Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.29 grimoire by Arwed von Merkatz (262633ee4d3d74a7a5334e51e48a9bcfde58c32c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.29 grimoire by Arwed von Merkatz (262633ee4d3d74a7a5334e51e48a9bcfde58c32c)
  • Date: Tue, 13 Jan 2009 13:00:13 -0600

GIT changes to stable-rc-0.29 grimoire by Arwed von Merkatz
<v.merkatz AT gmx.net>:

audio-players/rhythmbox/HISTORY | 4 +
audio-players/rhythmbox/PRE_BUILD | 3 +
audio-players/rhythmbox/rhythmbox-0.11.5-libmtp-0.3.0-API.patch | 11 ++++
chat-libs/ptlib/CONFLICTS | 1
chat-libs/ptlib/HISTORY | 3 +
chat-libs/pwlib/CONFLICTS | 1
chat-libs/pwlib/HISTORY | 3 +
crypto/openssh/DEPENDS | 5 --
crypto/openssh/HISTORY | 6 ++
crypto/openssl/DETAILS | 4 -
crypto/openssl/HISTORY | 4 +
gnome2-apps/drivel/DEPENDS | 1
gnome2-apps/drivel/DETAILS | 4 -
gnome2-apps/drivel/HISTORY | 4 +
graphics-libs/gegl/HISTORY | 5 ++
graphics-libs/gegl/PRE_BUILD | 6 --
graphics-libs/gegl/gegl-libavformat.patch | 22
--------
kde-core/kdeedu/DEPENDS | 3 +
kde-core/kdeedu/HISTORY | 3 +
libs/glibc/HISTORY | 4 +
libs/glibc/PRE_BUILD | 1
libs/glibc/bug-15014.patch | 13 +++++
net/net-tools/HISTORY | 4 +
net/net-tools/PRE_BUILD | 3 -
net/net-tools/net-tool-NULL-error.patch | 25
++++++++++
python-pypi/sqlobject/DEPENDS | 8 +++
python-pypi/sqlobject/HISTORY | 1
shell-term-fm/busybox/CONFIGURE | 2
shell-term-fm/busybox/HISTORY | 3 -
x11-libs/fontconfig/DEPENDS | 6 ++
x11-libs/fontconfig/HISTORY | 3 +
xfce/xfce4-xkb-plugin/DEPENDS | 4 +
xfce/xfce4-xkb-plugin/HISTORY | 3 +
33 files changed, 131 insertions(+), 42 deletions(-)

New commits:
commit 262633ee4d3d74a7a5334e51e48a9bcfde58c32c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xfce4-xkb-plugin: Added depends libxklavier and
libwnck. Bug #15023
(cherry picked from commit b3640f33a3b9a462046217619d2b28f3e03cf73d)

commit defbe41fda0a9efb8011c2101beda409af594519
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

rhythmbox #15022 (added patch due to libmtp)
(cherry picked from commit fcc0c6242fba62eefe270742608ccd0d32e70acd)

commit df780c0a124dd9a27451b3d86a8a16a4e966bfa3
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

glibc: fix linking, bug 15014
(cherry picked from commit 6f9d78f89027d4d60d1dcf63b4a5b77eb34caeec)

commit c8041f797cdef1ccf53b395fafc924b7f3a6dedc
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

openssh: Changed optional_depends XORG-SERVER to
xauth. This seems to be all it needs for X11-FORWARDING
(cherry picked from commit 880b31b6ad7c2e0e013844d5a994c516dbda5088)

commit 4e3b12447cf49174aa0bfcb98d8252174a0aae7c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

openssh: Removed depends xauth. It isn't needed unless
xorg-server is selcted and comes with that.
Bug #15010
(cherry picked from commit c10c2bc1ed74d53f9a0a137ae113efed7b71afd2)

commit 8bcfc7fff413e5885af21ee43d1c4ed770500a0e
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

net-tools: Added patch to fix compile error.
Bug #15009.
(cherry picked from commit 3db23f29dd7229f3df9549beef597a562a557da5)

commit 92aa698b0cf98171c7e2a1a243de3827b521a8ee
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gegl: Removed patch and PRE_BUILD. Not needed for ffmpeg-svn
with version update. Bug 15004.
(cherry picked from commit c7d818d28cdb5a97488e95667f9d50fe493e2c16)

commit 2c80608a2cd32d3fe7f08c834761278a83ec6950
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

drivel: Updated to version 2.0.3 Added depends gtksourceview1.
Fixes bug #15003
(cherry picked from commit 5a37c1b90490df552d42400def8ed55c76ded8dd)

commit 868c75eef28522cc11bf2c383eee73e8aa7c932b
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ptlib: Added conflicts pwlib. Bug 15002
(cherry picked from commit f560460c370ef1b027aa1c54ff80e12d36dbc072)

commit 51510e5a5cbc10705f49ca3b69af8b34ba6f25bb
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

pwlib: Added conflicts ptlib. Bug 15002
(cherry picked from commit 0da9646efe9f094fcf28ea4cec0a63d080fa5635)

commit fa4a68e7529898a922ce918da337b8418aa0633b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

sqlobject: needs a recent setuptools
(cherry picked from commit bb6bd26c0b75feb1d5e11ee1312dccb48605b6d7)

commit 67e3370d30c0558c4b24971e599a4c2e69fa611c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

fontconfig: added TEXT_TO_HTML if docbook was selected #14715
doesn't care if docbook itself is using it or not (no subdep)
(cherry picked from commit cd15e7db1886f3d547ff826f6b38c7984f41699c)

commit e0f99abec7b0f566b8bcf330b186ea782cdcc663
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

openssl: added link to security advisory
(cherry picked from commit 6d150036b0b6792d7cbc006261c842f2f7e91a77)

commit 8222624797c698059a53d57a81fa43ba0c447b44
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

openssl 0.9.8j, SECURITY_PATCH=4
(cherry picked from commit 15984f55191d96ba3ef25eb7c2a0d46a15c1aecf)

commit d54b38f777d4852765932908183c899896be73c6
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

kdeedu: needs also boost::python for kig scripting #13181
(cherry picked from commit d49c9c6d8f9f8f1eded9bcd63cea5482f4597904)

commit 049b3a648092fa2dcd05e5e38ded8f509762597a
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

Revert "busybox: use persistent_add instead of export" Bug #14965

This reverts commit ac24cb8a4c3076271dfcef1c441d0d978e6532e6.
(cherry picked from commit 5d9c73106178749c852546d7942d83b6f83e1e46)

diff --git a/audio-players/rhythmbox/HISTORY b/audio-players/rhythmbox/HISTORY
index ef277b8..4ea2f42 100644
--- a/audio-players/rhythmbox/HISTORY
+++ b/audio-players/rhythmbox/HISTORY
@@ -1,3 +1,7 @@
+2009-01-12 Ladislav Hagara <hgr AT vabo.cz>
+ * PRE_BUILD, rhythmbox-0.11.5-libmtp-0.3.0-API.patch: patch from
gentoo
+ #15022
+
2008-07-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.11.6

diff --git a/audio-players/rhythmbox/PRE_BUILD
b/audio-players/rhythmbox/PRE_BUILD
new file mode 100755
index 0000000..9858294
--- /dev/null
+++ b/audio-players/rhythmbox/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/rhythmbox-0.11.5-libmtp-0.3.0-API.patch
diff --git a/audio-players/rhythmbox/rhythmbox-0.11.5-libmtp-0.3.0-API.patch
b/audio-players/rhythmbox/rhythmbox-0.11.5-libmtp-0.3.0-API.patch
new file mode 100644
index 0000000..523c9c2
--- /dev/null
+++ b/audio-players/rhythmbox/rhythmbox-0.11.5-libmtp-0.3.0-API.patch
@@ -0,0 +1,11 @@
+--- plugins/mtpdevice/rb-mtp-source.c
++++ plugins/mtpdevice/rb-mtp-source.c
+@@ -681,7 +681,7 @@
+ trackmeta->filetype = mimetype_to_filetype (mimetype);
+ }
+
+- if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL,
NULL, 0) != 0) {
++ if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL,
NULL) != 0) {
+ LIBMTP_destroy_track_t (trackmeta);
+ rb_debug ("Tracktransfer failed\n");
+ return NULL;
diff --git a/chat-libs/ptlib/CONFLICTS b/chat-libs/ptlib/CONFLICTS
new file mode 100755
index 0000000..4dee3ad
--- /dev/null
+++ b/chat-libs/ptlib/CONFLICTS
@@ -0,0 +1 @@
+conflicts pwlib
diff --git a/chat-libs/ptlib/HISTORY b/chat-libs/ptlib/HISTORY
index a1ca252..96fc350 100644
--- a/chat-libs/ptlib/HISTORY
+++ b/chat-libs/ptlib/HISTORY
@@ -1,3 +1,6 @@
+2009-01-03 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFLICTS: Added conflicts pwlib. Bug 15002.
+
2008-11-39 George Sherwood <gsherwood AT sourcemage.org>
* BUILD: Added --disable-odbc to fix Bug #14924

diff --git a/chat-libs/pwlib/CONFLICTS b/chat-libs/pwlib/CONFLICTS
new file mode 100755
index 0000000..4366174
--- /dev/null
+++ b/chat-libs/pwlib/CONFLICTS
@@ -0,0 +1 @@
+conflicts ptlib
diff --git a/chat-libs/pwlib/HISTORY b/chat-libs/pwlib/HISTORY
index 476b836..49ce7cc 100644
--- a/chat-libs/pwlib/HISTORY
+++ b/chat-libs/pwlib/HISTORY
@@ -1,3 +1,6 @@
+2008-01-03 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFLICTS: Added conflicts ptlib. Bug #15002
+
2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: fix plugins/configure.in to not fail if alsa is disabled,
bug #14029
diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index 0b084ba..d2c0318 100755
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -3,7 +3,6 @@ depends gnupg &&
depends openssl &&
depends smgl-fhs &&
depends zlib &&
-depends xauth --with-xauth="${INSTALL_ROOT}/usr/bin/xauth"

optional_depends "tcp_wrappers" \
"--with-tcp-wrappers" \
@@ -20,7 +19,7 @@ optional_depends "krb5" \
"" \
"to enable Kerberos 5 support" &&

-optional_depends "X11-SERVER" \
- "" \
+optional_depends "xauth" \
+ "--with-xauth="${INSTALL_ROOT}/usr/bin/xauth"" \
"" \
"X server auth (needed by X11Forwarding)"
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 286bd88..c7f3329 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,9 @@
+2009-01-07 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: Change optional_depends XORG_SERVER to xauth
+
+2009-01-06 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: Removed depends xauth. Bug #15010
+
2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: remove check_if_xorg_modular* reference #14708

diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 8a2864e..cf5515a 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,5 +1,5 @@
SPELL=openssl
- VERSION=0.9.8i
+ VERSION=0.9.8j
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
SOURCE_URL[1]=ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/$SOURCE
@@ -17,7 +17,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.openssl.org/
ENTERED=20010922
- SECURITY_PATCH=3
+ SECURITY_PATCH=4

LICENSE[0]=http://www.cgicentral.net/400CS/Docs/openssl/LICENSE.openssl.html
KEYWORDS="crypto"
SHORT="library for providing encrypted transport layers"
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 0102bef..68c0f89 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2009-01-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8j, SECURITY_PATCH=4
+ * http://www.openssl.org/news/secadv_20090107.txt
+
2008-09-15 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: Use GPG signatures to check sources instead of sha512 hash

diff --git a/gnome2-apps/drivel/DEPENDS b/gnome2-apps/drivel/DEPENDS
index 590e0de..3bfd542 100755
--- a/gnome2-apps/drivel/DEPENDS
+++ b/gnome2-apps/drivel/DEPENDS
@@ -1,6 +1,7 @@
depends libgnomeui &&
depends curl &&
depends desktop-file-utils &&
+depends gtksourceview1 &&

optional_depends gtkspell \
"--with-gtkspell" \
diff --git a/gnome2-apps/drivel/DETAILS b/gnome2-apps/drivel/DETAILS
index a67ca8b..2e60989 100755
--- a/gnome2-apps/drivel/DETAILS
+++ b/gnome2-apps/drivel/DETAILS
@@ -1,9 +1,9 @@
SPELL=drivel
- VERSION=2.0.2
+ VERSION=2.0.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a65869e7cf2bc9b495daeffd61da9395ce827324d314c219de4110f3f94a5012929cca215b5c03419366cbf64344fdbaaaaf9da13ecb4536b087b0c95a10ebdb
+
SOURCE_HASH=sha512:d5652bafa814146c7156c8e8a78187f736837448dd9458b52eb9584c94f79827e915b1e45c4666cb210b8a38f394c5dde81a63eb07059d74dd98ff7fe75e51c7
PATCHLEVEL=1
LICENSE[0]="GPL"
WEB_SITE=http://www.dropline.net/drivel/
diff --git a/gnome2-apps/drivel/HISTORY b/gnome2-apps/drivel/HISTORY
index 394c091..2fb51c6 100644
--- a/gnome2-apps/drivel/HISTORY
+++ b/gnome2-apps/drivel/HISTORY
@@ -1,3 +1,7 @@
+2009-01-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 2.0.3
+ * DEPENDS: Added depends gtksourceview1. Bug #15003
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/graphics-libs/gegl/HISTORY b/graphics-libs/gegl/HISTORY
index a195bf3..ac31d3d 100644
--- a/graphics-libs/gegl/HISTORY
+++ b/graphics-libs/gegl/HISTORY
@@ -1,3 +1,8 @@
+2009-01-05 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Removed.
+ * gegl-libavformat.patch: Removed builds against ffmpeg-svn now.
+ Bug #15004
+
2009-01-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.0.22; fixed desc, website; cleaned up
* PRE_BUILD: cleaned up
diff --git a/graphics-libs/gegl/PRE_BUILD b/graphics-libs/gegl/PRE_BUILD
deleted file mode 100755
index aadca94..0000000
--- a/graphics-libs/gegl/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ "$(get_spell_provider $SPELL LIBAVCODEC)" == "ffmpeg-svn" ]]; then
- patch -p0 < "$SPELL_DIRECTORY/gegl-libavformat.patch"
-fi
diff --git a/graphics-libs/gegl/gegl-libavformat.patch
b/graphics-libs/gegl/gegl-libavformat.patch
deleted file mode 100644
index eefa8d8..0000000
--- a/graphics-libs/gegl/gegl-libavformat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru operations/external/ff-load.c operations/external/ff-load.c
---- operations/external/ff-load.c 2008-02-27 16:29:51.000000000 +0100
-+++ /operations/external/ff-load.c 2008-04-26 09:14:26.000000000 +0200
-@@ -27,7 +27,7 @@
-
- #include "gegl-chant.h"
- #include <errno.h>
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
-
- typedef struct
- {
-@@ -278,7 +278,7 @@
- p->enc = p->video_st->codec;
- p->codec = avcodec_find_decoder (p->enc->codec_id);
-
-- p->enc->error_resilience = 2;
-+/* p->enc->error_resilience = 2; */
- p->enc->error_concealment = 3;
- p->enc->workaround_bugs = FF_BUG_AUTODETECT;
-
-
diff --git a/kde-core/kdeedu/DEPENDS b/kde-core/kdeedu/DEPENDS
index 19c1ebc..186db4d 100755
--- a/kde-core/kdeedu/DEPENDS
+++ b/kde-core/kdeedu/DEPENDS
@@ -7,6 +7,9 @@ optional_depends python \
'--enable-kig-python-scripting' \
'--disable-kig-python-scripting' \
'for Kig Python Scripting support ' &&
+if is_depends_enabled $SPELL python; then
+ depends -sub PYTHON boost
+fi &&

optional_depends fontconfig \
'' \
diff --git a/kde-core/kdeedu/HISTORY b/kde-core/kdeedu/HISTORY
index f406dad..217a26c 100644
--- a/kde-core/kdeedu/HISTORY
+++ b/kde-core/kdeedu/HISTORY
@@ -1,3 +1,6 @@
+2009-01-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: needs also boost::python for kig scripting #13181
+
2008-08-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.10

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 43d8852..b5b1d1d 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2009-01-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, bug-15014.patch: patch for link failure on i486 and i686,
+ bug #15014
+
2008-11-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS, PRE_BUILD: remove libidn related stuff. now in normal
tarbal
* BUILD: fix ia32 usage
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 1c7fa4e..7726aa5 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -58,6 +58,7 @@ fi &&
cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/bug-15014.patch &&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
diff --git a/libs/glibc/bug-15014.patch b/libs/glibc/bug-15014.patch
new file mode 100644
index 0000000..be0bf04
--- /dev/null
+++ b/libs/glibc/bug-15014.patch
@@ -0,0 +1,13 @@
+--- libc-HEAD/sysdeps/i386/dl-tlsdesc.S.org 2008-11-17 18:17:04.004203199
+0100
++++ libc-HEAD/sysdeps/i386/dl-tlsdesc.S 2008-11-17 18:18:28.029877701
+0100
+@@ -128,8 +128,7 @@
+ .Lslow:
+ cfi_adjust_cfa_offset (28)
+ movl %ebx, 16(%esp)
+- call __i686.get_pc_thunk.bx
+- addl $_GLOBAL_OFFSET_TABLE_, %ebx
++ LOAD_PIC_REG(bx)
+ call ___tls_get_addr@PLT
+ movl 16(%esp), %ebx
+ jmp .Lret
+
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index 2c94fbe..cfc3130 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,7 @@
+2009-01-06 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added patch build error. Bug #15009
+ * net-tool-NULL-error.patch: gentoo patch for gcc 4.3.x build error
+
2008-02-03 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: netconf is useless

diff --git a/net/net-tools/PRE_BUILD b/net/net-tools/PRE_BUILD
index 3733546..25fa4ee 100755
--- a/net/net-tools/PRE_BUILD
+++ b/net/net-tools/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/kernel-headers.patch
+patch -p0 < $SPELL_DIRECTORY/kernel-headers.patch &&
+patch -p0 < $SPELL_DIRECTORY/net-tool-NULL-error.patch
diff --git a/net/net-tools/net-tool-NULL-error.patch
b/net/net-tools/net-tool-NULL-error.patch
new file mode 100644
index 0000000..998c5dc
--- /dev/null
+++ b/net/net-tools/net-tool-NULL-error.patch
@@ -0,0 +1,25 @@
+From 0ee63912133943e0837b90e46bec274761d46598 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT gentoo.org>
+Date: Mon, 9 Jun 2008 01:23:59 -0400
+Subject: [PATCH] Pull in stdlib.h for NULL definition to fix #225425
+
+Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
+---
+ lib/ec_hw.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/ec_hw.c b/lib/ec_hw.c
+index 825e501..558f26f 100644
+--- lib/ec_hw.c
++++ lib/ec_hw.c
+@@ -16,6 +16,7 @@
+
+ #if HAVE_HWEC
+
++#include <stdlib.h>
+ #include <net/if_arp.h>
+ #include "net-support.h"
+
+--
+1.5.5.3
+
diff --git a/python-pypi/sqlobject/DEPENDS b/python-pypi/sqlobject/DEPENDS
index 5d70c81..074c9c4 100755
--- a/python-pypi/sqlobject/DEPENDS
+++ b/python-pypi/sqlobject/DEPENDS
@@ -7,4 +7,12 @@ suggest_depends pygresql "Postgresql support" &&
suggest_depends pysqlite "sqlite support" &&
if is_depends_enabled $SPELL kinterbasdb;then
depends egenix-mx-base
+fi &&
+
+# needs a recent setuptools or it will try to get it itself #15001
+if spell_ok setuptools; then
+ local st=$(installed_version setuptools) &&
+ if [[ ${st:0:4} == 0.6c ]] && (( ${st:4:2} < 9 )); then
+ force_depends setuptools
+ fi
fi
diff --git a/python-pypi/sqlobject/HISTORY b/python-pypi/sqlobject/HISTORY
index 0edf8ac..c4b2b0a 100644
--- a/python-pypi/sqlobject/HISTORY
+++ b/python-pypi/sqlobject/HISTORY
@@ -1,5 +1,6 @@
2009-01-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added missing setuptools #15001
+ needs a recent setuptools

2008-12-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.10.4
diff --git a/shell-term-fm/busybox/CONFIGURE b/shell-term-fm/busybox/CONFIGURE
index 82021c8..64e1bd1 100755
--- a/shell-term-fm/busybox/CONFIGURE
+++ b/shell-term-fm/busybox/CONFIGURE
@@ -5,4 +5,4 @@ config_query BB_RESCUE "Enable building of /sbin/bb rescue
shell?" n &&
if [ "$BB_RESET" = "y" ] && [ $RECONFIGURE ] ; then
rm -f ${CONFIG_CACHE}/${SPELL}.config
fi
-persistent_add RECONFIGURE
+export RECONFIGURE
diff --git a/shell-term-fm/busybox/HISTORY b/shell-term-fm/busybox/HISTORY
index 0319eba..782393f 100644
--- a/shell-term-fm/busybox/HISTORY
+++ b/shell-term-fm/busybox/HISTORY
@@ -1,6 +1,3 @@
-2008-03-11 Ismael Luceno <ismael AT sourcemage.org>
- * CONFIGURE: use persistent_add instead of export
-
2008-01-17 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.8.2
* applets.patch: added to remove warning
diff --git a/x11-libs/fontconfig/DEPENDS b/x11-libs/fontconfig/DEPENDS
index cf3e1aa..ee12e3b 100755
--- a/x11-libs/fontconfig/DEPENDS
+++ b/x11-libs/fontconfig/DEPENDS
@@ -7,4 +7,8 @@ depends expat &&
optional_depends docbook-utils \
"--enable-docs" \
"--disable-docs" \
- "Create documentation"
+ "Create documentation" &&
+
+if is_depends_enabled $SPELL docbook-utils; then
+ depends HTML_TO_TEXT
+fi
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index 8dfa765..a4d9747 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,6 @@
+2009-01-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added TEXT_TO_HTML if docbook was selected #14715
+
2008-07-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.6.0
* BUILD: multijob OK
diff --git a/xfce/xfce4-xkb-plugin/DEPENDS b/xfce/xfce4-xkb-plugin/DEPENDS
index 198ef65..717a66d 100755
--- a/xfce/xfce4-xkb-plugin/DEPENDS
+++ b/xfce/xfce4-xkb-plugin/DEPENDS
@@ -1 +1,3 @@
-depends xfce4-panel
+depends xfce4-panel &&
+depends libxklavier &&
+depends libwnck
diff --git a/xfce/xfce4-xkb-plugin/HISTORY b/xfce/xfce4-xkb-plugin/HISTORY
index b8f57c7..a3937d8 100644
--- a/xfce/xfce4-xkb-plugin/HISTORY
+++ b/xfce/xfce4-xkb-plugin/HISTORY
@@ -1,3 +1,6 @@
+2009-01-12 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS depends libxklavier, libwnck. Bug #15023
+
2009-01-02 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.5.2. Updated $SOURCE
Bug #14993



  • [SM-Commit] GIT changes to stable-rc-0.29 grimoire by Arwed von Merkatz (262633ee4d3d74a7a5334e51e48a9bcfde58c32c), Arwed von Merkatz, 01/13/2009

Archive powered by MHonArc 2.6.24.

Top of Page