[xoo] xoo-0.7-glib.patch: Fix for new glib
Adam Jackson
ajax at fedoraproject.org
Wed Jan 11 22:08:49 UTC 2012
commit b370d181f798f57e8c2db7d1a9a47716583ce41c
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Jan 11 17:08:43 2012 -0500
xoo-0.7-glib.patch: Fix for new glib
xoo-0.7-glib.patch | 12 ++++++++++++
xoo.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/xoo-0.7-glib.patch b/xoo-0.7-glib.patch
new file mode 100644
index 0000000..b16c6a9
--- /dev/null
+++ b/xoo-0.7-glib.patch
@@ -0,0 +1,12 @@
+diff -up xoo-0.7/src/button.c.jx xoo-0.7/src/button.c
+--- xoo-0.7/src/button.c.jx 2005-09-05 11:21:59.000000000 -0400
++++ xoo-0.7/src/button.c 2012-01-11 17:05:35.943814368 -0500
+@@ -16,7 +16,7 @@
+ #include "config.h"
+ #include <string.h>
+ #include <stdio.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtk/gtkimage.h>
+ #include "fakedev.h"
+
diff --git a/xoo.spec b/xoo.spec
index d2fb9d9..a9327e1 100644
--- a/xoo.spec
+++ b/xoo.spec
@@ -1,7 +1,7 @@
Summary: Xoo is a graphical wrapper around xnest
Name: xoo
Version: 0.7
-Release: 14%{?dist}
+Release: 15%{?dist}
License: GPLv2+
# upstream is in the process of moving source to freedesktop.org
# tar ball not available ATM at either site
@@ -10,6 +10,7 @@ Source0: http://projects.o-hand.com/sources/%{name}/%{name}-%{version}.tar.gz
Source1: neo1973.png
Patch0: xoo-0.7-xnest-location.patch
Patch1: xoo-neo1973.patch
+Patch2: xoo-0.7-glib.patch
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXtst-devel, gtk2-devel, libglade2-devel, expat-devel
@@ -25,6 +26,7 @@ device.
%setup -q
%patch0 -b .xnest-location
%patch1 -p1 -b .neo1973
+%patch2 -p1 -b .glib
cp %{SOURCE1} data/
# ImplicitDSOlinking fix
sed -i 's/-lXtst/-lXtst -lX11/' configure.ac
@@ -53,6 +55,9 @@ rm -rf %{buildroot}
#%{_mandir}/*/*
%changelog
+* Wed Jan 11 2012 Adam Jackson <ajax at redhat.com> 0.7-15
+- xoo-0.7-glib.patch: Fix for new glib
+
* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.7-14
- Rebuild for new libpng
More information about the scm-commits
mailing list