From 7b1e2f38df07a99dc108c21f492a31a3290b7da2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 10 Aug 2009 17:33:35 +0000 Subject: [PATCH] - Add pango-1.25.1-no-hb-main.patch to fix build on x86-64 --- pango-1.25.1-no-hb-main.patch | 12 ++++++++++++ pango.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pango-1.25.1-no-hb-main.patch diff --git a/pango-1.25.1-no-hb-main.patch b/pango-1.25.1-no-hb-main.patch new file mode 100644 index 0000000..d720990 --- /dev/null +++ b/pango-1.25.1-no-hb-main.patch @@ -0,0 +1,12 @@ +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 d5869ed..10dbbfd 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: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2 @@ -37,6 +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 %description Pango is a library for laying out and rendering of text, with an emphasis @@ -72,6 +73,7 @@ for the pango package. %setup -q -n pango-%{version} %patch0 -p1 -b .lib64 +%patch1 -p1 -b .no-hb-main %build @@ -225,6 +227,9 @@ fi %changelog +* Mon Aug 10 2009 Behdad Esfahbod - 1.25.1-2 +- Add pango-1.25.1-no-hb-main.patch to fix build on x86-64 + * Mon Aug 10 2009 Behdad Esfahbod - 1.25.1-1 - Update to 1.25.1