From 82ab6c70e28845df0e5dd6152a05a79d9ef2d4b6 Mon Sep 17 00:00:00 2001 From: Daniel Jahre Date: Thu, 2 Feb 2006 12:40:44 +0000 Subject: [PATCH] Daniel Jahre: added the lfs gcc4 patch for gpdf fixes also a compile on amd64 (untested) [2005122819265728990] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6995 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/gnome2/gpdf/gpdf-gcc4.patch | 64 +++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 package/gnome2/gpdf/gpdf-gcc4.patch diff --git a/package/gnome2/gpdf/gpdf-gcc4.patch b/package/gnome2/gpdf/gpdf-gcc4.patch new file mode 100644 index 000000000..8b78f5018 --- /dev/null +++ b/package/gnome2/gpdf/gpdf-gcc4.patch @@ -0,0 +1,64 @@ +Submitted By: Joe Ciccone +Date: 2005-08-23 +Initial Package Version: 2.10.0 +Upstream Status: unknown +Origin: Fedora Core CVS +Rediffed by Ken Moffat to fix it +Description: Adds a forward declaration that GCC4 wants + +diff -Naur gpdf-2.10.0.orig/xpdf/TextOutputDev.h gpdf-2.10.0/xpdf/TextOutputDev.h +--- gpdf-2.10.0.orig/xpdf/TextOutputDev.h 2005-08-23 21:59:57.000000000 +0000 ++++ gpdf-2.10.0/xpdf/TextOutputDev.h 2005-08-23 22:00:10.000000000 +0000 +@@ -166,6 +166,8 @@ + // TextLine + //------------------------------------------------------------------------ + ++class TextBlock; ++ + class TextLine { + public: + +@@ -223,6 +225,8 @@ + // TextBlock + //------------------------------------------------------------------------ + ++class TextPage; ++ + class TextBlock { + public: + +@@ -342,6 +346,8 @@ + // TextPage + //------------------------------------------------------------------------ + ++class TextLineFrag; ++ + class TextPage { + public: + + +Submitted By: Ken Moffat +Date: 2005-09-09 +Initial Package Version: 2.10.0 +Upstream Status: unknown +Origin: from gentoo +Description: Allows gpdf to compile on x86_64 with gcc4 +(apply on top of the gcc4 patch) + +--- gpdf-2.10.0/xpdf/gpdf-control.cc 2005-05-20 15:03:29.000000000 +0200 ++++ gpdf-2.10.0.az/xpdf/gpdf-control.cc 2005-05-20 15:06:39.000000000 +0200 +@@ -209,12 +209,12 @@ + const gchar * status) + { + GPdfControlPrivate *priv; +- guint to_id; ++ unsigned long to_id; + + g_return_if_fail (GPDF_IS_NON_NULL_CONTROL (control)); + priv = control->priv; + +- if ((to_id = (unsigned int) ++ if ((to_id = (unsigned long) + g_object_get_data (G_OBJECT (control), + "status-timeout-id")) != 0) { + g_object_set_data (G_OBJECT (control),