Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Robin Cook (ae0ee48e21f22b25eb01e11efda4f9f0aaab318e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Robin Cook (ae0ee48e21f22b25eb01e11efda4f9f0aaab318e)
  • Date: Tue, 28 Jan 2014 10:43:23 -0600

GIT changes to devel-xorg-modular grimoire by Robin Cook <rcook AT wyrms.net>:

crypto/gnutls/DETAILS | 2
crypto/gnutls/HISTORY | 3
gnome2-apps/abiword/BUILD | 2
gnome2-apps/abiword/CONFIGURE | 17
gnome2-apps/abiword/DEPENDS | 49 +
gnome2-apps/abiword/DETAILS | 8
gnome2-apps/abiword/HISTORY | 5
http/webkitgtk/BUILD | 8
http/webkitgtk/CONFIGURE | 25
http/webkitgtk/DEPENDS | 102 +-
http/webkitgtk/DETAILS | 16
http/webkitgtk/HISTORY | 8
http/webkitgtk/PREPARE | 1
http/webkitgtk/PRE_BUILD | 5
http/webkitgtk3/BUILD | 4
http/webkitgtk3/CONFIGURE | 23
http/webkitgtk3/DEPENDS | 83 +-
http/webkitgtk3/DETAILS | 11
http/webkitgtk3/HISTORY | 435 +++++++++++-
http/webkitgtk3/PRE_BUILD | 5
kde4-apps/rekonq/DETAILS | 4
kde4-apps/rekonq/HISTORY | 3
libs/libusb-compat/DETAILS | 4
libs/libusb-compat/HISTORY | 3
libs/libusb/DETAILS | 10
libs/libusb/HISTORY | 3
libs/libusbx/BUILD | 1
libs/libusbx/CONFLICTS | 2
libs/libusbx/DEPENDS | 14
libs/libusbx/DETAILS | 27
libs/libusbx/DOWNLOAD | 1
libs/libusbx/HISTORY | 33
libs/libusbx/INSTALL | 1
libs/libusbx/PRE_BUILD | 1
libs/libusbx/PROVIDES | 1
libs/libusbx/UP_TRIGGERS | 2
mail/claws-mail/CONFIGURE | 3
mail/claws-mail/DEPENDS | 28
mail/claws-mail/DETAILS | 2
mail/claws-mail/HISTORY | 4
printer/cups-filters/DETAILS | 4
printer/cups-filters/HISTORY | 3
python-pypi/pyxattr/DEPENDS | 2
python-pypi/pyxattr/DETAILS | 13
python-pypi/pyxattr/HISTORY | 5
qt5/qtwebkit5/HISTORY | 3
qt5/qtwebkit5/PRE_BUILD | 4
qt5/qtwebkit5/icu.patch | 17
shell-term-fm/mc/HISTORY | 4
shell-term-fm/mc/PRE_BUILD | 3
shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch | 38 +
x11/xplanet/HISTORY | 3
x11/xplanet/PRE_BUILD | 4
x11/xplanet/xplanet-1.3.0-giflib.patch | 741
+++++++++++++++++++++
54 files changed, 1517 insertions(+), 286 deletions(-)

New commits:
commit 9d486000d2a7ac60d3b0b15f9b6473d15e1ec511
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

abiword: updated to 3.0.0

commit 05189d3766051d331e0cb7adbe90417c7a79fbfc
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

webkitgtk3: updated to 2.2.4

commit d190518e354524201baa81ec6ea7295a8d8720cc
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

webkitgtk: updated to 2.2.4

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

gnutls: => 3.2.9

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

pyxattr: => 0.7.3

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

deprecate libs/libusbx [replaced by libusb]

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

qtwebkit5 - fix build with icu-51.1+

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

cups-filters: => 1.0.44

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

libusb-compat 0.1.5

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

libusb 1.0.18

commit 879c76d8c1151b879e2d3568241c0e2f1e4d9c5f
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

xplanet: apply fix for newest giflib

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

rekonq 2.4.2

commit b254f7bdee40817f27a2bd21d09785dbece1db4a
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

claws-mail: updated to 3.9.3

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

shell-term-fm/mc: fix incompatibility with ncurses

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 3e6f83a..79d24e8 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -55,7 +55,7 @@ case $GNUTLS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.xz
;;
3.2)
- VERSION=3.2.8
+ VERSION=3.2.9
SOURCE=$SPELL-$VERSION.tar.xz
;;
esac
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 2bf7a0d..76e8153 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2014-01-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 3.2.9
+
2013-12-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 3.2.8

diff --git a/gnome2-apps/abiword/BUILD b/gnome2-apps/abiword/BUILD
index 94733f6..542503b 100755
--- a/gnome2-apps/abiword/BUILD
+++ b/gnome2-apps/abiword/BUILD
@@ -1,3 +1,3 @@
-OPTS="$ABIWORD_OPTS $OPTS" &&
+OPTS="--disable-collab-backend-service --disable-collab-backend-tcp
$ABIWORD_OPTS $OPTS" &&

default_build
diff --git a/gnome2-apps/abiword/CONFIGURE b/gnome2-apps/abiword/CONFIGURE
index a226d3b..8e3d9de 100755
--- a/gnome2-apps/abiword/CONFIGURE
+++ b/gnome2-apps/abiword/CONFIGURE
@@ -7,4 +7,19 @@ config_query_option ABIWORD_OPTS "Install additional
templates?" n \
"--disable-templates" &&

config_query_option ABIWORD_OPTS "Install additional plugins?" y \
- "--enable-plugins" ""
+ "--enable-plugins" "" &&
+
+config_query_option ABIWORD_OPTS "Menu Button instead of Menu Bar?" n \
+ "--enable-menubutton" "" &&
+
+config_query_option ABIWORD_OPTS "Include printing support?" y \
+ "" "--disable-print" &&
+
+config_query_option ABIWORD_OPTS "Include statusbar?" y \
+ "" "--disable-statusbar" &&
+
+config_query_option ABIWORD_OPTS "Enable use of EMACS keybindings?" n \
+ "--enable-emacs-keybindings" "" &&
+
+config_query_option ABIWORD_OPTS "Enable use of VI keybindings?" n \
+ "--enable-vi-keybindings" ""
diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index 204071b..c35602e 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -30,34 +30,69 @@ optional_depends gnome-vfs2 \
"--without-gnomevfs" \
"for gnome-vfs library support" &&

+optional_depends glib2 \
+ "--with-gio" "--without-gio" \
+ "Use GIO library?" &&
+
optional_depends enchant \
"--enable-spell" \
"--disable-spell" \
"for spell checking support" &&
-optional_depends asio '--enable-collab-backend-tcp' \
- '--disable-collab-backend-tcp' \
- 'for the tcp collaboration plugin' &&
+
+#optional_depends asio '--enable-collab-backend-tcp' \
+# '--disable-collab-backend-tcp' \
+# 'for the tcp collaboration plugin' &&
+
optional_depends empathy '--enable-collab-backend-telepathy' \
'--disable-collab-backend-telepathy' \
'for the telepathy collaboration plugin' &&
+
optional_depends loudmouth '--enable-collab-backend-xmpp' \
'--disable-collab-backend-xmpp' \
'for the XMPP/Jabber collaboration plugin' &&
+
optional_depends dbus-glib '--enable-collab-backend-sugar' \
'--disable-collab-backend-sugar' \
'for the Sugar collaboration plugin' &&
-optional_depends libsoup '--enable-collab-backend-service' \
- '--disable-collab-backend-service' \
- 'for the service collaboration plugin' &&
+
+#optional_depends libsoup '--enable-collab-backend-service' \
+# '--disable-collab-backend-service' \
+# 'for the service collaboration plugin' &&
+
if is_depends_enabled $SPELL libsoup; then
depends asio
fi &&
+
+optional_depends libical \
+ "--with-libical" "--without-libical" \
+ "Use libical and raptor libraries?" &&
+
+optional_depends evolution-data-server \
+ "--with-evolution-data-server" \
+ "--without-evolution-data-server" \
+ "Use Evolution Data Server to get at contact and calendar
information?" &&
+
+optional_depends libchamplain \
+ "--with-champlain" "--without-champlain" \
+ "Use champlain to display maps?" &&
+
optional_depends libwmf '' '' 'for the Windows Metafile Format plugin' &&
+
optional_depends libgda4 '' '' 'for gda database access plugin' &&
+
optional_depends gtkmathview '' '' 'for mathview MathML plugin' &&
+
optional_depends libwpd '' '' 'for the WordPerfect plugin' &&
+
optional_depends libwpg '' '' 'for the WordPerfect graphics plugin' &&
+
optional_depends aiksaurus '' '' 'for the aiksaurus (thesaurus) plugin' &&
+
optional_depends psiconv '' '' 'for the psiconv (psion conversion) plugin' &&
+
optional_depends gimp '' '' 'for the gimp plugin' &&
-optional_depends tidy '' '' 'for HTML cleaning using tidy'
+
+optional_depends tidy \
+ "--with-libtidy" "--without-libtidy"' \
+ "for HTML cleaning using tidy"
+
diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS
index 2b4dc45..173047e 100755
--- a/gnome2-apps/abiword/DETAILS
+++ b/gnome2-apps/abiword/DETAILS
@@ -1,14 +1,14 @@
SPELL=abiword
if [[ $DEVEL == y ]]; then
- VERSION=2.9.4
+ VERSION=3.0.0
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
-
SOURCE_HASH=sha512:8f09741bbd1d492be1e5f3486253c6d6c0c21895aaaa85fe60b167e30adbb72f9baa790a50370ec1cf0321229f6173aa2c48d05456fe8d06e08ef9685bb01d32
+
SOURCE_HASH=sha512:3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637
else
- VERSION=2.8.6
+ VERSION=3.0.0
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
-
SOURCE_HASH=sha512:327ffa6da73f7a1b74d1bc374239ac087ee76672da590626da3a068f972684b0963c50641718c39a7fb2429a56c1076bdfd67e8f7f0eab0eda90b70cf846bbbd
+
SOURCE_HASH=sha512:3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index c87c422..25878ac 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,8 @@
+2014-01-28 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated devel version to 3.0.0
+ * DEPENDS: updated depends, commented out currently broken backends
+ * CONFIGURE: added new configure options
+
2014-01-25 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated devel version to 2.9.4

diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 719a5d9..081340c 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,6 +1,4 @@
-OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
-OPTS="--with-gtk=2.0 --disable-webkit2 $OPTS" &&
+OPTS="--enable-webkit1 --disable-webkit2 $WEBKIT_OPTS $OPTS" &&
+
+default_build

-make_single &&
-default_build &&
-make_normal
diff --git a/http/webkitgtk/CONFIGURE b/http/webkitgtk/CONFIGURE
index d2cebdd..1c1eb0d 100755
--- a/http/webkitgtk/CONFIGURE
+++ b/http/webkitgtk/CONFIGURE
@@ -1,6 +1,21 @@
-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_OPTS "Enable support for WebGL?" y \
+ "--enable-webgl" "--disable-webgl" &&
+
+config_query_option WEBKIT_OPTS "Enable support for GLX?" y \
+ "--enable-glx" "--disable-glx" &&
+
+config_query_option WEBKIT_OPTS "Enable support for EGL?" y \
+ "--enable-egl" "--disable-egl" &&
+
+config_query_option WEBKIT_OPTS "Enable support for OpenGL ES 2?" n \
+ "--enable-gles2" "--disable-gles2" &&
+
+config_query_option WEBKIT_OPTS "Enable JIT compilation?" y \
+ "--enable-jit" "--disable-jit" &&
+
+config_query_option WEBKIT_OPTS "Enable Opcode statistics?" n \
+ "--enable-opcode-stats" "--disable-opcode-stats"
+
+# something like this will be needed for wayland
+#config_query_list WEBKIT_TARGET "Build for which target?" x11 wayland
x11,wayland directfb

-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..a1e8519 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -2,69 +2,65 @@ depends -sub CXX gcc &&
depends autoconf &&
depends automake &&
depends libtool &&
-depends gtk+2 &&
-depends icu &&
+depends bison &&
depends gperf &&
+depends flex &&
+depends icu &&
+depends libxslt &&
+depends libxml2 &&
+depends zlib &&
+depends libxt &&
+depends libxrender &&
+depends libxcomposite &&
+depends libxdamage &&
+depends mesalib --enable-accelerated-compositing &&
+depends glib2 &&
+depends fontconfig &&
+depends freetype2 &&
+depends harfbuzz &&
+depends cairo --enable-svg &&
+depends pango &&
+depends gtk+2 --with-gtk=2.0 &&
+depends gdk-pixbuf2 &&
+depends libsoup &&
+depends at-spi2-core &&
depends libpng &&
depends JPEG &&
-depends bison &&
-depends flex &&
+depends libwebp &&
depends sqlite &&
-depends libsoup &&
-depends enchant &&
-depends libxt &&
+depends perl &&
+depends PYTHON &&
depends RUBY &&

-optional_depends cairo '--enable-svg' \
- '--disable-svg' \
- 'Enable SVG support?'
+optional_depends enchant \
+ "--enable-spellcheck" "--disable-spellcheck" \
+ "Enable spellchecking support?" &&

-optional_depends libxslt '--enable-xslt' \
- '--disable-xslt' \
- 'for XSLT support' &&
+optional_depends libsecret \
+ "--enable-credential-storage"
"--disable-credential-storage" \
+ "Enable support for credential storage?" &&

-optional_depends gtk-doc '--enable-gtk-doc' \
- '--disable-gtk-doc' \
- 'for documentation generation' &&
-
-if [[ ! $WEBKIT_FONT_BE == freetype2 ]]; then
- depends pango "--with-font-backend=pango"
-fi &&
-depends freetype2 &&
+optional_depends gobject-introspection \
+ "--enable-introspection" "--disable-introspection" \
+ "Enable GObject introspection?" &&

-optional_depends gst-plugins-base \
- "--enable-video" \
- "--disable-video" \
- "for HTML5 streaming video support" &&
+optional_depends geoclue \
+ "--enable-geolocation" "--disable-geolocation" \
+ "Enable geolocation support?" &&

-#optional_depends gobject-introspection \
-# "--enable-introspection" \
-# "--disable-introspection" \
-# "to enable introspection" &&
+optional_depends gstreamer-1.0 \
+ "--enable-web-audio --enable-video" \
+ "--disable-web-audio --disable-video" \
+ "Enable support for enable HTML5 video and Web Audio?" &&

-optional_depends geoclue \
- "--enable-geolocation" \
- "--disable-geolocation" \
- "to enable geolocation support" &&
-
-case $WEBKIT_ACC in
- opengl)
- depends OPENGL "--with-acceleration-backend=opengl"
- ;;
- clutter)
- depends clutter "--with-acceleration-backend=clutter"
- ;;
- *)
- OPTS+=" --with-acceleration-backend=none"
- ;;
-esac
+if is_depends_enabled $SPELL gstreamer-1.0 ; then
+ depends gst-plugins-base-1.0
+fi &&

-#if is_depends_enabled $SPELL gobject-introspection; \
-# then depends gir-repository; fi
+optional_depends upower \
+ "--enable-battery-status" "--disable-battery-status" \
+ "Enable support for Battery Status API?" &&

-depends atk &&
-depends fontconfig &&
-depends gdk-pixbuf2 &&
-depends glib2 &&
-depends libx11 &&
-depends libxml2
+optional_depends gtk-doc \
+ "--enable-gtk-doc" "--disable-gtk-doc" \
+ "Build documentation with gtk-doc?"
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 0b1cf0b..85ab13f 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,17 +1,9 @@
SPELL=webkitgtk
-if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=1.10.2
- SOURCE=$SPELL-$VERSION.tar.xz
+ VERSION=2.2.4
+ SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-else
- VERSION=1.10.2
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-fi
+
SOURCE_HASH=sha512:9467abb72dda5839274702ee9173d8d83599196446f80537cf18e9be4b42fb7e23fdeb7d053d87a0143de5b499163d693dd09c4f035a315df78c46d9f7408705
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
PATCHLEVEL=1
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 44ee84d..c7ce335 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,11 @@
+2014-01-28 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 2.2.4
+ * DEPENDS: updated to new dependencies
+ * CONFIURE: added new configure options
+ * PREPARE: removed
+ * PRE_BUILD: removed but may be needed if can get gtk-doc removal
fixed
+ * BUILD: removed the make_single
+
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/PREPARE b/http/webkitgtk/PREPARE
deleted file mode 100755
index 678e34c..0000000
--- a/http/webkitgtk/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query WEBKITGTK_NIGHT "Build devel version?" n
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
deleted file mode 100755
index cdd362a..0000000
--- a/http/webkitgtk/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index d93409a..081340c 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,4 +1,4 @@
-OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
-OPTS="--with-gtk=3.0 $OPTS" &&
+OPTS="--enable-webkit1 --disable-webkit2 $WEBKIT_OPTS $OPTS" &&

default_build
+
diff --git a/http/webkitgtk3/CONFIGURE b/http/webkitgtk3/CONFIGURE
index 1fe0ab0..992cf7d 100755
--- a/http/webkitgtk3/CONFIGURE
+++ b/http/webkitgtk3/CONFIGURE
@@ -1,4 +1,21 @@
-config_query_list WEBKIT_FONT_BE "Select font backend to use" freetype2
pango &&
+config_query_option WEBKIT_OPTS "Enable support for WebGL?" y \
+ "--enable-webgl" "--disable-webgl" &&
+
+config_query_option WEBKIT_OPTS "Enable support for GLX?" y \
+ "--enable-glx" "--disable-glx" &&
+
+config_query_option WEBKIT_OPTS "Enable support for EGL?" y \
+ "--enable-egl" "--disable-egl" &&
+
+config_query_option WEBKIT_OPTS "Enable support for OpenGL ES 2?" n \
+ "--enable-gles2" "--disable-gles2" &&
+
+config_query_option WEBKIT_OPTS "Enable JIT compilation?" y \
+ "--enable-jit" "--disable-jit" &&
+
+config_query_option WEBKIT_OPTS "Enable Opcode statistics?" n \
+ "--enable-opcode-stats" "--disable-opcode-stats"
+
+# Something like this will be needed for wayland
+#config_query_list WEBKIT_TARGET "Build for which target?" x11 wayland
x11,wayland directfb

-config_query_option WEBKIT_WEBGL "Enable support for WebGL?" y \
- "--enable-webgl" "--disable-webgl"
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index 8062770..f0cbcf2 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -2,53 +2,66 @@ depends -sub CXX gcc &&
depends autoconf &&
depends automake &&
depends libtool &&
-depends gtk+3 &&
-depends icu &&
+depends bison &&
depends gperf &&
+depends flex &&
+depends icu &&
+depends libxslt &&
+depends libxml2 &&
+depends zlib &&
+depends libxt &&
+depends libxrender &&
+depends libxcomposite &&
+depends libxdamage &&
+depends mesalib --enable-accelerated-compositing &&
+depends glib2 &&
+depends fontconfig &&
+depends freetype2 &&
+depends harfbuzz &&
+depends cairo --enable-svg &&
+depends pango &&
+depends gtk+3 --with-gtk=3.0 &&
+depends gtk+2 &&
+depends gdk-pixbuf2 &&
+depends libsoup &&
+depends at-spi2-core &&
depends libpng &&
depends JPEG &&
-depends bison &&
-depends flex &&
+depends libwebp &&
depends sqlite &&
-depends libsoup &&
-depends enchant &&
-depends libxt &&
depends perl &&
depends PYTHON &&
depends RUBY &&

-optional_depends gtk-doc '--enable-gtk-doc' \
- '' \
- 'Build documentation?' &&
+optional_depends enchant \
+ "--enable-spellcheck" "--disable-spellcheck" \
+ "Enable spellchecking support?" &&

-optional_depends cairo '--enable-svg' \
- '--disable-svg' \
- 'Enable SVG support?' &&
+optional_depends libsecret \
+ "--enable-credential-storage"
"--disable-credential-storage" \
+ "Enable support for credential storage?" &&

-optional_depends libxslt '--enable-xslt' \
- '--disable-xslt' \
- 'for XSLT support' &&
+optional_depends gobject-introspection \
+ "--enable-introspection" "--disable-introspection" \
+ "Enable GObject introspection?" &&

-if [[ $WEBKIT_FONT_BE == freetype2 ]]; then
- depends freetype2
-else
- depends pango "--with-font-backend=pango"
-fi &&
+optional_depends geoclue \
+ "--enable-geolocation" "--disable-geolocation" \
+ "Enable geolocation support?" &&

-optional_depends gst-plugins-base \
- "--enable-video" \
- "--disable-video" \
- "for HTML5 streaming video support" &&
+optional_depends gstreamer-1.0 \
+ "--enable-web-audio --enable-video" \
+ "--disable-web-audio --disable-video" \
+ "Enable support for enable HTML5 video and Web Audio?" &&

-optional_depends gobject-introspection \
- "--enable-introspection" \
- "--disable-introspection" \
- "to enable introspection" &&
+if is_depends_enabled $SPELL gstreamer-1.0 ; then
+ depends gst-plugins-base-1.0
+fi &&

-optional_depends geoclue \
- "--enable-geolocation" \
- "--disable-geolocation" \
- "to enable geolocation support"
+optional_depends upower \
+ "--enable-battery-status" "--disable-battery-status" \
+ "Enable support for Battery Status API?" &&

-#if is_depends_enabled $SPELL gobject-introspection; \
-# then depends gir-repository; fi
+optional_depends gtk-doc \
+ "--enable-gtk-doc" "--disable-gtk-doc" \
+ "Build documentation with gtk-doc?"
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 27a7654..a8d1e2e 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,14 +1,15 @@
SPELL=webkitgtk3
- VERSION=1.10.2
+ VERSION=2.2.4
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkitgtk-$VERSION"
+
SOURCE_HASH=sha512:9467abb72dda5839274702ee9173d8d83599196446f80537cf18e9be4b42fb7e23fdeb7d053d87a0143de5b499163d693dd09c4f035a315df78c46d9f7408705
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
- SECURITY_PATCH=4
+ SECURITY_PATCH=8
+ PATCHLEVEL=1
GATHER_DOCS=off
LICENSE[0]=GPL
- ENTERED=20101017
+ ENTERED=20071208
SHORT="open source web browser engine"
cat << EOF
WebKit is an open source web browser engine. WebKit is also the name of the
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 0e90558..6adac04 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,40 +1,66 @@
-2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: added dependencies on perl, PYTHON and RUBY
+2014-01-28 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 2.2.4
+ * DEPENDS: updated to new dependencies
+ * CONFIURE: added new configure options
+ * PRE_BUILD: removed but may be needed if can get gtk-doc removal
fixed
+
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on RUBY (tested ruby-1.9 and ruby-1.8)
+
+2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFIGURE, DEPENDS: added configuration options for selecting
+ the acceleration backend and the unicode backend
+ * DEPENDS: removed dependencies on gstreamer, libffi, libxrender
+ and pcre
+
+2012-12-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: fix syntax error in if statement
+
+2012-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependencies on atk, fontconfig, gdk-pixbuf2,
+ glib2, gstreamer, libffi, libx11, libxml2, libxrender, pcre
+ * DETAILS: bumped PATCHLEVEL

2012-12-11 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.10.2, SECURITY_PATCH=4, SOURCE: webkit -> webkitgtk
+ * DETAILS: 1.10.2, SECURITY_PATCH=8, SOURCE: webkit -> webkitgtk
+ * BUILD: --disable-webkit2 added, WebKit2 requires GTK+ 3.x
* PRE_BUILD, bison-2.6.patch: patch removed

2012-09-17 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.8.3, SECURITY_PATCH=3
+ * DETAILS: 1.8.3, SECURITY_PATCH=7

2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.8.2, SECURITY_PATCH=2
+ * DETAILS: 1.8.2, SECURITY_PATCH=6
* PRE_BUILD, bison-2.6.patch: upstream patch added
http://trac.webkit.org/changeset/124099

-2012-05-10 Arjan Bouter <abouter AT sourcemage.org>
- * PRE_BUILD, opengl-headers.patch, gtk-doc.patch: apply
- webkitgtk patches to webkitgtk3
-
2012-04-25 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.8.1, SECURITY_PATCH=1
+ * DETAILS: 1.8.1, SECURITY_PATCH=5
+ * PRE_BUILD, disable-geo.patch: patch removed
+
+2012-04-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply patches
+ * disable-geo.patch: added, to fix compilation with disabled geoclue
+ support
+ * gtk-doc.patch: added, to fix installation without gtk-doc
+ * opengl-headers.patch: added, to fix compilation with opengl support
+
+2012-04-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: corrected source urls

2012-04-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.0
* CONFIGURE, BUILD: option for enable/disable webgl added

-2012-02-05 George Sherwood <gsherwood AT sourcemage.org>
- * DEPENDS: No longer depends on libsoup devel
-
2012-02-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.3

-2011-11-12 Tommy Boatman <tboatman AT sourcemage.org>
- * DEPENDS: changed gtk-doc to optional (bug #317)
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: libsoup is up to date enough to be used as stable

2011-09-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.1
+ * BUILD: --with-gtk=2.0 added

2011-08-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.3
@@ -49,38 +75,383 @@

2011-06-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.1
- * PRE_BUILD, perl514.patch: added to fix compilation with new Perl
5.14

-2011-04-26 Ladislav Hagara <hgr AT vabo.cz>
+2011-05-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * perl514.patch: added, to fix compilation with new Perl 5.14
+
+2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: stable is now at 1.4.0, which requires devel libsoup
+
+2011-04-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.0

+2011-04-12 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: devel webkit depends on devel libsop
+
2011-04-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.13

2011-02-27 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version 1.3.12
+ * DETAILS: Updated devel to version 1.3.12

-2011-02-12 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version 1.3.11
- * DEPENDS: Required devel version of libsoup
+2011-02-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to version 1.3.11

-2011-01-11 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version 1.3.10
+2011-02-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.7, SECURITY_PATCH=4
+
+2011-01-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: fixed multijob build
+
+2010-12-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.6, SECURITY_PATCH=3, #15926

2010-12-24 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version 1.3.9
+ * DETAILS: Updated devel to version 1.3.9
+
+2010-12-19 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to version 1.3.7

-2010-12-18 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version 1.3.7
- * DEPENDS: Added back optional_depends gobject-introspection
+2010-11-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to version 1.3.6

2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

2010-10-22 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version 1.3.5. Updated SOURCE_URL & SOURCE
- Updated SOURCE_DIRECTORY
- * PRE_BUILD: Removed. Not needed for released source.
+ * DETAILS: Updated devel to 1.3.5
+
+2010-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.5, SECURITY_PATCH=2, #15882
+
+2010-09-26 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to version 1.3.4
+
+2010-09-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.4, SECURITY_PATCH=1
+
+2010-08-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: Remove optional_depends gobject-introspection for now.
+
+2010-07-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.3
+ * PRE_BUILD, webkit-icu44.patch: removed
+
+2010-07-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.3
+
+2010-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.2, 1.3.2
+
+2010-06-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to version 1.3.1
+ * PRE_BUILD: Devel version doesn't need icu patch
+
+2010-05-18 Robert Figura <template AT sourcemage.org>
+ * DEPENDS: added libxt
+
+2010-05-14 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.2.1
+ * webkit-icu44.patch: Updated (Removed ChangeLog) to work with 1.2.1
+
+2010-05-07 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: fixed icu-dev version patch
+
+2010-04-24 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: Added depends gir-repository if optional depends
+ gobject-introspection
+
+2010-04-18 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD, webkit-icu44.patch: added patch to fix icu 4.4 issues
+
+2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.0
+ * DEPENDS: used devel dependencies for both stable and devel now
+
+2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUB_DEPENDS: added
+ WEBKIT_DEVEL sub dependency
+
+2010-03-24 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to version 1.1.90
+
+2010-03-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to version 1.1.23
+
+2010-03-09 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: added geoclue,
+ added gobject-introspection for the devel version
+
+2010-02-28 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to 1.1.22
+
+2010-02-11 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to 1.1.21
+
+2010-02-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to 1.1.20
+
+2010-01-24 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to 1.1.19
+
+2010-01-16 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to 1.1.18
+ * DEPENDS: Devel version needs devel version of libsoup
+
+2009-12-20 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: made gtk-doc and libxslt optional,
+ moved svg query to an optional dep.
+
+2009-12-06 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.15.4
+ Updated devel to version 1.1.17
+ Added devel version vice a nightly build. Updated SOURCE &
SOURCE_URL
+ Updated devel SOURCE_DIRECTORy
+ * PREPARE: Changed query to use devel version
+ * PRE_BUILD: Removed. Not needed for upstream devel version
+
+2009-11-16 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r51062
+
+2009-10-24 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r50006
+
+2009-10-20 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.15.3
+
+2009-10-06 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.15.2
+
+2009-10-02 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r49032. Updated SOURCE_URL[0]
+
+2009-09-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: stable libsoup is ok now (removed -sub SOUP_DEVEL)
+
+2009-09-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.15, 1.1.15.1
+
+2009-09-07 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.14
+
+2009-09-04 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r48037
+
+2009-08-24 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.13
+
+2009-08-11 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r47011
+
+2009-08-01 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.12
+
+2009-07-22 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r46193
+
+2009-07-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: Added sub_depends for libsoup on devel version
+ * DETAILS: Updated stable to 1.1.11
+
+2009-06-29 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r45330
+
+2009-06-15 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.10
+
+2009-06-10 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.9
+
+2009-05-30 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r44282
+
+2009-05-28 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.8
+
+2009-05-22 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r44015
+
+2009-05-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.7
+
+2009-05-04 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r43163
+
+2009-04-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: enchant isn't optional
+
+2009-04-29 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: optional_depends enchant
+ devel depends on gtk-doc
+ * DETAILS: Updated stable to version 1.1.6
+ Updated evel to version r43000
+
+2009-04-16 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to version 1.1.5
+
+2009-04-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: optional_depends gst-plugins-base not gstreamer
+
+2009-04-04 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: Added optional_depends gstreamer
+
+2009-04-03 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to version 1.1.4
+
+2009-03-28 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated nightly build to r42075
+
+2009-03-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated stable to 1.1.3
+
+2009-03-15 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 1.1.2 and nightly build to r41707
+ Updated SOURCE_URL and WEB_SITE
+
+2009-03-02 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Added webkit released version 1.1.1
+ * PREPARE: Added to select release or nightly build
+ * CONFIGURE: curl is no longer an option
+ * DEPENDS: no longer choice between libsoup and curl. Only libsoup
+ * UP_TRIGGERS: Added.
+
+2009-02-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r41017
+
+2009-01-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: curl/libsoup are _http_ backends
+
+2009-01-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r40000
+
+2009-01-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version r39872
+
+2009-01-11 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version r39790
+ * PRE_BUILD: Removed bison patch
+ * webkit-bison.patch: Removed. Official fix incorporated upstream
+
+2008-12-09 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFIGURE: Added option for libsoup http backend
+ * DEPENDS: depends on either curl or libsoup depending on http backend
+
+2008-12-07 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version r39077
+ * PRE_BUILD: Added upstream patch
+ * webkit-bison.patch: Added patch to fix problems with bison 2.4
+
+2008-11-21 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version r38654
+
+2008-10-08 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: updated spell to r37381
+
+2008-09-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r36635, for new JavaScript engine (SFX)
+
+2008-09-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r36108, for the latest (0.0.21) midori
+
+2008-08-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r36004, ~1k rev passed since the last
+ non-midori update
+
+2008-08-26 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version bump to r35928
+
+2008-08-23 George sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version r35895
+
+2008-08-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r35417 for midori 0.0.19
+
+2008-07-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r35075 (switched back to 8.8 mib tarball)
+
+2008-07-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r35005, fixed long desc
+
+2008-06-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: don't do useless doc'ing, let's keep good tradition to
update
+ this spell on every ~1Kth revision :P
+
+2008-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r34271
+
+2008-05-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r33475
+
+2008-05-03 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version r32828
+
+2008-04-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r31872
+ * BUILD, CONFIGURE, DEPENDS: added font backend selection
+
+2008-04-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * PRE_BUILD: moved autogen.sh here
+ * BUILD: uses default_build
+
+2008-04-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r31738
+
+2008-03-30 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version r31436
+ * CONFIGURE: Changed to --enable-svg-experimental to fix compile
+ problem with SVG.
+
+2008-02-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r30549
+
+2008-02-24 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version r30468
+
+2008-02-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r30218
+
+2008-02-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r30048
+
+2008-02-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r30028
+
+2008-01-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r29866
+
+2008-01-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r29801
+ * CONFIGURE: made SVG support configurable
+ * PRE_BUILD: => BUILD
+
+2008-01-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r29753
+
+2008-01-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r29711
+
+2008-01-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r29438, added SVG support
+
+2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r29226
+
+2008-01-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r29208
+
+2008-01-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r29180
+
+2008-01-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to r29152
+
+2008-01-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated to build 29079, cleaned up
+ * DEPENDS, BUILD, PRE_BUILD: qmake => autotools
+
+2007-12-14 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to build 28711

-2010-10-17 George Sherwood <gsherwood AT sourcemage.org>
- * All: Created spell
+2007-12-08 George Sherwood <george AT beernabeer.com>
+ * DETAILS, DEPENDS, BUILD, INSTALL: spell created
diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
deleted file mode 100755
index cdd362a..0000000
--- a/http/webkitgtk3/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/kde4-apps/rekonq/DETAILS b/kde4-apps/rekonq/DETAILS
index 85c4a21..9ad2485 100755
--- a/kde4-apps/rekonq/DETAILS
+++ b/kde4-apps/rekonq/DETAILS
@@ -1,6 +1,6 @@
SPELL=rekonq
- VERSION=2.4.0
-
SOURCE_HASH=sha512:bfc07ceda7d0bd1636aee5840dacd44b7216827b2bf9c48af40de3b5b9a5077fc0242acbf71950590753ed576336d67908d85c3c010b5a67a5d83f411d6722c5
+ VERSION=2.4.2
+
SOURCE_HASH=sha512:55594dac99b06db7986198f1b6e8efdb0770e2219a33d34db7919d4d0d741ef026b0e12d284ae9b2e1a9b6e40efcdf4f0870e9b0819bff14f45162c5b464ba78
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kde4-apps/rekonq/HISTORY b/kde4-apps/rekonq/HISTORY
index 7670161..2a1215a 100644
--- a/kde4-apps/rekonq/HISTORY
+++ b/kde4-apps/rekonq/HISTORY
@@ -1,3 +1,6 @@
+2014-01-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.2
+
2013-11-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.0

diff --git a/libs/libusb-compat/DETAILS b/libs/libusb-compat/DETAILS
index f421995..3da543b 100755
--- a/libs/libusb-compat/DETAILS
+++ b/libs/libusb-compat/DETAILS
@@ -1,6 +1,6 @@
SPELL=libusb-compat
- VERSION=0.1.4
- PATCHLEVEL=2
+ VERSION=0.1.5
+ PATCHLEVEL=0
#
SOURCE_HASH=sha512:6589523b747a5fd5893840b2d246cf46b64e10997cec2c3116664b8ce7090314bf413ed66049cdfcf68ea4a4ae33468673c897d18254ef52348cd430ffc99c0d
SOURCE_IGNORE=signature
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/libs/libusb-compat/HISTORY b/libs/libusb-compat/HISTORY
index e0f4337..4c1ad0d 100644
--- a/libs/libusb-compat/HISTORY
+++ b/libs/libusb-compat/HISTORY
@@ -1,3 +1,6 @@
+2014-01-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.1.5
+
2012-09-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: deleted ; libusbx has been fixed
diff --git a/libs/libusb/DETAILS b/libs/libusb/DETAILS
index 6de54d0..c8c2805 100755
--- a/libs/libusb/DETAILS
+++ b/libs/libusb/DETAILS
@@ -1,16 +1,16 @@
SPELL=libusb
- VERSION=1.0.9
-
SOURCE_HASH=sha512:5eba3e9df2c1db71d685becebebf5b1310ee87e442f97a2553a430fd11655a2d9ce50e4ec2ffd62fe322286b0d6bc9e142ce552effc2466ee50424deba035ee5
+ VERSION=1.0.18
+
SOURCE_HASH=sha512:bbc3d75cb91f4e6a024549c2bac38ee85aeda8529a4553fd36bc8e8a5c223cd89eb952eda71fcc0071d6c6c818a0631d4cca084fed69d4986eee5dcf9a87d662
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

- SOURCE2=libusb-compat-0.1.4.tar.bz2
+ SOURCE2=libusb-compat-0.1.5.tar.bz2
SOURCE2_URL[0]=$SOURCEFORGE_URL/libusb/$SOURCE2
-
SOURCE2_HASH=sha512:23214b362f3a3c2aa299678bf6da786ac3ff3c6a4299b392dee65b6ca7ffff68d8559f72549b16175f2fd44f45e127efdfc883895a1b39465a89f0b288b2fb7d
+
SOURCE2_HASH=sha512:fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857

LICENSE[0]=LGPL
- WEB_SITE=http://sourceforge.net/projects/libusb/
+ WEB_SITE=http://libusb.info/
ENTERED=20020213
KEYWORDS="usb libs"
SHORT="Library for USB devices."
diff --git a/libs/libusb/HISTORY b/libs/libusb/HISTORY
index cb4c108..521d79c 100644
--- a/libs/libusb/HISTORY
+++ b/libs/libusb/HISTORY
@@ -1,3 +1,6 @@
+2014-01-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.18, libusb-compat 0.1.5, WEB_SITE updated
+
2013-02-23 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: remove non-existent variable
make docs optional
diff --git a/libs/libusbx/BUILD b/libs/libusbx/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/libs/libusbx/BUILD
@@ -0,0 +1 @@
+true
diff --git a/libs/libusbx/CONFLICTS b/libs/libusbx/CONFLICTS
index c3cc187..678cde3 100755
--- a/libs/libusbx/CONFLICTS
+++ b/libs/libusbx/CONFLICTS
@@ -1 +1 @@
-conflicts libusb
+conflicts libusbx y
diff --git a/libs/libusbx/DEPENDS b/libs/libusbx/DEPENDS
deleted file mode 100755
index 60149b4..0000000
--- a/libs/libusbx/DEPENDS
+++ /dev/null
@@ -1,14 +0,0 @@
-depends -sub CXX gcc &&
-
-#
-# Fix Bug #8283
-#
-if [ "$LIBUSB_DOC" == '--enable-build-docs' ]; then
- depends docbook-dsssl &&
- depends docbook-sgml-dtd
-fi &&
-
-optional_depends doxygen \
- "" \
- "" \
- "to build C++ API documentation"
diff --git a/libs/libusbx/DETAILS b/libs/libusbx/DETAILS
index 356b006..3f6d063 100755
--- a/libs/libusbx/DETAILS
+++ b/libs/libusbx/DETAILS
@@ -1,25 +1,8 @@
SPELL=libusbx
- VERSION=1.0.17
-
SOURCE_HASH=sha512:fddde538197707e6a97a6ddefab0deeba67f93def1694dac8379589d442c707f8319b1bd9fae6587b25ddaa92ce7894f3ec2e65ddfc031697c15e4c65d251d31
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- LICENSE[0]=LGPL
- WEB_SITE=http://libusbx.org/
- ENTERED=20120509
- KEYWORDS="usb libs"
- SHORT="Library for USB devices."
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-libusbx is a library that provides generic access to USB devices. It is meant
-to be used by developers, to facilitate the development of applications that
-communicate with USB hardware.
-
-It is user-mode: No special privilege or elevation is required for the
-application to communicate with a device.
-
-It is version-agnostic: All versions of the USB protocol, from 1.0 to 3.0
-(latest), are supported.
-
-It is a fork of libusb, meant to be a drop-in replacement, with more features
-and a faster release cycle.
+deprecated spell [replaced by libusb]
EOF
+
diff --git a/libs/libusbx/DOWNLOAD b/libs/libusbx/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/libs/libusbx/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/libs/libusbx/HISTORY b/libs/libusbx/HISTORY
index 75ebbc7..cdfeb98 100644
--- a/libs/libusbx/HISTORY
+++ b/libs/libusbx/HISTORY
@@ -1,29 +1,4 @@
-2013-09-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: 1.0.17
-
-2013-07-22 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: 1.0.16
-
-2013-07-01 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 1.0.16-rc1
-
-2013-04-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: 1.0.15
-
-2012-10-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: 1.0.14
-
-2012-09-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: 1.0.13
- remove libusb-compat
- * PRE_BUILD: deleted, libusb-compat: is not needed here
-
-2012-06-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: 1.0.12
-
-2012-05-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: fix url for libusb-compat
-
-2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: 1.0.11, libusb-compat 0.1.4
- spell created, cloned from libusb spell
+2014-01-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by libusb]
diff --git a/libs/libusbx/INSTALL b/libs/libusbx/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/libs/libusbx/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/libs/libusbx/PRE_BUILD b/libs/libusbx/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/libs/libusbx/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/libs/libusbx/PROVIDES b/libs/libusbx/PROVIDES
deleted file mode 100755
index 42a30a8..0000000
--- a/libs/libusbx/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-LIBUSB
diff --git a/libs/libusbx/UP_TRIGGERS b/libs/libusbx/UP_TRIGGERS
index dfd894b..d40a01c 100755
--- a/libs/libusbx/UP_TRIGGERS
+++ b/libs/libusbx/UP_TRIGGERS
@@ -1 +1 @@
-up_trigger libusb-compat cast_self
+up_trigger libusb cast_self
diff --git a/mail/claws-mail/CONFIGURE b/mail/claws-mail/CONFIGURE
index d4b180a..e686ca1 100755
--- a/mail/claws-mail/CONFIGURE
+++ b/mail/claws-mail/CONFIGURE
@@ -1,4 +1,4 @@
-config_query_list CLAWSMAIL_GTK "Use which GTK to build?" gtk+2 gtk+3 &&
+config_query_list CLAWSMAIL_GTK "Use which GTK to build (gtk+3
experimental)?" gtk+2 gtk+3 &&

config_query_option CLAWSMAIL_OPTS "Compile tray-icon plugin?" y \
"--enable-trayicon-plugin" \
@@ -47,6 +47,7 @@ config_query_option CLAWSMAIL_OPTS "Enable fetchinfo
plugin?" y \
config_query_option CLAWSMAIL_OPTS "Enable mailmbox plugin?" y \
"--enable-mailmbox-plugin" \
"--disable-mailmbox-plugin" &&
+
config_query_option CLAWSMAIL_OPTS "Enable newmail plugin?" y \
"--enable-newmail-plugin" \
"--disable-newmail-plugin" &&
diff --git a/mail/claws-mail/DEPENDS b/mail/claws-mail/DEPENDS
index 1e40fc5..10d5108 100755
--- a/mail/claws-mail/DEPENDS
+++ b/mail/claws-mail/DEPENDS
@@ -10,11 +10,6 @@ optional_depends "dbus" \
"--disable-dbus" \
"for DBus notification support" &&

-optional_depends "gnome-print" \
- "--enable-gnomeprint" \
- "--disable-gnomeprint" \
- "enable gnome-print support?" &&
-
optional_depends "libetpan" \
"--enable-libetpan" \
"--disable-libetpan" \
@@ -25,14 +20,14 @@ optional_depends "compface" \
"--disable-compface" \
"for X-Face support" &&

-optional_depends "gnutls" \
- "--enable-openssl --enable-gnutls" \
- "--disable-openssl --disable-gnutls" \
- "for pop3s and imaps" &&
+optional_depends "gnutls" \
+ "--enable-gnutls" \
+ "--disable-gnutls" \
+ "for pop3s and imaps" &&

optional_depends "gpgme" \
- "--enable-pgpmime-plugin" \
- "--disable-pgpmime-plugin" \
+ "--enable-pgpcore-plugin --enable-pgpmime-plugin
--enable-pgpinline-plugin" \
+ "--disable-pgpcore-plugin --disable-pgpmime-plugin
--disable-pgpinline-plugin" \
"for encrypted email" &&

optional_depends "spamassassin" \
@@ -60,11 +55,6 @@ optional_depends "startup-notification" \
"--disable-startup-notification" \
"enable startup-notification support?" &&

-optional_depends "dillo" \
- "--enable-dillo-viewer-plugin" \
- "--disable-dillo-viewer-plugin" \
- "enable dillo plugin support to read html emails?" &&
-
optional_depends "aspell" \
"" \
"" \
@@ -80,9 +70,9 @@ optional_depends "gettext" \
"--disable-nls" \
"for Native Language Support" &&

-optional_depends network-manager \
- "--enable-networkmanager-support" \
- "--disable-networkmanager-support" \
+optional_depends network-manager \
+ "--enable-networkmanager" \
+ "--disable-networkmanager" \
"support for NetworkManager" &&

optional_depends valgrind \
diff --git a/mail/claws-mail/DETAILS b/mail/claws-mail/DETAILS
index 074c7e8..9e16d29 100755
--- a/mail/claws-mail/DETAILS
+++ b/mail/claws-mail/DETAILS
@@ -1,5 +1,5 @@
SPELL=claws-mail
- VERSION=3.9.2
+ VERSION=3.9.3
SECURITY_PATCH=1
SOURCE=$SPELL-${VERSION}.tar.bz2

SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/Claws%20Mail/$VERSION/$SOURCE
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 67ec17c..484b3a4 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,7 @@
+2014-01-26 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 3.9.3
+ * DEPENDS: updated to new depends
+
2013-09-02 Robin Cook <rcook AT wyrms.net>
* CONFIGURE: added additional configure options
* DEPENDS: added additional optional depends
diff --git a/printer/cups-filters/DETAILS b/printer/cups-filters/DETAILS
index e8ac1ce..b689c04 100755
--- a/printer/cups-filters/DETAILS
+++ b/printer/cups-filters/DETAILS
@@ -1,6 +1,6 @@
SPELL=cups-filters
- VERSION=1.0.43
-
SOURCE_HASH=sha512:79e33bd6deea147cb4c74806cadbcee4f080068e33673bdf88e0d3198fa86458a3147c8beb6f996e0f708f764e55cd5bd61ba29a142116e7e1dbe0a0e0ddd0e6
+ VERSION=1.0.44
+
SOURCE_HASH=sha512:ae4b312c04162b4eb3adb1dc3b426e33d58d2ed40adc4ed9b0a664bc5e3ce9e93223e2fac62ca0b4fc56c65edec0c0115095e69dee5e10683d6bc0c4faa8b83a
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/printer/cups-filters/HISTORY b/printer/cups-filters/HISTORY
index 924e73c..ac67933 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,6 @@
+2014-01-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.44
+
2013-12-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.43

diff --git a/python-pypi/pyxattr/DEPENDS b/python-pypi/pyxattr/DEPENDS
index 5729404..b2f6b5a 100755
--- a/python-pypi/pyxattr/DEPENDS
+++ b/python-pypi/pyxattr/DEPENDS
@@ -1,2 +1,2 @@
-depends python &&
+depends PYTHON &&
depends attr
diff --git a/python-pypi/pyxattr/DETAILS b/python-pypi/pyxattr/DETAILS
index 38f61ad..f91a4f3 100755
--- a/python-pypi/pyxattr/DETAILS
+++ b/python-pypi/pyxattr/DETAILS
@@ -1,10 +1,11 @@
SPELL=pyxattr
- VERSION=0.5.0
-
SOURCE_HASH=sha512:f0c2ae061826204d7c1934fe18dd642c108360a25aa3762324d0d59dc4434622d756c3256e0ee31c5159d8289c4e6848c9fc9089e4d95f8add0cd597b9fca0aa
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://pyxattr.sourceforge.net";
+ SPELLX=xattr
+ VERSION=0.7.3
+
SOURCE_HASH=sha512:b90a1829fc9191440810987468af9eb7a251fd2fcf4b48e2a9e3bbf8b41a016465e5194bf51ebf711021225e74a13683ed68a6ad30dd805c768257d490e59fc5
+ SOURCE="${SPELLX}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/x/xattr/$SOURCE
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ WEB_SITE=https://pypi.python.org/pypi/xattr
LICENSE[0]=LGPL
ENTERED=20081228
SHORT="allows you to manipulate the extended attributes present
in some os/filesystem combinations"
diff --git a/python-pypi/pyxattr/HISTORY b/python-pypi/pyxattr/HISTORY
index e3fac8b..7fc9504 100644
--- a/python-pypi/pyxattr/HISTORY
+++ b/python-pypi/pyxattr/HISTORY
@@ -1,3 +1,8 @@
+2014-01-27 Treeve Jelbert <treeve AT source.age.org>
+ * DETAILS: version 0.7.3
+ new website & url
+ * DEPENDS: PYTHON
+
2012-04-28 Treeve Jelbert <treeve AT source.age.org>
* DEPENDS: add attr

diff --git a/qt5/qtwebkit5/HISTORY b/qt5/qtwebkit5/HISTORY
index 5ebcfe3..cd69544 100644
--- a/qt5/qtwebkit5/HISTORY
+++ b/qt5/qtwebkit5/HISTORY
@@ -1,3 +1,6 @@
+2014-01-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, icu.patch: fix compile with icu-51.1
+
2013-12-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.2.0

diff --git a/qt5/qtwebkit5/PRE_BUILD b/qt5/qtwebkit5/PRE_BUILD
index ad71fa1..f4e9b96 100755
--- a/qt5/qtwebkit5/PRE_BUILD
+++ b/qt5/qtwebkit5/PRE_BUILD
@@ -5,5 +5,5 @@ default_pre_build &&
fi
if is_depends_enabled $SPELL python3;then
ln -s /usr/bin/python3 python
- fi
-
+ fi
+patch -p1 < $SPELL_DIRECTORY/icu.patch
diff --git a/qt5/qtwebkit5/icu.patch b/qt5/qtwebkit5/icu.patch
new file mode 100644
index 0000000..a580e81
--- /dev/null
+++ b/qt5/qtwebkit5/icu.patch
@@ -0,0 +1,17 @@
+diff --git a/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
b/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
+index 4867f65..6409a6d 100644
+--- a/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
++++ b/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
+@@ -31,6 +31,11 @@
+ #include <unicode/ustring.h>
+ #include <unicode/utf16.h>
+
++#include <unicode/uvernum.h>
++#if U_ICU_VERSION_MAJOR_NUM>=51
++#include <unicode/utf_old.h>
++#endif
++
+ namespace WTF {
+
+ namespace Unicode {
+
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index 787ac5a..08bce47 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,7 @@
+2014-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, mc-4.8.11-ncurses_build_fix.patch: fix incompatibility
+ with ncurses, patch from gentoo
+
2013-12-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.8.11

diff --git a/shell-term-fm/mc/PRE_BUILD b/shell-term-fm/mc/PRE_BUILD
new file mode 100755
index 0000000..ef5ca1a
--- /dev/null
+++ b/shell-term-fm/mc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/mc-4.8.11-ncurses_build_fix.patch
diff --git a/shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch
b/shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch
new file mode 100644
index 0000000..0d986eb
--- /dev/null
+++ b/shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch
@@ -0,0 +1,38 @@
+Index: lib/tty/key.c
+===================================================================
+--- lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
++++ lib/tty/key.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
+@@ -1947,4 +1947,5 @@
+ {
+ int c;
++ static int flag = 0; /* Return value from select */
+ #ifdef HAVE_LIBGPM
+ static struct Gpm_Event ev; /* Mouse event */
+@@ -1979,5 +1980,4 @@
+ {
+ int nfd;
+- static int flag = 0; /* Return value from select */
+ fd_set select_set;
+
+Index: lib/tty/tty-ncurses.c
+===================================================================
+--- lib/tty/tty-ncurses.c (revision
bb65b467900ea9eb1f7867c059fd26fac86c747c)
++++ lib/tty/tty-ncurses.c (revision
21bf5d2dde704fd9ae90d991ce1279ba925897c9)
+@@ -50,4 +50,5 @@
+ #include "tty.h"
+ #include "color-internal.h"
++#include "key.h"
+ #include "mouse.h"
+ #include "win.h"
+@@ -531,4 +532,5 @@
+ {
+ int res;
++ unsigned char str[UTF8_CHAR_LEN + 1];
+
+ res = g_unichar_to_utf8 (c, (char *) str);
+@@ -541,5 +543,4 @@
+ else
+ {
+- unsigned char str[UTF8_CHAR_LEN + 1];
+ const char *s;
+
diff --git a/x11/xplanet/HISTORY b/x11/xplanet/HISTORY
index 84816c7..85772a0 100644
--- a/x11/xplanet/HISTORY
+++ b/x11/xplanet/HISTORY
@@ -1,3 +1,6 @@
+2014-01-26 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patch for newest giflib
+
2012-05-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.0

diff --git a/x11/xplanet/PRE_BUILD b/x11/xplanet/PRE_BUILD
new file mode 100755
index 0000000..4d96253
--- /dev/null
+++ b/x11/xplanet/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/xplanet-1.3.0-giflib.patch
+
diff --git a/x11/xplanet/xplanet-1.3.0-giflib.patch
b/x11/xplanet/xplanet-1.3.0-giflib.patch
new file mode 100644
index 0000000..193719e
--- /dev/null
+++ b/x11/xplanet/xplanet-1.3.0-giflib.patch
@@ -0,0 +1,741 @@
+Fixes from upstream SVN, to support giflib-4.2 and giflib-5.
+
+Index: src/libimage/gif.c
+===================================================================
+--- src/libimage/gif.c (revision 184)
++++ src/libimage/gif.c (revision 186)
+@@ -20,222 +20,581 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include <gif_lib.h>
+
+ /*
+- A lot of this is based on the gif2rgb and rgb2gif codes in the libungif
+- distribution.
++ Based on the gif2rgb and rgb2gif codes in the libgif distribution.
+ */
+
+ int
+ read_gif(const char *filename, int *width, int *height, unsigned char **rgb)
+ {
+- int interlace_offset[] = { 0, 4, 2, 1 };
+- int interlace_jump[] = { 8, 8, 4, 2 };
+- GifColorType *colormap;
+- GifFileType *infile;
+- GifRecordType record_type;
+- GifRowType *buffer = NULL;
++ int BackGround = 0;
++ /* The way Interlaced image should be read - offsets and
++ jumps... */
++ int InterlacedOffset[] = { 0, 4, 2, 1 };
++ int InterlacedJumps[] = { 8, 8, 4, 2 };
++ ColorMapObject *ColorMap;
+
+- int i, j;
+- int color_index;
+- unsigned char *ptr = NULL;
++ int i, j, Size, Row, Col, Width, Height, ExtCode, Count;
++ GifRecordType RecordType;
++ GifByteType *Extension;
++ GifRowType *ScreenBuffer;
+
+- infile = DGifOpenFileName(filename);
++ GifRowType GifRow;
++ GifColorType *ColorMapEntry;
++ unsigned char *BufferP;
+
+- if (infile == NULL)
++ GifFileType *GifFile;
++#if GIFLIB_MAJOR >= 5
++ GifFile = DGifOpenFileName(filename, NULL);
++#else
++ GifFile = DGifOpenFileName(filename);
++#endif
++ if (GifFile == NULL) {
++ fprintf(stderr, "Can't open GIF file %s\n", filename);
++ return(0);
++ }
++ /* (Following comment was probably written on a 286 running under DOS.)
*/
++ /* Allocate the screen as vector of column of rows. We can't allocate
the*/
++ /* whole screen at once, as this broken minded CPU can allocate up to
*/
++ /* 64k at a time and our image can be bigger than that:
*/
++ /* Note this screen is device independent - it's the screen defined by
*/
++ /* the GIF file parameters.
*/
++ if ((ScreenBuffer = (GifRowType *)
++ malloc(GifFile->SHeight * sizeof(GifRowType))) == NULL)
+ {
+- PrintGifError();
+- return(0);
++ fprintf(stderr, "Failed to allocate memory required, aborted.");
++ return(0);
+ }
+
+- do
++ Size = GifFile->SWidth * sizeof(GifPixelType);/* Size in bytes one
row.*/
++ if ((ScreenBuffer[0] = (GifRowType) malloc(Size)) == NULL) /* First
row. */
+ {
+- if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)
+- {
+- PrintGifError();
+- return(0);
++ fprintf(stderr, "Failed to allocate memory required, aborted.");
++ return(0);
++ }
++
++ for (i = 0; i < GifFile->SWidth; i++) /* Set its color to BackGround.
*/
++ ScreenBuffer[0][i] = GifFile->SBackGroundColor;
++ for (i = 1; i < GifFile->SHeight; i++) {
++ /* Allocate the other rows, and set their color to background too: */
++ if ((ScreenBuffer[i] = (GifRowType) malloc(Size)) == NULL)
++ {
++ fprintf(stderr, "Failed to allocate memory required, aborted.\n");
++ return(0);
++ }
++
++ memcpy(ScreenBuffer[i], ScreenBuffer[0], Size);
++ }
++
++ /* Scan the content of the GIF file and load the image(s) in: */
++ do {
++ if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
++ fprintf(stderr, "Can't read GIF file\n");
++ return(0);
++ }
++ switch (RecordType) {
++ case IMAGE_DESC_RECORD_TYPE:
++ if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
++ return(0);
++ }
++ Row = GifFile->Image.Top; /* Image Position relative to Screen. */
++ Col = GifFile->Image.Left;
++ Width = GifFile->Image.Width;
++ Height = GifFile->Image.Height;
++ if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth
||
++ GifFile->Image.Top + GifFile->Image.Height >
GifFile->SHeight) {
++ return(0);
++ }
++ if (GifFile->Image.Interlace) {
++ /* Need to perform 4 passes on the images: */
++ for (Count = i = 0; i < 4; i++)
++ for (j = Row + InterlacedOffset[i]; j < Row + Height;
++ j += InterlacedJumps[i]) {
++ if (DGifGetLine(GifFile, &ScreenBuffer[j][Col],
++ Width) == GIF_ERROR) {
++ return(0);
++ }
++ }
++ }
++ else {
++ for (i = 0; i < Height; i++) {
++ if (DGifGetLine(GifFile, &ScreenBuffer[Row++][Col],
++ Width) == GIF_ERROR) {
++ return(0);
++ }
++ }
++ }
++ break;
++ case EXTENSION_RECORD_TYPE:
++ /* Skip any extension blocks in file: */
++ if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR)
{
++ return(0);
++ }
++ while (Extension != NULL) {
++ if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) {
++ return(0);
++ }
++ }
++ break;
++ case TERMINATE_RECORD_TYPE:
++ break;
++ default: /* Should be traps by DGifGetRecordType.
*/
++ break;
++ }
++ } while (RecordType != TERMINATE_RECORD_TYPE);
++
++ /* Lets dump it - set the global variables required and do it: */
++ BackGround = GifFile->SBackGroundColor;
++ ColorMap = (GifFile->Image.ColorMap
++ ? GifFile->Image.ColorMap
++ : GifFile->SColorMap);
++ if (ColorMap == NULL) {
++ fprintf(stderr, "Gif Image does not have a colormap\n");
++ return(0);
++ }
++
++ *width = GifFile->SWidth;
++ *height = GifFile->SHeight;
++
++ rgb[0] = malloc(3 * *width * *height);
++ if (rgb[0] == NULL)
++ {
++ fprintf(stderr, "Can't allocate memory for GIF file.\n");
++ return(0);
++ }
++
++ BufferP = rgb[0];
++
++ for (i = 0; i < *height; i++) {
++ GifRow = ScreenBuffer[i];
++ for (j = 0; j < *width; j++) {
++ ColorMapEntry = &ColorMap->Colors[GifRow[j]];
++ *BufferP++ = ColorMapEntry->Red;
++ *BufferP++ = ColorMapEntry->Green;
++ *BufferP++ = ColorMapEntry->Blue;
++ }
++ }
++
++ if (DGifCloseFile(GifFile) == GIF_ERROR) {
++ return(0);
++ }
++
++ return(1);
++}
++
++/* Make some variables global, so we could access them faster: */
++static int
++ ExpNumOfColors = 8,
++ ColorMapSize = 256;
++
++/******************************************************************************
++ * Code to quantize high resolution image into lower one. You may want to
++ * peek into the following article this code is based on:
++ * "Color Image Quantization for frame buffer Display", by Paul Heckbert
++ * SIGGRAPH 1982 page 297-307.
++
******************************************************************************
++ * History:
++ * 5 Jan 90 - Version 1.0 by Gershon Elber.
++
*****************************************************************************/
++
++#define ABS(x) ((x) > 0 ? (x) : (-(x)))
++
++#define COLOR_ARRAY_SIZE 32768
++#define BITS_PER_PRIM_COLOR 5
++#define MAX_PRIM_COLOR 0x1f
++
++static int SortRGBAxis;
++
++typedef struct QuantizedColorType {
++ GifByteType RGB[3];
++ GifByteType NewColorIndex;
++ long Count;
++ struct QuantizedColorType *Pnext;
++} QuantizedColorType;
++
++typedef struct NewColorMapType {
++ GifByteType RGBMin[3], RGBWidth[3];
++ unsigned int NumEntries; /* # of QuantizedColorType in linked list
below */
++ unsigned long Count; /* Total number of pixels in all the entries */
++ QuantizedColorType *QuantizedColors;
++} NewColorMapType;
++
++static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
++ unsigned int ColorMapSize,
++ unsigned int *NewColorMapSize);
++static int SortCmpRtn(const void *Entry1, const void *Entry2);
++
++/******************************************************************************
++ * Quantize high resolution image into lower one. Input image consists of a
++ * 2D array for each of the RGB colors with size Width by Height. There is
no
++ * Color map for the input. Output is a quantized image with 2D array of
++ * indexes into the output color map.
++ * Note input image can be 24 bits at the most (8 for red/green/blue) and
++ * the output has 256 colors at the most (256 entries in the color map.).
++ * ColorMapSize specifies size of color map up to 256 and will be updated to
++ * real size before returning.
++ * Also non of the parameter are allocated by this routine.
++ * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
++
******************************************************************************/
++static int
++QuantizeBuffer(unsigned int Width,
++ unsigned int Height,
++ int *ColorMapSize,
++ GifByteType * RedInput,
++ GifByteType * GreenInput,
++ GifByteType * BlueInput,
++ GifByteType * OutputBuffer,
++ GifColorType * OutputColorMap) {
++
++ unsigned int Index, NumOfEntries;
++ int i, j, MaxRGBError[3];
++ unsigned int NewColorMapSize;
++ long Red, Green, Blue;
++ NewColorMapType NewColorSubdiv[256];
++ QuantizedColorType *ColorArrayEntries, *QuantizedColor;
++
++ ColorArrayEntries = (QuantizedColorType *)malloc(
++ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
++ if (ColorArrayEntries == NULL) {
++ return GIF_ERROR;
++ }
++
++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
++ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
++ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
++ MAX_PRIM_COLOR;
++ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
++ ColorArrayEntries[i].Count = 0;
++ }
++
++ /* Sample the colors and their distribution: */
++ for (i = 0; i < (int)(Width * Height); i++) {
++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++ (2 * BITS_PER_PRIM_COLOR)) +
++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++ BITS_PER_PRIM_COLOR) +
++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
++ ColorArrayEntries[Index].Count++;
++ }
++
++ /* Put all the colors in the first entry of the color map, and call the
++ * recursive subdivision process. */
++ for (i = 0; i < 256; i++) {
++ NewColorSubdiv[i].QuantizedColors = NULL;
++ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
++ for (j = 0; j < 3; j++) {
++ NewColorSubdiv[i].RGBMin[j] = 0;
++ NewColorSubdiv[i].RGBWidth[j] = 255;
+ }
++ }
+
+- switch (record_type)
+- {
+- case IMAGE_DESC_RECORD_TYPE:
+- if (DGifGetImageDesc(infile) == GIF_ERROR)
+- {
+- PrintGifError();
+- return(0);
++ /* Find the non empty entries in the color table and chain them: */
++ for (i = 0; i < COLOR_ARRAY_SIZE; i++)
++ if (ColorArrayEntries[i].Count > 0)
++ break;
++ QuantizedColor = NewColorSubdiv[0].QuantizedColors =
&ColorArrayEntries[i];
++ NumOfEntries = 1;
++ while (++i < COLOR_ARRAY_SIZE)
++ if (ColorArrayEntries[i].Count > 0) {
++ QuantizedColor->Pnext = &ColorArrayEntries[i];
++ QuantizedColor = &ColorArrayEntries[i];
++ NumOfEntries++;
++ }
++ QuantizedColor->Pnext = NULL;
++
++ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled
colors */
++ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
++ NewColorMapSize = 1;
++ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
++ GIF_OK) {
++ free((char *)ColorArrayEntries);
++ return GIF_ERROR;
++ }
++ if (NewColorMapSize < *ColorMapSize) {
++ /* And clear rest of color map: */
++ for (i = NewColorMapSize; i < *ColorMapSize; i++)
++ OutputColorMap[i].Red = OutputColorMap[i].Green =
++ OutputColorMap[i].Blue = 0;
++ }
++
++ /* Average the colors in each entry to be the color to be used in the
++ * output color map, and plug it into the output color map itself. */
++ for (i = 0; i < NewColorMapSize; i++) {
++ if ((j = NewColorSubdiv[i].NumEntries) > 0) {
++ QuantizedColor = NewColorSubdiv[i].QuantizedColors;
++ Red = Green = Blue = 0;
++ while (QuantizedColor) {
++ QuantizedColor->NewColorIndex = i;
++ Red += QuantizedColor->RGB[0];
++ Green += QuantizedColor->RGB[1];
++ Blue += QuantizedColor->RGB[2];
++ QuantizedColor = QuantizedColor->Pnext;
+ }
++ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
++ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR))
/ j;
++ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) /
j;
++ } else
++ fprintf(stderr,
++ "Null entry in quantized color map - that's weird.\n");
++ }
+
+- *width = infile->Image.Width;
+- *height = infile->Image.Height;
++ /* Finally scan the input buffer again and put the mapped index in the
++ * output buffer. */
++ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
++ for (i = 0; i < (int)(Width * Height); i++) {
++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++ (2 * BITS_PER_PRIM_COLOR)) +
++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++ BITS_PER_PRIM_COLOR) +
++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
++ Index = ColorArrayEntries[Index].NewColorIndex;
++ OutputBuffer[i] = Index;
++ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
++ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
++ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green -
GreenInput[i]))
++ MaxRGBError[1] = ABS(OutputColorMap[Index].Green -
GreenInput[i]);
++ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
++ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
++ }
+
+- buffer = malloc(*height * sizeof(GifRowType *));
+- if (buffer == NULL)
+- {
+- fprintf(stderr, "Can't allocate memory for GIF file.\n");
+- return(0);
+- }
+-
+- for (i = 0; i < *height; i++)
+- {
+- buffer[i] = malloc(*width * sizeof(GifPixelType));
+- if (buffer[i] == NULL)
+- {
+- fprintf(stderr, "Can't allocate memory for GIF
line.\n");
+- return(0);
++ free((char *)ColorArrayEntries);
++
++ *ColorMapSize = NewColorMapSize;
++
++ return GIF_OK;
++}
++
++/******************************************************************************
++ * Routine to subdivide the RGB space recursively using median cut in each
++ * axes alternatingly until ColorMapSize different cubes exists.
++ * The biggest cube in one dimension is subdivide unless it has only one
entry.
++ * Returns GIF_ERROR if failed, otherwise GIF_OK.
++
******************************************************************************/
++static int
++SubdivColorMap(NewColorMapType * NewColorSubdiv,
++ unsigned int ColorMapSize,
++ unsigned int *NewColorMapSize) {
++
++ int MaxSize;
++ unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
++ long Sum, Count;
++ QuantizedColorType *QuantizedColor, **SortArray;
++
++ while (ColorMapSize > *NewColorMapSize) {
++ /* Find candidate for subdivision: */
++ MaxSize = -1;
++ for (i = 0; i < *NewColorMapSize; i++) {
++ for (j = 0; j < 3; j++) {
++ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
++ (NewColorSubdiv[i].NumEntries > 1)) {
++ MaxSize = NewColorSubdiv[i].RGBWidth[j];
++ Index = i;
++ SortRGBAxis = j;
+ }
+ }
+-
+- if (infile->Image.Interlace)
+- {
+- for (i = 0; i < 4; i++)
+- for (j = interlace_offset[i]; j < *height;
+- j += interlace_jump[i])
+- DGifGetLine(infile, buffer[j], *width);
+- }
+- else
+- {
+- for (i = 0; i < *height; i++)
+- DGifGetLine(infile, buffer[i], *width);
+- }
+- break;
+- case EXTENSION_RECORD_TYPE:
+- {
+- /* Skip extension blocks */
+- int ext_code;
+- GifByteType *ext;
+- if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)
+- {
+- PrintGifError();
+- return(0);
+- }
+- while (ext != NULL)
+- {
+- if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR)
+- {
+- PrintGifError();
+- return(0);
+- }
+- }
+ }
+- break;
+- case TERMINATE_RECORD_TYPE:
+- break;
+- default:
+- fprintf(stderr, "unknown record type in GIF file\n");
+- break;
+- }
+- } while (record_type != TERMINATE_RECORD_TYPE);
+
+- colormap = (infile->Image.ColorMap ? infile->Image.ColorMap->Colors
+- : infile->SColorMap->Colors);
++ if (MaxSize == -1)
++ return GIF_OK;
+
+- rgb[0] = malloc(3 * *width * *height);
+- if (rgb[0] == NULL)
+- {
+- fprintf(stderr, "Can't allocate memory for GIF file.\n");
+- return(0);
+- }
++ /* Split the entry Index into two along the axis SortRGBAxis: */
+
+- ptr = rgb[0];
++ /* Sort all elements in that entry along the given axis and split at
++ * the median. */
++ SortArray = (QuantizedColorType **)malloc(
++ sizeof(QuantizedColorType *) *
++ NewColorSubdiv[Index].NumEntries);
++ if (SortArray == NULL)
++ return GIF_ERROR;
++ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
++ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
++ j++, QuantizedColor = QuantizedColor->Pnext)
++ SortArray[j] = QuantizedColor;
+
+- for (j = 0; j < *height; j++)
+- {
+- for (i = 0; i < *width; i++)
+- {
+- color_index = (int) buffer[j][i];
+- *ptr++ = (unsigned char) colormap[color_index].Red;
+- *ptr++ = (unsigned char) colormap[color_index].Green;
+- *ptr++ = (unsigned char) colormap[color_index].Blue;
++ qsort(SortArray, NewColorSubdiv[Index].NumEntries,
++ sizeof(QuantizedColorType *), SortCmpRtn);
++
++ /* Relink the sorted list into one: */
++ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
++ SortArray[j]->Pnext = SortArray[j + 1];
++ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
++ NewColorSubdiv[Index].QuantizedColors = QuantizedColor =
SortArray[0];
++ free((char *)SortArray);
++
++ /* Now simply add the Counts until we have half of the Count: */
++ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
++ NumEntries = 1;
++ Count = QuantizedColor->Count;
++ while (QuantizedColor->Pnext != NULL &&
++ (Sum -= QuantizedColor->Pnext->Count) >= 0 &&
++ QuantizedColor->Pnext->Pnext != NULL) {
++ QuantizedColor = QuantizedColor->Pnext;
++ NumEntries++;
++ Count += QuantizedColor->Count;
+ }
+- free(buffer[j]);
++ /* Save the values of the last color of the first half, and first
++ * of the second half so we can update the Bounding Boxes later.
++ * Also as the colors are quantized and the BBoxes are full 0..255,
++ * they need to be rescaled.
++ */
++ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half
*/
++ /* coverity[var_deref_op] */
++ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
++ MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
++ MinColor <<= (8 - BITS_PER_PRIM_COLOR);
++
++ /* Partition right here: */
++ NewColorSubdiv[*NewColorMapSize].QuantizedColors =
++ QuantizedColor->Pnext;
++ QuantizedColor->Pnext = NULL;
++ NewColorSubdiv[*NewColorMapSize].Count = Count;
++ NewColorSubdiv[Index].Count -= Count;
++ NewColorSubdiv[*NewColorMapSize].NumEntries =
++ NewColorSubdiv[Index].NumEntries - NumEntries;
++ NewColorSubdiv[Index].NumEntries = NumEntries;
++ for (j = 0; j < 3; j++) {
++ NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
++ NewColorSubdiv[Index].RGBMin[j];
++ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
++ NewColorSubdiv[Index].RGBWidth[j];
++ }
++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] -
MinColor;
++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
++
++ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
++ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
++
++ (*NewColorMapSize)++;
+ }
+-
+- free(buffer);
+
+- DGifCloseFile(infile);
+- return(1);
++ return GIF_OK;
+ }
+
++/****************************************************************************
++ * Routine called by qsort to compare two entries.
++
****************************************************************************/
++static int
++SortCmpRtn(const void *Entry1,
++ const void *Entry2) {
++
++ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
++ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
++}
++
++/******************************************************************************
++* Close output file (if open), and exit.
++******************************************************************************/
++static void QuitGifError(GifFileType *GifFile)
++{
++ fprintf(stderr, "Error writing GIF file\n");
++ if (GifFile != NULL) EGifCloseFile(GifFile);
++}
++
+ int
+ write_gif(const char *filename, int width, int height, char *rgb)
+ {
+ int i;
+- int colormap_size = 256;
+- GifByteType *red, *green, *blue, *buffer, *ptr;
+- GifFileType *outfile;
+- ColorMapObject *colormap;
++ GifByteType *red, *green, *blue;
+
++ GifByteType *OutputBuffer = NULL;
++ ColorMapObject *OutputColorMap = NULL;
++
++ GifFileType *GifFile;
++ GifByteType *Ptr;
++
++ bool GifTestExistance = false;
++
++ ColorMapSize = 1 << ExpNumOfColors;
++
++#if GIFLIB_MAJOR >= 5
++ OutputColorMap = GifMakeMapObject(ColorMapSize, NULL);
++#else
++ OutputColorMap = MakeMapObject(ColorMapSize, NULL);
++#endif
++
++ if (OutputColorMap == NULL ||
++ (OutputBuffer = (GifByteType *) malloc(width * height *
++ sizeof(GifByteType))) == NULL)
++ {
++ fprintf(stderr,"Failed to allocate memory required, aborted.");
++ return(0);
++ }
++
+ red = malloc(width * height * sizeof(GifByteType));
+ green = malloc(width * height * sizeof(GifByteType));
+ blue = malloc(width * height * sizeof(GifByteType));
+- buffer = malloc(width * height * sizeof(GifByteType));
+-
+- if (red == NULL || green == NULL || blue == NULL || buffer == NULL)
++ if (red == NULL || green == NULL || blue == NULL)
+ {
+- fprintf(stderr, "Can't allocate memory for GIF file.\n");
+- return(0);
++ fprintf(stderr, "Can't allocate memory for GIF file.\n");
++ return(0);
+ }
+-
+- colormap = MakeMapObject(colormap_size, NULL);
+-
+ for (i = 0; i < width * height; i++)
+ {
+- red[i] = (GifByteType) rgb[3*i ];
+- green[i] = (GifByteType) rgb[3*i+1];
+- blue[i] = (GifByteType) rgb[3*i+2];
++ red[i] = (GifByteType) rgb[3*i ];
++ green[i] = (GifByteType) rgb[3*i+1];
++ blue[i] = (GifByteType) rgb[3*i+2];
+ }
+-
+- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
+- buffer, colormap->Colors) == GIF_ERROR)
++
++ if (QuantizeBuffer(width, height, &ColorMapSize,
++ red, green, blue,
++ OutputBuffer, OutputColorMap->Colors) == GIF_ERROR)
++
+ {
+- PrintGifError();
+- return(0);
++ QuitGifError(NULL);
++ return(0);
+ }
+
+ free(red);
+ free(green);
+ free(blue);
+
+- outfile = EGifOpenFileName((char *) filename, FALSE);
+- if (outfile == NULL)
++ Ptr = OutputBuffer;
++
++#if GIFLIB_MAJOR >= 5
++ GifFile = EGifOpenFileName(filename, GifTestExistance, NULL);
++#else
++ GifFile = EGifOpenFileName(filename, GifTestExistance);
++#endif
++ /* Open stdout for the output file: */
++ if (GifFile == NULL)
+ {
+- PrintGifError();
+- return(0);
++ QuitGifError(GifFile);
++ return(0);
+ }
+
+- if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0,
colormap)
+- == GIF_ERROR)
++ if (EGifPutScreenDesc(GifFile,
++ width, height, ExpNumOfColors, 0,
++ OutputColorMap) == GIF_ERROR ||
++ EGifPutImageDesc(GifFile,
++ 0, 0, width, height, false, NULL) == GIF_ERROR)
++
+ {
+- PrintGifError();
+- return(0);
++ QuitGifError(GifFile);
++ return(0);
+ }
+
+- if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL)
+- == GIF_ERROR)
+- {
+- PrintGifError();
+- return(0);
++ for (i = 0; i < height; i++) {
++ if (EGifPutLine(GifFile, Ptr, width) == GIF_ERROR)
++
++ {
++ QuitGifError(GifFile);
++ return(0);
++ }
++ Ptr += width;
+ }
+
+- ptr = buffer;
+- for (i = 0; i < height; i++)
++ if (EGifCloseFile(GifFile) == GIF_ERROR)
++
+ {
+- if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
+- {
+- PrintGifError();
+- return(0);
+- }
+- ptr += width;
++ QuitGifError(GifFile);
++ return(0);
+ }
+
+- EGifSpew(outfile);
+-
+- if (EGifCloseFile(outfile) == GIF_ERROR)
+- PrintGifError();
+-
+- free(buffer);
+-
+ return(1);
+ }



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Robin Cook (ae0ee48e21f22b25eb01e11efda4f9f0aaab318e), Robin Cook, 01/28/2014

Archive powered by MHonArc 2.6.24.

Top of Page