New commits:
commit 5fe2fa6091e9af9b40a7fee55a69a3ac73a29dda
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey: => 2.10 (+security)
commit 0272b5f0fb60cf6f30217d7a42c776c7e6146f7b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
editors/emacs: version 24.1
commit 782d679ffec0cec66582ecbcc060236e628a08a5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: => 0.7.13 (legacy)
commit 893ec9bea5b0608aa7c6940154c74247f076bc00
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
video/mplayer: remove obsolete switch --disable-faad-internal from DEPENDS
commit f8d283d472cf1d99c237b32ca9e4a3eab40cba80
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
mplayer 1.1
why to use gpg checking if almost every new version is signed by new gpg
key, not only mplayer
commit 2236bf8eb4e3eac31d44f50f48dd339c2c9267c1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
lvm 2.02.96
commit 53dd4bac83c5137142812bfab0475f4d926a0547
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/meld: version 1.6.0
commit 3c86ac1feb2b94a7191c4a96243e984bb0d38c59
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xine-ui: => 0.99.7
commit eaa0dc934aedd59ee5dad40aaf2b61019f8adc12
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xine-lib: => 1.2.2
commit 27862ec8f74f50683ec5c0cbb1203a2c5412230b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
linux 3.4.2
commit c08b3ab4dc925acffcce0a67a106f478a0f6523d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.0.34 (lts)
commit 891e79b3150af0492552b226aee1f7da74e8df59
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mariadb: => 5.2.12 (security)
commit 7ffb2c104239e17b39a7950032e3cd227d20db61
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>
ibpp: use the right char for (r)
commit d195591efed54749d52a2bd30697faa822fc3ce1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/qlandkarte-gt: version 1.4.2
commit b423d0726396f65242ee2c2a197a85b60c2e5a11
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/gdal: version 1.9.1
commit 4c0aa23778f5308a77f9dd60abc3b03453f09c4f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openssl: fixed UP_TRIGGERS
commit 050389e4f6d83d8cf3f776e2c4b3496819a4c567
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libevent: corrected UP_TRIGGERS
commit 387eb588640f3592c68c37b32cd635f14fd0dfb3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libxfce4util: UP_TRIGGERS fixed
if libxfce4util is installed for the first time:
libxfce4util checking for reverse triggers...
Removing dependees of libxfce4util
No spells to cast!
Cannot cast these spells:
---------------------------
libxfce4util (up_triggers)
commit 0394062a54b2624cf9ee0eddda91e2017c1e0ee7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/wxmaxima: version 12.04.0
commit 8162685f495d186715deb243b1fd3ff5dad6cefc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/maxima: version 5.27.0
commit 7e55b63d533eb57c6e780ac72285323834eb623d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/maxima: add dependency on perl
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 85a9b0d..7fcc22c 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: don't go below spell_ok if it fails check
+
2012-05-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8x, 1.0.0j, SECURITY_PATCH=19 http://www.openssl.org/news/secadv_20120510.txt
diff --git a/crypto/openssl/UP_TRIGGERS b/crypto/openssl/UP_TRIGGERS
index d9b53dc..3edee70 100755
--- a/crypto/openssl/UP_TRIGGERS
+++ b/crypto/openssl/UP_TRIGGERS
@@ -1,7 +1,7 @@
# this makes ABI changes automatically cast those that depend on openssl via
an up_trigger
-local OLD_SPELL_VERSION=""
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0
+
if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then
for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
diff --git a/database/ibpp/DETAILS b/database/ibpp/DETAILS
index e146917..0a27ced 100755
--- a/database/ibpp/DETAILS
+++ b/database/ibpp/DETAILS
@@ -13,7 +13,7 @@ SHORT="C++ classes to access and administer a Firebird
database"
cat << EOF
IBPP, where 'PP' stands for '++', is a C++ client interface for
Firebird Server versions 1.0, 1.5 and further. It also works with
-InterBase� 6.0, though it is expected it might only support Firebird
+InterBase® 6.0, though it is expected it might only support Firebird
in the future. It is a class library, free of any specific
development tool dependancies. It is not tied to any 'visual' or
'RAD' tool. It was indeed developed to add Firebird access in any
diff --git a/database/ibpp/HISTORY b/database/ibpp/HISTORY
index d6d2aad..ca53f7c 100644
--- a/database/ibpp/HISTORY
+++ b/database/ibpp/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: use properly encoded char for (r)
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index 073b1ad..ed9f6ec 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -7,9 +7,10 @@ optional_depends zlib \
"--with-zlib-dir=bundled" \
"to use system zlib instead of bundled" &&
-optional_depends readline \
- "--without-readline" "" \
- "to use system readline instead of bundled" &&
+# temporarily broken cause of mismatching API
+#optional_depends readline \
+# "--without-readline" "" \
+# "to use system readline instead of bundled" &&
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index 6e2262d..ed9cf44 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,5 +1,5 @@
SPELL=lvm
- VERSION=2.02.92
+ VERSION=2.02.96
SOURCE=LVM2.$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index fcd0376..535e89d 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.02.96
+
2012-02-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.02.92
diff --git a/editors/emacs/DETAILS b/editors/emacs/DETAILS
index 4d878c5..4df5384 100755
--- a/editors/emacs/DETAILS
+++ b/editors/emacs/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-trunk
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=23.4
+ VERSION=24.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:4}
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index 1c9c643..8d7d45d 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,5 +1,8 @@
+2012-06-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 24.1
+
2012-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 23.4
+ * DETAILS: version 23.4
2011-09-28 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: scm branch requires to run autogen.sh
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 3c9c4e5..3fd454e 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
SPELL=seamonkey
- VERSION=2.9.1
+ VERSION=2.10
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:d1aea9283e3f49af6faf51e8629bb16eb9859ec961b674df1f7b9acd34cfa6deb2c0ef4e4391abb5e7b41d4f4f8c0e122ca9e226c42dae8de256159a2bd269c6
+
SOURCE_HASH=sha512:58ee8230174ac34183d68ed29baf3e601898fd5ba692de5856181fc48d0f96a022e17012d569960c75e640c00272e41aaa89ee3b0f34a561211fd22015a697d0
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=42
+ SECURITY_PATCH=43
TMPFS=off
ENTERED=20010922
LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 757d9a4..ed60146 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,8 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.10; SECURITY_PATCH++
+ * PRE_BUILD: fixed packaging for usage with system libs
+ * seamonkey-2.9_gcc-4.7-1.patch: dropped, fixed by upstream
+
2012-05-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.9.1
* PRE_BUILD, seamonkey-2.9_gcc-4.7-1.patch: patch from LFS added
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 28b9254..98d515b 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -5,8 +5,8 @@ cd comm-release &&
sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#'
mozilla/configure &&
-# This patch fixes various files to ensure that Seamonkey compiles with GCC
4.7
-patch -p1 < "$SPELL_DIRECTORY/seamonkey-2.9_gcc-4.7-1.patch" &&
+# ignore packaging errors for the libs we have in a system
+sedit "/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@" suite/installer/Makefile.in &&
diff --git a/libs/libevent/UP_TRIGGERS b/libs/libevent/UP_TRIGGERS
index b8aa116..4ef15ef 100755
--- a/libs/libevent/UP_TRIGGERS
+++ b/libs/libevent/UP_TRIGGERS
@@ -1,8 +1,8 @@
# up_trigger everything on major version updates
-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0
-if spell_ok $SPELL && [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]];
then
+if [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]]; then
message "This is a possibly incompatible update of $SPELL..." &&
message "Figuring out what spells need to be recast, this may take a
while." &&
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/wxMaxima/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:920cae40b1fa8b0f5884b6c629d2d18c6c7b149f443da895abc18b42204551a1dd0cf24bd25604da74c24df481a0f16183957fc2c9df73c72756889b0fb000b2
+
SOURCE_HASH=sha512:3a6a275960948df8356bbebc8dcb16979abaf59bd039a0cfe52bf307250feb628df21a5b3bc0756cc5b1537d7fbd40e753398f5f8229f8670f26ce783416e290
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/wxMaxima-${VERSION}"
WEB_SITE="http://andrejv.github.com/wxmaxima"
LICENSE[0]=GPL
diff --git a/science/wxmaxima/HISTORY b/science/wxmaxima/HISTORY
index 8852357..ca03dd0 100644
--- a/science/wxmaxima/HISTORY
+++ b/science/wxmaxima/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 12.04.0
+
2011-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 11.08.0
diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
index c51c6c3..4defb1f 100755
--- a/video-libs/xine-lib/DETAILS
+++ b/video-libs/xine-lib/DETAILS
@@ -1,7 +1,7 @@
SPELL=xine-lib
- VERSION=1.2.1
-
SOURCE_HASH=sha512:7d68bc1ef6a3c15c95218b746437fe7c3ad6fffecab11b39b7580cf1ca0b7e5dda4754f38d459a99d71e82a3b11ac451fefc68fd2f5f3e418fd5136c949c73e4
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.2.2
+
SOURCE_HASH=sha512:338916386adafda85bafef0dae862c49470d7b6ccf2d8c83ada7ac2f50d12746daa0ebd3ec3fd68e063e20a1f86b0508665b3a49ba493e7fa9abf22f17bd8b81
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
WEB_SITE=http://www.xine-project.org/
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 442ea8a..fe6c26b 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,6 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.2; switched source to .xz
+
2012-04-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.1
* DEPENDS: corrected dependencies and flags
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index c421765..2b62472 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -3,7 +3,7 @@ if [[ $FFMPEG_RELEASE == stable ]]; then
VERSION=0.11
SECURITY_PATCH=12
else
- VERSION=0.7.12
+ VERSION=0.7.13
SECURITY_PATCH=11
fi
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index ed0c299..a8baba2 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.13 (legacy)
+
2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated stable to 0.11
* DEPENDS: dirac replaced by schroedinger in stable
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index c345fa7..cfdf360 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -22,7 +22,7 @@ fi &&
optional_depends libvorbis "--disable-tremor-internal
--extra-libs=-lvorbisenc" "" "to use external libvorbis to play ogg/vorbis
audio" &&
-optional_depends faad2 "--enable-faad --disable-faad-internal" "" "to use
shared faad for AAC decoding" &&
+optional_depends faad2 "--enable-faad" "" "to use shared faad for AAC
decoding" &&
# audio codecs
optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 7e3e8be..01dd1b7 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -11,8 +11,8 @@ if [[ $MPLAYER_BRANCH == scm ]]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.0rc4
- SOURCE=MPlayer-$VERSION.tar.bz2
+ VERSION=1.1
+ SOURCE=MPlayer-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[1]=ftp://ftp2.mplayerhq.hu/MPlayer/releases/$SOURCE
@@ -24,7 +24,7 @@ else
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
SECURITY_PATCH=3
fi
- PATCHLEVEL=2
+ PATCHLEVEL=0
WEB_SITE=http://www.mplayerhq.hu
LICENSE[0]=GPL
ENTERED=20010922
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 56caba3..c8abd0c 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,10 @@
+2012-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: removed obsolete switch --disable-faad-internal
+
+2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1, bz2 -> xz
+ * mplayer.gpg: 06D4D9C7 (Reimar D�ffinger) added
+
2012-01-01 Robin Cook <rcook AT wyrms.net>
* CONFLICTS: added to conflict with mplayer2
* PROVIDES: added to provide MPLAYER
diff --git a/video/mplayer/MPlayer-1.0rc4.tar.bz2.sig
b/video/mplayer/MPlayer-1.0rc4.tar.bz2.sig
deleted file mode 100644
index 4caeb67..0000000
Binary files a/video/mplayer/MPlayer-1.0rc4.tar.bz2.sig and /dev/null differ
diff --git a/video/mplayer/mplayer.gpg b/video/mplayer/mplayer.gpg
index b5efdf0..ca0b92a 100644
Binary files a/video/mplayer/mplayer.gpg and b/video/mplayer/mplayer.gpg
differ
diff --git a/video/xine-ui/DETAILS b/video/xine-ui/DETAILS
index 2772c6f..de334d5 100755
--- a/video/xine-ui/DETAILS
+++ b/video/xine-ui/DETAILS
@@ -1,6 +1,6 @@
SPELL=xine-ui
- VERSION=0.99.6
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.99.7
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
diff --git a/video/xine-ui/HISTORY b/video/xine-ui/HISTORY
index f9ce18d..b0793e7 100644
--- a/video/xine-ui/HISTORY
+++ b/video/xine-ui/HISTORY
@@ -1,3 +1,7 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.99.7; switched to .xz source
+ * curl.patch: dropped
+
2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply the patch
* curl.patch: added, to fix compilation with curl >=7.21.7
diff --git a/video/xine-ui/PRE_BUILD b/video/xine-ui/PRE_BUILD
index 4d61fa0..9f1183b 100755
--- a/video/xine-ui/PRE_BUILD
+++ b/video/xine-ui/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p0 < "$SPELL_DIRECTORY/curl.patch" &&
-
+# don't force mime db update
sed -i "s: install-data-hook::" misc/Makefile.in
diff --git a/video/xine-ui/curl.patch b/video/xine-ui/curl.patch
deleted file mode 100644
index 57a7f57..0000000
--- a/video/xine-ui/curl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/xitk/download.c.orig 2009-12-19 03:34:22.000000000 +0300
-+++ src/xitk/download.c 2011-09-14 23:13:28.299536494 +0400
-@@ -28,7 +28,6 @@
-
- #ifdef HAVE_CURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
-
diff --git a/video/xine-ui/xine-ui-0.99.6.tar.bz2.sig
b/video/xine-ui/xine-ui-0.99.6.tar.bz2.sig
deleted file mode 100644
index 63f2449..0000000
Binary files a/video/xine-ui/xine-ui-0.99.6.tar.bz2.sig and /dev/null differ
diff --git a/video/xine-ui/xine-ui-0.99.7.tar.xz.sig
b/video/xine-ui/xine-ui-0.99.7.tar.xz.sig
new file mode 100644
index 0000000..4b46c6f
Binary files /dev/null and b/video/xine-ui/xine-ui-0.99.7.tar.xz.sig differ
diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY
index a45cca7..52ff928 100644
--- a/xfce/libxfce4util/HISTORY
+++ b/xfce/libxfce4util/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
+ * UP_TRIGGERS: fixed
+
2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
* UP_TRIGGER: added, for proper upgrade
diff --git a/xfce/libxfce4util/UP_TRIGGERS b/xfce/libxfce4util/UP_TRIGGERS
index 2b8c75e..ff7732c 100755
--- a/xfce/libxfce4util/UP_TRIGGERS
+++ b/xfce/libxfce4util/UP_TRIGGERS
@@ -1,7 +1,9 @@
# recast everything on minor version update
-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
-if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
+if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
message "This is a possibly incompatible update of $SPELL..." &&
message "Figuring out what spells need to be recast, this may take a
while." &&
@@ -11,4 +13,5 @@ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
up_trigger $each cast_self
fi
done
+ fi
fi
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (2fa23024cd759673ac574f23d29d07968b0c169a),
Vlad Glagolev, 06/11/2012