[csw-devel] SF.net SVN: gar:[14770] csw/mgar/pkg/pango/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14770
          http://gar.svn.sourceforge.net/gar/?rev=14770&view=rev
Author:   dmichelsen
Date:     2011-06-09 18:57:18 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
pango: Update to 1.28.4

Modified Paths:
--------------
    csw/mgar/pkg/pango/trunk/Makefile
    csw/mgar/pkg/pango/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/pango/trunk/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch
    csw/mgar/pkg/pango/trunk/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch

Modified: csw/mgar/pkg/pango/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pango/trunk/Makefile	2011-06-09 18:41:23 UTC (rev 14769)
+++ csw/mgar/pkg/pango/trunk/Makefile	2011-06-09 18:57:18 UTC (rev 14770)
@@ -1,5 +1,5 @@
 NAME = pango
-VERSION = 1.24.5
+VERSION = 1.28.4
 CATEGORIES = lib
 
 DESCRIPTION = A framework for the layout and rendering of international text
@@ -14,6 +14,13 @@
 DISTFILES = $(DISTNAME).tar.bz2
 DISTFILES += CSWpango.postinstall
 
+# Use patch unless this is fixed
+#   https://bugzilla.gnome.org/show_bug.cgi?id=652228
+PATCHFILES += 0001-Do-not-use-gcc-specific-flags-unconditionally.patch
+# Use patch unless this is fixed:
+#   https://bugzilla.gnome.org/show_bug.cgi?id=652227
+PATCHFILES += 0002-Use-inttypes.h-when-stdint.h-is-not-available.patch
+
 VENDOR_URL = http://www.pango.org/
 
 PACKAGES += CSWpango

Modified: csw/mgar/pkg/pango/trunk/checksums
===================================================================
--- csw/mgar/pkg/pango/trunk/checksums	2011-06-09 18:41:23 UTC (rev 14769)
+++ csw/mgar/pkg/pango/trunk/checksums	2011-06-09 18:57:18 UTC (rev 14770)
@@ -1 +1 @@
-815416a452e9cccc172fed9862401f37  pango-1.24.5.tar.bz2
+3f3989700f04e9117d30544a9078b3a0  pango-1.28.4.tar.bz2

Added: csw/mgar/pkg/pango/trunk/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch
===================================================================
--- csw/mgar/pkg/pango/trunk/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch	                        (rev 0)
+++ csw/mgar/pkg/pango/trunk/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch	2011-06-09 18:57:18 UTC (rev 14770)
@@ -0,0 +1,25 @@
+From 8ef6a7aa023c4be33134fc8f022b3e82b3af5ef5 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 9 Jun 2011 20:30:13 +0200
+Subject: [PATCH 1/2] Do not use gcc-specific flags unconditionally
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index d3e10de..4504459 100755
+--- a/configure
++++ b/configure
+@@ -5627,7 +5627,7 @@ done
+ 
+ 
+ # Make sure we don't link to libstdc++ (needs de-gcc-fication)
+-CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
++#CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+ 
+ 
+ #
+-- 
+1.7.5.4
+

Added: csw/mgar/pkg/pango/trunk/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch
===================================================================
--- csw/mgar/pkg/pango/trunk/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch	                        (rev 0)
+++ csw/mgar/pkg/pango/trunk/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch	2011-06-09 18:57:18 UTC (rev 14770)
@@ -0,0 +1,29 @@
+From 24496b0da2cd09bc62723e33231cad80105e3a0c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 9 Jun 2011 20:30:55 +0200
+Subject: [PATCH 2/2] Use inttypes.h when stdint.h is not available
+
+---
+ pango/opentype/hb-common.h |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/pango/opentype/hb-common.h b/pango/opentype/hb-common.h
+index 11f64ed..a6be6ba 100644
+--- a/pango/opentype/hb-common.h
++++ b/pango/opentype/hb-common.h
+@@ -27,7 +27,11 @@
+ #ifndef HB_COMMON_H
+ #define HB_COMMON_H
+ 
+-#include <stdint.h>
++# ifdef HAVE_STDINT_H
++#  include <stdint.h>
++# else ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++# endif
+ 
+ # ifdef __cplusplus
+ #  define HB_BEGIN_DECLS	extern "C" {
+-- 
+1.7.5.4
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.