sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b729dfef8f5d77661f5029bf1437e0f14da21dea)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b729dfef8f5d77661f5029bf1437e0f14da21dea)
- Date: Tue, 8 Jan 2013 06:47:01 -0600
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
cluster/drbd/DETAILS | 20 ++++--
cluster/drbd/HISTORY | 3
dev/null |binary
gnome2-libs/pango/BUILD | 4 -
gnome2-libs/pango/CONFIGURE | 6 +
gnome2-libs/pango/DEPENDS | 17 ++---
gnome2-libs/pango/DETAILS | 3
gnome2-libs/pango/HISTORY | 6 +
gnome2-libs/pango/PRE_SUB_DEPENDS | 2
gnome2-libs/pango/SUB_DEPENDS | 6 -
gnome2-libs/pango/pango-1.32.4.tar.xz.sig | 0
gnome2-libs/pango/pango-1.32.5.tar.xz.sig |binary
graphics-libs/harfbuzz/DEPENDS | 10 +--
graphics-libs/harfbuzz/DETAILS | 2
graphics-libs/harfbuzz/HISTORY | 4 +
graphics-libs/harfbuzz/harfbuzz-0.9.10.tar.bz2.sig |binary
graphics-libs/harfbuzz/harfbuzz-0.9.9.tar.bz2.sig | 0
net/dhcpcd/DETAILS | 4 -
net/dhcpcd/HISTORY | 3
python-pypi/fabric/DEPENDS | 8 ++
python-pypi/fabric/DETAILS | 4 -
python-pypi/fabric/HISTORY | 4 +
python-pypi/paramiko/DETAILS | 11 +--
python-pypi/paramiko/HISTORY | 4 +
python-pypi/paramiko/paramiko.gpg | 0
python-pypi/python-ssh/DETAILS | 4 -
python-pypi/python-ssh/HISTORY | 3
windowmanagers/fluxbox/BUILD | 6 -
windowmanagers/fluxbox/CONFIGURE | 22 +-----
windowmanagers/fluxbox/DEPENDS | 6 +
windowmanagers/fluxbox/DETAILS | 2
windowmanagers/fluxbox/HISTORY | 7 --
windowmanagers/fluxbox/PRE_BUILD | 3
windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig |binary
windowmanagers/fluxbox/fluxbox-1.3.3.tar.bz2.sig | 0
windowmanagers/fluxbox/size_t.patch | 70
+++++++++++++++++++++
36 files changed, 170 insertions(+), 74 deletions(-)
New commits:
commit b729dfef8f5d77661f5029bf1437e0f14da21dea
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
drbd: added kernel 3.5-3.7 support
commit 3d2ff112af57bff74a9df6613217358d600df85c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pango: => 1.32.5
commit 60e712464e0fdceb08529d690435a7cf1158ebd7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "fluxbox: => 1.3.3"
This reverts commit 5c863583298045fbb16d5f6b25de013ace242616.
Downgrade to 1.3.2 due to upstream bug #3590078
commit 1e09c9d8a9583dcecf71359e443bf1bec493976f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "fluxbox: fixed fribidi detection, when built with glib support"
This reverts commit b758db2b5a365bddb1ed14f4df44155c81be170f.
commit 7f44a686c39653cd4e6a1029b089eb62208c016d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
dhcpcd: => 5.6.6
commit 250df6ad13eecb7ccd5789fd37a4ad559f9e1afa
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fabric: => 1.5.1
commit 9cb595a8ea9d331967db36823d47f48d95002bf7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
paramiko: => 1.9.0
commit 65684ff2678ac657f82b1bb451db07f4de28cd03
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
python-ssh: => 1.8.0
commit a31778bf126b9831b0fc5726af38a9b132148bf2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fabric: => 1.4.4
commit f61ddcfdb6ffe9d82f03e2edfba7406d9eaa7f2b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
harfbuzz: => 0.9.10
diff --git a/cluster/drbd/DETAILS b/cluster/drbd/DETAILS
index d808134..1c5c9d1 100755
--- a/cluster/drbd/DETAILS
+++ b/cluster/drbd/DETAILS
@@ -6,18 +6,30 @@ local KERNEL_BRANCH=`get_kernel_version|cut -d . -f -3` &&
if [[ $KERNEL_BRANCH == 2.6.33 ]] || [[ $KERNEL_BRANCH == 2.6.34 ]]; then
VERSION=8.3.7
SOURCE_HASH=sha512:9ea576ed6a75d80009ade0f9540535b2a65ecee6d38b1a85fa3146a97aac8cb3add31154e2921630aa75121c7115d66bdcf45adb8e0fa481bdb27c011b1c9b15
+elif [[ $KERNEL_BRANCH == 2.6.35 ]] || [[ $KERNEL_BRANCH == 2.6.36 ]]; then
+ VERSION=8.3.8.1
+
SOURCE_HASH=sha512:c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f
elif [[ $KERNEL_BRANCH == 2.6.37 ]] || [[ $KERNEL_BRANCH == 2.6.38 ]]; then
VERSION=8.3.9
SOURCE_HASH=sha512:7d6545b3298f2af7cc6ba91a501a15f3232cb914619deae4ff5b09b14d59375015878c8794464cedee298b1209cee60a6bd16cca436471b20c0641cc2a6f2745
elif [[ $KERNEL_BRANCH == 2.6.39 ]]; then
VERSION=8.3.10
SOURCE_HASH=sha512:8d904ada9c80732b47cbf149cf4172658d350856d8688f1dce92c16ce1c4e946a0b3b3a14bb3c9361684fc08b257207c58beaa2fdb534f2abf47ac45aa659389
-elif [[ ${KERNEL_BRANCH%%.*} == 3 ]]; then
+else
+ case ${KERNEL_BRANCH%.*} in
+ 3.[01234])
VERSION=8.3.11
SOURCE_HASH=sha512:2bbf16d69e897adcb247d451f1d844993bdb3ad201027a588f9a45b4fe43fa2f6e98ed6063e8dccc92b9a231ccebf0af85a8671e5672fa710aa986e555ae896d
-else
- VERSION=8.3.8.1
-
SOURCE_HASH=sha512:c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f
+ ;;
+ 3.[567])
+ VERSION=8.3.13
+
SOURCE_HASH=sha512:fff72545ae569dad37d202bd7dcb075e443964e4d2e95ae124bbcac098762bee78f91e4863b56abfca2bdce2baa42bb3fdbdf9bb489f498d84aa679fa43ae702
+ ;;
+ *)
+ message "${PROBLEM_COLOR}ERROR: kernel version $KERNEL_BRANCH not
supported.${MESSAGE_COLOR}" &&
+ return 1
+ ;;
+ esac
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.gz
diff --git a/cluster/drbd/HISTORY b/cluster/drbd/HISTORY
index 583f731..9c34967 100644
--- a/cluster/drbd/HISTORY
+++ b/cluster/drbd/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added kernel 3.5-3.7 support (see
drbd.org/download/mainline)
+
2012-03-31 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: pass KDIR var to build for using correct kernel sources
diff --git a/gnome2-libs/pango/BUILD b/gnome2-libs/pango/BUILD
index 1885d21..9dfab36 100755
--- a/gnome2-libs/pango/BUILD
+++ b/gnome2-libs/pango/BUILD
@@ -1,5 +1,3 @@
-if [[ "$PANGO_ARABIC" == "n" ]]; then
-
OPTS="--with-dynamic-modules=basic-fc,hangul-fc,hebrew-fc,indic-fc,khmer-fc,syriac-fc,thai-fc,tibetan-fc
$OPTS"
-fi &&
OPTS="$PANGO_OPTS $OPTS" &&
+
default_build
diff --git a/gnome2-libs/pango/CONFIGURE b/gnome2-libs/pango/CONFIGURE
index f626175..3af96ed 100755
--- a/gnome2-libs/pango/CONFIGURE
+++ b/gnome2-libs/pango/CONFIGURE
@@ -1,2 +1,4 @@
-config_query PANGO_ARABIC "Build arabic dynamic modules (can \
-cause problems with webkit browsers)?" y
+# TODO: thai-fc requires libthai (not in grimoire yet)
+config_query_option PANGO_OPTS "Build arabic dynamic modules (can cause
problems with webkit browsers)?" y \
+
"--with-dynamic-modules=basic-fc,arabic-lang,indic-lang" \
+ "--with-dynamic-modules=basic-fc"
diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index a47b489..0bbac40 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -6,15 +6,17 @@ depends fontconfig &&
depends freetype2 &&
depends glib2 &&
depends harfbuzz &&
+depends libpng &&
+depends pixman &&
-optional_depends libx11 \
- "--with-x" \
- "--without-x" \
+optional_depends libxft \
+ "--with-xft" \
+ "--without-xft" \
"for XFT and X11 support" &&
-if is_depends_enabled $SPELL libx11; then
+if is_depends_enabled $SPELL libxft; then
+ depends libx11 &&
depends libxau &&
- depends libxft &&
depends libxdmcp &&
depends libxrender &&
if spell_ok cairo && is_version_less $(installed_version cairo) 1.8; then
@@ -27,7 +29,4 @@ optional_depends gtk-doc "" "" "to build documentation with
gtk-doc" &&
optional_depends gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
- "to enable introspection" &&
-
-depends libpng &&
-depends pixman
+ "to enable introspection"
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index d5dc10d..96cd256 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,6 +1,5 @@
SPELL=pango
- VERSION=1.32.4
- PATCHLEVEL=1
+ VERSION=1.32.5
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 26bb36f..c35ba89 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,9 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.32.5
+ * BUILD, CONFIGURE: fixed arabic dynamic modules build/selection
+ * {{PRE_,}SUB_,}DEPENDS: X support is enabled via libxft and its flag,
+ not libx11
+
2012-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: removed dependencies on libxcb, libxext, expat, libffi,
pcre
diff --git a/gnome2-libs/pango/PRE_SUB_DEPENDS
b/gnome2-libs/pango/PRE_SUB_DEPENDS
index 675b761..1c09093 100755
--- a/gnome2-libs/pango/PRE_SUB_DEPENDS
+++ b/gnome2-libs/pango/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- X) is_depends_enabled $SPELL libx11;;
+ X) is_depends_enabled $SPELL libxft;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/gnome2-libs/pango/SUB_DEPENDS b/gnome2-libs/pango/SUB_DEPENDS
index c3ebf2a..94f9afc 100755
--- a/gnome2-libs/pango/SUB_DEPENDS
+++ b/gnome2-libs/pango/SUB_DEPENDS
@@ -1,8 +1,8 @@
case $THIS_SUB_DEPENDS in
- X) message "Pango with X11 support requested, forcing libx11 dependency" &&
- depends libx11 "--with-x" &&
+ X) message "Pango with XFT support requested, forcing libxft dependency" &&
+ depends libxft "--with-xft" &&
+ depends libx11 &&
depends libxau &&
- depends libxft &&
depends libxdmcp &&
depends libxrender
;;
diff --git a/gnome2-libs/pango/pango-1.32.4.tar.xz.sig
b/gnome2-libs/pango/pango-1.32.4.tar.xz.sig
deleted file mode 100644
index 26db5f5..0000000
Binary files a/gnome2-libs/pango/pango-1.32.4.tar.xz.sig and /dev/null differ
diff --git a/gnome2-libs/pango/pango-1.32.5.tar.xz.sig
b/gnome2-libs/pango/pango-1.32.5.tar.xz.sig
new file mode 100644
index 0000000..b2a073a
Binary files /dev/null and b/gnome2-libs/pango/pango-1.32.5.tar.xz.sig differ
diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index 9607fda..89c4c6b 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -1,5 +1,7 @@
depends ragel &&
-depends cairo &&
+
+optional_depends cairo "" "" \
+ "Enable tools used for command-line utilities?" &&
optional_depends icu "" "" \
"Enable icu use?" &&
@@ -10,7 +12,5 @@ optional_depends freetype2 "" "" \
optional_depends graphite2 "" "" \
"Enable graphite2 use?" &&
-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "use gtk-doc to build documentation"
+optional_depends gtk-doc "" "" \
+ "Enable gtk-doc to build documentation?"
diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index 9943ceb..73c8b75 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_URL[1]=git_http://anongit.freedesktop.org/git/harfbuzz.git:harfbuzz-git
SOURCE_IGNORE=volatile
else
- VERSION=0.9.9
+ VERSION=0.9.10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/harfbuzz/release/$SOURCE
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 4f89952..f8fe142 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,7 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.10
+ * DEPENDS: made cairo optional; removed non-existent gtk-doc flags
+
2012-12-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.9
diff --git a/graphics-libs/harfbuzz/harfbuzz-0.9.10.tar.bz2.sig
b/graphics-libs/harfbuzz/harfbuzz-0.9.10.tar.bz2.sig
new file mode 100644
index 0000000..52acc59
Binary files /dev/null and
b/graphics-libs/harfbuzz/harfbuzz-0.9.10.tar.bz2.sig differ
diff --git a/graphics-libs/harfbuzz/harfbuzz-0.9.9.tar.bz2.sig
b/graphics-libs/harfbuzz/harfbuzz-0.9.9.tar.bz2.sig
deleted file mode 100644
index 7813820..0000000
Binary files a/graphics-libs/harfbuzz/harfbuzz-0.9.9.tar.bz2.sig and
/dev/null differ
diff --git a/net/dhcpcd/DETAILS b/net/dhcpcd/DETAILS
index 0f73e6c..8e90e9d 100755
--- a/net/dhcpcd/DETAILS
+++ b/net/dhcpcd/DETAILS
@@ -1,6 +1,6 @@
SPELL=dhcpcd
- VERSION=5.6.4
-
SOURCE_HASH=sha512:eb3892604b2f889b4f34835f4d8e0bb2d129f7d0d91da39760eeaf3f75883a6db0e1397ac65084a3ddc4a2968a389fc723e9f031a844ef5333451527be8cb7a2
+ VERSION=5.6.6
+
SOURCE_HASH=sha512:55e5d8a818c421118c62fcea1cb259f15c8bafbb79f5d9b9d14c4099474fe25489189caa1025f2e07cd3a7446a794b4c757d9a28bea2c3e9bc1bc588d3d5e8dd
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://roy.marples.name/downloads/$SPELL/$SOURCE
diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY
index 474388b..18853f0 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.6.6
+
2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.6.4 (new stable branch)
diff --git a/python-pypi/fabric/DEPENDS b/python-pypi/fabric/DEPENDS
index 4b86892..17f0989 100755
--- a/python-pypi/fabric/DEPENDS
+++ b/python-pypi/fabric/DEPENDS
@@ -1,3 +1,9 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends python &&
depends SETUPTOOLS &&
-depends python-ssh
+depends paramiko &&
+
+if spell_ok paramiko && is_version_less $(installed_version paramiko) 1.9.0;
then
+ force_depends paramiko
+fi
diff --git a/python-pypi/fabric/DETAILS b/python-pypi/fabric/DETAILS
index aeea84a..69662ea 100755
--- a/python-pypi/fabric/DETAILS
+++ b/python-pypi/fabric/DETAILS
@@ -1,9 +1,9 @@
SPELL=fabric
SPELLX=Fabric
- VERSION=1.4.2
+ VERSION=1.5.1
SOURCE=${SPELLX}-${VERSION}.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/${SPELLX:0:1}/${SPELLX}/${SOURCE}
-
SOURCE_HASH=sha512:f911357a3ae83f514f0b0e67e6a682606aee819cd19a4db275e455e2452a3b20bdad889ee38834514429dfd30b40dfba865a5e26e1b8500b1702654f2bf8f98b
+
SOURCE_HASH=sha512:fc036d2e354189c26abe00b75ba016142d5aa8da2c523d02e2054da16e28d6fcba3f702379a68f5552ba7a26b6d48bc84fec4359b511b6769779b1488d8ee10a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE=http://fabfile.org/
LICENSE[0]=BSD
diff --git a/python-pypi/fabric/HISTORY b/python-pypi/fabric/HISTORY
index a833c76..0429309 100644
--- a/python-pypi/fabric/HISTORY
+++ b/python-pypi/fabric/HISTORY
@@ -1,3 +1,7 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.5.1
+ * DEPENDS: switched back to paramiko (ssh project was merged back)
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.2
diff --git a/python-pypi/paramiko/DETAILS b/python-pypi/paramiko/DETAILS
index 9c05731..3a154d8 100755
--- a/python-pypi/paramiko/DETAILS
+++ b/python-pypi/paramiko/DETAILS
@@ -1,13 +1,10 @@
SPELL=paramiko
- VERSION=1.7.7.1
+ VERSION=1.9.0
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SOURCE.asc
- SOURCE_URL[0]=http://www.lag.net/paramiko/download/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.asc
- SOURCE_GPG=paramiko.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:2f91b68b8a652aa773d14cded7a5f17cf6d758624f981c68510ee3b1302b64ee9290830440dca1a1000b7974ef9dca4f0acd13d01958433b6f35ae8a13e1c0a2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- WEB_SITE=http://www.lag.net/paramiko/
+ WEB_SITE=https://github.com/paramiko/paramiko/
ENTERED=20060403
LICENSE=LGPL
KEYWORDS="python devel"
diff --git a/python-pypi/paramiko/HISTORY b/python-pypi/paramiko/HISTORY
index c5f2ed3..b713690 100644
--- a/python-pypi/paramiko/HISTORY
+++ b/python-pypi/paramiko/HISTORY
@@ -1,3 +1,7 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.0; renewed website and source urls
+ * paramiko.gpg: dropped, not used anymore
+
2011-10-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.7.1; converted to upstream signature
checking; changed tarball extension; quoting paths
diff --git a/python-pypi/paramiko/paramiko.gpg
b/python-pypi/paramiko/paramiko.gpg
deleted file mode 100644
index 84a90e6..0000000
Binary files a/python-pypi/paramiko/paramiko.gpg and /dev/null differ
diff --git a/python-pypi/python-ssh/DETAILS b/python-pypi/python-ssh/DETAILS
index fc8d955..0c4333f 100755
--- a/python-pypi/python-ssh/DETAILS
+++ b/python-pypi/python-ssh/DETAILS
@@ -1,9 +1,9 @@
SPELL=python-ssh
SPELLX=ssh
- VERSION=1.7.14
+ VERSION=1.8.0
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELLX/$SOURCE
-
SOURCE_HASH=sha512:0c5b20cfc8fd8b3412fa371e1368607a2688af00ccad44a70b0d71e9aed8ccbe79c1063bbc4c65f0de3cf287fa0d1a3c116d89ab01139d8d6070db1a6ad80c12
+
SOURCE_HASH=sha512:bac32c2cf078c2a06b4b530c905e4b8e0c09b457d9d9feaee163d3a96d71b43c74d159a25ad65bcb4beba692b05b7587e60b4a13be7d049f8493977f9a032da7
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://pypi.python.org/pypi/ssh/
ENTERED=20111025
diff --git a/python-pypi/python-ssh/HISTORY b/python-pypi/python-ssh/HISTORY
index bd64b63..e8c518f 100644
--- a/python-pypi/python-ssh/HISTORY
+++ b/python-pypi/python-ssh/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.0
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.14
diff --git a/windowmanagers/fluxbox/BUILD b/windowmanagers/fluxbox/BUILD
index c3bf9b1..3d8e291 100755
--- a/windowmanagers/fluxbox/BUILD
+++ b/windowmanagers/fluxbox/BUILD
@@ -2,12 +2,6 @@ if [[ $FLUXBOX_BRANCH == scm ]]; then
./autogen.sh
fi &&
-if is_depends_enabled $SPELL fribidi && is_depends_enabled fribidi glib2;
then
- CXXFLAGS="-I$INSTALL_ROOT/usr/include/glib-2.0 \
- -I$INSTALL_ROOT/usr/lib/glib-2.0/include \
- $CXXFLAGS"
-fi &&
-
OPTS="$FLUXBOX_OPTS $OPTS" &&
default_build
diff --git a/windowmanagers/fluxbox/CONFIGURE
b/windowmanagers/fluxbox/CONFIGURE
index 8dc6a74..b0a0dcc 100755
--- a/windowmanagers/fluxbox/CONFIGURE
+++ b/windowmanagers/fluxbox/CONFIGURE
@@ -3,14 +3,8 @@ list_remove FLUXBOX_OPTS '--disable-ordered-pseudo' &&
list_remove FLUXBOX_OPTS '--enable-ordered-pseudo' &&
list_remove FLUXBOX_OPTS '--enable-gnome' &&
list_remove FLUXBOX_OPTS '--disable-gnome' &&
-list_remove FLUXBOX_OPTS '--enable-randr1.2' &&
-list_remove FLUXBOX_OPTS '--disable-randr1.2' &&
-list_remove FLUXBOX_OPTS '--enable-newwmspec' &&
-list_remove FLUXBOX_OPTS '--disable-newwmspec' &&
-list_remove FLUXBOX_OPTS '--enable-timed-cache' &&
-list_remove FLUXBOX_OPTS '--disable-timed-cache' &&
-config_query FLUXBOX_CONF "Go through all (9) configuration options?" n &&
+config_query FLUXBOX_CONF "Go through all (8) configuration options?" n
if [[ $FLUXBOX_CONF == y ]]; then
config_query_option FLUXBOX_OPTS "include code for the Slit?" y \
@@ -29,21 +23,17 @@ if [[ $FLUXBOX_CONF == y ]]; then
"--enable-regexp" \
"--disable-regexp" &&
- config_query_option FLUXBOX_OPTS "enable support for Extended Window
Manager Hints?" y \
- "--enable-ewmh" \
- "--disable-ewmh" &&
+ config_query_option FLUXBOX_OPTS "include code for new WM Spec?" y \
+ "--enable-newwmspec" \
+ "--disable-newwmspec" &&
config_query_option FLUXBOX_OPTS "include verbose debugging code?" n \
"--enable-debug" \
"--disable-debug" &&
- config_query_option FLUXBOX_OPTS "build programs used in testing fluxbox?"
n \
- "--enable-test" \
- "--disable-test" &&
-
config_query_option FLUXBOX_OPTS "use new timed pixmap cache?" y \
- "--enable-timedcache" \
- "--disable-timedcache" &&
+ "--enable-timed-cache" \
+ "--disable-timed-cache" &&
config_query_option FLUXBOX_OPTS "include Xmb (multibyte font, utf-8)
support?" y \
"--enable-xmb" \
diff --git a/windowmanagers/fluxbox/DEPENDS b/windowmanagers/fluxbox/DEPENDS
index fd3a5d0..da8aae5 100755
--- a/windowmanagers/fluxbox/DEPENDS
+++ b/windowmanagers/fluxbox/DEPENDS
@@ -47,6 +47,12 @@ optional_depends libxrandr \
"--disable-randr" \
"for X Randr extension support" &&
+if is_depends_enabled $SPELL libxrandr; then
+ config_query_option FLUXBOX_OPTS "enable RANDR 1.2 support?" y \
+ "--enable-randr1.2" \
+ "--disable-randr1.2"
+fi &&
+
optional_depends fribidi \
"--enable-fribidi" \
"--disable-fribidi" \
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index b6f1a6c..6008d69 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.3.3
+ VERSION=1.3.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index b341f16..c40622a 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,10 +1,3 @@
-2012-12-31 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 1.3.3
- * CONFIGURE: dropped deprecated randr1.2 flags; fixed timedcache
flags;
- added test flags; swapped deprecated flags with ewmh support
- * BUILD: fixed fribidi detection, when built with glib support
- * size_t.patch: dropped, fixed by upstream
-
2011-10-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.2
* DEPENDS, CONFIGURE: renewed optional flags
diff --git a/windowmanagers/fluxbox/PRE_BUILD
b/windowmanagers/fluxbox/PRE_BUILD
index f4306f4..6f597d5 100755
--- a/windowmanagers/fluxbox/PRE_BUILD
+++ b/windowmanagers/fluxbox/PRE_BUILD
@@ -3,6 +3,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+# Version 1.3.2 needs this patch, git not anymore.
+[[ $FLUXBOX_GIT == y ]] || patch -p0 < "$SPELL_DIRECTORY/size_t.patch" &&
+
if is_depends_enabled $SPELL fribidi && is_version_less $(installed_version
fribidi) 0.19; then
patch -p0 < "$SPELL_DIRECTORY/fribidi.patch" &&
autoreconf -i
diff --git a/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
new file mode 100644
index 0000000..b3d3f00
Binary files /dev/null and b/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
differ
diff --git a/windowmanagers/fluxbox/fluxbox-1.3.3.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.3.3.tar.bz2.sig
deleted file mode 100644
index 78eae0a..0000000
Binary files a/windowmanagers/fluxbox/fluxbox-1.3.3.tar.bz2.sig and /dev/null
differ
diff --git a/windowmanagers/fluxbox/size_t.patch
b/windowmanagers/fluxbox/size_t.patch
new file mode 100644
index 0000000..cca7cd0
--- /dev/null
+++ b/windowmanagers/fluxbox/size_t.patch
@@ -0,0 +1,70 @@
+diff -ru src/FbTk/LayerItem.hh ../fluxbox-1.3.1-size_t/src/FbTk/LayerItem.hh
+--- src/FbTk/LayerItem.hh 2011-02-24 17:00:37.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/FbTk/LayerItem.hh 2011-04-11
07:37:09.000000000 +0200
+@@ -25,6 +25,7 @@
+
+ #include "Layer.hh"
+ #include "NotCopyable.hh"
++#include <sys/types.h>
+ #include <vector>
+
+ namespace FbTk {
+diff -ru src/FbTk/MacroCommand.hh
../fluxbox-1.3.1-size_t/src/FbTk/MacroCommand.hh
+--- src/FbTk/MacroCommand.hh 2009-10-04 21:45:38.000000000 +0200
++++ ../fluxbox-1.3.1-size_t/src/FbTk/MacroCommand.hh 2011-04-11
07:35:02.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "Command.hh"
+ #include "RefCount.hh"
+
++#include <sys/types.h>
+ #include <vector>
+
+ namespace FbTk {
+diff -ru src/FbTk/Makefile.in ../fluxbox-1.3.1-size_t/src/FbTk/Makefile.in
+--- src/FbTk/Makefile.in 2011-02-27 18:40:24.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/FbTk/Makefile.in 2011-04-10
23:35:33.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+diff -ru src/FbTk/MultLayers.hh
../fluxbox-1.3.1-size_t/src/FbTk/MultLayers.hh
+--- src/FbTk/MultLayers.hh 2011-02-24 17:00:37.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/FbTk/MultLayers.hh 2011-04-11
07:36:19.000000000 +0200
+@@ -23,6 +23,7 @@
+ #ifndef FBTK_MULTLAYERS_HH
+ #define FBTK_MULTLAYERS_HH
+
++#include <sys/types.h>
+ #include <vector>
+
+ namespace FbTk {
+diff -ru src/Makefile.in ../fluxbox-1.3.1-size_t/src/Makefile.in
+--- src/Makefile.in 2011-02-27 18:40:24.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/Makefile.in 2011-04-10 23:35:33.000000000
+0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -569,7 +569,7 @@
+ # (which will cause the Makefiles to be regenerated when you run
`make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -594,7 +594,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in ../fluxbox-1.3.1-size_t/src/: defaults.cc
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b729dfef8f5d77661f5029bf1437e0f14da21dea), Vlad Glagolev, 01/08/2013
Archive powered by MHonArc 2.6.24.