New commits:
commit ec2fd588908ad9bbffcb041a2f8d196a167c589b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gimp 2.6.7
commit 9b6481276324230e6456bbd08478f48b24957051
Author: Bor Kraljic <pyrobor AT ver.si>
Commit: Don Johnson <minozake@felix-desktop.(none)>
qalculate-gtk => 0.9.6 & cln-config fix patch
commit 921fc34877f0dedb6c58f003e8214507450e2dcb
Author: Bor Kraljic <pyrobor AT ver.si>
Commit: Don Johnson <minozake@felix-desktop.(none)>
qalculate-kde => 0.9.6 & cln-config fix patch
commit b52952da47956cbd654f83c6cae8e8c4b50d45ef
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gnutls 2.8.3, default GNUTLS_BRANCH = 2.8
commit 8feded645dd6e84d13d2025e5b89e70b691b8710
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
acpitool 0.5.1
commit cb08440f2d796dc92395efcaab5ef99b0b98b417
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
rubygems: => 1.3.5
commit d15d801a09bf92417490ab056de33c68359d5cc3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
cryptsetup-luks 1.0.7
commit 2c03852e6fb57f58aeb20e0dd885e0ea116933c6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ruby: => 1.8.7-p174
commit 03010fd962dc9c4775ecd5399b8001a549f93c54
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xsane: fixed compilation with recent sane-backends
commit 9143b912f2ba14e0ce29cb84b57380e59439dbfb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdebase4-runtime: => 4.3.64svn1010339
commit 0537c3f77505b83d2bec1540947462628ae6a91b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdeutils4: => 4.3.64svn1010339
commit 802988f7d3dd429c2d99135a06cccb34349689c2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdenetwork4: => 4.3.64svn1010339
commit dbe31f2f4337da7b8070d3b635cb2377d8ba1ca1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdemultimedia4: => 4.3.64svn1010339
commit 49eab50d9c93146d1740bda446133c6dfeadbeff
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdeplasmoids4: => 4.3.64svn1010339
commit b24cd0dd5a04618825cfb7a8d1d6681a34736f52
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdegames4: => 4.3.64svn1010339
commit 9c50bafbd1b6766565441b636170b6ec7419e22b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdeadmin4: => 4.3.64svn1010339
commit c3e5e5dd8d05415053dcf1f675cd656df6c555df
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdebase-workspace4: => 4.3.64svn1010339
commit 86a008984455aef931b4bfab0a74d8316f69abca
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdebase4: => 4.3.64svn1010339
commit 44e55f6a539896c3e7feaf4375a5d2bad8eec67d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdepim4-runtime: => 4.3.64svn1010339
commit eafb805a531febdcffb5571c39e9e187795f41be
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdepimlibs4: => 4.3.64svn1010339
commit 1b925acce726529f773c7b341293f180167db158
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdelibs4-experimental: => 4.3.64svn1010339
commit 88ef2b9c2d5f62b5746b8090863d20c665836193
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdelibs4: => 4.3.64svn1010339
commit 02da15e90f5e606794f322cdaf45ebc1c131532c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdegraphics4: => 4.3.64svn1010339
commit 73b213529a7eeb75711b729671c0bce416aa6a19
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdegraphics4: => 4.3.64svn1010339
commit d01abfde304cb80c2d117291ca437fb5e3db08a5
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Julien ROZO <julien AT rozo.org>
ktorrent4 => 3.2.3
commit ac80084e5ad4db8fa6507745108525fa23f3cfb3
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
Revert "ktorrent4: updated version to 3.2.3"
I have to learn how to use efficiently the way conflict/merge works in
git
This reverts commit 37234becc9962ebfbb4c290af1d1666f59e13511.
commit 306ed0f1e990419208053a42f628d99771cccc04
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libpng: => 1.2.39
commit 3f5d36136fa4a950149286355162f39e5bc47ecf
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
quodlibet 2.1
commit 5ecdb7a1ba8c604b4e1bbe3074b5bdce83f5930f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
audio-players/quodlibet -> python-pypi/quodlibet
commit c78f0e9a18ad24047ea5ebd3094c5893bc341290
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
mutagen 1.16
commit 1e38fdc9795168eb12202eb8befd46849a5cf0d4
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>
utils/9base: corrected install path and conflicts with plan9port
commit d9712105f1189d0ae2400c07368997e582829e3b
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>
utils/plan9port: removed conflict with 9rc, ensure /opt is present
commit 25f1e0da2bb4661be1ce48847393ad001e94dfec
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pywebkitgtk 1.1.6
commit 5d5ca6b685aabdcce97970bc5cfe2ab05d756014
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>
utils/plan9port: updated to version 20090812, now provides PLAN9TOOLS
commit 5d506a4f738ff3cdcea70e56066e38a99f55954a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gnote 0.6.2
commit d193f1dcb774ad45eb1a0be446a42ec2ac1aec25
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gmime 2.4.8
commit 303c7767e35e393fb2e3d1cf9bfa0dbafa54aa91
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
botan 1.8.6
commit e23e724514216dd129699d249bda0932639c5ce6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sylpheed: => 2.7.1
commit 4c6a506e876836690796a2c312e4b88c10b2e03b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
f-spot 0.6.0.0
commit d3f562fa8b4a0df062a27ffb29b5f8e73dedcfd7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
merkaartor: => 0.14
commit d88140ddb10da88e916f37d8ceda5e75bc3ea413
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libssh 0.3.2
commit dfedf86f55ad7da2157e6d9e451b096ad69bff96
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pygame 1.9.1release
commit 1e7cca3860af6bd616d1bc3d854f95fa5c678896
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libev 3.8
commit cb210ecc9da3d53079a2999bc2005184c7ac852f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdepim4: => 4.3.63svn1008367
commit 82716463dd350ac3e6ec4633cb2c801e78432d61
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdegraphics4 0 fix pkconfig issue
commit 46d22de0b6dd79ea4e2b08f1f49244ad19394be2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libssh2 1.2
commit 8172389ca5e0f79e7a19e2f227d4d6998561d9c0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
iso-codes 3.10.2
commit 4c0f6b95ad7353ad07d2934f286991a5c58df05e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
Revert "fix bug #15343"
caused more problems than it solved
This reverts commit 55d694b32924dd9bd8fd44f1738975ce4ee79695.
commit 45268cccd3436a6dabcd788f2153a0fb3291fe67
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>
cln => 1.30.0
commit 2ce3ab3904df839a683d21daeb48892c6d026794
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>
qalculate => 0.9.6
commit 9a1ff46363b678f2457707294f5a2a280f96a781
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>
ktorrent4 => 3.2.3
commit 9f04caf5561cc2c577890f300eaad2c779c11558
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
koffice2: => 2.0.2
commit 55d694b32924dd9bd8fd44f1738975ce4ee79695
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
fix bug #15343
commit 287b0b35d9591b462e1349885b1e0464df5c1bd5
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>
utils/9base: updated to version 3, now provides PLAN9TOOLS
commit 3638e62d219f2d9f05977db37b58fe07d03d1f8c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
sqlobject: => 0.11.0
commit 4cce6d8acf61b4774030395ed0e7101ff6bebc3f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
gtk-vnc: Updated to 0.3.9
SOURCE_URL moved to GNOME_URL from SOURCEFORGE_URL
SOURCE matches upstream posted SHA256
commit 83705cc143cf3a66ea220f675559b3526f369e24
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
commit e6ac3327b2d9da6909834d1836d4b77bf495da30
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
phpmyadmin: Updated to version 3.2.1
commit e14d24177a2781752846fac28ce6148d66dfdcca
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
curl 7.19.6, SECURITY_PATCH=5
commit eafb5b8356ced86fd0d42e63f4a6d7966b0092d6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pixman: => 0.15.20
commit a48a39bb5b5f2f9886bef43be092faf3b28dd8bf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
digikam4 - update depends & triggers
commit 94b46703bf2b19fb6a37d9b5c1a9ea4f92bd2789
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pstoedit: => 3.50
commit 3573155aad9d2fa821c328841e522545fd621e9a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
jpeg - optimiseUP_TRIGGERS
commit 2c2a916293afc7f50b788405de3da84047191f2f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
netaddr: => 0.7
commit 37234becc9962ebfbb4c290af1d1666f59e13511
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
ktorrent4: updated version to 3.2.3
commit 0956308017b768db0e2f91993ebf389f01e83058
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
eigen2: => 2.0.4
commit 26b50b2e1a11dd81642089192e2974ef85ac7ed4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
memcached: new spell, high-performance, distributed memory object caching
system
commit 32521336366cb96f694ba5a01c9127d59b6c5198
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
added memcached user/group, fixed pkcs11 group creation
commit b4926dc412976f8eed7406364ddcbbe8e22c2c66
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libevent: => 1.4.12
commit e27df4a01a6299da8b51987dc5f191a4f6c2b32a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
jpeg: => 7
commit 9221044c2e3e9dec54d4b9477ceb35db0a7b5208
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
webkitgti: Updated devel/nightly to r47011
commit 53d933e8b1f17a752392641cf028fcd0688ff65b
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
bluez: updated version to 4.47
commit 3e2888597f41d27c586634953eb49888649ef035
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
kdesvn: updated version to 1.0.6, fixed SOURCE_URL
commit 288e2e26774c83e49bbe62464e43f26cadbc915e
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
kdesvn4: updated version to 1.4.0
commit 94cab9b8e9f8b0bc22cccac95b667326ded5feaa
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sqlite: => 3.6.17
commit 536cf223a5b13a9f571cfed0464361bd5f3d560a
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
bash: Added latest upstream patches. I have been running for a
few weeks. PATCHLEVEL++
commit d147dafaed8cad74f400d289e02aff52b733a41d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
spamprobe: fixed compile with current gcc
commit 9ae7da5a91aec169291ff243e10b5e2297996b20
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
liferea: Updated devel to version 1.7.1
commit 70dfcf2e2ff4d1e43cc6f8779aa7d812805d9bfb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdeplasmoids4: => 4.3.63svn1007208
commit c4daff6d74f0c3cb0cf2ce801fe23a1ca974bfb6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdeutils4: => 4.3.63svn1007208
commit 9c9bc18bf7fce90f5fa036eeab9caa2312a43654
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdewebdev4: => 4.3.63svn1007208
commit b4c241bccb5e7d3dc2903f0166402fbb3e9402a8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdetoys4: => 4.3.63svn1007208
commit 9bef2b3021ab883fd8c2d7a9c72a89225772a716
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdesdk4: => 4.3.63svn1007208
commit 676d2ac5b73b1494bf2b008f3052ea9814dd1706
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdeedu4: => 4.3.63svn1007208
commit 2ddaaf2d47d8dc320ebcbf6c6af2b5461d838417
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdebindings4: => 4.3.63svn1007208
commit b4782877303c1255dc9a2ad4f18c3f11d46a768d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdeartwork4: => 4.3.63svn1007208
commit d50ed9875a049df741c176ec30f20770f036ffec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdeaccessibility4: => 4.3.63svn1007208
commit 0ae85a6c4bf2e07432b099bb7a247670ef936056
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
oxygen-icons: => 4.3.63svn1007208
commit 9505535f70f330c9a974f39a7006031b4970e4c4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdemultimedia4: => 4.3.63svn1007208
commit 408d33ff9a12aed4513e612c82e5d08c9d8026f4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdenetwork4: => 4.3.63svn1007208
commit 4075aa29e67be7016f9ac876324517e3decb656b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
roundup: => 1.4.9
commit ae7a4323692b964ff174c2ee62bfc5b9f96ef98f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdegraphics4: => 4.3.63svn1007208
commit 58e5374e1472bcfc54451bb3fe3dc38711f57247
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdegames4: => 4.3.63svn1007208
commit b46e36f5c32ba310dd5771a222836bf0f308d283
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
suds: => 0.3.6
commit f203bae82acfea338f5d2e846772d58b49cae580
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdeadmin4: => 4.3.63svn1007208
commit 7b4a04ddee2bae0001ecebf22003c0cbd176dfdb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdebase4: => 4.3.63svn1007208
commit 5e9e1db88598e1ee50cbd766c9136c7b9797e964
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdepim4-runtime: => 4.3.63svn1007208
commit 5cedf6717fd6f273e6e29e256c8e1b292143dbc6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdebase-workspace4: => 4.3.63svn1007208
commit 1b139cf4d613d599c67a2f2429c09df022d8d87f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdepimlibs4: => 4.3.63svn1007208
commit 8a0d82ba4bc1e62f145c23846ca529b440c190bf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdebase4-runtime: => 4.3.63svn1007208
commit 92dee228f6429dc07d52c714938ca8370a099c55
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdelibs4-experimental: => 4.3.63svn1007208
commit 40322c05dbbf2c68fdce8b8147c3a23e9047c2f4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdelibs4: => 4.3.63svn1007208
commit ab6d686bceb6733a454bcdce3326d49ebd2707d1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mhwaveedit: => 1.4.16
diff --git a/ChangeLog b/ChangeLog
index 9bec4f1..4d53a5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * audio-players/quodlibet: -> python-pypi/quodlibet
+
+2009-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * net/memcached: new spell, high-performance, distributed memory
object
+ caching system
+ * accounts, groups: added memcached
+
2009-08-09 Arjan Bouter <abouter AT sourcemage.org>
* disk/grub2: new spell, grub2 bootloader
* java/fastjar: new spell, java jar generator
@@ -19,7 +27,7 @@
2009-08-03 Arjan Bouter <abouter AT sourcemage.org>
* wm-addons/pekwm-themes: new spell, pekwm themes
-
+
2009-08-01 Quentin Rameau <quinq AT sourcemage.org>
* audio-players/kuechenstation: new spell, xmms2 console client
diff --git a/audio-players/quodlibet/BUILD b/audio-players/quodlibet/BUILD
deleted file mode 100755
index 6d4ffad..0000000
--- a/audio-players/quodlibet/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-make &&
-if [ "$EXTENSIONS" == "y" ] ; then
- make extensions
-fi
diff --git a/audio-players/quodlibet/CONFIGURE
b/audio-players/quodlibet/CONFIGURE
deleted file mode 100755
index 2848696..0000000
--- a/audio-players/quodlibet/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query EXTENSIONS "Build extensions (trayicon, mmkeys)?" y &&
-persistent_add EXTENSIONS
diff --git a/audio-players/quodlibet/DEPENDS b/audio-players/quodlibet/DEPENDS
deleted file mode 100755
index 19ddbcf..0000000
--- a/audio-players/quodlibet/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends pygtk2 &&
-depends gstreamer &&
-depends gst-python &&
-depends mutagen
diff --git a/audio-players/quodlibet/DETAILS b/audio-players/quodlibet/DETAILS
deleted file mode 100755
index 0918acf..0000000
--- a/audio-players/quodlibet/DETAILS
+++ /dev/null
@@ -1,27 +0,0 @@
- SPELL=quodlibet
- VERSION=1.0
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.sacredchao.net/~piman/software/$SOURCE
-
SOURCE_HASH=sha512:bcd0149ad0c4dc321b72f037d18c90b9b176c159e17fd55040b19d6666540f05f2eee40eb891b4b4bf654de27a6760b5b7c6f469a7b6d933982734f8ff4f9120
- WEB_SITE=http://www.sacredchao.net/quodlibet
- ENTERED=20060905
- LICENSE[0]=GPL
- SHORT="Quod Libet is a GTK+-based audio player written in Python."
-cat << EOF
-Quod Libet is a GTK+-based audio player written in Python.
-It's designed around the idea that you know better than we do how to organize
-your music. It lets you make playlists based on regular expressions (don't
-worry, regular searches work too). It lets you display and edit any tags you
-want in the file. And it lets you do this for all the file formats it
supports
--- Ogg Vorbis, FLAC, MP3, Musepack, and MOD.
-
-Quod Libet easily scales to libraries of thousands of songs.
-It also supports most of the features you expect from a modern media player,
-like Unicode support, multimedia keys, and tag editing.
-
-Ex Falso is a program that uses the same tag editing backend as Quod Libet,
-but isn't connected to an audio player. If you're perfectly happy with your
-favorite player and just want something that can handle tagging, Ex Falso
-is for you.
-EOF
diff --git a/audio-players/quodlibet/HISTORY b/audio-players/quodlibet/HISTORY
deleted file mode 100644
index 047d0da..0000000
--- a/audio-players/quodlibet/HISTORY
+++ /dev/null
@@ -1,13 +0,0 @@
-2007-05-05 Alexander Tsamutali <astsmtl AT gmail.com>
- * DETAILS: Updated to 1.0
- * PRE_BUILD, make_install.patch: Removed
-
-2006-12-02 Alexander Tsamutali <astsmtl AT gmail.com>
- * PRE_BUILD: Added to patch 'Makefile'
- * CONFIGURE, BUILD: Now we can optionally build extensions
-
-2006-12-01 Bearcat M. Sandor <sourcemage AT feline-soul.com>
- * DETAILS: Updated to 0.24
-
-2006-09-05 Alexander Tsamutali <astsmtl AT gmail.com>
- * Created this spell
diff --git a/audio-players/quodlibet/INSTALL b/audio-players/quodlibet/INSTALL
deleted file mode 100755
index c464315..0000000
--- a/audio-players/quodlibet/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-PREFIX=/usr make install
diff --git a/crypto/botan/DETAILS b/crypto/botan/DETAILS
index 48dd578..b6b4f3a 100755
--- a/crypto/botan/DETAILS
+++ b/crypto/botan/DETAILS
@@ -1,5 +1,5 @@
SPELL=botan
- VERSION=1.8.5
+ VERSION=1.8.6
SOURCE=Botan-$VERSION.tbz
SOURCE_URL[0]=http://files.randombit.net/botan/$SOURCE
diff --git a/crypto/botan/HISTORY b/crypto/botan/HISTORY
index 68b82e6..5a16802 100644
--- a/crypto/botan/HISTORY
+++ b/crypto/botan/HISTORY
@@ -1,3 +1,6 @@
+2009-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.6
+
2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.5
diff --git a/crypto/cryptsetup-luks/DETAILS b/crypto/cryptsetup-luks/DETAILS
index a6b8ebe..cc85582 100755
--- a/crypto/cryptsetup-luks/DETAILS
+++ b/crypto/cryptsetup-luks/DETAILS
@@ -1,9 +1,9 @@
SPELL=cryptsetup-luks
- VERSION=1.0.6
+ VERSION=1.0.7
SOURCE=cryptsetup-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/cryptsetup-$VERSION
SOURCE_URL[0]=http://cryptsetup.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:deed2c603bfba3b26eb1cab65d880eb9fd69dc4aabc9e8fa2bf78de0879ecd5ddb03c4c6bd9c0ec166d2d5e87a13bb370e6e46d50f5dd246522e81bf75380e1b
+
SOURCE_HASH=sha512:e7fb5f2bfa8f79ce45c0b559220ac58374ef4318d2a96fbcc5a253eb898776ad55cc15d180b2654588b7eecb94df4d03594bf7551c24d456eba147ee1fb310f6
WEB_SITE=http://code.google.com/p/cryptsetup/
ENTERED=20060117
LICENSE[0]=GPL
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index 462ad85..5f9e433 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,6 @@
+2009-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.7
+
2009-03-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: updated WEB_SITE and SOURCE_URL[0]
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 35ffc49..f16795e 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -15,7 +15,7 @@ fi
if [ -z "$GNUTLS_BRANCH" ] || [ "$GNUTLS_BRANCH" == "DEFAULT" ]; then
- GNUTLS_BRANCH="2.6"
+ GNUTLS_BRANCH="2.8"
fi
case $GNUTLS_BRANCH in
@@ -60,9 +60,9 @@ case $GNUTLS_BRANCH in
diff --git a/graphics-libs/jpeg/UP_TRIGGERS b/graphics-libs/jpeg/UP_TRIGGERS
new file mode 100755
index 0000000..ac2364c
--- /dev/null
+++ b/graphics-libs/jpeg/UP_TRIGGERS
@@ -0,0 +1,18 @@
+# up_trigger everything on major version updates
+
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if test "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}"; then
+ message "This is a possibly incompatible update of jpeg..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+# special case for version 6b
+ OLD_SPELL_VERSION=${OLD_SPELL_VERSION/6b/62}
+ for each in $(show_up_depends $SPELL 1); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libjpeg\.so\.$OLD_SPELL_VERSION"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index 1885373..f79f4c4 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,6 +1,6 @@
SPELL=libpng
- VERSION=1.2.38
-
SOURCE_HASH=sha512:35791954c708d3ecfe45ff1ed01086622ef091fbee3e6042f4ad010e1dedaf478a415da6065d9cb6c39911f376145f19bdce562614ca0e9e5e1266e72c4275ab
+ VERSION=1.2.39
+
SOURCE_HASH=sha512:0898d76c549a9c75c8d13eeb7bb74ae71592395d5956bd10543d7192b06d2836a60cb9915e25d6c1b1a31b4c469923f18d8b9cf6fb15597a8248fc5d282870f4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index 569765f..16b80b2 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,6 @@
+2009-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.39
+
2009-07-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.38
* PRE_BUILD, libpng-1.2.38-apng.patch.gz: added patch from
diff --git a/graphics/f-spot/DETAILS b/graphics/f-spot/DETAILS
index 08703ab..348fc27 100755
--- a/graphics/f-spot/DETAILS
+++ b/graphics/f-spot/DETAILS
@@ -1,5 +1,5 @@
SPELL=f-spot
- VERSION=0.5.0.3
+ VERSION=0.6.0.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics/f-spot/HISTORY b/graphics/f-spot/HISTORY
index ee234bb..4640e7e 100644
--- a/graphics/f-spot/HISTORY
+++ b/graphics/f-spot/HISTORY
@@ -1,3 +1,6 @@
+2009-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.0.0
+
2009-07-24 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DEPENDS: changed to sqlite from sqlite2 as sqlite3 is now required
diff --git a/graphics/f-spot/f-spot-0.5.0.3.tar.bz2.sig
b/graphics/f-spot/f-spot-0.5.0.3.tar.bz2.sig
deleted file mode 100644
index 544e654..0000000
Binary files a/graphics/f-spot/f-spot-0.5.0.3.tar.bz2.sig and /dev/null differ
diff --git a/graphics/f-spot/f-spot-0.6.0.0.tar.bz2.sig
b/graphics/f-spot/f-spot-0.6.0.0.tar.bz2.sig
new file mode 100644
index 0000000..f9361ce
Binary files /dev/null and b/graphics/f-spot/f-spot-0.6.0.0.tar.bz2.sig differ
diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index aed574c..313ae52 100755
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -11,7 +11,7 @@ optional_depends lcms "" "" "for color proof module" &&
optional_depends libwmf "" "" "for Windows Metafile Format support" &&
diff --git a/python-pypi/pygame/DETAILS b/python-pypi/pygame/DETAILS
index 7d479ad..2f7186d 100755
--- a/python-pypi/pygame/DETAILS
+++ b/python-pypi/pygame/DETAILS
@@ -1,9 +1,9 @@
SPELL=pygame
- VERSION=1.9.0release
+ VERSION=1.9.1release
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.pygame.org/ftp/$SOURCE
-
SOURCE_HASH=sha512:3a3c8e21acf9edfffa5c10e0c71f1d5daa7fe6f3afa423309f991e1b20deb8e4bc1d4b179b070817be2725f07cab3e703cb7ef0369e3213debda903b616a9cb4
+
SOURCE_HASH=sha512:485f02c4f3113a9de5e731c089de8a9bdcc639152de162f20eb8b50659a42e24f53d0685346dc46f390439be5a5c001dcce7cb866b180948c0f1441d01a7d6c2
LICENSE[0]=LGPL
WEB_SITE=http://www.pygame.org
KEYWORDS="sdl python devel"
diff --git a/python-pypi/pygame/HISTORY b/python-pypi/pygame/HISTORY
index 6ba6520..296a036 100644
--- a/python-pypi/pygame/HISTORY
+++ b/python-pypi/pygame/HISTORY
@@ -1,3 +1,7 @@
+2009-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.9.1release
+ * PRE_BUILD: removed
+
2009-08-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9.0release
* PRE_BUILD: added to remove readme.html (not included)
diff --git a/python-pypi/pygame/PRE_BUILD b/python-pypi/pygame/PRE_BUILD
deleted file mode 100755
index 268546a..0000000
--- a/python-pypi/pygame/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sedit "177d" setup.py
diff --git a/python-pypi/quodlibet/CONFIGURE b/python-pypi/quodlibet/CONFIGURE
new file mode 100755
index 0000000..2848696
--- /dev/null
+++ b/python-pypi/quodlibet/CONFIGURE
@@ -0,0 +1,2 @@
+config_query EXTENSIONS "Build extensions (trayicon, mmkeys)?" y &&
+persistent_add EXTENSIONS
diff --git a/python-pypi/quodlibet/DEPENDS b/python-pypi/quodlibet/DEPENDS
new file mode 100755
index 0000000..19ddbcf
--- /dev/null
+++ b/python-pypi/quodlibet/DEPENDS
@@ -0,0 +1,4 @@
+depends pygtk2 &&
+depends gstreamer &&
+depends gst-python &&
+depends mutagen
diff --git a/python-pypi/quodlibet/DETAILS b/python-pypi/quodlibet/DETAILS
new file mode 100755
index 0000000..6f656db
--- /dev/null
+++ b/python-pypi/quodlibet/DETAILS
@@ -0,0 +1,27 @@
+ SPELL=quodlibet
+ VERSION=2.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://quodlibet.googlecode.com/files/$SOURCE
+
SOURCE_HASH=sha512:048a42d300b3fbfaf3e502b411b8c00b4877e460c4937a3a2dafd48b4f050686226564bacbe629e9864928ae871c06a42afbe84b6a762764bce5362eb70bed19
+ WEB_SITE=http://code.google.com/p/quodlibet/
+ ENTERED=20060905
+ LICENSE[0]=GPL
+ SHORT="Quod Libet is a GTK+-based audio player written in Python."
+cat << EOF
+Quod Libet is a GTK+-based audio player written in Python.
+It's designed around the idea that you know better than we do how to organize
+your music. It lets you make playlists based on regular expressions (don't
+worry, regular searches work too). It lets you display and edit any tags you
+want in the file. And it lets you do this for all the file formats it
supports
+-- Ogg Vorbis, FLAC, MP3, Musepack, and MOD.
+
+Quod Libet easily scales to libraries of thousands of songs.
+It also supports most of the features you expect from a modern media player,
+like Unicode support, multimedia keys, and tag editing.
+
+Ex Falso is a program that uses the same tag editing backend as Quod Libet,
+but isn't connected to an audio player. If you're perfectly happy with your
+favorite player and just want something that can handle tagging, Ex Falso
+is for you.
+EOF
diff --git a/python-pypi/quodlibet/HISTORY b/python-pypi/quodlibet/HISTORY
new file mode 100644
index 0000000..ddd38b2
--- /dev/null
+++ b/python-pypi/quodlibet/HISTORY
@@ -0,0 +1,17 @@
+2009-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1, new WEB_SITE and SOURCE_URL[0]
+ * spell moved to python-pypi section -> removed BUILD and INSTALL
+
+2007-05-05 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: Updated to 1.0
+ * PRE_BUILD, make_install.patch: Removed
+
+2006-12-02 Alexander Tsamutali <astsmtl AT gmail.com>
+ * PRE_BUILD: Added to patch 'Makefile'
+ * CONFIGURE, BUILD: Now we can optionally build extensions
+
+2006-12-01 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * DETAILS: Updated to 0.24
+
+2006-09-05 Alexander Tsamutali <astsmtl AT gmail.com>
+ * Created this spell
diff --git a/python-pypi/roundup/DETAILS b/python-pypi/roundup/DETAILS
index c4dfba3..88e7228 100755
--- a/python-pypi/roundup/DETAILS
+++ b/python-pypi/roundup/DETAILS
@@ -1,8 +1,8 @@
SPELL=roundup
- VERSION=1.4.8
+ VERSION=1.4.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/r/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:dad2866a426f541706d0c22693166fe05815dc25148ddcdf4edd661061fa333a3c584ba622d5c9a38bf72876ce73790688a0d05bc701bc5435f186d6736ea233
+
SOURCE_HASH=sha512:7ea013362fb73b271b275a94e69cd7068cde46cb506955140202db2bdf1ea3c2d78fcce5f8ff547b2a9139d0e46b85a4e667ce5a176621293be93cfdc2d238e2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://roundup.sourceforge.net/
LICENSE[0]=PYTHON
diff --git a/python-pypi/roundup/HISTORY b/python-pypi/roundup/HISTORY
index 5a69aba..682a6e2 100644
--- a/python-pypi/roundup/HISTORY
+++ b/python-pypi/roundup/HISTORY
@@ -1,3 +1,6 @@
+2009-08-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.9
+
2009-03-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.8
diff --git a/science-libs/cln/DETAILS b/science-libs/cln/DETAILS
index abed2cf..e498297 100755
--- a/science-libs/cln/DETAILS
+++ b/science-libs/cln/DETAILS
@@ -1,15 +1,16 @@
SPELL=cln
- VERSION=1.1.11
+ VERSION=1.3.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.ginac.de/$SOURCE
+ SOURCE_URL[0]=http://www.ginac.de/CLN/$SOURCE
SOURCE_URL[1]=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/$SOURCE
-
SOURCE_HASH=sha512:ae5fc1d15d13281eaf8af763b22b92092123f9827ea9a6d542e0db3a0d117823dfad9930e10b1e278023248a02c5715d3b15898f1886f3ebadf6f152133d5a12
+
SOURCE_HASH=sha512:85b01f53d92558ccd3744216f34240aa696378179eee5fc45251e335ed0a17d9163ac8366cd0949ff5f0556e88a49e8801b883f3995f1452ecdf4c7ba238758b
WEB_SITE=http://www.ginac.de/CLN/
ENTERED=2004
LICENSE[0]=GPL
KEYWORDS="science libs"
SHORT="CLN is a library for efficient computations with all kinds
of numbers in arbitrary precision."
cat << EOF
-CLN is a library for efficient computations with all kinds of numbers in
arbitrary precision.
+CLN is a library for efficient computations with all kinds of numbers in
+arbitrary precision.
EOF
diff --git a/science-libs/cln/HISTORY b/science-libs/cln/HISTORY
index 1848baa..119e6a9 100644
--- a/science-libs/cln/HISTORY
+++ b/science-libs/cln/HISTORY
@@ -1,3 +1,8 @@
+2009-08-12 Bor Kraljic <pyrobor AT ver.si>
+ * DETAILS: Fixed SOURCE_URL[0]
+ fixed long description wrap
+ updated spell to 1.3.0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/science/qalculate-gtk/PRE_BUILD b/science/qalculate-gtk/PRE_BUILD
new file mode 100755
index 0000000..5ffb898
--- /dev/null
+++ b/science/qalculate-gtk/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+unpack_file &&
+cd $SOURCE_DIRECTORY &&
+echo "PATCHING" &&
+patch -p1 < $SPELL_DIRECTORY/qalculate-gtk-0.9.6-cln-config.patch
diff --git a/science/qalculate-gtk/qalculate-gtk-0.9.6-cln-config.patch
b/science/qalculate-gtk/qalculate-gtk-0.9.6-cln-config.patch
new file mode 100644
index 0000000..624f091
--- /dev/null
+++ b/science/qalculate-gtk/qalculate-gtk-0.9.6-cln-config.patch
@@ -0,0 +1,160 @@
+diff -Naur qalculate-gtk-0.9.6/aclocal.m4 qalculate-gtk-0.9.6.new/aclocal.m4
+--- qalculate-gtk-0.9.6/aclocal.m4 2007-06-17 04:45:44.000000000 -0400
++++ qalculate-gtk-0.9.6.new/aclocal.m4 2008-02-02 11:04:21.000000000 -0500
+@@ -7836,146 +7836,27 @@
+ [dnl
+ dnl Get the cppflags and libraries from the cln-config script
+ dnl
+-AC_ARG_WITH(cln-prefix,[ --with-cln-prefix=PFX Prefix where CLN is
installed (optional)],
+- cln_config_prefix="$withval", cln_config_prefix="")
+-AC_ARG_WITH(cln-exec-prefix,[ --with-cln-exec-prefix=PFX Exec prefix where
CLN is installed (optional)],
+- cln_config_exec_prefix="$withval", cln_config_exec_prefix="")
+-AC_ARG_ENABLE(clntest, [ --disable-clntest Do not try to compile and
run a test CLN program],
+- , enable_clntest=yes)
+-
+-if test x$cln_config_exec_prefix != x ; then
+- cln_config_args="$cln_config_args --exec-prefix=$cln_config_exec_prefix"
+- if test x${CLN_CONFIG+set} != xset ; then
+- CLN_CONFIG=$cln_config_exec_prefix/bin/cln-config
+- fi
+-fi
+-if test x$cln_config_prefix != x ; then
+- cln_config_args="$cln_config_args --prefix=$cln_config_prefix"
+- if test x${CLN_CONFIG+set} != xset ; then
+- CLN_CONFIG=$cln_config_prefix/bin/cln-config
+- fi
+-fi
+
+-AC_PATH_PROG(CLN_CONFIG, cln-config, no)
++AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ cln_min_version=ifelse([$1], ,1.1.0,$1)
+ AC_MSG_CHECKING(for CLN - version >= $cln_min_version)
+-if test "$CLN_CONFIG" = "no" ; then
++if test "$PKG_CONFIG" = "no" ; then
+ AC_MSG_RESULT(no)
+- echo "*** The cln-config script installed by CLN could not be found"
+- echo "*** If CLN was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the CLN_CONFIG environment variable to the"
+- echo "*** full path to cln-config."
++ echo "*** could not find pkg-config"
+ ifelse([$3], , :, [$3])
+ else
+ dnl Parse required version and the result of cln-config.
+- cln_min_major_version=`echo $cln_min_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- cln_min_minor_version=`echo $cln_min_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- cln_min_micro_version=`echo $cln_min_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+- CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags`
+- CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
+- cln_config_version=`$CLN_CONFIG $cln_config_args --version`
+- cln_config_major_version=`echo $cln_config_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- cln_config_minor_version=`echo $cln_config_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- cln_config_micro_version=`echo $cln_config_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-dnl Check if the installed CLN is sufficiently new according to cln-config.
+- if test \( $cln_config_major_version -lt $cln_min_major_version \) -o \
+- \( $cln_config_major_version -eq $cln_min_major_version -a
$cln_config_minor_version -lt $cln_min_minor_version \) -o \
+- \( $cln_config_major_version -eq $cln_min_major_version -a
$cln_config_minor_version -eq $cln_min_minor_version -a
$cln_config_micro_version -lt $cln_min_micro_version \); then
+- echo -e "\n*** 'cln-config --version' returned
$cln_config_major_version.$cln_config_minor_version.$cln_config_micro_version,
but the minimum version"
+- echo "*** of CLN required is
$cln_min_major_version.$cln_min_minor_version.$cln_min_micro_version. If
cln-config is correct, then it is"
+- echo "*** best to upgrade to the required version."
+- echo "*** If cln-config was wrong, set the environment variable
CLN_CONFIG"
+- echo "*** to point to the correct copy of cln-config, and remove
the file"
+- echo "*** config.cache before re-running configure."
+- ifelse([$3], , :, [$3])
++ if $PKG_CONFIG cln --atleast-version=${cln_min_version}; then
++ echo "Found cln >= ${cln_min_version}"
++ CLN_CPPFLAGS=`$PKG_CONFIG cln --cflags`
++ CLN_LIBS=`$PKG_CONFIG cln --libs`
+ else
+-dnl The versions match so far. Now do a sanity check: Does the result of
cln-config
+-dnl match the version of the headers and the version built into the
library, too?
+- no_cln=""
+- if test "x$enable_clntest" = "xyes" ; then
+- ac_save_CPPFLAGS="$CPPFLAGS"
+- ac_save_LIBS="$LIBS"
+- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+- LIBS="$LIBS $CLN_LIBS"
+- rm -f conf.clntest
+- AC_TRY_RUN([
+-#include <stdio.h>
+-#include <string.h>
+-#include <cln/version.h>
+-
+-/* we do not #include <stdlib.h> because autoconf in C++ mode inserts a
+- prototype for exit() that conflicts with the one in stdlib.h */
+-extern "C" int system(const char *);
+-
+-int main(void)
+-{
+- system("touch conf.clntest");
+-
+- if ((CL_VERSION_MAJOR != $cln_config_major_version) ||
+- (CL_VERSION_MINOR != $cln_config_minor_version) ||
+- (CL_VERSION_PATCHLEVEL != $cln_config_micro_version)) {
+- printf("\n*** 'cln-config --version' returned %d.%d.%d, but the
header file I found\n", $cln_config_major_version, $cln_config_minor_version,
$cln_config_micro_version);
+- printf("*** corresponds to %d.%d.%d. This mismatch suggests your
installation of CLN\n", CL_VERSION_MAJOR, CL_VERSION_MINOR,
CL_VERSION_PATCHLEVEL);
+- printf("*** is corrupted or you have specified some wrong -I
compiler flags.\n");
+- printf("*** Please inquire and consider reinstalling CLN.\n");
+- return 1;
+- }
+- if ((cln::version_major != $cln_config_major_version) ||
+- (cln::version_minor != $cln_config_minor_version) ||
+- (cln::version_patchlevel != $cln_config_micro_version)) {
+- printf("\n*** 'cln-config --version' returned %d.%d.%d, but the
library I found\n", $cln_config_major_version, $cln_config_minor_version,
$cln_config_micro_version);
+- printf("*** corresponds to %d.%d.%d. This mismatch suggests your
installation of CLN\n", cln::version_major, cln::version_minor,
cln::version_patchlevel);
+- printf("*** is corrupted or you have specified some wrong -L
compiler flags.\n");
+- printf("*** Please inquire and consider reinstalling CLN.\n");
+- return 1;
+- }
+- return 0;
+-}
+-],, no_cln=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+- CPPFLAGS="$ac_save_CPPFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- if test "x$no_cln" = x ; then
+- AC_MSG_RESULT([yes, $cln_config_version])
+- ifelse([$2], , :, [$2])
+- else
+- AC_MSG_RESULT(no)
+- if test ! -f conf.clntest ; then
+- echo "*** Could not run CLN test program, checking why..."
+- CPPFLAGS="$CFLAGS $CLN_CPPFLAGS"
+- LIBS="$LIBS $CLN_LIBS"
+- AC_TRY_LINK([
+-#include <stdio.h>
+-#include <cln/version.h>
+-], [ return 0; ],
+- [ echo "*** The test program compiled, but did not run.
This usually means"
+- echo "*** that the run-time linker is not finding CLN or
finding the wrong"
+- echo "*** version of CLN. If it is not finding CLN,
you'll need to set your"
+- echo "*** LD_LIBRARY_PATH environment variable, or edit
/etc/ld.so.conf to point"
+- echo "*** to the installed location. Also, make sure you
have run ldconfig if that"
+- echo "*** is required on your system."],
+- [ echo "*** The test program failed to compile or link. See
the file config.log for the"
+- echo "*** exact error that occured. This usually means
CLN was incorrectly installed"
+- echo "*** or that you have moved CLN since it was
installed. In the latter case, you"
+- echo "*** may want to edit the cln-config script:
$CLN_CONFIG." ])
+- CPPFLAGS="$ac_save_CPPFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- CLN_CPPFLAGS=""
+- CLN_LIBS=""
+- ifelse([$3], , :, [$3])
+- fi
++ echo "ERROR: cln >= ${cln_min_version} not found"
++ ifelse([$3], , :, [$3])
+ fi
+ fi
+ AC_SUBST(CLN_CPPFLAGS)
+ AC_SUBST(CLN_LIBS)
+-rm -f conf.clntest
+ ])
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf
-*-
+
diff --git a/science/qalculate-kde/BUILD b/science/qalculate-kde/BUILD
new file mode 100755
index 0000000..f414e63
--- /dev/null
+++ b/science/qalculate-kde/BUILD
@@ -0,0 +1,3 @@
+cd $SOURCE_DIRECTORY &&
+autoconf &&
+default_kde3_build
diff --git a/science/qalculate-kde/DETAILS b/science/qalculate-kde/DETAILS
index 4f82a2b..b255ee9 100755
--- a/science/qalculate-kde/DETAILS
+++ b/science/qalculate-kde/DETAILS
@@ -1,16 +1,16 @@
SPELL=qalculate-kde
- VERSION=0.9.4
+ VERSION=0.9.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/qalculate/$SOURCE
-
SOURCE_HASH=sha512:597673bf779482087f9e6319d542900c84878bac57e7a21fe31cae384cd7c41de324c4660581ff15373ae44e301032e12db03ada7f1f44976605a1bdc2bb419b
+
SOURCE_HASH=sha512:aa821192d2c2960d988c32cea7c9ee2aca75e6e7e985520cfdf69e714716ddf972f5d9c347bc8780df7cb34991710908c81eeb35b5f9a3d7f1f33411f5baf471
WEB_SITE=http://qalculate.sourceforge.net/
ENTERED=20050824
LICENSE[0]=GPL
KEYWORDS="calculator science kde"
- SHORT="KDE GUI to Qalculate, an advanced scientific calculator
and simple CAS"
+ SHORT="KDE3 GUI to Qalculate, an advanced scientific calculator
and simple CAS"
cat << EOF
-This is a KDE GUI to Qalculate
+This is a KDE3 GUI to Qalculate
Qalculate! is a multi-purpose desktop calculator for GNU/Linux.
It is small and simple to use but with much power and versatility underneath.
diff --git a/science/qalculate-kde/HISTORY b/science/qalculate-kde/HISTORY
index 3a3897c..a1e3d8c 100644
--- a/science/qalculate-kde/HISTORY
+++ b/science/qalculate-kde/HISTORY
@@ -1,3 +1,9 @@
+2009-08-13 Bor Kraljic <pyrobor AT ver.si>
+ * PRE_BUILD: added, apply the patch
+ * BUILD: added, autoconf & default_kde3_build
+ * qalculate-kde-0.9.6-cln-config.patch: added cln-config fix
+ * DETAILS: updated spell to 0.9.6
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/science/qalculate-kde/PRE_BUILD b/science/qalculate-kde/PRE_BUILD
new file mode 100755
index 0000000..2567589
--- /dev/null
+++ b/science/qalculate-kde/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+unpack_file &&
+cd $SOURCE_DIRECTORY &&
+echo "PATCHING" &&
+patch -p1 < $SPELL_DIRECTORY/qalculate-kde-0.9.6-cln-config.patch
diff --git a/science/qalculate-kde/qalculate-kde-0.9.6-cln-config.patch
b/science/qalculate-kde/qalculate-kde-0.9.6-cln-config.patch
new file mode 100644
index 0000000..a28e80a
--- /dev/null
+++ b/science/qalculate-kde/qalculate-kde-0.9.6-cln-config.patch
@@ -0,0 +1,35 @@
+diff -Naur qalculate-kde-0.9.6/configure.in
qalculate-kde-0.9.6.new/configure.in
+--- qalculate-kde-0.9.6/configure.in 2007-06-17 07:33:58.000000000 -0400
++++ qalculate-kde-0.9.6.new/configure.in 2008-06-15 07:20:32.000000000
-0400
+@@ -73,11 +73,7 @@
+
+ AC_LANG([C++])
+
+-AC_PATH_CLN(1.1.0, [
+- LIBS="$LIBS $CLN_LIBS"
+- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+- AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
+-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
++PKG_CHECK_MODULES([CLN], [cln >= 1.1.0])
+
+ PKG_CHECK_MODULES(QALCULATE, [
+ libxml-2.0
+diff -Naur qalculate-kde-0.9.6/configure.in.in
qalculate-kde-0.9.6.new/configure.in.in
+--- qalculate-kde-0.9.6/configure.in.in 2007-05-18 04:10:17.000000000
-0400
++++ qalculate-kde-0.9.6.new/configure.in.in 2008-06-15 07:20:47.000000000
-0400
+@@ -8,11 +8,7 @@
+
+ AC_LANG([C++])
+
+-AC_PATH_CLN(1.1.0, [
+- LIBS="$LIBS $CLN_LIBS"
+- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+- AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
+-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
++PKG_CHECK_MODULES([CLN], [cln >= 1.1.0])
+
+ PKG_CHECK_MODULES(QALCULATE, [
+ libxml-2.0
+
+
+
diff --git a/science/qalculate/BUILD b/science/qalculate/BUILD
new file mode 100755
index 0000000..f88004c
--- /dev/null
+++ b/science/qalculate/BUILD
@@ -0,0 +1,8 @@
+cd $SOURCE_DIRECTORY &&
+autoconf &&
+OPTS="${!tempopts} $OPTS" &&
+OPTS="$OPTS --build=${BUILD}" &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --disable-clntest \
+ $OPTS &&
+default_build_make
diff --git a/science/qalculate/DETAILS b/science/qalculate/DETAILS
index 7c50a48..39af820 100755
--- a/science/qalculate/DETAILS
+++ b/science/qalculate/DETAILS
@@ -1,9 +1,9 @@
SPELL=qalculate
- VERSION=0.9.4
+ VERSION=0.9.6
SOURCE=libqalculate-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libqalculate-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/qalculate/$SOURCE
-
SOURCE_HASH=sha512:b87e89b8135c48c67d6c0de9fbcfd9bb354009b363fdba600dee037c56e42bafd019588fcb21b5ae28338cf06b1f2b8a16212c7dfcca60f421b92667cfe866c5
+
SOURCE_HASH=sha512:cca08c1f38c05fa8cdf59f76d561808fc902961499bec952062c4c01b0bac12e9e19ded4f938179e74105f103b472a7457eeccb306be8dc4f5dadff90cf1266c
WEB_SITE=http://qalculate.sourceforge.net/
ENTERED=20050208
LICENSE[0]=GPL
diff --git a/science/qalculate/HISTORY b/science/qalculate/HISTORY
index 5a5e259..b4eb240 100644
--- a/science/qalculate/HISTORY
+++ b/science/qalculate/HISTORY
@@ -1,3 +1,11 @@
+2009-08-12 Bor Kraljic <pyrobor AT ver.si>
+ * libqalculate-0.9.6-gcc4.3.patch: added from arch liux to compile
+ * libqalculate-0.9.6-cl_abort.patch: added from arch liux to compile
+ * libqalculate-0.9.6-cln-config.patch: added from arch liux to compile
+ * BUILD: added autoconf and --disable-clntest
+ * PRE_BUILD: changed apply the pathes
+ * DETAILS: updated spell to 0.9.6
+
2007-03-24 Jeremy Blosser <jblosser-smgl AT firinn.org>
* DEPENDS: Add xml-parser-expat, bug 11727.
diff --git a/science/qalculate/PRE_BUILD b/science/qalculate/PRE_BUILD
new file mode 100755
index 0000000..2ee55a5
--- /dev/null
+++ b/science/qalculate/PRE_BUILD
@@ -0,0 +1,8 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+unpack_file &&
+cd $SOURCE_DIRECTORY &&
+echo "PATCHING" &&
+patch -p1 < $SPELL_DIRECTORY/libqalculate-0.9.6-cln-config.patch &&
+patch -p1 < $SPELL_DIRECTORY/libqalculate-0.9.6-cl_abort.patch &&
+patch -p1 < $SPELL_DIRECTORY/libqalculate-0.9.6-gcc4.3.patch
+#patch -p1 < $SPELL_DIRECTORY/cln-patch1.patch
diff --git a/science/qalculate/libqalculate-0.9.6-cl_abort.patch
b/science/qalculate/libqalculate-0.9.6-cl_abort.patch
new file mode 100644
index 0000000..a9859b7
--- /dev/null
+++ b/science/qalculate/libqalculate-0.9.6-cl_abort.patch
@@ -0,0 +1,21 @@
+diff -Naur libqalculate-0.9.6/libqalculate/Number.cc
libqalculate-0.9.6.new1/libqalculate/Number.cc
+--- libqalculate-0.9.6/libqalculate/Number.cc 2007-05-18 04:03:22.000000000
-0400
++++ libqalculate-0.9.6.new1/libqalculate/Number.cc 2008-02-02
11:06:15.000000000 -0500
+@@ -28,6 +28,7 @@
+
+ using namespace cln;
+
++/*
+ void cln::cl_abort() {
+ CALCULATOR->error(true, "CLN Error: see terminal output (probably too
large or small floating point number)", NULL);
+ if(CALCULATOR->busy()) {
+@@ -36,7 +37,7 @@
+ exit(0);
+ }
+ }
+-
++*/
+ string printCL_I(cl_I integ, int base = 10, bool display_sign = true,
BaseDisplay base_display = BASE_DISPLAY_NORMAL, bool lower_case = false) {
+ if(base == BASE_ROMAN_NUMERALS) {
+ if(!zerop(integ) && integ < 10000 && integ > -10000) {
+
diff --git a/science/qalculate/libqalculate-0.9.6-cln-config.patch
b/science/qalculate/libqalculate-0.9.6-cln-config.patch
new file mode 100644
index 0000000..b1598d5
--- /dev/null
+++ b/science/qalculate/libqalculate-0.9.6-cln-config.patch
@@ -0,0 +1,172 @@
+diff -Naur libqalculate-0.9.6/aclocal.m4 libqalculate-0.9.6.new/aclocal.m4
+--- libqalculate-0.9.6/aclocal.m4 2007-06-17 04:45:44.000000000 -0400
++++ libqalculate-0.9.6.new/aclocal.m4 2008-02-02 11:04:21.000000000 -0500
+@@ -7836,146 +7836,27 @@
+ [dnl
+ dnl Get the cppflags and libraries from the cln-config script
+ dnl
+-AC_ARG_WITH(cln-prefix,[ --with-cln-prefix=PFX Prefix where CLN is
installed (optional)],
+- cln_config_prefix="$withval", cln_config_prefix="")
+-AC_ARG_WITH(cln-exec-prefix,[ --with-cln-exec-prefix=PFX Exec prefix where
CLN is installed (optional)],
+- cln_config_exec_prefix="$withval", cln_config_exec_prefix="")
+-AC_ARG_ENABLE(clntest, [ --disable-clntest Do not try to compile and
run a test CLN program],
+- , enable_clntest=yes)
+-
+-if test x$cln_config_exec_prefix != x ; then
+- cln_config_args="$cln_config_args --exec-prefix=$cln_config_exec_prefix"
+- if test x${CLN_CONFIG+set} != xset ; then
+- CLN_CONFIG=$cln_config_exec_prefix/bin/cln-config
+- fi
+-fi
+-if test x$cln_config_prefix != x ; then
+- cln_config_args="$cln_config_args --prefix=$cln_config_prefix"
+- if test x${CLN_CONFIG+set} != xset ; then
+- CLN_CONFIG=$cln_config_prefix/bin/cln-config
+- fi
+-fi
+
+-AC_PATH_PROG(CLN_CONFIG, cln-config, no)
++AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ cln_min_version=ifelse([$1], ,1.1.0,$1)
+ AC_MSG_CHECKING(for CLN - version >= $cln_min_version)
+-if test "$CLN_CONFIG" = "no" ; then
++if test "$PKG_CONFIG" = "no" ; then
+ AC_MSG_RESULT(no)
+- echo "*** The cln-config script installed by CLN could not be found"
+- echo "*** If CLN was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the CLN_CONFIG environment variable to the"
+- echo "*** full path to cln-config."
++ echo "*** could not find pkg-config"
+ ifelse([$3], , :, [$3])
+ else
+ dnl Parse required version and the result of cln-config.
+- cln_min_major_version=`echo $cln_min_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- cln_min_minor_version=`echo $cln_min_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- cln_min_micro_version=`echo $cln_min_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+- CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags`
+- CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
+- cln_config_version=`$CLN_CONFIG $cln_config_args --version`
+- cln_config_major_version=`echo $cln_config_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- cln_config_minor_version=`echo $cln_config_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- cln_config_micro_version=`echo $cln_config_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-dnl Check if the installed CLN is sufficiently new according to cln-config.
+- if test \( $cln_config_major_version -lt $cln_min_major_version \) -o \
+- \( $cln_config_major_version -eq $cln_min_major_version -a
$cln_config_minor_version -lt $cln_min_minor_version \) -o \
+- \( $cln_config_major_version -eq $cln_min_major_version -a
$cln_config_minor_version -eq $cln_min_minor_version -a
$cln_config_micro_version -lt $cln_min_micro_version \); then
+- echo -e "\n*** 'cln-config --version' returned
$cln_config_major_version.$cln_config_minor_version.$cln_config_micro_version,
but the minimum version"
+- echo "*** of CLN required is
$cln_min_major_version.$cln_min_minor_version.$cln_min_micro_version. If
cln-config is correct, then it is"
+- echo "*** best to upgrade to the required version."
+- echo "*** If cln-config was wrong, set the environment variable
CLN_CONFIG"
+- echo "*** to point to the correct copy of cln-config, and remove
the file"
+- echo "*** config.cache before re-running configure."
+- ifelse([$3], , :, [$3])
++ if $PKG_CONFIG cln --atleast-version=${cln_min_version}; then
++ echo "Found cln >= ${cln_min_version}"
++ CLN_CPPFLAGS=`$PKG_CONFIG cln --cflags`
++ CLN_LIBS=`$PKG_CONFIG cln --libs`
+ else
+-dnl The versions match so far. Now do a sanity check: Does the result of
cln-config
+-dnl match the version of the headers and the version built into the
library, too?
+- no_cln=""
+- if test "x$enable_clntest" = "xyes" ; then
+- ac_save_CPPFLAGS="$CPPFLAGS"
+- ac_save_LIBS="$LIBS"
+- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+- LIBS="$LIBS $CLN_LIBS"
+- rm -f conf.clntest
+- AC_TRY_RUN([
+-#include <stdio.h>
+-#include <string.h>
+-#include <cln/version.h>
+-
+-/* we do not #include <stdlib.h> because autoconf in C++ mode inserts a
+- prototype for exit() that conflicts with the one in stdlib.h */
+-extern "C" int system(const char *);
+-
+-int main(void)
+-{
+- system("touch conf.clntest");
+-
+- if ((CL_VERSION_MAJOR != $cln_config_major_version) ||
+- (CL_VERSION_MINOR != $cln_config_minor_version) ||
+- (CL_VERSION_PATCHLEVEL != $cln_config_micro_version)) {
+- printf("\n*** 'cln-config --version' returned %d.%d.%d, but the
header file I found\n", $cln_config_major_version, $cln_config_minor_version,
$cln_config_micro_version);
+- printf("*** corresponds to %d.%d.%d. This mismatch suggests your
installation of CLN\n", CL_VERSION_MAJOR, CL_VERSION_MINOR,
CL_VERSION_PATCHLEVEL);
+- printf("*** is corrupted or you have specified some wrong -I
compiler flags.\n");
+- printf("*** Please inquire and consider reinstalling CLN.\n");
+- return 1;
+- }
+- if ((cln::version_major != $cln_config_major_version) ||
+- (cln::version_minor != $cln_config_minor_version) ||
+- (cln::version_patchlevel != $cln_config_micro_version)) {
+- printf("\n*** 'cln-config --version' returned %d.%d.%d, but the
library I found\n", $cln_config_major_version, $cln_config_minor_version,
$cln_config_micro_version);
+- printf("*** corresponds to %d.%d.%d. This mismatch suggests your
installation of CLN\n", cln::version_major, cln::version_minor,
cln::version_patchlevel);
+- printf("*** is corrupted or you have specified some wrong -L
compiler flags.\n");
+- printf("*** Please inquire and consider reinstalling CLN.\n");
+- return 1;
+- }
+- return 0;
+-}
+-],, no_cln=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+- CPPFLAGS="$ac_save_CPPFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- if test "x$no_cln" = x ; then
+- AC_MSG_RESULT([yes, $cln_config_version])
+- ifelse([$2], , :, [$2])
+- else
+- AC_MSG_RESULT(no)
+- if test ! -f conf.clntest ; then
+- echo "*** Could not run CLN test program, checking why..."
+- CPPFLAGS="$CFLAGS $CLN_CPPFLAGS"
+- LIBS="$LIBS $CLN_LIBS"
+- AC_TRY_LINK([
+-#include <stdio.h>
+-#include <cln/version.h>
+-], [ return 0; ],
+- [ echo "*** The test program compiled, but did not run.
This usually means"
+- echo "*** that the run-time linker is not finding CLN or
finding the wrong"
+- echo "*** version of CLN. If it is not finding CLN,
you'll need to set your"
+- echo "*** LD_LIBRARY_PATH environment variable, or edit
/etc/ld.so.conf to point"
+- echo "*** to the installed location. Also, make sure you
have run ldconfig if that"
+- echo "*** is required on your system."],
+- [ echo "*** The test program failed to compile or link. See
the file config.log for the"
+- echo "*** exact error that occured. This usually means
CLN was incorrectly installed"
+- echo "*** or that you have moved CLN since it was
installed. In the latter case, you"
+- echo "*** may want to edit the cln-config script:
$CLN_CONFIG." ])
+- CPPFLAGS="$ac_save_CPPFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- CLN_CPPFLAGS=""
+- CLN_LIBS=""
+- ifelse([$3], , :, [$3])
+- fi
++ echo "ERROR: cln >= ${cln_min_version} not found"
++ ifelse([$3], , :, [$3])
+ fi
+ fi
+ AC_SUBST(CLN_CPPFLAGS)
+ AC_SUBST(CLN_LIBS)
+-rm -f conf.clntest
+ ])
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf
-*-
+diff -Naur libqalculate-0.9.6/src/Makefile.in
libqalculate-0.9.6.new/src/Makefile.in
+--- libqalculate-0.9.6/src/Makefile.in 2007-06-17 04:45:49.000000000 -0400
++++ libqalculate-0.9.6.new/src/Makefile.in 2008-02-02 11:37:48.000000000
-0500
+@@ -117,7 +117,7 @@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ @CLN_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_QALCULATE = @LN_QALCULATE@
+ LN_S = @LN_S@
+
diff --git a/science/qalculate/libqalculate-0.9.6-gcc4.3.patch
b/science/qalculate/libqalculate-0.9.6-gcc4.3.patch
new file mode 100644
index 0000000..53bf5ec
--- /dev/null
+++ b/science/qalculate/libqalculate-0.9.6-gcc4.3.patch
@@ -0,0 +1,12 @@
+diff -Naur libqalculate-0.9.6/libqalculate/Number.cc
libqalculate-0.9.6.new/libqalculate/Number.cc
+--- libqalculate-0.9.6/libqalculate/Number.cc 2007-05-18 04:03:22.000000000
-0400
++++ libqalculate-0.9.6.new/libqalculate/Number.cc 2008-04-01
10:46:53.000000000 -0400
+@@ -15,6 +15,7 @@
+ #include "Calculator.h"
+
+ #include <sstream>
++#include <climits>
+ #include "util.h"
+
+ #define REAL_PRECISION_FLOAT_RE(x)
cln::cl_float(cln::realpart(x), cln::float_format(PRECISION + 1))
+
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index e6a3807..0f22d85 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -14,7 +14,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_IGNORE=signature
SOURCE4_IGNORE=signature
WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
- PATCHLEVEL=3
+ PATCHLEVEL=4
ENTERED=20010922
LICENSE[0]=GPL2
KEYWORDS="console"
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index 194776f..1c40f7b 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,7 +1,12 @@
+2009-08-10 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Added upstream patches
+ * patches/bash40-025 to 028: Added to upstream patches
+
2009-07-22 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Added upstream patches
- * patchs/bash40-018 to 024: Added upstream patches
+ * patches/bash40-018 to 024: Added upstream patches