Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (a0641a55ae4014e50066eaca6a6c895c572850ef)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (a0641a55ae4014e50066eaca6a6c895c572850ef)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (a0641a55ae4014e50066eaca6a6c895c572850ef)
  • Date: Fri, 19 Apr 2013 18:03:49 -0500
GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

ChangeLog | 3
audio-players/mpd/DETAILS | 9
audio-players/mpd/HISTORY | 3
e-16/e16/DETAILS | 4
e-16/e16/HISTORY | 3
ftp/curl/BUILD | 5
ftp/curl/HISTORY | 3
graphics-libs/openjpeg/DETAILS | 2
graphics-libs/openjpeg/HISTORY | 8
graphics-libs/openjpeg/INSTALL | 5
graphics-libs/poppler/DETAILS | 8
graphics-libs/poppler/HISTORY | 3
graphics/imagemagick/BUILD | 3
graphics/imagemagick/DEPENDS | 10
graphics/imagemagick/DETAILS | 4
graphics/imagemagick/HISTORY | 4
http/webkitgtk/BUILD | 1
http/webkitgtk/CONFIGURE | 1
http/webkitgtk/DEPENDS | 6
http/webkitgtk/DETAILS | 10
http/webkitgtk/HISTORY | 9
http/webkitgtk/PRE_BUILD | 3
http/webkitgtk/opengl-headers.patch | 29 ++
http/webkitgtk3/BUILD | 1
http/webkitgtk3/DEPENDS | 6
http/webkitgtk3/DETAILS | 4
http/webkitgtk3/HISTORY | 8
http/webkitgtk3/PRE_BUILD | 3
http/webkitgtk3/opengl-headers.patch | 29 ++
kde4/kdebase4-runtime/DEPENDS | 1
kde4/kdebase4-runtime/HISTORY | 3
kernels/linux/HISTORY | 4
kernels/linux/info/patches/maintenance_patches_3/patch-3.8.8 | 5
kernels/linux/latest.defaults | 2
php-pear/imagick/DETAILS | 4
php-pear/imagick/HISTORY | 6
php-pear/imagick/PRE_BUILD | 8
php-pear/imagick/header.patch | 13 +
php-pear/imagick/php54.patch | 113
+++++++++++
python-pypi/bsddb3/DEPENDS | 4
python-pypi/bsddb3/HISTORY | 3
python-pypi/pyfpdf/DEPENDS | 2
python-pypi/pyfpdf/DETAILS | 15 +
python-pypi/pyfpdf/HISTORY | 4
python-pypi/pyparsing/DEPENDS | 7
python-pypi/pyparsing/DETAILS | 9
python-pypi/pyparsing/HISTORY | 6
python-pypi/pyparsing/PREPARE | 2
python-pypi/python-mpd/DETAILS | 4
python-pypi/python-mpd/HISTORY | 3
science-libs/eigen3/DETAILS | 6
science-libs/eigen3/HISTORY | 3
telephony/commoncpp2/DETAILS | 4
telephony/commoncpp2/HISTORY | 5
telephony/commoncpp2/PRE_BUILD | 3
telephony/commoncpp2/sde-statfix.patch | 63 ++++++
utils/qemu/BUILD | 1
utils/qemu/CONFIGURE | 20 -
utils/qemu/DEPENDS | 104
+++++-----
utils/qemu/DETAILS | 37 ---
utils/qemu/HISTORY | 10
utils/qemu/PREPARE | 7
utils/qemu/PRE_BUILD | 6
utils/qemu/archs | 41 ++-
utils/qemu/archs-0.15 | 41 ---
utils/qemu/cflags.patch | 11 -
66 files changed, 528 insertions(+), 239 deletions(-)

New commits:
commit 2e8120011c407b7b1b459e663dd21fa7fad6dea5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: Updated to 1.4.1
Removed branches, they no longer (even 1.1) compile without
work.
Query for enabling VNC
Optionally depends on libcap-ng
Move VNC-specific optional dependencies into a VNC enabled
check
Pass $QEMU_VNC to ./configure
PRE_BUILD, cflags.patch, archs-0.15: Removed
Updated architecture list to 1.4.1

commit af306facb5da522714e0bec41edc75410043c087
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python-mpd: => 0.5.1

commit e6739789061f2be52ae9c0cbf7451123e0b922c3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mpd: => 0.17.4

commit 7b46946a544693a40e5edf12c5565c60136cdacb
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

commoncpp2: 1.8.1, sys/stat.h patch from OpenSDE (Bug #190)

commit b5d8b6d85511dd01269efdab065d1412c33ef033
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

kdebase4-runtime: kactivities required dependency

commit 2d55ac8cfcdaaeeed8d93c22e44da4caa9f220e1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pyparsing: => 2.0.0

commit 9b841a25d6ca6c541f750620478ca91c61328c86
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

imagemagick: => 6.8.4-10, reenabled ghostscript support

commit 1f4e0606568662684f0422a3535295b6a4c99092
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

poppler 0.22.3

commit 6c6eceafc0cb634b9698c3d0338aaf454d7b84cf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pyfpdf-1.7

commit fc1b630ef618574def8f7b69983145387184e22b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

python3 support

commit 45baccea3f8c4c707a4d598bb2d036f7d165df82
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pyparsing: => 1.5.7

commit faa7ab768de4e3a3905e0702198b00e5937f865c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

e16 1.0.13

commit 81728a39263d2e15b57964b58b8b98a3706a9fd4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 3.8.8

commit c5f880bdf2809b729cb9d94bdfb0eae30ece9209
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

eigen3: => 3.1.3

commit 3a271be4d15d99af290840402cb0f1a1c6759ab5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

openjpeg: PATCHLEVEL++ for Bug #540 (Javier Vasquez's fix)
Adding "default_install" and the removal of broken symlink and the
creation of the correct one.

commit 57a9f1ccfd7602fb20bce0c2b2e4f36a9ca71369
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

curl: Fix -DPIC from CFLAGS -> CPPFLAGS (Bug #537)

configure: using CFLAGS: -march=native -mtune=native -m32 -pipe -DPIC
-fPIC -O2
configure: CFLAGS error: CFLAGS may only be used to specify C compiler
flags, not macro definitions. Use CPPFLAGS for: -DPIC
configure: error: Can not continue. Fix errors mentioned immediately
above this line.

commit 01189af4558a0bd77492b35143f584cc111a4a49
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

Revert "http/webkitgtk3: version 2.0.0"

This reverts commit 455adc34ada86900550ad7ea835095fb3d534127.

Doesn't compile with gcc 4.6.

commit a9f62e2834200d413da6d89c64f0077e83336192
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

Revert "http/webkitgtk: version 2.0.0"

This reverts commit df674ba4dfde970a8e249635fcbae9c4c1958713.

Doesn't compile with gcc 4.6. Thanks to Vlad and Thomas for noticing.

commit ca90dd02385c918ac14daf4ca95cff4a28f379a1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

imagick: => 3.0.1

diff --git a/ChangeLog b/ChangeLog
index a514d78..9761843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-04-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * python-pypi/pyfpdf: new spell, generate pdf file
+
2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* x11/nxproxy: new spell, NX proxy library
* x11/x2goclient: new spell, Qt client for the x2go remote desktop
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index f9f967b..17819e8 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,10 @@
SPELL=mpd
- VERSION=0.17.3
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.17.4
+ BRANCH=`echo $VERSION | cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-
SOURCE_HASH=sha512:e421e723cd7d46b87c07d5a3be5aaa592453b6c7d2fa02440cc8ac5a1f931126f5011b0fed9c8d0fcfb142dd7290db67ca2638f75fa8b41d38f2a825816621e1
+ SOURCE_URL[0]=http://www.musicpd.org/download/$SPELL/$BRANCH/$SOURCE
+
SOURCE_HASH=sha512:ee8a31cf1398f09b58ead002ae978cef8588baae338110dfc2073b6022ddd98f2877ba99cb6acd1911fb8f6cb7811377f9e05a3136718f1c68af1f623d0af722
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 58e5109..7d12320 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2013-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.17.4; updated source url
+
2013-02-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switched from libcdio to libcdio-paranoia

diff --git a/e-16/e16/DETAILS b/e-16/e16/DETAILS
index 64bfbd2..9002492 100755
--- a/e-16/e16/DETAILS
+++ b/e-16/e16/DETAILS
@@ -11,12 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.16-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:$SPELL/e
SOURCE_IGNORE=volatile
else
- VERSION=1.0.11
+ VERSION=1.0.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE

-
SOURCE_HASH=sha512:01a323bbcdbf2ae63179c78423aadd59fe15eed2425abe3b5546c0d2bf9e6458dec0cee75d0704592839d742467d580a018449faab81dfa57ff45aa6d4a56c54
+
SOURCE_HASH=sha512:965c853363c15154ca99b71deba3aa1d23bdfee0664b3511b39f52e066ca673a9b042e203e079357c9ca355484006cc4a90d0e0fb29b7396d582f7b9aa302da5
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"

fi
diff --git a/e-16/e16/HISTORY b/e-16/e16/HISTORY
index 7776348..bbdfc89 100644
--- a/e-16/e16/HISTORY
+++ b/e-16/e16/HISTORY
@@ -1,3 +1,6 @@
+2013-04-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.13
+
2012-10-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.11
* BUILD: removed
diff --git a/ftp/curl/BUILD b/ftp/curl/BUILD
index 22c63c9..b1a7eb0 100755
--- a/ftp/curl/BUILD
+++ b/ftp/curl/BUILD
@@ -2,4 +2,9 @@ if [[ "$CURL_SSL" == "none" ]]; then
OPTS="--without-gnutls --without-nss --without-ssl $OPTS"
fi &&

+if echo "$CFLAGS" | grep -q -- '-DPIC'; then
+ CFLAGS="${CFLAGS/-DPIC/}" &&
+ CPPFLAGS="$CPPFLAGS -DPIC "
+fi &&
+
default_build
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index dfbee4b..53ba4f3 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2013-04-16 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Fix -DPIC from CFLAGS -> CPPFLAGS (Bug #537)
+
2013-04-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.30.0
SECURITY_PATCH++
diff --git a/graphics-libs/openjpeg/DETAILS b/graphics-libs/openjpeg/DETAILS
index 4e58e5a..c3fb931 100755
--- a/graphics-libs/openjpeg/DETAILS
+++ b/graphics-libs/openjpeg/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
WEB_SITE=http://code.google.com/p/openjpeg/
KEYWORDS="images graphics libs"
ENTERED=20070627
- PATCHLEVEL=1
+ PATCHLEVEL=2
SHORT='Open-source JPEG 2000 codec'
cat << EOF
The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
diff --git a/graphics-libs/openjpeg/HISTORY b/graphics-libs/openjpeg/HISTORY
index 81cc49b..67c8a11 100644
--- a/graphics-libs/openjpeg/HISTORY
+++ b/graphics-libs/openjpeg/HISTORY
@@ -1,3 +1,11 @@
+2013-04-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++ for Bug #540 (Javier Vasquez's fix)
+
+2013-04-14 Javier Vasquez <j.e.vasquez.v AT gmail.com>
+ * INSTALL: New file. Adding besides "default_install"
+ the removal of broken symlink and the creation of the
+ correct one.
+
2013-04-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.1
SECURITY_PATCH=1
diff --git a/graphics-libs/openjpeg/INSTALL b/graphics-libs/openjpeg/INSTALL
new file mode 100755
index 0000000..4a50fc6
--- /dev/null
+++ b/graphics-libs/openjpeg/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+
+rm $INSTALL_ROOT/usr/share/pkgconfig/libopenjpeg.pc &&
+cd $INSTALL_ROOT/usr/share/pkgconfig &&
+ln -s $INSTALL_ROOT/usr/lib/pkgconfig/libopenjpeg1.pc libopenjpeg.pc
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 4718b3c..409f9f0 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.22.2
-
SOURCE_HASH=sha512:ce962f12a87f873a46cf8d02c0620694893a6e1857ac680174c4d9388d2255b5011e62e28b34a6e0abec9c8779530bf91ac123206a619a6eba59be92adb02d42
+ VERSION=0.22.3
+
SOURCE_HASH=sha512:70a1523847a9c1afe39ce9fa85d735d8433fa7e5c8537c739cd8c396e503579b75c1c3e749638397030eb80aa3f175301aa465637bb7289e14ba2cf76e7521a3
else
- VERSION=0.22.2
-
SOURCE_HASH=sha512:ce962f12a87f873a46cf8d02c0620694893a6e1857ac680174c4d9388d2255b5011e62e28b34a6e0abec9c8779530bf91ac123206a619a6eba59be92adb02d42
+ VERSION=0.22.3
+
SOURCE_HASH=sha512:70a1523847a9c1afe39ce9fa85d735d8433fa7e5c8537c739cd8c396e503579b75c1c3e749638397030eb80aa3f175301aa465637bb7289e14ba2cf76e7521a3
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 83429a8..9a45311 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2013-04-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.22.3
+
2013-03-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.22.2

diff --git a/graphics/imagemagick/BUILD b/graphics/imagemagick/BUILD
index d76777d..4fc9739 100755
--- a/graphics/imagemagick/BUILD
+++ b/graphics/imagemagick/BUILD
@@ -2,10 +2,9 @@ if [[ "$IMAGEMAGICK_X" != "y" ]]; then
OPTS="--without-x $OPTS"
fi &&

-# GS is broken with jpeg 8, so disable it
OPTS="--enable-shared \
--without-autotrace \
- --without-gslib \
$IMAGEMAGICK_HDRI \
$OPTS" &&
+
default_build
diff --git a/graphics/imagemagick/DEPENDS b/graphics/imagemagick/DEPENDS
index db29756..bee5d3c 100755
--- a/graphics/imagemagick/DEPENDS
+++ b/graphics/imagemagick/DEPENDS
@@ -70,12 +70,10 @@ optional_depends 'librsvg2' \
'--without-rsvg' \
'for Scalable Vector Graphics support' &&

-# broken with jpeg 8
-#
-#optional_depends POSTSCRIPT-INTERPRETER \
-# "--with-gslib" \
-# "--without-gslib" \
-# "for generating Postscript and PDF output" &&
+optional_depends POSTSCRIPT-INTERPRETER \
+ "--with-gslib" \
+ "--without-gslib" \
+ "for generating Postscript and PDF output" &&

optional_depends 'djvulibre' \
'--with-djvu' \
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 40365c8..6c8ee21 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.8.4-9
+ VERSION=6.8.4-10
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
-
SOURCE_HASH=sha512:039e5c59d1c9fb2495d417e093bcfcc32e689e0850df4e21702e98e4ae986acfba564e4bcb37e7d03cc4c761bdfcf4f783663627d5714f989a672272aa57fe2e
+
SOURCE_HASH=sha512:89a1072d8a7d7871c67c2b161d077bcc5560b6ae5fa951d4f4de1f5b83f8a85a23a5a588d23e88a61a1341fe29a6585c20e03b2ae13f175db3ab2a75720cb0c5
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index a5e6bbb..47460be 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,7 @@
+2013-04-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6.8.4-10
+ * BUILD, DEPENDS: reenabled ghostscript support
+
2013-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.8.4-9

diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 4e6911d..719a5d9 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,4 +1,5 @@
OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
+OPTS="--with-gtk=2.0 --disable-webkit2 $OPTS" &&

make_single &&
default_build &&
diff --git a/http/webkitgtk/CONFIGURE b/http/webkitgtk/CONFIGURE
index 129adc3..d2cebdd 100755
--- a/http/webkitgtk/CONFIGURE
+++ b/http/webkitgtk/CONFIGURE
@@ -1,5 +1,6 @@
config_query_list WEBKIT_FONT_BE "Select font backend to use" freetype2
pango &&
config_query_list WEBKIT_ACC "Select acceleration backend to use" opengl
clutter none &&
+config_query_list WEBKIT_UNICODE "Select unicode backend to use" icu glib2 &&

config_query_option WEBKIT_WEBGL "Enable support for WebGL?" y \
"--enable-webgl" "--disable-webgl"
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index d62dcb7..e36a940 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
depends autoconf &&
depends automake &&
depends libtool &&
-depends gtk+2 '--with-gtk=2.0 --disable-webkit2' &&
+depends gtk+2 &&
depends icu &&
depends gperf &&
depends libpng &&
@@ -14,8 +14,6 @@ depends libsoup &&
depends enchant &&
depends libxt &&
depends RUBY &&
-depends libwebp &&
-depends libsecret &&

optional_depends cairo '--enable-svg' \
'--disable-svg' \
@@ -34,7 +32,7 @@ if [[ ! $WEBKIT_FONT_BE == freetype2 ]]; then
fi &&
depends freetype2 &&

-optional_depends gst-plugins-base-1.0 \
+optional_depends gst-plugins-base \
"--enable-video" \
"--disable-video" \
"for HTML5 streaming video support" &&
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 8870763..0b1cf0b 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,20 +1,20 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=2.0.0
+ VERSION=1.10.2
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
- VERSION=2.0.0
+ VERSION=1.10.2
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
- PATCHLEVEL=0
+ PATCHLEVEL=1
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 1363ea5..44ee84d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,12 +1,3 @@
-2013-04-10 Pol Vinogradov <vin.public AT gmail.com>
- * DETAilS: version 2.0.0
- * BUILD: moved gtk+2 flags to DEPENDS
- * CONFIGURE: removed unicode backend choice
- * DEPENDS: added dependencies on libwebp and libsecret,
- gst-plugins-base -> gst-plugins-base-1.0, added flags to gtk+2
- * PRE_BUILD, opengl-headers.patch: removed OpenGL patch,
- added fix for UTF8 header
-
2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on RUBY (tested ruby-1.9 and ruby-1.8)

diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index 5003c3c..cdd362a 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -2,5 +2,4 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-sed -i '29i #include "../../../JavaScriptCore/icu/unicode/utf8.h"' \
- Source/WebCore/platform/text/TextCodecUTF8.h
+patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/http/webkitgtk/opengl-headers.patch
b/http/webkitgtk/opengl-headers.patch
new file mode 100644
index 0000000..0ff8fee
--- /dev/null
+++ b/http/webkitgtk/opengl-headers.patch
@@ -0,0 +1,29 @@
+--- Source/WebCore/platform/graphics/OpenGLShims.h.orig
++++ Source/WebCore/platform/graphics/OpenGLShims.h
+@@ -56,6 +56,8 @@
+ typedef void (*glBufferSubDataType) (GLenum, GLintptr, GLsizeiptr, const
GLvoid*);
+ typedef GLenum (*glCheckFramebufferStatusType) (GLenum);
+ typedef void (*glCompileShaderType) (GLuint);
++typedef void (*glCompressedTexImage2DType) (GLenum, GLint, GLenum, GLsizei,
GLsizei, GLint, GLsizei, const GLvoid *);
++typedef void (*glCompressedTexSubImage2DType) (GLenum, GLint, GLint, GLint,
GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+ typedef GLuint (*glCreateProgramType) ();
+ typedef GLuint (*glCreateShaderType) (GLenum);
+ typedef void (*glDeleteBuffersType) (GLsizei, const GLuint*);
+@@ -152,6 +154,8 @@
+ FUNCTION_TABLE_ENTRY(glBufferSubData);
+ FUNCTION_TABLE_ENTRY(glCheckFramebufferStatus);
+ FUNCTION_TABLE_ENTRY(glCompileShader);
++ FUNCTION_TABLE_ENTRY(glCompressedTexImage2D);
++ FUNCTION_TABLE_ENTRY(glCompressedTexSubImage2D);
+ FUNCTION_TABLE_ENTRY(glCreateProgram);
+ FUNCTION_TABLE_ENTRY(glCreateShader);
+ FUNCTION_TABLE_ENTRY(glDeleteBuffers);
+@@ -253,6 +257,8 @@
+ #define glCheckFramebufferStatusEXT glCheckFramebufferStatus
+ #define glCheckFramebufferStatus
LOOKUP_GL_FUNCTION(glCheckFramebufferStatus)
+ #define glCompileShader
LOOKUP_GL_FUNCTION(glCompileShader)
++#define glCompressedTexImage2D
LOOKUP_GL_FUNCTION(glCompressedTexImage2D)
++#define glCompressedTexSubImage2D
LOOKUP_GL_FUNCTION(glCompressedTexSubImage2D)
+ #define glCreateProgram
LOOKUP_GL_FUNCTION(glCreateProgram)
+ #define glCreateShader
LOOKUP_GL_FUNCTION(glCreateShader)
+ #define glDeleteBuffers
LOOKUP_GL_FUNCTION(glDeleteBuffers)
diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index 9207d63..d93409a 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,3 +1,4 @@
OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
+OPTS="--with-gtk=3.0 $OPTS" &&

default_build
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index 15b4b63..8062770 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
depends autoconf &&
depends automake &&
depends libtool &&
-depends gtk+3 '--with-gtk=3.0' &&
+depends gtk+3 &&
depends icu &&
depends gperf &&
depends libpng &&
@@ -16,8 +16,6 @@ depends libxt &&
depends perl &&
depends PYTHON &&
depends RUBY &&
-depends libwebp &&
-depends libsecret &&

optional_depends gtk-doc '--enable-gtk-doc' \
'' \
@@ -37,7 +35,7 @@ else
depends pango "--with-font-backend=pango"
fi &&

-optional_depends gst-plugins-base-1.0 \
+optional_depends gst-plugins-base \
"--enable-video" \
"--disable-video" \
"for HTML5 streaming video support" &&
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 4f5be4d..27a7654 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk3
- VERSION=2.0.0
+ VERSION=1.10.2
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkitgtk-$VERSION"
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=4
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index a0fca17..0e90558 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,11 +1,3 @@
-2013-04-10 Pol Vinogradov <vin.public AT gmail.com>
- * DETAilS: version 2.0.0
- * BUILD: moved --WITHgtk=3.0 flag to DEPENDS
- * DEPENDS: added dependencies on libwebp and libsecret,
- gst-plugins-base -> gst-plugins-base-1.0, added flag for gtk+3
- * PRE_BUILD, opengl-headers.patch: removed OpenGL patch,
- added fix for UTF8 header
-
2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added dependencies on perl, PYTHON and RUBY

diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
index 5003c3c..cdd362a 100755
--- a/http/webkitgtk3/PRE_BUILD
+++ b/http/webkitgtk3/PRE_BUILD
@@ -2,5 +2,4 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-sed -i '29i #include "../../../JavaScriptCore/icu/unicode/utf8.h"' \
- Source/WebCore/platform/text/TextCodecUTF8.h
+patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/http/webkitgtk3/opengl-headers.patch
b/http/webkitgtk3/opengl-headers.patch
new file mode 100644
index 0000000..0ff8fee
--- /dev/null
+++ b/http/webkitgtk3/opengl-headers.patch
@@ -0,0 +1,29 @@
+--- Source/WebCore/platform/graphics/OpenGLShims.h.orig
++++ Source/WebCore/platform/graphics/OpenGLShims.h
+@@ -56,6 +56,8 @@
+ typedef void (*glBufferSubDataType) (GLenum, GLintptr, GLsizeiptr, const
GLvoid*);
+ typedef GLenum (*glCheckFramebufferStatusType) (GLenum);
+ typedef void (*glCompileShaderType) (GLuint);
++typedef void (*glCompressedTexImage2DType) (GLenum, GLint, GLenum, GLsizei,
GLsizei, GLint, GLsizei, const GLvoid *);
++typedef void (*glCompressedTexSubImage2DType) (GLenum, GLint, GLint, GLint,
GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+ typedef GLuint (*glCreateProgramType) ();
+ typedef GLuint (*glCreateShaderType) (GLenum);
+ typedef void (*glDeleteBuffersType) (GLsizei, const GLuint*);
+@@ -152,6 +154,8 @@
+ FUNCTION_TABLE_ENTRY(glBufferSubData);
+ FUNCTION_TABLE_ENTRY(glCheckFramebufferStatus);
+ FUNCTION_TABLE_ENTRY(glCompileShader);
++ FUNCTION_TABLE_ENTRY(glCompressedTexImage2D);
++ FUNCTION_TABLE_ENTRY(glCompressedTexSubImage2D);
+ FUNCTION_TABLE_ENTRY(glCreateProgram);
+ FUNCTION_TABLE_ENTRY(glCreateShader);
+ FUNCTION_TABLE_ENTRY(glDeleteBuffers);
+@@ -253,6 +257,8 @@
+ #define glCheckFramebufferStatusEXT glCheckFramebufferStatus
+ #define glCheckFramebufferStatus
LOOKUP_GL_FUNCTION(glCheckFramebufferStatus)
+ #define glCompileShader
LOOKUP_GL_FUNCTION(glCompileShader)
++#define glCompressedTexImage2D
LOOKUP_GL_FUNCTION(glCompressedTexImage2D)
++#define glCompressedTexSubImage2D
LOOKUP_GL_FUNCTION(glCompressedTexSubImage2D)
+ #define glCreateProgram
LOOKUP_GL_FUNCTION(glCreateProgram)
+ #define glCreateShader
LOOKUP_GL_FUNCTION(glCreateShader)
+ #define glDeleteBuffers
LOOKUP_GL_FUNCTION(glDeleteBuffers)
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index 0d67ecf..dc67e6d 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -11,6 +11,7 @@ depends shared-desktop-ontologies &&
depends soprano &&
depends attica &&
depends nepomuk-core &&
+depends kactivities &&
optional_depends xine-lib '' '' 'xine libraries' &&
optional_depends libssh '' '' 'build kio_sftp slave' &&
optional_depends pulseaudio '' '' 'Pulseaudio server support' &&
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index 84c9ad2..8a2c2b7 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2013-04-17 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: added required kactivities
+
2013-03-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.10.1

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 6313636..5ac0dd9 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2013-04-17 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.8
+ * info/patches/maintenance_patches_3/patch-3.8.8: added
+
2013-04-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.8.7
* info/patches/maintenance_patches_3/patch-3.8.7: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.8
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.8
new file mode 100755
index 0000000..39e751a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.8
@@ -0,0 +1,5 @@
+appliedkernels="3.8"
+patchversion="${appliedkernels}.8"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f6da680069d5c31af0e57b8a8c4cab411b163782"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 9f817d1..dff3f96 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.8
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.8.7
+LATEST_maintenance_patches_3=patch-3.8.8
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/php-pear/imagick/DETAILS b/php-pear/imagick/DETAILS
index c1b1cf1..4ee24d9 100755
--- a/php-pear/imagick/DETAILS
+++ b/php-pear/imagick/DETAILS
@@ -1,8 +1,8 @@
SPELL=imagick
- VERSION=2.3.0
+ VERSION=3.0.1
SOURCE=$SPELL-$VERSION.tgz
SOURCE_URL[0]=http://pecl.php.net/get/$SOURCE
-
SOURCE_HASH=sha512:4ba1528398a0d7db547d9243c028ebaffc5d469942d830102da5f422a9d9cb7d6285ba6292503219183e0c5be20aad24c4eb376eda31edc0c1d84b6cef4c3c59
+
SOURCE_HASH=sha512:a8a9872662a8657a91dec793e8dd86ea492fa523f362cc9489f73b5f5f666872db95a929259dfde32b5370133fa4672b39007b08a7fec32be6a462873d7e6a4c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://pecl.php.net/package/imagick/
LICENSE[0]=PHP
diff --git a/php-pear/imagick/HISTORY b/php-pear/imagick/HISTORY
index 760ed85..3858b98 100644
--- a/php-pear/imagick/HISTORY
+++ b/php-pear/imagick/HISTORY
@@ -1,3 +1,9 @@
+2013-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.1
+ * PRE_BUILD: apply patches
+ * php54.patch: added, to fix build with PHP >=5.4
+ * header.patch: added, to use proper path for include files
+
2009-09-14 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing dependency

diff --git a/php-pear/imagick/PRE_BUILD b/php-pear/imagick/PRE_BUILD
index 4e954a3..ddeaff0 100755
--- a/php-pear/imagick/PRE_BUILD
+++ b/php-pear/imagick/PRE_BUILD
@@ -1,6 +1,14 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p1 < "$SPELL_DIRECTORY/header.patch" &&
+
+if spell_ok php && is_version_less 5.3.9999 $(installed_version php); then
+ patch -p1 < "$SPELL_DIRECTORY/php54.patch"
+fi &&
+
rm -f "$BUILD_DIRECTORY/package.xml" &&

phpize
diff --git a/php-pear/imagick/header.patch b/php-pear/imagick/header.patch
new file mode 100644
index 0000000..59a0174
--- /dev/null
+++ b/php-pear/imagick/header.patch
@@ -0,0 +1,13 @@
+--- imagick-305615/config.m4 2010/11/21 17:00:04
++++ imagick-329769/config.m4 2013/03/13 13:14:23
+@@ -52,7 +52,9 @@
+ else
+ AC_MSG_CHECKING(for MagickWand.h header file)
+
+- if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
++ if test -r $WAND_DIR/include/ImageMagick-6/wand/MagickWand.h; then
++ AC_MSG_RESULT(found in
$WAND_DIR/include/ImageMagick-6/wand/MagickWand.h)
++ elif test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
+ AC_MSG_RESULT(found in
$WAND_DIR/include/ImageMagick/wand/MagickWand.h)
+ else
+ AC_MSG_ERROR(Cannot locate header file MagickWand.h)
diff --git a/php-pear/imagick/php54.patch b/php-pear/imagick/php54.patch
new file mode 100644
index 0000000..596388e
--- /dev/null
+++ b/php-pear/imagick/php54.patch
@@ -0,0 +1,113 @@
+Common subdirectories: imagick-3.0.1/examples and imagick-3.0.1-3/examples
+diff -u imagick-3.0.1/imagick.c imagick-3.0.1-3/imagick.c
+--- imagick-3.0.1/imagick.c 2010-11-19 05:16:01.000000000 +0800
++++ imagick-3.0.1-3/imagick.c 2012-05-10 09:05:51.000000000 +0800
+@@ -2374,7 +2374,11 @@
+ /* ALLOC_HASHTABLE(intern->zo.properties); */
+
+ zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(intern->zo.properties,
&class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *)
&tmp, sizeof(zval *));
++#else
++ object_properties_init(&(intern->zo), class_type);
++#endif
+
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) php_imagick_object_free_storage, NULL
TSRMLS_CC);
+ retval.handlers = (zend_object_handlers *) &imagick_object_handlers;
+@@ -2409,7 +2413,11 @@
+ /* ALLOC_HASHTABLE(intern->zo.properties); */
+
+ zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(intern->zo.properties,
&class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *)
&tmp, sizeof(zval *));
++#else
++ object_properties_init(&(intern->zo), class_type);
++#endif
+
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) php_imagickdraw_object_free_storage,
NULL TSRMLS_CC);
+ retval.handlers = (zend_object_handlers *)
&imagickdraw_object_handlers;
+@@ -2443,7 +2451,11 @@
+ /* ALLOC_HASHTABLE(intern->zo.properties); */
+
+ zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(intern->zo.properties,
&class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *)
&tmp, sizeof(zval *));
++#else
++ object_properties_init(&(intern->zo), class_type);
++#endif
+
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t)
php_imagickpixeliterator_object_free_storage, NULL TSRMLS_CC);
+ retval.handlers = (zend_object_handlers *)
&imagickpixeliterator_object_handlers;
+@@ -2471,7 +2483,11 @@
+ /* ALLOC_HASHTABLE(intern->zo.properties); */
+
+ zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(intern->zo.properties,
&class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *)
&tmp, sizeof(zval *));
++#else
++ object_properties_init(&(intern->zo), class_type);
++#endif
+
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) php_imagickpixel_object_free_storage,
NULL TSRMLS_CC);
+ retval.handlers = (zend_object_handlers *)
&imagickpixel_object_handlers;
+diff -u imagick-3.0.1/imagick_helpers.c imagick-3.0.1-3/imagick_helpers.c
+--- imagick-3.0.1/imagick_helpers.c 2010-11-19 05:16:01.000000000 +0800
++++ imagick-3.0.1-3/imagick_helpers.c 2012-05-10 09:02:42.000000000 +0800
+@@ -723,9 +723,11 @@
+
+ int php_imagick_safe_mode_check(const char *filename TSRMLS_DC)
+ {
++#if PHP_VERSION_ID < 50399
+ if (PG(safe_mode) && (!php_checkuid_ex(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR, CHECKUID_NO_ERRORS))) {
+ return IMAGICK_READ_WRITE_SAFE_MODE_ERROR;
+ }
++#endif
+
+ if (PG(open_basedir) && php_check_open_basedir_ex(filename, 0
TSRMLS_CC)) {
+ return IMAGICK_READ_WRITE_OPEN_BASEDIR_ERROR;
+diff -u imagick-3.0.1/imagick_read.c imagick-3.0.1-3/imagick_read.c
+--- imagick-3.0.1/imagick_read.c 2010-11-19 05:16:01.000000000 +0800
++++ imagick-3.0.1-3/imagick_read.c 2012-05-10 09:03:18.000000000 +0800
+@@ -176,7 +176,11 @@
+ {
+ int status = IMAGICK_READ_WRITE_NO_ERROR;
+
++#if PHP_VERSION_ID < 50399
+ if (PG(open_basedir) || PG(safe_mode)) {
++#else
++ if (PG(open_basedir)) {
++#endif
+ char *absolute = php_imagick_get_absolute_filename(filename,
filename_len TSRMLS_CC);
+
+ if (absolute) {
+diff -u imagick-3.0.1/php_imagick_macros.h
imagick-3.0.1-3/php_imagick_macros.h
+--- imagick-3.0.1/php_imagick_macros.h 2010-11-19 05:16:01.000000000 +0800
++++ imagick-3.0.1-3/php_imagick_macros.h 2012-05-10 09:02:07.000000000
+0800
+@@ -145,6 +145,7 @@
+ value = (type)NULL; \
+ } \
+
++#if PHP_VERSION_ID < 50399
+ #define IMAGICK_SAFE_MODE_CHECK(filename_, status_)\
+ if (filename_) { \
+ if (strlen(filename_) > MAXPATHLEN) { \
+@@ -156,7 +157,18 @@
+ if (php_check_open_basedir_ex(filename_, 0 TSRMLS_CC)) { \
+ status_ = IMAGICK_READ_WRITE_OPEN_BASEDIR_ERROR; \
+ } \
+- } \
++ }
++#else
++#define IMAGICK_SAFE_MODE_CHECK(filename_, status_)\
++ if (filename_) { \
++ if (strlen(filename_) > MAXPATHLEN) { \
++ status_ = IMAGICK_READ_WRITE_FILENAME_TOO_LONG; \
++ } \
++ if (php_check_open_basedir_ex(filename_, 0 TSRMLS_CC)) { \
++ status_ = IMAGICK_READ_WRITE_OPEN_BASEDIR_ERROR; \
++ } \
++ }
++#endif
+
+ #define IMAGICK_HAS_FORMAT(buffer, magick_wand, free_buffer)\
+ buffer = MagickGetImageFormat(magick_wand);\
diff --git a/python-pypi/bsddb3/DEPENDS b/python-pypi/bsddb3/DEPENDS
index a1180cb..855edcd 100755
--- a/python-pypi/bsddb3/DEPENDS
+++ b/python-pypi/bsddb3/DEPENDS
@@ -1,3 +1,3 @@
-depends db &&
-depends python
+. $SECTION_DIRECTORY/PY_DEPENDS &&
+depends db

diff --git a/python-pypi/bsddb3/HISTORY b/python-pypi/bsddb3/HISTORY
index bd96fa9..113fc0e 100644
--- a/python-pypi/bsddb3/HISTORY
+++ b/python-pypi/bsddb3/HISTORY
@@ -1,3 +1,6 @@
+2013-04-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DPENDS: python3 support
+
2012-02-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.3.0

diff --git a/python-pypi/pyfpdf/DEPENDS b/python-pypi/pyfpdf/DEPENDS
new file mode 100755
index 0000000..178a7f5
--- /dev/null
+++ b/python-pypi/pyfpdf/DEPENDS
@@ -0,0 +1,2 @@
+. $SECTION_DIRECTORY/PY_DEPENDS
+
diff --git a/python-pypi/pyfpdf/DETAILS b/python-pypi/pyfpdf/DETAILS
new file mode 100755
index 0000000..8ca35b2
--- /dev/null
+++ b/python-pypi/pyfpdf/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=pyfpdf
+ SPELLX=fpdf
+ VERSION=1.7
+
SOURCE_HASH=sha512:1896c141b7133b5efcf0d67dff94ecf4cf9553ca631867bbdd185ea92638845811f3e8be31bac40fb5be5112dda4807b9183b4e89d2a840324e09a109350db45
+ SOURCE=$SPELLX-$VERSION.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ WEB_SITE=http://code.google.com/p/$SPELL
+ SOURCE_URL[0]=http://pyfpdf.googlecode.com/files/$SOURCE
+ LICENSE[0]=LGPL
+ ENTERED=20130417
+ KEYWORDS="python pdf"
+ SHORT="PDF document generation"
+cat << EOF
+PyFPDF is a library for PDF document generation
+EOF
diff --git a/python-pypi/pyfpdf/HISTORY b/python-pypi/pyfpdf/HISTORY
new file mode 100644
index 0000000..e009cfe
--- /dev/null
+++ b/python-pypi/pyfpdf/HISTORY
@@ -0,0 +1,4 @@
+2013-04-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7
+ spell created
+
diff --git a/python-pypi/pyparsing/DEPENDS b/python-pypi/pyparsing/DEPENDS
index a86d429..0fda360 100755
--- a/python-pypi/pyparsing/DEPENDS
+++ b/python-pypi/pyparsing/DEPENDS
@@ -1 +1,6 @@
-depends python
+if [[ $PYPARSING_BRANCH == 1.5 ]]; then
+ depends python
+ depends SETUPTOOLS
+else
+ depends python3
+fi
diff --git a/python-pypi/pyparsing/DETAILS b/python-pypi/pyparsing/DETAILS
index 41e0e7f..8652244 100755
--- a/python-pypi/pyparsing/DETAILS
+++ b/python-pypi/pyparsing/DETAILS
@@ -1,6 +1,11 @@
SPELL=pyparsing
- VERSION=1.5.6
-
SOURCE_HASH=sha512:614c1a016d121b7c4ecf90a164bbe323affd6cf72319c8494e9a583078ffa233c351627fc3e793307e407e043570f8301f112c4d86645dcd130220ed976289c8
+if [[ $PYPARSING_BRANCH == 1.5 ]]; then
+ VERSION=1.5.7
+
SOURCE_HASH=sha512:c8c2c6561934d2217af7e8e2225c67f138faa31cc30768930e917e01e872bda60479cce07278b1cc77f135504db7176ac8e3592231a585cbf078057ac56c4891
+else
+ VERSION=2.0.0
+
SOURCE_HASH=sha512:5b13d69c12fb362fbde883cf143df356c42141d8014a8e5b46185093bf17f2775499c6e1880ab8fb015ba4b3ca9334c4b34d0e249c0bef7d84984a03c0997a64
+fi
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
SOURCE_URL[1]="$SOURCEFORGE_URL/$SPELL/$SOURCE"
diff --git a/python-pypi/pyparsing/HISTORY b/python-pypi/pyparsing/HISTORY
index 3c607c9..c590e05 100644
--- a/python-pypi/pyparsing/HISTORY
+++ b/python-pypi/pyparsing/HISTORY
@@ -1,3 +1,9 @@
+2013-04-17 Treeve Jelbert <treeve AT sourcmage.org>
+ * DETAILS: version 1.5.7
+ alao 2.0.0
+ * PREPARE: added, support 20 branch, for python3
+ * DEPENDS: python3 support
+
2012-02-27 Treeve Jelbert <treeve AT sourcmage.org>
* DETAILS: version 1.5.6
new website, extra url
diff --git a/python-pypi/pyparsing/PREPARE b/python-pypi/pyparsing/PREPARE
new file mode 100755
index 0000000..e86e311
--- /dev/null
+++ b/python-pypi/pyparsing/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch 2.0 1.5
diff --git a/python-pypi/python-mpd/DETAILS b/python-pypi/python-mpd/DETAILS
index 339a61b..995721c 100755
--- a/python-pypi/python-mpd/DETAILS
+++ b/python-pypi/python-mpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=python-mpd
SPELLX=${SPELL}2
- VERSION=0.5.0
+ VERSION=0.5.1
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELLX/$SOURCE
-
SOURCE_HASH=sha512:b275c9ee0b98fa51b5396571504181cdf78e24b2a384ccd5bdadff2bd3ea29bb90811c43b269c369839b63b738545e45cf92e39063de181f898fbb78f77d1c0f
+
SOURCE_HASH=sha512:685b6c2b28c177bd265fc7535ebdf6c1a8c1954a2079dbae48637590364551adb8c8f74136ce8cf17db0a73328eba058d7bc5e8455caea213033f36cf999771d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=https://github.com/Mic92/python-mpd2
LICENSE[0]=LGPL
diff --git a/python-pypi/python-mpd/HISTORY b/python-pypi/python-mpd/HISTORY
index a9b0266..60605e7 100644
--- a/python-pypi/python-mpd/HISTORY
+++ b/python-pypi/python-mpd/HISTORY
@@ -1,3 +1,6 @@
+2013-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.5.1
+
2013-01-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.5.0; switched to hashsum
* jthalheim.gpg: removed
diff --git a/science-libs/eigen3/DETAILS b/science-libs/eigen3/DETAILS
index d97dfbd..5eaaae0 100755
--- a/science-libs/eigen3/DETAILS
+++ b/science-libs/eigen3/DETAILS
@@ -1,9 +1,9 @@
SPELL=eigen3
SPELLX=eigen
- VERSION=3.1.2
-
SOURCE_HASH=sha512:7f7cbada67fc4c63fd60ebfefaa2492432546e91e014a32103f958cd1f9644dff424a2e1046d8de51982dc9072873a96dfbe75e95a1529fd47880069989ae837
+ VERSION=3.1.3
+
SOURCE_HASH=sha512:7b6b816416570c9592ed9ca09e61970346f02bed492df7073fed3e657ded0c2bb736fb024554f92064ee783cbf1180952ccb87ed724899fa353f34c6a49210a4
SOURCE=$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/eigen-eigen-5097c01bcdc4
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/eigen-eigen-2249f9c22fe8
SOURCE_URL[0]=https://bitbucket.org/$SPELLX/$SPELLX/get/$SOURCE
WEB_SITE=http://eigen.tuxfamily.org
LICENSE[0]=LGPL
diff --git a/science-libs/eigen3/HISTORY b/science-libs/eigen3/HISTORY
index ba577d9..1372ec5 100644
--- a/science-libs/eigen3/HISTORY
+++ b/science-libs/eigen3/HISTORY
@@ -1,3 +1,6 @@
+2013-04-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.3
+
2013-01-01 Treeve Jelbert <treeve AT sourcemage.org>
* PROVIDES: added, for EIGEN

diff --git a/telephony/commoncpp2/DETAILS b/telephony/commoncpp2/DETAILS
index e29d8cb..a1b47af 100755
--- a/telephony/commoncpp2/DETAILS
+++ b/telephony/commoncpp2/DETAILS
@@ -1,6 +1,6 @@
SPELL=commoncpp2
- VERSION=1.8.0
-
SOURCE_HASH=sha512:2c4aafd7a0298534c908f2ea339cce158b745cc32dd3379eafe9f76ba5c2a4f7bf9d9f0d9d5fec3a4a41d559c28c07fef5773780e770623f60fb651cbb4e4804
+ VERSION=1.8.1
+
SOURCE_HASH=sha512:949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/commoncpp/$SOURCE
diff --git a/telephony/commoncpp2/HISTORY b/telephony/commoncpp2/HISTORY
index 92b41eb..6f661f4 100644
--- a/telephony/commoncpp2/HISTORY
+++ b/telephony/commoncpp2/HISTORY
@@ -1,3 +1,8 @@
+2013-04-17 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: version 1.8.1
+ * sde-statfix.patch: Bug 190. Unreferenced functions now in
+ sys/stat.h
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/telephony/commoncpp2/PRE_BUILD b/telephony/commoncpp2/PRE_BUILD
new file mode 100755
index 0000000..2679f9b
--- /dev/null
+++ b/telephony/commoncpp2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/sde-statfix.patch
diff --git a/telephony/commoncpp2/sde-statfix.patch
b/telephony/commoncpp2/sde-statfix.patch
new file mode 100644
index 0000000..7b97b11
--- /dev/null
+++ b/telephony/commoncpp2/sde-statfix.patch
@@ -0,0 +1,63 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../commonc++/commoncpp2-1.8.1-statfix.patch
+# Copyright (C) 2012 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff -Nur commoncpp2-1.8.1.orig/src/applog.cpp
commoncpp2-1.8.1/src/applog.cpp
+--- commoncpp2-1.8.1.orig/src/applog.cpp 2010-10-31 17:11:55.000000000 -0600
++++ commoncpp2-1.8.1/src/applog.cpp 2012-01-22 19:23:13.639292789 -0700
+@@ -45,6 +45,7 @@
+ #include <cstdlib>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <sys/stat.h>
+
+ // TODO sc: test if has to move up now that it is into commoncpp
+ // NOTE: the order of inclusion is important do not move following include
line
+@@ -297,7 +298,7 @@
+ else
+ {
+ // create pipe
+- int err = mkfifo(_nomeFile.c_str(), S_IREAD | S_IWRITE);
++ int err = mkfifo(_nomeFile.c_str(), S_IRUSR | S_IWUSR);
+ if (err == 0 || errno == EEXIST)
+ {
+ // and open it
+@@ -342,7 +343,7 @@
+ else
+ {
+ // create pipe
+- int err = mkfifo(_nomeFile.c_str(), S_IREAD | S_IWRITE);
++ int err = mkfifo(_nomeFile.c_str(), S_IRUSR | S_IWUSR);
+ if (err == 0 || errno == EEXIST)
+ {
+ // and open it
+@@ -456,7 +457,7 @@
+ else
+ {
+ // create pipe
+- int err = mkfifo(d->_nomeFile.c_str(), S_IREAD | S_IWRITE);
++ int err = mkfifo(d->_nomeFile.c_str(), S_IRUSR | S_IWUSR);
+ if (err == 0 || errno == EEXIST)
+ {
+ // and open it
+@@ -562,7 +563,7 @@
+ else
+ {
+ // create pipe
+- int err = mkfifo(d->_nomeFile.c_str(), S_IREAD | S_IWRITE);
++ int err = mkfifo(d->_nomeFile.c_str(), S_IRUSR | S_IWUSR);
+ if (err == 0 || errno == EEXIST)
+ {
+ // and open it
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 2689dd5..a4b775a 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -8,6 +8,7 @@ cd "${SOURCE_DIRECTORY}" &&
--audio-drv-list="$QEMU_AUDIO" \
--audio-card-list="$QEMU_CARDS" \
$QEMU_KVM \
+ $QEMU_VNC \
$OPTS &&

make
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index ecf3292..2d81f2e 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -1,10 +1,6 @@
. "$GRIMOIRE/FUNCTIONS" &&

-if is_version_less $QEMU_VER 0.15; then
- local QEMU_ARCH_FILE=archs
-else
- local QEMU_ARCH_FILE=archs-0.15
-fi &&
+local QEMU_ARCH_FILE=archs

local QEMU_ARCH_LIST=`cat $SPELL_DIRECTORY/$QEMU_ARCH_FILE` &&
persistent_add QEMU_ARCHS &&
@@ -32,13 +28,11 @@ fi
config_query_multi QEMU_AUDIO "Select sound system(s) to support" \
oss alsa sdl esd pa fmod &&

-if is_version_less $QEMU_VER 0.14; then
- config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
- ac97 es1370 sb16 cs4231a adlib gus
-else
- config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
- hda ac97 es1370 sb16 cs4231a adlib gus
-fi &&
+config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
+ hda ac97 es1370 sb16 cs4231a adlib gus &&

config_query_option QEMU_KVM "Enable KVM acceleration support" y \
- "" "--disable-kvm"
+ "" "--disable-kvm" &&
+
+config_query_option QEMU_VNC "Enable VNC support?" y \
+ '--enable-vnc' '--disable-vnc --disable-vnc-sasl
--disable-vnc-jpeg --disable-vnc-png --disable-vnc-ws'
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 78f182a..25c938d 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -14,46 +14,64 @@ if list_find "esd" $QEMU_AUDIO; then
depends esound
fi &&

-case $QEMU_VER in
- 0.12|*)
- optional_depends sdl \
- "--enable-sdl" \
- "--disable-sdl" \
- "for graphical output (recommended)" &&
-
- optional_depends curl \
- "--enable-curl" \
- "--disable-curl" \
- "for curl connectivity support" &&
-
- optional_depends BLUEZ \
- "--enable-bluez" \
- "--disable-bluez" \
- "for Bluetooth support" &&
-
- optional_depends ncurses \
- "--enable-curses" \
- "--disable-curses" \
- "for curses output" &&
-
- suggest_depends gnutls \
- "--enable-vnc-tls" \
- "--disable-vnc-tls" \
- "to enable TLS encryption for VNC server" &&
-
- suggest_depends LIBSASL \
- "--enable-vnc-sasl" \
- "--disable-vnc-sasl" \
- "to enable SASL encryption for VNC server"
- ;;
-esac &&
-
- suggest_depends bridge-utils \
- '' \
- '' \
- "for creating TUN/TAP bridges" &&
-
- suggest_depends iproute2 \
- "" \
- "" \
- "for routing between TUN/TAP interfaces"
+optional_depends sdl \
+ "--enable-sdl" \
+ "--disable-sdl" \
+ "for graphical output (recommended)" &&
+
+optional_depends curl \
+ "--enable-curl" \
+ "--disable-curl" \
+ "for curl connectivity support" &&
+
+optional_depends BLUEZ \
+ "--enable-bluez" \
+ "--disable-bluez" \
+ "for Bluetooth support" &&
+
+optional_depends ncurses \
+ "--enable-curses" \
+ "--disable-curses" \
+ "for curses output" &&
+
+optional_depends attr \
+ '--enable-attr' \
+ '--disable-attr' \
+ 'for attr/xattr support in XFS' &&
+
+optional_depends libcap-ng \
+ '--enable-cap-ng' \
+ '--disable-cap-ng' \
+ 'for expanded Linux POSIX API capabilities' &&
+
+if [[ "x$QEMU_VNC" == "x--enable-vnc" ]]; then
+ suggest_depends gnutls \
+ "--enable-vnc-tls" \
+ "--disable-vnc-tls" \
+ "to enable TLS encryption for VNC server" &&
+
+ suggest_depends LIBSASL \
+ "--enable-vnc-sasl" \
+ "--disable-vnc-sasl" \
+ "to enable SASL encryption for VNC server" &&
+
+ suggest_depends JPEG \
+ '--enable-vnc-jpeg' \
+ '--disable-vnc-jpeg' \
+ 'for JPEG lossy compression for VNC server' &&
+
+ suggest_depends libpng \
+ '--enable-vnc-png' \
+ '--disable-vnc-png' \
+ 'for PNG compression for VNC server'
+fi &&
+
+suggest_depends bridge-utils \
+ '' \
+ '' \
+ "for creating TUN/TAP bridges" &&
+
+suggest_depends iproute2 \
+ "" \
+ "" \
+ "for routing between TUN/TAP interfaces"
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 6d01434..b2ae39e 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,43 +1,12 @@
SPELL=qemu
-case $QEMU_VER in
- 0.12)
- VERSION=0.12.5
- ;;
- 0.13)
- VERSION=0.13.0
- ;;
- 0.14)
- VERSION=0.14.1
- ;;
- 0.15)
- VERSION=0.15.1
- ;;
- 1.0)
- VERSION=1.0.1
- ;;
- *)
- VERSION=1.1.1-1
- ;;
-esac
-if [ $QEMU_VER = 1.1 ]; then
+ VERSION=1.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
-else
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-fi
-case $QEMU_VER in
- 0.12|0.14)
- SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
- ;;
- *)
SOURCE_URL[0]=http://wiki.qemu.org/download/$SOURCE
- ;;
-esac
- SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=$SOURCE_URL.sig
- SOURCE_GPG="qemu.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE2_IGNORE=signature
+ SOURCE_GPG="qemu.gpg:${SOURCE2}:UPSTREAM_KEY"
DISTCC_HOSTS=
LICENSE[0]=GPL
LICENSE[1]=LGPL
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index d60a43b..e3f503b 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,13 @@
+2013-04-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.4.1
+ Removed branches, they no longer (even 1.1) compile without work.
+ * CONFIGURE: Query for enabling VNC
+ * DEPENDS: Optionally depends on libcap-ng
+ Move VNC-specific optional dependencies into a VNC enabled check
+ * BUILD: Pass $QEMU_VNC to ./configure
+ * PRE_BUILD, cflags.patch, archs-0.15: Removed
+ * archs: Updated to 1.4.1 architecture list
+
2012-08-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1.1-1 (branch 1.1); removed tabs

diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
index a322469..f2f6cf3 100755
--- a/utils/qemu/PREPARE
+++ b/utils/qemu/PREPARE
@@ -1,6 +1 @@
-if [[ ${#QEMU_VER} -gt 4 ]]; then
- QEMU_VER=${QEMU_VER%.*}
-fi
-
-config_query_list QEMU_VER "Which branch to build?" \
- 1.1 1.0 0.15 0.14 0.13 0.12
+persistent_remove QEMU_VER
diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
deleted file mode 100755
index 428663f..0000000
--- a/utils/qemu/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ "${QEMU_VER:0:4}" == "0.15" ]]; then
- patch -p0 < "$SPELL_DIRECTORY/cflags.patch"
-fi
diff --git a/utils/qemu/archs b/utils/qemu/archs
index 1b295fe..fbbe31a 100644
--- a/utils/qemu/archs
+++ b/utils/qemu/archs
@@ -1,32 +1,47 @@
alpha-linux-user alpha on
-i386-linux-user i386 on
arm-linux-user arm on
armeb-linux-user armeb on
cris-linux-user cris on
+i386-linux-user i386 on
m68k-linux-user m68k on
+microblaze-linux-user microblaze on
+microblazeel-linux-user microblazeel on
mips-linux-user mips on
mipsel-linux-user mipsel on
+or32-linux-user or32 on
ppc-linux-user ppc on
ppc64-linux-user ppc64 on
ppc64abi32-linux-user ppc64abi32 on
+s390x-linux-user s390x on
+sh4-linux-user sh4 on
+sh4eb-linux-user sh4eb on
sparc-linux-user sparc on
sparc32plus-linux-user sparc32plus on
sparc64-linux-user sparc64 on
-sh4-linux-user sh4 on
-sh4eb-linux-user sh4eb on
+unicore32-linux-user unicore32 on
x86_64-linux-user x86_64 on
-i386-softmmu i386-sofmmu on
-ppc-softmmu ppc-softmmu on
-ppcemb-softmmu ppcemb-softmmu on
-ppc64-softmmu ppc64-softmmu on
-sparc-softmmu sparc-softmmu on
-x86_64-softmmu x86_64-softmmu on
+alpha-softmmu alpha-softmmu on
+arm-softmmu arm-softmmu on
+cris-softmmu cris-softmmu on
+i386-softmmu i386-softmmu on
+lm32-softmmu lm32-softmmu on
+m68k-softmmu m68k-softmmu on
+microblaze-softmmu microblaze-softmmu on
+microblazeel-softmmu microblazeel-softmmu on
mips-softmmu mips-softmmu on
-mipsel-softmmu mipsel-softmmu on
mips64-softmmu mips64-softmmu on
mips64el-softmmu mips64el-softmmu on
-arm-softmmu arm-softmmu on
-m68k-softmmu m68k-softmmu on
-cris-softmmu cris-softmmu on
+mipsel-softmmu mipsel-softmmu on
+or32-softmmu or32-softmmu on
+ppc-softmmu ppc-softmmu on
+ppc64-softmmu ppc64-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+s390x-softmmu s390x-softmmu on
sh4-softmmu sh4-softmmu on
sh4eb-softmmu sh4eb-softmmu on
+sparc-softmmu sparc-softmmu on
+sparc64-softmmu sparc64-softmmu on
+unicore32-softmmu unicore32-softmmu on
+x86_64-softmmu x86_64-softmmu on
+xtensa-softmmu xtensa-softmmu on
+xtensaeb-softmmu xtensaeb-softmmu on
diff --git a/utils/qemu/archs-0.15 b/utils/qemu/archs-0.15
deleted file mode 100644
index a062278..0000000
--- a/utils/qemu/archs-0.15
+++ /dev/null
@@ -1,41 +0,0 @@
-alpha-linux-user alpha on
-armeb-linux-user armeb on
-arm-linux-user arm on
-cris-linux-user cris on
-i386-linux-user i386 on
-m68k-linux-user m68k on
-microblazeel-linux-user microblazeel on
-microblaze-linux-user microblaze on
-mipsel-linux-user mipsel on
-mips-linux-user mips on
-ppc64abi32-linux-user ppc64abi32 on
-ppc64-linux-user ppc64 on
-ppc-linux-user ppc on
-s390x-linux-user s390x on
-sh4eb-linux-user sh4eb on
-sh4-linux-user sh4 on
-sparc32plus-linux-user sparc32plus on
-sparc64-linux-user sparc64 on
-sparc-linux-user sparc on
-unicore32-linux-user unicore32 on
-x86_64-linux-user x86_64 on
-arm-softmmu arm-softmmu on
-cris-softmmu cris-softmmu on
-i386-softmmu i386-softmmu on
-lm32-softmmu lm32-softmmu on
-m68k-softmmu m68k-softmmu on
-microblazeel-softmmu microblazeel-softmmu on
-microblaze-softmmu microblaze-softmmu on
-mips64el-softmmu mips64el-softmmu on
-mips64-softmmu mips64-softmmu on
-mipsel-softmmu mipsel-softmmu on
-mips-softmmu mips-softmmu on
-ppc64-softmmu ppc64-softmmu on
-ppcemb-softmmu ppcemb-softmmu on
-ppc-softmmu ppc-softmmu on
-s390x-softmmu s390x-softmmu on
-sh4eb-softmmu sh4eb-softmmu on
-sh4-softmmu sh4-softmmu on
-sparc64-softmmu sparc64-softmmu on
-sparc-softmmu sparc-softmmu on
-x86_64-softmmu x86_64-softmmu on
diff --git a/utils/qemu/cflags.patch b/utils/qemu/cflags.patch
deleted file mode 100644
index 58b66e7..0000000
--- a/utils/qemu/cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2011-08-17 17:16:32.000000000 +0400
-+++ configure 2011-08-17 17:16:41.785907691 +0400
-@@ -2538,7 +2538,7 @@
- }
- EOF
- if ! compile_prog "" "" ; then
-- CFLAGS+="-march=i486"
-+ CFLAGS+=" -march=i486"
- fi
- fi
-


  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (a0641a55ae4014e50066eaca6a6c895c572850ef), Eric Sandall, 04/19/2013

Archive powered by MHonArc 2.6.24.

Top of Page