Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (61a5547d161f978c5c53609e36766bd666a28d93)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (61a5547d161f978c5c53609e36766bd666a28d93)
  • Date: Wed, 6 Oct 2010 18:21:24 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

gnome2-libs/at-spi/HISTORY | 2 ++
gnome2-libs/at-spi/make.patch | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 61a5547d161f978c5c53609e36766bd666a28d93
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

at-spi: Fixed location of at-spi.schemas

While fixing libcanberra for the make 3.82 syntax issues, noticed it
failed when trying to find libcanberra.schemas. Then looked at
at-spi and noticed it was also failing, but the Makefile did not
make this a hard error.

at-spi.schemas is not under data/, fix Makefile.in

commit cc3a46ae646f7354d75155f45a7762f28d88f429
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

at-spi: Missing entry for make.patch

diff --git a/gnome2-libs/at-spi/HISTORY b/gnome2-libs/at-spi/HISTORY
index 9b1d9d5..00a223d 100644
--- a/gnome2-libs/at-spi/HISTORY
+++ b/gnome2-libs/at-spi/HISTORY
@@ -2,6 +2,8 @@
* PRE_BUILD: Fix new make 3.82 syntax
Quote paths and provide patch message
* INSTALL: Fails with multiple make jobs
+ * make.patch: Added
+ Updated for incorrect location of at-spi.schemas

2010-06-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.30.1
diff --git a/gnome2-libs/at-spi/make.patch b/gnome2-libs/at-spi/make.patch
index d2c80b8..ffcb156 100644
--- a/gnome2-libs/at-spi/make.patch
+++ b/gnome2-libs/at-spi/make.patch
@@ -1,6 +1,6 @@
diff -Naur at-spi-1.30.1.orig/Makefile.in at-spi-1.30.1/Makefile.in
---- at-spi-1.30.1.orig/Makefile.in 2010-10-06 15:13:10.764999538 -0700
-+++ at-spi-1.30.1/Makefile.in 2010-10-06 15:14:37.888000738 -0700
+--- at-spi-1.30.1.orig/Makefile.in 2010-10-06 16:18:38.192000020 -0700
++++ at-spi-1.30.1/Makefile.in 2010-10-06 16:18:58.011000022 -0700
@@ -901,11 +901,11 @@
@INTLTOOL_SCHEMAS_RULE@

@@ -12,7 +12,7 @@ diff -Naur at-spi-1.30.1.orig/Makefile.in
at-spi-1.30.1/Makefile.in
-@GCONF_SCHEMAS_INSTALL_TRUE@ fi
+@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 $(top_builddir)/data/$$p ; \
++@GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(top_builddir)/$$p ; \
+@GCONF_SCHEMAS_INSTALL_TRUE@ done \
+@GCONF_SCHEMAS_INSTALL_TRUE@ fi
@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (61a5547d161f978c5c53609e36766bd666a28d93), Eric Sandall, 10/06/2010

Archive powered by MHonArc 2.6.24.

Top of Page