Skip to Content.
Sympa Menu

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

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 (a037977fc38338aa4de5054d32184df7a837baaa)
  • Date: Thu, 8 Oct 2009 22:36:32 -0500

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

gnome2-libs/gconf2/HISTORY | 4 ++++
gnome2-libs/gconf2/PRE_BUILD | 2 --
gnome2-libs/gconf2/defaults.patch | 16 ----------------
3 files changed, 4 insertions(+), 18 deletions(-)

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

gconf2: Don't apply defaults.patch, fixes Bug #15445

diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index db59ffb..a7a9092 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,7 @@
+2009-10-08 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Don't apply defaults.patch, fixes Bug #15445
+ * defaults.patch: Removed
+
2009-09-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added openldap opt dep, policykit is optional again too!
* defaults.patch: added, to fix compilation
diff --git a/gnome2-libs/gconf2/PRE_BUILD b/gnome2-libs/gconf2/PRE_BUILD
index 54dfbd3..06d429e 100755
--- a/gnome2-libs/gconf2/PRE_BUILD
+++ b/gnome2-libs/gconf2/PRE_BUILD
@@ -1,7 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/defaults.patch" &&
-
patch $SOURCE_DIRECTORY/Makefile.in \
$SCRIPT_DIRECTORY/gconf.xml.system.patch
diff --git a/gnome2-libs/gconf2/defaults.patch
b/gnome2-libs/gconf2/defaults.patch
deleted file mode 100644
index 4effcf5..0000000
--- a/gnome2-libs/gconf2/defaults.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- defaults/Makefile.in.orig 2009-09-22 16:54:11.000000000 +0400
-+++ defaults/Makefile.in 2009-09-24 00:34:28.749574347 +0400
-@@ -260,11 +260,11 @@
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -DSYSGCONFDIR=\"$(sysgconfdir)\" \
-- $(DEFAULTS_CFLAGS)
-+ $(DEPENDENT_CFLAGS)
-
- gconf_defaults_mechanism_LDADD = \
- $(top_builddir)/gconf/libgconf-2.la \
-- $(DEFAULTS_LIBS)
-+ $(DEPENDENT_LIBS)
-
- BUILT_SOURCES = gconf-defaults-glue.h
- dbus_servicesdir = $(datadir)/dbus-1/system-services




Archive powered by MHonArc 2.6.24.

Top of Page