rpms/pango/devel pango-1.25.1-cxx.patch, NONE, 1.1 pango.spec, 1.166, 1.167 pango-1.25.1-no-hb-main.patch, 1.1, NONE

[Behdad Esfahbod]

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8636

Modified Files:
	pango.spec 
Added Files:
	pango-1.25.1-cxx.patch 
Removed Files:
	pango-1.25.1-no-hb-main.patch 
Log Message:
* Mon Aug 10 2009 Behdad Esfahbod <besfahbo(a)redhat.com&gt; - 1.25.1-3 
- Remove pango-1.25.1-no-hb-main.patch 
- Add pango-1.25.1-cxx.patch 
- Hopefully builds this time 


pango-1.25.1-cxx.patch:
 Makefile.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE pango-1.25.1-cxx.patch ---
diff -up pango-1.25.1/pango/opentype/Makefile.in.cxx
pango-1.25.1/pango/opentype/Makefile.in
--- pango-1.25.1/pango/opentype/Makefile.in.cxx	2009-08-10 13:58:16.000000000 -0400
+++ pango-1.25.1/pango/opentype/Makefile.in	2009-08-10 13:57:47.000000000 -0400
@@ -105,7 +105,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = $(CC) -fno-rtti -fno-exceptions -Wabi -Wpadded -Wcast-align
+CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
@@ -264,6 +264,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
+
+# The following warning options are useful for debugging: -Wpadded -Wcast-align
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
 noinst_LTLIBRARIES = libharfbuzz.la
 HBSOURCES = \
 	hb-blob.c \


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- pango.spec	10 Aug 2009 17:33:35 -0000	1.166
+++ pango.spec	10 Aug 2009 18:01:48 -0000	1.167
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.25.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -37,7 +37,7 @@ BuildRequires: gtk-doc
 
 # Look for pango.modules in an arch-specific directory
 Patch0: pango-1.21.4-lib64.patch
-Patch1: pango-1.25.1-no-hb-main.patch
+Patch1: pango-1.25.1-cxx.patch
 
 %description
 Pango is a library for laying out and rendering of text, with an emphasis
@@ -73,7 +73,7 @@ for the pango package.
 %setup -q -n pango-%{version}
 
 %patch0 -p1 -b .lib64
-%patch1 -p1 -b .no-hb-main
+%patch1 -p1 -b .cxx
 
 %build
 
@@ -227,6 +227,11 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Behdad Esfahbod <besfahbo(a)redhat.com&gt; - 1.25.1-3
+- Remove pango-1.25.1-no-hb-main.patch
+- Add pango-1.25.1-cxx.patch
+- Hopefully builds this time
+
 * Mon Aug 10 2009 Behdad Esfahbod <besfahbo(a)redhat.com&gt; - 1.25.1-2
 - Add pango-1.25.1-no-hb-main.patch to fix build on x86-64
 


--- pango-1.25.1-no-hb-main.patch DELETED ---