[guitarix/f12/master] Add gtk-2.18 compatibility patch
Orcan Ogetbil
oget at fedoraproject.org
Sat Aug 14 21:25:11 UTC 2010
commit 81667424d8bb9557e9fbf8882e1e0ab34acb5608
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Sat Aug 14 17:24:59 2010 -0400
Add gtk-2.18 compatibility patch
guitarix-gtk218.patch | 26 ++++++++++++++++++++++++++
guitarix.spec | 3 +++
2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/guitarix-gtk218.patch b/guitarix-gtk218.patch
new file mode 100644
index 0000000..680bd20
--- /dev/null
+++ b/guitarix-gtk218.patch
@@ -0,0 +1,26 @@
+svn diff
+Index: libgxw/gxw/GxSelector.cpp
+===================================================================
+--- libgxw/gxw/GxSelector.cpp (revision 842)
++++ libgxw/gxw/GxSelector.cpp (working copy)
+@@ -21,6 +21,8 @@
+ #include <gtk/gtkprivate.h>
+ #include <string.h>
+
++#define gtk_widget_get_requisition(w, r) (*r = (w)->requisition)
++
+ #define P_(s) (s) // FIXME -> gettext
+
+ /****************************************************************
+Index: libgxw/gxw/GxRegler.cpp
+===================================================================
+--- libgxw/gxw/GxRegler.cpp (revision 842)
++++ libgxw/gxw/GxRegler.cpp (working copy)
+@@ -29,6 +29,8 @@
+ #include <gtk/gtkbindings.h>
+ #include <gtk/gtkmarshal.h>
+
++#define gtk_widget_get_requisition(w, r) (*r = (w)->requisition)
++
+ #define P_(s) (s) // FIXME -> gettext
+ #define I_(s) (s) // FIXME -> gettext
diff --git a/guitarix.spec b/guitarix.spec
index a302e13..d43a996 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -6,6 +6,8 @@ Group: Applications/Multimedia
License: GPLv2+
URL: http://guitarix.sourceforge.net/
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version}.tar.bz2
+# Compatibility patch sent to us by upstream
+Patch0: guitarix-gtk218.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
@@ -60,6 +62,7 @@ also be used by any other ladspa host.
%prep
%setup -q
+%patch0 -p0 -b .gtk218
# The build system does not use these bundled libraries by default. But
# just to make sure:
More information about the scm-commits
mailing list