From 9fb5d1aa03cc2fcff3e25374d32cca4ab6341cc5 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@fedoraproject.org>
Date: Mon, 10 Aug 2009 18:01:48 +0000
Subject: [PATCH] - 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        | 22 ++++++++++++++++++++++
 pango-1.25.1-no-hb-main.patch | 12 ------------
 pango.spec                    | 11 ++++++++---
 3 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 pango-1.25.1-cxx.patch
 delete mode 100644 pango-1.25.1-no-hb-main.patch

diff --git a/pango-1.25.1-cxx.patch b/pango-1.25.1-cxx.patch
new file mode 100644
index 0000000..267cbdc
--- /dev/null
+++ b/pango-1.25.1-cxx.patch
@@ -0,0 +1,22 @@
+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 \
diff --git a/pango-1.25.1-no-hb-main.patch b/pango-1.25.1-no-hb-main.patch
deleted file mode 100644
index d720990..0000000
--- a/pango-1.25.1-no-hb-main.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up pango-1.25.1/pango/opentype/Makefile.in.no-hb-main pango-1.25.1/pango/opentype/Makefile.in
---- pango-1.25.1/pango/opentype/Makefile.in.no-hb-main	2009-08-10 13:29:37.000000000 -0400
-+++ pango-1.25.1/pango/opentype/Makefile.in	2009-08-10 13:29:14.000000000 -0400
-@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--noinst_PROGRAMS = main$(EXEEXT)
-+#noinst_PROGRAMS = main$(EXEEXT)
- subdir = pango/opentype
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	COPYING TODO
diff --git a/pango.spec b/pango.spec
index 10dbbfd..1e22e6c 100644
--- a/pango.spec
+++ b/pango.spec
@@ -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@redhat.com> - 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@redhat.com> - 1.25.1-2
 - Add pango-1.25.1-no-hb-main.patch to fix build on x86-64