[SM-Commit] GIT changes to stable-rc-0.54 grimoire by George Sherwood (bbf9503ac49c11e0af8a764fb25c94f03a529f69)
George Sherwood
scm at sourcemage.org
Sat Mar 12 10:55:52 EST 2011
GIT changes to stable-rc-0.54 grimoire by George Sherwood <gsherwood at sourcemage.org>:
libs/libgksu/HISTORY | 4 ++++
libs/libgksu/PRE_BUILD | 3 +++
libs/libgksu/make.tab.patch | 24 ++++++++++++++++++++++++
3 files changed, 31 insertions(+)
New commits:
commit bbf9503ac49c11e0af8a764fb25c94f03a529f69
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>
libgksu: Fix spaces -> tabs in Makefile.{in,am}
Fixes:
Makefile:732: *** missing separator (did you mean TAB instead of 8
spaces?). Stop.
(cherry picked from commit 933a0cd3b2599fc91cbe428e7c46b3010a15497f)
diff --git a/libs/libgksu/HISTORY b/libs/libgksu/HISTORY
index 8a76157..139ee65 100644
--- a/libs/libgksu/HISTORY
+++ b/libs/libgksu/HISTORY
@@ -1,3 +1,7 @@
+2011-03-10 Eric Sandall <sandalle at sourcemage.org>
+ * PRE_BUILD: Apply make.tab.patch
+ * make.tab.patch: Fix spaces -> tabs in Makefile.{in,am}
+
2010-04-05 Vasil Yonkov <spirtbrat at sourcemage.org>
* DEPENDS: removed bison, libglade2, added gtk+2
diff --git a/libs/libgksu/PRE_BUILD b/libs/libgksu/PRE_BUILD
new file mode 100755
index 0000000..ae31f41
--- /dev/null
+++ b/libs/libgksu/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SPELL_DIRECTORY"/make.tab.patch
diff --git a/libs/libgksu/make.tab.patch b/libs/libgksu/make.tab.patch
new file mode 100644
index 0000000..087bd10
--- /dev/null
+++ b/libs/libgksu/make.tab.patch
@@ -0,0 +1,24 @@
+diff -Naur libgksu-2.0.12.orig/Makefile.am libgksu-2.0.12/Makefile.am
+--- libgksu-2.0.12.orig/Makefile.am 2011-03-10 16:15:00.190590002 -0800
++++ libgksu-2.0.12/Makefile.am 2011-03-10 16:18:49.910590000 -0800
+@@ -17,7 +17,7 @@
+
+ if GCONF_SCHEMAS_INSTALL
+ install-data-local:
+- if test -z "$(DESTDIR)" ; then \
++ if test -z "$(DESTDIR)" ; then \
+ for p in $(schemas_DATA) ; do \
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+ done \
+diff -Naur libgksu-2.0.12.orig/Makefile.in libgksu-2.0.12/Makefile.in
+--- libgksu-2.0.12.orig/Makefile.in 2011-03-10 16:15:00.190590002 -0800
++++ libgksu-2.0.12/Makefile.in 2011-03-10 16:19:05.715590000 -0800
+@@ -729,7 +729,7 @@
+ @INTLTOOL_SCHEMAS_RULE@
+
+ @GCONF_SCHEMAS_INSTALL_TRUE at install-data-local:
+- at GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
++ at GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
+ @GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
+ @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+ @GCONF_SCHEMAS_INSTALL_TRUE@ done \
More information about the SM-Commit
mailing list