Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (f0a369bfa2d1255716346f817fb5708ac507d0f6)
  • Date: Thu, 11 Apr 2013 13:38:30 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

ChangeLog | 7 ++
crypto/gnutls/DETAILS | 12 ----
crypto/gnutls/HISTORY | 3 +
dev/null |binary
devel/git/DETAILS | 8 +--
devel/git/HISTORY | 3 +
disk/udisks2/DETAILS | 4 -
disk/udisks2/HISTORY | 3 +
doc/evince/DEPENDS | 1
doc/evince/HISTORY | 3 +
gnome2-libs/libsoup/DETAILS | 4 -
gnome2-libs/libsoup/HISTORY | 3 +
gnome2-libs/libsoup/libsoup-2.42.0.tar.xz.sig |binary
graphics-libs/openjpeg/BUILD | 3 -
graphics-libs/openjpeg/DETAILS | 5 +-
graphics-libs/openjpeg/HISTORY | 7 ++
graphics-libs/openjpeg/INSTALL | 1
graphics/imagemagick/DETAILS | 4 -
graphics/imagemagick/HISTORY | 3 +
graphics/shotwell/DETAILS | 4 -
graphics/shotwell/HISTORY | 3 +
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 -----------
libs/libvirt/DETAILS | 2
libs/libvirt/HISTORY | 3 +
libs/libvirt/libvirt-1.0.4.tar.gz.sig |binary
lua-forge/lua/DETAILS | 6 +-
lua-forge/lua/HISTORY | 3 +
lua-forge/lua/lua.pc | 2
printer/ghostscript/DEPENDS | 5 --
printer/ghostscript/HISTORY | 3 +
ruby-raa/ruby-1.8/CONFLICTS | 1
ruby-raa/ruby-1.8/HISTORY | 3 +
ruby-raa/ruby-1.9/CONFLICTS | 1
ruby-raa/ruby-1.9/HISTORY | 3 +
ruby-raa/ruby-2.0/BUILD | 3 +
ruby-raa/ruby-2.0/CONFIGURE | 8 +++
ruby-raa/ruby-2.0/CONFLICTS | 4 +
ruby-raa/ruby-2.0/DEPENDS | 6 ++
ruby-raa/ruby-2.0/DETAILS | 19 +++++++
ruby-raa/ruby-2.0/HISTORY | 3 +
ruby-raa/ruby-2.0/INSTALL | 5 ++
ruby-raa/ruby-2.0/PROVIDES | 1
ruby-raa/ruby-enterprise-edition/CONFLICTS | 1
ruby-raa/ruby-enterprise-edition/HISTORY | 3 +
video/miro/DETAILS | 4 -
video/miro/HISTORY | 4 +
video/miro/PRE_BUILD | 4 -
video/miro/ffmpeg.patch | 63
--------------------------
x11/nxcomp/0001-respect-CXXFLAGS.patch | 26 ++++++++++
x11/nxcomp/DEPENDS | 3 -
x11/nxcomp/DETAILS | 10 ++--
x11/nxcomp/HISTORY | 7 ++
x11/nxcomp/PRE_BUILD | 3 -
x11/nxproxy/0001-respect-CXXFLAGS.patch | 28 +++++++++++
x11/nxproxy/DEPENDS | 2
x11/nxproxy/DETAILS | 15 ++++++
x11/nxproxy/HISTORY | 3 +
x11/nxproxy/PRE_BUILD | 4 +
x11/x2goclient/BUILD | 1
x11/x2goclient/DEPENDS | 7 ++
x11/x2goclient/DETAILS | 20 ++++++++
x11/x2goclient/HISTORY | 3 +
x11/x2goclient/INSTALL | 8 +++
75 files changed, 304 insertions(+), 187 deletions(-)

New commits:
commit 8bbb1600b9a6c037647617f9e05b52cb85c7d13a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/x2goclient: new spell, Qt client for the x2go remote desktop

commit da99114c4f62929e81276eaf11cd758da87be8b9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/nxproxy: new spell, NX proxy library

commit 3a083bdc3d670207f5aca3df19fa6f21263daa73
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/nxcomp: enforce CXXFLAGS

commit 4019008eb977b2d356244f58ee5a8e40b79490d1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/git: version 1.8.2.1

commit 84654d0b6cfe7bb23620a3e530059b136c757e97
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/imagemagick: version 6.8.4-8

commit 176d77a0e32e109e5cb47a08f6c195e6c901d0fc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/nxcomp: version 3.5.0-2

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

libvirt 1.0.4

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

gnutls 3.1.10 and 3.0.29

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

ghostscript - nolonger uses jasper

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

openjpeg: => 1.5.1

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

evince depends on libsecret

checking for LIBSECRET... no
configure: error: Package requirements (libsecret-1 >= 0.5) were not
met:

No package 'libsecret-1' found

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

http/webkitgtk3: version 2.0.0

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

http/webkitgtk: version 2.0.0

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

gnome2-libs/libsoup: version 2.42.0

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

shotwell 0.14.1

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

ruby-enterprise-edition - conflicts ruby-2.0

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

ruby-1.9 - conflicts ruby-2.0

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

ruby-1.8 - conflicts ruby-2.0

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

ruby-2.0: => 2.0.0-p0

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

udisks2: => 2.1.0

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

miro 6.0

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

lua 5.2.2

diff --git a/ChangeLog b/ChangeLog
index ce3150c..a514d78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
+
+2013-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * ruby-raa/ruby-2.0: new stable version of ruby
+
2013-04-05 Ismael Luceno <ismael AT sourcemage.org>
* audio-libs/flake: new spell, FLAC audio encoder

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 2ee4940..465f9a0 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -47,26 +47,18 @@ case $GNUTLS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.bz2
;;
3.0)
- VERSION=3.0.28
+ VERSION=3.0.29
SOURCE=$SPELL-$VERSION.tar.xz
;;
3.1)
- VERSION=3.1.9.1
- VX=3.1.9
+ VERSION=3.1.10
SOURCE=$SPELL-$VERSION.tar.xz
;;
esac

SOURCE2=$SOURCE.sig
SECURITY_PATCH=8
-case $GNUTLS_BRANCH in
- 3.1)
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VX
- ;;
- *)
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- ;;
-esac
SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v$GNUTLS_BRANCH/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 03619f2..ae92e80 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2013-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.1.10 and 3.0.29
+
2013-03-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 3.1.9.1

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 799c41b..debe309 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
SPELL=git
- VERSION=1.8.2
+ VERSION=1.8.2.1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
-
SOURCE_HASH=sha512:08274649a525879e2e5a6940cfd6e8b48c30e551ca1b63c7c73198a4777b643e60a0fd2a51bc6f4623b438d5168dd53c42b4daf87b80d52cfac3cd1cfa368976
+
SOURCE_HASH=sha512:d75a36a91b0522ca3a5c792473e16fc98dd9de082b4c0e9a75ebc525fa334edfdcb6dbf138e1bdede711f2158f24e8a8ba8499b89f9a82be1b5e60eb4ba5d33e
SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.gz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-
SOURCE3_HASH=sha512:6f8fa833b31fb8b3c0d9ce1cbc05ef3295c4ecc15703e878b5f1a86244241db399b20b5ee167cbf8989b70c6d72efa3410d47adc9b31b648bc2c901d9041d238
+
SOURCE3_HASH=sha512:a6463c8bc8a23301d89e985b88fa0073c154e126c51a1f7699cd09e79723ed463f46a9cf5dd63f9e2e46ee4111e6154ae86553bd446f5cf76db9fd4e3bff5a1f
SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-
SOURCE5_HASH=sha512:0665ec103487ee2b796607b5d19492d60ee2b62af46a87f38fa5973da66ca6fc75f5df5f8a3fd8e926a28c578ff30342e52f25da7084fc02c685289fc7d7689b
+
SOURCE5_HASH=sha512:8e7f25a0b230473f9e9290f61e9ea80a675459eea163ef76e281aa95747f5bc4df2ddb7f9bba9c2b0fb75819cd206f2415ba665bc986a628a07e8da4e5aa6efc
SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index c883173..9900e1a 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.2.1
+
2013-03-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.2

diff --git a/disk/udisks2/DETAILS b/disk/udisks2/DETAILS
index a5e6855..d80cb49 100755
--- a/disk/udisks2/DETAILS
+++ b/disk/udisks2/DETAILS
@@ -1,6 +1,6 @@
SPELL=udisks2
- VERSION=2.0.1
-
SOURCE_HASH=sha512:c8baadd9fd182a52e93eb4a182f6de42f59f429518236c00819f28ee726334c5dddb7366f874381b56211ffb41e3c915c63a482195443fc0b3dc95d513b4555a
+ VERSION=2.1.0
+
SOURCE_HASH=sha512:dffbceda998aee62f56819111db7c33fd65b8295d14885f28f8209be332ab319353116d51e2c006e434865ac515db04c7d8f5d2639ab9870247cf49136747811
# SECURITY_PATCH=2
SOURCE="${SPELL//2}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://udisks.freedesktop.org/releases/$SOURCE
diff --git a/disk/udisks2/HISTORY b/disk/udisks2/HISTORY
index 059fa2c..e81bdde 100644
--- a/disk/udisks2/HISTORY
+++ b/disk/udisks2/HISTORY
@@ -1,3 +1,6 @@
+2013-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.1.0
+
2012-12-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.0.1

diff --git a/doc/evince/DEPENDS b/doc/evince/DEPENDS
index 5b1b937..721a339 100755
--- a/doc/evince/DEPENDS
+++ b/doc/evince/DEPENDS
@@ -10,6 +10,7 @@ depends shared-mime-info &&
depends gnome-icon-theme &&
depends xml-parser-expat &&
depends itstool &&
+depends libsecret &&

runtime_depends gsettings-desktop-schemas &&

diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index 6a36b3a..2a341c6 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2013-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: libsecret added
+
2013-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.8.0

diff --git a/gnome2-libs/libsoup/DETAILS b/gnome2-libs/libsoup/DETAILS
index ae86753..0223b49 100755
--- a/gnome2-libs/libsoup/DETAILS
+++ b/gnome2-libs/libsoup/DETAILS
@@ -1,9 +1,9 @@
SPELL=libsoup
if [[ $LIBSOUP_DEVEL == y ]]; then
- VERSION=2.40.1
+ VERSION=2.42.0
SOURCE=$SPELL-$VERSION.tar.xz
else
- VERSION=2.40.1
+ VERSION=2.42.0
SOURCE=$SPELL-$VERSION.tar.xz
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index c0008c3..a1a1875 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,6 @@
+2013-04-09 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.42.0
+
2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: removed dependencies on icu, libffi and pcre, added
optional dependency on gobject-introspection
diff --git a/gnome2-libs/libsoup/libsoup-2.40.1.tar.xz.sig
b/gnome2-libs/libsoup/libsoup-2.40.1.tar.xz.sig
deleted file mode 100644
index d0ea26b..0000000
Binary files a/gnome2-libs/libsoup/libsoup-2.40.1.tar.xz.sig and /dev/null
differ
diff --git a/gnome2-libs/libsoup/libsoup-2.42.0.tar.xz.sig
b/gnome2-libs/libsoup/libsoup-2.42.0.tar.xz.sig
new file mode 100644
index 0000000..8de5f5e
Binary files /dev/null and b/gnome2-libs/libsoup/libsoup-2.42.0.tar.xz.sig
differ
diff --git a/graphics-libs/openjpeg/BUILD b/graphics-libs/openjpeg/BUILD
index 1741c07..e013b8d 100755
--- a/graphics-libs/openjpeg/BUILD
+++ b/graphics-libs/openjpeg/BUILD
@@ -1,2 +1 @@
-LDFLAGS="-lm $LDFLAGS" &&
-default_build
+cmake_build
diff --git a/graphics-libs/openjpeg/DETAILS b/graphics-libs/openjpeg/DETAILS
index b5460bc..4e58e5a 100755
--- a/graphics-libs/openjpeg/DETAILS
+++ b/graphics-libs/openjpeg/DETAILS
@@ -1,6 +1,7 @@
SPELL=openjpeg
- VERSION=1.5.0
-
SOURCE_HASH=sha512:59501fde86a7f0ab5a1b7e369feb9c4dcb8ea67ead8ffd706592cbba1e0ee7b2a2a9aaa32778632febe0c3dc4171c7af738c5899c732eb420358df3b16d7cf47
+ VERSION=1.5.1
+
SOURCE_HASH=sha512:7b6c6889eb478008bd659cf2f2dcc0551ebb0c15f6765d1df04bc75208acb300929e399d0ea9b5c69a6d43b39cd1e58ab94bc71c3b6efdfba35903f46b54dd2d
+ SECURITY_PATCH=1
# SOURCE_GPG="gurus.gpg:$SOURCE.sig"
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
diff --git a/graphics-libs/openjpeg/HISTORY b/graphics-libs/openjpeg/HISTORY
index 14d71a5..81cc49b 100644
--- a/graphics-libs/openjpeg/HISTORY
+++ b/graphics-libs/openjpeg/HISTORY
@@ -1,3 +1,10 @@
+2013-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.1
+ SECURITY_PATCH=1
+ fixes CVE-2012-3535, CVE-2012-3358
+ * BUILD: use cmake_build
+ * INSTALL: deleted
+
2012-04-17 Sukneet Basuta <sukneet AT sourcemage.org>
* BUILD: lets use default_build since cmake doesn't
symlink /usr/include/openjpeg.h ->
/usr/include/openjpeg-1.5/openjpeg.h
diff --git a/graphics-libs/openjpeg/INSTALL b/graphics-libs/openjpeg/INSTALL
deleted file mode 100755
index d6420d4..0000000
--- a/graphics-libs/openjpeg/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make install PREFIX=$INSTALL_ROOT/usr
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index fe06d54..59ea3a5 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.8.4-6
+ VERSION=6.8.4-8
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:35d6d883351818a52f0dd0d23434fa53bb60b564fdbecb608f537aef2b7ddde2de38ab726146a42d1c3456196009786a7bcfd3db89fe3e2001f43d70ada95a69
+
SOURCE_HASH=sha512:faf3adbdb528f2c7571af097feffe86fdfe09b868a7889689cd009f11ef1e2e54f491031a8b2f080ba38f35196380e836981df537d364cfde5aef0e615c5c971
# 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 c33bcf2..16590b5 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.8.4-8
+
2013-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.8.4-6

diff --git a/graphics/shotwell/DETAILS b/graphics/shotwell/DETAILS
index 0c65465..10c0491 100755
--- a/graphics/shotwell/DETAILS
+++ b/graphics/shotwell/DETAILS
@@ -1,11 +1,11 @@
SPELL=shotwell
- VERSION=0.14.0
+ VERSION=0.14.1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://yorba.org/download/shotwell/${VERSION::4}/$SOURCE
WEB_SITE=http://yorba.org/shotwell/
ENTERED=20100709
-
SOURCE_HASH=sha512:ec1c082a9de3e898fa14c23dffdb248f34cf2bf27556730891ad3274ca0efec84617b334b3d16dc1edaa05df257a61df0f592ea55d9f34dfb15e36ae8f18b320
+
SOURCE_HASH=sha512:cefc5130b7fd5bd2b7d7889c5ebba01e9a447e885ece8353e42cd4cd515c068722d2460a2cdf31a94824605091c06042e086986aff8fe2dd0b589ad2a2dce20b
LICENSE[0]=GPL
SHORT="digital photo organizer"
cat << EOF
diff --git a/graphics/shotwell/HISTORY b/graphics/shotwell/HISTORY
index defeac5..39d27d8 100644
--- a/graphics/shotwell/HISTORY
+++ b/graphics/shotwell/HISTORY
@@ -1,3 +1,6 @@
+2013-04-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.14.1
+
2013-03-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.14.0
* BUILD: added
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 719a5d9..4e6911d 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,5 +1,4 @@
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 d2cebdd..129adc3 100755
--- a/http/webkitgtk/CONFIGURE
+++ b/http/webkitgtk/CONFIGURE
@@ -1,6 +1,5 @@
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 e36a940..d62dcb7 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 &&
+depends gtk+2 '--with-gtk=2.0 --disable-webkit2' &&
depends icu &&
depends gperf &&
depends libpng &&
@@ -14,6 +14,8 @@ depends libsoup &&
depends enchant &&
depends libxt &&
depends RUBY &&
+depends libwebp &&
+depends libsecret &&

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

-optional_depends gst-plugins-base \
+optional_depends gst-plugins-base-1.0 \
"--enable-video" \
"--disable-video" \
"for HTML5 streaming video support" &&
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 0b1cf0b..8870763 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,20 +1,20 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=1.10.2
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+
SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
- VERSION=1.10.2
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+
SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
- PATCHLEVEL=1
+ PATCHLEVEL=0
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 44ee84d..1363ea5 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,12 @@
+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 cdd362a..5003c3c 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
+sed -i '29i #include "../../../JavaScriptCore/icu/unicode/utf8.h"' \
+ Source/WebCore/platform/text/TextCodecUTF8.h
diff --git a/http/webkitgtk/opengl-headers.patch
b/http/webkitgtk/opengl-headers.patch
deleted file mode 100644
index 0ff8fee..0000000
--- a/http/webkitgtk/opengl-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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 d93409a..9207d63 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,4 +1,3 @@
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 8062770..15b4b63 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 &&
+depends gtk+3 '--with-gtk=3.0' &&
depends icu &&
depends gperf &&
depends libpng &&
@@ -16,6 +16,8 @@ depends libxt &&
depends perl &&
depends PYTHON &&
depends RUBY &&
+depends libwebp &&
+depends libsecret &&

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

-optional_depends gst-plugins-base \
+optional_depends gst-plugins-base-1.0 \
"--enable-video" \
"--disable-video" \
"for HTML5 streaming video support" &&
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 27a7654..4f5be4d 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk3
- VERSION=1.10.2
+ VERSION=2.0.0
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+
SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
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 0e90558..a0fca17 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,11 @@
+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 cdd362a..5003c3c 100755
--- a/http/webkitgtk3/PRE_BUILD
+++ b/http/webkitgtk3/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
+sed -i '29i #include "../../../JavaScriptCore/icu/unicode/utf8.h"' \
+ Source/WebCore/platform/text/TextCodecUTF8.h
diff --git a/http/webkitgtk3/opengl-headers.patch
b/http/webkitgtk3/opengl-headers.patch
deleted file mode 100644
index 0ff8fee..0000000
--- a/http/webkitgtk3/opengl-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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/libs/libvirt/DETAILS b/libs/libvirt/DETAILS
index 3e7c128..c3cf02c 100755
--- a/libs/libvirt/DETAILS
+++ b/libs/libvirt/DETAILS
@@ -1,5 +1,5 @@
SPELL=libvirt
- VERSION=1.0.1
+ VERSION=1.0.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index 085e0eb..42ef5f2 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,6 @@
+2013-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.4
+
2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.1
* DEPENDS: Optionally depends on fuse
diff --git a/libs/libvirt/libvirt-1.0.1.tar.gz.sig
b/libs/libvirt/libvirt-1.0.1.tar.gz.sig
deleted file mode 100644
index 8e6fe55..0000000
Binary files a/libs/libvirt/libvirt-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/libs/libvirt/libvirt-1.0.4.tar.gz.sig
b/libs/libvirt/libvirt-1.0.4.tar.gz.sig
new file mode 100644
index 0000000..71c6ebe
Binary files /dev/null and b/libs/libvirt/libvirt-1.0.4.tar.gz.sig differ
diff --git a/lua-forge/lua/DETAILS b/lua-forge/lua/DETAILS
index 4234f23..010d8db 100755
--- a/lua-forge/lua/DETAILS
+++ b/lua-forge/lua/DETAILS
@@ -1,11 +1,11 @@
SPELL=lua
- VERSION=5.2.1
- PATCHLEVEL=1
+ VERSION=5.2.2
+ PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.lua.org/ftp/$SOURCE
SOURCE_URL[1]=http://www.tecgraf.puc-rio.br/lua/mirror/ftp/$SOURCE
-
SOURCE_HASH=sha512:d0548d2cc2aa4fb4b5ae19d0ff675027370e3ee22d6e1ba448651c6f1f6f5e6b6214c81b760a23954f1e270936248bc021b9594a75191de4c1921e73d1ae48fb
+
SOURCE_HASH=sha512:7165c7c5cb5606abc6306338fac425604c2d432c9f1c6cef35d0cc353ebd4eb7e6ed7781d58fb1fedc4b9ac43f64055f57506d9b71d999278af9408c1f34f664
WEB_SITE=http://www.lua.org/
ENTERED=20020309
LICENSE[0]=MIT
diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index 40f66ff..b3cf35d 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,6 @@
+2013-04-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, lua.pc: 5.2.2
+
2012-09-29 Sukneet Basuta <sukneet AT sourcemage.org>
* PROVIDES: added since it looks like lua51 will be around for a while

diff --git a/lua-forge/lua/lua.pc b/lua-forge/lua/lua.pc
index d4113d8..be8c67e 100644
--- a/lua-forge/lua/lua.pc
+++ b/lua-forge/lua/lua.pc
@@ -5,7 +5,7 @@
# grep '^V=' ../Makefile
V= 5.2
# grep '^R=' ../Makefile
-R= 5.2.1
+R= 5.2.2

# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
prefix= /usr
diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index cb8e96d..73287b3 100755
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -41,11 +41,6 @@ optional_depends "ijs" \
"--without-ijs" \
"for IJS print protocol support" &&

-optional_depends "jasper" \
- "--with-jasper" \
- "--without-jasper" \
- "JPEG 2000 support" &&
-
optional_depends "openjpeg" \
"--enable-openjpeg" \
"--disable-openjpeg" \
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index e70b5ff..47e1581 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,6 @@
+2013-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove jasper
+
2013-02-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 9.07
* DEPENDS: remove lcms2, they use a patched version
diff --git a/ruby-raa/ruby-1.8/CONFLICTS b/ruby-raa/ruby-1.8/CONFLICTS
index c9a3c7f..75d7b2e 100755
--- a/ruby-raa/ruby-1.8/CONFLICTS
+++ b/ruby-raa/ruby-1.8/CONFLICTS
@@ -1,3 +1,4 @@
conflicts ruby y
conflicts ruby-1.9
+conflicts ruby-2.0
conflicts ruby-enterprise-edition
diff --git a/ruby-raa/ruby-1.8/HISTORY b/ruby-raa/ruby-1.8/HISTORY
index 059a715..4708f7b 100644
--- a/ruby-raa/ruby-1.8/HISTORY
+++ b/ruby-raa/ruby-1.8/HISTORY
@@ -1,3 +1,6 @@
+2013-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add ruby-2.0
+
2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply stdout-rouge-fix.patch
* stdout-rouge-fix.patch: Fix glibc 2.14+ compilation
diff --git a/ruby-raa/ruby-1.9/CONFLICTS b/ruby-raa/ruby-1.9/CONFLICTS
index ffd847b..786eafb 100755
--- a/ruby-raa/ruby-1.9/CONFLICTS
+++ b/ruby-raa/ruby-1.9/CONFLICTS
@@ -1,3 +1,4 @@
conflicts ruby y
conflicts ruby-1.8
+conflicts ruby-2.0
conflicts ruby-enterprise-edition
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 1d24d27..949dcd3 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2013-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add ruby-2.0
+
2013-02-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.9.3-p392; SECURITY_PATCH++
(CVE-2013-0269)

diff --git a/ruby-raa/ruby-2.0/BUILD b/ruby-raa/ruby-2.0/BUILD
new file mode 100755
index 0000000..2789a74
--- /dev/null
+++ b/ruby-raa/ruby-2.0/BUILD
@@ -0,0 +1,3 @@
+OPTS="$OPTS --enable-shared --enable-pthread" &&
+CFLAGS="${CFLAGS/-fomit-frame-pointer/}" &&
+default_build
diff --git a/ruby-raa/ruby-2.0/CONFIGURE b/ruby-raa/ruby-2.0/CONFIGURE
new file mode 100755
index 0000000..c2d0f1e
--- /dev/null
+++ b/ruby-raa/ruby-2.0/CONFIGURE
@@ -0,0 +1,8 @@
+message "Building documentation can take a long time and" &&
+message "consume a lot of memory." &&
+if spell_ok ruby; then
+ persistent_read ruby RUBY_DOCS RUBY_DOCS_DEF
+fi &&
+config_query RUBY_DOCS \
+ "Do you want to build documentation?" \
+ ${RUBY_DOCS_DEF:-n}
diff --git a/ruby-raa/ruby-2.0/CONFLICTS b/ruby-raa/ruby-2.0/CONFLICTS
new file mode 100755
index 0000000..9f6aa10
--- /dev/null
+++ b/ruby-raa/ruby-2.0/CONFLICTS
@@ -0,0 +1,4 @@
+conflicts ruby y
+conflicts ruby-1.8
+conflicts ruby-1.9
+conflicts ruby-enterprise-edition
diff --git a/ruby-raa/ruby-2.0/DEPENDS b/ruby-raa/ruby-2.0/DEPENDS
new file mode 100755
index 0000000..8c5f8c3
--- /dev/null
+++ b/ruby-raa/ruby-2.0/DEPENDS
@@ -0,0 +1,6 @@
+optional_depends doxygen "" "--disable-install-doc" "install documentation"
&&
+optional_depends db "" "" "for db support" &&
+optional_depends gdbm "" "" "for gdbm support" &&
+optional_depends tk "" "" "for tk support" &&
+optional_depends libyaml "" "" "for YAML output (recommended)" &&
+optional_depends openssl "" "" "for ssl and hashing modules"
diff --git a/ruby-raa/ruby-2.0/DETAILS b/ruby-raa/ruby-2.0/DETAILS
new file mode 100755
index 0000000..c9a1625
--- /dev/null
+++ b/ruby-raa/ruby-2.0/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=ruby-2.0
+ PACKAGE=ruby
+ VERSION=2.0.0-p0
+
SOURCE_HASH=sha512:942c87616c6248d1284e114b769f938e81aefa805cfe32de81a344c7d982d4939efd69907a990b6e76a45da02f198fbac579aca3e74fa68472d301c70433a0ba
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE=$PACKAGE-$VERSION.tar.gz
+ SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/$PACKAGE/$BRANCH/$SOURCE
+ SOURCE_URL[1]=http://mirrors.ibiblio.org/$PACKAGE/$BRANCH/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$PACKAGE-$VERSION"
+ LICENSE[0]=GPL
+ KEYWORDS="devel"
+ WEB_SITE=http://www.ruby-lang.org/
+ ENTERED=20020106
+ SHORT="interpreted scripting language"
+cat << EOF
+Ruby is the interpreted scripting language for quick and easy object-oriented
+programming. It has many features to process text files and to do system
+management tasks. It is simple, straight foward extensible and portable.
+EOF
diff --git a/ruby-raa/ruby-2.0/HISTORY b/ruby-raa/ruby-2.0/HISTORY
new file mode 100644
index 0000000..547482d
--- /dev/null
+++ b/ruby-raa/ruby-2.0/HISTORY
@@ -0,0 +1,3 @@
+2011-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.0-p0
+ spell created, copied from ruby-19
diff --git a/ruby-raa/ruby-2.0/INSTALL b/ruby-raa/ruby-2.0/INSTALL
new file mode 100755
index 0000000..7bd4719
--- /dev/null
+++ b/ruby-raa/ruby-2.0/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+
+if [[ $RUBY_DOCS == y ]]; then
+ make install-doc
+fi
diff --git a/ruby-raa/ruby-2.0/PROVIDES b/ruby-raa/ruby-2.0/PROVIDES
new file mode 100755
index 0000000..a62e12a
--- /dev/null
+++ b/ruby-raa/ruby-2.0/PROVIDES
@@ -0,0 +1 @@
+RUBY
diff --git a/ruby-raa/ruby-enterprise-edition/CONFLICTS
b/ruby-raa/ruby-enterprise-edition/CONFLICTS
index bfec4b6..71e229e 100755
--- a/ruby-raa/ruby-enterprise-edition/CONFLICTS
+++ b/ruby-raa/ruby-enterprise-edition/CONFLICTS
@@ -1,3 +1,4 @@
conflicts ruby y
conflicts ruby-1.8
conflicts ruby-1.9
+conflicts ruby-2.0
diff --git a/ruby-raa/ruby-enterprise-edition/HISTORY
b/ruby-raa/ruby-enterprise-edition/HISTORY
index c77d62f..e48af3b 100644
--- a/ruby-raa/ruby-enterprise-edition/HISTORY
+++ b/ruby-raa/ruby-enterprise-edition/HISTORY
@@ -1,2 +1,5 @@
+2013-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add ruby-2.0
+
2012-05-12 David Kowis <dkowis AT shlrm.org>
* BUILD,DETAILS,CONFIGURE,CONFLICTS,DEPENDS,PROVIDES: Created new spell
for ruby-enterprise-edition
diff --git a/video/miro/DETAILS b/video/miro/DETAILS
index e2bf905..4381254 100755
--- a/video/miro/DETAILS
+++ b/video/miro/DETAILS
@@ -1,9 +1,9 @@
SPELL=miro
- VERSION=5.0.2
+ VERSION=6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.osuosl.org/pub/pculture.org/miro/src/$SOURCE
-
SOURCE_HASH=sha512:0f0f1ba8be4ba5131ec63db50e540d7570840a25570588f01ab5c2176d7df46769d5b985f8a719abd680ac7b50d4bd6020da2416c186884fd825c53dd6ddb9fb
+
SOURCE_HASH=sha512:d7770af3d4c63812c69cdbf05af7d7a2fe017736dc118ad509ce4e5b9ae66f917bf541e8abba5dd2318f22dac1f8698e77fe7da339ebaf7a72181faa77183370
WEB_SITE=http://www.getmiro.com/
ENTERED=20090804
LICENSE[0]=GPL
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index 53e8262..0cfbb95 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,7 @@
+2013-04-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.0
+ * PRE_BUILD, ffmpeg.patch: removed
+
2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.0.2
* PRE_BUILD, ffmpeg.patch: patch from Arch added
diff --git a/video/miro/PRE_BUILD b/video/miro/PRE_BUILD
deleted file mode 100755
index 1d3cb75..0000000
--- a/video/miro/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/ffmpeg.patch"
diff --git a/video/miro/ffmpeg.patch b/video/miro/ffmpeg.patch
deleted file mode 100644
index 8362308..0000000
--- a/video/miro/ffmpeg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- miro-5.0.1/linux/miro-segmenter.c~ 2012-07-06 14:33:24.618082171 +0000
-+++ miro-5.0.1/linux/miro-segmenter.c 2012-07-06 15:10:19.564146117 +0000
-@@ -156,7 +156,7 @@
- exit(1);
- }
-
-- ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
-+ ret = avformat_open_input(&ic, input, ifmt, 0);
- if (ret != 0) {
- fprintf(stderr, "Could not open input file, make sure it is an
mpegts file: %d\n", ret);
- exit(1);
-@@ -215,12 +215,7 @@
- }
- }
-
-- if (av_set_parameters(oc, NULL) < 0) {
-- fprintf(stderr, "Invalid output format parameters\n");
-- exit(1);
-- }
--
-- dump_format(oc, 0, input, 1);
-+ av_dump_format(oc, 0, input, 1);
-
- if (video_st) {
- codec = avcodec_find_decoder(video_st->codec->codec_id);
-@@ -233,12 +228,12 @@
- }
- }
-
-- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
- fprintf(stderr, "Could not open '%s'\n", output_filename);
- exit(1);
- }
-
-- if (av_write_header(oc)) {
-+ if (avformat_write_header(oc, NULL)) {
- fprintf(stderr, "Could not write mpegts header to first output
file\n");
-
- exit(1);
-@@ -274,10 +269,10 @@
- }
-
- if (segment_time - prev_segment_time >= segment_duration) {
-- put_flush_packet(oc->pb);
-- url_fclose(oc->pb);
-+ avio_flush(oc->pb);
-+ avio_close(oc->pb);
-
-- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
- fprintf(stderr, "Could not open '%s'\n", output_filename);
- break;
- }
-@@ -307,7 +302,7 @@
- av_freep(&oc->streams[i]);
- }
-
-- url_fclose(oc->pb);
-+ avio_close(oc->pb);
- av_free(oc);
-
- /* End-of-transcode marker. */
diff --git a/x11/nxcomp/0001-respect-CXXFLAGS.patch
b/x11/nxcomp/0001-respect-CXXFLAGS.patch
new file mode 100644
index 0000000..4945859
--- /dev/null
+++ b/x11/nxcomp/0001-respect-CXXFLAGS.patch
@@ -0,0 +1,26 @@
+From 5993fd4c4fa70b31525924322f031dd1039033d1 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Tue, 9 Apr 2013 18:49:58 +0200
+Subject: [PATCH] respect CXXFLAGS
+
+---
+ configure.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e9ab81d..e102c2a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -7,8 +7,7 @@ AC_PREREQ(2.13)
+
+ dnl Set our default compilation flags.
+
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="${CXXFLAGS} -fno-rtti -fno-exceptions"
+
+ dnl Reset default linking directives.
+
+--
+1.8.2
+
diff --git a/x11/nxcomp/DEPENDS b/x11/nxcomp/DEPENDS
index ccc6b11..c5aeb36 100755
--- a/x11/nxcomp/DEPENDS
+++ b/x11/nxcomp/DEPENDS
@@ -1,4 +1,5 @@
depends JPEG &&
depends libpng &&
depends -sub CXX gcc &&
-depends X11-SERVER
+depends X11-SERVER &&
+depends autoconf
diff --git a/x11/nxcomp/DETAILS b/x11/nxcomp/DETAILS
index 590854b..c003d58 100755
--- a/x11/nxcomp/DETAILS
+++ b/x11/nxcomp/DETAILS
@@ -1,9 +1,9 @@
SPELL=nxcomp
- VERSION=1
- SOURCE="${SPELL}_3.3.0-3-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://x2go.obviously-nice.de/deb/pool/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:aaa77d111eb8f1534c70ccfd036deaa0066be9df8ccb602c476b108993fdc2539572ef8858e975cd0836db73c16c64b40dadb10ae036642d68afb1665a37fb2d
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-3.3.0-3"
+ VERSION=3.5.0-2
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://64.34.173.142/download/${VERSION%-*}/sources/${SOURCE}
+
SOURCE_HASH=sha512:a16570404837fd82d17a9e22fe23dff73a441523e3d90a8062ccff384ef9a226098642e8debee8bdd2823d04b3d63ce253e95e3ad49ec1ba011ebda5cbfbd7b0
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://www.nomachine.com";
LICENSE[0]=GPL
ENTERED=20110318
diff --git a/x11/nxcomp/HISTORY b/x11/nxcomp/HISTORY
index af01f42..4348b38 100644
--- a/x11/nxcomp/HISTORY
+++ b/x11/nxcomp/HISTORY
@@ -1,3 +1,10 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-respect-CXXFLAGS.patch: force the spell
+ to respect CXXFLAGS
+
+2013-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.5.0-2
+
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/x11/nxcomp/PRE_BUILD b/x11/nxcomp/PRE_BUILD
index a98ca9e..fd366d5 100755
--- a/x11/nxcomp/PRE_BUILD
+++ b/x11/nxcomp/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SCRIPT_DIRECTORY/Loop.cpp.diff
+patch -p1 < $SPELL_DIRECTORY/0001-respect-CXXFLAGS.patch &&
+autoreconf -fi
diff --git a/x11/nxproxy/0001-respect-CXXFLAGS.patch
b/x11/nxproxy/0001-respect-CXXFLAGS.patch
new file mode 100644
index 0000000..1b52690
--- /dev/null
+++ b/x11/nxproxy/0001-respect-CXXFLAGS.patch
@@ -0,0 +1,28 @@
+From d3a45f25c19f966ada92a6b4bf3d5e0bd3a5f7b2 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Tue, 9 Apr 2013 18:46:05 +0200
+Subject: [PATCH] respect CXXFLAGS
+
+---
+ configure.in | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index bd930f1..9ba873a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -5,11 +5,6 @@ dnl Prolog
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+
+ if test -d "../nx-X11/exports/include" ; then
+--
+1.8.2
+
diff --git a/x11/nxproxy/DEPENDS b/x11/nxproxy/DEPENDS
new file mode 100755
index 0000000..8b72ee7
--- /dev/null
+++ b/x11/nxproxy/DEPENDS
@@ -0,0 +1,2 @@
+depends nxcomp &&
+depends autoconf
diff --git a/x11/nxproxy/DETAILS b/x11/nxproxy/DETAILS
new file mode 100755
index 0000000..2be8188
--- /dev/null
+++ b/x11/nxproxy/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=nxproxy
+ VERSION=3.5.0-1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://64.34.173.142/download/${VERSION%-*}/sources/${SOURCE}
+
SOURCE_HASH=sha512:9cffce5044289273fff6d26b865f20efd57a9c72f47e8c8b7feb5487e1fcb56252a45c1d50c4431d930cc14ccbd8db2adc5bf7ea96f65cb961b96fa68aeafe06
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://www.nomachine.com";
+ LICENSE[0]=GPL
+ ENTERED=20110318
+ SHORT="NX X compression library"
+cat << EOF
+NX provides a differential X compression library for X11.
+
+This package provides the X proxy binary.
+EOF
diff --git a/x11/nxproxy/HISTORY b/x11/nxproxy/HISTORY
new file mode 100644
index 0000000..9c40cf7
--- /dev/null
+++ b/x11/nxproxy/HISTORY
@@ -0,0 +1,3 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-respect-CXXFLAGS.patch, DEPENDS, DETAILS, PRE_BUILD: spell
created
+
diff --git a/x11/nxproxy/PRE_BUILD b/x11/nxproxy/PRE_BUILD
new file mode 100755
index 0000000..b60a616
--- /dev/null
+++ b/x11/nxproxy/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/0001-respect-CXXFLAGS.patch &&
+autoreconf -fi
diff --git a/x11/x2goclient/BUILD b/x11/x2goclient/BUILD
new file mode 100755
index 0000000..eec3de4
--- /dev/null
+++ b/x11/x2goclient/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/x11/x2goclient/DEPENDS b/x11/x2goclient/DEPENDS
new file mode 100755
index 0000000..5dc14a2
--- /dev/null
+++ b/x11/x2goclient/DEPENDS
@@ -0,0 +1,7 @@
+depends qt4 &&
+depends nxproxy &&
+depends nxcomp &&
+depends X11-SERVER &&
+depends openldap &&
+depends libssh &&
+depends cups
diff --git a/x11/x2goclient/DETAILS b/x11/x2goclient/DETAILS
new file mode 100755
index 0000000..a28b2bc
--- /dev/null
+++ b/x11/x2goclient/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=x2goclient
+ VERSION=4.0.1.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://code.x2go.org/releases/source/x2goclient/${SOURCE}
+
SOURCE_HASH=sha512:6127df3826f79b72562d8184b1d3742f4cf5704f13db3b0eb8cbef32e99863dc7894785e289742fa39cad26965f8615b601bd86d8b9ca94de352c9db24acd141
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.x2go.org";
+ LICENSE[0]=GPL
+ ENTERED=20130411
+ SHORT="a Qt4 client for the x2go remote desktop"
+cat << EOF
+x2go is an open source terminal server project offering a comprehensive
+"server based computing" solution. Combining the advantages of existing
+systems it features ease of use, performance and scalability. x2go provides
+you with access to your desktop as an individual as well as a corporate user
+- from within your own network and via the internet. x2go is not limited to
+any particular hardware, it supports a variety of devices and architectures.
+
+This spell builds the Qt4 client for x2go.
+EOF
diff --git a/x11/x2goclient/HISTORY b/x11/x2goclient/HISTORY
new file mode 100644
index 0000000..155bc6a
--- /dev/null
+++ b/x11/x2goclient/HISTORY
@@ -0,0 +1,3 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/x11/x2goclient/INSTALL b/x11/x2goclient/INSTALL
new file mode 100755
index 0000000..ea90cb5
--- /dev/null
+++ b/x11/x2goclient/INSTALL
@@ -0,0 +1,8 @@
+install -m755 ${SOURCE_DIRECTORY}/x2goclient \
+ ${INSTALL_ROOT}/usr/bin/ &&
+install -m644 ${SOURCE_DIRECTORY}/desktop/x2goclient.desktop \
+ ${INSTALL_ROOT}/usr/share/applications/ &&
+for res in 128x128 64x64 32x32 16x16; do
+ install -m644 ${SOURCE_DIRECTORY}/icons/${res}/x2goclient.png \
+ ${INSTALL_ROOT}/usr/share/icons/hicolor/${res}/apps/
+done



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

Archive powered by MHonArc 2.6.24.

Top of Page