[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (98fbc920da867efd4bfe953244ff3c175f119148)

Pol Vinogradov scm at sourcemage.org
Mon Aug 20 17:15:30 EDT 2007


GIT changes to master grimoire by Pol Vinogradov <vin.public at gmail.com>:

 chat-im/gajim/DEPENDS           |    1 +
 chat-im/gajim/HISTORY           |    3 +++
 graphics/gimp/DEPENDS           |    6 +++++-
 graphics/gimp/HISTORY           |    3 +++
 xfce/thunar/DEPENDS             |   34 ++++++++++++++++++++++++++++++++--
 xfce/thunar/HISTORY             |    5 ++++-
 xfce/xfce-utils/DEPENDS         |    7 ++++++-
 xfce/xfce-utils/HISTORY         |    3 +++
 xfce/xfce4-session/DEPENDS      |    9 +++++++--
 xfce/xfce4-session/HISTORY      |    4 ++++
 xfce/xfce4-session/PRE_BUILD    |    6 ------
 xfce/xfce4-session/gconf2.patch |   24 ------------------------
 12 files changed, 68 insertions(+), 37 deletions(-)

New commits:
commit 06dbfeda504f2d2a29f8d05a1bf8ce85ea35fb30
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    xfce/xfce-utils:
    
    DEPENDS: added dbus-glib as optional

commit c2cc5f0b343e7166880a5c51ba2293da72c5280f
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    xfce/xfce4-session:
    
    DEPENDS: added dbus as optional, fixed gconf2 flags
    PRE_BUILD, gconf2.patch: removed, fixed by upstream

commit 010a80d4c99ff23b6734cca9a4d916b608749559
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    xfce/thunar:
    
    DEPENDS: added dbus, gtk-doc, hal, libexif, pcre and
    startup-notification as optional

commit a5079410c5d690b953d935b2645b211be60a48ce
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    graphics/gimp:
    
    DEPENDS: added dbus-glib as optional for devel branch

commit 1b0007b9afba5ac65f07b45ed81edd1f8db61a14
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    chat-im/gajim:
    
    DEPENDS: added dbus as optional

diff --git a/chat-im/gajim/DEPENDS b/chat-im/gajim/DEPENDS
index f02b99e..8e4dad6 100755
--- a/chat-im/gajim/DEPENDS
+++ b/chat-im/gajim/DEPENDS
@@ -1,4 +1,5 @@
 depends  pygtk2    &&
 depends  pysqlite  &&
 depends  intltool  &&
+optional_depends dbus '--enable-remote' '--disable-remote' 'for remote control via DBus'  &&
 optional_depends gtkspell '--enable-gtkspell' '--disable-gtkspell' 'To add spelling checking'
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index 4e9319a..6d6ef5c 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,6 @@
+2007-08-20 Pol Vinogradov <vin.public at gmail.com>
+	* DEPENDS: added dbus as optional
+
 2007-02-19 George Sherwood <george at beernabeer.com>
 	* DETAILS: updated spell to 0.11.1
 
diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index 81d1b97..7c263fe 100755
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -1,5 +1,9 @@
 if [ "$GIMP_DEVEL" == "y" ];then
-  depends pygtk2
+  depends pygtk2   &&
+  optional_depends  dbus-glib            \
+                    "--with-dbus"        \
+                    "--without-dbus"     \
+                    "for D-Bus support"
 else
   optional_depends pygtk2 "--enable-python" "--disable-python" \
                           "for python scripting support"
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 0a19a63..43803fc 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,6 @@
+2007-08-20 Pol Vinogradov <vin.public at gmail.com>
+	* DEPENDS: added dbus-glib as optional for devel branch
+
 2007-08-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.4.0-rc1 (devel)
 	* INSTALL: removed, links are created by make install now
diff --git a/xfce/thunar/DEPENDS b/xfce/thunar/DEPENDS
index 4518803..f9fb363 100755
--- a/xfce/thunar/DEPENDS
+++ b/xfce/thunar/DEPENDS
@@ -1,2 +1,32 @@
-depends  xfce4-panel &&
-depends  exo
+depends  xfce4-panel  &&
+depends  exo          &&
+
+optional_depends  dbus                 \
+                  "--enable-dbus"      \
+                  "--disable-dbus"     \
+                  "for D-Bus support"  &&
+
+optional_depends  gtk-doc                   \
+                  "--enable-gtk-doc"        \
+                  "--disable-gtk-doc"       \
+                  "to build documentation"  &&
+
+optional_depends  hal                             \
+                  "--with-volume-manager=hal"     \
+                  ""                              \
+                  "to use HAL as volume manager"  &&
+
+optional_depends  libexif             \
+                  "--enable-exif"     \
+                  "--disable-exif"    \
+                  "for EXIF support"  &&
+
+optional_depends  pcre                               \
+                  "--enable-pcre"                    \
+                  "--disable-pcre"                   \
+                  "for regular expressions support"  &&
+
+optional_depends  startup-notification                        \
+                  "--enable-startup-notification"             \
+                  "--disable-startup-notification"            \
+                  "for startup notification library support"
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index 866d986..df0823f 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,7 +1,10 @@
+2007-08-20 Pol Vinogradov <vin.public at gmail.com>
+	* DEPENDS: added dbus, gtk-doc, hal, libexif, pcre and
+	  startup-notification as optional
+
 2007-02-19 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: PATCHLEVEL++
 	* PRE_BUILD: added for proper docs installation
 
 2007-01-23 George Sherwood <george at beernabeer.com>
 	* DEPENDS, DETAILS, HISTORY: created the spell
-
diff --git a/xfce/xfce-utils/DEPENDS b/xfce/xfce-utils/DEPENDS
index 6a95a58..c30afaf 100755
--- a/xfce/xfce-utils/DEPENDS
+++ b/xfce/xfce-utils/DEPENDS
@@ -1,2 +1,7 @@
 depends  xfce-mcs-manager  &&
-depends  which
+depends  which             &&
+
+optional_depends  dbus-glib            \
+                  '--enable-dbus'      \
+                  '--disable-dbus'     \
+                  'for D-Bus support'
diff --git a/xfce/xfce-utils/HISTORY b/xfce/xfce-utils/HISTORY
index 274b521..87df992 100644
--- a/xfce/xfce-utils/HISTORY
+++ b/xfce/xfce-utils/HISTORY
@@ -1,3 +1,6 @@
+2007-08-20 Pol Vinogradov <vin.public at gmail.com>
+	* DEPENDS: added dbus-glib as optional
+
 2007-07-04 George Sherwood <george at beernabeer.com>
 	* DEPENDS: depends which
 
diff --git a/xfce/xfce4-session/DEPENDS b/xfce/xfce4-session/DEPENDS
index fa501be..f96bae6 100755
--- a/xfce/xfce4-session/DEPENDS
+++ b/xfce/xfce4-session/DEPENDS
@@ -6,7 +6,12 @@ if  check_if_xorg_modular_libs gtk+2;  then
   depends  iceauth
 fi  &&
 
+optional_depends  dbus                 \
+                  '--enable-dbus'      \
+                  '--disable-dbus'     \
+                  'for D-Bus support'  &&
+
 optional_depends  gconf2                                \
-                  '--enable-gconf'                      \
-                  '--disable-gconf'                     \
+                  '--enable-gnome'                      \
+                  '--disable-gnome'                     \
                   'for Assistive technologies support'
diff --git a/xfce/xfce4-session/HISTORY b/xfce/xfce4-session/HISTORY
index a746cdb..77c3103 100644
--- a/xfce/xfce4-session/HISTORY
+++ b/xfce/xfce4-session/HISTORY
@@ -1,3 +1,7 @@
+2007-08-20 Pol Vinogradov <vin.public at gmail.com>
+	* DEPENDS: added dbus as optional, fixed gconf2 flags
+	* PRE_BUILD, gconf2.patch: removed, fixed by upstream
+
 2007-04-10 George Sherwood <george at beernabeer.com>
 	* DETAILS: updated spell to 4.4.1
 
diff --git a/xfce/xfce4-session/PRE_BUILD b/xfce/xfce4-session/PRE_BUILD
deleted file mode 100755
index 2c7e58d..0000000
--- a/xfce/xfce4-session/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index a32def7..0000000
--- a/xfce/xfce4-session/gconf2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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@



More information about the SM-Commit mailing list