Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (e2b9eac63a92ea59ba827bf6f0e2c0b19e85e59c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (e2b9eac63a92ea59ba827bf6f0e2c0b19e85e59c)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (e2b9eac63a92ea59ba827bf6f0e2c0b19e85e59c)
  • Date: Mon, 26 Dec 2011 02:15:46 -0600
GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 8
dev/null |binary
gnome2-apps/gnote/DEPENDS | 20 -
gnome2-apps/gnote/DETAILS | 4
gnome2-apps/gnote/HISTORY | 4
gnome2-apps/gnote/PRE_BUILD | 6
gnome2-apps/gnote/gnote-0.7.4.tar.bz2.sig | 0
gnome2-apps/gnote/gnote-0.8.2.tar.xz.sig |binary
gnome2-libs/gnome-applets2/BUILD | 12 -
gnome2-libs/gnome-applets2/CONFIGURE | 12 -
gnome2-libs/gnome-applets2/DEPENDS | 14 -
gnome2-libs/gnome-applets2/DETAILS | 2
gnome2-libs/gnome-applets2/HISTORY | 6
gnome2-libs/gnome-applets2/gnome-applets-2.91.3.tar.bz2.sig | 0
gnome2-libs/gnome-applets2/gnome-applets-3.3.1.tar.bz2.sig |binary
graphics-libs/sfml/BUILD | 1
graphics-libs/sfml/DEPENDS | 7
graphics-libs/sfml/DETAILS | 18 +
graphics-libs/sfml/HISTORY | 8
graphics-libs/sfml/PRE_BUILD | 8
graphics-libs/sfml/fix-includes.diff | 23 ++
graphics-libs/sfml/gcc-4.6.diff | 132
++++++++++++
graphics-libs/sfml/interlinking.diff | 78 +++++++
graphics-libs/sfml/repacking.diff | 132
++++++++++++
graphics-libs/soil/BUILD | 2
graphics-libs/soil/DEPENDS | 1
graphics-libs/soil/DETAILS | 13 +
graphics-libs/soil/HISTORY | 3
graphics-libs/soil/INSTALL | 2
graphics-libs/soil/Makefile.patch | 14 +
graphics-libs/soil/PRE_BUILD | 7
graphics/graphicsmagick/DETAILS | 4
graphics/graphicsmagick/HISTORY | 3
python-pypi/pycweather/DETAILS | 4
python-pypi/pycweather/HISTORY | 3
utils/gamin/HISTORY | 4
utils/gamin/PRE_BUILD | 4
utils/gamin/glib-fix.patch | 53 ++++
video-libs/live/DETAILS | 4
video-libs/live/HISTORY | 3
xorg-app/xcb-util-renderutil/DEPENDS | 2
xorg-app/xcb-util-renderutil/DETAILS | 14 +
xorg-app/xcb-util-renderutil/HISTORY | 2
xorg-lib/libxp/BUILD | 2
xorg-lib/libxp/HISTORY | 3
xorg-lib/libxp/PRE_BUILD | 4
xorg-lib/libxp/werror-fix.patch | 11 +
47 files changed, 611 insertions(+), 46 deletions(-)

New commits:
commit 31a57ef53994869ec82aa58c54fdf021ed760c94
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pycweather: => 0.3.0

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

graphicsmagick 1.3.13

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

xorg-app/xcb-util-renderutil: new spell, xcb render library

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

graphics-libs/sfml: new spell, a C++ multimedia API

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

graphics-libs/soil: new spell, a simple library for loading textures
into OpenGL

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

libxp: added patch to remove werror flag

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

gnote: updated to 0.8.2

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

gnome-applets2: updated to 3.3.1

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

gamin: apply patch to build with new glib2

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

live 2011.12.23

diff --git a/ChangeLog b/ChangeLog
index 5bff583..45b4f1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-26 Ladislav Hagara <hgr AT vabo.cz>
+ * xorg-app/xcb-util-renderutil: new spell, xcb render library
+
+2011-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * graphics-libs/soil: new spell, a simple library for loading
textures into
+ OpenGL
+ * graphics-libs/sfml: new spell, a multimedia C++ API
+
2011-12-23 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/fdb: new spell, yet another pthon binding for firebird

diff --git a/gnome2-apps/gnote/DEPENDS b/gnome2-apps/gnote/DEPENDS
index e0a3efa..c277444 100755
--- a/gnome2-apps/gnote/DEPENDS
+++ b/gnome2-apps/gnote/DEPENDS
@@ -5,22 +5,4 @@ depends libxslt &&
depends libxml2 &&
depends libxml++ &&
depends -sub "FILESYSTEM REGEX TEST" boost &&
-depends gconf2 &&
-optional_depends gtkspell \
- "" \
- "" \
- "For spell checking support" &&
-optional_depends libpanelappletmm \
- "" \
- "" \
- "For GNOME panel applet" &&
-
-optional_depends dbus-c++ \
- "--enable-dbus" \
- "--disable-dbus" \
- "to compile with dbus support" &&
-
-optional_depends rarian \
- "--enable-scrollkeeper" \
- "--disable-scrollkeeper" \
- "to register with rarian"
+depends gconf2
diff --git a/gnome2-apps/gnote/DETAILS b/gnome2-apps/gnote/DETAILS
index 7bbb797..06fa713 100755
--- a/gnome2-apps/gnote/DETAILS
+++ b/gnome2-apps/gnote/DETAILS
@@ -1,6 +1,6 @@
SPELL=gnote
- VERSION=0.7.4
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ VERSION=0.8.2
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
diff --git a/gnome2-apps/gnote/HISTORY b/gnome2-apps/gnote/HISTORY
index 8fda2ca..507814a 100644
--- a/gnome2-apps/gnote/HISTORY
+++ b/gnome2-apps/gnote/HISTORY
@@ -1,3 +1,7 @@
+2011-12-25 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.8.2
+ * DEPENDS: removed no longer valid depends
+
2011-07-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.7.4

diff --git a/gnome2-apps/gnote/PRE_BUILD b/gnome2-apps/gnote/PRE_BUILD
new file mode 100755
index 0000000..624577e
--- /dev/null
+++ b/gnome2-apps/gnote/PRE_BUILD
@@ -0,0 +1,6 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
+cd $SOURCE_DIRECTORY
+
diff --git a/gnome2-apps/gnote/gnote-0.7.4.tar.bz2.sig
b/gnome2-apps/gnote/gnote-0.7.4.tar.bz2.sig
deleted file mode 100644
index ffc42df..0000000
Binary files a/gnome2-apps/gnote/gnote-0.7.4.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gnote/gnote-0.8.2.tar.xz.sig
b/gnome2-apps/gnote/gnote-0.8.2.tar.xz.sig
new file mode 100644
index 0000000..46e7cea
Binary files /dev/null and b/gnome2-apps/gnote/gnote-0.8.2.tar.xz.sig differ
diff --git a/gnome2-libs/gnome-applets2/BUILD
b/gnome2-libs/gnome-applets2/BUILD
index 76a9db3..038a0e0 100755
--- a/gnome2-libs/gnome-applets2/BUILD
+++ b/gnome2-libs/gnome-applets2/BUILD
@@ -1,11 +1,5 @@
-if [ "$FREQSELSUID" == "n" ]; then
- OPTS="$OPTS --enable-suid=no"
-fi &&
+OPTS="$GAPPLETS_FREQSELSUID $GAPPLETS_IPV6 $GAPPLETS_BATT $GAPPLETS_MINI
$OPTS" &&

-if [ "$IPV6" == "y" ]; then
- OPTS="$OPTS --enable-ipv6"
-fi &&
-
-make_single &&
-default_build &&
+make_single &&
+default_build &&
make_normal
diff --git a/gnome2-libs/gnome-applets2/CONFIGURE
b/gnome2-libs/gnome-applets2/CONFIGURE
index 786ad80..db6d18b 100755
--- a/gnome2-libs/gnome-applets2/CONFIGURE
+++ b/gnome2-libs/gnome-applets2/CONFIGURE
@@ -1,4 +1,8 @@
-config_query FREQSELSUID "SUID root the Frequency Selector?" y &&
-config_query IPV6 "Enable IPv6 Extension?" n
-
-
+config_query_option GAPPLETS_FREQSELSUID "SUID root the Frequency Selector?"
y \
+ "--enable-suid" "--disable-suid"
&&
+config_query_option GAPPLETS_IPV6 "Enable IPv6 Extension?" n
\
+ "--enable-ipv6" "--disable-ipv6"
&&
+config_query_option GAPPLETS_BATT "Build battery monitor applet?" n
\
+ "--enable-battstat" "--disable-battstat"
&&
+config_query_option GAPPLETS_MINI "Build mini-commander?" n
\
+ "--enable-mini-commander" "--disable-mini-commander"

diff --git a/gnome2-libs/gnome-applets2/DEPENDS
b/gnome2-libs/gnome-applets2/DEPENDS
index 854bfdb..0a59073 100755
--- a/gnome2-libs/gnome-applets2/DEPENDS
+++ b/gnome2-libs/gnome-applets2/DEPENDS
@@ -29,11 +29,11 @@ optional_depends hal
\
"--with-hal"
\
"--without-hal"
\
"Build with hal support?"
&&
-optional_depends "apmd"
\
+optional_depends apmd
\
"--enable-battstat"
\
"--disable-battstat"
\
"for a battery status monitor"
&&
-optional_depends "gstreamer"
\
+optional_depends gstreamer
\
"--enable-mixer-applet"
\
"--disable-mixer-applet"
\
"Enable the gstreamer-based mixer applet."
&&
@@ -41,8 +41,14 @@ optional_depends cpufrequtils
\
"--enable-cpufreq=yes --enable-frequency-selector=yes"
\
"--enable-cpufreq=no --enable-frequency-selector=no"
\
"Build cpu freq scaling monitor applet and freq selector?"
&&
-optional_depends "policykit-gnome"
\
+optional_depends policykit-gnome
\
"--enable-polkit"
\
"--disable-polkit"
\
"Enable PolicyKit support?"
&&
-optional_depends "libnotify" "" "" "Enable notifications"
+optional_depends network-manager
\
+ "--enable-networkmanager"
\
+ "--disable-networkmanager"
\
+ "Enable Network Manager support?"
&&
+optional_depends libnotify "" "" "Enable notifications"
+
+
diff --git a/gnome2-libs/gnome-applets2/DETAILS
b/gnome2-libs/gnome-applets2/DETAILS
index ea3d926..b4cdad8 100755
--- a/gnome2-libs/gnome-applets2/DETAILS
+++ b/gnome2-libs/gnome-applets2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-applets2
- VERSION=2.91.3
+ VERSION=3.3.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-applets-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-applets-$VERSION
diff --git a/gnome2-libs/gnome-applets2/HISTORY
b/gnome2-libs/gnome-applets2/HISTORY
index 291aa33..8386efe 100644
--- a/gnome2-libs/gnome-applets2/HISTORY
+++ b/gnome2-libs/gnome-applets2/HISTORY
@@ -1,3 +1,9 @@
+2011-12-25 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 3.3.1
+ * DEPENDS: added network-manager
+ * CONFIGURE: changed to config_query_option and added two options
+ * BUILD: changed to use the config_query_options
+
2011-04-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.91.3

diff --git a/gnome2-libs/gnome-applets2/gnome-applets-2.91.3.tar.bz2.sig
b/gnome2-libs/gnome-applets2/gnome-applets-2.91.3.tar.bz2.sig
deleted file mode 100644
index 06c37ab..0000000
Binary files a/gnome2-libs/gnome-applets2/gnome-applets-2.91.3.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/gnome-applets2/gnome-applets-3.3.1.tar.bz2.sig
b/gnome2-libs/gnome-applets2/gnome-applets-3.3.1.tar.bz2.sig
new file mode 100644
index 0000000..fd7f35d
Binary files /dev/null and
b/gnome2-libs/gnome-applets2/gnome-applets-3.3.1.tar.bz2.sig differ
diff --git a/graphics-libs/sfml/BUILD b/graphics-libs/sfml/BUILD
new file mode 100755
index 0000000..6dfecc1
--- /dev/null
+++ b/graphics-libs/sfml/BUILD
@@ -0,0 +1 @@
+default_build_make
diff --git a/graphics-libs/sfml/DEPENDS b/graphics-libs/sfml/DEPENDS
new file mode 100755
index 0000000..786f85b
--- /dev/null
+++ b/graphics-libs/sfml/DEPENDS
@@ -0,0 +1,7 @@
+depends OPENAL &&
+depends libsndfile &&
+depends JPEG &&
+depends libpng &&
+depends zlib &&
+depends soil &&
+depends freetype2
diff --git a/graphics-libs/sfml/DETAILS b/graphics-libs/sfml/DETAILS
new file mode 100755
index 0000000..b53f6c6
--- /dev/null
+++ b/graphics-libs/sfml/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=sfml
+ VERSION=1.6
+ SOURCE="SFML-${VERSION}-sdk-linux-32.tar.gz"
+
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:518121bf05ab8b1f4ad917eaca72951ff870e992f79e2b3da94baad762e7de63ce331cf4cade172e285015fb6fec501e25039c633be2f7b77d77b171dc29cb0a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/SFML-${VERSION}"
+ WEB_SITE="http://www.sfml-dev.org";
+ LICENSE[0]=BSD
+ ENTERED=20111225
+ SHORT="a multimedia C++ API"
+cat << EOF
+SFML is a portable and easy to use multimedia API written in C++. You can
+see it as a modern, object-oriented alternative to SDL.
+
+SFML is composed of several packages to perfectly suit your needs. You can
+use SFML as a minimal windowing system to interface with OpenGL, or as a
+fully-featured multimedia library for building games or interactive programs.
+EOF
diff --git a/graphics-libs/sfml/HISTORY b/graphics-libs/sfml/HISTORY
new file mode 100644
index 0000000..d8ff5f1
--- /dev/null
+++ b/graphics-libs/sfml/HISTORY
@@ -0,0 +1,8 @@
+2011-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, PRE_BUILD: spell created
+ * added patches from Ubuntu:
+ - fix-includes.diff, gcc-4.6.diff: fix build with gcc 4.6
+ - interlinking.diff: fix dependencies in Makefiles
+ - repacking.diff: use system libraries instead of convenience
+ libraries provided by sfml
+
diff --git a/graphics-libs/sfml/PRE_BUILD b/graphics-libs/sfml/PRE_BUILD
new file mode 100755
index 0000000..55aecca
--- /dev/null
+++ b/graphics-libs/sfml/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/fix-includes.diff &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.6.diff &&
+patch -p1 < ${SCRIPT_DIRECTORY}/interlinking.diff &&
+patch -p1 < ${SCRIPT_DIRECTORY}/repacking.diff &&
+sedit "s:export *DESTDIR *= */usr/local:export DESTDIR=${INSTALL_ROOT}/usr:"
${SOURCE_DIRECTORY}/src/SFML/Makefile &&
+make mrproper
diff --git a/graphics-libs/sfml/fix-includes.diff
b/graphics-libs/sfml/fix-includes.diff
new file mode 100644
index 0000000..32d9ab8
--- /dev/null
+++ b/graphics-libs/sfml/fix-includes.diff
@@ -0,0 +1,23 @@
+From: Christoph Egger <christoph AT debian.org>
+Subject: [PATCH] debian/fix-includes
+
+SFML needs sme modified includes to build against gcc-4.6
+
+Signed-off-by: Christoph Egger <christoph AT debian.org>
+
+---
+ include/SFML/System/ResourcePtr.inl | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+Index: libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp
+===================================================================
+--- libsfml-1.6+dfsg1.orig/include/SFML/System/Resource.hpp 2011-09-21
15:03:16.449574957 +0000
++++ libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp 2011-09-21
15:03:34.429601847 +0000
+@@ -29,6 +29,7 @@
+ // Headers
+ ////////////////////////////////////////////////////////////
+ #include <set>
++#include <cstddef>
+
+
+ namespace sf
diff --git a/graphics-libs/sfml/gcc-4.6.diff b/graphics-libs/sfml/gcc-4.6.diff
new file mode 100644
index 0000000..82c2e06
--- /dev/null
+++ b/graphics-libs/sfml/gcc-4.6.diff
@@ -0,0 +1,132 @@
+From: Evgeni Golov <evgeni AT debian.org>
+Subject: [PATCH] debian/gcc-4.6
+
+Properly link with GCC 4.6.
+#include <cstddef> everywhere.
+Closes: #625031
+
+Signed-off-by: Evgeni Golov <evgeni AT debian.org>
+
+---
+ include/SFML/Audio/Music.hpp | 1 +
+ include/SFML/Audio/Sound.hpp | 1 +
+ include/SFML/Audio/SoundBuffer.hpp | 1 +
+ include/SFML/Graphics/PostFX.hpp | 1 +
+ include/SFML/Graphics/RenderWindow.hpp | 1 +
+ include/SFML/Graphics/Sprite.hpp | 1 +
+ include/SFML/Graphics/String.hpp | 1 +
+ include/SFML/System/ResourcePtr.inl | 1 +
+ src/SFML/Graphics/Font.cpp | 1 +
+ src/SFML/Graphics/Image.cpp | 1 +
+ 10 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp
+index 0b8f70d..3320676 100755
+--- a/include/SFML/Audio/Music.hpp
++++ b/include/SFML/Audio/Music.hpp
+@@ -28,6 +28,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <cstddef>
+ #include <SFML/Audio/SoundStream.hpp>
+ #include <string>
+ #include <vector>
+diff --git a/include/SFML/Audio/Sound.hpp b/include/SFML/Audio/Sound.hpp
+index 7cb8002..5a46481 100755
+--- a/include/SFML/Audio/Sound.hpp
++++ b/include/SFML/Audio/Sound.hpp
+@@ -28,6 +28,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <cstddef>
+ #include <SFML/System/Resource.hpp>
+ #include <SFML/System/Vector3.hpp>
+ #include <SFML/Audio/AudioResource.hpp>
+diff --git a/include/SFML/Audio/SoundBuffer.hpp
b/include/SFML/Audio/SoundBuffer.hpp
+index 023e5aa..2db29ad 100755
+--- a/include/SFML/Audio/SoundBuffer.hpp
++++ b/include/SFML/Audio/SoundBuffer.hpp
+@@ -28,6 +28,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <cstddef>
+ #include <SFML/System/Resource.hpp>
+ #include <SFML/Audio/AudioResource.hpp>
+ #include <string>
+diff --git a/include/SFML/Graphics/PostFX.hpp
b/include/SFML/Graphics/PostFX.hpp
+index c875377..be2200a 100755
+--- a/include/SFML/Graphics/PostFX.hpp
++++ b/include/SFML/Graphics/PostFX.hpp
+@@ -28,6 +28,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <cstddef>
+ #include <SFML/Graphics/Drawable.hpp>
+ #include <SFML/Graphics/Image.hpp>
+ #include <istream>
+diff --git a/include/SFML/Graphics/RenderWindow.hpp
b/include/SFML/Graphics/RenderWindow.hpp
+index 088e368..b2154cc 100755
+--- a/include/SFML/Graphics/RenderWindow.hpp
++++ b/include/SFML/Graphics/RenderWindow.hpp
+@@ -28,6 +28,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <cstddef>
+ #include <SFML/Graphics/Image.hpp>
+ #include <SFML/Graphics/RenderTarget.hpp>
+ #include <SFML/Window/Window.hpp>
+diff --git a/include/SFML/Graphics/Sprite.hpp
b/include/SFML/Graphics/Sprite.hpp
+index 9d47bb4..deb6bab 100755
+--- a/include/SFML/Graphics/Sprite.hpp
++++ b/include/SFML/Graphics/Sprite.hpp
+@@ -28,6 +28,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <cstddef>
+ #include <SFML/System/Resource.hpp>
+ #include <SFML/Graphics/Drawable.hpp>
+ #include <SFML/Graphics/Rect.hpp>
+diff --git a/include/SFML/Graphics/String.hpp
b/include/SFML/Graphics/String.hpp
+index b0ca81b..6b9c483 100755
+--- a/include/SFML/Graphics/String.hpp
++++ b/include/SFML/Graphics/String.hpp
+@@ -28,6 +28,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <cstddef>
+ #include <SFML/System/Resource.hpp>
+ #include <SFML/System/Unicode.hpp>
+ #include <SFML/Graphics/Drawable.hpp>
+diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp
+index 36c4c28..350c0cc 100755
+--- a/src/SFML/Graphics/Font.cpp
++++ b/src/SFML/Graphics/Font.cpp
+@@ -25,6 +25,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <cstddef>
+ #include <SFML/Graphics/Font.hpp>
+ #include <SFML/Graphics/FontLoader.hpp>
+ #include <iostream>
+diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
+index 14346fb..8b18fb7 100755
+--- a/src/SFML/Graphics/Image.cpp
++++ b/src/SFML/Graphics/Image.cpp
+@@ -25,6 +25,7 @@
+ ////////////////////////////////////////////////////////////
+ // Headers
+ ////////////////////////////////////////////////////////////
++#include <cstddef>
+ #include <SFML/Graphics/Image.hpp>
+ #include <SFML/Graphics/ImageLoader.hpp>
+ #include <SFML/Graphics/RenderWindow.hpp>
+--
+tg: (3794d17..) debian/gcc-4.6 (depends on: master)
diff --git a/graphics-libs/sfml/interlinking.diff
b/graphics-libs/sfml/interlinking.diff
new file mode 100644
index 0000000..ce79671
--- /dev/null
+++ b/graphics-libs/sfml/interlinking.diff
@@ -0,0 +1,78 @@
+From: Christoph Egger <Christoph.Egger AT gmx.de>
+Subject: [PATCH] debian/interlinking
+
+ Some of the SFML libraries depend on each other but they are currently not
+linked against them. This patch fixes this issue.
+
+Signed-off-by: Christoph Egger <Christoph.Egger AT gmx.de>
+
+---
+ src/SFML/Audio/Makefile | 2 +-
+ src/SFML/Graphics/Makefile | 2 +-
+ src/SFML/Makefile | 4 ++--
+ src/SFML/Window/Makefile | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/SFML/Audio/Makefile b/src/SFML/Audio/Makefile
+index 0215e80..175bb61 100755
+--- a/src/SFML/Audio/Makefile
++++ b/src/SFML/Audio/Makefile
+@@ -19,7 +19,7 @@ libsfml-audio-s.a: $(OBJ) $(OBJVORBIS)
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
+
+ libsfml-audio.so: $(OBJ) $(OBJVORBIS)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJVORBIS) -lsndfile -lopenal
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJVORBIS) -lsndfile -lopenal $(LIBPATH)/libsfml-system.so.$(VERSION)
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS)
+diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile
+index 4de224d..f149155 100755
+--- a/src/SFML/Graphics/Makefile
++++ b/src/SFML/Graphics/Makefile
+@@ -27,7 +27,7 @@ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG)
$(OBJPNG) $(OBJSOIL) $(OBJZLI
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG)
$(OBJSOIL) $(OBJZLIB)
+
+ libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL)
$(OBJZLIB)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
$(LIBPATH)/libsfml-system.so.$(VERSION)
$(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
+diff --git a/src/SFML/Makefile b/src/SFML/Makefile
+index d8f633e..cd73816 100755
+--- a/src/SFML/Makefile
++++ b/src/SFML/Makefile
+@@ -37,7 +37,7 @@ sfml-system:
+ @(mkdir -p ../../lib)
+ @(cd ./System && $(MAKE))
+
+-sfml-window:
++sfml-window: sfml-system
+ @(mkdir -p ../../lib)
+ @(cd ./Window && $(MAKE))
+
+@@ -45,7 +45,7 @@ sfml-network:
+ @(mkdir -p ../../lib)
+ @(cd ./Network && $(MAKE))
+
+-sfml-graphics:
++sfml-graphics: sfml-system sfml-window
+ @(mkdir -p ../../lib)
+ @(cd ./Graphics && $(MAKE))
+
+diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile
+index 0dd689c..a05a54b 100755
+--- a/src/SFML/Window/Makefile
++++ b/src/SFML/Window/Makefile
+@@ -18,7 +18,7 @@ libsfml-window-s.a: $(OBJ)
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
+
+ libsfml-window.so: $(OBJ)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) -lX11 -lXrandr -lGL
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS)
+--
+tg: (2bed856..) debian/interlinking (depends on:
debian/destdir-install-symlinks)
diff --git a/graphics-libs/sfml/repacking.diff
b/graphics-libs/sfml/repacking.diff
new file mode 100644
index 0000000..06d27d1
--- /dev/null
+++ b/graphics-libs/sfml/repacking.diff
@@ -0,0 +1,132 @@
+From: Christoph Egger <Christoph.Egger AT gmx.de>
+Subject: [PATCH] debian/repacking
+
+ SFML Upstream Tarball ships loads of convenience copies in it's tarball and
+builds them inseparable in it's Makefiles.
+
+ This patch removes the convenience-copies from all Makefiles and corrects
the
+source-file to use the generic, system-wide libraries.
+
+Signed-off-by: Christoph Egger <Christoph.Egger AT gmx.de>
+
+---
+ src/SFML/Graphics/GraphicsContext.hpp | 2 +-
+ src/SFML/Graphics/ImageLoader.cpp | 8 ++++----
+ src/SFML/Graphics/Makefile | 19 +++----------------
+ src/SFML/Window/Linux/WindowImplX11.cpp | 4 ++--
+ src/SFML/Window/Makefile | 3 +--
+ 5 files changed, 11 insertions(+), 25 deletions(-)
+
+diff --git a/src/SFML/Graphics/GraphicsContext.hpp
b/src/SFML/Graphics/GraphicsContext.hpp
+index 2fa77a3..aebfe1f 100755
+--- a/src/SFML/Graphics/GraphicsContext.hpp
++++ b/src/SFML/Graphics/GraphicsContext.hpp
+@@ -30,7 +30,7 @@
+ ////////////////////////////////////////////////////////////
+ #include <SFML/Config.hpp>
+ #include <SFML/System/NonCopyable.hpp>
+-#include <SFML/Graphics/GLEW/glew.h>
++#include <GL/glew.h>
+ #include <iostream>
+ #include <string>
+
+diff --git a/src/SFML/Graphics/ImageLoader.cpp
b/src/SFML/Graphics/ImageLoader.cpp
+index a3f83bf..e6ceacd 100755
+--- a/src/SFML/Graphics/ImageLoader.cpp
++++ b/src/SFML/Graphics/ImageLoader.cpp
+@@ -28,11 +28,11 @@
+ #include <SFML/Graphics/ImageLoader.hpp>
+ extern "C"
+ {
+- #include <SFML/Graphics/libjpeg/jpeglib.h>
+- #include <SFML/Graphics/libjpeg/jerror.h>
++ #include <jpeglib.h>
++ #include <jerror.h>
+ }
+-#include <SFML/Graphics/libpng/png.h>
+-#include <SFML/Graphics/SOIL/SOIL.h>
++#include <png.h>
++#include <SOIL/SOIL.h>
+ #include <iostream>
+
+
+diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile
+index f149155..346f568 100755
+--- a/src/SFML/Graphics/Makefile
++++ b/src/SFML/Graphics/Makefile
+@@ -1,15 +1,5 @@
+ SRC = $(wildcard *.cpp)
+-SRCGLEW = $(wildcard ./GLEW/*.c)
+-SRCJPEG = $(wildcard ./libjpeg/*.c)
+-SRCPNG = $(wildcard ./libpng/*.c)
+-SRCSOIL = $(wildcard ./SOIL/*.c)
+-SRCZLIB = $(wildcard ./zlib/*.c)
+ OBJ = $(SRC:.cpp=.o)
+-OBJGLEW = $(SRCGLEW:.c=.o)
+-OBJJPEG = $(SRCJPEG:.c=.o)
+-OBJPNG = $(SRCPNG:.c=.o)
+-OBJSOIL = $(SRCSOIL:.c=.o)
+-OBJZLIB = $(SRCZLIB:.c=.o)
+
+ ifeq ($(STATIC), yes)
+ LIB = libsfml-graphics-s.a
+@@ -26,19 +16,16 @@ all: $(LIB)
+ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL)
$(OBJZLIB)
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG)
$(OBJSOIL) $(OBJZLIB)
+
+-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL)
$(OBJZLIB)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
$(LIBPATH)/libsfml-system.so.$(VERSION)
$(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
++libsfml-graphics.so: $(OBJ)
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lGLEW -ljpeg -lpng -lSOIL -lfreetype $(LIBPATH)/libsfml-system.so.$(VERSION)
$(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
+
+-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
+- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
+-
+ .PHONY: clean mrproper
+
+ clean:
+- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++ @rm -rf $(OBJ)
+
+ mrproper: clean
+ @rm -rf $(LIBNAME)
+diff --git a/src/SFML/Window/Linux/WindowImplX11.cpp
b/src/SFML/Window/Linux/WindowImplX11.cpp
+index edec19b..f527864 100755
+--- a/src/SFML/Window/Linux/WindowImplX11.cpp
++++ b/src/SFML/Window/Linux/WindowImplX11.cpp
+@@ -27,8 +27,8 @@
+ ////////////////////////////////////////////////////////////
+ #include <SFML/Window/WindowStyle.hpp> // important to be included first
(conflict with None)
+ #include <SFML/Window/Linux/WindowImplX11.hpp>
+-#include <SFML/Window/glext/glxext.h>
+-#include <SFML/Window/glext/glext.h>
++#include <GL/glxext.h>
++#include <GL/glext.h>
+ #include <SFML/System/Unicode.hpp>
+ #include <X11/keysym.h>
+ #include <X11/extensions/Xrandr.h>
+diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile
+index a05a54b..5f9708e 100755
+--- a/src/SFML/Window/Makefile
++++ b/src/SFML/Window/Makefile
+@@ -1,6 +1,5 @@
+ SRC = $(wildcard *.cpp ./Linux/*.cpp)
+ OBJ = $(SRC:.cpp=.o)
+-OBJGLEW = $(SRCGLEW:.c=.o)
+
+ ifeq ($(STATIC), yes)
+ LIB = libsfml-window-s.a
+@@ -18,7 +17,7 @@ libsfml-window-s.a: $(OBJ)
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
+
+ libsfml-window.so: $(OBJ)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS)
+--
+tg: (cced581..) debian/repacking (depends on: debian/interlinking)
diff --git a/graphics-libs/soil/BUILD b/graphics-libs/soil/BUILD
new file mode 100755
index 0000000..232e8af
--- /dev/null
+++ b/graphics-libs/soil/BUILD
@@ -0,0 +1,2 @@
+cd "${SOURCE_DIRECTORY}/src/" &&
+default_build_make
diff --git a/graphics-libs/soil/DEPENDS b/graphics-libs/soil/DEPENDS
new file mode 100755
index 0000000..61c9cff
--- /dev/null
+++ b/graphics-libs/soil/DEPENDS
@@ -0,0 +1 @@
+depends OPENGL
diff --git a/graphics-libs/soil/DETAILS b/graphics-libs/soil/DETAILS
new file mode 100755
index 0000000..89a4c41
--- /dev/null
+++ b/graphics-libs/soil/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=soil
+ VERSION=1.07
+ SOURCE="${SPELL}.zip"
+ SOURCE_URL[0]=http://www.lonesock.net/files/${SOURCE}
+
SOURCE_HASH=sha512:a575a84aa65b7556320779d635561341f5cf156418d0462473e5d1eb082829be3bcb30600b4887af75aeddd3715de16bdb3ca1668ebaa93eea62bacf22b79548
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Simple OpenGL Image Library"
+ WEB_SITE="http://www.lonesock.net/soil.html";
+ LICENSE[0]=PD
+ ENTERED=20111225
+ SHORT="a tiny C library used primarily for uploading textures
into OpenGL"
+cat << EOF
+SOIL is a tiny C library used primarily for uploading textures into OpenGL.
+EOF
diff --git a/graphics-libs/soil/HISTORY b/graphics-libs/soil/HISTORY
new file mode 100644
index 0000000..6f4857e
--- /dev/null
+++ b/graphics-libs/soil/HISTORY
@@ -0,0 +1,3 @@
+2011-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/graphics-libs/soil/INSTALL b/graphics-libs/soil/INSTALL
new file mode 100755
index 0000000..653c917
--- /dev/null
+++ b/graphics-libs/soil/INSTALL
@@ -0,0 +1,2 @@
+cd "${SOURCE_DIRECTORY}/src/" &&
+default_install
diff --git a/graphics-libs/soil/Makefile.patch
b/graphics-libs/soil/Makefile.patch
new file mode 100644
index 0000000..e59df31
--- /dev/null
+++ b/graphics-libs/soil/Makefile.patch
@@ -0,0 +1,14 @@
+--- projects/makefile/Makefile.orig 2011-12-25 23:15:38.397716914 +0100
++++ projects/makefile/Makefile 2011-12-25 23:15:52.212551519 +0100
+@@ -1,10 +1,8 @@
+-MAKE = make
+-CC = gcc
+ INSTALL_FILE = install -p -o root -g root -m 644
+ INSTALL_DIR = install -p -o root -g root -d
+ LN = ln -s
+ RM = rm -fv
+-CFLAGS += -c -O2 -Wall
++CFLAGS += -c
+ LDFLAGS +=
+
+ CFILES = image_DXT.c image_helper.c SOIL.c stb_image_aug.c
diff --git a/graphics-libs/soil/PRE_BUILD b/graphics-libs/soil/PRE_BUILD
new file mode 100755
index 0000000..5272007
--- /dev/null
+++ b/graphics-libs/soil/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+cp "${SOURCE_DIRECTORY}/projects/makefile/alternate Makefile.txt" \
+ "${SOURCE_DIRECTORY}/projects/makefile/Makefile"
+patch -p0 < ${SCRIPT_DIRECTORY}/Makefile.patch &&
+cp "${SOURCE_DIRECTORY}/projects/makefile/Makefile" \
+ "${SOURCE_DIRECTORY}/src/"
diff --git a/graphics/graphicsmagick/DETAILS b/graphics/graphicsmagick/DETAILS
index 450336a..dada8f3 100755
--- a/graphics/graphicsmagick/DETAILS
+++ b/graphics/graphicsmagick/DETAILS
@@ -6,8 +6,8 @@
# SOURCE=GraphicsMagick-${VERSION}.tar.bz2
#
SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/snapshots/${SOURCE}
#else
- VERSION=1.3.7
-
SOURCE_HASH=sha512:987aaa88bf79337ac0cc5703e64e03db66621d6722c8c380c54c694f0bca1f987530af8b07b5474608b2ebb61ccae61fc65fc4d47bf1c63ea8d57bb2f06111f5
+ VERSION=1.3.13
+
SOURCE_HASH=sha512:7fc2f975036fc7def438ee4e9962e59e2bbb04d7b27a02790689dd0ad760e9ee52796e69ddb42da259fa43ea244483280d5cba4dac8aa95995389062f4bdde2b
SOURCE=GraphicsMagick-${VERSION}.tar.bz2
SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/${SOURCE}
SOURCE_URL[1]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/graphics/graphicsmagick/HISTORY b/graphics/graphicsmagick/HISTORY
index 55e29b9..4fc0389 100644
--- a/graphics/graphicsmagick/HISTORY
+++ b/graphics/graphicsmagick/HISTORY
@@ -1,3 +1,6 @@
+2011-12-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.13
+
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/python-pypi/pycweather/DETAILS b/python-pypi/pycweather/DETAILS
index 1ae6d93..2550b9a 100755
--- a/python-pypi/pycweather/DETAILS
+++ b/python-pypi/pycweather/DETAILS
@@ -1,9 +1,9 @@
SPELL=pycweather
- VERSION=0.2.0
+ VERSION=0.3.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
SOURCE_URL[1]=http://pycweather.enqlave.net/releases/$SOURCE
-
SOURCE_HASH=sha512:aff3cd468ec82e902678e567bb7644cd58049db8b5775bef7f148e9f992bf69353487d5eb55c8296eb7d9c1c33a3e7ceb35200ccee7826f63e761ba923d0ebf4
+
SOURCE_HASH=sha512:ab0570f239e45f141df4e7e78c1a1d9855f69697786d1213a0d74c615c80aa02fec1474c4d88bb137dcaa0fad0799eb43b60975ad0434fdb55e72c03ed84949f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://pycweather.enqlave.net/
LICENSE[0]=ISC
diff --git a/python-pypi/pycweather/HISTORY b/python-pypi/pycweather/HISTORY
index 09faea1..fddf9d2 100644
--- a/python-pypi/pycweather/HISTORY
+++ b/python-pypi/pycweather/HISTORY
@@ -1,3 +1,6 @@
+2011-12-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.0
+
2009-08-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.0

diff --git a/utils/gamin/HISTORY b/utils/gamin/HISTORY
index f73dfa5..88a2a5e 100644
--- a/utils/gamin/HISTORY
+++ b/utils/gamin/HISTORY
@@ -1,3 +1,7 @@
+2011-12-25 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patch use of deprecated G_CONST_RETURN
+
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-October/011050.html
+
2010-10-04 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Force glib2 to be cast if not already
Avoids circular gamin -> glib2 ?-> gamin cast order
diff --git a/utils/gamin/PRE_BUILD b/utils/gamin/PRE_BUILD
new file mode 100755
index 0000000..b78c45d
--- /dev/null
+++ b/utils/gamin/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/glib-fix.patch
diff --git a/utils/gamin/glib-fix.patch b/utils/gamin/glib-fix.patch
new file mode 100644
index 0000000..f120a48
--- /dev/null
+++ b/utils/gamin/glib-fix.patch
@@ -0,0 +1,53 @@
+Index: gamin-0.1.10/server/gam_node.c
+===================================================================
+--- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314
+0100
++++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100
+@@ -122,7 +122,7 @@
+ * it has finished with the string. If it must keep it longer, it
+ * should makes its own copy. The returned string must not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ gam_node_get_path(GamNode * node)
+ {
+ g_assert(node);
+Index: gamin-0.1.10/server/gam_node.h
+===================================================================
+--- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269
+0100
++++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100
+@@ -58,7 +58,7 @@
+ void gam_node_set_is_dir (GamNode *node,
+ gboolean is_dir);
+
+-G_CONST_RETURN char *gam_node_get_path (GamNode *node);
++const char *gam_node_get_path (GamNode *node);
+
+ GList *gam_node_get_subscriptions (GamNode *node);
+
+Index: gamin-0.1.10/server/gam_subscription.c
+===================================================================
+--- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12
15:25:40.497177525 +0100
++++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304
+0100
+@@ -141,7 +141,7 @@
+ * @param sub the GamSubscription
+ * @returns The path being monitored. It should not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ gam_subscription_get_path(GamSubscription * sub)
+ {
+ if (sub == NULL)
+Index: gamin-0.1.10/server/gam_subscription.h
+===================================================================
+--- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12
15:25:28.507178266 +0100
++++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285
+0100
+@@ -21,7 +21,7 @@
+
+ int gam_subscription_get_reqno (GamSubscription *sub);
+
+-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
++const char *gam_subscription_get_path (GamSubscription *sub);
+
+ GamListener *gam_subscription_get_listener (GamSubscription *sub);
+
+
diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index 149a398..f03ba82 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,7 +1,7 @@
SPELL=live
- VERSION=2011.12.20
+ VERSION=2011.12.23
SOURCE=$SPELL.$VERSION.tar.gz
-
SOURCE_HASH=sha512:801599d17a690dcf3412674f1146f6ddf215a5df4e9d599edf279125f2ca00ceabe60897370e8cb987f50588b9cbe6c3027fa649e83bb2b64294ea900c80f858
+
SOURCE_HASH=sha512:6d84373dc81df478e3870acd38d72b60d61070861d4b6f394728cf21be06eb41d6e84bc97848c997fe205ec93133c5f4f67bdd7865631a148901b48629c69286
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
SOURCE_URL[1]=http://live555sourcecontrol.googlecode.com/files/$SOURCE
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index adb0829..0b90f37 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2011-12-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2011.12.23
+
2011-12-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2011.12.20

diff --git a/xorg-app/xcb-util-renderutil/DEPENDS
b/xorg-app/xcb-util-renderutil/DEPENDS
new file mode 100755
index 0000000..5689e97
--- /dev/null
+++ b/xorg-app/xcb-util-renderutil/DEPENDS
@@ -0,0 +1,2 @@
+depends xcb-util &&
+optional_depends doxygen '--with-doxygen' '--without-doxygen' 'for
documentation'
diff --git a/xorg-app/xcb-util-renderutil/DETAILS
b/xorg-app/xcb-util-renderutil/DETAILS
new file mode 100755
index 0000000..683bce4
--- /dev/null
+++ b/xorg-app/xcb-util-renderutil/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=xcb-util-renderutil
+ VERSION=0.3.8
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://xcb.freedesktop.org/dist/${SOURCE}
+
SOURCE_HASH=sha512:d2f94d23628383a1d2c861e0bfbe6452b89efd1003348dcfacfae9249b49fefb91efdec4cd5f5fc0aadd6f6b72cb2b866089e42b5006f9394fb6b68cb484fa8e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://xcb.freedesktop.org/";
+ LICENSE[0]=XCL
+ ENTERED=20111226
+ SHORT="XCB util-renderutil library"
+cat << EOF
+XCB util-renderutil module provides the following library:
+ - renderutil: Convenience functions for the Render extension.
+EOF
diff --git a/xorg-app/xcb-util-renderutil/HISTORY
b/xorg-app/xcb-util-renderutil/HISTORY
new file mode 100644
index 0000000..504a074
--- /dev/null
+++ b/xorg-app/xcb-util-renderutil/HISTORY
@@ -0,0 +1,2 @@
+2011-12-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 0.3.8
diff --git a/xorg-lib/libxp/BUILD b/xorg-lib/libxp/BUILD
new file mode 100755
index 0000000..42b647d
--- /dev/null
+++ b/xorg-lib/libxp/BUILD
@@ -0,0 +1,2 @@
+OPTS="--disable-strict-compilation $OPTS" &&
+default_build
diff --git a/xorg-lib/libxp/HISTORY b/xorg-lib/libxp/HISTORY
index cf2d2d4..d97b99d 100644
--- a/xorg-lib/libxp/HISTORY
+++ b/xorg-lib/libxp/HISTORY
@@ -1,3 +1,6 @@
+2011-12-25 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: appy patch to remove werror causing build to fail.
+
2011-10-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.0.1
* PRE_BUILD: added to run autogen.sh
diff --git a/xorg-lib/libxp/PRE_BUILD b/xorg-lib/libxp/PRE_BUILD
index c5b8fb6..f32c7bd 100755
--- a/xorg-lib/libxp/PRE_BUILD
+++ b/xorg-lib/libxp/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-./autogen.sh
+./autogen.sh &&
+
+patch -p0 < $SCRIPT_DIRECTORY/werror-fix.patch
diff --git a/xorg-lib/libxp/werror-fix.patch b/xorg-lib/libxp/werror-fix.patch
new file mode 100644
index 0000000..25dc373
--- /dev/null
+++ b/xorg-lib/libxp/werror-fix.patch
@@ -0,0 +1,11 @@
+--- configure-orig 2011-12-25 15:52:45.689534862 -0600
++++ configure 2011-12-25 15:53:08.762535820 -0600
+@@ -7606,7 +7606,7 @@
+ CFLAGS="$xorg_testset_save_CFLAGS"
+
+ if test "$supported" = "yes" ; then
+- BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast"
++ BASE_CFLAGS="$BASE_CFLAGS"
+ found="yes"
+ fi
+ fi


  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (e2b9eac63a92ea59ba827bf6f0e2c0b19e85e59c), Vlad Glagolev, 12/26/2011

Archive powered by MHonArc 2.6.24.

Top of Page