Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (afc4c23f22cd564134ddd9534f296b78bf1fd0d1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (afc4c23f22cd564134ddd9534f296b78bf1fd0d1)
  • Date: Sun, 15 Jan 2012 14:31:49 -0600

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

doc/po4a/DEPENDS | 1 +
doc/po4a/HISTORY | 3 +++
ftp/ncftp/DETAILS | 2 +-
ftp/ncftp/HISTORY | 3 +++
gnome2-libs/gtk-engines2/DEPENDS | 9 ++++++++-
gnome2-libs/gtk-engines2/HISTORY | 8 ++++++++
gnome2-libs/gtk-engines2/INSTALL | 2 ++
gnome2-libs/gtk-engines2/PRE_BUILD | 3 +++
gnome2-libs/gtk-engines2/animation.c.patch | 11 +++++++++++
gnome2-libs/libcanberra/DEPENDS | 6 ++++++
gnome2-libs/libcanberra/HISTORY | 4 ++++
gnome2-libs/libcanberra/PRE_SUB_DEPENDS | 1 +
gnome2-libs/libcanberra/SUB_DEPENDS | 3 +++
kde4-support/phonon-backend-gstreamer/HISTORY | 4 ++++
kde4-support/phonon-backend-gstreamer/PRE_BUILD | 3 +++
kde4-support/phonon-backend-gstreamer/message.h.patch | 11 +++++++++++
net/ipset/DETAILS | 4 ++--
net/ipset/HISTORY | 3 +++
perl-cpan/dbd-odbc/DETAILS | 4 ++--
perl-cpan/dbd-odbc/HISTORY | 3 +++
utils/convmv/DEPENDS | 2 +-
utils/convmv/HISTORY | 3 +++
utils/notification-daemon/DEPENDS | 3 ++-
utils/notification-daemon/HISTORY | 3 +++
24 files changed, 91 insertions(+), 8 deletions(-)

New commits:
commit b6ad334c2fdd26baa2dac1af492d7e650f0374bf
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ipset: => 6.11

commit 48602c2eb72c7a596dd670305ff1f9769308b59a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

doc/po4a: added dependency on podlators

commit 9a4ee868a217f68b7aa81f65e870b1e24390d368
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kde4-support/phonon-backend-gstreamer: fixed compile error with current
versions of glib2

commit c97d556e9743647e17ee40c3613eecb4a80118ca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/notification-daemon: added dependency on libcanberra

commit 8e1ead394458c882240f16144d939d6c6b7fd5ae
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnome2-libs/libcanberra: added optional dependency on gtk+3

commit 5e6a6129448ae41f61059b51e71fc529749c4b0d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnome2-libs/gtk-engines2: added symlink for compatibility with older
versions

commit 3b5641108b68c00f19775c3d7b93c9b515e1dd1e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnome2-libs/gtk-engines2: fixed compile error

commit 58068bad404803f338458d5b0e4f940bd2e9c319
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnome2-libs/gtk-engines2: corrected dependencies

commit 9df579f02d3057e8f7c055cb2a46be5ff77fa272
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

perl-cpan/dbd-odbc: version 1.33

commit 6d051623d87de4601291e6f6f36d110c5a7dca4c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

ftp/ncftp: fixed source url

commit 5b02dc81a49ff0e0cf887f9c3ee3a5e2ab54fee3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/convmv: changed dependency from perl to podlators

diff --git a/doc/po4a/DEPENDS b/doc/po4a/DEPENDS
index 755fbfb..6d4cf1e 100755
--- a/doc/po4a/DEPENDS
+++ b/doc/po4a/DEPENDS
@@ -1,4 +1,5 @@
depends perl &&
+depends podlators &&
depends sgmlspm &&
# I really don't think they mean J. Clark's SP
depends opensp &&
diff --git a/doc/po4a/HISTORY b/doc/po4a/HISTORY
index c520811..87066dd 100644
--- a/doc/po4a/HISTORY
+++ b/doc/po4a/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on podlators
+
2010-10-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.40.1

diff --git a/ftp/ncftp/DETAILS b/ftp/ncftp/DETAILS
index 8b153dc..93389d7 100755
--- a/ftp/ncftp/DETAILS
+++ b/ftp/ncftp/DETAILS
@@ -10,7 +10,7 @@ if [[ "$NCFTP_IPV6" == "y" ]]; then

SOURCE_HASH=sha512:7fad4b2234e4f4506c5129cfccba1b4d89172b40e5d611c16d11722a3c1a602b0644ad11784eab2ad412aca245c23dfd471f344ece954b791d7ce9d9404ecfc7
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/$SOURCE
+ SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/older_versions/${SOURCE}
VERSION2=20080821
SOURCE2=$SPELL-$(echo $VERSION | sed -e
's/\.//g')-v6-$VERSION2.diff.gz
SOURCE2_URL[0]=ftp://ftp.kame.net/pub/kame/misc/$SOURCE2
diff --git a/ftp/ncftp/HISTORY b/ftp/ncftp/HISTORY
index 25e4a77..702311e 100644
--- a/ftp/ncftp/HISTORY
+++ b/ftp/ncftp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fixe source url
+
2011-02-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: SOURCE_HASH updated, sources changed upstream, #15942

diff --git a/gnome2-libs/gtk-engines2/DEPENDS
b/gnome2-libs/gtk-engines2/DEPENDS
index edffa0e..b49148d 100755
--- a/gnome2-libs/gtk-engines2/DEPENDS
+++ b/gnome2-libs/gtk-engines2/DEPENDS
@@ -1 +1,8 @@
-depends gtk+2
+depends gtk+3 &&
+depends atk &&
+depends pango &&
+depends gdk-pixbuf2 &&
+depends cairo &&
+depends freetype2 &&
+depends fontconfig &&
+depends glib2
diff --git a/gnome2-libs/gtk-engines2/HISTORY
b/gnome2-libs/gtk-engines2/HISTORY
index 5274c27..b79589a 100644
--- a/gnome2-libs/gtk-engines2/HISTORY
+++ b/gnome2-libs/gtk-engines2/HISTORY
@@ -1,3 +1,11 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: changed dependency on gtk+2 to gtk+3, added missing
+ dependencies on atk, pango, gdk-pixbuf2, cairo, freetype2,
+ fontconfig and glib2.
+ * PRE_BUILD, animation.c.patch: fixed compile error
+ * INSTALL: added symlink to gtk-engines-3.pc to fix packages which
+ expect gtk-engines-2.pc
+
2011-04-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.91.1

diff --git a/gnome2-libs/gtk-engines2/INSTALL
b/gnome2-libs/gtk-engines2/INSTALL
new file mode 100755
index 0000000..1e802dd
--- /dev/null
+++ b/gnome2-libs/gtk-engines2/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+ln -s /usr/lib/pkgconfig/gtk-engines-3.pc
${INSTALL_ROOT}/usr/lib/pkgconfig/gtk-engines-2.pc
diff --git a/gnome2-libs/gtk-engines2/PRE_BUILD
b/gnome2-libs/gtk-engines2/PRE_BUILD
new file mode 100755
index 0000000..b7fc0e7
--- /dev/null
+++ b/gnome2-libs/gtk-engines2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/animation.c.patch
diff --git a/gnome2-libs/gtk-engines2/animation.c.patch
b/gnome2-libs/gtk-engines2/animation.c.patch
new file mode 100644
index 0000000..3cf6af1
--- /dev/null
+++ b/gnome2-libs/gtk-engines2/animation.c.patch
@@ -0,0 +1,11 @@
+--- gtk-engines-2.91.1/engines/clearlooks/src/animation.c.orig 2012-01-15
14:42:22.742666206 +0100
++++ gtk-engines-2.91.1/engines/clearlooks/src/animation.c 2012-01-15
14:42:47.796339351 +0100
+@@ -28,7 +28,7 @@
+ #include "animation.h"
+
+ #ifdef HAVE_WORKING_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+
+ struct _AnimationInfo {
+ GTimer *timer;
diff --git a/gnome2-libs/libcanberra/DEPENDS b/gnome2-libs/libcanberra/DEPENDS
index 20c7478..8e8ae79 100755
--- a/gnome2-libs/libcanberra/DEPENDS
+++ b/gnome2-libs/libcanberra/DEPENDS
@@ -20,6 +20,12 @@ optional_depends gtk+2 \
"--disable-gtk" \
"Enable GTK+ support?" &&

+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "Enable GTK+3 support?" &&
+
+
optional_depends tdb \
"--enable-tdb" \
"--disable-tdb" \
diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY
index b52bfc8..b545a57 100644
--- a/gnome2-libs/libcanberra/HISTORY
+++ b/gnome2-libs/libcanberra/HISTORY
@@ -1,3 +1,7 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added optional dependency on gtk+3
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: added sub dependency on gtk+3
+
2011-04-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.28

diff --git a/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
index 91ac720..c0ea5d4 100755
--- a/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
+++ b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
GTK) is_depends_enabled $SPELL gtk+2 && return 0;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && 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
index e80d179..9fd85cb 100755
--- a/gnome2-libs/libcanberra/SUB_DEPENDS
+++ b/gnome2-libs/libcanberra/SUB_DEPENDS
@@ -3,5 +3,8 @@ case $THIS_SUB_DEPENDS in
GTK) echo "GTK support requested, forcing gtk+2 dependency." &&
depends gtk+2 '--enable-gtk'
;;
+GTK3) echo "GTK3 support requested, forcing gtk+3 dependency." &&
+ depends gtk+3 '--enable-gtk3'
+ ;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac
diff --git a/kde4-support/phonon-backend-gstreamer/HISTORY
b/kde4-support/phonon-backend-gstreamer/HISTORY
index a4e799d..ce0626f 100644
--- a/kde4-support/phonon-backend-gstreamer/HISTORY
+++ b/kde4-support/phonon-backend-gstreamer/HISTORY
@@ -1,3 +1,7 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, message.h.patch: fixed compile error with current
+ versions of glib2
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change

diff --git a/kde4-support/phonon-backend-gstreamer/PRE_BUILD
b/kde4-support/phonon-backend-gstreamer/PRE_BUILD
new file mode 100755
index 0000000..b2a0a0f
--- /dev/null
+++ b/kde4-support/phonon-backend-gstreamer/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/message.h.patch
diff --git a/kde4-support/phonon-backend-gstreamer/message.h.patch
b/kde4-support/phonon-backend-gstreamer/message.h.patch
new file mode 100644
index 0000000..a6ab7cf
--- /dev/null
+++ b/kde4-support/phonon-backend-gstreamer/message.h.patch
@@ -0,0 +1,11 @@
+--- phonon-backend-gstreamer-4.4.4/gstreamer/message.h.orig 2012-01-15
15:11:10.270718918 +0100
++++ phonon-backend-gstreamer-4.4.4/gstreamer/message.h 2012-01-15
15:11:21.532577144 +0100
+@@ -20,7 +20,7 @@
+
+ #include <QtCore/QMetaType>
+
+-#include <glib-2.0/glib/gmacros.h> // For G_*_DECLS macros primarily
++#include <glib.h> // For G_*_DECLS macros primarily
+ #include <gst/gstmessage.h>
+
+ QT_BEGIN_NAMESPACE
diff --git a/net/ipset/DETAILS b/net/ipset/DETAILS
index 45782f4..15fd03b 100755
--- a/net/ipset/DETAILS
+++ b/net/ipset/DETAILS
@@ -6,9 +6,9 @@ if is_version_less $(get_kernel_version) 2.6.35; then
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_HASH=sha512:ccac555257600b8fd2e229426514582e6f3f04000b4f2bc704d28efdae0869c1c6952ddb9a833a32e49604d16a4a9aa0a5ea847d469a31e567e84f36b76e19f2
else
- VERSION=6.9.1
+ VERSION=6.11
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:024a071613fd56577a2fd37ea6e2a961c113f3ca816077fd24b1698e4bd78a8cb3897291505ea02a9b6565b110170ba93b321b3e1a6476ce93b8d93abe3bd1ed
+
SOURCE_HASH=sha512:ac210f71c2a7a55fc71e36044b8d35174c4a423c74204ac24f056b684af03dde57a617d1f0f4f8e77336db8d716a4d50b58704038fb34073f8fa1bffa9d44210
fi
SOURCE_URL[0]=http://ipset.netfilter.org/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/ipset/HISTORY b/net/ipset/HISTORY
index 3630102..f45283a 100644
--- a/net/ipset/HISTORY
+++ b/net/ipset/HISTORY
@@ -1,2 +1,5 @@
+2012-01-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6.11
+
2011-09-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, {PRE_}BUILD, INSTALL: spell created
diff --git a/perl-cpan/dbd-odbc/DETAILS b/perl-cpan/dbd-odbc/DETAILS
index 276875a..bcefda3 100755
--- a/perl-cpan/dbd-odbc/DETAILS
+++ b/perl-cpan/dbd-odbc/DETAILS
@@ -1,8 +1,8 @@
SPELL=dbd-odbc
- VERSION=1.24
+ VERSION=1.33
SOURCE="DBD-ODBC-${VERSION}.tar.gz"
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MJ/MJEVANS/${SOURCE}
-
SOURCE_HASH=sha512:900ee360e0b4d24afadd467039ed3f8c200630ad5dc5260c5b0991bfa612cff9b1d9fe721b28a48e5406de528c1b9e79d61d28a0bef448d4d1291de619a26352
+
SOURCE_HASH=sha512:d5fb494adc2de526a28cd8d860821cd1a551eac05cd2fb6d1b682d266ad77bcf82791c575d687bef1ddffad6ef30d73b089542d2ead34b133309aef972acdcd0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/DBD-ODBC-${VERSION}"
WEB_SITE="http://search.cpan.org/~mjevans/DBD-ODBC/";
LICENSE[0]=GPL
diff --git a/perl-cpan/dbd-odbc/HISTORY b/perl-cpan/dbd-odbc/HISTORY
index c6dd56f..290afc2 100644
--- a/perl-cpan/dbd-odbc/HISTORY
+++ b/perl-cpan/dbd-odbc/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.33
+
2010-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.24

diff --git a/utils/convmv/DEPENDS b/utils/convmv/DEPENDS
index 6826bc7..3e1a548 100755
--- a/utils/convmv/DEPENDS
+++ b/utils/convmv/DEPENDS
@@ -1 +1 @@
-depends perl
+depends podlators
diff --git a/utils/convmv/HISTORY b/utils/convmv/HISTORY
index bdae4d0..653e2d1 100644
--- a/utils/convmv/HISTORY
+++ b/utils/convmv/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: changed dependency from perl to podlators
+
2009-04-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: updated to 1.14

diff --git a/utils/notification-daemon/DEPENDS
b/utils/notification-daemon/DEPENDS
index c97d4bb..712ab08 100755
--- a/utils/notification-daemon/DEPENDS
+++ b/utils/notification-daemon/DEPENDS
@@ -1,4 +1,5 @@
-depends gtk+2 &&
+depends gtk+3 &&
+depends -sub GTK3 libcanberra &&
depends dbus-glib &&
depends libsexy &&
depends gconf2 &&
diff --git a/utils/notification-daemon/HISTORY
b/utils/notification-daemon/HISTORY
index b3b5569..b8e1050 100644
--- a/utils/notification-daemon/HISTORY
+++ b/utils/notification-daemon/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on libcanberra with activated gtk+3
+
2011-10-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.3




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (afc4c23f22cd564134ddd9534f296b78bf1fd0d1), Vlad Glagolev, 01/15/2012

Archive powered by MHonArc 2.6.24.

Top of Page