New commits:
commit 2af2987bdc0884bc736e0c02af2685cae08cfe4c
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
metacity: added dependency on libcanberra with GTK, bug 15451
commit 44524eac5cabfe3215892dcbbd46a23d5de3828f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
libcanberra: added sub dependency GTK
commit 2838a55b41c776069aef13c61322433582bd1a53
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gnome-vfs2 2.24.2
commit 997f88faf50b7851edf74b30950d74d36c70d6ed
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
gdb: 7.0
commit 3cf629a20d4d98e4cddb4a556686fcfc7a48df41
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
shared-mime-info: => 0.70
commit 08e5ba6c842bbf7e294e44b2662489ef2d4504e3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
virtuoso-20090928 (devel)
this version allows the building of a minimal install, which satisfies
the needs of
kde-4.4.4. the resulting cache file is only a quarter the size, ~ 1.6MB,
and everything
builds much faster
commit 1930bbff4d43ec5f1dc41e903bd6aa1dc99525fa
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>
libxfcegui4 depends on intltool
commit 368cdcccc23452986bee39e13fe094406b110396
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>
libwnck depends on intltool
commit 3c4d799d4bd0cd9166aa649cf90887b60b2aa9c0
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>
xfce4-settings depends on libxi
commit b5e2e68370d70649f97a782f7ddec5d47146a30c
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>
gnome-doc-utils: requires intltool
commit 26c860eab645108e5e598449bf5eb1808564638f
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>
linux 2.6.31.3
commit a133131fda1bab9fa16311ba99114767466c6900
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
xf86-input-keyboard: => 1.4.0
commit 498d57fe4282400f23c48e2ed2a4b9bc87fd1581
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libxkbfile: => 1.0.6
(cherry picked from commit c5dcadeac36f55f1ff78ae69faca29bbddb54003)
commit 0c4a12972cebb3aeef3691e429b4d54ffdfea322
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libxvmc: => 1.0.5
(cherry picked from commit a125aa30fa5d7ec6805796ecc4b6c63ed065cb39)
commit 847d5bf851e9d91afdc4680ee72343a96a75b82b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libxdamage: => 1.1.2
(cherry picked from commit b6f7ca9e8df84daa6d8288917d356225338e28fd)
commit 1c90958fdab2be7dce025b5f002d222f10a7f6c6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
xf86-input-mouse: => 1.5.0
commit 366983cb71f8da937d12bdeb8efdd741e4a985f9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libxxf86dga: => 1.1.1
(cherry picked from commit c8ccb93e35c7e393d3b5ff13af6e6490310a4958)
commit 925ba3245809a75ba1b95a610760af03138eef8b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
randrproto: => 1.3.1
(cherry picked from commit c5fc8714bf52778b6859c48222e2673ac2795eec)
commit efb9cbef9f233f7d8b2c7f5addcac99371f5d733
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
gtk+2: fix circular dependency, bug 15429
commit 92c1c3665f2445f73c4361c0fee7c5868c87cd03
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
sip: => 4.9
commit 1576146a9ad5569ac239aaf1cd2a17d027b4a02b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
pyqt4: => 4.6
commit 15c47ed6c4c97dd39b28bc262e904ccfb7afbccc
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
qscintilla: => 2.4
commit 03818c6314ad5a79aabf4a7ac9a9e2718ca3f49e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
muparser: => 1.30
commit 21525e9ddac4057cb73b71c5ce83a136c2aab1b7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
glib2 2.22.2
commit 9ae2fab44422bc65ccacd8e88ebc8db91bc0a348
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdesdk4: => 4.3.2
commit d274e376099e1a989526b9546f23dd02b8abc377
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdewebdev4: => 4.3.2
commit 65e5e16af0a89942944ce455751db041453fe7d5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdetoys4: => 4.3.2
commit a631559e6121098ea3eeb239efbbd6b8162906a6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdeedu4: => 4.3.2
commit bb58094a77e954ffd3a7c1a4875c51b4cc097cfd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdebindings4: => 4.3.2
commit 799ac2655f753b8602ebb56f5a65691144237425
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdeartwork4: => 4.3.2
commit 458c224fbb6bea318445cf8e874a1c99d3446d87
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdeaccessibility4: => 4.3.2
commit 1b182d0144ad48aa7a268d4f4677faf5bfb70812
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
bzrtools: => 2.0.1
commit dc375e94dee6bb483a38a64605db7fca6ff3e8cc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
bzr: => 2.0.0
commit 20b03741ffecb969dfd2155410a442cc2cc604ca
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gnome-media2 2.28.1
commit a9426212f64c77a9e0b0ade1ba589719aeb66fd7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
freetype2 2.3.10
commit 88df1d5e45901c871e201f8578b702291b5a4ea9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
gzip: => 1.3.13
commit d1abca4cb3595a2c8c969f12384f6d0b7bb126da
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cdrdao: => 1.2.3
commit f7e2b0eebe9a8c5659a3fd5a131d724dd091583b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
optional_depends rarian \
"" "--disable-scrollkeeper" \
diff --git a/gnome2-libs/gnome-doc-utils/HISTORY
b/gnome2-libs/gnome-doc-utils/HISTORY
index 73f8f44..bdc69df 100644
--- a/gnome2-libs/gnome-doc-utils/HISTORY
+++ b/gnome2-libs/gnome-doc-utils/HISTORY
@@ -1,3 +1,6 @@
+2009-10-07 Finn Haedicke <finn_haedicke AT gmx.net>
+ * DEPENDS: requires intltool
+
2009-09-29 Finn Haedicke <finn_haedicke AT gmx.net>
* DEPENDS: requires libxml2 with PYTHON
diff --git a/gnome2-libs/gnome-media2/DETAILS
b/gnome2-libs/gnome-media2/DETAILS
index 415c729..24a8e61 100755
--- a/gnome2-libs/gnome-media2/DETAILS
+++ b/gnome2-libs/gnome-media2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-media2
- VERSION=2.28.0
+ VERSION=2.28.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-media-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-media-$VERSION
diff --git a/gnome2-libs/gnome-media2/HISTORY
b/gnome2-libs/gnome-media2/HISTORY
index f6811eb..534c9b2 100644
--- a/gnome2-libs/gnome-media2/HISTORY
+++ b/gnome2-libs/gnome-media2/HISTORY
@@ -1,3 +1,6 @@
+2009-10-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.28.1
+
2009-09-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.0
* PRE_BUILD, gnome-media-2.26.0-missing-cddbslave-cflags.patch:
removed
diff --git a/gnome2-libs/gnome-media2/gnome-media-2.28.0.tar.bz2.sig
b/gnome2-libs/gnome-media2/gnome-media-2.28.0.tar.bz2.sig
deleted file mode 100644
index 254a541..0000000
Binary files a/gnome2-libs/gnome-media2/gnome-media-2.28.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-media2/gnome-media-2.28.1.tar.bz2.sig
b/gnome2-libs/gnome-media2/gnome-media-2.28.1.tar.bz2.sig
new file mode 100644
index 0000000..597bf9b
Binary files /dev/null and
b/gnome2-libs/gnome-media2/gnome-media-2.28.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-vfs2/DETAILS b/gnome2-libs/gnome-vfs2/DETAILS
index 7c4b33f..341c320 100755
--- a/gnome2-libs/gnome-vfs2/DETAILS
+++ b/gnome2-libs/gnome-vfs2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-vfs2
- VERSION=2.24.1
+ VERSION=2.24.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-vfs-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-vfs-$VERSION
diff --git a/gnome2-libs/gnome-vfs2/HISTORY b/gnome2-libs/gnome-vfs2/HISTORY
index 1624ec4..999c4a3 100644
--- a/gnome2-libs/gnome-vfs2/HISTORY
+++ b/gnome2-libs/gnome-vfs2/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.24.2
+
2009-03-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.24.1
diff --git a/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.1.tar.bz2.sig
b/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.1.tar.bz2.sig
deleted file mode 100644
index 221d3aa..0000000
Binary files a/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.2.tar.bz2.sig
b/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.2.tar.bz2.sig
new file mode 100644
index 0000000..34cc82c
Binary files /dev/null and
b/gnome2-libs/gnome-vfs2/gnome-vfs-2.24.2.tar.bz2.sig differ
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 9f634ab..c877a30 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-10-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.18
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/libwnck/DEPENDS b/gnome2-libs/libwnck/DEPENDS
index f2bc92a..8d2dd66 100755
--- a/gnome2-libs/libwnck/DEPENDS
+++ b/gnome2-libs/libwnck/DEPENDS
@@ -1,8 +1,4 @@
-#
-# Umm...they check for intltool being installed, but /include/ it with their
-# code, so it gets found /right there/
-#depends intltool
-#
+depends intltool &&
depends libx11 &&
depends libxext &&
depends libxres &&
diff --git a/gnome2-libs/libwnck/HISTORY b/gnome2-libs/libwnck/HISTORY
index 02dc0da..29b49b2 100644
--- a/gnome2-libs/libwnck/HISTORY
+++ b/gnome2-libs/libwnck/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Finn Haedicke <finn_haedicke AT gmx.net>
+ * DEPENDS: added intltool
+
2009-09-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILL: 2.28.0
+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 f4053a7..cec002a 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-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.18.2
optional_depends libxrandr \
"--enable-xrandr" \
diff --git a/xfce/xfce4-settings/HISTORY b/xfce/xfce4-settings/HISTORY
index 2d8cae1..e7653d1 100644
--- a/xfce/xfce4-settings/HISTORY
+++ b/xfce/xfce4-settings/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Finn Haedicke <finn_haedicke AT gmx.net>
+ * DEPENDS: added libxi
+
2009-09-28 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to 4.6.3. Updated SOURCE_URL
* PRE_BUILD: Removed. Fixed Upstream
diff --git a/xorg-driver/xf86-input-keyboard/HISTORY
b/xorg-driver/xf86-input-keyboard/HISTORY
index 98eff18..385261b 100644
--- a/xorg-driver/xf86-input-keyboard/HISTORY
+++ b/xorg-driver/xf86-input-keyboard/HISTORY
@@ -1,9 +1,6 @@
2009-10-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.0
-2009-09-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.3.99.1
-
2009-01-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.3.2
diff --git a/xorg-driver/xf86-input-mouse/HISTORY
b/xorg-driver/xf86-input-mouse/HISTORY
index 9aed781..f39fb0c 100644
--- a/xorg-driver/xf86-input-mouse/HISTORY
+++ b/xorg-driver/xf86-input-mouse/HISTORY
@@ -1,9 +1,6 @@
2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.0
-2009-09-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.4.99.1
-
2009-01-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.4.0
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (8dbc9436e7e748a14626bd2367602f121f051f27),
Eric Sandall, 10/08/2009