Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (c1630113880d4723f2d6c0900387f9d9ef7bc791)
  • Date: Fri, 11 Aug 2006 11:24:07 -0500

GIT changes to master grimoire by Eric Sandall <sandalle@moby.(none)>:

xfce/xfce4-session/DEPENDS | 13 ++++++++++++-
xfce/xfce4-session/HISTORY | 7 +++++++
xfce/xfce4-session/PRE_BUILD | 6 ++++++
xfce/xfce4-session/gconf2.patch | 24 ++++++++++++++++++++++++
4 files changed, 49 insertions(+), 1 deletion(-)

New commits:
commit c1630113880d4723f2d6c0900387f9d9ef7bc791
Author: Eric Sandall <sandalle@moby.(none)>
Commit: Eric Sandall <sandalle@moby.(none)>

xfce4-session optionally depends on gconf2

commit b8b86c5e644beb7a70aabfc2f3470609d05dc574
Author: Eric Sandall <sandalle@moby.(none)>
Commit: Eric Sandall <sandalle@moby.(none)>

xfce4-session needs iceauth if using xorg-modular

diff --git a/xfce/xfce4-session/DEPENDS b/xfce/xfce4-session/DEPENDS
index a4bb149..fa501be 100755
--- a/xfce/xfce4-session/DEPENDS
+++ b/xfce/xfce4-session/DEPENDS
@@ -1 +1,12 @@
-depends xfce-mcs-manager
+depends xfce-mcs-manager &&
+
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs gtk+2; then
+ depends iceauth
+fi &&
+
+optional_depends gconf2 \
+ '--enable-gconf' \
+ '--disable-gconf' \
+ 'for Assistive technologies support'
diff --git a/xfce/xfce4-session/HISTORY b/xfce/xfce4-session/HISTORY
index 5869946..d67e427 100644
--- a/xfce/xfce4-session/HISTORY
+++ b/xfce/xfce4-session/HISTORY
@@ -1,3 +1,10 @@
+2006-08-11 Eric Sandall <eric AT sandall.us>
+ * DEPENDS: If using xorg-modular, depend on iceauth
+ Optionally depend on gconf2
+ * PRE_BUILD: Apply gconf2.patch if we want gconf2
+ * gconf2.patch: Add include paths for bonobo, libgnome, and
+ bonobo-activation (otherwise XFCE cannot find them for gconf)
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/xfce/xfce4-session/PRE_BUILD b/xfce/xfce4-session/PRE_BUILD
new file mode 100755
index 0000000..2c7e58d
--- /dev/null
+++ b/xfce/xfce4-session/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+if list_find "$OPTS" "--enable-gconf"; then
+ cd $SOURCE_DIRECTORY &&
+ patch -p1 < $SCRIPT_DIRECTORY/gconf2.patch
+fi
diff --git a/xfce/xfce4-session/gconf2.patch b/xfce/xfce4-session/gconf2.patch
new file mode 100644
index 0000000..a32def7
--- /dev/null
+++ b/xfce/xfce4-session/gconf2.patch
@@ -0,0 +1,24 @@
+diff -Naur xfce4-session-4.2.3.orig/Makefile.in
xfce4-session-4.2.3/Makefile.in
+--- xfce4-session-4.2.3.orig/Makefile.in 2006-08-11 08:53:00.103774152
-0700
++++ xfce4-session-4.2.3/Makefile.in 2006-08-11 09:15:53.403000936 -0700
+@@ -96,7 +96,7 @@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -I/usr/include/libgnome-2.0
-I/usr/include/bonobo-activation-2 -I/usr/include/libbonobo-2.0
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+diff -Naur xfce4-session-4.2.3.orig/xfce4-session/Makefile.in
xfce4-session-4.2.3/xfce4-session/Makefile.in
+--- xfce4-session-4.2.3.orig/xfce4-session/Makefile.in 2006-08-11
08:53:00.118771872 -0700
++++ xfce4-session-4.2.3/xfce4-session/Makefile.in 2006-08-11
09:14:15.325910920 -0700
+@@ -98,7 +98,7 @@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -I/usr/include/libgnome-2.0
-I/usr/include/bonobo-activation-2 -I/usr/include/libbonobo-2.0
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (c1630113880d4723f2d6c0900387f9d9ef7bc791), Eric Sandall, 08/11/2006

Archive powered by MHonArc 2.6.24.

Top of Page