sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (226a8b389138d3496220d8d82210c6d8d39bd0af)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (226a8b389138d3496220d8d82210c6d8d39bd0af)
- Date: Wed, 23 Sep 2009 15:50:25 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
gnome2-libs/gconf2/DEPENDS | 12 ++++++++++--
gnome2-libs/gconf2/HISTORY | 4 ++++
gnome2-libs/gconf2/PRE_BUILD | 6 +++++-
gnome2-libs/gconf2/defaults.patch | 16 ++++++++++++++++
4 files changed, 35 insertions(+), 3 deletions(-)
New commits:
commit 226a8b389138d3496220d8d82210c6d8d39bd0af
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gconf2: fixed compilation/dependencies
diff --git a/gnome2-libs/gconf2/DEPENDS b/gnome2-libs/gconf2/DEPENDS
index e735911..a01911c 100755
--- a/gnome2-libs/gconf2/DEPENDS
+++ b/gnome2-libs/gconf2/DEPENDS
@@ -1,7 +1,16 @@
depends libxml2 &&
depends orbit2 &&
depends xml-parser-expat &&
-depends policykit &&
+
+optional_depends policykit \
+ "--enable-defaults-service" \
+ "--disable-defaults-service" \
+ "Build the defaults DBus service?" &&
+
+optional_depends openldap \
+ "--with-openldap" \
+ "--without-openldap" \
+ "Enable LDAP backend?" &&
optional_depends gtk-doc \
"--enable-gtk-doc" \
@@ -12,4 +21,3 @@ optional_depends gtk+2 \
"--enable-gtk" \
"--disable-gtk" \
"for GConf sanity checker"
-
diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index 758a51d..db59ffb 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,7 @@
+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
+
2009-09-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.0
diff --git a/gnome2-libs/gconf2/PRE_BUILD b/gnome2-libs/gconf2/PRE_BUILD
index 09e909d..54dfbd3 100755
--- a/gnome2-libs/gconf2/PRE_BUILD
+++ b/gnome2-libs/gconf2/PRE_BUILD
@@ -1,3 +1,7 @@
-default_pre_build &&
+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
new file mode 100644
index 0000000..4effcf5
--- /dev/null
+++ b/gnome2-libs/gconf2/defaults.patch
@@ -0,0 +1,16 @@
+--- 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
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (226a8b389138d3496220d8d82210c6d8d39bd0af), Vlad Glagolev, 09/23/2009
Archive powered by MHonArc 2.6.24.