[awn-extras-applets] - apply upstream fix for cairo-menu (Bz 601616)
leigh123linux
leigh123linux at fedoraproject.org
Fri Sep 17 16:59:33 UTC 2010
commit 10516478f8c236e25c7e1fe50262b088746a8612
Author: leigh scott <leigh123linux at googlemail.com>
Date: Fri Sep 17 17:59:29 2010 +0100
- apply upstream fix for cairo-menu (Bz 601616)
1285_1284.diff | 13 +++++++++++++
1286_1285.diff | 11 +++++++++--
awn-extras-applets.spec | 8 ++++----
3 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/1285_1284.diff b/1285_1284.diff
new file mode 100644
index 0000000..13bc70b
--- /dev/null
+++ b/1285_1284.diff
@@ -0,0 +1,13 @@
+=== modified file 'configure.ac'
+--- configure.ac 2010-04-11 17:34:16 +0000
++++ configure.ac 2010-04-14 14:27:47 +0000
+@@ -269,6 +269,8 @@
+ AC_SUBST(APPLETSDIR)
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Locale directory])
+ AC_SUBST(LOCALEDIR)
++AC_DEFINE_UNQUOTED(LIBDIR, "$LIBDIR", [Lib directory])
++AC_SUBST(LIBDIR)
+
+ DBUS_SERVICES_DIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
+ AC_SUBST(DBUS_SERVICES_DIR)
+
diff --git a/1286_1285.diff b/1286_1285.diff
index fb1c625..9da66f5 100644
--- a/1286_1285.diff
+++ b/1286_1285.diff
@@ -1,12 +1,19 @@
=== modified file 'applets/maintained/cairo-menu/cairo-menu-applet.c'
--- applets/maintained/cairo-menu/cairo-menu-applet.c 2010-03-28 15:07:05 +0000
+++ applets/maintained/cairo-menu/cairo-menu-applet.c 2010-04-14 14:29:04 +0000
-@@ -156,7 +156,7 @@ cairo_menu_applet_constructed (GObject *
+@@ -156,12 +156,11 @@
TODO fix the various travesties*/
GList * iter;
GError * error = NULL;
- gchar * filename = APPLETSDIR"/../../../lib/awn/applets/cairo-menu/gnome-menu-builder";
-+ gchar * filename = APPLETSDIR"/../../../lib64/awn/applets/cairo-menu/gnome-menu-builder";
++ gchar * filename = LIBDIR"/awn/applets/cairo-menu/gnome-menu-builder";
GModule *module;
G_OBJECT_CLASS (cairo_menu_applet_parent_class)->constructed (object);
+- module = g_module_open (filename,
+- G_MODULE_BIND_LAZY);
++ module = g_module_open (filename,G_MODULE_BIND_LAZY);
+ g_assert (module);
+ if (!g_module_symbol (module, "menu_build", (gpointer *)&menu_build))
+ {
+
diff --git a/awn-extras-applets.spec b/awn-extras-applets.spec
index f570c00..2c76ecf 100644
--- a/awn-extras-applets.spec
+++ b/awn-extras-applets.spec
@@ -32,7 +32,8 @@ Patch21: 1388_1387.diff
Patch22: 1389_1388.diff
Patch23: 1390_1389.diff
Patch24: 1391_1390.diff
-Patch25: 1286_1285.diff
+Patch25: 1285_1284.diff
+Patch26: 1286_1285.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -116,9 +117,8 @@ awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
%patch22 -p0 -b .1389_1388
%patch23 -p0 -b .1390_1389
%patch24 -p0 -b .1391_1390
-%ifarch x86_64
-%patch25 -p0 -b .1286_1285
-%endif
+%patch25 -p0 -b .1285_1284
+%patch26 -p0 -b .1286_1285
cp -p %{SOURCE1} applets/unmaintained/MiMenu/icons
More information about the scm-commits
mailing list