[SM-Commit] GIT changes to master grimoire by Robin Cook (109523a51c835e0024ad87b7f9790ed97596b64a)

Robin Cook scm at sourcemage.org
Tue Dec 11 17:27:38 EST 2007


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 gnome2-libs/libgnomekbd/HISTORY                               |    4 ++
 gnome2-libs/libgnomekbd/PRE_BUILD                             |    6 ++--
 gnome2-libs/libgnomekbd/libgnomekbd-2.21.1-no-libbonobo.patch |   14 ++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit ff7e68135d1eb9490ef4af322a4b98050932736d
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    libgnomekbd: apply patch for build problem.

diff --git a/gnome2-libs/libgnomekbd/HISTORY b/gnome2-libs/libgnomekbd/HISTORY
index c8b52c8..47b065a 100644
--- a/gnome2-libs/libgnomekbd/HISTORY
+++ b/gnome2-libs/libgnomekbd/HISTORY
@@ -1,3 +1,7 @@
+2007-12-11 Robin Cook <rcook at wyrms.net>
+	* PRE_BUILD: apply patch to fix the actual problem and removed
+	  work around ( http://bugzilla.gnome.org/show_bug.cgi?id=453698 )
+
 2007-09-20 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 2.20.0
 
diff --git a/gnome2-libs/libgnomekbd/PRE_BUILD b/gnome2-libs/libgnomekbd/PRE_BUILD
index 189e93a..652e2fb 100755
--- a/gnome2-libs/libgnomekbd/PRE_BUILD
+++ b/gnome2-libs/libgnomekbd/PRE_BUILD
@@ -1,4 +1,4 @@
-default_pre_build  &&
+default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
-sed -i 's/-Werror//' test/Makefile.in  &&
-sed -i 's/-Werror//' capplet/Makefile.in
+
+patch -p0 < $SCRIPT_DIRECTORY/libgnomekbd-2.21.1-no-libbonobo.patch
diff --git a/gnome2-libs/libgnomekbd/libgnomekbd-2.21.1-no-libbonobo.patch b/gnome2-libs/libgnomekbd/libgnomekbd-2.21.1-no-libbonobo.patch
new file mode 100644
index 0000000..6dd2f3d
--- /dev/null
+++ b/gnome2-libs/libgnomekbd/libgnomekbd-2.21.1-no-libbonobo.patch
@@ -0,0 +1,14 @@
+Index: gkbd-indicator-plugins-add.c
+===================================================================
+--- capplet/gkbd-indicator-plugins-add.c	(revision 200)
++++ capplet/gkbd-indicator-plugins-add.c	(working copy)
+@@ -26,7 +26,7 @@
+ 
+ #include <gdk/gdkx.h>
+ #include <glade/glade.h>
+-#include <libbonobo.h>
++#include <glib/gi18n.h>
+ 
+ #include <libxklavier/xklavier.h>
+ 
+



More information about the SM-Commit mailing list