[florence] Added patch to avoid some direct glib includes
Robert Scheck
robert at fedoraproject.org
Mon Jan 16 00:54:05 UTC 2012
commit 50b0edd446f06e90b934a5d0329fb57a03f5de73
Author: Robert Scheck <robert at fedoraproject.org>
Date: Mon Jan 16 01:53:52 2012 +0100
Added patch to avoid some direct glib includes
florence-0.5.0-glib.patch | 19 +++++++++++++++++++
florence.spec | 2 ++
2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/florence-0.5.0-glib.patch b/florence-0.5.0-glib.patch
new file mode 100644
index 0000000..d86f72f
--- /dev/null
+++ b/florence-0.5.0-glib.patch
@@ -0,0 +1,19 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for florence >= 0.5.0
+which removes direct include directives of some glib includes. A recent
+glib, such as 2.31.6 in Fedora 17+, is going to complain "Only <glib.h>
+can be included directly." and building florence will fail.
+
+--- florence-0.5.0/src/trace.c 2010-11-28 15:59:13.000000000 +0100
++++ florence-0.5.0/src/trace.c.glib 2012-01-16 01:41:34.000000000 +0100
+@@ -21,10 +21,8 @@
+
+ #include "trace.h"
+ #include "system.h"
++#include <glib.h>
+ #include <glib/gprintf.h>
+-#include <glib/gutils.h>
+-#include <glib/gslist.h>
+-#include <glib/gstrfuncs.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+
diff --git a/florence.spec b/florence.spec
index 7fedbe1..8698d29 100644
--- a/florence.spec
+++ b/florence.spec
@@ -7,6 +7,7 @@ Group: User Interface/X Hardware Support
License: GPLv2+ and GFDL
URL: http://florence.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0: florence-0.5.0-glib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
@@ -48,6 +49,7 @@ to help disabled people having difficulties to click.
%prep
%setup -q
+%patch0 -p1 -b .glib
rm -f gconf-refresh
ln -sf /bin/true gconf-refresh
More information about the scm-commits
mailing list