Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.37 grimoire by Eric Sandall (035cfc0335f41602d7d7818188d099150ae0c7ab)

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 stable-rc-0.37 grimoire by Eric Sandall (035cfc0335f41602d7d7818188d099150ae0c7ab)
  • Date: Fri, 9 Oct 2009 15:23:54 -0500

GIT changes to stable-rc-0.37 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

dev/null |binary
disk/brasero/DEPENDS | 2 ++
disk/brasero/HISTORY | 3 +++
gnome2-libs/devicekit/DEPENDS | 2 +-
gnome2-libs/devicekit/HISTORY | 3 +++
gnome2-libs/gdm2/DEPENDS | 1 +
gnome2-libs/gdm2/HISTORY | 3 +++
gnome2-libs/libcanberra/CONFIGURE | 2 +-
gnome2-libs/libcanberra/HISTORY | 7
+++++++
gnome2-libs/libcanberra/PRE_SUB_DEPENDS | 6
++++++
gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS | 6
++++++
gnome2-libs/libcanberra/SUB_DEPENDS | 7
+++++++
gnome2-libs/metacity/DEPENDS | 1 +
gnome2-libs/metacity/HISTORY | 3 +++
net/samba/DETAILS | 6
+++---
net/samba/HISTORY | 3 +++
shell-term-fm/gnome-commander/DETAILS | 2 +-
shell-term-fm/gnome-commander/HISTORY | 3 +++
shell-term-fm/gnome-commander/gnome-commander-1.2.8.2.tar.bz2.sig |binary
shell-term-fm/gnome-commander/gnome-commander-1.2.8.tar.bz2.sig | 0
utils/eggdbus/DEPENDS | 2 +-
utils/eggdbus/HISTORY | 4 ++++
video/totem-pl-parser/DEPENDS | 2 +-
video/totem-pl-parser/HISTORY | 3 +++
x11-toolkits/gtk+2/DEPENDS | 8
++++++++
x11-toolkits/gtk+2/HISTORY | 9
+++++++++
x11-toolkits/gtk+2/PRE_BUILD | 5
++++-
27 files changed, 84 insertions(+), 9 deletions(-)

New commits:
commit 035cfc0335f41602d7d7818188d099150ae0c7ab
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

brasero needs gstreamer and gst-plugins-base #15455
(cherry-picked from bf3fb3c839f0ef3266c0f0745cd6416d3baca484)

commit 51fdf710de69bdacde46459f9a68eb4114414642
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

totem-pl-parser need gmime 2.4.X #15454
(cherry-picked from 795e831242779af5f4776a105fc4c20dfb8df81d)

commit ecd42b6732b118a361b39cb18b78d81895936eab
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eggdbus: needs docbook-xsl for man pages
(cherry picked from commit 40661fdb7761e3168619ecad0d09f61d55d7b824)

commit f75923ae1c37d0d31631acf59fbbdaf31959a64a
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

devicekit: requires docbook-xsl
(cherry picked from commit 38e664102fab989ae2f4f249d2a236ff293a3957)

commit 56650e67f8e9116baec7d597c913e149312386b6
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libcanberra: added sub dependency GTK
(cherry-picked from 44524ea)

commit ff1b4136e55e4aacebc1e3d43a8408dd60d4d577
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

metacity: added dependency on libcanberra with GTK, bug 15451
(cherry picked from commit 2af2987bdc0884bc736e0c02af2685cae08cfe4c)

commit 62c6be09f176b471344a4e93100db2f7e64e45bd
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gdm2 depends on libcanberra #15446
(cherry picked from commit 428d650de49e7039a1970990561802ad6dfff9ad)

commit 71aa5bc65968a61455375eb332fb56c2427ccbe9
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-commander 1.2.8.2
(cherry picked from commit babe3b9fd72a9c291aeb3b80296dd151a5bf3e21)

commit f18cb934a54a81607b39abb05e12fa1e4195ee98
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

samba: Updated to version 3.4.2. SECURITY_PATCH++
(cherry picked from commit 50ea724b2007c46ca9a8124a8b8b3ca3c1a573d2)

commit 91e77a40ae722040d93600a111f2183c7db645b7
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gtk+2: fix circular dependency, bug 15429

(Cherry-picked from efb9cbe)

diff --git a/disk/brasero/DEPENDS b/disk/brasero/DEPENDS
index 72009eb..45ccd5f 100755
--- a/disk/brasero/DEPENDS
+++ b/disk/brasero/DEPENDS
@@ -2,6 +2,8 @@ depends gnome-vfs2 &&
depends gst-plugins-good &&
depends hal &&
depends libxml2 &&
+depends gstreamer &&
+depends gst-plugins-base &&
optional_depends CD-BURN-UTILITY "" "" "to burn CDs" &&
optional_depends dvd+rw-tools "" "" "to burn DVDs" &&
optional_depends totem "--enable-playlist" "--disable-playlist" "For
playlist pane" &&
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index dc118be..0448aed 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,6 @@
+2009-10-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: added gstreamer and gst-plugins-base #15455
+
2009-09-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.0

diff --git a/gnome2-libs/devicekit/DEPENDS b/gnome2-libs/devicekit/DEPENDS
index c200701..f7a0df5 100755
--- a/gnome2-libs/devicekit/DEPENDS
+++ b/gnome2-libs/devicekit/DEPENDS
@@ -2,7 +2,7 @@ depends dbus &&
depends dbus-glib &&
depends pkgconfig &&
depends udev &&
-optional_depends docbook-dtd \
+optional_depends docbook-xsl \
"--enable-man-pages" \
"--disable-man-pages" \
"Build and install man pages?" &&
diff --git a/gnome2-libs/devicekit/HISTORY b/gnome2-libs/devicekit/HISTORY
index 573ce98..eb9d23e 100644
--- a/gnome2-libs/devicekit/HISTORY
+++ b/gnome2-libs/devicekit/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: requires docbook-xsl, not only docbook-dtd
+
2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Requires docbook-dtd not libxslt for man pages

diff --git a/gnome2-libs/gdm2/DEPENDS b/gnome2-libs/gdm2/DEPENDS
index 4af78c4..b293228 100755
--- a/gnome2-libs/gdm2/DEPENDS
+++ b/gnome2-libs/gdm2/DEPENDS
@@ -10,6 +10,7 @@ depends libxklavier &&
depends libglade2 &&
depends gnome-panel &&
depends librsvg2 &&
+depends libcanberra &&
#depends gnome-doc-utils &&

if echo $GDM_SECURE | grep -q "yes$" ; then
diff --git a/gnome2-libs/gdm2/HISTORY b/gnome2-libs/gdm2/HISTORY
index c057639..4f30926 100644
--- a/gnome2-libs/gdm2/HISTORY
+++ b/gnome2-libs/gdm2/HISTORY
@@ -1,3 +1,6 @@
+2009-10-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: added libcanberra #15446
+
2009-09-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.0

diff --git a/gnome2-libs/libcanberra/CONFIGURE
b/gnome2-libs/libcanberra/CONFIGURE
index dca16b1..02b3d9e 100755
--- a/gnome2-libs/libcanberra/CONFIGURE
+++ b/gnome2-libs/libcanberra/CONFIGURE
@@ -1,6 +1,6 @@
config_query_option CANBERRA_OSS "Enable OSS support?" n \
"--enable-oss" "--disable-oss" &&

-config_query_option CANBERRA_NULL "Enable NULL backend?" n \
+config_query_option CANBERRA_NULL "Enable NULL backend?" y \
"--enable-null" "--disable-null"

diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY
index 82ebf31..df770dc 100644
--- a/gnome2-libs/libcanberra/HISTORY
+++ b/gnome2-libs/libcanberra/HISTORY
@@ -1,3 +1,10 @@
+2009-10-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * SUB_DEPENDS, PRE_SUBDEPENDS, REPAIR^none^PRE_SUB_DEPENDS:
+ added sub dependency GTK
+ * CONFIGURE: default to building the null backend, otherwise
+ a default build on a clean system will fail due to no backend
+ being selected
+
2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.16

diff --git a/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..91ac720
--- /dev/null
+++ b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ GTK) is_depends_enabled $SPELL gtk+2 && return 0;;
+ *) echo "Eek, unknown subdependency requested!"; return 1;;
+esac
+return 1
+
diff --git a/gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS
b/gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..91ac720
--- /dev/null
+++ b/gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ GTK) is_depends_enabled $SPELL gtk+2 && return 0;;
+ *) echo "Eek, unknown subdependency requested!"; return 1;;
+esac
+return 1
+
diff --git a/gnome2-libs/libcanberra/SUB_DEPENDS
b/gnome2-libs/libcanberra/SUB_DEPENDS
new file mode 100755
index 0000000..e80d179
--- /dev/null
+++ b/gnome2-libs/libcanberra/SUB_DEPENDS
@@ -0,0 +1,7 @@
+
+case $THIS_SUB_DEPENDS in
+GTK) echo "GTK support requested, forcing gtk+2 dependency." &&
+ depends gtk+2 '--enable-gtk'
+ ;;
+*) echo unknown sub-depends!!! ; return 1 ;;
+esac
diff --git a/gnome2-libs/metacity/DEPENDS b/gnome2-libs/metacity/DEPENDS
index 000bcea..d91476e 100755
--- a/gnome2-libs/metacity/DEPENDS
+++ b/gnome2-libs/metacity/DEPENDS
@@ -9,6 +9,7 @@ depends libglade2 &&
depends orbit2 &&
depends xml-parser-expat &&
depends zenity &&
+depends -sub GTK libcanberra &&

optional_depends libxcomposite \
"--enable-compositor" \
diff --git a/gnome2-libs/metacity/HISTORY b/gnome2-libs/metacity/HISTORY
index 2173068..aa2cfdf 100644
--- a/gnome2-libs/metacity/HISTORY
+++ b/gnome2-libs/metacity/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added libcanberra with GTK, bug #15451
+
2009-09-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.0

diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index ac00dd0..85ab43e 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,18 +1,18 @@
SPELL=samba
- VERSION=3.4.1
+ VERSION=3.4.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:e328a34581c68d6959ae4cbe7964a00193795db8d2a20f8430aded7c60af3bc801f01478679036b8e801edf3099904eaaf96a62f42381ad0e3fa957fd0c0a19c
+
SOURCE_HASH=sha512:a35dc272536179be2832ebb251ab9ff43eb82e48700f4ed67626845ccb05a93b0f8ab9f227218bff777c4f291e759b674ac8a948a3380c7fe97e118ce90f0553
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2

SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
fi
- SECURITY_PATCH=11
+ SECURITY_PATCH=12
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 8ba3866..8c858e7 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2009-10-02 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.4.2. SECURITY_PATCH++
+
2009-09-12 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.4.1

diff --git a/shell-term-fm/gnome-commander/DETAILS
b/shell-term-fm/gnome-commander/DETAILS
index 736fda4..89c3efc 100755
--- a/shell-term-fm/gnome-commander/DETAILS
+++ b/shell-term-fm/gnome-commander/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-commander
- VERSION=1.2.8
+ VERSION=1.2.8.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/shell-term-fm/gnome-commander/HISTORY
b/shell-term-fm/gnome-commander/HISTORY
index 0cbe758..0f3503e 100644
--- a/shell-term-fm/gnome-commander/HISTORY
+++ b/shell-term-fm/gnome-commander/HISTORY
@@ -1,3 +1,6 @@
+2009-10-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.8.2 #15444
+
2009-07-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.8, WEB_SITE updated

diff --git
a/shell-term-fm/gnome-commander/gnome-commander-1.2.8.2.tar.bz2.sig
b/shell-term-fm/gnome-commander/gnome-commander-1.2.8.2.tar.bz2.sig
new file mode 100644
index 0000000..9c45de3
Binary files /dev/null and
b/shell-term-fm/gnome-commander/gnome-commander-1.2.8.2.tar.bz2.sig differ
diff --git a/shell-term-fm/gnome-commander/gnome-commander-1.2.8.tar.bz2.sig
b/shell-term-fm/gnome-commander/gnome-commander-1.2.8.tar.bz2.sig
deleted file mode 100644
index 4798eeb..0000000
Binary files
a/shell-term-fm/gnome-commander/gnome-commander-1.2.8.tar.bz2.sig and
/dev/null differ
diff --git a/utils/eggdbus/DEPENDS b/utils/eggdbus/DEPENDS
index 4e95395..1a72968 100755
--- a/utils/eggdbus/DEPENDS
+++ b/utils/eggdbus/DEPENDS
@@ -7,7 +7,7 @@ optional_depends gtk-doc \
"--disable-gtk-doc" \
"to build documentation" &&

-optional_depends libxslt \
+optional_depends docbook-xsl \
"--enable-man-pages" \
"--disable-man-pages" \
"to build man pages (seems broken)"
diff --git a/utils/eggdbus/HISTORY b/utils/eggdbus/HISTORY
index 58e3eef..047fbf2 100644
--- a/utils/eggdbus/HISTORY
+++ b/utils/eggdbus/HISTORY
@@ -1,3 +1,7 @@
+2009-10-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depends on docbook-xsl for man pages,
+ not libxslt
+
2009-09-30 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added missing optional dep on libxslt
* BUILD: removed, not needed anymore
diff --git a/video/totem-pl-parser/DEPENDS b/video/totem-pl-parser/DEPENDS
index f6dc591..bbed0a7 100755
--- a/video/totem-pl-parser/DEPENDS
+++ b/video/totem-pl-parser/DEPENDS
@@ -1,5 +1,5 @@
depends glib2 &&
-depends gmime &&
+depends -sub "2.4" gmime &&
depends gtk+2 &&
depends libxml2 &&
depends gnome-vfs2 &&
diff --git a/video/totem-pl-parser/HISTORY b/video/totem-pl-parser/HISTORY
index aa5e563..fe39c4a 100644
--- a/video/totem-pl-parser/HISTORY
+++ b/video/totem-pl-parser/HISTORY
@@ -1,3 +1,6 @@
+2009-10-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: depends gmime -> depends -sub "2.4" gmime #15454
+
2009-09-22 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on gmime

diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 138ea00..1b329f4 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -7,6 +7,14 @@ depends libxext &&
depends libxcursor &&
depends libxrender &&

+if spell_ok $SPELL; then
+ if spell_ok cairo; then
+ # sub_depend on svg support in cair for file
+ # print backend, requires this hack due to
+ # circular dependency
+ sub_depends cairo SVG
+ fi
+fi &&
optional_depends libpng \
"--with-libpng" \
"--without-libpng" \
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index cd924fa..e13381d 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,12 @@
+2009-10-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: sub_depend on cairo with SVG support if
+ gtk+2 and cairo are already installed, as those
+ 2 are dependencies of librsvg2, which provides
+ the SVG support in cairo
+ * PRE_BUILD: disable the file backend printing
+ module if cairo-svg support is not there
+ this fixes bug #15429
+
2009-10-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.18.1

diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD
index 4538091..e4d1630 100755
--- a/x11-toolkits/gtk+2/PRE_BUILD
+++ b/x11-toolkits/gtk+2/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-sed -i 's/CUPS_VERSION_MINOR > 1/\0 \&\& CUPS_VERSION_MINOR < 3/'
modules/printbackends/cups/gtkcupsutils.c
+sed -i 's/CUPS_VERSION_MINOR > 1/\0 \&\& CUPS_VERSION_MINOR < 3/'
modules/printbackends/cups/gtkcupsutils.c &&
+if [[ ! -f $INSTALL_ROOT/usr/include/cairo/cairo-svg.h ]]; then
+sed -i 's/SUBDIRS = file/SUBDIRS = /' modules/printbackends/Makefile.in
+fi



  • [SM-Commit] GIT changes to stable-rc-0.37 grimoire by Eric Sandall (035cfc0335f41602d7d7818188d099150ae0c7ab), Eric Sandall, 10/09/2009

Archive powered by MHonArc 2.6.24.

Top of Page