diff options
| author | Andraž Levstik | 2007-12-01 16:00:53 +0100 |
|---|---|---|
| committer | Andraž Levstik | 2007-12-01 16:00:53 +0100 |
| commit | ddfe543b9be88e1c185451be118748408ea5b3c1 (patch) | |
| tree | e6d0513e2e4c31ddc3722cceb634bdded82d0ae5 | |
| parent | a610dddfecd0ba5bb3855a84375ccc08679429f7 (diff) | |
| parent | 1d39fd87dffd723b9e993f90e53ef23538d359ad (diff) | |
Merge branch 'master' of git+ssh://scm.sourcemage.org/smgl/grimoire
265 files changed, 2763 insertions, 292 deletions
@@ -1,3 +1,26 @@ +2007-12-01 Ismael Luceno <ismael@sourcemage.org> + * devel/codeblocks: new spell, wxwidgets based IDE + +2007-12-01 Eric Sandall <sandalle@sourcemage.org> + * video/dvdshrink: Added spell from Daniel Goller (Bug #11796) + +2007-11-30 Eric Sandall <sandalle@sourcemage.org> + * e/e16-themes: Added e16 themes (Bug #14146) + +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * httpd/apache2/httpd.gpg: Moved to grimoire level apache.gpg + +2007-11-29 Ismael Luceno <ismael@sourcemage.org> + * smgl/initng: new spell, the next generation init system + * smgl/initng-ifiles: new spell, initng scripts + +2007-11-28 Arjan Bouter <abouter@sourcemage.org> + * windowmanagers/wmx: new spell, enhanced wm2 based windowmanager + * disk/hotswap: new spell, hotswap app for laptops + +2007-11-27 Ladislav Hagara <hgr@vabo.cz> + * kernels/i2c-tools: new spell, I2C tools for Linux + 2007-11-26 Eric Sandall <sandalle@sourcemage.org> * libs/libpaper: Added a simple paper size library diff --git a/http/apache2/httpd.gpg b/apache.gpg Binary files differindex 80be0d2375..80be0d2375 100644 --- a/http/apache2/httpd.gpg +++ b/apache.gpg diff --git a/audio-creation/hexter/DETAILS b/audio-creation/hexter/DETAILS index e9a34ef7d5..6a31bb71c8 100755 --- a/audio-creation/hexter/DETAILS +++ b/audio-creation/hexter/DETAILS @@ -1,8 +1,8 @@ SPELL=hexter - VERSION=0.6.0 + VERSION=0.6.1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=${SOURCEFORGE_URL}/dssi/$SOURCE - SOURCE_HASH=sha512:574bd2147c0a6126371722c48f03efe3baadd36fb691c0cb098c63fc783926860514c8449f3ae334e147cfec98d296f9aacb20de02e1777aaebe6633d1656a53 + SOURCE_HASH=sha512:cc482ac3c5ed5654c25f70efc2333b0c4dc47abb4d1ffcc6204306b93291439c164e3b77893f2f5e07a8ece806e147770afd03f6b3658dc9d42127de18aa1c38 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://dssi.sourceforge.net/hexter.html LICENSE[0]=GPL diff --git a/audio-creation/hexter/HISTORY b/audio-creation/hexter/HISTORY index b9973fa012..d5376b1561 100644 --- a/audio-creation/hexter/HISTORY +++ b/audio-creation/hexter/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated to 0.6.1. + 2007-04-05 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: Updated to 0.6.0. * BUILD: Added, --disable-dependency-tracking for faster build. diff --git a/audio-creation/jack-rack/BUILD b/audio-creation/jack-rack/BUILD deleted file mode 100755 index 5c2c0b0c07..0000000000 --- a/audio-creation/jack-rack/BUILD +++ /dev/null @@ -1,7 +0,0 @@ -# -# speed up build, install desktop files with $INSTALL_ROOT, make sure -# deprecated LADCCA isn't used -# -OPTS="--disable-dependency-tracking --disable-desktop-inst \ - --disable-ladcca $OPTS" \ -default_build diff --git a/audio-creation/jack-rack/DETAILS b/audio-creation/jack-rack/DETAILS index a0f13046bf..23d7db6597 100755 --- a/audio-creation/jack-rack/DETAILS +++ b/audio-creation/jack-rack/DETAILS @@ -1,9 +1,9 @@ SPELL=jack-rack - VERSION=1.4.5 + VERSION=1.4.7 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE - SOURCE_HASH=sha512:c470653e6d0bbf8cba040ea448f0092aae609bc66908f4d1c84cc4e18a019da2f2ef7cab7bb6c94023f01d1049a1dc7dc5e3336036f83f2785fda3c2247f5291 + SOURCE_HASH=sha512:f037a54ab5cc2670c716384d643310679eccb42ae248f2b9dc75a40cd38bb865e968d3c90a19c9a76c7a4668aa6e3b9657a648a27261c02e6313174e8ce12774 WEB_SITE=http://jack-rack.sourceforge.net/ ENTERED=20031208 LICENSE[0]=GPL diff --git a/audio-creation/jack-rack/HISTORY b/audio-creation/jack-rack/HISTORY index 0e93267723..d54ea6facb 100644 --- a/audio-creation/jack-rack/HISTORY +++ b/audio-creation/jack-rack/HISTORY @@ -1,3 +1,7 @@ +2007-11-28 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated to 1.4.7. + * BUILD: Deleted, not needed anymore. + 2007-02-19 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: Updated to 1.4.5. * DEPENDS: Added optional_depends gettext, added configure flags diff --git a/audio-drivers/jackdmp/CONFIGURE b/audio-drivers/jackdmp/CONFIGURE index 059ca7f893..d44c60a760 100755 --- a/audio-drivers/jackdmp/CONFIGURE +++ b/audio-drivers/jackdmp/CONFIGURE @@ -2,6 +2,7 @@ config_query_string JACKDMP_TMPDIR \ "Input default jackdmp temp dir:" \ /dev/shm && -config_query JACKDMP_SYMLINK \ - "Create /usr/bin/jackd symlink?" \ - n +# +# Symlink query removed in 0.68, keep this here for a while +# +persistent_remove JACKDMP_SYMLINK diff --git a/audio-drivers/jackdmp/DETAILS b/audio-drivers/jackdmp/DETAILS index 296695a56b..0fec628aa1 100755 --- a/audio-drivers/jackdmp/DETAILS +++ b/audio-drivers/jackdmp/DETAILS @@ -1,9 +1,9 @@ SPELL=jackdmp - VERSION=0.66 + VERSION=0.68 SOURCE=${SPELL}_$VERSION.zip SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}_$VERSION" SOURCE_URL[0]=http://www.grame.fr/~letz/$SOURCE - SOURCE_HASH=sha512:ca2cafbfbd51e2ee7b7703272b8b0bb54ae76f4841863b93f43db28418bf096007e209525500df53bf93dc85a5c4723fdd510f6b068d602061309aefb48c1a06 + SOURCE_HASH=sha512:36edf4489ca39d5947e878cc6bc88d6d5607d4571af3bd54643adf114223b93e768b46ed6ca63e9fee98c964c4cd1e3e63f405724bf8bb8ede75921d9a93d413 WEB_SITE=http://www.grame.fr/~letz/jackdmp.html ENTERED=20070319 LICENSE[0]=GPL diff --git a/audio-drivers/jackdmp/HISTORY b/audio-drivers/jackdmp/HISTORY index eb30391aee..c6217f95eb 100644 --- a/audio-drivers/jackdmp/HISTORY +++ b/audio-drivers/jackdmp/HISTORY @@ -1,3 +1,12 @@ +2007-11-28 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated to 0.68. + * CONFIGURE: Removed jackd symlink query, the makefile now installs + a symlink by default. + * INSTALL: Removed header and symlink install code, the makefile + does this now. + * jack.pc: Changed version number to 0.103.0 to match the JACK MIDI + API that jackdmp now uses. + 2007-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: Corrected WEB_SITE. diff --git a/audio-drivers/jackdmp/INSTALL b/audio-drivers/jackdmp/INSTALL index 9a4c0f93eb..2f3a91afcc 100755 --- a/audio-drivers/jackdmp/INSTALL +++ b/audio-drivers/jackdmp/INSTALL @@ -4,28 +4,6 @@ make DESTDIR="$INSTALL_ROOT" install && # -# symlink -# -if [[ $JACKDMP_SYMLINK == y ]] -then - message "${MESSAGE_COLOR}Installing symlink$DEFAULT_COLOR" && - ln -s "$INSTALL_ROOT/usr/bin/jackdmp" "$INSTALL_ROOT/usr/bin/jackd" -fi && - -# -# headers -# -message "${MESSAGE_COLOR}Installing headers$DEFAULT_COLOR" && -cd "$SOURCE_DIRECTORY/src/common" && -mkdir -p "$INSTALL_ROOT/usr/include/jack" && -local file HEADERS="intclient jack ringbuffer statistics \ - thread transport types" && -for file in $HEADERS -do - cp "$file.h" "$INSTALL_ROOT/usr/include/jack/" -done && - -# # pkgconfig file # message "${MESSAGE_COLOR}Installing pkgconfig file$DEFAULT_COLOR" && diff --git a/audio-drivers/jackdmp/jack.pc b/audio-drivers/jackdmp/jack.pc index ceb2ce5d9b..74aa4d6ab9 100644 --- a/audio-drivers/jackdmp/jack.pc +++ b/audio-drivers/jackdmp/jack.pc @@ -5,6 +5,6 @@ includedir=${prefix}/include Name: jack Description: the Jack Audio Connection Kit for multi-processor machines -Version: 0.99.0 +Version: 0.103.0 Libs: -L${libdir} -ljack -lpthread -lrt Cflags: -I${includedir} diff --git a/audio-libs/openal/HISTORY b/audio-libs/openal/HISTORY index ff29f5b0ac..8100b7b383 100644 --- a/audio-libs/openal/HISTORY +++ b/audio-libs/openal/HISTORY @@ -1,3 +1,7 @@ +2007-11-28 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Only apply gcc42.patch for $OPENAL_VERSION=release + See Bug #14126 + 2007-11-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * PRE_BUILD: fixed path to the patch * DETAILS: fixed fetching from svn diff --git a/audio-libs/openal/PRE_BUILD b/audio-libs/openal/PRE_BUILD index 1e8199f708..1d69f5c0a2 100755 --- a/audio-libs/openal/PRE_BUILD +++ b/audio-libs/openal/PRE_BUILD @@ -9,6 +9,6 @@ elif [[ $OPENAL_VERSION == scm ]]; then cd OpenAL-Sample && NOCONFIGURE=Y ./autogen.sh fi && -if [[ $OPENAL_VERSION != scm ]]; then +if [[ $OPENAL_VERSION == release ]]; then patch -p1 < $SCRIPT_DIRECTORY/gcc42.patch fi diff --git a/audio-plugins/amb-plugins/DETAILS b/audio-plugins/amb-plugins/DETAILS index cba1df2da3..3de5400d99 100755 --- a/audio-plugins/amb-plugins/DETAILS +++ b/audio-plugins/amb-plugins/DETAILS @@ -1,10 +1,10 @@ SPELL=amb-plugins - VERSION=0.1.0 + VERSION=0.3.0 SOURCE=AMB-plugins-$VERSION.tar.bz2 - SOURCE_URL[0]=http://users.skynet.be/solaris/linuxaudio/downloads/$SOURCE - SOURCE_HASH=sha512:23e4cca58ff6b3a548f1e97038040616d46c0136185bb54d7c4995033127e65109f714a8be38476c8c489e21906b32424b993f181d9c5a52297c780475793ab7 + SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/$SOURCE + SOURCE_HASH=sha512:dafde369f4d86089091eee08fb306a264c2e55c7c3c20383416897ab4e9a7a53c6fb5fa2438119ec34d616dfab0953959cab60dec4d8a0304725e854dff8056d SOURCE_DIRECTORY=$BUILD_DIRECTORY/AMB-plugins-$VERSION - WEB_SITE=http://users.skynet.be/solaris/linuxaudio/ + WEB_SITE=http://www.kokkinizita.net/linuxaudio/ladspa/index.html LICENSE[0]=GPL ENTERED=20060818 KEYWORDS="plugins audio" diff --git a/audio-plugins/amb-plugins/HISTORY b/audio-plugins/amb-plugins/HISTORY index 6bb4c441cd..3f5911f36f 100644 --- a/audio-plugins/amb-plugins/HISTORY +++ b/audio-plugins/amb-plugins/HISTORY @@ -1,2 +1,5 @@ +2007-11-27 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated to 0.3.0, updated SOURCE_URL[0] and WEB_SITE. + 2006-08-18 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell diff --git a/audio-plugins/caps-plugins/DEPENDS b/audio-plugins/caps-plugins/DEPENDS index 8bc21a1b98..eca6f52d49 100755 --- a/audio-plugins/caps-plugins/DEPENDS +++ b/audio-plugins/caps-plugins/DEPENDS @@ -1 +1,2 @@ -depends ladspa
\ No newline at end of file +depends ladspa && +depends g++ diff --git a/audio-plugins/caps-plugins/DETAILS b/audio-plugins/caps-plugins/DETAILS index d6afc8ecbb..df9f1dbbda 100755 --- a/audio-plugins/caps-plugins/DETAILS +++ b/audio-plugins/caps-plugins/DETAILS @@ -1,11 +1,11 @@ SPELL=caps-plugins - VERSION=0.3.0 + VERSION=0.4.2 SOURCE=caps_$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/caps-$VERSION SOURCE_URL[0]=http://quitte.de/dsp/$SOURCE WEB_SITE=http://quitte.de/dsp/caps.html ENTERED=20060725 - SOURCE_HASH=sha512:787f935a628defa008bb017927e4a1c38df17e16006de78bd17858f280c274dedc9fd3b2c914fef396413cd72c5834c6007498407cc55140beb48547b2322561 + SOURCE_HASH=sha512:15dfd0c515d0c760085d8f48cb7ca2ef44cda9e111464cb3c655e54064cf5c2ff1c22f61181ec777db358eb50e4636d43232bd1132b022082ae2de33416fc461 LICENSE[0]=GPL KEYWORDS="plugins audio" SHORT="The CAPS Audio Plugin Suite" diff --git a/audio-plugins/caps-plugins/HISTORY b/audio-plugins/caps-plugins/HISTORY index 64bd506ba8..c4ebd8317b 100644 --- a/audio-plugins/caps-plugins/HISTORY +++ b/audio-plugins/caps-plugins/HISTORY @@ -1,3 +1,8 @@ +2007-11-27 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated to 0.4.2. + * DEPENDS: Added depends g++. + * INSTALL: Added quotes around $INSTALL_ROOT. + 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/audio-plugins/caps-plugins/INSTALL b/audio-plugins/caps-plugins/INSTALL index 9a764a5179..ec689fcf53 100755 --- a/audio-plugins/caps-plugins/INSTALL +++ b/audio-plugins/caps-plugins/INSTALL @@ -1 +1 @@ -make install PREFIX=$INSTALL_ROOT/usr +make install PREFIX="$INSTALL_ROOT/usr" diff --git a/audio-plugins/cmt/DETAILS b/audio-plugins/cmt/DETAILS index 74bb715c01..c01cf8f54c 100755 --- a/audio-plugins/cmt/DETAILS +++ b/audio-plugins/cmt/DETAILS @@ -1,11 +1,11 @@ SPELL=cmt - VERSION=1.15 + VERSION=1.16 SOURCE=cmt_src_$VERSION.tgz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL" SOURCE_URL[0]=http://www.ladspa.org/download/$SOURCE WEB_SITE=http://www.ladspa.org/cmt/ ENTERED=20041007 - SOURCE_HASH=sha512:b4d8983242ac81dd620d30270563ca403b35cab69d32186963c482d6c0de89b2b1bba4f54d66a2b53a34299b96e5004ae1eeadda79956f1c51f46848d2a05207 + SOURCE_HASH=sha512:be4aaa064183b6121b4ca8d7d2535cb9a3bcb557e3a2f22b45ec9775b0e296f70a9a7edf697b78095d6ef1564bb5459bb742649082ac724d1774c0790379af21 LICENSE[0]=LGPL KEYWORDS="plugins audio" SHORT="A collection of LADSPA plugins." diff --git a/audio-plugins/cmt/HISTORY b/audio-plugins/cmt/HISTORY index eca19c4fa7..0b331e3d07 100644 --- a/audio-plugins/cmt/HISTORY +++ b/audio-plugins/cmt/HISTORY @@ -1,3 +1,7 @@ +2007-11-27 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated to 1.16. + * PRE_BUILD: Updated sedits. + 2007-02-16 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: Corrected WEB_SITE. diff --git a/audio-plugins/cmt/PRE_BUILD b/audio-plugins/cmt/PRE_BUILD index fd5f4a8dc6..9c603eecc0 100755 --- a/audio-plugins/cmt/PRE_BUILD +++ b/audio-plugins/cmt/PRE_BUILD @@ -1,9 +1,5 @@ default_pre_build && cd "$SOURCE_DIRECTORY/src" && -# Fix install & include dirs -sedit "s:/usr/local/lib:${INSTALL_ROOT}/usr/lib:" makefile && -sedit "s:-I/usr/local:-I${TRACK_ROOT}/usr:" makefile && - -# Don't fail on warnings -sedit "s:-Werror::" makefile +# Fix install path +sed -i "s|/usr/lib/ladspa|\"$INSTALL_ROOT/usr/lib/ladspa\"|" makefile diff --git a/audio-plugins/fil-plugins/DETAILS b/audio-plugins/fil-plugins/DETAILS index 63959c23ab..55f7f7cdcf 100755 --- a/audio-plugins/fil-plugins/DETAILS +++ b/audio-plugins/fil-plugins/DETAILS @@ -1,10 +1,10 @@ SPELL=fil-plugins VERSION=0.1.0 SOURCE=FIL-plugins-$VERSION.tar.bz2 - SOURCE_URL[0]=http://users.skynet.be/solaris/linuxaudio/downloads/$SOURCE + SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/$SOURCE SOURCE_HASH=sha512:269abfa69fd01786b246eb4c9fec27fca9f24e3ab003bdca71a798bf52f672a5605684e207937d5c213af549df757bd2410b9da32f9a0903d82e231a7b7923e2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/FIL-plugins-$VERSION - WEB_SITE=http://users.skynet.be/solaris/linuxaudio/ + WEB_SITE=http://www.kokkinizita.net/linuxaudio/ladspa/index.html LICENSE[0]=GPL ENTERED=20060818 KEYWORDS="plugins audio" diff --git a/audio-plugins/fil-plugins/HISTORY b/audio-plugins/fil-plugins/HISTORY index 6bb4c441cd..04de02c939 100644 --- a/audio-plugins/fil-plugins/HISTORY +++ b/audio-plugins/fil-plugins/HISTORY @@ -1,2 +1,5 @@ +2007-11-27 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated SOURCE_URL[0] and WEB_SITE. + 2006-08-18 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell diff --git a/audio-plugins/mcp-plugins/DETAILS b/audio-plugins/mcp-plugins/DETAILS index c7153186b5..ace3124d9f 100755 --- a/audio-plugins/mcp-plugins/DETAILS +++ b/audio-plugins/mcp-plugins/DETAILS @@ -1,10 +1,10 @@ SPELL=mcp-plugins VERSION=0.3.0 SOURCE=MCP-plugins-$VERSION.tar.bz2 - SOURCE_URL[0]=http://users.skynet.be/solaris/linuxaudio/downloads/$SOURCE + SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/$SOURCE SOURCE_HASH=sha512:ee08781b7d261fc330289e6e3580614859d693811289d127d730ffee8f2991b13b8455e8db7b54220b82a0d465582b4b81ca9c1002683e4b5c25e4aa69d57b3d SOURCE_DIRECTORY=$BUILD_DIRECTORY/MCP-plugins-$VERSION - WEB_SITE=http://users.skynet.be/solaris/linuxaudio/ + WEB_SITE=http://www.kokkinizita.net/linuxaudio/ladspa/index.html LICENSE[0]=GPL ENTERED=20060818 KEYWORDS="plugins audio" diff --git a/audio-plugins/mcp-plugins/HISTORY b/audio-plugins/mcp-plugins/HISTORY index 6bb4c441cd..04de02c939 100644 --- a/audio-plugins/mcp-plugins/HISTORY +++ b/audio-plugins/mcp-plugins/HISTORY @@ -1,2 +1,5 @@ +2007-11-27 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated SOURCE_URL[0] and WEB_SITE. + 2006-08-18 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell diff --git a/audio-plugins/rev-plugins/DETAILS b/audio-plugins/rev-plugins/DETAILS index 6a752aa690..24dad09b06 100755 --- a/audio-plugins/rev-plugins/DETAILS +++ b/audio-plugins/rev-plugins/DETAILS @@ -1,10 +1,10 @@ SPELL=rev-plugins VERSION=0.3.1 SOURCE=REV-plugins-$VERSION.tar.bz2 - SOURCE_URL[0]=http://users.skynet.be/solaris/linuxaudio/downloads/$SOURCE + SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/$SOURCE SOURCE_HASH=sha512:ff8a32733fe4c0ba9f5261543bad4d39772638d6d7d9210051b7a4f79cd0bb377d0bb97920e8120d5196acbbbdbbaf8f08ef2c2723f8cafd7e384944b0b4964e SOURCE_DIRECTORY=$BUILD_DIRECTORY/REV-plugins-$VERSION - WEB_SITE=http://users.skynet.be/solaris/linuxaudio/ + WEB_SITE=http://www.kokkinizita.net/linuxaudio/ladspa/index.html LICENSE[0]=GPL ENTERED=20060818 KEYWORDS="plugins audio" diff --git a/audio-plugins/rev-plugins/HISTORY b/audio-plugins/rev-plugins/HISTORY index 6bb4c441cd..04de02c939 100644 --- a/audio-plugins/rev-plugins/HISTORY +++ b/audio-plugins/rev-plugins/HISTORY @@ -1,2 +1,5 @@ +2007-11-27 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated SOURCE_URL[0] and WEB_SITE. + 2006-08-18 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell diff --git a/audio-plugins/vco-plugins/DETAILS b/audio-plugins/vco-plugins/DETAILS index c86fdf2aed..d6c6efda77 100755 --- a/audio-plugins/vco-plugins/DETAILS +++ b/audio-plugins/vco-plugins/DETAILS @@ -1,10 +1,10 @@ SPELL=vco-plugins VERSION=0.3.0 SOURCE=VCO-plugins-$VERSION.tar.bz2 - SOURCE_URL[0]=http://users.skynet.be/solaris/linuxaudio/downloads/$SOURCE + SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/$SOURCE SOURCE_HASH=sha512:44e066acdda38137dcc6a6b504a8453f8d0d25c90ba091e71a48554b47e60365a1e6b0bad694ec7340d399951b8b0592507be153370d1b4924d399310cf106c5 SOURCE_DIRECTORY=$BUILD_DIRECTORY/VCO-plugins-$VERSION - WEB_SITE=http://users.skynet.be/solaris/linuxaudio/ + WEB_SITE=http://www.kokkinizita.net/linuxaudio/ladspa/index.html LICENSE[0]=GPL ENTERED=20060818 KEYWORDS="plugins audio" diff --git a/audio-plugins/vco-plugins/HISTORY b/audio-plugins/vco-plugins/HISTORY index 6bb4c441cd..04de02c939 100644 --- a/audio-plugins/vco-plugins/HISTORY +++ b/audio-plugins/vco-plugins/HISTORY @@ -1,2 +1,5 @@ +2007-11-27 Juuso Alasuutari <iuso@sourcemage.org> + * DETAILS: Updated SOURCE_URL[0] and WEB_SITE. + 2006-08-18 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS index 0814370b50..7e90038e3b 100755 --- a/chat-im/pidgin/DETAILS +++ b/chat-im/pidgin/DETAILS @@ -1,5 +1,5 @@ SPELL=pidgin - VERSION=2.2.2 + VERSION=2.3.0 SECURITY_PATCH=1 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY index e9fd96ca1c..227f491990 100644 --- a/chat-im/pidgin/HISTORY +++ b/chat-im/pidgin/HISTORY @@ -1,3 +1,6 @@ +2007-11-27 George Sherwood <george@beernabeer.com> + * DETAILS: Updated to version 2.3.0 + 2007-10-25 George Sherwood <george@beernabeer.com> * DETAILS: Udated to version 2.2.2 diff --git a/chat-im/pidgin/pidgin-2.2.2.tar.bz2.sig b/chat-im/pidgin/pidgin-2.2.2.tar.bz2.sig Binary files differdeleted file mode 100644 index 90018fcfee..0000000000 --- a/chat-im/pidgin/pidgin-2.2.2.tar.bz2.sig +++ /dev/null diff --git a/chat-im/pidgin/pidgin-2.3.0.tar.bz2.sig b/chat-im/pidgin/pidgin-2.3.0.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..962a4eef02 --- /dev/null +++ b/chat-im/pidgin/pidgin-2.3.0.tar.bz2.sig diff --git a/cluster/mpich2/DETAILS b/cluster/mpich2/DETAILS index 77ab3b368b..68be40afb8 100755 --- a/cluster/mpich2/DETAILS +++ b/cluster/mpich2/DETAILS @@ -1,5 +1,5 @@ SPELL=mpich2 - VERSION=1.0.6 + VERSION=1.0.6p1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=ftp://ftp.mcs.anl.gov/pub/mpi/$SOURCE diff --git a/cluster/mpich2/HISTORY b/cluster/mpich2/HISTORY index dde7c67ee7..98a4c9daa1 100644 --- a/cluster/mpich2/HISTORY +++ b/cluster/mpich2/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Updated to 1.0.6p1 + 2007-09-16 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.0.6 diff --git a/cluster/mpich2/mpich2-1.0.6.tar.gz.sig b/cluster/mpich2/mpich2-1.0.6.tar.gz.sig Binary files differdeleted file mode 100644 index 4775690e08..0000000000 --- a/cluster/mpich2/mpich2-1.0.6.tar.gz.sig +++ /dev/null diff --git a/cluster/mpich2/mpich2-1.0.6p1.tar.gz.sig b/cluster/mpich2/mpich2-1.0.6p1.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..2e6daaa2ff --- /dev/null +++ b/cluster/mpich2/mpich2-1.0.6p1.tar.gz.sig diff --git a/crypto/pinentry/DETAILS b/crypto/pinentry/DETAILS index d3718ff898..4b13248fbf 100755 --- a/crypto/pinentry/DETAILS +++ b/crypto/pinentry/DETAILS @@ -1,9 +1,9 @@ SPELL=pinentry - VERSION=0.7.3 + VERSION=0.7.4 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/pinentry/$SOURCE - SOURCE_HASH=sha512:84fb2de7c333ef042f602694e68233f87a51a6726359061e38eba456e10edf666f5db4b66658ea21a3b7c15b74a9d01faa1e7cf7e36bf8834fc739a9a62db6a6 + SOURCE_HASH=sha512:4a02eea83461647cc075911fbe079a11b1c6f14d67e08b7cb73b39b47f2f76a4b4d565bd3d0ee923aeb0938d6464f21f31529d4aee6616671388636a614337a7 WEB_SITE=http://www.gnu.org/directory/security/libgcrypt.html ENTERED=20030326 LICENSE[0]=GPL diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY index e17d0dc6b5..8d2d66fe08 100644 --- a/crypto/pinentry/HISTORY +++ b/crypto/pinentry/HISTORY @@ -1,3 +1,6 @@ +2007-12-01 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 0.7.4 + 2007-07-06 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.7.3, removed UPDATED diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS index 88c48e223b..50dd528e38 100755 --- a/database/sqlite/DETAILS +++ b/database/sqlite/DETAILS @@ -1,6 +1,6 @@ SPELL=sqlite - VERSION=3.5.2 - SOURCE_HASH=sha512:976b68d7e1353a151099a50360d437f5cd0ac50a5dffdeab71a473c1cc8528fa111c8cb40e1f797c512febd87ed08f19ac73173a0abfd74f22ca761a2eb55865 + VERSION=3.5.3 + SOURCE_HASH=sha512:dd44b3bb0dd9670d36eb9c7f489a547869844417ca1c45fd54061e5c5978fc66e01e63c81d92a047b0b3900a5d2a8c16a2aed301ce071df22c302452bc9dbb78 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=http://sqlite.org/$SOURCE diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY index e015559f84..8d54ac3483 100644 --- a/database/sqlite/HISTORY +++ b/database/sqlite/HISTORY @@ -1,3 +1,6 @@ +2007-11-28 George Sherwood <george@beernabeer.com> + * DETAILS: Updated to version 3.5.3 + 2007-11-06 George Sherwood <george@beernabeer.com> * DETAILS: Updated to verison 3.5.2 Updated SOURCE_URL and WEB_SITE diff --git a/devel/clisp/DETAILS b/devel/clisp/DETAILS index 37c2719295..f28155c988 100755 --- a/devel/clisp/DETAILS +++ b/devel/clisp/DETAILS @@ -1,5 +1,5 @@ SPELL=clisp - VERSION=2.42 + VERSION=2.43 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.sig SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//a/} diff --git a/devel/clisp/HISTORY b/devel/clisp/HISTORY index fa5583714d..96159986d8 100644 --- a/devel/clisp/HISTORY +++ b/devel/clisp/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Updated to 2.43 + 2007-10-24 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 2.42 New key FDAA9CC7 Sam Steingold <sam.steingold@gmail.com> has not diff --git a/devel/codeblocks/BUILD b/devel/codeblocks/BUILD new file mode 100755 index 0000000000..099a16ad0b --- /dev/null +++ b/devel/codeblocks/BUILD @@ -0,0 +1,3 @@ +./bootstrap && +./configure --prefix=/usr --enable-contrib $OPTS && +make diff --git a/devel/codeblocks/DEPENDS b/devel/codeblocks/DEPENDS new file mode 100755 index 0000000000..3ccfa522ae --- /dev/null +++ b/devel/codeblocks/DEPENDS @@ -0,0 +1 @@ +depends wxgtk diff --git a/devel/codeblocks/DETAILS b/devel/codeblocks/DETAILS new file mode 100755 index 0000000000..8cfde8a9ba --- /dev/null +++ b/devel/codeblocks/DETAILS @@ -0,0 +1,22 @@ + SPELL=codeblocks +if [[ $SVN_AUTOUPDATE = y ]]; then + VERSION=$(date +%Y%m%d) +else + VERSION=svn +fi + SOURCE="${SPELL}.tar.bz2" + SOURCE_IGNORE=volatile + SOURCE_URL[0]="svn://svn.berlios.de/${SPELL}/trunk:${SPELL}" + FORCE_DOWNLOAD=on +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}" + WEB_SITE="http://www.codeblocks.org/" + LICENSE[0]=GPL + ENTERED=20070808 + SHORT="Extensible and fully configurable C++ IDE" +cat << EOF +Code::Blocks is a free C++ IDE built to meet the most demanding needs of +it's users. It is designed to be very extensible and fully configurable. + +Built around a plugin framework, Code::Blocks can be extended with plugins. +It even includes a plugin wizard so you can create your own plugins!. +EOF diff --git a/devel/codeblocks/HISTORY b/devel/codeblocks/HISTORY new file mode 100644 index 0000000000..8ddb5ba9b7 --- /dev/null +++ b/devel/codeblocks/HISTORY @@ -0,0 +1,2 @@ +2007-12-01 Ismael Luceno <ismael@sourcemage.org> + * DETAILS, DEPENDS, HISTORY, PREPARE: created spell diff --git a/devel/codeblocks/PREPARE b/devel/codeblocks/PREPARE new file mode 100755 index 0000000000..41396af7a0 --- /dev/null +++ b/devel/codeblocks/PREPARE @@ -0,0 +1 @@ +config_query SVN_AUTOUPDATE "Do you want to cast $SPELL on system upgrade?" n diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY index a004a9d3cc..d8664b647a 100644 --- a/devel/graphviz/HISTORY +++ b/devel/graphviz/HISTORY @@ -1,3 +1,7 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Remove the entire ./configure line or PRE_BUILD fails with: + -C: command not found + 2007-11-08 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * PRE_BUILD: removed configure call from autogen.sh diff --git a/devel/graphviz/PRE_BUILD b/devel/graphviz/PRE_BUILD index 4ee2203dc5..31d5c6257d 100755 --- a/devel/graphviz/PRE_BUILD +++ b/devel/graphviz/PRE_BUILD @@ -13,5 +13,5 @@ if ! spell_ok tcl; then sedit 's|\<gv_\w\+\.man\>||g' tclpkg/gv/Makefile.in fi && cd ${SOURCE_DIRECTORY} && -sedit "s:./configure::g" autogen.sh && +sedit "s:./configure.*::g" autogen.sh && ./autogen.sh diff --git a/devel/jam/HISTORY b/devel/jam/HISTORY index 2b44f95241..755a72d0d1 100644 --- a/devel/jam/HISTORY +++ b/devel/jam/HISTORY @@ -1,3 +1,11 @@ +2007-11-30 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Override user-flags in case they set -fstrict-aliasing + Thanks Jaka + +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Fix compilation with gcc 4.2 (Bug #14145) + See http://maillist.perforce.com/pipermail/jamming/2007-May/002913.html + 2007-01-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DEPENDS: added dependency on bison * BUILD: added make_single before make to fix a compile error, diff --git a/devel/jam/PRE_BUILD b/devel/jam/PRE_BUILD index 01e5c7775e..7db02b6bdc 100755 --- a/devel/jam/PRE_BUILD +++ b/devel/jam/PRE_BUILD @@ -1,6 +1,7 @@ mk_source_dir $SOURCE_DIRECTORY && cd $SOURCE_DIRECTORY && unpack_file && +CFLAGS="$CFLAGS -fno-strict-aliasing" && sedit "s:CFLAGS =:CFLAGS = ${CFLAGS}:" Makefile && sedit "s:(CFLAGS):(CFLAGS) ${LDFLAGS}:" Makefile && sedit "s:CCFLAGS +=:CCFLAGS += ${CFLAGS}:g" Jamfile && diff --git a/disk/hotswap/DEPENDS b/disk/hotswap/DEPENDS new file mode 100755 index 0000000000..8b4d300164 --- /dev/null +++ b/disk/hotswap/DEPENDS @@ -0,0 +1,8 @@ +depends libxml2 && +optional_depends kdelibs '--enable-kde-frontend' \ + '--disable-kde-frontend' \ + 'Do you want the KDE frontend?' && + +optional_depends MOTIF '--enable-motif-frontend' \ + '--disable-motif-frontend' \ + 'Do you want the MOTIF frontend?' diff --git a/disk/hotswap/DETAILS b/disk/hotswap/DETAILS new file mode 100755 index 0000000000..8c9e8406b2 --- /dev/null +++ b/disk/hotswap/DETAILS @@ -0,0 +1,14 @@ + SPELL=hotswap + VERSION=0.4.0 + SOURCE=$SPELL-$VERSION.tar.gz + SOURCE_HASH=sha512:6f8d6d84962c6ddb5d46c8ec66ad26ece4b278a5375f19d409cec7502b5c2115e96183f2e182084fd5380e4e559fa8c0a20178b0cc4360fd9b3982228bd8c334 + SOURCE_URL[0]=http://timstadelmann.de/$SOURCE +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION + WEB_SITE=http://timstadelmann.de/hotswap.html + ENTERED=20071124 + LICENSE[0]=GPL + SHORT="Hotswap utility" +cat << EOF +Hotswap allows you to register and unregister hotswappable IDE devices, +for example notebook computers modules. +EOF diff --git a/disk/hotswap/HISTORY b/disk/hotswap/HISTORY new file mode 100644 index 0000000000..f396796be9 --- /dev/null +++ b/disk/hotswap/HISTORY @@ -0,0 +1,3 @@ +2007-11-24 Arjan Bouter <abouter@sourcemage.org> + * DETAILS,DEPENDS,INSTALL,HISTORY: created spell + diff --git a/disk/hotswap/INSTALL b/disk/hotswap/INSTALL new file mode 100755 index 0000000000..fb38b417b2 --- /dev/null +++ b/disk/hotswap/INSTALL @@ -0,0 +1,2 @@ +default_install && +install_config_file doc/hotswaprc.example $INSTALL_ROOT/etc/hotswaprc diff --git a/disk/mdadm/DETAILS b/disk/mdadm/DETAILS index 1b9a1be555..b4aabbbb65 100755 --- a/disk/mdadm/DETAILS +++ b/disk/mdadm/DETAILS @@ -1,5 +1,5 @@ SPELL=mdadm - VERSION=2.6.3 + VERSION=2.6.4 SOURCE=${SPELL}-${VERSION}.tgz SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=http://neilb.web.cse.unsw.edu.au/source/mdadm/${SOURCE} diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY index 3eb340c287..788b860540 100644 --- a/disk/mdadm/HISTORY +++ b/disk/mdadm/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Updated to 2.6.4 + 2007-08-24 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 2.6.3 diff --git a/disk/mdadm/mdadm-2.6.3.tgz.sig b/disk/mdadm/mdadm-2.6.3.tgz.sig Binary files differdeleted file mode 100644 index 539b94c5fc..0000000000 --- a/disk/mdadm/mdadm-2.6.3.tgz.sig +++ /dev/null diff --git a/disk/mdadm/mdadm-2.6.4.tgz.sig b/disk/mdadm/mdadm-2.6.4.tgz.sig Binary files differnew file mode 100644 index 0000000000..4a5e359346 --- /dev/null +++ b/disk/mdadm/mdadm-2.6.4.tgz.sig diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS index 93d16352bb..eee84281c8 100755 --- a/disk/ntfs-3g/DETAILS +++ b/disk/ntfs-3g/DETAILS @@ -1,6 +1,6 @@ SPELL=ntfs-3g - VERSION=1.1104 - SOURCE_HASH=sha512:b6f28c317700863fd1894358ff726b05129d05db792c13d2f22f3155e62638faadedb867b898eabf991656fdc6968ee45fb60768e268387e17d1168e33134a93 + VERSION=1.1120 + SOURCE_HASH=sha512:b43e8129f6b8b1214b593683ce845ba05e639b7d5156656ddf7c52fa6ddd77e8fc69d931d98991b56c2e31fc10ca53b76798c62d06dcd2e90097620c34b09ba9 SOURCE=$SPELL-$VERSION.tgz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://www.ntfs-3g.org/ diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY index ca6a1244fc..b19a9002e9 100644 --- a/disk/ntfs-3g/HISTORY +++ b/disk/ntfs-3g/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.1120 + 2007-11-05 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1104 diff --git a/e/e16-themes/DEPENDS b/e/e16-themes/DEPENDS new file mode 100755 index 0000000000..f4d42de7f0 --- /dev/null +++ b/e/e16-themes/DEPENDS @@ -0,0 +1 @@ +depends e16 diff --git a/e/e16-themes/DETAILS b/e/e16-themes/DETAILS new file mode 100755 index 0000000000..42f085cc14 --- /dev/null +++ b/e/e16-themes/DETAILS @@ -0,0 +1,19 @@ + SPELL=e16-themes + VERSION=0.16.8.0.1 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/${SOURCE} + SOURCE_HASH=sha512:01d2f50dc061e499fb3021cb2a3b764cba9846aa8681849b59e587f89dd3d0c45f45f0b1dd81ddc7e5435fb5d7f84f1e9798e2444ea8c3bffa527c609ee080d6 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.enlightenment.org/" + LICENSE[0]=unrestricted + ENTERED=20071129 + SHORT="Install e16's base themes: BlueSteel BrushedMetal-Tigert, Ganymede, ShinyMetal" +cat << EOF +Aside from e16's default winter theme, four optional themes are available +with the distribution: + BlueSteel + BrushedMetal-Tigert + Ganymede + ShinyMetal +These should be considered as a required part of e16. +EOF diff --git a/e/e16-themes/HISTORY b/e/e16-themes/HISTORY new file mode 100644 index 0000000000..50ad5fc5e2 --- /dev/null +++ b/e/e16-themes/HISTORY @@ -0,0 +1,3 @@ +2007-11-29 linuxfan <demaillists@comcast.net> + * DEPENDS, DETAILS: spell created + diff --git a/e/enlightenment/DEPENDS b/e/enlightenment/DEPENDS index da9d22c9f9..7a5c9613e0 100755 --- a/e/enlightenment/DEPENDS +++ b/e/enlightenment/DEPENDS @@ -4,8 +4,9 @@ if [ "$EPROFILE_E16" == "y" ]; then depends e16 && - optional_depends e16-docs '' '' 'help docs for e16' && - optional_depends epplet-base '' '' 'for plugins' && + optional_depends e16-themes '' '' 'for default E16 themes' && + optional_depends e16-docs '' '' 'help docs for E16' && + optional_depends epplet-base '' '' 'for plugins' && optional_depends exmms '' '' 'for a XMMS epplet' fi && diff --git a/e/enlightenment/HISTORY b/e/enlightenment/HISTORY index a976f16a3f..819773a8e0 100644 --- a/e/enlightenment/HISTORY +++ b/e/enlightenment/HISTORY @@ -1,3 +1,6 @@ +2007-11-30 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Added optional dependency on e16-themes + 2007-11-09 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: entice is dead. Long live entice! diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY index a49237587a..cce6f3a7b4 100644 --- a/editors/vim/HISTORY +++ b/editors/vim/HISTORY @@ -1,3 +1,6 @@ +2007-12-01 Eric Sandall <sandalle@sourcemage.org> + * configs: Add /usr/share/vim/vimrc as a config (Bug #14128) + 2007-05-16 Arwed v. Merkatz <v.merkatz@gmx.net> * PRE_BUILD, new_changelog_entry.patch: fix :NewChangelogEntry command diff --git a/editors/vim/configs b/editors/vim/configs new file mode 100755 index 0000000000..cf7e6f3f4c --- /dev/null +++ b/editors/vim/configs @@ -0,0 +1 @@ +/usr/share/vim/vimrc diff --git a/ftp/deluge/DETAILS b/ftp/deluge/DETAILS index 7aa0d39679..9b6d47ea79 100755 --- a/ftp/deluge/DETAILS +++ b/ftp/deluge/DETAILS @@ -1,9 +1,9 @@ SPELL=deluge - VERSION=0.5.6.96 + VERSION=0.5.7 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://download.deluge-torrent.org/tarball/$VERSION/$SOURCE - SOURCE_HASH=sha512:05d475326cf0070010cb7ea8ff1529c8aad32e9683413d24fe8c831e7f0ce33c6a775c491a93246a73e43f878d08f6d50ecc847d7fd63ed8d5a52244847f8d01 + SOURCE_HASH=sha512:56a165f05d446e4a3bf2ab1c20ec8d88a95068ea33179e7b2641551acfe81e87d26c3dcdfd0d319a41b2d5d68f9c1267555377b6067ced6505f747f4cef468ac LICENSE[0]=GPL KEYWORDS="bittorrent client p2p" WEB_SITE=http://www.deluge-torrent.org diff --git a/ftp/deluge/HISTORY b/ftp/deluge/HISTORY index 90d90ca79f..3c5e637a57 100644 --- a/ftp/deluge/HISTORY +++ b/ftp/deluge/HISTORY @@ -1,3 +1,5 @@ +2007-11-28 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org> + * DEPENDS: Updating version to 0.5.7 2007-11-26 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org> * DETAILS: Updating version to 0.5.6.96 diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS index c44d8e320f..21d72f72ec 100755 --- a/ftp/transmission/DETAILS +++ b/ftp/transmission/DETAILS @@ -1,5 +1,5 @@ SPELL=transmission - VERSION=0.93 + VERSION=0.94 SOURCE=${SPELL}-${VERSION}.tar.bz2 SOURCE_URL[0]=http://download.m0k.org/${SPELL}/files/${SOURCE} SOURCE_GPG=gurus.gpg:${SOURCE}.sig diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY index 544ccc07c1..80c6e48962 100644 --- a/ftp/transmission/HISTORY +++ b/ftp/transmission/HISTORY @@ -1,3 +1,6 @@ +2007-11-27 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 0.94 + 2007-11-13 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 0.93, hash => gpg diff --git a/ftp/transmission/transmission-0.93.tar.bz2.sig b/ftp/transmission/transmission-0.93.tar.bz2.sig Binary files differdeleted file mode 100644 index 4b3df56629..0000000000 --- a/ftp/transmission/transmission-0.93.tar.bz2.sig +++ /dev/null diff --git a/ftp/transmission/transmission-0.94.tar.bz2.sig b/ftp/transmission/transmission-0.94.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..e7f44a5e98 --- /dev/null +++ b/ftp/transmission/transmission-0.94.tar.bz2.sig diff --git a/gnome2-apps/gedit/DETAILS b/gnome2-apps/gedit/DETAILS index 5ba179d12d..e3dbfe6a2a 100755 --- a/gnome2-apps/gedit/DETAILS +++ b/gnome2-apps/gedit/DETAILS @@ -1,5 +1,5 @@ SPELL=gedit - VERSION=2.20.3 + VERSION=2.20.4 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/gnome2-apps/gedit/HISTORY b/gnome2-apps/gedit/HISTORY index c942d35456..fa16a6661e 100644 --- a/gnome2-apps/gedit/HISTORY +++ b/gnome2-apps/gedit/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Robin Cook <rcook@wyrms.net> + * DETAILS: updated VERSION to 2.20.4 + 2007-10-18 Robin Cook <rcook@wyrms.net> * DETAILS: updated VERSION to 2.20.3 diff --git a/gnome2-apps/gedit/gedit-2.20.3.tar.bz2.sig b/gnome2-apps/gedit/gedit-2.20.3.tar.bz2.sig Binary files differdeleted file mode 100644 index 290690d60d..0000000000 --- a/gnome2-apps/gedit/gedit-2.20.3.tar.bz2.sig +++ /dev/null diff --git a/gnome2-apps/gedit/gedit-2.20.4.tar.bz2.sig b/gnome2-apps/gedit/gedit-2.20.4.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..05242f4dbc --- /dev/null +++ b/gnome2-apps/gedit/gedit-2.20.4.tar.bz2.sig diff --git a/gnome2-libs/gnome-speech/HISTORY b/gnome2-libs/gnome-speech/HISTORY index f27d4d8abe..c1de7cec4d 100644 --- a/gnome2-libs/gnome-speech/HISTORY +++ b/gnome2-libs/gnome-speech/HISTORY @@ -1,3 +1,8 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * According to the diff's ChangeLog, all that changed is: + configure.in, NEWS, README: prep for 0.4.16. + Fixes Bug #14009 + 2007-07-29 Robin Cook <rcook@wyrms.net> * DETAILS: updated VERSION to 0.4.16 diff --git a/gnome2-libs/gnome-speech/gnome-speech-0.4.16.tar.bz2.sig b/gnome2-libs/gnome-speech/gnome-speech-0.4.16.tar.bz2.sig Binary files differindex a2e2661de6..ed404cd1c7 100644 --- a/gnome2-libs/gnome-speech/gnome-speech-0.4.16.tar.bz2.sig +++ b/gnome2-libs/gnome-speech/gnome-speech-0.4.16.tar.bz2.sig diff --git a/gnome2-libs/java-access-bridge/DETAILS b/gnome2-libs/java-access-bridge/DETAILS index 9867b5719b..58f208b260 100755 --- a/gnome2-libs/java-access-bridge/DETAILS +++ b/gnome2-libs/java-access-bridge/DETAILS @@ -1,5 +1,5 @@ SPELL=java-access-bridge - VERSION=1.20.0 + VERSION=1.20.2 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/gnome2-libs/java-access-bridge/HISTORY b/gnome2-libs/java-access-bridge/HISTORY index 4459ebd398..ebbcc34046 100644 --- a/gnome2-libs/java-access-bridge/HISTORY +++ b/gnome2-libs/java-access-bridge/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Robin Cook <rcook@wyrms.net> + * DETAILS: updated VERSION to 1.20.2 + 2007-10-20 Robin Cook <rcook@wyrms.net> * DEPENDS: added at-spi and libbonobo diff --git a/gnome2-libs/java-access-bridge/java-access-bridge-1.20.0.tar.bz2.sig b/gnome2-libs/java-access-bridge/java-access-bridge-1.20.0.tar.bz2.sig Binary files differdeleted file mode 100644 index 97aa419671..0000000000 --- a/gnome2-libs/java-access-bridge/java-access-bridge-1.20.0.tar.bz2.sig +++ /dev/null diff --git a/gnome2-libs/java-access-bridge/java-access-bridge-1.20.2.tar.bz2.sig b/gnome2-libs/java-access-bridge/java-access-bridge-1.20.2.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..117c7fd00e --- /dev/null +++ b/gnome2-libs/java-access-bridge/java-access-bridge-1.20.2.tar.bz2.sig diff --git a/graphics-libs/libpng/CONFIGURE b/graphics-libs/libpng/CONFIGURE new file mode 100755 index 0000000000..dea0187296 --- /dev/null +++ b/graphics-libs/libpng/CONFIGURE @@ -0,0 +1 @@ +config_query ANI_PNG "Add patch for animated png's?" n diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY index 6da6f24153..58bdcde9b9 100644 --- a/graphics-libs/libpng/HISTORY +++ b/graphics-libs/libpng/HISTORY @@ -1,3 +1,10 @@ +2007-12-01 George Sherwood <george@beernabeer.com> + * CONFIGURE: Added to query concerning animated png's + * PRE_BUILD: Added to apply patch from + http://littlesvr.ca/apng/ + * libpng-1.2.23-apng.patch: Added optional patch for animated + png's. Needed for firefox 3 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.2.23 diff --git a/graphics-libs/libpng/PRE_BUILD b/graphics-libs/libpng/PRE_BUILD new file mode 100755 index 0000000000..974ea66293 --- /dev/null +++ b/graphics-libs/libpng/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +if [ "$ANI_PNG" == "y" ]; then +cd $SOURCE_DIRECTORY && +patch -p0 < $SCRIPT_DIRECTORY/libpng-1.2.23-apng.patch +fi diff --git a/graphics-libs/libpng/libpng-1.2.23-apng.patch b/graphics-libs/libpng/libpng-1.2.23-apng.patch new file mode 100644 index 0000000000..4c57b288de --- /dev/null +++ b/graphics-libs/libpng/libpng-1.2.23-apng.patch @@ -0,0 +1,1682 @@ +Index: pngread.c +=================================================================== +--- pngread.c (révision 138) ++++ pngread.c (révision 140) +@@ -399,6 +399,11 @@ + #if defined(PNG_READ_zTXt_SUPPORTED) + PNG_CONST PNG_zTXt; + #endif ++#if defined(PNG_READ_APNG_SUPPORTED) ++ PNG_CONST PNG_acTL; ++ PNG_CONST PNG_fcTL; ++ PNG_CONST PNG_fdAT; ++#endif + #endif /* PNG_USE_LOCAL_ARRAYS */ + png_byte chunk_length[4]; + png_uint_32 length; +@@ -452,6 +457,9 @@ + !(png_ptr->mode & PNG_HAVE_PLTE)) + png_error(png_ptr, "Missing PLTE before IDAT"); + ++#if defined(PNG_READ_APNG_SUPPORTED) ++ png_have_info(png_ptr, info_ptr); ++#endif + png_ptr->idat_size = length; + png_ptr->mode |= PNG_HAVE_IDAT; + break; +@@ -524,12 +532,97 @@ + else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4)) + png_handle_iTXt(png_ptr, info_ptr, length); + #endif ++#if defined(PNG_READ_APNG_SUPPORTED) ++ else if (!png_memcmp(png_ptr->chunk_name, png_acTL, 4)) ++ png_handle_acTL(png_ptr, info_ptr, length); ++ else if (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4)) ++ png_handle_fcTL(png_ptr, info_ptr, length); ++ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4)) ++ png_handle_fdAT(png_ptr, info_ptr, length); ++#endif + else + png_handle_unknown(png_ptr, info_ptr, length); + } + } + #endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */ + ++#if defined(PNG_READ_APNG_SUPPORTED) ++void PNGAPI ++png_read_frame_head(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */ ++ ++ png_debug(0, "Reading frame head\n"); ++ ++ if (!(png_ptr->mode & PNG_HAVE_acTL)) ++ png_error(png_ptr, "attempt to png_read_frame_head() but " ++ "no acTL present"); ++ ++ /* do nothing for the main IDAT */ ++ if (png_ptr->num_frames_read == 0) ++ return; ++ ++ png_crc_finish(png_ptr, 0); /* CRC from last IDAT or fdAT chunk */ ++ ++ png_read_reset(png_ptr); ++ png_ptr->mode &= ~PNG_HAVE_fcTL; ++ ++ have_chunk_after_DAT = 0; ++ for (;;) ++ { ++#ifdef PNG_USE_LOCAL_ARRAYS ++ PNG_IDAT; ++ PNG_fdAT; ++ PNG_fcTL; ++#endif ++ png_byte chunk_length[4]; ++ png_uint_32 length; ++ ++ png_read_data(png_ptr, chunk_length, 4); ++ length = png_get_uint_31(png_ptr, chunk_length); ++ ++ png_reset_crc(png_ptr); ++ png_crc_read(png_ptr, png_ptr->chunk_name, 4); ++ ++ if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) ++ { ++ /* discard trailing IDATs for the first frame */ ++ if (have_chunk_after_DAT || png_ptr->num_frames_read > 1) ++ png_error(png_ptr, "png_read_frame_head(): out of place IDAT"); ++ png_crc_finish(png_ptr, length); ++ } ++ else if (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4)) ++ { ++ png_handle_fcTL(png_ptr, info_ptr, length); ++ have_chunk_after_DAT = 1; ++ } ++ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4)) ++ { ++ png_ensure_sequence_number(png_ptr, length); ++ ++ /* discard trailing fdATs for frames other than the first */ ++ if (!have_chunk_after_DAT && png_ptr->num_frames_read > 1) ++ png_crc_finish(png_ptr, length - 4); ++ else if(png_ptr->mode & PNG_HAVE_fcTL) ++ { ++ png_ptr->idat_size = length - 4; ++ png_ptr->mode |= PNG_HAVE_IDAT; ++ ++ break; ++ } ++ else ++ png_error(png_ptr, "png_read_frame_head(): out of place fdAT"); ++ } ++ else ++ { ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ png_crc_finish(png_ptr, length); ++ } ++ } ++} ++#endif /* PNG_READ_APNG_SUPPORTED */ ++ + /* optional call to update the users info_ptr structure */ + void PNGAPI + png_read_update_info(png_structp png_ptr, png_infop info_ptr) +@@ -566,6 +659,10 @@ + { + #ifdef PNG_USE_LOCAL_ARRAYS + PNG_CONST PNG_IDAT; ++#if defined(PNG_READ_APNG_SUPPORTED) ++ PNG_CONST PNG_fdAT; ++ PNG_CONST PNG_IEND; ++#endif + PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, + 0xff}; + PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}; +@@ -695,19 +792,46 @@ + { + if (!(png_ptr->zstream.avail_in)) + { +- while (!png_ptr->idat_size) ++ png_uint_32 bytes_to_skip = 0; ++ ++ while (!png_ptr->idat_size || bytes_to_skip != 0) + { + png_byte chunk_length[4]; + +- png_crc_finish(png_ptr, 0); +- ++ png_crc_finish(png_ptr, bytes_to_skip); ++ bytes_to_skip = 0; ++ + png_read_data(png_ptr, chunk_length, 4); + png_ptr->idat_size = png_get_uint_31(png_ptr,chunk_length); +- ++ + png_reset_crc(png_ptr); + png_crc_read(png_ptr, png_ptr->chunk_name, 4); +- if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) +- png_error(png_ptr, "Not enough image data"); ++ ++#if defined(PNG_READ_APNG_SUPPORTED) ++ if (png_ptr->num_frames_read == 0) ++ { ++#endif ++ if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) ++ png_error(png_ptr, "Not enough image data"); ++#if defined(PNG_READ_APNG_SUPPORTED) ++ } ++ else ++ { ++ if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4)) ++ png_error(png_ptr, "Not enough image data"); ++ if (png_memcmp(png_ptr->chunk_name, png_fdAT, 4)) ++ { ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ bytes_to_skip = png_ptr->idat_size; ++ continue; ++ } ++ ++ png_ensure_sequence_number(png_ptr, png_ptr->idat_size); ++ ++ png_ptr->idat_size -= 4; ++ } ++#endif + } + png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size; + png_ptr->zstream.next_in = png_ptr->zbuf; +@@ -725,6 +849,9 @@ + png_error(png_ptr, "Extra compressed data"); + png_ptr->mode |= PNG_AFTER_IDAT; + png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED; ++#if defined(PNG_READ_APNG_SUPPORTED) ++ png_ptr->num_frames_read++; ++#endif + break; + } + if (ret != Z_OK) +@@ -979,6 +1106,11 @@ + #if defined(PNG_READ_zTXt_SUPPORTED) + PNG_CONST PNG_zTXt; + #endif ++#if defined(PNG_READ_APNG_SUPPORTED) ++ PNG_CONST PNG_acTL; ++ PNG_CONST PNG_fcTL; ++ PNG_CONST PNG_fdAT; ++#endif + #endif /* PNG_USE_LOCAL_ARRAYS */ + + png_read_data(png_ptr, chunk_length, 4); +@@ -1085,6 +1217,14 @@ + else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4)) + png_handle_iTXt(png_ptr, info_ptr, length); + #endif ++#if defined(PNG_READ_APNG_SUPPORTED) ++ else if (!png_memcmp(png_ptr->chunk_name, png_acTL, 4)) ++ png_handle_acTL(png_ptr, info_ptr, length); ++ else if (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4)) ++ png_handle_fcTL(png_ptr, info_ptr, length); ++ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4)) ++ png_handle_fdAT(png_ptr, info_ptr, length); ++#endif + else + png_handle_unknown(png_ptr, info_ptr, length); + } while (!(png_ptr->mode & PNG_HAVE_IEND)); +Index: png.c +=================================================================== +--- png.c (révision 138) ++++ png.c (révision 140) +@@ -51,6 +51,9 @@ + PNG_tIME; + PNG_tRNS; + PNG_zTXt; ++PNG_acTL; ++PNG_fcTL; ++PNG_fdAT; + + #ifdef PNG_READ_SUPPORTED + /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */ +Index: pngget.c +=================================================================== +--- pngget.c (révision 138) ++++ pngget.c (révision 140) +@@ -797,6 +797,167 @@ + } + #endif + ++#if defined(PNG_APNG_SUPPORTED) ++png_uint_32 PNGAPI ++png_get_acTL(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 *num_frames, png_uint_32 *num_plays) ++{ ++ png_debug1(1, "in %s retrieval function\n", "acTL"); ++ ++ if (png_ptr != NULL && info_ptr != NULL && ++ (info_ptr->valid & PNG_INFO_acTL) && ++ num_frames != NULL && num_plays != NULL) ++ { ++ *num_frames = info_ptr->num_frames; ++ *num_plays = info_ptr->num_plays; ++ return (1); ++ } ++ ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_num_frames(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_num_frames()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->num_frames); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_num_plays(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_num_plays()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->num_plays); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 *width, png_uint_32 *height, ++ png_uint_32 *x_offset, png_uint_32 *y_offset, ++ png_uint_16 *delay_num, png_uint_16 *delay_den, ++ png_byte *dispose_op, png_byte *blend_op) ++{ ++ png_debug1(1, "in %s retrieval function\n", "fcTL"); ++ ++ if (png_ptr != NULL && info_ptr != NULL && ++ (info_ptr->valid & PNG_INFO_fcTL) && ++ width != NULL && height != NULL && ++ x_offset != NULL && x_offset != NULL && ++ delay_num != NULL && delay_den != NULL && ++ dispose_op != NULL && blend_op != NULL) ++ { ++ *width = info_ptr->next_frame_width; ++ *height = info_ptr->next_frame_height; ++ *x_offset = info_ptr->next_frame_x_offset; ++ *y_offset = info_ptr->next_frame_y_offset; ++ *delay_num = info_ptr->next_frame_delay_num; ++ *delay_den = info_ptr->next_frame_delay_den; ++ *dispose_op = info_ptr->next_frame_dispose_op; ++ *blend_op = info_ptr->next_frame_blend_op; ++ return (1); ++ } ++ ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_width(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_width()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_width); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_height(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_height()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_height); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_x_offset(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_x_offset()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_x_offset); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_y_offset(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_y_offset()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_y_offset); ++ return (0); ++} ++ ++png_uint_16 PNGAPI ++png_get_next_frame_delay_num(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_delay_num()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_delay_num); ++ return (0); ++} ++ ++png_uint_16 PNGAPI ++png_get_next_frame_delay_den(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_delay_den()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_delay_den); ++ return (0); ++} ++ ++png_byte PNGAPI ++png_get_next_frame_dispose_op(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_dispose_op()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_dispose_op); ++ return (0); ++} ++ ++png_byte PNGAPI ++png_get_next_frame_blend_op(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_blend_op()\n"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_blend_op); ++ return (0); ++} ++ ++png_byte PNGAPI ++png_get_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_first_frame_is_hidden()\n"); ++ ++ if (png_ptr != NULL) ++ return (png_byte)(png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN); ++ ++ return 0; ++} ++#endif /* PNG_APNG_SUPPORTED */ ++ + #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) + png_uint_32 PNGAPI + png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr, +Index: png.h +=================================================================== +--- png.h (révision 138) ++++ png.h (révision 140) +@@ -944,6 +944,19 @@ + png_fixed_point int_y_blue; + #endif + ++#if defined(PNG_APNG_SUPPORTED) ++ png_uint_32 num_frames; /* including default image */ ++ png_uint_32 num_plays; ++ png_uint_32 next_frame_width; ++ png_uint_32 next_frame_height; ++ png_uint_32 next_frame_x_offset; ++ png_uint_32 next_frame_y_offset; ++ png_uint_16 next_frame_delay_num; ++ png_uint_16 next_frame_delay_den; ++ png_byte next_frame_dispose_op; ++ png_byte next_frame_blend_op; ++#endif ++ + } png_info; + + typedef png_info FAR * png_infop; +@@ -1045,6 +1058,8 @@ + #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */ + #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */ + #define PNG_INFO_IDAT 0x8000L /* ESR, 1.0.6 */ ++#define PNG_INFO_acTL 0x10000L ++#define PNG_INFO_fcTL 0x20000L + + /* This is used for the transformation routines, as some of them + * change these values for the row. It also should enable using +@@ -1085,7 +1100,11 @@ + typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop)); + typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep, + png_uint_32, int)); ++#if defined(PNG_APNG_SUPPORTED) ++typedef void (PNGAPI *png_progressive_frame_ptr) PNGARG((png_structp, ++ png_uint_32)); + #endif ++#endif + + #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \ + defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \ +@@ -1414,6 +1433,39 @@ + png_uint_32 user_height_max; + #endif + ++#if defined(PNG_APNG_SUPPORTED) ++ png_uint_32 apng_flags; ++ png_uint_32 next_seq_num; /* next fcTL/fdAT chunk sequence number */ ++ png_uint_32 first_frame_width; ++ png_uint_32 first_frame_height; ++ ++#if defined(PNG_READ_APNG_SUPPORTED) ++ png_uint_32 num_frames_read; /* incremented after all image data of */ ++ /* a frame is read */ ++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED ++ png_progressive_frame_ptr frame_info_fn; /* frame info read callback */ ++ png_progressive_frame_ptr frame_end_fn; /* frame data read callback */ ++#endif ++#endif ++ ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++ png_uint_32 num_frames_to_write; ++ png_uint_32 num_frames_written; ++#endif ++#endif ++ ++/* For png_struct.apng_flags: */ ++#define PNG_FIRST_FRAME_HIDDEN 0x0001 ++ ++/* dispose_op flags from inside fcTL */ ++#define PNG_DISPOSE_OP_NONE 0x00 ++#define PNG_DISPOSE_OP_BACKGROUND 0x01 ++#define PNG_DISPOSE_OP_PREVIOUS 0x02 ++ ++/* blend_op flags from inside fcTL */ ++#define PNG_BLEND_OP_SOURCE 0x00 ++#define PNG_BLEND_OP_OVER 0x01 ++ + /* New member added in libpng-1.0.25 and 1.2.17 */ + #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) + /* storage for unknown chunk that the library doesn't recognize. */ +@@ -1740,6 +1792,18 @@ + extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr, + png_bytepp image)); + ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++extern PNG_EXPORT (void,png_write_frame_head) PNGARG((png_structp png_ptr, ++ png_infop png_info, png_bytepp row_pointers, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op)); ++ ++extern PNG_EXPORT (void,png_write_frame_tail) PNGARG((png_structp png_ptr, ++ png_infop png_info)); ++#endif ++ + /* writes the end of the PNG file. */ + extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr, + png_infop info_ptr)); +@@ -1988,6 +2052,11 @@ + png_voidp progressive_ptr, + png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn, + png_progressive_end_ptr end_fn)); ++#if defined(PNG_READ_APNG_SUPPORTED) ++extern PNG_EXPORT(void,png_set_progressive_frame_fn) PNGARG((png_structp png_ptr, ++ png_progressive_frame_ptr frame_info_fn, ++ png_progressive_frame_ptr frame_end_fn)); ++#endif + + /* returns the user pointer associated with the push read functions */ + extern PNG_EXPORT(png_voidp,png_get_progressive_ptr) +@@ -2425,6 +2494,59 @@ + #endif + #endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */ + ++#if defined(PNG_APNG_SUPPORTED) ++extern PNG_EXPORT(png_uint_32,png_get_acTL) PNGARG((png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays)); ++extern PNG_EXPORT(png_uint_32,png_set_acTL) PNGARG((png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays)); ++extern PNG_EXPORT(png_uint_32,png_get_num_frames) PNGARG((png_structp png_ptr, ++ png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_get_num_plays) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++ ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_fcTL) ++ PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, ++ png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset, ++ png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op, ++ png_byte *blend_op)); ++extern PNG_EXPORT(png_uint_32,png_set_next_frame_fcTL) ++ PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 width, ++ png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op)); ++extern PNG_EXPORT(void,png_ensure_fcTL_is_valid) ++ PNGARG((png_structp png_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op)); ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_width) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_height) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_x_offset) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_get_next_frame_y_offset) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_num) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_den) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_byte,png_get_next_frame_dispose_op) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_byte,png_get_next_frame_blend_op) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_byte,png_get_first_frame_is_hidden) ++ PNGARG((png_structp png_ptr, png_infop info_ptr)); ++extern PNG_EXPORT(png_uint_32,png_set_first_frame_is_hidden) ++ PNGARG((png_structp png_ptr, png_infop info_ptr, png_byte is_hidden)); ++#endif /* PNG_APNG_SUPPORTED */ ++ ++#if defined(PNG_READ_APNG_SUPPORTED) ++extern PNG_EXPORT(void,png_read_frame_head) PNGARG((png_structp png_ptr, ++ png_infop info_ptr)); ++#endif ++ + #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) + /* provide a list of chunks and how they are to be handled, if the built-in + handling or default unknown chunk handling is not desired. Any chunks not +@@ -2731,6 +2853,8 @@ + #define PNG_BACKGROUND_IS_GRAY 0x800 + #define PNG_HAVE_PNG_SIGNATURE 0x1000 + #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ ++#define PNG_HAVE_acTL 0x4000 ++#define PNG_HAVE_fcTL 0x8000L + + /* flags for the transformations the PNG library does on the image data */ + #define PNG_BGR 0x0001 +@@ -2871,6 +2995,9 @@ + #define PNG_tIME png_byte png_tIME[5] = {116, 73, 77, 69, '\0'} + #define PNG_tRNS png_byte png_tRNS[5] = {116, 82, 78, 83, '\0'} + #define PNG_zTXt png_byte png_zTXt[5] = {122, 84, 88, 116, '\0'} ++#define PNG_acTL png_byte png_acTL[5] = { 97, 99, 84, 76, '\0'} ++#define PNG_fcTL png_byte png_fcTL[5] = {102, 99, 84, 76, '\0'} ++#define PNG_fdAT png_byte png_fdAT[5] = {102, 100, 65, 84, '\0'} + + #ifdef PNG_USE_GLOBAL_ARRAYS + PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5]; +@@ -2894,6 +3021,9 @@ + PNG_EXPORT_VAR (png_byte FARDATA) png_tIME[5]; + PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS[5]; + PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt[5]; ++PNG_EXPORT_VAR (png_byte FARDATA) png_acTL[5]; ++PNG_EXPORT_VAR (png_byte FARDATA) png_fcTL[5]; ++PNG_EXPORT_VAR (png_byte FARDATA) png_fdAT[5]; + #endif /* PNG_USE_GLOBAL_ARRAYS */ + + #if defined(PNG_1_0_X) || defined (PNG_1_2_X) +@@ -3168,6 +3298,17 @@ + #endif + #endif + ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++PNG_EXTERN void png_write_acTL PNGARG((png_structp png_ptr, ++ png_uint_32 num_frames, png_uint_32 num_plays)); ++ ++PNG_EXTERN void png_write_fcTL PNGARG((png_structp png_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op)); ++#endif ++ + /* Called when finished processing a row of data */ + PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr)); + +@@ -3219,6 +3360,20 @@ + PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr, + png_infop info_ptr)); + ++#if defined(PNG_READ_APNG_SUPPORTED) ++/* private, reset some things to become ready for reading next frame */ ++PNG_EXTERN void png_read_reset PNGARG((png_structp png_ptr)); ++PNG_EXTERN void png_read_reinit PNGARG((png_structp png_ptr, ++ png_infop info_ptr)); ++PNG_EXTERN void png_progressive_read_reset PNGARG((png_structp png_ptr)); ++#endif ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++/* private, reset some things to become ready for writing next frame */ ++PNG_EXTERN void png_write_reset PNGARG((png_structp png_ptr)); ++PNG_EXTERN void png_write_reinit PNGARG((png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 width, png_uint_32 height)); ++#endif ++ + /* these are the functions that do the transformations */ + #if defined(PNG_READ_FILLER_SUPPORTED) + PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info, +@@ -3434,6 +3589,18 @@ + png_uint_32 length)); + #endif + ++#if defined(PNG_READ_APNG_SUPPORTED) ++PNG_EXTERN void png_handle_acTL PNGARG((png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length)); ++PNG_EXTERN void png_handle_fcTL PNGARG((png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length)); ++PNG_EXTERN void png_have_info PNGARG((png_structp png_ptr, png_infop info_ptr)); ++PNG_EXTERN void png_handle_fdAT PNGARG((png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length)); ++PNG_EXTERN void png_ensure_sequence_number PNGARG((png_structp png_ptr, ++ png_uint_32 length)); ++#endif ++ + PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr, + png_infop info_ptr, png_uint_32 length)); + +Index: pngtrans.c +=================================================================== +--- pngtrans.c (révision 138) ++++ pngtrans.c (révision 140) +@@ -652,11 +652,10 @@ + png_voidp PNGAPI + png_get_user_transform_ptr(png_structp png_ptr) + { +-#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) + if (png_ptr == NULL) return (NULL); ++#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) + return ((png_voidp)png_ptr->user_transform_ptr); +-#else +- return (NULL); + #endif ++ return (NULL); + } + #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ +Index: pngconf.h +=================================================================== +--- pngconf.h (révision 138) ++++ pngconf.h (révision 140) +@@ -923,6 +923,10 @@ + # define PNG_READ_zTXt_SUPPORTED + # define PNG_zTXt_SUPPORTED + #endif ++#ifndef PNG_NO_READ_APNG ++# define PNG_READ_APNG_SUPPORTED ++# define PNG_APNG_SUPPORTED ++#endif + #ifndef PNG_NO_READ_UNKNOWN_CHUNKS + # define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED + # ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED +@@ -1065,6 +1069,12 @@ + # define PNG_zTXt_SUPPORTED + # endif + #endif ++#ifndef PNG_NO_WRITE_APNG ++# define PNG_WRITE_APNG_SUPPORTED ++# ifndef PNG_APNG_SUPPORTED ++# define PNG_APNG_SUPPORTED ++# endif ++#endif + #ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS + # define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED + # ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED +Index: pngwrite.c +=================================================================== +--- pngwrite.c (révision 138) ++++ pngwrite.c (révision 140) +@@ -261,6 +261,10 @@ + } + } + #endif ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++ if (info_ptr->valid & PNG_INFO_acTL) ++ png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays); ++#endif + #if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) + if (info_ptr->unknown_chunks_num) + { +@@ -299,6 +303,10 @@ + return; + if (!(png_ptr->mode & PNG_HAVE_IDAT)) + png_error(png_ptr, "No IDATs written into file"); ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++ if (png_ptr->num_frames_written != png_ptr->num_frames_to_write) ++ png_error(png_ptr, "Not enough frames written"); ++#endif + + /* see if user wants us to write information chunks */ + if (info_ptr != NULL) +@@ -1511,4 +1519,39 @@ + params = params; + } + #endif ++ ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++void PNGAPI ++png_write_frame_head(png_structp png_ptr, png_infop info_ptr, ++ png_bytepp row_pointers, png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op) ++{ ++ png_debug(1, "in png_write_frame_head\n"); ++ ++ /* there is a chance this has been set after png_write_info was called, ++ * so it would be set but not written. is there a way to be sure? */ ++ if (!(info_ptr->valid & PNG_INFO_acTL)) ++ png_error(png_ptr, "png_write_frame_head(): acTL not set"); ++ ++ png_write_reset(png_ptr); ++ ++ png_write_reinit(png_ptr, info_ptr, width, height); ++ ++ if ( !(png_ptr->num_frames_written == 0 && ++ (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ) ) ++ png_write_fcTL(png_ptr, width, height, x_offset, y_offset, ++ delay_num, delay_den, dispose_op, blend_op); ++} ++ ++void PNGAPI ++png_write_frame_tail(png_structp png_ptr, png_infop png_info) ++{ ++ png_debug(1, "in png_write_frame_tail\n"); ++ ++ png_ptr->num_frames_written++; ++} ++#endif /* PNG_WRITE_APNG_SUPPORTED */ ++ + #endif /* PNG_WRITE_SUPPORTED */ +Index: pngpread.c +=================================================================== +--- pngpread.c (révision 138) ++++ pngpread.c (révision 140) +@@ -192,6 +192,11 @@ + #if defined(PNG_READ_zTXt_SUPPORTED) + PNG_CONST PNG_zTXt; + #endif ++#if defined(PNG_READ_APNG_SUPPORTED) ++ PNG_CONST PNG_acTL; ++ PNG_CONST PNG_fcTL; ++ PNG_CONST PNG_fdAT; ++#endif + #endif /* PNG_USE_LOCAL_ARRAYS */ + /* First we make sure we have enough data for the 4 byte chunk name + * and the 4 byte chunk length before proceeding with decoding the +@@ -215,7 +220,104 @@ + png_crc_read(png_ptr, png_ptr->chunk_name, 4); + png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; + } +- ++ ++#if defined(PNG_READ_APNG_SUPPORTED) ++ if (png_ptr->num_frames_read > 0 && ++ png_ptr->num_frames_read < info_ptr->num_frames) ++ { ++ if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) ++ { ++ /* discard trailing IDATs for the first frame */ ++ if (png_ptr->mode & PNG_HAVE_fcTL || png_ptr->num_frames_read > 1) ++ png_error(png_ptr, "out of place IDAT"); ++ ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_push_crc_skip(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ return; ++ } ++ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4)) ++ { ++ if (png_ptr->buffer_size < 4) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_ensure_sequence_number(png_ptr, 4); ++ ++ if (!(png_ptr->mode & PNG_HAVE_fcTL)) ++ { ++ /* discard trailing fdATs for frames other than the first */ ++ if (png_ptr->num_frames_read < 2) ++ png_error(png_ptr, "out of place fdAT"); ++ ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_push_crc_skip(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ return; ++ } ++ else ++ { ++ /* frame data follows */ ++ png_ptr->idat_size = png_ptr->push_length - 4; ++ png_ptr->mode |= PNG_HAVE_IDAT; ++ png_ptr->process_mode = PNG_READ_IDAT_MODE; ++ ++ return; ++ } ++ } ++ else if(!png_memcmp(png_ptr->chunk_name, png_fcTL, 4)) ++ { ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ ++ png_read_reset(png_ptr); ++ png_ptr->mode &= ~PNG_HAVE_fcTL; ++ ++ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); ++ ++ if (!(png_ptr->mode & PNG_HAVE_fcTL)) ++ png_error(png_ptr, "missing required fcTL chunk"); ++ ++ png_read_reinit(png_ptr, info_ptr); ++ png_progressive_read_reset(png_ptr); ++ ++ if (png_ptr->frame_info_fn != NULL) ++ (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read); ++ ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ ++ return; ++ } ++ else ++ { ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ png_push_crc_skip(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ return; ++ } ++ ++ return; ++ } ++#endif /* PNG_READ_APNG_SUPPORTED */ ++ + if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) + if(png_ptr->mode & PNG_AFTER_IDAT) + png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT; +@@ -295,6 +397,9 @@ + png_error(png_ptr, "Too many IDAT's found"); + } + ++#if defined(PNG_READ_APNG_SUPPORTED) ++ png_have_info(png_ptr, info_ptr); ++#endif + png_ptr->idat_size = png_ptr->push_length; + png_ptr->mode |= PNG_HAVE_IDAT; + png_ptr->process_mode = PNG_READ_IDAT_MODE; +@@ -490,6 +595,35 @@ + png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length); + } + #endif ++#if defined(PNG_READ_APNG_SUPPORTED) ++ else if (!png_memcmp(png_ptr->chunk_name, png_acTL, 4)) ++ { ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_handle_acTL(png_ptr, info_ptr, png_ptr->push_length); ++ } ++ else if (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4)) ++ { ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); ++ } ++ else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4)) ++ { ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_handle_fdAT(png_ptr, info_ptr, png_ptr->push_length); ++ } ++#endif /* PNG_READ_APNG_SUPPORTED */ + else + { + if (png_ptr->push_length + 4 > png_ptr->buffer_size) +@@ -660,13 +794,17 @@ + png_push_read_IDAT(png_structp png_ptr) + { + #ifdef PNG_USE_LOCAL_ARRAYS +- PNG_CONST PNG_IDAT; ++ PNG_IDAT; ++#if defined(PNG_READ_APNG_SUPPORTED) ++ PNG_fdAT; ++ PNG_IEND; + #endif ++#endif + if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER)) + { + png_byte chunk_length[4]; + +- if (png_ptr->buffer_size < 8) ++ if (png_ptr->buffer_size < 12) + { + png_push_save_buffer(png_ptr); + return; +@@ -678,15 +816,59 @@ + png_crc_read(png_ptr, png_ptr->chunk_name, 4); + png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; + +- if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) ++#if defined(PNG_READ_APNG_SUPPORTED) ++ if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_fdAT, 4) ++ && png_ptr->num_frames_read > 0) + { ++ if (png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) ++ { ++ png_ptr->process_mode = PNG_READ_CHUNK_MODE; ++ if (png_ptr->frame_end_fn != NULL) ++ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read); ++ png_ptr->num_frames_read++; ++ return; ++ } ++ else ++ { ++ if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4)) ++ png_error(png_ptr, "Not enough image data"); ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_warning(png_ptr, "Skipping (ignoring) a chunk between " ++ "APNG chunks"); ++ png_crc_finish(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ return; ++ } ++ } ++ else ++#endif ++ if ( png_memcmp(png_ptr->chunk_name, png_IDAT, 4) ++ && (png_ptr->num_frames_read == 0) ) ++ { + png_ptr->process_mode = PNG_READ_CHUNK_MODE; + if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED)) + png_error(png_ptr, "Not enough compressed data"); ++#if defined(PNG_READ_APNG_SUPPORTED) ++ if (png_ptr->frame_end_fn != NULL) ++ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read); ++ png_ptr->num_frames_read++; ++#endif + return; + } + + png_ptr->idat_size = png_ptr->push_length; ++ ++#if defined(PNG_READ_APNG_SUPPORTED) ++ if(png_ptr->num_frames_read > 0) ++ { ++ png_ensure_sequence_number(png_ptr, 4); ++ png_ptr->idat_size -= 4; ++ } ++#endif + } + if (png_ptr->idat_size && png_ptr->save_buffer_size) + { +@@ -1577,6 +1759,17 @@ + png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); + } + ++#if defined(PNG_READ_APNG_SUPPORTED) ++void PNGAPI ++png_set_progressive_frame_fn(png_structp png_ptr, ++ png_progressive_frame_ptr frame_info_fn, ++ png_progressive_frame_ptr frame_end_fn) ++{ ++ png_ptr->frame_info_fn = frame_info_fn; ++ png_ptr->frame_end_fn = frame_end_fn; ++} ++#endif ++ + png_voidp PNGAPI + png_get_progressive_ptr(png_structp png_ptr) + { +Index: pngset.c +=================================================================== +--- pngset.c (révision 138) ++++ pngset.c (révision 140) +@@ -375,6 +375,11 @@ + info_ptr->rowbytes = (png_size_t)0; + else + info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth,width); ++ ++#if defined(PNG_APNG_SUPPORTED) ++ /* for non-animated png. this may be overritten from an acTL chunk later */ ++ info_ptr->num_frames = 1; ++#endif + } + + #if defined(PNG_oFFs_SUPPORTED) +@@ -1022,6 +1027,141 @@ + } + #endif /* PNG_sPLT_SUPPORTED */ + ++#if defined(PNG_APNG_SUPPORTED) ++png_uint_32 PNGAPI ++png_set_acTL(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 num_frames, png_uint_32 num_plays) ++{ ++ png_debug1(1, "in %s storage function\n", "acTL"); ++ ++ if (png_ptr == NULL || info_ptr == NULL) ++ { ++ png_warning(png_ptr, ++ "Call to png_set_acTL() with NULL png_ptr " ++ "or info_ptr ignored"); ++ return (0); ++ } ++ if (num_frames == 0) ++ { ++ png_warning(png_ptr, ++ "Ignoring attempt to set acTL with num_frames zero"); ++ return (0); ++ } ++ if (num_frames > PNG_UINT_31_MAX) ++ { ++ png_warning(png_ptr, ++ "Ignoring attempt to set acTL with num_frames > 2^31-1"); ++ return (0); ++ } ++ if (num_plays > PNG_UINT_31_MAX) ++ { ++ png_warning(png_ptr, ++ "Ignoring attempt to set acTL with num_plays " ++ "> 2^31-1"); ++ return (0); ++ } ++ ++ info_ptr->num_frames = num_frames; ++ info_ptr->num_plays = num_plays; ++ ++ info_ptr->valid |= PNG_INFO_acTL; ++ ++ return (1); ++} ++ ++/* delay_num and delay_den can hold any 16-bit values including zero */ ++png_uint_32 PNGAPI ++png_set_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op) ++{ ++ png_debug1(1, "in %s storage function\n", "fcTL"); ++ ++ if (png_ptr == NULL || info_ptr == NULL) ++ { ++ png_warning(png_ptr, ++ "Call to png_set_fcTL() with NULL png_ptr or info_ptr " ++ "ignored"); ++ return (0); ++ } ++ ++ png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, ++ delay_num, delay_den, dispose_op, blend_op); ++ ++ info_ptr->next_frame_width = width; ++ info_ptr->next_frame_height = height; ++ info_ptr->next_frame_x_offset = x_offset; ++ info_ptr->next_frame_y_offset = y_offset; ++ info_ptr->next_frame_delay_num = delay_num; ++ info_ptr->next_frame_delay_den = delay_den; ++ info_ptr->next_frame_dispose_op = dispose_op; ++ info_ptr->next_frame_blend_op = blend_op; ++ ++ info_ptr->valid |= PNG_INFO_fcTL; ++ ++ return (1); ++} ++ ++void /* PRIVATE */ ++png_ensure_fcTL_is_valid(png_structp png_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op) ++{ ++ if (width + x_offset > png_ptr->first_frame_width || ++ height + y_offset > png_ptr->first_frame_height) ++ png_error(png_ptr, "dimensions of a frame are greater than" ++ "the ones in IHDR"); ++ if (width > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid width in fcTL (> 2^31-1)"); ++ if (height > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid height in fcTL (> 2^31-1)"); ++ if (x_offset > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid x_offset in fcTL (> 2^31-1)"); ++ if (y_offset > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid y_offset in fcTL (> 2^31-1)"); ++ ++ if (dispose_op != PNG_DISPOSE_OP_NONE && ++ dispose_op != PNG_DISPOSE_OP_BACKGROUND && ++ dispose_op != PNG_DISPOSE_OP_PREVIOUS) ++ png_error(png_ptr, "invalid dispose_op in fcTL"); ++ ++ if (blend_op != PNG_BLEND_OP_SOURCE && ++ blend_op != PNG_BLEND_OP_OVER) ++ png_error(png_ptr, "invalid blend_op in fcTL"); ++ ++ if (blend_op == PNG_BLEND_OP_OVER) { ++ if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY) ++ png_error(png_ptr, "PNG_BLEND_OP_OVER is not valid for " ++ "color type 'greyscale without alpha'"); ++ else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) && ++ !(png_ptr->color_type & PNG_COLOR_MASK_ALPHA)) ++ png_error(png_ptr, "PNG_BLEND_OP_OVER is not valid for " ++ "color type 'truecolor without alpha'"); ++ } ++} ++ ++png_uint_32 PNGAPI ++png_set_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr, ++ png_byte is_hidden) ++{ ++ png_debug(1, "in png_first_frame_is_hidden()\n"); ++ ++ if (png_ptr == NULL) ++ return 0; ++ ++ if(is_hidden) ++ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN; ++ else ++ png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN; ++ ++ return 1; ++} ++#endif /* PNG_APNG_SUPPORTED */ ++ + #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) + void PNGAPI + png_set_unknown_chunks(png_structp png_ptr, +Index: pngrutil.c +=================================================================== +--- pngrutil.c (révision 138) ++++ pngrutil.c (révision 140) +@@ -374,6 +374,11 @@ + filter_type = buf[11]; + interlace_type = buf[12]; + ++#if defined(PNG_READ_APNG_SUPPORTED) ++ png_ptr->first_frame_width = width; ++ png_ptr->first_frame_height = height; ++#endif ++ + /* set internal variables */ + png_ptr->width = width; + png_ptr->height = height; +@@ -2175,6 +2180,168 @@ + } + #endif + ++#if defined(PNG_READ_APNG_SUPPORTED) ++void /* PRIVATE */ ++png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++{ ++ png_byte data[8]; ++ png_uint_32 num_frames; ++ png_uint_32 num_plays; ++ png_uint_32 didSet; ++ ++ png_debug(1, "in png_handle_acTL\n"); ++ ++ if (!(png_ptr->mode & PNG_HAVE_IHDR)) ++ { ++ png_error(png_ptr, "Missing IHDR before acTL"); ++ } ++ else if (png_ptr->mode & PNG_HAVE_IDAT) ++ { ++ png_warning(png_ptr, "Invalid acTL after IDAT skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ else if (png_ptr->mode & PNG_HAVE_acTL) ++ { ++ png_warning(png_ptr, "Duplicate acTL skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ else if (length != 8) ++ { ++ png_warning(png_ptr, "acTL with invalid length skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ ++ png_crc_read(png_ptr, data, 8); ++ png_crc_finish(png_ptr, 0); ++ ++ num_frames = png_get_uint_31(png_ptr, data); ++ num_plays = png_get_uint_31(png_ptr, data + 4); ++ ++ /* the set function will do error checking on num_frames */ ++ didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays); ++ if(didSet) ++ png_ptr->mode |= PNG_HAVE_acTL; ++} ++ ++void /* PRIVATE */ ++png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++{ ++ png_byte data[22]; ++ png_uint_32 width; ++ png_uint_32 height; ++ png_uint_32 x_offset; ++ png_uint_32 y_offset; ++ png_uint_16 delay_num; ++ png_uint_16 delay_den; ++ png_byte dispose_op; ++ png_byte blend_op; ++ ++ png_debug(1, "in png_handle_fcTL\n"); ++ ++ if (!(png_ptr->mode & PNG_HAVE_IHDR)) ++ { ++ png_error(png_ptr, "Missing IHDR before fcTL"); ++ } ++ else if (png_ptr->mode & PNG_HAVE_IDAT) ++ { ++ /* for any frames other then the first this message may be misleading, ++ * but correct. PNG_HAVE_IDAT is unset before the frame head is read ++ * i can't think of a better message */ ++ png_warning(png_ptr, "Invalid fcTL after IDAT skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ else if (png_ptr->mode & PNG_HAVE_fcTL) ++ { ++ png_warning(png_ptr, "Duplicate fcTL within one frame skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ else if (length != 26) ++ { ++ png_warning(png_ptr, "fcTL with invalid length skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ ++ png_ensure_sequence_number(png_ptr, length); ++ ++ png_crc_read(png_ptr, data, 22); ++ png_crc_finish(png_ptr, 0); ++ ++ width = png_get_uint_31(png_ptr, data); ++ height = png_get_uint_31(png_ptr, data + 4); ++ x_offset = png_get_uint_31(png_ptr, data + 8); ++ y_offset = png_get_uint_31(png_ptr, data + 12); ++ delay_num = png_get_uint_16(data + 16); ++ delay_den = png_get_uint_16(data + 18); ++ dispose_op = data[20]; ++ blend_op = data[21]; ++ ++ if (png_ptr->num_frames_read == 0 && (x_offset != 0 || y_offset != 0)) ++ png_error(png_ptr, "fcTL for the first frame must have zero offset"); ++ if (png_ptr->num_frames_read == 0 && ++ (width != info_ptr->width || height != info_ptr->height)) ++ png_error(png_ptr, "size in first frame's fcTL must match " ++ "the size in IHDR"); ++ ++ /* the set function will do more error checking */ ++ png_set_next_frame_fcTL(png_ptr, info_ptr, width, height, ++ x_offset, y_offset, delay_num, delay_den, ++ dispose_op, blend_op); ++ ++ png_read_reinit(png_ptr, info_ptr); ++ ++ png_ptr->mode |= PNG_HAVE_fcTL; ++} ++ ++void /* PRIVATE */ ++png_have_info(png_structp png_ptr, png_infop info_ptr) ++{ ++ if((info_ptr->valid & PNG_INFO_acTL) && !(info_ptr->valid & PNG_INFO_fcTL)) ++ { ++ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN; ++ info_ptr->num_frames++; ++ } ++} ++ ++void /* PRIVATE */ ++png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++{ ++ png_ensure_sequence_number(png_ptr, length); ++ ++ /* This function is only called from png_read_end(), png_read_info(), ++ * and png_push_read_chunk() which means that: ++ * - the user doesn't want to read this frame ++ * - or this is an out-of-place fdAT ++ * in either case it is safe to ignore the chunk with a warning */ ++ png_warning(png_ptr, "ignoring fdAT chunk"); ++ png_crc_finish(png_ptr, length - 4); ++} ++ ++void /* PRIVATE */ ++png_ensure_sequence_number(png_structp png_ptr, png_uint_32 length) ++{ ++ png_byte data[4]; ++ png_uint_32 sequence_number; ++ ++ if (length < 4) ++ png_error(png_ptr, "invalid fcTL or fdAT chunk found"); ++ ++ png_crc_read(png_ptr, data, 4); ++ sequence_number = png_get_uint_31(png_ptr, data); ++ ++ if (sequence_number != png_ptr->next_seq_num) ++ png_error(png_ptr, "fcTL or fdAT chunk with out-of-order sequence " ++ "number found"); ++ ++ png_ptr->next_seq_num++; ++} ++#endif /* PNG_READ_APNG_SUPPORTED */ ++ + /* This function is called when we haven't found a handler for a + chunk. If there isn't a problem with the chunk itself (ie bad + chunk name, CRC, or a critical chunk), the chunk is silently ignored +@@ -3138,8 +3305,10 @@ + if (row_bytes > (png_uint_32)65536L) + png_error(png_ptr, "This image requires a row greater than 64KB"); + #endif +- png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64); +- png_ptr->row_buf = png_ptr->big_row_buf+32; ++ if (png_ptr->big_row_buf == NULL) ++ png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64); ++ if (png_ptr->row_buf == NULL) ++ png_ptr->row_buf = png_ptr->big_row_buf+32; + + #ifdef PNG_MAX_MALLOC_64K + if ((png_uint_32)png_ptr->rowbytes + 1 > (png_uint_32)65536L) +@@ -3161,4 +3330,82 @@ + + png_ptr->flags |= PNG_FLAG_ROW_INIT; + } ++ ++#if defined(PNG_READ_APNG_SUPPORTED) ++/* This function is to be called after the main IDAT set has been read and ++ * before a new IDAT is read. It resets some parts of png_ptr ++ * to make them usable by the read functions again */ ++void /* PRIVATE */ ++png_read_reset(png_structp png_ptr) ++{ ++ png_ptr->mode &= ~PNG_HAVE_IDAT; ++ png_ptr->mode &= ~PNG_AFTER_IDAT; ++ png_ptr->row_number = 0; ++ png_ptr->pass = 0; ++ png_ptr->flags &= ~PNG_FLAG_ROW_INIT; ++} ++ ++void /* PRIVATE */ ++png_read_reinit(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_ptr->width = info_ptr->next_frame_width; ++ png_ptr->height = info_ptr->next_frame_height; ++ png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width); ++} ++ ++/* same as png_read_reset() but for the progressive reader */ ++void /* PRIVATE */ ++png_progressive_read_reset(png_structp png_ptr) ++{ ++#ifdef PNG_USE_LOCAL_ARRAYS ++ /* start of interlace block */ ++ const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; ++ ++ /* offset to next interlace block */ ++ const int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; ++ ++ /* start of interlace block in the y direction */ ++ const int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; ++ ++ /* offset to next interlace block in the y direction */ ++ const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; ++#endif ++ png_uint_32 row_bytes; ++ ++ if (png_ptr->interlaced) ++ { ++ if (!(png_ptr->transformations & PNG_INTERLACE)) ++ png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 - ++ png_pass_ystart[0]) / png_pass_yinc[0]; ++ else ++ png_ptr->num_rows = png_ptr->height; ++ ++ png_ptr->iwidth = (png_ptr->width + ++ png_pass_inc[png_ptr->pass] - 1 - ++ png_pass_start[png_ptr->pass]) / ++ png_pass_inc[png_ptr->pass]; ++ ++ row_bytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->iwidth) + 1; ++ ++ png_ptr->irowbytes = (png_size_t)row_bytes; ++ if((png_uint_32)png_ptr->irowbytes != row_bytes) ++ png_error(png_ptr, "png_progressive_read_reset(): Rowbytes " ++ "overflow"); ++ } ++ else ++ { ++ png_ptr->num_rows = png_ptr->height; ++ png_ptr->iwidth = png_ptr->width; ++ png_ptr->irowbytes = png_ptr->rowbytes + 1; ++ } ++ ++ png_ptr->flags &= ~PNG_FLAG_ZLIB_FINISHED; ++ if (inflateReset(&(png_ptr->zstream)) != Z_OK) ++ png_error(png_ptr, "inflateReset failed"); ++ png_ptr->zstream.avail_in = 0; ++ png_ptr->zstream.next_in = 0; ++ png_ptr->zstream.next_out = png_ptr->row_buf; ++ png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes; ++} ++#endif /* PNG_READ_APNG_SUPPORTED */ + #endif /* PNG_READ_SUPPORTED */ +Index: pngwutil.c +=================================================================== +--- pngwutil.c (révision 138) ++++ pngwutil.c (révision 140) +@@ -496,6 +496,11 @@ + /* write the chunk */ + png_write_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); + ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++ png_ptr->first_frame_width = width; ++ png_ptr->first_frame_height = height; ++#endif ++ + /* initialize zlib with PNG info */ + png_ptr->zstream.zalloc = png_zalloc; + png_ptr->zstream.zfree = png_zfree; +@@ -608,7 +613,10 @@ + { + #ifdef PNG_USE_LOCAL_ARRAYS + PNG_IDAT; ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++ PNG_fdAT; + #endif ++#endif + png_debug(1, "in png_write_IDAT\n"); + + /* Optimize the CMF field in the zlib stream. */ +@@ -650,7 +658,28 @@ + "Invalid zlib compression method or flags in IDAT"); + } + +- png_write_chunk(png_ptr, png_IDAT, data, length); ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++ if(png_ptr->num_frames_written == 0) ++#endif ++ png_write_chunk(png_ptr, (png_bytep)png_IDAT, data, length); ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++ else ++ { ++ png_byte buf[4]; ++ ++ png_write_chunk_start(png_ptr, (png_bytep)png_fdAT, 4 + length); ++ ++ png_save_uint_32(buf, png_ptr->next_seq_num); ++ png_write_chunk_data(png_ptr, buf, 4); ++ ++ png_write_chunk_data(png_ptr, data, length); ++ ++ png_write_chunk_end(png_ptr); ++ ++ png_ptr->next_seq_num++; ++ } ++#endif ++ + png_ptr->mode |= PNG_HAVE_IDAT; + } + +@@ -662,7 +691,7 @@ + PNG_IEND; + #endif + png_debug(1, "in png_write_IEND\n"); +- png_write_chunk(png_ptr, png_IEND, png_bytep_NULL, ++ png_write_chunk(png_ptr, (png_bytep)png_IEND, png_bytep_NULL, + (png_size_t)0); + png_ptr->mode |= PNG_HAVE_IEND; + } +@@ -1722,6 +1751,70 @@ + } + #endif + ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++void /* PRIVATE */ ++png_write_acTL(png_structp png_ptr, ++ png_uint_32 num_frames, png_uint_32 num_plays) ++{ ++#ifdef PNG_USE_LOCAL_ARRAYS ++ PNG_acTL; ++#endif ++ png_byte data[16]; ++ ++ png_debug(1, "in png_write_acTL\n"); ++ ++ png_ptr->num_frames_to_write = num_frames; ++ ++ if (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ++ num_frames--; ++ ++ png_save_uint_32(data, num_frames); ++ png_save_uint_32(data + 4, num_plays); ++ ++ png_write_chunk(png_ptr, (png_bytep)png_acTL, data, (png_size_t)8); ++} ++ ++void /* PRIVATE */ ++png_write_fcTL(png_structp png_ptr, png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op) ++{ ++#ifdef PNG_USE_LOCAL_ARRAYS ++ PNG_fcTL; ++#endif ++ png_byte data[26]; ++ ++ png_debug(1, "in png_write_fcTL\n"); ++ ++ if (png_ptr->num_frames_written == 0 && (x_offset != 0 || y_offset != 0)) ++ png_error(png_ptr, "x and/or y offset for the first frame aren't 0\n"); ++ if (png_ptr->num_frames_written == 0 && ++ (width != png_ptr->first_frame_width || ++ height != png_ptr->first_frame_height)) ++ png_error(png_ptr, "width and/or height in the first frame's fcTL " ++ "don't match the ones in IHDR\n"); ++ ++ /* more error checking */ ++ png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, ++ delay_num, delay_den, dispose_op, blend_op); ++ ++ png_save_uint_32(data, png_ptr->next_seq_num); ++ png_save_uint_32(data + 4, width); ++ png_save_uint_32(data + 8, height); ++ png_save_uint_32(data + 12, x_offset); ++ png_save_uint_32(data + 16, y_offset); ++ png_save_uint_16(data + 20, delay_num); ++ png_save_uint_16(data + 22, delay_den); ++ data[24] = dispose_op; ++ data[25] = blend_op; ++ ++ png_write_chunk(png_ptr, (png_bytep)png_fcTL, data, (png_size_t)26); ++ ++ png_ptr->next_seq_num++; ++} ++#endif /* PNG_WRITE_APNG_SUPPORTED */ ++ + /* initializes the row writing capability of libpng */ + void /* PRIVATE */ + png_write_start_row(png_structp png_ptr) +@@ -2789,4 +2882,39 @@ + } + #endif + } ++ ++#if defined(PNG_WRITE_APNG_SUPPORTED) ++void /* PRIVATE */ ++png_write_reset(png_structp png_ptr) ++{ ++ png_ptr->row_number = 0; ++ png_ptr->pass = 0; ++ png_ptr->mode &= ~PNG_HAVE_IDAT; ++} ++ ++void /* PRIVATE */ ++png_write_reinit(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 width, png_uint_32 height) ++{ ++ if (png_ptr->num_frames_written == 0 && ++ (width != png_ptr->first_frame_width || ++ height != png_ptr->first_frame_height)) ++ png_error(png_ptr, "width and/or height in the first frame's fcTL " ++ "don't match the ones in IHDR\n"); ++ if (width > png_ptr->first_frame_width || ++ height > png_ptr->first_frame_height) ++ png_error(png_ptr, "width and/or height for a frame greater than" ++ "the ones in IHDR"); ++ ++ png_set_IHDR(png_ptr, info_ptr, width, height, ++ info_ptr->bit_depth, info_ptr->color_type, ++ info_ptr->interlace_type, info_ptr->compression_type, ++ info_ptr->filter_type); ++ ++ png_ptr->width = width; ++ png_ptr->height = height; ++ png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width); ++ png_ptr->usr_width = png_ptr->width; ++} ++#endif + #endif /* PNG_WRITE_SUPPORTED */ +Index: pngrtran.c +=================================================================== +--- pngrtran.c (révision 138) ++++ pngrtran.c (révision 140) +@@ -1278,7 +1278,7 @@ + * or png_read_update_info() after setting transforms that expand + * pixels. This check added to libpng-1.2.19 */ + #if (PNG_WARN_UNINITIALIZED_ROW==1) +- png_error(png_ptr, "Uninitialized row"); ++ png_warning(png_ptr, "Uninitialized row"); + #else + png_warning(png_ptr, "Uninitialized row"); + #endif diff --git a/graphics/djvulibre/DETAILS b/graphics/djvulibre/DETAILS index c1e02ee34a..e6ef569fca 100755 --- a/graphics/djvulibre/DETAILS +++ b/graphics/djvulibre/DETAILS @@ -1,9 +1,9 @@ SPELL=djvulibre - VERSION=3.5.19 + VERSION=3.5.20 + SOURCE_HASH=sha512:e6266a16c91c8b705191b1189c2660a02d78639c4060e0f587be5588e050e5890afaf184530b081a25581f5e32f8f9a2b097088fe7bebf3ba9ba4e900bd7b32e SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/djvu/$SOURCE - SOURCE_HASH=sha512:2aed55fa6916f18279ff8bb1ff2236bf6e99932e15e196488f9f470e5b0d0e8d0653b41fec49897dae469b0e906f6d9834f842a5f90a14239a33e5d68c191dbe WEB_SITE=http://djvu.sourceforge.net/ ENTERED=20030125 LICENSE[0]=GPL diff --git a/graphics/djvulibre/HISTORY b/graphics/djvulibre/HISTORY index 84f47141d7..018fb96080 100644 --- a/graphics/djvulibre/HISTORY +++ b/graphics/djvulibre/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: updated to 3.5.20 + 2007-03-27 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: updated to 3.5.19 diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS index cf4a074797..8c8e1530bf 100755 --- a/graphics/imagemagick/DETAILS +++ b/graphics/imagemagick/DETAILS @@ -1,9 +1,12 @@ SPELL=imagemagick - VERSION=6.3.7-1 + VERSION=6.3.7-2 SECURITY_PATCH=1 SOURCE=ImageMagick-${VERSION}.tar.bz2 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION/-*/} SOURCE_URL[0]=ftp://ftp.imagemagick.org/pub/ImageMagick/$SOURCE + SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE + SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE + SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME" WEB_SITE=http://www.imagemagick.org/ ENTERED=20010922 diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY index c2b2f92dd2..ceb9789757 100644 --- a/graphics/imagemagick/HISTORY +++ b/graphics/imagemagick/HISTORY @@ -1,3 +1,9 @@ +2007-12-01 Remko van der Vossen <wich@sourcemage.org> + * DETAILS: Added 3 mirrors (which also have older releases available) + +2007-11-30 George Sherwood <george@beernabeer.com> + * DETAILS: Updated to version 6.3.7-2 + 2007-11-25 George Sherwood <george@beernabeer.com> * DETAILS: Updated to version 6.3.7-1 diff --git a/graphics/imagemagick/ImageMagick-6.3.7-1.tar.bz2.sig b/graphics/imagemagick/ImageMagick-6.3.7-1.tar.bz2.sig Binary files differdeleted file mode 100644 index beed06cd8e..0000000000 --- a/graphics/imagemagick/ImageMagick-6.3.7-1.tar.bz2.sig +++ /dev/null diff --git a/graphics/imagemagick/ImageMagick-6.3.7-2.tar.bz2.sig b/graphics/imagemagick/ImageMagick-6.3.7-2.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..bc5404f94a --- /dev/null +++ b/graphics/imagemagick/ImageMagick-6.3.7-2.tar.bz2.sig diff --git a/http/apache/DETAILS b/http/apache/DETAILS index 3db6e7fbc7..75636ec1f8 100755 --- a/http/apache/DETAILS +++ b/http/apache/DETAILS @@ -1,15 +1,19 @@ SPELL=apache VERSION=1.3.39 - SOURCE_HASH=sha512:fdffb3ed167d7beae0162f341c36cbb5f0a9be63c898442534b217e0ce7c5f87dffe6a9223873fc336848261ea3424a7e692c3de1b4a4cf9ae43e9f75d8827d9 SECURITY_PATCH=2 SOURCE=${SPELL}_$VERSION.tar.gz + SOURCE2=$SOURCE.asc + SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY" SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE - WEB_SITE=http://httpd.apache.org/ - ENTERED=20010922 + SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2 + SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2 + SOURCE2_IGNORE=signature LICENSE[0]=APACHE + WEB_SITE=http://httpd.apache.org/ KEYWORDS="http" + ENTERED=20010922 SHORT="Apache HTTP Server" cat << EOF Apache is the world's most popular HTTP server, being quite possibly diff --git a/http/apache/HISTORY b/http/apache/HISTORY index 0415b58490..0723ff0fed 100644 --- a/http/apache/HISTORY +++ b/http/apache/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Use upstream apache.gpg + 2007-09-10 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.3.39, SECURITY_PATCH=2, updated SOURCE_URLs CVE-2006-5752, CVE-2007-3304 @@ -104,7 +107,7 @@ should be applied on your box. 2002-04-08 Eric Schabell <eric@schabell.com> - * DETAILS: Reverted back to 1.3.24 due to bugs/complications with php spell and + * DETAILS: Reverted back to 1.3.24 due to bugs/complications with php spell and other user problems. 2002-04-07 Eric Schabell <eric@schabell.com> @@ -119,13 +122,13 @@ 2002-03-25 Eric Schabell <eric@schabell.com> * DETAILS: Updated version to 1.3.24: - The Apache Group is pleased to announce the release + The Apache Group is pleased to announce the release of the 1.3.24 version of the Apache HTTP server. - Apache 1.3.24 is principally a security and bug fix - release. Of particular note is that 1.3.24 addresses - and fixes the issues noted in CAN-2002-0061 (mitre.org) - regarding escaping of command line args on Win32. - Apache 1.3.24 is the best version of Apache currently + Apache 1.3.24 is principally a security and bug fix + release. Of particular note is that 1.3.24 addresses + and fixes the issues noted in CAN-2002-0061 (mitre.org) + regarding escaping of command line args on Win32. + Apache 1.3.24 is the best version of Apache currently available. 2002-03-13 Eric Schabell <eric@schabell.com> diff --git a/http/apache2/DETAILS b/http/apache2/DETAILS index f658e6aae2..5561be2671 100755 --- a/http/apache2/DETAILS +++ b/http/apache2/DETAILS @@ -1,10 +1,14 @@ SPELL=apache2 VERSION=2.0.61 SOURCE=httpd-$VERSION.tar.gz - SOURCE_GPG="httpd.gpg:${SOURCE}.asc:UPSTREAM_KEY" + SOURCE2=$SOURCE.asc + SOURCE_GPG="apache.gpg:${SOURCE}.asc:UPSTREAM_KEY" SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE + SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2 + SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2 + SOURCE2_IGNORE=signature SECURITY_PATCH=2 PATCHLEVEL=0 LICENSE[0]=APACHE @@ -13,18 +17,18 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION ENTERED=20020422 SHORT="Apache 2 HTTP server" cat << EOF -The Apache Group is proud to announce the release the first GA release of -Apache 2.0. Apache 2.0 has been running on the Apache.org website since +The Apache Group is proud to announce the release the first GA release of +Apache 2.0. Apache 2.0 has been running on the Apache.org website since December of 2000 and has proven to be very reliable. -Apache 2.0 offers numerous enhancements, improvements and performance -boosts over the 1.3 codebase. The most visible and noteworthy addition -is the ability to run Apache in a hybrid thread/process mode on any -platform that supports both threads and processes. This has shown to -improve the scalability of the Apache HTTP Server significantly in our -testing. Apache 2.0 also includes support for filtered I/O. This allows -modules to modify the output of other modules before it is sent to the -client. We have also included support for IPv6 on any platform that +Apache 2.0 offers numerous enhancements, improvements and performance +boosts over the 1.3 codebase. The most visible and noteworthy addition +is the ability to run Apache in a hybrid thread/process mode on any +platform that supports both threads and processes. This has shown to +improve the scalability of the Apache HTTP Server significantly in our +testing. Apache 2.0 also includes support for filtered I/O. This allows +modules to modify the output of other modules before it is sent to the +client. We have also included support for IPv6 on any platform that supports IPv6. Apache is the world's most popular HTTP server, being quite possibly diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY index 6abdb039e8..4ff4933554 100644 --- a/http/apache2/HISTORY +++ b/http/apache2/HISTORY @@ -1,3 +1,9 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Use upstream apache.gpg + Cleaned up extra spaces in long description + * buildconf.patch: Re-apply patch (finish Bug #13989) + * PRE_BUILD: Apply buildconf.patch again (Bug #13989) + 2007-09-10 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.0.61, SECURITY_PATCH=2 CVE-2007-3847, CVE-2007-1863, CVE-2006-5752, CVE-2007-3304 diff --git a/http/apache2/PRE_BUILD b/http/apache2/PRE_BUILD new file mode 100755 index 0000000000..b69b7feade --- /dev/null +++ b/http/apache2/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -p1 < $SCRIPT_DIRECTORY/buildconf.patch diff --git a/http/apache2/buildconf.patch b/http/apache2/buildconf.patch new file mode 100644 index 0000000000..427a438187 --- /dev/null +++ b/http/apache2/buildconf.patch @@ -0,0 +1,12 @@ +diff -urN httpd-2.0.58/buildconf httpd/buildconf +--- httpd-2.0.58/buildconf 2006-04-24 13:12:21.000000000 -0400 ++++ httpd/buildconf 2006-05-15 22:28:32.000000000 -0400 +@@ -67,7 +67,7 @@ + should_exit=1 + fi + +-if [ ! -f "$apu_src_dir/Makefile.in" ]; then ++if [ ! -f "$apu_src_dir/build/apu-conf.m4" ]; then + echo "" + echo "You don't have a copy of the apr-util source in $apu_src_dir. " + echo "Please get one the source using the following instructions, " diff --git a/http/apache2/httpd-2.0.61.tar.gz.asc b/http/apache2/httpd-2.0.61.tar.gz.asc deleted file mode 100644 index b51c8002dd..0000000000 --- a/http/apache2/httpd-2.0.61.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.7 (Darwin) - -iD8DBQBG3bjkizpgHwjJdeURAnqeAJ0dZrvd6Iu2q1kNoZ7B+mRdF6izYQCeM1Li -Yqkmoz1yEtTEdzst6S+Zf0s= -=sysN ------END PGP SIGNATURE----- diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS index 41591a40f5..a906885f6c 100755 --- a/http/apache22/DETAILS +++ b/http/apache22/DETAILS @@ -2,14 +2,18 @@ VERSION=2.2.6 SECURITY_PATCH=2 SOURCE=httpd-$VERSION.tar.gz - SOURCE_HASH=sha512:5d7d54785c2c25649a55c61f9fccd52f7607f15fce595c48d0dd13110df4e91ad6c3cdce111bb40a1770b39fbccae98521f3ac647ea1d35d5fa0f8064b8d5293 + SOURCE2=$SOURCE.asc + SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY" SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE - WEB_SITE=http://www.apache.org/ - ENTERED=20020422 + SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2 + SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2 + SOURCE2_IGNORE=signature LICENSE[0]=APACHE + WEB_SITE=http://www.apache.org/ KEYWORDS="http httpd webserver apache" + ENTERED=20020422 SHORT="Apache 2 HTTP server" cat << EOF Apache 2.2 offers numerous enhancements, improvements and performance diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY index 44f2c65e85..ccf70b4eaa 100644 --- a/http/apache22/HISTORY +++ b/http/apache22/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Use upstream apache.gpg key and signatures + 2007-09-09 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.2.6, SECURITY_PATCH=2 CVE-2007-3847, CVE-2007-1863, CVE-2007-3304, CVE-2006-5752, diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS index 1201bb2e05..8688555b7d 100755 --- a/http/firefox/DETAILS +++ b/http/firefox/DETAILS @@ -5,7 +5,7 @@ if [ "$FIREFOX_CVS" == "y" ]; then SOURCE_URL[0]=cvs://:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk SOURCE_IGNORE=volatile else - VERSION=2.0.0.9 + VERSION=2.0.0.11 SOURCE=$SPELL-$VERSION-source.tar.bz2 SOURCE2=${SOURCE}.asc SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY" @@ -15,7 +15,7 @@ else SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE SOURCE2_URL[0]=${SOURCE_URL}.asc - SECURITY_PATCH=12 + SECURITY_PATCH=14 fi SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla WEB_SITE=http://www.mozilla.org/projects/firefox/ diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY index 84ef4b1931..08c5d51c00 100644 --- a/http/firefox/HISTORY +++ b/http/firefox/HISTORY @@ -1,3 +1,14 @@ +2007-12-01 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: SECURITY_PATCH++ + updated spell to 2.0.0.11 + +2007-11-27 George Sherwood <george@beernabeer.com> + * DETAILS: Updated to versoin 2.0.0.10. SECURITY_PATCH++ + http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.10 + * firefox-config.patch: Updated to 2.0.0.10 + * PRE_BUILD: Removed patch + * gdkpango.patch: Removed. Incorporated upstream. + 2007-11-09 David Brown <dmlb2000@gmail.com> * PRE_BUILD: added new patch * gdkpango.patch: added to fix bug #14088 diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD index 3914db6649..d523658d50 100755 --- a/http/firefox/PRE_BUILD +++ b/http/firefox/PRE_BUILD @@ -28,8 +28,7 @@ else default_pre_build && cd $SOURCE_DIRECTORY && patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch && - patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch && - patch -p0 < $SCRIPT_DIRECTORY/gdkpango.patch + patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch fi && cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig && diff --git a/http/firefox/firefox-config.patch b/http/firefox/firefox-config.patch index b633d12e39..0c6929c223 100644 --- a/http/firefox/firefox-config.patch +++ b/http/firefox/firefox-config.patch @@ -14,8 +14,8 @@ exit 0 ;; --cflags) -- if test "/usr/local/include/firefox-2.0.0.9" != /usr/include ; then -- includes="-I/usr/local/include/firefox-2.0.0.9" +- if test "/usr/local/include/firefox-2.0.0.11" != /usr/include ; then +- includes="-I/usr/local/include/firefox-2.0.0.11" + if test "/usr/include/firefox" != /usr/include ; then + includes="-I/usr/include/firefox" fi @@ -25,14 +25,14 @@ if test "$echo_cflags" = "yes"; then nspr_cflags="-I/usr/include/nspr" for n in $echo_components; do -- component_includes="$component_includes -I/usr/local/include/firefox-2.0.0.9/$n" +- component_includes="$component_includes -I/usr/local/include/firefox-2.0.0.11/$n" + component_includes="$component_includes -I/usr/include/firefox/$n" done echo $component_includes $includes $nspr_cflags fi if test "$echo_idlflags" = "yes"; then -- echo "-I/usr/local/share/idl/firefox-2.0.0.9" +- echo "-I/usr/local/share/idl/firefox-2.0.0.11" + echo "-I/usr/share/idl/firefox" fi @@ -41,6 +41,6 @@ ;; esac done -- echo -L/usr/local/lib/firefox-2.0.0.9 $libs +- echo -L/usr/local/lib/firefox-2.0.0.11 $libs + echo -L/usr/lib $libs fi diff --git a/http/firefox/gdkpango.patch b/http/firefox/gdkpango.patch deleted file mode 100644 index cdad16225e..0000000000 --- a/http/firefox/gdkpango.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- config/system-headers.orig 2007-10-19 21:38:00.000000000 +0200 -+++ config/system-headers 2007-10-19 21:38:41.000000000 +0200 -@@ -208,6 +208,7 @@ - gdk/gdkevents.h - gdk/gdk.h - gdk/gdkkeysyms.h -+gdk/gdkpango.h - gdk/gdkprivate.h - gdk/gdkregion.h - gdk/gdkwindow.h diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS index e9892f2439..6b040d4b63 100755 --- a/http/seamonkey/DETAILS +++ b/http/seamonkey/DETAILS @@ -1,12 +1,12 @@ SPELL=seamonkey - VERSION=1.1.6 + VERSION=1.1.7 SOURCE=$SPELL-$VERSION.source.tar.bz2 - SOURCE_HASH=sha512:7222e50b3d69969634bd39cca4b0f7b581f5f026e802b78c747b4d85e33e913889b58f5492ea5db81436baf06303b2389bbb345c79526291bdbd35783b0e41d4:UPSTREAM_HASH + SOURCE_HASH=sha512:5abbcfb0ee20d17221f4951884cc4b6cf2049b5218daf8e99b888d05748ab7102b90e9683d1c79756caffc145eeab037f1a3540e3678c644515d15837957137f:UPSTREAM_HASH SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla SOURCE_URI=seamonkey/releases/$VERSION/$SOURCE SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI WEB_SITE=http://www.mozilla.org/ - SECURITY_PATCH=8 + SECURITY_PATCH=9 ENTERED=20010922 LICENSE[0]=MPL DOCS="LICENSE README.txt" diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY index b5e498cb53..9892a456d4 100644 --- a/http/seamonkey/HISTORY +++ b/http/seamonkey/HISTORY @@ -1,3 +1,7 @@ +2007-12-01 George Sherwood <george@beernabeer.com> + * DETAILS: Updated to version 1.1.7. SECURITY_PATCH++ + http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonkey + 2007-11-06 George Sherwood <george@beernabeer.com> * DETAILS: Updated to version 1.1.6. Removed broken SOURCE_URLS. diff --git a/http/squid/DETAILS b/http/squid/DETAILS index 4342f93d4b..6735c2bf86 100755 --- a/http/squid/DETAILS +++ b/http/squid/DETAILS @@ -1,12 +1,12 @@ SPELL=squid - VERSION=2.6.STABLE16 + VERSION=2.6.STABLE17 SOURCE=$SPELL-$VERSION.tar.bz2 # SOURCE2=$SOURCE.asc SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE # SOURCE2_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE2 # SOURCE_GPG=squid.gpg:$SOURCE2 - SOURCE_HASH=sha512:ba20d5f421ade72e49cded54cc868331c8c9d492fb27d649db6e008ea0340a2f9ae853cf6c46cdebcbcfe34b81a1e3623b3c98a456114ca156dfc7074ac52724 + SOURCE_HASH=sha512:1291c0c83d6063ced1fc399c3de2e2cf0a4dc4095d32bfe4804b8c34e6ada872596351bc1c8c8dd329172be5d8189ee3872fb84f20d5b961aa46c9491f7705ea WEB_SITE=http://www.squid-cache.org/ ENTERED=20011214 SECURITY_PATCH=1 diff --git a/http/squid/HISTORY b/http/squid/HISTORY index c4dfc0d558..2f84e55637 100644 --- a/http/squid/HISTORY +++ b/http/squid/HISTORY @@ -1,3 +1,6 @@ +2007-11-28 George Sherwood <george@beernabeer.com> + * DETAILS: Updated to version 2.6.STABLE17 + 2007-10-10 Martin Spitzbarth <m.spitzbarth@gmx.de> * BUILD: fixed the install path of the manpages * BUILD, INSTALL: INSTALL_ROOT ified the spell diff --git a/kde-apps/digikam/DETAILS b/kde-apps/digikam/DETAILS index dd026e6434..c926fcd7b7 100755 --- a/kde-apps/digikam/DETAILS +++ b/kde-apps/digikam/DETAILS @@ -1,7 +1,7 @@ SPELL=digikam if [[ "$DG_VER" == "y" ]];then - VERSION=0.9.3-beta2 - SOURCE_HASH=sha512:768caf0e63c9b5c1b0f6487cf74fe350986d78261d775c06e2050cd2075dc288aebc11804c021ae25e3ca51aebc84d52a06d44fcb75db667b17f9ee3019c0bad + VERSION=0.9.3-beta3 + SOURCE_HASH=sha512:a5ec1fa8c352cc39bd359b47759bc9c8626aefb9870d9ec579cbfb2309f974cf4ab29544841015d74dcb4bca21354f63b7c8b19b5b4a8dea0fc7ecd9fb1a1554 else VERSION=0.9.2-final SOURCE_HASH=sha512:030768d08d564c4a7322ff67e151ba0067499c54629cf6ba133736b7ee4e5e7c4a893ae21eec30a06d18d1736d983a752af66c877f032ef77cca4c6c8e7872f1 diff --git a/kde-apps/digikam/HISTORY b/kde-apps/digikam/HISTORY index a597b84980..a00d4e40c3 100644 --- a/kde-apps/digikam/HISTORY +++ b/kde-apps/digikam/HISTORY @@ -1,3 +1,6 @@ +2007-11-28 Treeve Jelbert <treevesourcemage.org> + * DETAILS: version 0.9.3-beta3 (devel) + 2007-11-01 Treeve Jelbert <treevesourcemage.org> * DETAILS: version 0.9.3-beta2 (devel) diff --git a/kde4/kde4-l10n/DETAILS b/kde4/kde4-l10n/DETAILS index 233aa6bcfc..c7348fe081 100755 --- a/kde4/kde4-l10n/DETAILS +++ b/kde4/kde4-l10n/DETAILS @@ -1,7 +1,7 @@ # the remaining details of this spell are provided by CONFIGURE SPELL=kde4-l10n SPELLX=kde-l10n - VERSION=3.95.2 + VERSION=3.96.1 SITE=$KDE_URL/unstable/${VERSION//.0/}/src/$SPELLX SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX source $SPELL_CONFIG diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY index 6e876ee70e..1d11b116aa 100644 --- a/kde4/kde4-l10n/HISTORY +++ b/kde4/kde4-l10n/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kde4-profile/DETAILS b/kde4/kde4-profile/DETAILS index e0316fcdf6..84bb9440c2 100755 --- a/kde4/kde4-profile/DETAILS +++ b/kde4/kde4-profile/DETAILS @@ -1,5 +1,5 @@ SPELL=kde4-profile - VERSION=3.95.2 + VERSION=3.96.1 WEB_SITE=http://www.kde.org/ ENTERED=20070307 KEYWORDS="kde" diff --git a/kde4/kde4-profile/HISTORY b/kde4/kde4-profile/HISTORY index 71936bdc64..f525d81e46 100644 --- a/kde4/kde4-profile/HISTORY +++ b/kde4/kde4-profile/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdeaccessibility4/DETAILS b/kde4/kdeaccessibility4/DETAILS index 67948dc223..3aa567f56e 100755 --- a/kde4/kdeaccessibility4/DETAILS +++ b/kde4/kdeaccessibility4/DETAILS @@ -1,6 +1,6 @@ SPELL=kdeaccessibility4 - VERSION=3.95.2 - SOURCE_HASH=sha512:3d80ef732887abe6104210275c0697de3a64c1af5e16d416f9453ea30aa2461787fc7e070d084f17bafea43be711c03ac4b3443c53fee2f4bdd0de7945c3fdee + VERSION=3.96.1 + SOURCE_HASH=sha512:2955cd6c229622424dbab7308027bd6102ff3fc6545c9c2ef28441fe96c50305815d0e07d6a7d68c7bb9254df2f1247f0da967593c8614f597ba7b2f6d9b5217 SOURCE=${SPELL//4}-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0/}/src/$SOURCE diff --git a/kde4/kdeaccessibility4/HISTORY b/kde4/kdeaccessibility4/HISTORY index 5cde0170c6..932e694a5a 100644 --- a/kde4/kdeaccessibility4/HISTORY +++ b/kde4/kdeaccessibility4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdeadmin4/DETAILS b/kde4/kdeadmin4/DETAILS index 2d8071f715..353c68807d 100755 --- a/kde4/kdeadmin4/DETAILS +++ b/kde4/kdeadmin4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdeadmin4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:2b1e2196d2ccfcdf0b527ccf8d526437c5cea18c0cdd4c00b7a76b8e73af5ec4393d9e287965d73b0c5ad28773db700b6ebcb8795a3fd6d194e60f957459557b + VERSION=3.96.1 + SOURCE_HASH=sha512:64427847a8fde6286cc5ce9b2db3e5639502f5d6eca8517b43347583743dacb6573821bf06e71df1b395a1c256956c4dcec7d8f6468da0521d51bc24e912aeca SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdeadmin4/HISTORY b/kde4/kdeadmin4/HISTORY index 5e5c8de8c6..ad6a3c81b0 100644 --- a/kde4/kdeadmin4/HISTORY +++ b/kde4/kdeadmin4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdebase-workspace4/DETAILS b/kde4/kdebase-workspace4/DETAILS index f291fc93ea..97bff9d050 100755 --- a/kde4/kdebase-workspace4/DETAILS +++ b/kde4/kdebase-workspace4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdebase-workspace4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:9c061494a55d250c06b6ccfb930914d855927a29838f2eefcac01c7a8bec0d37a13cf0333323fe68ca3a9fde10db66c2b1dcbcc2c0071b321dd94c92f44e9567 + VERSION=3.96.1 + SOURCE_HASH=sha512:b3685a6ab6e4331f8126d3f49dfa24c8b9384900e05a8664ef06b43f993ad767050e5c0490997e8c2a0a71dd7c32c4634251faf9e108f019cb661598d63cc373 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY index 35ab91b073..2b6997f410 100644 --- a/kde4/kdebase-workspace4/HISTORY +++ b/kde4/kdebase-workspace4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdebase4-runtime/DETAILS b/kde4/kdebase4-runtime/DETAILS index 2442cfafe2..96b2bbfcae 100755 --- a/kde4/kdebase4-runtime/DETAILS +++ b/kde4/kdebase4-runtime/DETAILS @@ -1,7 +1,7 @@ SPELL=kdebase4-runtime SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:2acc80f7aa62a20f2bab7fa1821791c44ff36a1d56f07ea924e6b12d652c73519d3bb322ef3e29b878b3f422163be96ae587aa5db3c82019621ca8faa64823e1 + VERSION=3.96.1 + SOURCE_HASH=sha512:3cd4bf28f23ee876a2d6a2eafec4af083c8c857d33b2eae5c634db8e487b31b26fdacdb2c5a12d4998088a1e4bce4ad5da325a6be2218158d1e179164af90e0e SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY index ee43def207..70f72efdd0 100644 --- a/kde4/kdebase4-runtime/HISTORY +++ b/kde4/kdebase4-runtime/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdebase4/DETAILS b/kde4/kdebase4/DETAILS index 7ad38ff94d..55875f52a4 100755 --- a/kde4/kdebase4/DETAILS +++ b/kde4/kdebase4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdebase4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:1db529bd5fd3d3ab40e8863d3001c1c84c8fbe49c46bda9e8f5cf9fb2530f585b41bc39e363db1e31421341f7e61fd47026fecdb591af05942074c2438f8c0d7 + VERSION=3.96.1 + SOURCE_HASH=sha512:4d2974d462a9c9ebbe5b4c02b65812ab542b3799344e900453c0e67de172d7ca9881c413787f0fef1bc73d961e54897b78980580bfad3ad2f2832398dc887d8f SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY index 3f3f1c016d..9c5f7e4444 100644 --- a/kde4/kdebase4/HISTORY +++ b/kde4/kdebase4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdebindings4/DETAILS b/kde4/kdebindings4/DETAILS index d33a239a6f..a60e8e61b4 100755 --- a/kde4/kdebindings4/DETAILS +++ b/kde4/kdebindings4/DETAILS @@ -1,6 +1,6 @@ SPELL=kdebindings4 - VERSION=3.95.2 - SOURCE_HASH=sha512:d2300457d35df6c8cfbda52c69649b4d4f76c36df0c57161f569e468347c609594fdbefb494c2611a80321a29787a827bc87e7ae1cc926ec7798c7583bd57f45 + VERSION=3.96.1 + SOURCE_HASH=sha512:4f0d1d013142cfad4820d566d26c07f6bec4672491ea65a857356b7cf32b4711f302cb9be0c6f59bc6ec36e4389286cd01940d2f89c477687dfd799063c7827f SOURCE=${SPELL//4}-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY index 5f21bda262..ab70281984 100644 --- a/kde4/kdebindings4/HISTORY +++ b/kde4/kdebindings4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdeedu4/DETAILS b/kde4/kdeedu4/DETAILS index bcffb9d006..ab2a34c003 100755 --- a/kde4/kdeedu4/DETAILS +++ b/kde4/kdeedu4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdeedu4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:797a7fcc41af38a1f82e8751862c3eb1c165681097fa3e803edef98eee90b2355394eb81dbe9ee0b8f07bb1bb65209f9ce7b240e5a531cc1e34f7eea8ddca8c1 + VERSION=3.96.1 + SOURCE_HASH=sha512:71a37a58bb2f24039bf3622bad8f796364e3529af9dda727219496c73c3d8db7adee376127b95c71e96c6e114b95ba6685d2b58bac72bd62978b514fcdebca51 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdeedu4/HISTORY b/kde4/kdeedu4/HISTORY index ac71fc122a..a62329ca96 100644 --- a/kde4/kdeedu4/HISTORY +++ b/kde4/kdeedu4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdegames4/DETAILS b/kde4/kdegames4/DETAILS index d0eb174eb8..650fd1fcae 100755 --- a/kde4/kdegames4/DETAILS +++ b/kde4/kdegames4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdegames4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:0f15dc2f8f85700f3e31d865984ab77816ebc3670066fa5f3a293a69534c77db586a95f8091e22f4e3fee81449a0dc613b474073f43a65d38309a5ba4085e123 + VERSION=3.96.1 + SOURCE_HASH=sha512:ecd7ef18f73f9a2f128ae21088656473a7132a602756b370544058a97925fc749b1bf9fc926ec95443b07d83ed58032b408aa276b7f482e023179c698db72fab SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY index 4978030abe..bcc2ccea87 100644 --- a/kde4/kdegames4/HISTORY +++ b/kde4/kdegames4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdegraphics4/DETAILS b/kde4/kdegraphics4/DETAILS index b627abecce..c7eaceb2be 100755 --- a/kde4/kdegraphics4/DETAILS +++ b/kde4/kdegraphics4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdegraphics4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:f589e154dbeac2fb5544d048cc2540700c519c13a440ca74d4cfe0860e534bb3345853f15a174bf1399952fcfaf78e0df125fc7b7bac713cc69817be164ce692 + VERSION=3.96.1 + SOURCE_HASH=sha512:9e226d3af5a9904e1e4c4b9c7768561e59a20829d7784ddb9b36d62cb44fb0def5184789da82aca67afb7aabe74a88688825193de16173b44725244bd5b598c9 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY index 6d23ded9ff..f84307f02b 100644 --- a/kde4/kdegraphics4/HISTORY +++ b/kde4/kdegraphics4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdelibs4/DETAILS b/kde4/kdelibs4/DETAILS index bd553c78b5..8729556937 100755 --- a/kde4/kdelibs4/DETAILS +++ b/kde4/kdelibs4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdelibs4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:ab92ed73b87aa8933870d5513d77436063e19b0e7173309c3a1f8074d5502a5dad4492f2336806be2f9063ac1980e0849d45de8930552fed9869ab8eeed03c9b + VERSION=3.96.1 + SOURCE_HASH=sha512:c70c6a4fba3461715df3211035f7218aa947805f0d1e5284be5d3112d57cd6a7d5c42e7c65abf977e59d5aa7db9100b34ca51e2e3ace6aabedd1146928f44661 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY index 4acf6d1596..8a46296d50 100644 --- a/kde4/kdelibs4/HISTORY +++ b/kde4/kdelibs4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdemultimedia4/DETAILS b/kde4/kdemultimedia4/DETAILS index cd1d5d4953..de69f5be32 100755 --- a/kde4/kdemultimedia4/DETAILS +++ b/kde4/kdemultimedia4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdemultimedia4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:92a50a3db74210e36988ed85a1d7e7a9659326131f86bed59068a9b6cbbdb83ef18cf38530146e3eaba44ac53d17551785e0f9d7d98ffac94a7fa6733bb78273 + VERSION=3.96.1 + SOURCE_HASH=sha512:25179f30bf05070335d345b9a340e60826733f8feee78388feb9eeb51326ddf728c271e309487c2f48c3ce1d03133c74df7fe518ad0e5189f4b28dec625fc15a SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY index 1e190a0388..1068f30f08 100644 --- a/kde4/kdemultimedia4/HISTORY +++ b/kde4/kdemultimedia4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdenetwork4/DETAILS b/kde4/kdenetwork4/DETAILS index e05661bbde..5c83179abe 100755 --- a/kde4/kdenetwork4/DETAILS +++ b/kde4/kdenetwork4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdenetwork4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:2f620fa0202641f1ca4a33ca5e199cf05749bc9aae69046b6d1ef46252f0a5eb0b975ce05dba9d38e9a8a171d1e7267fc771af987401716d640375f7f18f48e9 + VERSION=3.96.0 + SOURCE_HASH=sha512:8c28519ecd1dfce6e90be84f6365dc7464373b3dff6b812c988360f6f90dc2eab3a32da6171c1a1d48a03c0bb1f9e685180ff46213832bb66047b761c9855681 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY index c57a363fa9..4b7d04bbcb 100644 --- a/kde4/kdenetwork4/HISTORY +++ b/kde4/kdenetwork4/HISTORY @@ -1,3 +1,6 @@ +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdepim4/DETAILS b/kde4/kdepim4/DETAILS index 8c3beddf42..b25cb5837f 100755 --- a/kde4/kdepim4/DETAILS +++ b/kde4/kdepim4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdepim4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:498f171d1a6bb2578a47fbe34f19797860e5a1eed32ee669fcb64ba5e8bd6728b38c2093946a4543140007f2923a49047f286c0f1d2c0bf8d73bff0745851099 + VERSION=3.96.1 + SOURCE_HASH=sha512:7ef1df969e97bfff2a0fea4e8ba9b56953e7c567cb4e0e71a25a30a5bbbca927a4d7a5e26bf955e97f676e186c8ce0b9a82bcbacd36dce3767132c6fff6b1e24 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY index 5f39fa1161..b467bd04fd 100644 --- a/kde4/kdepim4/HISTORY +++ b/kde4/kdepim4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdepimlibs4/DETAILS b/kde4/kdepimlibs4/DETAILS index d67d89d833..85e43d4a3f 100755 --- a/kde4/kdepimlibs4/DETAILS +++ b/kde4/kdepimlibs4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdepimlibs4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:237dd5401757938bd9263b90bbf8b24b48d7a2313eca4c8e90f9ecfb0eb7e74ea65b901975ceea9181e4215ef6484e49e940561f3e6a97b313aa4e659dbadc5d + VERSION=3.96.1 + SOURCE_HASH=sha512:ca4d8b679bc65365407415f6b671c37f0a9d2eaa58469ebfdc92594712bcb9fb026920b0e2888906a139ddd9a0520f306a458d9e7a2c74f8f0981fde646e93ea SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY index 86c8a61e86..fdc44c3eaa 100644 --- a/kde4/kdepimlibs4/HISTORY +++ b/kde4/kdepimlibs4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdesdk4/DETAILS b/kde4/kdesdk4/DETAILS index 1987d1eab4..6190de6fa4 100755 --- a/kde4/kdesdk4/DETAILS +++ b/kde4/kdesdk4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdesdk4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:1e597da629acd5ba3cc0dc6867c1c488771dd829405cc22b686e40d2ce1cd2f9fc3b447819ae48b27f3d88564b19d2dcbcc0405e6f4503a511af0354899ad9af + VERSION=3.96.1 + SOURCE_HASH=sha512:bc3465077d4591dd286aaa6e31659389b22b466a86645a6636faa92f2c4ba704669ab14f7c19635112f72c1c86983164dd589fb248280b9dee8821f194c0f5b2 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY index fb03261c81..6bb95b75c0 100644 --- a/kde4/kdesdk4/HISTORY +++ b/kde4/kdesdk4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdetoys4/DETAILS b/kde4/kdetoys4/DETAILS index c4d420f298..1a348ab245 100755 --- a/kde4/kdetoys4/DETAILS +++ b/kde4/kdetoys4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdetoys4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:8955dcf9af7e57d7ee88fbbeb514e2910952cae1a352f5ed220be7d3e685192a54330a81aeee4389e77df2f1ac37e7993e2f12ac6fd357416d620fc54f365337 + VERSION=3.96.1 + SOURCE_HASH=sha512:267e8318c782eea05d625deb89fbe0cc4a10b32069da1a5601662dfe8bbcfac6e7e070f4cea18d256bf2395e0b62b860e245cb1d7eb11ce03d0202b23944cbb9 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdetoys4/HISTORY b/kde4/kdetoys4/HISTORY index 8704a54358..9e93f519cc 100644 --- a/kde4/kdetoys4/HISTORY +++ b/kde4/kdetoys4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/kdeutils4/DETAILS b/kde4/kdeutils4/DETAILS index 7b71ed8a5e..45a0ef1776 100755 --- a/kde4/kdeutils4/DETAILS +++ b/kde4/kdeutils4/DETAILS @@ -1,7 +1,7 @@ SPELL=kdeutils4 SPELLX=${SPELL//4} - VERSION=3.95.2 - SOURCE_HASH=sha512:e59b1a3c948b8d33e9dcf873d2d14ac7c837637eecd06a476daef6f897d05aa35ae982e5a0a044c3c02d557237deea872d2b95cbd17eba438d7af31c5f7db55e + VERSION=3.96.1 + SOURCE_HASH=sha512:c43e6c3b2a902d2356da54677090e89adceb90c9ed877bda4e73abef821013bc9c95efffc02f03858808f6b7629843209744359dac19f85528c4ea0c37aeb848 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/kdeutils4/HISTORY b/kde4/kdeutils4/HISTORY index 7373e0bf91..f3dbe5bb35 100644 --- a/kde4/kdeutils4/HISTORY +++ b/kde4/kdeutils4/HISTORY @@ -1,3 +1,9 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.1 + +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kde4/koffice2/DEPENDS b/kde4/koffice2/DEPENDS index e5045a7fca..aefd5f3359 100755 --- a/kde4/koffice2/DEPENDS +++ b/kde4/koffice2/DEPENDS @@ -19,5 +19,5 @@ optional_depends qca2 '' '' 'crypto support' && optional_depends qimageblitz '' '' 'graphics manipulation' && optional_depends glpk '' '' 'painterly mixer plugin'&& optional_depends libart_lgpl '' '' '2D graphics support' && -optional_depends kdepimlibs4 '' '' 'PIM support' -#libwpd '' '' 'WordPerfect import' +optional_depends kdepimlibs4 '' '' 'PIM support' && +optional_depends libwpd '' '' 'WordPerfect import' diff --git a/kde4/koffice2/DETAILS b/kde4/koffice2/DETAILS index 3f4be81363..f135f13382 100755 --- a/kde4/koffice2/DETAILS +++ b/kde4/koffice2/DETAILS @@ -1,10 +1,10 @@ #source $SECTION_DIRECTORY/KDE_DETAILS SPELL=koffice2 - VERSION=1.9.94 - SOURCE_HASH=sha512:75e1f23c90ac21207df1d3484bbc2469087a2406c08e2715d0f21392d5c5820dbc838dc13c3ef0235ca7add0d60dce3c025fe7efdfd6819beea63f93f813d434 + VERSION=1.9.95 + SOURCE_HASH=sha512:3ab0ad790a9fc8a8203643436639af1c5e6cc758212c2b4f905a2b680d8a551f674f677e6ea0960b2b2583bd62a143a6ee48f173790ef80a2538252ffcfc8a3f SOURCE=${SPELL//2}-${VERSION}.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2}-${VERSION} - SOURCE_URL[0]=$KDE_URL/unstable/3.94/src/$SOURCE + SOURCE_URL[0]=$KDE_URL/unstable/koffice-$VERSION/src/$SOURCE WEB_SITE=http://www.koffice.org ENTERED=20070707 LICENSE[0]=GPL diff --git a/kde4/koffice2/HISTORY b/kde4/koffice2/HISTORY index 69c4846d7c..7bffb7af9e 100644 --- a/kde4/koffice2/HISTORY +++ b/kde4/koffice2/HISTORY @@ -1,3 +1,7 @@ +2007-11-28 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.9.95 + * DEPENDS: add libwpd + 2007-10-18 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.9.94 diff --git a/kde4/plasma/DETAILS b/kde4/plasma/DETAILS index a959be75ff..979233d59e 100755 --- a/kde4/plasma/DETAILS +++ b/kde4/plasma/DETAILS @@ -1,7 +1,7 @@ SPELL=plasma SPELLX=extragear-plasma - VERSION=3.95.2 - SOURCE_HASH=sha512:ae8f53bdcf4ef387580c8944c69d19bfcc22da2d68cf9cc96af66d293cbcdff8a357cded57d0c4f330d4c435e98e9b0d5b55b4898034fb59f868c025f02170c1 + VERSION=3.96.0 + SOURCE_HASH=sha512:4cf653c76b20934fcc3a4d6aa42b695009eaf6814a015b3afed2739efed5b4aa3b0ee1bb9e5ff4074259511ea8983dc1e91d88c4c594660330e80bca57329cad SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE diff --git a/kde4/plasma/HISTORY b/kde4/plasma/HISTORY index 720612402d..f042edd996 100644 --- a/kde4/plasma/HISTORY +++ b/kde4/plasma/HISTORY @@ -1,3 +1,6 @@ +2007-11-27 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.96.0 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.95.2 diff --git a/kernels/i2c-tools/BUILD b/kernels/i2c-tools/BUILD new file mode 100755 index 0000000000..8f58e6df93 --- /dev/null +++ b/kernels/i2c-tools/BUILD @@ -0,0 +1 @@ +make diff --git a/kernels/i2c-tools/DETAILS b/kernels/i2c-tools/DETAILS new file mode 100755 index 0000000000..c109124ee2 --- /dev/null +++ b/kernels/i2c-tools/DETAILS @@ -0,0 +1,19 @@ + SPELL=i2c-tools + VERSION=3.0.0 + SOURCE=$SPELL-$VERSION.tar.bz2 + SOURCE2=$SPELL-$VERSION.tar.bz2.sig +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION + SOURCE_URL=http://dl.lm-sensors.org/i2c-tools/releases/$SOURCE + SOURCE2_URL=http://dl.lm-sensors.org/i2c-tools/releases/$SOURCE2 + SOURCE_GPG=lm_sensors.gpg:$SOURCE2 + SOURCE2_IGNORE=signature + WEB_SITE=http://www.lm-sensors.org/wiki/I2CTools + ENTERED=20071127 + KEYWORDS="kernels" + SHORT="I2C tools for Linux" + LICENSE[0]=GPL +cat << EOF +This package contains an heterogeneous set of I2C tools for Linux. These tools +were originally part of the lm-sensors package but were finally split into +their own package for convenience. +EOF diff --git a/kernels/i2c-tools/HISTORY b/kernels/i2c-tools/HISTORY new file mode 100644 index 0000000000..1d2fad7052 --- /dev/null +++ b/kernels/i2c-tools/HISTORY @@ -0,0 +1,3 @@ +2007-11-27 Ladislav Hagara <hgr@vabo.cz> + * DETAILS, HISTORY, BUILD, PRE_BUILD, lm_sensors.gpg: created this spell, version 3.0.0 + diff --git a/kernels/i2c-tools/PRE_BUILD b/kernels/i2c-tools/PRE_BUILD new file mode 100755 index 0000000000..af3ec2eeec --- /dev/null +++ b/kernels/i2c-tools/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && + +sedit "s:/local::" Makefile diff --git a/kernels/i2c-tools/lm_sensors.gpg b/kernels/i2c-tools/lm_sensors.gpg Binary files differnew file mode 100644 index 0000000000..f2d86fcdbb --- /dev/null +++ b/kernels/i2c-tools/lm_sensors.gpg diff --git a/kernels/iwlwifi/BUILD b/kernels/iwlwifi/BUILD index 25cc194407..821695cccb 100755 --- a/kernels/iwlwifi/BUILD +++ b/kernels/iwlwifi/BUILD @@ -1 +1,3 @@ -make KVER=$(get_kernel_version) +make_single && +make KVER=$(get_kernel_version) || make KVER=$(get_kernel_version) && +make_normal diff --git a/kernels/iwlwifi/DEPENDS b/kernels/iwlwifi/DEPENDS index 4c492ea554..27fc5a7281 100755 --- a/kernels/iwlwifi/DEPENDS +++ b/kernels/iwlwifi/DEPENDS @@ -1,8 +1,2 @@ depends IWLWIFI-UCODE '' '' 'z-rejected' && - -source $GRIMOIRE/FUNCTIONS && - -if [[ "$(get_kernel_version|cut -d. -f3)" < "23" ]] -then - depends mac80211 -fi +depends mac80211 diff --git a/kernels/iwlwifi/HISTORY b/kernels/iwlwifi/HISTORY index 57d1ff881e..95a1304f52 100644 --- a/kernels/iwlwifi/HISTORY +++ b/kernels/iwlwifi/HISTORY @@ -1,16 +1,15 @@ +2007-11-27 Eric Sandall <sandalle@sourcemage.org> + * BUILD: Fails the first time if it has to regenerate the Makefile + The error denoting this state is: "Makefile has been modified by + generate_compatible, please run `make' again" + 2007-11-22 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.2.0 -2007-10-20 Eric Sandall <sandalle@sourcemage.org> - * DEPENDS: Only needs mac80211 for 2.6.22 and older - * CONFLICTS: Conflicts with mac80211 for 2.6.23 and newer, since it's - now in the kernel - * PRE_BUILD: Check for CONFIG_FW_LOADER and CONFIG_MAC80211 - 2007-10-09 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: Nope, it just doesn't work often and it happened to be a - fluke that iwlwifi worked again after installing ieee80211. Only - needs mac80211 + fluke that iwlwifi worked again after installing ieee80211. + Only needs mac80211 2007-10-08 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: Also seems to depend on ieee80211 to work properly diff --git a/kernels/mac80211/HISTORY b/kernels/mac80211/HISTORY index a257e8412a..eff3d947d5 100644 --- a/kernels/mac80211/HISTORY +++ b/kernels/mac80211/HISTORY @@ -1,3 +1,6 @@ +2007-11-28 Eric Sandall <sandalle@sourcemage.org> + * INSTALL: Copy new .config to /boot for get_kernel_config to use + 2007-11-22 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 10.0.2 diff --git a/kernels/mac80211/INSTALL b/kernels/mac80211/INSTALL index 0117f3d855..3fe01cd7c8 100755 --- a/kernels/mac80211/INSTALL +++ b/kernels/mac80211/INSTALL @@ -1,2 +1,4 @@ -cd $INSTALL_ROOT/lib/modules/$(get_kernel_version)/build && -make modules_install +cd $INSTALL_ROOT/lib/modules/$(get_kernel_version)/build && +make modules_install && +cp $INSTALL_ROOT/lib/modules/$(get_kernel_version)/source/.config \ + $INSTALL_ROOT/boot/config-$(get_kernel_version) diff --git a/libs/apr-util/DETAILS b/libs/apr-util/DETAILS index 3f71bddf87..21129843f4 100755 --- a/libs/apr-util/DETAILS +++ b/libs/apr-util/DETAILS @@ -3,7 +3,7 @@ if [ -f $DEPENDS_CONFIG/apr.p ]; then fi SPELL=apr-util - VERSION=1.2.8 + VERSION=1.2.12 SOURCE_HASH=sha512:cae7133d5d7d14627edc603515f7aed65719cd225bc81c0608b3653c4765864c4cd3ee2959409a782a3a0010a4268a2f9b19c785b9c1e59cd9d97b48988665a1 REPOS_URI="branches/${VERSION%.*}.x" if [[ "$APR_LATEST" == y ]]; then @@ -11,14 +11,19 @@ if [[ "$APR_LATEST" == y ]]; then SOURCE_IGNORE=volatile SOURCE_HINTS=old_svn_compat SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION +else + SOURCE2=$SPELL-$VERSION.tar.bz2.asc + SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY" + SOURCE2_URL[0]=http://archive.apache.org/dist/apr/$SOURCE2 + SOURCE2_IGNORE=signature fi SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=${SOURCE_URL[0]:-http://archive.apache.org/dist/apr/$SOURCE} - WEB_SITE=http://apr.apache.org/ LICENSE[0]=APACHE - ENTERED=20030302 + WEB_SITE=http://apr.apache.org/ KEYWORDS="libs" + ENTERED=20030302 SHORT='Apache Portable Runtime Utility (APU) Library' cat << EOF Apache Portable Runtime Utility library provides various services diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY index 4e448d186b..4893617923 100644 --- a/libs/apr-util/HISTORY +++ b/libs/apr-util/HISTORY @@ -1,3 +1,7 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Use upstream apache.gpg key and signatures + Updated to 1.2.12 + 2007-03-08 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: add optional sqlite, sqlite2, psotgresql @@ -8,12 +12,12 @@ * DETAILS: version 1.2.8 2006-10-20 Juuso Alasuutari <iuso@sourcemage.org> - * TRIGGERS: Substituted broken conditional with - is_depends_enabled, changed 'on_cast db cast_self' to + * TRIGGERS: Substituted broken conditional with + is_depends_enabled, changed 'on_cast db cast_self' to check_self, added PATCHLEVEL=1, removed UPDATED. 2006-10-06 Juuso Alasuutari <iuso@sourcemage.org> - * INSTALL: Create /usr/share/apache2/build-1/ if necessary, bug + * INSTALL: Create /usr/share/apache2/build-1/ if necessary, bug #13152. 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> diff --git a/libs/apr-util0/DETAILS b/libs/apr-util0/DETAILS index 3969fafec3..51645daf14 100755 --- a/libs/apr-util0/DETAILS +++ b/libs/apr-util0/DETAILS @@ -3,8 +3,7 @@ if [ -f $DEPENDS_CONFIG/apr0.p ]; then fi SPELL=apr-util0 - VERSION=0.9.12 - SOURCE_HASH='sha512:1dcf0e851469fc1e91e2df2690340274aff88837c34311ae205e6594d553f47c9f43adb475fb3e278df662e55e2b2ffebd9b6a745bffb0759faaa8005927291a' + VERSION=0.9.15 REPOS_URI=branches/0.9.x if [[ "$APR_LATEST" == y ]]; then VERSION=${VERSION%\.*}-HEAD @@ -13,13 +12,17 @@ if [[ "$APR_LATEST" == y ]]; then SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION fi SOURCE=apr-util-$VERSION.tar.bz2 + SOURCE2=$SOURCE.asc + SOURCE_GPG="apache.gpg:$SOURCE.asc:UPSTREAM_KEY" SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-util-$VERSION SOURCE_URL[0]=http://archive.apache.org/dist/apr/$SOURCE - WEB_SITE=http://apr.apache.org/ - LICENSE[0]=APACHE - ENTERED=20030302 + SOURCE2_URL[0]=http://archive.apache.org/dist/apr/$SOURCE2 + SOURCE2_IGNORE=signature PATCHLEVEL=1 + LICENSE[0]=APACHE + WEB_SITE=http://apr.apache.org/ KEYWORDS="libs" + ENTERED=20030302 SHORT='Apache Portable Runtime Utility (APU) Library' cat << EOF Apache Portable Runtime Utility library provides various services diff --git a/libs/apr-util0/HISTORY b/libs/apr-util0/HISTORY index e8b6e9149c..2a96f81814 100644 --- a/libs/apr-util0/HISTORY +++ b/libs/apr-util0/HISTORY @@ -1,9 +1,13 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Updated to 0.9.15 + Use upstream apache.gpg key and signatures + 2007-02-22 David Kowis <dkowis@shlrm.org> * DEPENDS: delinting, put source statement in an if 2006-10-20 Juuso Alasuutari <iuso@sourcemage.org> - * TRIGGERS: Substituted broken conditional with - is_depends_enabled, changed 'on_cast db cast_self' to + * TRIGGERS: Substituted broken conditional with + is_depends_enabled, changed 'on_cast db cast_self' to check_self, added PATCHLEVEL=1, removed UPDATED. 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> diff --git a/libs/apr/DETAILS b/libs/apr/DETAILS index e89759f8da..57a31cffcb 100755 --- a/libs/apr/DETAILS +++ b/libs/apr/DETAILS @@ -1,6 +1,5 @@ SPELL=apr - VERSION=1.2.8 - SOURCE_HASH=sha512:a3a1e4bc84055b219c4628a665441caa628d242858bf7505aa37cecf8e998866ca0ce03bff6cd70a7714047a91f035ef0f75cde64b0ee7d2100d30790173235d + VERSION=1.2.12 REPOS_URI="branches/${VERSION%.*}.x" # APR_LATEST replaces APR_CVS; remove APR_CVS in May, 2005 if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then @@ -8,15 +7,20 @@ if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then SOURCE_IGNORE=volatile SOURCE_HINTS=old_svn_compat SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION +else + SOURCE2=$SPELL-$VERSION.tar.bz2.asc + SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY" + SOURCE2_URL[0]=http://archive.apache.org/dist/apr/$SOURCE2 + SOURCE2_IGNORE=signature fi SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=${SOURCE_URL[0]:-http://archive.apache.org/dist/apr/$SOURCE} - WEB_SITE=http://apr.apache.org/ LICENSE[0]=APACHE MAKE_NJOBS=1 - ENTERED=20030302 + WEB_SITE=http://apr.apache.org/ KEYWORDS="libs" + ENTERED=20030302 SHORT='The Apache Portable Runtime (APR) library' cat << EOF The mission of the Apache Portable Runtime (APR) is to provide a free library diff --git a/libs/apr/HISTORY b/libs/apr/HISTORY index 1c29143289..fd40c9de28 100644 --- a/libs/apr/HISTORY +++ b/libs/apr/HISTORY @@ -1,3 +1,7 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Use upstream apache.gpg key and signatures + Updated to 1.2.12 + 2006-12-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.2.8 diff --git a/libs/apr0/DETAILS b/libs/apr0/DETAILS index 09159a1365..c22c623056 100755 --- a/libs/apr0/DETAILS +++ b/libs/apr0/DETAILS @@ -1,6 +1,5 @@ SPELL=apr0 - VERSION=0.9.12 - SOURCE_HASH='sha512:5cd7dab6bc62e8e7c6fe36f36149acc175d6038690abb48471edb0f3865dcfb5e8efa1e462ef3ceee5aa0c39ab3d005fc698c6bf2abeb2cdb364b4327f1bba80' + VERSION=0.9.17 REPOS_URI=branches/0.9.x if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then VERSION=${VERSION%\.*}-HEAD @@ -9,14 +8,17 @@ if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION fi SOURCE=apr-$VERSION.tar.bz2 + SOURCE2=$SOURCE.asc + SOURCE_GPG="apache.gpg:$SOURCE.asc:UPSTREAM_KEY" SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-$VERSION SOURCE_URL[0]=http://www.apache.org/dist/apr/$SOURCE - WEB_SITE=http://apr.apache.org/ + SOURCE2_URL[0]=http://www.apache.org/dist/apr/$SOURCE2 + SOURCE2_IGNORE=signature LICENSE[0]=APACHE MAKE_NJOBS=1 - ENTERED=20030302 - UPDATED=20050122 + WEB_SITE=http://apr.apache.org/ KEYWORDS="libs" + ENTERED=20030302 SHORT='The Apache Portable Runtime (APR) library' cat << EOF The mission of the Apache Portable Runtime (APR) is to provide a free library diff --git a/libs/apr0/HISTORY b/libs/apr0/HISTORY index 542ba09d10..879315f874 100644 --- a/libs/apr0/HISTORY +++ b/libs/apr0/HISTORY @@ -1,3 +1,8 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Updated to 0.9.17 + Use upstream apache.gpg key and signatures + Removed UPDATED + 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * PROVIDES: [automated] Fixed invalid entries. @@ -8,7 +13,7 @@ * DETAILS: upgrade to 0.9.12. 2006-04-27 David Kowis <dkowis@shlrm.org> - * DETAILS: changed source URL to point to our mirror because + * DETAILS: changed source URL to point to our mirror because it's so old apache doesn't even have it 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> diff --git a/libs/nspr/CONFIGURE b/libs/nspr/CONFIGURE new file mode 100755 index 0000000000..f13d1ff18b --- /dev/null +++ b/libs/nspr/CONFIGURE @@ -0,0 +1 @@ +config_query STATIC_ASSERT "Add patch for STATIC_ASSERT?" n diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY index 3c619a74cc..e25c4e18f5 100644 --- a/libs/nspr/HISTORY +++ b/libs/nspr/HISTORY @@ -1,3 +1,10 @@ +2007-12-01 George Sherwood <george@beernabeer.com> + * CONFIGURE: Added to query for optional STATIC_ASSERT + * PRE_BUILD: Added to apply STATIC_ASSERT patch + * assert.patch: Added patch from + http://paketler.pardus.org.tr/2007/source/nspr.html + Needed to use system npsr in firefox 3 + 2007-07-17 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 4.6.7 diff --git a/libs/nspr/PRE_BUILD b/libs/nspr/PRE_BUILD new file mode 100755 index 0000000000..cd761e49d6 --- /dev/null +++ b/libs/nspr/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +if [ "$STATIC_ASSERT" == "y" ]; then +cd $SOURCE_DIRECTORY && +patch -p0 < $SCRIPT_DIRECTORY/assert.patch +fi diff --git a/libs/nspr/assert.patch b/libs/nspr/assert.patch new file mode 100644 index 0000000000..3c7ea4006d --- /dev/null +++ b/libs/nspr/assert.patch @@ -0,0 +1,18 @@ +--- mozilla/nsprpub/pr/include/prlog.h:3.14 Sun Apr 25 15:00:47 2004 ++++ mozilla/nsprpub/pr/include/prlog.h Mon May 28 14:48:26 2007 +@@ -251,6 +251,14 @@ + + #endif /* defined(DEBUG) || defined(FORCE_PR_ASSERT) */ + ++/* ++** Compile-time assert. "condition" must be a constant expression. ++** The macro can be used only in places where an "extern" declaration is ++** allowed. ++*/ ++#define PR_STATIC_ASSERT(condition) \ ++ extern void pr_static_assert(int arg[(condition) ? 1 : -1]) ++ + PR_END_EXTERN_C + + #endif /* prlog_h___ */ + diff --git a/mail/cone/DETAILS b/mail/cone/DETAILS index 2213be9273..77a9a76704 100755 --- a/mail/cone/DETAILS +++ b/mail/cone/DETAILS @@ -1,5 +1,5 @@ SPELL=cone - VERSION=0.69 + VERSION=0.74 SOURCE="$SPELL-$VERSION.tar.bz2" SOURCE_URL[0]=$SOURCEFORGE_URL/courier/$SOURCE SOURCE2=$SOURCE.sig diff --git a/mail/cone/HISTORY b/mail/cone/HISTORY index 8cdf9f5b35..6727a96577 100644 --- a/mail/cone/HISTORY +++ b/mail/cone/HISTORY @@ -1,2 +1,5 @@ +2007-11-29 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: updated to 0.74 + 2006-11-28 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell diff --git a/mail/nmh/DETAILS b/mail/nmh/DETAILS index 95c4bf7df8..32ce5f1e54 100755 --- a/mail/nmh/DETAILS +++ b/mail/nmh/DETAILS @@ -1,7 +1,7 @@ SPELL=nmh VERSION=1.2 SOURCE=$SPELL-$VERSION.tar.gz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://savannah.nongnu.org/download/nmh/$SOURCE SOURCE_HASH=sha512:e350a75d5313b37259a134f902c763178006459ba5df022337ae6429ad8eaab8e949cebccb60cd23fb8b496a0655448d8275e312edb3e35eae698811355a359e WEB_SITE=http://www.nongnu.org/nmh/ diff --git a/mail/nmh/HISTORY b/mail/nmh/HISTORY index 84eb43f3e1..94f6bc52d4 100644 --- a/mail/nmh/HISTORY +++ b/mail/nmh/HISTORY @@ -1,3 +1,6 @@ +2007-12-01 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Fixed SOURCE_DIRECTORY + 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/net/nfs-utils/DETAILS b/net/nfs-utils/DETAILS index a6cc280816..c6dcab7cd9 100755 --- a/net/nfs-utils/DETAILS +++ b/net/nfs-utils/DETAILS @@ -1,5 +1,5 @@ SPELL=nfs-utils - VERSION=1.1.0 + VERSION=1.1.1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/nfs/$SOURCE diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY index ee580cdea3..ebbe416a66 100644 --- a/net/nfs-utils/HISTORY +++ b/net/nfs-utils/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Updated to 1.1.1 + 2007-08-11 Eric Sandall <sandalle@sourcemage.org> * init.d/nfs: Start rpc.statd and rpc.mountd with specific ports, if defined * init.d/nfs.conf: Add MOUNTD_PORT and STATD_PORT (undefined) with suggested defaults diff --git a/net/nfs-utils/nfs-utils-1.1.0.tar.gz.sig b/net/nfs-utils/nfs-utils-1.1.0.tar.gz.sig Binary files differdeleted file mode 100644 index 35812aa0eb..0000000000 --- a/net/nfs-utils/nfs-utils-1.1.0.tar.gz.sig +++ /dev/null diff --git a/net/nfs-utils/nfs-utils-1.1.1.tar.gz.sig b/net/nfs-utils/nfs-utils-1.1.1.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..67b45404f9 --- /dev/null +++ b/net/nfs-utils/nfs-utils-1.1.1.tar.gz.sig diff --git a/perl-cpan/parrot/DETAILS b/perl-cpan/parrot/DETAILS index 60058edeae..674dfb84c1 100755 --- a/perl-cpan/parrot/DETAILS +++ b/perl-cpan/parrot/DETAILS @@ -1,8 +1,8 @@ SPELL=parrot - VERSION=0.4.14 + VERSION=0.5.0 SOURCE=$SPELL-$VERSION.tar.gz - SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/P/PA/PARTICLE/$SOURCE - SOURCE_HASH=sha512:250d3fd14012f4f2dbec70031f08ed569cf3a73ab64886510a8c35e7dbe47a2fb4b68a913e1dd99be5c86cc9c06fba7ab82f7ead2b73aec00fe469c34729142b + SOURCE_URL[0]=http://www.cpan.org/authors/id/C/CH/CHROMATIC/$SOURCE + SOURCE_HASH=sha512:3e0e84c052f3e805696ecab2037c0b4be5026db50ff08a887f6b43ee789bdca17f64ac958bf2116d6e3f3abd04b2dbbb55070d7dcb5b4225ecfd8c3d8fc75286 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION WEB_SITE=http://www.parrotcode.org LICENSE[0]=ART diff --git a/perl-cpan/parrot/HISTORY b/perl-cpan/parrot/HISTORY index 6980702980..4537544af3 100644 --- a/perl-cpan/parrot/HISTORY +++ b/perl-cpan/parrot/HISTORY @@ -1,3 +1,6 @@ +2007-11-28 Pol Vinogradov <vin.public@gmail.com> + * DETAILS: updated to 0.5.0, changed SOURCE_URL + 2007-08-06 Pol Vinogradov <vin.public@gmail.com> * DETAILS: updated to 0.4.14, changed SOURCE_URL * BUILD: removed unnecessary comments diff --git a/python-devel/rabbyt/DEPENDS b/python-devel/rabbyt/DEPENDS index 1ec3c3e602..9bb6fa95b5 100755 --- a/python-devel/rabbyt/DEPENDS +++ b/python-devel/rabbyt/DEPENDS @@ -1,2 +1,3 @@ depends python && +dependo setuptools && depends OPENGL diff --git a/science/octave/DETAILS b/science/octave/DETAILS index 34868a63f6..cc8d044e45 100755 --- a/science/octave/DETAILS +++ b/science/octave/DETAILS @@ -1,13 +1,14 @@ SPELL=octave - VERSION=2.9.13 - SOURCE_HASH=sha512:1835508274a928b349dbbb901c1c1ffa27173c6dd49d4e319fced8f3da6cbe25a16296c69c73572fa582a2487cfdd3e398847fc33145558f37a1c6b85cbfba38 + VERSION=2.9.17 +# SOURCE_HASH=sha512:1835508274a928b349dbbb901c1c1ffa27173c6dd49d4e319fced8f3da6cbe25a16296c69c73572fa582a2487cfdd3e398847fc33145558f37a1c6b85cbfba38 SOURCE=$SPELL-$VERSION.tar.bz2 + SOURCE_GPG="gurus.gpg:$SOURCE.sig" SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=ftp://ftp.octave.org/pub/$SPELL/bleeding-edge/$SOURCE - WEB_SITE=http://www.octave.org LICENSE[0]=GPL - ENTERED=20020319 + WEB_SITE=http://www.octave.org KEYWORDS="science" + ENTERED=20020319 SHORT="Octave is a MATLAB clone" cat << EOF diff --git a/science/octave/HISTORY b/science/octave/HISTORY index a0ff1a253e..fb9c250980 100644 --- a/science/octave/HISTORY +++ b/science/octave/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Updated to 2.9.17 + 2007-08-24 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * DETAILS, DEPENDS: updated spell to 2.9.13, no more gcc3 * FINAL: overwrite the symlink diff --git a/science/octave/octave-2.9.17.tar.bz2.sig b/science/octave/octave-2.9.17.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..1d51d3ecc1 --- /dev/null +++ b/science/octave/octave-2.9.17.tar.bz2.sig diff --git a/shell-term-fm/emelfm2/DETAILS b/shell-term-fm/emelfm2/DETAILS index 955dcc980b..4378b60af8 100755 --- a/shell-term-fm/emelfm2/DETAILS +++ b/shell-term-fm/emelfm2/DETAILS @@ -1,9 +1,9 @@ SPELL=emelfm2 - VERSION=0.3.5 + VERSION=0.3.6 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://emelfm2.net/rel/$SOURCE - SOURCE_HASH=sha512:34650c152010be08a86966570a5d6dc7f93e003751c3aadc7316d3bed341e4e5bfd3476a5c824fd69f4b1d84ab198704730c5d28b0ce2d7ea4fd2e1f60927eec + SOURCE_HASH=sha512:97d23eaa3ac84afe6d4838350a858d242e1f79a7c065bb35753bb683c761c84a07526326e9a9e7875f0a8c5683391b36717348a1810e0ba8227b5e09b5cc5602 WEB_SITE=http://emelfm2.net/ ENTERED=20040425 LICENSE[0]=GPL diff --git a/shell-term-fm/emelfm2/HISTORY b/shell-term-fm/emelfm2/HISTORY index 5000470b4d..ce693b5b4c 100644 --- a/shell-term-fm/emelfm2/HISTORY +++ b/shell-term-fm/emelfm2/HISTORY @@ -1,3 +1,6 @@ +2007-12-01 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 0.3.6 + 2007-08-03 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.3.5 diff --git a/shell-term-fm/yeahconsole/BUILD b/shell-term-fm/yeahconsole/BUILD new file mode 100755 index 0000000000..8f58e6df93 --- /dev/null +++ b/shell-term-fm/yeahconsole/BUILD @@ -0,0 +1 @@ +make diff --git a/shell-term-fm/yeahconsole/DETAILS b/shell-term-fm/yeahconsole/DETAILS index 53c2bbb46e..5fa6a6bda3 100755 --- a/shell-term-fm/yeahconsole/DETAILS +++ b/shell-term-fm/yeahconsole/DETAILS @@ -1,12 +1,11 @@ SPELL=yeahconsole - VERSION=0.3.1 + VERSION=0.3.4 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://freshmeat.net/redir/yeahconsole/54521/url_tgz/$SOURCE WEB_SITE=http://freshmeat.net/projects/yeahconsole/ ENTERED=20050628 - UPDATED=20040628 - SOURCE_HASH=sha512:a3f3a0ebf317e749240b34e3ab90b0291865a7fdafb97d6180fe9d2bc916ed017f51ddc61a7f44679e280edff06575cf516fd3d8cb3c146de45ec43417c2be3f + SOURCE_HASH=sha512:cba74d988b3cb991d95de1796e9e79b881fe011d4fc8d6aa1f863f4c465aadfd31250e57d36ce0118dfc367225c2861cf8e80ac47996c2718d83756a8e638ead LICENSE[0]=GPL KEYWORDS="console" SHORT="drop-down xterm, kuake style" diff --git a/shell-term-fm/yeahconsole/HISTORY b/shell-term-fm/yeahconsole/HISTORY index b426c32844..c9146708d2 100644 --- a/shell-term-fm/yeahconsole/HISTORY +++ b/shell-term-fm/yeahconsole/HISTORY @@ -1,3 +1,7 @@ +2007-11-28 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: version 0.3.4 + * PRE_BUILD,BUILD,desktop/yeahconsole.desktop: added + 2006-06-28 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Removed BUILD_API=2, set grimoire-wide diff --git a/shell-term-fm/yeahconsole/PRE_BUILD b/shell-term-fm/yeahconsole/PRE_BUILD new file mode 100755 index 0000000000..4a68df142a --- /dev/null +++ b/shell-term-fm/yeahconsole/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +sedit 's#/usr/local#/usr#g' Makefile diff --git a/smgl/initng-ifiles/BUILD b/smgl/initng-ifiles/BUILD new file mode 100755 index 0000000000..a0e23403b2 --- /dev/null +++ b/smgl/initng-ifiles/BUILD @@ -0,0 +1,8 @@ +CFLAGS="${CFLAGS/-Os/-O2}" && +cd ${SOURCE_DIRECTORY} && +mkdir build && +cd build && +cmake .. && +make_single && +make && +make_normal diff --git a/smgl/initng-ifiles/DEPENDS b/smgl/initng-ifiles/DEPENDS new file mode 100755 index 0000000000..cda1badd5d --- /dev/null +++ b/smgl/initng-ifiles/DEPENDS @@ -0,0 +1 @@ +depends initng diff --git a/smgl/initng-ifiles/DETAILS b/smgl/initng-ifiles/DETAILS new file mode 100755 index 0000000000..4144661131 --- /dev/null +++ b/smgl/initng-ifiles/DETAILS @@ -0,0 +1,38 @@ + SPELL=initng-ifiles +if [ "$INITNGIFILES_SVN" == "y" ]; then + if [ "${INITNGIFILES_SVN_AUTOUPDATE}" == "y" ]; then + VERSION=$(date +%Y%m%d) + else + VERSION=svn + fi + SOURCE=${SPELL}-${VERSION}.tar.bz2 + SOURCE_URL[0]=svn_http://svn.initng.org/${SPELL}/trunk:${SPELL}-${VERSION} + SOURCE_HINTS=old_svn_compat + SOURCE_IGNORE=signature +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} +else + VERSION=0.1.4 + SOURCE=${SPELL}-${VERSION}.tar.bz2 + SOURCE2=${SOURCE}.sig + SOURCE_URL[0]=http://download.initng.org/${SPELL}/v${VERSION:0:3}/${SOURCE} + SOURCE_URL[1]=http://ryuji.myftp.org/initng/${SOURCE} + SOURCE2_URL[0]=http://download.initng.org/${SPELL}/v${VERSION:0:3}/${SOURCE2} + SOURCE2_URL[1]=http://ryuji.myftp.org/initng/${SOURCE2} + SOURCE2_IGNORE=signature + SOURCE_GPG=initng.gpg:${SOURCE2}:UPSTREAM_KEY +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} +fi + WEB_SITE="http://www.initng.org/" + LICENSE[0]=GPL + ENTERED=20070412 + SHORT="InitNG's init scripts collection" + DOCS="README TODO COPYING AUTHORS ChangeLog doc/*" +cat << EOF +InitNG's init scripts collection package +--- + +InitNG is a full replacement of the old and in many ways deprecated SysV init +tool created by Jimmy Wennlund. It is designed to significantly increase the +speed of booting a unix-compatible system by starting processes asynchronously. +Development is now handled by a team from all around the world. +EOF diff --git a/smgl/initng-ifiles/HISTORY b/smgl/initng-ifiles/HISTORY new file mode 100644 index 0000000000..07cdf03c80 --- /dev/null +++ b/smgl/initng-ifiles/HISTORY @@ -0,0 +1,5 @@ +2007-11-29 Ismael Luceno <ismael.luceno@gmail.com> + * Updated to the latest release + +2007-04-12 Elisamuel Resto <ryuji@mages.ath.cx> + * ALL: created spell diff --git a/smgl/initng-ifiles/PREPARE b/smgl/initng-ifiles/PREPARE new file mode 100755 index 0000000000..4ed5dc0e8e --- /dev/null +++ b/smgl/initng-ifiles/PREPARE @@ -0,0 +1,5 @@ +config_query INITNGIFILES_SVN "Build SVN version?" n && + +if [ "${INITNGIFILES_SVN}" == "y" ]; then + config_query INITNGIFILES_SVN_AUTOUPDATE "Automaticaly update the spell on sorcery queue/system-update?" n +fi diff --git a/smgl/initng.gpg b/smgl/initng.gpg Binary files differnew file mode 100644 index 0000000000..c788e58f43 --- /dev/null +++ b/smgl/initng.gpg diff --git a/smgl/initng/BUILD b/smgl/initng/BUILD new file mode 100755 index 0000000000..a0e23403b2 --- /dev/null +++ b/smgl/initng/BUILD @@ -0,0 +1,8 @@ +CFLAGS="${CFLAGS/-Os/-O2}" && +cd ${SOURCE_DIRECTORY} && +mkdir build && +cd build && +cmake .. && +make_single && +make && +make_normal diff --git a/smgl/initng/DEPENDS b/smgl/initng/DEPENDS new file mode 100755 index 0000000000..195eab1405 --- /dev/null +++ b/smgl/initng/DEPENDS @@ -0,0 +1,4 @@ +depends gcc && +depends cmake && +depends gnupg && +depends smgl-fhs diff --git a/smgl/initng/DETAILS b/smgl/initng/DETAILS new file mode 100755 index 0000000000..49a86b38e3 --- /dev/null +++ b/smgl/initng/DETAILS @@ -0,0 +1,22 @@ + SPELL=initng + VERSION=0.6.10.2 + SOURCE=${SPELL}-${VERSION}.tar.bz2 + SOURCE2=${SOURCE}.sig + SOURCE_URL[0]=http://download.initng.org/${SPELL}/v${VERSION:0:3}/${SOURCE} + SOURCE_URL[1]=http://ryuji.myftp.org/initng/${SOURCE} + SOURCE2_URL[0]=http://download.initng.org/${SPELL}/v${VERSION:0:3}/${SOURCE2} + SOURCE2_URL[1]=http://ryuji.myftp.org/initng/${SOURCE2} + SOURCE2_IGNORE=signature + SOURCE_GPG=initng.gpg:${SOURCE2}:UPSTREAM_KEY +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} + WEB_SITE="http://www.initng.org/" + LICENSE[0]=GPL + ENTERED=20070412 + SHORT="Initng is a full replacement of SysV init written by Jimmy Wennlund" + DOCS="README NEWS TODO COPYING AUTHORS ChangeLog doc/*" +cat << EOF +Initng is a full replacement of the old and in many ways deprecated sysvinit +tool created by Jimmy Wennlund. It is designed to significantly increase the +speed of booting a unix-compatible system by starting processes asynchronously. +Development is now handled by a team from all around the world. +EOF diff --git a/smgl/initng/HISTORY b/smgl/initng/HISTORY new file mode 100644 index 0000000000..07cdf03c80 --- /dev/null +++ b/smgl/initng/HISTORY @@ -0,0 +1,5 @@ +2007-11-29 Ismael Luceno <ismael.luceno@gmail.com> + * Updated to the latest release + +2007-04-12 Elisamuel Resto <ryuji@mages.ath.cx> + * ALL: created spell diff --git a/utils/gpm/BUILD b/utils/gpm/BUILD index ab13ac0d90..ddd570ee17 100755 --- a/utils/gpm/BUILD +++ b/utils/gpm/BUILD @@ -8,4 +8,6 @@ LDFLAGS="$LDFLAGS -lm" && --infodir=${TRACK_ROOT}/usr/share/info \ $OPTS && sedit "s/src doc contrib/src contrib/" Makefile && -make +make_single && +make && +make_normal diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY index ff490ac19d..402c445492 100644 --- a/utils/gpm/HISTORY +++ b/utils/gpm/HISTORY @@ -1,3 +1,12 @@ +2007-12-01 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Apply gpm-OPEN_MAX-1.patch and gpm-OPEN_MAX-2.patch + (Bug #14109) + * BUILD: Fails to compile with multiple make jobs + * gpm-OPEN_MAX-1.patch: Patch from P. Berens to fix Bug #14109 + Updated to apply cleanly against 1.20.1 + * gpm-OPEN_MAX-2.patch: Patch from P. Berens to fix Bug #14109 + Updated to apply cleanly against 1.20.1 + 2006-07-09 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * CONFIGURE: make the dialogs optional #11598 and clean it up * FINAL: insert default values if none were specified diff --git a/utils/gpm/PRE_BUILD b/utils/gpm/PRE_BUILD index c426d5d0ca..5a905fdfc9 100755 --- a/utils/gpm/PRE_BUILD +++ b/utils/gpm/PRE_BUILD @@ -1,3 +1,7 @@ -default_pre_build && -patch $SOURCE_DIRECTORY/src/lib/liblow.c \ - $SCRIPT_DIRECTORY/gpm.1.20.1-pts.patch +default_pre_build && +patch $SOURCE_DIRECTORY/src/lib/liblow.c \ + $SCRIPT_DIRECTORY/gpm.1.20.1-pts.patch && +patch $SOURCE_DIRECTORY/src/prog/gpm-root.y \ + $SCRIPT_DIRECTORY/gpm-OPEN_MAX-1.patch && +patch $SOURCE_DIRECTORY/src/special.c \ + $SCRIPT_DIRECTORY/gpm-OPEN_MAX-2.patch diff --git a/utils/gpm/gpm-OPEN_MAX-1.patch b/utils/gpm/gpm-OPEN_MAX-1.patch new file mode 100644 index 0000000000..b3be5f0fd1 --- /dev/null +++ b/utils/gpm/gpm-OPEN_MAX-1.patch @@ -0,0 +1,14 @@ +diff -Naur gpm-1.20.1.orig/src/prog/gpm-root.y gpm-1.20.1/src/prog/gpm-root.y +--- gpm-1.20.1.orig/src/prog/gpm-root.y 2007-12-01 01:32:11.225537231 -0800 ++++ gpm-1.20.1/src/prog/gpm-root.y 2007-12-01 01:33:21.339840854 -0800 +@@ -525,7 +525,9 @@ + open("/dev/null",O_RDONLY); /* stdin */ + open(consolename,O_WRONLY); /* stdout */ + dup(1); /* stderr */ +- for (i=3;i<OPEN_MAX; i++) close(i); ++ int open_max = sysconf(_SC_OPEN_MAX); ++ if (open_max == -1) open_max = 1024; ++ for (i=3;i<open_max; i++) close(i); + execl("/bin/sh","sh","-c",self->arg,(char *)NULL); + exit(1); /* shouldn't happen */ + default: return 0; diff --git a/utils/gpm/gpm-OPEN_MAX-2.patch b/utils/gpm/gpm-OPEN_MAX-2.patch new file mode 100644 index 0000000000..502d62447c --- /dev/null +++ b/utils/gpm/gpm-OPEN_MAX-2.patch @@ -0,0 +1,14 @@ +diff -Naur gpm-1.20.1.orig/src/special.c gpm-1.20.1/src/special.c +--- gpm-1.20.1.orig/src/special.c 2007-12-01 01:32:11.225537231 -0800 ++++ gpm-1.20.1/src/special.c 2007-12-01 01:34:00.774824800 -0800 +@@ -155,7 +155,9 @@ + open(GPM_NULL_DEV,O_RDONLY); /* stdin */ + open(option.consolename,O_WRONLY); /* stdout */ + dup(1); /* stderr */ +- for (i=3;i<OPEN_MAX; i++) close(i); ++ int open_max = sysconf(_SC_OPEN_MAX); ++ if (open_max == -1) open_max = 1024; ++ for (i=3;i<open_max; i++) close(i); + execl("/bin/sh","sh","-c",command,(char *)NULL); + exit(1); /* shouldn't happen */ + diff --git a/utils/x86info/DETAILS b/utils/x86info/DETAILS index b154b8f813..f3bbe8233f 100755 --- a/utils/x86info/DETAILS +++ b/utils/x86info/DETAILS @@ -1,9 +1,9 @@ SPELL=x86info - VERSION=1.20 + VERSION=1.21 SOURCE=$SPELL-$VERSION.tgz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://www.codemonkey.org.uk/projects/x86info/$SOURCE - SOURCE_HASH=sha512:557ba181f9374bec2b2c022b79f6598f9a7dd0de928d9e7b6fe2a5b46f772376cd8166c98363b67518c86e821f9ef4fde33a324e5df0031e6c571097525f0fb3 + SOURCE_HASH=sha512:baee87625ec5a6e61c7834125ef5315e5550b5785b60ea052bde231ca281920154e8e046cc3f25b7c17d66dbb3581b929986f1fa32bf03619ef7cc879e6776e8 WEB_SITE=http://www.codemonkey.org.uk/ ENTERED=20011122 PATCHLEVEL=0 diff --git a/utils/x86info/HISTORY b/utils/x86info/HISTORY index 8b2bb1b1bf..ccff423284 100644 --- a/utils/x86info/HISTORY +++ b/utils/x86info/HISTORY @@ -1,3 +1,6 @@ +2007-11-27 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 1.21 + 2006-10-08 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.20 diff --git a/video-libs/avifile/BUILD b/video-libs/avifile/BUILD index 8ce36162f2..7c7240b45c 100755 --- a/video-libs/avifile/BUILD +++ b/video-libs/avifile/BUILD @@ -1,4 +1,6 @@ # needed for xvid detection LDFLAGS="$LDFLAGS -lm" && disable_pic && +# disable qt stuff, doesn't work with the gcc34/gcc4 combination +OPTS="--without-qt $OPTS" && default_build diff --git a/video-libs/avifile/DEPENDS b/video-libs/avifile/DEPENDS index 1fc8d7424f..c740ed9ccd 100755 --- a/video-libs/avifile/DEPENDS +++ b/video-libs/avifile/DEPENDS @@ -1,10 +1,5 @@ depends gcc34 && -optional_depends qt-x11 \ - "" \ - "--without-qt" \ - "for aviplay" && - optional_depends win32codecs \ "" \ "" \ diff --git a/video-libs/avifile/HISTORY b/video-libs/avifile/HISTORY index 41229e30b5..1e7e10cf7a 100644 --- a/video-libs/avifile/HISTORY +++ b/video-libs/avifile/HISTORY @@ -1,3 +1,8 @@ +2007-12-01 Arwed v. Merkatz <v.merkatz@gmx.net> + * PRE_BUILD: remove player and samples from the build as they don't + compile/link anymore, fixes bug #14148 + * DEPENDS, BUILD: remove qt-x11 support, doesn't link anymore + 2007-04-29 John Harding <johnh@kuberaconsulting.com> * BUILD: added disable_pic at ruskie's suggestion when it wouldn't compile here. It worked. diff --git a/video-libs/avifile/PRE_BUILD b/video-libs/avifile/PRE_BUILD index ad15d9f567..864336088c 100755 --- a/video-libs/avifile/PRE_BUILD +++ b/video-libs/avifile/PRE_BUILD @@ -2,4 +2,7 @@ default_pre_build && cd $SOURCE_DIRECTORY && # fix the pkgconfig file, avifile install header to include/avifile-0.7, # not include/avifile -sedit 's:\(@includedir@/avifile\):\1-0.7:' avifile.pc.in +sedit 's:\(@includedir@/avifile\):\1-0.7:' avifile.pc.in && +# remove player and samples from the build, they both fail due to issues +# with newer gcc versions +sedit 's:player samples::' Makefile.in diff --git a/video-libs/gst-plugins-good/HISTORY b/video-libs/gst-plugins-good/HISTORY index 76ccc299cc..b34b6c0311 100644 --- a/video-libs/gst-plugins-good/HISTORY +++ b/video-libs/gst-plugins-good/HISTORY @@ -1,3 +1,7 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * Fix to work with gst-plugins-base 0.10.15 + See http://bugzilla.gnome.org/show_bug.cgi?id=498181 + 2007-09-22 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: ascii -> ASCII in text description * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow e-emotion to depend on gst-plugins-good diff --git a/video-libs/gst-plugins-good/PRE_BUILD b/video-libs/gst-plugins-good/PRE_BUILD new file mode 100755 index 0000000000..c13e2c4ee1 --- /dev/null +++ b/video-libs/gst-plugins-good/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +sedit 's:DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED":#&:' $SOURCE_DIRECTORY/configure.ac && +sedit 's:DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED":#&:' $SOURCE_DIRECTORY/configure diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS index 3ba297121c..03646d9917 100755 --- a/video-libs/live/DETAILS +++ b/video-libs/live/DETAILS @@ -1,12 +1,13 @@ SPELL=live - VERSION=2006.01.04 + VERSION=2007.11.18 SOURCE=$SPELL.$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL -# SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE - SOURCE_URL[0]=http://w3studi.informatik.uni-stuttgart.de/~vonmerad/$SOURCE +# SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE + SOURCE_URL[0]=http://download.sourcemage.org/distro/$SOURCE WEB_SITE=http://www.live555.com/liveMedia/ LICENSE[0]=LGPL - SOURCE_GPG="gurus.gpg:$SOURCE.sig" + SOURCE_HASH=sha512:ad402fef30f04e4dd33e292f9c1ed443bb3cd45290340aa89561b569d1c9c4bcfdb8adc59f7f2f76e2e875f313668af4d30217b3feecfc00c38aa21d0847c6f4 +# SOURCE_GPG="gurus.gpg:$SOURCE.sig" ENTERED=20030301 KEYWORDS="streaming video libs" SHORT="LIVE555 Streaming Media" diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY index 502b8ba55a..dad33865ec 100644 --- a/video-libs/live/HISTORY +++ b/video-libs/live/HISTORY @@ -1,3 +1,9 @@ +2007-11-30 Arwed v. Merkatz <v.merkatz@gmx.net> + * DETAILS: changed SOURCE_URL to use our mirror + +2007-11-29 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 2007.11.18 + 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/video-libs/live/live.2006.01.04.tar.gz.sig b/video-libs/live/live.2006.01.04.tar.gz.sig Binary files differdeleted file mode 100644 index e61799fb6f..0000000000 --- a/video-libs/live/live.2006.01.04.tar.gz.sig +++ /dev/null diff --git a/video/dvdshrink/BUILD b/video/dvdshrink/BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/video/dvdshrink/BUILD @@ -0,0 +1 @@ +true diff --git a/video/dvdshrink/DEPENDS b/video/dvdshrink/DEPENDS new file mode 100755 index 0000000000..26333a91df --- /dev/null +++ b/video/dvdshrink/DEPENDS @@ -0,0 +1,7 @@ +depends cdrtools && +depends dvdauthor && +depends dvd+rw-tools && +depends mjpegtools && +depends perl-gtk2 && +depends subrip && +depends transcode diff --git a/video/dvdshrink/DETAILS b/video/dvdshrink/DETAILS new file mode 100755 index 0000000000..4d8988bb9f --- /dev/null +++ b/video/dvdshrink/DETAILS @@ -0,0 +1,21 @@ + SPELL=dvdshrink + VERSION=2.6.1 + SOURCE=${SPELL}-${VERSION}-6mdk.tar.gz +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL} + SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE} + WEB_SITE=http://dvdshrink.sourceforge.net + ENTERED=20060503 + SOURCE_HASH[0]=sha512:0794282bf2da2a331cd7c75e3a245699ecf7299c1b67ef107651ecf5a3d4c8cee0cc57fbce6fa6455e23fbc054a1df4ed9124c5fe2959c129bb4ee75f76f887c + LICENSE[0]=GPL + KEYWORDS="video" + SHORT="Shrinks DVD9 titles to fit on one DVD5, CLI and X GUI is supported" +cat << EOF +DVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use archival copies of DVD content on single-layer writable DVDs. + +# Command-line and graphical interface +# Scriptable +# Copy single movies +# Copy multiple episodes +# Selectable audio stream (AC3 only) +# Option for one subtitle stream per DVD title +EOF diff --git a/video/dvdshrink/HISTORY b/video/dvdshrink/HISTORY new file mode 100644 index 0000000000..6360eebf0c --- /dev/null +++ b/video/dvdshrink/HISTORY @@ -0,0 +1,8 @@ +2007-12-01 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Removed UPDATED and BUILD_API + * DEPENDS: Alphabetize and format + * INSTALL: Use INSTALL_ROOT + +2006-05-09 Daniel Goller <dgoller@satx.rr.com> + * BUILD, DEPENDS, DETAILS, INSTALL: created spell + diff --git a/video/dvdshrink/INSTALL b/video/dvdshrink/INSTALL new file mode 100755 index 0000000000..db27571d8f --- /dev/null +++ b/video/dvdshrink/INSTALL @@ -0,0 +1,8 @@ +for DIR in doc applications; do + if [ ! -d $INSTALL_ROOT/usr/share/$DIR/dvdshrink ]; then + mkdir -p $INSTALL_ROOT/usr/share/$DIR/dvdshrink + fi +done + +cp usr/bin/* $INSTALL_ROOT/usr/bin +cp -R usr/share/* $INSTALL_ROOT/usr/share diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS index c3564ae1d8..f7ff0675e6 100755 --- a/video/vlc/DETAILS +++ b/video/vlc/DETAILS @@ -1,10 +1,10 @@ SPELL=vlc - VERSION=0.8.6c + VERSION=0.8.6d SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE WEB_SITE=http://www.videolan.org - SOURCE_HASH=sha512:e2b71661c316b24ef0c7f3be8723cb90485dc727bb9ff06b97fb2446a73741cd78365ae6975bde7e172d9f1abb905eefab3c93182c4e1c82354aef9b31d84507 + SOURCE_HASH=sha512:5ab2505b7a4724aa5ddbafdf5dce9944b0fa8ddbb15e689c248f93152b8f8402c1a9d92b6e59819a676dfb2ea829270ec1d008e2c0d808c08bb6d0e22a753f0f # SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME" LICENSE[0]=GPL ENTERED=20011113 diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY index f7529beb7c..e534ec26a7 100644 --- a/video/vlc/HISTORY +++ b/video/vlc/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 0.8.6d + 2007-11-21 Arwed v. Merkatz <v.merkatz@gmx.net> * PRE_BUILD, ffmpeg-api.patch: fix for latest ffmpeg-svn support diff --git a/windowmanagers/fluxbox/DOWNLOAD b/windowmanagers/fluxbox/DOWNLOAD index 873b9fa431..36ac7e188f 100755 --- a/windowmanagers/fluxbox/DOWNLOAD +++ b/windowmanagers/fluxbox/DOWNLOAD @@ -8,7 +8,8 @@ function url_r_svn_crack() { R_SVN_TAG=${R_SVN_TAGNAME:-HEAD} } - +if [[ $FLUXBOX_SVN == y ]] +then url_r_svn_crack ${SOURCE_URL} && message "${MESSAGE_COLOR}Starting SVN checkout of" \ "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" && @@ -40,10 +41,7 @@ tar -jcf \ ${R_SVN_MODULE} && cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE} && rm ${SOURCE} && -message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}" && - -if [[ $SOURCE2 ]]; then - acquire_src 2 && - acquire_src 3 && - acquire_src 4 +message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}" +else +acquire_src '' fi diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY index 33d5d991e9..d69f647610 100644 --- a/windowmanagers/fluxbox/HISTORY +++ b/windowmanagers/fluxbox/HISTORY @@ -1,3 +1,6 @@ +2007-11-30 Elisamuel Resto <ryuji@mages.ath.cx> + * DOWNLOAD: #13828 fix didnt work properly, file from valgrind spell does + 2007-11-12 Arjan Bouter <abouter@sourcemage.org> * DETAILS: fixed svn SOURCE_DIRECTORY * DOWNLOAD: added to fix bug #13828 diff --git a/windowmanagers/wm2/DETAILS b/windowmanagers/wm2/DETAILS index 0b77f0db4a..344bc0c653 100755 --- a/windowmanagers/wm2/DETAILS +++ b/windowmanagers/wm2/DETAILS @@ -1,13 +1,21 @@ SPELL=wm2 -if [[ "$WM2_CVS_AUTOUPDATE" == "y" ]]; then +if [[ "$WM2_CVS" == "y" ]]; then + if [[ "$WM2_CVS_AUTOUPDATE" = "y" ]]; then VERSION=$(date +%Y%m%d) -else + else VERSION=cvs -fi - SOURCE=$SPELL-cvsroot.tar.bz2 + fi + SOURCE=${SPELL}-${VERSION}.tar.bz2 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvsroot SOURCE_URL[0]=cvs://:pserver:anonymous@wm2.cvs.sourceforge.net:/cvsroot/wm2:wm2 SOURCE_IGNORE=volatile +else + VERSION=4 + SOURCE=${SPELL}-${VERSION}.tar.gz + SOURCE_URL[0]=http://www.all-day-breakfast.com/$SPELL/${SOURCE} + SOURCE_HASH=sha512:9151267e5a6bf39587b15dc3e55b4acc05aa1b14a7a9bcb4e1ed25d474af8b0e7699343117f184c745645deb404d6f6e230809b88d9b7bb5c1f67ba0fbde72e9 +fi +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} WEB_SITE=http://www.all-day-breakfast.com/wm2/ ENTERED=20040821 PATCHLEVEL=0 @@ -16,20 +24,20 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvsroot SHORT="wm2 is a goodlooking minimalist windowmanager" cat << EOF wm2 is a window manager for X. Using wm2, you can: - · move windows around the screen; - · resize windows both horizontally and vertically; - · hide windows; - · restore hidden windows; and - · delete windows. +* move windows around the screen; +* resize windows both horizontally and vertically; +* hide windows; +* restore hidden windows; and +* delete windows. wm2 also adds a stylish frame to each managed window. wm2 does not provide: - · icons; - · configurability; - · a virtual desktop; - · extendable root menus; - · toolbars - button panels - docking areas - &c. +* icons; +* configurability; +* a virtual desktop; +* extendable root menus; +* toolbars - button panels - docking areas. wm2 is therefore the ideal window manager for today's elegant and ascetic programmer. EOF diff --git a/windowmanagers/wm2/HISTORY b/windowmanagers/wm2/HISTORY index 3e5b33b5f9..7641bd1b88 100644 --- a/windowmanagers/wm2/HISTORY +++ b/windowmanagers/wm2/HISTORY @@ -1,3 +1,7 @@ +2007-11-28 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: added release version and autoupdate for cvs + * PREPARE: added cvs autoupdate query + 2006-09-06 Pieter Lenaerts <e-type@sourcemage.org> * DETAILS: updated cvs url diff --git a/windowmanagers/wm2/PREPARE b/windowmanagers/wm2/PREPARE index 91d3331bff..e3d83887f5 100755 --- a/windowmanagers/wm2/PREPARE +++ b/windowmanagers/wm2/PREPARE @@ -1 +1,2 @@ +config_query WM2_CVS "Do you want the CVS version?" n config_query WM2_CVS_AUTOUPDATE "Automatically update $SPELL on system-update?" n diff --git a/windowmanagers/wmx/DEPENDS b/windowmanagers/wmx/DEPENDS new file mode 100755 index 0000000000..16690a3a2c --- /dev/null +++ b/windowmanagers/wmx/DEPENDS @@ -0,0 +1 @@ +depends X11-LIBS diff --git a/windowmanagers/wmx/DETAILS b/windowmanagers/wmx/DETAILS new file mode 100755 index 0000000000..414c759009 --- /dev/null +++ b/windowmanagers/wmx/DETAILS @@ -0,0 +1,28 @@ + SPELL=wmx +if [[ "$WMX_CVS" == "y" ]]; then + if [[ "$WMX_CVS_AUTOUPDATE" = "y" ]]; then + VERSION=$(date +%Y%m%d) + else + VERSION=cvs + fi + SOURCE=${SPELL}-${VERSION}.tar.bz2 +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvsroot + SOURCE_URL[0]=cvs://:pserver:anonymous@wm2.cvs.sourceforge.net:/cvsroot/wm2:wmx + SOURCE_IGNORE=volatile +else + VERSION=6pl1 + SOURCE=${SPELL}-${VERSION}.tar.gz + SOURCE_URL[0]=http://www.all-day-breakfast.com/$SPELL/${SOURCE} + SOURCE_HASH=sha512:0d13ffbe177912f8f5e0678cbdc0a8266ce4788f3aa6a87d733e27f7affba2ea267d754e82d63508b65487ad4d47bdfa2437fe1c1bbb132440ad4279bcbc0078 +fi +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} + WEB_SITE=http://www.all-day-breakfast.com/wmx/ + ENTERED=20071128 + LICENSE[0]=GPL + KEYWORDS="windowmanagers" + SHORT="wmx is a goodlooking minimalist windowmanager" +cat << EOF +WMX is based on wm2, and it retains a similar look and feel, +but it's intended to provide an experimental vehicle for features that +fall comfortably outside the scope of the manifesto for the original wm2. +EOF diff --git a/windowmanagers/wmx/HISTORY b/windowmanagers/wmx/HISTORY new file mode 100644 index 0000000000..e6b82fdb46 --- /dev/null +++ b/windowmanagers/wmx/HISTORY @@ -0,0 +1,3 @@ +2007-11-28 Arjan Bouter <abouter@sourcemage.org> + * DEPENDS,DETAILS,HISTORY,INSTALL,PREPARE,wmx.desktop: + created spell diff --git a/windowmanagers/wmx/INSTALL b/windowmanagers/wmx/INSTALL new file mode 100755 index 0000000000..9ff467e31c --- /dev/null +++ b/windowmanagers/wmx/INSTALL @@ -0,0 +1,2 @@ +cp ${SOURCE_DIRECTORY}/wmx ${INSTALL_ROOT}/usr/bin && +install_wmfiles diff --git a/windowmanagers/wmx/PREPARE b/windowmanagers/wmx/PREPARE new file mode 100755 index 0000000000..6544d01f3a --- /dev/null +++ b/windowmanagers/wmx/PREPARE @@ -0,0 +1,2 @@ +config_query WMX_CVS "Do you want the CVS version?" n +config_query WMX_CVS_AUTOUPDATE "Automatically update $SPELL on system-update?" n diff --git a/windowmanagers/wmx/wmx.desktop b/windowmanagers/wmx/wmx.desktop new file mode 100644 index 0000000000..d4f2f6fc45 --- /dev/null +++ b/windowmanagers/wmx/wmx.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=wmx +Comment=This session logs you into wmx +Exec=wmx +TryExec=wmx +Icon= +Type=Application diff --git a/windowmanagers/xfce/BUILD b/windowmanagers/xfce/BUILD index 6be3fd5bf6..a58ddffb59 100755 --- a/windowmanagers/xfce/BUILD +++ b/windowmanagers/xfce/BUILD @@ -1,3 +1,3 @@ -export CPPFLAGS="-I/usr/include/freetype2" && -OPTS=echo "$OPTS --data-dir=${INSTALL_ROOT}/usr/share --enable-xft=yes" +export CPPFLAGS="-I/usr/include/freetype2" && +OPTS="--with-data-dir=${INSTALL_ROOT}/usr/share $OPTS" && default_build diff --git a/windowmanagers/xfce/DEPENDS b/windowmanagers/xfce/DEPENDS index eb9ef5ef50..38ba6c99e7 100755 --- a/windowmanagers/xfce/DEPENDS +++ b/windowmanagers/xfce/DEPENDS @@ -1,11 +1,27 @@ +depends freetype2 && depends gcc34 && +depends gdk-pixbuf && +depends glib && depends gtk+ && +depends imlib && depends jpeg && -depends tiff && -depends libungif && +depends LIBGIF && depends libpng && +depends tiff && depends zlib && -depends imlib && -depends freetype2 && -depends gdk-pixbuf && + +. $GRIMOIRE/FUNCTIONS && + +if check_if_xorg_modular_libs gtk+; then + depends libice && + depends libsm && + depends libx11 && + depends libxext && + depends libxft '--enable-xft' && + depends libxinerama && + depends libxpm +else + depends X11-LIBS '--enable-xft' +fi && + optional_depends "samba" "" "" "for xfce's built in samba browser" diff --git a/windowmanagers/xfce/HISTORY b/windowmanagers/xfce/HISTORY index 3f9f0072df..085c694773 100644 --- a/windowmanagers/xfce/HISTORY +++ b/windowmanagers/xfce/HISTORY @@ -1,3 +1,14 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Works with any provider of LIBGIF + Add xorg-modular checks + Add dependency on glib + Redundant dependency on X11-LIBS for non-xorg-modular to set Xft + Alphabetize list + * BUILD: Pass user $OPTS last to override our settings + Proper data-dir switch is --with-data-dir (Bug #14140) + Don't use "echo" to set OPTS + Use DEPENDS to pass --enable-xft + 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER. diff --git a/windowmanagers/xmonad/DETAILS b/windowmanagers/xmonad/DETAILS index 4ca8b53a6e..c1a2511698 100755 --- a/windowmanagers/xmonad/DETAILS +++ b/windowmanagers/xmonad/DETAILS @@ -1,8 +1,8 @@ SPELL=xmonad - VERSION=0.4 + VERSION=0.4.1 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE} - SOURCE_HASH=sha512:72edff77c0cc55c9cb94f4656681696f7c4ef0447bf770f15e260f67ff31f519b5329dfdd76a866992dcc8cb9c3aecc40ed370d3fae47e995857a2a0619f5023 + SOURCE_HASH=sha512:7bb9557a9c865a97123ab8055ca72d2a5773c061d9b86a38dd743fd13f0f494a7155612fff386e8820abe4acb75406b4d145063c5691ef65a7819b7fd47864c8 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://xmonad.org" LICENSE[0]=BSD3 diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY index 4b2433ed5d..154e5371f9 100644 --- a/windowmanagers/xmonad/HISTORY +++ b/windowmanagers/xmonad/HISTORY @@ -1,3 +1,6 @@ +2007-11-28 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: version 0.4.1 + 2007-10-21 Alexander Tsamutali <astsmtl@gmail.com> * DETAILS: updated spell to 0.4 diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS index 4e64eaae2e..6b9788d3e5 100755 --- a/x11-libs/cairo/DETAILS +++ b/x11-libs/cairo/DETAILS @@ -1,5 +1,5 @@ SPELL=cairo - VERSION=1.4.10 + VERSION=1.4.12 SOURCE_GPG="gurus.gpg:${SOURCE}.sig" SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY index 3c2559b0b6..69a7a8aa7d 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,6 @@ +2007-11-29 Robin Cook <rcook@wyrms.net> + * DETAILS: updated VERSION to 1.4.12 + 2007-06-27 Robin Cook <rcook@wyrms.net> * DETAILS: updated VERSION to 1.4.10 diff --git a/x11-libs/cairo/cairo-1.4.10.tar.gz.sig b/x11-libs/cairo/cairo-1.4.10.tar.gz.sig Binary files differdeleted file mode 100644 index c00460b94d..0000000000 --- a/x11-libs/cairo/cairo-1.4.10.tar.gz.sig +++ /dev/null diff --git a/x11-libs/cairo/cairo-1.4.12.tar.gz.sig b/x11-libs/cairo/cairo-1.4.12.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..edd4f25b48 --- /dev/null +++ b/x11-libs/cairo/cairo-1.4.12.tar.gz.sig diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS index 0434b61832..1fbb7d9031 100755 --- a/x11-libs/wine/DETAILS +++ b/x11-libs/wine/DETAILS @@ -11,7 +11,7 @@ if [[ $WINE_VCS == y ]]; then SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git FORCE_DOWNLOAD=1 else - VERSION=0.9.49 + VERSION=0.9.50 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.sign SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY index fc9a66614a..4333f42132 100644 --- a/x11-libs/wine/HISTORY +++ b/x11-libs/wine/HISTORY @@ -1,3 +1,6 @@ +2007-11-30 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * DETAILS: updated spell to 0.9.50 + 2007-11-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.9.49 diff --git a/x11/fbpanel/DETAILS b/x11/fbpanel/DETAILS index 0dc5da562e..ea2883495c 100755 --- a/x11/fbpanel/DETAILS +++ b/x11/fbpanel/DETAILS @@ -1,5 +1,5 @@ SPELL=fbpanel - VERSION=4.5 + VERSION=4.12 SOURCE=$SPELL-$VERSION.tgz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/x11/fbpanel/HISTORY b/x11/fbpanel/HISTORY index c8c3ad1b03..8b4360687a 100644 --- a/x11/fbpanel/HISTORY +++ b/x11/fbpanel/HISTORY @@ -1,3 +1,6 @@ +2007-11-28 Arjan Bouter <abouter@sourcemage.org> + * DETAILS: version 4.12 + 2006-09-17 Pieter Lenaerts <e-type@sourcemage.org> * DEPENDS: added X11-LIBS, glitz, libpng, freetype2, pango, expat * updated to 4.5 diff --git a/x11/fbpanel/fbpanel-4.12.tgz.sig b/x11/fbpanel/fbpanel-4.12.tgz.sig Binary files differnew file mode 100644 index 0000000000..7ca9235ddd --- /dev/null +++ b/x11/fbpanel/fbpanel-4.12.tgz.sig diff --git a/x11/fbpanel/fbpanel-4.5.tgz.sig b/x11/fbpanel/fbpanel-4.5.tgz.sig Binary files differdeleted file mode 100644 index 2b163238f5..0000000000 --- a/x11/fbpanel/fbpanel-4.5.tgz.sig +++ /dev/null diff --git a/x11/xsensors/DETAILS b/x11/xsensors/DETAILS index a2dfd3cecc..fe36c1d040 100755 --- a/x11/xsensors/DETAILS +++ b/x11/xsensors/DETAILS @@ -1,5 +1,6 @@ SPELL=xsensors VERSION=0.60 + PATCHLEVEL=1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://www.linuxhardware.org/xsensors/$SOURCE diff --git a/x11/xsensors/HISTORY b/x11/xsensors/HISTORY index 42c35d5b71..d12ce28f5f 100644 --- a/x11/xsensors/HISTORY +++ b/x11/xsensors/HISTORY @@ -1,3 +1,7 @@ +2007-11-27 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: PATCHLEVEL=1 + * PRE_BUILD, xsensors-0.60-libsensors-3.patch.bz2: added patch due to lm_sensors 3.0.0 + 2007-11-06 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.60 diff --git a/x11/xsensors/PRE_BUILD b/x11/xsensors/PRE_BUILD new file mode 100755 index 0000000000..86f9ca5859 --- /dev/null +++ b/x11/xsensors/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && + +bzcat $SCRIPT_DIRECTORY/xsensors-0.60-libsensors-3.patch.bz2 | patch -p1 diff --git a/x11/xsensors/xsensors-0.60-libsensors-3.patch.bz2 b/x11/xsensors/xsensors-0.60-libsensors-3.patch.bz2 Binary files differnew file mode 100644 index 0000000000..fa159a1f9b --- /dev/null +++ b/x11/xsensors/xsensors-0.60-libsensors-3.patch.bz2 |