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/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 &&
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