[parcellite] Fix build error with glib2 >= 2.30

Christoph Wickert cwickert at fedoraproject.org
Sat Mar 10 18:47:27 UTC 2012


commit 7414ae84a1ae08e8061a26d1e5f977edbaa8652b
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Mar 10 19:47:17 2012 +0100

    Fix build error with glib2 >= 2.30

 parcellite-1.0.2rc5-glib.patch |   11 +++++++++++
 parcellite.spec                |    3 +++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/parcellite-1.0.2rc5-glib.patch b/parcellite-1.0.2rc5-glib.patch
new file mode 100644
index 0000000..8d0a115
--- /dev/null
+++ b/parcellite-1.0.2rc5-glib.patch
@@ -0,0 +1,11 @@
+--- parcellite-1.0.2rc5.orig/src/keybinder.h	2011-09-10 01:02:32.000000000 +0200
++++ parcellite-1.0.2rc5/src/keybinder.h	2012-03-10 19:39:08.267705810 +0100
+@@ -20,7 +20,7 @@
+ #ifndef __KEY_BINDER_H__
+ #define __KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/parcellite.spec b/parcellite.spec
index e44024e..3cb3a16 100644
--- a/parcellite.spec
+++ b/parcellite.spec
@@ -11,6 +11,7 @@ URL:            http://parcellite.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?prerelease}.tar.gz
 Patch0:         parcellite-0.9.2-de.po.patch
 Patch1:         parcellite-0.9.2-dsofix.patch
+Patch2:         parcellite-1.0.2rc5-glib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.10.0 
@@ -29,6 +30,7 @@ system tray or notification area if you want to use this package.
 %setup -qn %{name}-%{version}%{?prerelease}
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .dsofix
+%patch2 -p1 -b .glib
 
 
 %build
@@ -76,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sat Mar 10 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-0.2.rc5
 - Don't ship prebuilt binaries (#800644)
+- Fix build error with glib2 >= 2.30
 
 * Sat Mar 03 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-0.1.rc5
 - Update to 1.0.2 RC5 (#730240)


More information about the scm-commits mailing list