From crazy at frugalware.org Sat Dec 1 11:10:54 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 11:10:55 2007 Subject: [Frugalware-git] playground: kdelibs-3.96.1_743104-0playground2-i686 Message-ID: <20071201101054.4822011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=39865a04ac51149e17bf5e0589081f8865c485dd commit 39865a04ac51149e17bf5e0589081f8865c485dd Author: crazy Date: Sat Dec 1 11:05:12 2007 +0100 kdelibs-3.96.1_743104-0playground2-i686 * release bump * split work done * added new TODO diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index df11f98..5d9952a 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -3,11 +3,13 @@ pkgname=kdelibs pkgver=3.96.1_743104 -pkgrel=0playground1 +pkgrel=0playground2 pkgdesc="KDE4 Core Libraries." -depends=('qt4-qdbus' 'libqtsvg' 'libxpm' 'libxtst' 'strigi' 'gamin' 'xfsprogs-acl' 'soprano' \ - 'libqttest' 'pcre' 'libqt3support' 'alsa-lib' 'libungif' 'qt4-designer' 'heimdal' \ - 'enchant' 'openexr' 'jasper' 'hspell' 'shared-mime-info' 'avahi') +depends=('libqtsvg' 'libxpm' 'libxtst' 'strigi' 'xfsprogs-acl' 'pcre' 'soprano' \ + 'heimdal' 'libqt3support' 'alsa-lib' 'libungif' 'qt4-designer' 'openexr' 'jasper' \ + 'shared-mime-info' 'gamin' 'qt4-qdbus' 'bzip2' 'libqttest') +rodepends=("libkde=$pkgver") # this is an 'depend' but it won't find it while is an subpackage +makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell') groups=('kde4') archs=('i686') options=('nomirror') @@ -16,6 +18,69 @@ source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ flac.patch) sha1sums=('688346508a642949e9d5d8c71d945c0d4c487a6e' \ '0ff2c4946a6f58c0dadc7b6bd1027f46fab66218') -## TODO: sort the depends and split after kdebase-apps is done +## TODO: groups!!! +subpkgs=("$pkgname-compiletime" 'libkde' 'kspell-aspell' 'kspell-hspell' 'kspell-enchant' 'libkdecore') +subdescs=('Development files.' \ + 'Libraries needed for graphical KDE applications.' \ + 'KSpell aspell plugin.' \ + 'KSpell hspell plugin.' \ + 'KSpell enchant plugin.' \ + 'Core libraries needed for KDE applications.') +subdepends=("libkde=$pkgver libqtsvg libxpm libxtst strigi xfsprogs-acl libqtnetwork" \ + "libkdecore=$pkgver libqtsvg libxpm libxtst strigi xfsprogs-acl libqt3support libungif pcre soprano alsa-lib" \ + "libkde=$pkgver aspell libqtnetwork qt4-qdbus bzip2" \ + "libkde=$pkgver libqtnetwork qt4-qdbus bzip2 hspell" \ + "libkde=$pkgver enchant libqtnetwork qt4-qdbus bzip2" \ + "libkde=$pkgver libqtnetwork qt4-qdbus bzip2 pcre") +subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4') +subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686') + +build() +{ + CMakeKDE_build + + ## the funny part now ;) + + ## -aspell + Fsplit kspell-aspell usr/lib/kde4/kspell_aspell.so + Fsplit kspell-aspell usr/share/kde4/services/kspell_aspell.desktop + + ## -hspell + Fsplit kspell-hspell usr/lib/kde4/kspell_hspell.so + Fsplit kspell-hspell usr/share/kde4/services/kspell_hspell.desktop + + ## -enchant + Fsplit kspell-enchant usr/lib/kde4/kspell_enchant.so + Fsplit kspell-enchant usr/share/kde4/services/kspell_enchant.desktop + + ## -libkdecore ( yeah hate me for that :P ) + ## kdebase-workspace ( startkde ) need that but libkde has + ## it as depend so does not really matter + Fsplit libkdecore usr/lib/{libkdecore.so.*,libkpty.so.*,libkdefakes.so.*,libkjs.so.*} + Fsplit libkdecore usr/lib/kde4/libexec/kgrantpty + Fsplit libkdecore usr/bin/kde4-config + Fsplit libkdecore usr/lib/kde4/ktranscript.so + ## debug/message stuff + Fsplit libkdecore etc/kde4/config/{kdebug.areas,kdebugrc} + ## not really sure why but looks like these are needed here .. + Fsplit libkdecore usr/share/kde4/servicetypes/{sonnetspeller.desktop,kplugininfo.desktop} + Fsplit libkdecore usr/share/locale/all_languages + + ## -libkde + for i in $(find $Fdestdir/usr/lib \( -name kde4 \) -prune -o ! -name "*libkdeinit4*" -name "*.so.*" -print|sed 's/.*\///') + do + Fsplit libkde usr/lib/$i + done + + ## -compiletime ( devel ) + Fsplit $pkgname-compiletime usr/include + Fsplit $pkgname-compiletime usr/bin/{kde4automoc,meinproc4,kconfig_compiler} + Fsplit $pkgname-compiletime usr/share/apps/{cmake,ksgmltools2} + for i in $(find $Fdestdir/usr/lib \( -name kde4 \) -prune -o ! -name "*libkdeinit4*" -name "*.so" -print|sed 's/.*\///') + do + Fsplit $pkgname-compiletime usr/lib/$i + done +} + # optimization OK From crazy at frugalware.org Sat Dec 1 11:54:11 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 11:54:12 2007 Subject: [Frugalware-git] playground: kde4.sh Message-ID: <20071201105411.95A8A11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=cb7f06a47a3c0fb9f7a79bf7e3a6bd99484f14ee commit cb7f06a47a3c0fb9f7a79bf7e3a6bd99484f14ee Author: crazy Date: Sat Dec 1 11:20:22 2007 +0100 kde4.sh * added -compiletime to makedepends() diff --git a/source/include/kde4.sh b/source/include/kde4.sh index e60c11a..b744f62 100644 --- a/source/include/kde4.sh +++ b/source/include/kde4.sh @@ -57,7 +57,7 @@ if [ -z "$_F_kde4_defaults" ]; then fi - +makedepends=("${makedepends[@]}" 'kdelibs-compiletime>=3.96.1_743104') ### # == OVERWRITTEN VARIABLES # * url From crazy at frugalware.org Sat Dec 1 12:11:03 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 12:11:06 2007 Subject: [Frugalware-git] playground: kdepimlibs-3.96.1_742565-0playground2-i686 Message-ID: <20071201111103.6A66811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=b2b462c7f4bd8ace6b6aef1e7b192e18b6755e1c commit b2b462c7f4bd8ace6b6aef1e7b192e18b6755e1c Author: crazy Date: Sat Dec 1 12:09:55 2007 +0100 kdepimlibs-3.96.1_742565-0playground2-i686 * release bump * kdelibs -> libkde diff --git a/source/kde4/kdepimlibs/FrugalBuild b/source/kde4/kdepimlibs/FrugalBuild index 6b371f6..ec23f30 100644 --- a/source/kde4/kdepimlibs/FrugalBuild +++ b/source/kde4/kdepimlibs/FrugalBuild @@ -3,9 +3,9 @@ pkgname=kdepimlibs pkgver=3.96.1_742565 -pkgrel=0playground1 +pkgrel=0playground2 pkgdesc="Personal Information Management (PIM) libraries for KDE4." -depends=('gpgme' 'kdelibs>=3.96.1_743104' 'libldap' 'boost') +depends=('libkde>=3.96.1_743104' 'libqtsvg' 'libldap' 'gpgme' 'boost') makedepends=('openldap') groups=('kde4') archs=('i686') From crazy at frugalware.org Sat Dec 1 14:09:07 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 14:09:08 2007 Subject: [Frugalware-git] playground: kdelibs-3.96.1_743104-0playground3-i686 Message-ID: <20071201130907.3257211901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=d09a608cc7c62b091f794dfc647f0b4dea923e77 commit d09a608cc7c62b091f794dfc647f0b4dea923e77 Author: crazy Date: Sat Dec 1 14:03:20 2007 +0100 kdelibs-3.96.1_743104-0playground3-i686 * heh we need interfaces/*.xml files here as well * somewhat strange but so be it diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index 5d9952a..5e0d831 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kdelibs pkgver=3.96.1_743104 -pkgrel=0playground2 +pkgrel=0playground3 pkgdesc="KDE4 Core Libraries." depends=('libqtsvg' 'libxpm' 'libxtst' 'strigi' 'xfsprogs-acl' 'pcre' 'soprano' \ 'heimdal' 'libqt3support' 'alsa-lib' 'libungif' 'qt4-designer' 'openexr' 'jasper' \ @@ -66,6 +66,8 @@ build() ## not really sure why but looks like these are needed here .. Fsplit libkdecore usr/share/kde4/servicetypes/{sonnetspeller.desktop,kplugininfo.desktop} Fsplit libkdecore usr/share/locale/all_languages + ## don't ask =) + Fsplit libkdecore usr/share/dbus-1/interfaces/* ## -libkde for i in $(find $Fdestdir/usr/lib \( -name kde4 \) -prune -o ! -name "*libkdeinit4*" -name "*.so.*" -print|sed 's/.*\///') From crazy at frugalware.org Sat Dec 1 15:15:14 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 15:15:17 2007 Subject: [Frugalware-git] playground: kdebase-runtime-3.96.1_743137-0playground2-i686 Message-ID: <20071201141514.7925711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=025741e309f9aa62466f434d3509d22278e82d59 commit 025741e309f9aa62466f434d3509d22278e82d59 Author: crazy Date: Sat Dec 1 14:53:50 2007 +0100 kdebase-runtime-3.96.1_743137-0playground2-i686 * release bump * kdelibs -> libkde diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild index 53a4b7f..ecab9f8 100644 --- a/source/kde4/kdebase-runtime/FrugalBuild +++ b/source/kde4/kdebase-runtime/FrugalBuild @@ -3,9 +3,9 @@ pkgname=kdebase-runtime pkgver=3.96.1_743137 -pkgrel=0playground1 +pkgrel=0playground2 pkgdesc="Programs needed at runtime by other KDE4 applications" -depends=('kdelibs>=3.96.1_743104' 'xine-lib' 'libsmbclient' 'kdepimlibs>=3.96.1_742565') +depends=('libqtsvg' 'libkde>=3.96.1_743104' 'openexr' 'xine-lib' 'libsmbclient' 'xine-lib' 'kdepimlibs>=3.96.1_742565') groups=('kde4') archs=('i686') options=('nomirror') From vmiklos at frugalware.org Sat Dec 1 15:23:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 15:23:27 2007 Subject: [Frugalware-git] setup: updates for 0.8.2 Message-ID: <20071201142324.ABC1311901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=0619d09dc4f53fd92e5f146b096992497f56a7a0 commit 0619d09dc4f53fd92e5f146b096992497f56a7a0 Author: Miklos Vajna Date: Sat Dec 1 15:23:11 2007 +0100 updates for 0.8.2 diff --git a/NEWS b/NEWS index 236fdfb..e1373ba 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.8.2 - release for 0.8pre1 + - added wpa support 0.8.1 - maintainance release for 0.7 final - a spelling fix - usual translation updates diff --git a/configure b/configure index db92dab..b380051 100755 --- a/configure +++ b/configure @@ -17,7 +17,7 @@ packages = ['bash', 'kernel', 'busybox', 'dhcpcd', 'dialog', 'e2fsprogs', 'device-mapper', 'lvm2', 'wpa_supplicant', 'openssl'] # when releasing a new setup, please update this :) -version = "0.8.1" +version = "0.8.2" # parse our options parser = OptionParser(version="configure for Frugalware Setup v%s" % (version)) From vmiklos at frugalware.org Sat Dec 1 15:30:47 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 15:30:49 2007 Subject: [Frugalware-git] frugalware-current: fwsetup-0.8.2-1-i686 Message-ID: <20071201143047.B41A611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dc36e8d3cecca9dcae7759ed4d0e035fc3544ab4 commit dc36e8d3cecca9dcae7759ed4d0e035fc3544ab4 Author: Miklos Vajna Date: Sat Dec 1 15:30:26 2007 +0100 fwsetup-0.8.2-1-i686 version bump diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index 5ecf4fd..1039dac 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=fwsetup -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=1 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" From vmiklos at frugalware.org Sat Dec 1 15:45:17 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 15:45:19 2007 Subject: [Frugalware-git] frugalware: update for 0.8pre1 Message-ID: <20071201144517.C019E11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=ddee10035e32ec07eff0d0b7a292abad45bb59d1 commit ddee10035e32ec07eff0d0b7a292abad45bb59d1 Author: Miklos Vajna Date: Sat Dec 1 15:44:58 2007 +0100 update for 0.8pre1 diff --git a/Makefile b/Makefile index a88dee8..76ec45f 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 0.7 -CODENAME = Sayshell +VERSION = 0.8pre1 +CODENAME = Kalgan FRUGALWARE_LANGS = de hu it SERVICE_LANGS = de hu From vmiklos at frugalware.org Sat Dec 1 16:00:14 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 16:00:16 2007 Subject: [Frugalware-git] frugalware-current: frugalware-0.8pre1-1-i686 Message-ID: <20071201150014.791EA11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c2714776b8034d1b719d163f8a528c7d7464ed86 commit c2714776b8034d1b719d163f8a528c7d7464ed86 Author: Miklos Vajna Date: Sat Dec 1 16:00:10 2007 +0100 frugalware-0.8pre1-1-i686 version bump diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index 2721bc6..5ff8b36 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=frugalware -pkgver=0.7 +pkgver=0.8pre1 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/" From crazy at frugalware.org Sat Dec 1 16:14:39 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 16:14:41 2007 Subject: [Frugalware-git] playground: kdelibs-3.96.1_743104-0playground3-i686 Message-ID: <20071201151439.7354111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=a717b496f6ff4dc90ab4755f05e4244c98dacfb9 commit a717b496f6ff4dc90ab4755f05e4244c98dacfb9 Author: crazy Date: Sat Dec 1 16:13:08 2007 +0100 kdelibs-3.96.1_743104-0playground3-i686 * Some more missing stuff but while buggy / missing checks * in cmake files : * /bin/sh: KDE4_MAKEKDEWIDGETS_EXECUTABLE-NOTFOUND <- dumdidum , that does not work for sure ;) diff --git a/source/kde4/kdebase-workspace/build_with_no_debug.patch b/source/kde4/kdebase-workspace/build_with_no_debug.patch deleted file mode 100644 index 7c129b2..0000000 --- a/source/kde4/kdebase-workspace/build_with_no_debug.patch +++ /dev/null @@ -1,145 +0,0 @@ -Index: workspace/kwin/composite.cpp -=================================================================== ---- workspace/kwin/composite.cpp (Revision 737901) -+++ workspace/kwin/composite.cpp (Arbeitskopie) -@@ -446,7 +446,9 @@ - window_pix = None; - ungrabXServer(); - if( window_pix == None ) -+#ifndef NDEBUG - kDebug( 1212 ) << "Creating window pixmap failed: " << this; -+#endif - return window_pix; - #else - return None; -Index: workspace/kwin/rules.cpp -=================================================================== ---- workspace/kwin/rules.cpp (Revision 737901) -+++ workspace/kwin/rules.cpp (Arbeitskopie) -@@ -880,7 +880,9 @@ - if( (*it)->match( c )) - { - Rules* rule = *it; -+#ifndef NDEBUG - kDebug( 1212 ) << "Rule found:" << rule << ":" << c; -+#endif - if( rule->isTemporary()) - it = rules.erase( it ); - else -Index: workspace/kwin/group.cpp -=================================================================== ---- workspace/kwin/group.cpp (Revision 737901) -+++ workspace/kwin/group.cpp (Arbeitskopie) -@@ -781,7 +781,9 @@ - return None; - if( new_transient_for == window()) // pointing to self - { // also fix the property itself -+#ifndef NDEBUG - kWarning( 1216 ) << "Client " << this << " has WM_TRANSIENT_FOR poiting to itself." ; -+#endif - new_property_value = new_transient_for = rootWindow(); - } - // The transient_for window may be embedded in another application, -@@ -806,8 +808,10 @@ - { - if( new_transient_for != before_search ) - { -+#ifndef NDEBUG - kDebug( 1212 ) << "Client " << this << " has WM_TRANSIENT_FOR poiting to non-toplevel window " - << before_search << ", child of " << new_transient_for_client << ", adjusting." << endl; -+#endif - new_property_value = new_transient_for; // also fix the property - } - } -@@ -826,7 +830,9 @@ - loop_pos = pos->transient_for_id; - if( --count == 0 ) - { -+#ifndef NDEBUG - kWarning( 1216 ) << "Client " << this << " caused WM_TRANSIENT_FOR loop." ; -+#endif - new_transient_for = rootWindow(); - } - } -Index: workspace/kwin/activation.cpp -=================================================================== ---- workspace/kwin/activation.cpp (Revision 737901) -+++ workspace/kwin/activation.cpp (Arbeitskopie) -@@ -534,20 +534,26 @@ - return true; - if( ac == NULL || ac->isDesktop()) - { -+#ifndef NDEBUG - kDebug( 1212 ) << "Activation: No client active, allowing"; -+#endif - return true; // no active client -> always allow - } - // TODO window urgency -> return true? - if( Client::belongToSameApplication( c, ac, true )) - { -+#ifndef NDEBUG - kDebug( 1212 ) << "Activation: Belongs to active application"; -+#endif - return true; - } - if( level == 3 ) // high - return false; - if( time == -1U ) // no time known - { -+#ifndef NDEBUG - kDebug( 1212 ) << "Activation: No timestamp at all"; -+#endif - if( level == 1 ) // low - return true; - // no timestamp at all, don't activate - because there's also creation timestamp -@@ -557,8 +563,10 @@ - } - // level == 2 // normal - Time user_time = ac->userTime(); -+#ifndef NDEBUG - kDebug( 1212 ) << "Activation, compared:" << c << ":" << time << ":" << user_time - << ":" << ( timestampCompare( time, user_time ) >= 0 ) << endl; -+#endif - return timestampCompare( time, user_time ) >= 0; // time >= user_time - } - -@@ -748,7 +756,9 @@ - bool session ) const - { - Time time = info->userTime(); -+#ifndef NDEBUG - kDebug( 1212 ) << "User timestamp, initial:" << time; -+#endif - // newer ASN timestamp always replaces user timestamp, unless user timestamp is 0 - // helps e.g. with konqy reusing - if( asn_data != NULL && time != 0 ) -@@ -765,7 +775,9 @@ - time = asn_data->timestamp(); - } - } -+#ifndef NDEBUG - kDebug( 1212 ) << "User timestamp, ASN:" << time; -+#endif - if( time == -1U ) - { // The window doesn't have any timestamp. - // If it's the first window for its application -@@ -797,7 +809,9 @@ - // don't refuse if focus stealing prevention is turned off - if( !first_window && rules()->checkFSP( options->focusStealingPreventionLevel ) > 0 ) - { -+#ifndef NDEBUG - kDebug( 1212 ) << "User timestamp, already exists:" << 0; -+#endif - return 0; // refuse activation - } - } -@@ -817,7 +831,9 @@ - else - time = readUserCreationTime(); - } -+#ifndef NDEBUG - kDebug( 1212 ) << "User timestamp, final:" << this << ":" << time; -+#endif - return time; - } - diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index 5e0d831..91107fc 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -68,6 +68,7 @@ build() Fsplit libkdecore usr/share/locale/all_languages ## don't ask =) Fsplit libkdecore usr/share/dbus-1/interfaces/* + Fsplit libkdecore usr/bin/makekdewidgets ## -libkde for i in $(find $Fdestdir/usr/lib \( -name kde4 \) -prune -o ! -name "*libkdeinit4*" -name "*.so.*" -print|sed 's/.*\///') From crazy at frugalware.org Sat Dec 1 17:08:19 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 17:08:21 2007 Subject: [Frugalware-git] playground: kdelibs-3.96.1_743104-0playground4-i686 Message-ID: <20071201160819.5C00611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=d69576e4f5450c265bad719154175ad21bfc9813 commit d69576e4f5450c265bad719154175ad21bfc9813 Author: crazy Date: Sat Dec 1 16:57:02 2007 +0100 kdelibs-3.96.1_743104-0playground4-i686 * relbump again diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index 91107fc..dfc6eb6 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kdelibs pkgver=3.96.1_743104 -pkgrel=0playground3 +pkgrel=0playground4 pkgdesc="KDE4 Core Libraries." depends=('libqtsvg' 'libxpm' 'libxtst' 'strigi' 'xfsprogs-acl' 'pcre' 'soprano' \ 'heimdal' 'libqt3support' 'alsa-lib' 'libungif' 'qt4-designer' 'openexr' 'jasper' \ @@ -26,7 +26,7 @@ subdescs=('Development files.' \ 'KSpell aspell plugin.' \ 'KSpell hspell plugin.' \ 'KSpell enchant plugin.' \ - 'Core libraries needed for KDE applications.') + 'Core libraries and files needed for KDE applications.') subdepends=("libkde=$pkgver libqtsvg libxpm libxtst strigi xfsprogs-acl libqtnetwork" \ "libkdecore=$pkgver libqtsvg libxpm libxtst strigi xfsprogs-acl libqt3support libungif pcre soprano alsa-lib" \ "libkde=$pkgver aspell libqtnetwork qt4-qdbus bzip2" \ @@ -68,6 +68,7 @@ build() Fsplit libkdecore usr/share/locale/all_languages ## don't ask =) Fsplit libkdecore usr/share/dbus-1/interfaces/* + ## -compiletime ? Fsplit libkdecore usr/bin/makekdewidgets ## -libkde From vmiklos at frugalware.org Sat Dec 1 17:42:56 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 17:42:58 2007 Subject: [Frugalware-git] frugalware-current: fwsetup-0.8.2-2-i686 Message-ID: <20071201164256.1904011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24f993733ed4fcc2e855cd3ef670b565b5d023dc commit 24f993733ed4fcc2e855cd3ef670b565b5d023dc Author: Miklos Vajna Date: Sat Dec 1 17:42:49 2007 +0100 fwsetup-0.8.2-2-i686 depends() fix diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index 1039dac..8b1baf6 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -3,11 +3,11 @@ pkgname=fwsetup pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" depends=() -makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' 'frugalware>=0.7rc2') +makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' 'frugalware>=0.8pre1') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/releases/ |Flasttar" @@ -15,5 +15,5 @@ source=($url/releases/$pkgname-$pkgver.tar.gz) signatures=("$source.asc") options=('nofakeroot') unset MAKEFLAGS -Fconfopts="$Fconfopts --repo=stable" +#Fconfopts="$Fconfopts --repo=stable" # optimization OK From crazy at frugalware.org Sat Dec 1 18:00:34 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 18:00:37 2007 Subject: [Frugalware-git] playground: kdebase-workspace-3.96.1_743091-0playground2-i686 Message-ID: <20071201170034.9FFE011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=eeba34d1419fb9405e628c05a139656b97b65164 commit eeba34d1419fb9405e628c05a139656b97b65164 Author: crazy Date: Sat Dec 1 17:56:04 2007 +0100 kdebase-workspace-3.96.1_743091-0playground2-i686 * release bump * kdelibs -> libkde * disabled NM , we don't need it * added -libs subpackage * removed debug patch in svn now diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index 6d1062c..3396625 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -3,30 +3,55 @@ pkgname=kdebase-workspace pkgver=3.96.1_743091 -pkgrel=0playground1 +pkgrel=0playground2 pkgdesc="Programs specific for the KDE4 desktop." -depends=('kdelibs>=3.96.1_743104' 'libqtopengl' 'libxres' 'lmsensors' 'libxcomposite' \ - 'libxklavier' 'libxscrnsaver' 'qimageblitz' 'libqtscript' \ - 'libcaptury' 'libraw1394' 'bluez-libs') -rodepends=('kde-frugalware>=0.9.0' 'xorg-server>=1.2.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop') +depends=('libkde>=>=3.96.1_743104' 'libqt3support' 'libqtsvg' 'libxpm' 'strigi' 'xfsprogs-acl' 'libxtst' 'libqtopengl' 'libxres' \ + 'lmsensors' 'libxcomposite' 'libxklavier' 'libxscrnsaver' 'qimageblitz' 'libqtscript' 'libcaptury' \ + 'libraw1394' 'bluez-libs') +makedepends=('libqtscript' 'qt4-designer') +rodepends=('kde-frugalware>=0.9.0' 'xorg-server>=1.2.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop' 'xrdb' "$pkgname-libs=$pkgver") groups=('kde4') archs=('i686') options=('nomirror') +_F_cmake_confopts="$_F_cmake_confopts -DWITH_NetworkManager:BOOL=OFF" Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ - build_with_no_debug.patch \ ksysguarddrc_use_config_install_dir.patch \ systemsettingsrc_use_config_install_dir.patch) sha1sums=('d645d3a55028d22b2a0c2aafce2b0f4678086a23' \ - 'aae1b6ec6de1d7a00ad35727e7ebd1ed6246c255' \ 'c173303c33871f9fed4e33d16b323952a902d1aa' \ 'eed7fe30f80be191d4d63c6e2966d7276e961446') +## TODO: kdm +## FIXME: QT4 +subpkgs=("$pkgname-libs") +subdescs=('Libraries for KDE Workspace.') +subdepends=("libkde>=3.96.1_743104 strigi xfsprogs-acl libxpm libqtsvg libqtscript libxtst libqtopengl libxcomposite libqt3support qt4-designer") +subgroups=('kde4') +subarchs=('i686') build() { CMakeKDE_build + + ## Something may look not really logical. + ## Everything want -worksapce need that so make it -devel/-libs combo + Fsplit $pkgname-libs usr/lib/{libkworkspace.so*,libplasma.so*,libprocesscore.so*,libprocessui.so*} + Fsplit $pkgname-libs usr/lib/{libsolidcontrolifaces.so*,libsolidcontrol.so*,libtaskmanager.so*} + Fsplit $pkgname-libs usr/include + Fsplit $pkgname-libs usr/share/apps/cmake + + ## we have own files Fmv etc/kde4/config/kdm/kdmrc etc/kde4/config/kdm/kdmrc.ORIG + + ## No please .. remove that annoying stuff from autostart + Frm usr/share/autostart/{ktip.desktop,klipper.desktop} + + ## Wallpapers are by now ,, uhh crappy , we need plasma* one now kill the rest + ## When the newer obe are merged this will have -wallpapers package + Frm usr/share/wallpapers/* + cp -ra ../wallpapers/*plasma* $Fdestdir/usr/share/wallpapers/ || Fdie + } # optimization OK From crazy at frugalware.org Sat Dec 1 18:58:04 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 18:58:06 2007 Subject: [Frugalware-git] playground: kdebase-3.96.1_743066-0playground3-i686 Message-ID: <20071201175804.F01E911901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=c1792ca1ef98c8367d84c8bf99b2a7a6a7d01ad5 commit c1792ca1ef98c8367d84c8bf99b2a7a6a7d01ad5 Author: crazy Date: Sat Dec 1 18:54:42 2007 +0100 kdebase-3.96.1_743066-0playground3-i686 * makedepends() , sub{depends,rodepends}() fix * kdelibs -> libkde * libkonq -> libkonq=$pkgver diff --git a/source/kde4/kdebase/FrugalBuild b/source/kde4/kdebase/FrugalBuild index 65aa936..c6508c0 100644 --- a/source/kde4/kdebase/FrugalBuild +++ b/source/kde4/kdebase/FrugalBuild @@ -3,13 +3,13 @@ pkgname=kdebase pkgver=3.96.1_743066 -pkgrel=0playground2 +pkgrel=0playground3 pkgdesc="Basic programs for KDE4" depends=() -makedepends=('kdelibs>=3.96.1_743104' 'qimageblitz' 'libqtnetwork') +makedepends=('libkde>=3.96.1_743104' 'qimageblitz' 'libqtnetwork' 'libqtsvg') groups=('kde4') archs=('i686') -options=('nomirror' 'nodocs') # empty +options=('nomirror') _F_kde4_subpkgs=('dolphin' 'kfind' 'konsole' 'kwrite' 'kappfinder' 'konqueror-nsplugins' 'kdepasswd' 'kdialog' 'keditbookmarks' 'konqueror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) @@ -27,18 +27,18 @@ subdescs=('File Manager.' \ 'Bookmark Organizer and Editor.' \ 'Web browser, file manager and document viewer.' \ 'Konqueror library.') -subdepends=("kdelibs>=3.96.1_743104 libkonq qimageblitz" \ - "kdelibs>=3.96.1_743104 libkonq" \ - "kdelibs>=3.96.1_743104" \ - "kdelibs>=3.96.1_743104" \ - "kdelibs>=3.96.1_743104" \ - "kdelibs>=3.96.1_743104" \ - "kdelibs>=3.96.1_743104 libkonq" \ - "kdelibs>=3.96.1_743104" \ - "kdelibs>=3.96.1_743104 libkonq" \ - "kdelibs>=3.96.1_743104 libkonq" \ - "kdelibs>=3.96.1_743104 libqtnetwork") -subrodepends=('' '' 'keditbookmarks' '' '' '' '' '' '' 'keditbookmarks' '') +subdepends=("libkde>=3.96.1_743104 libkonq=$pkgver libqtsvg qimageblitz" \ + "libkde>=3.96.1_743104 libkonq=$pkgver libqtsvg" \ + "libkde>=3.96.1_743104 libqtsvg" \ + "libkde>=3.96.1_743104 libqtsvg" \ + "libkde>=3.96.1_743104 libqtsvg" \ + "libkde>=3.96.1_743104 libqtsvg" \ + "libkde>=3.96.1_743104 libkonq=$pkgver libqtsvg" \ + "libkde>=3.96.1_743104 libqtsvg" \ + "libkde>=3.96.1_743104 libkonq=$pkgver libqtsvg" \ + "libkde>=3.96.1_743104 libkonq=$pkgver libqtsvg" \ + "libkde>=3.96.1_743104 libqtnetwork libqtsvg") +subrodepends=('kfind' '' 'keditbookmarks' 'keditbookmarks kfind' '' '' '' '' '' 'kget keditbookmarks konsole' '') subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4') subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686') From crazy at frugalware.org Sat Dec 1 20:13:17 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 20:13:24 2007 Subject: [Frugalware-git] playground: kdebase-workspace-3.96.1_743091-0playground2-i686 Message-ID: <20071201191317.B3F2811901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=e4c26fad6e9beebbebf2272c543f227031c69eb9 commit e4c26fad6e9beebbebf2272c543f227031c69eb9 Author: crazy Date: Sat Dec 1 20:06:41 2007 +0100 kdebase-workspace-3.96.1_743091-0playground2-i686 * subdepends() fix diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index 3396625..e43df1e 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -26,7 +26,8 @@ sha1sums=('d645d3a55028d22b2a0c2aafce2b0f4678086a23' \ ## FIXME: QT4 subpkgs=("$pkgname-libs") subdescs=('Libraries for KDE Workspace.') -subdepends=("libkde>=3.96.1_743104 strigi xfsprogs-acl libxpm libqtsvg libqtscript libxtst libqtopengl libxcomposite libqt3support qt4-designer") +subdepends=("libkde>=3.96.1_743104 strigi xfsprogs-acl libxpm libqtsvg \ + libqtscript libxtst libqtopengl qimageblitz libxcomposite libqt3support qt4-designer") subgroups=('kde4') subarchs=('i686') From crazy at frugalware.org Sat Dec 1 20:13:17 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 20:13:30 2007 Subject: [Frugalware-git] playground: kdebase-workspace-3.96.1_743091-0playground2-i686 Message-ID: <20071201191317.CF93D11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=5d7bf50ac62ad6530206ced704ca85c2a0ebdd93 commit 5d7bf50ac62ad6530206ced704ca85c2a0ebdd93 Author: crazy Date: Sat Dec 1 20:07:21 2007 +0100 kdebase-workspace-3.96.1_743091-0playground2-i686 * added kde4-* groups diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index e43df1e..3a772aa 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -28,7 +28,7 @@ subpkgs=("$pkgname-libs") subdescs=('Libraries for KDE Workspace.') subdepends=("libkde>=3.96.1_743104 strigi xfsprogs-acl libxpm libqtsvg \ libqtscript libxtst libqtopengl qimageblitz libxcomposite libqt3support qt4-designer") -subgroups=('kde4') +subgroups=('kde4 kde4-libs') subarchs=('i686') build() From crazy at frugalware.org Sat Dec 1 20:13:18 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 20:13:30 2007 Subject: [Frugalware-git] playground: kdebase-runtime-3.96.1_743137-0playground2-i686 Message-ID: <20071201191318.1389411901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=865f547f9389602b002a7a55482e0a744db353d8 commit 865f547f9389602b002a7a55482e0a744db353d8 Author: crazy Date: Sat Dec 1 20:08:36 2007 +0100 kdebase-runtime-3.96.1_743137-0playground2-i686 * added kde4-* groups diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild index ecab9f8..cca078b 100644 --- a/source/kde4/kdebase-runtime/FrugalBuild +++ b/source/kde4/kdebase-runtime/FrugalBuild @@ -6,7 +6,7 @@ pkgver=3.96.1_743137 pkgrel=0playground2 pkgdesc="Programs needed at runtime by other KDE4 applications" depends=('libqtsvg' 'libkde>=3.96.1_743104' 'openexr' 'xine-lib' 'libsmbclient' 'xine-lib' 'kdepimlibs>=3.96.1_742565') -groups=('kde4') +groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') Finclude kde4 @@ -17,7 +17,7 @@ sha1sums=('725a36fcea925e5746165a70d03a1ca46cf6410a' \ subpkgs=("kdebase-icons") subdescs=('Oxygen KDE4 Icons') subdepends=() -subgroups=('kde4') +subgroups=('kde4 kde4-minimal') subarchs=('i686') build() From crazy at frugalware.org Sat Dec 1 20:13:18 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 20:13:30 2007 Subject: [Frugalware-git] playground: kdebase-3.96.1_743066-0playground3-i686 Message-ID: <20071201191318.1E49911901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=7889f70171aa344c5a207c2bbccb62a497dae2b5 commit 7889f70171aa344c5a207c2bbccb62a497dae2b5 Author: crazy Date: Sat Dec 1 20:11:19 2007 +0100 kdebase-3.96.1_743066-0playground3-i686 * added kde4-* groups diff --git a/source/kde4/kdebase/FrugalBuild b/source/kde4/kdebase/FrugalBuild index c6508c0..ef25aa2 100644 --- a/source/kde4/kdebase/FrugalBuild +++ b/source/kde4/kdebase/FrugalBuild @@ -39,7 +39,8 @@ subdepends=("libkde>=3.96.1_743104 libkonq=$pkgver libqtsvg qimageblitz" \ "libkde>=3.96.1_743104 libkonq=$pkgver libqtsvg" \ "libkde>=3.96.1_743104 libqtnetwork libqtsvg") subrodepends=('kfind' '' 'keditbookmarks' 'keditbookmarks kfind' '' '' '' '' '' 'kget keditbookmarks konsole' '') -subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4') +subgroups=('kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' \ + 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-libs') subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686') build() From crazy at frugalware.org Sat Dec 1 20:13:18 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 20:13:30 2007 Subject: [Frugalware-git] playground: kdebase-workspace-3.96.1_743091-0playground2-i686 Message-ID: <20071201191318.28F1C11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=35f9f7d86e65eee2af6f89753822f2f5b497da95 commit 35f9f7d86e65eee2af6f89753822f2f5b497da95 Author: crazy Date: Sat Dec 1 20:12:52 2007 +0100 kdebase-workspace-3.96.1_743091-0playground2-i686 * oops forgot this one diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index 3a772aa..61f5355 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -10,7 +10,7 @@ depends=('libkde>=>=3.96.1_743104' 'libqt3support' 'libqtsvg' 'libxpm' 'strigi' 'libraw1394' 'bluez-libs') makedepends=('libqtscript' 'qt4-designer') rodepends=('kde-frugalware>=0.9.0' 'xorg-server>=1.2.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop' 'xrdb' "$pkgname-libs=$pkgver") -groups=('kde4') +groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') _F_cmake_confopts="$_F_cmake_confopts -DWITH_NetworkManager:BOOL=OFF" From crazy at frugalware.org Sat Dec 1 20:15:55 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 20:15:56 2007 Subject: [Frugalware-git] playground: kdelibs-3.96.1_743104-0playground4-i686 Message-ID: <20071201191555.53E9E11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=c7580c7f64f7cae438261341d50af85cd85295f7 commit c7580c7f64f7cae438261341d50af85cd85295f7 Author: crazy Date: Sat Dec 1 20:15:42 2007 +0100 kdelibs-3.96.1_743104-0playground4-i686 * added kde4-* groups diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index dfc6eb6..3cd6f3a 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -10,7 +10,7 @@ depends=('libqtsvg' 'libxpm' 'libxtst' 'strigi' 'xfsprogs-acl' 'pcre' 'soprano' 'shared-mime-info' 'gamin' 'qt4-qdbus' 'bzip2' 'libqttest') rodepends=("libkde=$pkgver") # this is an 'depend' but it won't find it while is an subpackage makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell') -groups=('kde4') +groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') Finclude kde4 @@ -33,7 +33,7 @@ subdepends=("libkde=$pkgver libqtsvg libxpm libxtst strigi xfsprogs-acl libqtnet "libkde=$pkgver libqtnetwork qt4-qdbus bzip2 hspell" \ "libkde=$pkgver enchant libqtnetwork qt4-qdbus bzip2" \ "libkde=$pkgver libqtnetwork qt4-qdbus bzip2 pcre") -subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4') +subgroups=('kde4' 'kde4 kde4-libs' 'kde4' 'kde4' 'kde4' 'kde4 kde4-libs') subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686') build() From crazy at frugalware.org Sat Dec 1 20:40:48 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 20:40:49 2007 Subject: [Frugalware-git] playground: kdenetwork-3.96.1_743146-0playground2-i686 Message-ID: <20071201194048.2159011901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=63c9ff919681d52d443c1e6ede01839a11927710 commit 63c9ff919681d52d443c1e6ede01839a11927710 Author: crazy Date: Sat Dec 1 20:36:08 2007 +0100 kdenetwork-3.96.1_743146-0playground2-i686 * makedepends() , subdepends() fix * kdelibs -> libkde * kdebase-workspace -> kdebase-workspace-libs * added kde4-apps group diff --git a/source/kde4/kdenetwork/FrugalBuild b/source/kde4/kdenetwork/FrugalBuild index 272bd3e..1ef5d93 100644 --- a/source/kde4/kdenetwork/FrugalBuild +++ b/source/kde4/kdenetwork/FrugalBuild @@ -3,14 +3,14 @@ pkgname=kdenetwork pkgver=3.96.1_743146 -pkgrel=0playground1 +pkgrel=0playground2 pkgdesc="KDE Networking Programs" depends=() -makedepends=('openslp' 'libvncserver' 'kdepimlibs>=3.96.1_742565' 'libidn' 'qca' 'kdebase-workspace>=3.96.1_743091' \ - 'sqlite3' 'decibel' 'avahi-compat') +makedepends=('openslp' 'libvncserver' 'kdepimlibs>=3.96.1_742565' 'libidn' 'qca' 'kdebase-workspace-libs>=3.96.1_743091' \ + 'sqlite3' 'decibel' 'avahi-compat' 'libqtsvg' 'libqtnetwork' 'qimageblitz') groups=('kde4') archs=('i686') -options=('nomirror' 'nodocs') # empty +options=('nomirror') # empty _F_kde4_subpkgs=('kget' 'knewsticker' 'kopete' 'kppp' 'krdc' 'krfb' "$pkgname-filesharing" 'kdnssd') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) @@ -29,16 +29,17 @@ subdescs=('An advanced download manager for KDE.' \ 'Network file sharing.' \ 'Zeroconf.' \ 'Lan Information Server and Utils for KDE.') -subdepends=('libqtnetwork kdebase-workspace>=3.96.1_743091' \ - 'kdebase-workspace>=3.96.1_743091 kdepimlibs>=3.96.1_742565 libqtnetwork' \ - 'qimageblitz kdepimlibs>=3.96.1_742565 libxscrnsaver libidn qca sqlite3 decibel' \ - 'kdelibs>=3.96.1_739423' \ - 'kdelibs>=3.96.1_739423 libvncserver avahi-compat' \ - 'openslp libvncserver kdelibs>=3.96.1_739423 libqtnetwork bzip2 avahi-compat' \ - 'kdelibs>=3.96.1_739423' \ - 'kdelibs>=3.96.1_739423 libqtnetwork avahi-compat' \ - 'kdelibs>=3.96.1_739423') -subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4') +subdepends=('libqtnetwork kdebase-workspace-libs>=3.96.1_743091' \ + 'kdebase-workspace-libs>=3.96.1_743091 kdepimlibs>=3.96.1_742565 libqtnetwork' \ + 'qimageblitz kdepimlibs>=3.96.1_742565 libxscrnsaver libidn qca sqlite3 decibel libqtsvg libkde>=3.96.1_743104' \ + 'libkde>=3.96.1_743104 libqtsvg' \ + 'libkde>=>=3.96.1_743104 libvncserver avahi-compat libqtsvg libqtnetwork' \ + 'openslp libvncserver libkde>=>=3.96.1_743104 avahi-compat libqtsvg libqtnetwork qt4-qdbus bzip2' \ + 'libkde>=>=3.96.1_743104 libqtsvg' \ + 'libkde>=>=3.96.1_743104 libqtnetwork avahi-compat libqtsvg' \ + 'libkde>=>=3.96.1_743104 libqtsvg') +subgroups=('kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' \ + 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps') subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686') build() From crazy at frugalware.org Sat Dec 1 21:14:54 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 1 21:14:57 2007 Subject: [Frugalware-git] playground: kdemultimedia-3.96.1_742562-0playground2-i686 Message-ID: <20071201201454.55B7F11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=e4dec36a4cd19f3cda1735fe803c275edc0d169a commit e4dec36a4cd19f3cda1735fe803c275edc0d169a Author: crazy Date: Sat Dec 1 21:13:23 2007 +0100 kdemultimedia-3.96.1_742562-0playground2-i686 * makedepends() , subdepends() fix * kdelibs -> libkde * kdebase-workspace -> kdebase-workspace-libs * added kde4-apps group diff --git a/source/kde4/kdemultimedia/FrugalBuild b/source/kde4/kdemultimedia/FrugalBuild index 15e0504..6d77e18 100644 --- a/source/kde4/kdemultimedia/FrugalBuild +++ b/source/kde4/kdemultimedia/FrugalBuild @@ -3,13 +3,14 @@ pkgname=kdemultimedia pkgver=3.96.1_742562 -pkgrel=0playground1 +pkgrel=0playground2 pkgdesc="KDE Multimedia Programs" depends=() -makedepends=('kdelibs>=3.96.1_743104' 'libtunepimp' 'cdparanoia' 'flac' 'libmusicbrainz' 'libvorbis' 'taglib' 'lame' 'kdebase-workspace') +makedepends=('libkde>=3.96.1_743104' 'libtunepimp' 'cdparanoia' 'flac' 'libmusicbrainz' 'libvorbis' \ + 'taglib' 'lame' 'kdebase-workspace-libs>=3.96.1_743091' 'libqtsvg') groups=('kde4') archs=('i686') -options=('nomirror' 'nodocs') #empty +options=('nomirror') #empty _F_kde4_subpkgs=('juk' 'kmix' 'kscd' 'libkcddb' 'libkcompactdisc') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ @@ -24,13 +25,13 @@ subdescs=('Jukebox and music manager.' \ 'A library for retrieving and sending cddb information.' \ 'CD Player.' \ 'Audiocd KIO Slave Configuration.') -subdepends=('kdelibs>=3.96.1_74310 libtunepimp' \ - 'kdelibs>=3.96.1_74310' \ - 'kdelibs>=3.96.1_74310 libkcddb libkcompactdisc libmusicbrainz' \ - 'kdelibs>=3.96.1_74310 libmusicbrainz' \ - 'kdelibs>=3.96.1_74310 libqtnetwork' \ - 'kdelibs>=3.96.1_74310 libkcddb libmusicbrainz flac libvorbis cdparanoia libkcompactdisc') -subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4') +subdepends=('libkde>=3.96.1_74310 libtunepimp libqtsvg' \ + 'libkde>=3.96.1_74310 libqtsvg' \ + 'libkde>=3.96.1_74310 libkcddb libkcompactdisc libmusicbrainz libqtsvg' \ + 'libkde>=3.96.1_74310 libmusicbrainz libqtsvg' \ + 'libkde>=3.96.1_74310 libqtnetwork libqtsvg' \ + 'libkde>=3.96.1_74310 libkcddb libmusicbrainz flac libvorbis cdparanoia libkcompactdisc libqtsvg') +subgroups=('kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-libs' 'kde4 kde4-apps' 'kde4') subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686') build() @@ -41,9 +42,6 @@ build() ## -audiocd KIO kde4_install "kioslave" Fsplit $pkgname-audiocd-kio /etc /usr - - ## shut up tar - Fmkdir usr/share/doc/$pkgname/DUMMY_PACKAGE_DO_NOT_USE } From vmiklos at frugalware.org Sat Dec 1 22:05:42 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 22:05:44 2007 Subject: [Frugalware-git] setup: asklang: remove unnecessary bind_textdomain_codeset() in setcharset() Message-ID: <20071201210542.8CF1911901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=628c8a34dd66e3f7fe143eb6756345af55c1cbf7 commit 628c8a34dd66e3f7fe143eb6756345af55c1cbf7 Author: Miklos Vajna Date: Sat Dec 1 22:03:39 2007 +0100 asklang: remove unnecessary bind_textdomain_codeset() in setcharset() it's unnecessary and it breaks other gettext settings if the codeset is invalid diff --git a/src/plugins/asklang.c b/src/plugins/asklang.c index 7af7849..914ccb8 100644 --- a/src/plugins/asklang.c +++ b/src/plugins/asklang.c @@ -83,7 +83,6 @@ int setcharset(char *name, GList **config) FREE(ptr); // save the font for later usage data_put(config, "font", strdup(name)); - bind_textdomain_codeset("setup", g_ascii_strup(name, strlen(name)-1)); return(0); } From vmiklos at frugalware.org Sat Dec 1 22:05:42 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 22:05:44 2007 Subject: [Frugalware-git] setup: fix up localedef usage for glibc-2.7 Message-ID: <20071201210542.B8D8F11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=49544aa66555be45b14f24a7aa558cc94ec0967d commit 49544aa66555be45b14f24a7aa558cc94ec0967d Author: Miklos Vajna Date: Sat Dec 1 22:04:19 2007 +0100 fix up localedef usage for glibc-2.7 as of glibc-2.7, we must specify a charset, there is no autodetect anymore diff --git a/Makefile b/Makefile index e27d250..436de1b 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ export CCACHE_DIR=/var/cache/ccache/setup export CCACHE_NOLINK=1 export CCACHE_UMASK=002 DIALOG_LANGS = `find po -name *.po |sed 's/.*\/\(.*\).po/\1/' |tr '\n' ' '` -GLIBC_LANGS = en_US da_DK de_DE fr_FR hu_HU id_ID it_IT nl_NL pt_BR ro_RO sk_SK sv_SE +GLIBC_LANGS = en_US,ISO-8859-1 da_DK,ISO-8859-1 de_DE,ISO-8859-1 fr_FR,ISO-8859-1 hu_HU,ISO-8859-2 id_ID,ISO-8859-1 it_IT,ISO-8859-1 nl_NL,ISO-8859-1 pt_BR,ISO-8859-1 ro_RO,ISO-8859-2 sk_SK,ISO-8859-2 sv_SE,ISO-8859-1 CARCH ?= $(shell arch) ifeq ($(CARCH),i686) KARCH ?= i386 @@ -268,7 +268,7 @@ glibc: cd $(BDIR) && rm -rf usr/ && mkdir -p usr/lib/locale/ cd $(BDIR); \ for i in $(GLIBC_LANGS); do \ - localedef --prefix=./ -c -i $$i $$i; true; \ + localedef --prefix=./ -c -f $${i##*,} -i $${i%%,*} $${i%%,*}; true; \ done cp -a $(BDIR)/usr/lib/locale/locale-archive glibc/usr/lib/locale/ From vmiklos at frugalware.org Sat Dec 1 22:16:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 22:16:05 2007 Subject: [Frugalware-git] setup: updates for 0.8.3 Message-ID: <20071201211603.6A48D11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=43c504a8ee8be0554224934503aa243f24ba5235 commit 43c504a8ee8be0554224934503aa243f24ba5235 Author: Miklos Vajna Date: Sat Dec 1 22:15:06 2007 +0100 updates for 0.8.3 diff --git a/NEWS b/NEWS index e1373ba..1bff9df 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.8.3 - bugfix release, the previous one was broken with glibc-2.7 0.8.2 - release for 0.8pre1 - added wpa support 0.8.1 - maintainance release for 0.7 final diff --git a/configure b/configure index b380051..36e3864 100755 --- a/configure +++ b/configure @@ -17,7 +17,7 @@ packages = ['bash', 'kernel', 'busybox', 'dhcpcd', 'dialog', 'e2fsprogs', 'device-mapper', 'lvm2', 'wpa_supplicant', 'openssl'] # when releasing a new setup, please update this :) -version = "0.8.2" +version = "0.8.3" # parse our options parser = OptionParser(version="configure for Frugalware Setup v%s" % (version)) From vmiklos at frugalware.org Sat Dec 1 22:25:05 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 22:25:06 2007 Subject: [Frugalware-git] frugalware-current: fwsetup-0.8.3-1-i686 Message-ID: <20071201212505.4A21D11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b6f7088c43605b6f690f9a86b1a377f3d87ec031 commit b6f7088c43605b6f690f9a86b1a377f3d87ec031 Author: Miklos Vajna Date: Sat Dec 1 22:24:49 2007 +0100 fwsetup-0.8.3-1-i686 version bump (again:/) diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index 8b1baf6..5330e37 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=fwsetup -pkgver=0.8.2 -pkgrel=2 +pkgver=0.8.3 +pkgrel=1 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" depends=() From vmiklos at frugalware.org Sat Dec 1 23:01:13 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 1 23:01:15 2007 Subject: [Frugalware-git] frugalware-current: ghostscript-8.61-1-i686 Message-ID: <20071201220113.1A72411901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5634415a994f2ee9a1d4b25b8b156bc623e87370 commit 5634415a994f2ee9a1d4b25b8b156bc623e87370 Author: Miklos Vajna Date: Sat Dec 1 23:01:08 2007 +0100 ghostscript-8.61-1-i686 fix conflicts() diff --git a/source/apps/ghostscript/FrugalBuild b/source/apps/ghostscript/FrugalBuild index e6b31a4..be61515 100644 --- a/source/apps/ghostscript/FrugalBuild +++ b/source/apps/ghostscript/FrugalBuild @@ -8,8 +8,9 @@ pkgdesc="An interpreter for the PostScript language." depends=('cups') rodepends=('foomatic-filters' 'urw-fonts') groups=('apps') -# review after 0.8 -conflicts=('espgs' 'xespgs' 'xghostscript') +# review after 0.8. also we could add xghostscript to conflicts(), but first +# pacman-g2 should handle this +conflicts=('espgs' 'xespgs') replaces=('espgs') archs=('i686' 'x86_64') license="GPLv2" From vmiklos at frugalware.org Sun Dec 2 13:45:33 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 2 13:45:35 2007 Subject: [Frugalware-git] frugalware-current: ede-1.1-2-i686 Message-ID: <20071202124533.29374176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3e4824e317cf6f2b74d7c774af4978f608c05f15 commit 3e4824e317cf6f2b74d7c774af4978f608c05f15 Author: Miklos Vajna Date: Sun Dec 2 13:44:57 2007 +0100 ede-1.1-2-i686 source() fix diff --git a/source/x11-extra/ede/FrugalBuild b/source/x11-extra/ede/FrugalBuild index 19f7e23..8027706 100644 --- a/source/x11-extra/ede/FrugalBuild +++ b/source/x11-extra/ede/FrugalBuild @@ -7,6 +7,7 @@ pkgver=1.1 pkgrel=2 pkgdesc="Equinox Desktop Environment (shortly EDE) is small desktop environment" _F_sourceforge_broken_up2date=1 +_F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://equinox-project.org/" depends=('efltk>=2.0.6-2') From vmiklos at frugalware.org Sun Dec 2 13:49:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 2 13:49:13 2007 Subject: [Frugalware-git] frugalware-current: efltk-2.0.6-2-i686 Message-ID: <20071202124912.5443B176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a08ce374426ae2366548aceab35210a01d1faa9b commit a08ce374426ae2366548aceab35210a01d1faa9b Author: Miklos Vajna Date: Sun Dec 2 13:49:09 2007 +0100 efltk-2.0.6-2-i686 source() fix diff --git a/source/xlib-extra/efltk/FrugalBuild b/source/xlib-extra/efltk/FrugalBuild index d821cb1..d78395c 100644 --- a/source/xlib-extra/efltk/FrugalBuild +++ b/source/xlib-extra/efltk/FrugalBuild @@ -7,6 +7,7 @@ pkgver=2.0.6 pkgrel=2 pkgdesc="EFltk is a LGPL'd C++ graphical user interface toolkit" _F_sourceforge_dirname="ede" +_F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://equinox-project.org/" From vmiklos at frugalware.org Sun Dec 2 14:13:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 2 14:13:07 2007 Subject: [Frugalware-git] pacman-tools: mkisorelease.txt: the .foo string is hidden when it's monospace, fix it Message-ID: <20071202131303.D3097176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=668408b0c1ce143109eb0ffbbea4334ecd4e10f7 commit 668408b0c1ce143109eb0ffbbea4334ecd4e10f7 Author: Miklos Vajna Date: Sun Dec 2 14:12:01 2007 +0100 mkisorelease.txt: the .foo string is hidden when it's monospace, fix it diff --git a/mkisorelease.txt b/mkisorelease.txt index 6194d0f..2c71e23 100644 --- a/mkisorelease.txt +++ b/mkisorelease.txt @@ -47,6 +47,6 @@ Here is a list of what is _not_ updated at the moment: * fwlive iso (it takes a lot of time) -* the `.ls-Ral` files +* the .ls-Ral files * the `SHA1SUM` file From voroskoi at frugalware.org Sun Dec 2 14:16:46 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Dec 2 14:16:52 2007 Subject: [Frugalware-git] homepage-ng: FSA327-emacs Message-ID: <20071202131646.57562176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=09df5d13450c8336bca7c3818d087f8f050cf1d9 commit 09df5d13450c8336bca7c3818d087f8f050cf1d9 Author: voroskoi Date: Sun Dec 2 14:16:34 2007 +0100 FSA327-emacs diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 32416d1..c480175 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 327 + 2007-12-02 + voroskoi + emacs + 22.1-1 + 22.1-2sayshell1 + http://bugs.frugalware.org/task/2566 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5795 + Drake Wilson has reported a vulnerability in GNU Emacs, which can be exploited by malicious people to compromise a user's system. + The vulnerability is caused due to an error in the "hack-local-variables" function where local variables within a file are processed in an insecure manner. This can be exploited to e.g. modify a user's user-init-file and execute arbitrary Emacs Lisp code when a specially crafted file is opened. + Successful exploitation requires that "enable-local-variables" is set to ":safe". + + 326 2007-11-27 voroskoi From voroskoi at frugalware.org Sun Dec 2 14:21:27 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Dec 2 14:21:30 2007 Subject: [Frugalware-git] homepage-ng: FSA328-php-pear-mdb2 Message-ID: <20071202132127.6CD11176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=2819e69a75c4a98c7ae18670074887d12c8c3f45 commit 2819e69a75c4a98c7ae18670074887d12c8c3f45 Author: voroskoi Date: Sun Dec 2 14:21:01 2007 +0100 FSA328-php-pear-mdb2 diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index c480175..f8ae9bf 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 328 + 2007-12-02 + voroskoi + php-pear-mdb2 + 2.4.1-1 + 2.4.1-2sayshell1 + http://bugs.frugalware.org/task/2573 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5934 + A security issue has been reported in PEAR MDB2, which can be exploited by malicious people to disclose sensitive information. + The security issue is caused due to MDB2 potentially making use of PHP's protocol wrappers when storing certain input as LOB. This can be exploited to e.g. disclose sensitive information by storing a specially crafted URI (e.g. "file:///etc/passwd") as LOB. + + 327 2007-12-02 voroskoi From voroskoi at frugalware.org Sun Dec 2 14:25:45 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Dec 2 14:26:07 2007 Subject: [Frugalware-git] homepage-ng: FSA329-mysql Message-ID: <20071202132546.4D9EC176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=d2ab6bd4e8694820ef55ac7ca63d75a0766898a0 commit d2ab6bd4e8694820ef55ac7ca63d75a0766898a0 Author: voroskoi Date: Sun Dec 2 14:25:24 2007 +0100 FSA329-mysql diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index f8ae9bf..bfaba2d 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 329 + 2007-12-02 + voroskoi + mysql + 5.0.45-1 + 5.0.45-2sayshell1 + http://bugs.frugalware.org/task/2577 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5925 + A vulnerability has been reported in MySQL, which can be exploited by malicious users to cause a DoS (Denial of Service). + The vulnerability is caused due to an assertion error within the InnoDB engine and can be exploited to crash the database server via certain "CONTAINS" statements. + Successful exploitation requires "ALTER" privileges. + + 328 2007-12-02 voroskoi From voroskoi at frugalware.org Sun Dec 2 14:32:09 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Dec 2 14:32:23 2007 Subject: [Frugalware-git] homepage-ng: FSA330-cups Message-ID: <20071202133209.629E5176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=4dde005e36a146d779482ab2cf377e6031c76784 commit 4dde005e36a146d779482ab2cf377e6031c76784 Author: voroskoi Date: Sun Dec 2 14:31:41 2007 +0100 FSA330-cups diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index bfaba2d..9416aa8 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 330 + 2007-12-02 + voroskoi + cups + 1.3.2-2sayshell1 + 1.3.2-2sayshell2 + http://bugs.frugalware.org/task/2596 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4352 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5392 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5393 + Some vulnerabilities have been reported in CUPS, which can be exploited by malicious people to cause a DoS (Denial of Service) and potentially to compromise a user's system. The vulnerabilities are caused due to the use of a vulnerable version of Xpdf. + + 329 2007-12-02 voroskoi From voroskoi at frugalware.org Sun Dec 2 15:17:47 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Dec 2 15:17:50 2007 Subject: [Frugalware-git] frugalware-0.7: pidgin-2.2.1-2sayshell1-i686 Message-ID: <20071202141748.00DD1176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=7c997a15af72c636c6bef54a08e903cbf909e9d7 commit 7c997a15af72c636c6bef54a08e903cbf909e9d7 Author: voroskoi Date: Sun Dec 2 15:16:45 2007 +0100 pidgin-2.2.1-2sayshell1-i686 secfix relbump, closes #2539 diff --git a/source/xapps/pidgin/CVE-2007-4999.diff b/source/xapps/pidgin/CVE-2007-4999.diff new file mode 100644 index 0000000..4a0e33a --- /dev/null +++ b/source/xapps/pidgin/CVE-2007-4999.diff @@ -0,0 +1,12 @@ +diff -Nur pidgin-2.2.1/libpurple/util.c pidgin-2.2.1.new/libpurple/util.c +--- pidgin-2.2.1/libpurple/util.c 2007-09-29 18:39:14.000000000 +0200 ++++ pidgin-2.2.1.new/libpurple/util.c 2007-11-26 16:32:27.306345874 +0100 +@@ -1566,7 +1566,7 @@ + pt->dest_tag = "a"; + tags = g_list_prepend(tags, pt); + if(xhtml) +- g_string_append_printf(xhtml, "", g_strstrip(url->str)); ++ g_string_append_printf(xhtml, "", url ? g_strstrip(url->str) : ""); + continue; + } + if(!g_ascii_strncasecmp(c, "' || *(c+5) == ' ')) { diff --git a/source/xapps/pidgin/FrugalBuild b/source/xapps/pidgin/FrugalBuild index 759f59c..7ced7f7 100644 --- a/source/xapps/pidgin/FrugalBuild +++ b/source/xapps/pidgin/FrugalBuild @@ -4,7 +4,7 @@ pkgname=pidgin pkgver=2.2.1 -pkgrel=1 +pkgrel=2sayshell1 pkgdesc="A multi-protocol instant messaging (IM) client" url="http://www.pidgin.im/" depends=('gtk+2>=2.12.0' 'libao' 'audiofile' 'gtkspell' 'nss' 'startup-notification>=0.9' \ @@ -20,9 +20,10 @@ _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 Finclude sourceforge options=('scriptlet') -source=(${source[@]} perl-fix.patch) +source=(${source[@]} perl-fix.patch CVE-2007-4999.diff) sha1sums=('2dc920b156a2ba559108042ac2178f3bb8282e8e' \ - 'c3facfbc8ec54b6b5a4f83a827cd766658fd9777') + 'c3facfbc8ec54b6b5a4f83a827cd766658fd9777' \ + '3900a346def7fac72b139abbb7de4c49d4c926fb') build() { Fcd From crazy at frugalware.org Sun Dec 2 15:47:14 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 2 15:47:16 2007 Subject: [Frugalware-git] playground: kdesdk-3.96.1_743075-0playground2-i686 Message-ID: <20071202144714.0ADE5176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=8943c7243c3103d3623c615f08ac005e59f67d87 commit 8943c7243c3103d3623c615f08ac005e59f67d87 Author: crazy Date: Sun Dec 2 15:44:13 2007 +0100 kdesdk-3.96.1_743075-0playground2-i686 * release bump * kdelibs -> libkde * kdebase-workspace -> kdebase-workspace-libs * added kde4-apps group diff --git a/source/kde4/kdesdk/FrugalBuild b/source/kde4/kdesdk/FrugalBuild index 562fbc0..b0ec865 100644 --- a/source/kde4/kdesdk/FrugalBuild +++ b/source/kde4/kdesdk/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: crazy pkgname=kdesdk -pkgver=3.96.1_740651 -pkgrel=0playground1 +pkgver=3.96.1_743075 +pkgrel=0playground2 pkgdesc="KDE Software Development Kit." -depends=('kdepimlibs') -makedepends=('kdelibs' 'libqtnetwork' 'subversion' 'kdebase-workspace') +depends=('libkde>=3.96.1_743104' 'libqtsvg' 'kdepimlibs') +makedepends=('libqtnetwork' 'subversion' 'kdebase-workspace-libs') groups=('kde4') archs=('i686') options=('nomirror') _F_kde4_subpkgs=('umbrello' 'kbugbuster' 'kcachegrind' 'cervisia') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('94e172da15ef0a426fee452b2bc623126f33db1c') +sha1sums=('cf2bb2ef8007fda2db65017f53c0db68ff3ed669') subpkgs=("${_F_kde4_subpkgs[@]}" 'kate' 'kuiviewer' "$pkgname-kio") subdescs=('UML Modeller.' \ @@ -23,14 +23,14 @@ subdescs=('UML Modeller.' \ 'KDE Advanced Text Editor.' \ 'UI files viewer.' \ 'Subversion KIO Slaves.') -subdepends=('kdelibs' \ - 'kdepimlibs' \ - 'kdelibs' \ - 'kdelibs' \ - 'kdebase-workspace' \ - 'kdelibs' \ - 'kdelibs libqtnetwork subversion') -subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4') +subdepends=('libkde>=3.96.1_743104 libqtsvg' \ + 'kdepimlibs libkde>=3.96.1_743104 libqtsvg' \ + 'libkde>=3.96.1_743104 libqtsvg' \ + 'libkde>=3.96.1_743104 libqtsvg' \ + 'kdebase-workspace-libs' \ + 'libkde>=3.96.1_743104 libqtsvg' \ + 'libkde>=3.96.1_743104 libqtsvg libqtnetwork subversion') +subgroups=('kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4') subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686') build() @@ -54,3 +54,5 @@ build() kde4_install "$p" done } + +# optimization OK From crazy at frugalware.org Sun Dec 2 16:29:56 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 2 16:29:59 2007 Subject: [Frugalware-git] playground: kdeadmin-3.96.1_743133-0playground1-i686 Message-ID: <20071202152956.84E69176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=dcecf62cac1ebd1acde8b441a68decccc3a5b9d6 commit dcecf62cac1ebd1acde8b441a68decccc3a5b9d6 Author: crazy Date: Sun Dec 2 16:29:28 2007 +0100 kdeadmin-3.96.1_743133-0playground1-i686 * Version bump * _F_kde4_confopfs -> _F_cmake_confopts * kdelibs -> libkde diff --git a/source/kde4/kdeadmin/FrugalBuild b/source/kde4/kdeadmin/FrugalBuild index 41bf35b..6551310 100644 --- a/source/kde4/kdeadmin/FrugalBuild +++ b/source/kde4/kdeadmin/FrugalBuild @@ -5,15 +5,21 @@ pkgname=kdeadmin pkgver=3.96.1_743133 pkgrel=0playground1 pkgdesc="KDE Administration Programs" -depends=('kdelibs>=3.96.1_743104' 'libldap' 'kdepimlibs>=3.96.1_742565') -makedepends=('openldap') +depends=('libkde>=3.96.1_743104' 'libqtsvg' 'kdepimlibs>=3.96.1_742565') groups=('kde4') archs=('i686') options=('nomirror') -## kpackage needs SMART , knetworkconf does not work for FW , secpolicy is PAM stuff we don't have -_F_kde4_confopts="-DBUILD_kpackage:BOOL=OFF -DBUILD_knetworkconf:BOOL=OFF -DBUILD_secpolicy:BOOL=OFF" +## kpackage needs SMART , knetworkconf does not work for FW +_F_cmake_confopts="-DBUILD_kpackage:BOOL=OFF -DBUILD_knetworkconf:BOOL=OFF" Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) sha1sums=('161a3ac272c07836dd06be8dd28e714b8377dd32') + +build() +{ + CMakeKDE_build + Frm usr/share/doc/HTML/en/{knetworkconf,kpackage} +} + # optimization OK From crazy at frugalware.org Sun Dec 2 21:07:08 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 2 21:07:10 2007 Subject: [Frugalware-git] playground: kdeutils-3.96.1_743145-0playground1-i686 Message-ID: <20071202200708.0408B176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=10cf11f5a1dd1c972181683b1962ccb7d8982e4c commit 10cf11f5a1dd1c972181683b1962ccb7d8982e4c Author: crazy Date: Sun Dec 2 21:03:33 2007 +0100 kdeutils-3.96.1_743145-0playground1-i686 * Version bump * added subpackages * removed patch , klaptopdaemon is not there for 4.0 :/ diff --git a/source/kde4/kdeutils/FrugalBuild b/source/kde4/kdeutils/FrugalBuild index 1ed71b9..6e4b5ad 100644 --- a/source/kde4/kdeutils/FrugalBuild +++ b/source/kde4/kdeutils/FrugalBuild @@ -1,39 +1,102 @@ -# Compiling Time: 4.07 SBU +# Compiling Time: 3.56 SBU # Maintainer: crazy pkgname=kdeutils -pkgver=3.5.8 -pkgrel=1 -pkgdesc="KDE General Utilities." -groups=('kde') -archs=('i686' 'x86_64') -depends=('kdebase>=3.5.8' 'gmp' 'libxtst') -makedepends=('gnupg' 'doxygen') -Finclude kde -sha1sums=('55aac5ecb90ee8a9854603eb2415adb2da6f249c') - -subpkgs=("superkaramba") -subdescs=("SuperKaramba is a tool that allows you to easily create interactive eye-candy on your KDE desktop.") -subdepends=("kdelibs=$pkgver python>=2.5") -subgroups=('kde-extra') -subarchs=('i686 x86_64') - -build() +pkgver=3.96.1_743145 +pkgrel=0playground1 +pkgdesc="KDE General Utilities" +depends=() +makedepends=('kdepimlibs' 'gmp' 'kdebase-workspace-libs' 'libzip' 'gnupg' 'tpctl') +groups=('kde4') +archs=('i686') +options=('nomirror') # empty +_F_kde4_subpkgs=('kgpg' 'superkaramba' 'ktimer' 'khexedit' 'kfloppy' 'ark' 'kjots' 'kcalc' 'kdessh' 'sweeper' 'kwallet' 'kcharselect') +Finclude kde4 +source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) +sha1sums=('9d29d6592da154eaea408f569246ed4e71edd006') + + +subpkgs=("${_F_kde4_subpkgs[@]}" 'kwikdisk' 'kregexpeditor' 'libkmilo' 'kmilo-asus' 'kmilo-dell' 'kmilo-thinkpad' 'kmilo-vaio') +subdescs=('Simple GUI for gnugpg.' \ + 'An engine for cool desktop eyecandy.' \ + 'Countdown Launcher for KDE.' \ + 'Hex Editor for KDE.' \ + 'Floppy Disk Utility for KDE.' \ + 'Archiving Tool for KDE.' \ + 'Note Taking Utility for KDE.' \ + 'Calculator for KDE.' \ + 'Runs a program on a remote host.' \ + 'Utility for cleaning unwanted traces on the system.' \ + 'Wallet Management Tool for KDE.' \ + 'Character Selection Utility for KDE.' \ + 'Free Disk Space and Removable Media Utility for KDE.' \ + 'Regular Expressions Editor for KDE.' \ + 'KMilo lets you use the special keys on some keyboards and laptops.' \ + 'KMilo Asus Laptop Plugin.' \ + 'KMilo Dell I8k Laptop Plugin.' \ + 'KMilo Thinkpad Laptop Plugin.' \ + 'KMilo Sony Vaio Laptop Plugin.') +subdepends=('kdepimlibs libkde libqtsvg gnupg' \ + 'kdebase-workspace-libs qimageblitz python' \ + 'libkde libqtsvg libqtnetwork' \ + 'libkde libqtsvg khexedit' \ + 'libkde libqtsvg' \ + 'libkde libqtsvg libqtnetwork libzip' \ + 'libkde libqtsvg libqtnetwork' \ + 'libqtsvg libqtnetwork qt4-qdbus bzip2 libkde gmp' \ + 'libkde libqtsvg' \ + 'libkde libqtsvg libqtnetwork' \ + 'libkde libqtsvg' \ + 'libqtsvg libkde libqtnetwork qt4-qdbus bzip2' \ + 'libkde libqtsvg' \ + 'libkde libqtsvg' \ + 'libkde libqtsvg' \ + 'libkmilo libkde libqtsvg' \ + 'libkmilo libkde libqtsvg' \ + 'libkmilo libkde libqtsvg tpctl' \ + 'libkmilo libkde libqtsvg') +subgroups=('kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' \ + 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' \ + 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' \ + 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps') +subarchs=('i686' 'i686' 'i686' 'i686' 'i686' \ + 'i686' 'i686' 'i686' 'i686' 'i686' \ + 'i686' 'i686' 'i686' 'i686' 'i686' \ + 'i686' 'i686' 'i686' 'i686') + + +build() { - Fcd - Fpatchall - make -f admin/Makefile.common cvs || Fdie - Fconf \ - --without-xmms \ - DO_NOT_COMPILE="superkaramba" - cd superkaramba || Fdie - make || Fdie - Fmakeinstall - Fsplit superkaramba /usr - cd .. || Fdie - make || Fdie - Fmakeinstall - chmod 6755 $Fdestdir/usr/bin/klaptop_acpi_helper + CMakeKDE_make + CMakeKDE_split + + ## -kregexpeditor + kde4_install "doc/KRegExpEditor" + kde4_split "kregexpeditor" "kregexpeditor" + + ## -kdf ( kwikdisk ) + kde4_install "kdf" + Fsplit kwikdisk /usr + + ## libkmilo + kde4_install "kmilo/kmilod" + Fsplit libkmilo /usr + + ## -asus part + kde4_install "kmilo/asus" + Fsplit kmilo-asus /usr + + ## -dell part + kde4_install "kmilo/delli8k" + Fsplit kmilo-dell /usr + + ## -thinkpad + kde4_install "kmilo/thinkpad" + Fsplit kmilo-thinkpad /usr + + ## -vaio part + kde4_install "kmilo/kmilo_kvaio" + Fsplit kmilo-vaio /usr } # optimization OK diff --git a/source/kde4/kdeutils/fix-copy_and_paste_shit.patch b/source/kde4/kdeutils/fix-copy_and_paste_shit.patch deleted file mode 100644 index 8ec2820..0000000 --- a/source/kde4/kdeutils/fix-copy_and_paste_shit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kdeutils-3.5.7/klaptopdaemon/Makefile.am kdeutils-3.5.7-p/klaptopdaemon/Makefile.am ---- kdeutils-3.5.7/klaptopdaemon/Makefile.am 2007-05-14 09:40:45.000000000 +0200 -+++ kdeutils-3.5.7-p/klaptopdaemon/Makefile.am 2007-05-26 16:27:01.000000000 +0200 -@@ -9,7 +9,7 @@ - - MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c - kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel --kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst -+kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_XEXT) $(LIB_XSS) -lXtst - kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) libkcmlaptop.la - - klaptop_acpi_helper_SOURCES = acpi_helper.cpp From hermier at frugalware.org Sun Dec 2 21:11:34 2007 From: hermier at frugalware.org (Michel Hermier) Date: Sun Dec 2 21:11:37 2007 Subject: [Frugalware-git] frugalware-current: knb-0.2.2-2-i686 Message-ID: <20071202201134.50B4D176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=799302dcc9c77ec30f545856ff4a334e1ede928e commit 799302dcc9c77ec30f545856ff4a334e1ede928e Author: Michel Hermier Date: Sun Dec 2 21:10:57 2007 +0100 knb-0.2.2-2-i686 * Fix typo in the documentation. diff --git a/source/network-extra/knb/FrugalBuild b/source/network-extra/knb/FrugalBuild index c6c6074..79a2267 100644 --- a/source/network-extra/knb/FrugalBuild +++ b/source/network-extra/knb/FrugalBuild @@ -16,7 +16,7 @@ source=(http://www.beer.one.pl/~esio/c/knb-$pkgver-src.tar.gz \ knb-pidcheck.patch) sha1sums=('3bba023275edbdb0e8056332d72fdd43de4b2b68' \ '8490ce44c17a9f45cc6efd050708020caa081b5a' \ - '45bc711515881ca9405f298f66920af3f8d9ce94' \ + '33510a6bc96d37f1cb107e1f768185f5060a2773' \ '2816355de9bd7f8d86e53e70bb00b9216973be94') build() diff --git a/source/network-extra/knb/README.Frugalware b/source/network-extra/knb/README.Frugalware index cd6b8be..ed857e2 100644 --- a/source/network-extra/knb/README.Frugalware +++ b/source/network-extra/knb/README.Frugalware @@ -8,7 +8,7 @@ server irc.server.com 6667 channel #channel ---- -where `idlenick` is used till `keepnick` is used by someone else. The bot fill +where `idlenick` is used till `keepnick` is used by someone else. The bot will join to `#channel` on `irc.server.com`. You need to register that you're the owner for the first time. To do this, join From crazy at frugalware.org Sun Dec 2 21:56:11 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 2 21:56:14 2007 Subject: [Frugalware-git] playground: kdegraphics-3.96.1_743103-0playground1-i686 Message-ID: <20071202205611.8765C176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=41194efa2af894276872a60e781febf462f1c760 commit 41194efa2af894276872a60e781febf462f1c760 Author: crazy Date: Sun Dec 2 21:54:00 2007 +0100 kdegraphics-3.96.1_743103-0playground1-i686 * Version bump * kdelibs -> libkde diff --git a/source/kde4/kdegraphics/FrugalBuild b/source/kde4/kdegraphics/FrugalBuild index 82ad8ec..32799c9 100644 --- a/source/kde4/kdegraphics/FrugalBuild +++ b/source/kde4/kdegraphics/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: crazy pkgname=kdegraphics -pkgver=3.96.1_742107 +pkgver=3.96.1_743103 pkgrel=0playground1 pkgdesc="KDE Graphics Programs" -depends=('kdelibs' 'libqtnetwork') +depends=('libqtnetwork' 'libkde' 'libqtsvg') makedepends=('exiv2' 'qimageblitz' 'xghostscript' 'poppler-qt4' 'sane-backends' 'libusb' 'djvulibre' 'chmlib') groups=('kde4') archs=('i686') @@ -13,8 +13,9 @@ options=('nomirror') _F_kde4_subpkgs=('gwenview' 'kamera' 'kolourpaint' 'kruler' 'ksnapshot' 'okular' 'libkscan' 'kcolorchooser' 'svgpart') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('d6848c9d1ed989e7265f07973a20e5bb665f362f') +sha1sums=('3045e0cfc50f7331390c30994d63dd99c9b8318d') +## TODO: srigi stuff for 4.1 subpkgs=("${_F_kde4_subpkgs[@]}") subdescs=('Image Viewer for KDE.' \ 'Digital Camera KIO Slave for Konqueror.' \ @@ -25,16 +26,17 @@ subdescs=('Image Viewer for KDE.' \ 'Scanner Library for KDE.' \ 'Color Chooser for KDE.' \ 'KPart to display SVG images.') -subdepends=('kdelibs libqtnetwork svgpart' \ - 'kdelibs libgphoto2' \ - 'kdelibs qimageblitz' \ - 'kdelibs libqtnetwork bzip2' \ - 'kdelibs libqtnetwork' \ - 'kdelibs xghostscript qimageblitz poppler-qt4 djvulibre chmlib' \ - 'sane-backends kdelibs qimageblitz libusb' \ - 'kdelibs libqtnetwork bzip2' \ - 'kdelibs libqtnetwork') -subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4') +subdepends=('libkde libqtsvg libqtnetwork svgpart' \ + 'libkde libqtsvg libgphoto2' \ + 'libkde libqtsvg qimageblitz' \ + 'libkde libqtsvg libqtnetwork bzip2' \ + 'libkde libqtsvg libqtnetwork' \ + 'libkde libqtsvg xghostscript qimageblitz poppler-qt4 djvulibre chmlib' \ + 'libkde libqtsvg sane-backends qimageblitz libusb' \ + 'libkde libqtsvg libqtnetwork bzip2' \ + 'libkde libqtsvg libqtnetwork') +subgroups=('kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' \ + 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps' 'kde4 kde4-apps') subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686') build() @@ -44,3 +46,5 @@ build() kde4_install strigi-analyzer } + +# optimization OK From crazy at frugalware.org Sun Dec 2 22:01:47 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 2 22:01:52 2007 Subject: [Frugalware-git] playground: kde4.sh Message-ID: <20071202210147.366E0176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=3766741594a9e8256bdb229d2538ee8250b28d54 commit 3766741594a9e8256bdb229d2538ee8250b28d54 Author: crazy Date: Sun Dec 2 22:01:33 2007 +0100 kde4.sh * fix kdelib's makedepends() bug diff --git a/source/include/kde4.sh b/source/include/kde4.sh index b744f62..47384d4 100644 --- a/source/include/kde4.sh +++ b/source/include/kde4.sh @@ -56,8 +56,12 @@ if [ -z "$_F_kde4_defaults" ]; then _F_kde4_defaults=1 fi +if [ "$pkgname" = "kdelibs" ]; then + makedepends=("${makedepends[@]}") +else + makedepends=("${makedepends[@]}" 'kdelibs-compiletime>=3.96.1_743104') +fi -makedepends=("${makedepends[@]}" 'kdelibs-compiletime>=3.96.1_743104') ### # == OVERWRITTEN VARIABLES # * url From crazy at frugalware.org Mon Dec 3 00:43:56 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 00:43:59 2007 Subject: [Frugalware-git] playground: strigi-0.5.7-0playground2-i686 Message-ID: <20071202234356.056D0176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=eed489428fa78b9d413a696efb26530c25ec4c37 commit eed489428fa78b9d413a696efb26530c25ec4c37 Author: crazy Date: Mon Dec 3 00:43:20 2007 +0100 strigi-0.5.7-0playground2-i686 * relbump * GUI has an own subpackage now * s/kde4/cmake/ in Finlcude * use tarball from sf.net diff --git a/source/xapps/strigi/FrugalBuild b/source/xapps/strigi/FrugalBuild index c0a5fc8..047bdd1 100644 --- a/source/xapps/strigi/FrugalBuild +++ b/source/xapps/strigi/FrugalBuild @@ -2,22 +2,33 @@ # Maintainer: crazy pkgname=strigi -pkgver=0.5.7_739260 -pkgrel=0playground1 +pkgver=0.5.7 +pkgrel=0playground2 pkgdesc="An advanced, desktop independent search daemon" -depends=('bzip2' 'qt4-qdbus' 'libqtgui' 'clucene' 'gamin' 'exiv2') -makedepends=('j2sdk') +depends=('bzip2' 'dbus' 'clucene' 'exiv2' 'gamin') +makedepends=('j2sdk' 'qt4-qdbus' 'libqtgui') groups=('xapps') archs=('i686') _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 -_F_kde4_defaults=0 -_F_kde4_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib" -options=('nomirror' 'scriptlet') -Finclude sourceforge kde4 -source=(http://ftp.frugalware.org/pub/other/people/crazy/source/kde4/$pkgname-$pkgver.tar.bz2) -sha1sums=('4b56f9f3b66594d6c90ea2b800ff62a66fd8f42c') -## TODO : Split GUI stuff etc -## Add missing optional depends +_F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib" +options=('scriptlet') +Finclude sourceforge cmake +#source=(http://ftp.frugalware.org/pub/other/people/crazy/source/kde4/$pkgname-$pkgver.tar.bz2) +sha1sums=('d7e81f4e6e204129649473e00b20a6fcd7a76f65') +## TODO : Add missing optional depends +subpkgs=("$pkgname-qt4-gui") +subdescs=('Qt4 GUI for strigi.') +subdepends=("$pkgname=$pkgver qt4-qdbus bzip2 libqtgui") +subgroups=('xapps-extra') +subarchs=('i686') + +build() +{ + CMake_build + Fsplit $pkgname-qt4-gui usr/lib/libstrigiqtdbusclient.so* + Fsplit $pkgname-qt4-gui usr/include/strigi/qtdbus + Fsplit $pkgname-qt4-gui usr/bin/strigiclient +} # optimization OK From crazy at frugalware.org Mon Dec 3 01:25:45 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 01:25:47 2007 Subject: [Frugalware-git] playground: soprano-1.98.0_rc1-0playground1-i686 Message-ID: <20071203002545.A97D5176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=f02e82ddb954389ffeb018a89d65708a6ca2c858 commit f02e82ddb954389ffeb018a89d65708a6ca2c858 Author: crazy Date: Mon Dec 3 01:24:42 2007 +0100 soprano-1.98.0_rc1-0playground1-i686 * Version bump * use released tarballs from sf.net * moved Sesame2 storage backend to an own subpackge * s/kde4/cmake/ in Finclude * removed nomirror option diff --git a/source/apps/soprano/FrugalBuild b/source/apps/soprano/FrugalBuild index ec5274f..f91afb0 100644 --- a/source/apps/soprano/FrugalBuild +++ b/source/apps/soprano/FrugalBuild @@ -2,17 +2,35 @@ # Maintainer: crazy pkgname=soprano -pkgver=1.97.2_739107 +pkgver=1.98.0_rc1 pkgrel=0playground1 pkgdesc="RDF storage, parsing, and serialization framework" depends=('libqtnetwork' 'qt4-qdbus' 'clucene' 'librdf' 'libqttest') makedepends=('j2sdk') groups=('apps') archs=('i686') -options=('nomirror' 'scriptlet') -Finclude kde4 -source=(http://ftp.frugalware.org/pub/other/people/crazy/source/kde4/$pkgname-$pkgver.tar.bz2) -sha1sums=('dd4f58b9c165b82e47643d3b555cefb5e7d50659') +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_broken_up2date=1 +_F_cd_path="$pkgname-`echo $pkgver|sed 's/_/-/'`" +options=('scriptlet') +Finclude sourceforge cmake +sha1sums=('96903d94d37ab571f1fa422127a1c1021db33b79') ## TODO: Split +subpkgs=("$pkgname-sesame2") +subdescs=('Sesame2 storage backend (java-based)') +subdepends=("$pkgname=$pkgver j2re") +subgroups=('xapps-extra') +subarchs=('i686') + +build() +{ + CMake_build + + ## -sesame2 + Fsplit $pkgname-sesame2 usr/share/soprano/sesame2 + Fsplit $pkgname-sesame2 usr/lib/soprano/libsoprano_sesame2backend.* + Fsplit $pkgname-sesame2 usr/share/soprano/plugins/sesame2backend.desktop +} + # optimization OK From crazy at frugalware.org Mon Dec 3 01:34:40 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 01:34:47 2007 Subject: [Frugalware-git] playground: strigi-0.5.7-0playground2-i686 Message-ID: <20071203003441.35A21176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=c36f58093b2686d24b469877f7ffe9456ae47807 commit c36f58093b2686d24b469877f7ffe9456ae47807 Author: crazy Date: Mon Dec 3 01:34:16 2007 +0100 strigi-0.5.7-0playground2-i686 * moved to apps diff --git a/source/apps/strigi/FrugalBuild b/source/apps/strigi/FrugalBuild new file mode 100644 index 0000000..0bf7ea4 --- /dev/null +++ b/source/apps/strigi/FrugalBuild @@ -0,0 +1,34 @@ +# Compiling Time: 1.62 SBU +# Maintainer: crazy + +pkgname=strigi +pkgver=0.5.7 +pkgrel=0playground2 +pkgdesc="An advanced, desktop independent search daemon" +depends=('bzip2' 'dbus' 'clucene' 'exiv2' 'gamin') +makedepends=('j2sdk' 'qt4-qdbus' 'libqtgui') +groups=('apps') +archs=('i686') +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_broken_up2date=1 +_F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib" +options=('scriptlet') +Finclude sourceforge cmake +#source=(http://ftp.frugalware.org/pub/other/people/crazy/source/kde4/$pkgname-$pkgver.tar.bz2) +sha1sums=('d7e81f4e6e204129649473e00b20a6fcd7a76f65') +## TODO : Add missing optional depends + +subpkgs=("$pkgname-qt4-gui") +subdescs=('Qt4 GUI for strigi.') +subdepends=("$pkgname=$pkgver qt4-qdbus bzip2 libqtgui") +subgroups=('xapps-extra') +subarchs=('i686') + +build() +{ + CMake_build + Fsplit $pkgname-qt4-gui usr/lib/libstrigiqtdbusclient.so* + Fsplit $pkgname-qt4-gui usr/include/strigi/qtdbus + Fsplit $pkgname-qt4-gui usr/bin/strigiclient +} +# optimization OK diff --git a/source/xapps/strigi/FrugalBuild b/source/xapps/strigi/FrugalBuild deleted file mode 100644 index 047bdd1..0000000 --- a/source/xapps/strigi/FrugalBuild +++ /dev/null @@ -1,34 +0,0 @@ -# Compiling Time: 1.62 SBU -# Maintainer: crazy - -pkgname=strigi -pkgver=0.5.7 -pkgrel=0playground2 -pkgdesc="An advanced, desktop independent search daemon" -depends=('bzip2' 'dbus' 'clucene' 'exiv2' 'gamin') -makedepends=('j2sdk' 'qt4-qdbus' 'libqtgui') -groups=('xapps') -archs=('i686') -_F_sourceforge_ext=".tar.bz2" -_F_sourceforge_broken_up2date=1 -_F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib" -options=('scriptlet') -Finclude sourceforge cmake -#source=(http://ftp.frugalware.org/pub/other/people/crazy/source/kde4/$pkgname-$pkgver.tar.bz2) -sha1sums=('d7e81f4e6e204129649473e00b20a6fcd7a76f65') -## TODO : Add missing optional depends - -subpkgs=("$pkgname-qt4-gui") -subdescs=('Qt4 GUI for strigi.') -subdepends=("$pkgname=$pkgver qt4-qdbus bzip2 libqtgui") -subgroups=('xapps-extra') -subarchs=('i686') - -build() -{ - CMake_build - Fsplit $pkgname-qt4-gui usr/lib/libstrigiqtdbusclient.so* - Fsplit $pkgname-qt4-gui usr/include/strigi/qtdbus - Fsplit $pkgname-qt4-gui usr/bin/strigiclient -} -# optimization OK From crazy at frugalware.org Mon Dec 3 01:51:04 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 01:51:07 2007 Subject: [Frugalware-git] playground: qimageblitz-0.0.4-0playground1-i686 Message-ID: <20071203005104.25B1F176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=419535e5428d7509864117e64d86a7f844bf6acc commit 419535e5428d7509864117e64d86a7f844bf6acc Author: crazy Date: Mon Dec 3 01:50:46 2007 +0100 qimageblitz-0.0.4-0playground1-i686 * Version bump * corrected pkgdesc * use released tarball from sf.net * s/kde4/cmake/ un Finclude * removed nomirror option diff --git a/source/xlib/qimageblitz/FrugalBuild b/source/xlib/qimageblitz/FrugalBuild index 4de9c1e..0e16292 100644 --- a/source/xlib/qimageblitz/FrugalBuild +++ b/source/xlib/qimageblitz/FrugalBuild @@ -2,15 +2,16 @@ # Maintainer: crazy pkgname=qimageblitz -pkgver=4.0.0_731389 +pkgver=0.0.4 pkgrel=0playground1 -pkgdesc="Blitz image effect and filter library" +pkgdesc="Blitz image effect and filter library for KDE 4.0" depends=('libqtgui') groups=('xlib') archs=('i686') -options=('nomirror') -Finclude kde4 -source=(http://ftp.frugalware.org/pub/other/people/crazy/source/kde4/$pkgname-$pkgver.tar.bz2) -sha1sums=('f72437da511db54d2156f3f4900ae301d80705b9') +options=('force') +_F_sourceforge_broken_up2date=1 +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge cmake +sha1sums=('fa1c648d1dfa595b768f4ab481d9e2cd31e43d7e') # optimization OK From crazy at frugalware.org Mon Dec 3 01:55:28 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 01:55:30 2007 Subject: [Frugalware-git] playground: knemo Message-ID: <20071203005528.39903176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=a96b2df03885738950a70b79e1c0ee7dea0798d1 commit a96b2df03885738950a70b79e1c0ee7dea0798d1 Author: crazy Date: Mon Dec 3 01:55:17 2007 +0100 knemo * removed for now diff --git a/source/kde4/knemo/FrugalBuild b/source/kde4/knemo/FrugalBuild deleted file mode 100644 index fd54bb2..0000000 --- a/source/kde4/knemo/FrugalBuild +++ /dev/null @@ -1,27 +0,0 @@ -# Compiling Time: 0.32 SBU -# Maintainer: crazy - -pkgname=knemo -pkgver=0.4.8 -pkgrel=2 -pkgdesc="KNemo is a KDE Network Monitor." -depends=('kdelibs>=3.5.8' 'wireless_tools') -makedepends=('unsermake') -groups=('kde') -archs=('i686' 'x86_64') -_F_kde_id="12956" -Finclude kde -source=(http://kde-apps.org/CONTENT/content-files/12956-$pkgname-$pkgver.tar.bz2 \ - fw-autostart.patch) - -build() -{ - Fcd - Fpatchall - unsermake -f admin/Makefile.common cvs || Fdie - ./configure --prefix=/usr --disable-debug --without-debug || Fdie - unsermake || Fdie - unsermake install prefix=$Fdestdir/usr || Fdie -} -sha1sums=('ee6e8f56fe20b81318c60e38584db6fe3a46fd01' \ - '5062f47be6a7f2a7606e78b60f818f572b23d743') diff --git a/source/kde4/knemo/fw-autostart.patch b/source/kde4/knemo/fw-autostart.patch deleted file mode 100644 index 43d1d79..0000000 --- a/source/kde4/knemo/fw-autostart.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur knemo-0.4.6/src/knemod/knemod.desktop knemo-0.4.6-p/src/knemod/knemod.desktop ---- knemo-0.4.6/src/knemod/knemod.desktop 2006-10-03 21:54:25.000000000 +0200 -+++ knemo-0.4.6-p/src/knemod/knemod.desktop 2007-02-25 05:56:09.000000000 +0100 -@@ -5,7 +5,8 @@ - X-KDE-ModuleType=Library - X-KDE-Library=knemod - X-KDE-FactoryName=knemod --X-KDE-Kded-load-on-demand=true -+X-KDE-Kded-autoload=true -+X-KDE-Kded-load-on-demand=false - Name=KNemo - Name[sv]=Knemo - Name[xx]=xxKNemoxx From crazy at frugalware.org Mon Dec 3 02:17:42 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 02:17:44 2007 Subject: [Frugalware-git] playground: libnova-0.12.1-0playground1-i686 Message-ID: <20071203011742.46993176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=8f2c688e84aaf8192250da6f8c096222cf6ae536 commit 8f2c688e84aaf8192250da6f8c096222cf6ae536 Author: crazy Date: Mon Dec 3 02:16:44 2007 +0100 libnova-0.12.1-0playground1-i686 * New package diff --git a/source/lib/libnova/FrugalBuild b/source/lib/libnova/FrugalBuild new file mode 100644 index 0000000..50e9adb --- /dev/null +++ b/source/lib/libnova/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.33 SBU +# Maintainer: crazy + +pkgname=libnova +pkgver=0.12.1 +pkgrel=0playground1 +pkgdesc="libnova is a general purpose, double precision, celestial mechanics, astrometry and astrodynamics library." +depends=('glibc') +groups=('lib') +archs=('i686') +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +sha1sums=('b27d9b0d6f02f4303a790bce56571f85f2492e75') + +build() +{ + Fcd + Fautoreconf + Fconf + make CFLAGS="$CFLAGS" || Fdie + Fmakeinstall +} + +# optimization OK From crazy at frugalware.org Mon Dec 3 02:36:30 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 02:36:32 2007 Subject: [Frugalware-git] playground: indilib-0.5-0playground1-i686 Message-ID: <20071203013630.172E2176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=6a104579a96365f353b068201cef35a37eac6911 commit 6a104579a96365f353b068201cef35a37eac6911 Author: crazy Date: Mon Dec 3 02:35:19 2007 +0100 indilib-0.5-0playground1-i686 * New package diff --git a/source/lib/indilib/FrugalBuild b/source/lib/indilib/FrugalBuild new file mode 100644 index 0000000..2c7799a --- /dev/null +++ b/source/lib/indilib/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 1.05 SBU +# Maintainer: crazy + +pkgname=indilib +pkgver=0.5 +pkgrel=0playground1 +pkgdesc="An instrument neutral distributed interface control protocol for Astronomical devices." +depends=('libusb' 'zlib') +groups=('lib') +archs=('i686') +_F_sourceforge_dirname="indi" +_F_sourceforge_broken_up2date=1 +_F_cd_path="indi" +Finclude sourceforge +url="http://indi.sourceforge.net/index.php/Main_Page" +sha1sums=('b5ff00359b2de80c2cc7b253d278cff3be20b150') + +# optimization OK From crazy at frugalware.org Mon Dec 3 02:48:24 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 02:48:27 2007 Subject: [Frugalware-git] playground: gmm-3.0-1-i686 Message-ID: <20071203014824.30687176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=f7232fb5d33df8802c75cff35f77208b07a3edb5 commit f7232fb5d33df8802c75cff35f77208b07a3edb5 Author: crazy Date: Mon Dec 3 02:48:07 2007 +0100 gmm-3.0-1-i686 * New package diff --git a/source/lib/gmm/FrugalBuild b/source/lib/gmm/FrugalBuild new file mode 100644 index 0000000..23a04ff --- /dev/null +++ b/source/lib/gmm/FrugalBuild @@ -0,0 +1,14 @@ +# Compiling Time: 0.08 SBU +# Maintainer: crazy + +pkgname=gmm +pkgver=3.0 +pkgrel=1 +pkgdesc="A generic C++ template library for sparse, dense and skyline matrices." +url="http://home.gna.org/getfem/gmm_intro" +depends=() +groups=('lib') +archs=('i686') +up2date="lynx -dump http://home.gna.org/getfem/download.html|grep -om1 'gmm-\(.*\).tar.gz'|Flasttar" +source=(http://download.gna.org/getfem/stable/$pkgname-$pkgver.tar.gz) +sha1sums=('4e235a08742002263b53326872e38e87e688dfea') From crazy at frugalware.org Mon Dec 3 03:21:17 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 03:21:20 2007 Subject: [Frugalware-git] playground: k3b,kaffeine Message-ID: <20071203022117.9115E176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=639c90e0d0acb13e002716d36aecbbc99a7581c3 commit 639c90e0d0acb13e002716d36aecbbc99a7581c3 Author: crazy Date: Mon Dec 3 03:21:01 2007 +0100 k3b,kaffeine * removed from /kde4/ for now diff --git a/source/kde4/k3b/FrugalBuild b/source/kde4/k3b/FrugalBuild deleted file mode 100644 index 5cd9a99..0000000 --- a/source/kde4/k3b/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ - -# Compiling Time: 4.86 SBU -# Maintainer: CSÉCSY László - -pkgname=k3b -pkgver=1.0.4 -pkgrel=1 -pkgdesc="The CD Kreator" -depends=('flac>=1.1.4' 'libsamplerate' 'hal>=0.5.9-2' 'libmusicbrainz' 'taglib' 'ffmpeg>=20070422' 'cdrdao' \ - 'kdelibs>=3.5.8' 'cdrtools' 'cdparanoia' 'normalize' 'sox' 'dvd+rw-tools' 'libmad' \ - 'libvorbis' 'vcdimager' 'libsndfile' 'libdvdread' 'dbus-qt3' 'libmpcdec') -rodepends=('kdebase>=3.5.8') -groups=('kde') -archs=('i686' 'x86_64') -_F_sourceforge_ext=".tar.bz2" -_F_kde_reconf=1 -Finclude kde sourceforge -url="http://www.k3b.org/" -source=($source README.Frugalware) -options=('scriptlet') -Fconfopts="$Fconfopts --enable-mt" - -# optimization OK -sha1sums=('c420c6ca3a1f7405081a85014ef3e3f70e269223'\ - '8704ffb71684abde5b8288054ae25fda386244cc') diff --git a/source/kde4/k3b/README.Frugalware b/source/kde4/k3b/README.Frugalware deleted file mode 100644 index a4b0ab1..0000000 --- a/source/kde4/k3b/README.Frugalware +++ /dev/null @@ -1 +0,0 @@ -If you want to rip a video DVD, install the transcode package as well. diff --git a/source/kde4/kaffeine/FrugalBuild b/source/kde4/kaffeine/FrugalBuild deleted file mode 100644 index 946e901..0000000 --- a/source/kde4/kaffeine/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 0.90 SBU -# Maintainer: crazy -# Contributor: VMiklos - -pkgname=kaffeine -pkgver=0.8.5 -pkgrel=2 -pkgdesc="Kaffeine is full featured Media Player for KDE3." -depends=('kdebase>=3.5.8' 'xine-lib>=1.1.8-2' 'popt' 'libxml2' 'lame' 'cdparanoia' \ - 'gst-plugins-base' 'libogg' 'libxfixes') -groups=('kde') -archs=('i686' 'x86_64') -options=('scriptlet') -_F_sourceforge_ext=".tar.bz2" -_F_kde_defaults=0 -Finclude sourceforge kde - -build() -{ - Fbuild - Frm /usr/share/mimelnk/application/x-mplayer2.desktop -} - -sha1sums=('2a993555cf1b4295230a69fd74d68ed06c3e5ae8') -# optimization OK From crazy at frugalware.org Mon Dec 3 10:02:41 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 3 10:02:43 2007 Subject: [Frugalware-git] playground: kdebindings-3.96.1_744246-0playground1-i686 Message-ID: <20071203090241.84917176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=1bd7db3477cfbee284e8c80b0668d44d497d9636 commit 1bd7db3477cfbee284e8c80b0668d44d497d9636 Author: crazy Date: Mon Dec 3 09:57:18 2007 +0100 kdebindings-3.96.1_744246-0playground1-i686 * Version bump diff --git a/source/kde4/kdebindings/FrugalBuild b/source/kde4/kdebindings/FrugalBuild index 84429d9..061c40f 100644 --- a/source/kde4/kdebindings/FrugalBuild +++ b/source/kde4/kdebindings/FrugalBuild @@ -2,19 +2,20 @@ # Maintainer: crazy pkgname=kdebindings -pkgver=3.96.1_739577 +pkgver=3.96.1_744246 pkgrel=0playground1 pkgdesc="KDE Bindings." groups=('kde4') archs=('i686') depends=() ## Qwt - broken with qtw at the moment -makedepends=('libqtopengl' 'kdelibs' 'qscintilla2-qt4' 'python' 'ruby' 'sip' 'pyqt4' 'mono') -options=('nomirror' 'nodocs' 'nobuild') # empty +makedepends=('libqtopengl' 'qscintilla2-qt4' 'python' 'ruby' 'sip' 'pyqt4' 'mono' 'qscintilla2-qt4' \ + 'libqtsql' 'libqtsvg' 'libqtnetwork' 'libkde' 'libkdecore' 'xfsprogs-attr') +options=('nomirror') # empty Finclude mono kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ hack-MONO-to-build-and-install.patch) -sha1sums=('ca8bee544951dc7dbc395b4222e8a171e7fb26aa' \ +sha1sums=('bd0c5c51b5bbf986d7dab7fd46b70cfaf3b85478' \ '77ed06afc5979af61355286d7a47174fadf3ad63') subpkgs=('pykde4' "$pkgname-krosspython" "$pkgname-smoke-qt" "$pkgname-smoke-kde" \ @@ -27,14 +28,14 @@ subdescs=('KDE4 python bindings.' \ 'KDE4 ruby bindings.' \ 'Kross ruby bindings.' \ 'KDE4 charp bindings.') -subdepends=('python kdelibs pyqt4 sip' \ - 'kdelibs python libqtnetwork' \ - 'libqtnetwork libqtopengl qt4-qdbus libqtsql libqtsvg qscintilla2-qt4' \ - 'libqtopengl kdelibs' \ - 'ruby kdebindings-smoke-qt' \ - 'ruby kdebindings-smoke-kde' \ - 'kdelibs ruby libqtnetwork bzip2' \ - 'kdebindings-smoke-qt') +subdepends=('libkde xfsprogs-attr libkdecore python freetype2 libice libxrender' \ + 'libkde libkdecore python freetype2 libice libxrender' \ + 'libqtsql libdrm libqtopengl libqtsvg qscintilla2-qt4 freetype2 qt4-qdbus libxrender libqtnetwork' \ + 'libdrm libqtopengl libkde xfsprogs-attr libkdecore freetype2 libxrender' \ + 'libdrm kdebindings-smoke-qt freetype2 ruby libxrender' \ + 'libdrm kdebindings-smoke-kde xfsprogs-attr libkdecore freetype2 ruby libxrender' \ + 'libkde libkdecore freetype2 libice ruby libxrender' \ + 'libdrm kdebindings-smoke-qt freetype2 libxrender') subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4') subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686') @@ -50,7 +51,7 @@ build() mkdir build || Fdie cd build || Fdie - CMakeKDE_conf + CMake_conf make || Fdie ## -pykde4 @@ -79,3 +80,5 @@ build() ## shut up tar Fmkdir usr/share/doc/$pkgname/DUMMY_PACKAGE_DO_NOT_USE } + +# optimization OK From vmiklos at frugalware.org Mon Dec 3 12:42:14 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 3 12:42:18 2007 Subject: [Frugalware-git] vmiklos: archivemail-0.7.2-2-i686 Message-ID: <20071203114214.C6D27119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=vmiklos.git;a=commitdiff;h=a6fb4865aa8d6b93c917004b6682757401ecc6c7 commit a6fb4865aa8d6b93c917004b6682757401ecc6c7 Author: Miklos Vajna Date: Mon Dec 3 12:42:01 2007 +0100 archivemail-0.7.2-2-i686 added patch to handle the TMPDIR env var diff --git a/source/network-extra/archivemail/FrugalBuild b/source/network-extra/archivemail/FrugalBuild index 4e89cf0..5480e79 100644 --- a/source/network-extra/archivemail/FrugalBuild +++ b/source/network-extra/archivemail/FrugalBuild @@ -3,10 +3,12 @@ pkgname=archivemail pkgver=0.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for archiving and compressing old email in mailboxes." Finclude sourceforge depends=('python') groups=('network-extra') archs=('i686' 'x86_64') -sha1sums=('0ff9b8991b04f09cf9536c45b6f9e05d2427a459') +source=($source archivemail-0.7.2-tmpdir.diff) +sha1sums=('0ff9b8991b04f09cf9536c45b6f9e05d2427a459' \ + '32efbe94a2f2e423265147795bb3883ccc127e74') diff --git a/source/network-extra/archivemail/archivemail-0.7.2-tmpdir.diff b/source/network-extra/archivemail/archivemail-0.7.2-tmpdir.diff new file mode 100644 index 0000000..2c3f4ec --- /dev/null +++ b/source/network-extra/archivemail/archivemail-0.7.2-tmpdir.diff @@ -0,0 +1,14 @@ +--- archivemail.orig 2007-12-03 12:36:15.000000000 +0100 ++++ archivemail 2007-12-03 12:31:11.000000000 +0100 +@@ -1122,7 +1122,10 @@ + old_temp_dir = tempfile.tempdir + try: + # create a temporary directory for us to work in securely +- tempfile.tempdir = None ++ if 'TMPDIR' in os.environ.keys(): ++ tempfile.tempdir = os.environ['TMPDIR'] ++ else: ++ tempfile.tempdir = None + new_temp_dir = tempfile.mkdtemp('archivemail') + assert(new_temp_dir) + _stale.temp_dir = new_temp_dir From vmiklos at frugalware.org Mon Dec 3 13:18:49 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 3 13:18:51 2007 Subject: [Frugalware-git] homepage-ng: 0.8pre1 announce draft Message-ID: <20071203121849.618E911901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f5bd5a2f258a13d9b612f2bfc493c4381875d639 commit f5bd5a2f258a13d9b612f2bfc493c4381875d639 Author: Miklos Vajna Date: Mon Dec 3 13:18:33 2007 +0100 0.8pre1 announce draft diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 65b855e..0200a4b 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -17,6 +17,82 @@ + 79 + Frugalware 0.8pre1 (Kalgan) released + FIXME + VMiklos + 1 + announce the immediate availability of Frugalware 0.8pre1, the first technical preview of the upcoming 0.8 stable release.
+ A short and incomplete list of changes since 0.7:
+
    +
  • Package updates: +
      +
    • Linux 2.6.23 + fixes
      • +
    • GNU C Library 2.7
      • +
    • GCC 4.2.2
      • +
    • espgs is now relplaced with the stock ghostscript
      • +
    • compiz-fusion replaced beryl, most users now can avoid XGL
      • +
    • more than 600 other upstream updates
      • +
    • more than 100 new packages, including 20 new games
      • +
    +
    • +
  • New features: +
      +
    • Added FUN (Frugalware Update Notifier), which resides in the user's system tray and notifies if an update is available.
      • +
    • Added WPA support to the installer.
      • +
    +
    • +
+ Please refer to the Frugalware Testing ChangeLog for more information.
+ Download for i686:
+ NOTE: Don't download CDs 3-12 or the second DVD unless you don't have an internet connection
+ livecd, + netinstall, + usb, + tftp, + cd1, + cd2, + cd3, + cd4, + cd5, + cd6, + cd7, + cd8, + cd9, + cd10, + cd11, + cd12, + cd13, + dvd1 and + dvd2 +
+ SHA1SUMS: + 
+02e578aa85d125284556988cdb25360ff9111960  frugalware-0.8pre1-i686-cd10.iso
+28ccb3da4098608beb6a8f00af9ea5fd9ca8c1c2  frugalware-0.8pre1-i686-cd11.iso
+ed06c325ecfa07e52fdc063c7ff097134575e6e9  frugalware-0.8pre1-i686-cd12.iso
+f32a6279c7158f2cdc61edb911e4b77f410d0b03  frugalware-0.8pre1-i686-cd13.iso
+f6f4a62003c2f350aa11d270bc4b38b31f5cc96e  frugalware-0.8pre1-i686-cd1.iso
+54c33672abce250d97a38d8fd126933203a6b181  frugalware-0.8pre1-i686-cd2.iso
+a743bacd345804d78fc11aa37a7e613c9c448029  frugalware-0.8pre1-i686-cd3.iso
+446cdc74b5636ee17440b5f52662b3f3f1096512  frugalware-0.8pre1-i686-cd4.iso
+7b6ec80b5c423b1a7eedf0eaa4eb6ddf3bfa04b1  frugalware-0.8pre1-i686-cd5.iso
+125eb72cc1ee89eeb1b9c0de79128a4664d8b997  frugalware-0.8pre1-i686-cd6.iso
+4e82c7a6968b523898d0fbd1ce1089d6496823f4  frugalware-0.8pre1-i686-cd7.iso
+59e9e891a2227b521d84abf9efd87b1298eed235  frugalware-0.8pre1-i686-cd8.iso
+cc66aa7f5fe3dd2bdbe3f868228b9cf9e7551a70  frugalware-0.8pre1-i686-cd9.iso
+a1321a1f978bfedf8cf7fdd33c90e858bd881e10  frugalware-0.8pre1-i686-dvd1.iso
+8b4199630cda32bd91b3cea94c461e7f86c875c7  frugalware-0.8pre1-i686-dvd2.iso
+3667e2f2a710a87f266a465500393a0cb2c341dc  frugalware-0.8pre1-i686-net.iso
+64e0e9c40772e573824a950437490a5165edba15  fwlive-0.8pre1-i686-full.iso
+1c103ed0f0a5f86df03350efbddba696ee7203f4  frugalware-0.8pre1-i686-tftp.img.gz
+2fb3b8863079fb17ed6971226f5d996bd149e07d  frugalware-0.8pre1-i686-usb.tar.gz
+
+ ]]> + + + 78 Frugalware Newsletter Issue 10 Sat Nov 24 17:54:01 CET 2007 From vmiklos at frugalware.org Mon Dec 3 17:31:16 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 3 17:31:18 2007 Subject: [Frugalware-git] homepage-ng: sort the sha1sums in 0.8pre1 draft Message-ID: <20071203163116.0104211904C0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=b7dad97fb40b56207841ec942d9470c97af773ab commit b7dad97fb40b56207841ec942d9470c97af773ab Author: Miklos Vajna Date: Mon Dec 3 17:31:07 2007 +0100 sort the sha1sums in 0.8pre1 draft diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 0200a4b..811d009 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -69,10 +69,6 @@
SHA1SUMS: 
-02e578aa85d125284556988cdb25360ff9111960  frugalware-0.8pre1-i686-cd10.iso
-28ccb3da4098608beb6a8f00af9ea5fd9ca8c1c2  frugalware-0.8pre1-i686-cd11.iso
-ed06c325ecfa07e52fdc063c7ff097134575e6e9  frugalware-0.8pre1-i686-cd12.iso
-f32a6279c7158f2cdc61edb911e4b77f410d0b03  frugalware-0.8pre1-i686-cd13.iso
f6f4a62003c2f350aa11d270bc4b38b31f5cc96e  frugalware-0.8pre1-i686-cd1.iso
54c33672abce250d97a38d8fd126933203a6b181  frugalware-0.8pre1-i686-cd2.iso
a743bacd345804d78fc11aa37a7e613c9c448029  frugalware-0.8pre1-i686-cd3.iso
@@ -82,6 +78,10 @@ a743bacd345804d78fc11aa37a7e613c9c448029  frugalware-0.8pre1-i686-cd3.iso
4e82c7a6968b523898d0fbd1ce1089d6496823f4  frugalware-0.8pre1-i686-cd7.iso
59e9e891a2227b521d84abf9efd87b1298eed235  frugalware-0.8pre1-i686-cd8.iso
cc66aa7f5fe3dd2bdbe3f868228b9cf9e7551a70  frugalware-0.8pre1-i686-cd9.iso
+02e578aa85d125284556988cdb25360ff9111960  frugalware-0.8pre1-i686-cd10.iso
+28ccb3da4098608beb6a8f00af9ea5fd9ca8c1c2  frugalware-0.8pre1-i686-cd11.iso
+ed06c325ecfa07e52fdc063c7ff097134575e6e9  frugalware-0.8pre1-i686-cd12.iso
+f32a6279c7158f2cdc61edb911e4b77f410d0b03  frugalware-0.8pre1-i686-cd13.iso
a1321a1f978bfedf8cf7fdd33c90e858bd881e10  frugalware-0.8pre1-i686-dvd1.iso
8b4199630cda32bd91b3cea94c461e7f86c875c7  frugalware-0.8pre1-i686-dvd2.iso
3667e2f2a710a87f266a465500393a0cb2c341dc  frugalware-0.8pre1-i686-net.iso
From crazy at frugalware.org  Mon Dec  3 20:00:18 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec  3 20:00:21 2007
Subject: [Frugalware-git] playground: decibel-0.6_730296-0playground2-i686
Message-ID: <20071203190018.EAD7211904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=f6022b683b64f7c171cdc0dbe7798a9fd0982026

commit f6022b683b64f7c171cdc0dbe7798a9fd0982026
Author: crazy 
Date:   Mon Dec 3 19:59:56 2007 +0100

decibel-0.6_730296-0playground2-i686
* release bump
* kdelibs -> libkde

diff --git a/source/kde4/decibel/FrugalBuild b/source/kde4/decibel/FrugalBuild
index f061c56..82670e8 100644
--- a/source/kde4/decibel/FrugalBuild
+++ b/source/kde4/decibel/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=decibel
pkgver=0.6_730296
-pkgrel=0playground1
+pkgrel=0playground2
pkgdesc="Decibel is a realtime communications framework"
url="http://decibel.kde.org/"
-depends=('kdelibs>=3.96.1_739423' 'libqtnetwork' 'bzip2' 'tapioca-qt' 'telepathy-qt')
+depends=('libkde' 'tapioca-qt' 'libkdecore' 'freetype2' 'libice' 'libxrender')
groups=('kde4')
archs=('i686')
options=('nomirror')
From vmiklos at frugalware.org  Mon Dec  3 23:54:58 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec  3 23:55:00 2007
Subject: [Frugalware-git] pacman-tools: chkdep: small speed hack: cache the
	output of checker()
Message-ID: <20071203225458.9104011904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=58a84df32d7f21a6921f66436c2eea213c2e17a9

commit 58a84df32d7f21a6921f66436c2eea213c2e17a9
Author: Miklos Vajna 
Date:   Mon Dec 3 23:48:40 2007 +0100

chkdep: small speed hack: cache the output of checker()

diff --git a/chkdep b/chkdep
index 3f27926..9cb60b6 100755
--- a/chkdep
+++ b/chkdep
@@ -212,7 +212,7 @@ for root, dirs, files in os.walk(fpmroot):
for file in files:
ret = checker(os.path.join(root, file))
if ret:
-			for i in checker(os.path.join(root, file)):
+			for i in ret:
if i not in depfiles:
depfiles.append(i)
for i in depfiles:
From vmiklos at frugalware.org  Mon Dec  3 23:54:58 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec  3 23:55:01 2007
Subject: [Frugalware-git] pacman-tools: chkdep: added a -t/--trace option
	for more debug output
Message-ID: <20071203225458.AD3DC11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=22f6055139d8d75c9abef19e36a8747750fd304d

commit 22f6055139d8d75c9abef19e36a8747750fd304d
Author: Miklos Vajna 
Date:   Mon Dec 3 23:54:47 2007 +0100

chkdep: added a -t/--trace option for more debug output

diff --git a/chkdep b/chkdep
index 9cb60b6..8a5b95a 100755
--- a/chkdep
+++ b/chkdep
@@ -44,6 +44,8 @@ def detect_owner(lib):
if not owner and not quiet:
print >>sys.stderr, "WARNING: No package found containing %s!" % lib
elif owner not in deps:
+		if trace:
+			print "%s is an owner for %s" % (owner, lib)
deps.append(owner)

class Checks:
@@ -167,9 +169,10 @@ dir = None
method="elf"
pkg = None
quiet = False
+trace = True

try:
-	opts, args = getopt.getopt(sys.argv[1:], "d:p:qn:m:vi", ["dir=", "package=", "quiet", "ignore=", "method=", "version"])
+	opts, args = getopt.getopt(sys.argv[1:], "d:p:qn:m:tvi", ["dir=", "package=", "quiet", "ignore=", "method=", "trace", "version"])
except getopt.GetoptError:
usage()
sys.exit(1)
@@ -185,6 +188,8 @@ for opt, arg in opts:
method = arg
if opt in ("-n", "--name"):
ignorepkgs.append(arg)
+	if opt in ("-t", "--trace"):
+		trace = True
if opt in ("-v", "--version"):
print "chkdep %s" % __version__
sys.exit(0)
@@ -214,6 +219,8 @@ for root, dirs, files in os.walk(fpmroot):
if ret:
for i in ret:
if i not in depfiles:
+					if trace:
+						print "Found %s as a new dependency file." % i
depfiles.append(i)
for i in depfiles:
detect_owner(i)
@@ -221,5 +228,7 @@ for i in depfiles:
if pkg:
shutil.rmtree(fpmroot)

+if trace:
+	print "Dependencies before dependency cleanup: depends=('" + "' '".join(deps) + "')"
deps = rmdupdeps(deps)
print "depends=('" + "' '".join(deps) + "')"
diff --git a/chkdep.txt b/chkdep.txt
index 9e2a429..d18f878 100644
--- a/chkdep.txt
+++ b/chkdep.txt
@@ -33,5 +33,8 @@ chkdep [ -d | -p ]  [options]
-i::
Does nothing (for backward compatibility).

+-t, --trace::
+	More verbose output about what chkdep does.
+
-v, --version::
Display the package version.
From vmiklos at frugalware.org  Tue Dec  4 00:12:13 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 00:12:16 2007
Subject: [Frugalware-git] pacman-tools: chkdep: more trace info in
	rmdupdeps()
Message-ID: <20071203231213.6E80311904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=c0e7932169beb7d7f4e2437d81fa0b6a3b5c20a4

commit c0e7932169beb7d7f4e2437d81fa0b6a3b5c20a4
Author: Miklos Vajna 
Date:   Tue Dec 4 00:12:01 2007 +0100

chkdep: more trace info in rmdupdeps()

diff --git a/chkdep b/chkdep
index 8a5b95a..c14f513 100755
--- a/chkdep
+++ b/chkdep
@@ -25,12 +25,15 @@ def rmdupdeps(deps):
while j:
dep = pacman.void_to_char(pacman.list_getdata(j)).split("<")[0].split(">")[0].split("=")[0]
if dep not in depdeps:
+					print "%s will be ignored if found, as %s already depends on it." % (dep, pkgname)
depdeps.append(dep)
j = pacman.list_next(j)
i = pacman.list_next(i)
for i in deps:
if i not in depdeps and i not in ignorepkgs:
newdeps.append(i)
+		elif i in depdeps:
+			print "Ignoring %s as it is already a dependency of some other dependency." % i
return newdeps

def detect_owner(lib):
From vmiklos at frugalware.org  Tue Dec  4 00:27:50 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 00:27:52 2007
Subject: [Frugalware-git] pacman-tools: chkdep: handle dependency cycles
	when cleaning up the depends() list
Message-ID: <20071203232750.1FADD11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=c6d074a7b36116b64a896fd8fec43648c6c07f8b

commit c6d074a7b36116b64a896fd8fec43648c6c07f8b
Author: Miklos Vajna 
Date:   Tue Dec 4 00:27:41 2007 +0100

chkdep: handle dependency cycles when cleaning up the depends() list
thanks crazy for reporting this issue

diff --git a/chkdep b/chkdep
index c14f513..22a0d1a 100755
--- a/chkdep
+++ b/chkdep
@@ -20,7 +20,8 @@ def rmdupdeps(deps):
while i:
pkg = pacman.void_to_PM_PKG(pacman.list_getdata(i))
pkgname = pacman.void_to_char(pacman.pkg_getinfo(pkg, pacman.PKG_NAME))
-		if pkgname in deps and pkgname not in ignorepkgs:
+		# we don't allow pkgname in depdeps to handle dep cycles
+		if pkgname in deps and pkgname not in depdeps and pkgname not in ignorepkgs:
j = pacman.void_to_PM_LIST(pacman.pkg_getinfo(pkg, pacman.PKG_DEPENDS))
while j:
dep = pacman.void_to_char(pacman.list_getdata(j)).split("<")[0].split(">")[0].split("=")[0]
From crazy at frugalware.org  Tue Dec  4 00:45:05 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 00:45:07 2007
Subject: [Frugalware-git] 
	playground: kdebase-workspace-3.96.1_743091-0playground2-i686
Message-ID: <20071203234505.9942911904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=58563031bce3a08444cf1da4b039a64928f090e4

commit 58563031bce3a08444cf1da4b039a64928f090e4
Author: crazy 
Date:   Tue Dec 4 00:44:43 2007 +0100

kdebase-workspace-3.96.1_743091-0playground2-i686
* added an patch to fix broken icons naming in some *.directory files
* a lot more a broken but .. ( KDE BUG: 153377 )

diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild
index 61f5355..9c665d5 100644
--- a/source/kde4/kdebase-workspace/FrugalBuild
+++ b/source/kde4/kdebase-workspace/FrugalBuild
@@ -17,10 +17,12 @@ _F_cmake_confopts="$_F_cmake_confopts -DWITH_NetworkManager:BOOL=OFF"
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \
ksysguarddrc_use_config_install_dir.patch \
-	systemsettingsrc_use_config_install_dir.patch)
+	systemsettingsrc_use_config_install_dir.patch \
+	fix_some_icon_names_in_directory.patch)
sha1sums=('d645d3a55028d22b2a0c2aafce2b0f4678086a23' \
'c173303c33871f9fed4e33d16b323952a902d1aa' \
-          'eed7fe30f80be191d4d63c6e2966d7276e961446')
+          'eed7fe30f80be191d4d63c6e2966d7276e961446' \
+          '1281378a0cc3ac2d52a11f3afdbf8d8b96e0f36f')

## TODO: kdm
## FIXME: QT4
diff --git a/source/kde4/kdebase-workspace/fix_some_icon_names_in_directory.patch b/source/kde4/kdebase-workspace/fix_some_icon_names_in_directory.patch
new file mode 100644
index 0000000..d20b2df
--- /dev/null
+++ b/source/kde4/kdebase-workspace/fix_some_icon_names_in_directory.patch
@@ -0,0 +1,66 @@
+Index: menu/desktop/kde-development-translation.directory
+===================================================================
+--- menu/desktop/kde-development-translation.directory	(Revision 744587)
++++ menu/desktop/kde-development-translation.directory	(Arbeitskopie)
+@@ -65,7 +65,7 @@
+ Name[x-test]=xxTranslationxx
+ Name[zh_CN]=翻译
+ Name[zh_TW]=çżťč­Ż
+-Icon=locale
++Icon=preferences-desktop-locale
+
+ [Desktop Entry]
+ Encoding=UTF-8
+@@ -134,5 +134,5 @@
+ Name[x-test]=xxTranslationxx
+ Name[zh_CN]=翻译
+ Name[zh_TW]=çżťč­Ż
+-Icon=locale
++Icon=preferences-desktop-locale
+
+Index: menu/desktop/kde-utilities-peripherals.directory
+===================================================================
+--- menu/desktop/kde-utilities-peripherals.directory	(Revision 744587)
++++ menu/desktop/kde-utilities-peripherals.directory	(Arbeitskopie)
+@@ -66,7 +66,7 @@
+ Name[xh]=Iilayini zomda
+ Name[zh_CN]=外设
+ Name[zh_TW]=週邊設備
+-Icon=input_devices_settings
++Icon=preferences-desktop-peripherals
+ Comment=Peripherals
+ Comment[af]=Randapparatuur
+ Comment[ar]=الأجهزة الطرفية
+Index: menu/desktop/kde-utilities-pim.directory
+===================================================================
+--- menu/desktop/kde-utilities-pim.directory	(Revision 744587)
++++ menu/desktop/kde-utilities-pim.directory	(Arbeitskopie)
+@@ -17,7 +17,7 @@
+ Name[uk]=Керування інформацією
+ Name[x-test]=xxPIMxx
+ Name[zh_CN]=个人信息管理
+-Icon=korganizer
++Icon=view-pim-summary
+ Comment=PIM
+ Comment[af]=Persoonlike Informasie Bestuurder
+ Comment[ar]=مدير المعلومات الشخصي
+Index: menu/desktop/kde-unknown.directory
+===================================================================
+--- menu/desktop/kde-unknown.directory	(Revision 744587)
++++ menu/desktop/kde-unknown.directory	(Arbeitskopie)
+@@ -61,4 +61,4 @@
+ Name[wa]=Pierdous & rtrovĂŠs
+ Name[x-test]=xxLost & Foundxx
+ Name[zh_CN]=观感
+-Icon=help
++Icon=system-help
+Index: menu/desktop/kde-editors.directory
+===================================================================
+--- menu/desktop/kde-editors.directory	(Revision 744587)
++++ menu/desktop/kde-editors.directory	(Arbeitskopie)
+@@ -64,4 +64,4 @@
+ Name[xh]=Abahleli
+ Name[zh_CN]=编辑器
+ Name[zh_TW]=編輯器
+-Icon=package_editors
++Icon=accessories-text-editor
From vmiklos at frugalware.org  Tue Dec  4 02:07:23 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 02:07:25 2007
Subject: [Frugalware-git] pacman-tools: chkdep: disable trace by default
Message-ID: <20071204010723.F28C011904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=092c2acc0a42def9ed293c3b75b8564e8d5975bc

commit 092c2acc0a42def9ed293c3b75b8564e8d5975bc
Author: Miklos Vajna 
Date:   Tue Dec 4 02:07:12 2007 +0100

chkdep: disable trace by default

diff --git a/chkdep b/chkdep
index 22a0d1a..860b464 100755
--- a/chkdep
+++ b/chkdep
@@ -173,7 +173,7 @@ dir = None
method="elf"
pkg = None
quiet = False
-trace = True
+trace = False

try:
opts, args = getopt.getopt(sys.argv[1:], "d:p:qn:m:tvi", ["dir=", "package=", "quiet", "ignore=", "method=", "trace", "version"])
From crazy at frugalware.org  Tue Dec  4 02:50:34 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 02:50:36 2007
Subject: [Frugalware-git] 
	playground: kdebase-workspace-3.96.1_743091-0playground3-i686
Message-ID: <20071204015034.5627311904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=7c0e150374e0fdd0dc4dfa46f142be95e3d3c046

commit 7c0e150374e0fdd0dc4dfa46f142be95e3d3c046
Author: crazy 
Date:   Tue Dec 4 02:46:30 2007 +0100

kdebase-workspace-3.96.1_743091-0playground3-i686
* depends() fix
* fixed kdm's background

diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild
index 9c665d5..46053e4 100644
--- a/source/kde4/kdebase-workspace/FrugalBuild
+++ b/source/kde4/kdebase-workspace/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=kdebase-workspace
pkgver=3.96.1_743091
-pkgrel=0playground2
+pkgrel=0playground3
pkgdesc="Programs specific for the KDE4 desktop."
depends=('libkde>=>=3.96.1_743104' 'libqt3support' 'libqtsvg' 'libxpm' 'strigi' 'xfsprogs-acl' 'libxtst' 'libqtopengl' 'libxres' \
'lmsensors' 'libxcomposite' 'libxklavier' 'libxscrnsaver' 'qimageblitz' 'libqtscript' 'libcaptury' \
-	 'libraw1394' 'bluez-libs')
+	 'libraw1394' 'bluez-libs' 'strigi-qt4-gui')
makedepends=('libqtscript' 'qt4-designer')
rodepends=('kde-frugalware>=0.9.0' 'xorg-server>=1.2.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop' 'xrdb' "$pkgname-libs=$pkgver")
groups=('kde4' 'kde4-minimal')
@@ -54,6 +54,7 @@ build()
## When the newer obe are merged this will have -wallpapers package
Frm usr/share/wallpapers/*
cp -ra ../wallpapers/*plasma* $Fdestdir/usr/share/wallpapers/ || Fdie
+	Fsed "Wallpaper=.*" "Wallpaper=plasma-default.png"  $Fdestdir/etc/kde4/config/kdm/backgroundrc

}
From vmiklos at frugalware.org  Tue Dec  4 09:34:45 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 09:34:48 2007
Subject: [Frugalware-git] homepage-ng: 0.8pre1 is out
Message-ID: <20071204083445.9E00711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=72d1413886471a13fcbef18946c1cac8d854fb1d

commit 72d1413886471a13fcbef18946c1cac8d854fb1d
Author: Miklos Vajna 
Date:   Tue Dec 4 09:34:38 2007 +0100

0.8pre1 is out

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index 811d009..ca563fc 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -19,9 +19,9 @@

79
Frugalware 0.8pre1 (Kalgan) released
-		FIXME
+		Tue Dec  4 09:33:56 CET 2007
VMiklos
-		1
+		0
announce the immediate availability of Frugalware 0.8pre1, the first technical preview of the upcoming 0.8 stable release.

A short and incomplete list of changes since 0.7:

diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml
index ac93175..279fa35 100644
--- a/frugalware/xml/roadmap.xml
+++ b/frugalware/xml/roadmap.xml
@@ -46,7 +46,7 @@

pre1
Dec 4, 2007
-			0
+			1



From crazy at frugalware.org  Tue Dec  4 10:29:27 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 10:29:30 2007
Subject: [Frugalware-git] playground: strigi-0.5.7-0playground2-i686
Message-ID: <20071204092927.933B111904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=abf8860ffa02fad52750f705f363a00dab65b322

commit abf8860ffa02fad52750f705f363a00dab65b322
Author: crazy 
Date:   Tue Dec 4 06:42:13 2007 +0100

strigi-0.5.7-0playground2-i686
* move gui parts back to xapps , this ugly  menu need it

diff --git a/source/apps/strigi/FrugalBuild b/source/apps/strigi/FrugalBuild
index 0bf7ea4..954d04b 100644
--- a/source/apps/strigi/FrugalBuild
+++ b/source/apps/strigi/FrugalBuild
@@ -21,7 +21,7 @@ sha1sums=('d7e81f4e6e204129649473e00b20a6fcd7a76f65')
subpkgs=("$pkgname-qt4-gui")
subdescs=('Qt4 GUI for strigi.')
subdepends=("$pkgname=$pkgver qt4-qdbus bzip2 libqtgui")
-subgroups=('xapps-extra')
+subgroups=('xapps')
subarchs=('i686')

build()
From crazy at frugalware.org  Tue Dec  4 10:29:27 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 10:29:31 2007
Subject: [Frugalware-git] 
	playground: kdelibs-3.96.1_744663-0playground4-i686
Message-ID: <20071204092927.D404A11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=37347ce3a66deda24c874a6d5d7da85d4141df13

commit 37347ce3a66deda24c874a6d5d7da85d4141df13
Author: crazy 
Date:   Tue Dec 4 10:22:59 2007 +0100

kdelibs-3.96.1_744663-0playground4-i686
* release bump

diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild
index 3cd6f3a..371c995 100644
--- a/source/kde4/kdelibs/FrugalBuild
+++ b/source/kde4/kdelibs/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=kdelibs
-pkgver=3.96.1_743104
+pkgver=3.96.1_744663
pkgrel=0playground4
pkgdesc="KDE4 Core Libraries."
depends=('libqtsvg' 'libxpm' 'libxtst' 'strigi' 'xfsprogs-acl' 'pcre' 'soprano' \
@@ -16,7 +16,7 @@ options=('nomirror')
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \
flac.patch)
-sha1sums=('688346508a642949e9d5d8c71d945c0d4c487a6e' \
+sha1sums=('347c9c48d507448d11ecdd3efdc2c3717d39af9a' \
'0ff2c4946a6f58c0dadc7b6bd1027f46fab66218')

## TODO: groups!!!
From vmiklos at frugalware.org  Tue Dec  4 10:35:34 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 10:35:36 2007
Subject: [Frugalware-git] homepage-ng: typo in 0.8pre1 announce
Message-ID: <20071204093534.53CE411904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=fc4ea8b40247f6a46bd3f5e39905f3815f441c41

commit fc4ea8b40247f6a46bd3f5e39905f3815f441c41
Author: Miklos Vajna 
Date:   Tue Dec 4 10:35:30 2007 +0100

typo in 0.8pre1 announce
notced by phayz

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index ca563fc..7525141 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -31,7 +31,7 @@

  • Linux 2.6.23 + fixes
    • 

  • GNU C Library 2.7
    • 

  • GCC 4.2.2
    • 
-						
  • espgs is now relplaced with the stock ghostscript
    • 
+						
  • espgs is now replaced with the stock ghostscript
    • 

  • compiz-fusion replaced beryl, most users now can avoid XGL
    • 

  • more than 600 other upstream updates
    • 

  • more than 100 new packages, including 20 new games
    • 
From crazy at frugalware.org  Tue Dec  4 10:49:49 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 10:49:51 2007
Subject: [Frugalware-git] 
	playground: kdepimlibs-3.96.1_744361-0playground1-i686
Message-ID: <20071204094949.61ACD11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=033d516de4c7d123510babb52821ba1e02fc4eff

commit 033d516de4c7d123510babb52821ba1e02fc4eff
Author: crazy 
Date:   Tue Dec 4 10:48:44 2007 +0100

kdepimlibs-3.96.1_744361-0playground1-i686
* Version bump

diff --git a/source/kde4/kdepimlibs/FrugalBuild b/source/kde4/kdepimlibs/FrugalBuild
index ec23f30..468467b 100644
--- a/source/kde4/kdepimlibs/FrugalBuild
+++ b/source/kde4/kdepimlibs/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy 

pkgname=kdepimlibs
-pkgver=3.96.1_742565
-pkgrel=0playground2
+pkgver=3.96.1_744361
+pkgrel=0playground1
pkgdesc="Personal Information Management (PIM) libraries for KDE4."
depends=('libkde>=3.96.1_743104' 'libqtsvg' 'libldap' 'gpgme' 'boost')
makedepends=('openldap')
@@ -12,6 +12,6 @@ archs=('i686')
options=('nomirror')
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2)
-sha1sums=('001708ae59431c2e921f21643641e8df6eb2c9e4')
+sha1sums=('811f810e6d5fbd9e8fb6c0ad6d8720c9c42dccb0')

# optimization OK
From vmiklos at frugalware.org  Tue Dec  4 10:52:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 10:52:40 2007
Subject: [Frugalware-git] frugalware-current: obexfs-0.8-1-i686
Message-ID: <20071204095237.A579111904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7bf2a790fd0e715cfedb4e2bc3061afc99d7d119

commit 7bf2a790fd0e715cfedb4e2bc3061afc99d7d119
Author: Miklos Vajna 
Date:   Fri Nov 30 01:30:34 2007 +0100

obexfs-0.8-1-i686
new package

diff --git a/source/apps-extra/obexfs/FrugalBuild b/source/apps-extra/obexfs/FrugalBuild
new file mode 100644
index 0000000..6b5fac0
--- /dev/null
+++ b/source/apps-extra/obexfs/FrugalBuild
@@ -0,0 +1,15 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: VMiklos 
+
+pkgname=obexfs
+pkgver=0.8
+pkgrel=1
+pkgdesc="FUSE based filesystem using ObexFTP."
+_F_sourceforge_dirname=openobex
+Finclude sourceforge
+url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFs"
+depends=('openobex' 'fuse' 'obexftp')
+groups=('apps-extra')
+archs=('i686')
+up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=8960&package_id=178407'|Flasttar"
+sha1sums=('99c0c54212a2fc874107efbc9ad2ba7ad2b7ab37')
From vmiklos at frugalware.org  Tue Dec  4 10:52:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 10:52:40 2007
Subject: [Frugalware-git] frugalware-current: obexfs-0.8-1-i686
Message-ID: <20071204095237.B326411904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f8a2e12c4d7fceaa23d8ce40234577ed5aea36b

commit 6f8a2e12c4d7fceaa23d8ce40234577ed5aea36b
Author: Miklos Vajna 
Date:   Fri Nov 30 01:32:19 2007 +0100

obexfs-0.8-1-i686
a comment about how to test this package

diff --git a/source/apps-extra/obexfs/FrugalBuild b/source/apps-extra/obexfs/FrugalBuild
index 6b5fac0..3e1781f 100644
--- a/source/apps-extra/obexfs/FrugalBuild
+++ b/source/apps-extra/obexfs/FrugalBuild
@@ -13,3 +13,5 @@ groups=('apps-extra')
archs=('i686')
up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=8960&package_id=178407'|Flasttar"
sha1sums=('99c0c54212a2fc874107efbc9ad2ba7ad2b7ab37')
+
+# testing: obexfs -b 00:1C:9A:E5:08:F8 -B 10 ~/mnt/phone
From vmiklos at frugalware.org  Tue Dec  4 10:52:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 10:52:40 2007
Subject: [Frugalware-git] frugalware-current: archivemail-0.7.2-2-i686
Message-ID: <20071204095237.BE53C11904C2@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a6fb4865aa8d6b93c917004b6682757401ecc6c7

commit a6fb4865aa8d6b93c917004b6682757401ecc6c7
Author: Miklos Vajna 
Date:   Mon Dec 3 12:42:01 2007 +0100

archivemail-0.7.2-2-i686
added patch to handle the TMPDIR env var

diff --git a/source/network-extra/archivemail/FrugalBuild b/source/network-extra/archivemail/FrugalBuild
index 4e89cf0..5480e79 100644
--- a/source/network-extra/archivemail/FrugalBuild
+++ b/source/network-extra/archivemail/FrugalBuild
@@ -3,10 +3,12 @@

pkgname=archivemail
pkgver=0.7.2
-pkgrel=1
+pkgrel=2
pkgdesc="A tool for archiving and compressing old email in mailboxes."
Finclude sourceforge
depends=('python')
groups=('network-extra')
archs=('i686' 'x86_64')
-sha1sums=('0ff9b8991b04f09cf9536c45b6f9e05d2427a459')
+source=($source archivemail-0.7.2-tmpdir.diff)
+sha1sums=('0ff9b8991b04f09cf9536c45b6f9e05d2427a459' \
+          '32efbe94a2f2e423265147795bb3883ccc127e74')
diff --git a/source/network-extra/archivemail/archivemail-0.7.2-tmpdir.diff b/source/network-extra/archivemail/archivemail-0.7.2-tmpdir.diff
new file mode 100644
index 0000000..2c3f4ec
--- /dev/null
+++ b/source/network-extra/archivemail/archivemail-0.7.2-tmpdir.diff
@@ -0,0 +1,14 @@
+--- archivemail.orig	2007-12-03 12:36:15.000000000 +0100
++++ archivemail	2007-12-03 12:31:11.000000000 +0100
+@@ -1122,7 +1122,10 @@
+     old_temp_dir = tempfile.tempdir
+     try:
+         # create a temporary directory for us to work in securely
+-        tempfile.tempdir = None
++        if 'TMPDIR' in os.environ.keys():
++            tempfile.tempdir = os.environ['TMPDIR']
++        else:
++            tempfile.tempdir = None
+         new_temp_dir = tempfile.mkdtemp('archivemail')
+         assert(new_temp_dir)
+         _stale.temp_dir = new_temp_dir
From vmiklos at frugalware.org  Tue Dec  4 10:54:53 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 10:54:56 2007
Subject: [Frugalware-git] pacman-tools: chkdep: mark two more output line as
	"trace-only"
Message-ID: <20071204095453.CFF7211904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=524d332f4011d3366a130df888cd069bfd639618

commit 524d332f4011d3366a130df888cd069bfd639618
Author: Miklos Vajna 
Date:   Tue Dec 4 10:54:41 2007 +0100

chkdep: mark two more output line as "trace-only"

diff --git a/chkdep b/chkdep
index 860b464..89e6182 100755
--- a/chkdep
+++ b/chkdep
@@ -26,14 +26,15 @@ def rmdupdeps(deps):
while j:
dep = pacman.void_to_char(pacman.list_getdata(j)).split("<")[0].split(">")[0].split("=")[0]
if dep not in depdeps:
-					print "%s will be ignored if found, as %s already depends on it." % (dep, pkgname)
+					if trace:
+						print "%s will be ignored if found, as %s already depends on it." % (dep, pkgname)
depdeps.append(dep)
j = pacman.list_next(j)
i = pacman.list_next(i)
for i in deps:
if i not in depdeps and i not in ignorepkgs:
newdeps.append(i)
-		elif i in depdeps:
+		elif i in depdeps and trace:
print "Ignoring %s as it is already a dependency of some other dependency." % i
return newdeps
From crazy at frugalware.org  Tue Dec  4 11:27:21 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 11:27:23 2007
Subject: [Frugalware-git] 
	playground: kdebase-runtime-3.96.1_744367-0playground1-i686
Message-ID: <20071204102721.9535F11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=096e346c0c14b3cb29fbbeb1f5e2213048fb0498

commit 096e346c0c14b3cb29fbbeb1f5e2213048fb0498
Author: crazy 
Date:   Tue Dec 4 11:06:00 2007 +0100

kdebase-runtime-3.96.1_744367-0playground1-i686
* Version bump

diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild
index cca078b..d1d444e 100644
--- a/source/kde4/kdebase-runtime/FrugalBuild
+++ b/source/kde4/kdebase-runtime/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy 

pkgname=kdebase-runtime
-pkgver=3.96.1_743137
-pkgrel=0playground2
+pkgver=3.96.1_744367
+pkgrel=0playground1
pkgdesc="Programs needed at runtime by other KDE4 applications"
depends=('libqtsvg' 'libkde>=3.96.1_743104' 'openexr' 'xine-lib' 'libsmbclient' 'xine-lib' 'kdepimlibs>=3.96.1_742565')
groups=('kde4' 'kde4-minimal')
@@ -11,7 +11,7 @@ archs=('i686')
options=('nomirror')
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 kdebase-runtime-kdesu.patch)
-sha1sums=('725a36fcea925e5746165a70d03a1ca46cf6410a' \
+sha1sums=('aebe4a5690263045160db575b8ceafeec4474b9c' \
'258209c5a1b6161a5535412d07f8c3277f52a771')

subpkgs=("kdebase-icons")
From crazy at frugalware.org  Tue Dec  4 12:01:14 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 12:01:15 2007
Subject: [Frugalware-git] 
	playground: kdebase-workspace-3.96.1_744694-0playground1-i686
Message-ID: <20071204110114.6FCC311904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=98065076f90c9d8b0fa3580d32c90d83fe792760

commit 98065076f90c9d8b0fa3580d32c90d83fe792760
Author: crazy 
Date:   Tue Dec 4 11:57:07 2007 +0100

kdebase-workspace-3.96.1_744694-0playground1-i686
* Version bump

diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild
index 46053e4..00d8411 100644
--- a/source/kde4/kdebase-workspace/FrugalBuild
+++ b/source/kde4/kdebase-workspace/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy 

pkgname=kdebase-workspace
-pkgver=3.96.1_743091
-pkgrel=0playground3
+pkgver=3.96.1_744694
+pkgrel=0playground1
pkgdesc="Programs specific for the KDE4 desktop."
depends=('libkde>=>=3.96.1_743104' 'libqt3support' 'libqtsvg' 'libxpm' 'strigi' 'xfsprogs-acl' 'libxtst' 'libqtopengl' 'libxres' \
'lmsensors' 'libxcomposite' 'libxklavier' 'libxscrnsaver' 'qimageblitz' 'libqtscript' 'libcaptury' \
@@ -19,7 +19,7 @@ source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \
ksysguarddrc_use_config_install_dir.patch \
systemsettingsrc_use_config_install_dir.patch \
fix_some_icon_names_in_directory.patch)
-sha1sums=('d645d3a55028d22b2a0c2aafce2b0f4678086a23' \
+sha1sums=('c665820a0801dbd5781a77467bf6ab19079e457e' \
'c173303c33871f9fed4e33d16b323952a902d1aa' \
'eed7fe30f80be191d4d63c6e2966d7276e961446' \
'1281378a0cc3ac2d52a11f3afdbf8d8b96e0f36f')
From vmiklos at frugalware.org  Tue Dec  4 13:19:56 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:19:59 2007
Subject: [Frugalware-git] frugalware-current: kernel-2.6.23-3-i686
Message-ID: <20071204121956.520D411904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=495be6a0ca7b15b8fe80c9c2b95ae6d83630c581

commit 495be6a0ca7b15b8fe80c9c2b95ae6d83630c581
Author: Miklos Vajna 
Date:   Tue Dec 4 13:18:58 2007 +0100

kernel-2.6.23-3-i686
bump to patchlevel '9'

diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild
index fdaf9b2..ab5c07b 100644
--- a/source/base/kernel/FrugalBuild
+++ b/source/base/kernel/FrugalBuild
@@ -1,4 +1,4 @@
-# Compiling Time: 11.74 SBU
+# Compiling Time: 14.20 SBU
# Maintainer: VMiklos 

_F_kernel_patches=('aic7xxx-suspend.patch')
diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh
index 7b331b5..655069e 100644
--- a/source/include/kernel-version.sh
+++ b/source/include/kernel-version.sh
@@ -16,5 +16,5 @@
# * _F_kernelver_stable: the number of the -stable patch to use (if any)
###
_F_kernelver_ver=2.6.23
-_F_kernelver_rel=2
-_F_kernelver_stable=8
+_F_kernelver_rel=3
+_F_kernelver_stable=9
From vmiklos at frugalware.org  Tue Dec  4 13:24:27 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:43 2007
Subject: [Frugalware-git] frugalware-current: fglrx-8.42.3-4-i686
Message-ID: <20071204122427.A188711904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52df181487937d4e74223cffc68e67e4282ebbc9

commit 52df181487937d4e74223cffc68e67e4282ebbc9
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:12 2007 +0100

fglrx-8.42.3-4-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild
index f144d4a..8db5b12 100644
--- a/source/x11-extra/fglrx/FrugalBuild
+++ b/source/x11-extra/fglrx/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=fglrx
pkgver=8.42.3
-pkgrel=3
+pkgrel=4
pkgdesc="Hardware Accelerated ATi driver for xorg"
url="http://www.ati.com/"
# libstdc++5: no hardware acceleration without it
From vmiklos at frugalware.org  Tue Dec  4 13:24:27 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:44 2007
Subject: [Frugalware-git] frugalware-current: qc-usb-0.6.6-25-i686
Message-ID: <20071204122427.B0D2B11904C2@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55841d449e6639a125d5f7f687e4f333b6a78916

commit 55841d449e6639a125d5f7f687e4f333b6a78916
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:14 2007 +0100

qc-usb-0.6.6-25-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild
index 6a16f53..24fa8c8 100644
--- a/source/multimedia-extra/qc-usb/FrugalBuild
+++ b/source/multimedia-extra/qc-usb/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=qc-usb
pkgver=0.6.6
-pkgrel=24
+pkgrel=25
pkgdesc="Quickcam kernel driver."
groups=('multimedia-extra')
archs=('i686' 'x86_64')
From vmiklos at frugalware.org  Tue Dec  4 13:24:27 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:44 2007
Subject: [Frugalware-git] frugalware-current: rt2400-1.2.2_b3-13-i686
Message-ID: <20071204122427.C618011904C3@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d05b68e113b60d6842ceb2b3ddb7905455dfb033

commit d05b68e113b60d6842ceb2b3ddb7905455dfb033
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:15 2007 +0100

rt2400-1.2.2_b3-13-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/network-extra/rt2400/FrugalBuild b/source/network-extra/rt2400/FrugalBuild
index 47c5fa0..d3c9fdb 100644
--- a/source/network-extra/rt2400/FrugalBuild
+++ b/source/network-extra/rt2400/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=rt2400
pkgver=1.2.2_b3
-pkgrel=12
+pkgrel=13
pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 chipsets."
Finclude kernel-module sourceforge
url="http://rt2x00.serialmonkey.com/wiki/index.php"
From vmiklos at frugalware.org  Tue Dec  4 13:24:27 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:44 2007
Subject: [Frugalware-git] frugalware-current: rlocate-0.5.6-7-i686
Message-ID: <20071204122427.DF13311904C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd20fbf9f6e29868e1ee6a5301836ffe12789de1

commit fd20fbf9f6e29868e1ee6a5301836ffe12789de1
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:17 2007 +0100

rlocate-0.5.6-7-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/apps-extra/rlocate/FrugalBuild b/source/apps-extra/rlocate/FrugalBuild
index fec0a89..319e4f5 100644
--- a/source/apps-extra/rlocate/FrugalBuild
+++ b/source/apps-extra/rlocate/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=rlocate
pkgver=0.5.6
-pkgrel=6
+pkgrel=7
pkgdesc="rlocate is an implementation of the locate command"
_F_kernelmod_scriptlet=$pkgname.install
Finclude kernel-module
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:45 2007
Subject: [Frugalware-git] frugalware-current: ipw3945-1.2.2-7-i686
Message-ID: <20071204122428.08F2811904C6@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3b3963afac414f3f05d75a9ddfdf303c3c22b252

commit 3b3963afac414f3f05d75a9ddfdf303c3c22b252
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:19 2007 +0100

ipw3945-1.2.2-7-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/network-extra/ipw3945/FrugalBuild b/source/network-extra/ipw3945/FrugalBuild
index e2b7cc0..f4806ad 100644
--- a/source/network-extra/ipw3945/FrugalBuild
+++ b/source/network-extra/ipw3945/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=ipw3945
pkgver=1.2.2
-pkgrel=6
+pkgrel=7
pkgdesc="Intel PRO/Wireless 3945ABG Driver for Linux"
_F_sourceforge_ext=".tgz"
Finclude sourceforge kernel-module
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:45 2007
Subject: [Frugalware-git] frugalware-current: dazuko-2.3.4-4-i686
Message-ID: <20071204122428.1D9F711904C7@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=646abf8adf8e6952c03199d0a798e6e5940fff8a

commit 646abf8adf8e6952c03199d0a798e6e5940fff8a
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:21 2007 +0100

dazuko-2.3.4-4-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild
index 5c190c9..c376427 100644
--- a/source/apps-extra/dazuko/FrugalBuild
+++ b/source/apps-extra/dazuko/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=dazuko
pkgver=2.3.4
-pkgrel=3
+pkgrel=4
pkgdesc="On-access virus scanning kernel interface"
url="http://www.dazuko.org"
license="GPL-2 BSD"
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:45 2007
Subject: [Frugalware-git] frugalware-current: rt2500-1.1.0_b4-31-i686
Message-ID: <20071204122428.2687611904C9@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=99726007b86376059f309747b7babaa2cbbed4a8

commit 99726007b86376059f309747b7babaa2cbbed4a8
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:22 2007 +0100

rt2500-1.1.0_b4-31-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/network-extra/rt2500/FrugalBuild b/source/network-extra/rt2500/FrugalBuild
index 1bd28d1..d68abc1 100644
--- a/source/network-extra/rt2500/FrugalBuild
+++ b/source/network-extra/rt2500/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=rt2500
pkgver=1.1.0_b4
-pkgrel=30
+pkgrel=31
pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 and rt2500 chipsets."
_F_sourceforge_dirname="rt2400"
Finclude kernel-module sourceforge
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:46 2007
Subject: [Frugalware-git] frugalware-current: nvidia-100.14.19-3-i686
Message-ID: <20071204122428.3441211904CA@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=69af80843659f5732e2b454ff70939fd7ca01b5d

commit 69af80843659f5732e2b454ff70939fd7ca01b5d
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:24 2007 +0100

nvidia-100.14.19-3-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild
index cbc5d94..065d631 100644
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=nvidia
pkgver=100.14.19
-pkgrel=2
+pkgrel=3
pkgdesc="3D accelerated display driver for Nvidia cards"
url="http://www.nvidia.com/object/linux_display_archive.html"
conflicts=('libgl' 'libglx')
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:46 2007
Subject: [Frugalware-git] frugalware-current: gspcav1-1.00.18-13-i686
Message-ID: <20071204122428.452C211904CB@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f01113703b444cb2680253af444fc6d1c5787d6a

commit f01113703b444cb2680253af444fc6d1c5787d6a
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:26 2007 +0100

gspcav1-1.00.18-13-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild
index 9c30985..130059d 100644
--- a/source/multimedia-extra/gspcav1/FrugalBuild
+++ b/source/multimedia-extra/gspcav1/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gspcav1
pkgver=1.00.18
-pkgrel=12
+pkgrel=13
pkgdate=20070508
pkgdesc="One driver Upto 220 Webcams supported"
url="http://mxhaard.free.fr"
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:47 2007
Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.50-2-i686
Message-ID: <20071204122428.60B5811904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=baac5fa9865f656b30d9b25f502c081b71676788

commit baac5fa9865f656b30d9b25f502c081b71676788
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:28 2007 +0100

ndiswrapper-1.50-2-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild
index 4035b69..5d3683f 100644
--- a/source/network-extra/ndiswrapper/FrugalBuild
+++ b/source/network-extra/ndiswrapper/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=ndiswrapper
pkgver=1.50
-pkgrel=1
+pkgrel=2
pkgdesc="Wrapper for using Windows drivers for some wireless cards"
_F_kernelmod_scriptlet=$pkgname.install
Finclude kernel-module sourceforge
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:47 2007
Subject: [Frugalware-git] frugalware-current: truecrypt-4.3-15-i686
Message-ID: <20071204122428.775D211904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=31d7b9bf4e88a9746d08f1b53db4f3f79c694536

commit 31d7b9bf4e88a9746d08f1b53db4f3f79c694536
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:30 2007 +0100

truecrypt-4.3-15-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/apps-extra/truecrypt/FrugalBuild b/source/apps-extra/truecrypt/FrugalBuild
index 1e3398f..e57fc28 100644
--- a/source/apps-extra/truecrypt/FrugalBuild
+++ b/source/apps-extra/truecrypt/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=truecrypt
pkgver=4.3
pkgextraver=a
-pkgrel=14
+pkgrel=15
pkgdesc="A free open-source disk encryption software"
url="http://www.truecrypt.org/"
Finclude kernel-module
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:48 2007
Subject: [Frugalware-git] frugalware-current: acerhk-0.5.35-3-i686
Message-ID: <20071204122428.8ED4C11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f7edc8cd41ea8e17f9eb9f09d630b302a390109

commit 3f7edc8cd41ea8e17f9eb9f09d630b302a390109
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:31 2007 +0100

acerhk-0.5.35-3-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild
index f5a748b..5a8531c 100644
--- a/source/apps-extra/acerhk/FrugalBuild
+++ b/source/apps-extra/acerhk/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=acerhk
pkgver=0.5.35
-pkgrel=2
+pkgrel=3
pkgdesc="Acer Hotkey driver for Linux"
url="http://www.cakey.de/acerhk/"
Finclude kernel-module
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:48 2007
Subject: [Frugalware-git] frugalware-current: wlan-ng-0.2.8-12-i686
Message-ID: <20071204122428.9896811904C2@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf6cd0e2163b84523afbce7f7541e108b0df214e

commit bf6cd0e2163b84523afbce7f7541e108b0df214e
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:33 2007 +0100

wlan-ng-0.2.8-12-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild
index f19fa53..9100a6b 100644
--- a/source/network-extra/wlan-ng/FrugalBuild
+++ b/source/network-extra/wlan-ng/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=wlan-ng
pkgver=0.2.8
-pkgrel=11
+pkgrel=12
pkgdesc="Wireless Lan modules"
url="http://www.linux-wlan.org/"
Finclude kernel-module
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:48 2007
Subject: [Frugalware-git] frugalware-current: virtualbox-1.5.2-5-i686
Message-ID: <20071204122428.A014E11904CE@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5da590e1a29cfccb6aa36fddf5b3707320d3d7af

commit 5da590e1a29cfccb6aa36fddf5b3707320d3d7af
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:35 2007 +0100

virtualbox-1.5.2-5-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild
index 4c5dbef..7e1d7fd 100644
--- a/source/xapps-extra/virtualbox/FrugalBuild
+++ b/source/xapps-extra/virtualbox/FrugalBuild
@@ -5,7 +5,7 @@
pkgname=virtualbox
realname=VirtualBox
pkgver=1.5.2
-pkgrel=4
+pkgrel=5
pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use."
url="http://www.virtualbox.org"
_F_kernelmod_scriptlet=$pkgname.install
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:49 2007
Subject: [Frugalware-git] frugalware-current: nvidia-96xx-96.43.01-3-i686
Message-ID: <20071204122428.A9AE311904CF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ffca36cf9bf6ceac357bc79a418d63b9990ce32

commit 6ffca36cf9bf6ceac357bc79a418d63b9990ce32
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:37 2007 +0100

nvidia-96xx-96.43.01-3-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild
index e5e338a..5e5acce 100644
--- a/source/x11-extra/nvidia-96xx/FrugalBuild
+++ b/source/x11-extra/nvidia-96xx/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=nvidia-96xx
pkgver=96.43.01
-pkgrel=2
+pkgrel=3
pkgdesc="3d accelerated display driver for Nvidia cards"
url="http://www.nvidia.com/object/linux_display_archive.html"
conflicts=('libgl' 'libglx' 'nvidia')
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:49 2007
Subject: [Frugalware-git] frugalware-current: lirc-0.8.2-12-i686
Message-ID: <20071204122428.B20A011904D0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9f7b081b20916e5017a4742ef500ad65966df45

commit b9f7b081b20916e5017a4742ef500ad65966df45
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:39 2007 +0100

lirc-0.8.2-12-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild
index 27ba69b..7ff380e 100644
--- a/source/apps-extra/lirc/FrugalBuild
+++ b/source/apps-extra/lirc/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=lirc
pkgver=0.8.2
-pkgrel=11
+pkgrel=12
pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
url="http://www.lirc.org/"
Finclude kernel-module sourceforge
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:49 2007
Subject: [Frugalware-git] frugalware-current: kqemu-1.3.0pre11-18-i686
Message-ID: <20071204122428.BA8F611904D1@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9adcfdcd8c7b5edb679dfd827f58cc66a67286d9

commit 9adcfdcd8c7b5edb679dfd827f58cc66a67286d9
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:40 2007 +0100

kqemu-1.3.0pre11-18-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild
index d9c31d5..c4ba9f9 100644
--- a/source/xapps-extra/kqemu/FrugalBuild
+++ b/source/xapps-extra/kqemu/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=kqemu
pkgver=1.3.0pre11
-pkgrel=17
+pkgrel=18
pkgdesc="QEMU Accelerator Module"
url="http://fabrice.bellard.free.fr/qemu/"
depends=('qemu')
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:49 2007
Subject: [Frugalware-git] frugalware-current: adm8211-20060111-31-i686
Message-ID: <20071204122428.C489411904D2@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f63a7cf7806dc625d9524d1bb97ab28bc3a5800b

commit f63a7cf7806dc625d9524d1bb97ab28bc3a5800b
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:42 2007 +0100

adm8211-20060111-31-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/network-extra/adm8211/FrugalBuild b/source/network-extra/adm8211/FrugalBuild
index 62ffd5f..a1b3627 100644
--- a/source/network-extra/adm8211/FrugalBuild
+++ b/source/network-extra/adm8211/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=adm8211
pkgver=20060111
-pkgrel=30
+pkgrel=31
pkgdesc="IEEE 802.11 wireless LAN driver for adm8211 based cards"
url="http://aluminum.sourmilk.net/adm8211/"
Finclude kernel-module
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:50 2007
Subject: [Frugalware-git] frugalware-current: madwifi-0.9.3.3-4-i686
Message-ID: <20071204122428.CDCE311904D3@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e55068dfb3602e2af5e393ee4424ef627784ca6c

commit e55068dfb3602e2af5e393ee4424ef627784ca6c
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:45 2007 +0100

madwifi-0.9.3.3-4-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild
index 724c700..a196dac 100644
--- a/source/network/madwifi/FrugalBuild
+++ b/source/network/madwifi/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=madwifi
pkgver=0.9.3.3
-pkgrel=3
+pkgrel=4
pkgdesc="Madwifi drivers for Atheros wireless chipsets"
url="http://madwifi.sourceforge.net/"
Finclude kernel-module
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:50 2007
Subject: [Frugalware-git] frugalware-current: acx100-20071003-3-i686
Message-ID: <20071204122428.D73E111904D4@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cdbde9aa33b8fdbf64f7ff04ee89ccaf1e80fd88

commit cdbde9aa33b8fdbf64f7ff04ee89ccaf1e80fd88
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:47 2007 +0100

acx100-20071003-3-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild
index 7681896..29bf2c7 100644
--- a/source/network-extra/acx100/FrugalBuild
+++ b/source/network-extra/acx100/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=acx100
origname=acx-mac80211
pkgver=20071003
-pkgrel=2
+pkgrel=3
pkgdesc="The ACX100/ACX111 wireless network driver."
_F_sourceforge_ext=".tar.bz2"
_F_sourceforge_dirname=${pkgname}
From vmiklos at frugalware.org  Tue Dec  4 13:24:28 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:24:50 2007
Subject: [Frugalware-git] frugalware-current: r8169-6.004.00-2-i686
Message-ID: <20071204122428.E1D6011904C3@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cca73e17d5cd2f43e57cf75d348312aca4515e11

commit cca73e17d5cd2f43e57cf75d348312aca4515e11
Author: Miklos Vajna 
Date:   Tue Dec 4 13:23:49 2007 +0100

r8169-6.004.00-2-i686
rebuilt with kernel-2.6.23-3

diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild
index e74047c..7f683bd 100644
--- a/source/network-extra/r8169/FrugalBuild
+++ b/source/network-extra/r8169/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=r8169
pkgver=6.004.00
-pkgrel=1
+pkgrel=2
Finclude sourceforge kernel-module
pkgdesc="Realtek driver for RTL8169/8110 cards."
url="http://www.realtek.com.tw"
From vmiklos at frugalware.org  Tue Dec  4 13:25:18 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 13:25:19 2007
Subject: [Frugalware-git] frugalware-current: octave-2.9.17-1-x86_64
Message-ID: <20071204122518.4A6D211904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d2dc47d7ce2132f75360a9c32d92ac957796819

commit 3d2dc47d7ce2132f75360a9c32d92ac957796819
Author: Miklos Vajna 
Date:   Tue Dec 4 13:19:12 2007 +0100

octave-2.9.17-1-x86_64
version bump

diff --git a/source/apps-extra/octave/FrugalBuild b/source/apps-extra/octave/FrugalBuild
index 619e9f9..e96c805 100644
--- a/source/apps-extra/octave/FrugalBuild
+++ b/source/apps-extra/octave/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=octave
-pkgver=2.9.14
+pkgver=2.9.17
pkgrel=1
pkgdesc="Octave is a high-level language, primarily intended for numerical computations."
url="http://www.octave.org/"
@@ -12,7 +12,7 @@ groups=('apps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url/download.html|grep Testing|sed 's/.*) \([^ ]*\) (.*/\1/'"
source=(ftp://ftp.octave.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('f97ae13c931276a359312ceb5f957df23d723c6a')
+sha1sums=('570d000ff85d20b98ce8fddbb1da4bde40bb75a1')
# optimization OK

# feel free to bump this if you can, 2.9.15 did not compile for me
From voroskoi at frugalware.org  Tue Dec  4 13:35:10 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 13:35:13 2007
Subject: [Frugalware-git] frugalware-current: commoncpp2-1.6.0-1-i686
Message-ID: <20071204123511.0B81411904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8c4f524f767bfe5c1f3bb9e2cd033e8a59929515

commit 8c4f524f767bfe5c1f3bb9e2cd033e8a59929515
Author: voroskoi 
Date:   Tue Dec 4 13:33:14 2007 +0100

commoncpp2-1.6.0-1-i686
version bump
sha1->signatures

diff --git a/source/lib-extra/commoncpp2/FrugalBuild b/source/lib-extra/commoncpp2/FrugalBuild
index 0ce2c46..95ac502 100644
--- a/source/lib-extra/commoncpp2/FrugalBuild
+++ b/source/lib-extra/commoncpp2/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi 

pkgname=commoncpp2
-pkgver=1.5.9
+pkgver=1.6.0
pkgrel=1
url="http://wiki.gnutelephony.org/index.php/GNU_Common_CPP_Framework"
pkgdesc="GNU Common C++ is a portable and highly optimized class framework for writing C++ applications."
@@ -12,8 +12,7 @@ archs=('i686' 'x86_64')
Fconfopts="$Fconfopts --with-openssl"
up2date="lynx -dump http://ftp.gnu.org/pub/gnu/commoncpp/|Flasttar"
source=(http://ftp.gnu.org/pub/gnu/commoncpp/commoncpp2-$pkgver.tar.gz gcc42-atomicity.diff)
-sha1sums=('adca5e5a4eef5d891354cc54c9671d01d14286b4' \
-          '75f8a9464b3a414eba6743ea8f3acffdea3f13e9')
+signatures=("$source.sig" '')

build() {
unset MAKEFLAGS
From crazy at frugalware.org  Tue Dec  4 13:47:29 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 13:47:32 2007
Subject: [Frugalware-git] 
	playground: kdebase-3.96.1_744669-0playground1-i686
Message-ID: <20071204124729.1925311904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=3101a10dd0ab33d9f1b157d446a70edbab794cc2

commit 3101a10dd0ab33d9f1b157d446a70edbab794cc2
Author: crazy 
Date:   Tue Dec 4 13:43:47 2007 +0100

kdebase-3.96.1_744669-0playground1-i686
* Version bump

diff --git a/source/kde4/kdebase/FrugalBuild b/source/kde4/kdebase/FrugalBuild
index ef25aa2..51dacc1 100644
--- a/source/kde4/kdebase/FrugalBuild
+++ b/source/kde4/kdebase/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy 

pkgname=kdebase
-pkgver=3.96.1_743066
-pkgrel=0playground3
+pkgver=3.96.1_744669
+pkgrel=0playground1
pkgdesc="Basic programs for KDE4"
depends=()
makedepends=('libkde>=3.96.1_743104' 'qimageblitz' 'libqtnetwork' 'libqtsvg')
@@ -13,7 +13,7 @@ options=('nomirror')
_F_kde4_subpkgs=('dolphin' 'kfind' 'konsole' 'kwrite' 'kappfinder' 'konqueror-nsplugins' 'kdepasswd' 'kdialog' 'keditbookmarks' 'konqueror')
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2)
-sha1sums=('3f3f85ee794307fe581cc76f07dbce8aa575cf3b')
+sha1sums=('5ba2e5d70f457c40c9ee54746e36624eaefb6571')

subpkgs=("${_F_kde4_subpkgs[@]}" 'libkonq')
subdescs=('File Manager.' \
From voroskoi at frugalware.org  Tue Dec  4 13:49:04 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 13:49:07 2007
Subject: [Frugalware-git] frugalware-current: ccrtp-1.6.0-1-i686
Message-ID: <20071204124904.922D311904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=302e85fe20408e2fbad723a64a55a6a604bd3f87

commit 302e85fe20408e2fbad723a64a55a6a604bd3f87
Author: voroskoi 
Date:   Tue Dec 4 13:48:39 2007 +0100

ccrtp-1.6.0-1-i686
version bump
depends on commoncpp2>=1.6

diff --git a/source/lib-extra/ccrtp/FrugalBuild b/source/lib-extra/ccrtp/FrugalBuild
index 4fab94c..38253f3 100644
--- a/source/lib-extra/ccrtp/FrugalBuild
+++ b/source/lib-extra/ccrtp/FrugalBuild
@@ -2,11 +2,11 @@
# Maintainer: voroskoi 

pkgname=ccrtp
-pkgver=1.5.2
+pkgver=1.6.0
pkgrel=1
pkgdesc="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF."
url="http://wiki.gnutelephony.org/index.php/GNU_ccRTP"
-depends=('commoncpp2')
+depends=('commoncpp2>=1.6')
groups=('lib-extra')
archs=('i686' 'x86_64')
Fup2gnugz
From voroskoi at frugalware.org  Tue Dec  4 14:12:40 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 14:12:42 2007
Subject: [Frugalware-git] frugalware-current: pinentry-0.7.4-1-x86_64
Message-ID: <20071204131240.3F3EE11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=15e202094e996d955df9e7a572f5dbfa8f876bc8

commit 15e202094e996d955df9e7a572f5dbfa8f876bc8
Author: voroskoi 
Date:   Tue Dec 4 14:12:01 2007 +0100

pinentry-0.7.4-1-x86_64
version bump

diff --git a/source/apps-extra/pinentry/FrugalBuild b/source/apps-extra/pinentry/FrugalBuild
index 7f76d24..7cd1d87 100644
--- a/source/apps-extra/pinentry/FrugalBuild
+++ b/source/apps-extra/pinentry/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi 

pkgname=pinentry
-pkgver=0.7.3
+pkgver=0.7.4
pkgrel=1
pkgdesc="Applications for entering PINs or Passphrases."
url="http://ftp.gnupg.org/gcrypt/pinentry/"
From crazy at frugalware.org  Tue Dec  4 14:33:34 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 14:33:36 2007
Subject: [Frugalware-git] 
	playground: kdeadmin-3.96.1_743877-0playground1-i686
Message-ID: <20071204133334.1817D11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=f18b09e9f7fa8e59297083ae7d9607e23f445144

commit f18b09e9f7fa8e59297083ae7d9607e23f445144
Author: crazy 
Date:   Tue Dec 4 14:33:08 2007 +0100

kdeadmin-3.96.1_743877-0playground1-i686
* Version bump

diff --git a/source/kde4/kdeadmin/FrugalBuild b/source/kde4/kdeadmin/FrugalBuild
index 6551310..9a26706 100644
--- a/source/kde4/kdeadmin/FrugalBuild
+++ b/source/kde4/kdeadmin/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=kdeadmin
-pkgver=3.96.1_743133
+pkgver=3.96.1_743877
pkgrel=0playground1
pkgdesc="KDE Administration Programs"
depends=('libkde>=3.96.1_743104' 'libqtsvg' 'kdepimlibs>=3.96.1_742565')
@@ -13,7 +13,7 @@ options=('nomirror')
_F_cmake_confopts="-DBUILD_kpackage:BOOL=OFF -DBUILD_knetworkconf:BOOL=OFF"
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2)
-sha1sums=('161a3ac272c07836dd06be8dd28e714b8377dd32')
+sha1sums=('c0d2dfa69b92732f5c160694c6051a9c8954d9a7')


build()
From vmiklos at frugalware.org  Tue Dec  4 14:40:06 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 14:40:10 2007
Subject: [Frugalware-git] frugalware-current: flashplugin-9.0.115.0-1-i686
Message-ID: <20071204134006.4224311904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6464122f70131e26a719125b43bc1ccf299160a4

commit 6464122f70131e26a719125b43bc1ccf299160a4
Author: Miklos Vajna 
Date:   Tue Dec 4 14:39:28 2007 +0100

flashplugin-9.0.115.0-1-i686
version bump

diff --git a/source/xlib/flashplugin/FrugalBuild b/source/xlib/flashplugin/FrugalBuild
index 7cf541a..db86924 100644
--- a/source/xlib/flashplugin/FrugalBuild
+++ b/source/xlib/flashplugin/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=flashplugin
-pkgver=9.0.48.0
+pkgver=9.0.115.0
pkgrel=1
pkgdesc="Macromedia flash plugin for Netscape/Mozilla (nonfree)"
url="http://www.macromedia.com/"
@@ -11,7 +11,7 @@ groups=('xlib')
archs=('i686' '!x86_64')
up2date="lynx -useragent='Mozilla (Linux) Firefox' -dump http://www.adobe.com/go/getflashplayer 2>/dev/null|grep Version|sed 's/.*Version: //;s/,/./g;q'"
source=(http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz)
-sha1sums=('4bba0b81462394388b4509ecdc845f469c95d6ae')
+sha1sums=('269ebe804f77890687f280ce7bfb79a62d2c5bd3')

# NOTE: always check the upstream changelog:
# http://www.adobe.com/support/documentation/en/flashplayer/9/releasenotes.html
From vmiklos at frugalware.org  Tue Dec  4 15:39:55 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 15:39:58 2007
Subject: [Frugalware-git] vmexam: wipcheck.py: import
Message-ID: <20071204143955.1CA3311904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=vmexam.git;a=commitdiff;h=8f70c370b112303cb9ebbca55d2a0d732b8c5e7d

commit 8f70c370b112303cb9ebbca55d2a0d732b8c5e7d
Author: Miklos Vajna 
Date:   Tue Dec 4 15:39:39 2007 +0100

wipcheck.py: import

diff --git a/python/wipcheck.py b/python/wipcheck.py
new file mode 100644
index 0000000..9ba37a1
--- /dev/null
+++ b/python/wipcheck.py
@@ -0,0 +1,32 @@
+import os, sys
+
+# a simple script to check if there are outdated pkgs in a wip repo
+# usage: wipcheck.py bmf frugalware-current
+
+def vercmp(a, b):
+	sock = os.popen("vercmp %s %s" % (a, b))
+	buf = sock.readline()
+	sock.close()
+	return int(buf)
+
+wip = sys.argv[1]
+current = sys.argv[2]
+
+sock = os.popen("pacman-g2 -Sl")
+buf = sock.readlines()
+sock.close()
+
+wpkgs = {}
+cpkgs = {}
+
+for i in buf:
+	if i.startswith(wip + " "):
+		l = i.split(' ')
+		wpkgs[l[1]] = l[2].strip()
+	if i.startswith(current + " "):
+		l = i.split(' ')
+		cpkgs[l[1]] = l[2].strip()
+
+for k, v in wpkgs.items():
+	if k in cpkgs.keys() and vercmp(v, cpkgs[k]) < 0:
+		print "%s-%s is in %s, but %s is in %s, that's bad" % (k, v, wip, cpkgs[k], current)
From vmiklos at frugalware.org  Tue Dec  4 16:19:24 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 16:19:26 2007
Subject: [Frugalware-git] pacman-g2: updates for 3.6.5
Message-ID: <20071204151924.6809B11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=6de63e235f5d9aee79a3d6749d2da0de2438eb2e

commit 6de63e235f5d9aee79a3d6749d2da0de2438eb2e
Author: Miklos Vajna 
Date:   Tue Dec 4 16:19:18 2007 +0100

updates for 3.6.5

diff --git a/NEWS b/NEWS
index 30e994c..0885a36 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
VERSION         DESCRIPTION
-----------------------------------------------------------------------------
+3.6.5         - updated pacman-g2, FrugalBuild and makepkg manpage
+	      - pacman-g2 -Qt no longer states the db is corrupted when it
+	        isn't
+              - makepkg now handles the xpi extenstion
+	      - pacman-g2 -S now handles regular expressions if no package
+	        found
3.6.4         - speeded up sorting dependencies (this especially affects mkiso)
- converted documentation to asciidoc
- *sync now dies if the fpm is corrupted
diff --git a/configure.ac b/configure.ac
index c7a266f..2c44625 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ ENV_CFLAGS=$CFLAGS

AC_PREREQ(2.59)
dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots
-AC_INIT([pacman-g2 package manager], 3.6.4, [frugalware-devel@frugalware.org], pacman-g2)
+AC_INIT([pacman-g2 package manager], 3.6.5, [frugalware-devel@frugalware.org], pacman-g2)
AC_LANG(C)
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
@@ -21,7 +21,7 @@ dnl Define here the libpacman version number
PM_MAJOR_VERSION=0
PM_MINOR_VERSION=3
PM_MICRO_VERSION=6
-PM_MICRO_VERSION_SUFFIX=.4
+PM_MICRO_VERSION_SUFFIX=.5
PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION$PM_MICRO_VERSION_SUFFIX
dnl Needed for libtool to create proper shared lib version
PM_VERSION_INFO=`expr $PM_MAJOR_VERSION + $PM_MINOR_VERSION`:$PM_MICRO_VERSION:$PM_MINOR_VERSION
From vmiklos at frugalware.org  Tue Dec  4 16:55:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 16:55:42 2007
Subject: [Frugalware-git] frugalware-current: pacman-g2-3.6.5-1-i686
Message-ID: <20071204155537.C93B411904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1c5277f8d449443063909f874cc27e70f0df1e55

commit 1c5277f8d449443063909f874cc27e70f0df1e55
Author: Miklos Vajna 
Date:   Tue Dec 4 16:55:18 2007 +0100

pacman-g2-3.6.5-1-i686
version bump

diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild
index 1621e7b..35c1c78 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -4,7 +4,7 @@
USE_DEVEL=${USE_DEVEL:-"n"}

pkgname=pacman-g2
-pkgver=3.6.4
+pkgver=3.6.5
Fuse $USE_DEVEL && pkgver=3.6.3.48.g7571051
pkgrel=1
pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support."
From vmiklos at frugalware.org  Tue Dec  4 16:57:01 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 16:57:02 2007
Subject: [Frugalware-git] bmf: pacman-g2-3.6.3.48.g7571051-1-i686
Message-ID: <20071204155701.1281411904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=60b8f894528ffa31c8a8dd9762e2c31b242a363c

commit 60b8f894528ffa31c8a8dd9762e2c31b242a363c
Author: Miklos Vajna 
Date:   Tue Dec 4 16:56:56 2007 +0100

pacman-g2-3.6.3.48.g7571051-1-i686
add nobuild to options, newer version in current

diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild
index 65394df..23aa1d2 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -26,7 +26,7 @@ else
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
Finclude scm
fi
-options=('scriptlet')
+options=('scriptlet' 'nobuild')

build()
{
From krics at linuxforum.hu  Tue Dec  4 17:36:20 2007
From: krics at linuxforum.hu (Christian Hamar alias krix)
Date: Tue Dec  4 17:36:23 2007
Subject: [Frugalware-git] xorg73: xf86-video-radeonhd-1.0.0-1-x86_64
Message-ID: <20071204163620.9E03911904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=cfa9789fdb7c01e34ba37382d67f8313f77981a1

commit cfa9789fdb7c01e34ba37382d67f8313f77981a1
Author: Christian Hamar alias krix 
Date:   Tue Dec 4 17:34:58 2007 +0100

xf86-video-radeonhd-1.0.0-1-x86_64
* New package / Initial import

diff --git a/source/x11/xf86-video-radeonhd/FrugalBuild b/source/x11/xf86-video-radeonhd/FrugalBuild
new file mode 100644
index 0000000..c8c0c05
--- /dev/null
+++ b/source/x11/xf86-video-radeonhd/FrugalBuild
@@ -0,0 +1,17 @@
+# Compiling Time: 0.12 SBU
+# Maintainer: Christian Hamar alias krix 
+
+pkgname=xf86-video-radeonhd
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.Org driver for AMD GPG r5xx/r6xx chipsets"
+url="http://xorg.freedesktop.org"
+groups=('x11' 'xorg-core' 'xorg-drivers')
+archs=('i686' 'x86_64')
+depends=('xorg-server>=1.4' 'pciutils')
+makedepends=('randrproto' 'renderproto' 'videoproto')
+_F_xorg_ind=1
+Finclude xorg
+sha1sums=('84092b5df1e4dbf7cd69006f3e545c293e80873c')
+
+# optimization OK
From vmiklos at frugalware.org  Tue Dec  4 17:38:20 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 17:38:24 2007
Subject: [Frugalware-git] bmf: libtorrent-0.7.9.1013-1bmf1-i686
Message-ID: <20071204163820.C2D7611904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=2794c54be81dfa818a29bd11406a777eeee95b15

commit 2794c54be81dfa818a29bd11406a777eeee95b15
Author: Miklos Vajna 
Date:   Tue Dec 4 17:38:10 2007 +0100

libtorrent-0.7.9.1013-1bmf1-i686
update to newer snapshot, the dht patch is now merged! :)

diff --git a/source/lib-extra/libtorrent/FrugalBuild b/source/lib-extra/libtorrent/FrugalBuild
index 372559b..3f91f8c 100644
--- a/source/lib-extra/libtorrent/FrugalBuild
+++ b/source/lib-extra/libtorrent/FrugalBuild
@@ -2,20 +2,18 @@
# Maintainer: voroskoi 

pkgname=libtorrent
-pkgver=svn975
-pkgrel=1bmf2
+pkgver=0.7.9.1013
+pkgrel=1bmf1
pkgdesc="LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code."
url="http://libtorrent.rakshasa.no/"
depends=('openssl' 'libsigc++2')
groups=('lib-extra')
archs=('i686' 'x86_64')
-source=(dht.diff)
-sha1sums=('efe05581d451a7d973a0865e2fd493363539726f')
Fconfopts="$Fconfopts --enable-static"

_F_scm_type="subversion"
_F_scm_url="svn://rakshasa.no/libtorrent/trunk/libtorrent"
-_F_scm_tag="975"
+_F_scm_tag="1013"
Finclude scm

build()
diff --git a/source/lib-extra/libtorrent/dht.diff b/source/lib-extra/libtorrent/dht.diff
deleted file mode 100644
index 12bac8a..0000000
--- a/source/lib-extra/libtorrent/dht.diff
+++ /dev/null
@@ -1,5112 +0,0 @@
-Index: libtorrent/scripts/checks.m4
-===================================================================
---- libtorrent/scripts/checks.m4	(revision 975)
-+++ libtorrent/scripts/checks.m4	(working copy)
-@@ -289,7 +289,27 @@
-     ])
- ])
-
-+AC_DEFUN([TORRENT_CHECK_TR1], [
-+  AC_LANG_PUSH(C++)
-+  AC_MSG_CHECKING(for TR1 support)
-
-+  AC_COMPILE_IFELSE(
-+    [[#include 
-+      class Foo;
-+      typedef std::tr1::unordered_map Bar;
-+    ]],
-+    [
-+      AC_MSG_RESULT(yes)
-+      AC_DEFINE(HAVE_TR1, 1, Define to 1 if your C++ library supports the extensions from Technical Report 1)
-+    ],
-+    [
-+      AC_MSG_RESULT(no)
-+    ]
-+  )
-+
-+  AC_LANG_POP(C++)
-+])
-+
- AC_DEFUN([TORRENT_WITH_FASTCGI], [
-   AC_ARG_WITH(fastcgi,
-     [  --with-fastcgi=PATH      Enable FastCGI RPC support. (DO NOT USE)],
-Index: libtorrent/scripts/common.m4
-===================================================================
---- libtorrent/scripts/common.m4	(revision 975)
-+++ libtorrent/scripts/common.m4	(working copy)
-@@ -239,3 +239,18 @@
-         fi
-     ])
- ])
-+
-+AC_DEFUN([TORRENT_ENABLE_TR1], [
-+  AC_ARG_ENABLE(std_tr1,
-+    [  --disable-std_tr1       disable check for support for TR1 [[default=enable]]],
-+    [
-+      if test "$enableval" = "yes"; then
-+        TORRENT_CHECK_TR1()
-+      else
-+        AC_MSG_CHECKING(for TR1 support)
-+        AC_MSG_RESULT(disabled)
-+      fi
-+    ],[
-+        TORRENT_CHECK_TR1()
-+    ])
-+])
-Index: libtorrent/src/dht/dht_tracker.h
-===================================================================
---- libtorrent/src/dht/dht_tracker.h	(revision 0)
-+++ libtorrent/src/dht/dht_tracker.h	(revision 0)
-@@ -0,0 +1,84 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#ifndef LIBTORRENT_DHT_TORRENT_H
-+#define LIBTORRENT_DHT_TORRENT_H
-+
-+#include "globals.h"
-+
-+#include 
-+#include 
-+
-+#include "download/download_info.h"  // for SocketAddressCompact
-+
-+namespace torrent {
-+
-+class Object;
-+
-+// Container for peers tracked in a torrent.
-+
-+class DhtTracker : private std::vector {
-+public:
-+  typedef std::vector  base_type;
-+
-+  // Maximum number of peers we return for a GET_PEERS query (default value).
-+  // Needs to be small enough so that a packet with a payload of num_peers*6 bytes
-+  // does not need fragmentation. Value chosen so that the size is approximately
-+  // equal to a FIND_NODE reply (8*26 bytes).
-+  static const unsigned int max_peers = 32;
-+
-+  // Maximum number of peers we keep track of. For torrents with more peers,
-+  // replace random peers with new announces to avoid excessively large peer
-+  // tables for active torrents.
-+  static const unsigned int max_size = 128;
-+
-+  using base_type::empty;
-+  using base_type::size;
-+
-+  void                add_peer(const rak::socket_address* sa);
-+  std::string         get_peers(unsigned int maxPeers = max_peers);
-+
-+  // Remove old announces from the tracker that have not reannounced for
-+  // more than the given number of prune calls.
-+  void                prune(uint32_t maxAge);
-+
-+private:
-+  std::vector  m_lastSeen;
-+};
-+
-+}
-+
-+#endif
-Index: libtorrent/src/dht/dht_bucket.cc
-===================================================================
---- libtorrent/src/dht/dht_bucket.cc	(revision 0)
-+++ libtorrent/src/dht/dht_bucket.cc	(revision 0)
-@@ -0,0 +1,191 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#include "config.h"
-+
-+#include "torrent/exceptions.h"
-+
-+#include "dht_bucket.h"
-+#include "dht_node.h"
-+
-+namespace torrent {
-+
-+DhtBucket::DhtBucket(const HashString& begin, const HashString& end) :
-+  m_parent(NULL),
-+  m_child(NULL),
-+
-+  m_lastChanged(cachedTime.seconds()),
-+
-+  m_good(0),
-+  m_bad(0),
-+
-+  m_begin(begin),
-+  m_end(end) {
-+
-+  reserve(num_nodes);
-+}
-+
-+void
-+DhtBucket::add_node(DhtNode* n) {
-+  push_back(n);
-+  touch();
-+
-+  if (n->is_good())
-+    m_good++;
-+  else if (n->is_bad())
-+    m_bad++;
-+}
-+
-+void
-+DhtBucket::remove_node(DhtNode* n) {
-+  iterator itr = std::find_if(begin(), end(), std::bind2nd(std::equal_to(), n));
-+  if (itr == end())
-+    throw internal_error("DhtBucket::remove_node called for node not in bucket.");
-+
-+  erase(itr);
-+
-+  if (n->is_good())
-+    m_good--;
-+  else if (n->is_bad())
-+    m_bad--;
-+}
-+
-+void
-+DhtBucket::count() {
-+  m_good = std::count_if(begin(), end(), std::mem_fun(&DhtNode::is_good));
-+  m_bad = std::count_if(begin(), end(), std::mem_fun(&DhtNode::is_bad));
-+}
-+
-+// Called every 15 minutes for housekeeping.
-+void
-+DhtBucket::update() {
-+  // For now we only update the counts after some nodes have become bad
-+  // due to prolonged inactivity.
-+  count();
-+}
-+
-+DhtBucket::iterator
-+DhtBucket::find_replacement_candidate(bool onlyOldest) {
-+  iterator oldest = end();
-+  unsigned int oldestTime = std::numeric_limits::max();
-+
-+  for (iterator itr = begin(); itr != end(); ++itr) {
-+    if ((*itr)->is_bad() && !onlyOldest)
-+      return itr;
-+
-+    if ((*itr)->last_seen() < oldestTime) {
-+      oldestTime = (*itr)->last_seen();
-+      oldest = itr;
-+    }
-+  }
-+
-+  return oldest;
-+}
-+
-+void
-+DhtBucket::get_mid_point(HashString* middle) const {
-+  *middle = m_end;
-+
-+  for (unsigned int i=0; i0; i--) {
-+    unsigned int sum = (uint8_t)mid_range[i-1] + carry;
-+    m_begin[i-1] = (uint8_t)sum;
-+    carry = sum >> 8;
-+  }
-+
-+  // Move nodes over to other bucket if they fall in its range, then
-+  // delete them from this one.
-+  iterator split = std::partition(begin(), end(), std::bind2nd(std::mem_fun(&DhtNode::is_in_range), this));
-+  other->insert(other->end(), split, end());
-+  std::for_each(other->begin(), other->end(), std::bind2nd(std::mem_fun(&DhtNode::set_bucket), other));
-+  erase(split, end());
-+
-+  other->set_time(m_lastChanged);
-+  other->count();
-+
-+  count();
-+
-+  // Maintain child (adjacent narrower bucket) and parent (adjacent wider bucket)
-+  // so that given router ID is in child.
-+  if (other->is_in_range(id)) {
-+    // Make other become our new child.
-+    m_child = other;
-+    other->m_parent = this;
-+
-+  } else {
-+    // We become other's child, other becomes our parent's child.
-+    if (parent()) {
-+      parent()->m_child = other;
-+      other->m_parent = parent();
-+    }
-+
-+    m_parent = other;
-+    other->m_child = this;
-+  }
-+
-+  return other;
-+}
-+
-+}
-Index: libtorrent/src/dht/dht_bucket.h
-===================================================================
---- libtorrent/src/dht/dht_bucket.h	(revision 0)
-+++ libtorrent/src/dht/dht_bucket.h	(revision 0)
-@@ -0,0 +1,183 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#ifndef LIBTORRENT_DHT_BUCKET_H
-+#define LIBTORRENT_DHT_BUCKET_H
-+
-+#include 
-+
-+#include "globals.h"
-+
-+#include "torrent/hash_string.h"
-+
-+namespace torrent {
-+
-+class DhtNode;
-+
-+// A container holding a small number of nodes that fall in a given binary
-+// partition of the 160-bit ID space (i.e. the range ID1..ID2 where ID2-ID1+1 is
-+// a power of 2.)
-+class DhtBucket : private std::vector {
-+public:
-+  static const unsigned int num_nodes = 8;
-+
-+  typedef std::vector      base_type;
-+
-+  using base_type::const_iterator;
-+  using base_type::iterator;
-+
-+  using base_type::begin;
-+  using base_type::end;
-+  using base_type::size;
-+  using base_type::empty;
-+
-+  DhtBucket(const HashString& begin, const HashString& end);
-+
-+  // Add new node. Does NOT set node's bucket automatically (to allow adding a
-+  // node to multiple buckets, with only one "main" bucket.)
-+  void                add_node(DhtNode* n);
-+
-+  void                remove_node(DhtNode* n);
-+
-+  // Bucket's ID range functions.
-+  const HashString&   id_range_begin() const                  { return m_begin; }
-+  HashString&         id_range_begin()                        { return m_begin; }
-+  const HashString&   id_range_end() const                    { return m_end; }
-+  HashString&         id_range_end()                          { return m_end; }
-+
-+  bool                is_in_range(const HashString& id) const { return m_begin <= id && id <= m_end; }
-+
-+  // Find middle or random ID in bucket.
-+  void                get_mid_point(HashString* middle) const;
-+  void                get_random_id(HashString* rand_id) const;
-+
-+  // Node counts and bucket stats.
-+  bool                is_full() const                         { return size() >= num_nodes; }
-+  bool                has_space() const                       { return !is_full() || num_bad() > 0; }
-+  unsigned int        num_good() const                        { return m_good; }
-+  unsigned int        num_bad() const                         { return m_bad; }
-+
-+  unsigned int        age() const                             { return cachedTime.seconds() - m_lastChanged; }
-+  void                touch()                                 { m_lastChanged = cachedTime.seconds(); }
-+  void                set_time(int time)                      { m_lastChanged = time; }
-+
-+  // Called every 15 minutes after updating nodes.
-+  void                update();
-+
-+  // Return candidate for replacement (a bad node or the oldest node); may
-+  // return end() unless has_space() is true.
-+  iterator            find_replacement_candidate(bool onlyOldest = false);
-+
-+  // Split the bucket in two and redistribute nodes. Returned bucket is the
-+  // lower half, "this" bucket keeps the upper half.   Sets parent/child so
-+  // that the bucket the given ID falls in is the child.
-+  DhtBucket*          split(const HashString& id);
-+
-+  // Parent and child buckets.  Parent is the adjacent bucket with double the
-+  // ID width, child the adjacent bucket with half the width (except the very
-+  // last child which has the same width.)
-+  DhtBucket*          parent() const                          { return m_parent; }
-+  DhtBucket*          child() const                           { return m_child; }
-+
-+  // Called by the DhtNode on its bucket to update good/bad node counts.
-+  void                node_now_good(bool was_bad);
-+  void                node_now_bad(bool was_good);
-+
-+private:
-+  void                count();
-+
-+  DhtBucket*          m_parent;
-+  DhtBucket*          m_child;
-+
-+  unsigned int        m_lastChanged;
-+
-+  unsigned int        m_good;
-+  unsigned int        m_bad;
-+
-+  // These are 40 bytes together, so might as well put them last.
-+  HashString          m_begin;
-+  HashString          m_end;
-+};
-+
-+// Helper class to recursively follow a chain of buckets.  It first recurses
-+// into the bucket's children since they are by definition closer to the bucket,
-+// then continues with the bucket's parents.
-+class DhtBucketChain {
-+public:
-+  DhtBucketChain(const DhtBucket* b) : m_restart(b), m_cur(b) { }
-+
-+  const DhtBucket*          bucket()                          { return m_cur; }
-+  const DhtBucket*          next();
-+
-+private:
-+  const DhtBucket*          m_restart;
-+  const DhtBucket*          m_cur;
-+};
-+
-+inline void
-+DhtBucket::node_now_good(bool was_bad) {
-+  m_bad -= was_bad;
-+  m_good++;
-+}
-+
-+inline void
-+DhtBucket::node_now_bad(bool was_good) {
-+  m_good -= was_good;
-+  m_bad++;
-+}
-+
-+inline const DhtBucket*
-+DhtBucketChain::next() {
-+  // m_restart is clear when we're done recursing into the children and
-+  // follow the parents instead.
-+  if (m_restart == NULL) {
-+    m_cur = m_cur->parent();
-+
-+  } else {
-+    m_cur = m_cur->child();
-+
-+    if (!m_cur) {
-+      m_cur = m_restart->parent();
-+      m_restart = NULL;
-+    }
-+  }
-+
-+  return m_cur;
-+}
-+
-+}
-+
-+#endif
-Index: libtorrent/src/dht/dht_router.cc
-===================================================================
---- libtorrent/src/dht/dht_router.cc	(revision 0)
-+++ libtorrent/src/dht/dht_router.cc	(revision 0)
-@@ -0,0 +1,646 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#include "config.h"
-+#include "globals.h"
-+
-+#include 
-+#include 
-+#include 
-+
-+#include "torrent/dht_manager.h"
-+#include "torrent/exceptions.h"
-+#include "utils/sha1.h"
-+#include "manager.h"
-+
-+#include "dht_bucket.h"
-+#include "dht_router.h"
-+#include "dht_tracker.h"
-+#include "dht_transaction.h"
-+
-+namespace torrent {
-+
-+HashString DhtRouter::zero_id;
-+
-+DhtRouter::DhtRouter(const Object& cache, const rak::socket_address* sa) :
-+  DhtNode(zero_id, sa),  // actual ID is set later
-+  m_server(this),
-+  m_contacts(NULL),
-+  m_numRefresh(0),
-+  m_curToken(random()),
-+  m_prevToken(random()) {
-+
-+  HashString ones_id;
-+
-+  zero_id.clear();
-+  ones_id.clear(0xFF);
-+
-+  if (cache.has_key("self_id")) {
-+    assign(cache.get_key_string("self_id").c_str());
-+
-+  } else {
-+    long buffer[size_data];
-+
-+    for (long* itr = buffer; itr != buffer + size_data; ++itr)
-+      *itr = random();
-+
-+    Sha1 sha;
-+    sha.init();
-+    sha.update(buffer, sizeof(buffer));
-+    sha.final_c(data());
-+  }
-+
-+  set_bucket(new DhtBucket(zero_id, ones_id));
-+  m_routingTable.insert(std::make_pair(bucket()->id_range_end(), bucket()));
-+
-+  if (cache.has_key("nodes")) {
-+    Object::map_type nodes = cache.get_key_map("nodes");
-+
-+    for (Object::map_type::const_iterator itr = nodes.begin(); itr != nodes.end(); ++itr) {
-+      if (itr->first.length() != HashString::size_data)
-+        throw bencode_error("Loading cache: Invalid node hash.");
-+
-+      add_node_to_bucket(m_nodes.insert(new DhtNode(itr->first, itr->second)));
-+    }
-+  }
-+
-+  if (m_nodes.size() < num_bootstrap_complete)
-+    m_contacts = new std::list;
-+}
-+
-+DhtRouter::~DhtRouter() {
-+  stop();
-+  std::for_each(m_routingTable.begin(), m_routingTable.end(), rak::on(rak::mem_ref(&DhtBucketList::value_type::second), rak::call_delete()));
-+  std::for_each(m_trackers.begin(), m_trackers.end(), rak::on(rak::mem_ref(&DhtTrackerList::value_type::second), rak::call_delete()));
-+  std::for_each(m_nodes.begin(), m_nodes.end(), rak::on(rak::mem_ref(&DhtNodeList::value_type::second), rak::call_delete()));
-+}
-+
-+void
-+DhtRouter::start(int port) {
-+  m_server.start(port);
-+
-+  // Set timeout slot and schedule it to be called immediately for initial bootstrapping if necessary.
-+  m_taskTimeout.set_slot(rak::mem_fn(this, &DhtRouter::receive_timeout_bootstrap));
-+  priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(1)).round_seconds());
-+}
-+
-+void
-+DhtRouter::stop() {
-+  priority_queue_erase(&taskScheduler, &m_taskTimeout);
-+  m_server.stop();
-+}
-+
-+// Start a DHT get_peers and announce_peer request.
-+void
-+DhtRouter::announce(DownloadInfo* info, TrackerDht* tracker) {
-+  m_server.announce(*find_bucket(info->hash())->second, info->hash(), tracker);
-+}
-+
-+// Cancel any running requests from the given tracker.
-+// If info is not NULL, only cancel those requests.
-+void
-+DhtRouter::cancel_announce(DownloadInfo* info, const TrackerDht* tracker) {
-+  m_server.cancel_announce(info, tracker);
-+}
-+
-+DhtTracker*
-+DhtRouter::get_tracker(const HashString& hash, bool create) {
-+  DhtTrackerList::accessor itr = m_trackers.find(hash);
-+
-+  if (itr == m_trackers.end()) {
-+    if (!create)
-+      return NULL;
-+
-+    std::pair res = m_trackers.insert(std::make_pair(hash, new DhtTracker()));
-+
-+    if (!res.second)
-+      throw internal_error("DhtRouter::get_tracker did not actually insert tracker.");
-+
-+    return res.first.tracker();
-+  }
-+
-+  return itr.tracker();
-+}
-+
-+bool
-+DhtRouter::want_node(const HashString& id) {
-+  // We don't want to add ourself.  Also, too many broken implementations
-+  // advertise an ID of 0, which causes collisions, so reject that.
-+  if (id == this->id() || id == zero_id)
-+    return false;
-+
-+  // We are always interested in more nodes for our own bucket (causing it
-+  // to be split if full); in other buckets only if there's space.
-+  DhtBucket* b = find_bucket(id)->second;
-+  return b == bucket() || b->has_space();
-+}
-+
-+DhtNode*
-+DhtRouter::get_node(const HashString& id) {
-+  DhtNodeList::accessor itr = m_nodes.find(&id);
-+
-+  if (itr == m_nodes.end()) {
-+    if (id == this->id())
-+      return this;
-+    else
-+      return NULL;
-+  }
-+
-+  return itr.node();
-+}
-+
-+DhtRouter::DhtBucketList::iterator
-+DhtRouter::find_bucket(const HashString& id) {
-+  DhtBucketList::iterator itr = m_routingTable.upper_bound(id);
-+
-+#ifdef USE_EXTRA_DEBUG
-+  if (itr == m_routingTable.end())
-+    throw internal_error("DHT Buckets not covering entire ID space.");
-+
-+  if (!itr->second->is_in_range(id))
-+    throw internal_error("DhtRouter::find_bucket, m_routingTable.upper_bound did not find correct bucket.");
-+#endif
-+
-+  return itr;
-+}
-+
-+void
-+DhtRouter::contact(const rak::socket_address* sa, bool external) {
-+  // For non-external nodes, e.g. those from an explict add_node command
-+  // or found via the BT PORT message, contact them immediately if possible.
-+  if (!external) {
-+    if (is_active())
-+      m_server.ping(zero_id, sa);
-+
-+  } else {
-+    // Externally obtained nodes are added to the contact list, but only if
-+    // we're still bootstrapping. We don't contact external nodes after that.
-+    if (m_contacts != NULL)
-+      m_contacts->push_back(*sa);
-+  }
-+}
-+
-+// Received a query from the given node. If it has previously replied
-+// to one of our queries, consider it alive and update the bucket mtime,
-+// otherwise if we could use it in a bucket, try contacting it.
-+DhtNode*
-+DhtRouter::node_queried(const HashString& id, const rak::socket_address* sa) {
-+  DhtNode* node = get_node(id);
-+
-+  if (node == NULL) {
-+    if (want_node(id))
-+      m_server.ping(id, sa);
-+
-+    return NULL;
-+  }
-+
-+  // If we know the ID but the address is different, don't set the original node
-+  // active, but neither use this new address to prevent rogue nodes from polluting
-+  // our routing table with fake source addresses.
-+  if (node->address()->sa_inet()->address_n() != sa->sa_inet()->address_n())
-+    return NULL;
-+
-+  node->queried();
-+  if (node->is_good())
-+    node->bucket()->touch();
-+
-+  return node;
-+}
-+
-+// Received a reply from a node we queried.
-+// Check that it matches the information we have, set that it has replied
-+// and update the bucket mtime.
-+DhtNode*
-+DhtRouter::node_replied(const HashString& id, const rak::socket_address* sa) {
-+  DhtNode* node = get_node(id);
-+
-+  if (node == NULL) {
-+    // New node, create it. It's a good node (it replied!) so add it to a bucket.
-+    if (id == this->id() || id == zero_id)
-+      return NULL;
-+
-+    node = m_nodes.insert(new DhtNode(id, sa));
-+
-+    if (!add_node_to_bucket(node))   // deletes the node if it fails
-+      return NULL;
-+  }
-+
-+  if (node->address()->sa_inet()->address_n() != sa->sa_inet()->address_n())
-+    return NULL;
-+
-+  node->replied();
-+  node->bucket()->touch();
-+
-+  return node;
-+}
-+
-+// A node has not replied to one of our queries.
-+DhtNode*
-+DhtRouter::node_inactive(const HashString& id, const rak::socket_address* sa) {
-+  DhtNodeList::accessor itr = m_nodes.find(&id);
-+
-+  // If not found add it to some blacklist so we won't try contacting it again immediately?
-+  if (itr == m_nodes.end())
-+    return NULL;
-+
-+  // Check source address. Normally node_inactive is called if we DON'T receive a reply,
-+  // however it can also be called if a node replied with an malformed response packet,
-+  // so check that the address matches so that a rogue node cannot cause other nodes
-+  // to be considered bad by sending malformed packets.
-+  if (itr.node()->address()->sa_inet()->address_n() != sa->sa_inet()->address_n())
-+    return NULL;
-+
-+  itr.node()->inactive();
-+
-+  // Old node age normally implies no replies for many consecutive queries, however
-+  // after loading the node cache after a day or more we want to give each node a few
-+  // chances to reply again instead of removing all nodes instantly.
-+  if (itr.node()->is_bad() && itr.node()->age() >= timeout_remove_node) {
-+    delete_node(itr);
-+    return NULL;
-+  }
-+
-+  return itr.node();
-+}
-+
-+// We sent a query to the given node ID, but received a reply from a different
-+// node ID, that means the address of the original ID is invalid now.
-+void
-+DhtRouter::node_invalid(const HashString& id) {
-+  DhtNode* node = get_node(id);
-+
-+  if (node == NULL || node == this)
-+    return;
-+
-+  delete_node(m_nodes.find(&node->id()));
-+}
-+
-+char*
-+DhtRouter::store_closest_nodes(const HashString& id, char* buffer, char* bufferEnd) {
-+  DhtBucketChain chain(find_bucket(id)->second);
-+
-+  do {
-+    for (DhtBucket::const_iterator itr = chain.bucket()->begin(); itr != chain.bucket()->end(); ++itr) {
-+      if (!(*itr)->is_bad()) {
-+        buffer = (*itr)->store_compact(buffer);
-+
-+        if (buffer > bufferEnd)
-+          throw internal_error("DhtRouter::store_closest_nodes wrote past buffer end.");
-+
-+        if (buffer == bufferEnd)
-+          break;
-+      }
-+    }
-+  } while (buffer != bufferEnd && chain.next());
-+
-+  return buffer;
-+}
-+
-+Object*
-+DhtRouter::store_cache(Object* container) const {
-+  container->insert_key("self_id", str());
-+
-+  // Insert all nodes.
-+  Object& nodes = container->insert_key("nodes", Object(Object::TYPE_MAP));
-+  for (DhtNodeList::const_accessor itr = m_nodes.begin(); itr != m_nodes.end(); ++itr) {
-+    if (!itr.node()->is_bad())
-+      itr.node()->store_cache(&nodes.insert_key(itr.id().str(), Object(Object::TYPE_MAP)));
-+  }
-+
-+  return container;
-+}
-+
-+DhtManager::statistics_type
-+DhtRouter::get_statistics() const {
-+  DhtManager::statistics_type stats(*m_server.upload_throttle()->rate(), *m_server.download_throttle()->rate());
-+
-+  if (!m_server.is_active())
-+    stats.cycle = 0;
-+  else if (m_numRefresh < 2)  // still bootstrapping
-+    stats.cycle = 1;
-+  else
-+    stats.cycle = m_numRefresh;
-+
-+  stats.queries_received = m_server.queries_received();
-+  stats.queries_sent = m_server.queries_sent();
-+  stats.replies_received = m_server.replies_received();
-+
-+  stats.num_nodes = m_nodes.size();
-+  stats.num_buckets = m_routingTable.size();
-+
-+  stats.num_peers = 0;
-+  stats.max_peers = 0;
-+  stats.num_trackers = m_trackers.size();
-+
-+  for (DhtTrackerList::const_accessor itr = m_trackers.begin(); itr != m_trackers.end(); ++itr) {
-+    unsigned int peers = itr.tracker()->size();
-+    stats.num_peers += peers;
-+    stats.max_peers = std::max(peers, stats.max_peers);
-+  }
-+
-+  return stats;
-+}
-+
-+void
-+DhtRouter::receive_timeout_bootstrap() {
-+  // If we're still bootstrapping, restart the process every 60 seconds until
-+  // we have enough nodes in our routing table. After we have 32 nodes, we switch
-+  // to a less aggressive non-bootstrap mode of collecting nodes that contact us
-+  // and through doing normal torrent announces.
-+  if (m_nodes.size() < num_bootstrap_complete) {
-+    if (m_contacts == NULL)
-+      throw internal_error("DhtRouter::receive_timeout_bootstrap called without contact list.");
-+
-+    if (!m_nodes.empty() || !m_contacts->empty())
-+      bootstrap();
-+
-+    // Retry in 60 seconds.
-+    priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(timeout_bootstrap_retry)).round_seconds());
-+    m_numRefresh = 1;  // still bootstrapping
-+
-+  } else {
-+    // We won't be needing external contacts after this.
-+    if (m_contacts != NULL) {
-+      delete m_contacts;
-+      m_contacts = NULL;
-+    }
-+
-+    m_taskTimeout.set_slot(rak::mem_fn(this, &DhtRouter::receive_timeout));
-+
-+    if (!m_numRefresh) {
-+      // If we're still in the startup, do the usual refreshing too.
-+      receive_timeout();
-+
-+    } else {
-+      // Otherwise just set the 15 minute timer.
-+      priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(timeout_update)).round_seconds());
-+    }
-+
-+    m_numRefresh = 2;
-+  }
-+}
-+
-+void
-+DhtRouter::receive_timeout() {
-+  priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(timeout_update)).round_seconds());
-+
-+  m_prevToken = m_curToken;
-+  m_curToken = random();
-+
-+  // Do some periodic accounting, refreshing buckets and marking
-+  // bad nodes.
-+
-+  // Update nodes.
-+  for (DhtNodeList::accessor itr = m_nodes.begin(); itr != m_nodes.end(); ++itr) {
-+    if (!itr.node()->bucket())
-+      throw internal_error("DhtRouter::receive_timeout has node without bucket.");
-+
-+    itr.node()->update();
-+
-+    // Try contacting nodes we haven't received anything from for a while.
-+    // Don't contact repeatedly unresponsive nodes; we keep them in case they
-+    // do send a query, until we find a better node. However, give it a last
-+    // chance just before deleting it.
-+    if (itr.node()->is_questionable() && (!itr.node()->is_bad() || itr.node()->age() >= timeout_remove_node))
-+      m_server.ping(itr.node()->id(), itr.node()->address());
-+  }
-+
-+  // If bucket isn't full yet or hasn't received replies/queries from
-+  // its nodes for a while, try to find new nodes now.
-+  for (DhtBucketList::const_iterator itr = m_routingTable.begin(); itr != m_routingTable.end(); ++itr) {
-+    itr->second->update();
-+
-+    if (!itr->second->is_full() || itr->second->age() > timeout_bucket_bootstrap)
-+      bootstrap_bucket(itr->second);
-+  }
-+
-+  // Remove old peers and empty torrents from the tracker.
-+  for (DhtTrackerList::accessor itr = m_trackers.begin(); itr != m_trackers.end(); ) {
-+    itr.tracker()->prune(timeout_peer_announce);
-+
-+    if (itr.tracker()->empty()) {
-+      delete itr.tracker();
-+      m_trackers.erase(itr++);
-+
-+    } else {
-+      ++itr;
-+    }
-+  }
-+
-+  m_server.update();
-+
-+  m_numRefresh++;
-+}
-+
-+void
-+DhtRouter::generate_token(const rak::socket_address* sa, int token, char buffer[20]) {
-+  Sha1 sha;
-+  uint32_t key = sa->sa_inet()->address_n();
-+
-+  sha.init();
-+  sha.update(&token, sizeof(token));
-+  sha.update(&key, 4);
-+  sha.final_c(buffer);
-+}
-+
-+std::string
-+DhtRouter::make_token(const rak::socket_address* sa) {
-+  char token[20];
-+
-+  generate_token(sa, m_curToken, token);
-+
-+  return std::string(token, size_token);
-+}
-+
-+bool
-+DhtRouter::token_valid(const std::string& token, const rak::socket_address* sa) {
-+  if (token.length() != size_token)
-+    return false;
-+
-+  // Compare given token to the reference token.
-+  char reference[20];
-+
-+  // First try current token.
-+  generate_token(sa, m_curToken, reference);
-+
-+  if (std::memcmp(reference, token.c_str(), size_token) == 0)
-+    return true;
-+
-+  // If token recently changed, some clients may be using the older one.
-+  // That way a token is valid for 15-30 minutes, instead of 0-15.
-+  generate_token(sa, m_prevToken, reference);
-+
-+  return std::memcmp(reference, token.c_str(), size_token) == 0;
-+}
-+
-+DhtNode*
-+DhtRouter::find_node(const rak::socket_address* sa) {
-+  for (DhtNodeList::accessor itr = m_nodes.begin(); itr != m_nodes.end(); ++itr)
-+    if (itr.node()->address()->sa_inet()->address_n() == sa->sa_inet()->address_n())
-+      return itr.node();
-+
-+  return NULL;
-+}
-+
-+DhtRouter::DhtBucketList::iterator
-+DhtRouter::split_bucket(const DhtBucketList::iterator& itr, DhtNode* node) {
-+  // Split bucket. Current bucket keeps the upper half thus keeping the
-+  // map key valid, new bucket is the lower half of the original bucket.
-+  DhtBucket* newBucket = itr->second->split(id());
-+
-+  // If our bucket has a child now (the new bucket), move ourself into it.
-+  if (bucket()->child() != NULL)
-+    set_bucket(bucket()->child());
-+
-+  if (!bucket()->is_in_range(id()))
-+    throw internal_error("DhtRouter::split_bucket router ID ended up in wrong bucket.");
-+
-+  // Insert new bucket with iterator hint = just before current bucket.
-+  DhtBucketList::iterator other = m_routingTable.insert(itr, std::make_pair(newBucket->id_range_end(), newBucket));
-+
-+  // Check that the bucket we're not adding the node to isn't empty.
-+  if (other->second->is_in_range(node->id())) {
-+    if (itr->second->empty())
-+      bootstrap_bucket(itr->second);
-+
-+  } else {
-+    if (other->second->empty())
-+      bootstrap_bucket(other->second);
-+
-+    other = itr;
-+  }
-+
-+  return other;
-+}
-+
-+bool
-+DhtRouter::add_node_to_bucket(DhtNode* node) {
-+  DhtBucketList::iterator itr = find_bucket(node->id());
-+
-+  while (itr->second->is_full()) {
-+    // Bucket is full. If there are any bad nodes, remove the oldest.
-+    DhtBucket::iterator nodeItr = itr->second->find_replacement_candidate();
-+    if (nodeItr == itr->second->end())
-+      throw internal_error("DhtBucket::find_candidate returned no node.");
-+
-+    if ((*nodeItr)->is_bad()) {
-+      delete_node(m_nodes.find(&(*nodeItr)->id()));
-+
-+    } else {
-+      // Bucket is full of good nodes; if our own ID falls in
-+      // range then split the bucket else discard new node.
-+      if (itr->second != bucket()) {
-+        delete_node(m_nodes.find(&node->id()));
-+        return false;
-+      }
-+
-+      itr = split_bucket(itr, node);
-+    }
-+  }
-+
-+  itr->second->add_node(node);
-+  node->set_bucket(itr->second);
-+  return true;
-+}
-+
-+void
-+DhtRouter::delete_node(const DhtNodeList::accessor& itr) {
-+  if (itr == m_nodes.end())
-+    throw internal_error("DhtRouter::delete_node called with invalid iterator.");
-+
-+  if (itr.node()->bucket() != NULL)
-+    itr.node()->bucket()->remove_node(itr.node());
-+
-+  delete itr.node();
-+
-+  m_nodes.erase(itr);
-+}
-+
-+void
-+DhtRouter::bootstrap() {
-+  // Contact up to 8 nodes from the contact list.
-+  for (int count = 0; count < 8 && !m_contacts->empty(); count++) {
-+    if (!find_node(&m_contacts->back()))
-+      m_server.ping(zero_id, &m_contacts->back());
-+
-+    m_contacts->pop_back();
-+  }
-+
-+  // Abort unless we already found some nodes for a search.
-+  if (m_nodes.empty())
-+    return;
-+
-+  bootstrap_bucket(bucket());
-+
-+  // Aggressively ping all questionable nodes in our own bucket to weed
-+  // out bad nodes as early as possible and make room for fresh nodes.
-+  for (DhtBucket::iterator itr = bucket()->begin(); itr != bucket()->end(); ++itr)
-+    if (!(*itr)->is_good())
-+      m_server.ping((*itr)->id(), (*itr)->address());
-+
-+  // Also bootstrap a random bucket, if there are others.
-+  if (m_routingTable.size() < 2)
-+    return;
-+
-+  DhtBucketList::iterator itr = m_routingTable.begin();
-+  std::advance(itr, random() % m_routingTable.size());
-+
-+  if (itr->second != bucket() && itr != m_routingTable.end())
-+    bootstrap_bucket(itr->second);
-+}
-+
-+void
-+DhtRouter::bootstrap_bucket(const DhtBucket* bucket) {
-+  if (!m_server.is_active())
-+    return;
-+
-+  // Do a search for a random ID, or the ID adjacent to our
-+  // own when bootstrapping our own bucket. We don't search for
-+  // our own exact ID to avoid receiving only our own node info
-+  // instead of closest nodes, from nodes that know us already.
-+  HashString contactId;
-+
-+  if (bucket == this->bucket()) {
-+    contactId = id();
-+    contactId[contactId.size() - 1] ^= 1;
-+  } else {
-+    bucket->get_random_id(&contactId);
-+  }
-+
-+  m_server.find_node(*bucket, contactId);
-+}
-+
-+}
-Index: libtorrent/src/dht/dht_router.h
-===================================================================
---- libtorrent/src/dht/dht_router.h	(revision 0)
-+++ libtorrent/src/dht/dht_router.h	(revision 0)
-@@ -0,0 +1,174 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#ifndef LIBTORRENT_DHT_ROUTER_H
-+#define LIBTORRENT_DHT_ROUTER_H
-+
-+#include 
-+#include 
-+
-+#include "torrent/dht_manager.h"
-+#include "torrent/hash_string.h"
-+#include "torrent/object.h"
-+
-+#include "dht_node.h"
-+#include "dht_hash_map.h"
-+#include "dht_server.h"
-+
-+namespace torrent {
-+
-+class DhtBucket;
-+class DhtTracker;
-+class TrackerDht;
-+
-+// Main DHT class, maintains the routing table of known nodes and talks to the
-+// DhtServer object that handles the actual communication.
-+
-+class DhtRouter : public DhtNode {
-+public:
-+  // How many bytes to return and verify from the 20-byte SHA token.
-+  static const unsigned int size_token = 8;
-+
-+  static const unsigned int timeout_bootstrap_retry  =          60;  // Retry initial bootstrapping every minute.
-+  static const unsigned int timeout_update           =     15 * 60;  // Regular housekeeping updates every 15 minutes.
-+  static const unsigned int timeout_bucket_bootstrap =     15 * 60;  // Bootstrap idle buckets after 15 minutes.
-+  static const unsigned int timeout_remove_node      = 4 * 60 * 60;  // Remove unresponsive nodes after 4 hours.
-+  static const unsigned int timeout_peer_announce    =     30 * 60;  // Remove peers which haven't reannounced for 30 minutes.
-+
-+  // A node ID of all zero.
-+  static HashString zero_id;
-+
-+  DhtRouter(const Object& cache, const rak::socket_address* sa);
-+  ~DhtRouter();
-+
-+  // Start and stop the router. This starts/stops the UDP server as well.
-+  void                start(int port);
-+  void                stop();
-+
-+  bool                is_active()                        { return m_server.is_active(); }
-+
-+  // Find peers for given download and announce ourselves.
-+  void                announce(DownloadInfo* info, TrackerDht* tracker);
-+
-+  // Cancel any pending transactions related to the given download (or all if NULL).
-+  void                cancel_announce(DownloadInfo* info, const TrackerDht* tracker);
-+
-+  // Retrieve tracked torrent for the hash.
-+  // Returns NULL if not tracking the torrent unless create is true.
-+  DhtTracker*         get_tracker(const HashString& hash, bool create);
-+
-+  // Check if we are interested in inserting a new node of the given ID
-+  // into our table (i.e. if we have space or bad nodes in the corresponding bucket).
-+  bool                want_node(const HashString& id);
-+
-+  // Contact the given node, or add it to the list of potential contacts
-+  // if it was obtained externally from a .torrent file for example.
-+  void                contact(const rak::socket_address* sa, bool external);
-+
-+  // Retrieve node of given ID in constant time. Return NULL if not found, unless
-+  // it's our own ID in which case it returns the DhtRouter object.
-+  DhtNode*            get_node(const HashString& id);
-+
-+  // Search for node with given address in O(n), disregarding the port.
-+  DhtNode*            find_node(const rak::socket_address* sa);
-+
-+  // Whenever a node queries us, replies, or is confirmed inactive (no reply) or
-+  // invalid (reply with wrong ID), we need to update its status.
-+  DhtNode*            node_queried(const HashString& id, const rak::socket_address* sa);
-+  DhtNode*            node_replied(const HashString& id, const rak::socket_address* sa);
-+  DhtNode*            node_inactive(const HashString& id, const rak::socket_address* sa);
-+  void                node_invalid(const HashString& id);
-+
-+  // Store compact node information (26 bytes) for nodes closest to the
-+  // given ID in the given buffer, return new buffer end.
-+  char*               store_closest_nodes(const HashString& id, char* buffer, char* bufferEnd);
-+
-+  // Store DHT cache in the given container.
-+  Object*             store_cache(Object* container) const;
-+
-+  // Create and verify a token. Tokens are valid between 15-30 minutes from creation.
-+  std::string         make_token(const rak::socket_address* sa);
-+  bool                token_valid(const std::string& token, const rak::socket_address* sa);
-+
-+  DhtManager::statistics_type get_statistics() const;
-+  void                reset_statistics()                 { m_server.reset_statistics(); }
-+
-+  DhtServer*          server()                           { return &m_server; }
-+  DhtTrackerList*     trackers()                         { return &m_trackers; }
-+
-+private:
-+  // Number of nodes we need to consider the bootstrap process complete.
-+  static const unsigned int num_bootstrap_complete = 32;
-+
-+  typedef std::map DhtBucketList;
-+
-+  DhtBucketList::iterator find_bucket(const HashString& id);
-+
-+  bool                add_node_to_bucket(DhtNode* node);
-+  void                delete_node(const DhtNodeList::accessor& itr);
-+
-+  DhtBucketList::iterator split_bucket(const DhtBucketList::iterator& itr, DhtNode* node);
-+
-+  void                bootstrap();
-+  void                bootstrap_bucket(const DhtBucket* bucket);
-+
-+  void                receive_timeout();
-+  void                receive_timeout_bootstrap();
-+
-+  // buffer needs to hold an SHA1 hash (20 bytes), not just the token (8 bytes)
-+  void                generate_token(const rak::socket_address* sa, int token, char buffer[20]);
-+
-+  rak::priority_item  m_taskTimeout;
-+
-+  DhtServer           m_server;
-+  DhtNodeList         m_nodes;
-+  DhtBucketList       m_routingTable;
-+  DhtTrackerList      m_trackers;
-+
-+  std::list* m_contacts;
-+
-+  int                 m_numRefresh;
-+
-+  bool                m_networkUp;
-+
-+  // Secret keys used for generating announce tokens.
-+  int                 m_curToken;
-+  int                 m_prevToken;
-+};
-+
-+}
-+
-+#endif
-Index: libtorrent/src/dht/dht_hash_map.h
-===================================================================
---- libtorrent/src/dht/dht_hash_map.h	(revision 0)
-+++ libtorrent/src/dht/dht_hash_map.h	(revision 0)
-@@ -0,0 +1,168 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#ifndef LIBTORRENT_DHT_HASH_MAP_H
-+#define LIBTORRENT_DHT_HASH_MAP_H
-+
-+#include "config.h"
-+
-+#if HAVE_TR1
-+#include 
-+#else
-+#include 
-+#endif
-+
-+#include "torrent/hash_string.h"
-+
-+#include "dht_node.h"
-+#include "dht_tracker.h"
-+
-+namespace torrent {
-+
-+#if HAVE_TR1
-+// Hash functions for HashString keys, and dereferencing HashString pointers.
-+// We use the last n bits of the 160-bit ID hash, since in sub-buckets the
-+// first few bits are all identical.
-+struct hashstring_ptr_hash : public std::unary_function {
-+  size_t operator () (const HashString* n) const
-+  { return *(size_t*)(n->data() + n->size() - sizeof(size_t)); }
-+};
-+
-+struct hashstring_hash : public std::unary_function {
-+  size_t operator () (const HashString& n) const
-+  { return *(size_t*)(n.data() + n.size() - sizeof(size_t)); }
-+};
-+
-+// Compare HashString pointers by dereferencing them.
-+struct hashstring_ptr_equal : public std::binary_function {
-+  size_t operator () (const HashString* one, const HashString* two) const
-+  { return *one == *two; }
-+};
-+
-+class DhtNodeList : public std::tr1::unordered_map {
-+public:
-+  typedef std::tr1::unordered_map base_type;
-+
-+  // Define accessor iterator with more convenient access to the key and
-+  // element values.  Allows changing the map definition more easily if needed.
-+  template
-+  struct accessor_wrapper : public T {
-+    accessor_wrapper(const T& itr) : T(itr) { }
-+
-+    const HashString&    id() const    { return *(**this).first; }
-+    DhtNode*             node() const  { return (**this).second; }
-+  };
-+
-+  typedef accessor_wrapper  const_accessor;
-+  typedef accessor_wrapper        accessor;
-+
-+  DhtNode*            insert(DhtNode* n);
-+
-+};
-+
-+class DhtTrackerList : public std::tr1::unordered_map {
-+public:
-+  typedef std::tr1::unordered_map base_type;
-+
-+  template
-+  struct accessor_wrapper : public T {
-+    accessor_wrapper(const T& itr) : T(itr) { }
-+
-+    const HashString&    id() const       { return (**this).first; }
-+    DhtTracker*          tracker() const  { return (**this).second; }
-+  };
-+
-+  typedef accessor_wrapper  const_accessor;
-+  typedef accessor_wrapper        accessor;
-+
-+};
-+
-+#else
-+
-+// Compare HashString pointers by dereferencing them.
-+struct hashstring_ptr_less : public std::binary_function {
-+  size_t operator () (const HashString* one, const HashString* two) const
-+  { return *one < *two; }
-+};
-+
-+class DhtNodeList : public std::map {
-+public:
-+  typedef std::map base_type;
-+
-+  // Define accessor iterator with more convenient access to the key and
-+  // element values.  Allows changing the map definition more easily if needed.
-+  template
-+  struct accessor_wrapper : public T {
-+    accessor_wrapper(const T& itr) : T(itr) { }
-+
-+    const HashString&    id() const    { return *(**this).first; }
-+    DhtNode*             node() const  { return (**this).second; }
-+  };
-+
-+  typedef accessor_wrapper  const_accessor;
-+  typedef accessor_wrapper        accessor;
-+
-+  DhtNode*            insert(DhtNode* n);
-+
-+};
-+
-+class DhtTrackerList : public std::map {
-+public:
-+  typedef std::map base_type;
-+
-+  template
-+  struct accessor_wrapper : public T {
-+    accessor_wrapper(const T& itr) : T(itr) { }
-+
-+    const HashString&    id() const       { return (**this).first; }
-+    DhtTracker*          tracker() const  { return (**this).second; }
-+  };
-+
-+  typedef accessor_wrapper  const_accessor;
-+  typedef accessor_wrapper        accessor;
-+
-+};
-+#endif // HAVE_TR1
-+
-+inline
-+DhtNode* DhtNodeList::insert(DhtNode* n) {
-+  base_type::insert(std::make_pair(n, n));
-+  return n;
-+}
-+
-+}
-+
-+#endif
-Index: libtorrent/src/dht/dht_transaction.cc
-===================================================================
---- libtorrent/src/dht/dht_transaction.cc	(revision 0)
-+++ libtorrent/src/dht/dht_transaction.cc	(revision 0)
-@@ -0,0 +1,287 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#include "config.h"
-+
-+#include "torrent/exceptions.h"
-+#include "torrent/object_stream.h"
-+#include "tracker/tracker_dht.h"
-+
-+#include "dht_bucket.h"
-+#include "dht_transaction.h"
-+
-+namespace torrent {
-+
-+DhtSearch::DhtSearch(const HashString& target, const DhtBucket& contacts)
-+  : base_type(dht_compare_closer(target)),
-+    m_pending(0),
-+    m_contacted(0),
-+    m_replied(0),
-+    m_concurrency(3),
-+    m_restart(false),
-+    m_started(false),
-+    m_next(end()) {
-+
-+  add_contacts(contacts);
-+}
-+
-+DhtSearch::~DhtSearch() {
-+  // Make sure transactions were destructed first. Since it is the destruction
-+  // of a transaction that triggers this destructor, that should always be the
-+  // case.
-+  if (m_pending)
-+    throw internal_error("DhtSearch::~DhtSearch called with pending transactions.");
-+
-+  if (m_concurrency != 3)
-+    throw internal_error("DhtSearch::~DhtSearch with invalid concurrency limit.");
-+
-+  for (accessor itr = begin(); itr != end(); ++itr)
-+    delete itr.node();
-+}
-+
-+bool
-+DhtSearch::add_contact(const HashString& id, const rak::socket_address* sa) {
-+  DhtNode* n = new DhtNode(id, sa);
-+  bool added = insert(std::make_pair(n, this)).second;
-+
-+  if (!added)
-+    delete n;
-+  else
-+    m_restart = true;
-+
-+  return added;
-+}
-+
-+void
-+DhtSearch::add_contacts(const DhtBucket& contacts) {
-+  DhtBucketChain chain(&contacts);
-+
-+  // Add max_contacts=18 closest nodes, and fill up so we also have at least 8 good nodes.
-+  int needClosest = max_contacts - size();
-+  int needGood = DhtBucket::num_nodes;
-+
-+  for (DhtBucket::const_iterator itr = chain.bucket()->begin(); needClosest > 0 || needGood > 0; ++itr) {
-+    while (itr == chain.bucket()->end()) {
-+      if (!chain.next())
-+        return;
-+
-+      itr = chain.bucket()->begin();
-+    }
-+
-+    if ((!(*itr)->is_bad() || needClosest > 0) && add_contact((*itr)->id(), (*itr)->address())) {
-+      needGood -= !(*itr)->is_bad();
-+      needClosest--;
-+    }
-+  }
-+}
-+
-+// Check if a node has been contacted yet.  This is the case if it is not currently
-+// being contacted, nor has it been found to be good or bad.
-+bool
-+DhtSearch::node_uncontacted(const DhtNode* node) const {
-+  return !node->is_active() && !node->is_good() && !node->is_bad();
-+}
-+
-+// After more contacts have been added, discard least closest nodes
-+// except if node has a transaction pending.
-+void
-+DhtSearch::trim(bool final) {
-+
-+  // We keep:
-+  // - the max_contacts=18 closest good or unknown nodes and all nodes closer
-+  //   than them (to see if further searches find closer ones)
-+  // - for announces, also the 8 closest good nodes (i.e. nodes that have
-+  //   replied) to have at least that many for the actual announce
-+  // - any node that currently has transactions pending
-+  //
-+  // However, after exhausting all search nodes, we only keep good nodes.
-+  //
-+  // For our purposes, the node status is as follows:
-+  // node is bad (contacted but hasn't replied) if is_bad()
-+  // node is good (contacted and replied) if is_good()
-+  // node is currently being contacted if is_active()
-+  // node is new and unknown otherwise
-+
-+  int needClosest = final ? 0 : max_contacts;
-+  int needGood = is_announce() ? DhtBucket::num_nodes : 0;
-+
-+  // We're done if we can't find any more nodes to contact.
-+  m_next = end();
-+
-+  accessor itr = base_type::begin();
-+  while (itr != end()) {
-+    // If we have all we need, delete current node unless it is
-+    // currently being contacted.
-+    if (!itr.node()->is_active() && needClosest <= 0 && (!itr.node()->is_good() || needGood <= 0)) {
-+      delete itr.node();
-+      erase(itr++);
-+      continue;
-+    }
-+
-+    // Otherwise adjust needed counts appropriately.
-+    needClosest--;
-+    needGood -= itr.node()->is_good();
-+
-+    // Remember the first uncontacted node as the closest one to contact next.
-+    if (m_next == end() && node_uncontacted(itr.node()))
-+      m_next = const_accessor(itr);
-+
-+    ++itr;
-+  }
-+
-+  m_restart = false;
-+}
-+
-+DhtSearch::const_accessor
-+DhtSearch::get_contact() {
-+  if (m_pending >= m_concurrency)
-+    return end();
-+
-+  if (m_restart)
-+    trim(false);
-+
-+  const_accessor ret = m_next;
-+  if (ret == end())
-+    return ret;
-+
-+  set_node_active(ret, true);
-+  m_pending++;
-+  m_contacted++;
-+
-+  // Find next node to contact: any node we haven't contacted yet.
-+  while (++m_next != end()) {
-+    if (node_uncontacted(m_next.node()))
-+      break;
-+  }
-+
-+  return ret;
-+}
-+
-+void
-+DhtSearch::node_status(const_accessor& n, bool success) {
-+  if (n == end() || !n.node()->is_active())
-+    throw internal_error("DhtSearch::node_status called for invalid/inactive node.");
-+
-+  if (success) {
-+    n.node()->set_good();
-+    m_replied++;
-+
-+  } else {
-+    n.node()->set_bad();
-+  }
-+
-+  m_pending--;
-+  set_node_active(n, false);
-+}
-+
-+DhtSearch::const_accessor
-+DhtAnnounce::start_announce() {
-+  trim(true);
-+
-+  if (empty())
-+    return end();
-+
-+  if (!complete() || m_next != end() || size() > DhtBucket::num_nodes)
-+    throw internal_error("DhtSearch::start_announce called in inconsistent state.");
-+
-+  m_contacted = m_pending = size();
-+  m_replied = 0;
-+
-+  for (const_accessor itr(begin()); itr != end(); ++itr)
-+    set_node_active(itr, true);
-+
-+  return const_accessor(begin());
-+}
-+
-+void
-+DhtTransactionPacket::build_buffer(const Object& data) {
-+  char buffer[1500];  // If the message would exceed an Ethernet frame, something went very wrong.
-+  object_buffer_t result = object_write_bencode_c(object_write_to_buffer, NULL, std::make_pair(buffer, buffer + sizeof(buffer)), &data);
-+
-+  m_length = result.second - buffer;
-+  m_data = new char[m_length];
-+  memcpy(m_data, buffer, m_length);
-+}
-+
-+DhtTransaction::DhtTransaction(int quick_timeout, int timeout, const HashString& id, const rak::socket_address* sa)
-+  : m_hasQuickTimeout(quick_timeout > 0),
-+    m_id(id),
-+    m_sa(*sa),
-+    m_timeout(cachedTime.seconds() + timeout),
-+    m_quickTimeout(cachedTime.seconds() + quick_timeout),
-+    m_retry(3),
-+    m_packet(NULL) {
-+
-+}
-+
-+DhtTransaction::~DhtTransaction() {
-+  if (m_packet != NULL)
-+    m_packet->set_failed();
-+}
-+
-+void
-+DhtTransactionSearch::set_stalled() {
-+  if (!m_hasQuickTimeout)
-+    throw internal_error("DhtTransactionSearch::set_stalled called on already stalled transaction.");
-+
-+  m_hasQuickTimeout = false;
-+  m_search->m_concurrency++;
-+}
-+
-+void
-+DhtTransactionSearch::complete(bool success) {
-+  if (m_node == m_search->end())
-+    throw internal_error("DhtTransactionSearch::complete called multiple times.");
-+
-+  if (m_node.search() != m_search)
-+    throw internal_error("DhtTransactionSearch::complete called for node from wrong search.");
-+
-+  if (!m_hasQuickTimeout)
-+    m_search->m_concurrency--;
-+
-+  m_search->node_status(m_node, success);
-+  m_node = m_search->end();
-+}
-+
-+DhtTransactionSearch::~DhtTransactionSearch() {
-+  if (m_node != m_search->end())
-+    complete(false);
-+
-+  if (m_search->complete())
-+    delete m_search;
-+}
-+
-+}
-Index: libtorrent/src/dht/dht_node.cc
-===================================================================
---- libtorrent/src/dht/dht_node.cc	(revision 0)
-+++ libtorrent/src/dht/dht_node.cc	(revision 0)
-@@ -0,0 +1,89 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#include "config.h"
-+#include "globals.h"
-+
-+#include "torrent/exceptions.h"
-+#include "torrent/object.h"
-+
-+#include "dht_node.h"
-+
-+namespace torrent {
-+
-+DhtNode::DhtNode(const HashString& id, const rak::socket_address* sa) :
-+  HashString(id),
-+  m_socketAddress(*sa),
-+  m_lastSeen(0),
-+  m_recentlyActive(false),
-+  m_recentlyInactive(0),
-+  m_bucket(NULL) {
-+
-+  if (sa->family() != rak::socket_address::af_inet)
-+    throw resource_error("Address not af_inet");
-+}
-+
-+DhtNode::DhtNode(const std::string& id, const Object& cache) :
-+  HashString(*HashString::cast_from(id.c_str())),
-+  m_recentlyActive(false),
-+  m_recentlyInactive(0),
-+  m_bucket(NULL) {
-+
-+  rak::socket_address_inet* sa = m_socketAddress.sa_inet();
-+  sa->set_family();
-+  sa->set_address_h(cache.get_key_value("i"));
-+  sa->set_port(cache.get_key_value("p"));
-+  m_lastSeen = cache.get_key_value("t");
-+  update();
-+}
-+
-+char*
-+DhtNode::store_compact(char* buffer) const {
-+  HashString::cast_from(buffer)->assign(data());
-+  *(uint32_t*) (buffer+20) = address()->sa_inet()->address_n();
-+  *(uint16_t*) (buffer+24) = address()->sa_inet()->port_n();
-+  return buffer+26;
-+}
-+
-+Object*
-+DhtNode::store_cache(Object* container) const {
-+  container->insert_key("i", m_socketAddress.sa_inet()->address_h());
-+  container->insert_key("p", m_socketAddress.sa_inet()->port());
-+  container->insert_key("t", m_lastSeen);
-+  return container;
-+}
-+
-+}
-Index: libtorrent/src/dht/dht_server.cc
-===================================================================
---- libtorrent/src/dht/dht_server.cc	(revision 0)
-+++ libtorrent/src/dht/dht_server.cc	(revision 0)
-@@ -0,0 +1,912 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#include "config.h"
-+#include "globals.h"
-+
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+#include "net/throttle_manager.h"
-+#include "torrent/exceptions.h"
-+#include "torrent/connection_manager.h"
-+#include "torrent/object.h"
-+#include "torrent/object_stream.h"
-+#include "torrent/poll.h"
-+#include "tracker/tracker_dht.h"
-+
-+#include "dht_bucket.h"
-+#include "dht_router.h"
-+#include "dht_transaction.h"
-+
-+#include "manager.h"
-+
-+namespace torrent {
-+
-+const char* DhtServer::queries[] = {
-+  "ping",
-+  "find_node",
-+  "get_peers",
-+  "announce_peer",
-+};
-+
-+// Error in DHT protocol, avoids std::string ctor from communication_error
-+class dht_error : public network_error {
-+public:
-+  dht_error(int code, const char* message) : m_message(message), m_code(code) {}
-+
-+  virtual int          code() const throw()   { return m_code; }
-+  virtual const char*  what() const throw()   { return m_message; }
-+
-+private:
-+  const char*  m_message;
-+  int          m_code;
-+};
-+
-+DhtServer::DhtServer(DhtRouter* router) :
-+  m_router(router),
-+
-+  m_uploadThrottle(60),
-+  m_downloadThrottle(60),
-+
-+  m_networkUp(false) {
-+
-+  get_fd().clear();
-+  reset_statistics();
-+
-+  // Reserve a socket for the DHT server, even though we don't
-+  // actually open it until the server is started, which may not
-+  // happen until the first non-private torrent is started.
-+  manager->connection_manager()->inc_socket_count();
-+}
-+
-+DhtServer::~DhtServer() {
-+  stop();
-+
-+  std::for_each(m_highQueue.begin(), m_highQueue.end(), rak::call_delete());
-+  std::for_each(m_lowQueue.begin(), m_lowQueue.end(), rak::call_delete());
-+
-+  manager->connection_manager()->dec_socket_count();
-+}
-+
-+void
-+DhtServer::start(int port) {
-+  try {
-+    if (!get_fd().open_datagram() || !get_fd().set_nonblock())
-+      throw resource_error("Could not allocate datagram socket.");
-+
-+    if (!get_fd().set_reuse_address(true))
-+      throw resource_error("Could not set listening port to reuse address.");
-+
-+    rak::socket_address sa = *m_router->address();
-+    sa.set_port(port);
-+
-+    if (!get_fd().bind(sa))
-+      throw resource_error("Could not bind datagram socket.");
-+
-+  } catch (...) {
-+    get_fd().close();
-+    get_fd().clear();
-+    throw;
-+  }
-+
-+  m_taskTimeout.set_slot(rak::mem_fn(this, &DhtServer::receive_timeout));
-+
-+  m_uploadThrottle.set_list_iterator(manager->upload_throttle()->throttle_list()->end());
-+  m_uploadThrottle.slot_activate(rak::make_mem_fun(reinterpret_cast(this), &SocketBase::receive_throttle_up_activate));
-+
-+  m_downloadThrottle.set_list_iterator(manager->download_throttle()->throttle_list()->end());
-+  manager->download_throttle()->throttle_list()->insert(&m_downloadThrottle);
-+
-+  manager->poll()->open(this);
-+  manager->poll()->insert_read(this);
-+  manager->poll()->insert_error(this);
-+}
-+
-+void
-+DhtServer::stop() {
-+  if (!is_active())
-+    return;
-+
-+  clear_transactions();
-+
-+  priority_queue_erase(&taskScheduler, &m_taskTimeout);
-+
-+  manager->upload_throttle()->throttle_list()->erase(&m_uploadThrottle);
-+  manager->download_throttle()->throttle_list()->erase(&m_downloadThrottle);
-+
-+  manager->poll()->remove_read(this);
-+  manager->poll()->remove_write(this);
-+  manager->poll()->remove_error(this);
-+  manager->poll()->close(this);
-+
-+  get_fd().close();
-+  get_fd().clear();
-+
-+  m_networkUp = false;
-+}
-+
-+void
-+DhtServer::reset_statistics() {
-+  m_queriesReceived = 0;
-+  m_queriesSent = 0;
-+  m_repliesReceived = 0;
-+
-+  m_uploadThrottle.rate()->set_total(0);
-+  m_downloadThrottle.rate()->set_total(0);
-+}
-+
-+// Ping a node whose ID we know.
-+void
-+DhtServer::ping(const HashString& id, const rak::socket_address* sa) {
-+  // No point pinging a node that we're already contacting otherwise.
-+  transaction_itr itr = m_transactions.lower_bound(DhtTransaction::key(sa, 0));
-+  if (itr == m_transactions.end() || (itr->first >> 32 != DhtTransaction::key(sa, 0) >> 32))
-+    add_transaction(new DhtTransactionPing(id, sa), packet_prio_low);
-+}
-+
-+// Contact nodes in given bucket and ask for their nodes closest to target.
-+void
-+DhtServer::find_node(const DhtBucket& contacts, const HashString& target) {
-+  DhtSearch* search = new DhtSearch(target, contacts);
-+
-+  DhtSearch::const_accessor n;
-+  while ((n = search->get_contact()) != search->end())
-+    add_transaction(new DhtTransactionFindNode(n), packet_prio_low);
-+
-+  // This shouldn't happen, it means we had no contactable nodes at all.
-+  if (!search->start()) {
-+    delete search;
-+    return;
-+  }
-+
-+}
-+
-+void
-+DhtServer::announce(const DhtBucket& contacts, const HashString& infoHash, TrackerDht* tracker) {
-+  DhtAnnounce* announce = new DhtAnnounce(infoHash, tracker, contacts);
-+
-+  DhtSearch::const_accessor n;
-+  while ((n = announce->get_contact()) != announce->end())
-+    add_transaction(new DhtTransactionFindNode(n), packet_prio_high);
-+
-+  // This can only happen if all nodes we know are bad.
-+  if (!announce->start()) {
-+    tracker->receive_failed("No DHT nodes available for peer search.");
-+    delete announce;
-+    return;
-+  }
-+
-+  tracker->receive_status(announce->num_replied(), announce->num_contacted(), "Searching");
-+}
-+
-+void
-+DhtServer::cancel_announce(DownloadInfo* info, const TrackerDht* tracker) {
-+  transaction_itr itr = m_transactions.begin();
-+
-+  while (itr != m_transactions.end()) {
-+    if (itr->second->is_search() && itr->second->as_search()->search()->is_announce()) {
-+      DhtAnnounce* announce = reinterpret_cast(itr->second->as_search()->search());
-+
-+      if ((!info || announce->target() == info->hash()) && (!tracker || announce->tracker() == tracker)) {
-+        itr = cancel_transaction(itr);
-+        continue;  // itr has been incremented already
-+      }
-+    }
-+
-+    ++itr;
-+  }
-+}
-+
-+void
-+DhtServer::update() {
-+  // Reset this every 15 minutes. It'll get set back to true if we receive
-+  // any valid packets. This allows detecting when the entire network goes
-+  // down, and prevents all nodes from getting removed as unresponsive.
-+  m_networkUp = false;
-+}
-+
-+void
-+DhtServer::process_query(const Object& transactionId, const HashString& id, const rak::socket_address* sa, Object& request) {
-+  m_queriesReceived++;
-+  m_networkUp = true;
-+
-+  std::string& query = request.get_key_string("q");
-+
-+  Object& arg = request.get_key("a");
-+
-+  // Construct reply.
-+  Object reply(Object::TYPE_MAP);
-+
-+  if (query == "find_node")
-+    create_find_node_response(arg, reply);
-+
-+  else if (query == "get_peers")
-+    create_get_peers_response(arg, sa, reply);
-+
-+  else if (query == "announce_peer")
-+    create_announce_peer_response(arg, sa, reply);
-+
-+  else if (query != "ping")
-+    throw dht_error(dht_error_bad_method, "Unknown query type.");
-+
-+  m_router->node_queried(id, sa);
-+
-+  create_response(transactionId, sa, reply);
-+}
-+
-+void
-+DhtServer::create_find_node_response(const Object& arg, Object& reply) {
-+  const std::string& target = arg.get_key_string("target");
-+
-+  if (target.length() < HashString::size_data)
-+    throw dht_error(dht_error_protocol, "target string too short");
-+
-+  char compact[26*8];
-+  char* end = m_router->store_closest_nodes(*HashString::cast_from(target), compact, compact + 26*8);
-+
-+  if (end == compact)
-+    throw dht_error(dht_error_generic, "No nodes");
-+
-+  reply.insert_key("nodes", std::string(compact, end));
-+}
-+
-+void
-+DhtServer::create_get_peers_response(const Object& arg, const rak::socket_address* sa, Object& reply) {
-+  reply.insert_key("token", m_router->make_token(sa));
-+
-+  const std::string& info_hash_str = arg.get_key_string("info_hash");
-+
-+  if (info_hash_str.length() < HashString::size_data)
-+    throw dht_error(dht_error_protocol, "info hash too short");
-+
-+  const HashString* info_hash = HashString::cast_from(info_hash_str);
-+
-+  DhtTracker* tracker = m_router->get_tracker(*info_hash, false);
-+
-+  // If we're not tracking or have no peers, send closest nodes.
-+  if (!tracker || tracker->empty()) {
-+    char compact[26*8];
-+    char* end = m_router->store_closest_nodes(*info_hash, compact, compact + 26*8);
-+
-+    if (end == compact)
-+      throw dht_error(dht_error_generic, "No peers nor nodes");
-+
-+    reply.insert_key("nodes", std::string(compact, end));
-+
-+  } else {
-+    Object& values = reply.insert_key("values", Object(Object::TYPE_LIST));
-+    values.insert_back(tracker->get_peers());
-+  }
-+}
-+
-+void
-+DhtServer::create_announce_peer_response(const Object& arg, const rak::socket_address* sa, Object& reply) {
-+  const std::string& info_hash_str = arg.get_key_string("info_hash");
-+
-+  if (info_hash_str.length() < HashString::size_data)
-+    throw dht_error(dht_error_protocol, "info hash too short");
-+
-+  const HashString* info_hash = HashString::cast_from(info_hash_str);
-+
-+  if (!m_router->token_valid(arg.get_key_string("token"), sa))
-+    throw dht_error(dht_error_protocol, "Token invalid.");
-+
-+  DhtTracker* tracker = m_router->get_tracker(*info_hash, true);
-+  rak::socket_address peer = *sa;
-+  peer.set_port(arg.get_key_value("port"));
-+  tracker->add_peer(&peer);
-+}
-+
-+void
-+DhtServer::process_response(int transactionId, const HashString& id, const rak::socket_address* sa, Object& request) {
-+  transaction_itr itr = m_transactions.find(DhtTransaction::key(sa, transactionId));
-+
-+  // Response to a transaction we don't have in our table. At this point it's
-+  // impossible to tell whether it used to be a valid transaction but timed out
-+  // or the node did not return the ID we sent it. Best we can do is ignore the
-+  // reply.
-+  if (itr == m_transactions.end())
-+    return;
-+
-+  m_repliesReceived++;
-+  m_networkUp = true;
-+
-+  const Object& response = request.get_key("r");
-+
-+  // If we contact a node but the reply ID or key (address) don't match, ignore the reply
-+  // to prevent interference from rogue nodes.
-+  // (But ignore the port for comparison purposes since it may be changed by NAT.)
-+  DhtTransaction* transaction = itr->second;
-+  if (DhtTransaction::key(sa, transactionId) != transaction->key(transactionId) || (id != transaction->id() && transaction->id() != *m_router && transaction->id() != m_router->zero_id))
-+    return;
-+
-+  switch (transaction->type()) {
-+    case DhtTransaction::DHT_FIND_NODE:
-+      parse_find_node_reply(transaction->as_find_node(), response.get_key_string("nodes"));
-+      break;
-+
-+    case DhtTransaction::DHT_GET_PEERS:
-+      parse_get_peers_reply(transaction->as_get_peers(), response);
-+      break;
-+
-+    // Nothing to do for DHT_PING and DHT_ANNOUNCE_PEER
-+    default:
-+      break;
-+  }
-+
-+  // Mark node responsive only if all processing was successful, without errors.
-+  m_router->node_replied(id, sa);
-+
-+  delete itr->second;
-+  m_transactions.erase(itr);
-+}
-+
-+void
-+DhtServer::process_error(int transactionId, const rak::socket_address* sa, Object& request) {
-+  transaction_itr itr = m_transactions.find(DhtTransaction::key(sa, transactionId));
-+
-+  if (itr == m_transactions.end())
-+    return;
-+
-+  m_repliesReceived++;
-+  m_networkUp = true;
-+
-+  // Don't mark node as good (because it replied) or bad (because it returned an error).
-+  // If it consistently returns errors for valid queries it's probably broken.  But a
-+  // few error messages are acceptable. So we do nothing and pretend the query never happened.
-+
-+  cancel_transaction(itr);
-+}
-+
-+void
-+DhtServer::parse_node_info(node_info_list& l, const std::string& n) {
-+  if (sizeof(const compact_node_info) != 26)
-+    throw internal_error("DhtServer::parse_node_info(...) bad struct size.");
-+
-+  std::copy(reinterpret_cast(n.c_str()),
-+            reinterpret_cast(n.c_str() + n.size() - n.size() % sizeof(compact_node_info)),
-+            std::back_inserter(l));
-+}
-+
-+void
-+DhtServer::parse_find_node_reply(DhtTransactionSearch* transaction, const std::string& nodes) {
-+  DhtSearch* search = transaction->search();
-+
-+  transaction->complete(true);
-+
-+  node_info_list l;
-+  parse_node_info(l, nodes);
-+
-+  for (node_info_list::iterator itr = l.begin(); itr != l.end(); ++itr) {
-+    if (itr->id() != m_router->id()) {
-+      rak::socket_address sa = itr->address();
-+      search->add_contact(itr->id(), &sa);
-+    }
-+  }
-+
-+  find_node_next(transaction);
-+}
-+
-+void
-+DhtServer::parse_get_peers_reply(DhtTransactionGetPeers* transaction, const Object& response) {
-+  DhtAnnounce* announce = transaction->announce();
-+
-+  transaction->complete(true);
-+
-+  if (response.has_key_list("values"))
-+    announce->tracker()->receive_peers((*response.get_key_list("values").begin()).as_string());
-+
-+  if (response.has_key_string("token"))
-+    add_transaction(new DhtTransactionAnnounce(transaction->id(), transaction->address(), announce->target(), response.get_key_string("token")), packet_prio_low);
-+
-+  announce->tracker()->receive_status(announce->num_replied(), announce->num_contacted(), "Announcing");
-+
-+  if (!announce->complete())
-+    return;
-+
-+  DhtTracker* torrent = m_router->get_tracker(transaction->announce()->target(), false);
-+  if (torrent != NULL)
-+    announce->tracker()->receive_peers(torrent->get_peers());
-+
-+  announce->tracker()->receive_success();
-+}
-+
-+void
-+DhtServer::find_node_next(DhtTransactionSearch* transaction) {
-+  DhtSearch::const_accessor node;
-+  while ((node = transaction->search()->get_contact()) != transaction->search()->end()) {
-+    int prio = packet_prio_low;
-+    if (transaction->search()->is_announce())
-+      prio = packet_prio_high;
-+
-+    add_transaction(new DhtTransactionFindNode(node), prio);
-+  }
-+
-+  if (transaction->search()->is_announce())
-+    reinterpret_cast(transaction->search())->tracker()->receive_status(transaction->search()->num_replied(), transaction->search()->num_contacted(), "Searching");
-+
-+  if (!transaction->search()->complete())
-+    return;
-+
-+  if (!transaction->search()->is_announce())
-+    return;
-+
-+  // We have found the 8 closest nodes to the info hash. Retrieve peers
-+  // from them and announce to them.
-+  DhtAnnounce* announce = transaction->as_get_peers()->announce();
-+
-+  for (node = announce->start_announce(); node != announce->end(); ++node)
-+    add_transaction(new DhtTransactionGetPeers(node), packet_prio_high);
-+
-+  if (announce->complete())
-+    return announce->tracker()->receive_failed("DHT search unsuccessful.");
-+
-+  announce->tracker()->receive_status(announce->num_replied(), announce->num_contacted(), "Announcing");
-+}
-+
-+void
-+DhtServer::add_packet(DhtTransactionPacket* packet, int priority) {
-+  switch (priority) {
-+    // High priority packets are for important queries, and quite small.
-+    // They're added to front of high priority queue and thus will be the
-+    // next packets sent.
-+    case packet_prio_high:
-+      m_highQueue.push_front(packet);
-+      break;
-+
-+    // Low priority query packets are added to the back of the high priority
-+    // queue and will be sent when all high priority packets have been transmitted.
-+    case packet_prio_low:
-+      m_highQueue.push_back(packet);
-+      break;
-+
-+    // Reply packets will be processed after all of our own packets have been send.
-+    case packet_prio_reply:
-+      m_lowQueue.push_back(packet);
-+      break;
-+
-+    default:
-+      throw internal_error("DhtServer::add_packet called with invalid priority.");
-+  }
-+}
-+
-+void
-+DhtServer::create_query(transaction_itr itr, int tID, const rak::socket_address* sa, int priority) {
-+  if (itr->second->id() == m_router->id()) {
-+    delete itr->second;
-+    m_transactions.erase(itr);
-+    return;   // Don't send to ourself.
-+  }
-+
-+  Object query(Object::TYPE_MAP);
-+
-+  Object q(Object::TYPE_MAP);
-+  q.insert_key("id", m_router->str());
-+
-+  DhtTransaction* transaction = itr->second;
-+  switch (transaction->type()) {
-+    case DhtTransaction::DHT_PING:
-+      // nothing to do
-+      break;
-+
-+    case DhtTransaction::DHT_FIND_NODE:
-+      q.insert_key("target", transaction->as_find_node()->search()->target().str());
-+      break;
-+
-+    case DhtTransaction::DHT_GET_PEERS:
-+      q.insert_key("info_hash", transaction->as_get_peers()->announce()->target().str());
-+      break;
-+
-+    case DhtTransaction::DHT_ANNOUNCE_PEER:
-+      q.insert_key("info_hash", transaction->as_announce()->info_hash().str());
-+      q.insert_key("port", manager->connection_manager()->listen_port());
-+      q.insert_key("token", transaction->as_announce()->token());
-+      break;
-+  }
-+
-+  char trans_id = tID;
-+  query.insert_key("t", std::string(&trans_id, 1));
-+  query.insert_key("y", "q");
-+  query.insert_key("q", queries[transaction->type()]);
-+  query.insert_key("a", q);
-+  query.insert_key("v", PEER_VERSION);
-+
-+  DhtTransactionPacket* packet = new DhtTransactionPacket(transaction->address(), query, tID, transaction);
-+  transaction->set_packet(packet);
-+  add_packet(packet, priority);
-+
-+  m_queriesSent++;
-+}
-+
-+void
-+DhtServer::create_response(const Object& transactionId, const rak::socket_address* sa, Object& r) {
-+  Object reply(Object::TYPE_MAP);
-+  r.insert_key("id", m_router->str());
-+
-+  reply.insert_key("t", transactionId);
-+  reply.insert_key("y", "r");
-+  reply.insert_key("r", r);
-+  reply.insert_key("v", PEER_VERSION);
-+
-+  add_packet(new DhtTransactionPacket(sa, reply), packet_prio_reply);
-+}
-+
-+void
-+DhtServer::create_error(const Object& transactionId, const rak::socket_address* sa, int num, const std::string& msg) {
-+  Object error(Object::TYPE_MAP);
-+
-+  error.insert_key("t", transactionId);
-+  error.insert_key("y", "e");
-+  error.insert_key("v", PEER_VERSION);
-+
-+  Object& e = error.insert_key("e", Object(Object::TYPE_LIST));
-+  e.insert_back(num);
-+  e.insert_back(msg);
-+
-+  add_packet(new DhtTransactionPacket(sa, error), packet_prio_reply);
-+}
-+
-+int
-+DhtServer::add_transaction(DhtTransaction* transaction, int priority) {
-+  // Try random transaction ID. This is to make it less likely that we reuse
-+  // a transaction ID from an earlier transaction which timed out and we forgot
-+  // about it, so that if the node replies after the timeout it's less likely
-+  // that we match the reply to the wrong transaction.
-+  //
-+  // If there's an existing transaction with the random ID we search for the next
-+  // unused one. Since normally only one or two transactions will be active per
-+  // node, a collision is extremely unlikely, and a linear search for the first
-+  // open one is the most efficient.
-+  unsigned int rnd = (uint8_t)random();
-+  unsigned int id = rnd;
-+
-+  transaction_itr insertItr = m_transactions.lower_bound(transaction->key(rnd));
-+
-+  // If key matches, keep trying successive IDs.
-+  while (insertItr != m_transactions.end() && insertItr->first == transaction->key(id)) {
-+    ++insertItr;
-+    id = (uint8_t)(id + 1);
-+
-+    // Give up after trying all possible IDs. This should never happen.
-+    if (id == rnd) {
-+      delete transaction;
-+      return -1;
-+    }
-+
-+    // Transaction ID wrapped around, reset iterator.
-+    if (id == 0)
-+      insertItr = m_transactions.lower_bound(transaction->key(id));
-+  }
-+
-+  // We know where to insert it, so pass that as hint.
-+  insertItr = m_transactions.insert(insertItr, std::make_pair(transaction->key(id), transaction));
-+
-+  create_query(insertItr, id, transaction->address(), priority);
-+
-+  start_write();
-+
-+  return id;
-+}
-+
-+// Transaction received no reply and timed out. Mark node as bad and remove
-+// transaction (except if it was only the quick timeout).
-+DhtServer::transaction_itr
-+DhtServer::failed_transaction(transaction_itr itr, bool quick) {
-+  DhtTransaction* transaction = itr->second;
-+
-+  // If it was a known node, remember that it didn't reply, unless the transaction
-+  // is only stalled (had quick timeout, but not full timeout).  Also if the
-+  // transaction still has an associated packet, the packet never got sent due to
-+  // throttling, so don't blame the remote node for not replying.
-+  // Finally, if we haven't received anything whatsoever so far, assume the entire
-+  // network is down and so we can't blame the node either.
-+  if (!quick && m_networkUp && transaction->packet() == NULL && transaction->id() != *m_router)
-+    m_router->node_inactive(transaction->id(), transaction->address());
-+
-+  switch (transaction->type()) {
-+    case DhtTransaction::DHT_FIND_NODE:
-+      if (quick)
-+        transaction->as_find_node()->set_stalled();
-+      else
-+        transaction->as_find_node()->complete(false);
-+
-+      find_node_next(transaction->as_find_node());
-+      break;
-+
-+    case DhtTransaction::DHT_GET_PEERS:
-+      DhtAnnounce* announce;
-+      announce = transaction->as_get_peers()->announce();
-+      transaction->as_get_peers()->complete(false);
-+      if (announce->complete())
-+        announce->tracker()->receive_success();
-+      break;
-+
-+    // Nothing to for DHT_PING and DHT_ANNOUNCE_PEER
-+    default:
-+      break;
-+  }
-+
-+  if (quick) {
-+    return ++itr;         // don't actually delete the transaction until the final timeout
-+
-+  } else {
-+    delete itr->second;
-+    m_transactions.erase(itr++);
-+    return itr;
-+  }
-+}
-+
-+// Cancel transaction before the timeout (i.e. we aren't sure if the node is bad yet).
-+DhtServer::transaction_itr
-+DhtServer::cancel_transaction(transaction_itr itr) {
-+  DhtTransaction* transaction = itr->second;
-+
-+  // If this was the last transaction of an announce search, notify tracker.
-+  if (transaction->is_search() && transaction->as_search()->search()->is_announce()) {
-+    transaction->as_search()->complete(false);
-+
-+    DhtAnnounce* announce = reinterpret_cast(transaction->as_search()->search());
-+    if (announce->complete()) {
-+      // If we got no peers, it's a failure if the announces all failed as well.
-+      // We don't want no peers to be a failure in general since it may just be
-+      // a dead torrent.
-+      if (announce->num_replied() == 0 && !announce->tracker()->has_peers())
-+        announce->tracker()->receive_failed("Announce failed");
-+      else
-+        announce->tracker()->receive_success();
-+    }
-+  }
-+
-+  delete itr->second;
-+  m_transactions.erase(itr++);
-+  return itr;
-+}
-+
-+void
-+DhtServer::clear_transactions() {
-+  std::for_each(m_transactions.begin(), m_transactions.end(),
-+                rak::on(rak::mem_ref(&transaction_map::value_type::second),
-+                        rak::call_delete()));
-+  m_transactions.clear();
-+}
-+
-+void
-+DhtServer::event_read() {
-+  uint32_t total = 0;
-+  std::istringstream sstream;
-+
-+  sstream.imbue(std::locale::classic());
-+
-+  while (true) {
-+    rak::socket_address sa;
-+    int type = '?';
-+    const Object* transactionId = NULL;
-+    const HashString* nodeId = NULL;
-+
-+    try {
-+      char buffer[2048];
-+      int32_t read = read_datagram(buffer, sizeof(buffer), &sa);
-+
-+      if (read < 0)
-+        break;
-+
-+      total += read;
-+      sstream.str(std::string(buffer, read));
-+
-+      Object request;
-+      sstream >> request;
-+
-+      // Could throw dht_error with more descriptive error messages but
-+      // we can't return an error unless the packet is valid and we have the
-+      // transaction ID anyway. Searching the routing table for the source
-+      // address to find the node is too expensive, so just ignore the packet.
-+      if (sstream.fail() || !request.is_map() || !request.has_key("t") || !request.has_key_string("y"))
-+        continue;
-+
-+      // Read the items required for proper error handling first.
-+      transactionId = &request.get_key("t");
-+      if (request.get_key_string("y").length() == 1)
-+        type = request.get_key_string("y")[0];
-+
-+      // Queries and replies have node ID in different dictionaries.
-+      if (type == 'r' || type == 'q') {
-+        const std::string& nodeIdStr = request.get_key(type == 'q' ? "a" : "r").get_key_string("id");
-+
-+        if (nodeIdStr.length() < HashString::size_data)
-+          throw dht_error(dht_error_protocol, "id value too short");
-+
-+        nodeId = HashString::cast_from(nodeIdStr);
-+      }
-+
-+      // Sanity check the returned transaction ID.
-+      if ((type == 'r' || type == 'e') &&
-+          (!transactionId->is_string() || transactionId->as_string().length() != 1))
-+        throw dht_error(dht_error_protocol, "Invalid transaction ID type/length.");
-+
-+      switch (type) {
-+        case 'q':
-+          process_query(*transactionId, *nodeId, &sa, request);
-+          break;
-+
-+        case 'r':
-+          process_response(((unsigned char*)transactionId->as_string().c_str())[0], *nodeId, &sa, request);
-+          break;
-+
-+        case 'e':
-+          process_error(((unsigned char*)transactionId->as_string().c_str())[0], &sa, request);
-+          break;
-+
-+        default:
-+          throw dht_error(dht_error_bad_method, "Unknown message type.");
-+      }
-+
-+    } catch (bencode_error& e) {
-+      if (type == 'q' && transactionId != NULL)
-+        create_error(*transactionId, &sa, dht_error_protocol, std::string("Malformed packet: ") + e.what());
-+      else if ((type == 'r' || type == 'e') && nodeId != NULL)
-+        m_router->node_inactive(*nodeId, &sa);
-+
-+    } catch (dht_error& e) {
-+      // If node was querying us, reply with error packet, otherwise mark the node as "query failed",
-+      // so that if it repeatedly sends malformed replies we will drop it instead of propagating it
-+      // to other nodes.
-+      if (type == 'q' && transactionId != NULL)
-+        create_error(*transactionId, &sa, e.code(), e.what());
-+      else if ((type == 'r' || type == 'e') && nodeId != NULL)
-+        m_router->node_inactive(*nodeId, &sa);
-+
-+    } catch (network_error& e) {
-+
-+    }
-+  }
-+
-+  manager->download_throttle()->throttle_list()->node_used_unthrottled(total);
-+  start_write();
-+}
-+
-+bool
-+DhtServer::process_queue(packet_queue& queue, uint32_t* quota) {
-+  uint32_t used = 0;
-+
-+  while (!queue.empty()) {
-+    DhtTransactionPacket* packet = queue.front();
-+
-+    // Make sure its transaction hasn't timed out yet, if it has/had one
-+    // and don't bother sending non-transaction packets after more than
-+    // 15 seconds in the queue.
-+    if (packet->has_failed() || packet->age() > 15) {
-+      delete packet;
-+      queue.pop_front();
-+      continue;
-+    }
-+
-+    if (packet->length() > *quota) {
-+      manager->upload_throttle()->throttle_list()->node_used(&m_uploadThrottle, used);
-+      return false;
-+    }
-+
-+    queue.pop_front();
-+
-+    try {
-+      int written = write_datagram(packet->c_str(), packet->length(), packet->address());
-+
-+      if (written == -1)
-+        throw network_error();
-+
-+      used += written;
-+      *quota -= written;
-+
-+      if ((unsigned int)written != packet->length())
-+        throw network_error();
-+
-+    } catch (network_error& e) {
-+      // Couldn't write packet, maybe something wrong with node address or routing, so mark node as bad.
-+      if (packet->has_transaction()) {
-+        transaction_itr itr = m_transactions.find(packet->transaction()->key(packet->id()));
-+        if (itr == m_transactions.end())
-+          throw internal_error("DhtServer::process_queue could not find transaction.");
-+
-+        failed_transaction(itr, false);
-+      }
-+    }
-+
-+    if (packet->has_transaction())
-+      packet->transaction()->set_packet(NULL);
-+
-+    delete packet;
-+  }
-+
-+  manager->upload_throttle()->throttle_list()->node_used(&m_uploadThrottle, used);
-+  return true;
-+}
-+
-+void
-+DhtServer::event_write() {
-+  if (m_highQueue.empty() && m_lowQueue.empty())
-+    throw internal_error("DhtServer::event_write called but both write queues are empty.");
-+
-+  if (!manager->upload_throttle()->throttle_list()->is_throttled(&m_uploadThrottle))
-+    throw internal_error("DhtServer::event_write called while not in throttle list.");
-+
-+  uint32_t quota = manager->upload_throttle()->throttle_list()->node_quota(&m_uploadThrottle);
-+
-+  if (quota == 0 || !process_queue(m_highQueue, "a) || !process_queue(m_lowQueue, "a)) {
-+    manager->poll()->remove_write(this);
-+    manager->upload_throttle()->throttle_list()->node_deactivate(&m_uploadThrottle);
-+
-+  } else if (m_highQueue.empty() && m_lowQueue.empty()) {
-+    manager->poll()->remove_write(this);
-+    manager->upload_throttle()->throttle_list()->erase(&m_uploadThrottle);
-+  }
-+}
-+
-+void
-+DhtServer::event_error() {
-+}
-+
-+void
-+DhtServer::start_write() {
-+  if ((!m_highQueue.empty() || !m_lowQueue.empty()) && !manager->upload_throttle()->throttle_list()->is_throttled(&m_uploadThrottle)) {
-+    manager->upload_throttle()->throttle_list()->insert(&m_uploadThrottle);
-+    manager->poll()->insert_write(this);
-+  }
-+
-+  if (!m_taskTimeout.is_queued() && !m_transactions.empty())
-+    priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(5)).round_seconds());
-+}
-+
-+void
-+DhtServer::receive_timeout() {
-+  transaction_itr itr = m_transactions.begin();
-+  while (itr != m_transactions.end()) {
-+    if (itr->second->has_quick_timeout() && itr->second->quick_timeout() < cachedTime.seconds()) {
-+      itr = failed_transaction(itr, true);
-+
-+    } else if (itr->second->timeout() < cachedTime.seconds()) {
-+      itr = failed_transaction(itr, false);
-+
-+    } else {
-+      ++itr;
-+    }
-+  }
-+
-+  start_write();
-+}
-+
-+}
-Index: libtorrent/src/dht/Makefile.am
-===================================================================
---- libtorrent/src/dht/Makefile.am	(revision 0)
-+++ libtorrent/src/dht/Makefile.am	(revision 0)
-@@ -0,0 +1,19 @@
-+noinst_LTLIBRARIES = libsub_dht.la
-+
-+libsub_dht_la_SOURCES = \
-+	dht_bucket.cc \
-+	dht_bucket.h \
-+	dht_hash_map.h \
-+	dht_node.cc \
-+	dht_node.h \
-+	dht_router.cc \
-+	dht_router.h \
-+	dht_server.cc \
-+	dht_server.h \
-+	dht_size_list.h \
-+	dht_tracker.cc \
-+	dht_tracker.h \
-+	dht_transaction.cc \
-+	dht_transaction.h
-+
-+INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
-Index: libtorrent/src/dht/dht_transaction.h
-===================================================================
---- libtorrent/src/dht/dht_transaction.h	(revision 0)
-+++ libtorrent/src/dht/dht_transaction.h	(revision 0)
-@@ -0,0 +1,363 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#ifndef LIBTORRENT_DHT_TRANSACTION_H
-+#define LIBTORRENT_DHT_TRANSACTION_H
-+
-+#include 
-+
-+#include 
-+
-+#include "dht/dht_node.h"
-+#include "torrent/hash_string.h"
-+
-+namespace torrent {
-+
-+class DhtBucket;
-+class TrackerDht;
-+
-+class DhtSearch;
-+class DhtTransactionSearch;
-+
-+class DhtTransaction;
-+class DhtTransactionPing;
-+class DhtTransactionFindNode;
-+class DhtTransactionGetPeers;
-+class DhtTransactionAnnounce;
-+
-+// DhtSearch implements the DHT search algorithm and holds search data
-+// that needs to be persistent across multiple find_node transactions.
-+//
-+// DhtAnnounce is a derived class used for searches that will eventually
-+// lead to an announce to the closest nodes.
-+
-+
-+// Compare predicate for ID closeness.
-+struct dht_compare_closer : public std::binary_function {
-+  dht_compare_closer(const HashString& target) : m_target(target) { }
-+
-+  bool operator () (const DhtNode* one, const DhtNode* two) const;
-+
-+  const HashString&               target() const   { return m_target; }
-+
-+  HashString m_target;
-+};
-+
-+// DhtSearch contains a list of nodes sorted by closeness to the given target,
-+// and returns what nodes to contact with up to three concurrent transactions pending.
-+// The map element is the DhtSearch object itself to allow the returned accessors
-+// to know which search a given node belongs to.
-+class DhtSearch : protected std::map {
-+  friend class DhtTransactionSearch;
-+
-+public:
-+  typedef std::map base_type;
-+
-+  // Number of closest potential contact nodes to keep.
-+  static const unsigned int max_contacts = 18;
-+
-+  DhtSearch(const HashString& target, const DhtBucket& contacts);
-+  virtual ~DhtSearch();
-+
-+  // Wrapper for iterators, allowing more convenient access to the key
-+  // and element values, which also makes it easier to change the container
-+  // without having to modify much code using iterators.
-+  template 
-+  struct accessor_wrapper : public T {
-+    accessor_wrapper() { }
-+    accessor_wrapper(const T& itr) : T(itr) { }
-+
-+    DhtNode*                        node() const     { return (**this).first; }
-+    DhtSearch*                      search() const   { return (**this).second; }
-+  };
-+
-+  typedef accessor_wrapper  const_accessor;
-+  typedef accessor_wrapper        accessor;
-+
-+  // Add a potential node to contact for the search.
-+  bool                 add_contact(const HashString& id, const rak::socket_address* sa);
-+  void                 add_contacts(const DhtBucket& contacts);
-+
-+  // Return next node to contact. Up to concurrent_searches nodes are returned,
-+  // and end() after that. Don't advance the accessor to get further contacts!
-+  const_accessor       get_contact();
-+
-+  // Search statistics.
-+  int                  num_contacted()                   { return m_contacted; }
-+  int                  num_replied()                     { return m_replied; }
-+
-+  bool                 start()                           { m_started = true; return m_pending; }
-+  bool                 complete() const                  { return m_started && !m_pending; }
-+
-+  const HashString&    target() const                    { return key_comp().target(); }
-+
-+  virtual bool         is_announce() const               { return false; }
-+
-+  // Expose the otherwise private end() function but return an accessor,
-+  // to allow code checking whether get_contact returned a valid accessor.
-+  const_accessor       end() const                       { return base_type::end(); }
-+
-+  // Used by the sorting/comparison predicate to see which node is closer.
-+  static bool          is_closer(const HashString& one, const HashString& two, const HashString& target);
-+
-+protected:
-+  void                 trim(bool final);
-+  void                 node_status(const_accessor& n, bool success);
-+  void                 set_node_active(const_accessor& n, bool active);
-+
-+  // Statistics about contacted nodes.
-+  unsigned int         m_pending;
-+  unsigned int         m_contacted;
-+  unsigned int         m_replied;
-+  unsigned int         m_concurrency;
-+
-+  bool                 m_restart;  // If true, trim nodes and reset m_next on the following get_contact call.
-+  bool                 m_started;
-+
-+  // Next node to return in get_contact, is end() if we have no more contactable nodes.
-+  const_accessor       m_next;
-+
-+private:
-+  DhtSearch(const DhtSearch& s);
-+
-+  bool                 node_uncontacted(const DhtNode* node) const;
-+};
-+
-+class DhtAnnounce : public DhtSearch {
-+public:
-+  DhtAnnounce(const HashString& infoHash, TrackerDht* tracker, const DhtBucket& contacts)
-+    : DhtSearch(infoHash, contacts),
-+      m_tracker(tracker) { }
-+
-+  TrackerDht*          tracker() const                   { return m_tracker; }
-+
-+  // Start announce and return final set of nodes in get_contact() calls.
-+  // This resets DhtSearch's completed() function, which now
-+  // counts announces instead.
-+  const_accessor       start_announce();
-+
-+  virtual bool         is_announce() const               { return true; }
-+
-+private:
-+  TrackerDht*          m_tracker;
-+};
-+
-+// Class holding transaction data to be transmitted.
-+class DhtTransactionPacket {
-+public:
-+  // transaction packet
-+  DhtTransactionPacket(const rak::socket_address* s, const Object& d, unsigned int id, DhtTransaction* t)
-+    : m_sa(*s), m_id(id), m_transaction(t) { build_buffer(d); };
-+
-+  // non-transaction packet
-+  DhtTransactionPacket(const rak::socket_address* s, const Object& d)
-+    : m_sa(*s), m_id(-cachedTime.seconds()), m_transaction(NULL) { build_buffer(d); };
-+
-+  ~DhtTransactionPacket()                               { delete[] m_data; }
-+
-+  bool                        has_transaction() const   { return m_id >= -1; }
-+  bool                        has_failed() const        { return m_id == -1; }
-+  void                        set_failed()              { m_id = -1; }
-+
-+  const rak::socket_address*  address() const           { return &m_sa; }
-+  rak::socket_address*        address()                 { return &m_sa; }
-+
-+  const char*                 c_str() const             { return m_data; }
-+  size_t                      length() const            { return m_length; }
-+
-+  int                         id() const                { return m_id; }
-+  int                         age() const               { return has_transaction() ? 0 : cachedTime.seconds() + m_id; }
-+  const DhtTransaction*       transaction() const       { return m_transaction; }
-+  DhtTransaction*             transaction()             { return m_transaction; }
-+
-+private:
-+  void                        build_buffer(const Object& data);
-+
-+  rak::socket_address   m_sa;
-+  char*                 m_data;
-+  size_t                m_length;
-+  int                   m_id;
-+  DhtTransaction*       m_transaction;
-+};
-+
-+// DHT Transaction classes. DhtTransaction and DhtTransactionSearch
-+// are not directly usable with no public constructor, since type()
-+// is a pure virtual function.
-+class DhtTransaction {
-+public:
-+  virtual ~DhtTransaction();
-+
-+  typedef enum {
-+    DHT_PING,
-+    DHT_FIND_NODE,
-+    DHT_GET_PEERS,
-+    DHT_ANNOUNCE_PEER,
-+  } transaction_type;
-+
-+  virtual transaction_type    type() = 0;
-+  virtual bool                is_search()          { return false; }
-+
-+  // Key to uniquely identify a transaction with given per-node transaction id.
-+  uint64_t                    key(int id) const    { return key(&m_sa, id); }
-+  static uint64_t             key(const rak::socket_address* sa, int id) { return ((uint64_t)sa->sa_inet()->address_n() << 32) + id; }
-+
-+  // Node ID and address.
-+  const HashString&           id()                 { return m_id; }
-+  const rak::socket_address*  address()            { return &m_sa; }
-+
-+  int                         timeout()            { return m_timeout; }
-+  int                         quick_timeout()      { return m_quickTimeout; }
-+  bool                        has_quick_timeout()  { return m_hasQuickTimeout; }
-+
-+  int                         dec_retry()          { return m_retry--; }
-+  int                         retry()              { return m_retry; }
-+
-+  DhtTransactionPacket*       packet()             { return m_packet; }
-+  void                        set_packet(DhtTransactionPacket* p) { m_packet = p; }
-+
-+  // These could (should?) check that the type matches. Or use dynamic cast.
-+  DhtTransactionSearch*       as_search()          { return reinterpret_cast(this); }
-+  DhtTransactionPing*         as_ping()            { return reinterpret_cast(this); }
-+  DhtTransactionFindNode*     as_find_node()       { return reinterpret_cast(this); }
-+  DhtTransactionGetPeers*     as_get_peers()       { return reinterpret_cast(this); }
-+  DhtTransactionAnnounce*     as_announce()        { return reinterpret_cast(this); }
-+
-+protected:
-+  DhtTransaction(int quick_timeout, int timeout, const HashString& id, const rak::socket_address* sa);
-+
-+  bool                 m_hasQuickTimeout;
-+
-+private:
-+  DhtTransaction(const DhtTransaction& t);
-+
-+  HashString             m_id;
-+  rak::socket_address    m_sa;
-+  int                    m_timeout;
-+  int                    m_quickTimeout;
-+  int                    m_retry;
-+  DhtTransactionPacket*  m_packet;
-+};
-+
-+class DhtTransactionSearch : public DhtTransaction {
-+public:
-+  virtual ~DhtTransactionSearch();
-+
-+  virtual bool               is_search()                  { return true; }
-+
-+  DhtSearch::const_accessor  node()                       { return m_node; }
-+  DhtSearch*                 search()                     { return m_search; }
-+
-+  void                       set_stalled();
-+
-+  void                       complete(bool success);
-+
-+protected:
-+  DhtTransactionSearch(int quick_timeout, int timeout, DhtSearch::const_accessor& node)
-+    : DhtTransaction(quick_timeout, timeout, node.node()->id(), node.node()->address()),
-+      m_node(node),
-+      m_search(node.search()) { if (!m_hasQuickTimeout) m_search->m_concurrency++; }
-+
-+private:
-+  DhtSearch::const_accessor  m_node;
-+  DhtSearch*                 m_search;
-+};
-+
-+// Actual transaction classes.
-+class DhtTransactionPing : public DhtTransaction {
-+public:
-+  DhtTransactionPing(const HashString& id, const rak::socket_address* sa)
-+    : DhtTransaction(-1, 30, id, sa) { }
-+
-+  virtual transaction_type    type()                     { return DHT_PING; }
-+};
-+
-+class DhtTransactionFindNode : public DhtTransactionSearch {
-+public:
-+  DhtTransactionFindNode(DhtSearch::const_accessor& node)
-+    : DhtTransactionSearch(4, 30, node) { }
-+
-+  virtual transaction_type    type()                     { return DHT_FIND_NODE; }
-+};
-+
-+class DhtTransactionGetPeers : public DhtTransactionSearch {
-+public:
-+  DhtTransactionGetPeers(DhtSearch::const_accessor& node)
-+    : DhtTransactionSearch(-1, 30, node) { }
-+
-+  virtual transaction_type    type()                     { return DHT_GET_PEERS; }
-+
-+  DhtAnnounce*                announce()                 { return reinterpret_cast(search()); }
-+};
-+
-+class DhtTransactionAnnounce : public DhtTransaction {
-+public:
-+  DhtTransactionAnnounce(const HashString& id, const rak::socket_address* sa, const HashString& infoHash, const std::string& token)
-+    : DhtTransaction(-1, 30, id, sa),
-+      m_infoHash(infoHash),
-+      m_token(token) { }
-+
-+  virtual transaction_type    type()                     { return DHT_ANNOUNCE_PEER; }
-+
-+  const HashString&           info_hash()                { return m_infoHash; }
-+  const std::string&          token()                    { return m_token; }
-+
-+private:
-+  HashString           m_infoHash;
-+  std::string          m_token;
-+};
-+
-+inline bool
-+DhtSearch::is_closer(const HashString& one, const HashString& two, const HashString& target) {
-+  for (unsigned int i=0; im_lastSeen = active;
-+}
-+
-+inline bool
-+dht_compare_closer::operator () (const DhtNode* one, const DhtNode* two) const {
-+  return DhtSearch::is_closer(*one, *two, m_target);
-+}
-+
-+}
-+
-+#endif
-Index: libtorrent/src/dht/dht_node.h
-===================================================================
---- libtorrent/src/dht/dht_node.h	(revision 0)
-+++ libtorrent/src/dht/dht_node.h	(revision 0)
-@@ -0,0 +1,136 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#ifndef LIBTORRENT_DHT_NODE_H
-+#define LIBTORRENT_DHT_NODE_H
-+
-+#include "globals.h"
-+
-+#include 
-+
-+#include "torrent/hash_string.h"
-+
-+#include "dht_bucket.h"
-+
-+namespace torrent {
-+
-+class DhtBucket;
-+
-+class DhtNode : public HashString {
-+  friend class DhtSearch;
-+
-+public:
-+  // A node is considered bad if it failed to reply to this many queries.
-+  static const unsigned int max_failed_replies = 5;
-+
-+  DhtNode(const HashString& id, const rak::socket_address* sa);
-+  DhtNode(const std::string& id, const Object& cache);
-+
-+  const HashString&           id() const                 { return *this; }
-+  const rak::socket_address*  address() const            { return &m_socketAddress; }
-+  void                        set_address(const rak::socket_address* sa) { m_socketAddress = *sa; }
-+
-+  // For determining node quality.
-+  unsigned int                last_seen() const          { return m_lastSeen; }
-+  unsigned int                age() const                { return cachedTime.seconds() - m_lastSeen; }
-+  bool                        is_good() const            { return m_recentlyActive; }
-+  bool                        is_questionable() const    { return !m_recentlyActive; }
-+  bool                        is_bad() const             { return m_recentlyInactive >= max_failed_replies; };
-+  bool                        is_active() const          { return m_lastSeen; }
-+
-+  // Update is called once every 15 minutes.
-+  void                        update()                   { m_recentlyActive = age() < 15 * 60; }
-+
-+  // Called when node replies to us, queries us, or fails to reply.
-+  void                        replied()                  { set_good(); }
-+  void                        queried()                  { if (m_lastSeen) set_good(); }
-+  void                        inactive();
-+
-+  DhtBucket*                  bucket() const             { return m_bucket; }
-+  DhtBucket*                  set_bucket(DhtBucket* b)   { m_bucket = b; return b; }
-+
-+  bool                        is_in_range(const DhtBucket* b) { return b->is_in_range(*this); }
-+
-+  // Store compact node information (26 bytes address, port and ID) in the given
-+  // buffer and return pointer to end of stored information.
-+  char*                       store_compact(char* buffer) const;
-+
-+  // Store node cache in the given container object and return it.
-+  Object*                     store_cache(Object* container) const;
-+
-+private:
-+  DhtNode();
-+
-+  void                        set_good();
-+  void                        set_bad();
-+
-+  rak::socket_address m_socketAddress;
-+  unsigned int        m_lastSeen;
-+  bool                m_recentlyActive;
-+  unsigned int        m_recentlyInactive;
-+  DhtBucket*          m_bucket;
-+};
-+
-+inline void
-+DhtNode::set_good() {
-+  if (m_bucket != NULL && !is_good())
-+    m_bucket->node_now_good(is_bad());
-+
-+  m_lastSeen = cachedTime.seconds();
-+  m_recentlyInactive = 0;
-+  m_recentlyActive = true;
-+}
-+
-+inline void
-+DhtNode::set_bad() {
-+  if (m_bucket != NULL && !is_bad())
-+    m_bucket->node_now_bad(is_good());
-+
-+  m_recentlyInactive = max_failed_replies;
-+  m_recentlyActive = false;
-+}
-+
-+inline void
-+DhtNode::inactive() {
-+  if (m_recentlyInactive + 1 == max_failed_replies)
-+    set_bad();
-+  else
-+    m_recentlyInactive++;
-+}
-+
-+}
-+
-+#endif
-Index: libtorrent/src/dht/dht_server.h
-===================================================================
---- libtorrent/src/dht/dht_server.h	(revision 0)
-+++ libtorrent/src/dht/dht_server.h	(revision 0)
-@@ -0,0 +1,186 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#ifndef LIBTORRENT_DHT_SERVER_H
-+#define LIBTORRENT_DHT_SERVER_H
-+
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+#include "net/socket_datagram.h"
-+#include "net/throttle_node.h"
-+#include "download/download_info.h"  // for SocketAddressCompact
-+#include "torrent/hash_string.h"
-+
-+namespace torrent {
-+
-+class DhtBucket;
-+class DhtNode;
-+class DhtRouter;
-+
-+class DownloadInfo;
-+class TrackerDht;
-+
-+class DhtTransaction;
-+class DhtTransactionPacket;
-+class DhtTransactionSearch;
-+class DhtTransactionGetPeers;
-+
-+// UDP server that handles the DHT node communications.
-+
-+class DhtServer : public SocketDatagram {
-+public:
-+  DhtServer(DhtRouter* self);
-+  ~DhtServer();
-+
-+  void                start(int port);
-+  void                stop();
-+  bool                is_active() const                  { return get_fd().is_valid(); }
-+
-+  unsigned int        queries_received() const           { return m_queriesReceived; }
-+  unsigned int        queries_sent() const               { return m_queriesSent; }
-+  unsigned int        replies_received() const           { return m_repliesReceived; }
-+  void                reset_statistics();
-+
-+  // Contact a node to see if it replies. Set id=0 if unknown.
-+  void                ping(const HashString& id, const rak::socket_address* sa);
-+
-+  // Do a find_node search with the given contacts as starting point for the
-+  // search.
-+  void                find_node(const DhtBucket& contacts, const HashString& target);
-+
-+  // Do DHT announce, starting with the given contacts.
-+  void                announce(const DhtBucket& contacts, const HashString& infoHash, TrackerDht* tracker);
-+
-+  // Cancel given announce for given tracker, or all matching announces if info/tracker NULL.
-+  void                cancel_announce(DownloadInfo* info, const TrackerDht* tracker);
-+
-+  // Called every 15 minutes.
-+  void                update();
-+
-+  ThrottleNode*       upload_throttle()                          { return &m_uploadThrottle; }
-+  const ThrottleNode* upload_throttle() const                    { return &m_uploadThrottle; }
-+  ThrottleNode*       download_throttle()                        { return &m_downloadThrottle; }
-+  const ThrottleNode* download_throttle() const                  { return &m_downloadThrottle; }
-+
-+  virtual void        event_read();
-+  virtual void        event_write();
-+  virtual void        event_error();
-+
-+private:
-+  // DHT error codes.
-+  static const int dht_error_generic    = 201;
-+  static const int dht_error_server     = 202;
-+  static const int dht_error_protocol   = 203;
-+  static const int dht_error_bad_method = 204;
-+
-+  typedef std::deque packet_queue;
-+
-+  struct compact_node_info {
-+    char                 _id[20];
-+    SocketAddressCompact _addr;
-+
-+    HashString&          id()          { return *HashString::cast_from(_id); }
-+    rak::socket_address  address()     { return rak::socket_address(_addr); }
-+  } __attribute__ ((packed));
-+  typedef std::list node_info_list;
-+
-+  // Pending transactions (using DhtTransaction::key as key).
-+  typedef std::map transaction_map;
-+  typedef transaction_map::iterator transaction_itr;
-+
-+  // DHT transaction names for given transaction type.
-+  static const char* queries[];
-+
-+  // Priorities for the outgoing packets.
-+  static const int packet_prio_high  = 2;  // For important queries we send (announces).
-+  static const int packet_prio_low   = 1;  // For (relatively) unimportant queries we send.
-+  static const int packet_prio_reply = 0;  // For replies to peer queries.
-+
-+  void                start_write();
-+
-+  void                process_query(const Object& transaction, const HashString& id, const rak::socket_address* sa, Object& req);
-+  void                process_response(int transaction, const HashString& id, const rak::socket_address* sa, Object& req);
-+  void                process_error(int transaction, const rak::socket_address* sa, Object& req);
-+
-+  void                parse_node_info(node_info_list& l, const std::string& n);
-+  void                parse_find_node_reply(DhtTransactionSearch* t, const std::string& nodes);
-+  void                parse_get_peers_reply(DhtTransactionGetPeers* t, const Object& res);
-+
-+  void                find_node_next(DhtTransactionSearch* t);
-+
-+  void                add_packet(DhtTransactionPacket* packet, int priority);
-+  void                create_query(transaction_itr itr, int tID, const rak::socket_address* sa, int priority);
-+  void                create_response(const Object& transaction, const rak::socket_address* sa, Object& r);
-+  void                create_error(const Object& transaction, const rak::socket_address* sa, int num, const std::string& msg);
-+
-+  void                create_find_node_response(const Object& arg, Object& reply);
-+  void                create_get_peers_response(const Object& arg, const rak::socket_address* sa, Object& reply);
-+  void                create_announce_peer_response(const Object& arg, const rak::socket_address* sa, Object& reply);
-+
-+  int                 add_transaction(DhtTransaction* t, int priority);
-+
-+  // These methods return the iterator after the given one or end()
-+  transaction_itr     failed_transaction(transaction_itr itr, bool quick);
-+  transaction_itr     cancel_transaction(transaction_itr itr);
-+
-+  void                clear_transactions();
-+
-+  bool                process_queue(packet_queue& queue, uint32_t* quota);
-+  void                receive_timeout();
-+
-+  DhtRouter*          m_router;
-+  packet_queue        m_highQueue;
-+  packet_queue        m_lowQueue;
-+  transaction_map     m_transactions;
-+
-+  rak::priority_item  m_taskTimeout;
-+
-+  ThrottleNode        m_uploadThrottle;
-+  ThrottleNode        m_downloadThrottle;
-+
-+  unsigned int        m_queriesReceived;
-+  unsigned int        m_queriesSent;
-+  unsigned int        m_repliesReceived;
-+
-+  bool                m_networkUp;
-+};
-+
-+}
-+
-+#endif
-Index: libtorrent/src/dht/dht_tracker.cc
-===================================================================
---- libtorrent/src/dht/dht_tracker.cc	(revision 0)
-+++ libtorrent/src/dht/dht_tracker.cc	(revision 0)
-@@ -0,0 +1,129 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#include "config.h"
-+
-+#include "torrent/object.h"
-+
-+#include "dht_tracker.h"
-+
-+namespace torrent {
-+
-+void
-+DhtTracker::add_peer(const rak::socket_address* sa) {
-+  // Should check that sa is an INET address.
-+  SocketAddressCompact compact(sa->sa_inet()->address_n(), sa->sa_inet()->port_n());
-+
-+  unsigned int oldest = 0;
-+  uint32_t minSeen = ~uint32_t();
-+
-+  // Check if peer exists. If not, find oldest peer.
-+  for (unsigned int i = 0; i < size(); i++) {
-+    if ((*this)[i].addr == compact.addr) {
-+      (*this)[i].port = compact.port;
-+      m_lastSeen[i] = cachedTime.seconds();
-+      return;
-+
-+    } else if (m_lastSeen[i] < minSeen) {
-+      minSeen = m_lastSeen[i];
-+      oldest = i;
-+    }
-+  }
-+
-+  // If peer doesn't exist, append to list if the table is not full.
-+  if (size() < max_size) {
-+    push_back(compact);
-+    m_lastSeen.push_back(cachedTime.seconds());
-+
-+  // Peer doesn't exist and table is full: replace oldest peer.
-+  } else {
-+    (*this)[oldest] = compact;
-+    m_lastSeen[oldest] = cachedTime.seconds();
-+  }
-+}
-+
-+// Return compact info (6 bytes) for up to 30 peers, returning different
-+// peers for each call if there are more.
-+std::string
-+DhtTracker::get_peers(unsigned int maxPeers) {
-+  iterator first;
-+  iterator last;
-+
-+  // If we have more than max_peers, randomly return block of peers.
-+  // The peers in overlapping blocks get picked twice as often, but
-+  // that's better than returning fewer peers.
-+  if (size() > maxPeers) {
-+    unsigned int blocks = (size() + maxPeers - 1) / maxPeers;
-+
-+    first = begin() + (random() % blocks) * (size() - maxPeers) / (blocks - 1);
-+    last = first + maxPeers;
-+
-+  } else {
-+    first = begin();
-+    last = end();
-+  }
-+
-+  return std::string(first->c_str(), last->c_str());
-+}
-+
-+// Remove old announces.
-+void
-+DhtTracker::prune(uint32_t maxAge) {
-+  uint32_t minSeen = cachedTime.seconds() - maxAge;
-+  unsigned int i;
-+
-+  for (i = 0; i < size(); i++)
-+    if (m_lastSeen[i] <= minSeen)
-+      break;
-+
-+  if (i == size())
-+    return;  // No old peers found.
-+
-+  unsigned int index = i;
-+
-+  for (i++; i < size(); i++) {
-+    if (m_lastSeen[i] > minSeen) {
-+      m_lastSeen[index] = m_lastSeen[i];
-+      (*this)[index] = (*this)[i];
-+      index++;
-+    }
-+  }
-+
-+  resize(index);
-+  m_lastSeen.resize(index);
-+}
-+
-+}
-Index: libtorrent/src/net/throttle_node.h
-===================================================================
---- libtorrent/src/net/throttle_node.h	(revision 975)
-+++ libtorrent/src/net/throttle_node.h	(working copy)
-@@ -45,13 +45,13 @@
-
- namespace torrent {
-
--class PeerConnectionBase;
-+class SocketBase;
-
- class ThrottleNode {
- public:
-   typedef ThrottleList::iterator                  iterator;
-   typedef ThrottleList::const_iterator            const_iterator;
--  typedef rak::mem_fun0 SlotActivate;
-+  typedef rak::mem_fun0         SlotActivate;
-
-   ThrottleNode(uint32_t rateSpan) : m_rate(rateSpan)  { clear_quota(); }
-
-Index: libtorrent/src/net/socket_base.cc
-===================================================================
---- libtorrent/src/net/socket_base.cc	(revision 975)
-+++ libtorrent/src/net/socket_base.cc	(working copy)
-@@ -41,6 +41,8 @@
- #include 
-
- #include "torrent/exceptions.h"
-+#include "torrent/poll.h"
-+#include "manager.h"
- #include "socket_base.h"
-
- namespace torrent {
-@@ -72,4 +74,14 @@
-   return r == 1;
- }
-
-+void
-+SocketBase::receive_throttle_down_activate() {
-+  manager->poll()->insert_read(this);
-+}
-+
-+void
-+SocketBase::receive_throttle_up_activate() {
-+  manager->poll()->insert_write(this);
-+}
-+
- } // namespace torrent
-Index: libtorrent/src/net/socket_base.h
-===================================================================
---- libtorrent/src/net/socket_base.h	(revision 975)
-+++ libtorrent/src/net/socket_base.h	(working copy)
-@@ -60,6 +60,9 @@
-   bool                read_oob(void* buffer);
-   bool                write_oob(const void* buffer);
-
-+  void                receive_throttle_down_activate();
-+  void                receive_throttle_up_activate();
-+
- protected:
-   // Disable copying
-   SocketBase(const SocketBase&);
-Index: libtorrent/src/tracker/tracker_control.cc
-===================================================================
---- libtorrent/src/tracker/tracker_control.cc	(revision 975)
-+++ libtorrent/src/tracker/tracker_control.cc	(working copy)
-@@ -43,6 +43,7 @@
- #include "net/address_list.h"
- #include "torrent/exceptions.h"
- #include "tracker_control.h"
-+#include "tracker_dht.h"
- #include "tracker_http.h"
- #include "tracker_udp.h"
-
-@@ -73,6 +74,9 @@
-   else if (std::strncmp("udp://", url.c_str(), 6) == 0)
-     t = new TrackerUdp(m_info, url);
-
-+  else if (std::strncmp("dht://", url.c_str(), 6) == 0)
-+    t = new TrackerDht(m_info, url);
-+
-   else
-     // TODO: Error message here?... not really...
-     return;
-@@ -101,7 +105,7 @@
-   m_tries = -1;
-   m_state = s;
-
--  m_itr = m_list.find_enabled(m_itr);
-+  m_itr = m_list.find_usable(m_itr);
-
-   if (m_itr != m_list.end())
-     m_itr->second->send_state(m_state,
-Index: libtorrent/src/tracker/tracker_dht.h
-===================================================================
---- libtorrent/src/tracker/tracker_dht.h	(revision 0)
-+++ libtorrent/src/tracker/tracker_dht.h	(revision 0)
-@@ -0,0 +1,72 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#ifndef LIBTORRENT_TRACKER_TRACKER_DHT_H
-+#define LIBTORRENT_TRACKER_TRACKER_DHT_H
-+
-+#include "net/address_list.h"
-+#include "torrent/object.h"
-+#include "tracker_base.h"
-+
-+namespace torrent {
-+
-+class TrackerDht : public TrackerBase {
-+public:
-+  TrackerDht(DownloadInfo* info, const std::string& url);
-+  ~TrackerDht();
-+
-+  virtual bool        is_busy() const;
-+  virtual bool        is_usable() const;
-+
-+  virtual void        send_state(DownloadInfo::State state, uint64_t down, uint64_t up, uint64_t left);
-+  virtual void        close();
-+
-+  virtual Type        type() const;
-+
-+  bool                has_peers() const                { return !m_peers.empty(); }
-+
-+  void                receive_peers(const std::string& peers);
-+  void                receive_success();
-+  void                receive_failed(const std::string& msg);
-+  void                receive_status(int replied, int contacted, const char* stage);
-+
-+private:
-+  AddressList  m_peers;
-+};
-+
-+}
-+
-+#endif
-Index: libtorrent/src/tracker/tracker_container.cc
-===================================================================
---- libtorrent/src/tracker/tracker_container.cc	(revision 975)
-+++ libtorrent/src/tracker/tracker_container.cc	(working copy)
-@@ -47,10 +47,13 @@
-
- namespace torrent {
-
-+struct tracker_usable_t : public std::unary_function {
-+  bool operator () (const TrackerContainer::value_type& value) const { return value.second->is_usable(); }
-+};
-+
- bool
--TrackerContainer::has_enabled() const {
--  return std::find_if(begin(), end(),
--		      rak::on(rak::mem_ref(&value_type::second), std::mem_fun(&TrackerBase::is_enabled)))
-+TrackerContainer::has_usable() const {
-+  return std::find_if(begin(), end(), tracker_usable_t())
-     != end();
- }
-
-@@ -99,8 +102,8 @@
- }
-
- TrackerContainer::iterator
--TrackerContainer::find_enabled(iterator itr) {
--  while (itr != end() && !itr->second->is_enabled())
-+TrackerContainer::find_usable(iterator itr) {
-+  while (itr != end() && !tracker_usable_t()(*itr))
-     ++itr;
-
-   return itr;
-Index: libtorrent/src/tracker/tracker_container.h
-===================================================================
---- libtorrent/src/tracker/tracker_container.h	(revision 975)
-+++ libtorrent/src/tracker/tracker_container.h	(working copy)
-@@ -72,7 +72,7 @@
-
-   ~TrackerContainer() { clear(); }
-
--  bool                has_enabled() const;
-+  bool                has_usable() const;
-
-   void                randomize();
-   void                clear();
-@@ -82,7 +82,7 @@
-   iterator            promote(iterator itr);
-
-   iterator            find(TrackerBase* tb);
--  iterator            find_enabled(iterator itr);
-+  iterator            find_usable(iterator itr);
-   const_iterator      find_enabled(const_iterator itr) const;
-
-   iterator            begin_group(int group);
-Index: libtorrent/src/tracker/tracker_udp.cc
-===================================================================
---- libtorrent/src/tracker/tracker_udp.cc	(revision 975)
-+++ libtorrent/src/tracker/tracker_udp.cc	(working copy)
-@@ -36,9 +36,6 @@
-
- #include "config.h"
-
--#include 
--#include 
--
- #include "net/address_list.h"
- #include "torrent/exceptions.h"
- #include "torrent/connection_manager.h"
-@@ -64,7 +61,7 @@
-
-   close();
- }
--
-+
- bool
- TrackerUdp::is_busy() const {
-   return get_fd().is_valid();
-@@ -91,7 +88,7 @@
-   m_sendUp = up;
-   m_sendLeft = left;
-
--  m_slotResolver = manager->connection_manager()->resolver()(hostname, PF_INET, SOCK_DGRAM,
-+  m_slotResolver = manager->connection_manager()->resolver()(hostname, (int)rak::socket_address::pf_inet, SOCK_DGRAM,
-                                                              sigc::mem_fun(this, &TrackerUdp::start_announce));
- }
-
-Index: libtorrent/src/tracker/Makefile.am
-===================================================================
---- libtorrent/src/tracker/Makefile.am	(revision 975)
-+++ libtorrent/src/tracker/Makefile.am	(working copy)
-@@ -4,6 +4,8 @@
- 	tracker_base.h \
- 	tracker_control.cc \
- 	tracker_control.h \
-+	tracker_dht.cc \
-+	tracker_dht.h \
- 	tracker_http.cc \
- 	tracker_http.h \
- 	tracker_container.cc \
-Index: libtorrent/src/tracker/tracker_base.h
-===================================================================
---- libtorrent/src/tracker/tracker_base.h	(revision 975)
-+++ libtorrent/src/tracker/tracker_base.h	(working copy)
-@@ -58,7 +58,8 @@
-   typedef enum {
-     TRACKER_NONE,
-     TRACKER_HTTP,
--    TRACKER_UDP
-+    TRACKER_UDP,
-+    TRACKER_DHT
-   } Type;
-
-   TrackerBase(DownloadInfo* info, const std::string& url) :
-@@ -69,6 +70,7 @@
-
-   virtual bool        is_busy() const = 0;
-   bool                is_enabled() const                    { return m_enabled; }
-+  virtual bool        is_usable() const                     { return m_enabled; }
-
-   void                enable(bool state)                    { m_enabled = state; }
-
-@@ -81,6 +83,8 @@
-   const std::string&  url() const                           { return m_url; }
-   void                set_url(const std::string& url)       { m_url = url; }
-
-+  const std::string&  status() const                        { return m_status; }
-+
-   const std::string&  tracker_id() const                    { return m_trackerId; }
-   void                set_tracker_id(const std::string& id) { m_trackerId = id; }
-
-@@ -106,6 +110,7 @@
-
-   DownloadInfo*       m_info;
-   std::string         m_url;
-+  std::string         m_status;
-
-   std::string         m_trackerId;
-
-Index: libtorrent/src/tracker/tracker_dht.cc
-===================================================================
---- libtorrent/src/tracker/tracker_dht.cc	(revision 0)
-+++ libtorrent/src/tracker/tracker_dht.cc	(revision 0)
-@@ -0,0 +1,151 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#include "config.h"
-+
-+#include 
-+
-+#include "dht/dht_router.h"
-+#include "torrent/connection_manager.h"
-+#include "torrent/dht_manager.h"
-+#include "torrent/exceptions.h"
-+
-+#include "tracker_dht.h"
-+#include "tracker_http.h"
-+
-+#include "globals.h"
-+#include "manager.h"
-+
-+namespace torrent {
-+
-+TrackerDht::TrackerDht(DownloadInfo* info, const std::string& url) :
-+  TrackerBase(info, url) {
-+
-+  if (!manager->dht_manager()->is_valid())
-+    throw internal_error("Trying to add DHT tracker with no DHT manager.");
-+}
-+
-+TrackerDht::~TrackerDht() {
-+  if (is_busy())
-+    manager->dht_manager()->router()->cancel_announce(NULL, this);
-+}
-+
-+bool
-+TrackerDht::is_busy() const {
-+  return !m_status.empty();
-+}
-+
-+bool
-+TrackerDht::is_usable() const {
-+  return m_enabled && manager->dht_manager()->is_active();
-+}
-+
-+void
-+TrackerDht::send_state(DownloadInfo::State state, uint64_t down, uint64_t up, uint64_t left) {
-+  if (m_info == NULL)
-+    throw internal_error("TrackerDht::send_state(...) does not have a valid m_info.");
-+
-+  if (is_busy()) {
-+    manager->dht_manager()->router()->cancel_announce(m_info, this);
-+
-+    if (is_busy())
-+      throw internal_error("TrackerDht::send_state cancel_announce did not cancel announce.");
-+  }
-+
-+  if (state == DownloadInfo::STOPPED)
-+    return;
-+
-+  m_status = "[Initializing]";
-+
-+  if (!manager->dht_manager()->is_active())
-+    return receive_failed("DHT server not active.");
-+
-+  manager->dht_manager()->router()->announce(m_info, this);
-+
-+  set_normal_interval(20 * 60);
-+  set_min_interval(0);
-+}
-+
-+void
-+TrackerDht::close() {
-+  if (is_busy())
-+    manager->dht_manager()->router()->cancel_announce(m_info, this);
-+}
-+
-+TrackerDht::Type
-+TrackerDht::type() const {
-+  return TRACKER_DHT;
-+}
-+
-+void
-+TrackerDht::receive_peers(const std::string& peers) {
-+  if (!is_busy())
-+    throw internal_error("TrackerDht::receive_peers called while not busy.");
-+
-+  m_peers.parse_address_compact(peers);
-+}
-+
-+void
-+TrackerDht::receive_success() {
-+  if (!is_busy())
-+    throw internal_error("TrackerDht::receive_success called while not busy.");
-+
-+  m_status.clear();
-+  m_slotSuccess(this, &m_peers);
-+  m_peers.clear();
-+}
-+
-+void
-+TrackerDht::receive_failed(const std::string& msg) {
-+  if (!is_busy())
-+    throw internal_error("TrackerDht::receive_failed called while not busy.");
-+
-+  m_status.clear();
-+  m_slotFailed(this, msg);
-+  m_peers.clear();
-+}
-+
-+void
-+TrackerDht::receive_status(int replied, int contacted, const char* stage) {
-+  if (!is_busy())
-+    throw internal_error("TrackerDht::receive_status called while not busy.");
-+
-+  std::stringstream s;
-+  s << "[" << stage << ": " << replied << "/" << contacted << " nodes replied]";
-+  m_status = s.str();
-+}
-+
-+}
-Index: libtorrent/src/torrent/tracker.cc
-===================================================================
---- libtorrent/src/torrent/tracker.cc	(revision 975)
-+++ libtorrent/src/torrent/tracker.cc	(working copy)
-@@ -46,6 +46,11 @@
-   return m_tracker.second->is_enabled();
- }
-
-+bool
-+Tracker::is_usable() const {
-+  return m_tracker.second->is_usable();
-+}
-+
- void
- Tracker::enable() {
-   m_tracker.second->enable(true);
-@@ -67,6 +72,11 @@
- }
-
- const std::string&
-+Tracker::status() const {
-+  return m_tracker.second->status();
-+}
-+
-+const std::string&
- Tracker::tracker_id() const {
-   return m_tracker.second->tracker_id();
- }
-Index: libtorrent/src/torrent/torrent.cc
-===================================================================
---- libtorrent/src/torrent/torrent.cc	(revision 975)
-+++ libtorrent/src/torrent/torrent.cc	(working copy)
-@@ -165,6 +165,11 @@
-   return manager->connection_manager();
- }
-
-+DhtManager*
-+dht_manager() {
-+  return manager->dht_manager();
-+}
-+
- uint32_t
- total_handshakes() {
-   return manager->handshake_manager()->size();
-Index: libtorrent/src/torrent/tracker.h
-===================================================================
---- libtorrent/src/torrent/tracker.h	(revision 975)
-+++ libtorrent/src/torrent/tracker.h	(working copy)
-@@ -58,6 +58,7 @@
-   Tracker(value_type v) : m_tracker(v) {}
-
-   bool                is_enabled() const;
-+  bool                is_usable() const;
-   bool                is_open() const;
-
-   void                enable();
-@@ -65,6 +66,7 @@
-
-   uint32_t            group() const { return m_tracker.first; }
-   const std::string&  url() const;
-+  const std::string&  status() const;
-
-   // The "tracker id" string returned by the tracker.
-   const std::string&  tracker_id() const;
-Index: libtorrent/src/torrent/torrent.h
-===================================================================
---- libtorrent/src/torrent/torrent.h	(revision 975)
-+++ libtorrent/src/torrent/torrent.h	(working copy)
-@@ -65,6 +65,7 @@
- ChunkManager*       chunk_manager() LIBTORRENT_EXPORT;
- ClientList*         client_list() LIBTORRENT_EXPORT;
- ConnectionManager*  connection_manager() LIBTORRENT_EXPORT;
-+DhtManager*         dht_manager() LIBTORRENT_EXPORT;
-
- uint32_t            total_handshakes() LIBTORRENT_EXPORT;
-
-Index: libtorrent/src/torrent/peer/peer_info.h
-===================================================================
---- libtorrent/src/torrent/peer/peer_info.h	(revision 975)
-+++ libtorrent/src/torrent/peer/peer_info.h	(working copy)
-@@ -80,6 +80,7 @@
-   uint32_t            last_connection() const               { return m_lastConnection; }
-   void                set_last_connection(uint32_t tvsec)   { m_lastConnection = tvsec; }
-
-+  bool                supports_dht() const                  { return m_options[7] & 0x01; }
-   bool                supports_extensions() const           { return m_options[5] & 0x10; }
-
-   // Internal to libTorrent:
-Index: libtorrent/src/torrent/dht_manager.cc
-===================================================================
---- libtorrent/src/torrent/dht_manager.cc	(revision 0)
-+++ libtorrent/src/torrent/dht_manager.cc	(revision 0)
-@@ -0,0 +1,119 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#include "config.h"
-+
-+#include 
-+#include 
-+
-+#include 
-+
-+#include "manager.h"
-+
-+#include "dht/dht_router.h"
-+#include "dht/dht_server.h"
-+#include "dht_manager.h"
-+#include "net/throttle_manager.h"
-+
-+namespace torrent {
-+
-+DhtManager::~DhtManager() {
-+  stop();
-+  delete m_router;
-+}
-+
-+void
-+DhtManager::initialize(const Object& dhtCache) {
-+  if (m_router != NULL)
-+    throw internal_error("DhtManager::initialize called with DHT already active.");
-+
-+  m_router = new DhtRouter(dhtCache, rak::socket_address::cast_from(manager->connection_manager()->bind_address()));
-+}
-+
-+void
-+DhtManager::start(port_type port) {
-+  if (m_router == NULL)
-+    throw internal_error("DhtManager::start called without initializing first.");
-+
-+  m_router->start(port);
-+}
-+
-+
-+void
-+DhtManager::stop() {
-+  if (m_router != NULL)
-+    m_router->stop();
-+}
-+
-+bool
-+DhtManager::is_active() const {
-+  return m_router != NULL && m_router->is_active();
-+}
-+
-+void
-+DhtManager::add_node(const sockaddr* addr, int port, bool external) {
-+  if (m_router == NULL)
-+    return;
-+
-+  rak::socket_address sa = *rak::socket_address::cast_from(addr);
-+
-+  if (sa.family() != rak::socket_address::af_inet)
-+    return;
-+
-+
-+  sa.set_port(port);
-+  m_router->contact(&sa, external);
-+}
-+
-+Object*
-+DhtManager::store_cache(Object* container) const {
-+  if (m_router == NULL)
-+    throw internal_error("DhtManager::store_cache called but DHT not initialized.");
-+
-+  return m_router->store_cache(container);
-+}
-+
-+DhtManager::statistics_type
-+DhtManager::get_statistics() const {
-+  return m_router->get_statistics();
-+}
-+
-+void
-+DhtManager::reset_statistics() {
-+  m_router->reset_statistics();
-+}
-+
-+}
-Index: libtorrent/src/torrent/dht_manager.h
-===================================================================
---- libtorrent/src/torrent/dht_manager.h	(revision 0)
-+++ libtorrent/src/torrent/dht_manager.h	(revision 0)
-@@ -0,0 +1,125 @@
-+// libTorrent - BitTorrent library
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+// Add some helpfull words here.
-+
-+#ifndef LIBTORRENT_DHT_MANAGER_H
-+#define LIBTORRENT_DHT_MANAGER_H
-+
-+#include 
-+#include 
-+
-+namespace torrent {
-+
-+class ThrottleList;
-+
-+class LIBTORRENT_EXPORT DhtManager {
-+public:
-+  typedef ConnectionManager::port_type          port_type;
-+
-+  struct statistics_type {
-+    // Cycle; 0=inactive, 1=initial bootstrapping, 2 and up=normal operation
-+    unsigned int       cycle;
-+
-+    // UDP transfer rates.
-+    const Rate&        up_rate;
-+    const Rate&        down_rate;
-+
-+    // DHT query statistics.
-+    unsigned int       queries_received;
-+    unsigned int       queries_sent;
-+    unsigned int       replies_received;
-+
-+    // DHT node info.
-+    unsigned int       num_nodes;
-+    unsigned int       num_buckets;
-+
-+    // DHT tracker info.
-+    unsigned int       num_peers;
-+    unsigned int       max_peers;
-+    unsigned int       num_trackers;
-+
-+    statistics_type(const Rate& up, const Rate& down) : up_rate(up), down_rate(down) { }
-+  };
-+
-+  DhtManager() : m_router(NULL), m_portSent(0), m_canReceive(true) { };
-+  ~DhtManager();
-+
-+  void                initialize(const Object& dhtCache);
-+
-+  void                start(port_type port);
-+  void                stop();
-+
-+  // Store DHT cache in the given container and return the container.
-+  Object*             store_cache(Object* container) const;
-+
-+  bool                is_valid() const                        { return m_router; }
-+  bool                is_active() const;
-+
-+  port_type           port() const                            { return m_port; }
-+
-+  bool                can_receive_queries() const             { return m_canReceive; }
-+
-+  // Call this after sending the port to a client, so the router knows
-+  // that it should be getting requests.
-+  void                port_sent()                             { m_portSent++; }
-+
-+  // Add a node by address, e.g. from a torrent file (external = true), or from
-+  // explicit add_node commands or the BT PORT message (external = false).
-+  void                add_node(const sockaddr* addr, int port, bool external);
-+
-+  statistics_type     get_statistics() const;
-+  void                reset_statistics();
-+
-+  // To be called if upon examining the statistics, the client decides that
-+  // we can't receive outside requests and therefore shouldn't advertise our
-+  // UDP port after the BT handshake.
-+  void                set_can_receive(bool can)               { m_canReceive = can; }
-+
-+  // Internal libTorrent use only
-+  DhtRouter*          router()                                { return m_router; }
-+
-+private:
-+  DhtRouter*          m_router;
-+  port_type           m_port;
-+
-+  int                 m_portSent;
-+  bool                m_canReceive;
-+};
-+
-+}
-+
-+#endif
-Index: libtorrent/src/torrent/hash_string.h
-===================================================================
---- libtorrent/src/torrent/hash_string.h	(revision 975)
-+++ libtorrent/src/torrent/hash_string.h	(working copy)
-@@ -83,6 +83,10 @@
-
-   const value_type*   c_str() const                     { return m_data; }
-
-+  std::string         str() const                       { return std::string(m_data, size_data); }
-+
-+  void                clear(int v = 0)                  { std::memset(data(), v, size()); }
-+
-   void                assign(const value_type* src)     { std::memcpy(data(), src, size()); }
-
-   bool                equal_to(const char* hash) const     { return std::memcmp(m_data, hash, size()) == 0; }
-@@ -93,6 +97,8 @@
-   static const HashString* cast_from(const char* src)        { return (const HashString*)src; }
-   static const HashString* cast_from(const std::string& src) { return (const HashString*)src.c_str(); }
-
-+  static HashString*  cast_from(char* src)                   { return (HashString*)src; }
-+
- private:
-   char                m_data[size_data];
- };
-@@ -103,10 +109,20 @@
- }
-
- inline bool
-+operator != (const HashString& one, const HashString& two) {
-+  return std::memcmp(one.begin(), two.begin(), HashString::size_data) != 0;
-+}
-+
-+inline bool
- operator < (const HashString& one, const HashString& two) {
-   return std::memcmp(one.begin(), two.begin(), HashString::size_data) < 0;
- }
-
-+inline bool
-+operator <= (const HashString& one, const HashString& two) {
-+  return std::memcmp(one.begin(), two.begin(), HashString::size_data) <= 0;
- }
-
-+}
-+
- #endif
-Index: libtorrent/src/torrent/Makefile.am
-===================================================================
---- libtorrent/src/torrent/Makefile.am	(revision 975)
-+++ libtorrent/src/torrent/Makefile.am	(working copy)
-@@ -12,6 +12,8 @@
- 	common.h \
- 	connection_manager.cc \
- 	connection_manager.h \
-+	dht_manager.cc \
-+	dht_manager.h \
- 	download.cc \
- 	download.h \
- 	error.cc \
-@@ -54,6 +56,7 @@
- 	chunk_manager.h \
- 	common.h \
- 	connection_manager.h \
-+	dht_manager.h \
- 	download.h \
- 	error.h \
- 	exceptions.h \
-Index: libtorrent/src/torrent/common.h
-===================================================================
---- libtorrent/src/torrent/common.h	(revision 975)
-+++ libtorrent/src/torrent/common.h	(working copy)
-@@ -67,6 +67,8 @@
- class ClientList;
- class ConnectionList;
- class ConnectionManager;
-+class DhtManager;
-+class DhtRouter;
- class Download;
- class DownloadMain;
- class DownloadWrapper;
-Index: libtorrent/src/manager.cc
-===================================================================
---- libtorrent/src/manager.cc	(revision 975)
-+++ libtorrent/src/manager.cc	(working copy)
-@@ -50,6 +50,7 @@
-
- #include "torrent/chunk_manager.h"
- #include "torrent/connection_manager.h"
-+#include "torrent/dht_manager.h"
- #include "torrent/data/file_manager.h"
- #include "torrent/peer/client_list.h"
-
-@@ -70,6 +71,7 @@
-   m_chunkManager(new ChunkManager),
-   m_clientList(new ClientList),
-   m_connectionManager(new ConnectionManager),
-+  m_dhtManager(new DhtManager),
-
-   m_poll(NULL),
-
-@@ -99,6 +101,7 @@
-   delete m_hashQueue;
-
-   delete m_resourceManager;
-+  delete m_dhtManager;
-   delete m_connectionManager;
-   delete m_chunkManager;
-
-Index: libtorrent/src/manager.h
-===================================================================
---- libtorrent/src/manager.h	(revision 975)
-+++ libtorrent/src/manager.h	(working copy)
-@@ -58,6 +58,7 @@
- class ChunkManager;
- class ConnectionManager;
- class ThrottleManager;
-+class DhtManager;
-
- typedef std::list EncodingList;
-
-@@ -75,6 +76,7 @@
-   ChunkManager*       chunk_manager()                           { return m_chunkManager; }
-   ClientList*         client_list()                             { return m_clientList; }
-   ConnectionManager*  connection_manager()                      { return m_connectionManager; }
-+  DhtManager*         dht_manager()                             { return m_dhtManager; }
-
-   Poll*               poll()                                    { return m_poll; }
-   void                set_poll(Poll* p)                         { m_poll = p; }
-@@ -99,6 +101,7 @@
-   ChunkManager*       m_chunkManager;
-   ClientList*         m_clientList;
-   ConnectionManager*  m_connectionManager;
-+  DhtManager*         m_dhtManager;
-   Poll*               m_poll;
-
-   EncodingList        m_encodingList;
-Index: libtorrent/src/protocol/protocol_base.h
-===================================================================
---- libtorrent/src/protocol/protocol_base.h	(revision 975)
-+++ libtorrent/src/protocol/protocol_base.h	(working copy)
-@@ -62,6 +62,7 @@
-     REQUEST,
-     PIECE,
-     CANCEL,
-+    PORT,
-
-     EXTENSION_PROTOCOL = 20,
-
-@@ -108,6 +109,7 @@
-   void                write_request(const Piece& p);
-   void                write_cancel(const Piece& p);
-   void                write_piece(const Piece& p);
-+  void                write_port(uint16_t port);
-   void                write_extension(uint8_t id, uint32_t length);
-
-   static const size_type sizeof_keepalive    = 4;
-@@ -122,6 +124,8 @@
-   static const size_type sizeof_cancel_body  = 12;
-   static const size_type sizeof_piece        = 13;
-   static const size_type sizeof_piece_body   = 8;
-+  static const size_type sizeof_port         = 7;
-+  static const size_type sizeof_port_body    = 2;
-   static const size_type sizeof_extension    = 6;
-   static const size_type sizeof_extension_body=1;
-
-@@ -133,12 +137,14 @@
-   bool                can_write_request() const               { return m_buffer.reserved_left() >= sizeof_request; }
-   bool                can_write_cancel() const                { return m_buffer.reserved_left() >= sizeof_cancel; }
-   bool                can_write_piece() const                 { return m_buffer.reserved_left() >= sizeof_piece; }
-+  bool                can_write_port() const                  { return m_buffer.reserved_left() >= sizeof_port; }
-   bool                can_write_extension() const             { return m_buffer.reserved_left() >= sizeof_extension; }
-
-   bool                can_read_have_body() const              { return m_buffer.remaining() >= sizeof_have_body; }
-   bool                can_read_request_body() const           { return m_buffer.remaining() >= sizeof_request_body; }
-   bool                can_read_cancel_body() const            { return m_buffer.remaining() >= sizeof_request_body; }
-   bool                can_read_piece_body() const             { return m_buffer.remaining() >= sizeof_piece_body; }
-+  bool                can_read_port_body() const              { return m_buffer.remaining() >= sizeof_port_body; }
-   bool                can_read_extension_body() const         { return m_buffer.remaining() >= sizeof_extension_body; }
-
- protected:
-@@ -223,6 +229,13 @@
- }
-
- inline void
-+ProtocolBase::write_port(uint16_t port) {
-+  m_buffer.write_32(3);
-+  write_command(PORT);
-+  m_buffer.write_16(port);
-+}
-+
-+inline void
- ProtocolBase::write_extension(uint8_t id, uint32_t length) {
-   m_buffer.write_32(2 + length);
-   write_command(EXTENSION_PROTOCOL);
-Index: libtorrent/src/protocol/peer_connection_base.cc
-===================================================================
---- libtorrent/src/protocol/peer_connection_base.cc	(revision 975)
-+++ libtorrent/src/protocol/peer_connection_base.cc	(working copy)
-@@ -51,6 +51,7 @@
- #include "download/download_main.h"
- #include "net/socket_base.h"
- #include "torrent/connection_manager.h"
-+#include "torrent/dht_manager.h"
- #include "torrent/peer/peer_info.h"
-
- #include "extensions.h"
-@@ -118,10 +119,10 @@
-   m_peerChunks.bitfield()->swap(*bitfield);
-
-   m_peerChunks.upload_throttle()->set_list_iterator(m_download->upload_throttle()->end());
--  m_peerChunks.upload_throttle()->slot_activate(rak::make_mem_fun(this, &PeerConnectionBase::receive_throttle_up_activate));
-+  m_peerChunks.upload_throttle()->slot_activate(rak::make_mem_fun(static_cast(this), &SocketBase::receive_throttle_up_activate));
-
-   m_peerChunks.download_throttle()->set_list_iterator(m_download->download_throttle()->end());
--  m_peerChunks.download_throttle()->slot_activate(rak::make_mem_fun(this, &PeerConnectionBase::receive_throttle_down_activate));
-+  m_peerChunks.download_throttle()->slot_activate(rak::make_mem_fun(static_cast(this), &SocketBase::receive_throttle_down_activate));
-
-   download_queue()->set_delegator(m_download->delegator());
-   download_queue()->set_peer_chunks(&m_peerChunks);
-@@ -323,16 +324,6 @@
- }
-
- void
--PeerConnectionBase::receive_throttle_down_activate() {
--  manager->poll()->insert_read(this);
--}
--
--void
--PeerConnectionBase::receive_throttle_up_activate() {
--  manager->poll()->insert_write(this);
--}
--
--void
- PeerConnectionBase::event_error() {
-   m_download->connection_list()->erase(this, 0);
- }
-Index: libtorrent/src/protocol/peer_connection_base.h
-===================================================================
---- libtorrent/src/protocol/peer_connection_base.h	(revision 975)
-+++ libtorrent/src/protocol/peer_connection_base.h	(working copy)
-@@ -140,9 +140,6 @@
-
-   void                load_up_chunk();
-
--  void                receive_throttle_down_activate();
--  void                receive_throttle_up_activate();
--
-   void                read_request_piece(const Piece& p);
-   void                read_cancel_piece(const Piece& p);
-
-Index: libtorrent/src/protocol/peer_connection_leech.cc
-===================================================================
---- libtorrent/src/protocol/peer_connection_leech.cc	(revision 975)
-+++ libtorrent/src/protocol/peer_connection_leech.cc	(working copy)
-@@ -45,6 +45,8 @@
- #include "download/chunk_statistics.h"
- #include "download/download_info.h"
- #include "download/download_main.h"
-+#include "torrent/dht_manager.h"
-+#include "torrent/peer/peer_info.h"
-
- #include "extensions.h"
- #include "peer_connection_leech.h"
-@@ -275,6 +277,13 @@
-     read_cancel_piece(m_down->read_request());
-     return true;
-
-+  case ProtocolBase::PORT:
-+    if (!m_down->can_read_port_body())
-+      break;
-+
-+    manager->dht_manager()->add_node(m_peerInfo->socket_address(), m_down->buffer()->read_16(), false);
-+    return true;
-+
-   case ProtocolBase::EXTENSION_PROTOCOL:
-     if (!m_down->can_read_extension_body())
-       break;
-Index: libtorrent/src/protocol/peer_connection_seed.cc
-===================================================================
---- libtorrent/src/protocol/peer_connection_seed.cc	(revision 975)
-+++ libtorrent/src/protocol/peer_connection_seed.cc	(working copy)
-@@ -43,6 +43,8 @@
- #include "download/chunk_statistics.h"
- #include "download/download_info.h"
- #include "download/download_main.h"
-+#include "torrent/dht_manager.h"
-+#include "torrent/peer/peer_info.h"
-
- #include "extensions.h"
- #include "peer_connection_seed.h"
-@@ -175,6 +177,13 @@
-     read_cancel_piece(m_down->read_request());
-     return true;
-
-+  case ProtocolBase::PORT:
-+    if (!m_down->can_read_port_body())
-+      break;
-+
-+    manager->dht_manager()->add_node(m_peerInfo->socket_address(), m_down->buffer()->read_16(), false);
-+    return true;
-+
-   case ProtocolBase::EXTENSION_PROTOCOL:
-     if (!m_down->can_read_extension_body())
-       break;
-Index: libtorrent/src/protocol/handshake.cc
-===================================================================
---- libtorrent/src/protocol/handshake.cc	(revision 975)
-+++ libtorrent/src/protocol/handshake.cc	(working copy)
-@@ -38,6 +38,7 @@
-
- #include "download/download_info.h"
- #include "download/download_main.h"
-+#include "torrent/dht_manager.h"
- #include "net/throttle_list.h"
- #include "net/throttle_manager.h"
- #include "torrent/exceptions.h"
-@@ -522,18 +523,19 @@
-
-   // The download is just starting so we're not sending any
-   // bitfield.
--  if (m_download->file_list()->bitfield()->is_all_unset())
--    prepare_keepalive();
--  else
-+  if (m_download->file_list()->bitfield()->is_all_unset()) {
-+    prepare_post_handshake(true);
-+
-+  } else {
-     prepare_bitfield();
-
--  m_state = BITFIELD;
-+    // Give some extra time for reading/writing the bitfield.
-+    priority_queue_erase(&taskScheduler, &m_taskTimeout);
-+    priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(120)).round_seconds());
-+  }
-+
-   manager->poll()->insert_write(this);
-
--  // Give some extra time for reading/writing the bitfield.
--  priority_queue_erase(&taskScheduler, &m_taskTimeout);
--  priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime + rak::timer::from_seconds(120)).round_seconds());
--
-   return false;
- }
-
-@@ -731,6 +733,7 @@
-         goto restart;
-
-     case BITFIELD:
-+    case POST_HANDSHAKE:
-       read_bitfield();
-       break;
-
-@@ -864,8 +867,12 @@
-     if (!m_writeBuffer.remaining())
-       throw internal_error("event_write called with empty write buffer.");
-
--    if (m_writeBuffer.consume(write_unthrottled(m_writeBuffer.position(), m_writeBuffer.remaining())))
--      manager->poll()->remove_write(this);
-+    if (m_writeBuffer.consume(write_stream_throws(m_writeBuffer.position(), m_writeBuffer.remaining()))) {
-+      if (m_state == POST_HANDSHAKE)
-+        write_done();
-+      else
-+        manager->poll()->remove_write(this);
-+    }
-
-   } catch (handshake_succeeded& e) {
-     m_manager->receive_succeeded(this);
-@@ -948,6 +955,8 @@
-   m_writeBuffer.write_range(m_protocol, m_protocol + 19);
-
-   std::memset(m_writeBuffer.end(), 0, 8);
-+  if (manager->dht_manager()->is_active())
-+    *(m_writeBuffer.end()+7) |= 0x01;	// DHT support, enable PORT message
-   m_writeBuffer.move_end(8);
-
-   m_writeBuffer.write_range(m_download->info()->hash().c_str(), m_download->info()->hash().c_str() + 20);
-@@ -990,20 +999,50 @@
-     m_encryption.info()->encrypt(m_writeBuffer.end() - 5, 5);
-
-   m_writePos = 0;
-+
-+  m_state = BITFIELD;
- }
-
- void
--Handshake::prepare_keepalive() {
--  m_writeBuffer.write_32(0);
-+Handshake::prepare_post_handshake(bool must_write) {
-+  m_state = POST_HANDSHAKE;
-
--  if (m_encryption.info()->is_encrypted())
--    m_encryption.info()->encrypt(m_writeBuffer.end() - 4, 4);
-+  // Send PORT message for DHT if enabled and peer supports it.
-+  if (m_peerInfo->supports_dht() && manager->dht_manager()->is_active() && manager->dht_manager()->can_receive_queries()) {
-+    m_writeBuffer.write_32(3);
-+    m_writeBuffer.write_8(protocol_port);
-+    m_writeBuffer.write_16(manager->dht_manager()->port());
-+    manager->dht_manager()->port_sent();
-+    if (m_encryption.info()->is_encrypted())
-+      m_encryption.info()->encrypt(m_writeBuffer.end() - 7, 7);
-
--  // Skip writting the bitfield.
--  m_writePos = m_download->file_list()->bitfield()->size_bytes();
-+    must_write = false;
-+  }
-+
-+  // Send a keep-alive if we still must send something.
-+  if (must_write) {
-+    m_writeBuffer.write_32(0);
-+
-+    if (m_encryption.info()->is_encrypted())
-+      m_encryption.info()->encrypt(m_writeBuffer.end() - 4, 4);
-+  }
-+
-+  if (!m_writeBuffer.remaining())
-+    write_done();
- }
-
- void
-+Handshake::write_done() {
-+  m_writeDone = true;
-+  manager->poll()->remove_write(this);
-+
-+  // Ok to just check m_readDone as the call in event_read() won't
-+  // set it before the call.
-+  if (m_readDone)
-+    throw handshake_succeeded();
-+}
-+
-+void
- Handshake::write_extension_handshake() {
-   if (m_extensions->is_default())
-     m_extensions = new ProtocolExtension;
-@@ -1059,15 +1098,8 @@
-     }
-   }
-
--  if (m_writePos == bitfield->size_bytes()) {
--    m_writeDone = true;
--    manager->poll()->remove_write(this);
--
--    // Ok to just check m_readDone as the call in event_read() won't
--    // set it before the call.
--    if (m_readDone)
--      throw handshake_succeeded();
--  }
-+  if (m_writePos == bitfield->size_bytes())
-+    prepare_post_handshake(false);
- }
-
- void
-Index: libtorrent/src/protocol/handshake.h
-===================================================================
---- libtorrent/src/protocol/handshake.h	(revision 975)
-+++ libtorrent/src/protocol/handshake.h	(working copy)
-@@ -74,6 +74,7 @@
-     INACTIVE,
-     CONNECTING,
-     BITFIELD,
-+    POST_HANDSHAKE,
-
-     PROXY_CONNECT,
-     PROXY_DONE,
-@@ -130,6 +131,7 @@
-   void operator = (const Handshake&);
-
-   void                read_done();
-+  void                write_done();
-
-   bool                fill_read_buffer(int size);
-
-@@ -151,7 +153,7 @@
-   void                prepare_handshake();
-   void                prepare_peer_info();
-   void                prepare_bitfield();
--  void                prepare_keepalive();
-+  void                prepare_post_handshake(bool must_write);
-
-   void                write_extension_handshake();
-   void                write_bitfield();
-Index: libtorrent/src/download/download_constructor.cc
-===================================================================
---- libtorrent/src/download/download_constructor.cc	(revision 975)
-+++ libtorrent/src/download/download_constructor.cc	(working copy)
-@@ -42,6 +42,7 @@
- #include 
-
- #include "download/download_wrapper.h"
-+#include "torrent/dht_manager.h"
- #include "torrent/exceptions.h"
- #include "torrent/object.h"
- #include "torrent/data/file.h"
-@@ -50,6 +51,8 @@
-
- #include "download_constructor.h"
-
-+#include "manager.h"
-+
- namespace torrent {
-
- struct download_constructor_is_single_path {
-@@ -167,9 +170,16 @@
-   else if (b.has_key("announce"))
-     add_tracker_single(b.get_key("announce"), 0);
-
--  else
-+  else if (!manager->dht_manager()->is_valid() || m_download->info()->is_private())
-     throw bencode_error("Could not find any trackers");
-
-+  if (manager->dht_manager()->is_valid() && !m_download->info()->is_private())
-+    tracker->insert(tracker->group_size(), "dht://");
-+
-+  if (manager->dht_manager()->is_valid() && b.has_key_list("nodes"))
-+    std::for_each(b.get_key_list("nodes").begin(), b.get_key_list("nodes").end(),
-+                  rak::make_mem_fun(this, &DownloadConstructor::add_dht_node));
-+
-   tracker->randomize();
- }
-
-@@ -191,6 +201,35 @@
-   m_download->main()->tracker_manager()->insert(group, rak::trim_classic(b.as_string()));
- }
-
-+struct call_add_node_t {
-+  call_add_node_t(int port) : m_port(port) { }
-+
-+  void operator() (const sockaddr* sa, int err) {
-+    if (sa != NULL)
-+      manager->dht_manager()->add_node(sa, m_port, true);
-+  }
-+
-+  int m_port;
-+};
-+
-+void
-+DownloadConstructor::add_dht_node(const Object& b) {
-+  if (!b.is_list() || b.as_list().size() < 2)
-+    return;
-+
-+  Object::list_type::const_iterator el = b.as_list().begin();
-+
-+  if (!el->is_string())
-+    return;
-+
-+  const std::string& host = el->as_string();
-+
-+  if (!(++el)->is_value())
-+    return;
-+
-+  manager->connection_manager()->resolver()(host.c_str(), (int)rak::socket_address::pf_inet, SOCK_DGRAM, call_add_node_t(el->as_value()));
-+}
-+
- bool
- DownloadConstructor::is_valid_path_element(const Object& b) {
-   return
-Index: libtorrent/src/download/download_constructor.h
-===================================================================
---- libtorrent/src/download/download_constructor.h	(revision 975)
-+++ libtorrent/src/download/download_constructor.h	(working copy)
-@@ -67,6 +67,7 @@
-
-   void                add_tracker_group(const Object& b);
-   void                add_tracker_single(const Object& b, int group);
-+  void                add_dht_node(const Object& b);
-
-   static bool         is_valid_path_element(const Object& b);
-   static bool         is_invalid_path_element(const Object& b) { return !is_valid_path_element(b); }
-Index: libtorrent/src/Makefile.am
-===================================================================
---- libtorrent/src/Makefile.am	(revision 975)
-+++ libtorrent/src/Makefile.am	(working copy)
-@@ -1,6 +1,7 @@
- SUBDIRS = \
- 	torrent \
- 	data \
-+	dht \
- 	download \
- 	net \
- 	protocol \
-@@ -15,6 +16,7 @@
- 	$(top_srcdir)/src/torrent/data/libsub_torrentdata.la \
- 	$(top_srcdir)/src/torrent/peer/libsub_torrentpeer.la \
- 	$(top_srcdir)/src/data/libsub_data.la \
-+	$(top_srcdir)/src/dht/libsub_dht.la \
- 	$(top_srcdir)/src/download/libsub_download.la \
- 	$(top_srcdir)/src/net/libsub_net.la \
- 	$(top_srcdir)/src/protocol/libsub_protocol.la \
-Index: libtorrent/configure.ac
-===================================================================
---- libtorrent/configure.ac	(revision 975)
-+++ libtorrent/configure.ac	(working copy)
-@@ -2,6 +2,7 @@
-
- dnl Find a better way to do this
- AC_DEFINE(PEER_NAME, "-lt0B80-", Identifier that is part of the default peer id)
-+AC_DEFINE(PEER_VERSION, "lt\x0B\x80", 4 byte client and version identifier for DHT)
-
- LIBTORRENT_CURRENT=10
- LIBTORRENT_REVISION=8
-@@ -32,6 +33,7 @@
- TORRENT_ENABLE_DEBUG
- TORRENT_ENABLE_EXTRA_DEBUG
- TORRENT_ENABLE_WERROR
-+TORRENT_ENABLE_TR1
-
- TORRENT_DISABLE_IPV6
-
-@@ -104,6 +106,7 @@
- 	src/torrent/peer/Makefile
- 	src/torrent/data/Makefile
- 	src/data/Makefile
-+	src/dht/Makefile
- 	src/download/Makefile
- 	src/net/Makefile
- 	src/protocol/Makefile
From krics at linuxforum.hu  Tue Dec  4 17:38:33 2007
From: krics at linuxforum.hu (Christian Hamar alias krix)
Date: Tue Dec  4 17:38:36 2007
Subject: [Frugalware-git] xorg73: xcb-proto-1.1-1-x86_64
Message-ID: <20071204163833.ED6CB11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=4ecc210231afa4c7d6ef5c572139cccb44ebfe11

commit 4ecc210231afa4c7d6ef5c572139cccb44ebfe11
Author: Christian Hamar alias krix 
Date:   Tue Dec 4 17:38:13 2007 +0100

xcb-proto-1.1-1-x86_64
* Version bump

diff --git a/source/x11/xcb-proto/FrugalBuild b/source/x11/xcb-proto/FrugalBuild
index 96f1594..1a124c6 100644
--- a/source/x11/xcb-proto/FrugalBuild
+++ b/source/x11/xcb-proto/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix 

pkgname=xcb-proto
-pkgver=1.0
+pkgver=1.1
pkgrel=1
pkgdesc="X.org X protocol descriptions for XCB"
url="http://xcb.freedesktop.org"
@@ -12,4 +12,4 @@ archs=('i686' 'x86_64')
makedepends=('pkgconfig' 'libxml2')
up2date=("lynx -dump 'http://xcb.freedesktop.org/dist/?C=M;O=A' | grep xcb-proto | Flasttar")
source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2)
-sha1sums=('c7252cc74f75c997227b4dcdba2cb654d89cecda')
+sha1sums=('72bb3fe28e7ef55af335e8df41ca871517891698')
From krics at linuxforum.hu  Tue Dec  4 17:42:40 2007
From: krics at linuxforum.hu (Christian Hamar alias krix)
Date: Tue Dec  4 17:42:43 2007
Subject: [Frugalware-git] xorg73: libxcb-1.1-1-x86_64
Message-ID: <20071204164240.BE4DE11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=c019edc5ed2964af666c96bd85cd58c99a0b68ee

commit c019edc5ed2964af666c96bd85cd58c99a0b68ee
Author: Christian Hamar alias krix 
Date:   Tue Dec 4 17:42:22 2007 +0100

libxcb-1.1-1-x86_64
* Version bump
* Drop sloppy_lock patch (now in upstream)

diff --git a/source/x11/libxcb/FrugalBuild b/source/x11/libxcb/FrugalBuild
index 88fd18c..ed1fa37 100644
--- a/source/x11/libxcb/FrugalBuild
+++ b/source/x11/libxcb/FrugalBuild
@@ -2,19 +2,17 @@
# Maintainer: Christian Hamar alias krix 

pkgname=libxcb
-pkgver=1.0
-pkgrel=4
+pkgver=1.1
+pkgrel=1
pkgdesc="X.org X-protocol C Binding"
url="http://xcb.freedesktop.org"
groups=('x11' 'xorg-core' 'xorg-proto')
-depends=('xcb-proto>=1.0' 'libpthread-stubs' 'libxml2' 'libxau>=1.0.3-2' 'libxdmcp>=1.0.2-2' 'libxslt')
+depends=('xcb-proto>=1.1' 'libpthread-stubs' 'libxml2' 'libxau>=1.0.3-2' 'libxdmcp>=1.0.2-2' 'libxslt')
archs=('i686' 'x86_64')
makedepends=('pkgconfig')
up2date=("lynx -dump 'http://xcb.freedesktop.org/dist/?C=M;O=A' | grep libxcb | Flasttar")
-source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2 \
-	libxcb-1.0-sloppy_lock.patch)
-sha1sums=('0a7e0b65e6f1e0ef4dcaecaa01c4b2854206e96e'\
-          '4248f7becce913e5cc15f5f45b9f1cc47e6657e5')
+source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2)
+sha1sums=('b27c7eb86fd2ea43cea83cadcf20cc77abf5defe')

build() {
Fbuild
diff --git a/source/x11/libxcb/libxcb-1.0-sloppy_lock.patch b/source/x11/libxcb/libxcb-1.0-sloppy_lock.patch
deleted file mode 100644
index 22236cb..0000000
--- a/source/x11/libxcb/libxcb-1.0-sloppy_lock.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/xcb_conn.c.orig	2007-03-03 17:05:12.000000000 +0100
-+++ src/xcb_conn.c	2007-03-03 17:18:25.000000000 +0100
-@@ -62,6 +62,11 @@
- static int _xcb_xlib_init(_xcb_xlib *xlib)
- {
-     xlib->lock = 0;
-+    xlib->sloppy_lock = 0;
-+
-+    if (getenv("LIBXCB_ALLOW_SLOPPY_LOCK"))
-+        xlib->sloppy_lock = 1;
-+
-     pthread_cond_init(&xlib->cond, 0);
-     return 1;
- }
---- src/xcbint.h.orig	2007-03-03 17:05:00.000000000 +0100
-+++ src/xcbint.h	2007-03-03 17:10:33.000000000 +0100
-@@ -130,6 +130,7 @@
-
- typedef struct _xcb_xlib {
-     int lock;
-+    int sloppy_lock;
-     pthread_t thread;
-     pthread_cond_t cond;
- } _xcb_xlib;
---- src/xcb_xlib.c.orig	2007-03-03 17:07:06.000000000 +0100
-+++ src/xcb_xlib.c	2007-03-03 17:10:14.000000000 +0100
-@@ -40,7 +40,8 @@
- void xcb_xlib_lock(xcb_connection_t *c)
- {
-     _xcb_lock_io(c);
--    assert(!c->xlib.lock);
-+    if (!c->xlib.sloppy_lock)
-+	    assert(!c->xlib.lock);
-     c->xlib.lock = 1;
-     c->xlib.thread = pthread_self();
-     _xcb_unlock_io(c);
-@@ -49,7 +50,8 @@
- void xcb_xlib_unlock(xcb_connection_t *c)
- {
-     _xcb_lock_io(c);
--    assert(c->xlib.lock);
-+    if (!c->xlib.sloppy_lock)
-+	assert(c->xlib.lock);
-     assert(pthread_equal(c->xlib.thread, pthread_self()));
-     c->xlib.lock = 0;
-     pthread_cond_broadcast(&c->xlib.cond);
From krics at linuxforum.hu  Tue Dec  4 17:45:10 2007
From: krics at linuxforum.hu (Christian Hamar alias krix)
Date: Tue Dec  4 17:45:12 2007
Subject: [Frugalware-git] xorg73: pixman-0.9.6-1-x86_64
Message-ID: <20071204164510.5731911904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=8b8de22178726588c83b187f443890839b0838d2

commit 8b8de22178726588c83b187f443890839b0838d2
Author: Christian Hamar alias krix 
Date:   Tue Dec 4 17:44:56 2007 +0100

pixman-0.9.6-1-x86_64
* Version bump

diff --git a/source/x11/pixman/FrugalBuild b/source/x11/pixman/FrugalBuild
index fc7a84e..edb25c3 100644
--- a/source/x11/pixman/FrugalBuild
+++ b/source/x11/pixman/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=pixman
_F_xorg_name=pixman
-pkgver=0.9.5
+pkgver=0.9.6
pkgrel=1
pkgdesc="X.Org pixman library"
url="http://xorg.freedesktop.org"
@@ -14,5 +14,5 @@ makedepends=('pkgconfig' 'xproto>=7.0.11')
_F_xorg_ind=1
Finclude xorg

-sha1sums=('8aefe6f52eacb7d3283e2312783a4b80b2ba8324')
+sha1sums=('d31ea97176e475b47bcc9c0ad4813859857fb061')
# optimization OK
From krics at linuxforum.hu  Tue Dec  4 17:49:05 2007
From: krics at linuxforum.hu (Christian Hamar alias krix)
Date: Tue Dec  4 17:49:07 2007
Subject: [Frugalware-git] xorg73: wqy-bitmapfont-pcf-0.9.9_0-1-x86_64
Message-ID: <20071204164905.7736611904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=b473a4e0f4d8e84bed379baae1d1c661517fa4d8

commit b473a4e0f4d8e84bed379baae1d1c661517fa4d8
Author: Christian Hamar alias krix 
Date:   Tue Dec 4 17:47:26 2007 +0100

wqy-bitmapfont-pcf-0.9.9_0-1-x86_64
* Version bump

diff --git a/source/x11/wqy-bitmapfont-pcf/FrugalBuild b/source/x11/wqy-bitmapfont-pcf/FrugalBuild
index dc303bc..3cbd942 100644
--- a/source/x11/wqy-bitmapfont-pcf/FrugalBuild
+++ b/source/x11/wqy-bitmapfont-pcf/FrugalBuild
@@ -3,8 +3,8 @@
# Contributor: Tan Xiang 

pkgname=wqy-bitmapfont-pcf
-pkgver=0.7.0_4
-pkgrel=2
+pkgver=0.9.9_0
+pkgrel=1
pkgdesc="WenQuanYi Bitmap Song CJK font"
_F_sourceforge_dirname="wqy"
Finclude sourceforge
@@ -14,7 +14,7 @@ groups=('x11' 'xorg-core' 'xorg-fonts')
archs=('i686' 'x86_64')
up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=128192&package_id=156288'|grep -m1 '$pkgname.*.tar.gz'|sed 's/.*f-\(.*\).tar.gz .*/\1/' | sed 's/-/_/'"
source=(${source/$pkgver/${pkgver/_/-}})
-sha1sums=('10dbba2cd8e167d37d2d8f16ac63073498fd965f')
+sha1sums=('b97fbf1998bdf893619fc74b4c7577b437a1cd18')

build() {
Fcd wqy-bitmapfont
From vmiklos at frugalware.org  Tue Dec  4 18:12:07 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 18:12:10 2007
Subject: [Frugalware-git] bmf: rtorrent-0.7.9.1013-1bmf1-i686
Message-ID: <20071204171207.DB8D011904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=42f9cfcb3569b97ede3c57695f70d99b94f421cc

commit 42f9cfcb3569b97ede3c57695f70d99b94f421cc
Author: Miklos Vajna 
Date:   Tue Dec 4 18:11:55 2007 +0100

rtorrent-0.7.9.1013-1bmf1-i686
update to newer snapshot
dht patch is now in upstream

diff --git a/source/network-extra/rtorrent/FrugalBuild b/source/network-extra/rtorrent/FrugalBuild
index 870125e..605c21b 100644
--- a/source/network-extra/rtorrent/FrugalBuild
+++ b/source/network-extra/rtorrent/FrugalBuild
@@ -2,22 +2,21 @@
# Maintainer: voroskoi 

pkgname=rtorrent
-pkgver=svn975
+pkgver=0.7.9.1013
pkgrel=1bmf1
pkgdesc="The ncurses client for libtorrent."
url="http://libtorrent.rakshasa.no/"
-depends=('ncurses' 'libtorrent>=svn975' 'xmlrpc-c>=1.11.00')
+depends=('ncurses' 'libtorrent>=0.7.9.1013' 'xmlrpc-c>=1.11.00')
groups=('network-extra')
archs=('i686' 'x86_64')
Fconfopts="$Fconfopts --with-xmlrpc-c"
up2date="lynx -dump $url |grep rtorrent.*.tar |sed -ne 's/.*t-\(.*\).t.*/\1/;1p'"
-source=(curl_segfault_dirty_hack.diff dht.diff)
-sha1sums=('583dadf10d30956ec796ec9f3c2c4d5dfff64c79' \
-          'dcf3adce965952263179f814e468c155613e9493')
+source=(curl_segfault_dirty_hack.diff)
+sha1sums=('583dadf10d30956ec796ec9f3c2c4d5dfff64c79')

_F_scm_type="subversion"
_F_scm_url="svn://rakshasa.no/libtorrent/trunk/rtorrent"
-_F_scm_tag="975"
+_F_scm_tag="1013"
Finclude scm

build()
diff --git a/source/network-extra/rtorrent/dht.diff b/source/network-extra/rtorrent/dht.diff
deleted file mode 100644
index 160763e..0000000
--- a/source/network-extra/rtorrent/dht.diff
+++ /dev/null
@@ -1,708 +0,0 @@
-Index: rtorrent/doc/rtorrent.rc
-===================================================================
---- rtorrent/doc/rtorrent.rc	(revision 975)
-+++ rtorrent/doc/rtorrent.rc	(working copy)
-@@ -74,6 +74,17 @@
- #
- # encryption = allow_incoming,enable_retry,prefer_plaintext
-
-+# Enable DHT support for trackerless torrents or when all trackers are down.
-+# May be set to "disable" (completely disable DHT), "off" (do not start DHT),
-+# "auto" (start and stop DHT as needed), or "on" (start DHT immediately).
-+# The default is "off". For DHT to work, a session directory must be defined.
-+#
-+# dht = auto
-+
-+# UDP port to use for DHT.
-+#
-+# dht_port = 6881
-+
- # Enable peer exchange (for torrents not marked private)
- #
- # peer_exchange = yes
-Index: rtorrent/doc/rtorrent.1.xml
-===================================================================
---- rtorrent/doc/rtorrent.1.xml	(revision 975)
-+++ rtorrent/doc/rtorrent.1.xml	(working copy)
-@@ -1,4 +1,5 @@
--
-+
-
- 
-
-@@ -705,7 +706,39 @@
-         
-       
-
-+       
-+        dht = disabled|off|auto|on
-+        
-+Support for querying the distributed hash table (DHT) to find peers for trackerless
-+torrents or when all trackers are down. Set to disable to completely
-+disable DHT, off (default) to enable DHT but to not start the
-+DHT server, auto to automatically start and stop the DHT server
-+as needed or on for permanently keeping the DHT server running.
-+When set to automatic, the DHT server will start up when the first non-private torrent
-+is started, and will stop 15-30 minutes after the last non-private torrent is
-+stopped (or when rTorrent quits). For DHT to work, a session directory must be set (for
-+saving the DHT cache).
-+        
-+      
-+
-       
-+        dht_port = number
-+        
-+Set the UDP listen port for DHT. Defaults to 6881.
-+        
-+      
-+
-+      
-+        dht_add_node = host[:port]
-+        
-+Not intended for use in the configuration file but as one-time option in the
-+client or on the command line to bootstrap an empty DHT node table. Contacts
-+the given node and attempts to bootstrap from it if it replies.
-+The port is optional, with port 6881 being used by default.
-+        
-+      
-+
-+      
-         http_capath = path
-         http_cacert = filename
-         
-Index: rtorrent/src/core/download_list.cc
-===================================================================
---- rtorrent/src/core/download_list.cc	(revision 975)
-+++ rtorrent/src/core/download_list.cc	(working copy)
-@@ -55,6 +55,7 @@
- #include "globals.h"
- #include "manager.h"
-
-+#include "dht_manager.h"
- #include "download.h"
- #include "download_list.h"
- #include "download_store.h"
-@@ -94,6 +95,8 @@
- void
- DownloadList::session_save() {
-   std::for_each(begin(), end(), std::bind1st(std::mem_fun(&DownloadStore::save), control->core()->download_store()));
-+
-+  control->dht_manager()->save_dht_cache();
- }
-
- DownloadList::iterator
-@@ -388,6 +391,9 @@
-       torrent::resume_save_progress(*download->download(), download->download()->bencode()->get_key("libtorrent_resume"), true);
-     }
-
-+    // If the DHT server is set to auto, start it now.
-+    control->dht_manager()->auto_start();
-+
-     // Update the priority to ensure it has the correct
-     // seeding/unfinished modifiers.
-     download->set_priority(download->priority());
-Index: rtorrent/src/core/dht_manager.cc
-===================================================================
---- rtorrent/src/core/dht_manager.cc	(revision 0)
-+++ rtorrent/src/core/dht_manager.cc	(revision 0)
-@@ -0,0 +1,302 @@
-+// rTorrent - BitTorrent client
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#include "config.h"
-+
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+#include "rpc/parse_commands.h"
-+
-+#include "globals.h"
-+
-+#include "control.h"
-+#include "dht_manager.h"
-+#include "download.h"
-+#include "download_store.h"
-+#include "manager.h"
-+
-+namespace core {
-+
-+const char* DhtManager::dht_settings[dht_settings_num] = { "disable", "off", "auto", "on" };
-+
-+DhtManager::~DhtManager() {
-+  priority_queue_erase(&taskScheduler, &m_updateTimeout);
-+  priority_queue_erase(&taskScheduler, &m_stopTimeout);
-+}
-+
-+void
-+DhtManager::load_dht_cache() {
-+  if (m_start == dht_disable || !control->core()->download_store()->is_enabled())
-+    return;
-+
-+  torrent::Object cache(torrent::Object::TYPE_MAP);
-+  std::fstream cache_file((control->core()->download_store()->path() + "rtorrent.dht_cache").c_str(), std::ios::in | std::ios::binary);
-+
-+  if (cache_file.is_open()) {
-+    cache_file >> cache;
-+
-+    if (cache_file.fail())
-+      throw torrent::input_error("Invalid DHT cache.");
-+  }
-+
-+  try {
-+    torrent::dht_manager()->initialize(cache);
-+
-+    if (m_start == dht_on)
-+      start_dht();
-+
-+  } catch (torrent::local_error& e) {
-+   control->core()->push_log((std::string("DHT error: ") + e.what()).c_str());
-+  }
-+}
-+
-+void
-+DhtManager::start_dht() {
-+  priority_queue_erase(&taskScheduler, &m_stopTimeout);
-+
-+  if (torrent::dht_manager()->is_active() || !torrent::dht_manager()->is_valid())
-+    return;
-+
-+  int port = rpc::call_command_value("get_dht_port");
-+  if (port <= 0)
-+    return;
-+
-+  char msg[128];
-+  snprintf(msg, sizeof(msg), "Starting DHT server on port %d.", port);
-+  control->core()->push_log(msg);
-+
-+  try {
-+    torrent::dht_manager()->start(port);
-+
-+    m_updateTimeout.set_slot(rak::mem_fn(this, &DhtManager::update));
-+    priority_queue_insert(&taskScheduler, &m_updateTimeout, (cachedTime + rak::timer::from_seconds(60)).round_seconds());
-+
-+    m_dhtPrevCycle = 0;
-+    m_dhtPrevQueriesSent = 0;
-+    m_dhtPrevRepliesReceived = 0;
-+    m_dhtPrevQueriesReceived = 0;
-+    m_dhtPrevBytesUp = 0;
-+    m_dhtPrevBytesDown = 0;
-+
-+  } catch (torrent::local_error& e) {
-+    control->core()->push_log((std::string("DHT error: ") + e.what()).c_str());
-+    m_start = dht_off;
-+  }
-+}
-+
-+void
-+DhtManager::stop_dht() {
-+  priority_queue_erase(&taskScheduler, &m_updateTimeout);
-+  priority_queue_erase(&taskScheduler, &m_stopTimeout);
-+  if (m_stopTimeout.is_queued())
-+    priority_queue_erase(&taskScheduler, &m_stopTimeout);
-+
-+  if (torrent::dht_manager()->is_active()) {
-+    log_statistics(true);
-+    control->core()->push_log("Stopping DHT server.");
-+    torrent::dht_manager()->stop();
-+  }
-+}
-+
-+void
-+DhtManager::save_dht_cache() {
-+  if (!control->core()->download_store()->is_enabled() || !torrent::dht_manager()->is_active())
-+    return;
-+
-+  std::string filename = control->core()->download_store()->path() + "rtorrent.dht_cache";
-+  std::string filename_tmp = filename + ".new";
-+  std::fstream cache_file(filename_tmp.c_str(), std::ios::out | std::ios::trunc);
-+
-+  if (!cache_file.is_open())
-+    return;
-+
-+  torrent::Object cache(torrent::Object::TYPE_MAP);
-+  cache_file << *torrent::dht_manager()->store_cache(&cache);
-+
-+  if (!cache_file.good())
-+    return;
-+
-+  cache_file.close();
-+
-+  ::rename(filename_tmp.c_str(), filename.c_str());
-+}
-+
-+void
-+DhtManager::set_start(const std::string& arg) {
-+  int i;
-+  for (i = 0; i < dht_settings_num; i++) {
-+    if (arg == dht_settings[i]) {
-+      m_start = i;
-+      break;
-+    }
-+  }
-+
-+  if (i == dht_settings_num)
-+    throw torrent::input_error("Invalid argument.");
-+
-+  if (m_start == dht_off)
-+    stop_dht();
-+  else if (m_start == dht_on)
-+    start_dht();
-+}
-+
-+void
-+DhtManager::update() {
-+  if (!torrent::dht_manager()->is_active())
-+    throw torrent::internal_error("DhtManager::update called with DHT inactive.");
-+
-+  if (m_start == dht_auto && !m_stopTimeout.is_queued()) {
-+    DownloadList::const_iterator itr = std::find_if(control->core()->download_list()->begin(), control->core()->download_list()->end(), std::mem_fun(&Download::is_active));
-+    if (itr == control->core()->download_list()->end()) {
-+      m_stopTimeout.set_slot(rak::mem_fn(this, &DhtManager::stop_dht));
-+      priority_queue_insert(&taskScheduler, &m_stopTimeout, (cachedTime + rak::timer::from_seconds(15 * 60)).round_seconds());
-+    }
-+  }
-+
-+  // While bootstrapping (log_statistics returns true), check every minute if it completed, otherwise update every 15 minutes.
-+  if (log_statistics(false))
-+    priority_queue_insert(&taskScheduler, &m_updateTimeout, (cachedTime + rak::timer::from_seconds(60)).round_seconds());
-+  else
-+    priority_queue_insert(&taskScheduler, &m_updateTimeout, (cachedTime + rak::timer::from_seconds(15 * 60)).round_seconds());
-+}
-+
-+bool
-+DhtManager::log_statistics(bool force) {
-+  torrent::DhtManager::statistics_type stats = torrent::dht_manager()->get_statistics();
-+
-+  // Check for firewall problems.
-+
-+  if (stats.cycle > 2 && stats.queries_sent - m_dhtPrevQueriesSent > 100 && stats.queries_received == m_dhtPrevQueriesReceived) {
-+    // We should have had clients ping us at least but have received
-+    // nothing, that means the UDP port is probably unreachable.
-+    if (torrent::dht_manager()->can_receive_queries())
-+      control->core()->push_log("Warning: DHT port appears to be unreachable, no queries received.");
-+
-+    torrent::dht_manager()->set_can_receive(false);
-+  }
-+
-+  if (stats.queries_sent - m_dhtPrevQueriesSent > stats.num_nodes * 2 + 20 && stats.replies_received == m_dhtPrevRepliesReceived) {
-+    // No replies to over 20 queries plus two per node we have. Probably firewalled.
-+    if (!m_warned)
-+      control->core()->push_log("Warning: DHT port appears to be firewalled, no replies received.");
-+
-+    m_warned = true;
-+    return false;
-+  }
-+
-+  m_warned = false;
-+
-+  if (stats.queries_received > m_dhtPrevQueriesReceived)
-+    torrent::dht_manager()->set_can_receive(true);
-+
-+  // Nothing to log while bootstrapping, but check again every minute.
-+  if (stats.cycle <= 1) {
-+    m_dhtPrevCycle = stats.cycle;
-+    return true;
-+  }
-+
-+  // If bootstrap completed between now and the previous check, notify user.
-+  if (m_dhtPrevCycle == 1) {
-+    char buffer[128];
-+    snprintf(buffer, sizeof(buffer), "DHT bootstrap complete, have %d nodes in %d buckets.", stats.num_nodes, stats.num_buckets);
-+    control->core()->get_log_complete().push_front(buffer);
-+    m_dhtPrevCycle = stats.cycle;
-+    return false;
-+  };
-+
-+  // Standard DHT statistics on first real cycle, and every 8th cycle
-+  // afterwards (i.e. every 2 hours), or when forced.
-+  if ((force && stats.cycle != m_dhtPrevCycle) || stats.cycle == 3 || stats.cycle > m_dhtPrevCycle + 7) {
-+    char buffer[256];
-+    snprintf(buffer, sizeof(buffer),
-+             "DHT statistics: %d queries in, %d queries out, %d replies received, %lld bytes read, %lld bytes sent, "
-+             "%d known nodes in %d buckets, %d peers (highest: %d) tracked in %d torrents.",
-+             stats.queries_received - m_dhtPrevQueriesReceived,
-+             stats.queries_sent - m_dhtPrevQueriesSent,
-+             stats.replies_received - m_dhtPrevRepliesReceived,
-+             stats.down_rate.total() - m_dhtPrevBytesDown,
-+             stats.up_rate.total() - m_dhtPrevBytesUp,
-+             stats.num_nodes,
-+             stats.num_buckets,
-+             stats.num_peers,
-+             stats.max_peers,
-+             stats.num_trackers);
-+
-+    control->core()->get_log_complete().push_front(buffer);
-+
-+    m_dhtPrevCycle = stats.cycle;
-+    m_dhtPrevQueriesSent = stats.queries_sent;
-+    m_dhtPrevRepliesReceived = stats.replies_received;
-+    m_dhtPrevQueriesReceived = stats.queries_received;
-+    m_dhtPrevBytesUp = stats.up_rate.total();
-+    m_dhtPrevBytesDown = stats.down_rate.total();
-+  }
-+
-+ return false;
-+}
-+
-+torrent::Object
-+DhtManager::dht_statistics() {
-+  torrent::Object dhtStats(torrent::Object::TYPE_MAP);
-+
-+  dhtStats.insert_key("dht",              dht_settings[m_start]);
-+  dhtStats.insert_key("active",           torrent::dht_manager()->is_active());
-+
-+  if (torrent::dht_manager()->is_active()) {
-+    torrent::DhtManager::statistics_type stats = torrent::dht_manager()->get_statistics();
-+
-+    dhtStats.insert_key("cycle",            stats.cycle);
-+    dhtStats.insert_key("queries_received", stats.queries_received);
-+    dhtStats.insert_key("queries_sent",     stats.queries_sent);
-+    dhtStats.insert_key("replies_received", stats.replies_received);
-+    dhtStats.insert_key("bytes_read",       stats.down_rate.total());
-+    dhtStats.insert_key("bytes_written",    stats.up_rate.total());
-+    dhtStats.insert_key("nodes",            stats.num_nodes);
-+    dhtStats.insert_key("buckets",          stats.num_buckets);
-+    dhtStats.insert_key("peers",            stats.num_peers);
-+    dhtStats.insert_key("peers_max",        stats.max_peers);
-+    dhtStats.insert_key("torrents",         stats.num_trackers);
-+  }
-+
-+  return dhtStats;
-+}
-+
-+}
-Index: rtorrent/src/core/dht_manager.h
-===================================================================
---- rtorrent/src/core/dht_manager.h	(revision 0)
-+++ rtorrent/src/core/dht_manager.h	(revision 0)
-@@ -0,0 +1,89 @@
-+// rTorrent - BitTorrent client
-+// Copyright (C) 2005-2007, Jari Sundell
-+//
-+// This program is free software; you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation; either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+//
-+// In addition, as a special exception, the copyright holders give
-+// permission to link the code of portions of this program with the
-+// OpenSSL library under certain conditions as described in each
-+// individual source file, and distribute linked combinations
-+// including the two.
-+//
-+// You must obey the GNU General Public License in all respects for
-+// all of the code used other than OpenSSL.  If you modify file(s)
-+// with this exception, you may extend this exception to your version
-+// of the file(s), but you are not obligated to do so.  If you do not
-+// wish to do so, delete this exception statement from your version.
-+// If you delete this exception statement from all source files in the
-+// program, then also delete it here.
-+//
-+// Contact:  Jari Sundell 
-+//
-+//           Skomakerveien 33
-+//           3185 Skoppum, NORWAY
-+
-+#ifndef RTORRENT_CORE_DHT_MANAGER_H
-+#define RTORRENT_CORE_DHT_MANAGER_H
-+
-+#include 
-+
-+#include 
-+
-+namespace core {
-+
-+class DhtManager {
-+public:
-+  DhtManager() : m_warned(false), m_start(dht_off) { }
-+  ~DhtManager();
-+
-+  void                load_dht_cache();
-+  void                save_dht_cache();
-+  torrent::Object     dht_statistics();
-+
-+  void                start_dht();
-+  void                stop_dht();
-+  void                auto_start()                 { if (m_start == dht_auto) start_dht(); }
-+
-+  void                set_start(const std::string& arg);
-+
-+private:
-+  static const int    dht_disable = 0;
-+  static const int    dht_off     = 1;
-+  static const int    dht_auto    = 2;
-+  static const int    dht_on      = 3;
-+
-+  static const int    dht_settings_num = 4;
-+  static const char*  dht_settings[dht_settings_num];
-+
-+  void                update();
-+  bool                log_statistics(bool force);
-+
-+  unsigned int        m_dhtPrevCycle;
-+  unsigned int        m_dhtPrevQueriesSent;
-+  unsigned int        m_dhtPrevRepliesReceived;
-+  unsigned int        m_dhtPrevQueriesReceived;
-+  uint64_t            m_dhtPrevBytesUp;
-+  uint64_t            m_dhtPrevBytesDown;
-+
-+  rak::priority_item  m_updateTimeout;
-+  rak::priority_item  m_stopTimeout;
-+  bool                m_warned;
-+
-+  int                 m_start;
-+};
-+
-+}
-+
-+#endif
-Index: rtorrent/src/core/manager.cc
-===================================================================
---- rtorrent/src/core/manager.cc	(revision 975)
-+++ rtorrent/src/core/manager.cc	(working copy)
-@@ -242,6 +242,9 @@
-
-   m_downloadList->clear();
-
-+  // When we implement asynchronous DNS lookups, we need to cancel them
-+  // here before the torrent::* objects are deleted.
-+
-   torrent::cleanup();
-   CurlStack::global_cleanup();
-
-Index: rtorrent/src/core/Makefile.am
-===================================================================
---- rtorrent/src/core/Makefile.am	(revision 975)
-+++ rtorrent/src/core/Makefile.am	(working copy)
-@@ -5,6 +5,8 @@
- 	curl_get.h \
- 	curl_stack.cc \
- 	curl_stack.h \
-+	dht_manager.cc \
-+	dht_manager.h \
- 	download.cc \
- 	download.h \
- 	download_factory.cc \
-Index: rtorrent/src/control.cc
-===================================================================
---- rtorrent/src/control.cc	(revision 975)
-+++ rtorrent/src/control.cc	(working copy)
-@@ -44,6 +44,7 @@
- #include "core/download_store.h"
- #include "core/view_manager.h"
- #include "core/scheduler.h"
-+#include "core/dht_manager.h"
-
- #include "display/canvas.h"
- #include "display/window.h"
-@@ -75,6 +76,7 @@
-   m_core        = new core::Manager();
-   m_viewManager = new core::ViewManager(m_core->download_list());
-   m_scheduler   = new core::Scheduler(m_core->download_list());
-+  m_dhtManager  = new core::DhtManager();
-
-   m_inputStdin->slot_pressed(sigc::mem_fun(m_input, &input::Manager::pressed));
-
-@@ -95,6 +97,7 @@
-   delete m_display;
-   delete m_core;
-   delete m_scheduler;
-+  delete m_dhtManager;
- }
-
- void
-Index: rtorrent/src/display/utils.cc
-===================================================================
---- rtorrent/src/display/utils.cc	(revision 975)
-+++ rtorrent/src/display/utils.cc	(working copy)
-@@ -191,8 +191,8 @@
-   } else if (d->tracker_list()->is_busy() && d->tracker_list()->focus() < d->tracker_list()->size()) {
-     torrent::TrackerList* tl = d->tracker_list();
-
--    first = print_buffer(first, last, "Tracker[%i:%i]: Connecting to %s",
--                         tl->get(tl->focus()).group(), tl->focus(), tl->get(tl->focus()).url().c_str());
-+    first = print_buffer(first, last, "Tracker[%i:%i]: Connecting to %s %s",
-+                         tl->get(tl->focus()).group(), tl->focus(), tl->get(tl->focus()).url().c_str(), tl->get(tl->focus()).status().c_str());
-
-   } else if (!d->message().empty()) {
-     first = print_buffer(first, last, "%s", d->message().c_str());
-Index: rtorrent/src/display/window_tracker_list.cc
-===================================================================
---- rtorrent/src/display/window_tracker_list.cc	(revision 975)
-+++ rtorrent/src/display/window_tracker_list.cc	(working copy)
-@@ -91,7 +91,7 @@
-     m_canvas->print(4, pos++, "Id: %s Focus: %s Enabled: %s Open: %s S/L: %u/%u",
-                     rak::copy_escape_html(tracker.tracker_id()).c_str(),
-                     range.first == tl->focus() ? "yes" : " no",
--                    tracker.is_enabled() ? "yes" : " no",
-+                    tracker.is_usable() ? "yes" : tracker.is_enabled() ? "off" : " no",
-                     tracker.is_open() ? "yes" : " no",
-                     tracker.scrape_complete(),
-                     tracker.scrape_incomplete());
-Index: rtorrent/src/control.h
-===================================================================
---- rtorrent/src/control.h	(revision 975)
-+++ rtorrent/src/control.h	(working copy)
-@@ -51,6 +51,7 @@
-   class Manager;
-   class ViewManager;
-   class Scheduler;
-+  class DhtManager;
- }
-
- namespace display {
-@@ -89,6 +90,7 @@
-   core::Manager*      core()                        { return m_core; }
-   core::ViewManager*  view_manager()                { return m_viewManager; }
-   core::Scheduler*    scheduler()                   { return m_scheduler; }
-+  core::DhtManager*   dht_manager()                 { return m_dhtManager; }
-
-   torrent::Poll*      poll();
-
-@@ -118,6 +120,7 @@
-   core::Manager*      m_core;
-   core::ViewManager*  m_viewManager;
-   core::Scheduler*    m_scheduler;
-+  core::DhtManager*   m_dhtManager;
-
-   ui::Root*           m_ui;
-   display::Manager*   m_display;
-Index: rtorrent/src/main.cc
-===================================================================
---- rtorrent/src/main.cc	(revision 975)
-+++ rtorrent/src/main.cc	(working copy)
-@@ -49,6 +49,7 @@
- #include 
- #endif
-
-+#include "core/dht_manager.h"
- #include "core/download.h"
- #include "core/download_factory.h"
- #include "core/download_store.h"
-@@ -244,6 +245,7 @@
-
-     // Load session torrents and perform scheduled tasks to ensure
-     // session torrents are loaded before arg torrents.
-+    control->dht_manager()->load_dht_cache();
-     load_session_torrents(control);
-     rak::priority_queue_perform(&taskScheduler, cachedTime);
-
-Index: rtorrent/src/command_network.cc
-===================================================================
---- rtorrent/src/command_network.cc	(revision 975)
-+++ rtorrent/src/command_network.cc	(working copy)
-@@ -41,10 +41,12 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-
-+#include "core/dht_manager.h"
- #include "core/download.h"
- #include "core/manager.h"
- #include "rpc/scgi.h"
-@@ -119,7 +121,42 @@
- void apply_hash_interval(int arg)                { torrent::set_hash_interval(arg * 1000); }
- void apply_encoding_list(const std::string& arg) { torrent::encoding_list()->push_back(arg); }
-
-+struct call_add_node_t {
-+  call_add_node_t(int port) : m_port(port) { }
-+
-+  void operator() (const sockaddr* sa, int err) {
-+    if (sa == NULL)
-+      control->core()->push_log("Could not resolve host.");
-+    else
-+      torrent::dht_manager()->add_node(sa, m_port, false);
-+  }
-+
-+  int m_port;
-+};
-+
- void
-+apply_dht_add_node(const std::string& arg) {
-+  if (!torrent::dht_manager()->is_valid())
-+    throw torrent::input_error("DHT not enabled.");
-+
-+  int port, ret;
-+  char dummy;
-+  char host[1024];
-+
-+  ret = std::sscanf(arg.c_str(), "%1023[^:]:%i%c", host, &port, &dummy);
-+
-+  if (ret == 1)
-+    port = 6881;
-+  else if (ret != 2)
-+    throw torrent::input_error("Could not parse host.");
-+
-+  if (port < 1 || port > 65535)
-+    throw torrent::input_error("Invalid port number.");
-+
-+  torrent::connection_manager()->resolver()(host, (int)rak::socket_address::pf_inet, SOCK_DGRAM, call_add_node_t(port));
-+}
-+
-+void
- apply_enable_trackers(int64_t arg) {
-   for (core::Manager::DListItr itr = control->core()->download_list()->begin(), last = control->core()->download_list()->end(); itr != last; ++itr) {
-     torrent::TrackerList tl = (*itr)->download()->tracker_list();
-@@ -324,6 +361,11 @@
-   ADD_COMMAND_VALUE_UN("enable_trackers",       std::ptr_fun(&apply_enable_trackers));
-   ADD_COMMAND_STRING_UN("encoding_list",        std::ptr_fun(&apply_encoding_list));
-
-+  ADD_VARIABLE_VALUE("dht_port", 6881);
-+  ADD_COMMAND_STRING_UN("dht",                  rak::make_mem_fun(control->dht_manager(), &core::DhtManager::set_start));
-+  ADD_COMMAND_STRING_UN("dht_add_node",         std::ptr_fun(&apply_dht_add_node));
-+  ADD_COMMAND_VOID("dht_statistics",            rak::make_mem_fun(control->dht_manager(), &core::DhtManager::dht_statistics));
-+
-   ADD_VARIABLE_BOOL("peer_exchange", false);
-
-   // Not really network stuff:
From crazy at frugalware.org  Tue Dec  4 18:21:29 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 18:21:31 2007
Subject: [Frugalware-git] frugalware-current: thunderbird-2.0.0.9-1-i686
Message-ID: <20071204172129.A531811904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4dfe3e9f0f268df4836ee613d1c35fe7fd032fb2

commit 4dfe3e9f0f268df4836ee613d1c35fe7fd032fb2
Author: crazy 
Date:   Tue Dec 4 18:15:33 2007 +0100

thunderbird-2.0.0.9-1-i686
* Version bump
* closes #2515

diff --git a/source/xapps/thunderbird/20-use-pangocairo.patch b/source/xapps/thunderbird/20-use-pangocairo.patch
deleted file mode 100644
index 608e803..0000000
--- a/source/xapps/thunderbird/20-use-pangocairo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft	2005-08-18 22:41:26.000000000 -0400
-+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp	2005-08-18 22:38:01.000000000 -0400
-@@ -40,7 +40,7 @@
- #define PANGO_ENABLE_ENGINE
-
- #include "mozilla-decoder.h"
--#include 
-+#include 
- #include 
- #include 
- #include 
-@@ -208,7 +208,7 @@
-         }
-     }
-
--    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
-                                             mozilla_find_decoder,
-                                             NULL,
-                                             NULL);
diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild
index 394dfe7..1254443 100644
--- a/source/xapps/thunderbird/FrugalBuild
+++ b/source/xapps/thunderbird/FrugalBuild
@@ -3,8 +3,8 @@
# Contributor: Krisztian VASAS 

pkgname=thunderbird
-pkgver=2.0.0.6
-pkgrel=2
+pkgver=2.0.0.9
+pkgrel=1
pkgdesc="Mozilla Thunderbird mail and newsgroup client"
url="http://www.mozilla.org/products/thunderbird/"
depends=('gtk+2>=2.10.11' 'nss>=3.11.5' 'pango>=1.16.2' 'cairo>=1.4.4' 'libstdc++' 'libxt' 'libidl' 'libxcb')
@@ -22,13 +22,12 @@ source=(http://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/so
10-firefox-PR1-gnome-vfs-default-app.patch \
18-firefox-1.5-makeopts.patch \
19-$pkgname-1.5-locale.diff \
-	20-use-pangocairo.patch \
mozilla-$pkgname.desktop \
$pkgname.desktop
$pkgname-frugalware-default-prefs.js \
$pkgname.png \
$pkgname-rebuild-databases.pl)
-signatures=("${source[0]}.asc" '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+signatures=("${source[0]}.asc" '' '' '' '' '' '' '' '' '' '' '' '' '')

build()
{
From crazy at frugalware.org  Tue Dec  4 18:29:48 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 18:29:51 2007
Subject: [Frugalware-git] 
	playground: kdeutils-3.96.1_744699-0playground1-i686
Message-ID: <20071204172948.9370811904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=1083485fef6fa1a9d7243e665c751a6bdd183cfa

commit 1083485fef6fa1a9d7243e665c751a6bdd183cfa
Author: crazy 
Date:   Tue Dec 4 18:25:57 2007 +0100

kdeutils-3.96.1_744699-0playground1-i686
* Version bump

diff --git a/source/kde4/kdeutils/FrugalBuild b/source/kde4/kdeutils/FrugalBuild
index 6e4b5ad..4dfb25b 100644
--- a/source/kde4/kdeutils/FrugalBuild
+++ b/source/kde4/kdeutils/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=kdeutils
-pkgver=3.96.1_743145
+pkgver=3.96.1_744699
pkgrel=0playground1
pkgdesc="KDE General Utilities"
depends=()
@@ -13,7 +13,7 @@ options=('nomirror') # empty
_F_kde4_subpkgs=('kgpg' 'superkaramba' 'ktimer' 'khexedit' 'kfloppy' 'ark' 'kjots' 'kcalc' 'kdessh' 'sweeper' 'kwallet' 'kcharselect')
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2)
-sha1sums=('9d29d6592da154eaea408f569246ed4e71edd006')
+sha1sums=('6befb1fcf1cca32828595de7d1c9d15df186df71')


subpkgs=("${_F_kde4_subpkgs[@]}" 'kwikdisk' 'kregexpeditor' 'libkmilo' 'kmilo-asus' 'kmilo-dell' 'kmilo-thinkpad' 'kmilo-vaio')
From vmiklos at frugalware.org  Tue Dec  4 18:32:08 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 18:32:10 2007
Subject: [Frugalware-git] bmf: libtorrent-0.11.9.1013-1bmf1-i686
Message-ID: <20071204173208.34AF911904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=80dd3ec80881f72eb379b7c458952f7b7886a15f

commit 80dd3ec80881f72eb379b7c458952f7b7886a15f
Author: Miklos Vajna 
Date:   Tue Dec 4 18:32:01 2007 +0100

libtorrent-0.11.9.1013-1bmf1-i686
i forgot that libtorrent has a different version to rtorrent

diff --git a/source/lib-extra/libtorrent/FrugalBuild b/source/lib-extra/libtorrent/FrugalBuild
index 3f91f8c..e822123 100644
--- a/source/lib-extra/libtorrent/FrugalBuild
+++ b/source/lib-extra/libtorrent/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi 

pkgname=libtorrent
-pkgver=0.7.9.1013
+pkgver=0.11.9.1013
pkgrel=1bmf1
pkgdesc="LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code."
url="http://libtorrent.rakshasa.no/"
From vmiklos at frugalware.org  Tue Dec  4 18:32:52 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Tue Dec  4 18:32:54 2007
Subject: [Frugalware-git] bmf: rtorrent-0.7.9.1013-1bmf1-i686
Message-ID: <20071204173252.9BE9F11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=e851c2573c8a0b441951c01c78be078006fb2f30

commit e851c2573c8a0b441951c01c78be078006fb2f30
Author: Miklos Vajna 
Date:   Tue Dec 4 18:32:45 2007 +0100

rtorrent-0.7.9.1013-1bmf1-i686
depends() fix

diff --git a/source/network-extra/rtorrent/FrugalBuild b/source/network-extra/rtorrent/FrugalBuild
index 605c21b..192d52f 100644
--- a/source/network-extra/rtorrent/FrugalBuild
+++ b/source/network-extra/rtorrent/FrugalBuild
@@ -6,7 +6,7 @@ pkgver=0.7.9.1013
pkgrel=1bmf1
pkgdesc="The ncurses client for libtorrent."
url="http://libtorrent.rakshasa.no/"
-depends=('ncurses' 'libtorrent>=0.7.9.1013' 'xmlrpc-c>=1.11.00')
+depends=('ncurses' 'libtorrent>=0.11.9.1013' 'xmlrpc-c>=1.11.00')
groups=('network-extra')
archs=('i686' 'x86_64')
Fconfopts="$Fconfopts --with-xmlrpc-c"
From hermier at frugalware.org  Tue Dec  4 18:33:06 2007
From: hermier at frugalware.org (Michel Hermier)
Date: Tue Dec  4 18:33:08 2007
Subject: [Frugalware-git] homepage-ng: news_fr.xml
Message-ID: <20071204173306.BCB5F11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=d5cc7f57104a5f46a3d7d78b429b981fc17309f9

commit d5cc7f57104a5f46a3d7d78b429b981fc17309f9
Author: Michel Hermier 
Date:   Tue Dec 4 18:32:57 2007 +0100

news_fr.xml
* Translate last post about 0.8pre1

diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml
index 622e54c..e11510d 100644
--- a/frugalware/xml/news_fr.xml
+++ b/frugalware/xml/news_fr.xml
@@ -16,14 +16,90 @@



-  
+	
+		79
+		Frugalware 0.8pre1 (Kalgan) est disponible
+		Tue Dec  4 09:33:56 CET 2007
+		VMiklos
+		0
+		announcer la disponibilitÊ disponibilitÊ de Frugalware 0.8pre1, le premier aperçu technique de la prochaine version stable 0.8.
    
+			Une liste courte et incomplète des changements depuis 0.7:
    
+			
      
+				
    • Paquets mis Ă  jour:
+					
        
+						
      • Corrections Linux 2.6.23 +
        • 
+						
      • Librarie GNU C 2.7
        • 
+						
      • GCC 4.2.2
        • 
+						
      • espgs est dĂŠsormais remplacĂŠ par la version stable de ghostscript
        • 
+						
      • compiz-fusion remplace beryl, la plupart des utilisateurs peuvent dĂŠsormais ĂŠviter XGL
        • 
+						
      • plus de 600 autres mise Ă  jour
        • 
+						
      • plus de 100 nouveau paquets, dont 20 nouveau jeux
        • 
+					
      
+				
      • 
+				
    • Nouvelles fonctionnalitĂŠs:
+					
        
+						
      • Ajout de FUN (Frugalware Update Notifier), qui notifie quand une mise Ă  jour est disponible depuis le system tray utilisateur.
        • 
+						
      • Ajout du support de WPA lors de l'installation.
        • 
+					
      
+				
      • 
+			
    
+			Veuillez vous rĂŠfĂŠrer Ă  la Frugalware Testing ChangeLog pour plus d'informations.
    
+			TĂŠlĂŠchargements pour i686:
    
+			NOTE: Cliquer ici pour avoir plus d'information pour choisir le media don't vous avez besoin pour l'installation.
    
+				livecd,
+				netinstall,
+				usb,
+				tftp,
+				cd1,
+				cd2,
+				cd3,
+				cd4,
+				cd5,
+				cd6,
+				cd7,
+				cd8,
+				cd9,
+				cd10,
+				cd11,
+				cd12,
+				cd13,
+				dvd1 and
+				dvd2
+			
    
+			SHA1SUMS:
+			
    +				f6f4a62003c2f350aa11d270bc4b38b31f5cc96e  frugalware-0.8pre1-i686-cd1.iso
+				54c33672abce250d97a38d8fd126933203a6b181  frugalware-0.8pre1-i686-cd2.iso
+				a743bacd345804d78fc11aa37a7e613c9c448029  frugalware-0.8pre1-i686-cd3.iso
+				446cdc74b5636ee17440b5f52662b3f3f1096512  frugalware-0.8pre1-i686-cd4.iso
+				7b6ec80b5c423b1a7eedf0eaa4eb6ddf3bfa04b1  frugalware-0.8pre1-i686-cd5.iso
+				125eb72cc1ee89eeb1b9c0de79128a4664d8b997  frugalware-0.8pre1-i686-cd6.iso
+				4e82c7a6968b523898d0fbd1ce1089d6496823f4  frugalware-0.8pre1-i686-cd7.iso
+				59e9e891a2227b521d84abf9efd87b1298eed235  frugalware-0.8pre1-i686-cd8.iso
+				cc66aa7f5fe3dd2bdbe3f868228b9cf9e7551a70  frugalware-0.8pre1-i686-cd9.iso
+				02e578aa85d125284556988cdb25360ff9111960  frugalware-0.8pre1-i686-cd10.iso
+				28ccb3da4098608beb6a8f00af9ea5fd9ca8c1c2  frugalware-0.8pre1-i686-cd11.iso
+				ed06c325ecfa07e52fdc063c7ff097134575e6e9  frugalware-0.8pre1-i686-cd12.iso
+				f32a6279c7158f2cdc61edb911e4b77f410d0b03  frugalware-0.8pre1-i686-cd13.iso
+				a1321a1f978bfedf8cf7fdd33c90e858bd881e10  frugalware-0.8pre1-i686-dvd1.iso
+				8b4199630cda32bd91b3cea94c461e7f86c875c7  frugalware-0.8pre1-i686-dvd2.iso
+				3667e2f2a710a87f266a465500393a0cb2c341dc  frugalware-0.8pre1-i686-net.iso
+				64e0e9c40772e573824a950437490a5165edba15  fwlive-0.8pre1-i686-full.iso
+				1c103ed0f0a5f86df03350efbddba696ee7203f4  frugalware-0.8pre1-i686-tftp.img.gz
+				2fb3b8863079fb17ed6971226f5d996bd149e07d  frugalware-0.8pre1-i686-usb.tar.gz
+			
    
+			]]>
+		      
+	    
+	
78
Lettre d'information Frugalware numĂŠro 10
Sat Nov 24 17:54:01 CET 2007
Hermier
0
ici (en anglais) ou ici (en français). Nous esperons que vous l'apprÊcierez!
+			Le dixième numÊro de notre lettre d'information est disponible! Vous pouez la lire ici (en anglais) ou ici (en français). Nous esperons que vous l'apprÊcierez!
]]>


@@ -50,7 +126,7 @@
    

76
-		Frugalware 0.7 (Sayshell) for i686 and x86_64 released
+		Frugalware 0.7 (Sayshell) pour i686 et x86_64 est disponible
Sat Oct 13 02:58:26 CEST 2007
hermier
0
@@ -112,41 +188,41 @@
NOTE: Ne tÊlÊchargez pas les CD 3 à 13, ou le deuxième DVD à moins que vous n'ayez pas de connexion internet.
    
SHA1SUMs:

    -11d369eef484e64f1583364456491530d24701b7  frugalware-0.7-i686-cd10.iso
-c3d1630241a99f6f4936079b40c5fd93a417a9dc  frugalware-0.7-i686-cd11.iso
-0b3c25ac25d711fed156ce93d30b78c918c0defa  frugalware-0.7-i686-cd12.iso
-c91e25732f12519877a04e1f1c40078014890902  frugalware-0.7-i686-cd13.iso
-6d91662500224636efb58ecc9a19630fdb2d0755  frugalware-0.7-i686-cd1.iso
-3d0e566b39b09c7b348296711fa3c2b8cb7ea0f6  frugalware-0.7-i686-cd2.iso
-c1c06e429e4fd9df66d4de4c77a94ecb26fed5c8  frugalware-0.7-i686-cd3.iso
-3499cf0871539e855c2482fc6a7fb186db9052ce  frugalware-0.7-i686-cd4.iso
-621dc063927d3cb8a5c8aa4871d16d0dea2f93e3  frugalware-0.7-i686-cd5.iso
-b41da52c3b508f6a93d2d091617469ac758aeeab  frugalware-0.7-i686-cd6.iso
-af5c63ad65bd427b4655824dcac7155e5fb19166  frugalware-0.7-i686-cd7.iso
-00ef74ff9e853dc73b81d7405edb2e2ed36016a2  frugalware-0.7-i686-cd8.iso
-a89f34f212322e5c14ad288003536fb84e62106b  frugalware-0.7-i686-cd9.iso
-f6f731a45467274bcc1f7d987f3ccef6697dec03  frugalware-0.7-i686-dvd1.iso
-0443681c558f231b408e4add725635afe1b48af6  frugalware-0.7-i686-dvd2.iso
-b586b9aac75adea46f016572feb555b165b4de7b  frugalware-0.7-i686-net.iso
-a34ac62fa9c246d173a05f6fb4225745552ca0f2  frugalware-0.7-x86_64-cd10.iso
-dcbdff4b359a6ab1defe4aad59dce894a5cd658c  frugalware-0.7-x86_64-cd11.iso
-95a3d041031f4882883ff3d6fac351679dd2639e  frugalware-0.7-x86_64-cd1.iso
-89e82b51651843b666bff27d628e6ff16dc25594  frugalware-0.7-x86_64-cd2.iso
-0b7c8132f06501ba1749421183fbff509be2a80d  frugalware-0.7-x86_64-cd3.iso
-7b4451c9e6bab916ef8c0c33877526efb6785560  frugalware-0.7-x86_64-cd4.iso
-93fcdbeb35ee53179c32e882554980653b741b28  frugalware-0.7-x86_64-cd5.iso
-9887a9c6aea1ea9280b24f727287647d6be67434  frugalware-0.7-x86_64-cd6.iso
-82be4a85f8a3e80a357a62fa68aa4716fe6ff5b9  frugalware-0.7-x86_64-cd7.iso
-339d026a332e48a08cf735e123f6d71ec38e56e6  frugalware-0.7-x86_64-cd8.iso
-4d7846c6eef3308853acdeead0c2b253c3356a45  frugalware-0.7-x86_64-cd9.iso
-f636f27e02b98d270cb1947c187c27315c5b6e2b  frugalware-0.7-x86_64-dvd1.iso
-9b3646267dd40c38267566d5e1cdd096f79ddf24  frugalware-0.7-x86_64-dvd2.iso
-00d94d04c1bf3b7fc6030b7e7aac1e27e85fed82  frugalware-0.7-x86_64-net.iso
-eb039c92347aa3c13b14b51ed93031853de9cc5d  fwlive-0.7-i686-full.iso
-fa447a8cbd60d554905c48d379fb5d08b80e89b8  frugalware-0.7-i686-tftp.img.gz
-26d0be146804b652f0359dd0824012aaf3f3f716  frugalware-0.7-i686-usb.tar.gz
-31bd8243520f767c44ada50da287b4fe1d72a0ac  frugalware-0.7-x86_64-tftp.img.gz
-88c0be39dd0630c34e31e8482ead29f6097ee0a7  frugalware-0.7-x86_64-usb.tar.gz
+				11d369eef484e64f1583364456491530d24701b7  frugalware-0.7-i686-cd10.iso
+				c3d1630241a99f6f4936079b40c5fd93a417a9dc  frugalware-0.7-i686-cd11.iso
+				0b3c25ac25d711fed156ce93d30b78c918c0defa  frugalware-0.7-i686-cd12.iso
+				c91e25732f12519877a04e1f1c40078014890902  frugalware-0.7-i686-cd13.iso
+				6d91662500224636efb58ecc9a19630fdb2d0755  frugalware-0.7-i686-cd1.iso
+				3d0e566b39b09c7b348296711fa3c2b8cb7ea0f6  frugalware-0.7-i686-cd2.iso
+				c1c06e429e4fd9df66d4de4c77a94ecb26fed5c8  frugalware-0.7-i686-cd3.iso
+				3499cf0871539e855c2482fc6a7fb186db9052ce  frugalware-0.7-i686-cd4.iso
+				621dc063927d3cb8a5c8aa4871d16d0dea2f93e3  frugalware-0.7-i686-cd5.iso
+				b41da52c3b508f6a93d2d091617469ac758aeeab  frugalware-0.7-i686-cd6.iso
+				af5c63ad65bd427b4655824dcac7155e5fb19166  frugalware-0.7-i686-cd7.iso
+				00ef74ff9e853dc73b81d7405edb2e2ed36016a2  frugalware-0.7-i686-cd8.iso
+				a89f34f212322e5c14ad288003536fb84e62106b  frugalware-0.7-i686-cd9.iso
+				f6f731a45467274bcc1f7d987f3ccef6697dec03  frugalware-0.7-i686-dvd1.iso
+				0443681c558f231b408e4add725635afe1b48af6  frugalware-0.7-i686-dvd2.iso
+				b586b9aac75adea46f016572feb555b165b4de7b  frugalware-0.7-i686-net.iso
+				a34ac62fa9c246d173a05f6fb4225745552ca0f2  frugalware-0.7-x86_64-cd10.iso
+				dcbdff4b359a6ab1defe4aad59dce894a5cd658c  frugalware-0.7-x86_64-cd11.iso
+				95a3d041031f4882883ff3d6fac351679dd2639e  frugalware-0.7-x86_64-cd1.iso
+				89e82b51651843b666bff27d628e6ff16dc25594  frugalware-0.7-x86_64-cd2.iso
+				0b7c8132f06501ba1749421183fbff509be2a80d  frugalware-0.7-x86_64-cd3.iso
+				7b4451c9e6bab916ef8c0c33877526efb6785560  frugalware-0.7-x86_64-cd4.iso
+				93fcdbeb35ee53179c32e882554980653b741b28  frugalware-0.7-x86_64-cd5.iso
+				9887a9c6aea1ea9280b24f727287647d6be67434  frugalware-0.7-x86_64-cd6.iso
+				82be4a85f8a3e80a357a62fa68aa4716fe6ff5b9  frugalware-0.7-x86_64-cd7.iso
+				339d026a332e48a08cf735e123f6d71ec38e56e6  frugalware-0.7-x86_64-cd8.iso
+				4d7846c6eef3308853acdeead0c2b253c3356a45  frugalware-0.7-x86_64-cd9.iso
+				f636f27e02b98d270cb1947c187c27315c5b6e2b  frugalware-0.7-x86_64-dvd1.iso
+				9b3646267dd40c38267566d5e1cdd096f79ddf24  frugalware-0.7-x86_64-dvd2.iso
+				00d94d04c1bf3b7fc6030b7e7aac1e27e85fed82  frugalware-0.7-x86_64-net.iso
+				eb039c92347aa3c13b14b51ed93031853de9cc5d  fwlive-0.7-i686-full.iso
+				fa447a8cbd60d554905c48d379fb5d08b80e89b8  frugalware-0.7-i686-tftp.img.gz
+				26d0be146804b652f0359dd0824012aaf3f3f716  frugalware-0.7-i686-usb.tar.gz
+				31bd8243520f767c44ada50da287b4fe1d72a0ac  frugalware-0.7-x86_64-tftp.img.gz
+				88c0be39dd0630c34e31e8482ead29f6097ee0a7  frugalware-0.7-x86_64-usb.tar.gz

    
Si vous mettez votre système à jour vers Sayshell depuis une prÊcÊdente version (Terminus), veuillez lire la partie mise à jour de notre documentation.
    
]]>
From hermier at frugalware.org  Tue Dec  4 18:44:52 2007
From: hermier at frugalware.org (Michel Hermier)
Date: Tue Dec  4 18:44:56 2007
Subject: [Frugalware-git] homepage-ng: news_fr.xml
Message-ID: <20071204174452.8E5D911904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=14fb6509601e3f4e801f588e5065cfa3949ac6d6

commit 14fb6509601e3f4e801f588e5065cfa3949ac6d6
Author: Michel Hermier 
Date:   Tue Dec 4 18:44:35 2007 +0100

news_fr.xml
* Fix formating (I don't like 
     
    )

diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml
index e11510d..6b4f9ef 100644
--- a/frugalware/xml/news_fr.xml
+++ b/frugalware/xml/news_fr.xml
@@ -69,25 +69,25 @@

    
SHA1SUMS:

    -				f6f4a62003c2f350aa11d270bc4b38b31f5cc96e  frugalware-0.8pre1-i686-cd1.iso
-				54c33672abce250d97a38d8fd126933203a6b181  frugalware-0.8pre1-i686-cd2.iso
-				a743bacd345804d78fc11aa37a7e613c9c448029  frugalware-0.8pre1-i686-cd3.iso
-				446cdc74b5636ee17440b5f52662b3f3f1096512  frugalware-0.8pre1-i686-cd4.iso
-				7b6ec80b5c423b1a7eedf0eaa4eb6ddf3bfa04b1  frugalware-0.8pre1-i686-cd5.iso
-				125eb72cc1ee89eeb1b9c0de79128a4664d8b997  frugalware-0.8pre1-i686-cd6.iso
-				4e82c7a6968b523898d0fbd1ce1089d6496823f4  frugalware-0.8pre1-i686-cd7.iso
-				59e9e891a2227b521d84abf9efd87b1298eed235  frugalware-0.8pre1-i686-cd8.iso
-				cc66aa7f5fe3dd2bdbe3f868228b9cf9e7551a70  frugalware-0.8pre1-i686-cd9.iso
-				02e578aa85d125284556988cdb25360ff9111960  frugalware-0.8pre1-i686-cd10.iso
-				28ccb3da4098608beb6a8f00af9ea5fd9ca8c1c2  frugalware-0.8pre1-i686-cd11.iso
-				ed06c325ecfa07e52fdc063c7ff097134575e6e9  frugalware-0.8pre1-i686-cd12.iso
-				f32a6279c7158f2cdc61edb911e4b77f410d0b03  frugalware-0.8pre1-i686-cd13.iso
-				a1321a1f978bfedf8cf7fdd33c90e858bd881e10  frugalware-0.8pre1-i686-dvd1.iso
-				8b4199630cda32bd91b3cea94c461e7f86c875c7  frugalware-0.8pre1-i686-dvd2.iso
-				3667e2f2a710a87f266a465500393a0cb2c341dc  frugalware-0.8pre1-i686-net.iso
-				64e0e9c40772e573824a950437490a5165edba15  fwlive-0.8pre1-i686-full.iso
-				1c103ed0f0a5f86df03350efbddba696ee7203f4  frugalware-0.8pre1-i686-tftp.img.gz
-				2fb3b8863079fb17ed6971226f5d996bd149e07d  frugalware-0.8pre1-i686-usb.tar.gz
+f6f4a62003c2f350aa11d270bc4b38b31f5cc96e  frugalware-0.8pre1-i686-cd1.iso
+54c33672abce250d97a38d8fd126933203a6b181  frugalware-0.8pre1-i686-cd2.iso
+a743bacd345804d78fc11aa37a7e613c9c448029  frugalware-0.8pre1-i686-cd3.iso
+446cdc74b5636ee17440b5f52662b3f3f1096512  frugalware-0.8pre1-i686-cd4.iso
+7b6ec80b5c423b1a7eedf0eaa4eb6ddf3bfa04b1  frugalware-0.8pre1-i686-cd5.iso
+125eb72cc1ee89eeb1b9c0de79128a4664d8b997  frugalware-0.8pre1-i686-cd6.iso
+4e82c7a6968b523898d0fbd1ce1089d6496823f4  frugalware-0.8pre1-i686-cd7.iso
+59e9e891a2227b521d84abf9efd87b1298eed235  frugalware-0.8pre1-i686-cd8.iso
+cc66aa7f5fe3dd2bdbe3f868228b9cf9e7551a70  frugalware-0.8pre1-i686-cd9.iso
+02e578aa85d125284556988cdb25360ff9111960  frugalware-0.8pre1-i686-cd10.iso
+28ccb3da4098608beb6a8f00af9ea5fd9ca8c1c2  frugalware-0.8pre1-i686-cd11.iso
+ed06c325ecfa07e52fdc063c7ff097134575e6e9  frugalware-0.8pre1-i686-cd12.iso
+f32a6279c7158f2cdc61edb911e4b77f410d0b03  frugalware-0.8pre1-i686-cd13.iso
+a1321a1f978bfedf8cf7fdd33c90e858bd881e10  frugalware-0.8pre1-i686-dvd1.iso
+8b4199630cda32bd91b3cea94c461e7f86c875c7  frugalware-0.8pre1-i686-dvd2.iso
+3667e2f2a710a87f266a465500393a0cb2c341dc  frugalware-0.8pre1-i686-net.iso
+64e0e9c40772e573824a950437490a5165edba15  fwlive-0.8pre1-i686-full.iso
+1c103ed0f0a5f86df03350efbddba696ee7203f4  frugalware-0.8pre1-i686-tftp.img.gz
+2fb3b8863079fb17ed6971226f5d996bd149e07d  frugalware-0.8pre1-i686-usb.tar.gz

    
]]>
    
@@ -188,41 +188,41 @@
NOTE: Ne tÊlÊchargez pas les CD 3 à 13, ou le deuxième DVD à moins que vous n'ayez pas de connexion internet.
    
SHA1SUMs:

    -				11d369eef484e64f1583364456491530d24701b7  frugalware-0.7-i686-cd10.iso
-				c3d1630241a99f6f4936079b40c5fd93a417a9dc  frugalware-0.7-i686-cd11.iso
-				0b3c25ac25d711fed156ce93d30b78c918c0defa  frugalware-0.7-i686-cd12.iso
-				c91e25732f12519877a04e1f1c40078014890902  frugalware-0.7-i686-cd13.iso
-				6d91662500224636efb58ecc9a19630fdb2d0755  frugalware-0.7-i686-cd1.iso
-				3d0e566b39b09c7b348296711fa3c2b8cb7ea0f6  frugalware-0.7-i686-cd2.iso
-				c1c06e429e4fd9df66d4de4c77a94ecb26fed5c8  frugalware-0.7-i686-cd3.iso
-				3499cf0871539e855c2482fc6a7fb186db9052ce  frugalware-0.7-i686-cd4.iso
-				621dc063927d3cb8a5c8aa4871d16d0dea2f93e3  frugalware-0.7-i686-cd5.iso
-				b41da52c3b508f6a93d2d091617469ac758aeeab  frugalware-0.7-i686-cd6.iso
-				af5c63ad65bd427b4655824dcac7155e5fb19166  frugalware-0.7-i686-cd7.iso
-				00ef74ff9e853dc73b81d7405edb2e2ed36016a2  frugalware-0.7-i686-cd8.iso
-				a89f34f212322e5c14ad288003536fb84e62106b  frugalware-0.7-i686-cd9.iso
-				f6f731a45467274bcc1f7d987f3ccef6697dec03  frugalware-0.7-i686-dvd1.iso
-				0443681c558f231b408e4add725635afe1b48af6  frugalware-0.7-i686-dvd2.iso
-				b586b9aac75adea46f016572feb555b165b4de7b  frugalware-0.7-i686-net.iso
-				a34ac62fa9c246d173a05f6fb4225745552ca0f2  frugalware-0.7-x86_64-cd10.iso
-				dcbdff4b359a6ab1defe4aad59dce894a5cd658c  frugalware-0.7-x86_64-cd11.iso
-				95a3d041031f4882883ff3d6fac351679dd2639e  frugalware-0.7-x86_64-cd1.iso
-				89e82b51651843b666bff27d628e6ff16dc25594  frugalware-0.7-x86_64-cd2.iso
-				0b7c8132f06501ba1749421183fbff509be2a80d  frugalware-0.7-x86_64-cd3.iso
-				7b4451c9e6bab916ef8c0c33877526efb6785560  frugalware-0.7-x86_64-cd4.iso
-				93fcdbeb35ee53179c32e882554980653b741b28  frugalware-0.7-x86_64-cd5.iso
-				9887a9c6aea1ea9280b24f727287647d6be67434  frugalware-0.7-x86_64-cd6.iso
-				82be4a85f8a3e80a357a62fa68aa4716fe6ff5b9  frugalware-0.7-x86_64-cd7.iso
-				339d026a332e48a08cf735e123f6d71ec38e56e6  frugalware-0.7-x86_64-cd8.iso
-				4d7846c6eef3308853acdeead0c2b253c3356a45  frugalware-0.7-x86_64-cd9.iso
-				f636f27e02b98d270cb1947c187c27315c5b6e2b  frugalware-0.7-x86_64-dvd1.iso
-				9b3646267dd40c38267566d5e1cdd096f79ddf24  frugalware-0.7-x86_64-dvd2.iso
-				00d94d04c1bf3b7fc6030b7e7aac1e27e85fed82  frugalware-0.7-x86_64-net.iso
-				eb039c92347aa3c13b14b51ed93031853de9cc5d  fwlive-0.7-i686-full.iso
-				fa447a8cbd60d554905c48d379fb5d08b80e89b8  frugalware-0.7-i686-tftp.img.gz
-				26d0be146804b652f0359dd0824012aaf3f3f716  frugalware-0.7-i686-usb.tar.gz
-				31bd8243520f767c44ada50da287b4fe1d72a0ac  frugalware-0.7-x86_64-tftp.img.gz
-				88c0be39dd0630c34e31e8482ead29f6097ee0a7  frugalware-0.7-x86_64-usb.tar.gz
+11d369eef484e64f1583364456491530d24701b7  frugalware-0.7-i686-cd10.iso
+c3d1630241a99f6f4936079b40c5fd93a417a9dc  frugalware-0.7-i686-cd11.iso
+0b3c25ac25d711fed156ce93d30b78c918c0defa  frugalware-0.7-i686-cd12.iso
+c91e25732f12519877a04e1f1c40078014890902  frugalware-0.7-i686-cd13.iso
+6d91662500224636efb58ecc9a19630fdb2d0755  frugalware-0.7-i686-cd1.iso
+3d0e566b39b09c7b348296711fa3c2b8cb7ea0f6  frugalware-0.7-i686-cd2.iso
+c1c06e429e4fd9df66d4de4c77a94ecb26fed5c8  frugalware-0.7-i686-cd3.iso
+3499cf0871539e855c2482fc6a7fb186db9052ce  frugalware-0.7-i686-cd4.iso
+621dc063927d3cb8a5c8aa4871d16d0dea2f93e3  frugalware-0.7-i686-cd5.iso
+b41da52c3b508f6a93d2d091617469ac758aeeab  frugalware-0.7-i686-cd6.iso
+af5c63ad65bd427b4655824dcac7155e5fb19166  frugalware-0.7-i686-cd7.iso
+00ef74ff9e853dc73b81d7405edb2e2ed36016a2  frugalware-0.7-i686-cd8.iso
+a89f34f212322e5c14ad288003536fb84e62106b  frugalware-0.7-i686-cd9.iso
+f6f731a45467274bcc1f7d987f3ccef6697dec03  frugalware-0.7-i686-dvd1.iso
+0443681c558f231b408e4add725635afe1b48af6  frugalware-0.7-i686-dvd2.iso
+b586b9aac75adea46f016572feb555b165b4de7b  frugalware-0.7-i686-net.iso
+a34ac62fa9c246d173a05f6fb4225745552ca0f2  frugalware-0.7-x86_64-cd10.iso
+dcbdff4b359a6ab1defe4aad59dce894a5cd658c  frugalware-0.7-x86_64-cd11.iso
+95a3d041031f4882883ff3d6fac351679dd2639e  frugalware-0.7-x86_64-cd1.iso
+89e82b51651843b666bff27d628e6ff16dc25594  frugalware-0.7-x86_64-cd2.iso
+0b7c8132f06501ba1749421183fbff509be2a80d  frugalware-0.7-x86_64-cd3.iso
+7b4451c9e6bab916ef8c0c33877526efb6785560  frugalware-0.7-x86_64-cd4.iso
+93fcdbeb35ee53179c32e882554980653b741b28  frugalware-0.7-x86_64-cd5.iso
+9887a9c6aea1ea9280b24f727287647d6be67434  frugalware-0.7-x86_64-cd6.iso
+82be4a85f8a3e80a357a62fa68aa4716fe6ff5b9  frugalware-0.7-x86_64-cd7.iso
+339d026a332e48a08cf735e123f6d71ec38e56e6  frugalware-0.7-x86_64-cd8.iso
+4d7846c6eef3308853acdeead0c2b253c3356a45  frugalware-0.7-x86_64-cd9.iso
+f636f27e02b98d270cb1947c187c27315c5b6e2b  frugalware-0.7-x86_64-dvd1.iso
+9b3646267dd40c38267566d5e1cdd096f79ddf24  frugalware-0.7-x86_64-dvd2.iso
+00d94d04c1bf3b7fc6030b7e7aac1e27e85fed82  frugalware-0.7-x86_64-net.iso
+eb039c92347aa3c13b14b51ed93031853de9cc5d  fwlive-0.7-i686-full.iso
+fa447a8cbd60d554905c48d379fb5d08b80e89b8  frugalware-0.7-i686-tftp.img.gz
+26d0be146804b652f0359dd0824012aaf3f3f716  frugalware-0.7-i686-usb.tar.gz
+31bd8243520f767c44ada50da287b4fe1d72a0ac  frugalware-0.7-x86_64-tftp.img.gz
+88c0be39dd0630c34e31e8482ead29f6097ee0a7  frugalware-0.7-x86_64-usb.tar.gz

    
Si vous mettez votre système à jour vers Sayshell depuis une prÊcÊdente version (Terminus), veuillez lire la partie mise à jour de notre documentation.
    
]]>
From crazy at frugalware.org  Tue Dec  4 18:44:57 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 18:44:59 2007
Subject: [Frugalware-git] frugalware-current: tzdata-2007j-1-i686
Message-ID: <20071204174457.4F7D711904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b17748f83d9e62682778ddf755b6eb7be8b90705

commit b17748f83d9e62682778ddf755b6eb7be8b90705
Author: crazy 
Date:   Tue Dec 4 18:44:28 2007 +0100

tzdata-2007j-1-i686
* Version bump

diff --git a/source/base/tzdata/FrugalBuild b/source/base/tzdata/FrugalBuild
index debfc7a..b46d77e 100644
--- a/source/base/tzdata/FrugalBuild
+++ b/source/base/tzdata/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=tzdata
-pkgver=2007i
+pkgver=2007j
pkgrel=1
pkgdesc="Sources for time zone and daylight saving time data"
url="http://www.twinsun.com/tz/tz-link.htm"
@@ -10,17 +10,17 @@ depends=('glibc')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64')
up2date="lynx -dump -nolist ftp://elsie.nci.nih.gov/pub/|grep tzdata|sed 's/.*ta\(.*\).t.*/\1/'"
-source=(ftp://elsie.nci.nih.gov/pub/tzcode2007h.tar.gz \
+source=(ftp://elsie.nci.nih.gov/pub/tzcode${pkgver}.tar.gz \
ftp://elsie.nci.nih.gov/pub/${pkgname}${pkgver}.tar.gz \
Makefile.patch)
-sha1sums=('d04c6be80aa846d6927169b240b426d00dc6f8d9' \
-          'b13aeaae142c45183ddba5a9dc10f1c399b41c3a' \
+sha1sums=('3c7c60203dcfe472db5eeef906be155f19c90864' \
+          'c615434776c8aaa5dd5c85eaa5e33028bc66b1c9' \
'e8890681333949977ccff0b7a429ad25ed78dbcf')

build()
{
cd "$Fsrcdir"
-	tar -xf tzcode2007h.tar.gz  || Fdie
+	tar -xf tzcode${pkgver}.tar.gz  || Fdie
tar -xf ${pkgname}${pkgver}.tar.gz || Fdie
patch -p1 -i ../Makefile.patch || Fdie
make || Fdie
From crazy at frugalware.org  Tue Dec  4 18:59:47 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 18:59:49 2007
Subject: [Frugalware-git] frugalware-current: audacious-1.4.4-1-i686
Message-ID: <20071204175947.2A5BC11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=73bef27333778e091939a3712d78f25905c6d184

commit 73bef27333778e091939a3712d78f25905c6d184
Author: crazy 
Date:   Tue Dec 4 18:59:08 2007 +0100

audacious-1.4.4-1-i686
* Version bump

diff --git a/source/xmultimedia-extra/audacious/FrugalBuild b/source/xmultimedia-extra/audacious/FrugalBuild
index 241697d..7e73e67 100644
--- a/source/xmultimedia-extra/audacious/FrugalBuild
+++ b/source/xmultimedia-extra/audacious/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=audacious
-pkgver=1.4.2
+pkgver=1.4.4
pkgrel=1
pkgdesc="Audacious is a fork from BMP 0.9.7.1"
url="http://audacious-media-player.org/"
@@ -16,7 +16,7 @@ replaces=('bmp' 'bmp-docklet' 'bmp-mac')
up2date="lynx -dump 'http://audacious-media-player.org/index.php?title=Downloads'|grep -m1 '.tbz2'|sed 's/.*ious-\(.*\).t.*/\1/;s/-/_/'"
source=(http://distfiles.atheme.org/$pkgname-`echo $pkgver|sed 's/_/-/'`.tbz2)
_F_cd_path="$pkgname-`echo $pkgver|sed 's/_/-/'`"
-sha1sums=('999c7cf18c5d0521e924a21493e1841aec9621fb')
+sha1sums=('37ac3a7f879e6ca5ecb5b404d17d41aab4d7b7e8')

build()
{
From crazy at frugalware.org  Tue Dec  4 19:16:25 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 19:16:28 2007
Subject: [Frugalware-git] 
	playground: kdenetwork-3.96.1_744609-0playground1-i686
Message-ID: <20071204181625.604EA11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=2d3ab67da5c3ebbf3bd11ee77e116f69d2432d66

commit 2d3ab67da5c3ebbf3bd11ee77e116f69d2432d66
Author: crazy 
Date:   Tue Dec 4 19:11:40 2007 +0100

kdenetwork-3.96.1_744609-0playground1-i686
* Version bump

diff --git a/source/kde4/kdenetwork/FrugalBuild b/source/kde4/kdenetwork/FrugalBuild
index 1ef5d93..1d7429b 100644
--- a/source/kde4/kdenetwork/FrugalBuild
+++ b/source/kde4/kdenetwork/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy 

pkgname=kdenetwork
-pkgver=3.96.1_743146
-pkgrel=0playground2
+pkgver=3.96.1_744609
+pkgrel=0playground1
pkgdesc="KDE Networking Programs"
depends=()
makedepends=('openslp' 'libvncserver' 'kdepimlibs>=3.96.1_742565' 'libidn' 'qca' 'kdebase-workspace-libs>=3.96.1_743091' \
@@ -11,10 +11,10 @@ makedepends=('openslp' 'libvncserver' 'kdepimlibs>=3.96.1_742565' 'libidn' 'qca'
groups=('kde4')
archs=('i686')
options=('nomirror') # empty
-_F_kde4_subpkgs=('kget' 'knewsticker'  'kopete'  'kppp'  'krdc'  'krfb' "$pkgname-filesharing" 'kdnssd')
+_F_kde4_subpkgs=('kget' 'knewsticker' 'kopete'  'kppp'  'krdc'  'krfb' "$pkgname-filesharing" 'kdnssd')
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2)
-sha1sums=('7fe661124ee243c2e7b064b5de5021c615844acb')
+sha1sums=('7c727d63cf1a4991c4132df10f8453546bad1556')
## TODO : init script for lisad
## NOTE to self =) filesharing need samba , kdnssd ahavi 'running' to work right.
From crazy at frugalware.org  Tue Dec  4 19:16:23 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 19:16:29 2007
Subject: [Frugalware-git] 
	playground: kdebase-runtime-3.96.1_744367-0playground1-i686
Message-ID: <20071204181623.B9DE711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=74dd081653aec9e4adda63ba0940e1fe3cc17e02

commit 74dd081653aec9e4adda63ba0940e1fe3cc17e02
Author: crazy 
Date:   Tue Dec 4 18:49:13 2007 +0100

kdebase-runtime-3.96.1_744367-0playground1-i686
* depends() fix

diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild
index d1d444e..a4d9fc2 100644
--- a/source/kde4/kdebase-runtime/FrugalBuild
+++ b/source/kde4/kdebase-runtime/FrugalBuild
@@ -5,7 +5,7 @@ pkgname=kdebase-runtime
pkgver=3.96.1_744367
pkgrel=0playground1
pkgdesc="Programs needed at runtime by other KDE4 applications"
-depends=('libqtsvg' 'libkde>=3.96.1_743104' 'openexr' 'xine-lib' 'libsmbclient' 'xine-lib' 'kdepimlibs>=3.96.1_742565')
+depends=('libqtsvg' 'libkde>=3.96.1_743104' 'openexr' 'libsmbclient' 'xine-lib' 'kdepimlibs>=3.96.1_742565')
groups=('kde4' 'kde4-minimal')
archs=('i686')
options=('nomirror')
From crazy at frugalware.org  Tue Dec  4 19:18:01 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 19:18:04 2007
Subject: [Frugalware-git] frugalware-current: audacious-plugins-1.4.2-1-i686
Message-ID: <20071204181801.C1ECF11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e8d52681acbe295b4a8fd203026b7d1ef6b1ab3d

commit e8d52681acbe295b4a8fd203026b7d1ef6b1ab3d
Author: crazy 
Date:   Tue Dec 4 19:15:10 2007 +0100

audacious-plugins-1.4.2-1-i686
* Version bump

diff --git a/source/xmultimedia-extra/audacious-plugins/FrugalBuild b/source/xmultimedia-extra/audacious-plugins/FrugalBuild
index 0dba60c..2fc6395 100644
--- a/source/xmultimedia-extra/audacious-plugins/FrugalBuild
+++ b/source/xmultimedia-extra/audacious-plugins/FrugalBuild
@@ -2,11 +2,11 @@
# Maintainer: crazy 

pkgname=audacious-plugins
-pkgver=1.4.1
+pkgver=1.4.2
pkgrel=1
pkgdesc="Plugins for audacious."
url="http://audacious-media-player.org/"
-depends=('openssl' 'curl>=7.16.0' 'dbus-glib' 'sdl' 'audacious>=1.4.2' 'faad2' \
+depends=('openssl' 'curl>=7.16.0' 'dbus-glib' 'sdl' 'audacious>=1.4.4' 'faad2' \
'flac>=1.1.4' 'libvorbis'  'adplug>=2.1' 'libmodplug' 'unzip' 'libnms' 'glib2>=2.14.2' \
'lame' 'libmad' 'libsndfile' 'libxcomposite' 'imlib2' 'libcdio')
makedepends=('jack' 'arts' 'esd' 'libsamplerate' 'lirc' 'libprojectm>=1.01' 'neon' 'wavpack>=4.40.0' \
@@ -63,4 +63,4 @@ build()
}

# optimalization OK
-sha1sums=('76a83e405509edaab3f89ab191e43f227692fc4b')
+sha1sums=('fdf2255982be9f87f879ee68ac4ba0d47fb3579a')
From crazy at frugalware.org  Tue Dec  4 19:38:29 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 19:38:31 2007
Subject: [Frugalware-git] frugalware-current: emelfm2-0.3.6-1-i686
Message-ID: <20071204183829.D152B11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=370f58521e58d2c8888b04d6216fc2ec18c82974

commit 370f58521e58d2c8888b04d6216fc2ec18c82974
Author: crazy 
Date:   Tue Dec 4 19:37:56 2007 +0100

emelfm2-0.3.6-1-i686
* Version bump
* updated options.patch

diff --git a/source/xapps-extra/emelfm2/FrugalBuild b/source/xapps-extra/emelfm2/FrugalBuild
index 32a9f80..9c02b98 100644
--- a/source/xapps-extra/emelfm2/FrugalBuild
+++ b/source/xapps-extra/emelfm2/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: BMH1980 

pkgname=emelfm2
-pkgver=0.3.5
+pkgver=0.3.6
pkgrel=1
pkgdesc="emelFM2 is a file manager that implements the popular two-pane design."
url="http://www.emelfm2.net/"
@@ -30,5 +30,5 @@ build()
Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver
}

-sha1sums=('dde4c71458998c7519b8cddcd304798f04970bfb' \
-          '2d8dc1aad72e40b66b39942b43afc9a27450af0c')
+sha1sums=('888ae8540d178279be5e383aa3dc8e55fb560253' \
+          'c090dadc6a5a920870b77d812ca745267b11374d')
diff --git a/source/xapps-extra/emelfm2/options.patch b/source/xapps-extra/emelfm2/options.patch
index ea53775..6b4a6cd 100644
--- a/source/xapps-extra/emelfm2/options.patch
+++ b/source/xapps-extra/emelfm2/options.patch
@@ -1,7 +1,7 @@
-diff -Naur emelfm2-0.3.4/Makefile.config emelfm2-0.3.4-p/Makefile.config
---- emelfm2-0.3.4/Makefile.config	2007-05-13 04:39:01.000000000 +0200
-+++ emelfm2-0.3.4-p/Makefile.config	2007-05-27 18:03:18.000000000 +0200
-@@ -4,7 +4,7 @@
+diff -Naur emelfm2-0.3.6/Makefile.config emelfm2-0.3.6-p/Makefile.config
+--- emelfm2-0.3.6/Makefile.config	2007-11-29 01:37:49.000000000 +0100
++++ emelfm2-0.3.6-p/Makefile.config	2007-12-04 19:26:32.000000000 +0100
+@@ -7,7 +7,7 @@
### installation (where) ###
############################

@@ -10,7 +10,7 @@ diff -Naur emelfm2-0.3.4/Makefile.config emelfm2-0.3.4-p/Makefile.config
#BIN_DIR, PLUGINS_DIR, DOC_DIR, ICON_DIR, LOCALE_DIR, MAN_DIR
#are set in Makefile, based on PREFIX

-@@ -28,8 +28,8 @@
+@@ -31,8 +31,8 @@
XDG_INTEGRATION ?= 1
#where to install emelfm2.desktop and emelfm2.applications
#for desktop environment integration
@@ -21,16 +21,16 @@ diff -Naur emelfm2-0.3.4/Makefile.config emelfm2-0.3.4-p/Makefile.config

# gettext/internationalisation support
# (is automatically turned off if you don't have gettext)
-@@ -58,7 +58,7 @@
+@@ -73,7 +73,7 @@
# (volunteer needed to test and finalise)
# portevent-usage (on solaris) is a TODO
# (volunteer needed to work on that)
-WITH_KERNELFAM ?= 0
+WITH_KERNELFAM ?= 1

- # setting this to 1 provides support (on linux) for file-change monitoring
- # using inotify if that's available, or normal polling if not available
-@@ -80,7 +80,7 @@
+ # Enable NO MORE THAN ONE of these monitors.
+
+@@ -97,7 +97,7 @@

# setting this to 1 provides support for file-change monitoring
# using gamin if that's available, or normal polling if not available
@@ -39,23 +39,3 @@ diff -Naur emelfm2-0.3.4/Makefile.config emelfm2-0.3.4-p/Makefile.config

# Setting EDITOR_SPELLCHECK to 0/1 dis/enables spell-checking (using GtkSpell)
# in the internal editor.
-@@ -96,16 +96,16 @@
- # work, some enabling functionality for the elements in question must be coded.
- # As of now, such code has been added only for view and edit dialogs, for evaluation
- # and testing purposes
--EXTRA_BINDINGS ?= 0
-+EXTRA_BINDINGS ?= 1
-
- # setting this to 1 includes code (not much) that is applicable only
- # to Gtk versions > 2.6, if the build-system has any such Gtk
--USE_LATEST ?= 0
-+USE_LATEST ?= 1
-
- # setting this to 1 utilises replacement code for command execution. It's known
- # to work reasonably for some (most ?) OS's, but NOT for linux 2.4 (though it's
- # not fatal for that, just wasteful of CPU cycles)
--NEW_COMMAND ?= 0
-+NEW_COMMAND ?= 1
-
- # setting this to 1 enables a thumbnail viewer plugin. This uses libgimpthumbnail
- # for managing thumbnail-file cacheing in accord with freedesktop.org specification.
From crazy at frugalware.org  Tue Dec  4 19:48:10 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 19:48:12 2007
Subject: [Frugalware-git] playground: kdesdk-3.96.1_744599-0playground1-i686
Message-ID: <20071204184810.D270411904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=31d2ed355d056be0ad380a68ced188afe29365cc

commit 31d2ed355d056be0ad380a68ced188afe29365cc
Author: crazy 
Date:   Tue Dec 4 19:45:14 2007 +0100

kdesdk-3.96.1_744599-0playground1-i686
* Version bump

diff --git a/source/kde4/kdesdk/FrugalBuild b/source/kde4/kdesdk/FrugalBuild
index b0ec865..5d64d23 100644
--- a/source/kde4/kdesdk/FrugalBuild
+++ b/source/kde4/kdesdk/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy 

pkgname=kdesdk
-pkgver=3.96.1_743075
-pkgrel=0playground2
+pkgver=3.96.1_744599
+pkgrel=0playground1
pkgdesc="KDE Software Development Kit."
depends=('libkde>=3.96.1_743104' 'libqtsvg' 'kdepimlibs')
makedepends=('libqtnetwork' 'subversion' 'kdebase-workspace-libs')
@@ -13,7 +13,7 @@ options=('nomirror')
_F_kde4_subpkgs=('umbrello' 'kbugbuster' 'kcachegrind' 'cervisia')
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2)
-sha1sums=('cf2bb2ef8007fda2db65017f53c0db68ff3ed669')
+sha1sums=('00299154a0c7b3f825198009dd794954037ba45a')

subpkgs=("${_F_kde4_subpkgs[@]}" 'kate' 'kuiviewer' "$pkgname-kio")
subdescs=('UML Modeller.' \
From boobaa at frugalware.org  Tue Dec  4 19:50:49 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Tue Dec  4 19:50:51 2007
Subject: [Frugalware-git] frugalware-current: man-pages-2.69-1-i686
Message-ID: <20071204185049.1FA5711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13bb8c652e017b98712ea772577e43e52c10fd2a

commit 13bb8c652e017b98712ea772577e43e52c10fd2a
Author: CSÉCSY László 
Date:   Tue Dec 4 19:50:38 2007 +0100

man-pages-2.69-1-i686
version bump

diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild
index 0a70103..9287678 100644
--- a/source/apps/man-pages/FrugalBuild
+++ b/source/apps/man-pages/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos 

pkgname=man-pages
-pkgver=2.68
+pkgver=2.69
pkgrel=1
pkgdesc="Man pages are online documentation for Linux"
url="http://www.win.tue.nl/~aeb/linux/man"
@@ -41,4 +41,4 @@ build()
Frm /usr/share/man/man4/mouse.4
}
# optimization OK - noarch
-sha1sums=('f53bb9aa1d9ccbbba6acb6a2410a48cd0dc77a17')
+sha1sums=('6ed8b89ae0449f9465646640653bb1d2339edada')
From crazy at frugalware.org  Tue Dec  4 20:01:00 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 20:01:02 2007
Subject: [Frugalware-git] frugalware-current: mutagen-1.13-1-i686
Message-ID: <20071204190100.1466011904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5957ba97046e49f2d6579e7dd2d05abf9b979939

commit 5957ba97046e49f2d6579e7dd2d05abf9b979939
Author: crazy 
Date:   Tue Dec 4 20:00:12 2007 +0100

mutagen-1.13-1-i686
* Version bump

diff --git a/source/apps/mutagen/FrugalBuild b/source/apps/mutagen/FrugalBuild
index 296028a..d1f0b08 100644
--- a/source/apps/mutagen/FrugalBuild
+++ b/source/apps/mutagen/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=mutagen
-pkgver=1.12
+pkgver=1.13
pkgrel=1
pkgdesc="Mutagen is an audio metadata tag reader and writer."
url="http://www.sacredchao.net/quodlibet/wiki"
@@ -11,4 +11,4 @@ groups=('apps')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.sacredchao.net/~piman/software|grep 'mutagen.*\.tar\.gz$'|sort -r -n|head -n 1|sed 's/.*-\(.*\).t.*/\1/'"
source=(http://www.sacredchao.net/~piman/software/$pkgname-$pkgver.tar.gz)
-sha1sums=('f74ea15235e6fe766aef12cd31028d438940f1b9')
+sha1sums=('e638edfa7251593171fac7b24be2b0602d17116c')
From crazy at frugalware.org  Tue Dec  4 20:03:17 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 20:03:19 2007
Subject: [Frugalware-git] 
	playground: kdemultimedia-3.96.1_744422-0playground1-i686
Message-ID: <20071204190317.47DF311904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=12648fd54e743ee472b65acd1ede9d30fe8d7332

commit 12648fd54e743ee472b65acd1ede9d30fe8d7332
Author: crazy 
Date:   Tue Dec 4 20:01:45 2007 +0100

kdemultimedia-3.96.1_744422-0playground1-i686
* Version bump

diff --git a/source/kde4/kdemultimedia/FrugalBuild b/source/kde4/kdemultimedia/FrugalBuild
index 6d77e18..38e4df5 100644
--- a/source/kde4/kdemultimedia/FrugalBuild
+++ b/source/kde4/kdemultimedia/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy 

pkgname=kdemultimedia
-pkgver=3.96.1_742562
-pkgrel=0playground2
+pkgver=3.96.1_744422
+pkgrel=0playground1
pkgdesc="KDE Multimedia Programs"
depends=()
makedepends=('libkde>=3.96.1_743104' 'libtunepimp' 'cdparanoia' 'flac' 'libmusicbrainz' 'libvorbis' \
@@ -15,7 +15,7 @@ _F_kde4_subpkgs=('juk' 'kmix' 'kscd' 'libkcddb' 'libkcompactdisc')
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \
flac.patch)
-sha1sums=('d52d99e5284077ce73071dccbbb95592faf219e5' \
+sha1sums=('a122cb500f263ceabfe49116926867fb9f9bb409' \
'26bdd6cd8a68b1a60753a12b29260265393e63f9')

subpkgs=("${_F_kde4_subpkgs[@]}" "$pkgname-audiocd-kio")
From crazy at frugalware.org  Tue Dec  4 20:42:30 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 20:42:32 2007
Subject: [Frugalware-git] frugalware-current: wine-0.9.50-1-i686
Message-ID: <20071204194230.2264711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=77d6d959f5bb43028713f5b0340acfc094bd9c99

commit 77d6d959f5bb43028713f5b0340acfc094bd9c99
Author: crazy 
Date:   Tue Dec 4 20:37:41 2007 +0100

wine-0.9.50-1-i686
* Version bump

diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild
index c5be566..5af4864 100644
--- a/source/xapps/wine/FrugalBuild
+++ b/source/xapps/wine/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos 

pkgname=wine
-pkgver=0.9.49
+pkgver=0.9.50
pkgrel=1
pkgdesc="An Open Source implementation of the Windows API on top of X and Unix"
_F_sourceforge_ext=".tar.bz2"
@@ -30,7 +30,7 @@ build()
Frcd2
}

-sha1sums=('ddee8ff8229ec0df45a5254820acd3adaffecc94' \
+sha1sums=('5a4111e60b2e38f3eb0a2b4d9bc3de55498be5c1' \
'a9c70a49cef90cf60c2e90e63753858387f7117a' \
'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \
'8b0f7b52885c8d78ba3096a16e9caff60ffe624f')
From voroskoi at frugalware.org  Tue Dec  4 21:28:43 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 21:28:47 2007
Subject: [Frugalware-git] frugalware-current: seamonkey-1.1.7-1-x86_64
Message-ID: <20071204202843.97A2A11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0415d1f9e9cac6f463ebae8e804591f2c2c74457

commit 0415d1f9e9cac6f463ebae8e804591f2c2c74457
Author: voroskoi 
Date:   Tue Dec 4 21:26:25 2007 +0100

seamonkey-1.1.7-1-x86_64
version bump, closes #2608

diff --git a/source/xapps-extra/seamonkey/FrugalBuild b/source/xapps-extra/seamonkey/FrugalBuild
index ea51ba1..df08938 100644
--- a/source/xapps-extra/seamonkey/FrugalBuild
+++ b/source/xapps-extra/seamonkey/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi 

pkgname=seamonkey
-pkgver=1.1.6
+pkgver=1.1.7
pkgrel=1
pkgdesc="Seamonkey all-in-one internet application suite"
url="http://www.mozilla.org/projects/seamonkey/"
@@ -49,7 +49,7 @@ build() {
# Install menu file.
Ffile /usr/share/applications/$pkgname.desktop
}
-sha1sums=('e37972ab4a30c1f12f1673916b4ab7049bee5fff' \
+sha1sums=('2a38cb20c5e162cc79b5124a0fd0092d6e1d464d' \
'0dd4777e87d70eba6834d56813f6a415fe991007' \
'b0e0bdd676758e19cac4a0429257a92183328f0e')
From voroskoi at frugalware.org  Tue Dec  4 21:46:25 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 21:46:27 2007
Subject: [Frugalware-git] frugalware-current: libzrtpcpp-1.0.0-1-i686
Message-ID: <20071204204625.5EF5411904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c8e73c554ad2361c55c4b9be6574279aef334dc7

commit c8e73c554ad2361c55c4b9be6574279aef334dc7
Author: voroskoi 
Date:   Tue Dec 4 21:45:28 2007 +0100

libzrtpcpp-1.0.0-1-i686
version bump
depends on ccrtp>=1.6

diff --git a/source/lib-extra/libzrtpcpp/FrugalBuild b/source/lib-extra/libzrtpcpp/FrugalBuild
index b2157cf..9dc6d5b 100644
--- a/source/lib-extra/libzrtpcpp/FrugalBuild
+++ b/source/lib-extra/libzrtpcpp/FrugalBuild
@@ -2,16 +2,16 @@
# Maintainer: voroskoi 

pkgname=libzrtpcpp
-pkgver=0.9.2
+pkgver=1.0.0
pkgrel=1
pkgdesc="ZRTP extension for GNU ccRTP."
url="http://wiki.gnutelephony.org/index.php/Zrtp_FAQ"
-depends=('ccrtp' 'libgcrypt')
+depends=('ccrtp>=1.6' 'libgcrypt')
groups=('lib-extra')
archs=('i686' 'x86_64')
license="GPLv3"
-source=(http://ftp.gnu.org/pub/gnu/ccrtp/$pkgname-$pkgver.tar.gz)
+source=(http://ftp.gnu.org/pub/gnu/ccrtp/$pkgname-$pkgver.tar.gz ldflags.diff)
up2date="lynx -dump http://ftp.gnu.org/pub/gnu/ccrtp/ |Flasttar"
-signatures=($source.sig)
+signatures=($source.sig '')

# optimization OK
diff --git a/source/lib-extra/libzrtpcpp/ldflags.diff b/source/lib-extra/libzrtpcpp/ldflags.diff
new file mode 100644
index 0000000..3ed5e0c
--- /dev/null
+++ b/source/lib-extra/libzrtpcpp/ldflags.diff
@@ -0,0 +1,11 @@
+diff -aur libzrtpcpp-1.0.0/src/Makefile.in fw_libzrtpcpp-1.0.0/src/Makefile.in
+--- libzrtpcpp-1.0.0/src/Makefile.in	2007-11-30 00:13:52.000000000 +0100
++++ fw_libzrtpcpp-1.0.0/src/Makefile.in	2007-12-04 21:25:09.000000000 +0100
+@@ -248,7 +248,6 @@
+ RELEASE = $(LT_VERSION) -release $(LT_RELEASE)
+ lib_LTLIBRARIES = libzrtpcpp.la
+ # libzrtpcpp_la_LIBADD = @LIBS@
+-libzrtpcpp_la_LDFLAGS = $(RELEASE)
+
+ # http://www.gnu.org/software/libtool/manual.html
+ @ZRTP_OPENSSL_TRUE@zrtp_src_o = libzrtpcpp/crypto/openssl/ZrtpDH.cxx \
From crazy at frugalware.org  Tue Dec  4 21:50:22 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 21:50:24 2007
Subject: [Frugalware-git] playground: strigi-0.5.7-0playground3-i686
Message-ID: <20071204205022.2B5F711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=a2fc3039d45ee09aa18566a053f9947f3dd71a34

commit a2fc3039d45ee09aa18566a053f9947f3dd71a34
Author: crazy 
Date:   Tue Dec 4 21:49:23 2007 +0100

strigi-0.5.7-0playground3-i686
* split libstrigiqtdbusclient
* preparing to move over to current

diff --git a/source/apps/strigi/FrugalBuild b/source/apps/strigi/FrugalBuild
index 954d04b..86d5a9e 100644
--- a/source/apps/strigi/FrugalBuild
+++ b/source/apps/strigi/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=strigi
pkgver=0.5.7
-pkgrel=0playground2
+pkgrel=0playground3
pkgdesc="An advanced, desktop independent search daemon"
depends=('bzip2' 'dbus' 'clucene' 'exiv2' 'gamin')
makedepends=('j2sdk' 'qt4-qdbus' 'libqtgui')
@@ -14,21 +14,20 @@ _F_sourceforge_broken_up2date=1
_F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib"
options=('scriptlet')
Finclude sourceforge cmake
-#source=(http://ftp.frugalware.org/pub/other/people/crazy/source/kde4/$pkgname-$pkgver.tar.bz2)
sha1sums=('d7e81f4e6e204129649473e00b20a6fcd7a76f65')
## TODO : Add missing optional depends

-subpkgs=("$pkgname-qt4-gui")
-subdescs=('Qt4 GUI for strigi.')
-subdepends=("$pkgname=$pkgver qt4-qdbus bzip2 libqtgui")
-subgroups=('xapps')
-subarchs=('i686')
+subpkgs=("$pkgname-qt4-gui" "libstrigiqtdbusclient")
+subdescs=('Qt4 GUI for strigi.' 'Library for writing Qt4 D-Bus clients for strigi')
+subdepends=("$pkgname=$pkgver qt4-qdbus libqtgui libgcc libice libxrender libxfixes libxext" 'qt4-qdbus libgcc')
+subgroups=('xapps-extra' 'apps')
+subarchs=('i686' 'i686')

build()
{
CMake_build
-	Fsplit $pkgname-qt4-gui usr/lib/libstrigiqtdbusclient.so*
-	Fsplit $pkgname-qt4-gui usr/include/strigi/qtdbus
+	Fsplit libstrigiqtdbusclient usr/lib/libstrigiqtdbusclient.so*
+	Fsplit libstrigiqtdbusclient usr/include/strigi/qtdbus
Fsplit $pkgname-qt4-gui usr/bin/strigiclient
}
# optimization OK
From crazy at frugalware.org  Tue Dec  4 21:53:45 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 21:53:47 2007
Subject: [Frugalware-git] playground: strigi-0.5.7-0playground3-i686
Message-ID: <20071204205345.8689E11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=acf31cd3c7efd979dac492d0331ee0379f46df1d

commit acf31cd3c7efd979dac492d0331ee0379f46df1d
Author: crazy 
Date:   Tue Dec 4 21:53:16 2007 +0100

strigi-0.5.7-0playground3-i686
* damn fingers :) merged from wrong branch =)
* corrected depends()

diff --git a/source/apps/strigi/FrugalBuild b/source/apps/strigi/FrugalBuild
index 86d5a9e..3800436 100644
--- a/source/apps/strigi/FrugalBuild
+++ b/source/apps/strigi/FrugalBuild
@@ -19,7 +19,8 @@ sha1sums=('d7e81f4e6e204129649473e00b20a6fcd7a76f65')

subpkgs=("$pkgname-qt4-gui" "libstrigiqtdbusclient")
subdescs=('Qt4 GUI for strigi.' 'Library for writing Qt4 D-Bus clients for strigi')
-subdepends=("$pkgname=$pkgver qt4-qdbus libqtgui libgcc libice libxrender libxfixes libxext" 'qt4-qdbus libgcc')
+subdepends=("$pkgname=$pkgver libstrigiqtdbusclient=$pkgver qt4-qdbus libqtgui libgcc libice libxrender libxfixes libxext" \
+	'qt4-qdbus libgcc')
subgroups=('xapps-extra' 'apps')
subarchs=('i686' 'i686')
From voroskoi at frugalware.org  Tue Dec  4 21:59:27 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 21:59:29 2007
Subject: [Frugalware-git] frugalware-current: gkrellm-2.3.1-1-x86_64
Message-ID: <20071204205927.7874911904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5872171a6da3ba451678adb7fe7cc4058fca9667

commit 5872171a6da3ba451678adb7fe7cc4058fca9667
Author: voroskoi 
Date:   Tue Dec 4 21:58:59 2007 +0100

gkrellm-2.3.1-1-x86_64
version bump

diff --git a/source/xapps/gkrellm/FrugalBuild b/source/xapps/gkrellm/FrugalBuild
index 596a089..c9862b6 100644
--- a/source/xapps/gkrellm/FrugalBuild
+++ b/source/xapps/gkrellm/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi 

pkgname=gkrellm
-pkgver=2.3.0
+pkgver=2.3.1
pkgrel=1
pkgdesc="GKrellM is a single process stack of system monitors"
url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html"
@@ -12,12 +12,12 @@ groups=('xapps')
archs=('i686' 'x86_64')
up2date="lynx -dump 'http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html'|grep .tar.bz2$|sed -n 's/.*lm-\(.*\).t.*/\1/;1 p'"
source=(http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('f5e8206aeee93f5b3a6afff9cc55c58e9d511f56')

build()
{
Fmake
make INSTALLROOT=$Fdestdir/$Fprefix install || Fdie
}
-sha1sums=('b955aa38304d97bfedaa2167220f1d62407345d9')

# optimization OK
From crazy at frugalware.org  Tue Dec  4 22:00:02 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:00:07 2007
Subject: [Frugalware-git] 
	playground: kdebase-workspace-3.96.1_744694-0playground1-i686
Message-ID: <20071204210002.7775A11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=c0b5fa851bd294b8ef6967abe12a09a302639483

commit c0b5fa851bd294b8ef6967abe12a09a302639483
Author: crazy 
Date:   Tue Dec 4 21:59:49 2007 +0100

kdebase-workspace-3.96.1_744694-0playground1-i686
* depends on libstrigiqtdbusclient

diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild
index 00d8411..a592847 100644
--- a/source/kde4/kdebase-workspace/FrugalBuild
+++ b/source/kde4/kdebase-workspace/FrugalBuild
@@ -7,7 +7,7 @@ pkgrel=0playground1
pkgdesc="Programs specific for the KDE4 desktop."
depends=('libkde>=>=3.96.1_743104' 'libqt3support' 'libqtsvg' 'libxpm' 'strigi' 'xfsprogs-acl' 'libxtst' 'libqtopengl' 'libxres' \
'lmsensors' 'libxcomposite' 'libxklavier' 'libxscrnsaver' 'qimageblitz' 'libqtscript' 'libcaptury' \
-	 'libraw1394' 'bluez-libs' 'strigi-qt4-gui')
+	 'libraw1394' 'bluez-libs' 'libstrigiqtdbusclient')
makedepends=('libqtscript' 'qt4-designer')
rodepends=('kde-frugalware>=0.9.0' 'xorg-server>=1.2.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop' 'xrdb' "$pkgname-libs=$pkgver")
groups=('kde4' 'kde4-minimal')
From voroskoi at frugalware.org  Tue Dec  4 22:14:37 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 22:14:40 2007
Subject: [Frugalware-git] frugalware-current: pyrex-0.9.6.4-1-x86_64
Message-ID: <20071204211437.5503511904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=99ab9a206e55a24ac69a0040a0cbd5f6f9f50322

commit 99ab9a206e55a24ac69a0040a0cbd5f6f9f50322
Author: voroskoi 
Date:   Tue Dec 4 22:13:41 2007 +0100

pyrex-0.9.6.4-1-x86_64
version bump

diff --git a/source/devel/pyrex/FrugalBuild b/source/devel/pyrex/FrugalBuild
index 2c172be..ee099d4 100644
--- a/source/devel/pyrex/FrugalBuild
+++ b/source/devel/pyrex/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: voroskoi 

pkgname=pyrex
-pkgver=0.9.6.2
+pkgver=0.9.6.4
pkgrel=1
pkgextraver=
pkgdesc="A language for writing Python extension modules"
@@ -13,6 +13,7 @@ groups=('devel')
archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep tar |sed -ne 's/.*-\(.*\).ta.*/\1/;1p' -e s/$pkgextraver//"
source=($url/Pyrex-$pkgver$pkgextraver.tar.gz)
+sha1sums=('233fb9b92b62015b9d0f24c9e1aea4acdcd6782d')

build()
{
@@ -20,4 +21,3 @@ build()
rm Makefile || Fdie
Fbuild
}
-sha1sums=('b4b6b3ae090aa0f7622446fe6b3e915dca378c41')
From crazy at frugalware.org  Tue Dec  4 22:15:05 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:15:07 2007
Subject: [Frugalware-git] frugalware-current: strigi-0.5.7-1-i686
Message-ID: <20071204211505.6C47111904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7522caa78e69f8969b7d4cb0ffcca5b8a1fa5b32

commit 7522caa78e69f8969b7d4cb0ffcca5b8a1fa5b32
Author: crazy 
Date:   Tue Dec 4 22:14:13 2007 +0100

strigi-0.5.7-1-i686
* New package
* moved in from playground

diff --git a/source/apps-extra/strigi/FrugalBuild b/source/apps-extra/strigi/FrugalBuild
new file mode 100644
index 0000000..270c25b
--- /dev/null
+++ b/source/apps-extra/strigi/FrugalBuild
@@ -0,0 +1,34 @@
+# Compiling Time: 1.62 SBU
+# Maintainer: crazy 
+
+pkgname=strigi
+pkgver=0.5.7
+pkgrel=1
+pkgdesc="An advanced, desktop independent search daemon"
+depends=('bzip2' 'dbus' 'clucene' 'exiv2' 'gamin')
+makedepends=('j2sdk' 'qt4-qdbus' 'libqtgui' 'libgcc')
+groups=('apps-extra')
+archs=('i686')
+_F_sourceforge_ext=".tar.bz2"
+_F_sourceforge_broken_up2date=1
+_F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib"
+options=('scriptlet')
+Finclude sourceforge cmake
+sha1sums=('d7e81f4e6e204129649473e00b20a6fcd7a76f65')
+## TODO : Add missing optional depends
+
+subpkgs=("$pkgname-qt4-gui" "libstrigiqtdbusclient")
+subdescs=('Qt4 GUI for strigi.' 'Strigi library for writing Qt4 D-Bus clients.')
+subdepends=("$pkgname=$pkgver libstrigiqtdbusclient=$pkgver qt4-qdbus libqtgui libgcc libice libxrender libxfixes libxext" \
+	'qt4-qdbus libgcc')
+subgroups=('xapps-extra' 'apps-extra')
+subarchs=('i686' 'i686')
+
+build()
+{
+	CMake_build
+	Fsplit libstrigiqtdbusclient usr/lib/libstrigiqtdbusclient.so*
+	Fsplit libstrigiqtdbusclient usr/include/strigi/qtdbus
+	Fsplit $pkgname-qt4-gui usr/bin/strigiclient
+}
+# optimization OK
From crazy at frugalware.org  Tue Dec  4 22:18:05 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:18:05 2007
Subject: [Frugalware-git] playground: strigi-0.5.7-0playground3-i686
Message-ID: <20071204211805.08AF711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=1ea848e6cff02dccc5a4b8f6047301632d0e244d

commit 1ea848e6cff02dccc5a4b8f6047301632d0e244d
Author: crazy 
Date:   Tue Dec 4 22:17:19 2007 +0100

strigi-0.5.7-0playground3-i686
* removed , is in current now

diff --git a/source/apps/strigi/FrugalBuild b/source/apps/strigi/FrugalBuild
deleted file mode 100644
index 3800436..0000000
--- a/source/apps/strigi/FrugalBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Compiling Time: 1.62 SBU
-# Maintainer: crazy 
-
-pkgname=strigi
-pkgver=0.5.7
-pkgrel=0playground3
-pkgdesc="An advanced, desktop independent search daemon"
-depends=('bzip2' 'dbus' 'clucene' 'exiv2' 'gamin')
-makedepends=('j2sdk' 'qt4-qdbus' 'libqtgui')
-groups=('apps')
-archs=('i686')
-_F_sourceforge_ext=".tar.bz2"
-_F_sourceforge_broken_up2date=1
-_F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib"
-options=('scriptlet')
-Finclude sourceforge cmake
-sha1sums=('d7e81f4e6e204129649473e00b20a6fcd7a76f65')
-## TODO : Add missing optional depends
-
-subpkgs=("$pkgname-qt4-gui" "libstrigiqtdbusclient")
-subdescs=('Qt4 GUI for strigi.' 'Library for writing Qt4 D-Bus clients for strigi')
-subdepends=("$pkgname=$pkgver libstrigiqtdbusclient=$pkgver qt4-qdbus libqtgui libgcc libice libxrender libxfixes libxext" \
-	'qt4-qdbus libgcc')
-subgroups=('xapps-extra' 'apps')
-subarchs=('i686' 'i686')
-
-build()
-{
-	CMake_build
-	Fsplit libstrigiqtdbusclient usr/lib/libstrigiqtdbusclient.so*
-	Fsplit libstrigiqtdbusclient usr/include/strigi/qtdbus
-	Fsplit $pkgname-qt4-gui usr/bin/strigiclient
-}
-# optimization OK
From voroskoi at frugalware.org  Tue Dec  4 22:21:42 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 22:21:45 2007
Subject: [Frugalware-git] frugalware-current: klavaro-1.0.5-1-x86_64
Message-ID: <20071204212142.E06C311904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=61572ff55fd50580d6887c61af3f01a2617ae01c

commit 61572ff55fd50580d6887c61af3f01a2617ae01c
Author: voroskoi 
Date:   Tue Dec 4 22:21:08 2007 +0100

klavaro-1.0.5-1-x86_64
version bump
x86_64 added to archs

diff --git a/source/xapps-extra/klavaro/FrugalBuild b/source/xapps-extra/klavaro/FrugalBuild
index 72e07ba..865e01a 100644
--- a/source/xapps-extra/klavaro/FrugalBuild
+++ b/source/xapps-extra/klavaro/FrugalBuild
@@ -2,15 +2,15 @@
# Maintainer: voroskoi 

pkgname=klavaro
-pkgver=1.0.4
+pkgver=1.0.5
pkgrel=1
pkgdesc="Klavaro is just another free touch typing tutor program."
depends=('gtk+2')
groups=('xapps-extra')
-archs=('i686')
+archs=('i686' 'x86_64')
_F_sourceforge_ext=.tar.bz2
Finclude sourceforge
up2date="lynx -dump http://klavaro.sourceforge.net/en/index.html |grep bz2 |sed -ne 's/.*o-\(.*\).t.*/\1/;1p'"
-sha1sums=('6a9139e60f09c26cfd57cd48c3daeae04dae5993')
+sha1sums=('5e7ae4a2feb3d2dddfbd949eddefce4363228cd8')

# optimization OK
From crazy at frugalware.org  Tue Dec  4 22:22:20 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:22:21 2007
Subject: [Frugalware-git] frugalware-current: gmm-3.0-1-i686
Message-ID: <20071204212220.2206F11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2fda84726cd4635c95c17b14e869f800b2eee18c

commit 2fda84726cd4635c95c17b14e869f800b2eee18c
Author: crazy 
Date:   Tue Dec 4 22:21:51 2007 +0100

gmm-3.0-1-i686
* New package
* moved in from playground

diff --git a/source/lib-extra/gmm/FrugalBuild b/source/lib-extra/gmm/FrugalBuild
new file mode 100644
index 0000000..7a726cd
--- /dev/null
+++ b/source/lib-extra/gmm/FrugalBuild
@@ -0,0 +1,14 @@
+# Compiling Time: 0.08 SBU
+# Maintainer: crazy 
+
+pkgname=gmm
+pkgver=3.0
+pkgrel=1
+pkgdesc="A generic C++ template library for sparse, dense and skyline matrices."
+url="http://home.gna.org/getfem/gmm_intro"
+depends=()
+groups=('lib-extra')
+archs=('i686')
+up2date="lynx -dump http://home.gna.org/getfem/download.html|grep -om1 'gmm-\(.*\).tar.gz'|Flasttar"
+source=(http://download.gna.org/getfem/stable/$pkgname-$pkgver.tar.gz)
+sha1sums=('4e235a08742002263b53326872e38e87e688dfea')
From crazy at frugalware.org  Tue Dec  4 22:23:07 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:23:09 2007
Subject: [Frugalware-git] playground: gmm
Message-ID: <20071204212307.D169D11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=4cbe3b9d4744bb63486606134a494a9219acea25

commit 4cbe3b9d4744bb63486606134a494a9219acea25
Author: crazy 
Date:   Tue Dec 4 22:22:39 2007 +0100

gmm
* removed , in current now

diff --git a/source/lib/gmm/FrugalBuild b/source/lib/gmm/FrugalBuild
deleted file mode 100644
index 23a04ff..0000000
--- a/source/lib/gmm/FrugalBuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Compiling Time: 0.08 SBU
-# Maintainer: crazy 
-
-pkgname=gmm
-pkgver=3.0
-pkgrel=1
-pkgdesc="A generic C++ template library for sparse, dense and skyline matrices."
-url="http://home.gna.org/getfem/gmm_intro"
-depends=()
-groups=('lib')
-archs=('i686')
-up2date="lynx -dump http://home.gna.org/getfem/download.html|grep -om1 'gmm-\(.*\).tar.gz'|Flasttar"
-source=(http://download.gna.org/getfem/stable/$pkgname-$pkgver.tar.gz)
-sha1sums=('4e235a08742002263b53326872e38e87e688dfea')
From crazy at frugalware.org  Tue Dec  4 22:30:17 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:30:20 2007
Subject: [Frugalware-git] frugalware-current: Revert "gmm-3.0-1-i686"
Message-ID: <20071204213017.E3E8E11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f178d391655c45ec5f7212db2861a4976b78eb02

commit f178d391655c45ec5f7212db2861a4976b78eb02
Author: crazy 
Date:   Tue Dec 4 22:30:08 2007 +0100

Revert "gmm-3.0-1-i686"
* This reverts commit 9de650f14f5bfb20ab91ee001c9d8824db2f62eb.
* dg breakage

diff --git a/source/lib-extra/gmm/FrugalBuild b/source/lib-extra/gmm/FrugalBuild
deleted file mode 100644
index 7a726cd..0000000
--- a/source/lib-extra/gmm/FrugalBuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Compiling Time: 0.08 SBU
-# Maintainer: crazy 
-
-pkgname=gmm
-pkgver=3.0
-pkgrel=1
-pkgdesc="A generic C++ template library for sparse, dense and skyline matrices."
-url="http://home.gna.org/getfem/gmm_intro"
-depends=()
-groups=('lib-extra')
-archs=('i686')
-up2date="lynx -dump http://home.gna.org/getfem/download.html|grep -om1 'gmm-\(.*\).tar.gz'|Flasttar"
-source=(http://download.gna.org/getfem/stable/$pkgname-$pkgver.tar.gz)
-sha1sums=('4e235a08742002263b53326872e38e87e688dfea')
From crazy at frugalware.org  Tue Dec  4 22:31:40 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:31:41 2007
Subject: [Frugalware-git] frugalware-current: gmm-3.0-1-i686
Message-ID: <20071204213140.5A1FA11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d561a52cfa2c91e87e952ec45aae1629e6a3417

commit 5d561a52cfa2c91e87e952ec45aae1629e6a3417
Author: crazy 
Date:   Tue Dec 4 22:31:24 2007 +0100

gmm-3.0-1-i686
* New package

diff --git a/source/lib-extra/gmm/FrugalBuild b/source/lib-extra/gmm/FrugalBuild
new file mode 100644
index 0000000..7a726cd
--- /dev/null
+++ b/source/lib-extra/gmm/FrugalBuild
@@ -0,0 +1,14 @@
+# Compiling Time: 0.08 SBU
+# Maintainer: crazy 
+
+pkgname=gmm
+pkgver=3.0
+pkgrel=1
+pkgdesc="A generic C++ template library for sparse, dense and skyline matrices."
+url="http://home.gna.org/getfem/gmm_intro"
+depends=()
+groups=('lib-extra')
+archs=('i686')
+up2date="lynx -dump http://home.gna.org/getfem/download.html|grep -om1 'gmm-\(.*\).tar.gz'|Flasttar"
+source=(http://download.gna.org/getfem/stable/$pkgname-$pkgver.tar.gz)
+sha1sums=('4e235a08742002263b53326872e38e87e688dfea')
From voroskoi at frugalware.org  Tue Dec  4 22:36:24 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 22:36:26 2007
Subject: [Frugalware-git] frugalware-current: libtrash-3.0-1-x86_64
Message-ID: <20071204213624.7135611904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8925915e019fe1ed34901e9ea08e6aba37940b85

commit 8925915e019fe1ed34901e9ea08e6aba37940b85
Author: voroskoi 
Date:   Tue Dec 4 22:35:47 2007 +0100

libtrash-3.0-1-x86_64
version bump

diff --git a/source/lib-extra/libtrash/FrugalBuild b/source/lib-extra/libtrash/FrugalBuild
index 76f2f26..bbe09ec 100644
--- a/source/lib-extra/libtrash/FrugalBuild
+++ b/source/lib-extra/libtrash/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi 

pkgname=libtrash
-pkgver=2.8
+pkgver=3.0
pkgrel=1
pkgdesc="The shared library which, when preloaded, implements a trash can under GNU/Linux."
url="http://pages.stern.nyu.edu/~marriaga/software/libtrash/"
@@ -12,6 +12,7 @@ up2date="lynx -dump $url |grep -m 1 Version|sed 's/.*n \(.*\) can.*/\1/'"
source=($url/$pkgname-latest.tgz)
groups=('lib-extra')
archs=('i686' 'x86_64')
+sha1sums=('0cd25c2dbd041b6f3f1e706b31e1b535b723a588')

build()
{
@@ -24,6 +25,5 @@ build()
# DESTDIR is needed here
Fmakeinstall DESTDIR=$Fdestdir
}
-sha1sums=('a63d117eced4c3b8c6987577b407c2aab1efa645')

# optimization OK
From crazy at frugalware.org  Tue Dec  4 22:37:45 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:38:11 2007
Subject: [Frugalware-git] frugalware-current: libnova-0.12.1-1-i686
Message-ID: <20071204213745.4206A11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a6b4dceea59e381ec2b74603d17d87c6ba8126fe

commit a6b4dceea59e381ec2b74603d17d87c6ba8126fe
Author: crazy 
Date:   Tue Dec 4 22:36:41 2007 +0100

libnova-0.12.1-1-i686
* New package
* moved in from playground

diff --git a/source/lib-extra/libnova/FrugalBuild b/source/lib-extra/libnova/FrugalBuild
new file mode 100644
index 0000000..fa8f790
--- /dev/null
+++ b/source/lib-extra/libnova/FrugalBuild
@@ -0,0 +1,24 @@
+# Compiling Time: 0.33 SBU
+# Maintainer: crazy 
+
+pkgname=libnova
+pkgver=0.12.1
+pkgrel=1
+pkgdesc="libnova is a general purpose, double precision, celestial mechanics, astrometry and astrodynamics library."
+depends=('glibc')
+groups=('lib-extra')
+archs=('i686')
+_F_sourceforge_broken_up2date=1
+Finclude sourceforge
+sha1sums=('b27d9b0d6f02f4303a790bce56571f85f2492e75')
+
+build()
+{
+	Fcd
+	Fautoreconf
+	Fconf
+	make CFLAGS="$CFLAGS" || Fdie
+	Fmakeinstall
+}
+
+# optimization OK
From crazy at frugalware.org  Tue Dec  4 22:41:01 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:41:03 2007
Subject: [Frugalware-git] playground: libnova-0.12.1-0playground1-i686
Message-ID: <20071204214101.0B7E511904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=007ac2f3e0df8c899646a531ac7ac4297fc1b21c

commit 007ac2f3e0df8c899646a531ac7ac4297fc1b21c
Author: crazy 
Date:   Tue Dec 4 22:40:29 2007 +0100

libnova-0.12.1-0playground1-i686
* removed , in current now

diff --git a/source/lib/libnova/FrugalBuild b/source/lib/libnova/FrugalBuild
deleted file mode 100644
index 50e9adb..0000000
--- a/source/lib/libnova/FrugalBuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiling Time: 0.33 SBU
-# Maintainer: crazy 
-
-pkgname=libnova
-pkgver=0.12.1
-pkgrel=0playground1
-pkgdesc="libnova is a general purpose, double precision, celestial mechanics, astrometry and astrodynamics library."
-depends=('glibc')
-groups=('lib')
-archs=('i686')
-_F_sourceforge_broken_up2date=1
-Finclude sourceforge
-sha1sums=('b27d9b0d6f02f4303a790bce56571f85f2492e75')
-
-build()
-{
-	Fcd
-	Fautoreconf
-	Fconf
-	make CFLAGS="$CFLAGS" || Fdie
-	Fmakeinstall
-}
-
-# optimization OK
From voroskoi at frugalware.org  Tue Dec  4 22:43:31 2007
From: voroskoi at frugalware.org (voroskoi)
Date: Tue Dec  4 22:43:33 2007
Subject: [Frugalware-git] frugalware-current: twinkle-1.1-2-i686
Message-ID: <20071204214331.BBBC411904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=866f98b160762e0903a334404dda52d568517b3c

commit 866f98b160762e0903a334404dda52d568517b3c
Author: voroskoi 
Date:   Tue Dec 4 22:42:18 2007 +0100

twinkle-1.1-2-i686
rebuilt with new libzrtpcpp

diff --git a/source/kde-extra/twinkle/FrugalBuild b/source/kde-extra/twinkle/FrugalBuild
index e6084c3..cf7a72e 100644
--- a/source/kde-extra/twinkle/FrugalBuild
+++ b/source/kde-extra/twinkle/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=twinkle
pkgver=1.1
-pkgrel=1
+pkgrel=2
url="http://www.twinklephone.com/"
pkgdesc="Twinkle is a soft phone for your voice over IP communcations using the SIP protocol."
-depends=('libsndfile' 'kdelibs' 'speex' 'ilbc' 'libzrtpcpp' 'boost' 'libgl' 'libxmu' 'libxi' 'libxdamage')
+depends=('libsndfile' 'kdelibs' 'speex' 'ilbc' 'libzrtpcpp>=1.0' 'boost' 'libgl' 'libxmu' 'libxi' 'libxdamage')
archs=('i686' 'x86_64')
groups=('kde-extra')
Finclude kde
From crazy at frugalware.org  Tue Dec  4 22:50:27 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:50:31 2007
Subject: [Frugalware-git] frugalware-current: indilib-0.5-1-i686
Message-ID: <20071204215027.1547311904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=119e7c4d86e9368851868506279e2b0bc1280cd4

commit 119e7c4d86e9368851868506279e2b0bc1280cd4
Author: crazy 
Date:   Tue Dec 4 22:49:09 2007 +0100

indilib-0.5-1-i686
* New package
* moved in from playground

diff --git a/source/lib-extra/indilib/FrugalBuild b/source/lib-extra/indilib/FrugalBuild
new file mode 100644
index 0000000..aec654e
--- /dev/null
+++ b/source/lib-extra/indilib/FrugalBuild
@@ -0,0 +1,18 @@
+# Compiling Time: 1.05 SBU
+# Maintainer: crazy 
+
+pkgname=indilib
+pkgver=0.5
+pkgrel=1
+pkgdesc="An instrument neutral distributed interface control protocol for Astronomical devices."
+depends=('libusb' 'zlib')
+groups=('lib-extra')
+archs=('i686')
+_F_sourceforge_dirname="indi"
+_F_sourceforge_broken_up2date=1
+_F_cd_path="indi"
+Finclude sourceforge
+url="http://indi.sourceforge.net/index.php/Main_Page"
+sha1sums=('b5ff00359b2de80c2cc7b253d278cff3be20b150')
+
+# optimization OK
From crazy at frugalware.org  Tue Dec  4 22:51:46 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:51:48 2007
Subject: [Frugalware-git] frugalware-current: strigi-0.5.7-1-x86_64
Message-ID: <20071204215146.3AB8211904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50e414cbef5dbe7f7dd87a4c377f6029ccf7ef44

commit 50e414cbef5dbe7f7dd87a4c377f6029ccf7ef44
Author: crazy 
Date:   Tue Dec 4 22:50:48 2007 +0100

strigi-0.5.7-1-x86_64
* added x86_64 to archs

diff --git a/source/apps-extra/strigi/FrugalBuild b/source/apps-extra/strigi/FrugalBuild
index 270c25b..3c44b1a 100644
--- a/source/apps-extra/strigi/FrugalBuild
+++ b/source/apps-extra/strigi/FrugalBuild
@@ -8,7 +8,7 @@ pkgdesc="An advanced, desktop independent search daemon"
depends=('bzip2' 'dbus' 'clucene' 'exiv2' 'gamin')
makedepends=('j2sdk' 'qt4-qdbus' 'libqtgui' 'libgcc')
groups=('apps-extra')
-archs=('i686')
+archs=('i686' 'x86_64')
_F_sourceforge_ext=".tar.bz2"
_F_sourceforge_broken_up2date=1
_F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATION=lib"
@@ -22,7 +22,7 @@ subdescs=('Qt4 GUI for strigi.' 'Strigi library for writing Qt4 D-Bus clients.')
subdepends=("$pkgname=$pkgver libstrigiqtdbusclient=$pkgver qt4-qdbus libqtgui libgcc libice libxrender libxfixes libxext" \
'qt4-qdbus libgcc')
subgroups=('xapps-extra' 'apps-extra')
-subarchs=('i686' 'i686')
+subarchs=('i686 x86_64' 'i686 x86_64')

build()
{
From crazy at frugalware.org  Tue Dec  4 22:53:52 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 22:53:53 2007
Subject: [Frugalware-git] playground: indilib-0.5-0playground1-i686
Message-ID: <20071204215352.E853B11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=a1bab51d07e20e2f876a2e283f8eedfdee8b3054

commit a1bab51d07e20e2f876a2e283f8eedfdee8b3054
Author: crazy 
Date:   Tue Dec 4 22:53:32 2007 +0100

indilib-0.5-0playground1-i686
* removed , in current now

diff --git a/source/lib/indilib/FrugalBuild b/source/lib/indilib/FrugalBuild
deleted file mode 100644
index 2c7799a..0000000
--- a/source/lib/indilib/FrugalBuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Compiling Time: 1.05 SBU
-# Maintainer: crazy 
-
-pkgname=indilib
-pkgver=0.5
-pkgrel=0playground1
-pkgdesc="An instrument neutral distributed interface control protocol for Astronomical devices."
-depends=('libusb' 'zlib')
-groups=('lib')
-archs=('i686')
-_F_sourceforge_dirname="indi"
-_F_sourceforge_broken_up2date=1
-_F_cd_path="indi"
-Finclude sourceforge
-url="http://indi.sourceforge.net/index.php/Main_Page"
-sha1sums=('b5ff00359b2de80c2cc7b253d278cff3be20b150')
-
-# optimization OK
From crazy at frugalware.org  Tue Dec  4 23:01:20 2007
From: crazy at frugalware.org (crazy)
Date: Tue Dec  4 23:01:22 2007
Subject: [Frugalware-git] frugalware-current: gmm-3.0-1-x86_64
Message-ID: <20071204220120.8900B11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64faccefdd540c8bcb2bdf48acbb731c21c69aa3

commit 64faccefdd540c8bcb2bdf48acbb731c21c69aa3
Author: crazy 
Date:   Tue Dec 4 23:00:58 2007 +0100

gmm-3.0-1-x86_64
* added x86_64 to archs

diff --git a/source/lib-extra/gmm/FrugalBuild b/source/lib-extra/gmm/FrugalBuild
index 7a726cd..2905663 100644
--- a/source/lib-extra/gmm/FrugalBuild
+++ b/source/lib-extra/gmm/FrugalBuild
@@ -8,7 +8,7 @@ pkgdesc="A generic C++ template library for sparse, dense and skyline matrices."
url="http://home.gna.org/getfem/gmm_intro"
depends=()
groups=('lib-extra')
-archs=('i686')
+archs=('i686' 'x86_64')
up2date="lynx -dump http://home.gna.org/getfem/download.html|grep -om1 'gmm-\(.*\).tar.gz'|Flasttar"
source=(http://download.gna.org/getfem/stable/$pkgname-$pkgver.tar.gz)
sha1sums=('4e235a08742002263b53326872e38e87e688dfea')
From vmiklos at frugalware.org  Wed Dec  5 00:48:07 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Dec  5 00:48:11 2007
Subject: [Frugalware-git] bmf: libdvdnav2-svn956-1-i686
Message-ID: <20071204234807.D4ECA11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=6ed3e4f2a10c7bd175d785d4528f020d037a94e6

commit 6ed3e4f2a10c7bd175d785d4528f020d037a94e6
Author: Miklos Vajna 
Date:   Wed Dec 5 00:47:55 2007 +0100

libdvdnav2-svn956-1-i686
new package

diff --git a/source/lib-extra/libdvdnav2/FrugalBuild b/source/lib-extra/libdvdnav2/FrugalBuild
new file mode 100644
index 0000000..8c09508
--- /dev/null
+++ b/source/lib-extra/libdvdnav2/FrugalBuild
@@ -0,0 +1,25 @@
+# Compiling Time: 0.12 SBU
+# Maintainer: VMiklos 
+
+pkgname=libdvdnav2
+pkgver=svn956
+pkgrel=1
+pkgdesc="MPlayer's fork of libdvdnav"
+url="http://mplayerhq.hu"
+depends=('glibc')
+groups=('lib-extra')
+archs=('i686')
+_F_scm_url="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav2"
+_F_scm_type="subversion"
+_F_scm_tag="956"
+Finclude scm
+
+build()
+{
+	Funpack_scm
+	sed -i '/\.\/configure/d' autogen.sh
+	sh autogen.sh || return 1
+	Fbuild
+}
+
+# optimization OK
From vmiklos at frugalware.org  Wed Dec  5 01:24:50 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Dec  5 01:24:53 2007
Subject: [Frugalware-git] bmf: mplayer-1.0rc2-2bmf1-i686
Message-ID: <20071205002450.177C011904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=d448ed7b4781b5404406d1f86f42a152e6bef1ae

commit d448ed7b4781b5404406d1f86f42a152e6bef1ae
Author: Miklos Vajna 
Date:   Wed Dec 5 01:24:37 2007 +0100

mplayer-1.0rc2-2bmf1-i686
bump to newer version + update dvdnav patch

diff --git a/source/xapps/mplayer/01-mplayer.desktop.patch b/source/xapps/mplayer/01-mplayer.desktop.patch
deleted file mode 100644
index c257d5d..0000000
--- a/source/xapps/mplayer/01-mplayer.desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- MPlayer-1.0pre8/etc/mplayer.desktop.orig	2006-06-12 01:57:45.000000000 +0200
-+++ MPlayer-1.0pre8/etc/mplayer.desktop	2006-06-12 01:58:48.000000000 +0200
-@@ -3,10 +3,16 @@
- Encoding=UTF-8
- Name=MPlayer
- GenericName=Multimedia player
-+GenericName[de]=Multimedia Player
-+GenericName[es]=Reproductor multimedia
-+GenericName[fr]=Lecteur multimedia
-+GenericName[hu]=MultimĂŠdia-lejĂĄtszĂł
-+GenericName[it]=Lettore multimediale
- Comment=Multimedia player
- Comment[de]=Multimedia-Player
- Comment[es]=Reproductor multimedia
- Comment[fr]=Lecteur multimedia
-+Comment[hu]=MultimĂŠdia-lejĂĄtszĂł
- Comment[it]=Lettore multimediale
- Icon=mplayer.xpm
- TryExec=gmplayer
diff --git a/source/xapps/mplayer/CVE-2007-2948.diff b/source/xapps/mplayer/CVE-2007-2948.diff
deleted file mode 100644
index 2ecdcc5..0000000
--- a/source/xapps/mplayer/CVE-2007-2948.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- trunk/stream/stream_cddb.c	2007/05/10 11:43:39	23287
-+++ trunk/stream/stream_cddb.c	2007/06/05 11:13:32	23470
-@@ -377,7 +377,7 @@
-
- 	switch(status) {
- 		case 210:
--			ret = sscanf( http_hdr->body, "%d %s %08lx", &status, category, &disc_id);
-+			ret = sscanf( http_hdr->body, "%d %99s %08lx", &status, category, &disc_id);
- 			if( ret!=3 ) {
- 				mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 				return -1;
-@@ -438,7 +438,7 @@
- 	ptr++;
- 	// We have a list of exact/inexact matches, so which one do we use?
- 	// So let's take the first one.
--	ret = sscanf(ptr, "%s %08lx %s", cddb_data->category, &(cddb_data->disc_id), album_title);
-+	ret = sscanf(ptr, "%99s %08lx %99s", cddb_data->category, &(cddb_data->disc_id), album_title);
- 	if( ret!=3 ) {
- 		mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 		return -1;
-@@ -475,7 +475,7 @@
- 	switch(status) {
- 		case 200:
- 			// Found exact match
--			ret = sscanf(http_hdr->body, "%d %s %08lx %s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
-+			ret = sscanf(http_hdr->body, "%d %99s %08lx %99s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
- 			if( ret!=4 ) {
- 				mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 				return -1;
diff --git a/source/xapps/mplayer/DMO_VideoDecoder.diff b/source/xapps/mplayer/DMO_VideoDecoder.diff
deleted file mode 100644
index 7543412..0000000
--- a/source/xapps/mplayer/DMO_VideoDecoder.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-http://svn.mplayerhq.hu/mplayer/trunk/loader/dmo/DMO_VideoDecoder.c?r1=22019&r2=22204&view=patch
---- trunk/loader/dmo/DMO_VideoDecoder.c	2007/01/26 09:21:22	22019
-+++ trunk/loader/dmo/DMO_VideoDecoder.c	2007/02/11 17:55:49	22204
-@@ -119,6 +119,7 @@
-
-         this->iv.m_bh = malloc(bihs);
-         memcpy(this->iv.m_bh, format, bihs);
-+        this->iv.m_bh->biSize = bihs;
-
-         this->iv.m_State = STOP;
-         //this->iv.m_pFrame = 0;
diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 0157ce2..fd5c1c1 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -2,15 +2,15 @@
# Maintainer: VMiklos 

pkgname=mplayer
-pkgver=1.0rc1
+pkgver=1.0rc2
pkgextraver=
-pkgrel=9bmf2
+pkgrel=2bmf1
pkgdesc="The Movie Player"
url="http://www.mplayerhq.hu/"
depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \
'libungif' 'xvidcore' 'libpng' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' \
'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2' \
-	 'x264>=20070421' 'dejavu-ttf' 'openal' 'vidix')
+	 'x264>=20070421' 'dejavu-ttf' 'openal' 'vidix' 'libdvdnav2')
[ "$CARCH" == "i686" ] && depends=(${depends[@]} 'codecs')
groups=('xapps')
backup=('etc/mplayer/mplayer.conf')
@@ -19,22 +19,17 @@ options=('scriptlet' 'nostrip')
up2date="lynx -dump http://www.mplayerhq.hu/MPlayer/releases/|grep -v snapshot |Flasttarbz2"
source=(http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver$pkgextraver.tar.bz2 \
00-$pkgname.conf.patch \
-	01-$pkgname.desktop.patch \
http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-cp1250.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2 \
-	http://www.3gpp.org/ftp/Specs/archive/26_series/{26.104/26104-510.zip,26.204/26204-510.zip}
-	$pkgname-1.0pre7-lzo2.patch.bz2 \
-	http://www.mplayerhq.hu/MPlayer/patches/asmrules_fix_20061231.diff \
-	DMO_VideoDecoder.diff \
-	CVE-2007-2948.diff \
-	http://ftp.frugalware.org/pub/other/sources/mplayer/mplayer-0.7rc1-dvdnav.patch.bz2 \
-	rtp_correction.patch mga_common-correction.patch)
-sha1sums=('a450c0b0749c343a8496ba7810363c9d46dfa73c' \
+	http://www.3gpp.org/ftp/Specs/archive/26_series/{26.104/26104-510.zip,26.204/26204-510.zip} \
+	http://onebithq.com/pub/mplayer/dvdnav/20071023/MPlayer-1.0rc2-with-dvdnav.patch \
+	http://onebithq.com/pub/mplayer/dvdnav/20071023/dvdnav_aspect.patch \
+	mga_common-correction.patch)
+sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \
'f7492d46afc72678435b70fa4326dbbf32795ba9' \
-          '7135e8bf05cee6b123b81fa2a2c6ab18a27af615' \
'45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \
'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \
'152c40bf20de34aa8802d7f80d34d673b0b67212' \
@@ -42,12 +37,8 @@ sha1sums=('a450c0b0749c343a8496ba7810363c9d46dfa73c' \
'2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
'b22dbe895991c23fad446c3c4ff7b6db12673778' \
'9ca910295c2888fba95a98da83762a22aaf34651' \
-          '45c4adbe6ab3063b68938c813966948aebf15ce3' \
-          '84412f4bd85d64a92586ca4db7e8585d16cd1acd' \
-          'e629aafe8e07ddae6db93009715295e6a9d8ed45' \
-          '977fad7f0e8ec616d4b7a6cd2aa5aebcde99f7e1' \
-          'b36dce95d686e4b7a1a58b211d5856ab253c5cc9' \
-          '4192583c9837c0c106d140b885e89fc982d8cb8b' \
+          'e781ec5120635fbe6208453d9b8a0ec94b243792' \
+          'ea85ec053020dbb36fe6376d6a165fc7bef4f841' \
'2dcbd6908029a02655ab1536c2f93c7be82ca406')

# To add v4l support.
@@ -58,17 +49,16 @@ build()
unset CFLAGS
Fcd MPlayer-$pkgver$pkgextraver
Fpatchall
-	mkdir libavcodec/amr_float
+	mkdir -p libavcodec/amr_float
cd libavcodec/amr_float
-	unzip -q $Fsrcdir/26104-510_ANSI_C_source_code.zip
+	unzip -o -q $Fsrcdir/26104-510_ANSI_C_source_code.zip
cd -
mkdir libavcodec/amrwb_float
cd libavcodec/amrwb_float
-	unzip -q $Fsrcdir/26204-510_ANSI-C_source_code.zip
+	unzip -o -q $Fsrcdir/26204-510_ANSI-C_source_code.zip
cd -
Fconf --confdir=/etc/mplayer --enable-gui --language=all \
--enable-runtime-cpudetection --enable-liblzo \
-		--enable-live --with-livelibdir=/usr/lib/live \
--enable-largefiles --enable-mga --enable-xmga \
--enable-tdfxfb --disable-vidix-internal --enable-dvdnav \
--enable-debug
diff --git a/source/xapps/mplayer/asmrules_fix_20061231.diff b/source/xapps/mplayer/asmrules_fix_20061231.diff
deleted file mode 100644
index 87bab25..0000000
--- a/source/xapps/mplayer/asmrules_fix_20061231.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: stream/realrtsp/asmrp.c
-===================================================================
---- stream/realrtsp/asmrp.c	(revision 20381)
-+++ stream/realrtsp/asmrp.c	(working copy)
-@@ -40,6 +40,7 @@
- #include 
- #include 
- #include 
-+#include "asmrp.h"
-
- /*
- #define LOG
-@@ -645,8 +646,10 @@
- #ifdef LOG
-       printf ("rule #%d is true\n", rule_num);
- #endif
--      matches[num_matches] = rule_num;
--      num_matches++;
-+      if(num_matches < MAX_RULEMATCHES - 1)
-+        matches[num_matches++] = rule_num;
-+      else
-+        printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num);
-     }
-
-     rule_num++;
-Index: stream/realrtsp/real.c
-===================================================================
---- stream/realrtsp/real.c	(revision 20381)
-+++ stream/realrtsp/real.c	(working copy)
-@@ -271,7 +271,7 @@
-     int j=0;
-     int n;
-     char b[64];
--    int rulematches[16];
-+    int rulematches[MAX_RULEMATCHES];
-
- #ifdef LOG
-     printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
-Index: stream/realrtsp/asmrp.h
-===================================================================
---- stream/realrtsp/asmrp.h	(revision 20381)
-+++ stream/realrtsp/asmrp.h	(working copy)
-@@ -40,6 +40,8 @@
- #ifndef HAVE_ASMRP_H
- #define HAVE_ASMRP_H
-
-+#define MAX_RULEMATCHES 16
-+
- int asmrp_match (const char *rules, int bandwidth, int *matches) ;
-
- #endif
diff --git a/source/xapps/mplayer/mplayer-1.0pre7-lzo2.patch.bz2 b/source/xapps/mplayer/mplayer-1.0pre7-lzo2.patch.bz2
deleted file mode 100644
index ce765af..0000000
Binary files a/source/xapps/mplayer/mplayer-1.0pre7-lzo2.patch.bz2 and /dev/null differ
diff --git a/source/xapps/mplayer/rtp_correction.patch b/source/xapps/mplayer/rtp_correction.patch
deleted file mode 100644
index 9ef3fd3..0000000
--- a/source/xapps/mplayer/rtp_correction.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpdemux/demux_rtp.cpp	2006-11-04 14:58:41.000000000 +0100
-+++ libmpdemux/demux_rtp.cpp	2007-09-03 23:18:45.000000000 +0200
-@@ -241,7 +241,7 @@
-   if (demux_is_multiplexed_rtp_stream(demuxer)) {
-     stream_t* s = new_ds_stream(demuxer->video);
-     demuxer_t* od = demux_open(s, DEMUXER_TYPE_UNKNOWN,
--			       audio_id, video_id, dvdsub_id, NULL, 0, 0, 0);
-+			       audio_id, video_id, dvdsub_id, NULL, 0);
-     demuxer = new_demuxers_demuxer(od, od, od);
-   }
-
From vmiklos at frugalware.org  Wed Dec  5 01:42:14 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Dec  5 01:42:16 2007
Subject: [Frugalware-git] frugalware-current: amrnb-7.0.0.0-1-i686
Message-ID: <20071205004214.4A0FE11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a6188a38431bbadf9d90913d6de2afaec6e36fd5

commit a6188a38431bbadf9d90913d6de2afaec6e36fd5
Author: Miklos Vajna 
Date:   Wed Dec 5 01:41:46 2007 +0100

amrnb-7.0.0.0-1-i686
new package
a new depend for mplayer

diff --git a/source/lib-extra/amrnb/FrugalBuild b/source/lib-extra/amrnb/FrugalBuild
new file mode 100644
index 0000000..e2033a7
--- /dev/null
+++ b/source/lib-extra/amrnb/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: 0.12 SBU
+# Maintainer: VMiklos 
+
+pkgname=amrnb
+pkgver=7.0.0.0
+pkgrel=1
+pkgdesc="Wrapper library for 3GPP Adaptive Multi-Rate Floating-point Speech Codec"
+url="http://www.penguin.cz/~utx/amr"
+depends=('glibc')
+groups=('lib-extra')
+archs=('i686')
+up2date="lynx -dump $url |grep amrnb |Flasttarbz2"
+source=(http://ftp.penguin.cz/pub/users/utx/amr/amrnb-$pkgver.tar.bz2 \
+	http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip)
+sha1sums=('446e78078e24f05a7d474912722f4e0f4c7809e7' \
+          '2631a2e7ec06294b36eb7bf8f80ada1799fb6bf8')
+options=('nomirror')
+
+build()
+{
+	Fcd
+	cp ../26104-700.zip .
+	Fbuild
+}
+
+# optimization OK
From vmiklos at frugalware.org  Wed Dec  5 01:52:53 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Dec  5 01:52:55 2007
Subject: [Frugalware-git] frugalware-current: amrnb-7.0.0.0-1-i686
Message-ID: <20071205005253.CA51A11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ac030c331599e00a397f28b1dff12aa3377d9c36

commit ac030c331599e00a397f28b1dff12aa3377d9c36
Author: Miklos Vajna 
Date:   Wed Dec 5 01:52:46 2007 +0100

amrnb-7.0.0.0-1-i686
groups() fix

diff --git a/source/lib-extra/amrnb/FrugalBuild b/source/lib-extra/amrnb/FrugalBuild
deleted file mode 100644
index e2033a7..0000000
--- a/source/lib-extra/amrnb/FrugalBuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Compiling Time: 0.12 SBU
-# Maintainer: VMiklos 
-
-pkgname=amrnb
-pkgver=7.0.0.0
-pkgrel=1
-pkgdesc="Wrapper library for 3GPP Adaptive Multi-Rate Floating-point Speech Codec"
-url="http://www.penguin.cz/~utx/amr"
-depends=('glibc')
-groups=('lib-extra')
-archs=('i686')
-up2date="lynx -dump $url |grep amrnb |Flasttarbz2"
-source=(http://ftp.penguin.cz/pub/users/utx/amr/amrnb-$pkgver.tar.bz2 \
-	http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip)
-sha1sums=('446e78078e24f05a7d474912722f4e0f4c7809e7' \
-          '2631a2e7ec06294b36eb7bf8f80ada1799fb6bf8')
-options=('nomirror')
-
-build()
-{
-	Fcd
-	cp ../26104-700.zip .
-	Fbuild
-}
-
-# optimization OK
diff --git a/source/lib/amrnb/FrugalBuild b/source/lib/amrnb/FrugalBuild
new file mode 100644
index 0000000..c1b9e8f
--- /dev/null
+++ b/source/lib/amrnb/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: 0.12 SBU
+# Maintainer: VMiklos 
+
+pkgname=amrnb
+pkgver=7.0.0.0
+pkgrel=1
+pkgdesc="Wrapper library for 3GPP Adaptive Multi-Rate Floating-point Speech Codec"
+url="http://www.penguin.cz/~utx/amr"
+depends=('glibc')
+groups=('lib')
+archs=('i686')
+up2date="lynx -dump $url |grep amrnb |Flasttarbz2"
+source=(http://ftp.penguin.cz/pub/users/utx/amr/amrnb-$pkgver.tar.bz2 \
+	http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip)
+sha1sums=('446e78078e24f05a7d474912722f4e0f4c7809e7' \
+          '2631a2e7ec06294b36eb7bf8f80ada1799fb6bf8')
+options=('nomirror')
+
+build()
+{
+	Fcd
+	cp ../26104-700.zip .
+	Fbuild
+}
+
+# optimization OK
From vmiklos at frugalware.org  Wed Dec  5 01:55:36 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Dec  5 01:55:38 2007
Subject: [Frugalware-git] frugalware-current: amrwb-7.0.0.2-1-i686
Message-ID: <20071205005536.7609711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bbc890800b5c5283938901b7455b39149edb5558

commit bbc890800b5c5283938901b7455b39149edb5558
Author: Miklos Vajna 
Date:   Wed Dec 5 01:55:24 2007 +0100

amrwb-7.0.0.2-1-i686
new package
a new depend for mplayer

diff --git a/source/lib/amrwb/FrugalBuild b/source/lib/amrwb/FrugalBuild
new file mode 100644
index 0000000..1bd198b
--- /dev/null
+++ b/source/lib/amrwb/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: 0.12 SBU
+# Maintainer: VMiklos 
+
+pkgname=amrwb
+pkgver=7.0.0.2
+pkgrel=1
+pkgdesc="Wrapper library for 3GPP Adaptive Multi-Rate Wideband Floating-point Speech Codec"
+url="http://www.penguin.cz/~utx/amr"
+depends=('glibc')
+groups=('lib')
+archs=('i686')
+up2date="lynx -dump $url |grep amrwb |Flasttarbz2"
+source=(http://ftp.penguin.cz/pub/users/utx/amr/amrwb-$pkgver.tar.bz2 \
+	http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-700.zip)
+sha1sums=('040dadc5c59606132a62d6a594ac57bef21de2f5' \
+          '16634b168b407c3a72963117b0fab997725b92f6')
+options=('nomirror')
+
+build()
+{
+	Fcd
+	cp ../26204-700.zip .
+	Fbuild
+}
+
+# optimization OK
From janny at frugalware.org  Wed Dec  5 04:14:02 2007
From: janny at frugalware.org (janny)
Date: Wed Dec  5 04:14:04 2007
Subject: [Frugalware-git] frugalware-current: firefox-2.0.0.11-1-i686
Message-ID: <20071205031402.9833711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=69f89f7e833ea24a9ca98e4b12c2b2ed159137b7

commit 69f89f7e833ea24a9ca98e4b12c2b2ed159137b7
Author: janny 
Date:   Wed Dec 5 04:12:01 2007 +0100

firefox-2.0.0.11-1-i686
version bump

diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild
index e92b759..5bafcaa 100644
--- a/source/xapps/firefox/FrugalBuild
+++ b/source/xapps/firefox/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos 

pkgname=firefox
-pkgver=2.0.0.10
+pkgver=2.0.0.11
pkgrel=1
pkgdesc="Mozilla Firefox web browser"
url="http://www.mozilla.org/products/firefox/"
From janny at frugalware.org  Wed Dec  5 05:06:58 2007
From: janny at frugalware.org (janny)
Date: Wed Dec  5 05:07:00 2007
Subject: [Frugalware-git] frugalware-current: monodevelop-0.17-3-i686
Message-ID: <20071205040658.A784F11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4abba961d9d2c8f933d45fc0daf5d4e41499196b

commit 4abba961d9d2c8f933d45fc0daf5d4e41499196b
Author: janny 
Date:   Wed Dec 5 05:05:29 2007 +0100

monodevelop-0.17-3-i686
relbump with new firefox (.11)

diff --git a/source/gnome-extra/monodevelop/FrugalBuild b/source/gnome-extra/monodevelop/FrugalBuild
index 5ea7883..687dba1 100644
--- a/source/gnome-extra/monodevelop/FrugalBuild
+++ b/source/gnome-extra/monodevelop/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=monodevelop
pkgver=0.17
-pkgrel=2
+pkgrel=3
pkgdesc="A project to port SharpDevelop to Gtk#"
url="http://www.mono-project.com/"
depends=('gecko-sharp' 'gtksourceview-sharp' 'shared-mime-info' \
-	'mono-tools>=1.2.4-2' 'firefox=2.0.0.10' 'ikvm' 'boo' 'gnome-sharp' 'mono>=1.2.5.2')
+	'mono-tools>=1.2.4-2' 'firefox=2.0.0.11' 'ikvm' 'boo' 'gnome-sharp' 'mono>=1.2.5.2')
makedepends=('intltool')
groups=('gnome-extra')
archs=('i686' 'x86_64')
From janny at frugalware.org  Wed Dec  5 06:04:02 2007
From: janny at frugalware.org (janny)
Date: Wed Dec  5 06:04:07 2007
Subject: [Frugalware-git] 
	frugalware-current: perl-file-find-closures-1.07-1-i686
Message-ID: <20071205050402.C32A411904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c969f517807bfe291de65f110041fa220cc8fb1

commit 2c969f517807bfe291de65f110041fa220cc8fb1
Author: janny 
Date:   Wed Dec 5 06:03:42 2007 +0100

perl-file-find-closures-1.07-1-i686
version bump

diff --git a/source/devel-extra/perl-file-find-closures/FrugalBuild b/source/devel-extra/perl-file-find-closures/FrugalBuild
index b452d9e..f63e072 100644
--- a/source/devel-extra/perl-file-find-closures/FrugalBuild
+++ b/source/devel-extra/perl-file-find-closures/FrugalBuild
@@ -3,8 +3,8 @@

_F_perl_name=File-Find-Closures
_F_perl_author=B/BD/BDFOY
-pkgver=1.06
+pkgver=1.07
pkgdesc="functions you can use with File::Find"
Finclude perl
-sha1sums=('c94ab2aee13e2ee68d9ae6b2dd34ad410648e97a')
+sha1sums=('26e49711eccb8f220313c022b9a349ce77db1231')
archs=(${archs[@]} 'x86_64')
From janny at frugalware.org  Wed Dec  5 06:47:56 2007
From: janny at frugalware.org (janny)
Date: Wed Dec  5 06:47:58 2007
Subject: [Frugalware-git] frugalware-current: gdal-1.4.4-1-i686
Message-ID: <20071205054756.D72AD11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=41d338af69e2afaf5fc533172bdf90ad775c69c4

commit 41d338af69e2afaf5fc533172bdf90ad775c69c4
Author: janny 
Date:   Wed Dec 5 06:47:10 2007 +0100

gdal-1.4.4-1-i686
version bump

diff --git a/source/apps-extra/gdal/FrugalBuild b/source/apps-extra/gdal/FrugalBuild
index 57aff9c..07d8091 100644
--- a/source/apps-extra/gdal/FrugalBuild
+++ b/source/apps-extra/gdal/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Janny 

pkgname=gdal
-pkgver=1.4.3
+pkgver=1.4.4
pkgrel=1
pkgdesc="GDAL - a translator library for raster geospatial data formats"
url="http://www.gdal.org/"
@@ -14,7 +14,7 @@ groups=('apps-extra')
up2date="lynx -dump http://download.osgeo.org/gdal/|grep $pkgname-[0-9\.]*\.tar.gz$ |tail -n 1 |sed -ne 's/.*-\(.*\)\.t.*/\1/;1 p'"
source=($url/dl/$pkgname-$pkgver.tar.gz)
Finclude python
-sha1sums=('2d3251dfdfc38270c0d9c30f2475b6767b09b1ab')
+sha1sums=('9f5f830a464a34ef2b3a7b31a808d0938f13c9fb')

build() {
Fbuild --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin \
From janny at frugalware.org  Wed Dec  5 07:01:54 2007
From: janny at frugalware.org (janny)
Date: Wed Dec  5 07:01:57 2007
Subject: [Frugalware-git] frugalware-current: sugarcrm-4.5.1h-1-i686
Message-ID: <20071205060154.B69FE11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bbe60053a20480360f423d85abed1fa48c0dd4db

commit bbe60053a20480360f423d85abed1fa48c0dd4db
Author: janny 
Date:   Wed Dec 5 07:00:54 2007 +0100

sugarcrm-4.5.1h-1-i686
version bump

diff --git a/source/network-extra/sugarcrm/FrugalBuild b/source/network-extra/sugarcrm/FrugalBuild
index 8fa69f4..784b902 100644
--- a/source/network-extra/sugarcrm/FrugalBuild
+++ b/source/network-extra/sugarcrm/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=sugarcrm
origname=SugarOS
-pkgver=4.5.1g
+pkgver=4.5.1h
pkgrel=1
pkgdesc="Opensourced CRM application."
url="http://www.sugarforge.org"
@@ -12,9 +12,9 @@ rodepends=('apache' 'php' 'mysql' 'imap')
archs=('i686' 'x86_64')
groups=('network-extra')
up2date="lynx -dump $url/content/downloads/downloads.php|grep 'SugarOS.*\.zip'|sort|sed -n 's/.*-\([0-9\.a-z]\+\)\.zip.*/\1/;1p'"
-source=(http://dl.sugarforge.org/sugarcrm/${origname}4.5.1Latest/${origname}4.5.1/$origname-$pkgver.zip \
+source=(http://dl.sugarforge.org/sugarcrm/SugarOS4.5.1Latest/SugarOS4.5.1/$origname-$pkgver.zip \
README.Frugalware)
-sha1sums=('7bb0605e9b49fd0ea79db79cf3b54da767e590c9' \
+sha1sums=('b22aabdc5bf27da1b4712d7fa0d96d1717f1ce39' \
'2ad5db72181854016c96c83635244dc75226ff77')

build() {
From janny at frugalware.org  Wed Dec  5 07:24:05 2007
From: janny at frugalware.org (janny)
Date: Wed Dec  5 07:24:07 2007
Subject: [Frugalware-git] frugalware-current: courier-imap-4.3.0-1-i686
Message-ID: <20071205062405.BBBC311904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e65f4c694e664b28c6e84eba6eda30b6608fa81c

commit e65f4c694e664b28c6e84eba6eda30b6608fa81c
Author: janny 
Date:   Wed Dec 5 07:23:44 2007 +0100

courier-imap-4.3.0-1-i686
version bump

diff --git a/source/network-extra/courier-imap/FrugalBuild b/source/network-extra/courier-imap/FrugalBuild
index a74f2b4..42a56c9 100644
--- a/source/network-extra/courier-imap/FrugalBuild
+++ b/source/network-extra/courier-imap/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Karoly CZOVEK 

pkgname=courier-imap
-pkgver=4.2.1
+pkgver=4.3.0
pkgrel=1
pkgdesc="The Courier IMAP and POP3 server"
_F_sourceforge_dirname="courier"
@@ -18,7 +18,7 @@ makedepends=('postfix' 'openldap' 'mysql' 'postgresql' 'courier-authlib')
up2date="lynx -dump 'http://www.courier-mta.org/download.php'|grep imap|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'"
source=($source rc.courier-imapd rc.courier-imapd-ssl rc.courier-pop3d \
rc.courier-pop3d-ssl README.frugalware)
-sha1sums=('e21b464680fb8fe2e473966bf6faa19944a68485' \
+sha1sums=('b7c091f2bfdd22308ac26724e88b50e7a4f68cb2' \
'0da77a7b652876916c7e228bc889586cc5e45176' \
'036597f9d7609fc172509c07198be5057a1d6651' \
'52babf7670b08ab32b426f1d7dd3692c8aa49b4c' \
From janny at frugalware.org  Wed Dec  5 07:59:42 2007
From: janny at frugalware.org (janny)
Date: Wed Dec  5 07:59:43 2007
Subject: [Frugalware-git] frugalware-current: kcheckgmail-0.5.7.3-1-i686
Message-ID: <20071205065942.03C5511904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ece47fd24f00739b2c31b8efcede95909f6b6f4

commit 7ece47fd24f00739b2c31b8efcede95909f6b6f4
Author: janny 
Date:   Wed Dec 5 07:59:24 2007 +0100

kcheckgmail-0.5.7.3-1-i686
version bump

diff --git a/source/kde-extra/kcheckgmail/FrugalBuild b/source/kde-extra/kcheckgmail/FrugalBuild
index be88ef3..06dc3bd 100644
--- a/source/kde-extra/kcheckgmail/FrugalBuild
+++ b/source/kde-extra/kcheckgmail/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Janny 

pkgname=kcheckgmail
-pkgver=0.5.7.2
+pkgver=0.5.7.3
pkgrel=1
pkgdesc="KCheckGmail is a system tray application to notify you about how many email messages you have in your Gmail account."
license="GPL"
@@ -12,6 +12,6 @@ groups=('kde-extra')
_F_sourceforge_ext=".tar.bz2"
_F_sourceforge_broken_up2date=1
Finclude kde sourceforge
-sha1sums=('38cfa3d278be29dc2f966a08c342389c11975f56')
+sha1sums=('f0055a13b72e0d5e27644e875bf079f072589c3f')

# optimization ok
From janny at frugalware.org  Wed Dec  5 09:15:30 2007
From: janny at frugalware.org (janny)
Date: Wed Dec  5 09:15:32 2007
Subject: [Frugalware-git] frugalware-current: gimp-2.4.2-1-i686
Message-ID: <20071205081530.0C8F111904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dda49d54cf2119dc21085a94ca5c5353e6e03751

commit dda49d54cf2119dc21085a94ca5c5353e6e03751
Author: janny 
Date:   Wed Dec 5 09:13:17 2007 +0100

gimp-2.4.2-1-i686
version bump

diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild
index a11d68d..527584e 100644
--- a/source/xapps/gimp/FrugalBuild
+++ b/source/xapps/gimp/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos 

pkgname=gimp
-pkgver=2.4.1
+pkgver=2.4.2
pkgrel=1
pkgdesc="The GNU Image Manipulation Program"
url="http://www.gimp.org/"
@@ -14,7 +14,7 @@ archs=('i686' 'x86_64')
makedepends=('gimp-print' 'perl-xml')
up2date="lynx -dump $url/downloads/|grep tar.bz2|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'"
source=(ftp://ftp.gimp.org/pub/gimp/v2.4/$pkgname-$pkgver.tar.bz2)
-sha1sums=('5d554959e9583845acff713e5f65e02fcf37db0c')
+sha1sums=('4913a411abde3fccae5350e00a9bd20742715367')
options=('scriptlet')
_F_gnome_desktop="y"
Finclude gnome-scriptlet
From vmiklos at frugalware.org  Wed Dec  5 09:45:01 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Dec  5 09:45:04 2007
Subject: [Frugalware-git] frugalware-current: mplayer-1.0rc2-2-i686
Message-ID: <20071205084501.3FE8E11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fdd792e7dafbfeb397b3425b0cc53ddd24dcf2e5

commit fdd792e7dafbfeb397b3425b0cc53ddd24dcf2e5
Author: Miklos Vajna 
Date:   Wed Dec 5 09:44:20 2007 +0100

mplayer-1.0rc2-2-i686
moved amrnb and amrwb to a separate package (so that other pkgs can use it, too)
removed two no longer used patches

diff --git a/source/xapps/mplayer/CVE-2007-2948.diff b/source/xapps/mplayer/CVE-2007-2948.diff
deleted file mode 100644
index 2ecdcc5..0000000
--- a/source/xapps/mplayer/CVE-2007-2948.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- trunk/stream/stream_cddb.c	2007/05/10 11:43:39	23287
-+++ trunk/stream/stream_cddb.c	2007/06/05 11:13:32	23470
-@@ -377,7 +377,7 @@
-
- 	switch(status) {
- 		case 210:
--			ret = sscanf( http_hdr->body, "%d %s %08lx", &status, category, &disc_id);
-+			ret = sscanf( http_hdr->body, "%d %99s %08lx", &status, category, &disc_id);
- 			if( ret!=3 ) {
- 				mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 				return -1;
-@@ -438,7 +438,7 @@
- 	ptr++;
- 	// We have a list of exact/inexact matches, so which one do we use?
- 	// So let's take the first one.
--	ret = sscanf(ptr, "%s %08lx %s", cddb_data->category, &(cddb_data->disc_id), album_title);
-+	ret = sscanf(ptr, "%99s %08lx %99s", cddb_data->category, &(cddb_data->disc_id), album_title);
- 	if( ret!=3 ) {
- 		mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 		return -1;
-@@ -475,7 +475,7 @@
- 	switch(status) {
- 		case 200:
- 			// Found exact match
--			ret = sscanf(http_hdr->body, "%d %s %08lx %s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
-+			ret = sscanf(http_hdr->body, "%d %99s %08lx %99s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
- 			if( ret!=4 ) {
- 				mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 				return -1;
diff --git a/source/xapps/mplayer/DMO_VideoDecoder.diff b/source/xapps/mplayer/DMO_VideoDecoder.diff
deleted file mode 100644
index 7543412..0000000
--- a/source/xapps/mplayer/DMO_VideoDecoder.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-http://svn.mplayerhq.hu/mplayer/trunk/loader/dmo/DMO_VideoDecoder.c?r1=22019&r2=22204&view=patch
---- trunk/loader/dmo/DMO_VideoDecoder.c	2007/01/26 09:21:22	22019
-+++ trunk/loader/dmo/DMO_VideoDecoder.c	2007/02/11 17:55:49	22204
-@@ -119,6 +119,7 @@
-
-         this->iv.m_bh = malloc(bihs);
-         memcpy(this->iv.m_bh, format, bihs);
-+        this->iv.m_bh->biSize = bihs;
-
-         this->iv.m_State = STOP;
-         //this->iv.m_pFrame = 0;
diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 337d54e..d99ad7a 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -5,13 +5,13 @@ pkgname=mplayer
_F_archive_name=MPlayer
pkgver=1.0rc2
pkgextraver=
-pkgrel=1
+pkgrel=2
pkgdesc="The Movie Player"
url="http://www.mplayerhq.hu/"
depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \
'libungif' 'xvidcore' 'libpng' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' \
'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2' \
-	 'x264>=20070421' 'dejavu-ttf' 'openal' 'vidix')
+	 'x264>=20070421' 'dejavu-ttf' 'openal' 'vidix' 'amrnb' 'amrwb')
[ "$CARCH" == "i686" ] && depends=(${depends[@]} 'codecs')
groups=('xapps')
backup=('etc/mplayer/mplayer.conf')
@@ -24,17 +24,14 @@ source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver$pkgext
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-cp1250.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 \
-	http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2 \
-	http://www.3gpp.org/ftp/Specs/archive/26_series/{26.104/26104-510.zip,26.204/26204-510.zip})
+	http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2)
sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \
'f7492d46afc72678435b70fa4326dbbf32795ba9' \
'45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \
'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \
'152c40bf20de34aa8802d7f80d34d673b0b67212' \
'7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \
-          '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
-          'b22dbe895991c23fad446c3c4ff7b6db12673778' \
-          '9ca910295c2888fba95a98da83762a22aaf34651')
+          '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d')

# To add v4l support.
# mknod -m 660 /dev/video0 c 81 0
@@ -44,14 +41,6 @@ build()
unset CFLAGS
Fcd MPlayer-$pkgver$pkgextraver
Fpatchall
-	mkdir -p libavcodec/amr_float
-	cd libavcodec/amr_float
-	unzip -o -q $Fsrcdir/26104-510_ANSI_C_source_code.zip
-	cd -
-	mkdir -p libavcodec/amrwb_float
-	cd libavcodec/amrwb_float
-	unzip -o -q $Fsrcdir/26204-510_ANSI-C_source_code.zip
-	cd -
Fmake --confdir=/etc/mplayer --enable-gui --language=all \
--enable-runtime-cpudetection --enable-liblzo \
--enable-largefiles --enable-mga --enable-xmga \
@@ -75,8 +64,8 @@ build()

# Install mplayer.conf
Ffilerel etc/example.conf /etc/mplayer/mplayer.conf
-	## symlink to solve this "New_Face failed. Maybe the font path is wrong." and this
-	## annoying popup about font missing :S
+
+	# Install default ttf font
Fln /usr/lib/X11/fonts/TTF/DejaVuSans.ttf /usr/share/mplayer/subfont.ttf
}
From crazy at frugalware.org  Wed Dec  5 09:50:15 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 09:50:17 2007
Subject: [Frugalware-git] frugalware-current: homebank-3.5-2-i686
Message-ID: <20071205085015.CF15611904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2401a7d39af578829b8440f1028c6b4e3a1676b

commit e2401a7d39af578829b8440f1028c6b4e3a1676b
Author: crazy 
Date:   Wed Dec 5 09:49:18 2007 +0100

homebank-3.5-2-i686
* rebuild with libofx

diff --git a/source/xapps-extra/homebank/FrugalBuild b/source/xapps-extra/homebank/FrugalBuild
index 6ccd6fd..318d891 100644
--- a/source/xapps-extra/homebank/FrugalBuild
+++ b/source/xapps-extra/homebank/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=homebank
pkgver=3.5
-pkgrel=1
+pkgrel=2
pkgdesc="HomeBank is the free software you have always wanted to manage your personal accounts at home"
url="http://homebank.free.fr"
-depends=('gtk+2' 'libxdamage' 'libofx')
+depends=('gtk+2' 'libxdamage' 'libofx>=0.9.0')
makedepends=('perl-xml')
options=('scriptlet')
groups=('xapps-extra')
From crazy at frugalware.org  Wed Dec  5 09:50:16 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 09:50:18 2007
Subject: [Frugalware-git] frugalware-current: libnova-0.12.1-1-x86_64
Message-ID: <20071205085016.0E3C211904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb6d29d5147d38cad2735ccb998edfae47b25d44

commit bb6d29d5147d38cad2735ccb998edfae47b25d44
Author: crazy 
Date:   Wed Dec 5 09:50:03 2007 +0100

libnova-0.12.1-1-x86_64
* added x86_64 to archs()

diff --git a/source/lib-extra/libnova/FrugalBuild b/source/lib-extra/libnova/FrugalBuild
index fa8f790..9b2d128 100644
--- a/source/lib-extra/libnova/FrugalBuild
+++ b/source/lib-extra/libnova/FrugalBuild
@@ -7,13 +7,16 @@ pkgrel=1
pkgdesc="libnova is a general purpose, double precision, celestial mechanics, astrometry and astrodynamics library."
depends=('glibc')
groups=('lib-extra')
-archs=('i686')
+archs=('i686' 'x86_64')
_F_sourceforge_broken_up2date=1
Finclude sourceforge
sha1sums=('b27d9b0d6f02f4303a790bce56571f85f2492e75')

build()
{
+	if [ "$CARCH" == "x86_64" ]; then
+		export CFLAGS="$CFLAGS -fPIC"
+	fi
Fcd
Fautoreconf
Fconf
From iron at frugalware.org  Wed Dec  5 09:52:55 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Wed Dec  5 09:52:58 2007
Subject: [Frugalware-git] frugalware-current: acroread-8.1.1-2-noarch
Message-ID: <20071205085255.F0C9F11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c01eab28518d9d71a04afcc5e1443f9f367cc95b

commit c01eab28518d9d71a04afcc5e1443f9f367cc95b
Author: Krisztian VASAS 
Date:   Wed Dec 5 09:52:27 2007 +0100

acroread-8.1.1-2-noarch
- added acroread.csh for tcsh users

diff --git a/source/xapps-extra/acroread/FrugalBuild b/source/xapps-extra/acroread/FrugalBuild
index ab4e76b..152a16e 100644
--- a/source/xapps-extra/acroread/FrugalBuild
+++ b/source/xapps-extra/acroread/FrugalBuild
@@ -3,14 +3,14 @@

pkgname=acroread
pkgver=8.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="Adobe Acrobat Reader for viewing PDF files"
url="http://www.adobe.com/products/acrobat/readermain.html"
depends=('gtk+2' 'libstdc++5')
groups=('xapps-extra')
archs=('i686')
up2date="lynx -dump 'http://www.adobe.com/products/acrobat/readstep2_allversions_nojs2.html?option=full&platform=LINUX_.tar.gz&language=English'|grep 'Adobe Reader [0-9.]\+'|head -n 1|sed 's/.*Adobe Reader \(.*\)/\1/'"
-source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/8.x/$pkgver/enu/AdobeReader_enu-$pkgver-1.i486.tar.gz acroread.sh)
+source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/8.x/$pkgver/enu/AdobeReader_enu-$pkgver-1.i486.tar.gz acroread.sh acroread.csh)
options=('nobuild' 'nostrip')
_F_desktop_name="Adobe Reader"
_F_desktop_icon="acroread.png"
@@ -35,4 +35,5 @@ build()
Fdesktop2
}
sha1sums=('916ed44715e61e0384da2be69f968a59b15ea69d' \
-          '4b14a08c12f8c56a33421670831eeccb2eb45793')
+          '4b14a08c12f8c56a33421670831eeccb2eb45793' \
+	  'bc22ae0918ed8d7f044337f9003350f57344b704')
diff --git a/source/xapps-extra/acroread/acroread.csh b/source/xapps-extra/acroread/acroread.csh
new file mode 100644
index 0000000..5304900
--- /dev/null
+++ b/source/xapps-extra/acroread/acroread.csh
@@ -0,0 +1 @@
+setenv PATH "${PATH}:/usr/lib/acroread/Adobe/Reader8/bin"
From crazy at frugalware.org  Wed Dec  5 09:54:33 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 09:54:35 2007
Subject: [Frugalware-git] frugalware-current: rebuild.txt
Message-ID: <20071205085433.B67F711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad7cec9b91cef1814c31cbe4cfbba70c0a497927

commit ad7cec9b91cef1814c31cbe4cfbba70c0a497927
Author: crazy 
Date:   Wed Dec 5 09:54:16 2007 +0100

rebuild.txt
* added libofx and homebank to it

diff --git a/docs/rebuild.txt b/docs/rebuild.txt
index 51ce658..f1a9a10 100644
--- a/docs/rebuild.txt
+++ b/docs/rebuild.txt
@@ -267,3 +267,7 @@ revdep-rebuild 429 --other --sed "s|'parted[^']*'|'parted>=1.8.8'|"
- php
- bzflag
- xine-ui
+
+== libofx
+
+- homebank
From iron at frugalware.org  Wed Dec  5 09:58:29 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Wed Dec  5 09:58:30 2007
Subject: [Frugalware-git] frugalware-current: acroread-8.1.1-2-noarch
Message-ID: <20071205085829.6C68611904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55035bf8bfb20bf981239120e270018a04f0b1df

commit 55035bf8bfb20bf981239120e270018a04f0b1df
Author: Krisztian VASAS 
Date:   Wed Dec 5 09:58:08 2007 +0100

acroread-8.1.1-2-noarch
- forgot to add the Fexe line to the FB - now done

diff --git a/source/xapps-extra/acroread/FrugalBuild b/source/xapps-extra/acroread/FrugalBuild
index 152a16e..68a093f 100644
--- a/source/xapps-extra/acroread/FrugalBuild
+++ b/source/xapps-extra/acroread/FrugalBuild
@@ -28,6 +28,7 @@ build()
Fln /usr/lib/acroread/Browser/intellinux/nppdf.so \
/usr/lib/mozilla/plugins
Fexe /etc/profile.d/acroread.sh
+	Fexe /etc/profile.d/acroread.csh
Frm /usr/share/doc/$pkgname-$pkgver/INSTALL
Fmkdir /usr/share/pixmaps
Fcp /usr/lib/acroread/Adobe/Reader8/Resource/Icons/32x32/AdobeReader8.png \
From crazy at frugalware.org  Wed Dec  5 10:04:48 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 10:04:50 2007
Subject: [Frugalware-git] frugalware-current: indilib-0.5-1-x86_64
Message-ID: <20071205090448.F3B1511904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=825c93301a8e0ae3df887887f1f872717b592f8a

commit 825c93301a8e0ae3df887887f1f872717b592f8a
Author: crazy 
Date:   Wed Dec 5 10:04:23 2007 +0100

indilib-0.5-1-x86_64
* added x86_64 to archs()

diff --git a/source/lib-extra/indilib/FrugalBuild b/source/lib-extra/indilib/FrugalBuild
index aec654e..14dc907 100644
--- a/source/lib-extra/indilib/FrugalBuild
+++ b/source/lib-extra/indilib/FrugalBuild
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="An instrument neutral distributed interface control protocol for Astronomical devices."
depends=('libusb' 'zlib')
groups=('lib-extra')
-archs=('i686')
+archs=('i686' 'x86_64')
_F_sourceforge_dirname="indi"
_F_sourceforge_broken_up2date=1
_F_cd_path="indi"
@@ -15,4 +15,8 @@ Finclude sourceforge
url="http://indi.sourceforge.net/index.php/Main_Page"
sha1sums=('b5ff00359b2de80c2cc7b253d278cff3be20b150')

+if [ "$CARCH" == "x86_64" ]; then
+	 export CFLAGS="$CFLAGS -fPIC"
+fi
+
# optimization OK
From crazy at frugalware.org  Wed Dec  5 10:12:41 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 10:12:42 2007
Subject: [Frugalware-git] frugalware-current: pinot-0.81-1-i686
Message-ID: <20071205091241.30AEC11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6e9947f8d3a22d0b0d50ad4d702d914af9f5bd0d

commit 6e9947f8d3a22d0b0d50ad4d702d914af9f5bd0d
Author: crazy 
Date:   Wed Dec 5 10:11:29 2007 +0100

pinot-0.81-1-i686
* Version bump

diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild
index 6bc7ab2..716f9e6 100644
--- a/source/xapps-extra/pinot/FrugalBuild
+++ b/source/xapps-extra/pinot/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=pinot
-pkgver=0.80
+pkgver=0.81
pkgrel=1
pkgdesc="Personal search and metasearch for the Free Desktop"
url="http://pinot.berlios.de/"
@@ -17,12 +17,11 @@ options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
Finclude berlios
-sha1sums=('b3ad8a698dc027dba4c89c155abf28303cf22353')
+sha1sums=('e962068e496a0662e331c556c0048f78db8f6039')

build()
{
Fcd
-	Fsed 'pinot.png' 'pinot' *desktop
touch INSTALL ChangeLog || Fdie
mkdir m4 || Fdie
Fautoreconf
From crazy at frugalware.org  Wed Dec  5 10:22:04 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 10:22:06 2007
Subject: [Frugalware-git] frugalware-current: gst-ffmpeg-0.10.3-1-i686
Message-ID: <20071205092204.68E2E11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fab8fa382d52d70b7adad57ce5403040d756cfab

commit fab8fa382d52d70b7adad57ce5403040d756cfab
Author: crazy 
Date:   Wed Dec 5 10:19:37 2007 +0100

gst-ffmpeg-0.10.3-1-i686
* Version bump

diff --git a/source/xmultimedia/gst-ffmpeg/FrugalBuild b/source/xmultimedia/gst-ffmpeg/FrugalBuild
index d6cb916..511bdb5 100644
--- a/source/xmultimedia/gst-ffmpeg/FrugalBuild
+++ b/source/xmultimedia/gst-ffmpeg/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=gst-ffmpeg
-pkgver=0.10.2
+pkgver=0.10.3
pkgrel=1
pkgdesc="Gstreamer Multimedia Framework FFMpeg Plugin"
url="http://www.gstreamer.net"
@@ -12,7 +12,7 @@ groups=('xmultimedia')
archs=('i686' 'x86_64')
up2date="lynx -dump http://gstreamer.freedesktop.org/src/gst-ffmpeg/|sort -r -n|grep -m1 '.tar.bz2$'|sed 's/.*-\(.*\).tar.bz2/\1/'"
source=(http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('95ca222351a543c9a1f45e89e0695a3b709ec2f6')
+sha1sums=('dd40cc38f7581412e5e23d2bf401cc66c9ba1f55')

export CFLAGS="$CFLAGS -fno-strict-aliasing"
From crazy at frugalware.org  Wed Dec  5 10:26:05 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 10:26:08 2007
Subject: [Frugalware-git] frugalware-current: apr-1.2.12-1-i686
Message-ID: <20071205092605.AE36E11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=17dff2599cfef702469470998d24140e7a23983f

commit 17dff2599cfef702469470998d24140e7a23983f
Author: crazy 
Date:   Wed Dec 5 10:25:43 2007 +0100

apr-1.2.12-1-i686
* Version bump

diff --git a/source/network/apr/FrugalBuild b/source/network/apr/FrugalBuild
index 2f90fb9..ae003e8 100644
--- a/source/network/apr/FrugalBuild
+++ b/source/network/apr/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=apr
-pkgver=1.2.11
+pkgver=1.2.12
pkgrel=1
pkgdesc="Apache Portable Runtime"
url="http://apr.apache.org/"
@@ -12,6 +12,6 @@ archs=('i686' 'x86_64')
up2date="lynx -dump $url/download.cgi|grep tar.gz$ |sed 's/.*-\(.*\)\.t.*/\1/;q'"
source=(http://apache.mirror.iphh.net/$pkgname/$pkgname-$pkgver.tar.gz)
Fconfopts="$Fconfopts --with-gnu-ld --with-threads --enable-layout=RedHat"
-sha1sums=('bde2c8b6e477752bcac4f387ac0de9671cd15d1a')
+sha1sums=('12ebc5ee6bba6b66b75e25ff8326fd2d2ad8f4ff')

# optimization OK
From crazy at frugalware.org  Wed Dec  5 10:29:24 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 10:29:25 2007
Subject: [Frugalware-git] frugalware-current: apr-util-1.2.12-1-i686
Message-ID: <20071205092924.2B75911904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bfd397f81e8b256a4753dfd65f6e9fbd94d9fbe2

commit bfd397f81e8b256a4753dfd65f6e9fbd94d9fbe2
Author: crazy 
Date:   Wed Dec 5 10:29:06 2007 +0100

apr-util-1.2.12-1-i686
* Version bump

diff --git a/source/network/apr-util/FrugalBuild b/source/network/apr-util/FrugalBuild
index c82adbb..81756e5 100644
--- a/source/network/apr-util/FrugalBuild
+++ b/source/network/apr-util/FrugalBuild
@@ -2,11 +2,11 @@
# Maintainer: crazy 

pkgname=apr-util
-pkgver=1.2.10
-pkgrel=2
+pkgver=1.2.12
+pkgrel=1
pkgdesc="Apache Portable Runtime"
url="http://apr.apache.org/"
-depends=('apr=1.2.11' 'db>=4.6.18' 'gdbm' 'expat')
+depends=('apr=1.2.12' 'db>=4.6.18' 'gdbm' 'expat')
groups=('network')
archs=('i686' 'x86_64')
up2date="lynx -dump http://apache.mirror.iphh.net/apr/|grep 'apr-util-\(.*\).tar.bz2$'|Flasttarbz2"
@@ -17,6 +17,6 @@ Fconfopts="$Fconfopts --with-apr=/usr \
--with-berkeley-db \
--with-threads \
--enable-layout=RedHat"
-sha1sums=('2ef492de9c7d77b0b2d9b22b532c5e1256ebfd87')
+sha1sums=('1e0e4215ce064544976d96118ab1e51100aab577')

# optimization OK
From crazy at frugalware.org  Wed Dec  5 10:38:04 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 10:38:07 2007
Subject: [Frugalware-git] frugalware-current: apache-2.2.6-2-i686
Message-ID: <20071205093804.C496711904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7362aecab88430d9e4e48cfacf751c16dbf9341c

commit 7362aecab88430d9e4e48cfacf751c16dbf9341c
Author: crazy 
Date:   Wed Dec 5 10:36:56 2007 +0100

apache-2.2.6-2-i686
* rebuild with apr

diff --git a/source/network/apache/FrugalBuild b/source/network/apache/FrugalBuild
index 1581bb1..45951ec 100644
--- a/source/network/apache/FrugalBuild
+++ b/source/network/apache/FrugalBuild
@@ -4,12 +4,12 @@

pkgname=apache
pkgver=2.2.6
-pkgrel=1
+pkgrel=2
pkgdesc="A high performance Unix-based HTTP server (with SSL)"
url="http://httpd.apache.org/"
backup=(etc/httpd/conf/{httpd.conf,ssl.conf,ssl.crt/server.crt,ssl.csr/server.csr,ssl.key/server.key} \
var/www/html/index.html)
-depends=('gdbm' 'db>=4.6.18' 'openssl' 'expat' 'apr-util>=1.2.8-3')
+depends=('gdbm' 'db>=4.6.18' 'openssl' 'expat' 'apr-util>=1.2.12')
groups=('network')
archs=('i686' 'x86_64')
up2date="lynx -dump http://httpd.apache.org/download.cgi |grep 'best available'|sed 's/.*r \(.*\) i.*/\1/;q'"
From crazy at frugalware.org  Wed Dec  5 11:10:21 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 11:10:23 2007
Subject: [Frugalware-git] frugalware-current: subversion-1.4.5-2-i686
Message-ID: <20071205101021.5597C11904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7d9b2316b1c8633792b120ef6104cfd0385af327

commit 7d9b2316b1c8633792b120ef6104cfd0385af327
Author: crazy 
Date:   Wed Dec 5 11:08:13 2007 +0100

subversion-1.4.5-2-i686
* rebuild with apr

diff --git a/source/devel-extra/subversion/FrugalBuild b/source/devel-extra/subversion/FrugalBuild
index 959ea91..6d48524 100644
--- a/source/devel-extra/subversion/FrugalBuild
+++ b/source/devel-extra/subversion/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=subversion
pkgver=1.4.5
-pkgrel=1
+pkgrel=2
pkgdesc="A version control system that is a compelling replacement for CVS."
url="http://subversion.tigris.org/"
-depends=('neon>=0.26.4-2' 'apr-util>=1.2.8-3' 'apr>=1.2.9')
-makedepends=('apache>=2.2.4-3' 'swig' 'ruby')
+depends=('neon>=0.26.4-2' 'apr-util>=1.2.12' 'apr>=1.2.12')
+makedepends=('apache>=2.2.6-2' 'swig' 'ruby')
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://subversion.tigris.org/project_packages.html|grep -m1 'The best available'|sed 's/.*]//'|tr -d [:blank:]"
From crazy at frugalware.org  Wed Dec  5 12:40:18 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 12:40:20 2007
Subject: [Frugalware-git] wx28: wxgtk-2.8.7-1-i686
Message-ID: <20071205114018.7EAC011904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=cbd10c45b746c0ab2ae08121edc9064fab855e1a

commit cbd10c45b746c0ab2ae08121edc9064fab855e1a
Author: crazy 
Date:   Wed Dec 5 12:36:25 2007 +0100

wxgtk-2.8.7-1-i686
* Version bump
* now with -u8 subpackage
* added TODO

diff --git a/source/xlib-extra/wxgtk/FrugalBuild b/source/xlib-extra/wxgtk/FrugalBuild
index d27ee48..b18a4e1 100644
--- a/source/xlib-extra/wxgtk/FrugalBuild
+++ b/source/xlib-extra/wxgtk/FrugalBuild
@@ -1,53 +1,89 @@
-# Compiling Time: 2.30 SBU
+# Compiling Time: 15.12 SBU
# Maintainer: crazy 
# Contributor: Miklos Nemeth 

pkgname=wxgtk
-pkgver=2.6.4
-pkgrel=4
+pkgver=2.8.7
+pkgrel=1
pkgdesc="GTK+ implementation of wxWidgets API for GUI'"
_F_sourceforge_dirname="wxwindows"
_F_sourceforge_name="wxGTK"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.wxwidgets.org/"
-source=($source g_free.patch)
-depends=('gtk+2>=2.12.0' 'sdl' 'cppunit')
+# TODO: gst*
+depends=('libdrm' 'sdl' 'gtk+2' 'libgl' 'freetype2' 'libxcb' 'glib2')
groups=('xlib-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
replaces=('wxgtk-devel')
conflicts=('wxgtk-devel')
-sha1sums=('f2cad3189b8c5d3b5ca3f8f592bafdb183be7dd2' \
-          'd5526f171231febd957e84574a55a2e2a8cbbfe6')
+VER="2.8"
+
+subpkgs=("$pkgname-locale" "$pkgname-u8")
+subdescs=('Locale files for wxWidgets' "GTK+ implementation of wxWidgets API for GUI (unicode).")
+subgroups=('locale-extra' 'xlib-extra')
+subdepends=("$pkgname=$pkgver" "$pkgname=$pkgver")
+subarchs=('i686 x86_64' 'i686 x86_64')
+
+
+wx_compile()
+{
+	make || Fdie
+	Fmakeinstall
+	cd contrib/src || Fdie
+	Fconf
+        make || Fdie
+	Fmakeinstall
+	cd ../.. || Fdie
+}

-subpkgs=("$pkgname-locale")
-subdescs=('Locale files for wxWidgets')
-subgroups=('locale-extra')
-subdepends=("$pkgname=$pkgver")
-subarchs=('i686 x86_64')

build()
{
-	Fcd wxGTK-$pkgver
-	Fbuild  \
-		--disable-unicode \
-		--with-opengl \
+	cd $Fsrcdir || Fdie
+	export CFLAGS="$CFLAGS -fno-strict-aliasing"
+	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+	cp -r wxGTK-$pkgver wxGTK-$pkgver-u8 || Fdie
+	## TODO: figure|enable more things
+	wxconfig="--with-opengl \
--enable-geometry \
+		--enable-timer \
--enable-sound \
--with-sdl \
+		--enable-graphics_ctx \
--enable-mediactrl \
--enable-display \
-		--with-gtk2
-	cd contrib/src
-	Fconf
-	make || Fdie
-	Fmakeinstall
-	Frm /usr/bin/wx-config
-	Fln /usr/lib/wx/config/gtk2-ansi-release-2.6 /usr/bin/wx-config
-
+		--enable-plugins \
+		--enable-compat24"
+	## Unicode one
+	cd wxGTK-$pkgver-u8 || Fdie
+	Fpatchall
+	autoconf || Fdie
+	Fconf \
+		${wxconfig} \
+		--enable-unicode
+	wx_compile
+	Frm usr/lib/wx/${VER}
+	## This is still not a solution ...
+	Frm usr/include usr/share/aclocal usr/share/bakefile usr/share/locale usr/bin/wx-config usr/bin/wxrc
+	Fln /usr/lib/wx/config/gtk2-unicode-release-${VER} /usr/bin/wx-config-u8
+	Fmv /usr/bin/wxrc-${VER} /usr/bin/wxrc-${VER}-u8
+	Fln /usr/bin/wxrc-${VER}-u8 /usr/bin/wxrc-u8
+	Fsplit $pkgname-u8 /usr
+	## Normal build
+	cd ../wxGTK-$pkgver
+	Fpatchall
+	autoconf || Fdie
+	Fconf \
+                ${wxconfig} \
+                --disable-unicode
+        wx_compile
+	Frm usr/bin/wx-config
+	Fln /usr/lib/wx/config/gtk2-ansi-release-${VER} /usr/bin/wx-config
+	## lang stuff ( why is this split anyway ? )
Fsplit $pkgname-locale usr/share/locale
-
}

+sha1sums=('07247cce8f6602ab532666b766c15bf3c7cdea3f')
# optimization OK
diff --git a/source/xlib-extra/wxgtk/g_free.patch b/source/xlib-extra/wxgtk/g_free.patch
deleted file mode 100644
index ca0fb43..0000000
--- a/source/xlib-extra/wxgtk/g_free.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naurp wxGTK-2.6.4/src/gtk/button.cpp wxGTK-2.6.4-p/src/gtk/button.cpp
---- wxGTK-2.6.4/src/gtk/button.cpp	2007-03-20 16:50:07.000000000 +0100
-+++ wxGTK-2.6.4-p/src/gtk/button.cpp	2007-09-23 01:53:30.000000000 +0200
-@@ -89,7 +89,7 @@ gtk_button_style_set_callback( GtkWidget
-             right_border += default_border->right;
-             top_border += default_border->top;
-             bottom_border += default_border->bottom;
--            g_free( default_border );
-+            gtk_border_free( default_border );
-         }
- #else
-         left_border = 6;
-diff -Naurp wxGTK-2.6.4/src/gtk/window.cpp wxGTK-2.6.4-p/src/gtk/window.cpp
---- wxGTK-2.6.4/src/gtk/window.cpp	2007-03-20 16:50:07.000000000 +0100
-+++ wxGTK-2.6.4-p/src/gtk/window.cpp	2007-09-23 01:53:30.000000000 +0200
-@@ -3273,7 +3273,7 @@ void wxWindowGTK::DoSetSize( int x, int
-                 right_border += default_border->right;
-                 top_border += default_border->top;
-                 bottom_border += default_border->bottom;
--                g_free( default_border );
-+                gtk_border_free( default_border );
-             }
- #else
-             left_border = 6;
From crazy at frugalware.org  Wed Dec  5 12:43:40 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 12:43:41 2007
Subject: [Frugalware-git] wx28: wxpython-u8
Message-ID: <20071205114340.AD80411904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=46abc3375328c476ff3de6e8b9490f08a54526d8

commit 46abc3375328c476ff3de6e8b9490f08a54526d8
Author: crazy 
Date:   Wed Dec 5 12:43:32 2007 +0100

wxpython-u8
* removed
* no need to duplicate packages , is called 'subpkg' :)

diff --git a/source/xapps-extra/wxpython-u8/FrugalBuild b/source/xapps-extra/wxpython-u8/FrugalBuild
deleted file mode 100644
index 69a2a20..0000000
--- a/source/xapps-extra/wxpython-u8/FrugalBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: crazy 
-
-pkgname=wxpython-u8
-pkgver=2.6.4.0
-pkgrel=1
-pkgdesc="wxPython GUI toolkit unicode version"
-_F_sourceforge_dirname="wxpython"
-_F_sourceforge_name="wxPython-src"
-_F_sourceforge_ext=".tar.bz2"
-Finclude python sourceforge
-url="http://www.wxpython.org/"
-depends=('wxgtk-u8' 'python>=2.5' 'sdl' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' 'libxfixes' 'libxcb' \
-		'freetype2' 'cairo' 'pango' 'glib2' 'libgcc')
-makedepends=('wxgtk')
-groups=('xapps-extra')
-archs=('x86_64' 'i686')
-sha1sums=('621f529e0a5c3e30d4a750046fd71179567a52f8')
-options=('scriptlet')
-
-build()
-{
-	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"
-	export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	Fcd wxPython-src-$pkgver/wxPython
-	Fsed "cflags.append('-O3')" "pass"  config.py
-	Fmake BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1 UNICODE=1 WX_CONFIG='wx-config-u8'
-	Fmakeinstall BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1 UNICODE=1 WX_CONFIG='wx-config-u8'
-	/usr/bin/rm -rf $Fdestdir/usr/bin $Fdestdir/usr/include $Fdestdir/$_F_python_libdir/wxaddons
-	cd $Fdestdir/$_F_python_libdir
-	/usr/bin/rm -f wxversion.* wx.pth wxPython_common-${pkgver}-py2.5.egg-info wxaddons-${pkgver}-py2.5.egg-info
-}
-
-# optimization OK
From crazy at frugalware.org  Wed Dec  5 12:45:47 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 12:45:48 2007
Subject: [Frugalware-git] wx28: wxpython-2.6.4.0-1-i686
Message-ID: <20071205114547.2545011904CC@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=8aaee2b2c77ef7c7dff0b1650c025b880adf6764

commit 8aaee2b2c77ef7c7dff0b1650c025b880adf6764
Author: crazy 
Date:   Wed Dec 5 12:45:35 2007 +0100

wxpython-2.6.4.0-1-i686
* moved to xlib-extra

diff --git a/source/xapps-extra/wxpython/FrugalBuild b/source/xapps-extra/wxpython/FrugalBuild
deleted file mode 100644
index a0d9ebd..0000000
--- a/source/xapps-extra/wxpython/FrugalBuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Compiling Time: 1.20 SBU
-# Maintainer: crazy 
-
-pkgname=wxpython
-pkgver=2.6.4.0
-pkgrel=1
-pkgdesc="wxPython GUI toolkit"
-_F_sourceforge_dirname="$pkgname"
-_F_sourceforge_name="wxPython-src"
-_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
-url="http://www.wxpython.org/"
-depends=('wxgtk' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
-	'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc' 'python>=2.5')
-groups=('xapps-extra')
-options=('scriptlet')
-archs=('x86_64' 'i686')
-sha1sums=('621f529e0a5c3e30d4a750046fd71179567a52f8')
-
-build()
-{
-	Fcd wxPython-src-$pkgver/wxPython
-	Fsed "cflags.append('-O3')" "pass"  config.py
-	export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-	Fmake BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
-	Fmakeinstall BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
-}
-
-# optimization OK
diff --git a/source/xlib-extra/wxpython/FrugalBuild b/source/xlib-extra/wxpython/FrugalBuild
new file mode 100644
index 0000000..d3a0d55
--- /dev/null
+++ b/source/xlib-extra/wxpython/FrugalBuild
@@ -0,0 +1,30 @@
+# Compiling Time: 1.20 SBU
+# Maintainer: crazy 
+
+pkgname=wxpython
+pkgver=2.6.4.0
+pkgrel=1
+pkgdesc="wxPython GUI toolkit"
+_F_sourceforge_dirname="$pkgname"
+_F_sourceforge_name="wxPython-src"
+_F_sourceforge_ext=".tar.bz2"
+Finclude sourceforge
+url="http://www.wxpython.org/"
+depends=('wxgtk' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
+	'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc' 'python>=2.5')
+groups=('xlib-extra')
+options=('scriptlet')
+archs=('x86_64' 'i686')
+sha1sums=('621f529e0a5c3e30d4a750046fd71179567a52f8')
+
+build()
+{
+	Fcd wxPython-src-$pkgver/wxPython
+	Fsed "cflags.append('-O3')" "pass"  config.py
+	export CFLAGS="$CFLAGS -fno-strict-aliasing"
+	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+	Fmake BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
+	Fmakeinstall BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
+}
+
+# optimization OK
From crazy at frugalware.org  Wed Dec  5 13:31:02 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 13:31:04 2007
Subject: [Frugalware-git] wx28: wxpython-2.8.7.1-1-i686
Message-ID: <20071205123102.B3B8311904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=365588a9c3a340070328a4ee9feab5cfbb38c753

commit 365588a9c3a340070328a4ee9feab5cfbb38c753
Author: crazy 
Date:   Wed Dec 5 13:26:06 2007 +0100

wxpython-2.8.7.1-1-i686
* Version bump
* now with -u8 subpkg

diff --git a/source/xlib-extra/wxpython/FrugalBuild b/source/xlib-extra/wxpython/FrugalBuild
index d3a0d55..f88da17 100644
--- a/source/xlib-extra/wxpython/FrugalBuild
+++ b/source/xlib-extra/wxpython/FrugalBuild
@@ -1,30 +1,49 @@
-# Compiling Time: 1.20 SBU
+# Compiling Time: 6.51 SBU
# Maintainer: crazy 

pkgname=wxpython
-pkgver=2.6.4.0
+pkgver=2.8.7.1
pkgrel=1
pkgdesc="wxPython GUI toolkit"
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="wxPython-src"
_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
+Finclude sourceforge python
url="http://www.wxpython.org/"
-depends=('wxgtk' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
-	'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc' 'python>=2.5')
-groups=('xlib-extra')
options=('scriptlet')
+depends=('wxgtk>=2.8.7' 'python>=2.5' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
+	'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc')
+makedepends=('wxgtk-u8>=2.8.7')
+options=('scriptlet')
+groups=('xlib-extra')
archs=('x86_64' 'i686')
-sha1sums=('621f529e0a5c3e30d4a750046fd71179567a52f8')
+
+subpkgs=("$pkgname-u8")
+subdescs=("wxPython GUI toolkit (unicode version)")
+subdepends=("$pkgname=$pkgver wxgtk-u8>=2.8.7")
+subgroups=('xlib-extra')
+subarchs=('i686 x86_64')
+

build()
{
-	Fcd wxPython-src-$pkgver/wxPython
-	Fsed "cflags.append('-O3')" "pass"  config.py
+	Fcd wxPython-src-$pkgver
+	cp -r wxPython wxPython-u8 || Fdie
+	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"
export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-	Fmake BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
-	Fmakeinstall BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
+	wxp_config="BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1"
+	cd wxPython-u8 || Fdie
+	Fsed "cflags.append('-O3')" "pass" config.py
+        Fmake ${wxp_config} UNICODE=1 WX_CONFIG='wx-config-u8'
+        Fmakeinstall  ${wxp_config} UNICODE=1 WX_CONFIG='wx-config-u8'
+        Frm $_F_python_libdir/wxaddons usr/bin usr/include
+	Frm $_F_python_libdir/{wxversion.*,wx.pth,wxPython_common-${pkgver}-py${_F_python_ver}.egg-info,wxaddons-${pkgver}-py${_F_python_ver}.egg-info}
+	Fsplit $pkgname-u8 /usr
+	cd ../wxPython || Fdie
+	Fsed "cflags.append('-O3')" "pass" config.py
+        Fmake ${wxp_config} UNICODE=0 WX_CONFIG='wx-config'
+        Fmakeinstall ${wxp_config} UNICODE=0 WX_CONFIG='wx-config'
}

+sha1sums=('5526ee4c4cc57bcebb4950ea05e24639ef8b02dd')
# optimization OK
From crazy at frugalware.org  Wed Dec  5 13:40:06 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 13:40:09 2007
Subject: [Frugalware-git] wx28: drpython-165-2-i686
Message-ID: <20071205124006.BBC7411904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=cf940149c884392b7cbc7e6ef30511c016c9952a

commit cf940149c884392b7cbc7e6ef30511c016c9952a
Author: crazy 
Date:   Wed Dec 5 13:39:39 2007 +0100

drpython-165-2-i686
* release bump
* rebuild with wxpython

diff --git a/source/xapps-extra/drpython/FrugalBuild b/source/xapps-extra/drpython/FrugalBuild
index 85dc844..42f8daf 100644
--- a/source/xapps-extra/drpython/FrugalBuild
+++ b/source/xapps-extra/drpython/FrugalBuild
@@ -4,9 +4,9 @@

pkgname=drpython
pkgver=165
-pkgrel=1
+pkgrel=2
pkgdesc="DrPython is a highly customizable, extensible editor/environment for the Python programming Language."
-depends=('python' 'wxpython')
+depends=('python' 'wxpython>=2.8.7.1')
makedepends=('unzip')
groups=('xapps-extra')
archs=('i686' 'x86_64')
From crazy at frugalware.org  Wed Dec  5 14:01:21 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 14:01:23 2007
Subject: [Frugalware-git] wx28: audacity-1.3.3-2-i686
Message-ID: <20071205130121.A90B511904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=3824e6b9c54e9084b2edfe56de7aaf03a1988eee

commit 3824e6b9c54e9084b2edfe56de7aaf03a1988eee
Author: crazy 
Date:   Wed Dec 5 14:00:06 2007 +0100

audacity-1.3.3-2-i686
* release bump
* rebuild with wxgtk

diff --git a/source/xapps-extra/audacity/FrugalBuild b/source/xapps-extra/audacity/FrugalBuild
index 506ad8c..7caedcf 100644
--- a/source/xapps-extra/audacity/FrugalBuild
+++ b/source/xapps-extra/audacity/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=audacity
pkgver=1.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="A program that lets you manipulate digital audio waveforms"
Finclude sourceforge
url="http://audacity.sourceforge.net/"
-depends=('wxgtk' 'libvorbis' 'libid3tag' 'libmad' 'libogg' \
+depends=('wxgtk>=2.8.7' 'libvorbis' 'libid3tag' 'libmad' 'libogg' \
'libsamplerate' 'flac>=1.1.3' 'soundtouch' 'alsa-lib')
# TODO: twolame
# FIXME: flac somehow gets disabled
From crazy at frugalware.org  Wed Dec  5 14:10:19 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 14:10:20 2007
Subject: [Frugalware-git] wx28: wxexamples-2.6.3.1-2-i686
Message-ID: <20071205131019.2D29A11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=9029ada2bb6d7fe044dbea6590e07aef6e904965

commit 9029ada2bb6d7fe044dbea6590e07aef6e904965
Author: crazy 
Date:   Wed Dec 5 14:09:39 2007 +0100

wxexamples-2.6.3.1-2-i686
* release bump
* NOTE: this project died ( some desco crap )
* changed source to point to our ftp

diff --git a/source/xapps-extra/wxexamples/FrugalBuild b/source/xapps-extra/wxexamples/FrugalBuild
index 939eaf8..6ff4ce6 100644
--- a/source/xapps-extra/wxexamples/FrugalBuild
+++ b/source/xapps-extra/wxexamples/FrugalBuild
@@ -3,15 +3,16 @@

pkgname=wxexamples
pkgver=2.6.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="wxWidgets examples"
url="http://www.bluelion.hu/"
-depends=('wxgtk')
+depends=('wxgtk>=2.8.7')
options=('scriptlet')
groups=('xapps-extra')
archs=('x86_64' 'i686')
up2date="lynx -dump http://www.bluelion.hu/projects_hu.php|grep 'wxWidgets examples'|sed 's/.*examples.*v\([0-9\.]*\).*/\1/'"
-source=(http://www.bluelion.hu/projects/$pkgname/$pkgname-$pkgver.tar.bz2)
+#source=(http://www.bluelion.hu/projects/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/xapps-extra/wxexamples/wxexamples-2.6.3.1.tar.bz2)
sha1sums=('710b11f8d3b4dd4d7bcf16a9f18de2adf5dfa7fb')

build()
From crazy at frugalware.org  Wed Dec  5 14:27:31 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 14:27:33 2007
Subject: [Frugalware-git] wx28: wxmaxima-0.7.3a-2-i686
Message-ID: <20071205132731.BF11911904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=bc65ad676770974135e232bc79c1984d32ecc771

commit bc65ad676770974135e232bc79c1984d32ecc771
Author: crazy 
Date:   Wed Dec 5 14:27:06 2007 +0100

wxmaxima-0.7.3a-2-i686
* release bump
* added missing scriptlet option
* rebuild with wxgtk

diff --git a/source/xapps-extra/wxmaxima/FrugalBuild b/source/xapps-extra/wxmaxima/FrugalBuild
index 572e70b..be55be0 100644
--- a/source/xapps-extra/wxmaxima/FrugalBuild
+++ b/source/xapps-extra/wxmaxima/FrugalBuild
@@ -4,13 +4,14 @@

pkgname=wxmaxima
pkgver=0.7.3a
-pkgrel=1
+pkgrel=2
pkgdesc="wxMaxima is a wxWidgets GUI for the computer algebra system Maxima."
Finclude sourceforge
url="http://wxmaxima.sourceforge.net/"
-depends=('maxima>=5.10.0' 'libxml2' 'wxgtk')
+depends=('maxima>=5.10.0' 'libxml2' 'wxgtk>=2.8.7')
groups=('xapps-extra')
archs=('i686' '!x86_64')
+options=('scriptlet')
up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=126731 | grep -m1 tar.gz | sed 's/.*ma-\(.*\).tar.*/\1/'"
source=(${source/wxmaxima-/wxMaxima-})
_F_desktop_name="wxMaxima"
From crazy at frugalware.org  Wed Dec  5 17:17:06 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 17:17:11 2007
Subject: [Frugalware-git] wx28: wxpython-2.8.7.1-1-i686
Message-ID: <20071205161706.6435A11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=a488d9d6384be3a5e482a3b3e9b8bf0b4680e5c5

commit a488d9d6384be3a5e482a3b3e9b8bf0b4680e5c5
Author: crazy 
Date:   Wed Dec 5 17:12:10 2007 +0100

wxpython-2.8.7.1-1-i686
* correct typo in _misc.py

diff --git a/source/xlib-extra/wxpython/FrugalBuild b/source/xlib-extra/wxpython/FrugalBuild
index f88da17..8d21272 100644
--- a/source/xlib-extra/wxpython/FrugalBuild
+++ b/source/xlib-extra/wxpython/FrugalBuild
@@ -14,6 +14,7 @@ options=('scriptlet')
depends=('wxgtk>=2.8.7' 'python>=2.5' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc')
makedepends=('wxgtk-u8>=2.8.7')
+source=($source wxPython_misc.py-typo-fix.patch)
options=('scriptlet')
groups=('xlib-extra')
archs=('x86_64' 'i686')
@@ -28,6 +29,7 @@ subarchs=('i686 x86_64')
build()
{
Fcd wxPython-src-$pkgver
+	Fpatch wxPython_misc.py-typo-fix.patch
cp -r wxPython wxPython-u8 || Fdie
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"
export CFLAGS="$CFLAGS -fno-strict-aliasing"
@@ -45,5 +47,6 @@ build()
Fmakeinstall ${wxp_config} UNICODE=0 WX_CONFIG='wx-config'
}

-sha1sums=('5526ee4c4cc57bcebb4950ea05e24639ef8b02dd')
+sha1sums=('5526ee4c4cc57bcebb4950ea05e24639ef8b02dd' \
+          'b9ca68fe9ec90090e2e77355c58c4cd7a99a5366')
# optimization OK
diff --git a/source/xlib-extra/wxpython/wxPython_misc.py-typo-fix.patch b/source/xlib-extra/wxpython/wxPython_misc.py-typo-fix.patch
new file mode 100644
index 0000000..dd4a63f
--- /dev/null
+++ b/source/xlib-extra/wxpython/wxPython_misc.py-typo-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur wxPython-src-2.8.7.1/wxPython/wxPython/_misc.py wxPython-src-2.8.7.1-typo-fiX/wxPython/wxPython/_misc.py
+--- wxPython-src-2.8.7.1/wxPython/wxPython/_misc.py	2007-07-19 00:33:59.000000000 +0200
++++ wxPython-src-2.8.7.1-typo-fiX/wxPython/wxPython/_misc.py	2007-12-05 16:18:48.000000000 +0100
+@@ -453,7 +453,7 @@
+ wxDateTime_GetCurrentMonth = wx._misc.DateTime_GetCurrentMonth
+ wxDateTime_IsLeapYear = wx._misc.DateTime_IsLeapYear
+ wxDateTime_GetCentury = wx._misc.DateTime_GetCentury
+-wxDateTime_GetNumberOfDaysinYear = wx._misc.DateTime_GetNumberOfDaysinYear
++wxDateTime_GetNumberOfDaysinYear = wx._misc.DateTime_GetNumberOfDaysInYear
+ wxDateTime_GetNumberOfDaysInMonth = wx._misc.DateTime_GetNumberOfDaysInMonth
+ wxDateTime_GetMonthName = wx._misc.DateTime_GetMonthName
+ wxDateTime_GetWeekDayName = wx._misc.DateTime_GetWeekDayName
From crazy at frugalware.org  Wed Dec  5 17:40:19 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 17:40:21 2007
Subject: [Frugalware-git] wx28: bittorrent-5.0.9-2-i686
Message-ID: <20071205164019.2A61211904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=8ec05bee0da62b9fd9198d2844952645a2903166

commit 8ec05bee0da62b9fd9198d2844952645a2903166
Author: crazy 
Date:   Wed Dec 5 17:39:24 2007 +0100

bittorrent-5.0.9-2-i686
* release bump
* added an patch to fix wxpy28 detection

diff --git a/source/network-extra/bittorrent/FrugalBuild b/source/network-extra/bittorrent/FrugalBuild
index b27542b..980bac4 100644
--- a/source/network-extra/bittorrent/FrugalBuild
+++ b/source/network-extra/bittorrent/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=bittorrent
pkgver=5.0.9
-pkgrel=1
+pkgrel=2
pkgdesc="A tool for distributing files."
license="BitTorrent OpenSource License"
url="http://www.bittorrent.com/"
@@ -12,16 +12,18 @@ groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://download.bittorrent.com/dl/?M=A |Flasttar"
source=(http://download.bittorrent.com/dl/BitTorrent-$pkgver.tar.gz \
-	bittorrent.{desktop,png} rc.bt{track,seed})
-sha1sums=('9f1b9b66736dac204b19bc5dc13f3dd10158c89c' \
+	bittorrent.{desktop,png} rc.bt{track,seed} \
+	wxpy28.patch)
+sha1sums=('b610c811590aad6ec25fc7b30acb9e0264443121' \
'f7d59dda7e43c3cf23541ed10d4e0754fe0ff6e4' \
'2e27694484fecf0053816b1cd1f6aadee4313e76' \
'c383e7c79974883ca532b3626a58232989a995dc' \
-          '1968244cf87f6c076d392885c40310a7c0b01235')
+          '1968244cf87f6c076d392885c40310a7c0b01235' \
+          '0b0e71713b7b4b186d69ab3f1439ea819fe8c924')

subpkgs=('bittorrent-gui')
subdescs=('GUI versions of the BitTorrent file transfer tool')
-subdepends=("bittorrent=$pkgver-$pkgrel wxpython-u8 pycrypto wxpython")
+subdepends=("bittorrent=$pkgver-$pkgrel wxpython-u8>=2.8.7.1 pycrypto wxpython>=2.8.7.1")
subgroups=('xapps-extra')
subarchs=('i686 x86_64')

diff --git a/source/network-extra/bittorrent/wxpy28.patch b/source/network-extra/bittorrent/wxpy28.patch
new file mode 100644
index 0000000..475c3b5
--- /dev/null
+++ b/source/network-extra/bittorrent/wxpy28.patch
@@ -0,0 +1,12 @@
+diff -Naur BitTorrent-5.0.9/BitTorrent/GUI_wx/__init__.py BitTorrent-5.0.9-p/BitTorrent/GUI_wx/__init__.py
+--- BitTorrent-5.0.9/BitTorrent/GUI_wx/__init__.py	2007-08-04 01:55:42.000000000 +0200
++++ BitTorrent-5.0.9-p/BitTorrent/GUI_wx/__init__.py	2007-12-05 17:29:36.000000000 +0100
+@@ -22,7 +22,7 @@
+ else:
+     # doesn't work in py2exe
+     try:
+-        wxversion.select('2.6')
++        wxversion.select('2.8')
+     except:
+         pass
+
From crazy at frugalware.org  Wed Dec  5 19:36:48 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 19:36:50 2007
Subject: [Frugalware-git] wx28: bochs-2.3.5-2-i686
Message-ID: <20071205183648.F2EBE11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=46322af7daf0b23d1e7ab625c1b0d53b5868f71c

commit 46322af7daf0b23d1e7ab625c1b0d53b5868f71c
Author: crazy 
Date:   Wed Dec 5 19:35:53 2007 +0100

bochs-2.3.5-2-i686
* release bump
* rebuild with wxgtk
* added an patch to fix some compile errors
* added missing scriptlet option

diff --git a/source/xapps-extra/bochs/FrugalBuild b/source/xapps-extra/bochs/FrugalBuild
index 8ddaf3b..fd61240 100644
--- a/source/xapps-extra/bochs/FrugalBuild
+++ b/source/xapps-extra/bochs/FrugalBuild
@@ -3,15 +3,18 @@

pkgname=bochs
pkgver=2.3.5
-pkgrel=1
+pkgrel=2
pkgdesc="A highly portable open source IA-32 (x86) PC emulator."
-depends=('sdl' 'wxgtk' 'libx11' 'libxpm')
+depends=('sdl' 'wxgtk>=2.8.7' 'libx11' 'libxpm')
makedepends=('xproto')
groups=('xapps-extra')
archs=('i686' 'x86_64')
+options=('scriptlet')
Finclude sourceforge
+source=($source  build-fix.patch)
up2date="lynx -dump http://bochs.sourceforge.net/|grep -1 Current|sed -n 's/.*s \(.*\)/\1/;3 p'"
-sha1sums=('854bc37ee621212b6c73f5c5c194a97b6b4369f0')
+sha1sums=('854bc37ee621212b6c73f5c5c194a97b6b4369f0' \
+          '3e37675ce43d953fd801b07b759c4bfd01916db3')

[ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --enable-sse=2 --enable-3dnow --enable-x86-64"

diff --git a/source/xapps-extra/bochs/build-fix.patch b/source/xapps-extra/bochs/build-fix.patch
new file mode 100644
index 0000000..a8173a3
--- /dev/null
+++ b/source/xapps-extra/bochs/build-fix.patch
@@ -0,0 +1,21 @@
+diff -Naur bochs-2.3.5/gui/wx.cc bochs-2.3.5-p/gui/wx.cc
+--- bochs-2.3.5/gui/wx.cc	2006-10-25 19:40:56.000000000 +0200
++++ bochs-2.3.5-p/gui/wx.cc	2007-12-05 18:57:29.000000000 +0100
+@@ -832,9 +832,7 @@
+     case WXK_NUMPAD_UP:            bx_key = BX_KEY_KP_UP;        break;
+     case WXK_NUMPAD_RIGHT:         bx_key = BX_KEY_KP_RIGHT;     break;
+     case WXK_NUMPAD_DOWN:          bx_key = BX_KEY_KP_DOWN;      break;
+-    case WXK_NUMPAD_PRIOR:         bx_key = BX_KEY_KP_PAGE_UP;   break;
+     case WXK_NUMPAD_PAGEUP:        bx_key = BX_KEY_KP_PAGE_UP;   break;
+-    case WXK_NUMPAD_NEXT:          bx_key = BX_KEY_KP_PAGE_DOWN; break;
+     case WXK_NUMPAD_PAGEDOWN:      bx_key = BX_KEY_KP_PAGE_DOWN; break;
+     case WXK_NUMPAD_END:           bx_key = BX_KEY_KP_END;       break;
+     case WXK_NUMPAD_BEGIN:         bx_key = BX_KEY_KP_HOME;      break;
+@@ -860,7 +858,6 @@
+     case 220: bx_key = BX_KEY_BACKSLASH;     break; // \|
+     case 222: bx_key = BX_KEY_SINGLE_QUOTE;  break; // '"
+     case 305: bx_key = BX_KEY_KP_5;          break; // keypad 5
+-    case 392: bx_key = BX_KEY_KP_ADD;        break; // keypad plus
+
+     default:
+       wxLogMessage(wxT ("Unhandled key event: %i (0x%x)"), key, key);
From crazy at frugalware.org  Wed Dec  5 19:47:39 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 19:47:40 2007
Subject: [Frugalware-git] wx28: xchm-1.13-2-i686
Message-ID: <20071205184739.04B6C11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=8be871a3588c6a998b2b941254e15f47ea08b8d5

commit 8be871a3588c6a998b2b941254e15f47ea08b8d5
Author: crazy 
Date:   Wed Dec 5 19:47:20 2007 +0100

xchm-1.13-2-i686
* release bump
* rebuild with wxgtk
* added missing scriptlet option
* while at it fixed aliasing bug

diff --git a/source/xapps-extra/xchm/FrugalBuild b/source/xapps-extra/xchm/FrugalBuild
index 893c881..1709cdb 100644
--- a/source/xapps-extra/xchm/FrugalBuild
+++ b/source/xapps-extra/xchm/FrugalBuild
@@ -3,14 +3,16 @@

pkgname=xchm
pkgver=1.13
-pkgrel=1
+pkgrel=2
pkgdesc="A cross-platform GUI front-end to chmlib."
-depends=('chmlib' 'wxgtk')
+depends=('chmlib' 'wxgtk>=2.8.7')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-_F_sourceforge_prefix=xchm-
+_F_sourceforge_prefix="xchm-"
+options=('scriptlet')
Finclude sourceforge
-
sha1sums=('f062f584c9fd00107e28d96342d48ea36b2f2f49')
+export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
# optimization OK
From crazy at frugalware.org  Wed Dec  5 22:52:39 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 22:52:41 2007
Subject: [Frugalware-git] wx28: amule-2.1.3-10-i686
Message-ID: <20071205215239.3E5F311904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=667268b2e94bc5ae2088af4c211050e3ff8ec033

commit 667268b2e94bc5ae2088af4c211050e3ff8ec033
Author: crazy 
Date:   Wed Dec 5 22:51:05 2007 +0100

amule-2.1.3-10-i686
* release bump
* added an patch to fix compile errors with wxgtk >=2.8*
* enabled a lot missing options
* depends() fix

diff --git a/source/xapps-extra/amule/FrugalBuild b/source/xapps-extra/amule/FrugalBuild
index 008bcd7..2222522 100644
--- a/source/xapps-extra/amule/FrugalBuild
+++ b/source/xapps-extra/amule/FrugalBuild
@@ -3,21 +3,29 @@

pkgname=amule
pkgver=2.1.3
-pkgrel=9
+pkgrel=10
pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network."
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="aMule"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.amule.org/"
-depends=('wxgtk>=2.6.4' 'libxxf86vm' 'binutils=2.18.50.0.2')
+source=($source aMule-wx.patch)
+depends=('wxgtk>=2.8.7' 'libxxf86vm' 'binutils=2.18.50.0.2' 'gd' 'curl')
up2date="lynx -dump $url/files/files.php?cat=6 | grep Latest | tail -n 1 | cut -d ' ' -f 10"
license="GPL2"
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
+Fconfopts="$Fconfopts --enable-cas --enable-wxcas \
+	--enable-amulecmd --enable-amulecmdgui \
+	--enable-webserver --enable-webservergui \
+	--enable-kad-compile --enable-amule-daemon \
+	--enable-alc --enable-alcc \
+	--enable-ccache --disable-debug"
_F_cd_path="aMule-$pkgver"
-sha1sums=('dd47deb38e7a5b823550b85150f5a814c597b273')
+sha1sums=('dd47deb38e7a5b823550b85150f5a814c597b273' \
+          'bd048f7b88ff4c19841f606d03c5a9750e6e6945')
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"

# optimization OK
diff --git a/source/xapps-extra/amule/aMule-wx.patch b/source/xapps-extra/amule/aMule-wx.patch
new file mode 100644
index 0000000..8148d35
--- /dev/null
+++ b/source/xapps-extra/amule/aMule-wx.patch
@@ -0,0 +1,156 @@
+diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp
+--- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp	2005-12-16 13:09:29.000000000 +0100
++++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp	2006-12-17 20:20:47.151203000 +0100
+@@ -297,7 +297,7 @@
+ 	m_validateButton =
+ 	    new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
+ 	m_cancelButton =
+-	    new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) );
++	    new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
+
+ 	m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
+ 	m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
+@@ -321,7 +321,6 @@
+ EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
+ EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
+ EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
+-EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel )       	// Defined in wxDialog
+ EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
+ EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
+ END_EVENT_TABLE ()
+--- aMule/src/utils/wxCas/src/wxcasprefs.h.org	2006-12-17 22:17:39.017417250 +0100
++++ aMule/src/utils/wxCas/src/wxcasprefs.h	2006-12-17 22:18:17.611829250 +0100
+@@ -101,8 +101,7 @@
+ 	    ID_AUTOSTATIMG_COMBO,
+ 	    ID_AUTOSTATIMG_BROWSE_BUTTON,
+ 	    ID_FTP_UPDATE_CHECK,
+-	    ID_VALIDATE_BUTTON,
+-	    ID_CANCEL_BUTTON
++	    ID_VALIDATE_BUTTON
+ 	};
+
+ protected:
+--- aMule/src/MuleGifCtrl.cpp	2006-02-03 20:14:05.000000000 +0100
++++ aMule/src/MuleGifCtrl.cpp	2006-11-19 19:35:33.000000000 +0100
+@@ -24,7 +24,6 @@
+
+ #include 
+ #include 
+-#include 
+ #include 
+
+ #include "MuleGifCtrl.h"
+@@ -35,6 +34,50 @@
+ 	EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
+ END_EVENT_TABLE()
+
++#if wxCHECK_VERSION(2, 7, 1)
++// Wrapper that emulates old wxGIFDecoder API
++
++class MuleGIFDecoder : public wxGIFDecoder {
++public:
++	MuleGIFDecoder(wxInputStream* stream, bool dummy) {
++		m_stream = stream;
++		dummy = dummy; // Unused.
++		m_nframe = 0;
++	}
++
++	~MuleGIFDecoder() { /* don't delete the stream! */ }
++
++	wxGIFErrorCode ReadGIF() {
++		return LoadGIF(*m_stream);
++	}
++
++	void GoFirstFrame() { m_nframe = 0; }
++	void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
++	void GoLastFrame() { m_nframe = GetFrameCount(); }
++
++	void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
++
++	size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
++	size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
++
++	size_t	GetLeft() { return 0; }
++	size_t	GetTop() { return 0; }
++
++	long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
++
++private:
++	uint32_t m_nframe;
++	wxInputStream* m_stream;
++};
++
++#else
++class MuleGIFDecoder : public wxGIFDecoder {
++public:
++	MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
++};
++#endif
++
++
+
+ MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
+                           const wxSize& size, long style, const wxValidator& validator,
+@@ -66,7 +109,7 @@
+ 	}
+
+   	wxMemoryInputStream stream(data, size);
+-  	m_decoder = new wxGIFDecoder(&stream, TRUE);
++  	m_decoder = new MuleGIFDecoder(&stream, TRUE);
+   	if ( m_decoder->ReadGIF() != wxGIF_OK ) {
+    		delete m_decoder;
+    		m_decoder = NULL;
+@@ -137,3 +180,4 @@
+ 	dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
+ }
+
++// File_checked_for_headers
+--- aMule/src/MuleGifCtrl.h	2006-01-01 06:17:25.000000000 +0100
++++ aMule/src/MuleGifCtrl.h	2006-11-18 05:01:22.000000000 +0100
+@@ -27,11 +27,10 @@
+
+ #include 
+ #include 
+-#include 
+
+ const int GIFTIMERID = 271283;
+
+-class wxGIFDecoder;
++class MuleGIFDecoder;
+ class wxBitmap;
+
+ /**
+@@ -121,7 +120,7 @@
+ 	void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
+
+ 	//! A pointer to the current gif-animation.
+-	wxGIFDecoder*	m_decoder;
++	MuleGIFDecoder*	m_decoder;
+ 	//! Timer used for the delay between each frame.
+ 	wxTimer			m_timer;
+ 	//! Current frame.
+@@ -133,3 +132,4 @@
+
+ #endif
+
++// File_checked_for_headers
+--- aMule-2.1.3/src/MuleTextCtrl.cpp~	2006-12-17 20:55:37.157820250 +0100
++++ aMule-2.1.3/src/MuleTextCtrl.cpp	2006-12-17 20:56:21.328580750 +0100
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+
+ /**
+  * These are the IDs used to identify the different menu-items.
+--- amule/src/amule.cpp~	2006-12-17 21:53:26.474639000 +0100
++++ amule/src/amule.cpp	2006-12-17 21:55:40.307003000 +0100
+@@ -96,6 +96,7 @@
+ 		#include 
+ 		#include 
+ 	#endif
++	#include 
+ #endif
+
+
From crazy at frugalware.org  Wed Dec  5 23:05:56 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 23:05:58 2007
Subject: [Frugalware-git] wx28: poedit-1.3.7-3-i686
Message-ID: <20071205220556.C807811904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=5deb05be2a258162054b53bdc477d8057acf49ca

commit 5deb05be2a258162054b53bdc477d8057acf49ca
Author: crazy 
Date:   Wed Dec 5 23:05:29 2007 +0100

poedit-1.3.7-3-i686
* release bump
* rebuild with wxgtk
* added missing scriptlet option

diff --git a/source/xlib-extra/poedit/FrugalBuild b/source/xlib-extra/poedit/FrugalBuild
index 0adbcfc..c9d69b8 100644
--- a/source/xlib-extra/poedit/FrugalBuild
+++ b/source/xlib-extra/poedit/FrugalBuild
@@ -3,14 +3,15 @@

pkgname=poedit
pkgver=1.3.7
-pkgrel=2
+pkgrel=3
pkgdesc="cross-platform gettext catalogs (.po files) editor"
url="http://www.poedit.org/"
license="MIT"
+options=('scriptlet')
Finclude sourceforge
groups=('xlib-extra')
archs=('i686' 'x86_64')
-depends=('wxgtk-u8>=2.4.1' 'gtkspell>=2.0' 'db>=4.6.18' 'zip')
+depends=('wxgtk-u8>=2.8.7' 'gtkspell>=2.0' 'db>=4.6.18' 'zip')

build() {
Fsed '-ldb"' '-ldb -lpthread"' admin/berkeley_db.m4
From crazy at frugalware.org  Wed Dec  5 23:12:21 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 23:12:23 2007
Subject: [Frugalware-git] wx28: wxsqlite3-1.8.1-1-i686
Message-ID: <20071205221221.EE42C11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=2044ee0ec7e3cbd9c000a1e852cd8bddc7d626d4

commit 2044ee0ec7e3cbd9c000a1e852cd8bddc7d626d4
Author: crazy 
Date:   Wed Dec 5 23:11:57 2007 +0100

wxsqlite3-1.8.1-1-i686
* Version bump

diff --git a/source/xlib-extra/wxsqlite3/FrugalBuild b/source/xlib-extra/wxsqlite3/FrugalBuild
index 82e8f01..9b024a8 100644
--- a/source/xlib-extra/wxsqlite3/FrugalBuild
+++ b/source/xlib-extra/wxsqlite3/FrugalBuild
@@ -2,10 +2,10 @@
# Maintainer: Miklos Nemeth 

pkgname=wxsqlite3
-pkgver=1.7.3
+pkgver=1.8.1
pkgrel=1
pkgdesc="wxSQLite3 is a C++ wrapper around the public domain SQLite 3.x database"
-depends=('sqlite3' 'wxgtk')
+depends=('sqlite3' 'wxgtk>=2.8.7')
groups=('xlib-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
@@ -13,9 +13,8 @@ _F_sourceforge_dirname="wxcode"
Finclude sourceforge
url="http://wxcode.sourceforge.net/components/wxsqlite3/"
up2date="lynx -dump http://wxcode.sourceforge.net/components/wxsqlite3/ | grep Latest | sed 's/.*n: \([0-9.]*\) B.*/\1/'"
-_F_cd_path="$pkgname"
Fconfopts="$Fconfopts --with-sqlite3-prefix=/usr"
-sha1sums=('ead53f4a2958ce6fc1096af93f8ce52b7e1299b8')
+sha1sums=('a62d12ab0ec1b47a3cbf9b8d34259d4b1e91d26e')
unset MAKEFLAGS

# optimization OK
From crazy at frugalware.org  Wed Dec  5 23:31:26 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 23:31:28 2007
Subject: [Frugalware-git] wx28: wxstedit-1.2.4-2-i686
Message-ID: <20071205223126.4DADF11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=a3556d9e68847fda10a1f87521b0a6684298842b

commit a3556d9e68847fda10a1f87521b0a6684298842b
Author: crazy 
Date:   Wed Dec 5 23:30:55 2007 +0100

wxstedit-1.2.4-2-i686
* release bump
* rebuild with wxgtk
* added missing Fdie , scriptlet option
* added workaround for SMP builds

diff --git a/source/xlib-extra/wxstedit/FrugalBuild b/source/xlib-extra/wxstedit/FrugalBuild
index c4f2327..68ff989 100644
--- a/source/xlib-extra/wxstedit/FrugalBuild
+++ b/source/xlib-extra/wxstedit/FrugalBuild
@@ -3,22 +3,23 @@

pkgname=wxstedit
pkgver=1.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="wxStyledTextCtrl wrapper around the Scintilla text editor widget"
url="http://wxcode.sourceforge.net/components/wxstedit/"
-depends=('wxgtk')
+depends=('wxgtk>=2.8.7')
groups=('xlib-extra')
archs=('i686' 'x86_64')
_F_sourceforge_dirname=wxcode
-#_F_sourceforge_ext=.zip
+options=('scriptlet')
Finclude sourceforge
up2date="lynx -dump http://wxcode.sourceforge.net/showcomp.php?name=wxStEdit | grep Latest | sed 's/.*n: \([0-9.]*\) B.*/\1/'"
sha1sums=('d0c7a0240f1c5d92a6678d46301e0717d14e7fa8')
+unset MAKEFLAGS

build()
{
Fcd
-    mv include/wx/stedit/setup0.h include/wx/stedit/setup.h
+    mv include/wx/stedit/setup0.h include/wx/stedit/setup.h || Fdie
Fbuild
}
# optimization OK
From crazy at frugalware.org  Wed Dec  5 23:45:33 2007
From: crazy at frugalware.org (crazy)
Date: Wed Dec  5 23:45:34 2007
Subject: [Frugalware-git] wx28: wxxml2-1.8-1-i686
Message-ID: <20071205224533.5F50011904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=b538df84169b92dae619b22ab0b534e2205f7564

commit b538df84169b92dae619b22ab0b534e2205f7564
Author: crazy 
Date:   Wed Dec 5 23:45:19 2007 +0100

wxxml2-1.8-1-i686
* Version bump
* removed whole build() , not needed
* removed patch , in upstream
* added missing scriptlet option

diff --git a/source/xlib-extra/wxxml2/FrugalBuild b/source/xlib-extra/wxxml2/FrugalBuild
index 80f5ea1..f0e7713 100644
--- a/source/xlib-extra/wxxml2/FrugalBuild
+++ b/source/xlib-extra/wxxml2/FrugalBuild
@@ -2,30 +2,21 @@
# Maintainer: Miklos Nemeth 

pkgname=wxxml2
-pkgver=1.6
+pkgver=1.8
pkgrel=1
pkgdesc="xml2 class for wxWidgets framework"
_F_sourceforge_dirname="wxcode"
Finclude sourceforge
url="http://wxcode.sourceforge.net/components/wxxml2/"
-depends=('wxgtk' 'libxml2')
-makedepends=('wxgtk-devel' 'sdl')
+depends=('wxgtk>=2.8.7' 'libxml2')
+makedepends=('sdl')
+options=('scriptlet')
groups=('xlib-extra')
archs=('i686' 'x86_64')
+_F_cd_path="$pkgname"
up2date="lynx -dump $url | grep Latest | sed 's/.*: \([0-9\.]*\) B.*/\1/'"
-source=(${source/$pkgname-$pkgver/$pkgname} \
-        wxxml2-precisionfix.diff)
-sha1sums=('4ecbd61e7563c3500738ee0c9908bac1c6f11eb9' \
-	  '649d459874e46b2079c84c50221824506569bfb7')
+source=(${source/$pkgname-$pkgver/$pkgname})
+sha1sums=('ab07182d6edee520c0af172a23ab3e6737015e24')

-build()
-{
-    patch -Np0 -i "$Fsrcdir/wxxml2-precisionfix.diff"
-    cd wxxml2/build
-    Facu
-    autoconf
-    Fmake
-    Fmakeinstall
-}

-# optimalization ok
+# optimization OK
diff --git a/source/xlib-extra/wxxml2/wxxml2-precisionfix.diff b/source/xlib-extra/wxxml2/wxxml2-precisionfix.diff
deleted file mode 100644
index 8d68a76..0000000
--- a/source/xlib-extra/wxxml2/wxxml2-precisionfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wxxml2.orig/src/xml2.cpp wxxml2/src/xml2.cpp
---- wxxml2.orig/src/xml2.cpp	2005-08-10 10:15:08.000000000 +0000
-+++ wxxml2/src/xml2.cpp	2006-04-17 02:42:18.000000000 +0000
-@@ -916,7 +916,7 @@
- bool wxXml2Document::operator==(const wxXml2Document &doc) const
- {
- 	// check for null pointers
--	if ((int)doc.GetObj() ^ (int)GetObj())
-+	if ((long)doc.GetObj() ^ (long)GetObj())
- 		return FALSE;
- 	if (GetRoot() == doc.GetRoot())
- 		return TRUE;
From vmiklos at frugalware.org  Wed Dec  5 23:50:25 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Dec  5 23:50:27 2007
Subject: [Frugalware-git] bmf: mplayer-1.0rc2-3bmf1-i686
Message-ID: <20071205225025.9C88511904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=1dc9e22c353b49ae2852fd5697fedcb45bfc3ded

commit 1dc9e22c353b49ae2852fd5697fedcb45bfc3ded
Author: Miklos Vajna 
Date:   Wed Dec 5 23:43:16 2007 +0100

mplayer-1.0rc2-3bmf1-i686
sync with current

diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index fd5c1c1..6714991 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -4,13 +4,13 @@
pkgname=mplayer
pkgver=1.0rc2
pkgextraver=
-pkgrel=2bmf1
+pkgrel=3bmf1
pkgdesc="The Movie Player"
url="http://www.mplayerhq.hu/"
depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \
'libungif' 'xvidcore' 'libpng' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' \
'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2' \
-	 'x264>=20070421' 'dejavu-ttf' 'openal' 'vidix' 'libdvdnav2')
+	 'x264>=20070421' 'dejavu-ttf' 'openal' 'vidix' 'libdvdnav2' 'amrnb' 'amrwb')
[ "$CARCH" == "i686" ] && depends=(${depends[@]} 'codecs')
groups=('xapps')
backup=('etc/mplayer/mplayer.conf')
@@ -24,7 +24,6 @@ source=(http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver$pkgextraver.tar
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2 \
-	http://www.3gpp.org/ftp/Specs/archive/26_series/{26.104/26104-510.zip,26.204/26204-510.zip} \
http://onebithq.com/pub/mplayer/dvdnav/20071023/MPlayer-1.0rc2-with-dvdnav.patch \
http://onebithq.com/pub/mplayer/dvdnav/20071023/dvdnav_aspect.patch \
mga_common-correction.patch)
@@ -35,8 +34,6 @@ sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \
'152c40bf20de34aa8802d7f80d34d673b0b67212' \
'7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \
'2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
-          'b22dbe895991c23fad446c3c4ff7b6db12673778' \
-          '9ca910295c2888fba95a98da83762a22aaf34651' \
'e781ec5120635fbe6208453d9b8a0ec94b243792' \
'ea85ec053020dbb36fe6376d6a165fc7bef4f841' \
'2dcbd6908029a02655ab1536c2f93c7be82ca406')
@@ -49,14 +46,6 @@ build()
unset CFLAGS
Fcd MPlayer-$pkgver$pkgextraver
Fpatchall
-	mkdir -p libavcodec/amr_float
-	cd libavcodec/amr_float
-	unzip -o -q $Fsrcdir/26104-510_ANSI_C_source_code.zip
-	cd -
-	mkdir libavcodec/amrwb_float
-	cd libavcodec/amrwb_float
-	unzip -o -q $Fsrcdir/26204-510_ANSI-C_source_code.zip
-	cd -
Fconf --confdir=/etc/mplayer --enable-gui --language=all \
--enable-runtime-cpudetection --enable-liblzo \
--enable-largefiles --enable-mga --enable-xmga \
@@ -83,8 +72,8 @@ build()

# Install mplayer.conf
Ffilerel etc/example.conf /etc/mplayer/mplayer.conf
-	## symlink to solve this "New_Face failed. Maybe the font path is wrong." and this
-	## annoying popup about font missing :S
+
+	# Install default ttf font
Fln /usr/lib/X11/fonts/TTF/DejaVuSans.ttf /usr/share/mplayer/subfont.ttf
}
From vmiklos at frugalware.org  Wed Dec  5 23:50:25 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Wed Dec  5 23:50:27 2007
Subject: [Frugalware-git] bmf: mplayer-1.0rc2-3bmf1-i686
Message-ID: <20071205225025.B072E1190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=dfc942139b2a21204d73af7ada437699f69587e1

commit dfc942139b2a21204d73af7ada437699f69587e1
Author: Miklos Vajna 
Date:   Wed Dec 5 23:50:13 2007 +0100

mplayer-1.0rc2-3bmf1-i686
added a readme.fw

diff --git a/source/xapps/mplayer/README.Frugalware b/source/xapps/mplayer/README.Frugalware
new file mode 100644
index 0000000..21a63df
--- /dev/null
+++ b/source/xapps/mplayer/README.Frugalware
@@ -0,0 +1,10 @@
+This package contains a huge patch to add support for dvd menus.
+
+In most cases all you want is:
+
+----
+$ mplayer dvdnav:// -mouse-movements
+----
+
+NOTE: If you pause the movie and move the mouse it will be unpaused, that's a
+known bug.
From crazy at frugalware.org  Thu Dec  6 00:02:52 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 00:02:54 2007
Subject: [Frugalware-git] wx28: gpac-0.4.4-3-i686
Message-ID: <20071205230252.7B3F811904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=caea772e8624d8197ae4eeb7573130cfbdf482bc

commit caea772e8624d8197ae4eeb7573130cfbdf482bc
Author: crazy 
Date:   Thu Dec 6 00:01:33 2007 +0100

gpac-0.4.4-3-i686
* release bump
* rebuild with wxgtk
* added missing scriptlet option
* added workaround for SMP builds
* while at it fixed url bug

diff --git a/source/xmultimedia-extra/gpac/FrugalBuild b/source/xmultimedia-extra/gpac/FrugalBuild
index c792abd..3bd1840 100644
--- a/source/xmultimedia-extra/gpac/FrugalBuild
+++ b/source/xmultimedia-extra/gpac/FrugalBuild
@@ -3,16 +3,17 @@

pkgname=gpac
pkgver=0.4.4
-pkgrel=2
+pkgrel=3
pkgdesc="GPAC is a multimedia framework based on the MPEG-4 Systems standard."
-url="http://gpac.sourceforge.net/"
-depends=('wxgtk' 'libgcc' 'openssl' 'ffmpeg' 'libmad' 'freeglut')
+depends=('wxgtk>=2.8.7' 'libgcc' 'openssl' 'ffmpeg' 'libmad' 'freeglut')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
+options=('scriptlet')
Finclude sourceforge
up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=84101 |grep tar.gz |sed -ne 's/.*c-\(.*\).tar.*/\1/;s/-/_/;1p'"

build(){
+	unset MAKEFLAGS
Fcd $pkgname
chmod +x configure || Fdie
Fsed "-O3" "$CFLAGS" configure
From crazy at frugalware.org  Thu Dec  6 00:21:54 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 00:21:57 2007
Subject: [Frugalware-git] wx28: picard-0.7.2-3-i686
Message-ID: <20071205232154.5E8F611904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=16b7a421f2b2c746eef00ef820fc668f5ee19cfa

commit 16b7a421f2b2c746eef00ef820fc668f5ee19cfa
Author: crazy 
Date:   Thu Dec 6 00:21:30 2007 +0100

picard-0.7.2-3-i686
* release bump
* added an patch to fix wxpy28 detection
* fixed strip bug , krixI :P
* added missing scriptlet option

diff --git a/source/xmultimedia-extra/picard/FrugalBuild b/source/xmultimedia-extra/picard/FrugalBuild
index c2871c6..3e0bae6 100644
--- a/source/xmultimedia-extra/picard/FrugalBuild
+++ b/source/xmultimedia-extra/picard/FrugalBuild
@@ -3,19 +3,22 @@

pkgname=picard
pkgver=0.7.2
-pkgrel=2
+pkgrel=3
pkgdesc="The next generation MusicBrainz tagger"
url="http://musicbrainz.org/products/picard/"
depends=('python-ctypes' 'python-musicbrainz2' 'libtunepimp-python>=0.5.3' 'libmusicbrainz' \
-	'wxpython' 'wxgtk')
+	'wxpython>=2.8.7.1' 'wxgtk>=2.8.7')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
+options=('nostrip' 'scriptlet')
up2date="lynx -dump 'http://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/?C=M;O=D'|grep $pkgname.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'"
-source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('4046bcaf3b481c13f7bcbb2f2a858eacdbba1184')
+source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/$pkgname-$pkgver.tar.gz wxpy28.patch)
+sha1sums=('4046bcaf3b481c13f7bcbb2f2a858eacdbba1184' \
+          'f81e2aa7c52b351a7425fca1d8276c4558d2fc06')

build() {
Fcd
+	Fpatchall
# Need a patch from svn to run with libtunepimp 0.4 (autofinger disabled :( )
python setup.py install --prefix "$Fprefix" --root "$Fdestdir" || Fdie
# Wrapper fixup
diff --git a/source/xmultimedia-extra/picard/wxpy28.patch b/source/xmultimedia-extra/picard/wxpy28.patch
new file mode 100644
index 0000000..67b8f42
--- /dev/null
+++ b/source/xmultimedia-extra/picard/wxpy28.patch
@@ -0,0 +1,12 @@
+diff -Naur picard-0.7.2/picard/tagger.py picard-0.7.2-p/picard/tagger.py
+--- picard-0.7.2/picard/tagger.py	2006-10-24 22:39:42.000000000 +0200
++++ picard-0.7.2-p/picard/tagger.py	2007-12-06 00:10:55.000000000 +0100
+@@ -54,7 +54,7 @@
+
+ try:
+     import wxversion
+-    wxversion.select(["2.6", "2.7"])
++    wxversion.select(["2.6", "2.7" , "2.8"])
+ except:
+     pass
+
From crazy at frugalware.org  Thu Dec  6 00:26:33 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 00:26:34 2007
Subject: [Frugalware-git] frugalware-current: perl-cairo-1.044-1-i686
Message-ID: <20071205232633.673FA11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6fb8f1ffa322987a78f8f97e0b39af1c0f2af305

commit 6fb8f1ffa322987a78f8f97e0b39af1c0f2af305
Author: crazy 
Date:   Thu Dec 6 00:26:10 2007 +0100

perl-cairo-1.044-1-i686
* Version bump

diff --git a/source/xlib-extra/perl-cairo/FrugalBuild b/source/xlib-extra/perl-cairo/FrugalBuild
index 295644b..6f35cba 100644
--- a/source/xlib-extra/perl-cairo/FrugalBuild
+++ b/source/xlib-extra/perl-cairo/FrugalBuild
@@ -1,7 +1,7 @@
# Compiling Time: 0.05 SBU
# Maintainer: crazy 

-pkgver=1.043
+pkgver=1.044
pkgdesc="Perl interface to the cairo library"
depends=('cairo>=1.2.4')
makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig' 'perl-test-number-delta')
@@ -14,6 +14,6 @@ _F_sourceforge_name="Cairo"
Finclude sourceforge perl
archs=($archs 'x86_64')
groups=('xlib-extra')
-sha1sums=('71570fd66005da530598f3d979fef82cc5345bce')
+sha1sums=('58d697db51a3e072c9433398658da55cd4a6fe9d')

# optimization OK
From crazy at frugalware.org  Thu Dec  6 02:31:54 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 02:31:57 2007
Subject: [Frugalware-git] wx28: vlc-0.8.6-8-i686
Message-ID: <20071206013154.A798611904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=bb5f52395f2330ccfadd2a86d56e9feb883e7f8e

commit bb5f52395f2330ccfadd2a86d56e9feb883e7f8e
Author: crazy 
Date:   Thu Dec 6 02:30:09 2007 +0100

vlc-0.8.6-8-i686
* Version bump to patchlevel 'd'
* also this one builds with new wxgtk without hacks
* volume button is still ugly but .. heh
* fixed aliasing bug
* replaced old deprecated livedotcom configure options with
* new ones

diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild
index 01a994e..b1001a2 100644
--- a/source/xmultimedia-extra/vlc/FrugalBuild
+++ b/source/xmultimedia-extra/vlc/FrugalBuild
@@ -3,12 +3,12 @@

pkgname=vlc
pkgver=0.8.6
-pkgextraver=c
-pkgrel=7
+pkgextraver=d
+pkgrel=8
pkgdesc="The cross-platform media player and streaming server."
url="http://www.videolan.org/vlc/"
depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \
-	 'mpeg2dec' 'ffmpeg>=20070422' 'fribidi' 'wxgtk-u8' 'live' 'speex' 'libdca' \
+	 'mpeg2dec' 'ffmpeg>=20070422' 'fribidi' 'wxgtk-u8>=2.8.7' 'live' 'speex' 'libdca' \
'sysfsutils' 'mesa' 'libdvbpsi' 'libxv' 'sdlimage' 'libcdio' \
'libid3tag' 'libtheora' 'faad2' 'xvidcore')
## WARNING: do NOT add any VCD option to build its kill off the GUI
@@ -19,15 +19,16 @@ archs=('i686' 'x86_64')
up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'"
source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \
$pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff libdca.patch)
-sha1sums=('aefaf7a039874930b3e7caf139d2ed5b5bbd0a56'\
-          '888a02c9f81331fce1f6ee5f705ce68e5b486ffd'\
-          '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0'\
-          '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5'\
+sha1sums=('63afd15cc782795c8d8f3de5edc614389465c577' \
+          '888a02c9f81331fce1f6ee5f705ce68e5b486ffd' \
+          '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \
+          '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5' \
'edc3a14dfd9b022dca7593e006c324fa5cc17e48')

build()
{
Fpatchall
+	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
Fsed 'mozilla-config' 'firefox-config' configure.ac
Fsed 'firefox-config\.h' 'mozilla-config\.h' configure.ac
Fsed '/usr/lib/mozilla' '/usr/lib/firefox' configure.ac
@@ -47,8 +48,8 @@ build()
--enable-mozilla \
--enable-v4l \
--enable-realrtsp \
-		--enable-livedotcom \
-		--with-livedotcom-tree=/usr/lib/live \
+		--enable-live555 \
+		--with-live555-tree=/usr/lib/live \
--enable-speex \
--enable-wxwidgets \
--with-wx-config=wx-config-u8 \
From crazy at frugalware.org  Thu Dec  6 02:45:12 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 02:45:13 2007
Subject: [Frugalware-git] wx28: bittornado-0.3.18-2-i686
Message-ID: <20071206014512.1145511904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=7741e3ccac265a4142fe36d7728c4f37d0adae67

commit 7741e3ccac265a4142fe36d7728c4f37d0adae67
Author: crazy 
Date:   Thu Dec 6 02:44:56 2007 +0100

bittornado-0.3.18-2-i686
* release bump
* rebuild with wxpy28
* s/build()/_F_cd_path/
* added missing scritplet option

diff --git a/source/xapps-extra/bittornado/FrugalBuild b/source/xapps-extra/bittornado/FrugalBuild
index f0c9ff8..aa2b8a6 100644
--- a/source/xapps-extra/bittornado/FrugalBuild
+++ b/source/xapps-extra/bittornado/FrugalBuild
@@ -3,20 +3,16 @@

pkgname=bittornado
pkgver=0.3.18
-pkgrel=1
+pkgrel=2
pkgdesc="Experimental bittorrent client"
url="http://www.bittornado.com/"
-depends=('wxpython')
+depends=('wxpython>=2.8.7.1')
+options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.bittornado.com/download.html | grep 'http.*tar\.gz' | sed 's/.*-\([0-9\.]\+\)\.tar.*/\1/;q'"
source=(http://download2.bittornado.com/download/BitTornado-$pkgver.tar.gz)
+_F_cd_path="BitTornado-CVS"
sha1sums=('64c65b69d112f76ba8a024ff5b8671058130b71a')

-build()
-{
-	Fcd BitTornado-CVS
-	Fbuild
-}
-
# optimization OK - noarch
From crazy at frugalware.org  Thu Dec  6 02:49:10 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 02:49:10 2007
Subject: [Frugalware-git] frugalware-current: ipodder
Message-ID: <20071206014910.294BE11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8f8ad5dd24b12234501066868277098119ca7779

commit 8f8ad5dd24b12234501066868277098119ca7779
Author: crazy 
Date:   Thu Dec 6 02:48:08 2007 +0100

ipodder
* removed from tree
* will close #1126,#1341 as well

diff --git a/source/xapps-extra/ipodder/FrugalBuild b/source/xapps-extra/ipodder/FrugalBuild
deleted file mode 100644
index 985c6ad..0000000
--- a/source/xapps-extra/ipodder/FrugalBuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: VMiklos 
-
-pkgname=ipodder
-pkgver=2.1.9
-pkgrel=1
-pkgdesc="The cross-platform podcast receiver."
-_F_sourceforge_dirname="$pkgname"
-_F_sourceforge_name="iPodder-linux"
-_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
-url="http://ipodder.sourceforge.net"
-depends=('wxpython')
-groups=('xapps-extra')
-archs=('i686' 'x86_64')
-up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=118306 |grep iPodder-linux|sed 's/.*linux \([^ ]\+\) .*/\1/;q'"
-sha1sums=('10a2864ed7ca176c8a35e699ae86ad06d947a502')
-
-_prefix=/usr/lib/ipodder
-
-build()
-{
-	Fcd iPodder_linux
-	Fmkdir $_prefix /usr/bin
-	Fsed '/opt/iPodder' "$_prefix" iPodder.sh
-	Fsed "$pkgver" "'$pkgver'" iPodderGui.py
-	Fsed '\(imported\)' '\1, use pacman-g2 -S pyxmms!' ipodder/players.py
-	chmod 644 ipodder/grabbers.py
-	cp -f -R * $Fdestdir/$_prefix
-	Fln $_prefix/iPodder.sh /usr/bin/ipodder
-	Ffilerel /usr/share/applications/iPodder.desktop
-	Frm $_prefix/build
-}
-
-# optimalization ok - noarch
From crazy at frugalware.org  Thu Dec  6 03:21:23 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 03:21:24 2007
Subject: [Frugalware-git] wx28: tovid-0.30-3-i686
Message-ID: <20071206022123.05E9E11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=67c29029ea49454f189469b891cb0321e90d1e95

commit 67c29029ea49454f189469b891cb0321e90d1e95
Author: crazy 
Date:   Thu Dec 6 03:20:58 2007 +0100

tovid-0.30-3-i686
* release bump
* rebuild with wypy28
* depends() fix , this one need the unicode version

diff --git a/source/xapps-extra/tovid/FrugalBuild b/source/xapps-extra/tovid/FrugalBuild
index 8aa1667..6ec4d75 100644
--- a/source/xapps-extra/tovid/FrugalBuild
+++ b/source/xapps-extra/tovid/FrugalBuild
@@ -4,18 +4,20 @@

pkgname=tovid
pkgver=0.30
-pkgrel=2
+pkgrel=3
pkgdesc="Tovid is a collection of video disc authoring tools"
license="GPL"
-depends=('wxpython' 'mplayer>=1.0rc1-7' 'mjpegtools>=1.9.0rc2' 'ffmpeg>=20070422' 'imagemagick' 'txt2tags' \
+depends=('wxpython-u8>=2.8.7.1' 'mplayer>=1.0rc1-7' 'mjpegtools>=1.9.0rc2' 'ffmpeg>=20070422' 'imagemagick' 'txt2tags' \
'normalize' 'dvdauthor' 'vcdimager' 'libdvdcss' 'lsdvd' 'transcode>=1.0.2-5' 'sox' 'cdrdao')
archs=('i686')
groups=('xapps-extra')
options=('scriptlet')
_F_sourceforge_prefix="$pkgname "
Finclude sourceforge
+source=($source wxpy28.patch)
url="http://tovid.wikia.com/wiki/Main_Page"
-sha1sums=('70259c55a7da3b9a98fe8136470f5770d0923732')
+sha1sums=('70259c55a7da3b9a98fe8136470f5770d0923732' \
+          'c4243db5f508f1608ff9258138b4871d35d9f6c6')

build() {
Fbuild
diff --git a/source/xapps-extra/tovid/wxpy28.patch b/source/xapps-extra/tovid/wxpy28.patch
new file mode 100644
index 0000000..afef4b2
--- /dev/null
+++ b/source/xapps-extra/tovid/wxpy28.patch
@@ -0,0 +1,29 @@
+diff -Naur tovid-0.30/src/tovidgui tovid-0.30-p/src/tovidgui
+--- tovid-0.30/src/tovidgui	2006-11-20 06:54:41.000000000 +0100
++++ tovid-0.30-p/src/tovidgui	2007-12-06 03:06:10.000000000 +0100
+@@ -21,20 +21,20 @@
+ import sys
+ import traceback
+
+-# Try to import wx 2.6; print error if it's unavailable
++# Try to import wx 2.8; print error if it's unavailable
+ try:
+     import wxversion
+-    if wxversion.checkInstalled('2.6'):
+-        wxversion.select('2.6-unicode')
++    if wxversion.checkInstalled('2.8'):
++        wxversion.select('2.8-unicode')
+     else:
+-        print "tovidgui requires wxPython 2.6; please install or upgrade wxPython."
++        print "tovidgui requires wxPython 2.8; please install or upgrade wxPython."
+         sys.exit()
+     import wx
+ except ImportError:
+     traceback.print_exc()
+     print "There was an error importing the 'wx' libraries. The above"
+     print "output should help you find what went wrong. Re-installing"
+-    print "wxPython 2.6 (or upgrading from wxPython 2.4 to 2.6) may"
++    print "wxPython 2.8 (or upgrading from wxPython 2.6 to 2.8) may"
+     print "help. Consult the tovid homepage (tovid.org) for further"
+     print "assistance."
+     print "Sorry, 'tovidgui' will not work."
From crazy at frugalware.org  Thu Dec  6 03:45:17 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 03:45:17 2007
Subject: [Frugalware-git] wx28: wxglade-0.6.1-1-i686
Message-ID: <20071206024517.1095911904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=bae6a1f6cc3ef1b495051efeb1089a0387e8329c

commit bae6a1f6cc3ef1b495051efeb1089a0387e8329c
Author: crazy 
Date:   Thu Dec 6 03:44:56 2007 +0100

wxglade-0.6.1-1-i686
* Version bump

diff --git a/source/xapps-extra/wxglade/FrugalBuild b/source/xapps-extra/wxglade/FrugalBuild
index 4c7fa34..55a11ea 100644
--- a/source/xapps-extra/wxglade/FrugalBuild
+++ b/source/xapps-extra/wxglade/FrugalBuild
@@ -2,20 +2,19 @@
# Maintainer: Miklos Nemeth 

pkgname=wxglade
-pkgver=0.4.1
-pkgrel=3
+pkgver=0.6.1
+pkgrel=1
pkgdesc="Glade like GUI designer for wxWidgets"
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="wxGlade"
Finclude sourceforge python
-url="http://wxglade.sf.net/"
-depends=('wxpython')
+depends=('wxpython>=2.8.7.1')
groups=('xapps-extra')
archs=('x86_64' 'i686')
-up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=58225 |grep wxGlade-[0-9\.]*.tar.gz |sed -n 's/.*-\([0-9\.]*\)\.t.*/\1/; 1 p'"
+options=('scriptlet' 'nostrip')
source=($source wxglade.xpm)
-sha1sums=('5955872b1d868a92733afc1f8bc328d81ba3c2e5' \
-	  'b1f5b576a55cf8de6a9131b85e510b230c05c4e0')
+sha1sums=('59b1afb803ccfadd1d27caeaefca7e030eb107ab' \
+          'b1f5b576a55cf8de6a9131b85e510b230c05c4e0')


build()
@@ -27,4 +26,3 @@ build()
cp -a wxglade.xpm $Fdestdir/usr/share/pixmaps
}

-# optimalization ok
From crazy at frugalware.org  Thu Dec  6 04:27:36 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 04:27:37 2007
Subject: [Frugalware-git] wx28: wxsvg-1.0b7_3-1-i686
Message-ID: <20071206032736.06CDB11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=7f32eed084739895e6f9c5d83914e12a21736ef9

commit 7f32eed084739895e6f9c5d83914e12a21736ef9
Author: crazy 
Date:   Thu Dec 6 04:27:03 2007 +0100

wxsvg-1.0b7_3-1-i686
* New package
* need for dvdstyler

diff --git a/source/xlib-extra/wxsvg/FrugalBuild b/source/xlib-extra/wxsvg/FrugalBuild
new file mode 100644
index 0000000..033c792
--- /dev/null
+++ b/source/xlib-extra/wxsvg/FrugalBuild
@@ -0,0 +1,27 @@
+# Compiling Time: 1.53 SBU
+# Maintainer: crazy 
+
+pkgname=wxsvg
+pkgver=1.0b7_3
+pkgrel=1
+pkgdesc="wxSVG is C++ library to create, manipulate and render SVG files"
+_F_sourceforge_broken_up2date=1
+Finclude sourceforge
+url="http://www.wxsvg.org/"
+depends=('libart_lgpl' 'libstdc++' 'wxgtk>=2.8.1' 'libxxf86vm' 'expat' 'libxdamage' 'libice')
+## DO NOT CHANGE THAT YET! Exist ony on 2 mirrors by now
+source=(http://dfn.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver}.tar.gz)
+groups=('xlib-extra')
+archs=('i686' 'x86_64')
+sha1sums=('95ebb5b271dc286c9455c34aeac31dcda5d66763')
+options=('scriptlet')
+
+build()
+{
+	Fcd
+	touch NEWS README || Fdie
+	Fautoreconf
+	Fbuild
+}
+
+# optimization OK
From crazy at frugalware.org  Thu Dec  6 05:03:36 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 05:03:39 2007
Subject: [Frugalware-git] wx28: dvdstyler-1.5.1-1-i686
Message-ID: <20071206040336.961AA11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wx28.git;a=commitdiff;h=38c62b180e5b6346df056376d650dfa942d6e43b

commit 38c62b180e5b6346df056376d650dfa942d6e43b
Author: crazy 
Date:   Thu Dec 6 05:03:03 2007 +0100

dvdstyler-1.5.1-1-i686
* Version bump
* removed broken custom up2date ( brr )
* moved away from 'gnome' , wth this ?
* added an patch to fix autotools
* url fix
* removed old patch
* changed maintainer to me

diff --git a/source/gnome-extra/dvdstyler/FrugalBuild b/source/gnome-extra/dvdstyler/FrugalBuild
deleted file mode 100644
index 4fb10b6..0000000
--- a/source/gnome-extra/dvdstyler/FrugalBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Compiling Time: ~0.65 SBU
-# Maintainer: BMH1980 
-
-pkgname=dvdstyler
-pkgver=1.4
-pkgrel=6
-pkgdesc="DVDStyler is a crossplatform dvd authoring system."
-_F_sourceforge_dirname="dvdstyler"
-_F_sourceforge_name="DVDStyler"
-Finclude sourceforge
-url="http://dvdstyler.sourceforge.net/"
-makedepends=('dvdauthor' 'netpbm')
-depends=('libgnomeui' 'mpgtx' 'wxgtk' 'mjpegtools>=1.8.0-2' 'cdrtools' 'dvd+rw-tools')
-up2date="lynx -dump http://dvdstyler.sourceforge.net/downloads.html | grep Source | head -n 1 | cut -d ' ' -f 9 | cut -d '-' -f 2 | sed 's|.tar.gz||'"
-source=($source dvdstyler-amd64-gcc4fix.patch)
-license="GPL2"
-options=('scriptlet')
-groups=('gnome-extra')
-archs=('i686' 'x86_64')
-sha1sums=('5374a5f58dbef7b2180a5e89f416cf2c1cbc64ab' \
-          'f7c802dc6f6ae1b9b856e18859cebd2e1d95c4df')
-
-build()
-{
-	Fcd DVDStyler-$pkgver
-	if [ "$CARCH" == "x86_64" ]; then
-		Fpatch dvdstyler-amd64-gcc4fix.patch
-	fi
-	Fmake
-	Fmakeinstall
-	Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver
-}
-
-# optimization OK
diff --git a/source/gnome-extra/dvdstyler/dvdstyler-amd64-gcc4fix.patch b/source/gnome-extra/dvdstyler/dvdstyler-amd64-gcc4fix.patch
deleted file mode 100644
index de22e2f..0000000
--- a/source/gnome-extra/dvdstyler/dvdstyler-amd64-gcc4fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur DVDStyler-1.4.orig/src/ButtonPropDlg.cpp DVDStyler-1.4/src/ButtonPropDlg.cpp
---- DVDStyler-1.4.orig/src/ButtonPropDlg.cpp	2005-08-05 12:27:38.000000000 +0200
-+++ DVDStyler-1.4/src/ButtonPropDlg.cpp	2005-08-05 12:27:13.000000000 +0200
-@@ -115,14 +115,14 @@
- int ButtonPropDlg::GetTsi()
- {
-   if (m_titlesetChoice->GetSelection() >= 0)
--	return ((int) m_titlesetChoice->GetClientData(m_titlesetChoice->GetSelection()))-1;
-+	return ((long) m_titlesetChoice->GetClientData(m_titlesetChoice->GetSelection()))-1;
-   return 0;
- }
-
- int ButtonPropDlg::GetPgci()
- {
-   if (m_targetChoice->GetSelection() >= 0)
--	return (int) m_targetChoice->GetClientData(m_targetChoice->GetSelection());
-+	return (long) m_targetChoice->GetClientData(m_targetChoice->GetSelection());
-   return 0;
- }
-
-@@ -296,9 +296,9 @@
- 	return false;
-   }
-   int n = 1;
--  int tsi = ((int)GetClientData(n++))-1;
-+  int tsi = ((long)GetClientData(n++))-1;
-   m_object->SetActionTsi(tsi != m_tsi ? tsi : -2);
--  m_object->SetActionPgci((int)GetClientData(n++));
-+  m_object->SetActionPgci((long)GetClientData(n++));
-   m_object->SetActionChapter(GetInt(n++));
-   if (GetBool(n++))
- 	m_object->SetCustomAction(GetString(n));
diff --git a/source/gnome-extra/dvdstyler/dvdstyler.install b/source/gnome-extra/dvdstyler/dvdstyler.install
deleted file mode 100644
index 60bfe59..0000000
--- a/source/gnome-extra/dvdstyler/dvdstyler.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install()
-{
-	echo -n "updating desktop database..."
-	if update-desktop-database > /dev/null 2>&1 ; then
-		echo " done."
-	else
-		echo " failed."
-	fi
-}
-
-post_remove()
-{
-	post_install
-}
-
-op=$1
-shift
-
-$op $*
-
-# vim: ft=sh
diff --git a/source/xapps-extra/dvdstyler/FrugalBuild b/source/xapps-extra/dvdstyler/FrugalBuild
new file mode 100644
index 0000000..550c991
--- /dev/null
+++ b/source/xapps-extra/dvdstyler/FrugalBuild
@@ -0,0 +1,35 @@
+# Compiling Time: ~0.65 SBU
+# Maintainer: crazy 
+# Contributor: BMH1980 
+
+pkgname=dvdstyler
+pkgver=1.5.1
+pkgrel=1
+pkgdesc="DVDStyler is a crossplatform dvd authoring system."
+_F_sourceforge_dirname="dvdstyler"
+_F_sourceforge_name="DVDStyler"
+Finclude sourceforge
+url="http://www.dvdstyler.de"
+makedepends=('dvdauthor' 'netpbm')
+depends=('mpgtx' 'wxgtk>=2.8.1' 'mjpegtools>=1.8.0-2' 'cdrtools' 'dvd+rw-tools' 'wxsvg')
+source=($source fix-autotools.patch)
+license="GPL2"
+options=('scriptlet')
+groups=('xapps-extra')
+archs=('i686' 'x86_64')
+sha1sums=('c466dca9a5ff318dd43eb73d1acd0a360a68efd4' \
+          'cc9403bef31726c7e42d8786817e48f56c544a8c')
+
+build()
+{
+	Fcd DVDStyler-$pkgver
+	Fpatchall
+	touch NEWS || Fdie
+	Fautoreconf
+	Fmake
+	Fmakeinstall
+	# twice there
+	Frm usr/share/doc/dvdstyler
+}
+
+# optimization OK
diff --git a/source/xapps-extra/dvdstyler/dvdstyler.install b/source/xapps-extra/dvdstyler/dvdstyler.install
new file mode 100644
index 0000000..60bfe59
--- /dev/null
+++ b/source/xapps-extra/dvdstyler/dvdstyler.install
@@ -0,0 +1,21 @@
+post_install()
+{
+	echo -n "updating desktop database..."
+	if update-desktop-database > /dev/null 2>&1 ; then
+		echo " done."
+	else
+		echo " failed."
+	fi
+}
+
+post_remove()
+{
+	post_install
+}
+
+op=$1
+shift
+
+$op $*
+
+# vim: ft=sh
diff --git a/source/xapps-extra/dvdstyler/fix-autotools.patch b/source/xapps-extra/dvdstyler/fix-autotools.patch
new file mode 100644
index 0000000..0d5ba1d
--- /dev/null
+++ b/source/xapps-extra/dvdstyler/fix-autotools.patch
@@ -0,0 +1,30 @@
+diff -Naur DVDStyler-1.5.1/configure.in DVDStyler-1.5.1-p/configure.in
+--- DVDStyler-1.5.1/configure.in	2007-02-22 19:34:46.000000000 +0100
++++ DVDStyler-1.5.1-p/configure.in	2007-12-06 04:33:53.000000000 +0100
+@@ -148,5 +148,4 @@
+   buttons/Makefile
+   objects/Makefile
+   data/Makefile
+-  install.win32/Makefile
+ ])
+diff -Naur DVDStyler-1.5.1/src/Makefile.am DVDStyler-1.5.1-p/src/Makefile.am
+--- DVDStyler-1.5.1/src/Makefile.am	2007-07-08 19:11:50.000000000 +0200
++++ DVDStyler-1.5.1-p/src/Makefile.am	2007-12-06 04:34:22.000000000 +0100
+@@ -7,7 +7,7 @@
+  BurnDlg.cpp ProgressDlg.cpp\
+  MainWin.cpp dvdstyler.cpp
+
+-CXXFLAGS = @CXXFLAGS@ -I..
++AM_CXXFLAGS = @CXXFLAGS@ -I..
+ LDADD = ../wxVillaLib/libwxvilla.a
+
+ SUBDIRS = rc
+diff -Naur DVDStyler-1.5.1/wxVillaLib/Makefile.am DVDStyler-1.5.1-p/wxVillaLib/Makefile.am
+--- DVDStyler-1.5.1/wxVillaLib/Makefile.am	2006-12-06 15:09:21.000000000 +0100
++++ DVDStyler-1.5.1-p/wxVillaLib/Makefile.am	2007-12-06 04:35:17.000000000 +0100
+@@ -3,4 +3,4 @@
+  PipeExecute.cpp PropDlg.cpp SConv.cpp\
+  Thumbnails.cpp ThumbnailFactory.cpp\
+  utils.cpp VerticalToolbar.cpp
+-CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@
++AM_CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@
From boobaa at frugalware.org  Thu Dec  6 08:48:03 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Thu Dec  6 08:48:06 2007
Subject: [Frugalware-git] frugalware-current: openoffice.org-2.3.1-1-i686
	version bump removed patches, they are all in ooo-build
Message-ID: <20071206074803.9961811904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ef0255aab13ec004f8126eb4117ce12dae72d31

commit 7ef0255aab13ec004f8126eb4117ce12dae72d31
Author: Miklos Vajna 
Date:   Wed Dec 5 13:13:08 2007 +0100

openoffice.org-2.3.1-1-i686 version bump removed patches, they are all in ooo-build

diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild
index ec7b20f..a2bd7e5 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -5,14 +5,16 @@
pkgname=openoffice.org
USE_DEVEL=${USE_DEVEL:-"n"}
if ! Fuse $USE_DEVEL; then
-	upstream=2.3.0
+	upstream=2.3.1
+	branch=-2-3
tree=oog680
-	milestone=5
+	milestone=9
pkgver=$upstream
-	pkgrel=2
-	snapshot=20070912
+	pkgrel=1
+	snapshot=20071205
else
upstream=2.3
+	branch=
tree=oog680
milestone=5
pkgver=$upstream${tree}_m$milestone
@@ -37,7 +39,7 @@ if ! Fuse $USE_DEVEL; then
else
up2date="lynx -dump http://svn.gnome.org/viewcvs/ooo-build/trunk/configure.in?view=markup |grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'"
fi
-source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$snapshot.tar.bz2 \
+source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2 \
http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.3.0/SDF/hu.sdf \
gcj-4.2.2.patch ucb-no-CURL_NO_OLDIES.diff)
signatures=($source.asc '' '' '')
diff --git a/source/xapps/openoffice.org/gcj-4.2.2.patch b/source/xapps/openoffice.org/gcj-4.2.2.patch
deleted file mode 100644
index 873f604..0000000
--- a/source/xapps/openoffice.org/gcj-4.2.2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/patches/src680/buildfix-jvmfwk-gcc-4.2.diff b/patches/src680/buildfix-jvmfwk-gcc-4.2.diff
-index 1907383..0b98ddf 100644
---- a/patches/src680/buildfix-jvmfwk-gcc-4.2.diff
-+++ b/patches/src680/buildfix-jvmfwk-gcc-4.2.diff
-@@ -1,11 +1,12 @@
- --- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.ark	2006-11-10 23:23:34.000000000 +0100
- +++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-11-10 23:24:11.000000000 +0100
--@@ -71,6 +71,9 @@
-+@@ -71,6 +71,10 @@
-  {
-      static char const* ar[]= {
-            "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
- +          "/gcj-4.2.0/libjvm.so",
- +          "/gcj-4.2.1/libjvm.so",
-++          "/gcj-4.2.2/libjvm.so",
- +          "/gcj-4.3.0/libjvm.so",
-            "/gcj-4.1.1/libjvm.so",
-  	  "/gcj-4.2/libjvm.so",
diff --git a/source/xapps/openoffice.org/ucb-no-CURL_NO_OLDIES.diff b/source/xapps/openoffice.org/ucb-no-CURL_NO_OLDIES.diff
deleted file mode 100644
index 31432c2..0000000
--- a/source/xapps/openoffice.org/ucb-no-CURL_NO_OLDIES.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/patches/src680/apply b/patches/src680/apply
-index 4f5b1f9..022e5a7 100644
---- a/patches/src680/apply
-+++ b/patches/src680/apply
-@@ -777,6 +777,7 @@ SectionOwner => davidf
-
- [ FrugalwareOnly ]
- gcc401-stlport45-include.diff, gghibo
-+ucb-no-CURL_NO_OLDIES.diff
-
-
- # ( mmp@oo.o deals with defaults apparently )
-diff --git a/patches/src680/ucb-no-CURL_NO_OLDIES.diff b/patches/src680/ucb-no-CURL_NO_OLDIES.diff
-new file mode 100644
-index 0000000..4ec2d7a
---- /dev/null
-+++ b/patches/src680/ucb-no-CURL_NO_OLDIES.diff
-@@ -0,0 +1,19 @@
-+Index: source/ucp/ftp/makefile.mk
-+===================================================================
-+RCS file: /cvs/ucb/ucb/source/ucp/ftp/makefile.mk,v
-+retrieving revision 1.13
-+retrieving revision 1.12
-+diff -u -u -r1.13 -r1.12
-+--- ucb/source/ucp/ftp/makefile.mk	20 Sep 2004 14:32:42 -0000	1.13
-++++ ucb/source/ucp/ftp/makefile.mk	2 Feb 2004 18:36:22 -0000	1.12
-+@@ -75,9 +75,7 @@
-+
-+ .INCLUDE: settings.mk
-+
-+-.IF "$(SYSTEM_CURL)" == "YES"
-+-CFLAGS+=-DCURL_NO_OLDIES
-+-.ENDIF
-++#CFLAGS +=-fno-inline
-+
-+ # --- General -----------------------------------------------------
-+
From boobaa at frugalware.org  Thu Dec  6 08:48:03 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Thu Dec  6 08:48:07 2007
Subject: [Frugalware-git] frugalware-current: drupal-5.4-1-i686
Message-ID: <20071206074803.C42091190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c958a53345a77bd0a1e8eee6efb8022352321a4

commit 5c958a53345a77bd0a1e8eee6efb8022352321a4
Author: CSÉCSY László 
Date:   Thu Dec 6 08:47:50 2007 +0100

drupal-5.4-1-i686
version bump
closes #2620 in -current
new m8r (ok by alex@)

diff --git a/source/network-extra/drupal/FrugalBuild b/source/network-extra/drupal/FrugalBuild
index 5074d04..b0409b1 100644
--- a/source/network-extra/drupal/FrugalBuild
+++ b/source/network-extra/drupal/FrugalBuild
@@ -1,8 +1,9 @@
# Compiling Time: 0 SBU
-# Maintainer: AlexExtreme 
+# Maintainer: CSÉCSY László 
+# Contributor: AlexExtreme 

pkgname=drupal
-pkgver=5.3
+pkgver=5.4
pkgrel=1
pkgdesc="An advanced content management system to manage your website"
url="http://drupal.org"
@@ -14,7 +15,7 @@ up2date="lynx -dump http://drupal.org/download | grep -m1 'l-[0-9\.]*.tar.gz' |
backup=(var/www/drupal/sites/default/settings.php)
source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \
drupalsetup README.Frugalware)
-sha1sums=('71aaf830b65ec3c1029855b6ae95b6493ca17ae5' \
+sha1sums=('76e08a766d36d24c4628f61aea47d8961064f29b' \
'c56deef0edee4cea4b9391d20358eb7e2faf0005' \
'64c0eadd7a2e00b11644458a4eeea8e3203fa739')
options=('stick')
From vmiklos at frugalware.org  Thu Dec  6 13:14:29 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Thu Dec  6 13:14:31 2007
Subject: [Frugalware-git] frugalware-current: t/srcmissing: threat nomirror
	as nobuild
Message-ID: <20071206121429.DDBC911904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cff1618b069c88a0e5d0060b9efd700e8835f473

commit cff1618b069c88a0e5d0060b9efd700e8835f473
Author: Miklos Vajna 
Date:   Thu Dec 6 13:13:58 2007 +0100

t/srcmissing: threat nomirror as nobuild

diff --git a/t/srcmissing b/t/srcmissing
index 1eba5da..95fe6fa 100755
--- a/t/srcmissing
+++ b/t/srcmissing
@@ -25,7 +25,7 @@ do
unset pkgver pkgextraver nobuild options archs
export startdir=`pwd`
. FrugalBuild || echo "errors parsing the FrugalBuild"
-	if [ ! -z "$pkgname" -a ! "$nobuild" -a ! "`check_option NOBUILD`" ]; then
+	if [ ! -z "$pkgname" -a ! "$nobuild" -a ! "`check_option NOBUILD`" -a ! "`check_option NOMIRROR`" ]; then
for j in ${archs[@]}
do
[[ "$j" =~ '^!' ]] && continue
From vmiklos at frugalware.org  Thu Dec  6 13:18:24 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Thu Dec  6 13:18:26 2007
Subject: [Frugalware-git] frugalware-current: device-mapper-1.02.23-1-i686
Message-ID: <20071206121824.6984311904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=737625925ea9dcf579718c3f49a4d1922bdcb949

commit 737625925ea9dcf579718c3f49a4d1922bdcb949
Author: Miklos Vajna 
Date:   Thu Dec 6 13:18:13 2007 +0100

device-mapper-1.02.23-1-i686
version bump

diff --git a/source/lib/device-mapper/FrugalBuild b/source/lib/device-mapper/FrugalBuild
index 3ebaca5..60c4b7f 100644
--- a/source/lib/device-mapper/FrugalBuild
+++ b/source/lib/device-mapper/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos 

pkgname=device-mapper
-pkgver=1.02.22
+pkgver=1.02.23
pkgrel=1
pkgdesc="Device mapper ioctl library."
url="http://sources.redhat.com/dm/"
From vmiklos at frugalware.org  Thu Dec  6 13:30:19 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Thu Dec  6 13:30:22 2007
Subject: [Frugalware-git] frugalware-current: lvm2-2.02.29-1-i686
Message-ID: <20071206123019.8D5F211904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9428e5a2ef942936c044ba7685ef0d4eeb759aa4

commit 9428e5a2ef942936c044ba7685ef0d4eeb759aa4
Author: Miklos Vajna 
Date:   Thu Dec 6 13:30:13 2007 +0100

lvm2-2.02.29-1-i686
version bump

diff --git a/source/apps/lvm2/FrugalBuild b/source/apps/lvm2/FrugalBuild
index 1eed0ab..f2f0372 100644
--- a/source/apps/lvm2/FrugalBuild
+++ b/source/apps/lvm2/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=lvm2
-pkgver=2.02.28
+pkgver=2.02.29
pkgrel=1
pkgdesc="Logical Volume Manager 2 utilities"
url="http://sources.redhat.com/lvm2/"
From vmiklos at frugalware.org  Thu Dec  6 14:06:21 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Thu Dec  6 14:06:23 2007
Subject: [Frugalware-git] frugalware-current: sudo-1.6.9p9-1-i686
Message-ID: <20071206130621.0448C11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=36d03c04544c728ae29135ebae2606d29915f905

commit 36d03c04544c728ae29135ebae2606d29915f905
Author: Miklos Vajna 
Date:   Thu Dec 6 14:06:14 2007 +0100

sudo-1.6.9p9-1-i686
version bump

diff --git a/source/apps/sudo/FrugalBuild b/source/apps/sudo/FrugalBuild
index a4f587e..0999acb 100644
--- a/source/apps/sudo/FrugalBuild
+++ b/source/apps/sudo/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=sudo
-pkgver=1.6.9p8
+pkgver=1.6.9p9
pkgrel=1
pkgdesc="Give limited root privileges to certain users"
url="http://www.sudo.ws/"
@@ -12,7 +12,7 @@ archs=('i686' 'x86_64')
backup=('etc/sudoers')
up2date="lynx -dump http://www.sudo.ws/|grep 'stable version is'|sed 's/.*sudo \(.*\), .*/\1/'"
source=(http://www.sudo.ws/$pkgname/dist/$pkgname-$pkgver.tar.gz sudo.sh)
-sha1sums=('d4408550e4ebd2089edb2a7cc3f4ce9f7ba919f3' \
+sha1sums=('2a005b68d8ccea79028e56bd2500a70bfbf3a7b8' \
'ff0745f1d95c614f55e8fd1f85abee2486cf24ba')

build()
From vmiklos at frugalware.org  Thu Dec  6 14:34:23 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Thu Dec  6 14:34:25 2007
Subject: [Frugalware-git] frugalware-current: bind-9.4.2-1-i686
Message-ID: <20071206133423.5DD9711904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e96898e9b99dcf5e5aa30201f6d64571c5510104

commit e96898e9b99dcf5e5aa30201f6d64571c5510104
Author: Miklos Vajna 
Date:   Thu Dec 6 14:24:07 2007 +0100

bind-9.4.2-1-i686
version bump

diff --git a/source/network/bind/FrugalBuild b/source/network/bind/FrugalBuild
index b280fd4..6457f2c 100644
--- a/source/network/bind/FrugalBuild
+++ b/source/network/bind/FrugalBuild
@@ -2,9 +2,9 @@
# Maintainer: VMiklos 

pkgname=bind
-pkgver=9.4.1
-pkgextraver=-P1
-pkgrel=3
+pkgver=9.4.2
+pkgextraver=
+pkgrel=1
pkgdesc="DNS server and utilities"
url="http://www.isc.org/index.pl?/sw/bind/"
backup=(etc/named.conf etc/logrotate.d/named)
From vmiklos at frugalware.org  Thu Dec  6 14:34:23 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Thu Dec  6 14:34:27 2007
Subject: [Frugalware-git] frugalware-current: wpa_supplicant-0.5.9-1-i686
Message-ID: <20071206133423.701311190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=203873693129c44bd5bb6d51eb857516bf916b0c

commit 203873693129c44bd5bb6d51eb857516bf916b0c
Author: Miklos Vajna 
Date:   Thu Dec 6 14:33:36 2007 +0100

wpa_supplicant-0.5.9-1-i686
version bump

diff --git a/source/network/wpa_supplicant/FrugalBuild b/source/network/wpa_supplicant/FrugalBuild
index 724ffb8..cfa1205 100644
--- a/source/network/wpa_supplicant/FrugalBuild
+++ b/source/network/wpa_supplicant/FrugalBuild
@@ -2,9 +2,9 @@
# Maintainer: VMiklos 

pkgname=wpa_supplicant
-pkgver=0.5.8
+pkgver=0.5.9
madwifi=0.9.3.3
-pkgrel=2
+pkgrel=1
pkgdesc="Linux WPA/WPA2/IEEE 802.1X Supplicant"
url="http://hostap.epitest.fi/wpa_supplicant/"
depends=('openssl')
@@ -16,7 +16,7 @@ up2date="lynx -dump $url |grep -1 stable|sed -n 's/.*-\(.*\)\.t.*/\1/;3 p'"
source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz \
http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/network/madwifi/madwifi-$madwifi.tar.gz \
config)
-sha1sums=('434545faf4758044629f574d82939511be8deb0b' \
+sha1sums=('c197852585b069341f5d90dec9143a2b27a64320' \
'acdd6f06b484202225fd3f888564e18e0f064af1' \
'7d2b0166bc96c1241c1aee88809a20fccf2eef82')
options=('scriptlet')
From crazy at frugalware.org  Thu Dec  6 15:33:55 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 15:33:57 2007
Subject: [Frugalware-git] frugalware-current: qt4-4.3.3-1-i686
Message-ID: <20071206143355.EDF4511904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=99c38d7083ffbfde696798bbe521225996da667b

commit 99c38d7083ffbfde696798bbe521225996da667b
Author: crazy 
Date:   Thu Dec 6 15:16:32 2007 +0100

qt4-4.3.3-1-i686
* Version bump
* updated qt-copy patches
* moved some plugins around
* added new TODO

diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild
index dbec250..521f267 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -3,8 +3,8 @@

pkgname=qt4
origname=qt
-pkgver=4.3.2
-pkgrel=4
+pkgver=4.3.3
+pkgrel=1
pkgmore=x11-opensource-src
## Dummy package is empty ..
pkgdesc="The QT4 GUI toolkit."
@@ -21,7 +21,7 @@ archs=('i686' 'x86_64')
options=('scriptlet' 'nodocs')
up2date="lynx -dump ftp://ftp.trolltech.com/qt/source/|grep 'qt-x11-opensource-src'|grep -v rc[1-9]|grep -v beta|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'"
source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.gz \
-	http://ftp.frugalware.org/pub/other/sources/kde/qt4/patches-r738985.tar.bz2 \
+	http://ftp.frugalware.org/pub/other/sources/kde/qt4/patches-745397.tar.bz2 \
assistant4.desktop \
designer4.desktop \
linguist4.desktop \
@@ -31,8 +31,8 @@ source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.gz \
frugalware.patch \
Trolltech.conf \
apply_patches)
-sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \
-          '896e1d7a1877e14eb7e0bb647763bdbfd9d747c6' \
+sha1sums=('77d00e2438efa793f6c16c54b64c8ba440ee3228' \
+          'a787d5204131bb02c54b834e894cd55fc66ce680' \
'70413a58f1d4b7260ab407482675b8028cea4e47' \
'957376dd30fdf1bbc2ff5545f2f808f90d44c4dc' \
'bc6527ee1d672cc192c667aeb49540b166e96949' \
@@ -119,8 +119,8 @@ build()
Fcd $origname-$pkgmore-$pkgver
Fpatchall
Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing -Wno-deprecated" mkspecs/common/g++.conf
-	mv $Fsrcdir/{patches-r738985,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie
-	mv patches-r738985 patches || Fdie
+	mv $Fsrcdir/{patches-745397,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie
+	mv patches-745397 patches || Fdie
chmod +x apply_patches || Fdie
./apply_patches || Fdie
./configure \
@@ -178,6 +178,7 @@ build()
Fsplit $pkgname-qdbus /usr

## -assistant
+	## TODO: split libs
do_install "tools/assistant"
do_install "tools/assistant/lib"
clean_junk
@@ -188,8 +189,9 @@ build()
Fsplit $pkgname-assistant  /usr

## -designer
-	## TODO: Move pluings to qt3support
+	## TODO: split libs
do_install "tools/designer"
+	Frm usr/lib/qt4/plugins
clean_junk

Fmkdir usr/share/applications usr/share/pixmaps
@@ -281,6 +283,7 @@ build()
do_install "src/$lib"
do_install "src/plugins/accessible"
do_install "tools/porting"
+			do_install "tools/designer/src/plugins"
clean_junk

## already in qui =)
From crazy at frugalware.org  Thu Dec  6 17:07:37 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 17:07:39 2007
Subject: [Frugalware-git] frugalware-current: pcsc-lite-1.4.4-1-i686
Message-ID: <20071206160737.4ECB911904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ada338f3004f7a89490592bd977b7eba436ba0f7

commit ada338f3004f7a89490592bd977b7eba436ba0f7
Author: crazy 
Date:   Thu Dec 6 17:07:22 2007 +0100

pcsc-lite-1.4.4-1-i686
* New package
* WIP ( init script )

diff --git a/source/apps-extra/pcsc-lite/FrugalBuild b/source/apps-extra/pcsc-lite/FrugalBuild
new file mode 100644
index 0000000..082f8af
--- /dev/null
+++ b/source/apps-extra/pcsc-lite/FrugalBuild
@@ -0,0 +1,27 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: crazy 
+
+pkgname=pcsc-lite
+pkgver=1.4.4
+pkgrel=1
+pkgdesc="PC/SC Architecture smartcard middleware library"
+url="http://www.linuxnet.com/middle.html"
+depends=('libusb' 'glibc')
+groups=('apps-extra')
+archs=('i686')
+backup=('etc/pcsc/reader.conf')
+up2date="elinks -dump 'https://alioth.debian.org/frs/?group_id=30105'|grep 'pcsc-lite-\(.*\).tar.gz$'|Flasttar"
+# TODO init / cofig script(s)
+source=(https://alioth.debian.org/frs/download.php/2106/$pkgname-$pkgver.tar.gz)
+sha1sums=('2f5eb95b3acc2a3e32bf73d52c0c3fe991bb24aa')
+options=()
+
+build()
+{
+	Fbuild --enable-usbdropdir=/usr/share/pcsc/drivers
+	Fmv etc/reader.conf.d etc/pcsc
+	Fmv usr/share/doc/pcsc-lite usr/share/doc/pcsc-lite-$pkgver
+	Fsed "reader.conf.d" "pcsc" $Fdestdir/usr/sbin/update-reader.conf
+}
+
+# optimization OK
From crazy at frugalware.org  Thu Dec  6 17:28:47 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 17:28:49 2007
Subject: [Frugalware-git] frugalware-current: ccid-1.3.1-1-i686
Message-ID: <20071206162847.E504F11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=66a21a3007dd257d13273623c0fbf5de07bf2204

commit 66a21a3007dd257d13273623c0fbf5de07bf2204
Author: crazy 
Date:   Thu Dec 6 17:28:33 2007 +0100

ccid-1.3.1-1-i686
* New package

diff --git a/source/apps-extra/ccid/FrugalBuild b/source/apps-extra/ccid/FrugalBuild
new file mode 100644
index 0000000..eedb78f
--- /dev/null
+++ b/source/apps-extra/ccid/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: crazy 
+
+pkgname=ccid
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="CCID free software driver"
+url="http://pcsclite.alioth.debian.org/ccid.html"
+depends=('pcsc-lite' 'udev')
+groups=('apps-extra')
+archs=('i686')
+backup=('etc/etc/reader.conf')
+up2date="elinks -dump 'https://alioth.debian.org/frs/?group_id=30105'|grep 'ccid-\(.*\).tar.gz$'|Flasttar"
+source=(https://alioth.debian.org/frs/download.php/2193/$pkgname-$pkgver.tar.gz)
+sha1sums=('15d3b814b27a0a3196cc220cd3a13eeca82488fc')
+
+build()
+{
+	Fbuild \
+		--enable-udev \
+		--enable-twinserial
+	Ffilerel src/pcscd_ccid.rules /etc/udev/rules.d/60-pcscd-ccid.rules
+	Fmv usr/share/doc/ccid usr/share/doc/ccid-$pkgver
+}
+
+# optimization OK
From vmiklos at frugalware.org  Thu Dec  6 17:53:45 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Thu Dec  6 17:53:46 2007
Subject: [Frugalware-git] frugalware-current: fakeroot-1.8.10-1-i686
Message-ID: <20071206165345.1D8B811904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b22892f28eef0b6fa1d7b29b7897b8c895dd39b3

commit b22892f28eef0b6fa1d7b29b7897b8c895dd39b3
Author: Miklos Vajna 
Date:   Thu Dec 6 17:53:24 2007 +0100

fakeroot-1.8.10-1-i686
version bump

diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild
index f233aeb..b3d2e28 100644
--- a/source/devel/fakeroot/FrugalBuild
+++ b/source/devel/fakeroot/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: VMiklos 

pkgname=fakeroot
-pkgver=1.8.5
+pkgver=1.8.10
pkgrel=1
pkgdesc="Gives a fake root environment"
url="http://packages.debian.org/unstable/utils/fakeroot"
@@ -13,5 +13,5 @@ groups=('devel' 'devel-core')
archs=('i686' 'x86_64')
up2date="lynx -dump http://ftp.debian.org/debian/pool/main/f/fakeroot/?M=A|grep gz$|sed -n 's/.*_\(.*\)\.t.*/\1/;$ p'"
source=(http://ftp.debian.org/debian/pool/main/f/fakeroot/${pkgname}_$pkgver.tar.gz)
-sha1sums=('1a44f8b8f7b14caa5cdd3f72fb9975db35ddb03f')
+sha1sums=('810db3e5a298cf16787f7db5ad8ef4e9ab20f430')
# optimization OK
From crazy at frugalware.org  Thu Dec  6 19:24:35 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 19:24:37 2007
Subject: [Frugalware-git] frugalware-current: openct-0.6.14-1-i686
Message-ID: <20071206182435.390F911904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=589e2da0aebca9c23815bfe5b2d69bc20b9f6a86

commit 589e2da0aebca9c23815bfe5b2d69bc20b9f6a86
Author: crazy 
Date:   Thu Dec 6 19:24:06 2007 +0100

openct-0.6.14-1-i686
* New package
* for bug #2278

diff --git a/source/apps-extra/openct/FrugalBuild b/source/apps-extra/openct/FrugalBuild
new file mode 100644
index 0000000..94a2c17
--- /dev/null
+++ b/source/apps-extra/openct/FrugalBuild
@@ -0,0 +1,32 @@
+# Compiling Time: 0.30 SBU
+# Maintainer: crazy 
+
+pkgname=openct
+pkgver=0.6.14
+pkgrel=1
+pkgdesc="Library and tools for accessing smart card terminals."
+url="http://www.opensc-project.org/openct/wiki/WikiStart"
+depends=('libtool' 'glibc' 'libusb' 'udev') # hal if found
+makedepends=('pcsc-lite')
+groups=('apps-extra')
+archs=('i686')
+up2date="lynx -dump http://www.opensc-project.org/files/openct/|Flasttar"
+source=(http://www.opensc-project.org/files/$pkgname/$pkgname-$pkgver.tar.gz rc.openct)
+sha1sums=('a4432c69d87310bc653666aa41444703c64ff024' \
+          '739d85ec3ab4310784fa59cf77a414e390f9644e')
+
+build()
+{
+	Fbuild --with-bundle-dir=/usr/share/pcsc/drivers
+	Ffilerel etc/openct.udev /etc/udev/rules.d/95-openct.rules
+	Fexerel etc/openct_usb /lib/udev/openct_usb
+	Fexerel etc/openct_pcmcia /lib/udev/openct_pcmcia
+	Fexerel etc/openct_serial /lib/udev/openct_serial
+	Ffilerel etc/openct.fdi /usr/share/hal/fdi/information/10freedesktop/10-usb-openct.fdi
+	Fexerel etc/openct.hald /usr/bin/hald-addon-openct
+	Ffilerel etc/openct.conf /etc/openct.conf.sample
+	Fmkdir var/run/openct
+	Frcd2
+}
+
+# optimization OK
diff --git a/source/apps-extra/openct/rc.openct b/source/apps-extra/openct/rc.openct
new file mode 100755
index 0000000..88cad12
--- /dev/null
+++ b/source/apps-extra/openct/rc.openct
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# rc.openct for FrugalWare
+# distributed under GPL License
+
+# chkconfig: 2345 32 56
+# description: Starts or stops the OpenCT daemon
+
+source /lib/initscripts/functions
+TEXTDOMAIN=openct
+TEXTDOMAINDIR=/lib/initscripts/messages
+
+actions=(restart start stop)
+daemon=$"openct daemon"
+
+conf="/etc/openct.conf"
+
+rc_start() {
+	if [ ! -e "$conf" ]; then
+		msg "You need a valid openct.conf before you can start the daemon.\n"
+		msg "Please edit /etc/openct.conf.sample\n"
+		exit 1
+	else
+	start_msg
+		/usr/sbin/openct-control init
+		ok $?
+	fi
+}
+
+rc_stop() {
+	stop_msg
+
+		/usr/sbin/openct-control shutdown 1>/dev/null
+		ok $?
+}
+
+rc_exec $1
From crazy at frugalware.org  Thu Dec  6 20:18:55 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 20:18:57 2007
Subject: [Frugalware-git] frugalware-current: opensc-0.11.4-1-i686
Message-ID: <20071206191855.2E81011904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=56bdd933bfc813be9f1e861575e9b6e13d17d2dd

commit 56bdd933bfc813be9f1e861575e9b6e13d17d2dd
Author: crazy 
Date:   Thu Dec 6 20:18:21 2007 +0100

opensc-0.11.4-1-i686
* New package
* for bug #2280

diff --git a/source/apps-extra/opensc/FrugalBuild b/source/apps-extra/opensc/FrugalBuild
new file mode 100644
index 0000000..6a418e3
--- /dev/null
+++ b/source/apps-extra/opensc/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: 0.30 SBU
+# Maintainer: crazy 
+
+pkgname=opensc
+pkgver=0.11.4
+pkgrel=1
+pkgdesc="Library and tools for SmartCards."
+url="http://www.opensc-project.org/opensc/"
+depends=('pinentry' 'pcsc-lite' 'openct' 'openssl' 'libassuan' 'zlib' 'readline')
+makedepends=('libx11' 'libxt')
+backup=('etc/opensc.conf')
+groups=('apps-extra')
+archs=('i686')
+up2date="lynx -dump http://www.opensc-project.org/files/opensc/|Flasttar"
+source=(http://www.opensc-project.org/files/$pkgname/$pkgname-$pkgver.tar.gz)
+sha1sums=('2a871e0817e9ff605217d48052d77976aee89530')
+
+build()
+{
+	Fbuild \
+		--with-pin-entry=/usr/bin/pinentry \
+		--with-plugin-dir=/usr/lib/mozilla/plugins
+	Ffilerel etc/opensc.conf /etc/opensc.conf
+}
+
+# optimization OK
From crazy at frugalware.org  Thu Dec  6 21:57:15 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 21:57:17 2007
Subject: [Frugalware-git] frugalware-current: djvulibre-3.5.20-1-i686
Message-ID: <20071206205715.2025911904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5426d721e04fecc4eeed03950bec7751bb4acec3

commit 5426d721e04fecc4eeed03950bec7751bb4acec3
Author: crazy 
Date:   Thu Dec 6 21:56:18 2007 +0100

djvulibre-3.5.20-1-i686
* Version bump
* merged and rediffed the patch(es)

diff --git a/source/xlib/djvulibre/FrugalBuild b/source/xlib/djvulibre/FrugalBuild
index 1e9b9d1..58c7970 100644
--- a/source/xlib/djvulibre/FrugalBuild
+++ b/source/xlib/djvulibre/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy 

pkgname=djvulibre
-pkgver=3.5.19
-pkgrel=2
+pkgver=3.5.20
+pkgrel=1
pkgdesc="DjVu is a web-centric format for distributing documents and images."
depends=('libtiff' 'libjpeg')
makedepends=('kdelibs' 'gnome-mime-data' 'gnome-icon-theme' 'htop' 'xdg-utils')
@@ -16,7 +16,7 @@ _F_sourceforge_broken_up2date=1
_F_sourceforge_mirror="mesh"
Finclude sourceforge
url="http://djvulibre.djvuzone.org/"
-source=(${source[@]} head_-n1.patch fix-all-FLAGS.patch)
+source=(${source[@]} autotools-fixes.patch)

subpkgs=('djview')
subdescs=('DjVu viewer for qt and mozilla plugins.')
@@ -58,8 +58,7 @@ build()
Fsplit djview usr/share/djvu/djview3
}

-sha1sums=('439977e03c8c35ca74eb5887993edb317923133f'\
-          'df699c98fae73de45fb68bc6a7fe12d30a5c87bf'\
-          'd39c386e650c3c50b45bb5ec7fc3198c7d3a1eb1')
+sha1sums=('88ec94512f3f7845b42c2585f75e07a9cf147380' \
+          'cc8bd12bc51a616a322819bb033c43dd489fff4e')
# optimization OK

diff --git a/source/xlib/djvulibre/autotools-fixes.patch b/source/xlib/djvulibre/autotools-fixes.patch
new file mode 100644
index 0000000..c217ee3
--- /dev/null
+++ b/source/xlib/djvulibre/autotools-fixes.patch
@@ -0,0 +1,105 @@
+diff -Naur djvulibre-3.5.20/configure.ac djvulibre-3.5.20-p/configure.ac
+--- djvulibre-3.5.20/configure.ac	2007-11-29 00:46:44.000000000 +0100
++++ djvulibre-3.5.20-p/configure.ac	2007-12-06 21:17:12.000000000 +0100
+@@ -387,7 +387,7 @@
+ else
+   AC_MSG_CHECKING([g++ version])
+ changequote(<<, >>)dnl
+-  cxxver="`$CXX --version | head -1 |
++  cxxver="`$CXX --version | head -n 1 |
+              sed -e 's/^.*[^0-9.]\([2-4]\.[0-9.]*\).*$/\1/'`"
+ changequote([, ])dnl
+   AC_MSG_RESULT($cxxver)
+diff -Naur djvulibre-3.5.20/gui/bin2cpp/Makefile.in djvulibre-3.5.20-p/gui/bin2cpp/Makefile.in
+--- djvulibre-3.5.20/gui/bin2cpp/Makefile.in	2007-04-20 18:44:23.000000000 +0200
++++ djvulibre-3.5.20-p/gui/bin2cpp/Makefile.in	2007-12-06 21:17:05.000000000 +0100
+@@ -47,10 +47,10 @@
+ LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
+
+ INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
+-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
++CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
++CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
+
+ PROGRAMS = bin2cpp
+
+diff -Naur djvulibre-3.5.20/gui/nsdejavu/Makefile.in djvulibre-3.5.20-p/gui/nsdejavu/Makefile.in
+--- djvulibre-3.5.20/gui/nsdejavu/Makefile.in	2007-04-20 18:44:23.000000000 +0200
++++ djvulibre-3.5.20-p/gui/nsdejavu/Makefile.in	2007-12-06 21:17:05.000000000 +0100
+@@ -51,7 +51,7 @@
+  -I${top_srcdir}/gui/shared/res \
+  -I${top_srcdir}/gui/npsdk
+
+-CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS}
++CFLAGS += @CPPFLAGS@ ${DEFS} ${INCS} ${NSDEJAVU_CFLAGS}
+
+ LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
+
+diff -Naur djvulibre-3.5.20/libdjvu/Makefile.in djvulibre-3.5.20-p/libdjvu/Makefile.in
+--- djvulibre-3.5.20/libdjvu/Makefile.in	2007-05-19 05:07:34.000000000 +0200
++++ djvulibre-3.5.20-p/libdjvu/Makefile.in	2007-12-06 21:16:34.000000000 +0100
+@@ -53,7 +53,7 @@
+ LIBDJVU_VER = @LIBDJVU_VER@
+
+ INCS = -I${top_builddir} -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+ CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+ CXXFLAGS =  ${FLAGS} ${CXXPICFLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+diff -Naur djvulibre-3.5.20/tools/jb2cmp/Makefile.in djvulibre-3.5.20-p/tools/jb2cmp/Makefile.in
+--- djvulibre-3.5.20/tools/jb2cmp/Makefile.in	2007-11-29 00:55:29.000000000 +0100
++++ djvulibre-3.5.20-p/tools/jb2cmp/Makefile.in	2007-12-06 21:17:05.000000000 +0100
+@@ -47,10 +47,10 @@
+ THREAD_CFLAGS = @THREAD_CFLAGS@
+
+ INCS = -I${top_builddir} -I${top_srcdir} -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${THREAD_LIBS} @LIBS@
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
+-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
++CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
++CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
+
+
+ OBJS = classify.o cuts.o frames.o patterns.o
+diff -Naur djvulibre-3.5.20/tools/Makefile.in djvulibre-3.5.20-p/tools/Makefile.in
+--- djvulibre-3.5.20/tools/Makefile.in	2007-04-20 18:44:24.000000000 +0200
++++ djvulibre-3.5.20-p/tools/Makefile.in	2007-12-06 21:17:05.000000000 +0100
+@@ -52,11 +52,11 @@
+ LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
+
+ INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+ MORELIBS= @LDFLAGS@ ${JPEG_LIBS} ${TIFF_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+-CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
++CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
++CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+
+ SUBDIRS = jb2cmp
+
+diff -Naur djvulibre-3.5.20/xmltools/Makefile.in djvulibre-3.5.20-p/xmltools/Makefile.in
+--- djvulibre-3.5.20/xmltools/Makefile.in	2007-09-17 08:23:41.000000000 +0200
++++ djvulibre-3.5.20-p/xmltools/Makefile.in	2007-12-06 21:17:05.000000000 +0100
+@@ -50,10 +50,10 @@
+ LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
+
+ INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+-CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
++CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
++CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+
+ PROGRAMS = djvutoxml djvuxmlparser
+
diff --git a/source/xlib/djvulibre/fix-all-FLAGS.patch b/source/xlib/djvulibre/fix-all-FLAGS.patch
deleted file mode 100644
index 548ab20..0000000
--- a/source/xlib/djvulibre/fix-all-FLAGS.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Naur djvulibre-3.5.19/gui/bin2cpp/Makefile.in djvulibre-3.5.19-p/gui/bin2cpp/Makefile.in
---- djvulibre-3.5.19/gui/bin2cpp/Makefile.in	2007-03-25 22:48:22.000000000 +0200
-+++ djvulibre-3.5.19-p/gui/bin2cpp/Makefile.in	2007-04-20 14:57:06.000000000 +0200
-@@ -46,10 +46,10 @@
- LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
-
- INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
--CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
--CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
-+CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
-+CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
-
- PROGRAMS = bin2cpp
-
-diff -Naur djvulibre-3.5.19/gui/nsdejavu/Makefile.in djvulibre-3.5.19-p/gui/nsdejavu/Makefile.in
---- djvulibre-3.5.19/gui/nsdejavu/Makefile.in	2007-03-25 22:48:24.000000000 +0200
-+++ djvulibre-3.5.19-p/gui/nsdejavu/Makefile.in	2007-04-20 14:57:36.000000000 +0200
-@@ -50,7 +50,7 @@
-  -I${top_srcdir}/gui/shared/res \
-  -I${top_srcdir}/gui/npsdk
-
--CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS}
-+CFLAGS += @CPPFLAGS@ ${DEFS} ${INCS} ${NSDEJAVU_CFLAGS}
-
- LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
-
-diff -Naur djvulibre-3.5.19/libdjvu/Makefile.in djvulibre-3.5.19-p/libdjvu/Makefile.in
---- djvulibre-3.5.19/libdjvu/Makefile.in	2007-03-25 22:48:34.000000000 +0200
-+++ djvulibre-3.5.19-p/libdjvu/Makefile.in	2007-04-20 14:58:07.000000000 +0200
-@@ -52,10 +52,10 @@
- LIBDJVU_VER = @LIBDJVU_VER@
-
- INCS = -I${top_builddir} -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
--CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
--CXXFLAGS =  ${FLAGS} ${CXXPICFLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-+CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
-+CXXFLAGS +=  ${FLAGS} ${CXXPICFLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-
- all: ${LIBDJVU_LA}
-
-diff -Naur djvulibre-3.5.19/tools/jb2cmp/Makefile.in djvulibre-3.5.19-p/tools/jb2cmp/Makefile.in
---- djvulibre-3.5.19/tools/jb2cmp/Makefile.in	2007-03-25 22:48:36.000000000 +0200
-+++ djvulibre-3.5.19-p/tools/jb2cmp/Makefile.in	2007-04-20 14:58:30.000000000 +0200
-@@ -45,10 +45,10 @@
- THREAD_CFLAGS = @THREAD_CFLAGS@
-
- INCS = -I${top_builddir} -I${top_srcdir} -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${THREAD_LIBS} @LIBS@
--CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
--CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
-+CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
-+CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
-
-
- OBJS = classify.o cuts.o frames.o patterns.o
-diff -Naur djvulibre-3.5.19/tools/Makefile.in djvulibre-3.5.19-p/tools/Makefile.in
---- djvulibre-3.5.19/tools/Makefile.in	2007-03-25 22:48:35.000000000 +0200
-+++ djvulibre-3.5.19-p/tools/Makefile.in	2007-04-20 14:58:55.000000000 +0200
-@@ -51,11 +51,11 @@
- LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
-
- INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
- MORELIBS= @LDFLAGS@ ${JPEG_LIBS} ${TIFF_LIBS} ${THREAD_LIBS} @LIBS@
--CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
--CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-+CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
-+CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-
- SUBDIRS = jb2cmp
-
-diff -Naur djvulibre-3.5.19/xmltools/Makefile.in djvulibre-3.5.19-p/xmltools/Makefile.in
---- djvulibre-3.5.19/xmltools/Makefile.in	2007-03-25 22:48:36.000000000 +0200
-+++ djvulibre-3.5.19-p/xmltools/Makefile.in	2007-04-20 14:59:16.000000000 +0200
-@@ -49,10 +49,10 @@
- LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
-
- INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
--FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
-+FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
- LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
--CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
--CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-+CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
-+CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
-
- PROGRAMS = djvutoxml djvuxmlparser
-
diff --git a/source/xlib/djvulibre/head_-n1.patch b/source/xlib/djvulibre/head_-n1.patch
deleted file mode 100644
index 4ac69dd..0000000
--- a/source/xlib/djvulibre/head_-n1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur djvulibre-3.5.17/configure djvulibre-3.5.17-p/configure
---- djvulibre-3.5.17/configure	2006-03-23 17:37:23.000000000 +0100
-+++ djvulibre-3.5.17-p/configure	2006-10-06 17:50:18.000000000 +0200
-@@ -26970,7 +26970,7 @@
- else
-   echo "$as_me:$LINENO: checking g++ version" >&5
- echo $ECHO_N "checking g++ version... $ECHO_C" >&6
--  cxxver="`$CXX --version | head -1 |
-+  cxxver="`$CXX --version | head -n 1 |
-              sed -e 's/^.*[^0-9.]\([2-4]\.[0-9.]*\).*$/\1/'`"
-   echo "$as_me:$LINENO: result: $cxxver" >&5
- echo "${ECHO_T}$cxxver" >&6
-diff -Naur djvulibre-3.5.17/configure.ac djvulibre-3.5.17-p/configure.ac
---- djvulibre-3.5.17/configure.ac	2006-03-23 17:37:24.000000000 +0100
-+++ djvulibre-3.5.17-p/configure.ac	2006-10-06 17:50:18.000000000 +0200
-@@ -326,7 +326,7 @@
- else
-   AC_MSG_CHECKING([g++ version])
- changequote(<<, >>)dnl
--  cxxver="`$CXX --version | head -1 |
-+  cxxver="`$CXX --version | head -n 1 |
-              sed -e 's/^.*[^0-9.]\([2-4]\.[0-9.]*\).*$/\1/'`"
- changequote([, ])dnl
-   AC_MSG_RESULT($cxxver)
From vmiklos at frugalware.org  Thu Dec  6 22:39:55 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Thu Dec  6 22:40:14 2007
Subject: [Frugalware-git] frugalware-current: git-1.5.3.7-1-i686
Message-ID: <20071206213956.909BD11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c37c138a6ead31bfb2b6afa4ed960e5a54518465

commit c37c138a6ead31bfb2b6afa4ed960e5a54518465
Author: Miklos Vajna 
Date:   Thu Dec 6 22:39:23 2007 +0100

git-1.5.3.7-1-i686
version bump
fixed manpages

diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild
index bf719e5..0b4f69c 100644
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@ -4,7 +4,7 @@
USE_DEVEL=${USE_DEVEL:-"n"}

pkgname=git
-pkgver=1.5.3.6
+pkgver=1.5.3.7
Fuse $USE_DEVEL && pkgver=1.5.3.rc7.30.g947ad2
pkgrel=1
pkgdesc="A fast, scalable, distributed revision control system."
@@ -51,6 +51,9 @@ build()
# we don't need the html version of manpages
Fsed '^DOC_HTML=.*' 'DOC_HTML=' Documentation/Makefile

+	# also we want proper manlinks (how ugly docbook is)
+	sed -i -e "/^\tmv \$@+ \$@/i\\\\tsed -i 's|git\\\\([0-9]\\\\)|\\\\1(\\\\2)|g' \$@+" -e "s/^sed/\\\\tsed/" Documentation/Makefile
+
Fconf
make V=1 CLFAGS="$CFLAGS" ASCIIDOC8=YesPlease ETC_GITCONFIG=/etc/gitconfig all doc test || return 1
Fmakeinstall install-doc ETC_GITCONFIG=/etc/gitconfig mandir=/usr/share/man
From crazy at frugalware.org  Thu Dec  6 23:00:46 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 23:00:52 2007
Subject: [Frugalware-git] frugalware-current: Revert
	"lmsensors-3.0.0-1-x86_64"
Message-ID: <20071206220046.B5E3711901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f7f28bcf5ef131eba74202fc1e14426cca8f94c

commit 9f7f28bcf5ef131eba74202fc1e14426cca8f94c
Author: crazy 
Date:   Thu Dec 6 23:00:10 2007 +0100

Revert "lmsensors-3.0.0-1-x86_64"
* revert eaabb19486f7333df9402f82ce414b2f4c5081b3.
* krix please you just broke everything depends on it
* so setup a WIP repo and start fixing all apps before pushing '3'
* including kde , gnome , xfce etc etc , thx

diff --git a/source/apps/lmsensors/FrugalBuild b/source/apps/lmsensors/FrugalBuild
index af1cf8e..a4dc78d 100644
--- a/source/apps/lmsensors/FrugalBuild
+++ b/source/apps/lmsensors/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Zsolt Szalai 

pkgname=lmsensors
-pkgver=3.0.0
+pkgver=2.10.5
pkgrel=1
pkgdesc="Linux System Hardware Monitor"
url="http://www.lm-sensors.org/"
@@ -12,8 +12,8 @@ archs=('i686' 'x86_64')
depends=('glibc' 'sysfsutils')
makedepends=('kernel-source')
up2date="lynx -dump http://www.lm-sensors.org/wiki/Download |grep 'lm_sensors-' | grep tar|sed 's/.*-\([^ ]*\).tar.*/\1/;q'"
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-$pkgver.tar.bz2 rc.lmsensors README.Frugalware)
-backup=(etc/{sensors.conf,sensors3.conf,sysconfig/lm_sensors})
+source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-$pkgver.tar.gz rc.lmsensors README.Frugalware)
+backup=(etc/{sensors.conf,sysconfig/lm_sensors})

build() {
Fcd lm_sensors-$pkgver
@@ -24,7 +24,7 @@ build() {
Fdoc README.Frugalware
}

-sha1sums=('eeb9f5b1fa829cbf55f3147ba08cbe3095275f7e' \
+sha1sums=('d420dc8ed77c82c38f2a9456654d98dfb0a5578d' \
'f91892076a106c4aaee29f9611b9f004ddb392ab' \
'62f12385b257170a95fbac89afc10523e152f216')
# optimization OK
From crazy at frugalware.org  Thu Dec  6 23:02:38 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 23:02:44 2007
Subject: [Frugalware-git] frugalware-current: lmsensors-2.10.5-2-i686
Message-ID: <20071206220239.19DCB11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e51554d1d28cd41c6e8a8e7a1f95878465f7bec

commit 5e51554d1d28cd41c6e8a8e7a1f95878465f7bec
Author: crazy 
Date:   Thu Dec 6 23:02:29 2007 +0100

lmsensors-2.10.5-2-i686
* release bump
* added force so '2' series gets reinstalled on -Syu

diff --git a/source/apps/lmsensors/FrugalBuild b/source/apps/lmsensors/FrugalBuild
index a4dc78d..93dceba 100644
--- a/source/apps/lmsensors/FrugalBuild
+++ b/source/apps/lmsensors/FrugalBuild
@@ -4,13 +4,14 @@

pkgname=lmsensors
pkgver=2.10.5
-pkgrel=1
+pkgrel=2
pkgdesc="Linux System Hardware Monitor"
url="http://www.lm-sensors.org/"
groups=('apps')
archs=('i686' 'x86_64')
depends=('glibc' 'sysfsutils')
makedepends=('kernel-source')
+options=('force')
up2date="lynx -dump http://www.lm-sensors.org/wiki/Download |grep 'lm_sensors-' | grep tar|sed 's/.*-\([^ ]*\).tar.*/\1/;q'"
source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-$pkgver.tar.gz rc.lmsensors README.Frugalware)
backup=(etc/{sensors.conf,sysconfig/lm_sensors})
From crazy at frugalware.org  Thu Dec  6 23:13:56 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 23:13:59 2007
Subject: [Frugalware-git] frugalware-current: sip-4.7.3-1-i686
Message-ID: <20071206221356.A3A9C11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=70846e9f6a28235b81a90b6ce0ceefe92f1dde44

commit 70846e9f6a28235b81a90b6ce0ceefe92f1dde44
Author: crazy 
Date:   Thu Dec 6 23:13:37 2007 +0100

sip-4.7.3-1-i686
* Version bump

diff --git a/source/xlib/sip/FrugalBuild b/source/xlib/sip/FrugalBuild
index 39b95aa..51a7719 100644
--- a/source/xlib/sip/FrugalBuild
+++ b/source/xlib/sip/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: voroskoi 

pkgname=sip
-pkgver=4.7.1
-pkgrel=2
+pkgver=4.7.3
+pkgrel=1
pkgdesc="SIP is a tool that makes it very easy to create Python bindings for C and C++ libraries"
url="http://www.riverbankcomputing.co.uk/sip/index.php"
depends=('python>=2.5')
@@ -23,6 +23,6 @@ build()
Fsed "CFLAGS = -pipe -fPIC -O2 -w" "CFLAGS = $CFLAGS -fPIC -w" siplib/Makefile
Fbuild
}
-sha1sums=('458b305f7d5c4213a1bed032d87fdaff89a72fe0')
+sha1sums=('dfde22ba283b774dbe54e7f494ae217f6e43f370')

# optimization OK
From crazy at frugalware.org  Thu Dec  6 23:49:10 2007
From: crazy at frugalware.org (crazy)
Date: Thu Dec  6 23:49:17 2007
Subject: [Frugalware-git] frugalware-current: pyqt4-4.3.3-1-i686
Message-ID: <20071206224910.412DB11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f505b3276f66be91034fb8af4bc3aa08665591ee

commit f505b3276f66be91034fb8af4bc3aa08665591ee
Author: crazy 
Date:   Thu Dec 6 23:47:56 2007 +0100

pyqt4-4.3.3-1-i686
* Version bump

diff --git a/source/xlib-extra/pyqt4/FrugalBuild b/source/xlib-extra/pyqt4/FrugalBuild
index 4e20a3b..78274fa 100644
--- a/source/xlib-extra/pyqt4/FrugalBuild
+++ b/source/xlib-extra/pyqt4/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=pyqt4
origname=PyQt
-pkgver=4.3.1
-pkgrel=2
+pkgver=4.3.3
+pkgrel=1
pkgdesc="PyQt4 is a set of Python bindings for the Qt4 toolkit."
url="http://www.riverbankcomputing.co.uk/pyqt/index.php"
-depends=('libqttest' 'libqtopengl' 'libqtsvg' 'qt4-designer' 'dbus-python' 'python' 'sip>=4.7' 'qscintilla2-qt4>=1.73_2.1-3')
+depends=('libqttest' 'libqtopengl' 'libqtsvg' 'qt4-designer' 'dbus-python' 'python' 'sip>=4.7.3' 'qscintilla2-qt4>=1.73_2.1-3')
up2date="lynx -dump http://www.riverbankcomputing.co.uk/pyqt/download.php |grep 'PyQt-x11-gpl-4' |sed -ne 's/.*l-\(.*\).tar.gz .*/\1/;1 p'"
source=(http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/$origname-x11-gpl-$pkgver.tar.gz)
#up2date="$pkgver"
@@ -15,7 +15,7 @@ source=(http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/$origname-x11-gpl-
license="GPL"
groups=('xlib-extra')
archs=('i686' 'x86_64')
-sha1sums=('089154ca3126fe0efd3003d998f18b6db29c49b9')
+sha1sums=('78db8a84185cfdee505e1c0c65d793eb608d6485')

## TODO: split it!!
From vmiklos at frugalware.org  Fri Dec  7 02:05:47 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 02:05:49 2007
Subject: [Frugalware-git] frugalware-current: ffmpeg-20070422-2-i686
Message-ID: <20071207010547.1F96711904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cedc0035fc7ce79237226e1b42b298c84b8b9ac7

commit cedc0035fc7ce79237226e1b42b298c84b8b9ac7
Author: Miklos Vajna 
Date:   Fri Dec 7 02:05:10 2007 +0100

ffmpeg-20070422-2-i686
rebuild using --enable-amr_nb and --enable-amr_wb

diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild
index 0746938..e23a4ae 100644
--- a/source/xmultimedia/ffmpeg/FrugalBuild
+++ b/source/xmultimedia/ffmpeg/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=ffmpeg
pkgver=20070422
-pkgrel=1
+pkgrel=2
pkgdesc="FFMpeg is a complete and free Internet live audio and vide  broadcasting solution for Linux/Unix"
url="http://ffmpeg.sourceforge.net/"
-depends=('a52dec' 'lame' 'faac' 'x264>=20070421' 'libvorbis' 'xvidcore' 'zlib' 'libdca>=0.0.5' 'faad2' 'imlib2')
+depends=('a52dec' 'lame' 'faac' 'x264>=20070421' 'libvorbis' 'xvidcore' 'zlib' 'libdca>=0.0.5' 'faad2' 'imlib2' 'amrnb' 'amrwb')
makedepends=('freetype2')
groups=('xmultimedia')
archs=('i686' 'x86_64')
@@ -36,7 +36,9 @@ build()
--disable-static \
--enable-pp \
--enable-pthreads \
-		--disable-opts
+		--disable-opts \
+		--enable-amr_nb \
+		--enable-amr_wb
make SHARED_PP="yes" || Fdie
make DESTDIR=$Fdestdir install || Fdie
}
From vmiklos at frugalware.org  Fri Dec  7 02:18:34 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 02:18:37 2007
Subject: [Frugalware-git] vmexam: video/youtube-convert: flv->avi converter
Message-ID: <20071207011834.03D1C11904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=vmexam.git;a=commitdiff;h=265e7249c307a5630837b26a25e083d3394b36ea

commit 265e7249c307a5630837b26a25e083d3394b36ea
Author: Miklos Vajna 
Date:   Fri Dec 7 02:16:56 2007 +0100

video/youtube-convert: flv->avi converter

diff --git a/video/youtube-convert b/video/youtube-convert
new file mode 100755
index 0000000..60d17c6
--- /dev/null
+++ b/video/youtube-convert
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# a simple script to convert youtube's flv to an avi which can be played by anyone
+
+mencoder $1 -ovc lavc -oac mp3lame -lavcopts vcodec=mpeg4:keyint=50 -o `basename $1`.avi -ffourcc XVID
From vmiklos at frugalware.org  Fri Dec  7 02:18:34 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 02:18:37 2007
Subject: [Frugalware-git] vmexam: video/mobile-convert: *->phone converter
Message-ID: <20071207011834.111831190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=vmexam.git;a=commitdiff;h=56d9dfaaa177eb6ffd5bfb52f525e3fae812fe69

commit 56d9dfaaa177eb6ffd5bfb52f525e3fae812fe69
Author: Miklos Vajna 
Date:   Fri Dec 7 02:18:09 2007 +0100

video/mobile-convert: *->phone converter

diff --git a/video/mobile-convert b/video/mobile-convert
new file mode 100755
index 0000000..53bc2c4
--- /dev/null
+++ b/video/mobile-convert
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# a simple script to convert any video to a 3gp format which can be played by phones
+
+ffmpeg -i $1 -acodec amr_nb -ar 8000 -ac 1 -ab 12.2k -vcodec h263 -s qcif -r 15 `basename $1`.3gp
From vmiklos at frugalware.org  Fri Dec  7 02:35:49 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 02:35:52 2007
Subject: [Frugalware-git] vmexam: video/flv-convert: * -> flv converter
Message-ID: <20071207013549.CC83011904CD@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=vmexam.git;a=commitdiff;h=ceddb737aa2024284d7b289fc99dcbec1ffe0b61

commit ceddb737aa2024284d7b289fc99dcbec1ffe0b61
Author: Miklos Vajna 
Date:   Fri Dec 7 02:35:25 2007 +0100

video/flv-convert: * -> flv converter
last script for today :)

diff --git a/video/flv-convert b/video/flv-convert
new file mode 100755
index 0000000..41c5130
--- /dev/null
+++ b/video/flv-convert
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# a simple script to convert any video to an flv format which can be played by flash players
+
+mencoder \
+$1 \
+-ofps 25 \
+-o `basename $1`.flv \
+-of lavf \
+-oac mp3lame \
+-lameopts abr:br=64 \
+-srate 22050 \
+-ovc lavc \
+-lavcopts vcodec=flv:keyint=50:vbitrate=300:mbd=2:mv0:trell:\
+v4mv:cbp:last_pred=3 -vf scale=320:240
From crazy at frugalware.org  Fri Dec  7 08:22:58 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 08:23:01 2007
Subject: [Frugalware-git] 
	frugalware-current: module-init-tools-3.2.2-10-i686
Message-ID: <20071207072258.BA37D1190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8339241930c7e1075cdcc3749e27179a77bfad61

commit 8339241930c7e1075cdcc3749e27179a77bfad61
Author: crazy 
Date:   Fri Dec 7 08:22:28 2007 +0100

module-init-tools-3.2.2-10-i686
* fix source , url , up2date
* actually 3.4 is out , vmiklos ^^

diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild
index 7e82998..4b9133f 100644
--- a/source/base/module-init-tools/FrugalBuild
+++ b/source/base/module-init-tools/FrugalBuild
@@ -6,14 +6,14 @@ pkgname=module-init-tools
pkgver=3.2.2
pkgrel=10
pkgdesc="Utilities for inserting and removing modules from the Linux kernel"
-url="http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/"
+url="http://kerneltools.org/KernelTools.org"
depends=('glibc')
makedepends=('zlib')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
backup=('etc/rc.d/rc.modules' 'etc/sysconfig/modules')
-up2date="lynx -dump '$url/?C=M&O=D' |grep module-init-tools-[0-9\.]*.tar.bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'"
-source=($url/$pkgname-$pkgver.tar.bz2 rc.modules modules)
+up2date="lynx -dump http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/|Flasttarbz2"
+source=(http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/$pkgname-$pkgver.tar.bz2 rc.modules modules)
sha1sums=('b51e8ac170be23a1f2e301a1dddd47a47ec2186a' \
'4eea32f43b0adafc380ee88d70dc8f03a0b4b062' \
'4c840e22304f1b152be871b7b4eb99c0cecf482f')
From crazy at frugalware.org  Fri Dec  7 08:26:42 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 08:26:42 2007
Subject: [Frugalware-git] 
	playground: kdepimlibs-3.96.1_744361-0playground1-i686
Message-ID: <20071207072642.0AC681190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=83c4b93b9730de627d925dc6851f09eb03f2acd0

commit 83c4b93b9730de627d925dc6851f09eb03f2acd0
Author: crazy 
Date:   Fri Dec 7 08:26:19 2007 +0100

kdepimlibs-3.96.1_744361-0playground1-i686
* fix depends() and makedepends()

diff --git a/source/kde4/kdepimlibs/FrugalBuild b/source/kde4/kdepimlibs/FrugalBuild
index 468467b..1957055 100644
--- a/source/kde4/kdepimlibs/FrugalBuild
+++ b/source/kde4/kdepimlibs/FrugalBuild
@@ -5,8 +5,9 @@ pkgname=kdepimlibs
pkgver=3.96.1_744361
pkgrel=0playground1
pkgdesc="Personal Information Management (PIM) libraries for KDE4."
-depends=('libkde>=3.96.1_743104' 'libqtsvg' 'libldap' 'gpgme' 'boost')
-makedepends=('openldap')
+depends=('libkde' 'libice' 'libxext' 'libxfixes' 'libqtgui' 'gamin' 'xfsprogs-attr' \
+	'libxrender' 'libldap' 'libqtnetwork' 'qt4-qdbus' 'bzip2' 'libgcc' 'libqtsql' 'gpgme')
+makedepends=('openldap' 'boost')
groups=('kde4')
archs=('i686')
options=('nomirror')
From crazy at frugalware.org  Fri Dec  7 08:46:17 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 08:46:19 2007
Subject: [Frugalware-git] 
	playground: kdegraphics-3.96.1_744494-0playground1-i686
Message-ID: <20071207074617.56CE61190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=2cc10359b5038b6d3e4ba90c0314ed002e0c2c42

commit 2cc10359b5038b6d3e4ba90c0314ed002e0c2c42
Author: crazy 
Date:   Fri Dec 7 08:44:05 2007 +0100

kdegraphics-3.96.1_744494-0playground1-i686
* Version bump

diff --git a/source/kde4/kdegraphics/FrugalBuild b/source/kde4/kdegraphics/FrugalBuild
index 32799c9..2651908 100644
--- a/source/kde4/kdegraphics/FrugalBuild
+++ b/source/kde4/kdegraphics/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy 

pkgname=kdegraphics
-pkgver=3.96.1_743103
+pkgver=3.96.1_744494
pkgrel=0playground1
pkgdesc="KDE Graphics Programs"
depends=('libqtnetwork' 'libkde' 'libqtsvg')
@@ -13,7 +13,7 @@ options=('nomirror')
_F_kde4_subpkgs=('gwenview' 'kamera' 'kolourpaint'  'kruler'  'ksnapshot'  'okular' 'libkscan' 'kcolorchooser' 'svgpart')
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2)
-sha1sums=('3045e0cfc50f7331390c30994d63dd99c9b8318d')
+sha1sums=('23e499f44bd8675a2ce0df6b114178843b388661')

## TODO: srigi stuff for 4.1
subpkgs=("${_F_kde4_subpkgs[@]}")
From crazy at frugalware.org  Fri Dec  7 09:04:51 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:04:54 2007
Subject: [Frugalware-git] frugalware-current: xmule
Message-ID: <20071207080451.B1FC81190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=823f573fdfaea692c38a912497b2162e6a8c19ab

commit 823f573fdfaea692c38a912497b2162e6a8c19ab
Author: crazy 
Date:   Fri Dec 7 09:03:55 2007 +0100

xmule
* removed from tree
* Ok @ janny

diff --git a/source/xapps-extra/xmule/FrugalBuild b/source/xapps-extra/xmule/FrugalBuild
deleted file mode 100644
index 5cf1d0f..0000000
--- a/source/xapps-extra/xmule/FrugalBuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Compiling time: 1.35 SBU
-# Maintainer: Janny 
-
-pkgname=xmule
-pkgver=1.13.7_rc1
-pkgrel=2
-pkgdesc="The Multiplatform Fork of the xMule Client | Inspiring P2P for Geeks"
-_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
-url="http://www.xmule.ws"
-license="GPL"
-depends=('glib' 'gtk+2' 'wxgtk>=2.6.0' 'zlib' 'wget')
-groups=('xapps-extra')
-archs=('i686' 'x86_64')
-options=('scriptlet')
-up2date="lynx -dump $url/|grep xmule.*.tar.bz2|sed -ne 's/.*xmule-\(.*\)\.t.*/\1/;1 p'"
-#source=($url/files/releases/$pkgname-1.13.7-rc1.tar.bz2 ed2k.protocol)
-source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/xapps-extra/xmule/xmule-1.13.7-rc1.tar.bz2 \
-	ed2k.protocol)
-build()
-{
-	Fcd $pkgname-1.13.7/
-	Fbuild
-
-	# Install icon for the menu file.
-	Ficonrel $pkgname.xpm
-
-	# Install menu file.
-	Fdesktop "$pkgname" "$pkgname.xpm" "Network;"
-
-	# Install KDE ed2k protocol
-	Ffile /usr/share/services/ed2k.protocol
-
-	# fix conflicts with amule
-	Frm usr/bin/ed2k
-	Fln /usr/bin/ed2k.xmule-2.0 /usr/bin/xed2k
-}
-
-sha1sums=('2d7b058094fd89912179a9675d26c9a31d638506' \
-          'f5eb94d97813e1d6665a4652e32085ac2b27a5db')
-# optimization OK
diff --git a/source/xapps-extra/xmule/ed2k.protocol b/source/xapps-extra/xmule/ed2k.protocol
deleted file mode 100644
index c770b64..0000000
--- a/source/xapps-extra/xmule/ed2k.protocol
+++ /dev/null
@@ -1,11 +0,0 @@
-[Protocol]
-	exec=/usr/bin/xed2k "%u"
-	protocol=ed2k
-	input=none
-	output=none
-	helper=true
-	listing=false
-	reading=false
-	writing=false
-	makedir=false
-	deleting=false
From crazy at frugalware.org  Fri Dec  7 09:10:19 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:10:23 2007
Subject: [Frugalware-git] frugalware-current: wxmusik-0.4.2.2-4-i686
Message-ID: <20071207081019.7A0801190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=42eaf21545c93634ccc43e9fe7b18a1573e55f68

commit 42eaf21545c93634ccc43e9fe7b18a1573e55f68
Author: crazy 
Date:   Fri Dec 7 09:09:47 2007 +0100

wxmusik-0.4.2.2-4-i686
* nobuild for now , can't wait for priyank on that

diff --git a/source/xmultimedia-extra/wxmusik/FrugalBuild b/source/xmultimedia-extra/wxmusik/FrugalBuild
index 38c642e..f688c19 100644
--- a/source/xmultimedia-extra/wxmusik/FrugalBuild
+++ b/source/xmultimedia-extra/wxmusik/FrugalBuild
@@ -24,7 +24,7 @@ source=(http://download.berlios.de/musik/wxMusik-$pkgver.tar.bz2 \
PlaylistCtrl.patch \
SourcesBox.patch \
FLAC13.diff)
-options=('scriptlet')
+options=('scriptlet' 'nobuild')
_F_desktop_name="WxMusik"
_F_desktop_icon="musik.png"
_F_desktop_categories="AudioVideo;Player;"
From crazy at frugalware.org  Fri Dec  7 09:15:56 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:20 2007
Subject: [Frugalware-git] frugalware-current: wxgtk-u8
Message-ID: <20071207081556.69F401190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=148b23a75456d5e801741f7caa5b3901ddfb3fe2

commit 148b23a75456d5e801741f7caa5b3901ddfb3fe2
Author: crazy 
Date:   Wed Dec 5 11:34:16 2007 +0100

wxgtk-u8
* removed
* no need to duplicate packages , is called 'subpkg' :P

diff --git a/source/xlib-extra/wxgtk-u8/FrugalBuild b/source/xlib-extra/wxgtk-u8/FrugalBuild
deleted file mode 100644
index 39ecc96..0000000
--- a/source/xlib-extra/wxgtk-u8/FrugalBuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Compiling Time: 1.56 SBU
-# Maintainer: crazy 
-# Contributor: Miklos Nemeth 
-
-pkgname=wxgtk-u8
-pkgver=2.6.4
-pkgrel=3
-pkgdesc="GTK+ implementation of wxWidgets API for GUI unicode'"
-_F_sourceforge_dirname="wxwindows"
-_F_sourceforge_name="wxGTK"
-_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
-url="http://www.wxwidgets.org/"
-source=($source g_free.patch)
-depends=('gtk+2>=2.12.0' 'wxgtk>=2.6.4-3')
-groups=('xlib-extra')
-archs=('i686' 'x86_64')
-options=('scriptlet')
-sha1sums=('f2cad3189b8c5d3b5ca3f8f592bafdb183be7dd2' \
-          'd5526f171231febd957e84574a55a2e2a8cbbfe6')
-## FIXME: this package is not needed at all it could be done as 'subpkg' from wxgtk
-##        or maybe we should use the 'all' tarball and Fsplit things .. -- crazy --
-build()
-{
-	Fcd wxGTK-$pkgver
-	Fbuild  \
-		--enable-unicode \
-		--with-opengl \
-		--enable-geometry \
-		--enable-sound \
-		--with-sdl \
-		--enable-mediactrl \
-		--enable-display \
-		--with-gtk2
-	cd contrib/src
-	Fconf
-	make || Fdie
-	Fmakeinstall
-	## FIXME: this is crap we need some PATH like /usr/lib/u8 or alike for this things -- crazy --
-	Frm /usr/bin/wx-config
-	Frm /usr/bin/wxrc
-	Fln /usr/lib/wx/config/gtk2-unicode-release-2.6 /usr/bin/wx-config-u8
-	Fmv /usr/bin/wxrc-2.6 /usr/bin/wxrc-2.6-u8
-	Fln /usr/bin/wxrc-2.6-u8 /usr/bin/wxrc-u8
-	Frm /usr/include
-	Frm /usr/share/aclocal
-	Frm /usr/share/bakefile
-	Frm /usr/share/locale
-}
-
-# optimization OK
diff --git a/source/xlib-extra/wxgtk-u8/g_free.patch b/source/xlib-extra/wxgtk-u8/g_free.patch
deleted file mode 100644
index ca0fb43..0000000
--- a/source/xlib-extra/wxgtk-u8/g_free.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naurp wxGTK-2.6.4/src/gtk/button.cpp wxGTK-2.6.4-p/src/gtk/button.cpp
---- wxGTK-2.6.4/src/gtk/button.cpp	2007-03-20 16:50:07.000000000 +0100
-+++ wxGTK-2.6.4-p/src/gtk/button.cpp	2007-09-23 01:53:30.000000000 +0200
-@@ -89,7 +89,7 @@ gtk_button_style_set_callback( GtkWidget
-             right_border += default_border->right;
-             top_border += default_border->top;
-             bottom_border += default_border->bottom;
--            g_free( default_border );
-+            gtk_border_free( default_border );
-         }
- #else
-         left_border = 6;
-diff -Naurp wxGTK-2.6.4/src/gtk/window.cpp wxGTK-2.6.4-p/src/gtk/window.cpp
---- wxGTK-2.6.4/src/gtk/window.cpp	2007-03-20 16:50:07.000000000 +0100
-+++ wxGTK-2.6.4-p/src/gtk/window.cpp	2007-09-23 01:53:30.000000000 +0200
-@@ -3273,7 +3273,7 @@ void wxWindowGTK::DoSetSize( int x, int
-                 right_border += default_border->right;
-                 top_border += default_border->top;
-                 bottom_border += default_border->bottom;
--                g_free( default_border );
-+                gtk_border_free( default_border );
-             }
- #else
-             left_border = 6;
From crazy at frugalware.org  Fri Dec  7 09:15:56 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:21 2007
Subject: [Frugalware-git] frugalware-current: wxpython-u8
Message-ID: <20071207081556.898B91190504@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46abc3375328c476ff3de6e8b9490f08a54526d8

commit 46abc3375328c476ff3de6e8b9490f08a54526d8
Author: crazy 
Date:   Wed Dec 5 12:43:32 2007 +0100

wxpython-u8
* removed
* no need to duplicate packages , is called 'subpkg' :)

diff --git a/source/xapps-extra/wxpython-u8/FrugalBuild b/source/xapps-extra/wxpython-u8/FrugalBuild
deleted file mode 100644
index 69a2a20..0000000
--- a/source/xapps-extra/wxpython-u8/FrugalBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: crazy 
-
-pkgname=wxpython-u8
-pkgver=2.6.4.0
-pkgrel=1
-pkgdesc="wxPython GUI toolkit unicode version"
-_F_sourceforge_dirname="wxpython"
-_F_sourceforge_name="wxPython-src"
-_F_sourceforge_ext=".tar.bz2"
-Finclude python sourceforge
-url="http://www.wxpython.org/"
-depends=('wxgtk-u8' 'python>=2.5' 'sdl' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' 'libxfixes' 'libxcb' \
-		'freetype2' 'cairo' 'pango' 'glib2' 'libgcc')
-makedepends=('wxgtk')
-groups=('xapps-extra')
-archs=('x86_64' 'i686')
-sha1sums=('621f529e0a5c3e30d4a750046fd71179567a52f8')
-options=('scriptlet')
-
-build()
-{
-	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"
-	export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	Fcd wxPython-src-$pkgver/wxPython
-	Fsed "cflags.append('-O3')" "pass"  config.py
-	Fmake BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1 UNICODE=1 WX_CONFIG='wx-config-u8'
-	Fmakeinstall BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1 UNICODE=1 WX_CONFIG='wx-config-u8'
-	/usr/bin/rm -rf $Fdestdir/usr/bin $Fdestdir/usr/include $Fdestdir/$_F_python_libdir/wxaddons
-	cd $Fdestdir/$_F_python_libdir
-	/usr/bin/rm -f wxversion.* wx.pth wxPython_common-${pkgver}-py2.5.egg-info wxaddons-${pkgver}-py2.5.egg-info
-}
-
-# optimization OK
From crazy at frugalware.org  Fri Dec  7 09:15:56 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:22 2007
Subject: [Frugalware-git] frugalware-current: wxpython-2.6.4.0-1-i686
Message-ID: <20071207081556.AC12D1190505@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8aaee2b2c77ef7c7dff0b1650c025b880adf6764

commit 8aaee2b2c77ef7c7dff0b1650c025b880adf6764
Author: crazy 
Date:   Wed Dec 5 12:45:35 2007 +0100

wxpython-2.6.4.0-1-i686
* moved to xlib-extra

diff --git a/source/xapps-extra/wxpython/FrugalBuild b/source/xapps-extra/wxpython/FrugalBuild
deleted file mode 100644
index a0d9ebd..0000000
--- a/source/xapps-extra/wxpython/FrugalBuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Compiling Time: 1.20 SBU
-# Maintainer: crazy 
-
-pkgname=wxpython
-pkgver=2.6.4.0
-pkgrel=1
-pkgdesc="wxPython GUI toolkit"
-_F_sourceforge_dirname="$pkgname"
-_F_sourceforge_name="wxPython-src"
-_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
-url="http://www.wxpython.org/"
-depends=('wxgtk' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
-	'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc' 'python>=2.5')
-groups=('xapps-extra')
-options=('scriptlet')
-archs=('x86_64' 'i686')
-sha1sums=('621f529e0a5c3e30d4a750046fd71179567a52f8')
-
-build()
-{
-	Fcd wxPython-src-$pkgver/wxPython
-	Fsed "cflags.append('-O3')" "pass"  config.py
-	export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-	Fmake BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
-	Fmakeinstall BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
-}
-
-# optimization OK
diff --git a/source/xlib-extra/wxpython/FrugalBuild b/source/xlib-extra/wxpython/FrugalBuild
new file mode 100644
index 0000000..d3a0d55
--- /dev/null
+++ b/source/xlib-extra/wxpython/FrugalBuild
@@ -0,0 +1,30 @@
+# Compiling Time: 1.20 SBU
+# Maintainer: crazy 
+
+pkgname=wxpython
+pkgver=2.6.4.0
+pkgrel=1
+pkgdesc="wxPython GUI toolkit"
+_F_sourceforge_dirname="$pkgname"
+_F_sourceforge_name="wxPython-src"
+_F_sourceforge_ext=".tar.bz2"
+Finclude sourceforge
+url="http://www.wxpython.org/"
+depends=('wxgtk' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
+	'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc' 'python>=2.5')
+groups=('xlib-extra')
+options=('scriptlet')
+archs=('x86_64' 'i686')
+sha1sums=('621f529e0a5c3e30d4a750046fd71179567a52f8')
+
+build()
+{
+	Fcd wxPython-src-$pkgver/wxPython
+	Fsed "cflags.append('-O3')" "pass"  config.py
+	export CFLAGS="$CFLAGS -fno-strict-aliasing"
+	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+	Fmake BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
+	Fmakeinstall BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
+}
+
+# optimization OK
From crazy at frugalware.org  Fri Dec  7 09:15:56 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:23 2007
Subject: [Frugalware-git] frugalware-current: drpython-165-2-i686
Message-ID: <20071207081556.DA4BC1190507@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf940149c884392b7cbc7e6ef30511c016c9952a

commit cf940149c884392b7cbc7e6ef30511c016c9952a
Author: crazy 
Date:   Wed Dec 5 13:39:39 2007 +0100

drpython-165-2-i686
* release bump
* rebuild with wxpython

diff --git a/source/xapps-extra/drpython/FrugalBuild b/source/xapps-extra/drpython/FrugalBuild
index 85dc844..42f8daf 100644
--- a/source/xapps-extra/drpython/FrugalBuild
+++ b/source/xapps-extra/drpython/FrugalBuild
@@ -4,9 +4,9 @@

pkgname=drpython
pkgver=165
-pkgrel=1
+pkgrel=2
pkgdesc="DrPython is a highly customizable, extensible editor/environment for the Python programming Language."
-depends=('python' 'wxpython')
+depends=('python' 'wxpython>=2.8.7.1')
makedepends=('unzip')
groups=('xapps-extra')
archs=('i686' 'x86_64')
From crazy at frugalware.org  Fri Dec  7 09:15:56 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:23 2007
Subject: [Frugalware-git] frugalware-current: wxpython-2.8.7.1-1-i686
Message-ID: <20071207081556.D3DA61190506@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=365588a9c3a340070328a4ee9feab5cfbb38c753

commit 365588a9c3a340070328a4ee9feab5cfbb38c753
Author: crazy 
Date:   Wed Dec 5 13:26:06 2007 +0100

wxpython-2.8.7.1-1-i686
* Version bump
* now with -u8 subpkg

diff --git a/source/xlib-extra/wxpython/FrugalBuild b/source/xlib-extra/wxpython/FrugalBuild
index d3a0d55..f88da17 100644
--- a/source/xlib-extra/wxpython/FrugalBuild
+++ b/source/xlib-extra/wxpython/FrugalBuild
@@ -1,30 +1,49 @@
-# Compiling Time: 1.20 SBU
+# Compiling Time: 6.51 SBU
# Maintainer: crazy 

pkgname=wxpython
-pkgver=2.6.4.0
+pkgver=2.8.7.1
pkgrel=1
pkgdesc="wxPython GUI toolkit"
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="wxPython-src"
_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
+Finclude sourceforge python
url="http://www.wxpython.org/"
-depends=('wxgtk' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
-	'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc' 'python>=2.5')
-groups=('xlib-extra')
options=('scriptlet')
+depends=('wxgtk>=2.8.7' 'python>=2.5' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
+	'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc')
+makedepends=('wxgtk-u8>=2.8.7')
+options=('scriptlet')
+groups=('xlib-extra')
archs=('x86_64' 'i686')
-sha1sums=('621f529e0a5c3e30d4a750046fd71179567a52f8')
+
+subpkgs=("$pkgname-u8")
+subdescs=("wxPython GUI toolkit (unicode version)")
+subdepends=("$pkgname=$pkgver wxgtk-u8>=2.8.7")
+subgroups=('xlib-extra')
+subarchs=('i686 x86_64')
+

build()
{
-	Fcd wxPython-src-$pkgver/wxPython
-	Fsed "cflags.append('-O3')" "pass"  config.py
+	Fcd wxPython-src-$pkgver
+	cp -r wxPython wxPython-u8 || Fdie
+	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"
export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-	Fmake BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
-	Fmakeinstall BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1 BUILD_ANIMATE=1
+	wxp_config="BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1"
+	cd wxPython-u8 || Fdie
+	Fsed "cflags.append('-O3')" "pass" config.py
+        Fmake ${wxp_config} UNICODE=1 WX_CONFIG='wx-config-u8'
+        Fmakeinstall  ${wxp_config} UNICODE=1 WX_CONFIG='wx-config-u8'
+        Frm $_F_python_libdir/wxaddons usr/bin usr/include
+	Frm $_F_python_libdir/{wxversion.*,wx.pth,wxPython_common-${pkgver}-py${_F_python_ver}.egg-info,wxaddons-${pkgver}-py${_F_python_ver}.egg-info}
+	Fsplit $pkgname-u8 /usr
+	cd ../wxPython || Fdie
+	Fsed "cflags.append('-O3')" "pass" config.py
+        Fmake ${wxp_config} UNICODE=0 WX_CONFIG='wx-config'
+        Fmakeinstall ${wxp_config} UNICODE=0 WX_CONFIG='wx-config'
}

+sha1sums=('5526ee4c4cc57bcebb4950ea05e24639ef8b02dd')
# optimization OK
From crazy at frugalware.org  Fri Dec  7 09:15:56 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:24 2007
Subject: [Frugalware-git] frugalware-current: audacity-1.3.3-2-i686
Message-ID: <20071207081556.E10891190508@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3824e6b9c54e9084b2edfe56de7aaf03a1988eee

commit 3824e6b9c54e9084b2edfe56de7aaf03a1988eee
Author: crazy 
Date:   Wed Dec 5 14:00:06 2007 +0100

audacity-1.3.3-2-i686
* release bump
* rebuild with wxgtk

diff --git a/source/xapps-extra/audacity/FrugalBuild b/source/xapps-extra/audacity/FrugalBuild
index 506ad8c..7caedcf 100644
--- a/source/xapps-extra/audacity/FrugalBuild
+++ b/source/xapps-extra/audacity/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=audacity
pkgver=1.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="A program that lets you manipulate digital audio waveforms"
Finclude sourceforge
url="http://audacity.sourceforge.net/"
-depends=('wxgtk' 'libvorbis' 'libid3tag' 'libmad' 'libogg' \
+depends=('wxgtk>=2.8.7' 'libvorbis' 'libid3tag' 'libmad' 'libogg' \
'libsamplerate' 'flac>=1.1.3' 'soundtouch' 'alsa-lib')
# TODO: twolame
# FIXME: flac somehow gets disabled
From crazy at frugalware.org  Fri Dec  7 09:15:56 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:25 2007
Subject: [Frugalware-git] frugalware-current: wxexamples-2.6.3.1-2-i686
Message-ID: <20071207081556.EC9BB1190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9029ada2bb6d7fe044dbea6590e07aef6e904965

commit 9029ada2bb6d7fe044dbea6590e07aef6e904965
Author: crazy 
Date:   Wed Dec 5 14:09:39 2007 +0100

wxexamples-2.6.3.1-2-i686
* release bump
* NOTE: this project died ( some desco crap )
* changed source to point to our ftp

diff --git a/source/xapps-extra/wxexamples/FrugalBuild b/source/xapps-extra/wxexamples/FrugalBuild
index 939eaf8..6ff4ce6 100644
--- a/source/xapps-extra/wxexamples/FrugalBuild
+++ b/source/xapps-extra/wxexamples/FrugalBuild
@@ -3,15 +3,16 @@

pkgname=wxexamples
pkgver=2.6.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="wxWidgets examples"
url="http://www.bluelion.hu/"
-depends=('wxgtk')
+depends=('wxgtk>=2.8.7')
options=('scriptlet')
groups=('xapps-extra')
archs=('x86_64' 'i686')
up2date="lynx -dump http://www.bluelion.hu/projects_hu.php|grep 'wxWidgets examples'|sed 's/.*examples.*v\([0-9\.]*\).*/\1/'"
-source=(http://www.bluelion.hu/projects/$pkgname/$pkgname-$pkgver.tar.bz2)
+#source=(http://www.bluelion.hu/projects/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/xapps-extra/wxexamples/wxexamples-2.6.3.1.tar.bz2)
sha1sums=('710b11f8d3b4dd4d7bcf16a9f18de2adf5dfa7fb')

build()
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:25 2007
Subject: [Frugalware-git] frugalware-current: wxmaxima-0.7.3a-2-i686
Message-ID: <20071207081557.010581190503@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bc65ad676770974135e232bc79c1984d32ecc771

commit bc65ad676770974135e232bc79c1984d32ecc771
Author: crazy 
Date:   Wed Dec 5 14:27:06 2007 +0100

wxmaxima-0.7.3a-2-i686
* release bump
* added missing scriptlet option
* rebuild with wxgtk

diff --git a/source/xapps-extra/wxmaxima/FrugalBuild b/source/xapps-extra/wxmaxima/FrugalBuild
index 572e70b..be55be0 100644
--- a/source/xapps-extra/wxmaxima/FrugalBuild
+++ b/source/xapps-extra/wxmaxima/FrugalBuild
@@ -4,13 +4,14 @@

pkgname=wxmaxima
pkgver=0.7.3a
-pkgrel=1
+pkgrel=2
pkgdesc="wxMaxima is a wxWidgets GUI for the computer algebra system Maxima."
Finclude sourceforge
url="http://wxmaxima.sourceforge.net/"
-depends=('maxima>=5.10.0' 'libxml2' 'wxgtk')
+depends=('maxima>=5.10.0' 'libxml2' 'wxgtk>=2.8.7')
groups=('xapps-extra')
archs=('i686' '!x86_64')
+options=('scriptlet')
up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=126731 | grep -m1 tar.gz | sed 's/.*ma-\(.*\).tar.*/\1/'"
source=(${source/wxmaxima-/wxMaxima-})
_F_desktop_name="wxMaxima"
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:26 2007
Subject: [Frugalware-git] frugalware-current: wxpython-2.8.7.1-1-i686
Message-ID: <20071207081557.0D0DF1190509@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a488d9d6384be3a5e482a3b3e9b8bf0b4680e5c5

commit a488d9d6384be3a5e482a3b3e9b8bf0b4680e5c5
Author: crazy 
Date:   Wed Dec 5 17:12:10 2007 +0100

wxpython-2.8.7.1-1-i686
* correct typo in _misc.py

diff --git a/source/xlib-extra/wxpython/FrugalBuild b/source/xlib-extra/wxpython/FrugalBuild
index f88da17..8d21272 100644
--- a/source/xlib-extra/wxpython/FrugalBuild
+++ b/source/xlib-extra/wxpython/FrugalBuild
@@ -14,6 +14,7 @@ options=('scriptlet')
depends=('wxgtk>=2.8.7' 'python>=2.5' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \
'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc')
makedepends=('wxgtk-u8>=2.8.7')
+source=($source wxPython_misc.py-typo-fix.patch)
options=('scriptlet')
groups=('xlib-extra')
archs=('x86_64' 'i686')
@@ -28,6 +29,7 @@ subarchs=('i686 x86_64')
build()
{
Fcd wxPython-src-$pkgver
+	Fpatch wxPython_misc.py-typo-fix.patch
cp -r wxPython wxPython-u8 || Fdie
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"
export CFLAGS="$CFLAGS -fno-strict-aliasing"
@@ -45,5 +47,6 @@ build()
Fmakeinstall ${wxp_config} UNICODE=0 WX_CONFIG='wx-config'
}

-sha1sums=('5526ee4c4cc57bcebb4950ea05e24639ef8b02dd')
+sha1sums=('5526ee4c4cc57bcebb4950ea05e24639ef8b02dd' \
+          'b9ca68fe9ec90090e2e77355c58c4cd7a99a5366')
# optimization OK
diff --git a/source/xlib-extra/wxpython/wxPython_misc.py-typo-fix.patch b/source/xlib-extra/wxpython/wxPython_misc.py-typo-fix.patch
new file mode 100644
index 0000000..dd4a63f
--- /dev/null
+++ b/source/xlib-extra/wxpython/wxPython_misc.py-typo-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur wxPython-src-2.8.7.1/wxPython/wxPython/_misc.py wxPython-src-2.8.7.1-typo-fiX/wxPython/wxPython/_misc.py
+--- wxPython-src-2.8.7.1/wxPython/wxPython/_misc.py	2007-07-19 00:33:59.000000000 +0200
++++ wxPython-src-2.8.7.1-typo-fiX/wxPython/wxPython/_misc.py	2007-12-05 16:18:48.000000000 +0100
+@@ -453,7 +453,7 @@
+ wxDateTime_GetCurrentMonth = wx._misc.DateTime_GetCurrentMonth
+ wxDateTime_IsLeapYear = wx._misc.DateTime_IsLeapYear
+ wxDateTime_GetCentury = wx._misc.DateTime_GetCentury
+-wxDateTime_GetNumberOfDaysinYear = wx._misc.DateTime_GetNumberOfDaysinYear
++wxDateTime_GetNumberOfDaysinYear = wx._misc.DateTime_GetNumberOfDaysInYear
+ wxDateTime_GetNumberOfDaysInMonth = wx._misc.DateTime_GetNumberOfDaysInMonth
+ wxDateTime_GetMonthName = wx._misc.DateTime_GetMonthName
+ wxDateTime_GetWeekDayName = wx._misc.DateTime_GetWeekDayName
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:27 2007
Subject: [Frugalware-git] frugalware-current: bittorrent-5.0.9-2-i686
Message-ID: <20071207081557.23388119050A@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ec05bee0da62b9fd9198d2844952645a2903166

commit 8ec05bee0da62b9fd9198d2844952645a2903166
Author: crazy 
Date:   Wed Dec 5 17:39:24 2007 +0100

bittorrent-5.0.9-2-i686
* release bump
* added an patch to fix wxpy28 detection

diff --git a/source/network-extra/bittorrent/FrugalBuild b/source/network-extra/bittorrent/FrugalBuild
index b27542b..980bac4 100644
--- a/source/network-extra/bittorrent/FrugalBuild
+++ b/source/network-extra/bittorrent/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=bittorrent
pkgver=5.0.9
-pkgrel=1
+pkgrel=2
pkgdesc="A tool for distributing files."
license="BitTorrent OpenSource License"
url="http://www.bittorrent.com/"
@@ -12,16 +12,18 @@ groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://download.bittorrent.com/dl/?M=A |Flasttar"
source=(http://download.bittorrent.com/dl/BitTorrent-$pkgver.tar.gz \
-	bittorrent.{desktop,png} rc.bt{track,seed})
-sha1sums=('9f1b9b66736dac204b19bc5dc13f3dd10158c89c' \
+	bittorrent.{desktop,png} rc.bt{track,seed} \
+	wxpy28.patch)
+sha1sums=('b610c811590aad6ec25fc7b30acb9e0264443121' \
'f7d59dda7e43c3cf23541ed10d4e0754fe0ff6e4' \
'2e27694484fecf0053816b1cd1f6aadee4313e76' \
'c383e7c79974883ca532b3626a58232989a995dc' \
-          '1968244cf87f6c076d392885c40310a7c0b01235')
+          '1968244cf87f6c076d392885c40310a7c0b01235' \
+          '0b0e71713b7b4b186d69ab3f1439ea819fe8c924')

subpkgs=('bittorrent-gui')
subdescs=('GUI versions of the BitTorrent file transfer tool')
-subdepends=("bittorrent=$pkgver-$pkgrel wxpython-u8 pycrypto wxpython")
+subdepends=("bittorrent=$pkgver-$pkgrel wxpython-u8>=2.8.7.1 pycrypto wxpython>=2.8.7.1")
subgroups=('xapps-extra')
subarchs=('i686 x86_64')

diff --git a/source/network-extra/bittorrent/wxpy28.patch b/source/network-extra/bittorrent/wxpy28.patch
new file mode 100644
index 0000000..475c3b5
--- /dev/null
+++ b/source/network-extra/bittorrent/wxpy28.patch
@@ -0,0 +1,12 @@
+diff -Naur BitTorrent-5.0.9/BitTorrent/GUI_wx/__init__.py BitTorrent-5.0.9-p/BitTorrent/GUI_wx/__init__.py
+--- BitTorrent-5.0.9/BitTorrent/GUI_wx/__init__.py	2007-08-04 01:55:42.000000000 +0200
++++ BitTorrent-5.0.9-p/BitTorrent/GUI_wx/__init__.py	2007-12-05 17:29:36.000000000 +0100
+@@ -22,7 +22,7 @@
+ else:
+     # doesn't work in py2exe
+     try:
+-        wxversion.select('2.6')
++        wxversion.select('2.8')
+     except:
+         pass
+
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:27 2007
Subject: [Frugalware-git] frugalware-current: bochs-2.3.5-2-i686
Message-ID: <20071207081557.28CD2119050B@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46322af7daf0b23d1e7ab625c1b0d53b5868f71c

commit 46322af7daf0b23d1e7ab625c1b0d53b5868f71c
Author: crazy 
Date:   Wed Dec 5 19:35:53 2007 +0100

bochs-2.3.5-2-i686
* release bump
* rebuild with wxgtk
* added an patch to fix some compile errors
* added missing scriptlet option

diff --git a/source/xapps-extra/bochs/FrugalBuild b/source/xapps-extra/bochs/FrugalBuild
index 8ddaf3b..fd61240 100644
--- a/source/xapps-extra/bochs/FrugalBuild
+++ b/source/xapps-extra/bochs/FrugalBuild
@@ -3,15 +3,18 @@

pkgname=bochs
pkgver=2.3.5
-pkgrel=1
+pkgrel=2
pkgdesc="A highly portable open source IA-32 (x86) PC emulator."
-depends=('sdl' 'wxgtk' 'libx11' 'libxpm')
+depends=('sdl' 'wxgtk>=2.8.7' 'libx11' 'libxpm')
makedepends=('xproto')
groups=('xapps-extra')
archs=('i686' 'x86_64')
+options=('scriptlet')
Finclude sourceforge
+source=($source  build-fix.patch)
up2date="lynx -dump http://bochs.sourceforge.net/|grep -1 Current|sed -n 's/.*s \(.*\)/\1/;3 p'"
-sha1sums=('854bc37ee621212b6c73f5c5c194a97b6b4369f0')
+sha1sums=('854bc37ee621212b6c73f5c5c194a97b6b4369f0' \
+          '3e37675ce43d953fd801b07b759c4bfd01916db3')

[ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --enable-sse=2 --enable-3dnow --enable-x86-64"

diff --git a/source/xapps-extra/bochs/build-fix.patch b/source/xapps-extra/bochs/build-fix.patch
new file mode 100644
index 0000000..a8173a3
--- /dev/null
+++ b/source/xapps-extra/bochs/build-fix.patch
@@ -0,0 +1,21 @@
+diff -Naur bochs-2.3.5/gui/wx.cc bochs-2.3.5-p/gui/wx.cc
+--- bochs-2.3.5/gui/wx.cc	2006-10-25 19:40:56.000000000 +0200
++++ bochs-2.3.5-p/gui/wx.cc	2007-12-05 18:57:29.000000000 +0100
+@@ -832,9 +832,7 @@
+     case WXK_NUMPAD_UP:            bx_key = BX_KEY_KP_UP;        break;
+     case WXK_NUMPAD_RIGHT:         bx_key = BX_KEY_KP_RIGHT;     break;
+     case WXK_NUMPAD_DOWN:          bx_key = BX_KEY_KP_DOWN;      break;
+-    case WXK_NUMPAD_PRIOR:         bx_key = BX_KEY_KP_PAGE_UP;   break;
+     case WXK_NUMPAD_PAGEUP:        bx_key = BX_KEY_KP_PAGE_UP;   break;
+-    case WXK_NUMPAD_NEXT:          bx_key = BX_KEY_KP_PAGE_DOWN; break;
+     case WXK_NUMPAD_PAGEDOWN:      bx_key = BX_KEY_KP_PAGE_DOWN; break;
+     case WXK_NUMPAD_END:           bx_key = BX_KEY_KP_END;       break;
+     case WXK_NUMPAD_BEGIN:         bx_key = BX_KEY_KP_HOME;      break;
+@@ -860,7 +858,6 @@
+     case 220: bx_key = BX_KEY_BACKSLASH;     break; // \|
+     case 222: bx_key = BX_KEY_SINGLE_QUOTE;  break; // '"
+     case 305: bx_key = BX_KEY_KP_5;          break; // keypad 5
+-    case 392: bx_key = BX_KEY_KP_ADD;        break; // keypad plus
+
+     default:
+       wxLogMessage(wxT ("Unhandled key event: %i (0x%x)"), key, key);
From crazy at frugalware.org  Fri Dec  7 09:15:56 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:28 2007
Subject: [Frugalware-git] frugalware-current: wxgtk-2.8.7-1-i686
Message-ID: <20071207081556.7B5C41190503@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cbd10c45b746c0ab2ae08121edc9064fab855e1a

commit cbd10c45b746c0ab2ae08121edc9064fab855e1a
Author: crazy 
Date:   Wed Dec 5 12:36:25 2007 +0100

wxgtk-2.8.7-1-i686
* Version bump
* now with -u8 subpackage
* added TODO

diff --git a/source/xlib-extra/wxgtk/FrugalBuild b/source/xlib-extra/wxgtk/FrugalBuild
index d27ee48..b18a4e1 100644
--- a/source/xlib-extra/wxgtk/FrugalBuild
+++ b/source/xlib-extra/wxgtk/FrugalBuild
@@ -1,53 +1,89 @@
-# Compiling Time: 2.30 SBU
+# Compiling Time: 15.12 SBU
# Maintainer: crazy 
# Contributor: Miklos Nemeth 

pkgname=wxgtk
-pkgver=2.6.4
-pkgrel=4
+pkgver=2.8.7
+pkgrel=1
pkgdesc="GTK+ implementation of wxWidgets API for GUI'"
_F_sourceforge_dirname="wxwindows"
_F_sourceforge_name="wxGTK"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.wxwidgets.org/"
-source=($source g_free.patch)
-depends=('gtk+2>=2.12.0' 'sdl' 'cppunit')
+# TODO: gst*
+depends=('libdrm' 'sdl' 'gtk+2' 'libgl' 'freetype2' 'libxcb' 'glib2')
groups=('xlib-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
replaces=('wxgtk-devel')
conflicts=('wxgtk-devel')
-sha1sums=('f2cad3189b8c5d3b5ca3f8f592bafdb183be7dd2' \
-          'd5526f171231febd957e84574a55a2e2a8cbbfe6')
+VER="2.8"
+
+subpkgs=("$pkgname-locale" "$pkgname-u8")
+subdescs=('Locale files for wxWidgets' "GTK+ implementation of wxWidgets API for GUI (unicode).")
+subgroups=('locale-extra' 'xlib-extra')
+subdepends=("$pkgname=$pkgver" "$pkgname=$pkgver")
+subarchs=('i686 x86_64' 'i686 x86_64')
+
+
+wx_compile()
+{
+	make || Fdie
+	Fmakeinstall
+	cd contrib/src || Fdie
+	Fconf
+        make || Fdie
+	Fmakeinstall
+	cd ../.. || Fdie
+}

-subpkgs=("$pkgname-locale")
-subdescs=('Locale files for wxWidgets')
-subgroups=('locale-extra')
-subdepends=("$pkgname=$pkgver")
-subarchs=('i686 x86_64')

build()
{
-	Fcd wxGTK-$pkgver
-	Fbuild  \
-		--disable-unicode \
-		--with-opengl \
+	cd $Fsrcdir || Fdie
+	export CFLAGS="$CFLAGS -fno-strict-aliasing"
+	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+	cp -r wxGTK-$pkgver wxGTK-$pkgver-u8 || Fdie
+	## TODO: figure|enable more things
+	wxconfig="--with-opengl \
--enable-geometry \
+		--enable-timer \
--enable-sound \
--with-sdl \
+		--enable-graphics_ctx \
--enable-mediactrl \
--enable-display \
-		--with-gtk2
-	cd contrib/src
-	Fconf
-	make || Fdie
-	Fmakeinstall
-	Frm /usr/bin/wx-config
-	Fln /usr/lib/wx/config/gtk2-ansi-release-2.6 /usr/bin/wx-config
-
+		--enable-plugins \
+		--enable-compat24"
+	## Unicode one
+	cd wxGTK-$pkgver-u8 || Fdie
+	Fpatchall
+	autoconf || Fdie
+	Fconf \
+		${wxconfig} \
+		--enable-unicode
+	wx_compile
+	Frm usr/lib/wx/${VER}
+	## This is still not a solution ...
+	Frm usr/include usr/share/aclocal usr/share/bakefile usr/share/locale usr/bin/wx-config usr/bin/wxrc
+	Fln /usr/lib/wx/config/gtk2-unicode-release-${VER} /usr/bin/wx-config-u8
+	Fmv /usr/bin/wxrc-${VER} /usr/bin/wxrc-${VER}-u8
+	Fln /usr/bin/wxrc-${VER}-u8 /usr/bin/wxrc-u8
+	Fsplit $pkgname-u8 /usr
+	## Normal build
+	cd ../wxGTK-$pkgver
+	Fpatchall
+	autoconf || Fdie
+	Fconf \
+                ${wxconfig} \
+                --disable-unicode
+        wx_compile
+	Frm usr/bin/wx-config
+	Fln /usr/lib/wx/config/gtk2-ansi-release-${VER} /usr/bin/wx-config
+	## lang stuff ( why is this split anyway ? )
Fsplit $pkgname-locale usr/share/locale
-
}

+sha1sums=('07247cce8f6602ab532666b766c15bf3c7cdea3f')
# optimization OK
diff --git a/source/xlib-extra/wxgtk/g_free.patch b/source/xlib-extra/wxgtk/g_free.patch
deleted file mode 100644
index ca0fb43..0000000
--- a/source/xlib-extra/wxgtk/g_free.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naurp wxGTK-2.6.4/src/gtk/button.cpp wxGTK-2.6.4-p/src/gtk/button.cpp
---- wxGTK-2.6.4/src/gtk/button.cpp	2007-03-20 16:50:07.000000000 +0100
-+++ wxGTK-2.6.4-p/src/gtk/button.cpp	2007-09-23 01:53:30.000000000 +0200
-@@ -89,7 +89,7 @@ gtk_button_style_set_callback( GtkWidget
-             right_border += default_border->right;
-             top_border += default_border->top;
-             bottom_border += default_border->bottom;
--            g_free( default_border );
-+            gtk_border_free( default_border );
-         }
- #else
-         left_border = 6;
-diff -Naurp wxGTK-2.6.4/src/gtk/window.cpp wxGTK-2.6.4-p/src/gtk/window.cpp
---- wxGTK-2.6.4/src/gtk/window.cpp	2007-03-20 16:50:07.000000000 +0100
-+++ wxGTK-2.6.4-p/src/gtk/window.cpp	2007-09-23 01:53:30.000000000 +0200
-@@ -3273,7 +3273,7 @@ void wxWindowGTK::DoSetSize( int x, int
-                 right_border += default_border->right;
-                 top_border += default_border->top;
-                 bottom_border += default_border->bottom;
--                g_free( default_border );
-+                gtk_border_free( default_border );
-             }
- #else
-             left_border = 6;
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:29 2007
Subject: [Frugalware-git] frugalware-current: xchm-1.13-2-i686
Message-ID: <20071207081557.2F1D2119050C@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8be871a3588c6a998b2b941254e15f47ea08b8d5

commit 8be871a3588c6a998b2b941254e15f47ea08b8d5
Author: crazy 
Date:   Wed Dec 5 19:47:20 2007 +0100

xchm-1.13-2-i686
* release bump
* rebuild with wxgtk
* added missing scriptlet option
* while at it fixed aliasing bug

diff --git a/source/xapps-extra/xchm/FrugalBuild b/source/xapps-extra/xchm/FrugalBuild
index 893c881..1709cdb 100644
--- a/source/xapps-extra/xchm/FrugalBuild
+++ b/source/xapps-extra/xchm/FrugalBuild
@@ -3,14 +3,16 @@

pkgname=xchm
pkgver=1.13
-pkgrel=1
+pkgrel=2
pkgdesc="A cross-platform GUI front-end to chmlib."
-depends=('chmlib' 'wxgtk')
+depends=('chmlib' 'wxgtk>=2.8.7')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-_F_sourceforge_prefix=xchm-
+_F_sourceforge_prefix="xchm-"
+options=('scriptlet')
Finclude sourceforge
-
sha1sums=('f062f584c9fd00107e28d96342d48ea36b2f2f49')
+export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
# optimization OK
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:30 2007
Subject: [Frugalware-git] frugalware-current: amule-2.1.3-10-i686
Message-ID: <20071207081557.37080119050D@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=667268b2e94bc5ae2088af4c211050e3ff8ec033

commit 667268b2e94bc5ae2088af4c211050e3ff8ec033
Author: crazy 
Date:   Wed Dec 5 22:51:05 2007 +0100

amule-2.1.3-10-i686
* release bump
* added an patch to fix compile errors with wxgtk >=2.8*
* enabled a lot missing options
* depends() fix

diff --git a/source/xapps-extra/amule/FrugalBuild b/source/xapps-extra/amule/FrugalBuild
index 008bcd7..2222522 100644
--- a/source/xapps-extra/amule/FrugalBuild
+++ b/source/xapps-extra/amule/FrugalBuild
@@ -3,21 +3,29 @@

pkgname=amule
pkgver=2.1.3
-pkgrel=9
+pkgrel=10
pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network."
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="aMule"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.amule.org/"
-depends=('wxgtk>=2.6.4' 'libxxf86vm' 'binutils=2.18.50.0.2')
+source=($source aMule-wx.patch)
+depends=('wxgtk>=2.8.7' 'libxxf86vm' 'binutils=2.18.50.0.2' 'gd' 'curl')
up2date="lynx -dump $url/files/files.php?cat=6 | grep Latest | tail -n 1 | cut -d ' ' -f 10"
license="GPL2"
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
+Fconfopts="$Fconfopts --enable-cas --enable-wxcas \
+	--enable-amulecmd --enable-amulecmdgui \
+	--enable-webserver --enable-webservergui \
+	--enable-kad-compile --enable-amule-daemon \
+	--enable-alc --enable-alcc \
+	--enable-ccache --disable-debug"
_F_cd_path="aMule-$pkgver"
-sha1sums=('dd47deb38e7a5b823550b85150f5a814c597b273')
+sha1sums=('dd47deb38e7a5b823550b85150f5a814c597b273' \
+          'bd048f7b88ff4c19841f606d03c5a9750e6e6945')
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"

# optimization OK
diff --git a/source/xapps-extra/amule/aMule-wx.patch b/source/xapps-extra/amule/aMule-wx.patch
new file mode 100644
index 0000000..8148d35
--- /dev/null
+++ b/source/xapps-extra/amule/aMule-wx.patch
@@ -0,0 +1,156 @@
+diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp
+--- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp	2005-12-16 13:09:29.000000000 +0100
++++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp	2006-12-17 20:20:47.151203000 +0100
+@@ -297,7 +297,7 @@
+ 	m_validateButton =
+ 	    new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
+ 	m_cancelButton =
+-	    new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) );
++	    new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
+
+ 	m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
+ 	m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
+@@ -321,7 +321,6 @@
+ EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
+ EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
+ EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
+-EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel )       	// Defined in wxDialog
+ EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
+ EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
+ END_EVENT_TABLE ()
+--- aMule/src/utils/wxCas/src/wxcasprefs.h.org	2006-12-17 22:17:39.017417250 +0100
++++ aMule/src/utils/wxCas/src/wxcasprefs.h	2006-12-17 22:18:17.611829250 +0100
+@@ -101,8 +101,7 @@
+ 	    ID_AUTOSTATIMG_COMBO,
+ 	    ID_AUTOSTATIMG_BROWSE_BUTTON,
+ 	    ID_FTP_UPDATE_CHECK,
+-	    ID_VALIDATE_BUTTON,
+-	    ID_CANCEL_BUTTON
++	    ID_VALIDATE_BUTTON
+ 	};
+
+ protected:
+--- aMule/src/MuleGifCtrl.cpp	2006-02-03 20:14:05.000000000 +0100
++++ aMule/src/MuleGifCtrl.cpp	2006-11-19 19:35:33.000000000 +0100
+@@ -24,7 +24,6 @@
+
+ #include 
+ #include 
+-#include 
+ #include 
+
+ #include "MuleGifCtrl.h"
+@@ -35,6 +34,50 @@
+ 	EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
+ END_EVENT_TABLE()
+
++#if wxCHECK_VERSION(2, 7, 1)
++// Wrapper that emulates old wxGIFDecoder API
++
++class MuleGIFDecoder : public wxGIFDecoder {
++public:
++	MuleGIFDecoder(wxInputStream* stream, bool dummy) {
++		m_stream = stream;
++		dummy = dummy; // Unused.
++		m_nframe = 0;
++	}
++
++	~MuleGIFDecoder() { /* don't delete the stream! */ }
++
++	wxGIFErrorCode ReadGIF() {
++		return LoadGIF(*m_stream);
++	}
++
++	void GoFirstFrame() { m_nframe = 0; }
++	void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
++	void GoLastFrame() { m_nframe = GetFrameCount(); }
++
++	void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
++
++	size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
++	size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
++
++	size_t	GetLeft() { return 0; }
++	size_t	GetTop() { return 0; }
++
++	long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
++
++private:
++	uint32_t m_nframe;
++	wxInputStream* m_stream;
++};
++
++#else
++class MuleGIFDecoder : public wxGIFDecoder {
++public:
++	MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
++};
++#endif
++
++
+
+ MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
+                           const wxSize& size, long style, const wxValidator& validator,
+@@ -66,7 +109,7 @@
+ 	}
+
+   	wxMemoryInputStream stream(data, size);
+-  	m_decoder = new wxGIFDecoder(&stream, TRUE);
++  	m_decoder = new MuleGIFDecoder(&stream, TRUE);
+   	if ( m_decoder->ReadGIF() != wxGIF_OK ) {
+    		delete m_decoder;
+    		m_decoder = NULL;
+@@ -137,3 +180,4 @@
+ 	dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
+ }
+
++// File_checked_for_headers
+--- aMule/src/MuleGifCtrl.h	2006-01-01 06:17:25.000000000 +0100
++++ aMule/src/MuleGifCtrl.h	2006-11-18 05:01:22.000000000 +0100
+@@ -27,11 +27,10 @@
+
+ #include 
+ #include 
+-#include 
+
+ const int GIFTIMERID = 271283;
+
+-class wxGIFDecoder;
++class MuleGIFDecoder;
+ class wxBitmap;
+
+ /**
+@@ -121,7 +120,7 @@
+ 	void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
+
+ 	//! A pointer to the current gif-animation.
+-	wxGIFDecoder*	m_decoder;
++	MuleGIFDecoder*	m_decoder;
+ 	//! Timer used for the delay between each frame.
+ 	wxTimer			m_timer;
+ 	//! Current frame.
+@@ -133,3 +132,4 @@
+
+ #endif
+
++// File_checked_for_headers
+--- aMule-2.1.3/src/MuleTextCtrl.cpp~	2006-12-17 20:55:37.157820250 +0100
++++ aMule-2.1.3/src/MuleTextCtrl.cpp	2006-12-17 20:56:21.328580750 +0100
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+
+ /**
+  * These are the IDs used to identify the different menu-items.
+--- amule/src/amule.cpp~	2006-12-17 21:53:26.474639000 +0100
++++ amule/src/amule.cpp	2006-12-17 21:55:40.307003000 +0100
+@@ -96,6 +96,7 @@
+ 		#include 
+ 		#include 
+ 	#endif
++	#include 
+ #endif
+
+
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:30 2007
Subject: [Frugalware-git] frugalware-current: wxsqlite3-1.8.1-1-i686
Message-ID: <20071207081557.92C821190505@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2044ee0ec7e3cbd9c000a1e852cd8bddc7d626d4

commit 2044ee0ec7e3cbd9c000a1e852cd8bddc7d626d4
Author: crazy 
Date:   Wed Dec 5 23:11:57 2007 +0100

wxsqlite3-1.8.1-1-i686
* Version bump

diff --git a/source/xlib-extra/wxsqlite3/FrugalBuild b/source/xlib-extra/wxsqlite3/FrugalBuild
index 82e8f01..9b024a8 100644
--- a/source/xlib-extra/wxsqlite3/FrugalBuild
+++ b/source/xlib-extra/wxsqlite3/FrugalBuild
@@ -2,10 +2,10 @@
# Maintainer: Miklos Nemeth 

pkgname=wxsqlite3
-pkgver=1.7.3
+pkgver=1.8.1
pkgrel=1
pkgdesc="wxSQLite3 is a C++ wrapper around the public domain SQLite 3.x database"
-depends=('sqlite3' 'wxgtk')
+depends=('sqlite3' 'wxgtk>=2.8.7')
groups=('xlib-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
@@ -13,9 +13,8 @@ _F_sourceforge_dirname="wxcode"
Finclude sourceforge
url="http://wxcode.sourceforge.net/components/wxsqlite3/"
up2date="lynx -dump http://wxcode.sourceforge.net/components/wxsqlite3/ | grep Latest | sed 's/.*n: \([0-9.]*\) B.*/\1/'"
-_F_cd_path="$pkgname"
Fconfopts="$Fconfopts --with-sqlite3-prefix=/usr"
-sha1sums=('ead53f4a2958ce6fc1096af93f8ce52b7e1299b8')
+sha1sums=('a62d12ab0ec1b47a3cbf9b8d34259d4b1e91d26e')
unset MAKEFLAGS

# optimization OK
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:31 2007
Subject: [Frugalware-git] frugalware-current: poedit-1.3.7-3-i686
Message-ID: <20071207081557.41A121190504@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5deb05be2a258162054b53bdc477d8057acf49ca

commit 5deb05be2a258162054b53bdc477d8057acf49ca
Author: crazy 
Date:   Wed Dec 5 23:05:29 2007 +0100

poedit-1.3.7-3-i686
* release bump
* rebuild with wxgtk
* added missing scriptlet option

diff --git a/source/xlib-extra/poedit/FrugalBuild b/source/xlib-extra/poedit/FrugalBuild
index 0adbcfc..c9d69b8 100644
--- a/source/xlib-extra/poedit/FrugalBuild
+++ b/source/xlib-extra/poedit/FrugalBuild
@@ -3,14 +3,15 @@

pkgname=poedit
pkgver=1.3.7
-pkgrel=2
+pkgrel=3
pkgdesc="cross-platform gettext catalogs (.po files) editor"
url="http://www.poedit.org/"
license="MIT"
+options=('scriptlet')
Finclude sourceforge
groups=('xlib-extra')
archs=('i686' 'x86_64')
-depends=('wxgtk-u8>=2.4.1' 'gtkspell>=2.0' 'db>=4.6.18' 'zip')
+depends=('wxgtk-u8>=2.8.7' 'gtkspell>=2.0' 'db>=4.6.18' 'zip')

build() {
Fsed '-ldb"' '-ldb -lpthread"' admin/berkeley_db.m4
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:32 2007
Subject: [Frugalware-git] frugalware-current: wxstedit-1.2.4-2-i686
Message-ID: <20071207081557.9E6EB1190507@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a3556d9e68847fda10a1f87521b0a6684298842b

commit a3556d9e68847fda10a1f87521b0a6684298842b
Author: crazy 
Date:   Wed Dec 5 23:30:55 2007 +0100

wxstedit-1.2.4-2-i686
* release bump
* rebuild with wxgtk
* added missing Fdie , scriptlet option
* added workaround for SMP builds

diff --git a/source/xlib-extra/wxstedit/FrugalBuild b/source/xlib-extra/wxstedit/FrugalBuild
index c4f2327..68ff989 100644
--- a/source/xlib-extra/wxstedit/FrugalBuild
+++ b/source/xlib-extra/wxstedit/FrugalBuild
@@ -3,22 +3,23 @@

pkgname=wxstedit
pkgver=1.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="wxStyledTextCtrl wrapper around the Scintilla text editor widget"
url="http://wxcode.sourceforge.net/components/wxstedit/"
-depends=('wxgtk')
+depends=('wxgtk>=2.8.7')
groups=('xlib-extra')
archs=('i686' 'x86_64')
_F_sourceforge_dirname=wxcode
-#_F_sourceforge_ext=.zip
+options=('scriptlet')
Finclude sourceforge
up2date="lynx -dump http://wxcode.sourceforge.net/showcomp.php?name=wxStEdit | grep Latest | sed 's/.*n: \([0-9.]*\) B.*/\1/'"
sha1sums=('d0c7a0240f1c5d92a6678d46301e0717d14e7fa8')
+unset MAKEFLAGS

build()
{
Fcd
-    mv include/wx/stedit/setup0.h include/wx/stedit/setup.h
+    mv include/wx/stedit/setup0.h include/wx/stedit/setup.h || Fdie
Fbuild
}
# optimization OK
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:35 2007
Subject: [Frugalware-git] frugalware-current: wxxml2-1.8-1-i686
Message-ID: <20071207081557.A78471190506@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b538df84169b92dae619b22ab0b534e2205f7564

commit b538df84169b92dae619b22ab0b534e2205f7564
Author: crazy 
Date:   Wed Dec 5 23:45:19 2007 +0100

wxxml2-1.8-1-i686
* Version bump
* removed whole build() , not needed
* removed patch , in upstream
* added missing scriptlet option

diff --git a/source/xlib-extra/wxxml2/FrugalBuild b/source/xlib-extra/wxxml2/FrugalBuild
index 80f5ea1..f0e7713 100644
--- a/source/xlib-extra/wxxml2/FrugalBuild
+++ b/source/xlib-extra/wxxml2/FrugalBuild
@@ -2,30 +2,21 @@
# Maintainer: Miklos Nemeth 

pkgname=wxxml2
-pkgver=1.6
+pkgver=1.8
pkgrel=1
pkgdesc="xml2 class for wxWidgets framework"
_F_sourceforge_dirname="wxcode"
Finclude sourceforge
url="http://wxcode.sourceforge.net/components/wxxml2/"
-depends=('wxgtk' 'libxml2')
-makedepends=('wxgtk-devel' 'sdl')
+depends=('wxgtk>=2.8.7' 'libxml2')
+makedepends=('sdl')
+options=('scriptlet')
groups=('xlib-extra')
archs=('i686' 'x86_64')
+_F_cd_path="$pkgname"
up2date="lynx -dump $url | grep Latest | sed 's/.*: \([0-9\.]*\) B.*/\1/'"
-source=(${source/$pkgname-$pkgver/$pkgname} \
-        wxxml2-precisionfix.diff)
-sha1sums=('4ecbd61e7563c3500738ee0c9908bac1c6f11eb9' \
-	  '649d459874e46b2079c84c50221824506569bfb7')
+source=(${source/$pkgname-$pkgver/$pkgname})
+sha1sums=('ab07182d6edee520c0af172a23ab3e6737015e24')

-build()
-{
-    patch -Np0 -i "$Fsrcdir/wxxml2-precisionfix.diff"
-    cd wxxml2/build
-    Facu
-    autoconf
-    Fmake
-    Fmakeinstall
-}

-# optimalization ok
+# optimization OK
diff --git a/source/xlib-extra/wxxml2/wxxml2-precisionfix.diff b/source/xlib-extra/wxxml2/wxxml2-precisionfix.diff
deleted file mode 100644
index 8d68a76..0000000
--- a/source/xlib-extra/wxxml2/wxxml2-precisionfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wxxml2.orig/src/xml2.cpp wxxml2/src/xml2.cpp
---- wxxml2.orig/src/xml2.cpp	2005-08-10 10:15:08.000000000 +0000
-+++ wxxml2/src/xml2.cpp	2006-04-17 02:42:18.000000000 +0000
-@@ -916,7 +916,7 @@
- bool wxXml2Document::operator==(const wxXml2Document &doc) const
- {
- 	// check for null pointers
--	if ((int)doc.GetObj() ^ (int)GetObj())
-+	if ((long)doc.GetObj() ^ (long)GetObj())
- 		return FALSE;
- 	if (GetRoot() == doc.GetRoot())
- 		return TRUE;
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:35 2007
Subject: [Frugalware-git] frugalware-current: gpac-0.4.4-3-i686
Message-ID: <20071207081557.B0FE6119050E@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=caea772e8624d8197ae4eeb7573130cfbdf482bc

commit caea772e8624d8197ae4eeb7573130cfbdf482bc
Author: crazy 
Date:   Thu Dec 6 00:01:33 2007 +0100

gpac-0.4.4-3-i686
* release bump
* rebuild with wxgtk
* added missing scriptlet option
* added workaround for SMP builds
* while at it fixed url bug

diff --git a/source/xmultimedia-extra/gpac/FrugalBuild b/source/xmultimedia-extra/gpac/FrugalBuild
index c792abd..3bd1840 100644
--- a/source/xmultimedia-extra/gpac/FrugalBuild
+++ b/source/xmultimedia-extra/gpac/FrugalBuild
@@ -3,16 +3,17 @@

pkgname=gpac
pkgver=0.4.4
-pkgrel=2
+pkgrel=3
pkgdesc="GPAC is a multimedia framework based on the MPEG-4 Systems standard."
-url="http://gpac.sourceforge.net/"
-depends=('wxgtk' 'libgcc' 'openssl' 'ffmpeg' 'libmad' 'freeglut')
+depends=('wxgtk>=2.8.7' 'libgcc' 'openssl' 'ffmpeg' 'libmad' 'freeglut')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
+options=('scriptlet')
Finclude sourceforge
up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=84101 |grep tar.gz |sed -ne 's/.*c-\(.*\).tar.*/\1/;s/-/_/;1p'"

build(){
+	unset MAKEFLAGS
Fcd $pkgname
chmod +x configure || Fdie
Fsed "-O3" "$CFLAGS" configure
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:36 2007
Subject: [Frugalware-git] frugalware-current: picard-0.7.2-3-i686
Message-ID: <20071207081557.B8F89119050F@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=16b7a421f2b2c746eef00ef820fc668f5ee19cfa

commit 16b7a421f2b2c746eef00ef820fc668f5ee19cfa
Author: crazy 
Date:   Thu Dec 6 00:21:30 2007 +0100

picard-0.7.2-3-i686
* release bump
* added an patch to fix wxpy28 detection
* fixed strip bug , krixI :P
* added missing scriptlet option

diff --git a/source/xmultimedia-extra/picard/FrugalBuild b/source/xmultimedia-extra/picard/FrugalBuild
index c2871c6..3e0bae6 100644
--- a/source/xmultimedia-extra/picard/FrugalBuild
+++ b/source/xmultimedia-extra/picard/FrugalBuild
@@ -3,19 +3,22 @@

pkgname=picard
pkgver=0.7.2
-pkgrel=2
+pkgrel=3
pkgdesc="The next generation MusicBrainz tagger"
url="http://musicbrainz.org/products/picard/"
depends=('python-ctypes' 'python-musicbrainz2' 'libtunepimp-python>=0.5.3' 'libmusicbrainz' \
-	'wxpython' 'wxgtk')
+	'wxpython>=2.8.7.1' 'wxgtk>=2.8.7')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
+options=('nostrip' 'scriptlet')
up2date="lynx -dump 'http://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/?C=M;O=D'|grep $pkgname.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'"
-source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('4046bcaf3b481c13f7bcbb2f2a858eacdbba1184')
+source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/$pkgname-$pkgver.tar.gz wxpy28.patch)
+sha1sums=('4046bcaf3b481c13f7bcbb2f2a858eacdbba1184' \
+          'f81e2aa7c52b351a7425fca1d8276c4558d2fc06')

build() {
Fcd
+	Fpatchall
# Need a patch from svn to run with libtunepimp 0.4 (autofinger disabled :( )
python setup.py install --prefix "$Fprefix" --root "$Fdestdir" || Fdie
# Wrapper fixup
diff --git a/source/xmultimedia-extra/picard/wxpy28.patch b/source/xmultimedia-extra/picard/wxpy28.patch
new file mode 100644
index 0000000..67b8f42
--- /dev/null
+++ b/source/xmultimedia-extra/picard/wxpy28.patch
@@ -0,0 +1,12 @@
+diff -Naur picard-0.7.2/picard/tagger.py picard-0.7.2-p/picard/tagger.py
+--- picard-0.7.2/picard/tagger.py	2006-10-24 22:39:42.000000000 +0200
++++ picard-0.7.2-p/picard/tagger.py	2007-12-06 00:10:55.000000000 +0100
+@@ -54,7 +54,7 @@
+
+ try:
+     import wxversion
+-    wxversion.select(["2.6", "2.7"])
++    wxversion.select(["2.6", "2.7" , "2.8"])
+ except:
+     pass
+
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:36 2007
Subject: [Frugalware-git] frugalware-current: vlc-0.8.6-8-i686
Message-ID: <20071207081557.C2D731190510@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb5f52395f2330ccfadd2a86d56e9feb883e7f8e

commit bb5f52395f2330ccfadd2a86d56e9feb883e7f8e
Author: crazy 
Date:   Thu Dec 6 02:30:09 2007 +0100

vlc-0.8.6-8-i686
* Version bump to patchlevel 'd'
* also this one builds with new wxgtk without hacks
* volume button is still ugly but .. heh
* fixed aliasing bug
* replaced old deprecated livedotcom configure options with
* new ones

diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild
index 01a994e..b1001a2 100644
--- a/source/xmultimedia-extra/vlc/FrugalBuild
+++ b/source/xmultimedia-extra/vlc/FrugalBuild
@@ -3,12 +3,12 @@

pkgname=vlc
pkgver=0.8.6
-pkgextraver=c
-pkgrel=7
+pkgextraver=d
+pkgrel=8
pkgdesc="The cross-platform media player and streaming server."
url="http://www.videolan.org/vlc/"
depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \
-	 'mpeg2dec' 'ffmpeg>=20070422' 'fribidi' 'wxgtk-u8' 'live' 'speex' 'libdca' \
+	 'mpeg2dec' 'ffmpeg>=20070422' 'fribidi' 'wxgtk-u8>=2.8.7' 'live' 'speex' 'libdca' \
'sysfsutils' 'mesa' 'libdvbpsi' 'libxv' 'sdlimage' 'libcdio' \
'libid3tag' 'libtheora' 'faad2' 'xvidcore')
## WARNING: do NOT add any VCD option to build its kill off the GUI
@@ -19,15 +19,16 @@ archs=('i686' 'x86_64')
up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'"
source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \
$pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff libdca.patch)
-sha1sums=('aefaf7a039874930b3e7caf139d2ed5b5bbd0a56'\
-          '888a02c9f81331fce1f6ee5f705ce68e5b486ffd'\
-          '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0'\
-          '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5'\
+sha1sums=('63afd15cc782795c8d8f3de5edc614389465c577' \
+          '888a02c9f81331fce1f6ee5f705ce68e5b486ffd' \
+          '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \
+          '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5' \
'edc3a14dfd9b022dca7593e006c324fa5cc17e48')

build()
{
Fpatchall
+	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
Fsed 'mozilla-config' 'firefox-config' configure.ac
Fsed 'firefox-config\.h' 'mozilla-config\.h' configure.ac
Fsed '/usr/lib/mozilla' '/usr/lib/firefox' configure.ac
@@ -47,8 +48,8 @@ build()
--enable-mozilla \
--enable-v4l \
--enable-realrtsp \
-		--enable-livedotcom \
-		--with-livedotcom-tree=/usr/lib/live \
+		--enable-live555 \
+		--with-live555-tree=/usr/lib/live \
--enable-speex \
--enable-wxwidgets \
--with-wx-config=wx-config-u8 \
From crazy at frugalware.org  Fri Dec  7 09:15:57 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:37 2007
Subject: [Frugalware-git] frugalware-current: bittornado-0.3.18-2-i686
Message-ID: <20071207081557.E903C1190511@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7741e3ccac265a4142fe36d7728c4f37d0adae67

commit 7741e3ccac265a4142fe36d7728c4f37d0adae67
Author: crazy 
Date:   Thu Dec 6 02:44:56 2007 +0100

bittornado-0.3.18-2-i686
* release bump
* rebuild with wxpy28
* s/build()/_F_cd_path/
* added missing scritplet option

diff --git a/source/xapps-extra/bittornado/FrugalBuild b/source/xapps-extra/bittornado/FrugalBuild
index f0c9ff8..aa2b8a6 100644
--- a/source/xapps-extra/bittornado/FrugalBuild
+++ b/source/xapps-extra/bittornado/FrugalBuild
@@ -3,20 +3,16 @@

pkgname=bittornado
pkgver=0.3.18
-pkgrel=1
+pkgrel=2
pkgdesc="Experimental bittorrent client"
url="http://www.bittornado.com/"
-depends=('wxpython')
+depends=('wxpython>=2.8.7.1')
+options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.bittornado.com/download.html | grep 'http.*tar\.gz' | sed 's/.*-\([0-9\.]\+\)\.tar.*/\1/;q'"
source=(http://download2.bittornado.com/download/BitTornado-$pkgver.tar.gz)
+_F_cd_path="BitTornado-CVS"
sha1sums=('64c65b69d112f76ba8a024ff5b8671058130b71a')

-build()
-{
-	Fcd BitTornado-CVS
-	Fbuild
-}
-
# optimization OK - noarch
From crazy at frugalware.org  Fri Dec  7 09:15:59 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:37 2007
Subject: [Frugalware-git] frugalware-current: wxglade-0.6.1-1-i686
Message-ID: <20071207081559.499C31190502@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bae6a1f6cc3ef1b495051efeb1089a0387e8329c

commit bae6a1f6cc3ef1b495051efeb1089a0387e8329c
Author: crazy 
Date:   Thu Dec 6 03:44:56 2007 +0100

wxglade-0.6.1-1-i686
* Version bump

diff --git a/source/xapps-extra/wxglade/FrugalBuild b/source/xapps-extra/wxglade/FrugalBuild
index 4c7fa34..55a11ea 100644
--- a/source/xapps-extra/wxglade/FrugalBuild
+++ b/source/xapps-extra/wxglade/FrugalBuild
@@ -2,20 +2,19 @@
# Maintainer: Miklos Nemeth 

pkgname=wxglade
-pkgver=0.4.1
-pkgrel=3
+pkgver=0.6.1
+pkgrel=1
pkgdesc="Glade like GUI designer for wxWidgets"
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="wxGlade"
Finclude sourceforge python
-url="http://wxglade.sf.net/"
-depends=('wxpython')
+depends=('wxpython>=2.8.7.1')
groups=('xapps-extra')
archs=('x86_64' 'i686')
-up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=58225 |grep wxGlade-[0-9\.]*.tar.gz |sed -n 's/.*-\([0-9\.]*\)\.t.*/\1/; 1 p'"
+options=('scriptlet' 'nostrip')
source=($source wxglade.xpm)
-sha1sums=('5955872b1d868a92733afc1f8bc328d81ba3c2e5' \
-	  'b1f5b576a55cf8de6a9131b85e510b230c05c4e0')
+sha1sums=('59b1afb803ccfadd1d27caeaefca7e030eb107ab' \
+          'b1f5b576a55cf8de6a9131b85e510b230c05c4e0')


build()
@@ -27,4 +26,3 @@ build()
cp -a wxglade.xpm $Fdestdir/usr/share/pixmaps
}

-# optimalization ok
From crazy at frugalware.org  Fri Dec  7 09:15:58 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:38 2007
Subject: [Frugalware-git] frugalware-current: tovid-0.30-3-i686
Message-ID: <20071207081558.4EAE71190513@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=67c29029ea49454f189469b891cb0321e90d1e95

commit 67c29029ea49454f189469b891cb0321e90d1e95
Author: crazy 
Date:   Thu Dec 6 03:20:58 2007 +0100

tovid-0.30-3-i686
* release bump
* rebuild with wypy28
* depends() fix , this one need the unicode version

diff --git a/source/xapps-extra/tovid/FrugalBuild b/source/xapps-extra/tovid/FrugalBuild
index 8aa1667..6ec4d75 100644
--- a/source/xapps-extra/tovid/FrugalBuild
+++ b/source/xapps-extra/tovid/FrugalBuild
@@ -4,18 +4,20 @@

pkgname=tovid
pkgver=0.30
-pkgrel=2
+pkgrel=3
pkgdesc="Tovid is a collection of video disc authoring tools"
license="GPL"
-depends=('wxpython' 'mplayer>=1.0rc1-7' 'mjpegtools>=1.9.0rc2' 'ffmpeg>=20070422' 'imagemagick' 'txt2tags' \
+depends=('wxpython-u8>=2.8.7.1' 'mplayer>=1.0rc1-7' 'mjpegtools>=1.9.0rc2' 'ffmpeg>=20070422' 'imagemagick' 'txt2tags' \
'normalize' 'dvdauthor' 'vcdimager' 'libdvdcss' 'lsdvd' 'transcode>=1.0.2-5' 'sox' 'cdrdao')
archs=('i686')
groups=('xapps-extra')
options=('scriptlet')
_F_sourceforge_prefix="$pkgname "
Finclude sourceforge
+source=($source wxpy28.patch)
url="http://tovid.wikia.com/wiki/Main_Page"
-sha1sums=('70259c55a7da3b9a98fe8136470f5770d0923732')
+sha1sums=('70259c55a7da3b9a98fe8136470f5770d0923732' \
+          'c4243db5f508f1608ff9258138b4871d35d9f6c6')

build() {
Fbuild
diff --git a/source/xapps-extra/tovid/wxpy28.patch b/source/xapps-extra/tovid/wxpy28.patch
new file mode 100644
index 0000000..afef4b2
--- /dev/null
+++ b/source/xapps-extra/tovid/wxpy28.patch
@@ -0,0 +1,29 @@
+diff -Naur tovid-0.30/src/tovidgui tovid-0.30-p/src/tovidgui
+--- tovid-0.30/src/tovidgui	2006-11-20 06:54:41.000000000 +0100
++++ tovid-0.30-p/src/tovidgui	2007-12-06 03:06:10.000000000 +0100
+@@ -21,20 +21,20 @@
+ import sys
+ import traceback
+
+-# Try to import wx 2.6; print error if it's unavailable
++# Try to import wx 2.8; print error if it's unavailable
+ try:
+     import wxversion
+-    if wxversion.checkInstalled('2.6'):
+-        wxversion.select('2.6-unicode')
++    if wxversion.checkInstalled('2.8'):
++        wxversion.select('2.8-unicode')
+     else:
+-        print "tovidgui requires wxPython 2.6; please install or upgrade wxPython."
++        print "tovidgui requires wxPython 2.8; please install or upgrade wxPython."
+         sys.exit()
+     import wx
+ except ImportError:
+     traceback.print_exc()
+     print "There was an error importing the 'wx' libraries. The above"
+     print "output should help you find what went wrong. Re-installing"
+-    print "wxPython 2.6 (or upgrading from wxPython 2.4 to 2.6) may"
++    print "wxPython 2.8 (or upgrading from wxPython 2.6 to 2.8) may"
+     print "help. Consult the tovid homepage (tovid.org) for further"
+     print "assistance."
+     print "Sorry, 'tovidgui' will not work."
From crazy at frugalware.org  Fri Dec  7 09:15:59 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:39 2007
Subject: [Frugalware-git] frugalware-current: wxsvg-1.0b7_3-1-i686
Message-ID: <20071207081559.E91C01190503@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f32eed084739895e6f9c5d83914e12a21736ef9

commit 7f32eed084739895e6f9c5d83914e12a21736ef9
Author: crazy 
Date:   Thu Dec 6 04:27:03 2007 +0100

wxsvg-1.0b7_3-1-i686
* New package
* need for dvdstyler

diff --git a/source/xlib-extra/wxsvg/FrugalBuild b/source/xlib-extra/wxsvg/FrugalBuild
new file mode 100644
index 0000000..033c792
--- /dev/null
+++ b/source/xlib-extra/wxsvg/FrugalBuild
@@ -0,0 +1,27 @@
+# Compiling Time: 1.53 SBU
+# Maintainer: crazy 
+
+pkgname=wxsvg
+pkgver=1.0b7_3
+pkgrel=1
+pkgdesc="wxSVG is C++ library to create, manipulate and render SVG files"
+_F_sourceforge_broken_up2date=1
+Finclude sourceforge
+url="http://www.wxsvg.org/"
+depends=('libart_lgpl' 'libstdc++' 'wxgtk>=2.8.1' 'libxxf86vm' 'expat' 'libxdamage' 'libice')
+## DO NOT CHANGE THAT YET! Exist ony on 2 mirrors by now
+source=(http://dfn.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver}.tar.gz)
+groups=('xlib-extra')
+archs=('i686' 'x86_64')
+sha1sums=('95ebb5b271dc286c9455c34aeac31dcda5d66763')
+options=('scriptlet')
+
+build()
+{
+	Fcd
+	touch NEWS README || Fdie
+	Fautoreconf
+	Fbuild
+}
+
+# optimization OK
From crazy at frugalware.org  Fri Dec  7 09:16:00 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 09:16:39 2007
Subject: [Frugalware-git] frugalware-current: dvdstyler-1.5.1-1-i686
Message-ID: <20071207081600.8A7111190509@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=38c62b180e5b6346df056376d650dfa942d6e43b

commit 38c62b180e5b6346df056376d650dfa942d6e43b
Author: crazy 
Date:   Thu Dec 6 05:03:03 2007 +0100

dvdstyler-1.5.1-1-i686
* Version bump
* removed broken custom up2date ( brr )
* moved away from 'gnome' , wth this ?
* added an patch to fix autotools
* url fix
* removed old patch
* changed maintainer to me

diff --git a/source/gnome-extra/dvdstyler/FrugalBuild b/source/gnome-extra/dvdstyler/FrugalBuild
deleted file mode 100644
index 4fb10b6..0000000
--- a/source/gnome-extra/dvdstyler/FrugalBuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Compiling Time: ~0.65 SBU
-# Maintainer: BMH1980 
-
-pkgname=dvdstyler
-pkgver=1.4
-pkgrel=6
-pkgdesc="DVDStyler is a crossplatform dvd authoring system."
-_F_sourceforge_dirname="dvdstyler"
-_F_sourceforge_name="DVDStyler"
-Finclude sourceforge
-url="http://dvdstyler.sourceforge.net/"
-makedepends=('dvdauthor' 'netpbm')
-depends=('libgnomeui' 'mpgtx' 'wxgtk' 'mjpegtools>=1.8.0-2' 'cdrtools' 'dvd+rw-tools')
-up2date="lynx -dump http://dvdstyler.sourceforge.net/downloads.html | grep Source | head -n 1 | cut -d ' ' -f 9 | cut -d '-' -f 2 | sed 's|.tar.gz||'"
-source=($source dvdstyler-amd64-gcc4fix.patch)
-license="GPL2"
-options=('scriptlet')
-groups=('gnome-extra')
-archs=('i686' 'x86_64')
-sha1sums=('5374a5f58dbef7b2180a5e89f416cf2c1cbc64ab' \
-          'f7c802dc6f6ae1b9b856e18859cebd2e1d95c4df')
-
-build()
-{
-	Fcd DVDStyler-$pkgver
-	if [ "$CARCH" == "x86_64" ]; then
-		Fpatch dvdstyler-amd64-gcc4fix.patch
-	fi
-	Fmake
-	Fmakeinstall
-	Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver
-}
-
-# optimization OK
diff --git a/source/gnome-extra/dvdstyler/dvdstyler-amd64-gcc4fix.patch b/source/gnome-extra/dvdstyler/dvdstyler-amd64-gcc4fix.patch
deleted file mode 100644
index de22e2f..0000000
--- a/source/gnome-extra/dvdstyler/dvdstyler-amd64-gcc4fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur DVDStyler-1.4.orig/src/ButtonPropDlg.cpp DVDStyler-1.4/src/ButtonPropDlg.cpp
---- DVDStyler-1.4.orig/src/ButtonPropDlg.cpp	2005-08-05 12:27:38.000000000 +0200
-+++ DVDStyler-1.4/src/ButtonPropDlg.cpp	2005-08-05 12:27:13.000000000 +0200
-@@ -115,14 +115,14 @@
- int ButtonPropDlg::GetTsi()
- {
-   if (m_titlesetChoice->GetSelection() >= 0)
--	return ((int) m_titlesetChoice->GetClientData(m_titlesetChoice->GetSelection()))-1;
-+	return ((long) m_titlesetChoice->GetClientData(m_titlesetChoice->GetSelection()))-1;
-   return 0;
- }
-
- int ButtonPropDlg::GetPgci()
- {
-   if (m_targetChoice->GetSelection() >= 0)
--	return (int) m_targetChoice->GetClientData(m_targetChoice->GetSelection());
-+	return (long) m_targetChoice->GetClientData(m_targetChoice->GetSelection());
-   return 0;
- }
-
-@@ -296,9 +296,9 @@
- 	return false;
-   }
-   int n = 1;
--  int tsi = ((int)GetClientData(n++))-1;
-+  int tsi = ((long)GetClientData(n++))-1;
-   m_object->SetActionTsi(tsi != m_tsi ? tsi : -2);
--  m_object->SetActionPgci((int)GetClientData(n++));
-+  m_object->SetActionPgci((long)GetClientData(n++));
-   m_object->SetActionChapter(GetInt(n++));
-   if (GetBool(n++))
- 	m_object->SetCustomAction(GetString(n));
diff --git a/source/gnome-extra/dvdstyler/dvdstyler.install b/source/gnome-extra/dvdstyler/dvdstyler.install
deleted file mode 100644
index 60bfe59..0000000
--- a/source/gnome-extra/dvdstyler/dvdstyler.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install()
-{
-	echo -n "updating desktop database..."
-	if update-desktop-database > /dev/null 2>&1 ; then
-		echo " done."
-	else
-		echo " failed."
-	fi
-}
-
-post_remove()
-{
-	post_install
-}
-
-op=$1
-shift
-
-$op $*
-
-# vim: ft=sh
diff --git a/source/xapps-extra/dvdstyler/FrugalBuild b/source/xapps-extra/dvdstyler/FrugalBuild
new file mode 100644
index 0000000..550c991
--- /dev/null
+++ b/source/xapps-extra/dvdstyler/FrugalBuild
@@ -0,0 +1,35 @@
+# Compiling Time: ~0.65 SBU
+# Maintainer: crazy 
+# Contributor: BMH1980 
+
+pkgname=dvdstyler
+pkgver=1.5.1
+pkgrel=1
+pkgdesc="DVDStyler is a crossplatform dvd authoring system."
+_F_sourceforge_dirname="dvdstyler"
+_F_sourceforge_name="DVDStyler"
+Finclude sourceforge
+url="http://www.dvdstyler.de"
+makedepends=('dvdauthor' 'netpbm')
+depends=('mpgtx' 'wxgtk>=2.8.1' 'mjpegtools>=1.8.0-2' 'cdrtools' 'dvd+rw-tools' 'wxsvg')
+source=($source fix-autotools.patch)
+license="GPL2"
+options=('scriptlet')
+groups=('xapps-extra')
+archs=('i686' 'x86_64')
+sha1sums=('c466dca9a5ff318dd43eb73d1acd0a360a68efd4' \
+          'cc9403bef31726c7e42d8786817e48f56c544a8c')
+
+build()
+{
+	Fcd DVDStyler-$pkgver
+	Fpatchall
+	touch NEWS || Fdie
+	Fautoreconf
+	Fmake
+	Fmakeinstall
+	# twice there
+	Frm usr/share/doc/dvdstyler
+}
+
+# optimization OK
diff --git a/source/xapps-extra/dvdstyler/dvdstyler.install b/source/xapps-extra/dvdstyler/dvdstyler.install
new file mode 100644
index 0000000..60bfe59
--- /dev/null
+++ b/source/xapps-extra/dvdstyler/dvdstyler.install
@@ -0,0 +1,21 @@
+post_install()
+{
+	echo -n "updating desktop database..."
+	if update-desktop-database > /dev/null 2>&1 ; then
+		echo " done."
+	else
+		echo " failed."
+	fi
+}
+
+post_remove()
+{
+	post_install
+}
+
+op=$1
+shift
+
+$op $*
+
+# vim: ft=sh
diff --git a/source/xapps-extra/dvdstyler/fix-autotools.patch b/source/xapps-extra/dvdstyler/fix-autotools.patch
new file mode 100644
index 0000000..0d5ba1d
--- /dev/null
+++ b/source/xapps-extra/dvdstyler/fix-autotools.patch
@@ -0,0 +1,30 @@
+diff -Naur DVDStyler-1.5.1/configure.in DVDStyler-1.5.1-p/configure.in
+--- DVDStyler-1.5.1/configure.in	2007-02-22 19:34:46.000000000 +0100
++++ DVDStyler-1.5.1-p/configure.in	2007-12-06 04:33:53.000000000 +0100
+@@ -148,5 +148,4 @@
+   buttons/Makefile
+   objects/Makefile
+   data/Makefile
+-  install.win32/Makefile
+ ])
+diff -Naur DVDStyler-1.5.1/src/Makefile.am DVDStyler-1.5.1-p/src/Makefile.am
+--- DVDStyler-1.5.1/src/Makefile.am	2007-07-08 19:11:50.000000000 +0200
++++ DVDStyler-1.5.1-p/src/Makefile.am	2007-12-06 04:34:22.000000000 +0100
+@@ -7,7 +7,7 @@
+  BurnDlg.cpp ProgressDlg.cpp\
+  MainWin.cpp dvdstyler.cpp
+
+-CXXFLAGS = @CXXFLAGS@ -I..
++AM_CXXFLAGS = @CXXFLAGS@ -I..
+ LDADD = ../wxVillaLib/libwxvilla.a
+
+ SUBDIRS = rc
+diff -Naur DVDStyler-1.5.1/wxVillaLib/Makefile.am DVDStyler-1.5.1-p/wxVillaLib/Makefile.am
+--- DVDStyler-1.5.1/wxVillaLib/Makefile.am	2006-12-06 15:09:21.000000000 +0100
++++ DVDStyler-1.5.1-p/wxVillaLib/Makefile.am	2007-12-06 04:35:17.000000000 +0100
+@@ -3,4 +3,4 @@
+  PipeExecute.cpp PropDlg.cpp SConv.cpp\
+  Thumbnails.cpp ThumbnailFactory.cpp\
+  utils.cpp VerticalToolbar.cpp
+-CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@
++AM_CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@
From boobaa at frugalware.org  Fri Dec  7 09:23:48 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Fri Dec  7 09:23:54 2007
Subject: [Frugalware-git] frugalware-current: openoffice.org-2.3.1-1-i686
Message-ID: <20071207082348.AF0B81190503@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f939d2430663e82f2823c102a4f74951e6e89238

commit f939d2430663e82f2823c102a4f74951e6e89238
Author: CSÉCSY László 
Date:   Fri Dec 7 09:15:44 2007 +0100

openoffice.org-2.3.1-1-i686
version bump compiled at last, with close introspection of vmiklos@
wasted cpu-cycles donated by KYbest

diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild
index a2bd7e5..b0381b7 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -41,8 +41,8 @@ else
fi
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2 \
http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.3.0/SDF/hu.sdf \
-	gcj-4.2.2.patch ucb-no-CURL_NO_OLDIES.diff)
-signatures=($source.asc '' '' '')
+	die-pam-die-die-die.patch less-vba.diff store-noinstall.diff)
+signatures=($source.asc '' '' '' '')
options=(${options[@]} 'scriptlet')
_F_gnome_desktop="y"
Finclude gnome-scriptlet mono
@@ -98,7 +98,11 @@ done
build() {
unset MAKEFLAGS
Fmonoexport
-	Fcd ooo-build
+	if [ -n "$branch" ]; then
+		Fcd ooo-build-$(echo $branch|sed 's/^-//;s/-/./g')
+	else
+		Fcd ooo-build
+	fi

# Extra localizations
cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1
diff --git a/source/xapps/openoffice.org/die-pam-die-die-die.patch b/source/xapps/openoffice.org/die-pam-die-die-die.patch
new file mode 100644
index 0000000..cacbc86
--- /dev/null
+++ b/source/xapps/openoffice.org/die-pam-die-die-die.patch
@@ -0,0 +1,13 @@
+diff --git a/patches/src680/apply b/patches/src680/apply
+index 2dc5da8..71e85ae 100644
+--- a/patches/src680/apply
++++ b/patches/src680/apply
+@@ -402,7 +402,7 @@ tools-urlobj-smb-scheme-patch.diff, n#261623, flr
+ tools-qa-urlobj-unittest.diff, n#261623, flr
+
+ # honour disable-*-link
+-config_office-honour-disable-link.diff, i#83088, fridrich
++#config_office-honour-disable-link.diff, i#83088, fridrich
+
+ # misc mozilla checks
+ config_office-misc-mozilla-checks.diff, i#83090, fridrich
diff --git a/source/xapps/openoffice.org/less-vba.diff b/source/xapps/openoffice.org/less-vba.diff
new file mode 100644
index 0000000..303e86d
--- /dev/null
+++ b/source/xapps/openoffice.org/less-vba.diff
@@ -0,0 +1,22 @@
+Index: patches/src680/apply
+===================================================================
+--- patches/src680/apply	(revision 11042)
++++ patches/src680/apply	(working copy)
+@@ -260,7 +260,7 @@
+ cws-npower7.diff
+
+ # npower8 (depends) e.g. must come after npower7
+-cws-npower8.diff
++#cws-npower8.diff
+
+ # major re-work / speed-up of configmgr
+ # FIXME: when integrated upstream, remove the hack in Makefile.shared
+@@ -1386,7 +1386,7 @@
+ # core changes not yet upstream
+ sc-source-ui-vba-makefile-mk.diff
+ # fix --disable-vba build
+-oovbaapi-disable-vba.diff
++#oovbaapi-disable-vba.diff
+
+ # export of macro bindings for shapes
+ sc-export-shape-macro-bindings.diff, n#304739, noelpwer
diff --git a/source/xapps/openoffice.org/store-noinstall.diff b/source/xapps/openoffice.org/store-noinstall.diff
new file mode 100644
index 0000000..e1c56db
--- /dev/null
+++ b/source/xapps/openoffice.org/store-noinstall.diff
@@ -0,0 +1,13 @@
+Index: patches/src680/apply
+===================================================================
+--- patches/src680/apply	(revision 11042)
++++ patches/src680/apply	(working copy)
+@@ -1875,7 +1875,7 @@
+ SectionOwner => rodo
+ SectionIssue => i#75399
+ store-core.diff
+-store-install.diff
++#store-install.diff
+ store-registry.diff
+ # don't burn 3% of startup doing CRC's we don't need
+ speed-store.diff, i#78495, michael
From crazy at frugalware.org  Fri Dec  7 10:32:00 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 10:32:02 2007
Subject: [Frugalware-git] frugalware-current: amule-2.1.3-11-i686
Message-ID: <20071207093200.2D0CC11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ba400fb302ab6f1c838561bb4ca8accf0e071db

commit 0ba400fb302ab6f1c838561bb4ca8accf0e071db
Author: crazy 
Date:   Fri Dec 7 10:30:12 2007 +0100

amule-2.1.3-11-i686
* release bump
* added replaces for xmule
* fixed broken server.met location

diff --git a/source/xapps-extra/amule/FrugalBuild b/source/xapps-extra/amule/FrugalBuild
index 2222522..030d4aa 100644
--- a/source/xapps-extra/amule/FrugalBuild
+++ b/source/xapps-extra/amule/FrugalBuild
@@ -3,14 +3,15 @@

pkgname=amule
pkgver=2.1.3
-pkgrel=10
+pkgrel=11
pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network."
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="aMule"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.amule.org/"
-source=($source aMule-wx.patch)
+replaces=('xmule')
+source=($source aMule-wx.patch fix-broken-server.met-link.patch)
depends=('wxgtk>=2.8.7' 'libxxf86vm' 'binutils=2.18.50.0.2' 'gd' 'curl')
up2date="lynx -dump $url/files/files.php?cat=6 | grep Latest | tail -n 1 | cut -d ' ' -f 10"
license="GPL2"
@@ -25,7 +26,8 @@ Fconfopts="$Fconfopts --enable-cas --enable-wxcas \
--enable-ccache --disable-debug"
_F_cd_path="aMule-$pkgver"
sha1sums=('dd47deb38e7a5b823550b85150f5a814c597b273' \
-          'bd048f7b88ff4c19841f606d03c5a9750e6e6945')
+          'bd048f7b88ff4c19841f606d03c5a9750e6e6945' \
+          '5c74fe3e13cad5d40def64e873f3fe6114ecb91a')
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"

# optimization OK
diff --git a/source/xapps-extra/amule/fix-broken-server.met-link.patch b/source/xapps-extra/amule/fix-broken-server.met-link.patch
new file mode 100644
index 0000000..300faec
--- /dev/null
+++ b/source/xapps-extra/amule/fix-broken-server.met-link.patch
@@ -0,0 +1,12 @@
+diff -Naur aMule-2.1.3/src/ServerWnd.cpp aMule-2.1.3-p/src/ServerWnd.cpp
+--- aMule-2.1.3/src/ServerWnd.cpp	2006-03-17 03:06:48.000000000 +0100
++++ aMule-2.1.3-p/src/ServerWnd.cpp	2007-12-07 10:09:40.000000000 +0100
+@@ -70,7 +70,7 @@
+
+ 	CastChild( ID_SRV_SPLITTER, wxSplitterWindow )->SetSashPosition(splitter_pos, true);
+ 	CastChild( ID_SRV_SPLITTER, wxSplitterWindow )->SetSashGravity(0.5f);
+-	CastChild( IDC_SERVERLISTURL, wxTextCtrl )->SetValue(wxT("http://ocbmaurice.dyns.net/pl/slist.pl?download/server-best.met"));
++	CastChild( IDC_SERVERLISTURL, wxTextCtrl )->SetValue(wxT("http://www.server-met.de/dl.php?load=gz&trace=33250645.6944"));
+
+ 	// Insert two columns, currently without a header
+ 	wxListCtrl* ED2KInfoList = CastChild( ID_ED2KINFO, wxListCtrl );
From crazy at frugalware.org  Fri Dec  7 10:42:43 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 10:42:46 2007
Subject: [Frugalware-git] frugalware-current: pacman-g2-3.6.5-1-i686
Message-ID: <20071207094243.5804E11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4891670ca7025e8a41437ad49c82ecb6323c2872

commit 4891670ca7025e8a41437ad49c82ecb6323c2872
Author: crazy 
Date:   Fri Dec 7 10:42:28 2007 +0100

pacman-g2-3.6.5-1-i686
* damn , fix that upgrade bug
* added depends on glibc>=2.7

diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild
index 35c1c78..3ae32c8 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -10,7 +10,7 @@ pkgrel=1
pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support."
url="http://ftp.frugalware.org/pub/other/pacman-g2/"
backup=(etc/{makepkg,pacman}.conf etc/pacman.d/{frugalware,frugalware-current})
-depends=('libarchive>=2.0.27' 'glibc>=2.6-2')
+depends=('libarchive>=2.0.27' 'glibc>=2.7')
makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono' \
'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common')
Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'intltool')
From crazy at frugalware.org  Fri Dec  7 12:04:56 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 12:04:59 2007
Subject: [Frugalware-git] frugalware-current: rosegarden-1.6.0-1-i686
Message-ID: <20071207110456.4688E11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4132068a702c73118e14fe0d1dacb227ad7eca4

commit a4132068a702c73118e14fe0d1dacb227ad7eca4
Author: crazy 
Date:   Fri Dec 7 12:01:46 2007 +0100

rosegarden-1.6.0-1-i686
* Version bump
* s/build()/Finclude cmake/

diff --git a/source/kde-extra/rosegarden/FrugalBuild b/source/kde-extra/rosegarden/FrugalBuild
index 9580535..321feea 100644
--- a/source/kde-extra/rosegarden/FrugalBuild
+++ b/source/kde-extra/rosegarden/FrugalBuild
@@ -2,10 +2,10 @@
# Maintainer: crazy 

pkgname=rosegarden
-pkgver=1.5.1
+pkgver=1.6.0
pkgrel=1
pkgdesc="Rosegarden is a professional audio MIDI sequencer,score editor,music composition and editing environment."
-depends=('kdelibs>=3.5.6' 'dssi' 'liblrdf' 'liblo>=0.24' 'jack' 'fftw')
+depends=('kdelibs>=3.5.8' 'dssi' 'liblrdf' 'liblo>=0.24' 'jack' 'fftw')
makedepends=('cmake')
conflicts=('rosegarden-4')
replaces=('rosegarden-4')
@@ -13,22 +13,8 @@ groups=('kde-extra' 'xmultimedia-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
+_F_cmake_confopts="-DWANT_LIRC=NO"
+Finclude sourceforge cmake
url="http://www.rosegardenmusic.com/"
-
-build ()
-{
-
-     	Fcd
-     	if [ -d build ]; then
-		rm -rf build
-	fi
-     	mkdir -p build || Fdie
-	cd build || Fdie
-	cmake .. -DWANT_LIRC=NO -DCMAKE_INSTALL_PREFIX="$Fdestdir/usr" || Fdie
-	make || Fdie
-	make install || Fdie
-}
-
-sha1sums=('59b387ca936fe315db234487556f7f0f23c748f4')
+sha1sums=('3114222e3531cb2f94c013c08ff0068352f840ce')
# optimization OK
From devil505linux at gmail.com  Fri Dec  7 17:27:49 2007
From: devil505linux at gmail.com (Devil505)
Date: Fri Dec  7 17:27:51 2007
Subject: [Frugalware-git] 
	frugalware-current: gnome-video-arcade-0.5.3-1-i686
Message-ID: <20071207162749.96ECF11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e74f563184ab6f2d4e2452efdde6b6f3daf67a99

commit e74f563184ab6f2d4e2452efdde6b6f3daf67a99
Author: Devil505 
Date:   Fri Dec 7 17:26:25 2007 +0100

gnome-video-arcade-0.5.3-1-i686
*New Package
*Closes FS#2190

diff --git a/source/gnome-extra/gnome-video-arcade/FrugalBuild b/source/gnome-extra/gnome-video-arcade/FrugalBuild
new file mode 100644
index 0000000..de4f599
--- /dev/null
+++ b/source/gnome-extra/gnome-video-arcade/FrugalBuild
@@ -0,0 +1,22 @@
+# Compiling Time: 0.20 SBU
+# Maintainer: Devil505 
+
+pkgname=gnome-video-arcade
+pkgver=0.5.3
+pkgrel=1
+pkgdesc="GNOME Video Arcade is a simple xmame front-end for the GNOME Desktop Environment"
+_F_sourceforge_dirname="gva"
+_F_sourceforge_broken_up2date=1
+Finclude sourceforge
+depends=('libgnomeui' 'sqlite3' 'libxdamage' 'xmame')
+makedepends=('perl-xml' 'gnome-doc-utils')
+_F_gnome_schemas=('/etc/gconf/schemas/gnome-video-arcade.schemas')
+_F_gnome_desktop="y"
+_F_gnome_iconcache="y"
+Finclude gnome-scriptlet
+options=('scriptlet')
+groups=('gnome-extra')
+archs=('i686')
+sha1sums=('52a0a789972257d8516a603fed77759a26fd9c45')
+
+# optimization OK
From devil505linux at gmail.com  Fri Dec  7 17:43:58 2007
From: devil505linux at gmail.com (Devil505)
Date: Fri Dec  7 17:44:01 2007
Subject: [Frugalware-git] frugalware-current: penguin-command-1.6.11-1-i686
Message-ID: <20071207164358.535F711904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de742ffcf634bfc9a71e96e5b287bf7504802465

commit de742ffcf634bfc9a71e96e5b287bf7504802465
Author: Devil505 
Date:   Fri Dec 7 17:42:02 2007 +0100

penguin-command-1.6.11-1-i686
*New Package from jedifox via frugalware-fr

diff --git a/source/games-extra/penguin-command/FrugalBuild b/source/games-extra/penguin-command/FrugalBuild
new file mode 100644
index 0000000..bdb732c
--- /dev/null
+++ b/source/games-extra/penguin-command/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: 0.04 SBU
+# Maintainer: Devil505 
+# Contributor: jedifox
+
+pkgname=penguin-command
+pkgver=1.6.11
+pkgrel=1
+pkgdesc="This is a clone of the classic Missile Command Game"
+_F_sourceforge_broken_up2date="1"
+Finclude sourceforge
+url="http://www.linux-games.com/penguin-command/"
+depends=('glibc' 'sdl_mixer' 'sdlimage')
+groups=('games-extra')
+archs=('i686')
+sha1sums=('db1b2693e27bf88cf71ad2fca3c780c5a2678a8b')
+
+_F_desktop_icon="/usr/share/penguin-command/gfx/icon.xpm"
+_F_desktop_categories="Game;ArcadeGame;"
+
+build()
+{
+	Fbuild
+  	Fdesktop2
+}
+
+# optimization OK
From crazy at frugalware.org  Fri Dec  7 18:10:28 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 18:10:31 2007
Subject: [Frugalware-git] frugalware-current: wxxml2-1.8-2-i686
Message-ID: <20071207171028.CBD7211904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=187d5df07129c9d01432656f93030c20d12010f0

commit 187d5df07129c9d01432656f93030c20d12010f0
Author: crazy 
Date:   Fri Dec 7 18:10:00 2007 +0100

wxxml2-1.8-2-i686
* release bump
* should compile on 64bit now

diff --git a/source/xlib-extra/wxxml2/FrugalBuild b/source/xlib-extra/wxxml2/FrugalBuild
index f0e7713..4bd1907 100644
--- a/source/xlib-extra/wxxml2/FrugalBuild
+++ b/source/xlib-extra/wxxml2/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=wxxml2
pkgver=1.8
-pkgrel=1
+pkgrel=2
pkgdesc="xml2 class for wxWidgets framework"
_F_sourceforge_dirname="wxcode"
Finclude sourceforge
@@ -18,5 +18,8 @@ up2date="lynx -dump $url | grep Latest | sed 's/.*: \([0-9\.]*\) B.*/\1/'"
source=(${source/$pkgname-$pkgver/$pkgname})
sha1sums=('ab07182d6edee520c0af172a23ab3e6737015e24')

+if [ "$CARCH" == "x86_64" ]; then
+	export CXXFLAGS="$CXXFLAGS -fPIC"
+fi

# optimization OK
From crazy at frugalware.org  Fri Dec  7 18:36:18 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 18:36:21 2007
Subject: [Frugalware-git] frugalware-current: rapidsvn-0.9.4-1-i686
Message-ID: <20071207173618.C497311904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=657a5bfb0a914800b01aab014510a4ff8ae4bf75

commit 657a5bfb0a914800b01aab014510a4ff8ae4bf75
Author: crazy 
Date:   Fri Dec 7 18:35:51 2007 +0100

rapidsvn-0.9.4-1-i686
* New package

diff --git a/source/xapps-extra/rapidsvn/FrugalBuild b/source/xapps-extra/rapidsvn/FrugalBuild
new file mode 100644
index 0000000..f9effda
--- /dev/null
+++ b/source/xapps-extra/rapidsvn/FrugalBuild
@@ -0,0 +1,42 @@
+# Compiling Time: 1.14 SBU
+# Maintainer: crazy 
+
+pkgname=rapidsvn
+pkgver=0.9.4
+pkgrel=1
+pkgdesc="GUI front-end for Subversion"
+url="http://rapidsvn.tigris.org/"
+depends=('subversion' 'wxgtk>=2.8.7' 'libstdc++' 'libxxf86vm' 'libxdamage' 'libice')
+rodepends=('libsvncpp')
+groups=('xapps-extra')
+archs=('i686')
+up2date="lynx -dump 'http://rapidsvn.tigris.org/'|grep 'latest release:' |sed 's/.*: \(.*\) .*/\1/'"
+source=(http://www.rapidsvn.org/download/release/$pkgver/$pkgname-$pkgver.tar.gz wx28.patch)
+sha1sums=('0f8eff53964f641253d6a4be82187ab9f30168c7' \
+          '3cefddbd8ef4d96f7269fee3a51684193686f86c')
+options=('scriptlet')
+
+subpkgs=('libsvncpp')
+subdescs=('svncpp is a C++ wrapper for the C Subversion client library.')
+subdepends=('libstdc++')
+subgroups=('lib-extra')
+subarchs=('i686')
+
+export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
+build()
+{
+	Fcd
+	Fbuild \
+		--with-apr-config=/usr/bin/apr-1-config \
+		--with-apu-config=/usr/bin/apu-1-config
+	## prepare .desktop file
+	Ffilerel \
+		src/res/bitmaps/rapidsvn_128x128.png \
+		/usr/share/pixmaps/$pkgname.png
+	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Development;"
+
+	Fsplit libsvncpp usr/lib usr/include
+}
+
+# optimization OK
diff --git a/source/xapps-extra/rapidsvn/wx28.patch b/source/xapps-extra/rapidsvn/wx28.patch
new file mode 100644
index 0000000..f8aa30b
--- /dev/null
+++ b/source/xapps-extra/rapidsvn/wx28.patch
@@ -0,0 +1,180 @@
+diff -Naur rapidsvn-0.9.4/src/add_action.cpp rapidsvn-0.9.4-wx28/src/add_action.cpp
+--- rapidsvn-0.9.4/src/add_action.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/add_action.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -23,12 +23,12 @@
+  * ====================================================================
+  */
+
+-// svncpp
+-#include "svncpp/client.hpp"
+-
+ // wxWidgets
+ #include "wx/intl.h"
+
++// svncpp
++#include "svncpp/client.hpp"
++
+ // app
+ #include "ids.hpp"
+ #include "add_action.hpp"
+diff -Naur rapidsvn-0.9.4/src/checkout_dlg.cpp rapidsvn-0.9.4-wx28/src/checkout_dlg.cpp
+--- rapidsvn-0.9.4/src/checkout_dlg.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/checkout_dlg.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -256,7 +256,6 @@
+
+ BEGIN_EVENT_TABLE (CheckoutDlg, wxDialog)
+   EVT_BUTTON (ID_BUTTON_BROWSE, CheckoutDlg::OnBrowse)
+-  EVT_BUTTON (wxID_OK, CheckoutDlg::OnOK)
+   EVT_CHECKBOX (ID_USELATEST, CheckoutDlg::OnUseLatest)
+   EVT_TEXT (-1, CheckoutDlg::OnText)
+ //  EVT_BUTTON (wxID_HELP, CheckoutDlg::OnHelp)
+diff -Naur rapidsvn-0.9.4/src/export_dlg.cpp rapidsvn-0.9.4-wx28/src/export_dlg.cpp
+--- rapidsvn-0.9.4/src/export_dlg.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/export_dlg.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -295,7 +295,6 @@
+
+ BEGIN_EVENT_TABLE (ExportDlg, wxDialog)
+   EVT_BUTTON (ID_BUTTON_BROWSE, ExportDlg::OnBrowse)
+-  EVT_BUTTON (wxID_OK, ExportDlg::OnOK)
+   EVT_CHECKBOX (ID_USE_LATEST, ExportDlg::OnUseLatest)
+   EVT_CHECKBOX (ID_NOT_SPECIFIED, ExportDlg::OnNotSpecified)
+   EVT_COMBOBOX (ID_NATIVE_EOL, ExportDlg::OnNativeEol)
+diff -Naur rapidsvn-0.9.4/src/import_dlg.cpp rapidsvn-0.9.4-wx28/src/import_dlg.cpp
+--- rapidsvn-0.9.4/src/import_dlg.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/import_dlg.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -196,7 +196,11 @@
+     }
+   }
+
+-  wxDialog::OnOK(event);
++#if wxCHECK_VERSION (2, 7, 0)
++  wxDialog::EndModal (wxID_OK);
++#else
++  wxDialog::OnOK (event);
++#endif
+ }
+
+ void
+diff -Naur rapidsvn-0.9.4/src/listener.cpp rapidsvn-0.9.4-wx28/src/listener.cpp
+--- rapidsvn-0.9.4/src/listener.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/listener.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -253,7 +253,7 @@
+   void
+   handleEvent (wxCommandEvent & event)
+   {
+-    switch (event.m_id)
++    switch (event.GetId ())
+     {
+     case SIG_GET_LOG_MSG:
+       callbackGetLogMessage ();
+diff -Naur rapidsvn-0.9.4/src/log_dlg.cpp rapidsvn-0.9.4-wx28/src/log_dlg.cpp
+--- rapidsvn-0.9.4/src/log_dlg.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/log_dlg.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include "wx/valgen.h"
+ #include "wx/listctrl.h"
+ #include "wx/splitter.h"
++#include "wx/notebook.h"
+
+
+ // svncpp
+diff -Naur rapidsvn-0.9.4/src/merge_dlg.cpp rapidsvn-0.9.4-wx28/src/merge_dlg.cpp
+--- rapidsvn-0.9.4/src/merge_dlg.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/merge_dlg.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -113,7 +113,11 @@
+     }
+   }
+
+-  wxDialog::OnOK(event);
++#if wxCHECK_VERSION (2, 7, 0)
++  wxDialog::EndModal (wxID_OK);
++#else
++  wxDialog::OnOK (event);
++#endif
+ }
+
+ void
+diff -Naur rapidsvn-0.9.4/src/preferences_dlg.cpp rapidsvn-0.9.4-wx28/src/preferences_dlg.cpp
+--- rapidsvn-0.9.4/src/preferences_dlg.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/preferences_dlg.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -114,9 +114,14 @@
+    */
+   bool SelectExecutable (const wxString & title, wxTextCtrl * textCtrl)
+   {
++#if wxCHECK_VERSION (2, 7, 0)
++    wxFileDialog dlg (this, title, wxEmptyString, wxEmptyString, _("*.*"), wxFD_OPEN);
++#else
+     wxFileDialog dlg (this, title);
+
+     dlg.SetStyle (wxHIDE_READONLY | wxOPEN);
++#endif
++
+     dlg.SetWildcard (EXECUTABLE_WILDCARD);
+     dlg.SetPath (textCtrl->GetValue ());
+
+diff -Naur rapidsvn-0.9.4/src/rapidsvn_frame.cpp rapidsvn-0.9.4-wx28/src/rapidsvn_frame.cpp
+--- rapidsvn-0.9.4/src/rapidsvn_frame.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/rapidsvn_frame.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -1150,7 +1150,7 @@
+ void
+ RapidSvnFrame::OnColumn (wxCommandEvent & event)
+ {
+-  int eventId = event.m_id;
++  int eventId = event.GetId ();
+   int col = 0;
+   while (col < FileListCtrl::COL_COUNT &&
+          m->ColumnList[col].id != eventId)
+@@ -1192,7 +1192,7 @@
+ RapidSvnFrame::OnColumnSorting (wxCommandEvent & event)
+ {
+   // we dont want to list FileListCtrl::COL_NAME/COL_PATH/... here
+-  int col = event.m_id - ID_ColumnSort_Name;
++  int col = event.GetId () - ID_ColumnSort_Name;
+
+   m->listCtrl->SetSortColumn (col);
+   m->listCtrl->SetSortAscending (true);
+@@ -1294,7 +1294,7 @@
+ void
+ RapidSvnFrame::OnUpdateCommand (wxUpdateUIEvent & updateUIEvent)
+ {
+-  updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.m_id, GetSelectionActionFlags ()));
++  updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.GetId (), GetSelectionActionFlags ()));
+ }
+
+ void
+@@ -1514,13 +1514,13 @@
+ {
+   Action* action = NULL;
+
+-  if ((event.m_id >= ID_Verb_Min) && (event.m_id <= ID_Verb_Max))
++  if ((event.GetId () >= ID_Verb_Min) && (event.GetId () <= ID_Verb_Max))
+   {
+-    action = new ExternalProgramAction (this, event.m_id - ID_Verb_Min, false);
++    action = new ExternalProgramAction (this, event.GetId () - ID_Verb_Min, false);
+   }
+   else
+   {
+-    switch (event.m_id)
++    switch (event.GetId ())
+     {
+     case ID_Explore:
+       action = new ExternalProgramAction (this, -1, true);
+diff -Naur rapidsvn-0.9.4/src/resolve_action.cpp rapidsvn-0.9.4-wx28/src/resolve_action.cpp
+--- rapidsvn-0.9.4/src/resolve_action.cpp	2006-12-08 18:47:07.000000000 +0100
++++ rapidsvn-0.9.4-wx28/src/resolve_action.cpp	2007-12-07 17:26:17.000000000 +0100
+@@ -23,12 +23,12 @@
+  * ====================================================================
+  */
+
+-// svncpp
+-#include "svncpp/client.hpp"
+-
+ // wxWidgets
+ #include "wx/intl.h"
+
++// svncpp
++#include "svncpp/client.hpp"
++
+ // app
+ #include "resolve_action.hpp"
+
From crazy at frugalware.org  Fri Dec  7 18:41:28 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 18:41:29 2007
Subject: [Frugalware-git] frugalware-current: syslog-ng-2.0.6-1-i686
Message-ID: <20071207174128.50D7011904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24dff08e96321805d742b2c2c6b94a2cd6ba817d

commit 24dff08e96321805d742b2c2c6b94a2cd6ba817d
Author: crazy 
Date:   Fri Dec 7 18:41:11 2007 +0100

syslog-ng-2.0.6-1-i686
* Version bump

diff --git a/source/apps-extra/syslog-ng/FrugalBuild b/source/apps-extra/syslog-ng/FrugalBuild
index 3d2a100..578f4ad 100644
--- a/source/apps-extra/syslog-ng/FrugalBuild
+++ b/source/apps-extra/syslog-ng/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: AlexExtreme 

pkgname=syslog-ng
-pkgver=2.0.5
+pkgver=2.0.6
pkgrel=1
pkgdesc="A flexible system logging tool"
url="http://www.balabit.com/products/syslog_ng/"
@@ -17,7 +17,7 @@ up2date="lynx -dump http://www.balabit.com/downloads/files/syslog-ng/sources/sta
source=(http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/$pkgname-$pkgver.tar.gz \
rc.syslog-ng syslog-ng.conf syslog-ng)
backup=(etc/syslog-ng.conf)
-sha1sums=('f514e2d2ae7831298e71d6fa9cc1817f7038431c' \
+sha1sums=('8aa20a920e22072643d384b91109c973c2c74a71' \
'261b708d924538a7811be7ca09d1de36be414678' \
'12abe05ce61a93cd8f3b578129f97ec6d50888bf' \
'2876e61d5e04f6117967da728bcb1d3b6785532f')
From crazy at frugalware.org  Fri Dec  7 19:13:28 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 19:13:32 2007
Subject: [Frugalware-git] frugalware-current: kile-2.0-1-i686
Message-ID: <20071207181328.DAE6511904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eeeb9a6f9d487998cecd0550c12daa587806999a

commit eeeb9a6f9d487998cecd0550c12daa587806999a
Author: crazy 
Date:   Fri Dec 7 19:11:25 2007 +0100

kile-2.0-1-i686
* Version bump

diff --git a/source/kde-extra/kile/FrugalBuild b/source/kde-extra/kile/FrugalBuild
index 1e487af..e355a1b 100644
--- a/source/kde-extra/kile/FrugalBuild
+++ b/source/kde-extra/kile/FrugalBuild
@@ -3,17 +3,17 @@
# Contributor: Zsolt Szalai 

pkgname=kile
-pkgver=1.9.3
+pkgver=2.0
pkgrel=1
pkgdesc="A qt latex environment."
groups=('kde-extra')
archs=('i686' 'x86_64')
-depends=('kdegraphics>=3.5.5' 'tetex')
+depends=('kdegraphics>=3.5.8' 'tetex')
_F_sourceforge_ext=".tar.bz2"
_F_sourceforge_prefix='kile-'
Finclude sourceforge
options=('scriptlet')
-sha1sums=('230045ca6cb488577d5da705843c168812ba03ae')
+sha1sums=('d7603233b7aac686f08f59d4b65697bdd3d1ea2f')

build()
{
From vmiklos at frugalware.org  Fri Dec  7 19:16:04 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 19:16:07 2007
Subject: [Frugalware-git] frugalware-current: xmlto-0.0.19-1-i686
Message-ID: <20071207181604.73E9B11904C2@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8fb272c7e2c0fa2b3b531727b509a6ab5275853

commit b8fb272c7e2c0fa2b3b531727b509a6ab5275853
Author: Miklos Vajna 
Date:   Fri Dec 7 19:15:40 2007 +0100

xmlto-0.0.19-1-i686
version bump

diff --git a/source/apps-extra/xmlto/FrugalBuild b/source/apps-extra/xmlto/FrugalBuild
index 619064b..dd2e947 100644
--- a/source/apps-extra/xmlto/FrugalBuild
+++ b/source/apps-extra/xmlto/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=xmlto
-pkgver=0.0.18
+pkgver=0.0.19
pkgrel=1
pkgdesc="xmlto is a front-end to an XSL toolchain."
url="http://cyberelk.net/tim/xmlto/"
@@ -13,5 +13,5 @@ archs=('i686' 'x86_64')
up2date="lynx -dump http://cyberelk.net/tim/data/xmlto/stable/ |Flasttarbz2"
source=(http://cyberelk.net/tim/data/xmlto/stable/xmlto-$pkgver.tar.bz2)
options=('scriptlet')
-sha1sums=('abee8925a80bfefcdf1543956a804b1facff7bec')
+sha1sums=('5bef2821dd89a020f286dc6f1b5678bce4f1997a')
# optimization OK
From vmiklos at frugalware.org  Fri Dec  7 19:24:05 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 19:24:08 2007
Subject: [Frugalware-git] frugalware-current: bzr-rebase-0.3-1-i686
Message-ID: <20071207182405.7491D11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d6e394760a3798354ed232dc5913d54ca285ace

commit 3d6e394760a3798354ed232dc5913d54ca285ace
Author: Miklos Vajna 
Date:   Fri Dec 7 19:24:01 2007 +0100

bzr-rebase-0.3-1-i686
version bump

diff --git a/source/devel-extra/bzr-rebase/FrugalBuild b/source/devel-extra/bzr-rebase/FrugalBuild
index ce20ab4..c49fc62 100644
--- a/source/devel-extra/bzr-rebase/FrugalBuild
+++ b/source/devel-extra/bzr-rebase/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=bzr-rebase
-pkgver=0.2
+pkgver=0.3
pkgrel=1
pkgdesc="Provides a 'bzr rebase' command, like the famous git-rebase."
url="http://bazaar-vcs.org/Rebase"
From crazy at frugalware.org  Fri Dec  7 19:46:19 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 19:46:20 2007
Subject: [Frugalware-git] frugalware-current: recoll-1.10.0-1-i686
Message-ID: <20071207184619.60BB811904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b8ae860c87550e047f5ce0c2b335be258416ae1

commit 9b8ae860c87550e047f5ce0c2b335be258416ae1
Author: crazy 
Date:   Fri Dec 7 19:45:26 2007 +0100

recoll-1.10.0-1-i686
* Version bump
* fixed source , url , up2date
* removed old patches
* qt3 -> qt4

diff --git a/source/xapps-extra/recoll/FrugalBuild b/source/xapps-extra/recoll/FrugalBuild
index 7a2391f..c47a2d3 100644
--- a/source/xapps-extra/recoll/FrugalBuild
+++ b/source/xapps-extra/recoll/FrugalBuild
@@ -2,21 +2,20 @@
# Maintainer: crazy 

pkgname=recoll
-pkgver=1.8.1
-pkgrel=6
+pkgver=1.10.0
+pkgrel=1
pkgdesc="Recoll is a personal full text search tool for Unix/Linux."
-Finclude sourceforge
url="http://www.lesbonscomptes.com/recoll/"
-depends=('qt' 'xapian-core>=1.0.4' 'gamin' 'aspell')
-rodepends=('xpdf' 'id3lib' 'catdoc' 'gawk' 'antiword' 'pstotext' 'djvulibre>=3.5.18' 'file' 'unrtf')
+depends=('xapian-core' 'gamin' 'libsm' 'libqt3support' 'libpng' 'libxi' 'libxrandr' 'libxcursor' 'libxinerama' 'fontconfig' 'aspell')
+rodepends=('xpdf' 'id3lib' 'catdoc' 'gawk' 'antiword' 'pstotext' 'djvulibre>=3.5.20' 'file' 'unrtf')
backup=('usr/share/recoll/examples/{recoll.conf,mimemap,mimeconf}')
license="GPL"
+up2date="lynx -dump http://www.lesbonscomptes.com/recoll/download.html|grep -om1 'recoll-\(.*\).tar.gz'|Flasttar"
+source=($url/$pkgname-$pkgver.tar.gz)
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-source=($source cxxflags.patch xapian-1.0.0.patch)
-Fconfopts="$Fconfopts --with-inotify --with-fam"
-sha1sums=('ccc10903378588f42d810475c0df552b3963ced9'\
-          'b4060db4bfd4a0f5063904d6f1f60998b1a44fe0'\
-          '2f9f31ba642a630842d4d51e8dd5118b6e447f31')
+Fconfopts="$Fconfopts --with-inotify --with-fam=/usr/lib/libfam.so"
+sha1sums=('38d0a75fa2ecb7d5fcb115c8ebb1eb01537a495a')
+
# optimization OK
diff --git a/source/xapps-extra/recoll/cxxflags.patch b/source/xapps-extra/recoll/cxxflags.patch
deleted file mode 100644
index 739e230..0000000
--- a/source/xapps-extra/recoll/cxxflags.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur recoll-1.5.4/mk/localdefs.in recoll-1.5.4-p/mk/localdefs.in
---- recoll-1.5.4/mk/localdefs.in	2006-01-30 10:32:28.000000000 +0100
-+++ recoll-1.5.4-p/mk/localdefs.in	2006-10-06 22:39:43.000000000 +0200
-@@ -12,4 +12,4 @@
- LOCALCXXFLAGS = $(INCICONV) $(XAPIANCXXFLAGS) \
- 	      -DRECOLL_DATADIR=\"$(RECOLL_DATADIR)\"
-
--CXXFLAGS = -g -O2 -Wall -Wno-unused
-+CXXFLAGS += -g -Wall -Wno-unused
diff --git a/source/xapps-extra/recoll/xapian-1.0.0.patch b/source/xapps-extra/recoll/xapian-1.0.0.patch
deleted file mode 100644
index 27407fe..0000000
--- a/source/xapps-extra/recoll/xapian-1.0.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur recoll-1.8.1/rcldb/rcldb.cpp recoll-1.8.1-p/rcldb/rcldb.cpp
---- recoll-1.8.1/rcldb/rcldb.cpp	2007-02-14 11:09:31.000000000 +0100
-+++ recoll-1.8.1-p/rcldb/rcldb.cpp	2007-05-18 14:05:56.000000000 +0200
-@@ -1531,7 +1531,7 @@
- 		     const string& base)
- {
-     Xapian::Stem stemmer(lang);
--    if (!stemmer.stem_word(word).compare(stemmer.stem_word(base))) {
-+    if (!stemmer(word).compare(stemmer(base))) {
- 	LOGDEB2(("Rcl::Db::stemDiffers: same for %s and %s\n",
- 		word.c_str(), base.c_str()));
- 	return false;
-diff -Naur recoll-1.8.1/rcldb/stemdb.cpp recoll-1.8.1-p/rcldb/stemdb.cpp
---- recoll-1.8.1/rcldb/stemdb.cpp	2007-01-19 16:19:51.000000000 +0100
-+++ recoll-1.8.1-p/rcldb/stemdb.cpp	2007-05-18 14:10:27.000000000 +0200
-@@ -115,7 +115,7 @@
- 		// (*it).c_str(), *sit));
- 		continue;
- 	    }
--	    string stem = stemmer.stem_word(*it);
-+	    string stem = stemmer(*it);
- 	    //cerr << "word " << *it << " stem " << stem << endl;
- 	    if (stem == *it) {
- 		++stemconst;
-@@ -226,7 +226,7 @@
- {
-     try {
- 	Xapian::Stem stemmer(lang);
--	string stem = stemmer.stem_word(term);
-+	string stem = stemmer(term);
- 	LOGDEB(("stemExpand: [%s] stem-> [%s]\n", term.c_str(), stem.c_str()));
-
- 	// Open stem database
From crazy at frugalware.org  Fri Dec  7 20:32:37 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 20:32:40 2007
Subject: [Frugalware-git] frugalware-current: gst-python-0.10.9-1-i686
Message-ID: <20071207193237.F314811904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7044a15d3fdabc7b79504f387e51e3d0e46d908c

commit 7044a15d3fdabc7b79504f387e51e3d0e46d908c
Author: crazy 
Date:   Fri Dec 7 20:32:15 2007 +0100

gst-python-0.10.9-1-i686
* Version bump
* changed maintainer to me

diff --git a/source/xlib-extra/gst-python/FrugalBuild b/source/xlib-extra/gst-python/FrugalBuild
index be438fa..8e998a2 100644
--- a/source/xlib-extra/gst-python/FrugalBuild
+++ b/source/xlib-extra/gst-python/FrugalBuild
@@ -1,17 +1,18 @@
# Compiling Time: 0.13 SBU
-# Maintainer: DNAku 
+# Contributor: DNAku 

pkgname=gst-python
-pkgver=0.10.8
+pkgver=0.10.9
pkgrel=1
pkgdesc="GStreamer python bindings"
url="http://gstreamer.freedesktop.org/modules/gst-python.html"
-depends=('gstreamer>=0.10.14' 'gst-plugins-base>=0.10.14' 'pygtk' 'libxml2')
+depends=('gstreamer>=0.10.15' 'gst-plugins-base>=0.10.15' 'pygtk' 'libxml2')
archs=('i686' 'x86_64')
groups=('xlib-extra')
options=('scriptlet')
up2date="lynx -dump http://gstreamer.freedesktop.org/src/gst-python/|grep tar.gz$|sed -n 's/.*n-\([^-]*\)-.*/\1/;$ p'|sed 's/.*on.//g'|sed 's/.tar.*//g'"
source=(http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('e64d4bf2f668fd6c9dcdd9c17745fa616e12d96f')
+sha1sums=('4ba8033a3b4d12804258db9c4cf0a63367cc9592')

# optimization OK
From crazy at frugalware.org  Fri Dec  7 20:36:21 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 20:36:23 2007
Subject: [Frugalware-git] frugalware-current: conky-1.4.9-1-i686
Message-ID: <20071207193621.C67AB11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=77dfa7efcfb6350d486539b75821362ed98f2c86

commit 77dfa7efcfb6350d486539b75821362ed98f2c86
Author: crazy 
Date:   Fri Dec 7 20:36:03 2007 +0100

conky-1.4.9-1-i686
* Version bump

diff --git a/source/xapps-extra/conky/FrugalBuild b/source/xapps-extra/conky/FrugalBuild
index d0bb55b..d78e450 100644
--- a/source/xapps-extra/conky/FrugalBuild
+++ b/source/xapps-extra/conky/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Tuxbubling 

pkgname=conky
-pkgver=1.4.7
+pkgver=1.4.9
pkgrel=1
pkgdesc="Light-weight system monitor."
_F_sourceforge_ext=".tar.bz2"
@@ -13,7 +13,7 @@ makedepends=('xorg-server')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://conky.sourceforge.net/ | grep latest | sed -ne '1 p' | sed 's/.*is //;s/.$//'"
-sha1sums=('531ab8a468c80f5904feb8a26121158cd7af033f')
+sha1sums=('26f233588ea83b157729bb7dd56a64ffae856d20')

build()
{
From crazy at frugalware.org  Fri Dec  7 20:37:45 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 20:37:47 2007
Subject: [Frugalware-git] frugalware-current: rc-1.7.1-1-i686
Message-ID: <20071207193745.7A3FF11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01a86ef43c353afe396b2de9a7de556c10265861

commit 01a86ef43c353afe396b2de9a7de556c10265861
Author: crazy 
Date:   Fri Dec 7 20:37:31 2007 +0100

rc-1.7.1-1-i686
* Version bump

diff --git a/source/apps-extra/rc/FrugalBuild b/source/apps-extra/rc/FrugalBuild
index 6bd39be..6c9475f 100644
--- a/source/apps-extra/rc/FrugalBuild
+++ b/source/apps-extra/rc/FrugalBuild
@@ -2,18 +2,15 @@
# Maintainer: DNAku 

pkgname=rc
-pkgver=1.7
+pkgver=1.7.1
pkgrel=1
pkgdesc="clone of plan9 shell"
url="http://www.libra-aries-books.co.uk/rc/"
depends=()
archs=('i686' 'x86_64')
groups=('apps-extra')
-install=rc.install
source=(http://www.libra-aries-books.co.uk/rc/release/rc-$pkgver.tar.gz)
up2date="lynx -dump $url | Flasttar"
-sha1sums=('7a7511f7ef54f1883aa73e572b0a66e476421829')
-
-# optimalization OK
+sha1sums=('e282fde927c91b7f580426bcdfc62f780c6645c5')

# optimization OK
From crazy at frugalware.org  Fri Dec  7 20:42:29 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 20:42:32 2007
Subject: [Frugalware-git] frugalware-current: sonata-1.3-1-i686
Message-ID: <20071207194229.9601211904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2bb441c6f930cb291f2431dd0bd1bf7b412a7a3

commit e2bb441c6f930cb291f2431dd0bd1bf7b412a7a3
Author: crazy 
Date:   Fri Dec 7 20:42:02 2007 +0100

sonata-1.3-1-i686
* Version bump

diff --git a/source/xapps-extra/sonata/FrugalBuild b/source/xapps-extra/sonata/FrugalBuild
index 1672163..708a3b7 100644
--- a/source/xapps-extra/sonata/FrugalBuild
+++ b/source/xapps-extra/sonata/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: detto 

pkgname=sonata
-pkgver=1.2.3
+pkgver=1.3
pkgrel=1
pkgdesc="Sonata is a lightweight GTK+ music client for the Music Player Daemon (MPD)."
_F_berlios_ext=".tar.bz2"
@@ -12,6 +12,6 @@ depends=('mpd' 'pygtk')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-sha1sums=('1402ccf047c0a44ba5b4054188ad70381adde7c6')
+sha1sums=('7a4da42466d1a59d01c619b3af06bdfcec36e057')

# optimization OK
From crazy at frugalware.org  Fri Dec  7 20:44:09 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 20:44:12 2007
Subject: [Frugalware-git] frugalware-current: openbox-themes-1.0.2-1-i686
Message-ID: <20071207194409.B9A7C11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2e64dc5dec38331511b425dab68e7161437abd10

commit 2e64dc5dec38331511b425dab68e7161437abd10
Author: crazy 
Date:   Fri Dec 7 20:43:49 2007 +0100

openbox-themes-1.0.2-1-i686
* Version bump

diff --git a/source/xlib-extra/openbox-themes/FrugalBuild b/source/xlib-extra/openbox-themes/FrugalBuild
index 96f2a6d..7175066 100644
--- a/source/xlib-extra/openbox-themes/FrugalBuild
+++ b/source/xlib-extra/openbox-themes/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: detto 

pkgname=openbox-themes
-pkgver=1.0.1
+pkgver=1.0.2
pkgrel=1
pkgdesc="Themes for Openbox."
url="http://www.debian.org"
@@ -11,7 +11,7 @@ groups=('xlib-extra')
depends=('openbox')
source=(http://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.gz)
up2date="lynx -dump http://ftp.debian.org/debian/pool/main/o/openbox-themes | grep 'tar.gz\($\|#\)'|sed -n 's/.*-.*_\(.*\)\.t.*/\1/;$ p'"
-sha1sums=('fbcb70a1f0ae1054931edde150b00960a3dd2ea9')
+sha1sums=('d581d4f79a21ac4cff8dd70f83a7be50321572f0')

build () {
Fmkdir usr/share
From crazy at frugalware.org  Fri Dec  7 20:49:55 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 20:49:58 2007
Subject: [Frugalware-git] frugalware-current: poweriso-1.1-1-i686
Message-ID: <20071207194955.CABB411904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=83427e9516cb49db6a96c372ec19b69f3bbe55a6

commit 83427e9516cb49db6a96c372ec19b69f3bbe55a6
Author: crazy 
Date:   Fri Dec 7 20:49:42 2007 +0100

poweriso-1.1-1-i686
* brrr , added missing depends()
* up2date fix
* added !x86_64

diff --git a/source/apps-extra/poweriso/FrugalBuild b/source/apps-extra/poweriso/FrugalBuild
index 1d808e6..5f98002 100644
--- a/source/apps-extra/poweriso/FrugalBuild
+++ b/source/apps-extra/poweriso/FrugalBuild
@@ -6,9 +6,10 @@ pkgver=1.1
pkgrel=1
pkgdesc="A free utility for linux which can extract, list, and convert image files (including ISO, BIN, DAA, and other formats)."
url="http://www.poweriso.com"
-archs=('i686')
+archs=('i686' '!x86_64')
+depends=()
groups=('apps-extra')
-up2date="lynx -dump $url/download.htm | grep tar.gz | cut -d '-' -f2 | sed -n 's|.tar.gz||p'"
+up2date="lynx -dump 'http://www.poweriso.com/download.htm'|grep '.tar.gz'|Flasttar"
source=($url/$pkgname-$pkgver.tar.gz)
options=('nobuild')
sha1sums=('1af3e804964f64d9aef40c3c42e5d6e3c8524751')
From crazy at frugalware.org  Fri Dec  7 21:03:25 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 21:03:27 2007
Subject: [Frugalware-git] frugalware-current: parcelle-1.2-1-i686
Message-ID: <20071207200325.F0B6611904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4357df5065d21ac3dbce5fdb1c29b635d62d766

commit a4357df5065d21ac3dbce5fdb1c29b635d62d766
Author: crazy 
Date:   Fri Dec 7 21:03:14 2007 +0100

parcelle-1.2-1-i686
* Version bump
* fixed up2date
* moved to the right group

diff --git a/source/gnome-extra/parcelle/FrugalBuild b/source/gnome-extra/parcelle/FrugalBuild
deleted file mode 100644
index 587abdc..0000000
--- a/source/gnome-extra/parcelle/FrugalBuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Compiling Time: 0 SBU
-# Maintainer: detto 
-
-pkgname=parcelle
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="A PyGTK application that captures and saves clipboard history."
-url="http://code.google.com/p/xyhthyx"
-archs=('i686')
-groups=('gnome-extra')
-rodepends=('pygtk' 'pyxml')
-up2date="lynx -dump $url/downloads/list | grep -v svn | Flasttar"
-source=(http://xyhthyx.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('b2ffcd21e835e842bd3ed2f94136c1b6c2eeba65')
-_F_cd_path=$pkgname
diff --git a/source/xapps-extra/parcelle/FrugalBuild b/source/xapps-extra/parcelle/FrugalBuild
new file mode 100644
index 0000000..4ef0d2b
--- /dev/null
+++ b/source/xapps-extra/parcelle/FrugalBuild
@@ -0,0 +1,14 @@
+# Compiling Time: 0 SBU
+# Maintainer: detto 
+
+pkgname=parcelle
+pkgver=1.2
+pkgrel=1
+pkgdesc="A PyGTK application that captures and saves clipboard history."
+url="http://code.google.com/p/xyhthyx"
+archs=('i686')
+groups=('xapps-extra')
+rodepends=('pygtk' 'pyxml')
+up2date="lynx -dump http://code.google.com/p/xyhthyx/|grep 'parcelle-\(.*\).tar.gz'| Flasttar"
+source=(http://xyhthyx.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+sha1sums=('81ad9667d8e6387905c4daaffac3c0bb416f3edb')
From crazy at frugalware.org  Fri Dec  7 21:29:29 2007
From: crazy at frugalware.org (crazy)
Date: Fri Dec  7 21:29:30 2007
Subject: [Frugalware-git] frugalware-current: efltk-2.0.7-1-i686
Message-ID: <20071207202929.2CB7311904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec01227c63acda7defe041d010b0b8a3af9ada97

commit ec01227c63acda7defe041d010b0b8a3af9ada97
Author: crazy 
Date:   Fri Dec 7 21:28:53 2007 +0100

efltk-2.0.7-1-i686
* Version bump
* removed all merged patches

diff --git a/source/xlib-extra/efltk/02-fix-Fl_Text_Buffer.h-extra_qualification.patch b/source/xlib-extra/efltk/02-fix-Fl_Text_Buffer.h-extra_qualification.patch
deleted file mode 100644
index 251284c..0000000
--- a/source/xlib-extra/efltk/02-fix-Fl_Text_Buffer.h-extra_qualification.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur efltk/efltk/Fl_Text_Buffer.h efltk-p/efltk/Fl_Text_Buffer.h
---- efltk/efltk/Fl_Text_Buffer.h	2006-09-02 22:55:52.000000000 +0200
-+++ efltk-p/efltk/Fl_Text_Buffer.h	2006-09-03 13:25:26.391963896 +0200
-@@ -78,7 +78,7 @@
-    Fl_Text_Buffer(int requestedSize = 0);
-    ~Fl_Text_Buffer();
-
--   char *Fl_Text_Buffer::static_buffer();
-+   char *static_buffer();
-
-     // Undo stack size: (default 50)
-    int undo_size();
diff --git a/source/xlib-extra/efltk/03-fix-Fl_Combo_Box.h-extra_qualification.patch b/source/xlib-extra/efltk/03-fix-Fl_Combo_Box.h-extra_qualification.patch
deleted file mode 100644
index 551adf4..0000000
--- a/source/xlib-extra/efltk/03-fix-Fl_Combo_Box.h-extra_qualification.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur efltk/efltk/Fl_Combo_Box.h efltk-p/efltk/Fl_Combo_Box.h
---- efltk/efltk/Fl_Combo_Box.h	2006-09-02 22:55:52.000000000 +0200
-+++ efltk-p/efltk/Fl_Combo_Box.h	2006-09-03 13:40:32.269249616 +0200
-@@ -23,8 +23,8 @@
-
-     void ctor_init();
- protected:
--    static void Fl_Combo_Box::cb_browse(Fl_Widget *w, void *data);
--    static void Fl_Combo_Box::cb_button(Fl_Widget *w, void *data);
-+    static void cb_browse(Fl_Widget *w, void *data);
-+    static void cb_button(Fl_Widget *w, void *data);
- public:
-     static Fl_Named_Style* default_style;
-
diff --git a/source/xlib-extra/efltk/04-no-test.patch b/source/xlib-extra/efltk/04-no-test.patch
deleted file mode 100644
index c3bf8e0..0000000
--- a/source/xlib-extra/efltk/04-no-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur efltk/Makefile efltk-p/Makefile
---- efltk/Makefile	2006-09-02 22:55:49.000000000 +0200
-+++ efltk-p/Makefile	2006-09-03 15:12:11.974167384 +0200
-@@ -25,7 +25,7 @@
- SHELL=/bin/sh
- OS_NAME := $(shell uname -s | sed "s/\//-/" | sed "s/_/-/" | sed "s/-.*//g")
-
--DIRS = src tools themes efltk locale test
-+DIRS = src tools themes efltk locale
-
- GENERATED = makeinclude efltk-config
-
diff --git a/source/xlib-extra/efltk/FrugalBuild b/source/xlib-extra/efltk/FrugalBuild
index d78395c..c90dd2e 100644
--- a/source/xlib-extra/efltk/FrugalBuild
+++ b/source/xlib-extra/efltk/FrugalBuild
@@ -3,31 +3,24 @@
# Contributor: BMH1980 

pkgname=efltk
-pkgver=2.0.6
-pkgrel=2
+pkgver=2.0.7
+pkgrel=1
pkgdesc="EFltk is a LGPL'd C++ graphical user interface toolkit"
_F_sourceforge_dirname="ede"
-_F_sourceforge_ext=".tar.bz2"
_F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://equinox-project.org/"
+source=($source 01-fix-cflags.patch)
license="LGPL"
depends=('libjpeg' 'libstdc++' 'libpng' 'mesa' 'libxrender' 'freetype2>=2.3.1' 'fontconfig' 'unixodbc' 'libxft')
groups=('xlib-extra')
archs=('i686' 'x86_64')
-source=($source \
-	01-fix-cflags.patch  02-fix-Fl_Text_Buffer.h-extra_qualification.patch \
-	03-fix-Fl_Combo_Box.h-extra_qualification.patch 04-no-test.patch \
-	efltk-2.0.6-1-x86_64.diff)
-sha1sums=('314b749d9ee8f2723fe8127b6f0533252102009c' \
-          '0c8f452f9b3234f8e1694b149bc649ee01569f5b' \
-          '0945594a6968fc1cefca7c1810a4157c41863cea' \
-          'b0c2b44e11118b022a12fdee89a4d0a215c11bf9' \
-          '745cc08458254b73077d0ef16c729cc2de77620a' \
-          '7d6c501907cba2e6cd672c2882e137ad5a40562a')
+sha1sums=('b5a4911414e7d933df5e339dab34c7a18a691736' \
+          '0c8f452f9b3234f8e1694b149bc649ee01569f5b')

build()
{
+	export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
Fcd $pkgname
Fpatchall
rm configure
diff --git a/source/xlib-extra/efltk/efltk-2.0.6-1-x86_64.diff b/source/xlib-extra/efltk/efltk-2.0.6-1-x86_64.diff
deleted file mode 100644
index 972bc8a..0000000
--- a/source/xlib-extra/efltk/efltk-2.0.6-1-x86_64.diff
+++ /dev/null
@@ -1,163 +0,0 @@
-One of the errors:
-make[2]: Entering directory `/var/tmp/fst/src/efltk/src/core'
-Compiling Fl.cpp...
-/var/tmp/fst/src/efltk/efltk/Fl_Flags.h: In constructor 'Fl_Flags::Fl_Flags(void*)':
-/var/tmp/fst/src/efltk/efltk/Fl_Flags.h:92: error: cast from 'void*' to 'int' loses precision
-/var/tmp/fst/src/efltk/efltk/Fl_Int_List.h: In member function 'int Fl_Int_List::item(uint) const':
-/var/tmp/fst/src/efltk/efltk/Fl_Int_List.h:46: error: cast from 'void*' to 'int' loses precision
-/var/tmp/fst/src/efltk/efltk/Fl_Widget.h: In static member function 'static void Fl_Widget::cb_i_slot_active(void*, void*, i
-nt, void*, void*)':
-/var/tmp/fst/src/efltk/efltk/Fl_Widget.h:366: error: cast from 'void*' to 'int' loses precision
-/var/tmp/fst/src/efltk/efltk/Fl_Widget.h: In static member function 'static void Fl_Widget::cb_i_slot_visibility(void*, void
-*, int, void*, void*)':
-/var/tmp/fst/src/efltk/efltk/Fl_Widget.h:367: error: cast from 'void*' to 'int' loses precision
-make[2]: *** [Fl.shared.o] Error 1
-make[2]: Leaving directory `/var/tmp/fst/src/efltk/src/core'
-make[1]: *** [shared] Error 2
-make[1]: Leaving directory `/var/tmp/fst/src/efltk/src'
-make: *** [all] Error 2
-Casting void* to int is not a good idea, let's use long instead.
---- ./src/widgets/Fl_Calendar.cpp.orig	2006-11-18 03:15:00.000000000 +0100
-+++ ./src/widgets/Fl_Calendar.cpp	2006-11-18 03:15:20.000000000 +0100
-@@ -43,13 +43,13 @@
- // Callback function for day buttons
- void Fl_Calendar::cbDayButtonClicked(Fl_Widget *button, void *param) {
-     Fl_Calendar *c = (Fl_Calendar *)button->parent()->parent();
--    c->dayButtonClicked((unsigned)param);
-+    c->dayButtonClicked((unsigned long)param);
- }
-
- // Callback function for switch buttons
- void Fl_Calendar::cbSwitchButtonClicked(Fl_Widget *button, void *param) {
-     Fl_Calendar *c = (Fl_Calendar *)button->parent();
--    c->switchButtonClicked((int)param);
-+    c->switchButtonClicked((long)param);
- }
-
- void Fl_Calendar::dayButtonClicked(unsigned day) {
---- ./src/widgets/Fl_Input.cpp.orig	2006-11-18 03:15:44.000000000 +0100
-+++ ./src/widgets/Fl_Input.cpp	2006-11-18 03:15:52.000000000 +0100
-@@ -59,7 +59,7 @@
- static void cb_menu(Fl_Widget *w, void *d)
- {
-     if(!menu_widget) return;
--    switch((int)d) {
-+    switch((long)d) {
-         case CUT:
-             menu_widget->copy(true);
-             menu_widget->cut();
---- ./src/widgets/Fl_Text_Editor.cpp.orig	2006-11-18 03:16:26.000000000 +0100
-+++ ./src/widgets/Fl_Text_Editor.cpp	2006-11-18 03:16:35.000000000 +0100
-@@ -45,7 +45,7 @@
- {
-     if(!menu_widget) return;
-     char *selection = 0;
--    switch((int)d) {
-+    switch((long)d) {
-         case COPY:
-             selection = (char *)menu_widget->buffer()->selection_text();
-             if(*selection) {
---- ./efltk/db/Fl_Params.h.orig	2006-11-18 03:13:58.000000000 +0100
-+++ ./efltk/db/Fl_Params.h	2006-11-18 03:14:25.000000000 +0100
-@@ -45,7 +45,7 @@
-     void       bind_clear() { m_bindParamIndexes.clear(); }
-     void       bind_add(unsigned bindIndex);
-     unsigned   bind_count() { return m_bindParamIndexes.count(); }
--    unsigned   bind_index(unsigned ind) { return (unsigned)m_bindParamIndexes[ind]; }
-+    unsigned   bind_index(unsigned ind) { return (unsigned long)m_bindParamIndexes[ind]; }
-
-     // ASSIGNMENT OPERATORS
-     Fl_Variant& operator =(const Fl_Variant &C) {
---- ./efltk/Fl_Flags.h.orig	2006-11-18 03:10:46.000000000 +0100
-+++ ./efltk/Fl_Flags.h	2006-11-18 03:11:22.000000000 +0100
-@@ -89,7 +89,7 @@
-     Fl_Flags(long flags) : m_flags(flags) { }
-     Fl_Flags(unsigned flags) : m_flags(flags) { }
-     Fl_Flags(int flags) : m_flags(flags) { }
--    Fl_Flags(void* flags) : m_flags((int)flags) { }
-+    Fl_Flags(void* flags) : m_flags((long)flags) { }
-     Fl_Flags() : m_flags(0) { }
-
-     bool is_set(int flags) const { return (m_flags&flags)!=0; }
---- ./efltk/Fl_Int_List.h.orig	2006-11-18 03:11:34.000000000 +0100
-+++ ./efltk/Fl_Int_List.h	2006-11-18 03:11:45.000000000 +0100
-@@ -43,7 +43,7 @@
-     char *to_string(const char *separator=",");
-     void from_string(const char * s, const char * separator=",");
-
--    int item(uint index) const { return (int)Fl_Ptr_List::item(index); }
-+    int item(uint index) const { return (long)Fl_Ptr_List::item(index); }
-     int &operator [](uint ind) const { return (int&)items[ind]; }
- };
-
---- ./efltk/Fl_Widget.h.orig	2006-11-18 03:12:03.000000000 +0100
-+++ ./efltk/Fl_Widget.h	2006-11-18 03:12:16.000000000 +0100
-@@ -363,8 +363,8 @@
- public:
-     /* Define default slots */
-     DEFSLOT_O(Fl_Widget, Fl_Widget, slot_label, const char *);
--    DEFSLOT_O(Fl_Widget, Fl_Widget, slot_active, int);
--    DEFSLOT_O(Fl_Widget, Fl_Widget, slot_visibility, int);
-+    DEFSLOT_O(Fl_Widget, Fl_Widget, slot_active, long);
-+    DEFSLOT_O(Fl_Widget, Fl_Widget, slot_visibility, long);
-
- 	/**
- 	 * Change label of widget. This function redraws label also.
---- ./tools/efluid/Fl_Widget_Type.cpp.orig	2006-11-18 03:17:49.000000000 +0100
-+++ ./tools/efluid/Fl_Widget_Type.cpp	2006-11-18 03:18:33.000000000 +0100
-@@ -608,7 +608,7 @@
-         i->value(e ? e-whenmenu : 0);
-     } else {
-         int m = i->value();
--        int n = int(whenmenu[m].compiled);
-+        int n = long(whenmenu[m].compiled);
-         for_all_selected_widgets() {
-             modflag = 1;
-             Fl_Widget_Type* q = (Fl_Widget_Type*)o;
-@@ -1209,7 +1209,7 @@
-         int fval = 0, val = current_widget->o->layout_align();
-         const Enumeration *e;
-         for(e = layoutalignmenu; e->menu_entry; e++, fval++){
--            if (val == (int)e->compiled) break;
-+            if (val == (long)e->compiled) break;
-         }
-         if (e->menu_entry == 0) fval = 0;
-         i->value(fval);
-@@ -1218,7 +1218,7 @@
-
-         for_all_selected_widgets() {
-             Fl_Widget_Type* q = (Fl_Widget_Type*)o;
--            int al = (int)layoutalignmenu[i->value()].compiled;
-+            int al = (long)layoutalignmenu[i->value()].compiled;
-             int oal = q->o->layout_align();
-             if (al != oal) {
-                 q->o->layout_align((Fl_AlignEnum)al);
-@@ -1515,7 +1515,7 @@
-         i->redraw();
-     } else {
-         const Enumeration* table = current_widget->subtypes();
--        int n = int(table[i->value()].compiled);
-+        int n = long(table[i->value()].compiled);
-         for_all_selected_widgets() {
-             modflag = 1;
-             Fl_Widget_Type* q = (Fl_Widget_Type*)o;
---- ./tools/efluid/Fl_Type.cpp.orig	2006-11-18 03:18:45.000000000 +0100
-+++ ./tools/efluid/Fl_Type.cpp	2006-11-18 03:19:01.000000000 +0100
-@@ -67,7 +67,7 @@
- const Enumeration* from_value(int data, const Enumeration* table)
- {
-   for (;table->menu_entry; table++)
--    if (int(table->compiled) == data) return table;
-+    if (long(table->compiled) == data) return table;
-   return 0;
- }
-
-@@ -99,7 +99,7 @@
- {
-   if (table) {
-     const Enumeration* t = from_text(text, table);
--    if (t) return int(t->compiled);
-+    if (t) return long(t->compiled);
-   }
-   return strtol(text, 0, 0);
- }
From vmiklos at frugalware.org  Fri Dec  7 22:08:09 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 22:08:11 2007
Subject: [Frugalware-git] 
	frugalware-current: autoconf-archive-2007_12_06-1-i686
Message-ID: <20071207210809.1BDE011904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=657a841ae77314fc76cc000a80dbd8f05b523764

commit 657a841ae77314fc76cc000a80dbd8f05b523764
Author: Miklos Vajna 
Date:   Fri Dec 7 22:08:00 2007 +0100

autoconf-archive-2007_12_06-1-i686
version bump

diff --git a/source/devel-extra/autoconf-archive/FrugalBuild b/source/devel-extra/autoconf-archive/FrugalBuild
index dd13fce..0cb1f27 100644
--- a/source/devel-extra/autoconf-archive/FrugalBuild
+++ b/source/devel-extra/autoconf-archive/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=autoconf-archive
-pkgver=2007_11_22
+pkgver=2007_12_06
pkgrel=1
pkgdesc="Aims to provide a collection of reusable Autoconf macros."
url="http://autoconf-archive.cryp.to/"
@@ -11,5 +11,5 @@ groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep tar.bz2$|sed 's/.*archive-\(.*\).t.*/\1/;s/-/_/g;q'"
source=(http://autoconf-archive.cryp.to/autoconf-archive-${pkgver//_/-}.tar.bz2)
-sha1sums=('07ea6651b00a59bf2751a0fa1e6b5f6a03392c24')
+sha1sums=('71517ebf316344231b9e0778f86135ccf586db8a')
_F_cd_path="autoconf-archive-${pkgver//_/-}"
From vmiklos at frugalware.org  Fri Dec  7 22:58:22 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 22:58:26 2007
Subject: [Frugalware-git] frugalware-current: amrnb-7.0.0.0-1-x86_64
Message-ID: <20071207215822.6662D11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46a95d7411f422f8d7f275bf084803737b230f83

commit 46a95d7411f422f8d7f275bf084803737b230f83
Author: Miklos Vajna 
Date:   Fri Dec 7 22:58:17 2007 +0100

amrnb-7.0.0.0-1-x86_64
added x86_64 to archs()

diff --git a/source/lib/amrnb/FrugalBuild b/source/lib/amrnb/FrugalBuild
index c1b9e8f..6b7bb24 100644
--- a/source/lib/amrnb/FrugalBuild
+++ b/source/lib/amrnb/FrugalBuild
@@ -8,7 +8,7 @@ pkgdesc="Wrapper library for 3GPP Adaptive Multi-Rate Floating-point Speech Code
url="http://www.penguin.cz/~utx/amr"
depends=('glibc')
groups=('lib')
-archs=('i686')
+archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep amrnb |Flasttarbz2"
source=(http://ftp.penguin.cz/pub/users/utx/amr/amrnb-$pkgver.tar.bz2 \
http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip)
From vmiklos at frugalware.org  Fri Dec  7 22:59:39 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 22:59:41 2007
Subject: [Frugalware-git] frugalware-current: amrwb-7.0.0.2-1-x86_64
Message-ID: <20071207215939.8605711904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f358f15f23442e2a424f925cf77c393f1591b60f

commit f358f15f23442e2a424f925cf77c393f1591b60f
Author: Miklos Vajna 
Date:   Fri Dec 7 22:59:36 2007 +0100

amrwb-7.0.0.2-1-x86_64
added x86_64 to archs()

diff --git a/source/lib/amrwb/FrugalBuild b/source/lib/amrwb/FrugalBuild
index 1bd198b..aaf2031 100644
--- a/source/lib/amrwb/FrugalBuild
+++ b/source/lib/amrwb/FrugalBuild
@@ -8,7 +8,7 @@ pkgdesc="Wrapper library for 3GPP Adaptive Multi-Rate Wideband Floating-point Sp
url="http://www.penguin.cz/~utx/amr"
depends=('glibc')
groups=('lib')
-archs=('i686')
+archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep amrwb |Flasttarbz2"
source=(http://ftp.penguin.cz/pub/users/utx/amr/amrwb-$pkgver.tar.bz2 \
http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-700.zip)
From vmiklos at frugalware.org  Fri Dec  7 23:26:36 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 23:26:47 2007
Subject: [Frugalware-git] frugalware-current: ltp-20071130-1-i686
Message-ID: <20071207222636.DC84E11904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51e4358eefacc374339205fe51798edb88d7858e

commit 51e4358eefacc374339205fe51798edb88d7858e
Author: Miklos Vajna 
Date:   Fri Dec 7 22:39:30 2007 +0100

ltp-20071130-1-i686
version bump

diff --git a/source/apps-extra/ltp/FrugalBuild b/source/apps-extra/ltp/FrugalBuild
index 6cda2e8..b3842c6 100644
--- a/source/apps-extra/ltp/FrugalBuild
+++ b/source/apps-extra/ltp/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=ltp
-pkgver=20071031
+pkgver=20071130
# sometimes != $pkgver
realver=$pkgver
pkgrel=1
@@ -16,7 +16,7 @@ groups=('apps-extra')
archs=('i686' 'x86_64')
source=(${source/ltp-/ltp-full-} $pkgname-{IDcheck_noninteractive,runltp_path}.diff \
ltp-20061222-linux2619.diff)
-sha1sums=('5f98a5fb82699827f1d55f0c65507ee105d4cfb9' \
+sha1sums=('b3e2a3fa3249b182d2a033939f84daffd40da9a6' \
'c7a2132257cf1c430a9692009952084746722c40' \
'e9ff5dbafdd07ebe796b2f064066d7dbb7c7b6c5' \
'0a6f6665340d6745904936484c42e6e874a0fc2d')
From vmiklos at frugalware.org  Fri Dec  7 23:26:36 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 23:26:48 2007
Subject: [Frugalware-git] frugalware-current: live-2007.12.07-1-i686
Message-ID: <20071207222636.EFFA811904C2@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6004b27b0b508b29bd5b13cf5c8f5e01379c395f

commit 6004b27b0b508b29bd5b13cf5c8f5e01379c395f
Author: Miklos Vajna 
Date:   Fri Dec 7 22:46:58 2007 +0100

live-2007.12.07-1-i686
version bump

diff --git a/source/multimedia/live/FrugalBuild b/source/multimedia/live/FrugalBuild
index 4d754e1..205ab14 100644
--- a/source/multimedia/live/FrugalBuild
+++ b/source/multimedia/live/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=live
-pkgver=2007.11.18
+pkgver=2007.12.07
pkgrel=1
pkgdesc="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
url="http://www.live555.com/"
@@ -11,7 +11,7 @@ groups=('multimedia')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.live555.com/liveMedia/public/|grep tar.gz$|sed 's/.*live.\(.*\)\.t.*/\1/;q'"
source=(http://www.live555.com/liveMedia/public/live.$pkgver.tar.gz)
-sha1sums=('6cfb9fffad02af064a109863fb1f53990610e2d2')
+sha1sums=('0f466fafec96841b975a978fde9405ea9084b631')

build()
{
From vmiklos at frugalware.org  Fri Dec  7 23:26:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 23:26:49 2007
Subject: [Frugalware-git] frugalware-current: mplayerplug-in-3.50-1-i686
Message-ID: <20071207222637.1211211904C3@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95234ac9a47d506d65307ac0f83fe6e9d4572f11

commit 95234ac9a47d506d65307ac0f83fe6e9d4572f11
Author: Miklos Vajna 
Date:   Fri Dec 7 22:51:19 2007 +0100

mplayerplug-in-3.50-1-i686
version bump

diff --git a/source/xlib-extra/mplayerplug-in/FrugalBuild b/source/xlib-extra/mplayerplug-in/FrugalBuild
index cd026ee..2ea4095 100644
--- a/source/xlib-extra/mplayerplug-in/FrugalBuild
+++ b/source/xlib-extra/mplayerplug-in/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=mplayerplug-in
-pkgver=3.45
+pkgver=3.50
pkgrel=1
pkgdesc="A browser plugin that uses mplayer to play digital media from websites"
depends=('nss' 'libxpm' 'mplayer')
@@ -15,6 +15,6 @@ up2date="lynx -dump $url|grep Current|sed 's/.*: \(.*\) r.*/\1/'"
_F_cd_path="$pkgname"
Fconfopts="$Fconfopts --enable-x"
source=(${source[@]} mplayerplug-in-gcc4.patch)
-sha1sums=('39a888c6e65b83f862abef83f5e0381ec7a6a6ea' \
+sha1sums=('54e5d7a3b33f503830183545f7bc278d37cb89d5' \
'aca3e9f0a69bac7aaeb6ade07b7cf31509163fd4')
# optimization OK
From vmiklos at frugalware.org  Fri Dec  7 23:26:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 23:26:50 2007
Subject: [Frugalware-git] frugalware-current: kvm-55-1-i686
Message-ID: <20071207222637.2715D11904C4@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dc57a3e6026c1a37a2a9f432c7de21afd40261ab

commit dc57a3e6026c1a37a2a9f432c7de21afd40261ab
Author: Miklos Vajna 
Date:   Fri Dec 7 23:04:56 2007 +0100

kvm-55-1-i686
version bump

diff --git a/source/xapps-extra/kvm/FrugalBuild b/source/xapps-extra/kvm/FrugalBuild
index 89ca002..a38d7ce 100644
--- a/source/xapps-extra/kvm/FrugalBuild
+++ b/source/xapps-extra/kvm/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: AlexExtreme 

pkgname=kvm
-pkgver=53
+pkgver=55
pkgrel=1
pkgdesc="KVM is a kernel based virtual machine"
url="http://kvm.sourceforge.net"
@@ -12,7 +12,7 @@ archs=('i686')
Finclude sourceforge kernel-version
depends=("kernel>=$_F_kernelver_ver" 'sdl' 'zlib')
makedepends=("kernel-source>=$_F_kernelver_ver" 'gcc-3.3')
-sha1sums=('e004d84a4721c772ceecda3b297e60ee03b7b243')
+sha1sums=('d5899f5162f40436c7cfc067789365e7ad2cfa6b')
Fconfopts="--prefix=$Fprefix"

# no changelog in the tarball, you can reach it here:
From vmiklos at frugalware.org  Fri Dec  7 23:26:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 23:26:51 2007
Subject: [Frugalware-git] frugalware-current: gnormalize-0.53-1-i686
Message-ID: <20071207222637.3AF8A11904C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fbdd811488509235b03c9765f06add3f42a9f0be

commit fbdd811488509235b03c9765f06add3f42a9f0be
Author: Miklos Vajna 
Date:   Fri Dec 7 23:07:37 2007 +0100

gnormalize-0.53-1-i686
version bump

diff --git a/source/xapps-extra/gnormalize/FrugalBuild b/source/xapps-extra/gnormalize/FrugalBuild
index 846bf5d..74ae345 100644
--- a/source/xapps-extra/gnormalize/FrugalBuild
+++ b/source/xapps-extra/gnormalize/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=gnormalize
-pkgver=0.52
+pkgver=0.53
pkgrel=1
pkgdesc="An audio converter, a front end to normalize, and an encoder/decoder"
rodepends=('perl-gtk2' 'normalize' 'cdparanoia' 'lame' 'faac' 'vorbis-tools' \
@@ -24,5 +24,5 @@ build()
Ffilerel icons/gnormalize-48.png /usr/share/icons/large/gnormalize.png
Ffile /usr/share/applications/gnormalize.desktop
}
-sha1sums=('85bebbdf9725be31c03ad50fb720ca4600fa2daf' \
-	  'caa01187c4662a2957e1030be5d48db03dde533a')
+sha1sums=('e4165a0a1159078bf7a315d909f046d6d1f75e5b' \
+          'caa01187c4662a2957e1030be5d48db03dde533a')
From vmiklos at frugalware.org  Fri Dec  7 23:26:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 23:26:51 2007
Subject: [Frugalware-git] 
	frugalware-current: firefox-flashblock-1.5.5-1-i686
Message-ID: <20071207222637.4B46011904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9bc71c126f272c7ac67a4a171ea7aa9e81570de2

commit 9bc71c126f272c7ac67a4a171ea7aa9e81570de2
Author: Miklos Vajna 
Date:   Fri Dec 7 23:08:43 2007 +0100

firefox-flashblock-1.5.5-1-i686
version bump

diff --git a/source/xapps-extra/firefox-flashblock/FrugalBuild b/source/xapps-extra/firefox-flashblock/FrugalBuild
index 6d7e3b8..be56a67 100644
--- a/source/xapps-extra/firefox-flashblock/FrugalBuild
+++ b/source/xapps-extra/firefox-flashblock/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=firefox-flashblock
_F_firefox_ext=flashblock
_F_firefox_id=3d7eb24f-2740-49df-8937-200b1cc08f8a
-pkgver=1.5.4.1
+pkgver=1.5.5
pkgrel=1
pkgdesc="Replaces Flash objects with a button you can click to view them."
url="http://flashblock.mozdev.org/"
@@ -14,6 +14,6 @@ archs=('i686' 'x86_64')
up2date="lynx -dump http://downloads.mozdev.org/flashblock/|grep [0-9].xpi$|sed 's/.*-\(.*\)\.xpi/\1/'|Fsort|tail -n 1"
source=(http://downloads.mozdev.org/$_F_firefox_ext/$_F_firefox_ext-$pkgver.xpi \
chrome.manifest)
-sha1sums=('11f2f3c250b77a0331646079187b509a4b904206' \
+sha1sums=('409e768f67a9cb7f3e9369eae7fa73a7896c683f' \
'08b5540b3fc3872cdf3124ead702c0db7b6df7b7')
Finclude firefox-extension
From vmiklos at frugalware.org  Fri Dec  7 23:26:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 23:26:51 2007
Subject: [Frugalware-git] frugalware-current: rssowl-1.2.4-1-i686
Message-ID: <20071207222637.541DC11904C2@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=29e76f71ee0b7cc5b7c7586549044b2c0c55c8a9

commit 29e76f71ee0b7cc5b7c7586549044b2c0c55c8a9
Author: Miklos Vajna 
Date:   Fri Dec 7 23:16:02 2007 +0100

rssowl-1.2.4-1-i686
version bump

diff --git a/source/xapps-extra/rssowl/FrugalBuild b/source/xapps-extra/rssowl/FrugalBuild
index 87da20a..83689aa 100644
--- a/source/xapps-extra/rssowl/FrugalBuild
+++ b/source/xapps-extra/rssowl/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=rssowl
-pkgver=1.2.3
+pkgver=1.2.4
pkgrel=1
pkgdesc="A mature Java-based RSS/RDF/Atom Newsreader with advanced features."
_F_sourceforge_ext="_src.tar.gz"
@@ -32,4 +32,4 @@ build()
Fdesktop "/usr/bin/rssowl" "/usr/share/pixmaps/rssowl.xpm" "Application;Network;"
}

-sha1sums=('f5b2c67b0b41fc1dcb337099ca894599b36bca84')
+sha1sums=('1663a2813361332346e4b7acfeb912bd7c97157a')
From vmiklos at frugalware.org  Fri Dec  7 23:26:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 23:26:52 2007
Subject: [Frugalware-git] frugalware-current: squid-2.6.STABLE17-1-i686
Message-ID: <20071207222637.621EF11904C6@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8300260dbb222daaa008e2a905c377cd8aaa5d8d

commit 8300260dbb222daaa008e2a905c377cd8aaa5d8d
Author: Miklos Vajna 
Date:   Fri Dec 7 23:26:04 2007 +0100

squid-2.6.STABLE17-1-i686
version bump

diff --git a/source/network-extra/squid/FrugalBuild b/source/network-extra/squid/FrugalBuild
index 44817b4..f417a10 100644
--- a/source/network-extra/squid/FrugalBuild
+++ b/source/network-extra/squid/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=squid
-pkgver=2.6.STABLE16
+pkgver=2.6.STABLE17
pkgrel=1
pkgdesc="Squid Web Proxy Cache"
url="http://www.squid-cache.org/"
@@ -15,11 +15,11 @@ up2date="lynx -dump $url/Versions/v2/2.6/|grep -1 Current|sed -n 's/.*-\([^ ]*\)
source=(http://www.squid-cache.org/Versions/v2/2.6/$pkgname-$pkgver.tar.bz2 \
$pkgname-2.6.STABLE3-dirs.diff $pkgname-2.6.STABLE3-samba.diff \
$pkgname-2.6.STABLE3-username.diff rc.squid squid)
-sha1sums=('3140c0df8bad7cf3350bd4a02f4ac9582e6c4406' \
+sha1sums=('ca59eaf0d9a8956920611338334c38a418b49c14' \
'a1482482406661090951fa4c4304ca6604db2d14' \
'8eacf8bd974c461162aaba72b5bc4109cc1104c7' \
'7dbae27eeee7b62e685f6758a06d984b0b62668e' \
-          '57728d2d5388ea6184f40d87997e03e1363f787b' \
+          'a6d755b4ac0002d9a29c05795fff7c2574fc7f69' \
'53042dd86e482d4a6eff9e34ecb01352439c5026')

build()
From vmiklos at frugalware.org  Fri Dec  7 23:31:06 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Fri Dec  7 23:31:08 2007
Subject: [Frugalware-git] frugalware-current: mplayer-1.0rc2-2-x86_64
Message-ID: <20071207223106.860A511904C0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13e6af2b4d213fd1c45d67fb57e7fafa3dda432f

commit 13e6af2b4d213fd1c45d67fb57e7fafa3dda432f
Author: Miklos Vajna 
Date:   Fri Dec 7 23:30:53 2007 +0100

mplayer-1.0rc2-2-x86_64
make install vs smp

diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index d99ad7a..f3a8300 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -45,6 +45,7 @@ build()
--enable-runtime-cpudetection --enable-liblzo \
--enable-largefiles --enable-mga --enable-xmga \
--enable-tdfxfb --disable-vidix-internal
+	unset MAKEFLAGS
make DESTDIR=$Fdestdir install || Fdie
Fmkdir /usr/share/doc/$pkgname-$pkgver
mv DOCS/* $Fdestdir/usr/share/doc/$pkgname-$pkgver/
From devil505linux at gmail.com  Sat Dec  8 11:33:01 2007
From: devil505linux at gmail.com (Devil505)
Date: Sat Dec  8 11:33:03 2007
Subject: [Frugalware-git] frugalware-current: peertv-0.4.0.1-1-i686
Message-ID: <20071208103301.B27AB11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e441c4894ac0cd57faf88d3776870be67f5b6e33

commit e441c4894ac0cd57faf88d3776870be67f5b6e33
Author: Devil505 
Date:   Sat Dec 8 11:31:23 2007 +0100

peertv-0.4.0.1-1-i686
*New Package
*Closes FS#1583
*Authors contacted and are agree

diff --git a/source/xapps-extra/peertv/FrugalBuild b/source/xapps-extra/peertv/FrugalBuild
new file mode 100644
index 0000000..7093b3f
--- /dev/null
+++ b/source/xapps-extra/peertv/FrugalBuild
@@ -0,0 +1,26 @@
+# Compiling Time: 0.04 SBU
+# Maintainer: Devil505 
+
+pkgname=peertv
+pkgver=0.4.0.1
+pkgrel=1
+pkgdesc="Program to watch WebTV"
+url="http://www.peertv.eu"
+rodepends=('mplayer')
+depends=('wxgtk' 'libxxf86vm' 'expat' 'libxdamage')
+groups=('xapps-extra')
+archs=('i686')
+up2date="lynx -dump $url/peertvlinux/ | Flasttarbz2"
+source=($url/peertvlinux/$pkgname-$pkgver.tar.bz2)
+sha1sums=('d5f42a5c7ae408764194cc545f43b52d2ef7905e')
+
+_F_desktop_name="PeerTV"
+_F_desktop_icon="/usr/share/peertv/peertv.ico"
+_F_desktop_categories="AudioVideo;TV;"
+
+build()
+{
+    Fmake
+    Fmakeinstall
+    Fdesktop2
+}
\ No newline at end of file
From devil505linux at gmail.com  Sat Dec  8 11:44:32 2007
From: devil505linux at gmail.com (Devil505)
Date: Sat Dec  8 11:44:34 2007
Subject: [Frugalware-git] frugalware-current: *Modify depends (wxgtk>=2.8.7)
Message-ID: <20071208104432.D8B0E11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f4eb042d3ce1cddf5fae98e49c30a58bde9868f3

commit f4eb042d3ce1cddf5fae98e49c30a58bde9868f3
Author: Devil505 
Date:   Sat Dec 8 11:44:11 2007 +0100

*Modify depends (wxgtk>=2.8.7)

diff --git a/source/xapps-extra/peertv/FrugalBuild b/source/xapps-extra/peertv/FrugalBuild
index 7093b3f..1dbbd1d 100644
--- a/source/xapps-extra/peertv/FrugalBuild
+++ b/source/xapps-extra/peertv/FrugalBuild
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Program to watch WebTV"
url="http://www.peertv.eu"
rodepends=('mplayer')
-depends=('wxgtk' 'libxxf86vm' 'expat' 'libxdamage')
+depends=('wxgtk>=2.8.7' 'libxxf86vm' 'expat' 'libxdamage')
groups=('xapps-extra')
archs=('i686')
up2date="lynx -dump $url/peertvlinux/ | Flasttarbz2"
From crazy at frugalware.org  Sat Dec  8 12:21:04 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 12:21:06 2007
Subject: [Frugalware-git] frugalware-current: ede-1.2-1-i686
Message-ID: <20071208112104.E11D111904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=827d0089c5cc68f0307f4253959b27572c9e4e1a

commit 827d0089c5cc68f0307f4253959b27572c9e4e1a
Author: crazy 
Date:   Sat Dec 8 12:20:01 2007 +0100

ede-1.2-1-i686
* Version bump
* more fixes for startede
* synced artwork
* CXXFLAGS fixed
* eworkpanel still crashes sometimes :/

diff --git a/source/x11-extra/ede/FrugalBuild b/source/x11-extra/ede/FrugalBuild
index 8027706..d786591 100644
--- a/source/x11-extra/ede/FrugalBuild
+++ b/source/x11-extra/ede/FrugalBuild
@@ -3,22 +3,32 @@
# Contributor: BMH1980 

pkgname=ede
-pkgver=1.1
-pkgrel=2
+pkgver=1.2
+pkgrel=1
pkgdesc="Equinox Desktop Environment (shortly EDE) is small desktop environment"
_F_sourceforge_broken_up2date=1
-_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://equinox-project.org/"
-depends=('efltk>=2.0.6-2')
-makedepends=('imagemagick')
+depends=('efltk>=2.0.7' 'libxext' 'libgcc' 'libxml2')
rodepends=('xorg-server' 'xsetroot' 'xscreensaver' 'xrdb' 'xmessage' 'firefox' 'xmms')
groups=('x11-extra')
archs=('i686' '!x86_64')
license="GPL2"
-source=($source http://ede.sourceforge.net/themes/EdeAirlock/EdeAirlock.tar.bz2 \
-	http://frugalware.org/~nadfoka/0.6/background.jpg \
-        $pkgname.desktop xinitrc.$pkgname startede.patch fw-defaults.patch)
+source=($source http://equinox-project.org/themes/EdeAirlock/EdeAirlock.tar.bz2 \
+	http://ftp.frugalware.org/pub/other/sources/ede/frugalware.jpg \
+        $pkgname.desktop \
+	xinitrc.$pkgname \
+	startede.patch \
+	fw-defaults.patch \
+	cxxflags.patch)
+sha1sums=('3ed41a5382c6374ba2c9d8b6fff88e26205c5a0f' \
+          'caead6461b78f7d671d6f226dbd38162fc2e6949' \
+          '4e485b070b28ff2116618aece0331b94f6c790e2' \
+          'd5e9f0923aa3e18277166c7a346bc49abd244b17' \
+          '21809e574d9b9ec838707dc31ecf879f9793ff6b' \
+          '79f0559efdfccdaeb269737d9808cd21836df4bb' \
+          'bc7cb26aee7fee94fb0a5263e8e10bd0c0492e1f' \
+          '4ad02f4836bb92ee0761e70d5bae882e8e002764')
# TODO: rework Menus, XX.png's and new desktop files, fw-theme

build()
@@ -26,23 +36,16 @@ build()
Fcd $pkgname
Fpatchall
Fmkdir usr/bin usr/share/pixmaps usr/share/$pkgname/{wallpapers,themes}
-	Fconf --disable-debug
+	Fconf --disable-debug --disable-silent
make || Fdie
make LOCALEDIR="$Fdestdir/usr/share/locale" prefix="$Fdestdir/usr" install || Fdie
-	cd ..
-	/usr/bin/convert background.jpg -resize  1024x786 frugalware.jpg || Fdie
-	cd $pkgname
+
Ffile /etc/X11/sessions/$pkgname.desktop
Fexe /etc/X11/xinit/xinitrc.$pkgname
Fmv usr/share/$pkgname/doc/$pkgname.png usr/share/pixmaps
Fcpr EdeAirlock usr/share/$pkgname/themes/EdeAirlock
-	Fcpr background.jpg  usr/share/$pkgname/wallpapers/1600x1200-frugalware.jpg
Fcpr frugalware.jpg usr/share/$pkgname/wallpapers/frugalware.jpg
}
-sha1sums=('e00356ad746c63aa0e1e98f9f5aeeff92eea7ae5'\
-          'caead6461b78f7d671d6f226dbd38162fc2e6949'\
-          '071229d076034c681ec4d18bf72c227d78cc467d'\
-          'd5e9f0923aa3e18277166c7a346bc49abd244b17'\
-          '21809e574d9b9ec838707dc31ecf879f9793ff6b'\
-          'c8c0ae02b65031fddbe8fd6eca29ff31b754220e'\
-          'bc7cb26aee7fee94fb0a5263e8e10bd0c0492e1f')
+
+
+# optimization OK
diff --git a/source/x11-extra/ede/cxxflags.patch b/source/x11-extra/ede/cxxflags.patch
new file mode 100644
index 0000000..ca1eb71
--- /dev/null
+++ b/source/x11-extra/ede/cxxflags.patch
@@ -0,0 +1,12 @@
+diff -Naur ede/makeinclude.in ede-p/makeinclude.in
+--- ede/makeinclude.in	2007-11-16 14:18:40.000000000 +0100
++++ ede-p/makeinclude.in	2007-12-08 11:50:35.000000000 +0100
+@@ -47,7 +47,7 @@
+ 	done
+
+ # compiler flags
+-CXXFLAGS	= -DSHAPE @CXXFLAGS@
++CXXFLAGS	+= -DSHAPE @CXXFLAGS@
+
+ # libraries
+ LIBS		= @LIBS@
diff --git a/source/x11-extra/ede/startede.patch b/source/x11-extra/ede/startede.patch
index d2df03f..f9890b9 100644
--- a/source/x11-extra/ede/startede.patch
+++ b/source/x11-extra/ede/startede.patch
@@ -1,6 +1,6 @@
diff -Naur ede/datas/startede.in ede-p/datas/startede.in
---- ede/datas/startede.in	2006-09-02 22:52:45.000000000 +0200
-+++ ede-p/datas/startede.in	2006-09-03 16:39:20.988236416 +0200
+--- ede/datas/startede.in	2007-11-16 14:18:28.000000000 +0100
++++ ede-p/datas/startede.in	2007-12-08 11:31:09.000000000 +0100
@@ -6,7 +6,7 @@
XSETROOT=`which xsetroot 2> /dev/null`

@@ -24,3 +24,14 @@ diff -Naur ede/datas/startede.in ede-p/datas/startede.in
fi

# If we have xsetroot than script shoult run it
+@@ -36,7 +33,9 @@
+ 	xscreensaver -nosplash &
+ fi
+
++## broken without that :/ - crazy -
++export LIBXCB_ALLOW_SLOPPY_LOCK=1
++
+ exec edewm &
+ exec eiconman &
+-etip &
+ exec eworkpanel
From crazy at frugalware.org  Sat Dec  8 14:55:22 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 14:55:25 2007
Subject: [Frugalware-git] frugalware-current: codeblocks-r4713-1-i686
Message-ID: <20071208135522.E1D1E11904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=70e1305c243b894cadcc23bbd5d6745ed0589696

commit 70e1305c243b894cadcc23bbd5d6745ed0589696
Author: crazy 
Date:   Sat Dec 8 14:52:21 2007 +0100

codeblocks-r4713-1-i686
* Version bump to an snapshot
* fixed url bug and CXXFLAGS
* fixed depends() and options() bugs
* s/build()/Fconfopts/
* contrib plugins are enabled now

diff --git a/source/xapps-extra/codeblocks/FrugalBuild b/source/xapps-extra/codeblocks/FrugalBuild
index 9218e18..de82e42 100644
--- a/source/xapps-extra/codeblocks/FrugalBuild
+++ b/source/xapps-extra/codeblocks/FrugalBuild
@@ -2,39 +2,19 @@
# Maintainer: Priyank Gosalia 

pkgname=codeblocks
-pkgver=1.0rc2
+pkgver=r4713
pkgrel=1
pkgdesc="A free cross platform C++ IDE"
-url="http://www.codeblocks.org/"
-depends=('wxgtk')
-makedepends=('hd2u' 'autoconf' 'libtool')
+depends=('libstdc++' 'wxgtk>=2.8.7' 'libxdamage' 'libxxf86vm' 'expat' 'libice' 'bzip2')
groups=('xapps-extra')
archs=('i686' 'x86_64')
_F_sourceforge_ext=".tgz"
+options=('scriptlet' 'force')
Finclude sourceforge
-source=(${source[@]} codeblocks-1.0rc2_main.patch codeblocks-1.0rc2_sdk.patch barholder.patch)
-sha1sums=('f5ffae4af7caeeef51b44fee76cf7c3d892b8efa' \
-	  '5195dd6a070da8bf4b8df5bde2c8ff1e27f3f8d8' \
-	  '2afef53b1fcb163cc6e0674cdeca312e9d4dc18b' \
-	  '7d2d3cf212ca8374e58bea1a7fe03b36fc79bf32')
-
-build() {
-	Fcd
-
-	# Apply patches to compile with gcc41
-	patch -Np0 -i $Fsrcdir/codeblocks-1.0rc2_main.patch || return 1
-	patch -Np0 -i $Fsrcdir/codeblocks-1.0rc2_sdk.patch || return 1
-	patch -Np0 -i $Fsrcdir/barholder.patch || return 1
-
-	# Build Code::Blocks
-	chmod +x bootstrap
-	dos2unix bootstrap && ./bootstrap
-	dos2unix configure
-	dos2unix src/setup/mime/{codeblocks.desktop,codeblocks.applications}
-	Fconf
-	find . -name Makefile -exec dos2unix {} \;
-	Fmake
-	Fmakeinstall
-}
+url="http://www.codeblocks.org/"
+source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
+Fconfopts="$Fconfopts --with-contrib-plugins=all,-wxsmith"
+sha1sums=('7ef647ce1d963fd64d1ff4c551a71ba4f0a20510')
+export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"

# optimization OK
diff --git a/source/xapps-extra/codeblocks/barholder.patch b/source/xapps-extra/codeblocks/barholder.patch
deleted file mode 100644
index 3474a44..0000000
--- a/source/xapps-extra/codeblocks/barholder.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/src/wxDockit/include/wx/barholder.h	2006-05-29 23:39:03.000000000 +0530
-+++ src/src/wxDockit/include/wx/barholder.h	2005-09-08 13:25:24.000000000 +0530
-@@ -39,7 +39,7 @@
-     }
-
-     // Normal constructor
--    wxBarHolder::wxBarHolder( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-+    wxBarHolder( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-         const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("barholder") ) {
-         Init();
-
diff --git a/source/xapps-extra/codeblocks/codeblocks-1.0rc2_main.patch b/source/xapps-extra/codeblocks/codeblocks-1.0rc2_main.patch
deleted file mode 100644
index 5061219..0000000
--- a/source/xapps-extra/codeblocks/codeblocks-1.0rc2_main.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/src/main.cpp	2006-05-30 16:33:56.000000000 +0530
-+++ src/src/main.cpp	2006-05-30 16:34:24.000000000 +0530
-@@ -65,7 +65,7 @@
- class wxMyFileDropTarget : public wxFileDropTarget
- {
- public:
--    wxMyFileDropTarget::wxMyFileDropTarget(MainFrame *frame):m_frame(frame){}
-+    wxMyFileDropTarget(MainFrame *frame):m_frame(frame){}
-     virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames)
-     {
-         if(!m_frame) return false;
diff --git a/source/xapps-extra/codeblocks/codeblocks-1.0rc2_sdk.patch b/source/xapps-extra/codeblocks/codeblocks-1.0rc2_sdk.patch
deleted file mode 100644
index fa670ca..0000000
--- a/source/xapps-extra/codeblocks/codeblocks-1.0rc2_sdk.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-# Patch for compiling codeblocks with gcc-4.1
-# Priyank 
-
---- src/sdk/managedthread.h	2006-05-30 15:49:01.000000000 +0530
-+++ src/sdk/managedthread.h	2006-05-30 15:49:16.000000000 +0530
-@@ -11,8 +11,8 @@
- class ManagedThread : public wxThread
- {
- public:
--    ManagedThread::ManagedThread(bool* abortflag  = 0L);
--    virtual ManagedThread::~ManagedThread();
-+    ManagedThread(bool* abortflag  = 0L);
-+    virtual ~ManagedThread();
-     static unsigned long count_running();
-     static unsigned long count_threads();
-     static void abort_all(); // Warning! Once set, can't be reset!
-
---- src/sdk/editormanager.h	2006-05-30 15:56:16.000000000 +0530
-+++ src/sdk/editormanager.h	2006-05-30 15:57:07.000000000 +0530
-@@ -126,7 +126,7 @@
-
-         /** Builds Opened Files tree in the Projects tab
-           */
--        wxTreeCtrl *EditorManager::GetTree();
-+        wxTreeCtrl* GetTree();
-         wxTreeItemId FindTreeFile(const wxString& filename);
-         wxString GetTreeItemFilename(wxTreeItemId item);
-         void BuildOpenedFilesTree(wxWindow* parent);
-
---- src/sdk/xtra_classes.h	2006-05-30 15:51:27.000000000 +0530
-+++ src/sdk/xtra_classes.h	2006-05-30 15:52:24.000000000 +0530
-@@ -18,8 +18,8 @@
- class wxSplitPanel : public wxPanel
- {
- public:
--    wxSplitPanel::wxSplitPanel() { /*nothing to init, really */ }
--    wxSplitPanel::wxSplitPanel(wxWindow* parent, wxWindowID id = -1,
-+    wxSplitPanel() { /*nothing to init, really */ }
-+    wxSplitPanel(wxWindow* parent, wxWindowID id = -1,
-                                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                                long style = wxTAB_TRAVERSAL, const wxString& name = _T("splitpanel"),const wxString configname = wxEmptyString,int defaultsashposition = 150)
-     {
-@@ -33,9 +33,9 @@
-       * If only one is found, the panel is not split.
-       *
-       */
--    void wxSplitPanel::RefreshSplitter(int idtop,int idbottom);
-+    void RefreshSplitter(int idtop,int idbottom);
-
--    virtual wxSplitPanel::~wxSplitPanel();
-+    virtual ~wxSplitPanel();
-     wxSplitterWindow* GetSplitter() { return (this) ? m_splitter : 0L; }
-     void SetConfigEntryForSplitter(const wxString& splitterconfig){ m_SplitterConfig = splitterconfig; }
- protected:
-
---- src/sdk/cbthreadpool.cpp		2006-05-30 16:10:00.000000000 +0530
-+++ src/sdk/cbthreadpool.cpp		2006-05-30 16:10:57.000000000 +0530
-@@ -250,7 +250,7 @@
- #if wxCHECK_VERSION(2,6,0)
-     wxMilliSleep(1);
- #else
--    wxUSleep(1);
-+    wxUsleep(1);
- #endif
-
-     wxLogNull logNo;
-@@ -265,7 +265,7 @@
- #if wxCHECK_VERSION(2,6,0)
-             wxMilliSleep(1);
- #else
--            wxUSleep(1);
-+            wxUsleep(1);
- #endif
-             if(++count > 10)
-                 break;
From crazy at frugalware.org  Sat Dec  8 16:50:39 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 16:50:43 2007
Subject: [Frugalware-git] frugalware-current: kdebase-3.5.8-2-i686
Message-ID: <20071208155039.77CE011904BF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c35db463ab9cd7a4c664159d862702b0d1304712

commit c35db463ab9cd7a4c664159d862702b0d1304712
Author: crazy 
Date:   Sat Dec 8 16:50:22 2007 +0100

kdebase-3.5.8-2-i686
* release bump
* added j2sdk to makedepends ( again :/ )

diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild
index 7b7850b..96cae68 100644
--- a/source/kde/kdebase/FrugalBuild
+++ b/source/kde/kdebase/FrugalBuild
@@ -3,12 +3,12 @@

pkgname=kdebase
pkgver=3.5.8
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Base Programs."
depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.8' 'libraw1394' 'hal>=0.5.7.1-3' 'mtools' 'libxdamage' \
'xscreensaver-data' 'bdftopcf' 'lmsensors' 'libxxf86misc' 'libfontenc' \
'setxkbmap' 'dbus-qt3>=20060814' 'libsmbclient>=3.0.24-2' 'xkeyboard-config' 'cyrus-sasl>=2.1.22-8' 'libldap')
-makedepends=('samba' 'imake' 'doxygen' 'qt-docs' 'graphviz' 'openldap')
+makedepends=('samba' 'imake' 'doxygen' 'qt-docs' 'graphviz' 'openldap' 'j2sdk')
rodepends=('xorg-server>=1.2.0' 'kde-frugalware>=0.7.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop')
groups=('kde' 'kde-minimal')
archs=('i686' 'x86_64')
From crazy at frugalware.org  Sat Dec  8 17:50:42 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 17:50:44 2007
Subject: [Frugalware-git] boost: boost-jam-3.1.16-1-i686
Message-ID: <20071208165042.3C6411190503@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=ff50ac57f2be814e3f79ea441614283504d3f182

commit ff50ac57f2be814e3f79ea441614283504d3f182
Author: crazy 
Date:   Sat Dec 8 17:50:26 2007 +0100

boost-jam-3.1.16-1-i686
* Version bump
* added cflags diff , fixes the segfaults
* new maintainer , Ok @ krix

diff --git a/source/devel-extra/boost-jam/FrugalBuild b/source/devel-extra/boost-jam/FrugalBuild
index d478850..960d342 100644
--- a/source/devel-extra/boost-jam/FrugalBuild
+++ b/source/devel-extra/boost-jam/FrugalBuild
@@ -1,8 +1,9 @@
# Compiling Time: 0.06 SBU
-# Maintainer: Christian Hamar alias krix 
+# Maintainer: crazy 
+# Contributor: Christian Hamar alias krix 

pkgname=boost-jam
-pkgver=3.1.14
+pkgver=3.1.16
pkgrel=1
pkgdesc="Boost.Jam - an alternative to make based on Jam."
_F_sourceforge_dirname="boost"
@@ -14,13 +15,16 @@ groups=('devel-extra')
archs=('x86_64' 'i686')
conflicts=('jam')
up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=7586'|grep -m 1 'boost-jam-[0-9\.]*.tgz'|sed 's/.*jam-\(.*\).tgz .*/\1/'"
-source=($source boost-jam-misc.patch)
-sha1sums=('6aaeaef716a70ed845d51bc87047c9b96d34e16e'\
-          'e47680c0c6878a151872d969e9aac103068c257f')
+source=($source boost-jam-misc.patch \
+	cflags.patch)
+sha1sums=('e2dd6ef9c56b18c7be7669aba374bcd24745ae95' \
+          'e47680c0c6878a151872d969e9aac103068c257f' \
+          'b7be7e370ae926b09bdd7514a170bc879a4d80f5')

build() {
Fpatchall
-	LOCATE_TARGET=bin ./build.sh cc
+	export CFLAGS="$CFLAGS -fno-strict-aliasing"
+	LOCATE_TARGET=bin ./build.sh gcc --symbols || Fdie
Fexerel bin/bjam /usr/bin/bjam
}

diff --git a/source/devel-extra/boost-jam/cflags.patch b/source/devel-extra/boost-jam/cflags.patch
new file mode 100644
index 0000000..a01be09
--- /dev/null
+++ b/source/devel-extra/boost-jam/cflags.patch
@@ -0,0 +1,57 @@
+diff -Naur boost-jam-3.1.16/build.jam boost-jam-3.1.16-flags/build.jam
+--- boost-jam-3.1.16/build.jam	2007-12-03 04:27:54.000000000 +0100
++++ boost-jam-3.1.16-flags/build.jam	2007-12-08 17:38:26.000000000 +0100
+@@ -176,7 +176,7 @@
+ ## GCC 2.x, 3.x, 4.x
+ toolset gcc gcc : "-o " : -D
+     : -pedantic -fno-strict-aliasing
+-    [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
++    [ opt --release : [ opt --symbols : -g : -s ] $(CFLAGS) ]
+     [ opt --debug : -g -O0 -fno-inline ]
+     -I$(--python-include) -I$(--extra-include) -Wno-long-long
+     : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+diff -Naur boost-jam-3.1.16/build.sh boost-jam-3.1.16-flags/build.sh
+--- boost-jam-3.1.16/build.sh	2007-12-03 04:27:54.000000000 +0100
++++ boost-jam-3.1.16-flags/build.sh	2007-12-08 17:36:50.000000000 +0100
+@@ -12,7 +12,7 @@
+ echo_run ()
+ {
+     echo "$@"
+-    $@
++    eval "$@"
+     r=$?
+     if test $r -ne 0 ; then
+         exit $r
+@@ -265,7 +265,7 @@
+     echo_run rm -rf bootstrap
+     echo_run mkdir bootstrap
+     if test ! -r jamgram.y -o ! -r jamgramtab.h ; then
+-        echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_YYACC} ${YYACC_SOURCES}
++        echo_run ${BOOST_JAM_CC} ${CFLAGS} ${BOOST_JAM_OPT_YYACC} ${YYACC_SOURCES}
+         if test -x "./bootstrap/yyacc0" ; then
+             echo_run ./bootstrap/yyacc0 jamgram.y jamgramtab.h jamgram.yy
+         fi
+@@ -279,16 +279,20 @@
+         mv -f y.tab.h jamgram.h
+     fi
+     if test ! -r jambase.c ; then
+-        echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_MKJAMBASE} ${MKJAMBASE_SOURCES}
++        echo_run ${BOOST_JAM_CC} ${CFLAGS} ${BOOST_JAM_OPT_MKJAMBASE} ${MKJAMBASE_SOURCES}
+         if test -x "./bootstrap/mkjambase0" ; then
+             echo_run ./bootstrap/mkjambase0 jambase.c Jambase
+         fi
+     fi
+-    echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_JAM} ${BJAM_SOURCES}
++    echo_run ${BOOST_JAM_CC} ${CFLAGS} ${BOOST_JAM_OPT_JAM} ${BJAM_SOURCES}
+ fi
+ if test -x "./bootstrap/jam0" ; then
+     if test "${BJAM_UPDATE}" != "update" ; then
+         echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" clean
+     fi
+-    echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
++    if test -z "$BOOST_JAM_TOOLSET_ROOT"; then
++        echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "$@"
++    else
++        echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
++    fi
+ fi
From crazy at frugalware.org  Sat Dec  8 19:44:34 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 19:44:37 2007
Subject: [Frugalware-git] boost: boost-1.34.1-1-i686
Message-ID: <20071208184435.00EDD11901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=c18bae909bf3ee8b127f889e335195327346b89b

commit c18bae909bf3ee8b127f889e335195327346b89b
Author: crazy 
Date:   Sat Dec 8 19:41:14 2007 +0100

boost-1.34.1-1-i686
* Version bump
* removed all old patches
* split all libs in own packages
* new maintainer , Ok @ krix

diff --git a/source/devel-extra/boost/FrugalBuild b/source/devel-extra/boost/FrugalBuild
index 12feb26..91599b0 100644
--- a/source/devel-extra/boost/FrugalBuild
+++ b/source/devel-extra/boost/FrugalBuild
@@ -1,25 +1,31 @@
# Compiling Time: 2.33 SBU
-# Maintainer: Christian Hamar alias krix 
+# Maintainer: crazy 
+# Contributor: Christian Hamar alias krix 

pkgname=boost
-pkgver=1.34.0
-pkgrel=5
-pkgdesc="Boost Libraries for C++"
+pkgver=1.34.1
+pkgrel=1
+pkgdesc="Boost header files , examples and tools"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge python
url="http://boost.org/"
-depends=('libstdc++' 'python' 'icu>=3.8' 'bzip2' 'zlib')
-makedepends=('boost-jam')
+depends=()
+makedepends=('boost-jam>=3.1.16' 'python' 'icu>=3.8' 'bzip2' 'zlib')
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=7586 | grep 'Latest.*Notes' | sed -n 's/.*\]\([0-9\.]\+\) \[.*/\1/;1 p'"
-source=(${source/-$pkgver/_${pkgver//./_}} no_version_for_include_kthx.patch \
-	boostjam_x86_64.patch gcc42_atomicity_h.patch)
+source=(${source/-$pkgver/_${pkgver//./_}})
_F_cd_path="${pkgname}_`echo $pkgver|tr . _`"
-sha1sums=('d2fdb4535a13566917fe3d8377b017f094933641'\
-          'ed54f5fe28c801e240fa87f3641de1b1184dfe20'\
-          'f183bdd5970e67ac2d9062ec1834eb22233ede03'\
-          '4885396af53aa6a959cd6adb92d826acfa204d5a')
+sha1sums=('b771271d5cbd3bdb0f119dd66dfd36bad7a66866')
+
+subpkgs=("libboost" "libboost-mt" "libboost-static" "libboost-mt-static")
+subdescs=('Boost libraries.' 'Boost libraries with multithreading support.' \
+	  'Boost libraries statically linked.' 'Boost libraries with multithreading support statically linked.')
+subdepends=('icu libgcc bzip2 zlib' \
+	    'icu libgcc bzip2 zlib' \
+	    '' '')
+subgroups=('devel-extra' 'devel-extra' 'devel-extra' 'devel-extra')
+subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64')

build()
{
@@ -27,7 +33,7 @@ build()
Fpatchall
Fsed "-O3" "$CXXFLAGS -fno-strict-aliasing" tools/build/v2/tools/gcc.jam
BOOSTJAM="/usr/bin/bjam"
-	OPTIONS="release debug-symbols=off optimization=speed threading=single,multi -d2"
+	OPTIONS="release debug-symbols=off optimization=speed threading=single,multi -d+2"
JOBS="$MAKEFLAGS"

${BOOSTJAM} \
@@ -41,7 +47,8 @@ build()
--exec-prefix="$Fdestdir/usr" \
--includedir="$Fdestdir/usr/include" \
--libdir="$Fdestdir/usr/lib" \
-	    	--toolset=gcc stage || Fdie
+		--toolset=gcc \
+	    	--layout=system || Fdie

${BOOSTJAM} \
${JOBS} \
@@ -54,11 +61,20 @@ build()
--exec-prefix="$Fdestdir/usr" \
--includedir="$Fdestdir/usr/include" \
--libdir="$Fdestdir/usr/lib" \
-		--toolset=gcc install || Fdie
+		--toolset=gcc \
+		--layout=system install || Fdie

cd $Fsrcdir/$_F_cd_path/tools/build/
Fmkdir usr/share/boost
-	cp -a b* index.html  v2/ $Fdestdir/usr/share/boost/
+	rm -rf v2/debian || Fdie
+	cp -a b* index.html  v2/ $Fdestdir/usr/share/boost/ || Fdie
+
+	Fsplit libboost-mt usr/lib/libboost_*-mt.so
+	Fsplit libboost-mt-static  usr/lib/libboost_*-mt.a
+
+	Fsplit libboost usr/lib/libboost_*.so
+	Fsplit libboost-static usr/lib/libboost_*.a
+
}

# optimization OK
diff --git a/source/devel-extra/boost/boostjam_x86_64.patch b/source/devel-extra/boost/boostjam_x86_64.patch
deleted file mode 100644
index 46c0fa4..0000000
--- a/source/devel-extra/boost/boostjam_x86_64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur boost_1_34_0.orig/tools/jam/src/jam.h boost_1_34_0/tools/jam/src/jam.h
---- boost_1_34_0.orig/tools/jam/src/jam.h	2007-05-25 13:34:42.000000000 +0200
-+++ boost_1_34_0/tools/jam/src/jam.h	2007-05-25 13:35:11.000000000 +0200
-@@ -480,6 +480,10 @@
- # define OSPLAT "OSPLAT=IA64"
- # endif
-
-+# if defined( __x86_64__ )
-+# define OSPLAT "OSPLAT=x86_64"
-+# endif
-+
- # ifdef __s390__
- # define OSPLAT "OSPLAT=390"
- # endif
diff --git a/source/devel-extra/boost/gcc42_atomicity_h.patch b/source/devel-extra/boost/gcc42_atomicity_h.patch
deleted file mode 100644
index 01408c4..0000000
--- a/source/devel-extra/boost/gcc42_atomicity_h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur boost_1_34_0.orig/boost/detail/atomic_count_gcc.hpp boost_1_34_0/boost/detail/atomic_count_gcc.hpp
---- boost_1_34_0.orig/boost/detail/atomic_count_gcc.hpp	2007-05-26 14:18:17.000000000 +0200
-+++ boost_1_34_0/boost/detail/atomic_count_gcc.hpp	2007-05-26 14:19:26.000000000 +0200
-@@ -17,7 +17,15 @@
- //  http://www.boost.org/LICENSE_1_0.txt)
- //
-
--#include 
-+#define GCC_VERSION (__GNUC__ * 10000 \
-+		     + __GNUC_MINOR__ * 100 \
-+		     + __GNUC_PATCHLEVEL__)
-+
-+#if GCC_VERSION >= 40200
-+ #include 
-+#else
-+ #include 
-+#endif
-
- namespace boost
- {
diff --git a/source/devel-extra/boost/no_version_for_include_kthx.patch b/source/devel-extra/boost/no_version_for_include_kthx.patch
deleted file mode 100644
index 4d74ab2..0000000
--- a/source/devel-extra/boost/no_version_for_include_kthx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur boost_1_34_0/Jamfile.v2 boost_1_34_0-p/Jamfile.v2
---- boost_1_34_0/Jamfile.v2	2007-05-11 05:40:34.000000000 +0200
-+++ boost_1_34_0-p/Jamfile.v2	2007-05-13 19:13:52.000000000 +0200
-@@ -312,7 +312,7 @@
-     ;
- if $(layout-versioned)
- {
--    install-requirements += boost-$(BOOST_VERSION_TAG)/boost ;
-+    install-requirements += boost ;
- }
- else
- {
From crazy at frugalware.org  Sat Dec  8 20:42:14 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 20:42:16 2007
Subject: [Frugalware-git] boost: rblibtorrent-0.12-6-i686
Message-ID: <20071208194214.AF2AA11901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=44679232426bccf29dffeac74808e61bc2bc6764

commit 44679232426bccf29dffeac74808e61bc2bc6764
Author: crazy 
Date:   Sat Dec 8 20:41:12 2007 +0100

rblibtorrent-0.12-6-i686
* release bump
* rebuild with boost

diff --git a/source/lib-extra/rblibtorrent/FrugalBuild b/source/lib-extra/rblibtorrent/FrugalBuild
index 3ed2d58..aa00ca8 100644
--- a/source/lib-extra/rblibtorrent/FrugalBuild
+++ b/source/lib-extra/rblibtorrent/FrugalBuild
@@ -3,12 +3,13 @@

pkgname=rblibtorrent
pkgver=0.12
-pkgrel=5
+pkgrel=6
pkgdesc="LibTorrent is a BitTorrent library written in C++"
_F_sourceforge_name="libtorrent"
Finclude sourceforge
url="http://www.rasterbar.com/products/libtorrent/index.html"
-depends=('boost>=1.34.0-5' 'zlib' 'icu>=3.8')
+depends=('libboost-mt>=1.34.1' 'zlib' 'icu>=3.8')
+makedepends=('boost>=1.34.1')
groups=('lib-extra')
archs=('i686' 'x86_64')
#source=(http://www.libtorrent.org/libtorrent-${pkgver}rc3.tar.gz)
@@ -25,11 +26,11 @@ build()
--libdir=/usr/lib/libtorrent \
--enable-debug=no \
--with-zlib=system \
-		--with-boost-date-time=gcc42-mt \
-		--with-boost-filesystem=gcc42-mt \
-		--with-boost-thread=gcc42-mt \
-		--with-boost-regex=gcc42-mt \
-		--with-boost-program_options=gcc42-mt \
+		--with-boost-date-time=mt \
+		--with-boost-filesystem=mt \
+		--with-boost-thread=mt \
+		--with-boost-regex=mt \
+		--with-boost-program_options=mt \
--enable-examples
Fmakeinstall
Fmv usr/lib/libtorrent/pkgconfig usr/lib/pkgconfig/
From crazy at frugalware.org  Sat Dec  8 21:19:52 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 21:19:54 2007
Subject: [Frugalware-git] boost: monotone-0.37-1-i686
Message-ID: <20071208201953.008FE11901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=caa7d527a6b44b1f046b3c94e157b6c8bd8d6b59

commit caa7d527a6b44b1f046b3c94e157b6c8bd8d6b59
Author: crazy 
Date:   Sat Dec 8 21:18:43 2007 +0100

monotone-0.37-1-i686
* Version bump
* build with new boost

diff --git a/source/devel-extra/monotone/FrugalBuild b/source/devel-extra/monotone/FrugalBuild
index 7ff63d5..6a19390 100644
--- a/source/devel-extra/monotone/FrugalBuild
+++ b/source/devel-extra/monotone/FrugalBuild
@@ -2,12 +2,12 @@
# Maintainer: Christian Hamar alias krix 

pkgname=monotone
-pkgver=0.36
+pkgver=0.37
pkgrel=1
pkgdesc="Another distributed version (revision) control system"
url="http://venge.net/monotone/"
-depends=('libstdc++' 'boost>=1.34.0' 'lua')
-makedepends=('cvs')
+depends=('libstdc++' 'libboost-mt>=1.34.1' 'lua')
+makedepends=('boost>=1.34.1' 'cvs')
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump 'http://venge.net/monotone/?M=D'|grep tar.gz$|sed -n 's/.*e-\(.*\)\.t.*/\1/;1 p'"
@@ -16,9 +16,9 @@ source=(http://venge.net/monotone/downloads/$pkgver/$pkgname-$pkgver.tar.gz)
build()
{
Fcd
-       	Fmake --enable-ipv6 --with-bundled-lua=no BOOST_SUFFIX="-gcc42-mt-1_34 -gcc42 -gcc42-mt"
+       	Fmake --enable-ipv6 --with-bundled-lua=no BOOST_SUFFIX="-mt"
Fmakeinstall
}

-sha1sums=('d6f5ae91dc8045624dfc0dfbca00d60fea569ac3')
+sha1sums=('7d53bd67f7539342fcc15cceb0c2f4b31ba07647')
# optimization OK
From crazy at frugalware.org  Sat Dec  8 21:55:05 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 21:55:10 2007
Subject: [Frugalware-git] boost: d4x-2.5.7.1-4-i686
Message-ID: <20071208205505.CF17011901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=2d6c7b60b585cc5b82a9683c2e7523ebf6056b1c

commit 2d6c7b60b585cc5b82a9683c2e7523ebf6056b1c
Author: crazy 
Date:   Sat Dec 8 21:54:25 2007 +0100

d4x-2.5.7.1-4-i686
* release bump
* added an patch to fix the build

diff --git a/source/xapps-extra/d4x/FrugalBuild b/source/xapps-extra/d4x/FrugalBuild
index 0058ae4..322c1d2 100644
--- a/source/xapps-extra/d4x/FrugalBuild
+++ b/source/xapps-extra/d4x/FrugalBuild
@@ -4,22 +4,27 @@

pkgname=d4x
pkgver=2.5.7.1
-pkgrel=3
+pkgrel=4
pkgdesc="Download manager for Linux"
url="http://www.krasu.ru/soft/chuchelo/"
-depends=('gtk+2' 'atk' 'openssl' 'libstdc++' 'freetype2' 'pango' 'cairo' 'boost>=1.34.0-4' 'cppunit')
+depends=('gtk+2' 'atk' 'openssl' 'libstdc++' 'freetype2' 'pango' 'cairo')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
options=('scriptlet')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.krasu.ru/soft/chuchelo/|grep -m1 '.tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'"
-source=(http://d4x.krasu.ru/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('10955550112bdf22ff91c6c9395afd1a5f15bff2')
+source=(http://d4x.krasu.ru/files/$pkgname-$pkgver.tar.bz2 gtk2-compile.patch)
+sha1sums=('10955550112bdf22ff91c6c9395afd1a5f15bff2' \
+          '5020e0ea3027c4eae877c702b52f360047dbd8f8')

build ()
{
Fcd
+	Fpatchall
+	autoconf || Fdie
Fmkdir usr/bin
-	Fbuild
+	Fmake
+	Fmakeinstall
Fln /usr/man/man1/nt.1.gz /usr/man/man1/d4x.1.gz
Fmkdir /usr/share/{applications,pixmaps}
Ffilerel share/nt.desktop /usr/share/applications/nt.desktop
diff --git a/source/xapps-extra/d4x/gtk2-compile.patch b/source/xapps-extra/d4x/gtk2-compile.patch
new file mode 100644
index 0000000..8f15a9a
--- /dev/null
+++ b/source/xapps-extra/d4x/gtk2-compile.patch
@@ -0,0 +1,22 @@
+diff -Naur d4x-2.5.7.1/configure.ac d4x-2.5.7.1-gtk/configure.ac
+--- d4x-2.5.7.1/configure.ac	2005-11-05 00:35:38.000000000 +0100
++++ d4x-2.5.7.1-gtk/configure.ac	2007-12-08 21:31:53.000000000 +0100
+@@ -298,7 +298,6 @@
+
+ # Other needed defines
+ AC_DEFINE(_REENTRANT, , [Enable reenrant code of glibc])
+-AC_DEFINE(GTK_DISABLE_DEPRECATED, , [Enable warnings about deprecated functions usage])
+ AC_DEFINE(_FILE_OFFSET_BITS, 64, [To support files over 2GB])
+
+ # Prepare all requiered flags
+diff -Naur d4x-2.5.7.1/main/face/list.cc d4x-2.5.7.1-gtk/main/face/list.cc
+--- d4x-2.5.7.1/main/face/list.cc	2006-03-20 01:29:41.000000000 +0100
++++ d4x-2.5.7.1-gtk/main/face/list.cc	2007-12-08 21:31:04.000000000 +0100
+@@ -8,7 +8,6 @@
+  *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  */
+-#define GTK_DISABLE_DEPRECATED
+
+ #include 
+ #include 
From crazy at frugalware.org  Sat Dec  8 23:07:35 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 23:07:37 2007
Subject: [Frugalware-git] boost: inkscape-0.45.1-5-i686
Message-ID: <20071208220735.39D7F11901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=7de3efe7b86a43fe55975fa29b9d80826ec26b20

commit 7de3efe7b86a43fe55975fa29b9d80826ec26b20
Author: crazy 
Date:   Sat Dec 8 23:02:41 2007 +0100

inkscape-0.45.1-5-i686
* release bump
* fixed the build
* fixed makedepends() and depends()

diff --git a/source/xapps-extra/inkscape/FrugalBuild b/source/xapps-extra/inkscape/FrugalBuild
index 58e58ee..53b5a7c 100644
--- a/source/xapps-extra/inkscape/FrugalBuild
+++ b/source/xapps-extra/inkscape/FrugalBuild
@@ -4,12 +4,12 @@

pkgname=inkscape
pkgver=0.45.1
-pkgrel=4
+pkgrel=5
pkgdesc="A vector illustrator program for GNOME"
url="http://www.inkscape.org/"
-makedepends=('intltool' 'perl-xml')
depends=('openssl' 'lcms' 'cairomm' 'libgcc' 'atk' 'gtkmm>=2.10.10-3' 'glibmm' 'freetype2' 'libxcb' \
-	'pango>=1.14.3' 'libgc>=6.4' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7' 'python>=2.5' 'perl' 'boost>=1.34.0-4')
+	'pango>=1.14.3' 'libgc>=6.4' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7' 'python>=2.5' 'perl')
+makedepends=('boost>=1.34.1' 'intltool' 'perl-xml')
rodepends=('libxml2>=2.6.20' 'pyxml' 'libxslt')
groups=('xapps-extra')
archs=('i686' 'x86_64')
@@ -25,6 +25,7 @@ build()
export CFLAGS="$CFLAGS -fno-strict-aliasing"
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"
Fautoreconf
+	intltoolize -c -f || Fdie
Fmake \
--without-gnome-print \
--with-gnu-ld \
@@ -39,7 +40,7 @@ build()
Fmakeinstall
}

-sha1sums=('f3df9eafc0fdfcc5f5024ea4bec4d7c477698380'\
-          '85d9b4a7bf718a51efa13eb40fcc01a2d9378734'\
+sha1sums=('f3df9eafc0fdfcc5f5024ea4bec4d7c477698380' \
+          '85d9b4a7bf718a51efa13eb40fcc01a2d9378734' \
'ddcb89e80b8b19c53c0994e9b472026bc1a2d200')
# optimization OK
From crazy at frugalware.org  Sat Dec  8 23:24:34 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 23:24:36 2007
Subject: [Frugalware-git] boost: openlibraries-0.4.0-3-i686
Message-ID: <20071208222434.5903111901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=67cb04dfe015d4bc45dfe2d11e6a1dbc379d1237

commit 67cb04dfe015d4bc45dfe2d11e6a1dbc379d1237
Author: crazy 
Date:   Sat Dec 8 23:21:08 2007 +0100

openlibraries-0.4.0-3-i686
* release bump
* rebuild with boost

diff --git a/source/xlib-extra/openlibraries/FrugalBuild b/source/xlib-extra/openlibraries/FrugalBuild
index c1a691c..57df114 100644
--- a/source/xlib-extra/openlibraries/FrugalBuild
+++ b/source/xlib-extra/openlibraries/FrugalBuild
@@ -3,12 +3,13 @@

pkgname=openlibraries
pkgver=0.4.0
-pkgrel=2
+pkgrel=3
pkgdesc="Powerful cross-platform set of libraries to test and deploy rich media applications."
Finclude sourceforge python
options=('scriptlet')
source=($source sg_appearance.cpp_compile_fix.patch)
-depends=('boost>=1.34.0-4' 'glew' 'libgcc' 'libjpeg' 'libpng' 'libtiff' 'freeglut' 'openal' 'sqlite3' 'python>=2.5')
+depends=('libboost-mt>=1.34.1' 'glew' 'libgcc' 'libjpeg' 'libpng' 'libtiff' 'freeglut' 'openal' 'sqlite3' 'python>=2.5')
+makedepends=('boost>=1.34.1')
groups=('xlib-extra')
archs=('i686')
sha1sums=('7ebe24cfdc16c4869a74c0736bd4069f1ceff44c'\
@@ -27,7 +28,6 @@ build()
--with-boostthreadruntime=mt \
--with-pythonversion="$_F_python_ver" \
--with-boostprefix=/usr \
-        	--with-boosttoolset=gcc42 \
--with-openalprefix=/usr \
--with-glewprefix=/usr
}
From crazy at frugalware.org  Sat Dec  8 23:57:05 2007
From: crazy at frugalware.org (crazy)
Date: Sat Dec  8 23:57:06 2007
Subject: [Frugalware-git] boost: jahshaka-2.0-3-i686
Message-ID: <20071208225705.2EEA611901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=390774888d5e72f8e3a88fd3cf5e56059839ca5e

commit 390774888d5e72f8e3a88fd3cf5e56059839ca5e
Author: crazy 
Date:   Sat Dec 8 23:53:49 2007 +0100

jahshaka-2.0-3-i686
* release bump
* rebuild with boost and openlibraries

diff --git a/source/xapps-extra/jahshaka/FrugalBuild b/source/xapps-extra/jahshaka/FrugalBuild
index 2823fa3..09f9bf8 100644
--- a/source/xapps-extra/jahshaka/FrugalBuild
+++ b/source/xapps-extra/jahshaka/FrugalBuild
@@ -3,11 +3,12 @@

pkgname=jahshaka
pkgver=2.0
-pkgrel=2
+pkgrel=3
pkgdesc="Jahshaka is a video and film compositing, editing and special fx system that uses OpenGL & OpenML."
_F_sourceforge_name=jahshakafx
Finclude sourceforge
-depends=('libxi' 'fontconfig' 'openlibraries' 'libxft' 'mlt-plus-plus' 'qt' 'freetype2' 'libxrender' 'boost')
+depends=('libxi' 'fontconfig' 'openlibraries>=0.4.0-3' 'libxft' 'mlt-plus-plus' 'qt' 'freetype2' 'libxrender' 'libboost-mt>=1.34.1')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
archs=('i686')
source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/$_F_sourceforge_dirname/$pkgname.tar.gz)
From vmiklos at frugalware.org  Sun Dec  9 01:12:26 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 01:12:33 2007
Subject: [Frugalware-git] pacman-g2: new test for group installs
Message-ID: <20071209001226.06DB511901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=3ac747491af31debf037af8e1e88dcbe91336040

commit 3ac747491af31debf037af8e1e88dcbe91336040
Author: Miklos Vajna 
Date:   Sun Dec 9 01:10:40 2007 +0100

new test for group installs
so, if we have a group 'grp' and we have a package 'foo-grp', we should not
install the later on -S grp

diff --git a/pactest/tests/sync022.py b/pactest/tests/sync022.py
new file mode 100644
index 0000000..320e993
--- /dev/null
+++ b/pactest/tests/sync022.py
@@ -0,0 +1,22 @@
+self.description = "Install a group from a sync db while there are other group-like packages"
+
+sp1 = pmpkg("pkg1")
+sp1.groups = ["grp"]
+
+sp2 = pmpkg("pkg2")
+sp2.groups = ["grp"]
+
+sp3 = pmpkg("pkg3")
+sp3.groups = ["grp"]
+
+sp4 = pmpkg("foo-grp")
+
+for p in sp1, sp2, sp3, sp4:
+	self.addpkg2db("sync", p);
+
+self.args = "-S grp"
+
+self.addrule("PACMAN_RETCODE=0")
+for p in sp1, sp2, sp3:
+	self.addrule("PKG_EXIST=%s" % p.name)
+self.addrule("!PKG_EXIST=%s" % sp4.name)
From vmiklos at frugalware.org  Sun Dec  9 01:12:26 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 01:12:34 2007
Subject: [Frugalware-git] pacman-g2: syncpkg() fix for sync022 test
Message-ID: <20071209001226.46D0B11904C1@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=b6369b026ab46449e5b10e73186db0cf6efb7ce3

commit b6369b026ab46449e5b10e73186db0cf6efb7ce3
Author: Miklos Vajna 
Date:   Sun Dec 9 01:11:20 2007 +0100

syncpkg() fix for sync022 test

diff --git a/src/pacman-g2/sync.c b/src/pacman-g2/sync.c
index c1915f9..21a846c 100644
--- a/src/pacman-g2/sync.c
+++ b/src/pacman-g2/sync.c
@@ -401,6 +401,7 @@ int syncpkg(list_t *targets)
}
}
/* targ is not a group, see if it's a regex */
+				if(!found) {
for(j = pmc_syncs; j; j = j->next) {
PM_DB *db = j->data;
PM_LIST *k;
@@ -418,6 +419,7 @@ int syncpkg(list_t *targets)
}
}
}
+				}
if(!found) {
/* targ not found in sync db, searching for providers... */
PM_LIST *k = NULL;
From vmiklos at frugalware.org  Sun Dec  9 01:12:26 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 01:12:35 2007
Subject: [Frugalware-git] pacman-g2: syncpkg(): identation fix
Message-ID: <20071209001226.A06991190503@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=862db94f9377160731ff3596dbad5440fa0aa655

commit 862db94f9377160731ff3596dbad5440fa0aa655
Author: Miklos Vajna 
Date:   Sun Dec 9 01:11:53 2007 +0100

syncpkg(): identation fix

diff --git a/src/pacman-g2/sync.c b/src/pacman-g2/sync.c
index 21a846c..8d2213c 100644
--- a/src/pacman-g2/sync.c
+++ b/src/pacman-g2/sync.c
@@ -402,24 +402,24 @@ int syncpkg(list_t *targets)
}
/* targ is not a group, see if it's a regex */
if(!found) {
-				for(j = pmc_syncs; j; j = j->next) {
-					PM_DB *db = j->data;
-					PM_LIST *k;
-					for(k = pacman_db_getpkgcache(db); k; k = pacman_list_next(k)) {
-						PM_PKG *p = pacman_list_getdata(k);
-						char *pkgname = pacman_pkg_getinfo(p, PM_PKG_NAME);
-						int match = pacman_reg_match(pkgname, targ);
-						if(match == -1) {
-							ERR(NL, _("could not add target '%s': %s\n"), targ, pacman_strerror(pm_errno));
-							retval = 1;
-							goto cleanup;
-						} else if(match) {
-							found++;
-							targets = list_add(targets, strdup(pkgname));
+					for(j = pmc_syncs; j; j = j->next) {
+						PM_DB *db = j->data;
+						PM_LIST *k;
+						for(k = pacman_db_getpkgcache(db); k; k = pacman_list_next(k)) {
+							PM_PKG *p = pacman_list_getdata(k);
+							char *pkgname = pacman_pkg_getinfo(p, PM_PKG_NAME);
+							int match = pacman_reg_match(pkgname, targ);
+							if(match == -1) {
+								ERR(NL, _("could not add target '%s': %s\n"), targ, pacman_strerror(pm_errno));
+								retval = 1;
+								goto cleanup;
+							} else if(match) {
+								found++;
+								targets = list_add(targets, strdup(pkgname));
+							}
}
}
}
-				}
if(!found) {
/* targ not found in sync db, searching for providers... */
PM_LIST *k = NULL;
From crazy at frugalware.org  Sun Dec  9 01:14:54 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 01:14:56 2007
Subject: [Frugalware-git] boost: k3d-0.6.7.0-3-i686
Message-ID: <20071209001454.46B1511901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=cf61753c23d245b016c7d631bdb1dc18ccbcd91b

commit cf61753c23d245b016c7d631bdb1dc18ccbcd91b
Author: crazy 
Date:   Sun Dec 9 01:10:10 2007 +0100

k3d-0.6.7.0-3-i686
* release bump
* rebuild with boost

diff --git a/source/xapps-extra/k3d/FrugalBuild b/source/xapps-extra/k3d/FrugalBuild
index 710f7ee..ea82a18 100644
--- a/source/xapps-extra/k3d/FrugalBuild
+++ b/source/xapps-extra/k3d/FrugalBuild
@@ -4,10 +4,11 @@

pkgname=k3d
pkgver=0.6.7.0
-pkgrel=2
+pkgrel=3
pkgdesc="A complete free-as-in-freedom 3D modeling, animation and rendering system."
depends=('gtkglext' 'imagemagick' 'librsvg' 'gts' 'python>=2.5' 'openexr>=1.4.0a' 'libxml2' 'libsigc++2'  'freetype2' \
-	'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm' 'pango' 'glibmm' 'boost>=1.34.0-3')
+	'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm' 'pango' 'glibmm' 'libboost-mt>=1.34.1')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet' 'force')
@@ -19,10 +20,10 @@ url="http://www.k-3d.org/"
build()
{
Fcd
-	Fsed 'boost_regex' 'boost_regex-gcc42-mt' m4/k3d_with_external_boost.m4
-        Fsed 'boost_date_time' 'boost_date_time-gcc42-mt' m4/k3d_with_external_boost.m4
+	Fsed 'boost_regex' 'boost_regex-mt' m4/k3d_with_external_boost.m4
+        Fsed 'boost_date_time' 'boost_date_time-mt' m4/k3d_with_external_boost.m4
Fsed 'K3D_BOOST_LIBS=.*' \
-		'K3D_BOOST_LIBS="-lboost_regex-gcc42-mt -lboost_date_time-gcc42-mt -lboost_filesystem-gcc42-mt"' \
+		'K3D_BOOST_LIBS="-lboost_regex-mt -lboost_date_time-mt -lboost_filesystem-mt"' \
m4/k3d_with_external_boost.m4
Fautoreconf
Fconf  	\
From vmiklos at frugalware.org  Sun Dec  9 01:22:47 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 01:22:51 2007
Subject: [Frugalware-git] frugalware-current: octave-2.9.18-1-i686
Message-ID: <20071209002247.80BEE11901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88c090a39b2079c2f6ceb209178b9ee7032d8159

commit 88c090a39b2079c2f6ceb209178b9ee7032d8159
Author: Miklos Vajna 
Date:   Sun Dec 9 01:14:25 2007 +0100

octave-2.9.18-1-i686
version bump

diff --git a/source/apps-extra/octave/FrugalBuild b/source/apps-extra/octave/FrugalBuild
index e96c805..74d9ac9 100644
--- a/source/apps-extra/octave/FrugalBuild
+++ b/source/apps-extra/octave/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=octave
-pkgver=2.9.17
+pkgver=2.9.18
pkgrel=1
pkgdesc="Octave is a high-level language, primarily intended for numerical computations."
url="http://www.octave.org/"
@@ -12,7 +12,5 @@ groups=('apps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url/download.html|grep Testing|sed 's/.*) \([^ ]*\) (.*/\1/'"
source=(ftp://ftp.octave.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('570d000ff85d20b98ce8fddbb1da4bde40bb75a1')
+sha1sums=('a533597147990ebf19cbcf7bc3bb1ffc738b3bbb')
# optimization OK
-
-# feel free to bump this if you can, 2.9.15 did not compile for me
From vmiklos at frugalware.org  Sun Dec  9 01:22:47 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 01:22:53 2007
Subject: [Frugalware-git] frugalware-current: pacman-g2-3.6.5-2-i686
Message-ID: <20071209002247.F371011904C1@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=22caa6e40600926b852eb269ea030fd1209da248

commit 22caa6e40600926b852eb269ea030fd1209da248
Author: Miklos Vajna 
Date:   Sun Dec 9 01:22:27 2007 +0100

pacman-g2-3.6.5-2-i686
backport patch from git to fix building a new chroot

diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild
index 3ae32c8..5e3c5b4 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -6,7 +6,7 @@ USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=pacman-g2
pkgver=3.6.5
Fuse $USE_DEVEL && pkgver=3.6.3.48.g7571051
-pkgrel=1
+pkgrel=2
pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support."
url="http://ftp.frugalware.org/pub/other/pacman-g2/"
backup=(etc/{makepkg,pacman}.conf etc/pacman.d/{frugalware,frugalware-current})
@@ -20,8 +20,9 @@ archs=('i686' 'x86_64' 'ppc')
_F_archive_nosort=y
up2date="lynx -dump $url/releases/ |Flasttar"
if ! Fuse $USE_DEVEL; then
-	source=($url/releases/$pkgname-$pkgver.tar.gz)
-	signatures=("$source.asc")
+	source=($url/releases/$pkgname-$pkgver.tar.gz \
+		http://git.frugalware.org/patches/pacman-g2/b6369b026ab46449e5b10e73186db0cf6efb7ce3.patch)
+	signatures=("$source.asc" '')
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
From crazy at frugalware.org  Sun Dec  9 02:02:39 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 02:02:42 2007
Subject: [Frugalware-git] boost: lyx-1.5.2-2-i686
Message-ID: <20071209010239.C0D4D11901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=22ac81ae8c79ed86013e263fe7cb38c60339c0f4

commit 22ac81ae8c79ed86013e263fe7cb38c60339c0f4
Author: crazy 
Date:   Sun Dec 9 01:59:36 2007 +0100

lyx-1.5.2-2-i686
* release bump
* rebuild with boost
* new maintainer

diff --git a/source/xapps-extra/lyx/FrugalBuild b/source/xapps-extra/lyx/FrugalBuild
index 8903b12..7a7309c 100644
--- a/source/xapps-extra/lyx/FrugalBuild
+++ b/source/xapps-extra/lyx/FrugalBuild
@@ -1,12 +1,14 @@
# Compiling time: 4.15 SBU
-# Maintainer: Bence Nagy 
+# Maintainer: crazy 
+# Conteibutor: Bence Nagy 

pkgname=lyx
pkgver=1.5.2
-pkgrel=1
+pkgrel=2
pkgdesc="An advanced open-source document processor based on TeX"
url='http://www.lyx.org'
-depends=('tetex' 'python' 'perl' 'imagemagick' 'aspell' 'libqtgui' 'boost' 'aspell')
+depends=('tetex' 'python' 'perl' 'imagemagick' 'aspell' 'libqtgui' 'libboost-mt>=1.34.1' 'aspell')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
@@ -14,7 +16,7 @@ up2date="lynx -dump 'http://lyx.cybermirror.org/stable/?D=A'|Flasttarbz2"
source=(http://lyx.cybermirror.org/stable/$pkgname-$pkgver.tar.bz2 \
boost.patch)
sha1sums=('1b1e8de870972ae5ea14bcdd91d6e4f326491b9c' \
-          '849f1769729e08d9951f9820dea4db470c910597')
+          '60f5824faa4e55896e1729e249bd9ae1e423beba')


build()
diff --git a/source/xapps-extra/lyx/boost.patch b/source/xapps-extra/lyx/boost.patch
index b73d630..44fd828 100644
--- a/source/xapps-extra/lyx/boost.patch
+++ b/source/xapps-extra/lyx/boost.patch
@@ -9,10 +9,10 @@ diff -Naur lyx-1.5.2/config/common.am lyx-1.5.2-p/config/common.am
-BOOST_REGEX = -lboost_regex
-BOOST_SIGNALS = -lboost_signals
-BOOST_IOSTREAMS = -lboost_iostreams
-+BOOST_FILESYSTEM = -lboost_filesystem-gcc42-mt
-+BOOST_REGEX = -lboost_regex-gcc42-mt
-+BOOST_SIGNALS = -lboost_signals-gcc42-mt
-+BOOST_IOSTREAMS = -lboost_iostreams-gcc42-mt
++BOOST_FILESYSTEM = -lboost_filesystem-mt
++BOOST_REGEX = -lboost_regex-mt
++BOOST_SIGNALS = -lboost_signals-mt
++BOOST_IOSTREAMS = -lboost_iostreams-mt
endif

LIBS =
From vmiklos at frugalware.org  Sun Dec  9 02:27:47 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 02:27:50 2007
Subject: [Frugalware-git] frugalware-current: openoffice.org-2.3.1-1-i686
Message-ID: <20071209012747.9CD6E11901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2818c800ed97aa7c2b22e33a2e59aa20855e2caa

commit 2818c800ed97aa7c2b22e33a2e59aa20855e2caa
Author: Miklos Vajna 
Date:   Sun Dec 9 02:27:35 2007 +0100

openoffice.org-2.3.1-1-i686
small cleanup about smp build

diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild
index b0381b7..b57360d 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -96,7 +96,6 @@ done
# http://wiki.frugalware.org/OOo_building

build() {
-	unset MAKEFLAGS
Fmonoexport
if [ -n "$branch" ]; then
Fcd ooo-build-$(echo $branch|sed 's/^-//;s/-/./g')
@@ -113,7 +112,8 @@ build() {

# SMP build
if [ ! -z "$MAKEFLAGS" ]; then
-		Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}"
+		# Uncomment this if you really want an smp build. It may or may not work.
+		#Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}"
unset MAKEFLAGS
fi
From crazy at frugalware.org  Sun Dec  9 02:41:23 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 02:41:26 2007
Subject: [Frugalware-git] boost: pdfedit-0.3.2-2-i686
Message-ID: <20071209014123.553B311901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=d73602b46243d6fa8919748f2351a2d16e43ede2

commit d73602b46243d6fa8919748f2351a2d16e43ede2
Author: crazy 
Date:   Sun Dec 9 02:39:58 2007 +0100

pdfedit-0.3.2-2-i686
* release bump
* fixed depends() for new boost

diff --git a/source/xapps-extra/pdfedit/FrugalBuild b/source/xapps-extra/pdfedit/FrugalBuild
index ff6b7e5..8451521 100644
--- a/source/xapps-extra/pdfedit/FrugalBuild
+++ b/source/xapps-extra/pdfedit/FrugalBuild
@@ -3,9 +3,10 @@

pkgname=pdfedit
pkgver=0.3.2
-pkgrel=1
+pkgrel=2
pkgdesc="PDFedit is an editor for manipulating PDF files."
-depends=('qt' 't1lib' 'boost')
+depends=('qt' 't1lib')
+makedepends=('boost')
groups=('xapps-extra')
archs=('i686')
_F_sourceforge_ext=".tar.bz2"
From crazy at frugalware.org  Sun Dec  9 02:54:30 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 02:54:33 2007
Subject: [Frugalware-git] boost: pinot-0.81-2-i686
Message-ID: <20071209015430.A75BB11901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=9f696db689c862d3a730382f89618f77cf4e0a06

commit 9f696db689c862d3a730382f89618f77cf4e0a06
Author: crazy 
Date:   Sun Dec 9 02:53:41 2007 +0100

pinot-0.81-2-i686
* release bump
* fixed depends() for new boost

diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild
index 716f9e6..d10ae5b 100644
--- a/source/xapps-extra/pinot/FrugalBuild
+++ b/source/xapps-extra/pinot/FrugalBuild
@@ -3,13 +3,12 @@

pkgname=pinot
pkgver=0.81
-pkgrel=1
+pkgrel=2
pkgdesc="Personal search and metasearch for the Free Desktop"
url="http://pinot.berlios.de/"
depends=('openssl' 'curl' 'cairomm' 'dbus>=1.1.2' 'dbus-glib' 'xapian-core>=1.0.4' 'gmime' 'atk' 'gtkmm' \
-	'boost>=1.34.0-4' 'libtextcat' 'taglib' 'freetype2' 'libxcb' 'pango' 'libxml++' 'sqlite3>=3.3.8-2' \
-	'shared-mime-info')
-makedepends=('desktop-file-utils')
+	'libtextcat' 'taglib' 'freetype2' 'libxcb' 'pango' 'libxml++' 'sqlite3>=3.3.8-2' 'shared-mime-info')
+makedepends=('desktop-file-utils' 'boost>=1.34.1')
# add catdvi package to the repos
rodepends=('unzip' 'poppler-pdftools' 'unrtf' 'catdoc')
license="GPL"
From crazy at frugalware.org  Sun Dec  9 05:14:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 05:14:55 2007
Subject: [Frugalware-git] boost: stellarium-0.9.0-3-i686
Message-ID: <20071209041450.C55D91190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=cc78edefe16d51357b690be06c39f492ff4ae4a3

commit cc78edefe16d51357b690be06c39f492ff4ae4a3
Author: crazy 
Date:   Sun Dec 9 05:03:29 2007 +0100

stellarium-0.9.0-3-i686
* release bump
* fixed depends() in general curl is needed for remote
* things , also boost is just a makedepend
* switched to cmake ( auto* will disappear see INSTALL files )
* removed not needed moc diff
* added an patch to fix *FLAGS
* added missing desktop and icon and a note about for
* janny in FB , once that is in source tarball build() can go away

diff --git a/source/xapps-extra/stellarium/FrugalBuild b/source/xapps-extra/stellarium/FrugalBuild
index 1d1c82e..272bd06 100644
--- a/source/xapps-extra/stellarium/FrugalBuild
+++ b/source/xapps-extra/stellarium/FrugalBuild
@@ -4,25 +4,30 @@

pkgname=stellarium
pkgver=0.9.0
-pkgrel=2
+pkgrel=3
pkgdesc="A free open source planetarium for your computer."
_F_sourceforge_broken_up2date=1
-Finclude sourceforge
+makedepends=('boost>=1.34.1')
+_F_cmake_confopts="-DCMAKE_CXX_FLAGS=$CXXFLAGS -DCMAKE_C_FLAGS=$CFLAGS"
+Finclude sourceforge cmake
url="http://www.stellarium.org/"
-depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'boost' 'libjpeg' 'libqtopengl')
+depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'libjpeg' 'libqtopengl' 'curl')
license="GPL"
groups=('xapps-extra')
archs=('i686')
-source=($source unused_moc.diff)
+## icon is from there :
+## http://sourceforge.net/tracker/index.php?func=detail&aid=1154587&group_id=48857&atid=454375
+## janny next release may have an icon in the tarball as well desktop files
+## please check that.
+source=($source $pkgname.png flags.patch)
sha1sums=('696e0fa935b695763ab37c66ec5e189c3e6db9f9' \
-          '1858fd653aa91bdf76cae9815819fb9db5c4b35a')
+          'ab43d03d1e5616b2dadf5a1a0cb4c70e3265167d' \
+          'b5401b8b028c8417d392588d3b8375da858fd6b9')

build()
{
-	Fcd
-	./autogen.sh || return 1
-	cp /usr/share/automake/mkinstalldirs . || return 1
-	Fbuild --with-qt-dir=/usr
+	CMake_build
+	Ffilerel ../../$pkgname.png /usr/share/pixmaps/$pkgname.png
+	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Education;"
}
-
# optimization OK
diff --git a/source/xapps-extra/stellarium/flags.patch b/source/xapps-extra/stellarium/flags.patch
new file mode 100644
index 0000000..e338cb6
--- /dev/null
+++ b/source/xapps-extra/stellarium/flags.patch
@@ -0,0 +1,14 @@
+diff -Naur stellarium-0.9.0/CMakeLists.txt stellarium-0.9.0-p/CMakeLists.txt
+--- stellarium-0.9.0/CMakeLists.txt	2007-06-06 10:25:19.000000000 +0200
++++ stellarium-0.9.0-p/CMakeLists.txt	2007-12-09 04:47:11.000000000 +0100
+@@ -16,8 +16,8 @@
+ ENDIF(NOT CMAKE_BUILD_TYPE)
+
+ IF(UNIX AND NOT WIN32)
+- SET(CMAKE_C_FLAGS -Wall)       # additional C compile flags
+- SET(CMAKE_CXX_FLAGS -Wall)     # additional CPP compile flags
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")       # additional C compile flags
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")     # additional CPP compile flags
+  SET(STLPORT_LIBRARY "")
+ ELSE(UNIX AND NOT WIN32)
+  SET(CMAKE_C_FLAGS "-Wall -fexceptions -fident -mthreads -D_STLP_NO_CUSTOM_IO -D_STLP_USE_DYNAMIC_LIB  -I/home/fchereau/STLport/stlport -L/home/fchereau/STLport/lib")
diff --git a/source/xapps-extra/stellarium/stellarium.png b/source/xapps-extra/stellarium/stellarium.png
new file mode 100644
index 0000000..e603356
Binary files /dev/null and b/source/xapps-extra/stellarium/stellarium.png differ
diff --git a/source/xapps-extra/stellarium/unused_moc.diff b/source/xapps-extra/stellarium/unused_moc.diff
deleted file mode 100644
index f9b3683..0000000
--- a/source/xapps-extra/stellarium/unused_moc.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur stellarium-0.9.0.orig/configure.ac stellarium-0.9.0/configure.ac
---- stellarium-0.9.0.orig/configure.ac	2007-06-06 10:25:19.000000000 +0200
-+++ stellarium-0.9.0/configure.ac	2007-07-07 19:07:52.000000000 +0200
-@@ -213,35 +213,6 @@
- }
- EOF
-
--AC_MSG_CHECKING(does moc work?)
--bnv_try_1="moc myqt.h -o moc_myqt.cpp"
--AC_TRY_EVAL(bnv_try_1)
--if test x"$ac_status" != x0; then
--   AC_MSG_ERROR(moc doesn't work)
--fi
--AC_MSG_RESULT(yes)
--AC_MSG_CHECKING(can I compile moc_myqt.cpp?)
--bnv_try_2="$CXX -c $CXXFLAGS -o moc_myqt.o moc_myqt.cpp"
--AC_TRY_EVAL(bnv_try_2)
--if test x"$ac_status" != x0; then
--   AC_MSG_ERROR(couldn't compile moc_myqt.cpp)
--fi
--AC_MSG_RESULT(yes)
--AC_MSG_CHECKING(can I compile myqt.cpp?)
--bnv_try_3="$CXX $QTINC -c $CXXFLAGS -o myqt.o myqt.cpp"
--AC_TRY_EVAL(bnv_try_3)
--if test x"$ac_status" != x0; then
--   AC_MSG_ERROR(couldn't compile myqt.cpp)
--fi
--AC_MSG_RESULT(yes)
--AC_MSG_CHECKING(can I link against QT?)
--nv_try_4="$CXX $LIBS -o myqt myqt.o moc_myqt.o"
--AC_TRY_EVAL(bnv_try_4)
--if test x"$ac_status" != x0; then
--   AC_MSG_ERROR(couldn't link)
--fi
--AC_MSG_RESULT(yes)
--
- AC_MSG_CHECKING(for mkoctfile)
- AC_TRY_EVAL(mkoctfile)
- if test x"$ac_status" != x0; then
From crazy at frugalware.org  Sun Dec  9 05:18:41 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 05:18:43 2007
Subject: [Frugalware-git] boost: ardour-2.1-1-i686
Message-ID: <20071209041841.5843E1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=ae71ee7bddb3b2d212fc2dcf78828d83d893c41c

commit ae71ee7bddb3b2d212fc2dcf78828d83d893c41c
Author: crazy 
Date:   Sun Dec 9 05:18:29 2007 +0100

ardour-2.1-1-i686
* just updated makedepend()
* added missing Fdie's

diff --git a/source/xmultimedia-extra/ardour/FrugalBuild b/source/xmultimedia-extra/ardour/FrugalBuild
index aedd411..e134400 100644
--- a/source/xmultimedia-extra/ardour/FrugalBuild
+++ b/source/xmultimedia-extra/ardour/FrugalBuild
@@ -8,7 +8,7 @@ pkgrel=1
pkgdesc="Ardour is a digital audio workstation."
url="http://ardour.org/"
depends=('jack' 'liblrdf' 'libsamplerate' 'liblo' 'libusb' 'gtk+2' 'libgnomecanvas')
-makedepends=('scons' 'boost>=1.34.0-4')
+makedepends=('scons' 'boost>=1.34.1')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
@@ -26,8 +26,8 @@ build()
_F_desktop_categories="GTK;Audio;AudioVideoEditing;Multimedia"
_F_desktop_icon="/usr/share/ardour2/icons/ardour_icon_48px.png"
Fdesktop2
-	scons PREFIX=$Fprefix ARCH="$CFLAGS" VST=0
-	scons DESTDIR=$Fdestdir/ install
+	scons PREFIX=$Fprefix ARCH="$CFLAGS" VST=0 || Fdie
+	scons DESTDIR=$Fdestdir/ install || Fdie
}

# optimization OK
From crazy at frugalware.org  Sun Dec  9 05:53:11 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 05:53:14 2007
Subject: [Frugalware-git] boost: miro-0.9.8.1-3-i686
Message-ID: <20071209045311.9570F1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=fd7a218e1c145fc77651ad2762bfeb0181d67425

commit fd7a218e1c145fc77651ad2762bfeb0181d67425
Author: crazy 
Date:   Sun Dec 9 05:51:30 2007 +0100

miro-0.9.8.1-3-i686
* release bump
* rebuild with boost
* moved to gnome-extra , do pacman-g2 -S miro and you have
* and working gnome desktop , so it cannot be xmultimedia :P
* fixed up2date , _F_cd_path , broken sha1sums
* added missing _F_archive_name
* I really wonder how priyank bumped this one ..

diff --git a/source/gnome-extra/miro/FrugalBuild b/source/gnome-extra/miro/FrugalBuild
new file mode 100644
index 0000000..690b1c3
--- /dev/null
+++ b/source/gnome-extra/miro/FrugalBuild
@@ -0,0 +1,35 @@
+# Compiling Time: 0.16 SBU
+# Maintainer: Priyank Gosalia 
+
+pkgname=miro
+_F_archive_name=Miro
+pkgver=0.9.8.1
+pkgrel=3
+pkgdesc="The free and open source internet TV platform."
+url="http://www.getmiro.com/"
+depends=('gtk+2' 'pygtk' 'dbus-python' 'pyrex' 'libboost-mt>=1.34.1' 'xine-lib' 'db>=4.6.19'
+	'nss' 'nspr' 'xulrunner' 'gnome-python-extras' 'gnome-python-extras-mozembed')
+makedepends=('boost>=1.34.1')
+groups=('gnome-extra')
+replaces=('democracy')
+conflicts=('democracy')
+archs=('i686')
+options=('scriptlet')
+up2date="lynx -dump 'http://ftp.osuosl.org/pub/pculture.org/miro/src/?C=M;O=A'| Flasttar"
+source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/Miro-$pkgver.tar.gz \
+	qt-mt.pc dbus_python0.8_fixes.patch)
+sha1sums=('9ffa7d8a58be22a613a48a88399a7f38382324fb' \
+          '153e1902352eb4d724ec816b8097f01830178181' \
+          'baed01f46d5606f106d01c573c9cbdf94044e961')
+
+build()
+{
+	Fcd
+	Fpatchall
+	PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$Fsrcdir
+	cd platform/gtk-x11 || Fdie
+	Fsed 'boost_python' 'boost_python-mt' setup.py
+	python setup.py install --root=$Fdestdir || Fdie
+}
+
+# optimization OK
diff --git a/source/gnome-extra/miro/dbus_python0.8_fixes.patch b/source/gnome-extra/miro/dbus_python0.8_fixes.patch
new file mode 100644
index 0000000..a566acc
--- /dev/null
+++ b/source/gnome-extra/miro/dbus_python0.8_fixes.patch
@@ -0,0 +1,21 @@
+--- platform/gtk-x11/onetime.py.orig	2007-05-20 21:50:54.000000000 -0400
++++ platform/gtk-x11/onetime.py	2007-05-20 21:51:01.000000000 -0400
+@@ -86,7 +86,7 @@
+     # we can delete the low-level name here because these objects
+     # are guaranteed to exist only once for each bus name
+     def __del__(self):
+-        dbus_bindings.bus_release_name(self._bus.get_connection(), self._name)
++        dbus.dbus_bindings.bus_release_name(self._bus.get_connection(), self._name)
+         pass
+
+     def get_bus(self):
+@@ -109,7 +109,8 @@
+     def __init__(self):
+         bus = dbus.SessionBus()
+         bus_name = BusNameFlags('org.participatoryculture.dtv.onetime', bus=bus, flags=dbus.dbus_bindings.NAME_FLAG_DO_NOT_QUEUE)
+-        dbus.service.Object.__init__(self, bus_name, '/org/participatoryculture/dtv/OneTime')
++        dbus.service.Object.__init__(self, bus_name=bus_name,
++                                     object_path='/org/participatoryculture/dtv/OneTime')
+
+     @dbus.service.method('org.participatoryculture.dtv.OneTimeIface')
+     def HandleArgs (self, args):
diff --git a/source/gnome-extra/miro/qt-mt.pc b/source/gnome-extra/miro/qt-mt.pc
new file mode 100644
index 0000000..95ce3b4
--- /dev/null
+++ b/source/gnome-extra/miro/qt-mt.pc
@@ -0,0 +1,11 @@
+prefix=/opt/qt
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+qt_config=qt warn_on release incremental link_prl nocrosscompiler minimal-config small-config medium-config large-config full-config styles tools kernel widgets dialogs iconview workspace network canvas table xml opengl sql release dll thread largefile stl ipv6 system-mng system-jpeg system-png gif system-zlib nis cups bigcodecs x11sm xshape xinerama xcursor xrandr xrender xftfreetype xkb dylib create_prl link_prl qt warn_on depend_includepath qmake_cache x11 x11inc create_libtool create_pc moc x11lib
+
+Name: Qt
+Description: Libqt-mt.so.3.3.8 Library
+Version: 3.3.8
+Libs: -L${libdir} -lqt-mt -L/usr/X11R6/lib -L/usr/X11R6/lib -lz -lGL -lXmu -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfreetype -lfontconfig -lXext -lX11 -lm -lSM -lICE -ldl -lpthread
+Cflags: -DQT_SHARED -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -D_REENTRANT -I${includedir}
diff --git a/source/xmultimedia-extra/miro/FrugalBuild b/source/xmultimedia-extra/miro/FrugalBuild
deleted file mode 100644
index d3439d7..0000000
--- a/source/xmultimedia-extra/miro/FrugalBuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Compiling Time: 0.16 SBU
-# Maintainer: Priyank Gosalia 
-
-pkgname=miro
-pkgver=0.9.8.1
-pkgrel=2
-pkgdesc="The free and open source internet TV platform."
-url="http://www.getmiro.com/"
-depends=('gtk+2' 'pygtk' 'dbus-python' 'pyrex' 'boost' 'xine-lib' 'db>=4.6.19'
-	'nss' 'nspr' 'xulrunner' 'gnome-python-extras' 'gnome-python-extras-mozembed')
-groups=('xmultimedia-extra')
-replaces=('democracy')
-conflicts=('democracy')
-archs=('i686')
-up2date="lynx -dump 'http://ftp.osuosl.org/pub/pculture.org/miro/src/?C=M;O=A'| Flasttar"
-source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/Miro-$pkgver.tar.gz \
-	qt-mt.pc dbus_python0.8_fixes.patch)
-_F_cd_path="Miro-2007-07-24"
-sha1sums=('8bbb80c673a283e2f0c4e0b1a333a2f9a8a638c8' \
-          '153e1902352eb4d724ec816b8097f01830178181' \
-          'baed01f46d5606f106d01c573c9cbdf94044e961')
-
-build()
-{
-	Fcd
-	Fpatchall
-	PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$Fsrcdir
-	cd platform/gtk-x11 || Fdie
-	Fsed 'boost_python' 'boost_python-gcc42-mt' setup.py
-	python setup.py install --root=$Fdestdir || Fdie
-}
-
-# optimization OK
diff --git a/source/xmultimedia-extra/miro/dbus_python0.8_fixes.patch b/source/xmultimedia-extra/miro/dbus_python0.8_fixes.patch
deleted file mode 100644
index a566acc..0000000
--- a/source/xmultimedia-extra/miro/dbus_python0.8_fixes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- platform/gtk-x11/onetime.py.orig	2007-05-20 21:50:54.000000000 -0400
-+++ platform/gtk-x11/onetime.py	2007-05-20 21:51:01.000000000 -0400
-@@ -86,7 +86,7 @@
-     # we can delete the low-level name here because these objects
-     # are guaranteed to exist only once for each bus name
-     def __del__(self):
--        dbus_bindings.bus_release_name(self._bus.get_connection(), self._name)
-+        dbus.dbus_bindings.bus_release_name(self._bus.get_connection(), self._name)
-         pass
-
-     def get_bus(self):
-@@ -109,7 +109,8 @@
-     def __init__(self):
-         bus = dbus.SessionBus()
-         bus_name = BusNameFlags('org.participatoryculture.dtv.onetime', bus=bus, flags=dbus.dbus_bindings.NAME_FLAG_DO_NOT_QUEUE)
--        dbus.service.Object.__init__(self, bus_name, '/org/participatoryculture/dtv/OneTime')
-+        dbus.service.Object.__init__(self, bus_name=bus_name,
-+                                     object_path='/org/participatoryculture/dtv/OneTime')
-
-     @dbus.service.method('org.participatoryculture.dtv.OneTimeIface')
-     def HandleArgs (self, args):
diff --git a/source/xmultimedia-extra/miro/qt-mt.pc b/source/xmultimedia-extra/miro/qt-mt.pc
deleted file mode 100644
index 95ce3b4..0000000
--- a/source/xmultimedia-extra/miro/qt-mt.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/opt/qt
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-qt_config=qt warn_on release incremental link_prl nocrosscompiler minimal-config small-config medium-config large-config full-config styles tools kernel widgets dialogs iconview workspace network canvas table xml opengl sql release dll thread largefile stl ipv6 system-mng system-jpeg system-png gif system-zlib nis cups bigcodecs x11sm xshape xinerama xcursor xrandr xrender xftfreetype xkb dylib create_prl link_prl qt warn_on depend_includepath qmake_cache x11 x11inc create_libtool create_pc moc x11lib
-
-Name: Qt
-Description: Libqt-mt.so.3.3.8 Library
-Version: 3.3.8
-Libs: -L${libdir} -lqt-mt -L/usr/X11R6/lib -L/usr/X11R6/lib -lz -lGL -lXmu -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfreetype -lfontconfig -lXext -lX11 -lm -lSM -lICE -ldl -lpthread
-Cflags: -DQT_SHARED -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -D_REENTRANT -I${includedir}
From crazy at frugalware.org  Sun Dec  9 05:56:15 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 05:56:16 2007
Subject: [Frugalware-git] boost: miro-0.9.8.1-3-i686
Message-ID: <20071209045615.1AD231190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=1011fb10225c148bd37254961d87e59ccee0a3fb

commit 1011fb10225c148bd37254961d87e59ccee0a3fb
Author: crazy 
Date:   Sun Dec 9 05:56:05 2007 +0100

miro-0.9.8.1-3-i686
* use _F_archive_name for source also

diff --git a/source/gnome-extra/miro/FrugalBuild b/source/gnome-extra/miro/FrugalBuild
index 690b1c3..71eb72e 100644
--- a/source/gnome-extra/miro/FrugalBuild
+++ b/source/gnome-extra/miro/FrugalBuild
@@ -16,7 +16,7 @@ conflicts=('democracy')
archs=('i686')
options=('scriptlet')
up2date="lynx -dump 'http://ftp.osuosl.org/pub/pculture.org/miro/src/?C=M;O=A'| Flasttar"
-source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/Miro-$pkgver.tar.gz \
+source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/${_F_archive_name}-$pkgver.tar.gz \
qt-mt.pc dbus_python0.8_fixes.patch)
sha1sums=('9ffa7d8a58be22a613a48a88399a7f38382324fb' \
'153e1902352eb4d724ec816b8097f01830178181' \
From crazy at frugalware.org  Sun Dec  9 06:09:57 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 06:10:01 2007
Subject: [Frugalware-git] boost: btg-0.9.6-3-i686
Message-ID: <20071209050957.B558B1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=504fc8e6b31432a75c5e3b3e461a6e21d11b5db7

commit 504fc8e6b31432a75c5e3b3e461a6e21d11b5db7
Author: crazy 
Date:   Sun Dec 9 06:09:04 2007 +0100

btg-0.9.6-3-i686
* release bump
* rebuild with boost

diff --git a/source/network-extra/btg/FrugalBuild b/source/network-extra/btg/FrugalBuild
index 8591556..1a5655c 100644
--- a/source/network-extra/btg/FrugalBuild
+++ b/source/network-extra/btg/FrugalBuild
@@ -4,10 +4,11 @@
pkgname=btg
pkgver=0.9.6
pkgextraver=_p1
-pkgrel=2
+pkgrel=3
pkgdesc="Bittorrent client implemented in C++ and using the Rasterbar Libtorrent library."
Finclude berlios
-depends=('boost>=1.34.0-4' 'rblibtorrent>=0.12-4' 'gnutls' 'dialog')
+depends=('libboost-mt>=1.34.1' 'rblibtorrent>=0.12-6' 'gnutls' 'dialog')
+makedepends=('boost>=1.34.1')
groups=('network-extra')
archs=('i686' 'x86_64')
sha1sums=('2ec586301d1f11475cb8a9c9c34e9ed45ca6b78d')
@@ -17,10 +18,17 @@ build()
Fcd $pkgname-$pkgver
Fsed libtorrent rblibtorrent configure.in
autoconf || return 1
-	Fbuild --with-boost-iostreams=gcc42-mt --with-boost-filesystem=gcc42-mt \
-		--with-boost-date-time=gcc42-mt --with-boost-thread=gcc42-mt \
-		--with-boost-program-options=gcc42-mt --enable-cli --enable-www \
-		--enable-session-saving --enable-upnp --enable-event-callback
+	Fbuild \
+		--with-boost-iostreams=mt \
+		--with-boost-filesystem=mt \
+		--with-boost-date-time=mt \
+		--with-boost-thread=mt \
+		--with-boost-program-options=mt \
+		--enable-cli \
+		--enable-www \
+		--enable-session-saving \
+		--enable-upnp \
+		--enable-event-callback
}

# optimization OK
From crazy at frugalware.org  Sun Dec  9 06:14:19 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 06:14:22 2007
Subject: [Frugalware-git] boost: qbittorrent-0.9.3-4-i686
Message-ID: <20071209051420.019401190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=676afc9d77471900ce550b0ccc456c6a0e84ad72

commit 676afc9d77471900ce550b0ccc456c6a0e84ad72
Author: crazy 
Date:   Sun Dec 9 06:13:50 2007 +0100

qbittorrent-0.9.3-4-i686
* release bump
* rebuild with boost

diff --git a/source/xapps-extra/qbittorrent/FrugalBuild b/source/xapps-extra/qbittorrent/FrugalBuild
index a342b38..652f446 100644
--- a/source/xapps-extra/qbittorrent/FrugalBuild
+++ b/source/xapps-extra/qbittorrent/FrugalBuild
@@ -3,9 +3,10 @@

pkgname=qbittorrent
pkgver=0.9.3
-pkgrel=3
+pkgrel=4
pkgdesc="A Bittorrent client."
-depends=('rblibtorrent>=0.12-4' 'curl>=7.16.1-2' 'python>=2.5' 'libqtgui' 'libqtnetwork')
+depends=('rblibtorrent>=0.12-6' 'curl>=7.16.1-2' 'python>=2.5' 'libqtgui' 'libqtnetwork' 'libboost-mt>=1.34.1')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
archs=('i686' 'x86_64')
_F_sourceforge_broken_up2date=1
From crazy at frugalware.org  Sun Dec  9 06:32:59 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 06:33:02 2007
Subject: [Frugalware-git] boost: pdns-recursor-3.1.4-3-i686
Message-ID: <20071209053259.AECA91190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=fcccbb2ed5bedc4b168926c4e6cca708acb0dbca

commit fcccbb2ed5bedc4b168926c4e6cca708acb0dbca
Author: crazy 
Date:   Sun Dec 9 06:32:38 2007 +0100

pdns-recursor-3.1.4-3-i686
* release bump
* fixed depends()
* fixed CXXFLAGS
* ohh well for the rest see the diff
* please someone take over this ..

diff --git a/source/network-extra/pdns-recursor/FrugalBuild b/source/network-extra/pdns-recursor/FrugalBuild
index 1681f4b..df919d8 100644
--- a/source/network-extra/pdns-recursor/FrugalBuild
+++ b/source/network-extra/pdns-recursor/FrugalBuild
@@ -4,27 +4,37 @@

pkgname=pdns-recursor
pkgver=3.1.4
-pkgrel=2
+pkgrel=3
pkgdesc="Power DNS recursor"
url="http://www.powerdns.com/"
-depends=('glibc')
-makedepends=('boost>=1.34.0')
+depends=('libstdc++')
+makedepends=('boost>=1.34.1')
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx --dump http://downloads.powerdns.com/releases/?M=D|grep recursor|sed 's/.*recursor-\(.*\).tar.*/\1/;1 q'"
source=(http://downloads.powerdns.com/releases/pdns-recursor-$pkgver.tar.bz2 \
rc.pdns-recursor recursor.conf atomicity_fix.patch)

-build() {
-    Fcd $pkgname-$pkgver
-    # Fix for gcc4.2.0 atomicity.h problem
-    Fpatchall
-    Fconf --libdir=/usr/lib/pdns --sysconfdir=/etc/powerdns --enable-pdns_server --enable-recursor --with-pgsql-includes=/usr/include --with-sqlite-includes=/usr/include --with-modules="geo" --with-dynmodules="mysql gmysql gpgsql gsqlite pipe"
-    Fmakeinstall
-    Fmkdir /etc/powerdns
-    Fmkdir /lib/initscripts/messages/hu/LC_MESSAGES
-    msgfmt -o $Fdestdir/lib/initscripts/messages/hu/LC_MESSAGES/$pkgname.mo $startdir/hu.po
-    Frcd2 pdns-recursor
+build()
+{
+	Fcd $pkgname-$pkgver
+	# Fix for gcc4.2.0 atomicity.h problem
+	Fpatchall
+	Fconf \
+		--libdir=/usr/lib/pdns \
+		--sysconfdir=/etc/powerdns \
+		--enable-pdns_server \
+		--enable-recursor \
+		--with-pgsql-includes=/usr/include \
+		--with-sqlite-includes=/usr/include \
+		--with-modules="geo" \
+		--with-dynmodules="mysql gmysql gpgsql gsqlite pipe"
+	make OPTFLAGS="" || Fdie
+	Fmakeinstall
+	Fmkdir /etc/powerdns
+	Fmkdir /lib/initscripts/messages/hu/LC_MESSAGES
+	msgfmt -o $Fdestdir/lib/initscripts/messages/hu/LC_MESSAGES/$pkgname.mo $startdir/hu.po
+	Frcd2 pdns-recursor

}
From crazy at frugalware.org  Sun Dec  9 06:57:38 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 06:57:39 2007
Subject: [Frugalware-git] boost: pdns-2.9.21-3-i686
Message-ID: <20071209055738.7C2FC1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=2dc09c32ea897e900802d087da99113c88ffab85

commit 2dc09c32ea897e900802d087da99113c88ffab85
Author: crazy 
Date:   Sun Dec 9 06:56:59 2007 +0100

pdns-2.9.21-3-i686
* release bump
* yeah 'sqlite2 libmysqlclient libpq' are depends()
* if you don't like that 'man FrugalBuild' and split it

diff --git a/source/network-extra/pdns/FrugalBuild b/source/network-extra/pdns/FrugalBuild
index 4f6a42b..d1bed80 100644
--- a/source/network-extra/pdns/FrugalBuild
+++ b/source/network-extra/pdns/FrugalBuild
@@ -4,11 +4,11 @@

pkgname=pdns
pkgver=2.9.21
-pkgrel=2
+pkgrel=3
pkgdesc="Power DNS Server and Recursor"
url="http://www.powerdns.com/"
-depends=('glibc' 'pdns-recursor')
-makedepends=('mysql' 'postgresql' 'sqlite2' 'boost>=1.34.0')
+depends=('libstdc++' 'sqlite2' 'libmysqlclient' 'libpq' 'pdns-recursor>=3.1.4-3')
+makedepends=('mysql' 'postgresql' 'boost>=1.34.1')
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx --dump http://downloads.powerdns.com/releases/?M=D|grep pdns-.*gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'"
@@ -19,12 +19,18 @@ sha1sums=('2b86e4b44ef43db308c62e32b10ed0d5221a45c9' \
'd545b750c7479f89a9f0410dca02c875f41ca860')
build()
{
-    Fcd pdns-$pkgver
-    Fconf --libdir=/usr/lib/pdns --sysconfdir=/etc/powerdns --enable-pdns_server  --with-pgsql-includes=/usr/include --with-sqlite-includes=/usr/include --with-modules="geo" --with-dynmodules="mysql gmysql gpgsql gsqlite pipe"
-    Fmakeinstall
-    Fmkdir /lib/initscripts/messages/hu/LC_MESSAGES
-    msgfmt -o $Fdestdir/lib/initscripts/messages/hu/LC_MESSAGES/$pkgname.mo $startdir/hu.po
-    Frcd2 pdns
+	Fcd pdns-$pkgver
+	Fbuild \
+		--libdir=/usr/lib/pdns \
+		--sysconfdir=/etc/powerdns \
+		--enable-pdns_server  \
+		--with-pgsql-includes=/usr/include \
+		--with-sqlite-includes=/usr/include \
+		--with-modules="geo" \
+		--with-dynmodules="mysql gmysql gpgsql gsqlite pipe"
+    	Fmkdir /lib/initscripts/messages/hu/LC_MESSAGES
+	msgfmt -o $Fdestdir/lib/initscripts/messages/hu/LC_MESSAGES/$pkgname.mo $startdir/hu.po
+    	Frcd2 pdns
}

# optimization OK
From crazy at frugalware.org  Sun Dec  9 08:31:06 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 08:31:07 2007
Subject: [Frugalware-git] boost: glob2-0.9.1-2-i686
Message-ID: <20071209073106.B65121190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=16bb89978500a897c660827368862cad1e6acc4c

commit 16bb89978500a897c660827368862cad1e6acc4c
Author: crazy 
Date:   Sun Dec 9 08:27:18 2007 +0100

glob2-0.9.1-2-i686
* release bump
* rebuild with boost
* fixed icon location , CXXFLAGS , depends()
* make use of MAKEFLAGS

diff --git a/source/games-extra/glob2/FrugalBuild b/source/games-extra/glob2/FrugalBuild
index f42b186..fa036d7 100644
--- a/source/games-extra/glob2/FrugalBuild
+++ b/source/games-extra/glob2/FrugalBuild
@@ -4,11 +4,11 @@

pkgname=glob2
pkgver=0.9.1
-pkgrel=1
+pkgrel=2
pkgdesc="Innovative Real-Time Strategy (RTS) game which reduces micro-management by automatically assigning tasks to units."
url="http://globulation2.org/"
-depends=('sdl_net' 'sdl_ttf' 'sdlimage' 'libvorbis' 'libgl' 'speex')
-makedepends=('boost>=1.34.0' 'scons')
+depends=('sdl_net' 'sdl_ttf' 'sdlimage' 'libvorbis' 'libgl' 'speex' 'fribidi' 'libboost-mt>=1.34.1')
+makedepends=('boost>=1.34.1' 'scons')
license="GPL2"
groups=('games-extra')
archs=('i686' 'x86_64')
@@ -18,11 +18,13 @@ source=("http://dl.sv.nongnu.org/releases/$pkgname/$pkgver/$pkgname-$pkgver.tar.
build() {
Fpatchall
cp $Fsrcdir/glob2.desktop data/ || return 1
-	scons || return 1
+	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
+	scons $JOBS CXXFLAGS="$CXXFLAGS" || return 1
scons BINDIR="$Fdestdir/usr/bin" INSTALLDIR="$Fdestdir/usr/share" install || return 1
+
}

-sha1sums=('18136ff058e2b7bd313cefdc45bcbfe25e12a5e0' \
-          '14373039ae35116b9bec89604240aab0202d1d99' \
-          'f65660dafea34ca84a53cb8033f856baac65fd84')
+sha1sums=('edfc49f3b06933783518afeeb670c5119694267a' \
+          '74ab16b4267a8b39d707b94873a34143f8a4d508' \
+          'b090d2baf0943f66611f9b73f66d883d8aad3e33')
# optimization OK
diff --git a/source/games-extra/glob2/glob2-0.9.1-boostmt.diff b/source/games-extra/glob2/glob2-0.9.1-boostmt.diff
index 8476984..12b0c0d 100644
--- a/source/games-extra/glob2/glob2-0.9.1-boostmt.diff
+++ b/source/games-extra/glob2/glob2-0.9.1-boostmt.diff
@@ -6,8 +6,8 @@
Exit(1)
-    if not conf.CheckLib('boost_thread') or not conf.CheckCXXHeader('boost/thread/thread.hpp'):
-        print "Could not find libboost_thread or boost/thread/thread.hpp"
-+    if not conf.CheckLib('boost_thread-gcc42-mt') or not conf.CheckCXXHeader('boost/thread/thread.hpp'):
-+        print "Could not find libboost_thread-gcc42-mt or boost/thread/thread.hpp"
++    if not conf.CheckLib('boost_thread-mt') or not conf.CheckCXXHeader('boost/thread/thread.hpp'):
++        print "Could not find libboost_thread-mt or boost/thread/thread.hpp"
Exit(1)
if not conf.CheckCXXHeader('boost/shared_ptr.hpp'):
print "Could not find boost/shared_ptr.hpp"
@@ -16,7 +16,7 @@
if env['osx']:
env.Append(CXXFLAGS="-framework OpenGL")
-    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread'])
-+    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread-gcc42-mt'])
++    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread-mt'])

env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz"
env["TARFLAGS"] = "-c -z"
diff --git a/source/games-extra/glob2/glob2.desktop b/source/games-extra/glob2/glob2.desktop
index bb87b9c..a0017b7 100644
--- a/source/games-extra/glob2/glob2.desktop
+++ b/source/games-extra/glob2/glob2.desktop
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=Globulation 2
Comment=An innovative new strategy game
Exec=glob2
-Icon=glob2-icon-48x48
+Icon=/usr/share/glob2/data/icons/glob2-icon-48x48.png
Terminal=false
X-MultipleArgs=false
Type=Application
From boobaa at frugalware.org  Sun Dec  9 10:21:41 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Sun Dec  9 10:21:44 2007
Subject: [Frugalware-git] frugalware-current: drupal-captcha-5.x_3.1-1-i686
Message-ID: <20071209092141.CDE3E1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6c8abc1b451314e08ce9fa157971d959ec7ec824

commit 6c8abc1b451314e08ce9fa157971d959ec7ec824
Author: CSÉCSY László 
Date:   Sun Dec 9 10:21:36 2007 +0100

drupal-captcha-5.x_3.1-1-i686
version bump

diff --git a/source/network-extra/drupal-captcha/FrugalBuild b/source/network-extra/drupal-captcha/FrugalBuild
index d910939..324f26c 100644
--- a/source/network-extra/drupal-captcha/FrugalBuild
+++ b/source/network-extra/drupal-captcha/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: CSÉCSY László 

_F_drupal_module=captcha
-pkgver=5.x_3.0
+pkgver=5.x_3.1
pkgrel=1
pkgdesc="Provides CAPTCHA feature to virtually any user facing web form in Drupal"
Finclude drupal
-sha1sums=('30a2ed557345e05f76dbde207bba47f785a8fb31')
+sha1sums=('84bc72399bb7b647385397d13b6aa28734ffd771')
From crazy at frugalware.org  Sun Dec  9 11:28:14 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 11:34:02 2007
Subject: [Frugalware-git] boost: pingus-0.7.2-1-i686
Message-ID: <20071209102814.A871C11901CF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=208cae94d8fbcc8b6a670a321d8384022a2bc0f2

commit 208cae94d8fbcc8b6a670a321d8384022a2bc0f2
Author: crazy 
Date:   Sun Dec 9 11:21:53 2007 +0100

pingus-0.7.2-1-i686
* Version bump
* fixed LDFLAGS , CXXFLAGS
* make use of MAKEFLAGS
* added missing desktop file
* fixed depends()

diff --git a/source/games-extra/pingus/FrugalBuild b/source/games-extra/pingus/FrugalBuild
index b0d68c8..c074b31 100644
--- a/source/games-extra/pingus/FrugalBuild
+++ b/source/games-extra/pingus/FrugalBuild
@@ -3,24 +3,34 @@
# Contributor: Edo Hikmahtiar 

pkgname=pingus
-pkgver=0.7.0
+pkgver=0.7.2
pkgrel=1
pkgdesc="Pingus is a free Lemmings clone for GNU/Linux"
url="http://pingus.seul.org"
-makedepends=('scons')
-depends=('boost' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+depends=('libboost-mt>=1.34.1' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+makedepends=('boost>=1.34.1' 'scons')
groups=('games-extra')
archs=('i686')
up2date="lynx -dump http://pingus.seul.org/download.html | grep -m1 -A2 Source | sed 's/.*-\(.*\).t.*/\1/' | tail -n1"
source=($url/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('64fb622b7d72b0c819653b0710e078e146fbf808')
+sha1sums=('1cd3a1d924337a5ee2e0ee387c0513f85d47cdb0')

build()
{
Fcd
-	scons || Fdie
-	Fmkdir $Fdestdir/usr
-	sh install.sh $Fdestdir/usr
+	## lol ..
+	Fsed "boost_signals" "boost_signals-mt" SConstruct
+	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
+	scons $JOBS LINKFLAGS="$LDFLAGS" CCFLAGS="$CXXFLAGS" || Fdie
+	## oh well not an pinguin 'icon' but 24x18 looks like shit so
+	## we use this one for now =)
+	Ffilerel data/images/worldobjs/teleporter2.png \
+		/usr/share/pixmaps/$pkgname.png
+	sh install.sh $Fdestdir/usr || Fdie
+	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Game;ArcadeGame;"
+
}

#optimization OK
+
+# optimization OK
From boobaa at frugalware.org  Sun Dec  9 11:42:30 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Sun Dec  9 12:19:58 2007
Subject: [Frugalware-git] frugalware-current: drupal-5.5-1-i686
Message-ID: <20071209104230.5160011904CE@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=870727919346eaf8537af001efff9a5466ef530b

commit 870727919346eaf8537af001efff9a5466ef530b
Author: CSÉCSY László 
Date:   Sun Dec 9 11:41:34 2007 +0100

drupal-5.5-1-i686
version bump

diff --git a/source/network-extra/drupal/FrugalBuild b/source/network-extra/drupal/FrugalBuild
index b0409b1..d577052 100644
--- a/source/network-extra/drupal/FrugalBuild
+++ b/source/network-extra/drupal/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: AlexExtreme 

pkgname=drupal
-pkgver=5.4
+pkgver=5.5
pkgrel=1
pkgdesc="An advanced content management system to manage your website"
url="http://drupal.org"
@@ -15,7 +15,7 @@ up2date="lynx -dump http://drupal.org/download | grep -m1 'l-[0-9\.]*.tar.gz' |
backup=(var/www/drupal/sites/default/settings.php)
source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \
drupalsetup README.Frugalware)
-sha1sums=('76e08a766d36d24c4628f61aea47d8961064f29b' \
+sha1sums=('4c810c92251dfc34036d9f02015192969cc4960a' \
'c56deef0edee4cea4b9391d20358eb7e2faf0005' \
'64c0eadd7a2e00b11644458a4eeea8e3203fa739')
options=('stick')
From crazy at frugalware.org  Sun Dec  9 11:41:06 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:20:19 2007
Subject: [Frugalware-git] boost: Revert "pingus-0.7.2-1-i686"
Message-ID: <20071209104106.E88EE11904C1@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=9af9e6128bec08cc17511d8e0cd7ab20ff98c24e

commit 9af9e6128bec08cc17511d8e0cd7ab20ff98c24e
Author: crazy 
Date:   Sun Dec 9 11:40:06 2007 +0100

Revert "pingus-0.7.2-1-i686"
* This reverts commit 7391fa5327d4a7ef41f07d4f7d1f1767c5582400.
* likes how dg breaks commits ..

diff --git a/source/games-extra/pingus/FrugalBuild b/source/games-extra/pingus/FrugalBuild
index c074b31..b0d68c8 100644
--- a/source/games-extra/pingus/FrugalBuild
+++ b/source/games-extra/pingus/FrugalBuild
@@ -3,34 +3,24 @@
# Contributor: Edo Hikmahtiar 

pkgname=pingus
-pkgver=0.7.2
+pkgver=0.7.0
pkgrel=1
pkgdesc="Pingus is a free Lemmings clone for GNU/Linux"
url="http://pingus.seul.org"
-depends=('libboost-mt>=1.34.1' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
-makedepends=('boost>=1.34.1' 'scons')
+makedepends=('scons')
+depends=('boost' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
groups=('games-extra')
archs=('i686')
up2date="lynx -dump http://pingus.seul.org/download.html | grep -m1 -A2 Source | sed 's/.*-\(.*\).t.*/\1/' | tail -n1"
source=($url/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('1cd3a1d924337a5ee2e0ee387c0513f85d47cdb0')
+sha1sums=('64fb622b7d72b0c819653b0710e078e146fbf808')

build()
{
Fcd
-	## lol ..
-	Fsed "boost_signals" "boost_signals-mt" SConstruct
-	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
-	scons $JOBS LINKFLAGS="$LDFLAGS" CCFLAGS="$CXXFLAGS" || Fdie
-	## oh well not an pinguin 'icon' but 24x18 looks like shit so
-	## we use this one for now =)
-	Ffilerel data/images/worldobjs/teleporter2.png \
-		/usr/share/pixmaps/$pkgname.png
-	sh install.sh $Fdestdir/usr || Fdie
-	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Game;ArcadeGame;"
-
+	scons || Fdie
+	Fmkdir $Fdestdir/usr
+	sh install.sh $Fdestdir/usr
}

#optimization OK
-
-# optimization OK
From crazy at frugalware.org  Sun Dec  9 11:44:11 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:20:21 2007
Subject: [Frugalware-git] boost: pingus-0.7.2-1-i686
Message-ID: <20071209104411.3E43C11904D0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost.git;a=commitdiff;h=0dd7f29325b4e7086c9d19263d805182ae8cc9ac

commit 0dd7f29325b4e7086c9d19263d805182ae8cc9ac
Author: crazy 
Date:   Sun Dec 9 11:43:52 2007 +0100

pingus-0.7.2-1-i686
* Version bump
* fixed LDFLAGS , CXXFLAGS
* make use of MAKEFLAGS
* added missing desktop file
* fixed depends()

diff --git a/source/games-extra/pingus/FrugalBuild b/source/games-extra/pingus/FrugalBuild
index b0d68c8..c074b31 100644
--- a/source/games-extra/pingus/FrugalBuild
+++ b/source/games-extra/pingus/FrugalBuild
@@ -3,24 +3,34 @@
# Contributor: Edo Hikmahtiar 

pkgname=pingus
-pkgver=0.7.0
+pkgver=0.7.2
pkgrel=1
pkgdesc="Pingus is a free Lemmings clone for GNU/Linux"
url="http://pingus.seul.org"
-makedepends=('scons')
-depends=('boost' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+depends=('libboost-mt>=1.34.1' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+makedepends=('boost>=1.34.1' 'scons')
groups=('games-extra')
archs=('i686')
up2date="lynx -dump http://pingus.seul.org/download.html | grep -m1 -A2 Source | sed 's/.*-\(.*\).t.*/\1/' | tail -n1"
source=($url/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('64fb622b7d72b0c819653b0710e078e146fbf808')
+sha1sums=('1cd3a1d924337a5ee2e0ee387c0513f85d47cdb0')

build()
{
Fcd
-	scons || Fdie
-	Fmkdir $Fdestdir/usr
-	sh install.sh $Fdestdir/usr
+	## lol ..
+	Fsed "boost_signals" "boost_signals-mt" SConstruct
+	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
+	scons $JOBS LINKFLAGS="$LDFLAGS" CCFLAGS="$CXXFLAGS" || Fdie
+	## oh well not an pinguin 'icon' but 24x18 looks like shit so
+	## we use this one for now =)
+	Ffilerel data/images/worldobjs/teleporter2.png \
+		/usr/share/pixmaps/$pkgname.png
+	sh install.sh $Fdestdir/usr || Fdie
+	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Game;ArcadeGame;"
+
}

#optimization OK
+
+# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:56:53 2007
Subject: [Frugalware-git] frugalware-current: boost-1.34.1-1-i686
Message-ID: <20071209115650.40CEB1190054@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c18bae909bf3ee8b127f889e335195327346b89b

commit c18bae909bf3ee8b127f889e335195327346b89b
Author: crazy 
Date:   Sat Dec 8 19:41:14 2007 +0100

boost-1.34.1-1-i686
* Version bump
* removed all old patches
* split all libs in own packages
* new maintainer , Ok @ krix

diff --git a/source/devel-extra/boost/FrugalBuild b/source/devel-extra/boost/FrugalBuild
index 12feb26..91599b0 100644
--- a/source/devel-extra/boost/FrugalBuild
+++ b/source/devel-extra/boost/FrugalBuild
@@ -1,25 +1,31 @@
# Compiling Time: 2.33 SBU
-# Maintainer: Christian Hamar alias krix 
+# Maintainer: crazy 
+# Contributor: Christian Hamar alias krix 

pkgname=boost
-pkgver=1.34.0
-pkgrel=5
-pkgdesc="Boost Libraries for C++"
+pkgver=1.34.1
+pkgrel=1
+pkgdesc="Boost header files , examples and tools"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge python
url="http://boost.org/"
-depends=('libstdc++' 'python' 'icu>=3.8' 'bzip2' 'zlib')
-makedepends=('boost-jam')
+depends=()
+makedepends=('boost-jam>=3.1.16' 'python' 'icu>=3.8' 'bzip2' 'zlib')
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=7586 | grep 'Latest.*Notes' | sed -n 's/.*\]\([0-9\.]\+\) \[.*/\1/;1 p'"
-source=(${source/-$pkgver/_${pkgver//./_}} no_version_for_include_kthx.patch \
-	boostjam_x86_64.patch gcc42_atomicity_h.patch)
+source=(${source/-$pkgver/_${pkgver//./_}})
_F_cd_path="${pkgname}_`echo $pkgver|tr . _`"
-sha1sums=('d2fdb4535a13566917fe3d8377b017f094933641'\
-          'ed54f5fe28c801e240fa87f3641de1b1184dfe20'\
-          'f183bdd5970e67ac2d9062ec1834eb22233ede03'\
-          '4885396af53aa6a959cd6adb92d826acfa204d5a')
+sha1sums=('b771271d5cbd3bdb0f119dd66dfd36bad7a66866')
+
+subpkgs=("libboost" "libboost-mt" "libboost-static" "libboost-mt-static")
+subdescs=('Boost libraries.' 'Boost libraries with multithreading support.' \
+	  'Boost libraries statically linked.' 'Boost libraries with multithreading support statically linked.')
+subdepends=('icu libgcc bzip2 zlib' \
+	    'icu libgcc bzip2 zlib' \
+	    '' '')
+subgroups=('devel-extra' 'devel-extra' 'devel-extra' 'devel-extra')
+subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64')

build()
{
@@ -27,7 +33,7 @@ build()
Fpatchall
Fsed "-O3" "$CXXFLAGS -fno-strict-aliasing" tools/build/v2/tools/gcc.jam
BOOSTJAM="/usr/bin/bjam"
-	OPTIONS="release debug-symbols=off optimization=speed threading=single,multi -d2"
+	OPTIONS="release debug-symbols=off optimization=speed threading=single,multi -d+2"
JOBS="$MAKEFLAGS"

${BOOSTJAM} \
@@ -41,7 +47,8 @@ build()
--exec-prefix="$Fdestdir/usr" \
--includedir="$Fdestdir/usr/include" \
--libdir="$Fdestdir/usr/lib" \
-	    	--toolset=gcc stage || Fdie
+		--toolset=gcc \
+	    	--layout=system || Fdie

${BOOSTJAM} \
${JOBS} \
@@ -54,11 +61,20 @@ build()
--exec-prefix="$Fdestdir/usr" \
--includedir="$Fdestdir/usr/include" \
--libdir="$Fdestdir/usr/lib" \
-		--toolset=gcc install || Fdie
+		--toolset=gcc \
+		--layout=system install || Fdie

cd $Fsrcdir/$_F_cd_path/tools/build/
Fmkdir usr/share/boost
-	cp -a b* index.html  v2/ $Fdestdir/usr/share/boost/
+	rm -rf v2/debian || Fdie
+	cp -a b* index.html  v2/ $Fdestdir/usr/share/boost/ || Fdie
+
+	Fsplit libboost-mt usr/lib/libboost_*-mt.so
+	Fsplit libboost-mt-static  usr/lib/libboost_*-mt.a
+
+	Fsplit libboost usr/lib/libboost_*.so
+	Fsplit libboost-static usr/lib/libboost_*.a
+
}

# optimization OK
diff --git a/source/devel-extra/boost/boostjam_x86_64.patch b/source/devel-extra/boost/boostjam_x86_64.patch
deleted file mode 100644
index 46c0fa4..0000000
--- a/source/devel-extra/boost/boostjam_x86_64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur boost_1_34_0.orig/tools/jam/src/jam.h boost_1_34_0/tools/jam/src/jam.h
---- boost_1_34_0.orig/tools/jam/src/jam.h	2007-05-25 13:34:42.000000000 +0200
-+++ boost_1_34_0/tools/jam/src/jam.h	2007-05-25 13:35:11.000000000 +0200
-@@ -480,6 +480,10 @@
- # define OSPLAT "OSPLAT=IA64"
- # endif
-
-+# if defined( __x86_64__ )
-+# define OSPLAT "OSPLAT=x86_64"
-+# endif
-+
- # ifdef __s390__
- # define OSPLAT "OSPLAT=390"
- # endif
diff --git a/source/devel-extra/boost/gcc42_atomicity_h.patch b/source/devel-extra/boost/gcc42_atomicity_h.patch
deleted file mode 100644
index 01408c4..0000000
--- a/source/devel-extra/boost/gcc42_atomicity_h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur boost_1_34_0.orig/boost/detail/atomic_count_gcc.hpp boost_1_34_0/boost/detail/atomic_count_gcc.hpp
---- boost_1_34_0.orig/boost/detail/atomic_count_gcc.hpp	2007-05-26 14:18:17.000000000 +0200
-+++ boost_1_34_0/boost/detail/atomic_count_gcc.hpp	2007-05-26 14:19:26.000000000 +0200
-@@ -17,7 +17,15 @@
- //  http://www.boost.org/LICENSE_1_0.txt)
- //
-
--#include 
-+#define GCC_VERSION (__GNUC__ * 10000 \
-+		     + __GNUC_MINOR__ * 100 \
-+		     + __GNUC_PATCHLEVEL__)
-+
-+#if GCC_VERSION >= 40200
-+ #include 
-+#else
-+ #include 
-+#endif
-
- namespace boost
- {
diff --git a/source/devel-extra/boost/no_version_for_include_kthx.patch b/source/devel-extra/boost/no_version_for_include_kthx.patch
deleted file mode 100644
index 4d74ab2..0000000
--- a/source/devel-extra/boost/no_version_for_include_kthx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur boost_1_34_0/Jamfile.v2 boost_1_34_0-p/Jamfile.v2
---- boost_1_34_0/Jamfile.v2	2007-05-11 05:40:34.000000000 +0200
-+++ boost_1_34_0-p/Jamfile.v2	2007-05-13 19:13:52.000000000 +0200
-@@ -312,7 +312,7 @@
-     ;
- if $(layout-versioned)
- {
--    install-requirements += boost-$(BOOST_VERSION_TAG)/boost ;
-+    install-requirements += boost ;
- }
- else
- {
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:56:55 2007
Subject: [Frugalware-git] frugalware-current: boost-jam-3.1.16-1-i686
Message-ID: <20071209115650.269AD1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff50ac57f2be814e3f79ea441614283504d3f182

commit ff50ac57f2be814e3f79ea441614283504d3f182
Author: crazy 
Date:   Sat Dec 8 17:50:26 2007 +0100

boost-jam-3.1.16-1-i686
* Version bump
* added cflags diff , fixes the segfaults
* new maintainer , Ok @ krix

diff --git a/source/devel-extra/boost-jam/FrugalBuild b/source/devel-extra/boost-jam/FrugalBuild
index d478850..960d342 100644
--- a/source/devel-extra/boost-jam/FrugalBuild
+++ b/source/devel-extra/boost-jam/FrugalBuild
@@ -1,8 +1,9 @@
# Compiling Time: 0.06 SBU
-# Maintainer: Christian Hamar alias krix 
+# Maintainer: crazy 
+# Contributor: Christian Hamar alias krix 

pkgname=boost-jam
-pkgver=3.1.14
+pkgver=3.1.16
pkgrel=1
pkgdesc="Boost.Jam - an alternative to make based on Jam."
_F_sourceforge_dirname="boost"
@@ -14,13 +15,16 @@ groups=('devel-extra')
archs=('x86_64' 'i686')
conflicts=('jam')
up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=7586'|grep -m 1 'boost-jam-[0-9\.]*.tgz'|sed 's/.*jam-\(.*\).tgz .*/\1/'"
-source=($source boost-jam-misc.patch)
-sha1sums=('6aaeaef716a70ed845d51bc87047c9b96d34e16e'\
-          'e47680c0c6878a151872d969e9aac103068c257f')
+source=($source boost-jam-misc.patch \
+	cflags.patch)
+sha1sums=('e2dd6ef9c56b18c7be7669aba374bcd24745ae95' \
+          'e47680c0c6878a151872d969e9aac103068c257f' \
+          'b7be7e370ae926b09bdd7514a170bc879a4d80f5')

build() {
Fpatchall
-	LOCATE_TARGET=bin ./build.sh cc
+	export CFLAGS="$CFLAGS -fno-strict-aliasing"
+	LOCATE_TARGET=bin ./build.sh gcc --symbols || Fdie
Fexerel bin/bjam /usr/bin/bjam
}

diff --git a/source/devel-extra/boost-jam/cflags.patch b/source/devel-extra/boost-jam/cflags.patch
new file mode 100644
index 0000000..a01be09
--- /dev/null
+++ b/source/devel-extra/boost-jam/cflags.patch
@@ -0,0 +1,57 @@
+diff -Naur boost-jam-3.1.16/build.jam boost-jam-3.1.16-flags/build.jam
+--- boost-jam-3.1.16/build.jam	2007-12-03 04:27:54.000000000 +0100
++++ boost-jam-3.1.16-flags/build.jam	2007-12-08 17:38:26.000000000 +0100
+@@ -176,7 +176,7 @@
+ ## GCC 2.x, 3.x, 4.x
+ toolset gcc gcc : "-o " : -D
+     : -pedantic -fno-strict-aliasing
+-    [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
++    [ opt --release : [ opt --symbols : -g : -s ] $(CFLAGS) ]
+     [ opt --debug : -g -O0 -fno-inline ]
+     -I$(--python-include) -I$(--extra-include) -Wno-long-long
+     : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+diff -Naur boost-jam-3.1.16/build.sh boost-jam-3.1.16-flags/build.sh
+--- boost-jam-3.1.16/build.sh	2007-12-03 04:27:54.000000000 +0100
++++ boost-jam-3.1.16-flags/build.sh	2007-12-08 17:36:50.000000000 +0100
+@@ -12,7 +12,7 @@
+ echo_run ()
+ {
+     echo "$@"
+-    $@
++    eval "$@"
+     r=$?
+     if test $r -ne 0 ; then
+         exit $r
+@@ -265,7 +265,7 @@
+     echo_run rm -rf bootstrap
+     echo_run mkdir bootstrap
+     if test ! -r jamgram.y -o ! -r jamgramtab.h ; then
+-        echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_YYACC} ${YYACC_SOURCES}
++        echo_run ${BOOST_JAM_CC} ${CFLAGS} ${BOOST_JAM_OPT_YYACC} ${YYACC_SOURCES}
+         if test -x "./bootstrap/yyacc0" ; then
+             echo_run ./bootstrap/yyacc0 jamgram.y jamgramtab.h jamgram.yy
+         fi
+@@ -279,16 +279,20 @@
+         mv -f y.tab.h jamgram.h
+     fi
+     if test ! -r jambase.c ; then
+-        echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_MKJAMBASE} ${MKJAMBASE_SOURCES}
++        echo_run ${BOOST_JAM_CC} ${CFLAGS} ${BOOST_JAM_OPT_MKJAMBASE} ${MKJAMBASE_SOURCES}
+         if test -x "./bootstrap/mkjambase0" ; then
+             echo_run ./bootstrap/mkjambase0 jambase.c Jambase
+         fi
+     fi
+-    echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_JAM} ${BJAM_SOURCES}
++    echo_run ${BOOST_JAM_CC} ${CFLAGS} ${BOOST_JAM_OPT_JAM} ${BJAM_SOURCES}
+ fi
+ if test -x "./bootstrap/jam0" ; then
+     if test "${BJAM_UPDATE}" != "update" ; then
+         echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" clean
+     fi
+-    echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
++    if test -z "$BOOST_JAM_TOOLSET_ROOT"; then
++        echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "$@"
++    else
++        echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
++    fi
+ fi
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:56:56 2007
Subject: [Frugalware-git] frugalware-current: rblibtorrent-0.12-6-i686
Message-ID: <20071209115650.5AE1D11901A6@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=44679232426bccf29dffeac74808e61bc2bc6764

commit 44679232426bccf29dffeac74808e61bc2bc6764
Author: crazy 
Date:   Sat Dec 8 20:41:12 2007 +0100

rblibtorrent-0.12-6-i686
* release bump
* rebuild with boost

diff --git a/source/lib-extra/rblibtorrent/FrugalBuild b/source/lib-extra/rblibtorrent/FrugalBuild
index 3ed2d58..aa00ca8 100644
--- a/source/lib-extra/rblibtorrent/FrugalBuild
+++ b/source/lib-extra/rblibtorrent/FrugalBuild
@@ -3,12 +3,13 @@

pkgname=rblibtorrent
pkgver=0.12
-pkgrel=5
+pkgrel=6
pkgdesc="LibTorrent is a BitTorrent library written in C++"
_F_sourceforge_name="libtorrent"
Finclude sourceforge
url="http://www.rasterbar.com/products/libtorrent/index.html"
-depends=('boost>=1.34.0-5' 'zlib' 'icu>=3.8')
+depends=('libboost-mt>=1.34.1' 'zlib' 'icu>=3.8')
+makedepends=('boost>=1.34.1')
groups=('lib-extra')
archs=('i686' 'x86_64')
#source=(http://www.libtorrent.org/libtorrent-${pkgver}rc3.tar.gz)
@@ -25,11 +26,11 @@ build()
--libdir=/usr/lib/libtorrent \
--enable-debug=no \
--with-zlib=system \
-		--with-boost-date-time=gcc42-mt \
-		--with-boost-filesystem=gcc42-mt \
-		--with-boost-thread=gcc42-mt \
-		--with-boost-regex=gcc42-mt \
-		--with-boost-program_options=gcc42-mt \
+		--with-boost-date-time=mt \
+		--with-boost-filesystem=mt \
+		--with-boost-thread=mt \
+		--with-boost-regex=mt \
+		--with-boost-program_options=mt \
--enable-examples
Fmakeinstall
Fmv usr/lib/libtorrent/pkgconfig usr/lib/pkgconfig/
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:56:57 2007
Subject: [Frugalware-git] frugalware-current: monotone-0.37-1-i686
Message-ID: <20071209115650.62AE111901A7@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=caa7d527a6b44b1f046b3c94e157b6c8bd8d6b59

commit caa7d527a6b44b1f046b3c94e157b6c8bd8d6b59
Author: crazy 
Date:   Sat Dec 8 21:18:43 2007 +0100

monotone-0.37-1-i686
* Version bump
* build with new boost

diff --git a/source/devel-extra/monotone/FrugalBuild b/source/devel-extra/monotone/FrugalBuild
index 7ff63d5..6a19390 100644
--- a/source/devel-extra/monotone/FrugalBuild
+++ b/source/devel-extra/monotone/FrugalBuild
@@ -2,12 +2,12 @@
# Maintainer: Christian Hamar alias krix 

pkgname=monotone
-pkgver=0.36
+pkgver=0.37
pkgrel=1
pkgdesc="Another distributed version (revision) control system"
url="http://venge.net/monotone/"
-depends=('libstdc++' 'boost>=1.34.0' 'lua')
-makedepends=('cvs')
+depends=('libstdc++' 'libboost-mt>=1.34.1' 'lua')
+makedepends=('boost>=1.34.1' 'cvs')
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump 'http://venge.net/monotone/?M=D'|grep tar.gz$|sed -n 's/.*e-\(.*\)\.t.*/\1/;1 p'"
@@ -16,9 +16,9 @@ source=(http://venge.net/monotone/downloads/$pkgver/$pkgname-$pkgver.tar.gz)
build()
{
Fcd
-       	Fmake --enable-ipv6 --with-bundled-lua=no BOOST_SUFFIX="-gcc42-mt-1_34 -gcc42 -gcc42-mt"
+       	Fmake --enable-ipv6 --with-bundled-lua=no BOOST_SUFFIX="-mt"
Fmakeinstall
}

-sha1sums=('d6f5ae91dc8045624dfc0dfbca00d60fea569ac3')
+sha1sums=('7d53bd67f7539342fcc15cceb0c2f4b31ba07647')
# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:00 2007
Subject: [Frugalware-git] frugalware-current: d4x-2.5.7.1-4-i686
Message-ID: <20071209115650.7C8A611901A8@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2d6c7b60b585cc5b82a9683c2e7523ebf6056b1c

commit 2d6c7b60b585cc5b82a9683c2e7523ebf6056b1c
Author: crazy 
Date:   Sat Dec 8 21:54:25 2007 +0100

d4x-2.5.7.1-4-i686
* release bump
* added an patch to fix the build

diff --git a/source/xapps-extra/d4x/FrugalBuild b/source/xapps-extra/d4x/FrugalBuild
index 0058ae4..322c1d2 100644
--- a/source/xapps-extra/d4x/FrugalBuild
+++ b/source/xapps-extra/d4x/FrugalBuild
@@ -4,22 +4,27 @@

pkgname=d4x
pkgver=2.5.7.1
-pkgrel=3
+pkgrel=4
pkgdesc="Download manager for Linux"
url="http://www.krasu.ru/soft/chuchelo/"
-depends=('gtk+2' 'atk' 'openssl' 'libstdc++' 'freetype2' 'pango' 'cairo' 'boost>=1.34.0-4' 'cppunit')
+depends=('gtk+2' 'atk' 'openssl' 'libstdc++' 'freetype2' 'pango' 'cairo')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
options=('scriptlet')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.krasu.ru/soft/chuchelo/|grep -m1 '.tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'"
-source=(http://d4x.krasu.ru/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('10955550112bdf22ff91c6c9395afd1a5f15bff2')
+source=(http://d4x.krasu.ru/files/$pkgname-$pkgver.tar.bz2 gtk2-compile.patch)
+sha1sums=('10955550112bdf22ff91c6c9395afd1a5f15bff2' \
+          '5020e0ea3027c4eae877c702b52f360047dbd8f8')

build ()
{
Fcd
+	Fpatchall
+	autoconf || Fdie
Fmkdir usr/bin
-	Fbuild
+	Fmake
+	Fmakeinstall
Fln /usr/man/man1/nt.1.gz /usr/man/man1/d4x.1.gz
Fmkdir /usr/share/{applications,pixmaps}
Ffilerel share/nt.desktop /usr/share/applications/nt.desktop
diff --git a/source/xapps-extra/d4x/gtk2-compile.patch b/source/xapps-extra/d4x/gtk2-compile.patch
new file mode 100644
index 0000000..8f15a9a
--- /dev/null
+++ b/source/xapps-extra/d4x/gtk2-compile.patch
@@ -0,0 +1,22 @@
+diff -Naur d4x-2.5.7.1/configure.ac d4x-2.5.7.1-gtk/configure.ac
+--- d4x-2.5.7.1/configure.ac	2005-11-05 00:35:38.000000000 +0100
++++ d4x-2.5.7.1-gtk/configure.ac	2007-12-08 21:31:53.000000000 +0100
+@@ -298,7 +298,6 @@
+
+ # Other needed defines
+ AC_DEFINE(_REENTRANT, , [Enable reenrant code of glibc])
+-AC_DEFINE(GTK_DISABLE_DEPRECATED, , [Enable warnings about deprecated functions usage])
+ AC_DEFINE(_FILE_OFFSET_BITS, 64, [To support files over 2GB])
+
+ # Prepare all requiered flags
+diff -Naur d4x-2.5.7.1/main/face/list.cc d4x-2.5.7.1-gtk/main/face/list.cc
+--- d4x-2.5.7.1/main/face/list.cc	2006-03-20 01:29:41.000000000 +0100
++++ d4x-2.5.7.1-gtk/main/face/list.cc	2007-12-08 21:31:04.000000000 +0100
+@@ -8,7 +8,6 @@
+  *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  */
+-#define GTK_DISABLE_DEPRECATED
+
+ #include 
+ #include 
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:02 2007
Subject: [Frugalware-git] frugalware-current: inkscape-0.45.1-5-i686
Message-ID: <20071209115650.88B4811901A9@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7de3efe7b86a43fe55975fa29b9d80826ec26b20

commit 7de3efe7b86a43fe55975fa29b9d80826ec26b20
Author: crazy 
Date:   Sat Dec 8 23:02:41 2007 +0100

inkscape-0.45.1-5-i686
* release bump
* fixed the build
* fixed makedepends() and depends()

diff --git a/source/xapps-extra/inkscape/FrugalBuild b/source/xapps-extra/inkscape/FrugalBuild
index 58e58ee..53b5a7c 100644
--- a/source/xapps-extra/inkscape/FrugalBuild
+++ b/source/xapps-extra/inkscape/FrugalBuild
@@ -4,12 +4,12 @@

pkgname=inkscape
pkgver=0.45.1
-pkgrel=4
+pkgrel=5
pkgdesc="A vector illustrator program for GNOME"
url="http://www.inkscape.org/"
-makedepends=('intltool' 'perl-xml')
depends=('openssl' 'lcms' 'cairomm' 'libgcc' 'atk' 'gtkmm>=2.10.10-3' 'glibmm' 'freetype2' 'libxcb' \
-	'pango>=1.14.3' 'libgc>=6.4' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7' 'python>=2.5' 'perl' 'boost>=1.34.0-4')
+	'pango>=1.14.3' 'libgc>=6.4' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7' 'python>=2.5' 'perl')
+makedepends=('boost>=1.34.1' 'intltool' 'perl-xml')
rodepends=('libxml2>=2.6.20' 'pyxml' 'libxslt')
groups=('xapps-extra')
archs=('i686' 'x86_64')
@@ -25,6 +25,7 @@ build()
export CFLAGS="$CFLAGS -fno-strict-aliasing"
export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"
Fautoreconf
+	intltoolize -c -f || Fdie
Fmake \
--without-gnome-print \
--with-gnu-ld \
@@ -39,7 +40,7 @@ build()
Fmakeinstall
}

-sha1sums=('f3df9eafc0fdfcc5f5024ea4bec4d7c477698380'\
-          '85d9b4a7bf718a51efa13eb40fcc01a2d9378734'\
+sha1sums=('f3df9eafc0fdfcc5f5024ea4bec4d7c477698380' \
+          '85d9b4a7bf718a51efa13eb40fcc01a2d9378734' \
'ddcb89e80b8b19c53c0994e9b472026bc1a2d200')
# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:30 2007
Subject: [Frugalware-git] frugalware-current: jahshaka-2.0-3-i686
Message-ID: <20071209115650.B931C11901CF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=390774888d5e72f8e3a88fd3cf5e56059839ca5e

commit 390774888d5e72f8e3a88fd3cf5e56059839ca5e
Author: crazy 
Date:   Sat Dec 8 23:53:49 2007 +0100

jahshaka-2.0-3-i686
* release bump
* rebuild with boost and openlibraries

diff --git a/source/xapps-extra/jahshaka/FrugalBuild b/source/xapps-extra/jahshaka/FrugalBuild
index 2823fa3..09f9bf8 100644
--- a/source/xapps-extra/jahshaka/FrugalBuild
+++ b/source/xapps-extra/jahshaka/FrugalBuild
@@ -3,11 +3,12 @@

pkgname=jahshaka
pkgver=2.0
-pkgrel=2
+pkgrel=3
pkgdesc="Jahshaka is a video and film compositing, editing and special fx system that uses OpenGL & OpenML."
_F_sourceforge_name=jahshakafx
Finclude sourceforge
-depends=('libxi' 'fontconfig' 'openlibraries' 'libxft' 'mlt-plus-plus' 'qt' 'freetype2' 'libxrender' 'boost')
+depends=('libxi' 'fontconfig' 'openlibraries>=0.4.0-3' 'libxft' 'mlt-plus-plus' 'qt' 'freetype2' 'libxrender' 'libboost-mt>=1.34.1')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
archs=('i686')
source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/$_F_sourceforge_dirname/$pkgname.tar.gz)
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:31 2007
Subject: [Frugalware-git] frugalware-current: k3d-0.6.7.0-3-i686
Message-ID: <20071209115650.C9394119039F@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf61753c23d245b016c7d631bdb1dc18ccbcd91b

commit cf61753c23d245b016c7d631bdb1dc18ccbcd91b
Author: crazy 
Date:   Sun Dec 9 01:10:10 2007 +0100

k3d-0.6.7.0-3-i686
* release bump
* rebuild with boost

diff --git a/source/xapps-extra/k3d/FrugalBuild b/source/xapps-extra/k3d/FrugalBuild
index 710f7ee..ea82a18 100644
--- a/source/xapps-extra/k3d/FrugalBuild
+++ b/source/xapps-extra/k3d/FrugalBuild
@@ -4,10 +4,11 @@

pkgname=k3d
pkgver=0.6.7.0
-pkgrel=2
+pkgrel=3
pkgdesc="A complete free-as-in-freedom 3D modeling, animation and rendering system."
depends=('gtkglext' 'imagemagick' 'librsvg' 'gts' 'python>=2.5' 'openexr>=1.4.0a' 'libxml2' 'libsigc++2'  'freetype2' \
-	'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm' 'pango' 'glibmm' 'boost>=1.34.0-3')
+	'plib' 'graphviz' 'libtiff' 'atk' 'gtkmm' 'pango' 'glibmm' 'libboost-mt>=1.34.1')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet' 'force')
@@ -19,10 +20,10 @@ url="http://www.k-3d.org/"
build()
{
Fcd
-	Fsed 'boost_regex' 'boost_regex-gcc42-mt' m4/k3d_with_external_boost.m4
-        Fsed 'boost_date_time' 'boost_date_time-gcc42-mt' m4/k3d_with_external_boost.m4
+	Fsed 'boost_regex' 'boost_regex-mt' m4/k3d_with_external_boost.m4
+        Fsed 'boost_date_time' 'boost_date_time-mt' m4/k3d_with_external_boost.m4
Fsed 'K3D_BOOST_LIBS=.*' \
-		'K3D_BOOST_LIBS="-lboost_regex-gcc42-mt -lboost_date_time-gcc42-mt -lboost_filesystem-gcc42-mt"' \
+		'K3D_BOOST_LIBS="-lboost_regex-mt -lboost_date_time-mt -lboost_filesystem-mt"' \
m4/k3d_with_external_boost.m4
Fautoreconf
Fconf  	\
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:32 2007
Subject: [Frugalware-git] frugalware-current: lyx-1.5.2-2-i686
Message-ID: <20071209115650.E2A6B11903A0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=22ac81ae8c79ed86013e263fe7cb38c60339c0f4

commit 22ac81ae8c79ed86013e263fe7cb38c60339c0f4
Author: crazy 
Date:   Sun Dec 9 01:59:36 2007 +0100

lyx-1.5.2-2-i686
* release bump
* rebuild with boost
* new maintainer

diff --git a/source/xapps-extra/lyx/FrugalBuild b/source/xapps-extra/lyx/FrugalBuild
index 8903b12..7a7309c 100644
--- a/source/xapps-extra/lyx/FrugalBuild
+++ b/source/xapps-extra/lyx/FrugalBuild
@@ -1,12 +1,14 @@
# Compiling time: 4.15 SBU
-# Maintainer: Bence Nagy 
+# Maintainer: crazy 
+# Conteibutor: Bence Nagy 

pkgname=lyx
pkgver=1.5.2
-pkgrel=1
+pkgrel=2
pkgdesc="An advanced open-source document processor based on TeX"
url='http://www.lyx.org'
-depends=('tetex' 'python' 'perl' 'imagemagick' 'aspell' 'libqtgui' 'boost' 'aspell')
+depends=('tetex' 'python' 'perl' 'imagemagick' 'aspell' 'libqtgui' 'libboost-mt>=1.34.1' 'aspell')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
@@ -14,7 +16,7 @@ up2date="lynx -dump 'http://lyx.cybermirror.org/stable/?D=A'|Flasttarbz2"
source=(http://lyx.cybermirror.org/stable/$pkgname-$pkgver.tar.bz2 \
boost.patch)
sha1sums=('1b1e8de870972ae5ea14bcdd91d6e4f326491b9c' \
-          '849f1769729e08d9951f9820dea4db470c910597')
+          '60f5824faa4e55896e1729e249bd9ae1e423beba')


build()
diff --git a/source/xapps-extra/lyx/boost.patch b/source/xapps-extra/lyx/boost.patch
index b73d630..44fd828 100644
--- a/source/xapps-extra/lyx/boost.patch
+++ b/source/xapps-extra/lyx/boost.patch
@@ -9,10 +9,10 @@ diff -Naur lyx-1.5.2/config/common.am lyx-1.5.2-p/config/common.am
-BOOST_REGEX = -lboost_regex
-BOOST_SIGNALS = -lboost_signals
-BOOST_IOSTREAMS = -lboost_iostreams
-+BOOST_FILESYSTEM = -lboost_filesystem-gcc42-mt
-+BOOST_REGEX = -lboost_regex-gcc42-mt
-+BOOST_SIGNALS = -lboost_signals-gcc42-mt
-+BOOST_IOSTREAMS = -lboost_iostreams-gcc42-mt
++BOOST_FILESYSTEM = -lboost_filesystem-mt
++BOOST_REGEX = -lboost_regex-mt
++BOOST_SIGNALS = -lboost_signals-mt
++BOOST_IOSTREAMS = -lboost_iostreams-mt
endif

LIBS =
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:33 2007
Subject: [Frugalware-git] frugalware-current: pdfedit-0.3.2-2-i686
Message-ID: <20071209115651.0885711904C1@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d73602b46243d6fa8919748f2351a2d16e43ede2

commit d73602b46243d6fa8919748f2351a2d16e43ede2
Author: crazy 
Date:   Sun Dec 9 02:39:58 2007 +0100

pdfedit-0.3.2-2-i686
* release bump
* fixed depends() for new boost

diff --git a/source/xapps-extra/pdfedit/FrugalBuild b/source/xapps-extra/pdfedit/FrugalBuild
index ff6b7e5..8451521 100644
--- a/source/xapps-extra/pdfedit/FrugalBuild
+++ b/source/xapps-extra/pdfedit/FrugalBuild
@@ -3,9 +3,10 @@

pkgname=pdfedit
pkgver=0.3.2
-pkgrel=1
+pkgrel=2
pkgdesc="PDFedit is an editor for manipulating PDF files."
-depends=('qt' 't1lib' 'boost')
+depends=('qt' 't1lib')
+makedepends=('boost')
groups=('xapps-extra')
archs=('i686')
_F_sourceforge_ext=".tar.bz2"
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:33 2007
Subject: [Frugalware-git] frugalware-current: pinot-0.81-2-i686
Message-ID: <20071209115651.0EC0C1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f696db689c862d3a730382f89618f77cf4e0a06

commit 9f696db689c862d3a730382f89618f77cf4e0a06
Author: crazy 
Date:   Sun Dec 9 02:53:41 2007 +0100

pinot-0.81-2-i686
* release bump
* fixed depends() for new boost

diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild
index 716f9e6..d10ae5b 100644
--- a/source/xapps-extra/pinot/FrugalBuild
+++ b/source/xapps-extra/pinot/FrugalBuild
@@ -3,13 +3,12 @@

pkgname=pinot
pkgver=0.81
-pkgrel=1
+pkgrel=2
pkgdesc="Personal search and metasearch for the Free Desktop"
url="http://pinot.berlios.de/"
depends=('openssl' 'curl' 'cairomm' 'dbus>=1.1.2' 'dbus-glib' 'xapian-core>=1.0.4' 'gmime' 'atk' 'gtkmm' \
-	'boost>=1.34.0-4' 'libtextcat' 'taglib' 'freetype2' 'libxcb' 'pango' 'libxml++' 'sqlite3>=3.3.8-2' \
-	'shared-mime-info')
-makedepends=('desktop-file-utils')
+	'libtextcat' 'taglib' 'freetype2' 'libxcb' 'pango' 'libxml++' 'sqlite3>=3.3.8-2' 'shared-mime-info')
+makedepends=('desktop-file-utils' 'boost>=1.34.1')
# add catdvi package to the repos
rodepends=('unzip' 'poppler-pdftools' 'unrtf' 'catdoc')
license="GPL"
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:34 2007
Subject: [Frugalware-git] frugalware-current: stellarium-0.9.0-3-i686
Message-ID: <20071209115651.156B81190054@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cc78edefe16d51357b690be06c39f492ff4ae4a3

commit cc78edefe16d51357b690be06c39f492ff4ae4a3
Author: crazy 
Date:   Sun Dec 9 05:03:29 2007 +0100

stellarium-0.9.0-3-i686
* release bump
* fixed depends() in general curl is needed for remote
* things , also boost is just a makedepend
* switched to cmake ( auto* will disappear see INSTALL files )
* removed not needed moc diff
* added an patch to fix *FLAGS
* added missing desktop and icon and a note about for
* janny in FB , once that is in source tarball build() can go away

diff --git a/source/xapps-extra/stellarium/FrugalBuild b/source/xapps-extra/stellarium/FrugalBuild
index 1d1c82e..272bd06 100644
--- a/source/xapps-extra/stellarium/FrugalBuild
+++ b/source/xapps-extra/stellarium/FrugalBuild
@@ -4,25 +4,30 @@

pkgname=stellarium
pkgver=0.9.0
-pkgrel=2
+pkgrel=3
pkgdesc="A free open source planetarium for your computer."
_F_sourceforge_broken_up2date=1
-Finclude sourceforge
+makedepends=('boost>=1.34.1')
+_F_cmake_confopts="-DCMAKE_CXX_FLAGS=$CXXFLAGS -DCMAKE_C_FLAGS=$CFLAGS"
+Finclude sourceforge cmake
url="http://www.stellarium.org/"
-depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'boost' 'libjpeg' 'libqtopengl')
+depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'libjpeg' 'libqtopengl' 'curl')
license="GPL"
groups=('xapps-extra')
archs=('i686')
-source=($source unused_moc.diff)
+## icon is from there :
+## http://sourceforge.net/tracker/index.php?func=detail&aid=1154587&group_id=48857&atid=454375
+## janny next release may have an icon in the tarball as well desktop files
+## please check that.
+source=($source $pkgname.png flags.patch)
sha1sums=('696e0fa935b695763ab37c66ec5e189c3e6db9f9' \
-          '1858fd653aa91bdf76cae9815819fb9db5c4b35a')
+          'ab43d03d1e5616b2dadf5a1a0cb4c70e3265167d' \
+          'b5401b8b028c8417d392588d3b8375da858fd6b9')

build()
{
-	Fcd
-	./autogen.sh || return 1
-	cp /usr/share/automake/mkinstalldirs . || return 1
-	Fbuild --with-qt-dir=/usr
+	CMake_build
+	Ffilerel ../../$pkgname.png /usr/share/pixmaps/$pkgname.png
+	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Education;"
}
-
# optimization OK
diff --git a/source/xapps-extra/stellarium/flags.patch b/source/xapps-extra/stellarium/flags.patch
new file mode 100644
index 0000000..e338cb6
--- /dev/null
+++ b/source/xapps-extra/stellarium/flags.patch
@@ -0,0 +1,14 @@
+diff -Naur stellarium-0.9.0/CMakeLists.txt stellarium-0.9.0-p/CMakeLists.txt
+--- stellarium-0.9.0/CMakeLists.txt	2007-06-06 10:25:19.000000000 +0200
++++ stellarium-0.9.0-p/CMakeLists.txt	2007-12-09 04:47:11.000000000 +0100
+@@ -16,8 +16,8 @@
+ ENDIF(NOT CMAKE_BUILD_TYPE)
+
+ IF(UNIX AND NOT WIN32)
+- SET(CMAKE_C_FLAGS -Wall)       # additional C compile flags
+- SET(CMAKE_CXX_FLAGS -Wall)     # additional CPP compile flags
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")       # additional C compile flags
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")     # additional CPP compile flags
+  SET(STLPORT_LIBRARY "")
+ ELSE(UNIX AND NOT WIN32)
+  SET(CMAKE_C_FLAGS "-Wall -fexceptions -fident -mthreads -D_STLP_NO_CUSTOM_IO -D_STLP_USE_DYNAMIC_LIB  -I/home/fchereau/STLport/stlport -L/home/fchereau/STLport/lib")
diff --git a/source/xapps-extra/stellarium/stellarium.png b/source/xapps-extra/stellarium/stellarium.png
new file mode 100644
index 0000000..e603356
Binary files /dev/null and b/source/xapps-extra/stellarium/stellarium.png differ
diff --git a/source/xapps-extra/stellarium/unused_moc.diff b/source/xapps-extra/stellarium/unused_moc.diff
deleted file mode 100644
index f9b3683..0000000
--- a/source/xapps-extra/stellarium/unused_moc.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur stellarium-0.9.0.orig/configure.ac stellarium-0.9.0/configure.ac
---- stellarium-0.9.0.orig/configure.ac	2007-06-06 10:25:19.000000000 +0200
-+++ stellarium-0.9.0/configure.ac	2007-07-07 19:07:52.000000000 +0200
-@@ -213,35 +213,6 @@
- }
- EOF
-
--AC_MSG_CHECKING(does moc work?)
--bnv_try_1="moc myqt.h -o moc_myqt.cpp"
--AC_TRY_EVAL(bnv_try_1)
--if test x"$ac_status" != x0; then
--   AC_MSG_ERROR(moc doesn't work)
--fi
--AC_MSG_RESULT(yes)
--AC_MSG_CHECKING(can I compile moc_myqt.cpp?)
--bnv_try_2="$CXX -c $CXXFLAGS -o moc_myqt.o moc_myqt.cpp"
--AC_TRY_EVAL(bnv_try_2)
--if test x"$ac_status" != x0; then
--   AC_MSG_ERROR(couldn't compile moc_myqt.cpp)
--fi
--AC_MSG_RESULT(yes)
--AC_MSG_CHECKING(can I compile myqt.cpp?)
--bnv_try_3="$CXX $QTINC -c $CXXFLAGS -o myqt.o myqt.cpp"
--AC_TRY_EVAL(bnv_try_3)
--if test x"$ac_status" != x0; then
--   AC_MSG_ERROR(couldn't compile myqt.cpp)
--fi
--AC_MSG_RESULT(yes)
--AC_MSG_CHECKING(can I link against QT?)
--nv_try_4="$CXX $LIBS -o myqt myqt.o moc_myqt.o"
--AC_TRY_EVAL(bnv_try_4)
--if test x"$ac_status" != x0; then
--   AC_MSG_ERROR(couldn't link)
--fi
--AC_MSG_RESULT(yes)
--
- AC_MSG_CHECKING(for mkoctfile)
- AC_TRY_EVAL(mkoctfile)
- if test x"$ac_status" != x0; then
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:35 2007
Subject: [Frugalware-git] frugalware-current: ardour-2.1-1-i686
Message-ID: <20071209115651.1DA8511904CE@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ae71ee7bddb3b2d212fc2dcf78828d83d893c41c

commit ae71ee7bddb3b2d212fc2dcf78828d83d893c41c
Author: crazy 
Date:   Sun Dec 9 05:18:29 2007 +0100

ardour-2.1-1-i686
* just updated makedepend()
* added missing Fdie's

diff --git a/source/xmultimedia-extra/ardour/FrugalBuild b/source/xmultimedia-extra/ardour/FrugalBuild
index aedd411..e134400 100644
--- a/source/xmultimedia-extra/ardour/FrugalBuild
+++ b/source/xmultimedia-extra/ardour/FrugalBuild
@@ -8,7 +8,7 @@ pkgrel=1
pkgdesc="Ardour is a digital audio workstation."
url="http://ardour.org/"
depends=('jack' 'liblrdf' 'libsamplerate' 'liblo' 'libusb' 'gtk+2' 'libgnomecanvas')
-makedepends=('scons' 'boost>=1.34.0-4')
+makedepends=('scons' 'boost>=1.34.1')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
@@ -26,8 +26,8 @@ build()
_F_desktop_categories="GTK;Audio;AudioVideoEditing;Multimedia"
_F_desktop_icon="/usr/share/ardour2/icons/ardour_icon_48px.png"
Fdesktop2
-	scons PREFIX=$Fprefix ARCH="$CFLAGS" VST=0
-	scons DESTDIR=$Fdestdir/ install
+	scons PREFIX=$Fprefix ARCH="$CFLAGS" VST=0 || Fdie
+	scons DESTDIR=$Fdestdir/ install || Fdie
}

# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:36 2007
Subject: [Frugalware-git] frugalware-current: miro-0.9.8.1-3-i686
Message-ID: <20071209115651.2F96B11904D0@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1011fb10225c148bd37254961d87e59ccee0a3fb

commit 1011fb10225c148bd37254961d87e59ccee0a3fb
Author: crazy 
Date:   Sun Dec 9 05:56:05 2007 +0100

miro-0.9.8.1-3-i686
* use _F_archive_name for source also

diff --git a/source/gnome-extra/miro/FrugalBuild b/source/gnome-extra/miro/FrugalBuild
index 690b1c3..71eb72e 100644
--- a/source/gnome-extra/miro/FrugalBuild
+++ b/source/gnome-extra/miro/FrugalBuild
@@ -16,7 +16,7 @@ conflicts=('democracy')
archs=('i686')
options=('scriptlet')
up2date="lynx -dump 'http://ftp.osuosl.org/pub/pculture.org/miro/src/?C=M;O=A'| Flasttar"
-source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/Miro-$pkgver.tar.gz \
+source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/${_F_archive_name}-$pkgver.tar.gz \
qt-mt.pc dbus_python0.8_fixes.patch)
sha1sums=('9ffa7d8a58be22a613a48a88399a7f38382324fb' \
'153e1902352eb4d724ec816b8097f01830178181' \
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:37 2007
Subject: [Frugalware-git] frugalware-current: miro-0.9.8.1-3-i686
Message-ID: <20071209115651.264D711904CF@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd7a218e1c145fc77651ad2762bfeb0181d67425

commit fd7a218e1c145fc77651ad2762bfeb0181d67425
Author: crazy 
Date:   Sun Dec 9 05:51:30 2007 +0100

miro-0.9.8.1-3-i686
* release bump
* rebuild with boost
* moved to gnome-extra , do pacman-g2 -S miro and you have
* and working gnome desktop , so it cannot be xmultimedia :P
* fixed up2date , _F_cd_path , broken sha1sums
* added missing _F_archive_name
* I really wonder how priyank bumped this one ..

diff --git a/source/gnome-extra/miro/FrugalBuild b/source/gnome-extra/miro/FrugalBuild
new file mode 100644
index 0000000..690b1c3
--- /dev/null
+++ b/source/gnome-extra/miro/FrugalBuild
@@ -0,0 +1,35 @@
+# Compiling Time: 0.16 SBU
+# Maintainer: Priyank Gosalia 
+
+pkgname=miro
+_F_archive_name=Miro
+pkgver=0.9.8.1
+pkgrel=3
+pkgdesc="The free and open source internet TV platform."
+url="http://www.getmiro.com/"
+depends=('gtk+2' 'pygtk' 'dbus-python' 'pyrex' 'libboost-mt>=1.34.1' 'xine-lib' 'db>=4.6.19'
+	'nss' 'nspr' 'xulrunner' 'gnome-python-extras' 'gnome-python-extras-mozembed')
+makedepends=('boost>=1.34.1')
+groups=('gnome-extra')
+replaces=('democracy')
+conflicts=('democracy')
+archs=('i686')
+options=('scriptlet')
+up2date="lynx -dump 'http://ftp.osuosl.org/pub/pculture.org/miro/src/?C=M;O=A'| Flasttar"
+source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/Miro-$pkgver.tar.gz \
+	qt-mt.pc dbus_python0.8_fixes.patch)
+sha1sums=('9ffa7d8a58be22a613a48a88399a7f38382324fb' \
+          '153e1902352eb4d724ec816b8097f01830178181' \
+          'baed01f46d5606f106d01c573c9cbdf94044e961')
+
+build()
+{
+	Fcd
+	Fpatchall
+	PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$Fsrcdir
+	cd platform/gtk-x11 || Fdie
+	Fsed 'boost_python' 'boost_python-mt' setup.py
+	python setup.py install --root=$Fdestdir || Fdie
+}
+
+# optimization OK
diff --git a/source/gnome-extra/miro/dbus_python0.8_fixes.patch b/source/gnome-extra/miro/dbus_python0.8_fixes.patch
new file mode 100644
index 0000000..a566acc
--- /dev/null
+++ b/source/gnome-extra/miro/dbus_python0.8_fixes.patch
@@ -0,0 +1,21 @@
+--- platform/gtk-x11/onetime.py.orig	2007-05-20 21:50:54.000000000 -0400
++++ platform/gtk-x11/onetime.py	2007-05-20 21:51:01.000000000 -0400
+@@ -86,7 +86,7 @@
+     # we can delete the low-level name here because these objects
+     # are guaranteed to exist only once for each bus name
+     def __del__(self):
+-        dbus_bindings.bus_release_name(self._bus.get_connection(), self._name)
++        dbus.dbus_bindings.bus_release_name(self._bus.get_connection(), self._name)
+         pass
+
+     def get_bus(self):
+@@ -109,7 +109,8 @@
+     def __init__(self):
+         bus = dbus.SessionBus()
+         bus_name = BusNameFlags('org.participatoryculture.dtv.onetime', bus=bus, flags=dbus.dbus_bindings.NAME_FLAG_DO_NOT_QUEUE)
+-        dbus.service.Object.__init__(self, bus_name, '/org/participatoryculture/dtv/OneTime')
++        dbus.service.Object.__init__(self, bus_name=bus_name,
++                                     object_path='/org/participatoryculture/dtv/OneTime')
+
+     @dbus.service.method('org.participatoryculture.dtv.OneTimeIface')
+     def HandleArgs (self, args):
diff --git a/source/gnome-extra/miro/qt-mt.pc b/source/gnome-extra/miro/qt-mt.pc
new file mode 100644
index 0000000..95ce3b4
--- /dev/null
+++ b/source/gnome-extra/miro/qt-mt.pc
@@ -0,0 +1,11 @@
+prefix=/opt/qt
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+qt_config=qt warn_on release incremental link_prl nocrosscompiler minimal-config small-config medium-config large-config full-config styles tools kernel widgets dialogs iconview workspace network canvas table xml opengl sql release dll thread largefile stl ipv6 system-mng system-jpeg system-png gif system-zlib nis cups bigcodecs x11sm xshape xinerama xcursor xrandr xrender xftfreetype xkb dylib create_prl link_prl qt warn_on depend_includepath qmake_cache x11 x11inc create_libtool create_pc moc x11lib
+
+Name: Qt
+Description: Libqt-mt.so.3.3.8 Library
+Version: 3.3.8
+Libs: -L${libdir} -lqt-mt -L/usr/X11R6/lib -L/usr/X11R6/lib -lz -lGL -lXmu -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfreetype -lfontconfig -lXext -lX11 -lm -lSM -lICE -ldl -lpthread
+Cflags: -DQT_SHARED -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -D_REENTRANT -I${includedir}
diff --git a/source/xmultimedia-extra/miro/FrugalBuild b/source/xmultimedia-extra/miro/FrugalBuild
deleted file mode 100644
index d3439d7..0000000
--- a/source/xmultimedia-extra/miro/FrugalBuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Compiling Time: 0.16 SBU
-# Maintainer: Priyank Gosalia 
-
-pkgname=miro
-pkgver=0.9.8.1
-pkgrel=2
-pkgdesc="The free and open source internet TV platform."
-url="http://www.getmiro.com/"
-depends=('gtk+2' 'pygtk' 'dbus-python' 'pyrex' 'boost' 'xine-lib' 'db>=4.6.19'
-	'nss' 'nspr' 'xulrunner' 'gnome-python-extras' 'gnome-python-extras-mozembed')
-groups=('xmultimedia-extra')
-replaces=('democracy')
-conflicts=('democracy')
-archs=('i686')
-up2date="lynx -dump 'http://ftp.osuosl.org/pub/pculture.org/miro/src/?C=M;O=A'| Flasttar"
-source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/Miro-$pkgver.tar.gz \
-	qt-mt.pc dbus_python0.8_fixes.patch)
-_F_cd_path="Miro-2007-07-24"
-sha1sums=('8bbb80c673a283e2f0c4e0b1a333a2f9a8a638c8' \
-          '153e1902352eb4d724ec816b8097f01830178181' \
-          'baed01f46d5606f106d01c573c9cbdf94044e961')
-
-build()
-{
-	Fcd
-	Fpatchall
-	PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$Fsrcdir
-	cd platform/gtk-x11 || Fdie
-	Fsed 'boost_python' 'boost_python-gcc42-mt' setup.py
-	python setup.py install --root=$Fdestdir || Fdie
-}
-
-# optimization OK
diff --git a/source/xmultimedia-extra/miro/dbus_python0.8_fixes.patch b/source/xmultimedia-extra/miro/dbus_python0.8_fixes.patch
deleted file mode 100644
index a566acc..0000000
--- a/source/xmultimedia-extra/miro/dbus_python0.8_fixes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- platform/gtk-x11/onetime.py.orig	2007-05-20 21:50:54.000000000 -0400
-+++ platform/gtk-x11/onetime.py	2007-05-20 21:51:01.000000000 -0400
-@@ -86,7 +86,7 @@
-     # we can delete the low-level name here because these objects
-     # are guaranteed to exist only once for each bus name
-     def __del__(self):
--        dbus_bindings.bus_release_name(self._bus.get_connection(), self._name)
-+        dbus.dbus_bindings.bus_release_name(self._bus.get_connection(), self._name)
-         pass
-
-     def get_bus(self):
-@@ -109,7 +109,8 @@
-     def __init__(self):
-         bus = dbus.SessionBus()
-         bus_name = BusNameFlags('org.participatoryculture.dtv.onetime', bus=bus, flags=dbus.dbus_bindings.NAME_FLAG_DO_NOT_QUEUE)
--        dbus.service.Object.__init__(self, bus_name, '/org/participatoryculture/dtv/OneTime')
-+        dbus.service.Object.__init__(self, bus_name=bus_name,
-+                                     object_path='/org/participatoryculture/dtv/OneTime')
-
-     @dbus.service.method('org.participatoryculture.dtv.OneTimeIface')
-     def HandleArgs (self, args):
diff --git a/source/xmultimedia-extra/miro/qt-mt.pc b/source/xmultimedia-extra/miro/qt-mt.pc
deleted file mode 100644
index 95ce3b4..0000000
--- a/source/xmultimedia-extra/miro/qt-mt.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/opt/qt
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-qt_config=qt warn_on release incremental link_prl nocrosscompiler minimal-config small-config medium-config large-config full-config styles tools kernel widgets dialogs iconview workspace network canvas table xml opengl sql release dll thread largefile stl ipv6 system-mng system-jpeg system-png gif system-zlib nis cups bigcodecs x11sm xshape xinerama xcursor xrandr xrender xftfreetype xkb dylib create_prl link_prl qt warn_on depend_includepath qmake_cache x11 x11inc create_libtool create_pc moc x11lib
-
-Name: Qt
-Description: Libqt-mt.so.3.3.8 Library
-Version: 3.3.8
-Libs: -L${libdir} -lqt-mt -L/usr/X11R6/lib -L/usr/X11R6/lib -lz -lGL -lXmu -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfreetype -lfontconfig -lXext -lX11 -lm -lSM -lICE -ldl -lpthread
-Cflags: -DQT_SHARED -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -D_REENTRANT -I${includedir}
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:38 2007
Subject: [Frugalware-git] frugalware-current: btg-0.9.6-3-i686
Message-ID: <20071209115651.3AEDA11904D1@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=504fc8e6b31432a75c5e3b3e461a6e21d11b5db7

commit 504fc8e6b31432a75c5e3b3e461a6e21d11b5db7
Author: crazy 
Date:   Sun Dec 9 06:09:04 2007 +0100

btg-0.9.6-3-i686
* release bump
* rebuild with boost

diff --git a/source/network-extra/btg/FrugalBuild b/source/network-extra/btg/FrugalBuild
index 8591556..1a5655c 100644
--- a/source/network-extra/btg/FrugalBuild
+++ b/source/network-extra/btg/FrugalBuild
@@ -4,10 +4,11 @@
pkgname=btg
pkgver=0.9.6
pkgextraver=_p1
-pkgrel=2
+pkgrel=3
pkgdesc="Bittorrent client implemented in C++ and using the Rasterbar Libtorrent library."
Finclude berlios
-depends=('boost>=1.34.0-4' 'rblibtorrent>=0.12-4' 'gnutls' 'dialog')
+depends=('libboost-mt>=1.34.1' 'rblibtorrent>=0.12-6' 'gnutls' 'dialog')
+makedepends=('boost>=1.34.1')
groups=('network-extra')
archs=('i686' 'x86_64')
sha1sums=('2ec586301d1f11475cb8a9c9c34e9ed45ca6b78d')
@@ -17,10 +18,17 @@ build()
Fcd $pkgname-$pkgver
Fsed libtorrent rblibtorrent configure.in
autoconf || return 1
-	Fbuild --with-boost-iostreams=gcc42-mt --with-boost-filesystem=gcc42-mt \
-		--with-boost-date-time=gcc42-mt --with-boost-thread=gcc42-mt \
-		--with-boost-program-options=gcc42-mt --enable-cli --enable-www \
-		--enable-session-saving --enable-upnp --enable-event-callback
+	Fbuild \
+		--with-boost-iostreams=mt \
+		--with-boost-filesystem=mt \
+		--with-boost-date-time=mt \
+		--with-boost-thread=mt \
+		--with-boost-program-options=mt \
+		--enable-cli \
+		--enable-www \
+		--enable-session-saving \
+		--enable-upnp \
+		--enable-event-callback
}

# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:38 2007
Subject: [Frugalware-git] frugalware-current: openlibraries-0.4.0-3-i686
Message-ID: <20071209115650.A3B7B11901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=67cb04dfe015d4bc45dfe2d11e6a1dbc379d1237

commit 67cb04dfe015d4bc45dfe2d11e6a1dbc379d1237
Author: crazy 
Date:   Sat Dec 8 23:21:08 2007 +0100

openlibraries-0.4.0-3-i686
* release bump
* rebuild with boost

diff --git a/source/xlib-extra/openlibraries/FrugalBuild b/source/xlib-extra/openlibraries/FrugalBuild
index c1a691c..57df114 100644
--- a/source/xlib-extra/openlibraries/FrugalBuild
+++ b/source/xlib-extra/openlibraries/FrugalBuild
@@ -3,12 +3,13 @@

pkgname=openlibraries
pkgver=0.4.0
-pkgrel=2
+pkgrel=3
pkgdesc="Powerful cross-platform set of libraries to test and deploy rich media applications."
Finclude sourceforge python
options=('scriptlet')
source=($source sg_appearance.cpp_compile_fix.patch)
-depends=('boost>=1.34.0-4' 'glew' 'libgcc' 'libjpeg' 'libpng' 'libtiff' 'freeglut' 'openal' 'sqlite3' 'python>=2.5')
+depends=('libboost-mt>=1.34.1' 'glew' 'libgcc' 'libjpeg' 'libpng' 'libtiff' 'freeglut' 'openal' 'sqlite3' 'python>=2.5')
+makedepends=('boost>=1.34.1')
groups=('xlib-extra')
archs=('i686')
sha1sums=('7ebe24cfdc16c4869a74c0736bd4069f1ceff44c'\
@@ -27,7 +28,6 @@ build()
--with-boostthreadruntime=mt \
--with-pythonversion="$_F_python_ver" \
--with-boostprefix=/usr \
-        	--with-boosttoolset=gcc42 \
--with-openalprefix=/usr \
--with-glewprefix=/usr
}
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:39 2007
Subject: [Frugalware-git] frugalware-current: qbittorrent-0.9.3-4-i686
Message-ID: <20071209115651.54B9E11901A6@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=676afc9d77471900ce550b0ccc456c6a0e84ad72

commit 676afc9d77471900ce550b0ccc456c6a0e84ad72
Author: crazy 
Date:   Sun Dec 9 06:13:50 2007 +0100

qbittorrent-0.9.3-4-i686
* release bump
* rebuild with boost

diff --git a/source/xapps-extra/qbittorrent/FrugalBuild b/source/xapps-extra/qbittorrent/FrugalBuild
index a342b38..652f446 100644
--- a/source/xapps-extra/qbittorrent/FrugalBuild
+++ b/source/xapps-extra/qbittorrent/FrugalBuild
@@ -3,9 +3,10 @@

pkgname=qbittorrent
pkgver=0.9.3
-pkgrel=3
+pkgrel=4
pkgdesc="A Bittorrent client."
-depends=('rblibtorrent>=0.12-4' 'curl>=7.16.1-2' 'python>=2.5' 'libqtgui' 'libqtnetwork')
+depends=('rblibtorrent>=0.12-6' 'curl>=7.16.1-2' 'python>=2.5' 'libqtgui' 'libqtnetwork' 'libboost-mt>=1.34.1')
+makedepends=('boost>=1.34.1')
groups=('xapps-extra')
archs=('i686' 'x86_64')
_F_sourceforge_broken_up2date=1
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:40 2007
Subject: [Frugalware-git] frugalware-current: pdns-recursor-3.1.4-3-i686
Message-ID: <20071209115651.6A90611901A7@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fcccbb2ed5bedc4b168926c4e6cca708acb0dbca

commit fcccbb2ed5bedc4b168926c4e6cca708acb0dbca
Author: crazy 
Date:   Sun Dec 9 06:32:38 2007 +0100

pdns-recursor-3.1.4-3-i686
* release bump
* fixed depends()
* fixed CXXFLAGS
* ohh well for the rest see the diff
* please someone take over this ..

diff --git a/source/network-extra/pdns-recursor/FrugalBuild b/source/network-extra/pdns-recursor/FrugalBuild
index 1681f4b..df919d8 100644
--- a/source/network-extra/pdns-recursor/FrugalBuild
+++ b/source/network-extra/pdns-recursor/FrugalBuild
@@ -4,27 +4,37 @@

pkgname=pdns-recursor
pkgver=3.1.4
-pkgrel=2
+pkgrel=3
pkgdesc="Power DNS recursor"
url="http://www.powerdns.com/"
-depends=('glibc')
-makedepends=('boost>=1.34.0')
+depends=('libstdc++')
+makedepends=('boost>=1.34.1')
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx --dump http://downloads.powerdns.com/releases/?M=D|grep recursor|sed 's/.*recursor-\(.*\).tar.*/\1/;1 q'"
source=(http://downloads.powerdns.com/releases/pdns-recursor-$pkgver.tar.bz2 \
rc.pdns-recursor recursor.conf atomicity_fix.patch)

-build() {
-    Fcd $pkgname-$pkgver
-    # Fix for gcc4.2.0 atomicity.h problem
-    Fpatchall
-    Fconf --libdir=/usr/lib/pdns --sysconfdir=/etc/powerdns --enable-pdns_server --enable-recursor --with-pgsql-includes=/usr/include --with-sqlite-includes=/usr/include --with-modules="geo" --with-dynmodules="mysql gmysql gpgsql gsqlite pipe"
-    Fmakeinstall
-    Fmkdir /etc/powerdns
-    Fmkdir /lib/initscripts/messages/hu/LC_MESSAGES
-    msgfmt -o $Fdestdir/lib/initscripts/messages/hu/LC_MESSAGES/$pkgname.mo $startdir/hu.po
-    Frcd2 pdns-recursor
+build()
+{
+	Fcd $pkgname-$pkgver
+	# Fix for gcc4.2.0 atomicity.h problem
+	Fpatchall
+	Fconf \
+		--libdir=/usr/lib/pdns \
+		--sysconfdir=/etc/powerdns \
+		--enable-pdns_server \
+		--enable-recursor \
+		--with-pgsql-includes=/usr/include \
+		--with-sqlite-includes=/usr/include \
+		--with-modules="geo" \
+		--with-dynmodules="mysql gmysql gpgsql gsqlite pipe"
+	make OPTFLAGS="" || Fdie
+	Fmakeinstall
+	Fmkdir /etc/powerdns
+	Fmkdir /lib/initscripts/messages/hu/LC_MESSAGES
+	msgfmt -o $Fdestdir/lib/initscripts/messages/hu/LC_MESSAGES/$pkgname.mo $startdir/hu.po
+	Frcd2 pdns-recursor

}
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:40 2007
Subject: [Frugalware-git] frugalware-current: pdns-2.9.21-3-i686
Message-ID: <20071209115651.843CB11904D2@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2dc09c32ea897e900802d087da99113c88ffab85

commit 2dc09c32ea897e900802d087da99113c88ffab85
Author: crazy 
Date:   Sun Dec 9 06:56:59 2007 +0100

pdns-2.9.21-3-i686
* release bump
* yeah 'sqlite2 libmysqlclient libpq' are depends()
* if you don't like that 'man FrugalBuild' and split it

diff --git a/source/network-extra/pdns/FrugalBuild b/source/network-extra/pdns/FrugalBuild
index 4f6a42b..d1bed80 100644
--- a/source/network-extra/pdns/FrugalBuild
+++ b/source/network-extra/pdns/FrugalBuild
@@ -4,11 +4,11 @@

pkgname=pdns
pkgver=2.9.21
-pkgrel=2
+pkgrel=3
pkgdesc="Power DNS Server and Recursor"
url="http://www.powerdns.com/"
-depends=('glibc' 'pdns-recursor')
-makedepends=('mysql' 'postgresql' 'sqlite2' 'boost>=1.34.0')
+depends=('libstdc++' 'sqlite2' 'libmysqlclient' 'libpq' 'pdns-recursor>=3.1.4-3')
+makedepends=('mysql' 'postgresql' 'boost>=1.34.1')
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="lynx --dump http://downloads.powerdns.com/releases/?M=D|grep pdns-.*gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'"
@@ -19,12 +19,18 @@ sha1sums=('2b86e4b44ef43db308c62e32b10ed0d5221a45c9' \
'd545b750c7479f89a9f0410dca02c875f41ca860')
build()
{
-    Fcd pdns-$pkgver
-    Fconf --libdir=/usr/lib/pdns --sysconfdir=/etc/powerdns --enable-pdns_server  --with-pgsql-includes=/usr/include --with-sqlite-includes=/usr/include --with-modules="geo" --with-dynmodules="mysql gmysql gpgsql gsqlite pipe"
-    Fmakeinstall
-    Fmkdir /lib/initscripts/messages/hu/LC_MESSAGES
-    msgfmt -o $Fdestdir/lib/initscripts/messages/hu/LC_MESSAGES/$pkgname.mo $startdir/hu.po
-    Frcd2 pdns
+	Fcd pdns-$pkgver
+	Fbuild \
+		--libdir=/usr/lib/pdns \
+		--sysconfdir=/etc/powerdns \
+		--enable-pdns_server  \
+		--with-pgsql-includes=/usr/include \
+		--with-sqlite-includes=/usr/include \
+		--with-modules="geo" \
+		--with-dynmodules="mysql gmysql gpgsql gsqlite pipe"
+    	Fmkdir /lib/initscripts/messages/hu/LC_MESSAGES
+	msgfmt -o $Fdestdir/lib/initscripts/messages/hu/LC_MESSAGES/$pkgname.mo $startdir/hu.po
+    	Frcd2 pdns
}

# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:42 2007
Subject: [Frugalware-git] frugalware-current: glob2-0.9.1-2-i686
Message-ID: <20071209115651.A6C7811901A8@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=16bb89978500a897c660827368862cad1e6acc4c

commit 16bb89978500a897c660827368862cad1e6acc4c
Author: crazy 
Date:   Sun Dec 9 08:27:18 2007 +0100

glob2-0.9.1-2-i686
* release bump
* rebuild with boost
* fixed icon location , CXXFLAGS , depends()
* make use of MAKEFLAGS

diff --git a/source/games-extra/glob2/FrugalBuild b/source/games-extra/glob2/FrugalBuild
index f42b186..fa036d7 100644
--- a/source/games-extra/glob2/FrugalBuild
+++ b/source/games-extra/glob2/FrugalBuild
@@ -4,11 +4,11 @@

pkgname=glob2
pkgver=0.9.1
-pkgrel=1
+pkgrel=2
pkgdesc="Innovative Real-Time Strategy (RTS) game which reduces micro-management by automatically assigning tasks to units."
url="http://globulation2.org/"
-depends=('sdl_net' 'sdl_ttf' 'sdlimage' 'libvorbis' 'libgl' 'speex')
-makedepends=('boost>=1.34.0' 'scons')
+depends=('sdl_net' 'sdl_ttf' 'sdlimage' 'libvorbis' 'libgl' 'speex' 'fribidi' 'libboost-mt>=1.34.1')
+makedepends=('boost>=1.34.1' 'scons')
license="GPL2"
groups=('games-extra')
archs=('i686' 'x86_64')
@@ -18,11 +18,13 @@ source=("http://dl.sv.nongnu.org/releases/$pkgname/$pkgver/$pkgname-$pkgver.tar.
build() {
Fpatchall
cp $Fsrcdir/glob2.desktop data/ || return 1
-	scons || return 1
+	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
+	scons $JOBS CXXFLAGS="$CXXFLAGS" || return 1
scons BINDIR="$Fdestdir/usr/bin" INSTALLDIR="$Fdestdir/usr/share" install || return 1
+
}

-sha1sums=('18136ff058e2b7bd313cefdc45bcbfe25e12a5e0' \
-          '14373039ae35116b9bec89604240aab0202d1d99' \
-          'f65660dafea34ca84a53cb8033f856baac65fd84')
+sha1sums=('edfc49f3b06933783518afeeb670c5119694267a' \
+          '74ab16b4267a8b39d707b94873a34143f8a4d508' \
+          'b090d2baf0943f66611f9b73f66d883d8aad3e33')
# optimization OK
diff --git a/source/games-extra/glob2/glob2-0.9.1-boostmt.diff b/source/games-extra/glob2/glob2-0.9.1-boostmt.diff
index 8476984..12b0c0d 100644
--- a/source/games-extra/glob2/glob2-0.9.1-boostmt.diff
+++ b/source/games-extra/glob2/glob2-0.9.1-boostmt.diff
@@ -6,8 +6,8 @@
Exit(1)
-    if not conf.CheckLib('boost_thread') or not conf.CheckCXXHeader('boost/thread/thread.hpp'):
-        print "Could not find libboost_thread or boost/thread/thread.hpp"
-+    if not conf.CheckLib('boost_thread-gcc42-mt') or not conf.CheckCXXHeader('boost/thread/thread.hpp'):
-+        print "Could not find libboost_thread-gcc42-mt or boost/thread/thread.hpp"
++    if not conf.CheckLib('boost_thread-mt') or not conf.CheckCXXHeader('boost/thread/thread.hpp'):
++        print "Could not find libboost_thread-mt or boost/thread/thread.hpp"
Exit(1)
if not conf.CheckCXXHeader('boost/shared_ptr.hpp'):
print "Could not find boost/shared_ptr.hpp"
@@ -16,7 +16,7 @@
if env['osx']:
env.Append(CXXFLAGS="-framework OpenGL")
-    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread'])
-+    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread-gcc42-mt'])
++    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread-mt'])

env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz"
env["TARFLAGS"] = "-c -z"
diff --git a/source/games-extra/glob2/glob2.desktop b/source/games-extra/glob2/glob2.desktop
index bb87b9c..a0017b7 100644
--- a/source/games-extra/glob2/glob2.desktop
+++ b/source/games-extra/glob2/glob2.desktop
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=Globulation 2
Comment=An innovative new strategy game
Exec=glob2
-Icon=glob2-icon-48x48
+Icon=/usr/share/glob2/data/icons/glob2-icon-48x48.png
Terminal=false
X-MultipleArgs=false
Type=Application
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:43 2007
Subject: [Frugalware-git] frugalware-current: pingus-0.7.2-1-i686
Message-ID: <20071209115651.C2D3611901A9@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=208cae94d8fbcc8b6a670a321d8384022a2bc0f2

commit 208cae94d8fbcc8b6a670a321d8384022a2bc0f2
Author: crazy 
Date:   Sun Dec 9 11:21:53 2007 +0100

pingus-0.7.2-1-i686
* Version bump
* fixed LDFLAGS , CXXFLAGS
* make use of MAKEFLAGS
* added missing desktop file
* fixed depends()

diff --git a/source/games-extra/pingus/FrugalBuild b/source/games-extra/pingus/FrugalBuild
index b0d68c8..c074b31 100644
--- a/source/games-extra/pingus/FrugalBuild
+++ b/source/games-extra/pingus/FrugalBuild
@@ -3,24 +3,34 @@
# Contributor: Edo Hikmahtiar 

pkgname=pingus
-pkgver=0.7.0
+pkgver=0.7.2
pkgrel=1
pkgdesc="Pingus is a free Lemmings clone for GNU/Linux"
url="http://pingus.seul.org"
-makedepends=('scons')
-depends=('boost' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+depends=('libboost-mt>=1.34.1' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+makedepends=('boost>=1.34.1' 'scons')
groups=('games-extra')
archs=('i686')
up2date="lynx -dump http://pingus.seul.org/download.html | grep -m1 -A2 Source | sed 's/.*-\(.*\).t.*/\1/' | tail -n1"
source=($url/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('64fb622b7d72b0c819653b0710e078e146fbf808')
+sha1sums=('1cd3a1d924337a5ee2e0ee387c0513f85d47cdb0')

build()
{
Fcd
-	scons || Fdie
-	Fmkdir $Fdestdir/usr
-	sh install.sh $Fdestdir/usr
+	## lol ..
+	Fsed "boost_signals" "boost_signals-mt" SConstruct
+	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
+	scons $JOBS LINKFLAGS="$LDFLAGS" CCFLAGS="$CXXFLAGS" || Fdie
+	## oh well not an pinguin 'icon' but 24x18 looks like shit so
+	## we use this one for now =)
+	Ffilerel data/images/worldobjs/teleporter2.png \
+		/usr/share/pixmaps/$pkgname.png
+	sh install.sh $Fdestdir/usr || Fdie
+	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Game;ArcadeGame;"
+
}

#optimization OK
+
+# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:44 2007
Subject: [Frugalware-git] frugalware-current: Revert "pingus-0.7.2-1-i686"
Message-ID: <20071209115651.C994D11904D3@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9af9e6128bec08cc17511d8e0cd7ab20ff98c24e

commit 9af9e6128bec08cc17511d8e0cd7ab20ff98c24e
Author: crazy 
Date:   Sun Dec 9 11:40:06 2007 +0100

Revert "pingus-0.7.2-1-i686"
* This reverts commit 7391fa5327d4a7ef41f07d4f7d1f1767c5582400.
* likes how dg breaks commits ..

diff --git a/source/games-extra/pingus/FrugalBuild b/source/games-extra/pingus/FrugalBuild
index c074b31..b0d68c8 100644
--- a/source/games-extra/pingus/FrugalBuild
+++ b/source/games-extra/pingus/FrugalBuild
@@ -3,34 +3,24 @@
# Contributor: Edo Hikmahtiar 

pkgname=pingus
-pkgver=0.7.2
+pkgver=0.7.0
pkgrel=1
pkgdesc="Pingus is a free Lemmings clone for GNU/Linux"
url="http://pingus.seul.org"
-depends=('libboost-mt>=1.34.1' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
-makedepends=('boost>=1.34.1' 'scons')
+makedepends=('scons')
+depends=('boost' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
groups=('games-extra')
archs=('i686')
up2date="lynx -dump http://pingus.seul.org/download.html | grep -m1 -A2 Source | sed 's/.*-\(.*\).t.*/\1/' | tail -n1"
source=($url/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('1cd3a1d924337a5ee2e0ee387c0513f85d47cdb0')
+sha1sums=('64fb622b7d72b0c819653b0710e078e146fbf808')

build()
{
Fcd
-	## lol ..
-	Fsed "boost_signals" "boost_signals-mt" SConstruct
-	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
-	scons $JOBS LINKFLAGS="$LDFLAGS" CCFLAGS="$CXXFLAGS" || Fdie
-	## oh well not an pinguin 'icon' but 24x18 looks like shit so
-	## we use this one for now =)
-	Ffilerel data/images/worldobjs/teleporter2.png \
-		/usr/share/pixmaps/$pkgname.png
-	sh install.sh $Fdestdir/usr || Fdie
-	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Game;ArcadeGame;"
-
+	scons || Fdie
+	Fmkdir $Fdestdir/usr
+	sh install.sh $Fdestdir/usr
}

#optimization OK
-
-# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:45 2007
Subject: [Frugalware-git] frugalware-current: pingus-0.7.2-1-i686
Message-ID: <20071209115651.D3EEC11904D4@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0dd7f29325b4e7086c9d19263d805182ae8cc9ac

commit 0dd7f29325b4e7086c9d19263d805182ae8cc9ac
Author: crazy 
Date:   Sun Dec 9 11:43:52 2007 +0100

pingus-0.7.2-1-i686
* Version bump
* fixed LDFLAGS , CXXFLAGS
* make use of MAKEFLAGS
* added missing desktop file
* fixed depends()

diff --git a/source/games-extra/pingus/FrugalBuild b/source/games-extra/pingus/FrugalBuild
index b0d68c8..c074b31 100644
--- a/source/games-extra/pingus/FrugalBuild
+++ b/source/games-extra/pingus/FrugalBuild
@@ -3,24 +3,34 @@
# Contributor: Edo Hikmahtiar 

pkgname=pingus
-pkgver=0.7.0
+pkgver=0.7.2
pkgrel=1
pkgdesc="Pingus is a free Lemmings clone for GNU/Linux"
url="http://pingus.seul.org"
-makedepends=('scons')
-depends=('boost' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+depends=('libboost-mt>=1.34.1' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+makedepends=('boost>=1.34.1' 'scons')
groups=('games-extra')
archs=('i686')
up2date="lynx -dump http://pingus.seul.org/download.html | grep -m1 -A2 Source | sed 's/.*-\(.*\).t.*/\1/' | tail -n1"
source=($url/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('64fb622b7d72b0c819653b0710e078e146fbf808')
+sha1sums=('1cd3a1d924337a5ee2e0ee387c0513f85d47cdb0')

build()
{
Fcd
-	scons || Fdie
-	Fmkdir $Fdestdir/usr
-	sh install.sh $Fdestdir/usr
+	## lol ..
+	Fsed "boost_signals" "boost_signals-mt" SConstruct
+	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
+	scons $JOBS LINKFLAGS="$LDFLAGS" CCFLAGS="$CXXFLAGS" || Fdie
+	## oh well not an pinguin 'icon' but 24x18 looks like shit so
+	## we use this one for now =)
+	Ffilerel data/images/worldobjs/teleporter2.png \
+		/usr/share/pixmaps/$pkgname.png
+	sh install.sh $Fdestdir/usr || Fdie
+	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Game;ArcadeGame;"
+
}

#optimization OK
+
+# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:46 2007
Subject: [Frugalware-git] frugalware-current: Revert "pingus-0.7.2-1-i686"
Message-ID: <20071209115651.DEFC311904D5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=522c8a1ccfd3371a05bafcec7f9db14c07c8ff6e

commit 522c8a1ccfd3371a05bafcec7f9db14c07c8ff6e
Author: crazy 
Date:   Sun Dec 9 11:50:32 2007 +0100

Revert "pingus-0.7.2-1-i686"
* This reverts commit 0dd7f29325b4e7086c9d19263d805182ae8cc9ac.
* jaja f** this python crap

diff --git a/source/games-extra/pingus/FrugalBuild b/source/games-extra/pingus/FrugalBuild
index c074b31..b0d68c8 100644
--- a/source/games-extra/pingus/FrugalBuild
+++ b/source/games-extra/pingus/FrugalBuild
@@ -3,34 +3,24 @@
# Contributor: Edo Hikmahtiar 

pkgname=pingus
-pkgver=0.7.2
+pkgver=0.7.0
pkgrel=1
pkgdesc="Pingus is a free Lemmings clone for GNU/Linux"
url="http://pingus.seul.org"
-depends=('libboost-mt>=1.34.1' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
-makedepends=('boost>=1.34.1' 'scons')
+makedepends=('scons')
+depends=('boost' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
groups=('games-extra')
archs=('i686')
up2date="lynx -dump http://pingus.seul.org/download.html | grep -m1 -A2 Source | sed 's/.*-\(.*\).t.*/\1/' | tail -n1"
source=($url/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('1cd3a1d924337a5ee2e0ee387c0513f85d47cdb0')
+sha1sums=('64fb622b7d72b0c819653b0710e078e146fbf808')

build()
{
Fcd
-	## lol ..
-	Fsed "boost_signals" "boost_signals-mt" SConstruct
-	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
-	scons $JOBS LINKFLAGS="$LDFLAGS" CCFLAGS="$CXXFLAGS" || Fdie
-	## oh well not an pinguin 'icon' but 24x18 looks like shit so
-	## we use this one for now =)
-	Ffilerel data/images/worldobjs/teleporter2.png \
-		/usr/share/pixmaps/$pkgname.png
-	sh install.sh $Fdestdir/usr || Fdie
-	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Game;ArcadeGame;"
-
+	scons || Fdie
+	Fmkdir $Fdestdir/usr
+	sh install.sh $Fdestdir/usr
}

#optimization OK
-
-# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:46 2007
Subject: [Frugalware-git] frugalware-current: pingus-0.7.2-1-i686
Message-ID: <20071209115651.E8B7411904D6@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5816ad0e8f0d545e1da1f9b1f3834ad4979e3e66

commit 5816ad0e8f0d545e1da1f9b1f3834ad4979e3e66
Author: crazy 
Date:   Sun Dec 9 11:51:39 2007 +0100

pingus-0.7.2-1-i686
* read the other commits logs

diff --git a/source/games-extra/pingus/FrugalBuild b/source/games-extra/pingus/FrugalBuild
index b0d68c8..c074b31 100644
--- a/source/games-extra/pingus/FrugalBuild
+++ b/source/games-extra/pingus/FrugalBuild
@@ -3,24 +3,34 @@
# Contributor: Edo Hikmahtiar 

pkgname=pingus
-pkgver=0.7.0
+pkgver=0.7.2
pkgrel=1
pkgdesc="Pingus is a free Lemmings clone for GNU/Linux"
url="http://pingus.seul.org"
-makedepends=('scons')
-depends=('boost' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+depends=('libboost-mt>=1.34.1' 'sdl' 'libpng' 'sdlimage' 'sdl_mixer' 'physfs')
+makedepends=('boost>=1.34.1' 'scons')
groups=('games-extra')
archs=('i686')
up2date="lynx -dump http://pingus.seul.org/download.html | grep -m1 -A2 Source | sed 's/.*-\(.*\).t.*/\1/' | tail -n1"
source=($url/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('64fb622b7d72b0c819653b0710e078e146fbf808')
+sha1sums=('1cd3a1d924337a5ee2e0ee387c0513f85d47cdb0')

build()
{
Fcd
-	scons || Fdie
-	Fmkdir $Fdestdir/usr
-	sh install.sh $Fdestdir/usr
+	## lol ..
+	Fsed "boost_signals" "boost_signals-mt" SConstruct
+	[ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS"
+	scons $JOBS LINKFLAGS="$LDFLAGS" CCFLAGS="$CXXFLAGS" || Fdie
+	## oh well not an pinguin 'icon' but 24x18 looks like shit so
+	## we use this one for now =)
+	Ffilerel data/images/worldobjs/teleporter2.png \
+		/usr/share/pixmaps/$pkgname.png
+	sh install.sh $Fdestdir/usr || Fdie
+	Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Game;ArcadeGame;"
+
}

#optimization OK
+
+# optimization OK
From crazy at frugalware.org  Sun Dec  9 12:56:51 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 12:57:47 2007
Subject: [Frugalware-git] frugalware-current: twinkle-1.1-3-i686
Message-ID: <20071209115651.F3AB411901C5@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1c390ea31c0b6644e49b3f0c1c27fc810af380b6

commit 1c390ea31c0b6644e49b3f0c1c27fc810af380b6
Author: crazy 
Date:   Sun Dec 9 12:45:09 2007 +0100

twinkle-1.1-3-i686
* rebuild with boost

diff --git a/source/kde-extra/twinkle/FrugalBuild b/source/kde-extra/twinkle/FrugalBuild
index cf7a72e..7063494 100644
--- a/source/kde-extra/twinkle/FrugalBuild
+++ b/source/kde-extra/twinkle/FrugalBuild
@@ -3,10 +3,11 @@

pkgname=twinkle
pkgver=1.1
-pkgrel=2
+pkgrel=3
url="http://www.twinklephone.com/"
pkgdesc="Twinkle is a soft phone for your voice over IP communcations using the SIP protocol."
-depends=('libsndfile' 'kdelibs' 'speex' 'ilbc' 'libzrtpcpp>=1.0' 'boost' 'libgl' 'libxmu' 'libxi' 'libxdamage')
+depends=('libsndfile' 'kdelibs' 'speex' 'ilbc' 'libzrtpcpp>=1.0' 'libboost-mt>=1.34.1' 'libgl' 'libxmu' 'libxi' 'libxdamage')
+makedepends=('boost>=1.34.1')
archs=('i686' 'x86_64')
groups=('kde-extra')
Finclude kde
@@ -15,7 +16,7 @@ source=(http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-$pkgver.tar.gz)
sha1sums=('e2f0b1e7c0273b3197c5e4c21545d0500249240f')

build() {
-	Fsed "boost_regex-gcc" "boost_regex-gcc42" configure.in
+	Fsed "boost_regex-gcc" "boost_regex-mt" configure.in
Fautoreconf
Fmake
Fmakeinstall
From crazy at frugalware.org  Sun Dec  9 13:36:49 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 13:36:52 2007
Subject: [Frugalware-git] frugalware-current: deluge-0.5.7.1-1-i686
Message-ID: <20071209123649.5A0471190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=609ea089e718de5e8dbf5a3e51d29d676b637907

commit 609ea089e718de5e8dbf5a3e51d29d676b637907
Author: crazy 
Date:   Sun Dec 9 13:35:45 2007 +0100

deluge-0.5.7.1-1-i686
* Version bump
* fixed up2date
* fixed depends()
* removed the patch . not needed anymore

diff --git a/source/gnome-extra/deluge/FrugalBuild b/source/gnome-extra/deluge/FrugalBuild
index 7acac35..0aff307 100644
--- a/source/gnome-extra/deluge/FrugalBuild
+++ b/source/gnome-extra/deluge/FrugalBuild
@@ -3,29 +3,29 @@
# Contributor: Artur Grunau 

pkgname=deluge
-pkgver=0.5.6.2
+pkgver=0.5.7.1
pkgrel=1
pkgdesc="BitTorrent client written in Python and GTK+."
url="http://deluge-torrent.org/"
-depends=('pygtk' 'pyxdg' 'boost' 'notify-python' 'notification-daemon')
+depends=('pygtk' 'pyxdg' 'libboost-mt>=1.34.1' 'notify-python' 'notification-daemon')
+makedepends=('boost>=1.34.1')
groups=('gnome-extra')
archs=('i686' 'x86_64')
-up2date="lynx -dump $url/downloads-source | grep -m1 tar.gz | Flasttar"
-source=(http://download.deluge-torrent.org/tarball/$pkgver/$pkgname-$pkgver.tar.gz \
-	$pkgname-$pkgver-boostmt.diff)
+options=('scriptlet')
+up2date="lynx -dump http://deluge-torrent.org/|grep 'Released'|sed -e 's/.*ge \(.*\) R.*/\1/'"
+source=(http://download.deluge-torrent.org/tarball/$pkgver/$pkgname-$pkgver.tar.gz)
_F_gnome_iconcache=y
+_F_cd_path="deluge-torrent-$pkgver"
Finclude gnome-scriptlet
-sha1sums=('f7e48045f4a6d1b9d9327c414c0a3b576f882c0b' \
-          '7447f2895af447c2ed02d41c7bf96291cc2833fd')
+sha1sums=('1fdbc0d3028f57ac23f6861f690d9701e0ebe7a6')

build()
{
Fcd
-	Fpatchall
Fsed 'PREFIX = /usr/local' 'PREFIX = /usr' Makefile
Fsed '--prefix=$(PREFIX)' '--prefix=$(PREFIX) --root=$(DESTDIR)' Makefile
make || Fdie
-	make DESTDIR=$Fdestdir install
+	make DESTDIR=$Fdestdir install || Fdie
Fbuild_gnome_scriptlet
}
From crazy at frugalware.org  Sun Dec  9 13:43:48 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 13:43:49 2007
Subject: [Frugalware-git] frugalware-current: deluge-0.5.7.1-1-i686
Message-ID: <20071209124348.4A61E1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=28e38dedae1a5ef1cf9aed4e7e951dab6d6066ba

commit 28e38dedae1a5ef1cf9aed4e7e951dab6d6066ba
Author: crazy 
Date:   Sun Dec 9 13:43:21 2007 +0100

deluge-0.5.7.1-1-i686
* now really remove it

diff --git a/source/gnome-extra/deluge/deluge-0.5.6.2-boostmt.diff b/source/gnome-extra/deluge/deluge-0.5.6.2-boostmt.diff
deleted file mode 100644
index 2b74eaa..0000000
--- a/source/gnome-extra/deluge/deluge-0.5.6.2-boostmt.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur deluge-0.5.6.2/setup.py deluge-0.5.6.2.new/setup.py
---- deluge-0.5.6.2/setup.py	2007-10-31 15:12:11.000000000 +0530
-+++ deluge-0.5.6.2.new/setup.py	2007-10-31 21:21:41.000000000 +0530
-@@ -167,8 +167,8 @@
-             'boost_thread', 'z', 'pthread', 'ssl']
-         print 'Libraries nomt'
-     elif boosttype == "mt":
--        librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
--            'boost_thread-mt', 'z', 'pthread', 'ssl']
-+        librariestype = ['boost_filesystem-gcc42-mt', 'boost_date_time-gcc42-mt',
-+            'boost_thread-gcc42-mt', 'z', 'pthread', 'ssl']
-         print 'Libraries mt'
- else:
-         librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
From vmiklos at frugalware.org  Sun Dec  9 14:03:06 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 14:03:07 2007
Subject: [Frugalware-git] frugalware-current: e2fsprogs-1.40.3-1-i686
Message-ID: <20071209130306.819AE1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8405524216a272ab61db0570df9cabbebc0a13d5

commit 8405524216a272ab61db0570df9cabbebc0a13d5
Author: Miklos Vajna 
Date:   Sun Dec 9 14:02:47 2007 +0100

e2fsprogs-1.40.3-1-i686
version bump
change source() to kernel.org, sourceforge is a..

diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild
index 06a5cf8..8300f44 100644
--- a/source/base/e2fsprogs/FrugalBuild
+++ b/source/base/e2fsprogs/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=e2fsprogs
-pkgver=1.40.2
+pkgver=1.40.3
pkgrel=1
pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems"
url="http://e2fsprogs.sourceforge.net/"
@@ -11,8 +11,9 @@ rodepends=('coreutils')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
Finclude sourceforge
-source=(${source[@]} rc.fsck rc.random)
-sha1sums=('65519d66bd15550d0bcd32ec72481ff0dbe737e2' \
+source=(http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/e2fsprogs-$pkgver.tar.bz2 \
+	rc.fsck rc.random)
+sha1sums=('ff5a71b04a45a26f00655555d6de311f43bf053c' \
'a4b2ac27c9e155b29a7dea6e7693f449e6ce6c9f' \
'7d5e3eecbea952aa1f72808fb810892d82a35461')
From crazy at frugalware.org  Sun Dec  9 14:05:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 14:05:53 2007
Subject: [Frugalware-git] frugalware-current: sdl_gfx-2.0.13-1-i686
Message-ID: <20071209130550.A9F351190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb1d105d008b91ef654641d5480c36d93745b614

commit eb1d105d008b91ef654641d5480c36d93745b614
Author: crazy 
Date:   Sun Dec 9 13:54:09 2007 +0100

sdl_gfx-2.0.13-1-i686
* up2date fix

diff --git a/source/xlib/sdl_gfx/FrugalBuild b/source/xlib/sdl_gfx/FrugalBuild
index 0a99dba..424d5ff 100644
--- a/source/xlib/sdl_gfx/FrugalBuild
+++ b/source/xlib/sdl_gfx/FrugalBuild
@@ -10,7 +10,7 @@ depends=('sdl')
license="LGPL"
groups=('xlib')
archs=('i686' 'x86_64')
-up2date="lynx -dump http://www.ferzkopp.net/Software/SDL_gfx-2.0/|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).tar.gz/\1/'"
+up2date="lynx -dump 'http://www.ferzkopp.net/joomla/content/view/19/14/'|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).tar.gz/\1/'"
source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-$pkgver.tar.gz)
sha1sums=('406c2aecec20961156338b7eba83963bc22a5287')
From crazy at frugalware.org  Sun Dec  9 14:05:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 14:05:54 2007
Subject: [Frugalware-git] frugalware-current: pingus-0.7.2-1-i686
Message-ID: <20071209130550.D5B711190054@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=923404dc0100e27b92566fa69e7201d0332493c5

commit 923404dc0100e27b92566fa69e7201d0332493c5
Author: crazy 
Date:   Sun Dec 9 13:58:33 2007 +0100

pingus-0.7.2-1-i686
* forgot to remove that

diff --git a/source/games-extra/pingus/FrugalBuild b/source/games-extra/pingus/FrugalBuild
index c074b31..087d886 100644
--- a/source/games-extra/pingus/FrugalBuild
+++ b/source/games-extra/pingus/FrugalBuild
@@ -31,6 +31,4 @@ build()

}

-#optimization OK
-
# optimization OK
From crazy at frugalware.org  Sun Dec  9 14:05:50 2007
From: crazy at frugalware.org (crazy)
Date: Sun Dec  9 14:05:54 2007
Subject: [Frugalware-git] frugalware-current: kdevelop-3.5.0-1-i686
Message-ID: <20071209130550.ED16E11901A6@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=edac177e17d4b32cc9a4723609367d6c8b3a6b19

commit edac177e17d4b32cc9a4723609367d6c8b3a6b19
Author: crazy 
Date:   Sun Dec 9 14:03:27 2007 +0100

kdevelop-3.5.0-1-i686
* up2date fix

diff --git a/source/kde-extra/kdevelop/FrugalBuild b/source/kde-extra/kdevelop/FrugalBuild
index 8a81218..55612d7 100644
--- a/source/kde-extra/kdevelop/FrugalBuild
+++ b/source/kde-extra/kdevelop/FrugalBuild
@@ -12,7 +12,6 @@ depends=('kdebase>=3.5.8' 'kdesdk>=3.5.8' 'gettext' 'make' 'flex' 'graphviz' \
'automake' 'autoconf' 'htdig' 'valgrind' 'ctags>=5.6-2')
makedepends=('cvs' 'kde-apidox' 'qt-docs' 'doxygen')
conflicts=('kdevelop-docs')
-_F_kde_id="10157"
Finclude kde
url="http://www.kdevelop.org/"
Fconfopts="$Fconfopts --enable-vba \
From vmiklos at frugalware.org  Sun Dec  9 14:07:19 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 14:07:21 2007
Subject: [Frugalware-git] frugalware-current: openoffice.org-2.3.1-1-x86_64
Message-ID: <20071209130719.478F91190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=295b01f86a6ea554f1067413bf5d436983fc8fa9

commit 295b01f86a6ea554f1067413bf5d436983fc8fa9
Author: Miklos Vajna 
Date:   Sun Dec 9 14:07:10 2007 +0100

openoffice.org-2.3.1-1-x86_64
steal the cflags hack from xerces-j so hopefully gcj won't be killed by oom :)

diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild
index b57360d..564af4e 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -136,6 +136,9 @@ build() {
autoconf || return 1

# Optimize build.
+	## HACK! don't remove or it eats your box got killed here while
+	## eating 3G mem ...
+	export CFLAGS="$(echo $CFLAGS|sed 's/-O2/-O0/')"
export ARCH_FLAGS="$CFLAGS"

if Fuse $USE_DEVEL; then
From boobaa at frugalware.org  Sun Dec  9 16:16:59 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Sun Dec  9 16:17:02 2007
Subject: [Frugalware-git] frugalware-current: k9copy-1.2.1-1-i686
Message-ID: <20071209151659.AE0B71190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0cc180c85604344a10e39e787f3d999b523b55d0

commit 0cc180c85604344a10e39e787f3d999b523b55d0
Author: CSÉCSY László 
Date:   Sun Dec 9 16:15:13 2007 +0100

k9copy-1.2.1-1-i686
version bump

diff --git a/source/kde-extra/k9copy/FrugalBuild b/source/kde-extra/k9copy/FrugalBuild
index ae4d180..3087c3c 100644
--- a/source/kde-extra/k9copy/FrugalBuild
+++ b/source/kde-extra/k9copy/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos 

pkgname=k9copy
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
pkgdesc="K9Copy is a small utility which allows the copy of DVD under Linux."
depends=('kdelibs' 'dvdauthor' 'mjpegtools>=1.8.0-2' 'libdvdread' 'dvd+rw-tools' 'toolame' 'vamps' 'hal' 'dbus-qt3')
@@ -15,4 +15,4 @@ Finclude sourceforge kde
url="http://k9copy.sourceforge.net/index.php"

# optimization OK
-sha1sums=('c1585998774b5debdeec3ea0efb7254f6deb3ca6')
+sha1sums=('6ab1ac84997d29463603dce943a64edc55d1c751')
From boobaa at frugalware.org  Sun Dec  9 16:27:26 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Sun Dec  9 16:27:28 2007
Subject: [Frugalware-git] frugalware-current: man-pages-2.70-1-i686
Message-ID: <20071209152726.581D61190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=69af09a20adcd62594c882c42fdab648cf4dc12f

commit 69af09a20adcd62594c882c42fdab648cf4dc12f
Author: CSÉCSY László 
Date:   Sun Dec 9 16:27:02 2007 +0100

man-pages-2.70-1-i686
version bump

diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild
index 9287678..d534cca 100644
--- a/source/apps/man-pages/FrugalBuild
+++ b/source/apps/man-pages/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: VMiklos 

pkgname=man-pages
-pkgver=2.69
+pkgver=2.70
pkgrel=1
pkgdesc="Man pages are online documentation for Linux"
url="http://www.win.tue.nl/~aeb/linux/man"
@@ -41,4 +41,4 @@ build()
Frm /usr/share/man/man4/mouse.4
}
# optimization OK - noarch
-sha1sums=('6ed8b89ae0449f9465646640653bb1d2339edada')
+sha1sums=('92a1e01b6e78f849b318493df7c2ddb43a0ba878')
From hermier at frugalware.org  Sun Dec  9 17:57:20 2007
From: hermier at frugalware.org (Michel Hermier)
Date: Sun Dec  9 17:57:23 2007
Subject: [Frugalware-git] frugalware-current: azureus-3.0.4.0-1-i686.fpm
Message-ID: <20071209165720.B07FA1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c7a90e9294db0526df9fdc7cd5b01eff2202c74

commit 3c7a90e9294db0526df9fdc7cd5b01eff2202c74
Author: Michel Hermier 
Date:   Sun Dec 9 17:57:11 2007 +0100

azureus-3.0.4.0-1-i686.fpm
* Release bump.

diff --git a/source/xapps-extra/azureus/FrugalBuild b/source/xapps-extra/azureus/FrugalBuild
index ae457b4..f112246 100644
--- a/source/xapps-extra/azureus/FrugalBuild
+++ b/source/xapps-extra/azureus/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Shrift 

pkgname=azureus
-pkgver=3.0.3.4
+pkgver=3.0.4.0
pkgrel=1
pkgdesc="A Java BitTorrent Client"
depends=()
@@ -13,9 +13,9 @@ archs=('i686' 'x86_64')
_F_sourceforge_prefix=azureus-
Finclude sourceforge
[ "$CARCH" == "i686" ] && _arch="" && \
-	sha1sums=('96f83a64f52208911546b1c9f9b7d55c221349ad')
+	sha1sums=('8ff64d9034aa9f746acb5d76f440e99a0057b37d')
[ "$CARCH" == "x86_64" ] && _arch=-x86_64 && \
-	sha1sums=('c173808c3fec65853304921deaaacb6d9f2c17aa')
+	sha1sums=('ffdcd832b22a24615f8429b7e51ef4e3673ef3f6')
source=(${source%az*}/Azureus_$pkgver'_'linux$_arch.tar.bz2 $pkgname.desktop)
sha1sums=(${sha1sums[@]} '7fbddde5f38583716cd3868a91064fcb6d1d56c8')
From vmiklos at frugalware.org  Sun Dec  9 20:39:07 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 20:39:09 2007
Subject: [Frugalware-git] frugalware-current: icewm-1.2.33-1-i686
Message-ID: <20071209193907.A08051190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8be58834b6f3536eb1ebeb41e5418bd2d480fc14

commit 8be58834b6f3536eb1ebeb41e5418bd2d480fc14
Author: Miklos Vajna 
Date:   Sun Dec 9 20:38:56 2007 +0100

icewm-1.2.33-1-i686
version bump
up2date fix (thx Mcklaren)

diff --git a/source/xlib/icewm/FrugalBuild b/source/xlib/icewm/FrugalBuild
index 0ee4fcd..63fa7e4 100644
--- a/source/xlib/icewm/FrugalBuild
+++ b/source/xlib/icewm/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: VMiklos 

pkgname=icewm
-pkgver=1.2.32
+pkgver=1.2.33
pkgrel=1
pkgdesc="A window manager, whose goal is speed and simplicity."
pkgdesc_localized=('hu_HU Egy ablakkezelő, melynek célja a sebesség és az egyszerűség.')
@@ -10,8 +10,10 @@ depends=('libsm' 'libxinerama' 'libstdc++' 'imlib' 'libxft' 'libpng' 'libxrandr'
groups=('xlib')
archs=('i686' 'x86_64')
Finclude sourceforge
-up2date="lynx -dump http://www.icewm.org/|grep '][0-9\.]* released'|sed 's/.*]\(.*\) r.*/\1/;q'"
source=(${source[@]} xinitrc.icewm icewm.desktop)
+sha1sums=('dce8cd65e9f6d1d692c93fb3dbba18a68f431ff8' \
+          '6149ed5fae01115186d6e55adedf5bfa0fde839a' \
+          '39e0879b896572c1c448a243876857f89f946c24')

build()
{
@@ -20,6 +22,3 @@ build()
Ffile /etc/X11/sessions/icewm.desktop
Fexe /etc/X11/xinit/xinitrc.icewm
}
-sha1sums=('98714e22eaea0a677253a15361430968e9646161' \
-          '6149ed5fae01115186d6e55adedf5bfa0fde839a' \
-          '39e0879b896572c1c448a243876857f89f946c24')
From vmiklos at frugalware.org  Sun Dec  9 22:51:38 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 22:51:41 2007
Subject: [Frugalware-git] homepage-ng: newsletter issue 11
Message-ID: <20071209215138.9767E1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=29e6b05d53dd9f98977ec579261622993b2c2aa7

commit 29e6b05d53dd9f98977ec579261622993b2c2aa7
Author: Russell Dickenson 
Date:   Sat Dec 8 21:24:01 2007 +1000

newsletter issue 11

diff --git a/frugalware/weeklynews/issue11.html b/frugalware/weeklynews/issue11.html
new file mode 100644
index 0000000..fdfc9b8
--- /dev/null
+++ b/frugalware/weeklynews/issue11.html
@@ -0,0 +1,124 @@
+
    
+
    
+
    Table of Contents
    
+
+
+
+
    Welcome
    
+
    
+	The newsletter's aim is to keep you up to date with what's happened recently in the world of the Linux distribution 'Frugalware'.
+
    
+
    
+  In this issue we welcome a new release of Frugalware, put the 'Windows' key to good use in Gnome, reveal a bug in previous newsletters (:O) and more.
+
    
+
+
+
    Events
    
+
    
+	Here's a selection of events which have occurred since the previous newsletter:
+
    
+
      
+	
    • 
+	
      We're on the way to Kalgan
      
+
      
+	On 4 December, vmiklos (Miklos) announced the release of Frugalware 0.8 pre-release 1.  Frugalware releases are each given a code-name from the series of fictional planets named by famed science fiction author Isaac Asimov.  Frugalware 0.8 is code-named "Kalgan".
+
      
+
      
+	Highlights of the release include -
+
      
+
        
+	
      • 
+	Package updates
+	
        • 
+		
          
+		  
        • Linux 2.6.23 + fixes
          • 
+          
        • GNU C Library 2.7
          • 
+          
        • GCC 4.2.2
          • 
+          
        • espgs is now replaced with the stock ghostscript
          • 
+          
        • compiz-fusion replaced beryl, most users now can avoid XGL
          • 
+          
        • more than 600 other upstream updates
          • 
+          
        • more than 100 new packages, including 20 new games, cgit (an alternate web front-end for git) and OpenOffice 2.3.1
          • 
+          
        • numerous bug fixes, including the "firefox crashes when selecting print preview" bug
          • 
+		
        
+    
      • 
+    New features
+    
        • 
+    	
          
+          
        • Added FUN (Frugalware Update Notifier), which resides in the user's system tray and notifies you if package updates are available.
          • 
+          
        • Added WPA (Wi-Fi Protected Access) support to the installer
          • 
+    	
        
+
      
+
    
+
+
+
    Tips and tricks
    
+
      
+	
    • 
+		
      Using the 'Windows' key in Gnome/Metacity - submitted by 'detto'
      
+	
      
+	I'm used to use the Windows key("hyper" or "mod4") but gnome-keybinding-properties didn't quite work with it. It is impossible to set "hyper"/"mod4" as it captures one key only (calling it "Super_L") with no combination (i.e. I press mod4+ctrl+a to be my shortcut and all I get is "Super_L").
+	
      
+	
      
+	To make this button work, one has to open gnome-keyboard-properties, go to the third tab, pull down the option "Alt/Win key behaviour" and change it to "hyper is mapped to the windows key".
+	
      
+	
      • 
+
    
+	
    
+	This section relies on your contributions! If have some tips and tricks that you would like to be shown in the newsletter, please post them on the forums in the Tips and Tricks section!
+	
    
+
+
+
    Bug fixes
    
+
    
+Strange but true!  A bug was recently found in the "Bug fixes" section of the newsletter.  The link provided in previous newsletters worked only if you were logged into the Bug Tracker System at the time.  If you were not, the report you saw was incorrect.  Thanks go to Miklos for helping to correct the bug.
+
    
+
    
+	A list of bugs closed since the previous newsletter is available here.
+
    
+
+
+
    Security announcements
    
+
    
+	According to the normal support arrangements for Frugalware, when Frugalware 0.7 (Sayshell) was released, support for the previous release ended.  This means that no further security or bug fixes will be released.
+
    
+
+
    
+	Here is a list of security issues which have been discovered and fixed in the 0.7 release since the previous newsletter.
+
    
+
+
      
+        
    • FSA330 - cups: Some vulnerabilities have been reported in CUPS, which can be exploited by malicious people to cause a DoS (Denial of Service) and potentially to compromise a user's system.    The vulnerabilities are caused due to the use of a vulnerable version of Xpdf.. Please upgrade to cups-1.3.2-2sayshell2.
      • 
+        
    • FSA329 - mysql: A vulnerability has been reported in MySQL, which can be exploited by malicious users to cause a DoS (Denial of Service). Please upgrade to mysql-5.0.45-2sayshell1.
      • 
+        
    • FSA328 - php-pear-mdb2: A security issue has been reported in PEAR MDB2, which can be exploited by malicious people to disclose sensitive information. Please upgrade to php-pear-mdb2-2.4.1-2sayshell1.
      • 
+        
    • FSA327 - emacs: Drake Wilson has reported a vulnerability in GNU Emacs, which can be exploited by malicious people to compromise a user's system. Please upgrade to emacs-22.1-2sayshell1.
      • 
+        
    • FSA326 - samba: Some vulnerabilities have been reported in Samba, which can be exploited by malicious people to compromise a vulnerable system. Please upgrade to samba-3.0.26-2sayshell1.
      • 
+        
    • FSA325 - phpmyadmin: Three vulnerabilities have been reported in phpMyAdmin, which can be exploited by malicious users to conduct script insertion, SQL injection and cross-site scripting attacks. Please upgrade to phpmyadmin-2.11.2.2-1sayshell1.
      • 
+        
    • FSA324 - php: Some vulnerabilities and weaknesses have been reported in PHP, where some have unknown impacts and others can be exploited to bypass certain security restrictions. Please upgrade to php-5.2.5-1sayshell1.
      • 
+        
    • FSA323 - cpio: There is a vulnerability in cpio, which can be exploited by malicious people to cause a DoS (Denial of Service). Please upgrade to cpio-2.9-2sayshell1.
      • 
+        
    • FSA322 - perl: Tavis Ormandy and Will Drewry have reported a vulnerability in Perl, which potentially can be exploited by malicious people to compromise a vulnerable system. Please upgrade to perl-5.8.8-5sayshell1.
      • 
+        
    • FSA321 - openldap: Some vulnerabilities have been reported in OpenLDAP, which can be exploited by malicious users to cause a DoS (Denial of Service). Please upgrade to openldap-2.3.39-1sayshell1.
      • 
+        
    • FSA320 - kernel: Some vulnerabilities have been reported in the Linux Kernel, which can be exploited by malicious, local users and by malicious people to cause a DoS (Denial of Service). Please upgrade to kernel-2.6.22-7sayshell3.
      • 
+
    
+
+
+
    Feedback
    
+
    
+	If you have feedback about the Frugalware newsletter - whether good or bad - please provide it via the forums.  Your feedback is valuable because we want the newsletter to meet the needs of Frugalware's users.
+
    
+
+
+
    Credits
    
+
    
+	The Frugalware newsletter is written by Russell Dickenson (AKA phayz).
+
    
+
    
+	Credit for the Frugalware distribution itself goes to the development team.
+
    
From vmiklos at frugalware.org  Sun Dec  9 22:54:37 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Sun Dec  9 22:54:38 2007
Subject: [Frugalware-git] homepage-ng: news entry for newsletter11
Message-ID: <20071209215437.0C5841190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=a37295b1694c47a9781c5ef560bf6a1ba576e09f

commit a37295b1694c47a9781c5ef560bf6a1ba576e09f
Author: Miklos Vajna 
Date:   Sun Dec 9 22:54:33 2007 +0100

news entry for newsletter11

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml
index e0e877c..6cd9124 100644
--- a/frugalware/xml/news.xml
+++ b/frugalware/xml/news.xml
@@ -17,6 +17,19 @@



+		80
+		Frugalware Newsletter Issue 11
+		Sun Dec  9 22:51:50 CET 2007
+		VMiklos
+		0
+		
+			In this issue we welcome a new release of Frugalware, put the 'Windows' key to good use in Gnome, reveal a bug in previous newsletters and more.
    
+			You can read it here. We hope you like it!
+			]]>
+		    
+	    
+	
79
Frugalware 0.8pre1 (Kalgan) released
Tue Dec  4 09:33:56 CET 2007
From crazy at frugalware.org  Mon Dec 10 02:03:18 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 02:03:21 2007
Subject: [Frugalware-git] frugalware-current: bmpx-0.40.13-2-i686
Message-ID: <20071210010318.22D651190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a55c88f079ca185d8886e941339be277f131939

commit 0a55c88f079ca185d8886e941339be277f131939
Author: crazy 
Date:   Mon Dec 10 02:01:18 2007 +0100

bmpx-0.40.13-2-i686
* release bump
* rebuild with boost
* added an patch to fix the build

diff --git a/source/xmultimedia-extra/bmpx/FrugalBuild b/source/xmultimedia-extra/bmpx/FrugalBuild
index 7ab8554..1d2b0ac 100644
--- a/source/xmultimedia-extra/bmpx/FrugalBuild
+++ b/source/xmultimedia-extra/bmpx/FrugalBuild
@@ -4,15 +4,15 @@
pkgname=bmpx
pkgver=0.40.13
basever=0.40
-pkgrel=1
+pkgrel=2
pkgdesc="A media player that features support for specifications like XDS DnD, XSPF and DBus."
url="http://bmpx.beep-media-player.org"
depends=('libsidplay' 'gamin' 'alsa-lib' 'dbus>=1.0.0-2' 'dbus-glib' 'libglademm>=2.6.3-2' 'hal>=0.5.8.1' \
'libsoup' 'icu>=3.8' 'db>=4.5.20' 'libmodplug' 'sqlite3' 'taglib' 'freetype2' 'librsvg' 'startup-notification' \
'gst-plugins-base>=0.10.10-4' 'gst-plugins-base-alsa>=0.10.10-4' 'gst-plugins-base-oil>=0.10.10-4' \
-	'gst-plugins-base-cdparanoia>=0.10.10-4' 'boost>=1.34.0-4' 'libofa>=0.9.3-2' 'cdparanoia' \
+	'gst-plugins-base-cdparanoia>=0.10.10-4' 'libboost-mt>=1.34.1' 'libofa>=0.9.3-2' 'cdparanoia' \
'libsexymm' 'libsexy' 'bzip2' 'e2fsprogs')
-makedepends=('flex' 'bison' 'gzip' 'zip' 'firefox' 'perl-xml' 'intltool')
+makedepends=('flex' 'bison' 'gzip' 'zip' 'firefox' 'perl-xml' 'intltool' 'boost>=1.34.1')
rodepends=('gst-ffmpeg>=0.10.1-4' 'gst-plugins-good-flac>=0.10.4-5' 'gst-plugins-ugly-mad>=0.10.4-2' \
'gst-plugins-bad-faad2>=0.10.3-5' 'gst-plugins-bad-musepack>=0.10.3-5' 'gst-plugins-bad>=0.10.3-5' \
'gst-plugins-good>=0.10.4-5' 'gst-plugins-ugly>=0.10.4-2' 'gst-plugins-bad-mms>=0.10.3-5' \
@@ -22,9 +22,10 @@ groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump 'http://bmpx.beep-media-player.org/site/Downloads'|grep -m1 '.tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'"
source=(http://files.beep-media-player.org/releases/$basever/$pkgname-$pkgver.tar.bz2 \
-	01-fw_builduser.patch)
+	01-fw_builduser.patch compile-fix.patch)
sha1sums=('3327baa8f13f8411a15ebafd0112b9ba8623c0ef' \
-          'a8aabe4db10959e488ffdc38881c88a7cd72855e')
+          'a8aabe4db10959e488ffdc38881c88a7cd72855e' \
+          '92c7eea5204f4f3ac55f52e682cf6f1033ce858b')

subpkgs=("$pkgname-lastfm-firefox-plugin")
subdescs=("Firefox LastFM plugin for $pkgname")
@@ -45,11 +46,7 @@ build()
--enable-modplug \
--enable-sn \
--enable-sm \
-		--with-tr1 \
-		--with-boost-filesystem="boost_filesystem-gcc42-mt" \
-		--with-boost-regex="boost_regex-gcc42-mt" \
-		--with-boost-iostreams="boost_iostreams-gcc42-mt" \
-		##--enable-debug#
+		--with-tr1
make || Fdie
Fmakeinstall
## ff plugin
diff --git a/source/xmultimedia-extra/bmpx/compile-fix.patch b/source/xmultimedia-extra/bmpx/compile-fix.patch
new file mode 100644
index 0000000..931d512
--- /dev/null
+++ b/source/xmultimedia-extra/bmpx/compile-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur bmpx-0.40.13/src/sanity.cc bmpx-0.40.13-p/src/sanity.cc
+--- bmpx-0.40.13/src/sanity.cc	2007-10-18 19:17:08.000000000 +0200
++++ bmpx-0.40.13-p/src/sanity.cc	2007-12-10 01:32:37.000000000 +0100
+@@ -69,7 +69,7 @@
+ }
+
+ C_FUNCTION
+-gchar *
++const gchar *
+ sanity_check_gtk (void)
+ {
+   return gtk_check_version (GTK_REQUIRED_MAJOR_VER,
From crazy at frugalware.org  Mon Dec 10 05:06:03 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 05:06:08 2007
Subject: [Frugalware-git] frugalware-current: swig-1.3.31-1-i686
Message-ID: <20071210040603.0BE7F1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df18824c393030e8ccb05f83ae3e5bab7aaf77e9

commit df18824c393030e8ccb05f83ae3e5bab7aaf77e9
Author: crazy 
Date:   Mon Dec 10 03:38:44 2007 +0100

swig-1.3.31-1-i686
* New maintainer
* added depends() .. brr

diff --git a/source/devel-extra/swig/FrugalBuild b/source/devel-extra/swig/FrugalBuild
index 25ec443..c2c78b1 100644
--- a/source/devel-extra/swig/FrugalBuild
+++ b/source/devel-extra/swig/FrugalBuild
@@ -1,5 +1,6 @@
# Compiling time: 0.16 SBU
-# Maintainer: Miklos Nemeth 
+# Maintainer: crazy 
+# Contributor: Miklos Nemeth 

pkgname=swig
pkgver=1.3.31
@@ -7,6 +8,7 @@ pkgrel=1
pkgdesc="SWIG interface compiler"
url="http://www.swig.org"
archs=('i686' 'x86_64')
+depends=()
groups=('devel-extra')
Finclude sourceforge
up2date="lynx -dump http://www.swig.org/download.html|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'"
From crazy at frugalware.org  Mon Dec 10 05:06:03 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 05:06:11 2007
Subject: [Frugalware-git] frugalware-current: pysqlite2-2.3.5-2-i686
Message-ID: <20071210040603.32E6B1190054@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=45ebb79289722873d94143b1ecc0c4343bbb2a48

commit 45ebb79289722873d94143b1ecc0c4343bbb2a48
Author: crazy 
Date:   Mon Dec 10 03:41:27 2007 +0100

pysqlite2-2.3.5-2-i686
* up2date fix

diff --git a/source/devel-extra/pysqlite2/FrugalBuild b/source/devel-extra/pysqlite2/FrugalBuild
index dafc8dc..7f5ffec 100644
--- a/source/devel-extra/pysqlite2/FrugalBuild
+++ b/source/devel-extra/pysqlite2/FrugalBuild
@@ -3,6 +3,7 @@
# Contributor: enda 

pkgname=pysqlite2
+_F_archive_name=pysqlite
pkgver=2.3.5
pkgrel=2
pkgdesc="Python DB-API 2.0 interface for SQLite."
From crazy at frugalware.org  Mon Dec 10 05:06:03 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 05:06:12 2007
Subject: [Frugalware-git] 
	frugalware-current: python-logilab-astng-0.17.1-1-i686
Message-ID: <20071210040603.4C36311901A6@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6113b89cc317a9df008a0dd1b51e7b34146a85f7

commit 6113b89cc317a9df008a0dd1b51e7b34146a85f7
Author: crazy 
Date:   Mon Dec 10 03:42:49 2007 +0100

python-logilab-astng-0.17.1-1-i686
* up2date fix

diff --git a/source/devel-extra/python-logilab-astng/FrugalBuild b/source/devel-extra/python-logilab-astng/FrugalBuild
index 03c01d6..a628c04 100644
--- a/source/devel-extra/python-logilab-astng/FrugalBuild
+++ b/source/devel-extra/python-logilab-astng/FrugalBuild
@@ -3,6 +3,7 @@
# Contributor: Rohan Dhruva 

pkgname=python-logilab-astng
+_F_archive_name=logilab-astng
pkgver=0.17.1
pkgrel=1
pkgdesc="Python Abstract Syntax Tree New Generation."
From crazy at frugalware.org  Mon Dec 10 05:06:03 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 05:06:14 2007
Subject: [Frugalware-git] frugalware-current: geoip-python-1.2.1-2-i686
Message-ID: <20071210040603.6074611901A7@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d06048e6f8f8038f7fa2ec1dc6bc47cde2d90e6e

commit d06048e6f8f8038f7fa2ec1dc6bc47cde2d90e6e
Author: crazy 
Date:   Mon Dec 10 03:44:13 2007 +0100

geoip-python-1.2.1-2-i686
* up2date fix

diff --git a/source/devel-extra/geoip-python/FrugalBuild b/source/devel-extra/geoip-python/FrugalBuild
index de07220..45abb31 100644
--- a/source/devel-extra/geoip-python/FrugalBuild
+++ b/source/devel-extra/geoip-python/FrugalBuild
@@ -2,6 +2,7 @@
# Maintainer: Priyank Gosalia 

pkgname=geoip-python
+_F_archive_name=GeoIP-Python
pkgver=1.2.1
pkgrel=2
pkgdesc="Python bindings for the GeoIP geographical lookup libraries"
From crazy at frugalware.org  Mon Dec 10 05:06:03 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 05:06:16 2007
Subject: [Frugalware-git] 
	frugalware-current: python-logilab-common-0.23.1-1-i686
Message-ID: <20071210040603.7308E11901A8@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed7aa2dfaef19c69c1a0dea9c03bc1b75960d871

commit ed7aa2dfaef19c69c1a0dea9c03bc1b75960d871
Author: crazy 
Date:   Mon Dec 10 03:45:22 2007 +0100

python-logilab-common-0.23.1-1-i686
* up2date fix

diff --git a/source/devel-extra/python-logilab-common/FrugalBuild b/source/devel-extra/python-logilab-common/FrugalBuild
index 1cfcf0e..5d7c973 100644
--- a/source/devel-extra/python-logilab-common/FrugalBuild
+++ b/source/devel-extra/python-logilab-common/FrugalBuild
@@ -3,6 +3,7 @@
# Contributor: Rohan Dhruva 

pkgname=python-logilab-common
+_F_archive_name=logilab-common
pkgver=0.23.1
pkgrel=1
pkgdesc="Providing low level functionnalities needed for logilab python programs."
From crazy at frugalware.org  Mon Dec 10 05:06:03 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 05:06:17 2007
Subject: [Frugalware-git] frugalware-current: xerces-c-2.8.0-1-i686
Message-ID: <20071210040603.8514411901A9@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=35b73376399bc0090c4cd146ed9ed5b414beebea

commit 35b73376399bc0090c4cd146ed9ed5b414beebea
Author: crazy 
Date:   Mon Dec 10 04:29:53 2007 +0100

xerces-c-2.8.0-1-i686
* Version bump
* fixed url , source , build() , depends()

diff --git a/source/devel-extra/xerces-c/FrugalBuild b/source/devel-extra/xerces-c/FrugalBuild
index 6b657f7..36ae457 100644
--- a/source/devel-extra/xerces-c/FrugalBuild
+++ b/source/devel-extra/xerces-c/FrugalBuild
@@ -2,29 +2,28 @@
# Maintainer: Priyank Gosalia 

pkgname=xerces-c
-pkgver=2.7.0
+pkgver=2.8.0
pkgrel=1
pkgdesc="Xerces2 C++ Parser"
url="http://xml.apache.org/xerces-c/"
-depends=('gcc')
+depends=('libstdc++')
groups=('devel-extra')
archs=('i686' 'x86_64')
-up2date="lynx -dump http://www.apache.org/dist/xml/xerces-c/source/ | grep -m1 tar.gz | sed 's/.*rc_\(.*\).ta.*/\1/' | tr -s '_' '.'"
-source=(http://www.apache.org/dist/xml/xerces-c/source/$pkgname-src_2_7_0.tar.gz \
+up2date="lynx -dump http://xerces.apache.org/xerces-c/download.cgi|grep -om1 'xerces-c-src\(.*\).tar.gz'|sed 's/.*c_\(.*\).t.*/\1/;s/_/./g'"
+source=(http://netmirror.org/mirror/apache.org/xerces/c/sources/$pkgname-src_`echo $pkgver|tr '.' '_'`.tar.gz \
xerces-c-2.7.0-libpath.patch  xerces-c-2.7.0-multilib.patch)
-sha1sums=('56f9587f33fca0a573a45f07762e3262a255d73f' \
-	'defaad81f4044b03aedc2d38da6e83725f5d0f61' \
-	'6a9760ab87c309e401574b5bd6652a87b568f253')
+sha1sums=('f0803b1330daec3f44b17dee64c3c99de6b3cd3e' \
+          'defaad81f4044b03aedc2d38da6e83725f5d0f61' \
+          '6a9760ab87c309e401574b5bd6652a87b568f253')

build() {
-	export XERCESCROOT=$Fsrcdir/$pkgname-src_2_7_0
-	Fcd $pkgname-src_2_7_0
-	patch -Np1 -i $Fsrcdir/xerces-c-2.7.0-libpath.patch || return 1
-	patch -Np1 -i $Fsrcdir/xerces-c-2.7.0-multilib.patch || return 1
-	cd src/xercesc/
+	export XERCESCROOT=$Fsrcdir/$pkgname-src_`echo $pkgver|tr '.' '_'`
+	Fcd $pkgname-src_`echo $pkgver|tr '.' '_'`
+	cd src/xercesc/ || Fdie
+	# DO _NOT_ use F* commands here - crazy -
./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P/usr || return 1
-	Fmake
-	make DESTDIR=$Fdestdir install
+	make || Fdie
+	make DESTDIR=$Fdestdir install || Fdie
}

# optimization OK
From crazy at frugalware.org  Mon Dec 10 05:06:03 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 05:06:19 2007
Subject: [Frugalware-git] frugalware-current: xerces-c-2.8.0-1-i686
Message-ID: <20071210040603.A4B841190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a30483671a4389cf3041c1408022282d8e6e719e

commit a30483671a4389cf3041c1408022282d8e6e719e
Author: crazy 
Date:   Mon Dec 10 05:04:52 2007 +0100

xerces-c-2.8.0-1-i686
* forgot to remove patches
* fixed SMP build

diff --git a/source/devel-extra/xerces-c/FrugalBuild b/source/devel-extra/xerces-c/FrugalBuild
index 36ae457..0da8d03 100644
--- a/source/devel-extra/xerces-c/FrugalBuild
+++ b/source/devel-extra/xerces-c/FrugalBuild
@@ -10,13 +10,11 @@ depends=('libstdc++')
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://xerces.apache.org/xerces-c/download.cgi|grep -om1 'xerces-c-src\(.*\).tar.gz'|sed 's/.*c_\(.*\).t.*/\1/;s/_/./g'"
-source=(http://netmirror.org/mirror/apache.org/xerces/c/sources/$pkgname-src_`echo $pkgver|tr '.' '_'`.tar.gz \
-	xerces-c-2.7.0-libpath.patch  xerces-c-2.7.0-multilib.patch)
-sha1sums=('f0803b1330daec3f44b17dee64c3c99de6b3cd3e' \
-          'defaad81f4044b03aedc2d38da6e83725f5d0f61' \
-          '6a9760ab87c309e401574b5bd6652a87b568f253')
+source=(http://netmirror.org/mirror/apache.org/xerces/c/sources/$pkgname-src_`echo $pkgver|tr '.' '_'`.tar.gz)
+sha1sums=('f0803b1330daec3f44b17dee64c3c99de6b3cd3e')

build() {
+	unset MAKEFLAGS
export XERCESCROOT=$Fsrcdir/$pkgname-src_`echo $pkgver|tr '.' '_'`
Fcd $pkgname-src_`echo $pkgver|tr '.' '_'`
cd src/xercesc/ || Fdie
diff --git a/source/devel-extra/xerces-c/xerces-c-2.7.0-libpath.patch b/source/devel-extra/xerces-c/xerces-c-2.7.0-libpath.patch
deleted file mode 100644
index 3d430ff..0000000
--- a/source/devel-extra/xerces-c/xerces-c-2.7.0-libpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- xerces-c-src/src/xercesc/Makefile.incl.orig	2006-01-08 20:05:35.000000000 -0500
-+++ xerces-c-src/src/xercesc/Makefile.incl	2006-01-08 20:08:19.000000000 -0500
-@@ -348,23 +348,23 @@
-
-         ifeq (${BITSTOBUILD}, 64)
-             ifeq (${TRANSCODER}, ICU)
--                ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
-+                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata
-             else
--                ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
-+                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib
-             endif
-
-             ifeq (${MESSAGELOADER}, ICU)
--                ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages
-+                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata -lXercesMessages
-             endif
-         else
-             ifeq (${TRANSCODER}, ICU)
--                ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
-+                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata
-             else
--                ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
-+                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib
-             endif
-
-             ifeq (${MESSAGELOADER}, ICU)
--                ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages
-+                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata -lXercesMessages
-             endif
-         endif
-
diff --git a/source/devel-extra/xerces-c/xerces-c-2.7.0-multilib.patch b/source/devel-extra/xerces-c/xerces-c-2.7.0-multilib.patch
deleted file mode 100644
index eca8109..0000000
--- a/source/devel-extra/xerces-c/xerces-c-2.7.0-multilib.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN xerces-c-src.orig/obj/Makefile.in xerces-c-src/obj/Makefile.in
---- xerces-c-src.orig/obj/Makefile.in	2005-08-26 12:19:57.000000000 -0400
-+++ xerces-c-src/obj/Makefile.in	2005-10-04 12:01:33.000000000 -0400
-@@ -46,6 +46,7 @@
- include ../src/xercesc/Makefile.incl
-
- LIB=${XERCESCROOT}/lib
-+MLIBDIR=lib
- ## OS390BATCH
- ifeq (${OS390BATCH},1)
- BATCH_TARGET = "//'${LOADMOD}(IXM4C56)'"
-@@ -223,26 +224,26 @@
- ifeq (${OS390BATCH},1)
- 	@echo "Nothing to do for OS390BATCH ..."
- else
--	-mkdir -p ${DESTDIR}${PREFIX}/lib
-+	-mkdir -p ${DESTDIR}${PREFIX}/${MLIBDIR}
- ifeq (${PLATFORM}, CYGWIN)
- 	-mkdir -p ${DESTDIR}${PREFIX}/bin
- 	$(CP) ${FQ_SO_NAME} ${DESTDIR}${PREFIX}/bin
--	$(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
--	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; rm -f libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
-+	$(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR}
-+	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; rm -f libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
-
- 	$(CP) ${FQ_SO_DEPDOM} ${DESTDIR}${PREFIX}/bin
--	$(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
--	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
-+	$(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR}
-+	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
- else
--	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
--	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
-+	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/${MLIBDIR}
-+	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
-
--	$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib
--	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})
-+	$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/${MLIBDIR}
-+	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})
- endif
- ifeq (${PLATFORM},OS390)
--	$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
--	$(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
-+	$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}
-+	$(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}
- endif
- endif
-
From crazy at frugalware.org  Mon Dec 10 05:23:52 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 05:23:58 2007
Subject: [Frugalware-git] frugalware-current: xalan-c-1.10.0-2-i686
Message-ID: <20071210042352.6F6251190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=42fb244cf78399fd550df78318c65c3b9a7ffea7

commit 42fb244cf78399fd550df78318c65c3b9a7ffea7
Author: crazy 
Date:   Mon Dec 10 05:22:57 2007 +0100

xalan-c-1.10.0-2-i686
* rebuild with xerces-c
* depends() fix
* changed maintainer to me

diff --git a/source/devel-extra/xalan-c/FrugalBuild b/source/devel-extra/xalan-c/FrugalBuild
index f564faf..b220400 100644
--- a/source/devel-extra/xalan-c/FrugalBuild
+++ b/source/devel-extra/xalan-c/FrugalBuild
@@ -1,18 +1,19 @@
# Compiling Time: 3.16 SBU
-# Maintainer: AlexExtreme 
+# Maintainer: crazy 
+# Contributor: AlexExtreme 

pkgname=xalan-c
realname=Xalan-C
pkgver=1.10.0
-pkgrel=1
+pkgrel=2
pkgdesc="Xalan C++ Parser"
url="http://xml.apache.org/xalan-c/"
-depends=('gcc' 'xerces-c')
+depends=('libstdc++' 'xerces-c>=2.8.0')
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.apache.org/dist/xml/xalan-c/source/|grep -om1 'Xalan-C\(.*\)-src.tar.gz'|sed 's/.*C_\(.*\).src.*/\1/;s/_/./g'"
source=(http://www.apache.org/dist/xml/xalan-c/source/${realname}_`echo $pkgver|tr . _`-src.tar.gz)
-signatures=($source.asc)
+sha1sums=('3fc63045048176e0ab00ce8aa0d15b2c1e5d646b')
_F_cd_path="xml-xalan/c"
unset MAKEFLAGS
From crazy at frugalware.org  Mon Dec 10 05:34:25 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 05:34:29 2007
Subject: [Frugalware-git] frugalware-current: glest-2.0.1-2-i686
Message-ID: <20071210043425.E87DA1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=db999ad2c97388765cc6d387567440de7f7ead62

commit db999ad2c97388765cc6d387567440de7f7ead62
Author: crazy 
Date:   Mon Dec 10 05:32:10 2007 +0100

glest-2.0.1-2-i686
* release bump
* rebuild with xerces-c
* added some missing Fdie's

diff --git a/source/games-extra/glest/FrugalBuild b/source/games-extra/glest/FrugalBuild
index af644a2..186d135 100644
--- a/source/games-extra/glest/FrugalBuild
+++ b/source/games-extra/glest/FrugalBuild
@@ -3,14 +3,14 @@

pkgname=glest
pkgver=2.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="Cross-platform 3D realtime strategy game."
_F_sourceforge_ext=".zip"
Finclude sourceforge
url="http://www.glest.org/"
makedepends=('jam' 'hd2u')
rodepends=('glest-data')
-depends=('sdl' 'libogg' 'libvorbis' 'openal' 'xerces-c' 'libxt' 'libx11' 'mesa' 'corefonts')
+depends=('sdl' 'libogg' 'libvorbis' 'openal' 'xerces-c>=2.8.0' 'libxt' 'libx11' 'mesa' 'corefonts')
groups=('games-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
@@ -24,8 +24,8 @@ sha1sums=('20625eb567de3de9e3f2c5ec91e6c5da0dd6dca8' \
build()
{
for i in `find $Fsrcdir/{source,mk} -type f`; do dos2unix $i; done
-	cd $Fsrcdir
-	cd mk/linux
+	cd $Fsrcdir || Fdie
+	cd mk/linux || Fdie
chmod a+x *.sh || return 1
Fmkdir usr/{share/glest,bin}
if [[ ! -e configure ]] ; then
From crazy at frugalware.org  Mon Dec 10 06:10:18 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 06:10:23 2007
Subject: [Frugalware-git] frugalware-current: virtualbox-1.5.2-6-i686
Message-ID: <20071210051019.000521190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ffac0c38b5efc8ade139abfb4db1219fe3a31bf6

commit ffac0c38b5efc8ade139abfb4db1219fe3a31bf6
Author: crazy 
Date:   Mon Dec 10 06:07:57 2007 +0100

virtualbox-1.5.2-6-i686
* rebuild with xerces-c

diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild
index 7e1d7fd..e268162 100644
--- a/source/xapps-extra/virtualbox/FrugalBuild
+++ b/source/xapps-extra/virtualbox/FrugalBuild
@@ -5,12 +5,12 @@
pkgname=virtualbox
realname=VirtualBox
pkgver=1.5.2
-pkgrel=5
+pkgrel=6
pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use."
url="http://www.virtualbox.org"
_F_kernelmod_scriptlet=$pkgname.install
Finclude kernel-module
-depends=(${depends[@]} 'gcc' 'xerces-c' 'xalan-c' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \
+depends=(${depends[@]} 'gcc' 'xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \
'hal' 'libstdc++5')
# For get-vbox-additions
rodepends=('wget')
From boobaa at frugalware.org  Mon Dec 10 09:15:02 2007
From: boobaa at frugalware.org (CSÉCSY László)
Date: Mon Dec 10 09:15:08 2007
Subject: [Frugalware-git] frugalware-current: phpmyadmin-2.11.3-1-i686
Message-ID: <20071210081502.884E71190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=96f097055232c461003fa93969df75486c531c33

commit 96f097055232c461003fa93969df75486c531c33
Author: CSÉCSY László 
Date:   Mon Dec 10 09:14:36 2007 +0100

phpmyadmin-2.11.3-1-i686
version bump
buncho' mirrors ou'there, an' on'y one workin... :S

diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild
index 13e20f7..f617459 100644
--- a/source/network-extra/phpmyadmin/FrugalBuild
+++ b/source/network-extra/phpmyadmin/FrugalBuild
@@ -3,10 +3,11 @@
# Maintainer: CSÉCSY László 

pkgname=phpmyadmin
-pkgver=2.11.2.2
+pkgver=2.11.3
pkgrel=1
pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW."
_F_sourceforge_ext="-all-languages.tar.bz2"
+_F_sourceforge_mirror="osdn"
Finclude sourceforge
url="http://www.phpmyadmin.net/home_page/"
rodepends=('php')
@@ -29,4 +30,4 @@ build()
Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2
}

-sha1sums=('0839e9f79c86b257b95dba24a96838a0171fce88')
+sha1sums=('5c3f39e944ed8294d102a96846430b85d711ed0e')
From vmiklos at frugalware.org  Mon Dec 10 10:47:38 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 10:47:40 2007
Subject: [Frugalware-git] frugalware-current: wxsvg-1.0b7_3-1-i686
Message-ID: <20071210094738.AF6111190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3063151cb5060d02dcd2ac3156b818625799f57f

commit 3063151cb5060d02dcd2ac3156b818625799f57f
Author: Miklos Vajna 
Date:   Mon Dec 10 10:46:58 2007 +0100

wxsvg-1.0b7_3-1-i686
removed hardwired mirror, it's on other mirrors, too already

diff --git a/source/xlib-extra/wxsvg/FrugalBuild b/source/xlib-extra/wxsvg/FrugalBuild
index 033c792..6984ff8 100644
--- a/source/xlib-extra/wxsvg/FrugalBuild
+++ b/source/xlib-extra/wxsvg/FrugalBuild
@@ -9,8 +9,7 @@ _F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://www.wxsvg.org/"
depends=('libart_lgpl' 'libstdc++' 'wxgtk>=2.8.1' 'libxxf86vm' 'expat' 'libxdamage' 'libice')
-## DO NOT CHANGE THAT YET! Exist ony on 2 mirrors by now
-source=(http://dfn.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver}.tar.gz)
+source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver}.tar.gz)
groups=('xlib-extra')
archs=('i686' 'x86_64')
sha1sums=('95ebb5b271dc286c9455c34aeac31dcda5d66763')
From vmiklos at frugalware.org  Mon Dec 10 10:53:14 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 10:53:15 2007
Subject: [Frugalware-git] frugalware-current: splashy-0.3.7-1-i686
Message-ID: <20071210095314.7665D1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e28479c1f3499797f3187f0e7cdd2c400819930

commit 0e28479c1f3499797f3187f0e7cdd2c400819930
Author: Miklos Vajna 
Date:   Mon Dec 10 10:53:07 2007 +0100

splashy-0.3.7-1-i686
version bump

diff --git a/source/base/splashy/FrugalBuild b/source/base/splashy/FrugalBuild
index 0cde4fa..fdd62da 100644
--- a/source/base/splashy/FrugalBuild
+++ b/source/base/splashy/FrugalBuild
@@ -2,10 +2,10 @@
# Maintainer: VMiklos 

pkgname=splashy
-pkgver=0.3.6
+pkgver=0.3.7
themever=0.7
# see http://alioth.debian.org/project/showfiles.php?group_id=30657
-rel_id=2169
+rel_id=2218
pkgrel=1
pkgdesc="A complete user-space boot splash system"
url="http://alioth.debian.org/projects/splashy/"
@@ -21,7 +21,7 @@ source=(http://alioth.debian.org/download.php/$rel_id/splashy-$pkgver.tar.gz \
splashy-0.3.0-frugalware.diff splashy-0.3.0-nof2.diff \
rc.{zz-,}splash rc.splash-{de,hu,it}.po \
http://ftp.frugalware.org/pub/other/artwork/splashy-theme/splashy-frugalware-$themever.tar.gz)
-sha1sums=('9ee77afd17cfcd67f8fa8ce86ce17fd6026709d2' \
+sha1sums=('c4ec7d24eacc30b6df8c2bbf514fdd4a0fb3e0d6' \
'319e6edb46519414d9d3e7b620592ab162a5bc00' \
'4979a54122223dc7d4324f52e120ff9005a8c17b' \
'006d65bb621d1108cbb994fb50712bad4d61b6d0' \
From iron at frugalware.org  Mon Dec 10 10:59:17 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 10:59:19 2007
Subject: [Frugalware-git] homepage-ng: fwng: Hungarian annoucement draft
Message-ID: <20071210095917.07E1B1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=b4a994cab8765abc020fb9d95a1c1a39acc7d7ca

commit b4a994cab8765abc020fb9d95a1c1a39acc7d7ca
Author: Krisztian VASAS 
Date:   Mon Dec 10 10:59:31 2007 +0100

fwng: Hungarian annoucement draft

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index 0ceb6ac..fa3c42c 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -12,6 +12,82 @@
]>


+     79
+     Megjelent a Frugalware 0.8pre1 (Kalgan)
+     Mon Dec 10 10:01:58 CET 2007
+     IroNiQ
+     1
+     jelenti be a Frugalware 0.8pre1 azonnali elérhetőségét, mint az eljövendő 0.8-as stabil kiadás első előzetes változatát.
    
+	Egy rĂśvid, nem teljes lista a 0.7 Ăłta tĂśrtĂŠnt vĂĄltozĂĄsokrĂłl:
    
+	
      
+		
    • CsomagfrissĂ­tĂŠsek:
+			
        
+				
      • Linux 2.6.23 + javĂ­tĂĄsok
        • 
+				
      • GNU C Library 2.7
        • 
+				
      • GCC 4.2.2
        • 
+				
      • Az espgs csomag le lett cserĂŠlve gyĂĄri ghostscriptre
        • 
+				
      • A compiz-fusion lecserĂŠlte a beryl csomagot, felhasznĂĄlĂłink tĂśbbsĂŠgĂŠnek nincs szĂźksĂŠge az XGL-re
        • 
+				
      • TĂśbb, mint 600 csomag frissĂźlĂŠs
        • 
+				
      • TĂśbb, mint 100 Ăşj csomag, kĂśztĂźk 20 Ăşj jĂĄtĂŠk is
        • 
+			
      
+		
      • 
+		
    • ÚjdonsĂĄgok:
+			
        
+				
      • FUN (Frugalware Update Notifier): beĂŠpĂźl a felhasznĂĄlĂł tĂĄlcĂĄjĂĄba ĂŠs ĂŠrtesĂ­tĂŠst kĂźld, ha valamilyen frissĂ­tĂŠs elĂŠrhető.
        • 
+				
      • WPA tĂĄmogatĂĄs a telepĂ­tőben.
        • 
+			
      
+		
      • 
+	
    
+	Bővebb információért tekintse meg a Frugalware Testing Változáslistát.
    
+	LetĂśltĂŠs i686-ra:
    
+	MEGJEGYZÉS: Kattintson ide, hogy eldönthesse, melyik telepítő médiára van szüksége.
    
+	livecd,
+	netinstall,
+	usb,
+	tftp,
+	cd1,
+	cd2,
+	cd3,
+	cd4,
+	cd5,
+	cd6,
+	cd7,
+	cd8,
+	cd9,
+	cd10,
+	cd11,
+	cd12,
+	cd13,
+	dvd1 and
+	dvd2
+	
    
+	SHA1SUMok:
+	
    +f6f4a62003c2f350aa11d270bc4b38b31f5cc96e  frugalware-0.8pre1-i686-cd1.iso
+54c33672abce250d97a38d8fd126933203a6b181  frugalware-0.8pre1-i686-cd2.iso
+a743bacd345804d78fc11aa37a7e613c9c448029  frugalware-0.8pre1-i686-cd3.iso
+446cdc74b5636ee17440b5f52662b3f3f1096512  frugalware-0.8pre1-i686-cd4.iso
+7b6ec80b5c423b1a7eedf0eaa4eb6ddf3bfa04b1  frugalware-0.8pre1-i686-cd5.iso
+125eb72cc1ee89eeb1b9c0de79128a4664d8b997  frugalware-0.8pre1-i686-cd6.iso
+4e82c7a6968b523898d0fbd1ce1089d6496823f4  frugalware-0.8pre1-i686-cd7.iso
+59e9e891a2227b521d84abf9efd87b1298eed235  frugalware-0.8pre1-i686-cd8.iso
+cc66aa7f5fe3dd2bdbe3f868228b9cf9e7551a70  frugalware-0.8pre1-i686-cd9.iso
+02e578aa85d125284556988cdb25360ff9111960  frugalware-0.8pre1-i686-cd10.iso
+28ccb3da4098608beb6a8f00af9ea5fd9ca8c1c2  frugalware-0.8pre1-i686-cd11.iso
+ed06c325ecfa07e52fdc063c7ff097134575e6e9  frugalware-0.8pre1-i686-cd12.iso
+f32a6279c7158f2cdc61edb911e4b77f410d0b03  frugalware-0.8pre1-i686-cd13.iso
+a1321a1f978bfedf8cf7fdd33c90e858bd881e10  frugalware-0.8pre1-i686-dvd1.iso
+8b4199630cda32bd91b3cea94c461e7f86c875c7  frugalware-0.8pre1-i686-dvd2.iso
+3667e2f2a710a87f266a465500393a0cb2c341dc  frugalware-0.8pre1-i686-net.iso
+64e0e9c40772e573824a950437490a5165edba15  fwlive-0.8pre1-i686-full.iso
+1c103ed0f0a5f86df03350efbddba696ee7203f4  frugalware-0.8pre1-i686-tftp.img.gz
+2fb3b8863079fb17ed6971226f5d996bd149e07d  frugalware-0.8pre1-i686-usb.tar.gz
+  
    
+  ]]>
+		    
+	    
+	
76
Megjelent a Frugalware 0.7 (Sayshell) i686-ra&nbsp;ĂŠs x86_64-re
Sat Oct 13 09:11:34 CEST 2007
From vmiklos at frugalware.org  Mon Dec 10 11:16:31 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 11:16:33 2007
Subject: [Frugalware-git] frugalware-current: docbook-utils-0.6.14-1-i686
Message-ID: <20071210101631.33F1C1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad2971c56977b9ff402656f60e01d6a20c76d96b

commit ad2971c56977b9ff402656f60e01d6a20c76d96b
Author: Miklos Vajna 
Date:   Mon Dec 10 11:16:23 2007 +0100

docbook-utils-0.6.14-1-i686
new package (makedepend for module-init-tools)

diff --git a/source/apps-extra/docbook-utils/FrugalBuild b/source/apps-extra/docbook-utils/FrugalBuild
new file mode 100644
index 0000000..c72a229
--- /dev/null
+++ b/source/apps-extra/docbook-utils/FrugalBuild
@@ -0,0 +1,21 @@
+# Compiling Time: 0 SBU
+# Maintainer: VMiklos 
+
+pkgname=docbook-utils
+pkgver=0.6.14
+pkgrel=1
+pkgdesc="A collection of scripts used to convert and analyze SGML and DocBook files."
+url="http://sources.redhat.com/docbook-tools/"
+depends=('perl' 'openjade')
+groups=('apps-extra')
+archs=('i686')
+up2date="lynx -dump ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/|grep $pkgname-|Flasttar"
+source=(ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-$pkgver.tar.gz)
+sha1sums=('aae596844930e0e4bb7f8824024be0982cc4fa85')
+options=('scriptlet')
+
+build()
+{
+	Fsed 'HTML' '' doc/Makefile.*
+	Fbuild
+}
From iron at frugalware.org  Mon Dec 10 11:17:56 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 11:17:58 2007
Subject: [Frugalware-git] homepage-ng: fwng: Hungarian announcement published
Message-ID: <20071210101756.B70351190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=fc8da67dc97f63dbf058460045cd954198dbf2e1

commit fc8da67dc97f63dbf058460045cd954198dbf2e1
Author: Krisztian VASAS 
Date:   Mon Dec 10 11:18:10 2007 +0100

fwng: Hungarian announcement published

diff --git a/frugalware/xml/news_hu.xml b/frugalware/xml/news_hu.xml
index fa3c42c..f8299bb 100644
--- a/frugalware/xml/news_hu.xml
+++ b/frugalware/xml/news_hu.xml
@@ -16,7 +16,7 @@
Megjelent a Frugalware 0.8pre1 (Kalgan)
Mon Dec 10 10:01:58 CET 2007
IroNiQ
-     1
+     0
jelenti be a Frugalware 0.8pre1 azonnali elérhetőségét, mint az eljövendő 0.8-as stabil kiadás első előzetes változatát.
    
Egy rĂśvid, nem teljes lista a 0.7 Ăłta tĂśrtĂŠnt vĂĄltozĂĄsokrĂłl:
    
From vmiklos at frugalware.org  Mon Dec 10 11:56:48 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 11:56:51 2007
Subject: [Frugalware-git] 
	frugalware-current: docbook-sgml-dtd-4.1-4.1-1-i686
Message-ID: <20071210105648.C3B771190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=92985173c138f62fdb22db679a047a71de2597f2

commit 92985173c138f62fdb22db679a047a71de2597f2
Author: Miklos Vajna 
Date:   Mon Dec 10 11:56:40 2007 +0100

docbook-sgml-dtd-4.1-4.1-1-i686
new package (makedepend for module-init-tools)

diff --git a/source/apps-extra/docbook-sgml-dtd-4.1/FrugalBuild b/source/apps-extra/docbook-sgml-dtd-4.1/FrugalBuild
new file mode 100644
index 0000000..230e5b5
--- /dev/null
+++ b/source/apps-extra/docbook-sgml-dtd-4.1/FrugalBuild
@@ -0,0 +1,23 @@
+# Compiling Time: 0 SBU
+# Maintainer: VMiklos 
+
+pkgname=docbook-sgml-dtd-4.1
+pkgver=4.1
+pkgrel=1
+pkgdesc="Docbook SGML DTD 4.1"
+url="http://www.docbook.org/sgml/"
+rodepends=('sgml-common')
+groups=('apps-extra')
+archs=('i686' 'x86_64')
+# this package has been initially added for module-init-tools and it won't work with
+# newer versions
+up2date="$pkgver"
+source=(http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip)
+sha1sums=('3009fcc364511d186da40e828bf0d5d1556c020e')
+
+build()
+{
+	Fmkdir /usr/share/sgml/docbook/sgml-dtd-$pkgver
+	mv *.cat catalog
+	cp *.dcl *.dtd *.mod catalog $Fdestdir/usr/share/sgml/docbook/sgml-dtd-$pkgver
+}
From vmiklos at frugalware.org  Mon Dec 10 12:16:08 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 12:16:11 2007
Subject: [Frugalware-git] frugalware-current: module-init-tools-3.4-1-i686
Message-ID: <20071210111608.8E3421190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=725e03072dd8c4787980a61f0fe7955ae49dd327

commit 725e03072dd8c4787980a61f0fe7955ae49dd327
Author: Miklos Vajna 
Date:   Mon Dec 10 12:16:00 2007 +0100

module-init-tools-3.4-1-i686
version bump
added docbook* to makedepends for manpage generation

diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild
index 4b9133f..4a78f4f 100644
--- a/source/base/module-init-tools/FrugalBuild
+++ b/source/base/module-init-tools/FrugalBuild
@@ -3,23 +3,24 @@
# Modified by Adam Zlehovszky 

pkgname=module-init-tools
-pkgver=3.2.2
-pkgrel=10
+pkgver=3.4
+pkgrel=1
pkgdesc="Utilities for inserting and removing modules from the Linux kernel"
url="http://kerneltools.org/KernelTools.org"
depends=('glibc')
-makedepends=('zlib')
+makedepends=('zlib' 'docbook-utils' 'docbook-sgml-dtd-4.1' 'perl-sgmlspm')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
backup=('etc/rc.d/rc.modules' 'etc/sysconfig/modules')
up2date="lynx -dump http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/|Flasttarbz2"
source=(http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/$pkgname-$pkgver.tar.bz2 rc.modules modules)
-sha1sums=('b51e8ac170be23a1f2e301a1dddd47a47ec2186a' \
+sha1sums=('fcdf758d171211b72210d48b7303ccb5651a1850' \
'4eea32f43b0adafc380ee88d70dc8f03a0b4b062' \
'4c840e22304f1b152be871b7b4eb99c0cecf482f')

build()
{
+	Fsed '2>&1' '' Makefile*
Fbuild --exec-prefix=/ --enable-zlib
Fmv /bin/lsmod /sbin/
Ffile /etc/sysconfig/modules
From vmiklos at frugalware.org  Mon Dec 10 12:34:34 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 12:34:36 2007
Subject: [Frugalware-git] frugalware-current: xalan-j-2.7.1-1-i686
Message-ID: <20071210113434.92B3E1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cc80893ff422395944bcb3124180375671d82ce4

commit cc80893ff422395944bcb3124180375671d82ce4
Author: Miklos Vajna 
Date:   Mon Dec 10 12:34:28 2007 +0100

xalan-j-2.7.1-1-i686
version bump
added -O0 hack: 26.86 -> 0.87 SBU :)

diff --git a/source/devel-extra/xalan-j/FrugalBuild b/source/devel-extra/xalan-j/FrugalBuild
index a76d5f2..f835a70 100644
--- a/source/devel-extra/xalan-j/FrugalBuild
+++ b/source/devel-extra/xalan-j/FrugalBuild
@@ -1,21 +1,24 @@
-# Compiling Time: 26.86 SBU
+# Compiling Time: 0.87 SBU
# Maintainer: VMiklos 

pkgname=xalan-j
-pkgver=2.7.0
-pkgrel=2
+pkgver=2.7.1
+pkgrel=1
pkgdesc="Java XSLT processor for transforming XML documents"
url="http://xml.apache.org/xalan-j"
groups=('devel-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://xml.apache.org/xalan-j/ |sed -n '/Xalan-Java Version/s/.*Version \(.*\) works.*/\1/p'"
source=(http://www.apache.org/dist/xml/xalan-j/xalan-j_${pkgver//./_}-src.tar.gz)
-signatures=($source.sig)
+signatures=($source.asc)
Finclude java
depends=(${depends[@]} 'xerces-j' 'javacup' 'bcel' 'xml-commons-external')

build()
{
+	## HACK! don't remove or it eats your box got killed here while
+	## eating 3G mem ...
+	export CFLAGS="$(echo $CFLAGS|sed 's/-O2/-O0/')"
Fcd xalan-j_${pkgver//./_}
Fjavacleanup
ln -s /usr/share/java/xml-apis.jar lib/
From vmiklos at frugalware.org  Mon Dec 10 12:36:33 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 12:36:34 2007
Subject: [Frugalware-git] frugalware-current: module-init-tools-3.4-1-i686
Message-ID: <20071210113633.1C0D01190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e0caf77597daecffdfeba3dfc8b431fafcdeeee

commit 1e0caf77597daecffdfeba3dfc8b431fafcdeeee
Author: Miklos Vajna 
Date:   Mon Dec 10 12:36:28 2007 +0100

module-init-tools-3.4-1-i686
forgot to add scriptlet to options()

diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild
index 4a78f4f..70c153b 100644
--- a/source/base/module-init-tools/FrugalBuild
+++ b/source/base/module-init-tools/FrugalBuild
@@ -17,6 +17,7 @@ source=(http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/$pkg
sha1sums=('fcdf758d171211b72210d48b7303ccb5651a1850' \
'4eea32f43b0adafc380ee88d70dc8f03a0b4b062' \
'4c840e22304f1b152be871b7b4eb99c0cecf482f')
+options=('scriptlet')

build()
{
From vmiklos at frugalware.org  Mon Dec 10 12:54:57 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 12:54:59 2007
Subject: [Frugalware-git] frugalware-current: flowplayer-1.21-1-i686
Message-ID: <20071210115457.041901190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d9bfaef52bfc780d6306c72a87d0b3af9077272

commit 8d9bfaef52bfc780d6306c72a87d0b3af9077272
Author: Miklos Vajna 
Date:   Mon Dec 10 12:54:51 2007 +0100

flowplayer-1.21-1-i686
new package

diff --git a/source/network-extra/flowplayer/FrugalBuild b/source/network-extra/flowplayer/FrugalBuild
new file mode 100644
index 0000000..0b2f146
--- /dev/null
+++ b/source/network-extra/flowplayer/FrugalBuild
@@ -0,0 +1,24 @@
+# Compiling Time: 0 SBU
+# Maintainer: VMiklos 
+
+pkgname=flowplayer
+pkgver=1.21
+pkgrel=1
+pkgdesc="A video player for Flash Video in FLV format."
+_F_sourceforge_ext=".zip"
+Finclude sourceforge
+# one may want to install this to a server, so don't add flash here
+depends=()
+groups=('network-extra')
+archs=('i686')
+source=($source README.Frugalware)
+sha1sums=('8142ea94a73da11e1b608bab6d0aedef72b0c08a' \
+          '86374caf83972a7e93b1ce86ac29e94096a518ed')
+
+build()
+{
+	Fcd flowplayer
+	Fmkdir /usr/share/$pkgname
+	cp * $Fdestdir/usr/share/$pkgname
+	Fdoc README.Frugalware
+}
diff --git a/source/network-extra/flowplayer/README.Frugalware b/source/network-extra/flowplayer/README.Frugalware
new file mode 100644
index 0000000..63c4ff1
--- /dev/null
+++ b/source/network-extra/flowplayer/README.Frugalware
@@ -0,0 +1,12 @@
+Once you have the `.flv` file you want to share, you need `FlowPlayer.swf` from
+`/usr/share/flowplayer` and the following code sniplet:
+
+----
+
+	
+	
+
+----
+
+// vim: ft=asciidoc
From vmiklos at frugalware.org  Mon Dec 10 13:26:41 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 13:26:43 2007
Subject: [Frugalware-git] frugalware-current: docbook-utils-0.6.14-1-x86_64
Message-ID: <20071210122641.03DBF1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a731f47e392f2a6b9e325256608c37ec9363d799

commit a731f47e392f2a6b9e325256608c37ec9363d799
Author: Miklos Vajna 
Date:   Mon Dec 10 13:26:36 2007 +0100

docbook-utils-0.6.14-1-x86_64
added x86_64 to archs()

diff --git a/source/apps-extra/docbook-utils/FrugalBuild b/source/apps-extra/docbook-utils/FrugalBuild
index c72a229..0f2a2a3 100644
--- a/source/apps-extra/docbook-utils/FrugalBuild
+++ b/source/apps-extra/docbook-utils/FrugalBuild
@@ -8,7 +8,7 @@ pkgdesc="A collection of scripts used to convert and analyze SGML and DocBook fi
url="http://sources.redhat.com/docbook-tools/"
depends=('perl' 'openjade')
groups=('apps-extra')
-archs=('i686')
+archs=('i686' 'x86_64')
up2date="lynx -dump ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/|grep $pkgname-|Flasttar"
source=(ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-$pkgver.tar.gz)
sha1sums=('aae596844930e0e4bb7f8824024be0982cc4fa85')
From vmiklos at frugalware.org  Mon Dec 10 13:37:22 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 13:37:25 2007
Subject: [Frugalware-git] 
	frugalware-current: amsn-plugin-fpsstats-0.9-1-i686
Message-ID: <20071210123722.D68D91190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0bc210aca8517ad697e991e4f80c8ab7c4c9691f

commit 0bc210aca8517ad697e991e4f80c8ab7c4c9691f
Author: Miklos Vajna 
Date:   Mon Dec 10 13:37:02 2007 +0100

amsn-plugin-fpsstats-0.9-1-i686
typo in dir name (fpstats->fpsstats)

diff --git a/source/xapps-extra/amsn-plugin-fpsstats/FrugalBuild b/source/xapps-extra/amsn-plugin-fpsstats/FrugalBuild
new file mode 100644
index 0000000..f308de2
--- /dev/null
+++ b/source/xapps-extra/amsn-plugin-fpsstats/FrugalBuild
@@ -0,0 +1,15 @@
+# Compiling Time: 0.1 SBU
+# Maintainer: Devil505 
+
+pkgname=amsn-plugin-fpsstats
+_F_amsn_name="FPSstats"
+pkgver=0.9
+pkgrel=1
+pkgdesc="Show your current statistics in a game you're playing in your personal message and in an auto-message."
+_F_sourceforge_ext=".zip"
+_F_sourceforge_dirname="amsn"
+_F_sourceforge_name="$_F_amsn_name"
+_F_sourceforge_broken_up2date=1
+Finclude sourceforge amsn
+archs=('i686')
+sha1sums=('d7c05af9178f264a51a8c224707d393521e6299a')
diff --git a/source/xapps-extra/amsn-plugin-fpstats/FrugalBuild b/source/xapps-extra/amsn-plugin-fpstats/FrugalBuild
deleted file mode 100644
index f308de2..0000000
--- a/source/xapps-extra/amsn-plugin-fpstats/FrugalBuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Compiling Time: 0.1 SBU
-# Maintainer: Devil505 
-
-pkgname=amsn-plugin-fpsstats
-_F_amsn_name="FPSstats"
-pkgver=0.9
-pkgrel=1
-pkgdesc="Show your current statistics in a game you're playing in your personal message and in an auto-message."
-_F_sourceforge_ext=".zip"
-_F_sourceforge_dirname="amsn"
-_F_sourceforge_name="$_F_amsn_name"
-_F_sourceforge_broken_up2date=1
-Finclude sourceforge amsn
-archs=('i686')
-sha1sums=('d7c05af9178f264a51a8c224707d393521e6299a')
From vmiklos at frugalware.org  Mon Dec 10 13:46:26 2007
From: vmiklos at frugalware.org (Miklos Vajna)
Date: Mon Dec 10 13:46:27 2007
Subject: [Frugalware-git] frugalware-current: gnome-schedule-1.2.1-1-i686
Message-ID: <20071210124626.197CA1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf0eb41893dbf23ab207f1978b35a70003c91eef

commit cf0eb41893dbf23ab207f1978b35a70003c91eef
Author: Miklos Vajna 
Date:   Mon Dec 10 13:46:20 2007 +0100

gnome-schedule-1.2.1-1-i686
version bump
ok krix@

diff --git a/source/gnome-extra/gnome-schedule/FrugalBuild b/source/gnome-extra/gnome-schedule/FrugalBuild
index 7479cc8..444325f 100644
--- a/source/gnome-extra/gnome-schedule/FrugalBuild
+++ b/source/gnome-extra/gnome-schedule/FrugalBuild
@@ -1,10 +1,9 @@
# Compiling Time: 0.2 SBU
# Maintainer: Christian Hamar alias krix 
-# Contributor: AlexExtreme 
# Contributor: BMH1980 

pkgname=gnome-schedule
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
pkgdesc="Gnome-schedule is a GNOME GUI for configuring a users crontab."
groups=('gnome-extra')
@@ -15,7 +14,7 @@ up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=11218
depends=('pygtk' 'at' 'gnome-python')
makedepends=('libxslt' 'perl-xml' 'intltool' 'gnome-doc-utils')
rodepends=('dcron')
-sha1sums=('2e1ca70fad39dccf0c487246839f65533f72d48a')
+sha1sums=('78891cf36aa9e1b58fe7f4cc33b62ede14bef542')

build() {
Fcd
From iron at frugalware.org  Mon Dec 10 14:48:20 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 14:48:22 2007
Subject: [Frugalware-git] frugalware-current: xfce4-4.4.2-noarch
Message-ID: <20071210134820.6DF641190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5502888870455bb2dbed0cadbbfc639d32700462

commit 5502888870455bb2dbed0cadbbfc639d32700462
Author: Krisztian VASAS 
Date:   Mon Dec 10 14:48:12 2007 +0100

xfce4-4.4.2-noarch
- changed dlurl: started building 4.4.2

diff --git a/source/include/xfce4.sh b/source/include/xfce4.sh
index 78505e0..db48f03 100644
--- a/source/include/xfce4.sh
+++ b/source/include/xfce4.sh
@@ -58,7 +58,7 @@ if echo ${groups[*]} | grep -q goodies ; then
else
url="http://www.xfce.org/"
preup2date="lynx -dump http://www.xfce.org/archive/ | grep xfce- | tail -n1 | sed 's/.*-\(.*\)\/.*/\1/'"
-	dlurl="$url/archive/xfce-4.4.1/src"
+	dlurl="$url/archive/xfce-4.4.2/src"
up2date="lynx -dump $url/archive/xfce-\$($preup2date)/src/ | grep $_F_xfce_name | Flasttarbz2"
source=($dlurl/$_F_xfce_name-$pkgver.tar.bz2)
fi
From iron at frugalware.org  Mon Dec 10 14:50:12 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 14:50:13 2007
Subject: [Frugalware-git] frugalware-current: xfce4-dev-tools-4.4.0.1-1-i686
Message-ID: <20071210135012.6ECCA1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=265fe626a12680f976ce49b19c74f1f26ece9e61

commit 265fe626a12680f976ce49b19c74f1f26ece9e61
Author: Krisztian VASAS 
Date:   Mon Dec 10 14:49:08 2007 +0100

xfce4-dev-tools-4.4.0.1-1-i686
- version bump

diff --git a/source/xfce4/xfce4-dev-tools/FrugalBuild b/source/xfce4/xfce4-dev-tools/FrugalBuild
index 0cb31d7..761ba31 100644
--- a/source/xfce4/xfce4-dev-tools/FrugalBuild
+++ b/source/xfce4/xfce4-dev-tools/FrugalBuild
@@ -2,13 +2,13 @@
# Maintainer: Priyank Gosalia 

pkgname=xfce4-dev-tools
-pkgver=4.4.0
+pkgver=4.4.0.1
pkgrel=1
pkgdesc="Xfce4 developer tools."
depends=('intltool')
groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
Finclude xfce4
-sha1sums=('20b620ab7e732aa95e8072474251de2d899b3419')
+sha1sums=('4577d204087f7fe58228fc2f4140001d9b97b493')

# optimization OK
From iron at frugalware.org  Mon Dec 10 14:55:02 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 14:55:04 2007
Subject: [Frugalware-git] frugalware-current: libxfce4util-4.4.2-1-i686
Message-ID: <20071210135502.0B9A31190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=44232740e972aa96f0f6dae1d5735e4f081ec3a9

commit 44232740e972aa96f0f6dae1d5735e4f081ec3a9
Author: Krisztian VASAS 
Date:   Mon Dec 10 14:54:44 2007 +0100

libxfce4util-4.4.2-1-i686
- version bump

diff --git a/source/xfce4/libxfce4util/FrugalBuild b/source/xfce4/libxfce4util/FrugalBuild
index 3927a80..df2088e 100644
--- a/source/xfce4/libxfce4util/FrugalBuild
+++ b/source/xfce4/libxfce4util/FrugalBuild
@@ -2,13 +2,13 @@
# Maintainer: Priyank Gosalia 

pkgname=libxfce4util
-pkgver=4.4.1
+pkgver=4.4.2
pkgrel=1
pkgdesc="Basic utility non-GUI functions for Xfce4."
depends=('glib2')
groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
Finclude xfce4
-sha1sums=('20b0d8b952e780569b0d32bcf26f377867c659c8')
+sha1sums=('b0399b476bd901a84424a2b77d4aa89d7fcfac7d')

# optimization OK
From iron at frugalware.org  Mon Dec 10 15:00:10 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 15:00:13 2007
Subject: [Frugalware-git] frugalware-current: libxfce4mcs-4.4.2-1-i686
Message-ID: <20071210140010.491821190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f1b21284f1a22efbc68fccef671ceb22602f9d04

commit f1b21284f1a22efbc68fccef671ceb22602f9d04
Author: Krisztian VASAS 
Date:   Mon Dec 10 14:59:54 2007 +0100

libxfce4mcs-4.4.2-1-i686
- version bump

diff --git a/source/xfce4/libxfce4mcs/FrugalBuild b/source/xfce4/libxfce4mcs/FrugalBuild
index edde5af..053eba9 100644
--- a/source/xfce4/libxfce4mcs/FrugalBuild
+++ b/source/xfce4/libxfce4mcs/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia 

pkgname=libxfce4mcs
-pkgver=4.4.1
+pkgver=4.4.2
pkgrel=1
pkgdesc="Multi-channel settings management support for Xfce4."
depends=('libx11' 'libsm' 'libxt' 'startup-notification' 'libxfce4util>=4.4.1')
@@ -11,4 +11,4 @@ archs=('i686' 'x86_64')
Finclude xfce4

# optimization OK
-sha1sums=('9a39e5227f6f574635bd5a06f023cadd4256e57c')
+sha1sums=('f71c618070a57b1180a25dc008d83b623a862f42')
From iron at frugalware.org  Mon Dec 10 15:09:06 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 15:09:08 2007
Subject: [Frugalware-git] frugalware-current: libxfcegui4-4.4.2-1-i686
Message-ID: <20071210140906.A07BD1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d2e800464dc45fb07e11655592852bcf260a01f0

commit d2e800464dc45fb07e11655592852bcf260a01f0
Author: Krisztian VASAS 
Date:   Mon Dec 10 15:08:53 2007 +0100

libxfcegui4-4.4.2-1-i686
- version bump

diff --git a/source/xfce4/libxfcegui4/FrugalBuild b/source/xfce4/libxfcegui4/FrugalBuild
index b911e2c..57023f9 100644
--- a/source/xfce4/libxfcegui4/FrugalBuild
+++ b/source/xfce4/libxfcegui4/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia 

pkgname=libxfcegui4
-pkgver=4.4.1
+pkgver=4.4.2
pkgrel=1
pkgdesc="Various gtk widgets for Xfce4."
depends=('gtk+2' 'libxfce4util>=4.4.1' 'hicolor-icon-theme' 'startup-notification' 'librsvg')
@@ -12,6 +12,6 @@ archs=('i686' 'x86_64')
Finclude xfce4
options=('scriptlet')
Fconfopts="$Fconfopts --enable-xinerama --enable-gtk-doc"
-sha1sums=('d0a5d59e36fb29756fb3e9a1e1f646a0980104a2')
+sha1sums=('554a30c02c92b76c8caad444040e18d8ec1737bc')

# optimization OK
From iron at frugalware.org  Mon Dec 10 15:16:46 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 15:16:48 2007
Subject: [Frugalware-git] frugalware-current: xfce-mcs-manager-4.4.2-1-i686
Message-ID: <20071210141646.8BE9F1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e08c73afe16feb42d1b267a67623165b1aa287c9

commit e08c73afe16feb42d1b267a67623165b1aa287c9
Author: Krisztian VASAS 
Date:   Mon Dec 10 15:16:33 2007 +0100

xfce-mcs-manager-4.4.2-1-i686
- version bump

diff --git a/source/xfce4/xfce-mcs-manager/FrugalBuild b/source/xfce4/xfce-mcs-manager/FrugalBuild
index b014d8f..0555c06 100644
--- a/source/xfce4/xfce-mcs-manager/FrugalBuild
+++ b/source/xfce4/xfce-mcs-manager/FrugalBuild
@@ -2,15 +2,15 @@
# Maintainer: Priyank Gosalia 

pkgname=xfce-mcs-manager
-pkgver=4.4.1
+pkgver=4.4.2
pkgrel=1
pkgdesc="A multi channel settings manager for Xfce4."
url="http://www.xfce.org/"
-depends=('pango' 'atk' 'libxfcegui4>=4.4.1' 'libxfce4mcs>=4.4.1')
+depends=('pango' 'atk' 'libxfcegui4>=4.4.2' 'libxfce4mcs>=4.4.2')
groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
_F_gnome_iconcache=y
Finclude gnome-scriptlet xfce4
-sha1sums=('c03e83ebe5a315aa2a1333624cd2f04dafba6a15')
+sha1sums=('0fccebcd65bd547b29a2e497793d5d9055760ef1')

# optimization OK
From iron at frugalware.org  Mon Dec 10 15:20:35 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 15:20:37 2007
Subject: [Frugalware-git] frugalware-current: gtk-xfce-engine-2.4.2-1-i686
Message-ID: <20071210142035.22F871190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ee3c5d84175420d46aa26ab0285f884a672cba15

commit ee3c5d84175420d46aa26ab0285f884a672cba15
Author: Krisztian VASAS 
Date:   Mon Dec 10 15:20:22 2007 +0100

gtk-xfce-engine-2.4.2-1-i686
- version bump

diff --git a/source/xfce4/gtk-xfce-engine/FrugalBuild b/source/xfce4/gtk-xfce-engine/FrugalBuild
index 9128dbb..60874a5 100644
--- a/source/xfce4/gtk-xfce-engine/FrugalBuild
+++ b/source/xfce4/gtk-xfce-engine/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia 

pkgname=gtk-xfce-engine
-pkgver=2.4.1
+pkgver=2.4.2
pkgrel=1
pkgdesc="A port of Xfce4 engine to GTK+2.0."
depends=('gtk+2')
@@ -11,4 +11,4 @@ archs=('i686' 'x86_64')
Finclude xfce4

# optimization OK
-sha1sums=('a28a59c704ba66aa30be2c8ed03ba1bf0eaf1ad9')
+sha1sums=('67fb4959ec0be46ec0ac472ab1af74361b7d9be5')
From iron at frugalware.org  Mon Dec 10 15:34:58 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 15:35:01 2007
Subject: [Frugalware-git] frugalware-current: xfce-mcs-plugins-4.4.2-1-i686
Message-ID: <20071210143458.5450F1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4bf84a7f87b7368813d7018e4c51e803c10f00f0

commit 4bf84a7f87b7368813d7018e4c51e803c10f00f0
Author: Krisztian VASAS 
Date:   Mon Dec 10 15:34:46 2007 +0100

xfce-mcs-plugins-4.4.2-1-i686
- version bump

diff --git a/source/xfce4/xfce-mcs-plugins/FrugalBuild b/source/xfce4/xfce-mcs-plugins/FrugalBuild
index f10b6fb..e88f0fd 100644
--- a/source/xfce4/xfce-mcs-plugins/FrugalBuild
+++ b/source/xfce4/xfce-mcs-plugins/FrugalBuild
@@ -2,16 +2,16 @@
# Maintainer: Priyank Gosalia 

pkgname=xfce-mcs-plugins
-pkgver=4.4.1
-pkgrel=2
+pkgver=4.4.2
+pkgrel=1
pkgdesc="A set of plugins for the Xfce multi channel settings manager."
-depends=('libxfce4mcs>=4.4.1' 'libxfcegui4>=4.4.1' \
-		'xfce-frugalware>=0.4' 'xfce-mcs-manager>=4.4.1')
+depends=('libxfce4mcs>=4.4.2' 'libxfcegui4>=4.4.2' \
+		'xfce-frugalware>=0.4' 'xfce-mcs-manager>=4.4.2')
groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
Finclude xfce4
source=(${source[@]} xfce_frugalware.patch)
-sha1sums=('50b5e82e67ab76e24ed232e6302a1430a902cd08'\
+sha1sums=('c44cb09e081366a0fbe88dcaa85b4fdd4307d0da'\
'3a2e82b02813d428a3be08a59aed10560e6d4793')

# optimization OK
From crazy at frugalware.org  Mon Dec 10 15:48:53 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 15:48:55 2007
Subject: [Frugalware-git] frugalware-current: tuxtyping-1.5.15-1-i686
Message-ID: <20071210144853.33EA51190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=967bfb8c34befa9d9dd239ef36681120278da472

commit 967bfb8c34befa9d9dd239ef36681120278da472
Author: crazy 
Date:   Mon Dec 10 15:46:03 2007 +0100

tuxtyping-1.5.15-1-i686
* Version bump
* fixed depends() , source , up2date
* fixed docs , icon , desktop file bugs

diff --git a/source/games-extra/tuxtyping/FrugalBuild b/source/games-extra/tuxtyping/FrugalBuild
index 5af8461..7434314 100644
--- a/source/games-extra/tuxtyping/FrugalBuild
+++ b/source/games-extra/tuxtyping/FrugalBuild
@@ -2,37 +2,42 @@
# Maintainer: Priyank Gosalia 

pkgname=tuxtyping
-pkgver=1.5.3
+pkgver=1.5.15
pkgrel=1
pkgdesc="TuxTyping is an educational typing tutorial game for children."
_F_desktop_name="Tux Typing"
-_F_desktop_icon="tuxtype2.png"
-_F_desktop_categories="Game;"
+_F_desktop_icon="/usr/share/pixmaps/tuxtype.png"
+_F_desktop_categories="Game;KidsGame;"
_F_sourceforge_name="tuxtype"
-_F_sourceforge_ext=".tar.bz2"
+_F_sourceforge_dirname="tuxtype"
+_F_sourceforge_broken_up2date=1
Finclude sourceforge
+options=('scriptlet')
url="http://tuxtype.sourceforge.net/"
license="GPL"
-depends=('sdl' 'sdlimage' 'sdl_mixer' 'sdl_ttf')
+depends=('sdl_pango' 'sdlimage' 'sdl_ttf' 'sdl_mixer' 'zlib' 'fontconfig')
groups=('games-extra')
archs=('i686' 'x86_64')
-source=(${source/tuxtype-/tuxtype2-} magyar.tar.bz2)
-_F_cd_path="tuxtype2-$pkgver"
-sha1sums=('f1b6e48ebb6622d089685cf5e99e8de3c3200e17'\
+source=(${source} magyar.tar.bz2)
+_F_cd_path="tuxtype-$pkgver"
+sha1sums=('6f59cc54f6957ae74bfa61117e3df440da6b207f' \
'441511a3a07c90a6c3493d0959b6d0a2f79b97ac')

build()
{
Fbuild
-	Fmv /usr/bin/tuxtype2 /usr/bin/tuxtyping
+	Fmv /usr/bin/tuxtype /usr/bin/tuxtyping

# Install hungarian localization
-	Fcpr magyar /usr/share/tuxtype2/data/themes/
+	Fcpr magyar /usr/share/tuxtype/data/themes/

# Icon
-	Fmkdir /usr/share/pixmaps
-	Fcp /usr/share/tuxtype2/tuxtype2.ico /usr/share/pixmaps/tuxtype2.png
+	Fmkdir usr/share/{pixmaps,doc}
+	cp -ra $Fdestdir/usr/share/tuxtype/data/images/status/tux_helmet1.png \
+		$Fdestdir/usr/share/pixmaps/tuxtype.png || Fdie
Fdesktop2
+	Fmv usr/doc/tuxtype usr/share/doc/$pkgname-$pkgver
+	Frm usr/doc
}

# optimization OK
From iron at frugalware.org  Mon Dec 10 16:46:22 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 16:46:24 2007
Subject: [Frugalware-git] frugalware-current: xfce4-session-4.4.2-1-i686
Message-ID: <20071210154622.A96421190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf55fca79c6354170e8dfce36bd1a2ff911517d9

commit bf55fca79c6354170e8dfce36bd1a2ff911517d9
Author: Krisztian VASAS 
Date:   Mon Dec 10 16:46:08 2007 +0100

xfce4-session-4.4.2-1-i686
- version bump
- corrected frugalware splash patch

diff --git a/source/xfce4/xfce4-session/FrugalBuild b/source/xfce4/xfce4-session/FrugalBuild
index c68a958..98c44e6 100644
--- a/source/xfce4/xfce4-session/FrugalBuild
+++ b/source/xfce4/xfce4-session/FrugalBuild
@@ -2,14 +2,14 @@
# Maintainer: Priyank Gosalia 

pkgname=xfce4-session
-pkgver=4.4.1
-pkgrel=4
+pkgver=4.4.2
+pkgrel=1
pkgdesc="A session manager for Xfce4."
url="http://www.xfce.org/"
-depends=('libsm' 'libxfcegui4>=4.4.1' 'libxfce4mcs>=4.4.1' \
+depends=('libsm' 'libxfcegui4>=4.4.2' 'libxfce4mcs>=4.4.2' \
'iceauth' 'hal>=0.5.8.1-5' 'xorg-server')
rodepends=('xsm' 'sessreg' 'xmessage' 'fortune-mod')
-makedepends=('xfce4-dev-tools>=4.4.0' 'xfce-mcs-manager>=4.4.1' 'intltool')
+makedepends=('xfce4-dev-tools>=4.4.0.1' 'xfce-mcs-manager>=4.4.2' 'intltool')
conflicts=('xfce4-toys')
replaces=('xfce4-toys')
groups=('xfce4' 'xfce4-core')
@@ -21,8 +21,8 @@ source=(${source[@]} \
http://frugalware.org/~priyank/$pkgname/xfce4-session_frugalware-splash.patch.gz \
xfce4-session-suspend_hibernate.patch xfce4-session_icons.patch xfce4-session xfce4.desktop)
Fconfopts="$Fconfopts --with-shutdown-style=hal --with-x"
-sha1sums=('05a47d55830a9f9b91498a6a3fd1bf3eb197d42a' \
-          '4454c513ffed8fbb0647887d380cb78720d0aaa7' \
+sha1sums=('576d0515257354d1d9da646fcf29d0dc9b5065db' \
+          '8a6b3f13ab6d2ee7ce244093ddbcb6e99a41fecb' \
'ecaf290e94eea48812c189108532b81f28b15879' \
'84e0eb59643910a81a501af844ae510f12848093' \
'd99d32e3dfb82ace51fd0ca6699b57078ad350fd' \
From crazy at frugalware.org  Mon Dec 10 16:53:35 2007
From: crazy at frugalware.org (crazy)
Date: Mon Dec 10 16:53:39 2007
Subject: [Frugalware-git] frugalware-current: tuxpaint-0.9.18-1-i686
Message-ID: <20071210155335.6F9AC1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d1b95b7d06ca9be737c2305681d261f82397e10c

commit d1b95b7d06ca9be737c2305681d261f82397e10c
Author: crazy 
Date:   Mon Dec 10 16:50:17 2007 +0100

tuxpaint-0.9.18-1-i686
* Version bump
* fixed depends()
* updated patch
* added missing backup and scriptlet option

diff --git a/source/games-extra/tuxpaint/FrugalBuild b/source/games-extra/tuxpaint/FrugalBuild
index 926ded3..b631c90 100644
--- a/source/games-extra/tuxpaint/FrugalBuild
+++ b/source/games-extra/tuxpaint/FrugalBuild
@@ -2,31 +2,31 @@
# Maintainer: Priyank Gosalia 

pkgname=tuxpaint
-pkgver=0.9.16
+pkgver=0.9.18
pkgrel=1
pkgdesc="A drawing program for young children."
_F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://tuxpaint.org/"
-depends=('sdl' 'sdlimage' 'sdl_ttf' 'sdl_mixer' 'libpng' 'freetype2' 'netpbm')
+depends=('sdlimage' 'sdl_ttf' 'sdl_mixer' 'sdl_pango' 'librsvg' 'libpaper' 'libxcb')
+backup=('etc/tuxpaint/tuxpaint.conf')
+options=('scriptlet')
groups=('games-extra')
archs=('i686' 'x86_64')
_F_gnome_iconcache="y"
Finclude gnome-scriptlet
source=(${source[@]} $pkgname-fix.patch)
-sha1sums=('7c09582abe69d0fc6f0e1077c839b8931899fbe7' \
-	  '41bd3adc853fa53f48f8fe7a3d5b97f99ff52a92')
+sha1sums=('34c59dc7789e4bd85ba5b34f3e173227b5879e5b' \
+          '14f373b5b5e590b186b4f8e58d2e4db1145ef773')

build()
{
Fcd
Fpatchall
make ENABLE_GETTEXT=1 || Fdie
-	make PKG_ROOT="$Fdestdir" ENABLE_GETTEXT=1 install
+	make PKG_ROOT="$Fdestdir" ENABLE_GETTEXT=1 install || Fdie
Fbuild_gnome_scriptlet

-	# Fix categories in desktop icon
-	echo "Categories=Application;Graphics;" >> $Fdestdir/usr/share/applications/tuxpaint.desktop
}

# optimization OK
diff --git a/source/games-extra/tuxpaint/tuxpaint-fix.patch b/source/games-extra/tuxpaint/tuxpaint-fix.patch
index dd06cdc..44c8de0 100644
--- a/source/games-extra/tuxpaint/tuxpaint-fix.patch
+++ b/source/games-extra/tuxpaint/tuxpaint-fix.patch
@@ -1,7 +1,7 @@
-diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile
---- tuxpaint-0.9.16/Makefile	2006-10-19 02:41:49.000000000 -0500
-+++ tuxpaint-0.9.16-patched/Makefile	2006-12-11 23:22:55.000000000 -0500
-@@ -18,7 +18,7 @@
+diff -NurdpB tuxpaint-0.9.18/Makefile tuxpaint-0.9.18-patched/Makefile
+--- tuxpaint-0.9.18/Makefile	2007-11-21 17:16:33.000000000 -0500
++++ tuxpaint-0.9.18-patched/Makefile	2007-11-27 18:45:15.000000000 -0500
+@@ -20,7 +20,7 @@ SO_TYPE=so

# Where to install things:

@@ -10,7 +10,7 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile


# Root directory to place files when creating packages.
-@@ -62,13 +62,15 @@
+@@ -72,11 +72,14 @@ MIMESET_CMD=echo -n

ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/share/pixmaps
X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps
@@ -23,39 +23,38 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile
+DESKTOP_ICON_PREFIX=$(PREFIX)/share/icons


- # Locale files
-
+ENABLE_GETTEXT=0
- LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale
- # LOCALE_PREFIX=/usr/share/locale
++
+ # Built with sound by default  (override with "make nosound")

-@@ -97,7 +99,7 @@
- # The entire set of CFLAGS:
+ NOSOUNDFLAG=__SOUND
+@@ -134,7 +137,7 @@ ARCH_LIBS=obj/postscript_print.o

#-ffast-math
--CFLAGS=-O2 -W -Wall -fno-common -ffloat-store \
+ OPTFLAGS=-O2
+-CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
+CFLAGS += -W -Wall -fno-common -ffloat-store \
-Wcast-align -Wredundant-decls \
-Wbad-function-cast -Wwrite-strings \
-Waggregate-return \
-@@ -118,7 +120,10 @@
+@@ -160,7 +163,10 @@ MOUSE_CFLAGS=-Isrc/$(MOUSEDIR) -D$(CURSO

# "make" with no arguments builds the program and man page from sources:

--all:	tuxpaint translations
-+all:	tuxpaint
+-all:	tuxpaint translations magic-plugins tp-magic-config
++all:	tuxpaint magic-plugins tp-magic-config
+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
+		make translations; \
+	fi
@echo
@echo "--------------------------------------------------------------"
@echo
-@@ -220,10 +225,13 @@
- # to do this as superuser ("root"))
-
+@@ -350,10 +356,13 @@ include Makefile-i18n
install:	install-bin install-data install-man install-doc \
--		install-icon install-gettext install-importscript \
-+		install-icon install-importscript \
+ 		install-magic-plugins \
+ 		install-magic-plugin-dev \
+-		install-icon install-gettext install-im install-importscript \
++		install-icon install-im install-importscript \
install-default-config install-example-stamps \
install-example-starters \
-		install-gnome install-kde install-kde-icons
@@ -66,7 +65,7 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile
@echo
@echo "--------------------------------------------------------------"
@echo
-@@ -497,16 +505,49 @@
+@@ -622,16 +631,49 @@ install-example-starters:

# Install a launcher icon in the Gnome menu, under "Graphics"

@@ -125,7 +124,7 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile
fi


-@@ -590,9 +631,6 @@
+@@ -725,9 +767,6 @@ install-icon:
@install -d $(ICON_PREFIX)
@cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png
@chmod 644 $(ICON_PREFIX)/tuxpaint.png
@@ -135,12 +134,20 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile


# Install the program:
-@@ -1034,7 +1072,7 @@
- 		$^ \
- 		$(HQXX_O) \
+@@ -873,7 +912,7 @@ tuxpaint:	obj/tuxpaint.o obj/i18n.o obj/
$(SDL_LIBS) \
+ 		$(SVG_LIB) \
+ 		$(PAPER_LIB) \
-		-lm $(ARCH_LINKS)
+		-lm -lpng12 $(ARCH_LINKS)
@$(RSRC_CMD)
@$(MIMESET_CMD)

+diff -NurdpB tuxpaint-0.9.18/src/tuxpaint.desktop tuxpaint-0.9.18-patched/src/tuxpaint.desktop
+--- tuxpaint-0.9.18/src/tuxpaint.desktop	2007-10-29 11:15:48.000000000 -0500
++++ tuxpaint-0.9.18-patched/src/tuxpaint.desktop	2007-11-27 18:35:49.000000000 -0500
+@@ -191,3 +191,4 @@ Comment[wo]=LĂŤl lu natal yu Ăąu jagglel
+ Comment[xh]=Inkqubo yokuzoba yabantwana.
+ Comment[zh_cn]=孩子的绘图程序。
+ Comment[zh_tw]=適合兒童的畫圖程式
++Categories=Application;Graphics;
From iron at frugalware.org  Mon Dec 10 16:55:55 2007
From: iron at frugalware.org (Krisztian VASAS)
Date: Mon Dec 10 16:55:59 2007
Subject: [Frugalware-git] frugalware-current: xfce-utils-4.4.2-1-i686
Message-ID: <20071210155555.6A2CC1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=813659ac4428f09455ed6d736d0a924300ebcdb4

commit 813659ac4428f09455ed6d736d0a924300ebcdb4
Author: Krisztian VASAS 
Date:   Mon Dec 10 16:55:42 2007 +0100

xfce-utils-4.4.2-1-i686
- version bump

diff --git a/source/xfce4/xfce-utils/FrugalBuild b/source/xfce4/xfce-utils/FrugalBuild
index a622f22..caa4b71 100644
--- a/source/xfce4/xfce-utils/FrugalBuild
+++ b/source/xfce4/xfce-utils/FrugalBuild
@@ -2,11 +2,11 @@
# Maintainer: Priyank Gosalia 

pkgname=xfce-utils
-pkgver=4.4.1
+pkgver=4.4.2
pkgrel=1
pkgdesc="Utilities for Xfce4."
-depends=('libxfcegui4>=4.4.1' 'libxfce4mcs>=4.4.1' 'dbus-glib>=0.73')
-makedepends=('xfce-mcs-manager>=4.4.1')
+depends=('libxfcegui4>=4.4.2' 'libxfce4mcs>=4.4.2' 'dbus-glib>=0.73')
+makedepends=('xfce-mcs-manager>=4.4.2')
groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
_F_gnome_desktop=y
@@ -14,7 +14,7 @@ _F_gnome_iconcache=y
Finclude xfce4 gnome-scriptlet
options=('scriptlet')
Fconfopts="$Fconfopts --enable-dbus"
-sha1sums=('69ab30d45bbe252993f783e2f4d7f184226cacbb')
+sha1sums=('b03b685743770b12157159f4b46bde9fb8c2f434')

build()
{
From hermier at frugalware.org  Mon Dec 10 17:00:25 2007
From: hermier at frugalware.org (Michel Hermier)
Date: Mon Dec 10 17:00:27 2007
Subject: [Frugalware-git] homepage-ng: news_fr.xml
Message-ID: <20071210160025.CB15B1190005@genesis.frugalware.org>

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=029f151e5bc8344060e7fb2f2737e25f9ff7758f

commit 029f151e5bc8344060e7fb2f2737e25f9ff7758f
Author: Michel Hermier 
Date:   Mon Dec 10 17:00:10 2007 +0100

news_fr.xml
* Newsletter issue \#11 entry

diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml
index 6b4f9ef..220227a 100644
--- a/frugalware/xml/news_fr.xml
+++ b/frugalware/xml/news_fr.xml
@@ -17,10 +17,23 @@



+		80
+		Lettre d'information Frugalware numĂŠro 11
+		Sun Dec  9 22:51:50 CET 2007
+		hermier
+		0
+		
+			Dans ce numĂŠro nous acceuillons une nouvelle version de Frugalware, la touche 'Windows' est maintenant active avec Gnome, rĂŠvĂŠllation d'un bug dans les lettres d'information prĂŠcĂŠdante.
    
+			Vous pouvez la lire ici (anglais) ou ici (français). Nous espÊrons que vous l'apprÊcierez!
+			]]>
+		    
+	    
+	
79
Frugalware 0.8pre1 (Kalgan) est disponible
Tue Dec  4 09:33:56 CET 2007
-		VMiklos
+		hermier
0
announcer la disponibilitÊ disponibilitÊ de Frugalware 0.8pre1, le premier aperçu technique de la prochaine version stable 0.8.
    
@@ -90,7 +103,7 @@ a1321a1f978bfedf8cf7fdd33c90e858bd881e10  frugalware-0.8pre1-i686-dvd1.iso
2fb3b8863079fb17ed6971226f5d996bd149e07d  frugalware-0.8pre1-i686-usb.tar.gz
    ]]> - +     78 From iron at frugalware.org Mon Dec 10 17:02:24 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 17:02:25 2007 Subject: [Frugalware-git] frugalware-current: xfce4-panel-4.4.2-1-i686 Message-ID: <20071210160224.D5B941190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e2b523da5b506f2acabeaf44385059ee042d7a8 commit 0e2b523da5b506f2acabeaf44385059ee042d7a8 Author: Krisztian VASAS Date: Mon Dec 10 17:02:18 2007 +0100 xfce4-panel-4.4.2-1-i686 - version bump diff --git a/source/xfce4/xfce4-panel/FrugalBuild b/source/xfce4/xfce4-panel/FrugalBuild index 78a2a75..e7c376f 100644 --- a/source/xfce4/xfce4-panel/FrugalBuild +++ b/source/xfce4/xfce4-panel/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-panel -pkgver=4.4.1 +pkgver=4.4.2 pkgrel=1 pkgdesc="Panel for the Xfce4 desktop environment." -makedepends=('xfce-mcs-manager>=4.4.1') -depends=('pango' 'atk' 'libxml2' 'libxfcegui4>=4.4.1' 'libxfce4mcs>=4.4.1') +makedepends=('xfce-mcs-manager>=4.4.2') +depends=('pango' 'atk' 'libxml2' 'libxfcegui4>=4.4.2' 'libxfce4mcs>=4.4.2') groups=('xfce4' 'xfce4-core') conflicts=('xfce4-showdesktop-plugin' 'xfce4-taskbar-plugin' 'xfce4-windowlist-plugin' 'xfce4-iconbox' 'xfce4-systray') replaces=('xfce4-showdesktop-plugin' 'xfce4-taskbar-plugin' 'xfce4-windowlist-plugin' 'xfce4-iconbox' 'xfce4-systray') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('5a0ca0dee7f8d525120f65cc8fd199a3e673f60c') +sha1sums=('f66a5f46abc21324e5a375e52a37b98757eae121') build() { From crazy at frugalware.org Mon Dec 10 17:16:51 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 10 17:16:53 2007 Subject: [Frugalware-git] frugalware-current: tuxpaint-0.9.18-2-x86_64 Message-ID: <20071210161651.26D681190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a91e78e71700c1946375d2a2e8e21773dd70984b commit a91e78e71700c1946375d2a2e8e21773dd70984b Author: crazy Date: Mon Dec 10 17:16:41 2007 +0100 tuxpaint-0.9.18-2-x86_64 * release bump * updated patch to build with -fPIC diff --git a/source/games-extra/tuxpaint/FrugalBuild b/source/games-extra/tuxpaint/FrugalBuild index b631c90..01bdde1 100644 --- a/source/games-extra/tuxpaint/FrugalBuild +++ b/source/games-extra/tuxpaint/FrugalBuild @@ -3,7 +3,7 @@ pkgname=tuxpaint pkgver=0.9.18 -pkgrel=1 +pkgrel=2 pkgdesc="A drawing program for young children." _F_sourceforge_broken_up2date=1 Finclude sourceforge @@ -17,7 +17,7 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet source=(${source[@]} $pkgname-fix.patch) sha1sums=('34c59dc7789e4bd85ba5b34f3e173227b5879e5b' \ - '14f373b5b5e590b186b4f8e58d2e4db1145ef773') + 'b9a7e57c84b61b537763346d4fb0049ecfd0ad5b') build() { diff --git a/source/games-extra/tuxpaint/tuxpaint-fix.patch b/source/games-extra/tuxpaint/tuxpaint-fix.patch index 44c8de0..31f28bb 100644 --- a/source/games-extra/tuxpaint/tuxpaint-fix.patch +++ b/source/games-extra/tuxpaint/tuxpaint-fix.patch @@ -33,7 +33,7 @@ diff -NurdpB tuxpaint-0.9.18/Makefile tuxpaint-0.9.18-patched/Makefile #-ffast-math OPTFLAGS=-O2 -CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ -+CFLAGS += -W -Wall -fno-common -ffloat-store \ ++CFLAGS += -fPIC -W -Wall -fno-common -ffloat-store \ -Wcast-align -Wredundant-decls \ -Wbad-function-cast -Wwrite-strings \ -Waggregate-return \ From iron at frugalware.org Mon Dec 10 17:21:22 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 17:21:24 2007 Subject: [Frugalware-git] frugalware-current: libexo-0.3.4-1-i686 Message-ID: <20071210162122.397FE1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d9ceec29b2be8ba6dfdc2910b44faa0fced1009 commit 3d9ceec29b2be8ba6dfdc2910b44faa0fced1009 Author: Krisztian VASAS Date: Mon Dec 10 17:21:14 2007 +0100 libexo-0.3.4-1-i686 - version bump - added missing _F_archive_name diff --git a/source/xfce4/libexo/FrugalBuild b/source/xfce4/libexo/FrugalBuild index e8a08e6..f168f08 100644 --- a/source/xfce4/libexo/FrugalBuild +++ b/source/xfce4/libexo/FrugalBuild @@ -3,16 +3,17 @@ pkgname=libexo _F_xfce_name=exo -pkgver=0.3.2 -pkgrel=4 +_F_archive_name=exo +pkgver=0.3.4 +pkgrel=1 pkgdesc="Extension library to Xfce." -depends=('libxfcegui4>=4.4.1' 'xfce-mcs-plugins>=4.4.1' 'libnotify' \ +depends=('libxfcegui4>=4.4.2' 'xfce-mcs-plugins>=4.4.2' 'libnotify' \ 'hal>=0.5.9-2' 'startup-notification' 'perl-uri') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 _F_cd_path="$_F_xfce_name-$pkgver" Fconfopts="${Fconfopts[@]} --enable-mcs-plugin --enable-hal --enable-notifications" -sha1sums=('3a9f65c093d0a81e0a76bd2e8cbcde9805194f3c') +sha1sums=('4f7a3f46592fd0311be1f011f17431f211cc1fcb') # optimization OK From crazy at frugalware.org Mon Dec 10 17:33:21 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 10 17:33:23 2007 Subject: [Frugalware-git] frugalware-current: lincity-ng-1.1.2-1-i686 Message-ID: <20071210163321.C5D591190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c41f6197ce5cffa85b395c74be9bdeb46d624c68 commit c41f6197ce5cffa85b395c74be9bdeb46d624c68 Author: crazy Date: Mon Dec 10 17:22:06 2007 +0100 lincity-ng-1.1.2-1-i686 * Version bump * make use of MAKEFLAGS diff --git a/source/games-extra/lincity-ng/FrugalBuild b/source/games-extra/lincity-ng/FrugalBuild index abb661c..016b817 100644 --- a/source/games-extra/lincity-ng/FrugalBuild +++ b/source/games-extra/lincity-ng/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=lincity-ng -pkgver=1.1.0 +pkgver=1.1.2 pkgrel=1 pkgdesc="A City Simulation Game. It is a polished and improved version of the classic LinCity game." _F_berlios_ext=".tar.bz2" @@ -13,14 +13,16 @@ depends=('physfs=1.0.1' 'sdl' 'sdl_mixer' 'sdl_gfx' 'sdl_ttf' 'sdlimage' 'libxml makedepends=('jam') groups=('games-extra') archs=('i686') -sha1sums=('9d75d9a042c31f0ddbf605499c9e48f26d9a94ad') +sha1sums=('b2bd7f2e058ada133b452d9dddd8def0f2dbbaeb') build() { Fcd + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" Fconf --with-libSDL_image=/usr/ - jam || return 1 - jam -sDESTDIR=$Fdestdir install + [ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS" + jam $JOBS || Fdie + jam -sDESTDIR=$Fdestdir install || Fdie } # optimization OK From iron at frugalware.org Mon Dec 10 17:36:02 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 17:36:03 2007 Subject: [Frugalware-git] frugalware-current: thunar-0.9.0-1-i686 Message-ID: <20071210163602.34A401190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4bfee748042acf687818d9098a201200f982f51f commit 4bfee748042acf687818d9098a201200f982f51f Author: Krisztian VASAS Date: Mon Dec 10 17:35:53 2007 +0100 thunar-0.9.0-1-i686 - version bump - added missing _F_archive_name diff --git a/source/xfce4/thunar/FrugalBuild b/source/xfce4/thunar/FrugalBuild index 469eaf9..df8addf 100644 --- a/source/xfce4/thunar/FrugalBuild +++ b/source/xfce4/thunar/FrugalBuild @@ -3,13 +3,14 @@ pkgname=thunar _F_xfce_name=Thunar -pkgver=0.8.0 -pkgrel=3 +_F_archive_name=Thunar +pkgver=0.9.0 +pkgrel=1 pkgdesc="Thunar is a modern file manager for Xfce." -makedepends=('xfce4-dev-tools>=4.4,0' 'intltool') -depends=('libexo=0.3.2-4' 'gtk+2' 'gamin' 'libxfce4util>=4.4.1' \ +makedepends=('xfce4-dev-tools>=4.4,0.1' 'intltool') +depends=('libexo=0.3.4-1' 'gtk+2' 'gamin' 'libxfce4util>=4.4.2' \ 'hicolor-icon-theme' 'hal>=0.5.9-2' 'dbus-glib>=0.73' \ - 'libexif' 'xfce4-panel>=4.4.1' 'glib2>=2.12.8') + 'libexif' 'xfce4-panel>=4.4.2' 'glib2>=2.12.8') groups=('xfce4' 'xfce4-core') conflicts=('xffm') replaces=('xffm') @@ -18,6 +19,6 @@ _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet _F_cd_path="$_F_xfce_name-$pkgver" Fconfopts="$Fconfopts --enable-cairo --disable-debug --disable-gnome-thumbnailers" -sha1sums=('1adcba7b86d9219b0bd7eb8c16d5719aa8393d98') +sha1sums=('fd4625d58e28006087d5a35004483a953184e4fe') # optimization OK From crazy at frugalware.org Mon Dec 10 18:09:01 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 10 18:09:04 2007 Subject: [Frugalware-git] frugalware-current: cegui-0.5.0b-2-i686 Message-ID: <20071210170901.083181190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cd5591f4a2c90f8f10cb1fe75fa0faccce497b0f commit cd5591f4a2c90f8f10cb1fe75fa0faccce497b0f Author: crazy Date: Mon Dec 10 18:08:08 2007 +0100 cegui-0.5.0b-2-i686 * rebuild with xerces-c * added an patch to fix the build * ( posted in upstream support channel , I hope they push to CVS ) * depends() fix * fixed url bug * added sha1sums() ( huh ? ) diff --git a/source/xlib-extra/cegui/FrugalBuild b/source/xlib-extra/cegui/FrugalBuild index 6fcdebf..8255ea0 100644 --- a/source/xlib-extra/cegui/FrugalBuild +++ b/source/xlib-extra/cegui/FrugalBuild @@ -3,17 +3,18 @@ pkgname=cegui pkgver=0.5.0b -pkgrel=1 +pkgrel=2 pkgdesc="Crazy Eddie's GUI System is a free library providing windowing and widgets for graphics APIs/engines" -url="http://www.cegui.org.uk/" -depends=('mesa' 'xerces-c' 'freetype2') +depends=('freetype2' 'pcre' 'xerces-c>=2.8.0' 'libgcc' 'freeglut' 'libgl' 'libsm' 'libxext' 'libxdamage' 'expat' 'libxml2') groups=('xlib-extra') archs=('i686' 'x86_64') _F_sourceforge_dirname="crayzedsgui" _F_sourceforge_ext=".tar.gz" Finclude sourceforge -source=(${source/$pkgname-/CEGUI-}) +url="http://www.cegui.org.uk/" +source=(${source/$pkgname-/CEGUI-} compile-fix-for-xerces-c-2.8.0.patch) _F_cd_path="CEGUI-`echo $pkgver | sed 's/b//'`" Fconfopts="${Fconfopts} --without-devil" - +sha1sums=('29c3888b1ba9a4ee246a8534244a00280c01bd60' \ + '817dee3f9b83588cad27da5ae86ec323ab21b1ee') # optimization OK diff --git a/source/xlib-extra/cegui/compile-fix-for-xerces-c-2.8.0.patch b/source/xlib-extra/cegui/compile-fix-for-xerces-c-2.8.0.patch new file mode 100644 index 0000000..7c954a4 --- /dev/null +++ b/source/xlib-extra/cegui/compile-fix-for-xerces-c-2.8.0.patch @@ -0,0 +1,11 @@ +diff -Naur CEGUI-0.5.0/XMLParserModules/XercesParser/CEGUIXercesParser.h CEGUI-0.5.0-p/XMLParserModules/XercesParser/CEGUIXercesParser.h +--- CEGUI-0.5.0/XMLParserModules/XercesParser/CEGUIXercesParser.h 2006-05-12 21:42:23.000000000 +0200 ++++ CEGUI-0.5.0-p/XMLParserModules/XercesParser/CEGUIXercesParser.h 2007-12-10 17:45:46.000000000 +0100 +@@ -42,6 +42,7 @@ + + + // Xerces-C includes ++#include + #include + #include + #include From iron at frugalware.org Mon Dec 10 20:33:59 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 20:34:01 2007 Subject: [Frugalware-git] frugalware-current: thunar-volman-0.2.0-1-i686 Message-ID: <20071210193359.2E9801190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff3d475907aad3c392b6e351511c7a8a265d0a44 commit ff3d475907aad3c392b6e351511c7a8a265d0a44 Author: Krisztian VASAS Date: Mon Dec 10 20:33:47 2007 +0100 thunar-volman-0.2.0-1-i686 - version bump - added perl-xml to makedepends() diff --git a/source/xfce4/thunar-volman/FrugalBuild b/source/xfce4/thunar-volman/FrugalBuild index 5672852..1350a11 100644 --- a/source/xfce4/thunar-volman/FrugalBuild +++ b/source/xfce4/thunar-volman/FrugalBuild @@ -2,20 +2,20 @@ # Maintainer: Priyank Gosalia pkgname=thunar-volman -pkgver=0.1.2 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="Automatic volume management of removable drives and media for Thunar." _F_berlios_dirname="xfce-goodies" _F_berlios_ext=".tar.bz2" _F_gnome_iconcache="y" Finclude berlios url="http://foo-projects.org/~benny/projects/thunar-volman/index.html" -depends=('thunar>=0.8.0-3' 'hal>=0.5.9-2' 'libexo>=0.3.2-4' 'libnotify' 'dbus') -makedepends=('pkgconfig') +depends=('thunar>=0.9.0-1' 'hal>=0.5.9-2' 'libexo>=0.3.4-1' 'libnotify' 'dbus') +makedepends=('pkgconfig' 'perl-xml') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude gnome-scriptlet up2date="lynx -dump $url | grep -m1 released | sed 's/.*n \(.*\) r.*/\1/'" -sha1sums=('a64b7c95d9edb2286950888da4c3f096ad1205c7') +sha1sums=('c0aeb591a7750f89784cdc40d42baa18cff6bf6a') # optimization OK From iron at frugalware.org Mon Dec 10 20:41:09 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 20:41:12 2007 Subject: [Frugalware-git] frugalware-current: thunar-archive-plugin-0.2.4-4-i686 Message-ID: <20071210194109.CDFDE1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1fe680590aebca66d4abcaf9cb64df7858083800 commit 1fe680590aebca66d4abcaf9cb64df7858083800 Author: Krisztian VASAS Date: Mon Dec 10 20:41:02 2007 +0100 thunar-archive-plugin-0.2.4-4-i686 - rebuilt with thunar 0.9.0 diff --git a/source/xfce4-extra/thunar-archive-plugin/FrugalBuild b/source/xfce4-extra/thunar-archive-plugin/FrugalBuild index 5768ce1..b850e0f 100644 --- a/source/xfce4-extra/thunar-archive-plugin/FrugalBuild +++ b/source/xfce4-extra/thunar-archive-plugin/FrugalBuild @@ -3,11 +3,11 @@ pkgname=thunar-archive-plugin pkgver=0.2.4 -pkgrel=3 +pkgrel=4 pkgdesc="Thunar archive plugin." url="http://www.foo-projects.org/~benny/projects/thunar-archive-plugin/" makedepends=('intltool') -depends=('thunar>=0.8.0' 'xarchiver>=0.4.6-3') +depends=('thunar>=0.9.0' 'xarchiver>=0.4.6-3') _F_gnome_iconcache="y" Finclude gnome-scriptlet groups=('xfce4-extra') From iron at frugalware.org Mon Dec 10 20:46:37 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 20:46:40 2007 Subject: [Frugalware-git] frugalware-current: thunar-media-tags-plugin-0.1.2-2-i686 Message-ID: <20071210194637.A7DF51190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c8b2b0137c1be508d245c188606acc066863748d commit c8b2b0137c1be508d245c188606acc066863748d Author: Krisztian VASAS Date: Mon Dec 10 20:46:32 2007 +0100 thunar-media-tags-plugin-0.1.2-2-i686 - rebuilt with thunar 0.9.0 diff --git a/source/xfce4-extra/thunar-media-tags-plugin/FrugalBuild b/source/xfce4-extra/thunar-media-tags-plugin/FrugalBuild index 6e0f4cb..578de1b 100644 --- a/source/xfce4-extra/thunar-media-tags-plugin/FrugalBuild +++ b/source/xfce4-extra/thunar-media-tags-plugin/FrugalBuild @@ -3,10 +3,10 @@ pkgname=thunar-media-tags-plugin pkgver=0.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Thunar Media tag editor plugin." url="http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin" -depends=('thunar>=0.5.0rc2' 'taglib') +depends=('thunar>=0.9.0' 'taglib') makedepends=('intltool') groups=('xfce4-extra') archs=('i686' 'x86_64') From iron at frugalware.org Mon Dec 10 20:55:06 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 20:55:09 2007 Subject: [Frugalware-git] frugalware-current: xfdesktop-4.4.2-1-i686 Message-ID: <20071210195506.420C11190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78c14bde85eafc62a64580b201e44279a45de0ca commit 78c14bde85eafc62a64580b201e44279a45de0ca Author: Krisztian VASAS Date: Mon Dec 10 20:54:56 2007 +0100 xfdesktop-4.4.2-1-i686 - version bump diff --git a/source/xfce4/xfdesktop/FrugalBuild b/source/xfce4/xfdesktop/FrugalBuild index d4695df..aa4f959 100644 --- a/source/xfce4/xfdesktop/FrugalBuild +++ b/source/xfce4/xfdesktop/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Priyank Gosalia pkgname=xfdesktop -pkgver=4.4.1 +pkgver=4.4.2 pkgrel=1 pkgdesc="A desktop manager for Xfce4." -depends=('libxml2' 'libxfcegui4>=4.4.1' 'libxfce4mcs>=4.4.1' \ - 'dbus' 'thunar>=0.8.0-2' 'libexo>=0.3.2-3') -makedepends=('xfce4-panel>=4.4.1' 'xfce-mcs-manager>=4.4.1') +depends=('libxml2' 'libxfcegui4>=4.4.2' 'libxfce4mcs>=4.4.2' \ + 'dbus' 'thunar>=0.9.0-1' 'libexo>=0.3.4-1') +makedepends=('xfce4-panel>=4.4.2' 'xfce-mcs-manager>=4.4.2') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 @@ -23,7 +23,7 @@ build() } # optimization OK -sha1sums=('46324ad37bb782ec7a5da11c619d9e76a0f54133'\ +sha1sums=('f2ff4d429c0241401bdeebd3dc9b71b35dbe9ae8'\ '530517581f8f5023fbb7ea147d4d362a8409e9b0'\ '003289bfa15867653122230a2ab79c0889c1f8d9'\ '5cc04b415cf32353333106fb200244765f86b844') From iron at frugalware.org Mon Dec 10 21:00:14 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 21:00:20 2007 Subject: [Frugalware-git] frugalware-current: xfce4-icon-theme-4.4.2-1-i686 Message-ID: <20071210200014.CD3561190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed545ec716da205865e113709e56a24d1bdf45b8 commit ed545ec716da205865e113709e56a24d1bdf45b8 Author: Krisztian VASAS Date: Mon Dec 10 21:00:06 2007 +0100 xfce4-icon-theme-4.4.2-1-i686 - version bump diff --git a/source/xfce4/xfce4-icon-theme/FrugalBuild b/source/xfce4/xfce4-icon-theme/FrugalBuild index 5eef44f..6ea5f1c 100644 --- a/source/xfce4/xfce4-icon-theme/FrugalBuild +++ b/source/xfce4/xfce4-icon-theme/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-icon-theme -pkgver=4.4.1 +pkgver=4.4.2 pkgrel=1 pkgdesc="Default icon theme for Xfce4." groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('3966fe9d2f5d9097f52429e62a539e93b11d9883') +sha1sums=('ba2c458eb1b8ba65a7198b9cbfa631017fd0f1c0') From iron at frugalware.org Mon Dec 10 21:07:48 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 21:07:52 2007 Subject: [Frugalware-git] frugalware-current: orage-4.4.2-1-i686 Message-ID: <20071210200748.CDCF61190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b6dfb9e7cefe4a69b350bd51577f7c5743e0c96a commit b6dfb9e7cefe4a69b350bd51577f7c5743e0c96a Author: Krisztian VASAS Date: Mon Dec 10 21:07:42 2007 +0100 orage-4.4.2-1-i686 - version bump diff --git a/source/xfce4/orage/FrugalBuild b/source/xfce4/orage/FrugalBuild index 25ace1b..a2df0ea 100644 --- a/source/xfce4/orage/FrugalBuild +++ b/source/xfce4/orage/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=orage -pkgver=4.4.1 +pkgver=4.4.2 pkgrel=1 pkgdesc="A Time-managing application for the Xfce Desktop Environment." makedepends=('xfce-mcs-manager>=4.4.1') -depends=('libxfce4mcs>=4.4.1' 'libxfcegui4>=4.4.1' 'xfce4-panel>=4.4.1') +depends=('libxfce4mcs>=4.4.2' 'libxfcegui4>=4.4.2' 'xfce4-panel>=4.4.2') groups=('xfce4' 'xfce4-core') conflicts=('xfcalendar') replaces=('xfcalendar') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('2e05ebb91fe8164bcc880a67bbd091a2dba3bc6d') +sha1sums=('bc026bf95a4f372a86ea115547272f4b99109bdd') build() { From iron at frugalware.org Mon Dec 10 21:25:08 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 21:25:09 2007 Subject: [Frugalware-git] frugalware-current: xfwm4-4.4.2-1-i686 Message-ID: <20071210202508.096911190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad928562e60424f8c103f080407f40cfcaeff1c2 commit ad928562e60424f8c103f080407f40cfcaeff1c2 Author: Krisztian VASAS Date: Mon Dec 10 21:24:52 2007 +0100 xfwm4-4.4.2-1-i686 - version bump - ignored gtk2.12 patch diff --git a/source/xfce4/xfwm4/FrugalBuild b/source/xfce4/xfwm4/FrugalBuild index 6643d30..55c1cf0 100644 --- a/source/xfce4/xfwm4/FrugalBuild +++ b/source/xfce4/xfwm4/FrugalBuild @@ -2,20 +2,19 @@ # Maintainer: Priyank Gosalia pkgname=xfwm4 -pkgver=4.4.1 -pkgrel=2 +pkgver=4.4.2 +pkgrel=1 pkgdesc="A window manager compatable with Xfce4, Gnome and KDE." -makedepends=('xfce-mcs-manager>=4.4.1') -depends=('libxfcegui4>=4.4.1' 'xfce-mcs-plugins>=4.4.1' 'libxfce4mcs>=4.4.1' \ +makedepends=('xfce-mcs-manager>=4.4.2') +depends=('libxfcegui4>=4.4.2' 'xfce-mcs-plugins>=4.4.2' 'libxfce4mcs>=4.4.2' \ 'libxpm' 'libxext' 'libxfixes' 'libxdamage' 'libxcomposite' 'libpng') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude xfce4 gnome-scriptlet -source=(${source[@]} xfwm_frugalware.patch xfwm4-gtk212.patch) +source=(${source[@]} xfwm_frugalware.patch) Fconfopts="$Fconfopts --enable-compositor" -sha1sums=('1f1c0cb374941bce2bd59eedd8d9bd05591c65a0' \ - '581f049fe15c2c8639af5b975643b3eea1c38578' \ - 'a44f947351144b6df035a845fc2bac175044b2c1') +sha1sums=('a6d8b3b1493ff98141cfb7232ef6b4940224bce9' \ + '581f049fe15c2c8639af5b975643b3eea1c38578') # optimization OK From iron at frugalware.org Mon Dec 10 21:30:50 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 21:30:55 2007 Subject: [Frugalware-git] frugalware-current: xfwm4-themes-4.4.2-1-i686 Message-ID: <20071210203050.C3CFE1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1956717f69b7c2e23c801f329345135c6993e8cf commit 1956717f69b7c2e23c801f329345135c6993e8cf Author: Krisztian VASAS Date: Mon Dec 10 21:30:44 2007 +0100 xfwm4-themes-4.4.2-1-i686 - version bump diff --git a/source/xfce4/xfwm4-themes/FrugalBuild b/source/xfce4/xfwm4-themes/FrugalBuild index f54bb20..6b67003 100644 --- a/source/xfce4/xfwm4-themes/FrugalBuild +++ b/source/xfce4/xfwm4-themes/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=xfwm4-themes -pkgver=4.4.1 +pkgver=4.4.2 pkgrel=1 pkgdesc="A set of additionnal themes for the Xfce4 window manager." -depends=('xfwm4>=4.4.1') +depends=('xfwm4>=4.4.2') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('e02932600d9971716e4058252588c0f7bff509ec') +sha1sums=('ce682c0713fda99b34e6569df5bd053ce8bd4928') From iron at frugalware.org Mon Dec 10 21:35:08 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 21:35:10 2007 Subject: [Frugalware-git] frugalware-current: xfce4-appfinder-4.4.2-1-i686 Message-ID: <20071210203508.4F4351190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=40b729cbc4bdafd59d558cf88bf6c40caa55cb0a commit 40b729cbc4bdafd59d558cf88bf6c40caa55cb0a Author: Krisztian VASAS Date: Mon Dec 10 21:35:00 2007 +0100 xfce4-appfinder-4.4.2-1-i686 - version bump diff --git a/source/xfce4/xfce4-appfinder/FrugalBuild b/source/xfce4/xfce4-appfinder/FrugalBuild index 0a67a4a..5ea25ab 100644 --- a/source/xfce4/xfce4-appfinder/FrugalBuild +++ b/source/xfce4/xfce4-appfinder/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-appfinder -pkgver=4.4.1 +pkgver=4.4.2 pkgrel=1 pkgdesc="Utilities and additions for the Xfce4 panel." makedepends=('intltool') -depends=('libxfcegui4>=4.4.1') +depends=('libxfcegui4>=4.4.2') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('0f433a4469975466cb141163ca9d71f75cd9916f') +sha1sums=('1ed442bca3fc8bc4c4f14aad0ec1573fbf4bd061') # optimization OK From iron at frugalware.org Mon Dec 10 22:05:50 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 22:05:57 2007 Subject: [Frugalware-git] frugalware-current: xfprint-4.4.2-1-i686 Message-ID: <20071210210550.88F521190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=879e2d5f9e7e3e9d53ec5c3221b050b17169387a commit 879e2d5f9e7e3e9d53ec5c3221b050b17169387a Author: Krisztian VASAS Date: Mon Dec 10 22:05:42 2007 +0100 xfprint-4.4.2-1-i686 - version bump diff --git a/source/xfce4/xfprint/FrugalBuild b/source/xfce4/xfprint/FrugalBuild index 1bfe036..5784dd5 100644 --- a/source/xfce4/xfprint/FrugalBuild +++ b/source/xfce4/xfprint/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=xfprint -pkgver=4.4.1 +pkgver=4.4.2 pkgrel=1 pkgdesc="A printer manager for Xfce4." url="http://www.xfce.org/" groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') -depends=('libxfce4mcs>=4.4.1' 'libxfcegui4>=4.4.1' 'cups' 'a2ps') -makedepends=('xfce-mcs-manager>=4.4.1') +depends=('libxfce4mcs>=4.4.2' 'libxfcegui4>=4.4.2' 'cups' 'a2ps') +makedepends=('xfce-mcs-manager>=4.4.2') _F_gnome_iconcache="y" Finclude xfce4 gnome-scriptlet Fconfopts="$Fconfopts --enable-cups" -sha1sums=('28da63a9a47ae4ae528ab24b35a035f583efb1e4') +sha1sums=('ad775ac77894e9d946711181e812fdc6edd725a7') # optimization OK From iron at frugalware.org Mon Dec 10 22:22:59 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 22:23:00 2007 Subject: [Frugalware-git] frugalware-current: terminal-0.2.8-1-i686 Message-ID: <20071210212259.36E3D1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=141bbfd3dba8da94a00b6705925be4210890287d commit 141bbfd3dba8da94a00b6705925be4210890287d Author: Krisztian VASAS Date: Mon Dec 10 22:22:52 2007 +0100 terminal-0.2.8-1-i686 - version bump - removed 02_CVE-2007-3770.patch from source() - added _F_archive_name diff --git a/source/xfce4/terminal/FrugalBuild b/source/xfce4/terminal/FrugalBuild index b8439c1..2b29b7f 100644 --- a/source/xfce4/terminal/FrugalBuild +++ b/source/xfce4/terminal/FrugalBuild @@ -3,19 +3,18 @@ pkgname=terminal _F_xfce_name=Terminal -pkgver=0.2.6 -pkgrel=2 +_F_archive_name=Terminal +pkgver=0.2.8 +pkgrel=1 pkgdesc="A modern virtual terminal emulator for Xfce." -makedepends=('xfce4-dev-tools>=4.4.0' 'intltool') -depends=('libexo>=0.3.2' 'vte' 'dbus-glib>=0.71') +makedepends=('xfce4-dev-tools>=4.4.0.1' 'intltool') +depends=('libexo>=0.3.4' 'vte' 'dbus-glib>=0.71') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') _F_gnome_iconcache="y" options=('scriptlet') Finclude xfce4 gnome-scriptlet _F_cd_path="$_F_xfce_name-$pkgver" -source=(${source} 02_CVE-2007-3770.patch.diff) -sha1sums=('8851179492c4768a1a53d2424d7a7c8b1a873c58' \ - '8b2aeb8cbd0dd6e1bb88a38ae205a0249625095e') +sha1sums=('9c4ae0422dea8161aa72659d3bd1b035688d70d7') # optimization OK From iron at frugalware.org Mon Dec 10 22:27:11 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 22:27:14 2007 Subject: [Frugalware-git] frugalware-current: mousepad-0.2.13-1-i686 Message-ID: <20071210212711.D99DF1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a959b794643f0aee567d8b4d4cdb6473fbfbd98d commit a959b794643f0aee567d8b4d4cdb6473fbfbd98d Author: Krisztian VASAS Date: Mon Dec 10 22:27:06 2007 +0100 mousepad-0.2.13-1-i686 - version bump diff --git a/source/xfce4/mousepad/FrugalBuild b/source/xfce4/mousepad/FrugalBuild index 634e111..e8b51bc 100644 --- a/source/xfce4/mousepad/FrugalBuild +++ b/source/xfce4/mousepad/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=mousepad -pkgver=0.2.12 +pkgver=0.2.13 pkgrel=1 pkgdesc="A simple text editor for Xfce." makedepends=('intltool') -depends=('libxfcegui4>=4.4.0' 'gtk+2') +depends=('libxfcegui4>=4.4.0.1' 'gtk+2') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude xfce4 gnome-scriptlet -sha1sums=('7a27bc73290c08d729c36e816cf1c7f1aa667bd5') +sha1sums=('521d2ffb3b805b568620d40ca43264584d504ccb') # optimization OK From iron at frugalware.org Mon Dec 10 22:38:08 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 22:38:11 2007 Subject: [Frugalware-git] frugalware-current: squeeze-0.2.1-4-i686 Message-ID: <20071210213808.E361D1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf0a31ce2b36d2defb984a129577d464679a9e26 commit cf0a31ce2b36d2defb984a129577d464679a9e26 Author: Krisztian VASAS Date: Mon Dec 10 22:37:58 2007 +0100 squeeze-0.2.1-4-i686 - rebuilt with thunar 0.9.0 diff --git a/source/xfce4-extra/squeeze/FrugalBuild b/source/xfce4-extra/squeeze/FrugalBuild index 75f2add..e983c72 100644 --- a/source/xfce4-extra/squeeze/FrugalBuild +++ b/source/xfce4-extra/squeeze/FrugalBuild @@ -3,11 +3,11 @@ pkgname=squeeze pkgver=0.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="A modern and advanced archive manager for Xfce4." url="http://squeeze.xfce.org/" makedepends=('intltool' 'pkgconfig') -depends=('gtk+2' 'thunar>=0.8.0' 'dbus-glib>=0.71') +depends=('gtk+2' 'thunar>=0.9.0' 'dbus-glib>=0.71') groups=('xfce4-extra') archs=('i686' 'x86_64') _F_gnome_iconcache="y" From iron at frugalware.org Mon Dec 10 22:49:04 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 22:49:06 2007 Subject: [Frugalware-git] frugalware-current: xfburn-0.2.0-2-i686 Message-ID: <20071210214904.D15081190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=73cfc476fc07f1b581d8b1ad4630223843099532 commit 73cfc476fc07f1b581d8b1ad4630223843099532 Author: Krisztian VASAS Date: Mon Dec 10 22:48:57 2007 +0100 xfburn-0.2.0-2-i686 - rebuilt with new xfce 4.4.2 packages diff --git a/source/xfce4-extra/xfburn/FrugalBuild b/source/xfce4-extra/xfburn/FrugalBuild index 80fae68..31e6357 100644 --- a/source/xfce4-extra/xfburn/FrugalBuild +++ b/source/xfce4-extra/xfburn/FrugalBuild @@ -3,11 +3,11 @@ pkgname=xfburn pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A CD Recorder for Xfce4." url="http://www.xfce.org/projects/xfburn/" makedepends=('intltool' 'pkgconfig') -depends=('thunar>=0.8.0' 'libexo>=0.3.2' 'libxfcegui4>=4.4.0' 'cdrtools' \ +depends=('thunar>=0.9.0' 'libexo>=0.3.4' 'libxfcegui4>=4.4.2' 'cdrtools' \ 'cdrdao') options=('scriptlet') groups=('xfce4-extra') From iron at frugalware.org Mon Dec 10 22:58:09 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 22:58:13 2007 Subject: [Frugalware-git] frugalware-current: xfce4-mpc-plugin-0.3.2-2-i686 Message-ID: <20071210215809.8D8CF1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=864e2c8d9ac543b47f258000c7d26af406a38f87 commit 864e2c8d9ac543b47f258000c7d26af406a38f87 Author: Krisztian VASAS Date: Mon Dec 10 22:57:53 2007 +0100 xfce4-mpc-plugin-0.3.2-2-i686 - rebuilt with new xfce4-panel diff --git a/source/xfce4-extra/xfce4-mpc-plugin/FrugalBuild b/source/xfce4-extra/xfce4-mpc-plugin/FrugalBuild index 72ab817..305c9a7 100644 --- a/source/xfce4-extra/xfce4-mpc-plugin/FrugalBuild +++ b/source/xfce4-extra/xfce4-mpc-plugin/FrugalBuild @@ -3,10 +3,10 @@ pkgname=xfce4-mpc-plugin pkgver=0.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="An Xfce4 panel plugin for Music Player Daemon." makedepends=('intltool') -depends=('libxfcegui4>=4.4.0' 'xfce4-panel>=4.4.0' 'libmpd') +depends=('libxfcegui4>=4.4.2' 'xfce4-panel>=4.4.2' 'libmpd') rodepends=('mpd') groups=('xfce4-extra' 'xfce4-goodies') archs=('i686' 'x86_64') From iron at frugalware.org Mon Dec 10 23:06:51 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 23:06:55 2007 Subject: [Frugalware-git] frugalware-current: xfce4-xfapplet-plugin-0.1.0-3-i686 Message-ID: <20071210220651.BBB8D1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9a575b2e87404183b9e308ca9faa81fad440e1d commit b9a575b2e87404183b9e308ca9faa81fad440e1d Author: Krisztian VASAS Date: Mon Dec 10 23:06:41 2007 +0100 xfce4-xfapplet-plugin-0.1.0-3-i686 - rebuilt with new xfce4-panel diff --git a/source/xfce4-extra/xfce4-xfapplet-plugin/FrugalBuild b/source/xfce4-extra/xfce4-xfapplet-plugin/FrugalBuild index a394489..6d2337d 100644 --- a/source/xfce4-extra/xfce4-xfapplet-plugin/FrugalBuild +++ b/source/xfce4-extra/xfce4-xfapplet-plugin/FrugalBuild @@ -3,11 +3,11 @@ pkgname=xfce4-xfapplet-plugin pkgver=0.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="An Xfce4 panel plugin that allows you to run Gnome panel applets." url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xfapplet-plugin" makedepends=('intltool') -depends=('libxfcegui4>=4.4.0' 'xfce4-panel>=4.4.0' 'orbit2' 'gnome-applets') +depends=('libxfcegui4>=4.4.2' 'xfce4-panel>=4.4.2' 'orbit2' 'gnome-applets') groups=('xfce4-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://goodies.xfce.org/releases/$pkgname | Flasttarbz2" From iron at frugalware.org Mon Dec 10 23:11:25 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 23:11:28 2007 Subject: [Frugalware-git] frugalware-current: xfce4-xmms-plugin-0.5.1-3-i686 Message-ID: <20071210221125.B5D9E1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b36867c9552386a18932a08132f32adf16fc314 commit 5b36867c9552386a18932a08132f32adf16fc314 Author: Krisztian VASAS Date: Mon Dec 10 23:11:16 2007 +0100 xfce4-xmms-plugin-0.5.1-3-i686 - rebuilt with new xfce4-panel diff --git a/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild b/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild index 5f56cb5..07fe2af 100644 --- a/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild +++ b/source/xfce4-extra/xfce4-xmms-plugin/FrugalBuild @@ -3,11 +3,11 @@ pkgname=xfce4-xmms-plugin pkgver=0.5.1 -pkgrel=2 +pkgrel=3 pkgdesc="An XMMS control plugin for the Xfce4 panel." url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xmms-plugin" makedepends=('intltool') -depends=('xfce4-panel>=4.4.0' 'xmms') +depends=('xfce4-panel>=4.4.2' 'xmms') groups=('xfce4-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://goodies.xfce.org/releases/$pkgname/ | grep tar.bz2 | Flasttarbz2" From iron at frugalware.org Mon Dec 10 23:18:05 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Dec 10 23:18:08 2007 Subject: [Frugalware-git] frugalware-current: xfmedia-0.9.2-2-i686 Message-ID: <20071210221805.B81BA1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b5cf8ae9b4a00c953937c40b64821aae004d25f commit 2b5cf8ae9b4a00c953937c40b64821aae004d25f Author: Krisztian VASAS Date: Mon Dec 10 23:18:00 2007 +0100 xfmedia-0.9.2-2-i686 - rebuilt with new libexo diff --git a/source/xfce4-extra/xfmedia/FrugalBuild b/source/xfce4-extra/xfmedia/FrugalBuild index 8383353..9c1cb71 100644 --- a/source/xfce4-extra/xfmedia/FrugalBuild +++ b/source/xfce4-extra/xfmedia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xfmedia pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="Xfmedia is a simple, easy-to-use media player based on the xine engine." url="http://spuriousinterrupt.org/projects/xfmedia/" up2date="lynx -dump $url|grep -i 'current release'|grep -o '[0-9][0-9\.]\+'|sed 's|.$||'" From crazy at frugalware.org Tue Dec 11 00:08:48 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 00:08:52 2007 Subject: [Frugalware-git] frugalware-current: lua-5.1.2-1-i686 Message-ID: <20071210230848.4A9801190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=895e0c6ac72c9b8dd979492eb0a9460f66b2d3ed commit 895e0c6ac72c9b8dd979492eb0a9460f66b2d3ed Author: crazy Date: Tue Dec 11 00:07:59 2007 +0100 lua-5.1.2-1-i686 * Version bump diff --git a/source/apps/lua/FrugalBuild b/source/apps/lua/FrugalBuild index b49fb9c..b85f80a 100644 --- a/source/apps/lua/FrugalBuild +++ b/source/apps/lua/FrugalBuild @@ -3,17 +3,17 @@ # Contributor: Laszlo Dvornik pkgname=lua -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=1 pkgdesc="A powerful light-weight programming language designed for extending applications." url="http://www.lua.org/" depends=('readline') groups=('apps' 'devel-core') archs=('i686' 'x86_64') -up2date="lynx -dump 'http://www.lua.org/ftp/'|grep -m1 'lua-5.1'|sed -n 's/.*-\(.*\).t.*/\1/;1 p'" +up2date="lynx -dump 'http://www.lua.org/ftp/'|Flasttar" source=($url/ftp/$pkgname-$pkgver.tar.gz \ - $pkgname-$pkgver-{cflags,prefix,sharedlibs}.diff) -sha1sums=('be13878ceef8e1ee7a4201261f0adf09f89f1005' \ + $pkgname-5.1.1-{cflags,prefix,sharedlibs}.diff) +sha1sums=('8a460d2d7e70e93cb72bf3d584405464763cb5f0' \ '0d5d6b2aeab1ca8bde5f65d77d40d5a23b79b2c8' \ 'd37a0602e3b77d0e51b1e615a69e902686fa0b29' \ '93d932a6bf9a691b4b2ecd6be41ff422a1aecf63') From crazy at frugalware.org Tue Dec 11 00:57:40 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 00:57:43 2007 Subject: [Frugalware-git] frugalware-current: dejavu-ttf-2.22-1-i686 Message-ID: <20071210235740.A217E1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1798105542a3b9b4cc37113e705494d3ec6a420b commit 1798105542a3b9b4cc37113e705494d3ec6a420b Author: crazy Date: Tue Dec 11 00:55:53 2007 +0100 dejavu-ttf-2.22-1-i686 * Version bump diff --git a/source/x11/dejavu-ttf/FrugalBuild b/source/x11/dejavu-ttf/FrugalBuild index f3a40cd..8024ace 100644 --- a/source/x11/dejavu-ttf/FrugalBuild +++ b/source/x11/dejavu-ttf/FrugalBuild @@ -2,10 +2,11 @@ # Maintainer: crazy pkgname=dejavu-ttf -pkgver=2.21 -pkgrel=2 +pkgver=2.22 +pkgrel=1 pkgdesc="DejaVu fonts" _F_sourceforge_dirname="dejavu" +_F_sourceforge_name="dejavu-fonts-ttf" _F_sourceforge_ext=".tar.bz2" _F_sourceforge_mirror="mesh" Finclude sourceforge @@ -14,12 +15,12 @@ makedepends=('fop-devel') groups=('x11' 'xorg-core' 'xorg-fonts') archs=('i686' 'x86_64') source=($source dejavu-ttf.xml) -sha1sums=('5f3d3362cf4e6fc269f9d429ab9d25d095e8af48' \ +sha1sums=('5b9812807bd33dfc20e99eeb4de4f8e5b93f30f8' \ 'e78cf8b8a2484540820629e93f73f794e061eeed') build() { - Fcd + Fcd $_F_sourceforge_name-$pkgver/ttf cp $Fsrcdir/dejavu-ttf.xml ./ for i in *.ttf do From crazy at frugalware.org Tue Dec 11 01:03:04 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 01:03:06 2007 Subject: [Frugalware-git] frugalware-current: dejavu-lgc-ttf-2.22-1-i686 Message-ID: <20071211000304.2CBCA1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c032ec725cc5acf74757e3c05043da81ab1f5ab commit 5c032ec725cc5acf74757e3c05043da81ab1f5ab Author: crazy Date: Tue Dec 11 01:01:37 2007 +0100 dejavu-lgc-ttf-2.22-1-i686 * Version bump diff --git a/source/x11/dejavu-lgc-ttf/FrugalBuild b/source/x11/dejavu-lgc-ttf/FrugalBuild index 996a10d..de11b2a 100644 --- a/source/x11/dejavu-lgc-ttf/FrugalBuild +++ b/source/x11/dejavu-lgc-ttf/FrugalBuild @@ -2,10 +2,11 @@ # Maintainer: crazy pkgname=dejavu-lgc-ttf -pkgver=2.21 +pkgver=2.22 pkgrel=1 pkgdesc="DejaVu fonts (LGC)" _F_sourceforge_dirname="dejavu" +_F_sourceforge_name="dejavu-lgc-fonts-ttf" _F_sourceforge_ext=".tar.bz2" _F_sourceforge_mirror="mesh" Finclude sourceforge @@ -15,9 +16,9 @@ archs=('i686' 'x86_64') build() { - Fcd + Fcd $_F_sourceforge_name-$pkgver/ttf Fmkdir /usr/lib/X11/fonts/TTF Ffilerel *.ttf /usr/lib/X11/fonts/TTF } -sha1sums=('6bc872ed7515b3c77e69f1ae8748ddba9a9e6659') +sha1sums=('e733d57f8a2eb6d200a6716d80d72560ef40d2e8') From crazy at frugalware.org Tue Dec 11 01:05:24 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 01:05:25 2007 Subject: [Frugalware-git] frugalware-current: speex-1.2beta3-1-i686 Message-ID: <20071211000524.6EEA51190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d64eb826c635e5d3b82837c0d6921e8c9da79cc commit 5d64eb826c635e5d3b82837c0d6921e8c9da79cc Author: crazy Date: Tue Dec 11 01:04:56 2007 +0100 speex-1.2beta3-1-i686 * Version bump diff --git a/source/multimedia/speex/FrugalBuild b/source/multimedia/speex/FrugalBuild index 17b915b..dc16637 100644 --- a/source/multimedia/speex/FrugalBuild +++ b/source/multimedia/speex/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=speex -pkgver=1.2beta2 +pkgver=1.2beta3 pkgrel=1 pkgdesc="Speex is an audio codec tuned for speech" url="http://www.speex.org/" @@ -11,7 +11,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.speex.org/downloads/|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" groups=('multimedia') source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('7a0c55763d71f2d845c65968964b1fb1b1897f2e') +sha1sums=('cebbf0dc38a7a8075f10f020c0c5cf43edb2ad35') build() { From crazy at frugalware.org Tue Dec 11 01:06:59 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 01:07:01 2007 Subject: [Frugalware-git] frugalware-current: lzma-4.32.4-1-i686 Message-ID: <20071211000659.2AB691190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ef3dfe78ac7b1ac9567fa28e652299348afd777c commit ef3dfe78ac7b1ac9567fa28e652299348afd777c Author: crazy Date: Tue Dec 11 01:06:42 2007 +0100 lzma-4.32.4-1-i686 * Version bump diff --git a/source/apps-extra/lzma/FrugalBuild b/source/apps-extra/lzma/FrugalBuild index e624ffb..b0ab702 100644 --- a/source/apps-extra/lzma/FrugalBuild +++ b/source/apps-extra/lzma/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Tuxbubling pkgname=lzma -pkgver=4.32.3 +pkgver=4.32.4 pkgrel=1 pkgdesc="High compression utility based on LZMA SDK" url="http://tukaani.org/" @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') options=('force') up2date="lynx -dump http://tukaani.org/lzma/download|grep -m1 .tar.gz|sed -e 's/.*]lzma-//' -e 's/.tar.gz//'" source=($url/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('6d1be75ee482b1086fa231aac82d62ea7a160608') +sha1sums=('54bf381006340e9ae5cb8aa2ae7d20ef6ada241e') if [ "$CARCH" == "x86_64" ]; then export CFLAGS="$CFLAGS -fPIC" From crazy at frugalware.org Tue Dec 11 01:17:51 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 01:17:54 2007 Subject: [Frugalware-git] frugalware-current: aria2-0.12.0-1-i686 Message-ID: <20071211001751.AFF6E1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e213d2ae6bbbdd4db8c649b6be3d6409b9cc7367 commit e213d2ae6bbbdd4db8c649b6be3d6409b9cc7367 Author: crazy Date: Tue Dec 11 01:17:01 2007 +0100 aria2-0.12.0-1-i686 * Version bump diff --git a/source/network-extra/aria2/FrugalBuild b/source/network-extra/aria2/FrugalBuild index da244a4..67fcece 100644 --- a/source/network-extra/aria2/FrugalBuild +++ b/source/network-extra/aria2/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=aria2 -pkgver=0.11.5 -pkgrel=2 +pkgver=0.12.0 +pkgrel=1 pkgdesc="aria2 is an utility for downloading files." depends=('openssl' 'libstdc++' 'cppunit' 'c-ares>=1.5.1') makedepends=('cvs' 'gnutls') @@ -13,9 +13,7 @@ archs=('i686' 'x86_64') _F_sourceforge_prefix="$pkgname-" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -source=($source c-ares.patch) -sha1sums=('93272ca14daf72cccd65140c09a54616a67d6850' \ - '3ac2666478dc1342ba3f3d50f29ff4b93ef34da9') +sha1sums=('138380000be0e5df2e3ee4cbb39c0f872cdb195b') build() { diff --git a/source/network-extra/aria2/c-ares.patch b/source/network-extra/aria2/c-ares.patch deleted file mode 100644 index 9b2b02f..0000000 --- a/source/network-extra/aria2/c-ares.patch +++ /dev/null @@ -1,166 +0,0 @@ -diff -Naur aria2-0.11.5/config.h.in aria2-0.11.5-p/config.h.in ---- aria2-0.11.5/config.h.in 2007-11-17 11:09:10.000000000 +0100 -+++ aria2-0.11.5-p/config.h.in 2007-11-26 13:35:34.000000000 +0100 -@@ -138,6 +138,9 @@ - /* Define to 1 if you have libcares. */ - #undef HAVE_LIBCARES - -+/* Define 1 if ares_host_callback accepts timeouts(c-ares >= 1.5) */ -+#undef HAVE_LIBCARES1_5 -+ - /* Define to 1 if you have libgcrypt. */ - #undef HAVE_LIBGCRYPT - -diff -Naur aria2-0.11.5/configure.ac aria2-0.11.5-p/configure.ac ---- aria2-0.11.5/configure.ac 2007-11-17 11:09:10.000000000 +0100 -+++ aria2-0.11.5-p/configure.ac 2007-11-26 13:35:34.000000000 +0100 -@@ -38,6 +38,9 @@ - AC_PROG_RANLIB - AC_PROG_YACC - -+# Setting language choice -+AC_LANG([C++]) -+ - # Checks for libraries. - if test "x$with_libxml2" = "xyes"; then - AM_PATH_XML2([2.6.24], [have_libxml2=yes]) -diff -Naur aria2-0.11.5/doc/Makefile.in aria2-0.11.5-p/doc/Makefile.in ---- aria2-0.11.5/doc/Makefile.in 2007-08-28 18:36:33.000000000 +0200 -+++ aria2-0.11.5-p/doc/Makefile.in 2007-11-26 13:35:34.000000000 +0100 -@@ -77,12 +77,12 @@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ --CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ - CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ - CPPUNIT_LIBS = @CPPUNIT_LIBS@ - CXX = @CXX@ -+CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ -diff -Naur aria2-0.11.5/m4/libcares.m4 aria2-0.11.5-p/m4/libcares.m4 ---- aria2-0.11.5/m4/libcares.m4 2007-08-28 18:36:33.000000000 +0200 -+++ aria2-0.11.5-p/m4/libcares.m4 2007-11-26 13:35:34.000000000 +0100 -@@ -16,10 +16,30 @@ - CPPFLAGS_save=$CPPFLAGS - - LIBS="-L$libcares_prefix_lib $LIBS" --CPPFLAGS="-I$libcares_prefix_include $CPPFLAGS" -+CPPFLAGS="-I$libcares_prefix_include -Wall $CPPFLAGS" - - AC_CHECK_LIB([cares], [ares_init], [have_libcares=yes]) -+ - if test "x$have_libcares" = "xyes"; then -+ -+ AC_MSG_CHECKING([whether ares_host_callback accepts timeouts(c-ares >= 1.5)]) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+ #include -+ -+ void callback(void* arg, int status, int timeouts, struct hostent* host); -+ ]], -+ [[ -+ ares_channel channel; -+ ares_gethostbyname(channel, "foo", 0, callback, 0); -+ ]])], -+ [have_libcares1_5=yes], -+ [have_libcares1_5=no]) -+ AC_MSG_RESULT([$have_libcares1_5]) -+ -+ if test "x$have_libcares1_5" = "xyes"; then -+ AC_DEFINE([HAVE_LIBCARES1_5], [1], [Define 1 if ares_host_callback accepts timeouts(c-ares >= 1.5)]) -+ fi -+ - AC_DEFINE([HAVE_LIBCARES], [1], [Define to 1 if you have libcares.]) - LIBCARES_LIBS="-L$libcares_prefix_lib -lcares" - LIBCARES_CPPFLAGS="-I$libcares_prefix_include" -diff -Naur aria2-0.11.5/m4/Makefile.in aria2-0.11.5-p/m4/Makefile.in ---- aria2-0.11.5/m4/Makefile.in 2007-08-28 18:36:33.000000000 +0200 -+++ aria2-0.11.5-p/m4/Makefile.in 2007-11-26 13:35:34.000000000 +0100 -@@ -73,12 +73,12 @@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ --CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ - CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ - CPPUNIT_LIBS = @CPPUNIT_LIBS@ - CXX = @CXX@ -+CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ -diff -Naur aria2-0.11.5/Makefile.in aria2-0.11.5-p/Makefile.in ---- aria2-0.11.5/Makefile.in 2007-11-17 11:09:10.000000000 +0100 -+++ aria2-0.11.5-p/Makefile.in 2007-11-26 13:35:34.000000000 +0100 -@@ -99,12 +99,12 @@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ --CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ - CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ - CPPUNIT_LIBS = @CPPUNIT_LIBS@ - CXX = @CXX@ -+CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ -diff -Naur aria2-0.11.5/src/Makefile.in aria2-0.11.5-p/src/Makefile.in ---- aria2-0.11.5/src/Makefile.in 2007-09-03 12:32:19.000000000 +0200 -+++ aria2-0.11.5-p/src/Makefile.in 2007-11-26 13:35:34.000000000 +0100 -@@ -516,12 +516,12 @@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ --CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@ - CPPUNIT_CONFIG = @CPPUNIT_CONFIG@ - CPPUNIT_LIBS = @CPPUNIT_LIBS@ - CXX = @CXX@ -+CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ -diff -Naur aria2-0.11.5/src/NameResolver.cc aria2-0.11.5-p/src/NameResolver.cc ---- aria2-0.11.5/src/NameResolver.cc 2007-08-28 18:36:33.000000000 +0200 -+++ aria2-0.11.5-p/src/NameResolver.cc 2007-11-26 13:35:34.000000000 +0100 -@@ -36,7 +36,11 @@ - - #ifdef ENABLE_ASYNC_DNS - -+#ifdef HAVE_LIBCARES1_5 -+void callback(void* arg, int status, int timeouts, struct hostent* host) { -+#else - void callback(void* arg, int status, struct hostent* host) { -+#endif // HAVE_LIBCARES1_5 - NameResolver* resolverPtr = (NameResolver*)arg; - #ifdef HAVE_LIBARES - // This block is required since the assertion in ares_strerror fails -diff -Naur aria2-0.11.5/src/NameResolver.h aria2-0.11.5-p/src/NameResolver.h ---- aria2-0.11.5/src/NameResolver.h 2007-08-28 18:36:33.000000000 +0200 -+++ aria2-0.11.5-p/src/NameResolver.h 2007-11-26 13:35:34.000000000 +0100 -@@ -48,10 +48,18 @@ - } /* end of extern "C" */ - #endif - -+#ifdef HAVE_LIBCARES1_5 -+void callback(void* arg, int status, int timeouts, struct hostent* host); -+#else - void callback(void* arg, int status, struct hostent* host); -+#endif // HAVE_LIBCARES1_5 - - class NameResolver { -+#ifdef HAVE_LIBCARES1_5 -+ friend void callback(void* arg, int status, int timeouts, struct hostent* host); -+#else - friend void callback(void* arg, int status, struct hostent* host); -+#endif // HAVE_LIBCARES1_5 - - public: - enum STATUS { From crazy at frugalware.org Tue Dec 11 01:21:33 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 01:21:45 2007 Subject: [Frugalware-git] frugalware-current: aria2fe-0.0.5-1-i686 Message-ID: <20071211002133.898CB1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d0f196f97988dc062f36ec8c257d1790045c5398 commit d0f196f97988dc062f36ec8c257d1790045c5398 Author: crazy Date: Tue Dec 11 01:21:16 2007 +0100 aria2fe-0.0.5-1-i686 * Version bump diff --git a/source/xapps-extra/aria2fe/FrugalBuild b/source/xapps-extra/aria2fe/FrugalBuild index 2a05fcb..7892a33 100644 --- a/source/xapps-extra/aria2fe/FrugalBuild +++ b/source/xapps-extra/aria2fe/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=aria2fe -pkgver=0.0.4 +pkgver=0.0.5 pkgrel=1 pkgdesc="A graphical user interface for aria2." depends=('libqtgui') @@ -13,7 +13,7 @@ _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://aria2fe.com/" -sha1sums=('b99369391b58f4b620ddb1046f166e11f18ae4f7') +sha1sums=('c093e5143bf9bac37c561cd8a5e20c1ef4f8bb08') build() { From crazy at frugalware.org Tue Dec 11 01:23:43 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 01:23:45 2007 Subject: [Frugalware-git] frugalware-current: dbus-python-0.82.4-1-i686 Message-ID: <20071211002343.93E731190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ee88692003333e3f5c5aec8a7fa5b9a9910f6266 commit ee88692003333e3f5c5aec8a7fa5b9a9910f6266 Author: crazy Date: Tue Dec 11 01:23:22 2007 +0100 dbus-python-0.82.4-1-i686 * Version bump diff --git a/source/apps/dbus-python/FrugalBuild b/source/apps/dbus-python/FrugalBuild index bcb8690..d0badbe 100644 --- a/source/apps/dbus-python/FrugalBuild +++ b/source/apps/dbus-python/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=dbus-python -pkgver=0.82.3 +pkgver=0.82.4 pkgrel=1 pkgdesc="Python bindings for D-BUS" url="http://www.freedesktop.org/wiki/Software_2fDBusBindings" @@ -12,6 +12,6 @@ groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump http://dbus.freedesktop.org/releases/dbus-python/|Flasttar" source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -signatures=(${source[0]}.asc) +sha1sums=('6675106364c3865a38a9196e314508e7aae2f8b6') # optimization OK From crazy at frugalware.org Tue Dec 11 01:48:56 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 01:48:58 2007 Subject: [Frugalware-git] frugalware-current: djvulibre-3.5.20_2-1-i686 Message-ID: <20071211004856.532BC1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=47a12f94dbc97654a9ed911ad8664ec0955b9737 commit 47a12f94dbc97654a9ed911ad8664ec0955b9737 Author: crazy Date: Tue Dec 11 01:47:57 2007 +0100 djvulibre-3.5.20_2-1-i686 * Version bump diff --git a/source/xlib/djvulibre/FrugalBuild b/source/xlib/djvulibre/FrugalBuild index 58c7970..b4d0a73 100644 --- a/source/xlib/djvulibre/FrugalBuild +++ b/source/xlib/djvulibre/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=djvulibre -pkgver=3.5.20 +pkgver=3.5.20_2 pkgrel=1 pkgdesc="DjVu is a web-centric format for distributing documents and images." depends=('libtiff' 'libjpeg') @@ -28,7 +28,7 @@ subinstall=djview.install build() { - Fcd + Fcd $pkgname-`echo $pkgver|sed 's/_.*//'` Fpatchall Fautoreconf unset MAKEFLAGS @@ -58,7 +58,7 @@ build() Fsplit djview usr/share/djvu/djview3 } -sha1sums=('88ec94512f3f7845b42c2585f75e07a9cf147380' \ +sha1sums=('0a726b7f1793262372b3e0fe30f398b0c7d48985' \ 'cc8bd12bc51a616a322819bb033c43dd489fff4e') # optimization OK From crazy at frugalware.org Tue Dec 11 02:08:54 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 02:08:57 2007 Subject: [Frugalware-git] frugalware-current: hermes-1.3.3-2-i686 Message-ID: <20071211010854.B13281190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4240c4631d9035b8e6e7956f1e607e2966ae84f8 commit 4240c4631d9035b8e6e7956f1e607e2966ae84f8 Author: crazy Date: Tue Dec 11 01:59:01 2007 +0100 hermes-1.3.3-2-i686 * missing _F_archive_name diff --git a/source/lib/hermes/FrugalBuild b/source/lib/hermes/FrugalBuild index 9b9722e..27238d3 100644 --- a/source/lib/hermes/FrugalBuild +++ b/source/lib/hermes/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=hermes +_F_archive_name=Hermes pkgver=1.3.3 pkgrel=2 pkgdesc="Hermes Graphics Library" @@ -13,7 +14,8 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://clanlib.org/download/legacy | grep Hermes | Flasttarbz2" source=(http://clanlib.org/download/legacy/Hermes-$pkgver.tar.bz2 \ $pkgname-$pkgver-destdir.patch) -sha1sums=('c760eb17fcbf2052907e42b637cd22c2b96657d6' 'd17a2fc63ca0e80dc7edd3dbd0a6a08075403982') +sha1sums=('c760eb17fcbf2052907e42b637cd22c2b96657d6' \ + 'd17a2fc63ca0e80dc7edd3dbd0a6a08075403982') build() { From crazy at frugalware.org Tue Dec 11 02:08:54 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 02:08:59 2007 Subject: [Frugalware-git] frugalware-current: python-empy-3.3-2-i686 Message-ID: <20071211010854.D001B1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=83471d47a41541507e0c62eba0c669728a29acdf commit 83471d47a41541507e0c62eba0c669728a29acdf Author: crazy Date: Tue Dec 11 02:08:43 2007 +0100 python-empy-3.3-2-i686 * up2date fix diff --git a/source/devel-extra/python-empy/FrugalBuild b/source/devel-extra/python-empy/FrugalBuild index 9fc70bc..d7197d6 100644 --- a/source/devel-extra/python-empy/FrugalBuild +++ b/source/devel-extra/python-empy/FrugalBuild @@ -5,10 +5,10 @@ pkgname=python-empy pkgver=3.3 pkgrel=2 pkgdesc="A powerful and robust templating system for Python" -url="http://alcyone.com/software/empy" +url="http://alcyone.com/software/empy/" source=(http://www.alcyone.com/software/empy/empy-latest.tar.gz) depends=('python') -up2date="lynx -dump http://packages.debian.org/unstable/python/python-empy |grep -m1 'Package'|sed 's/.*empy..//g'|sed 's/-.*//g'" +up2date="lynx -dump http://www.alcyone.com/software/empy/ |grep -m1 'current version of empy'|sed 's/.*is \(.*\)./\1/'" archs=('i686' 'x86_64') groups=('devel-extra') sha1sums=('dfc82202231143b9aabc81bd735c6f8a559b5109') From crazy at frugalware.org Tue Dec 11 04:47:38 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 04:47:47 2007 Subject: [Frugalware-git] playground: soprano-1.99_rc2-0playground1-i686 Message-ID: <20071211034738.4BA2C1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=78ed243b61c74c5193f590afb214b147ea59146d commit 78ed243b61c74c5193f590afb214b147ea59146d Author: crazy Date: Tue Dec 11 04:46:31 2007 +0100 soprano-1.99_rc2-0playground1-i686 * Version bump diff --git a/source/apps/soprano/FrugalBuild b/source/apps/soprano/FrugalBuild index f91afb0..e314dac 100644 --- a/source/apps/soprano/FrugalBuild +++ b/source/apps/soprano/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=soprano -pkgver=1.98.0_rc1 +pkgver=1.99_rc2 pkgrel=0playground1 pkgdesc="RDF storage, parsing, and serialization framework" depends=('libqtnetwork' 'qt4-qdbus' 'clucene' 'librdf' 'libqttest') @@ -14,7 +14,7 @@ _F_sourceforge_broken_up2date=1 _F_cd_path="$pkgname-`echo $pkgver|sed 's/_/-/'`" options=('scriptlet') Finclude sourceforge cmake -sha1sums=('96903d94d37ab571f1fa422127a1c1021db33b79') +sha1sums=('8e94131a3e9704db7f2f0a369a7e855d3f448a3f') ## TODO: Split subpkgs=("$pkgname-sesame2") From crazy at frugalware.org Tue Dec 11 05:40:38 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 05:40:41 2007 Subject: [Frugalware-git] playground: kdelibs-3.97.1_747077-0playground1-i686 Message-ID: <20071211044038.CD06E1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=585003f8c0951478037242e94fac3e6dfb46f48e commit 585003f8c0951478037242e94fac3e6dfb46f48e Author: crazy Date: Tue Dec 11 05:34:55 2007 +0100 kdelibs-3.97.1_747077-0playground1-i686 * Version bump diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index 371c995..9371801 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -2,21 +2,21 @@ # Maintainer: crazy pkgname=kdelibs -pkgver=3.96.1_744663 -pkgrel=0playground4 +pkgver=3.97.1_747077 +pkgrel=0playground1 pkgdesc="KDE4 Core Libraries." depends=('libqtsvg' 'libxpm' 'libxtst' 'strigi' 'xfsprogs-acl' 'pcre' 'soprano' \ 'heimdal' 'libqt3support' 'alsa-lib' 'libungif' 'qt4-designer' 'openexr' 'jasper' \ 'shared-mime-info' 'gamin' 'qt4-qdbus' 'bzip2' 'libqttest') rodepends=("libkde=$pkgver") # this is an 'depend' but it won't find it while is an subpackage -makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell') +makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell' 'libstrigiqtdbusclient') groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ flac.patch) -sha1sums=('347c9c48d507448d11ecdd3efdc2c3717d39af9a' \ +sha1sums=('0b7e3ccc0346a05bcd1d89c7e873c4acd404342a' \ '0ff2c4946a6f58c0dadc7b6bd1027f46fab66218') ## TODO: groups!!! From crazy at frugalware.org Tue Dec 11 05:57:26 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 05:57:29 2007 Subject: [Frugalware-git] playground: kdepimlibs-3.97.1_747063-0playground1-i686 Message-ID: <20071211045726.DDB401190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=b50d0dd36cd60abece83b1a4a30361ab072c924f commit b50d0dd36cd60abece83b1a4a30361ab072c924f Author: crazy Date: Tue Dec 11 05:56:19 2007 +0100 kdepimlibs-3.97.1_747063-0playground1-i686 * Version bump diff --git a/source/kde4/kdepimlibs/FrugalBuild b/source/kde4/kdepimlibs/FrugalBuild index 1957055..def36c5 100644 --- a/source/kde4/kdepimlibs/FrugalBuild +++ b/source/kde4/kdepimlibs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdepimlibs -pkgver=3.96.1_744361 +pkgver=3.97.1_747063 pkgrel=0playground1 pkgdesc="Personal Information Management (PIM) libraries for KDE4." depends=('libkde' 'libice' 'libxext' 'libxfixes' 'libqtgui' 'gamin' 'xfsprogs-attr' \ @@ -13,6 +13,6 @@ archs=('i686') options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('811f810e6d5fbd9e8fb6c0ad6d8720c9c42dccb0') +sha1sums=('fe58c3eaa459fb4e5f45fdf713ffa0e7ce266e1d') # optimization OK From crazy at frugalware.org Tue Dec 11 06:34:12 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 06:34:14 2007 Subject: [Frugalware-git] playground: kdebase-runtime-3.97.1_747048-0playground1-i686 Message-ID: <20071211053412.5CB451190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=d4cfa071ffe32f8107493f500599d27c6d74ea96 commit d4cfa071ffe32f8107493f500599d27c6d74ea96 Author: crazy Date: Tue Dec 11 06:12:51 2007 +0100 kdebase-runtime-3.97.1_747048-0playground1-i686 * Version bump diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild index a4d9fc2..49c9386 100644 --- a/source/kde4/kdebase-runtime/FrugalBuild +++ b/source/kde4/kdebase-runtime/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdebase-runtime -pkgver=3.96.1_744367 +pkgver=3.97.1_747048 pkgrel=0playground1 pkgdesc="Programs needed at runtime by other KDE4 applications" depends=('libqtsvg' 'libkde>=3.96.1_743104' 'openexr' 'libsmbclient' 'xine-lib' 'kdepimlibs>=3.96.1_742565') @@ -11,7 +11,7 @@ archs=('i686') options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 kdebase-runtime-kdesu.patch) -sha1sums=('aebe4a5690263045160db575b8ceafeec4474b9c' \ +sha1sums=('d52b0a9baa974163a8c8a0ae5b749a66350b5593' \ '258209c5a1b6161a5535412d07f8c3277f52a771') subpkgs=("kdebase-icons") From crazy at frugalware.org Tue Dec 11 07:08:37 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 07:08:39 2007 Subject: [Frugalware-git] playground: kdebase-workspace-3.97.1_747082-0playground1-i686 Message-ID: <20071211060837.A3FCE1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=7c0c210067b299aaf23e1be8c7c190d3bb8e55fd commit 7c0c210067b299aaf23e1be8c7c190d3bb8e55fd Author: crazy Date: Tue Dec 11 07:04:27 2007 +0100 kdebase-workspace-3.97.1_747082-0playground1-i686 * Version bump diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index a592847..436af92 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdebase-workspace -pkgver=3.96.1_744694 +pkgver=3.97.1_747082 pkgrel=0playground1 pkgdesc="Programs specific for the KDE4 desktop." depends=('libkde>=>=3.96.1_743104' 'libqt3support' 'libqtsvg' 'libxpm' 'strigi' 'xfsprogs-acl' 'libxtst' 'libqtopengl' 'libxres' \ @@ -19,7 +19,7 @@ source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ ksysguarddrc_use_config_install_dir.patch \ systemsettingsrc_use_config_install_dir.patch \ fix_some_icon_names_in_directory.patch) -sha1sums=('c665820a0801dbd5781a77467bf6ab19079e457e' \ +sha1sums=('e034828a9d7e4cd9366a29a41ff037b54734f5fb' \ 'c173303c33871f9fed4e33d16b323952a902d1aa' \ 'eed7fe30f80be191d4d63c6e2966d7276e961446' \ '1281378a0cc3ac2d52a11f3afdbf8d8b96e0f36f') From crazy at frugalware.org Tue Dec 11 07:33:20 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 07:33:22 2007 Subject: [Frugalware-git] playground: kdebase-3.97.1_747070-0playground1-i686 Message-ID: <20071211063320.02BC31190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=828da87c9f3b22c15af9e3558d7df8192e345e7f commit 828da87c9f3b22c15af9e3558d7df8192e345e7f Author: crazy Date: Tue Dec 11 07:29:54 2007 +0100 kdebase-3.97.1_747070-0playground1-i686 * Version bump diff --git a/source/kde4/kdebase/FrugalBuild b/source/kde4/kdebase/FrugalBuild index 51dacc1..8dc2022 100644 --- a/source/kde4/kdebase/FrugalBuild +++ b/source/kde4/kdebase/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdebase -pkgver=3.96.1_744669 +pkgver=3.97.1_747070 pkgrel=0playground1 pkgdesc="Basic programs for KDE4" depends=() @@ -13,7 +13,7 @@ options=('nomirror') _F_kde4_subpkgs=('dolphin' 'kfind' 'konsole' 'kwrite' 'kappfinder' 'konqueror-nsplugins' 'kdepasswd' 'kdialog' 'keditbookmarks' 'konqueror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('5ba2e5d70f457c40c9ee54746e36624eaefb6571') +sha1sums=('a7da165c7ae712ee6aa831131a22bcafa9b3bd66') subpkgs=("${_F_kde4_subpkgs[@]}" 'libkonq') subdescs=('File Manager.' \ @@ -50,8 +50,8 @@ build() kde4_split "lib/konq" libkonq - # shut up tar - Fmkdir usr/share/doc/$pkgname/DUMMY_PACKAGE_DO_NOT_USE + ## split it + kde4_install kinfocenter } From boobaa at frugalware.org Tue Dec 11 09:28:00 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Dec 11 09:28:02 2007 Subject: [Frugalware-git] frugalware-current: poedit-1.3.8-1-i686 Message-ID: <20071211082800.405A91190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c68cf4399569098c83b51a1269f9eae357172d87 commit c68cf4399569098c83b51a1269f9eae357172d87 Author: CSÉCSY László Date: Tue Dec 11 09:27:51 2007 +0100 poedit-1.3.8-1-i686 version bump diff --git a/source/xlib-extra/poedit/FrugalBuild b/source/xlib-extra/poedit/FrugalBuild index c9d69b8..b2209c2 100644 --- a/source/xlib-extra/poedit/FrugalBuild +++ b/source/xlib-extra/poedit/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László pkgname=poedit -pkgver=1.3.7 -pkgrel=3 +pkgver=1.3.8 +pkgrel=1 pkgdesc="cross-platform gettext catalogs (.po files) editor" url="http://www.poedit.org/" license="MIT" @@ -19,4 +19,4 @@ build() { } # optimization OK -sha1sums=('4086a1594e0af71fb664ac773d5e7700799ee8c9') +sha1sums=('6d7f812bfaadce61dde370eaf8692474f0ae026e') From vmiklos at frugalware.org Tue Dec 11 19:00:56 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 19:00:59 2007 Subject: [Frugalware-git] frugalware-current: stgit-0.14-1-i686 Message-ID: <20071211180056.A39141190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d27c22de06373471f71b9ca0df0f07bf42e12a44 commit d27c22de06373471f71b9ca0df0f07bf42e12a44 Author: Miklos Vajna Date: Tue Dec 11 19:00:36 2007 +0100 stgit-0.14-1-i686 version bump diff --git a/source/devel-extra/stgit/FrugalBuild b/source/devel-extra/stgit/FrugalBuild index 99a5c71..793f683 100644 --- a/source/devel-extra/stgit/FrugalBuild +++ b/source/devel-extra/stgit/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=stgit -pkgver=0.13 +pkgver=0.14 pkgrel=1 pkgdesc="Provides similar functionality to Quilt on top of GIT." url="http://www.procode.org/stgit/" @@ -11,4 +11,4 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|Flasttar" source=(http://homepage.ntlworld.com/cmarinas/stgit/stgit-$pkgver.tar.gz) -sha1sums=('0a2d7b8e5fc09f3ea7f62dbcd57881ea51d7595a') +sha1sums=('374f23d82d30ca0579d8077c43dd64dbbe4a6c15') From vmiklos at frugalware.org Tue Dec 11 20:02:50 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 20:02:53 2007 Subject: [Frugalware-git] frugalware-current: erlang-12B_0-1-i686 Message-ID: <20071211190250.A75151190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=009b00374362381ea5369bd32c18418464c7d3d4 commit 009b00374362381ea5369bd32c18418464c7d3d4 Author: Miklos Vajna Date: Tue Dec 11 20:02:09 2007 +0100 erlang-12B_0-1-i686 version bump diff --git a/source/devel-extra/erlang/FrugalBuild b/source/devel-extra/erlang/FrugalBuild index 60de54f..6b87d41 100644 --- a/source/devel-extra/erlang/FrugalBuild +++ b/source/devel-extra/erlang/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=erlang -pkgver=11B_5 +pkgver=12B_0 ertsver=5.5.5 interfacever=3.5.5.3 pkgrel=1 @@ -16,9 +16,9 @@ up2date="lynx -dump http://www.erlang.org/download.html|grep readme$|sed 's/.*_R source=(http://www.erlang.org/download/otp_src_R${pkgver/_/-}.tar.gz \ http://www.erlang.org/download/otp_doc_html_R${pkgver/_/-}.tar.gz \ http://www.erlang.org/download/otp_doc_man_R${pkgver/_/-}.tar.gz) -sha1sums=('c03569f0387b04b0afcc5f59983792676fd4382b' \ - 'a44439ec924c35896b3cdb534f5001daf6e2e8dd' \ - '3809faa63ac3420fd03291443bf0a73075a4781f') +sha1sums=('e2c6e18d22e34a799fc6bc25fa2d25eedb30bccc' \ + '5e2166519f7d9cbda4092d163d03a59f300368bb' \ + 'deba073069d7a8ae6d6c94c17e1eb45b5ec0f647') build() { From crazy at frugalware.org Tue Dec 11 20:40:47 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 20:40:49 2007 Subject: [Frugalware-git] playground: kdebase-runtime-3.97.1_747048-0playground1-i686 Message-ID: <20071211194047.2C2A81190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=3bf0a2ed032cb6904a42e17e142858a5ac9a3158 commit 3bf0a2ed032cb6904a42e17e142858a5ac9a3158 Author: crazy Date: Tue Dec 11 20:40:35 2007 +0100 kdebase-runtime-3.97.1_747048-0playground1-i686 * remove it , I have to export * $prefix/lib//kde4/libexec/ anyway .. how weird .. diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild index 49c9386..4b93166 100644 --- a/source/kde4/kdebase-runtime/FrugalBuild +++ b/source/kde4/kdebase-runtime/FrugalBuild @@ -10,9 +10,8 @@ groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') Finclude kde4 -source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 kdebase-runtime-kdesu.patch) -sha1sums=('d52b0a9baa974163a8c8a0ae5b749a66350b5593' \ - '258209c5a1b6161a5535412d07f8c3277f52a771') +source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) +sha1sums=('d52b0a9baa974163a8c8a0ae5b749a66350b5593') subpkgs=("kdebase-icons") subdescs=('Oxygen KDE4 Icons') diff --git a/source/kde4/kdebase-runtime/kdebase-runtime-kdesu.patch b/source/kde4/kdebase-runtime/kdebase-runtime-kdesu.patch deleted file mode 100644 index dabe3ad..0000000 --- a/source/kde4/kdebase-runtime/kdebase-runtime-kdesu.patch +++ /dev/null @@ -1,29 +0,0 @@ -pusling> crazy: it is a part of "kde cares about the distros" - - -Index: runtime/kdesu/kdesud/CMakeLists.txt -=================================================================== ---- runtime/kdesu/kdesud/CMakeLists.txt (Revision 738725) -+++ runtime/kdesu/kdesud/CMakeLists.txt (Arbeitskopie) -@@ -19,7 +19,7 @@ - endif(KDE4_ENABLE_FPIE) - - MESSAGE(STATUS "Create macro to display info at the end of install") --install(TARGETS kdesud PERMISSIONS SETGID OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${LIBEXEC_INSTALL_DIR}) -+install(TARGETS kdesud PERMISSIONS SETGID OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${BIN_INSTALL_DIR}) - - - ########### install files ############### -Index: runtime/kdesu/kdesu/CMakeLists.txt -=================================================================== ---- runtime/kdesu/kdesu/CMakeLists.txt (Revision 738725) -+++ runtime/kdesu/kdesu/CMakeLists.txt (Arbeitskopie) -@@ -16,7 +16,7 @@ - - target_link_libraries(kdesu_executable ${KDE4_KDEUI_LIBS} ${KDE4_KDESU_LIBS} ) - --install(TARGETS kdesu_executable DESTINATION ${LIBEXEC_INSTALL_DIR}) -+install(TARGETS kdesu_executable DESTINATION ${BIN_INSTALL_DIR}) - - - From vmiklos at frugalware.org Tue Dec 11 20:48:22 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 20:48:24 2007 Subject: [Frugalware-git] frugalware-current: valgrind-3.3.0-1-i686 Message-ID: <20071211194822.9B0CE1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d9f061d3ff6f22c61b541b72f71a9892934c9c8 commit 0d9f061d3ff6f22c61b541b72f71a9892934c9c8 Author: Miklos Vajna Date: Tue Dec 11 20:48:13 2007 +0100 valgrind-3.3.0-1-i686 version bump removed unnecessary build() diff --git a/source/devel-extra/valgrind/FrugalBuild b/source/devel-extra/valgrind/FrugalBuild index 5e4308f..645138b 100644 --- a/source/devel-extra/valgrind/FrugalBuild +++ b/source/devel-extra/valgrind/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=valgrind -pkgver=3.2.3 +pkgver=3.3.0 pkgrel=1 pkgdesc="Tools for debugging and profiling Linux programs." url="http://valgrind.org/" @@ -11,13 +11,8 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep Current|sed -n 's/.*-\(.*\)/\1/;$ p'" source=($url/downloads/$pkgname-$pkgver.tar.bz2) +sha1sums=('e2d0f3bcb4e6dd4638ceeddc9da8603b32efdf11') -build() -{ - if [ "$CARCH" == "x86_64" ]; then - Fbuild --enable-only64bit - else - Fbuild - fi -} -sha1sums=('550195a913997ff15f12eea484bd3fe636b25472') +if [ "$CARCH" == "x86_64" ]; then + Fconfopts="$Fconfopts --enable-only64bit" +fi From vmiklos at frugalware.org Tue Dec 11 20:50:35 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 20:50:36 2007 Subject: [Frugalware-git] frugalware-current: intltool-0.36.3-1-i686 Message-ID: <20071211195035.789921190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d4933385c5a68c6e8bc134762b83ae395a01b0d6 commit d4933385c5a68c6e8bc134762b83ae395a01b0d6 Author: Miklos Vajna Date: Tue Dec 11 20:50:30 2007 +0100 intltool-0.36.3-1-i686 version bump diff --git a/source/gnome/intltool/FrugalBuild b/source/gnome/intltool/FrugalBuild index 2fc3150..a3db291 100644 --- a/source/gnome/intltool/FrugalBuild +++ b/source/gnome/intltool/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=intltool -pkgver=0.36.2 +pkgver=0.36.3 pkgrel=1 pkgdesc="Contains scripts and autoconf magic for internationalizing various kinds of data files." url="http://www.gnome.org/" @@ -11,4 +11,4 @@ groups=('gnome') archs=('i686' 'x86_64') _F_gnome_devel=y Finclude gnome -sha1sums=('c2ccd02b7688eb0b299608cb446dc80cdcd18795') +sha1sums=('e1878d27b2947cea3359f1ea267ab5f88fa6a0e4') From vmiklos at frugalware.org Tue Dec 11 21:10:42 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 21:10:45 2007 Subject: [Frugalware-git] frugalware-current: giggle-0.4-1-i686 Message-ID: <20071211201042.3E99E1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2e6c61a49a3c0c64818bf8939d9bcd446a59d00 commit e2e6c61a49a3c0c64818bf8939d9bcd446a59d00 Author: Miklos Vajna Date: Tue Dec 11 21:10:35 2007 +0100 giggle-0.4-1-i686 new package closes #2600 diff --git a/source/gnome-extra/giggle/FrugalBuild b/source/gnome-extra/giggle/FrugalBuild new file mode 100644 index 0000000..c87ae76 --- /dev/null +++ b/source/gnome-extra/giggle/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.20 SBU +# Contributor: frubru1 +# Maintainer: VMiklos + +pkgname=giggle +pkgver=0.4 +pkgrel=1 +pkgdesc="Giggle is a graphical frontend for the git directory tracker (think of gitk on GTK+)." +url="http://developer.imendio.com/projects/giggle" +depends=('glib2' 'gtksourceview' 'libglade' 'git') +makedepends=('intltool') +groups=('gnome-extra') +archs=('i686' 'x86_64') +dummy="http://ftp.imendio.com/pub/imendio" +source=($dummy/$pkgname/src/$pkgname-$pkgver.tar.gz) +up2date="lynx -dump $dummy/$pkgname/src | Flasttar" +sha1sums=('6cb44e5a64a8279aee2e19e00d8714cd3b0f43aa') +_F_gnome_iconcache=y +_F_gnome_desktop=y +Finclude gnome-scriptlet + +# optimization OK From crazy at frugalware.org Tue Dec 11 21:15:34 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 21:15:36 2007 Subject: [Frugalware-git] playground: kdelibs-3.97.1_747313-0playground1-i686 Message-ID: <20071211201535.000EA1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=94cd79a9dd3ffa64d32ca47a13b268f66554f62b commit 94cd79a9dd3ffa64d32ca47a13b268f66554f62b Author: crazy Date: Tue Dec 11 21:09:30 2007 +0100 kdelibs-3.97.1_747313-0playground1-i686 * bump to an newer snapshot diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index 9371801..bdf14f6 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdelibs -pkgver=3.97.1_747077 +pkgver=3.97.1_747313 pkgrel=0playground1 pkgdesc="KDE4 Core Libraries." depends=('libqtsvg' 'libxpm' 'libxtst' 'strigi' 'xfsprogs-acl' 'pcre' 'soprano' \ @@ -16,7 +16,7 @@ options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ flac.patch) -sha1sums=('0b7e3ccc0346a05bcd1d89c7e873c4acd404342a' \ +sha1sums=('a9313eee508b479028341f3e881efded7f595784' \ '0ff2c4946a6f58c0dadc7b6bd1027f46fab66218') ## TODO: groups!!! From crazy at frugalware.org Tue Dec 11 21:17:02 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 21:17:03 2007 Subject: [Frugalware-git] playground: kdebase-workspace-3.97.1_747082-0playground1-i686 Message-ID: <20071211201702.59FCD1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=6bf13f388abd6faefb761659d3c0f628feb09ed1 commit 6bf13f388abd6faefb761659d3c0f628feb09ed1 Author: crazy Date: Tue Dec 11 21:16:51 2007 +0100 kdebase-workspace-3.97.1_747082-0playground1-i686 * add the pager by default to the panel diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index 436af92..630a135 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -18,11 +18,13 @@ Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ ksysguarddrc_use_config_install_dir.patch \ systemsettingsrc_use_config_install_dir.patch \ - fix_some_icon_names_in_directory.patch) + fix_some_icon_names_in_directory.patch \ + add-the-pager.patch) sha1sums=('e034828a9d7e4cd9366a29a41ff037b54734f5fb' \ 'c173303c33871f9fed4e33d16b323952a902d1aa' \ 'eed7fe30f80be191d4d63c6e2966d7276e961446' \ - '1281378a0cc3ac2d52a11f3afdbf8d8b96e0f36f') + '1281378a0cc3ac2d52a11f3afdbf8d8b96e0f36f' \ + '16bcaa98c03b7fc7dbf8a49bbeee0a445287441d') ## TODO: kdm ## FIXME: QT4 diff --git a/source/kde4/kdebase-workspace/add-the-pager.patch b/source/kde4/kdebase-workspace/add-the-pager.patch new file mode 100644 index 0000000..26fb154 --- /dev/null +++ b/source/kde4/kdebase-workspace/add-the-pager.patch @@ -0,0 +1,12 @@ +Index: libs/plasma/corona.cpp +=================================================================== +--- libs/plasma/corona.cpp (Revision 747313) ++++ libs/plasma/corona.cpp (Arbeitskopie) +@@ -269,6 +269,7 @@ + + // some default applets to get a usable UI + panel->addApplet("launcher"); ++ panel->addApplet("pager"); + panel->addApplet("tasks"); + panel->addApplet("systemtray"); + panel->addApplet("notifier"); From vmiklos at frugalware.org Tue Dec 11 21:27:57 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 21:27:59 2007 Subject: [Frugalware-git] frugalware-current: bzr-rebase-0.3-1-x86_64 Message-ID: <20071211202757.542D61190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e919404445473e0405dbcec494c9feab28ae9703 commit e919404445473e0405dbcec494c9feab28ae9703 Author: Miklos Vajna Date: Tue Dec 11 21:26:12 2007 +0100 bzr-rebase-0.3-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/bzr-rebase/FrugalBuild b/source/devel-extra/bzr-rebase/FrugalBuild index c49fc62..bfa81ee 100644 --- a/source/devel-extra/bzr-rebase/FrugalBuild +++ b/source/devel-extra/bzr-rebase/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Provides a 'bzr rebase' command, like the famous git-rebase." url="http://bazaar-vcs.org/Rebase" depends=('bzr') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url |Flasttar" source=(http://samba.org/~jelmer/bzr/bzr-rebase-$pkgver.tar.gz) signatures=($source.asc) From crazy at frugalware.org Tue Dec 11 21:29:03 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 21:29:05 2007 Subject: [Frugalware-git] playground: kdepimlibs-3.97.1_747159-0playground1-i686 Message-ID: <20071211202903.4406D1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=22882a30a4a719b3e47af36f2f242480b014f3ec commit 22882a30a4a719b3e47af36f2f242480b014f3ec Author: crazy Date: Tue Dec 11 21:27:55 2007 +0100 kdepimlibs-3.97.1_747159-0playground1-i686 * bump to an newer snapshot diff --git a/source/kde4/kdepimlibs/FrugalBuild b/source/kde4/kdepimlibs/FrugalBuild index def36c5..dbbf019 100644 --- a/source/kde4/kdepimlibs/FrugalBuild +++ b/source/kde4/kdepimlibs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdepimlibs -pkgver=3.97.1_747063 +pkgver=3.97.1_747159 pkgrel=0playground1 pkgdesc="Personal Information Management (PIM) libraries for KDE4." depends=('libkde' 'libice' 'libxext' 'libxfixes' 'libqtgui' 'gamin' 'xfsprogs-attr' \ @@ -13,6 +13,6 @@ archs=('i686') options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('fe58c3eaa459fb4e5f45fdf713ffa0e7ce266e1d') +sha1sums=('1eaa19505a1c13ca860a0164739466158ea3cd29') # optimization OK From vmiklos at frugalware.org Tue Dec 11 21:33:28 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 21:33:31 2007 Subject: [Frugalware-git] frugalware-current: pcsc-lite-1.4.4-1-x86_64 Message-ID: <20071211203328.6CF711190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dba956c5bd0cdf407e2642ffbc7b477379348f54 commit dba956c5bd0cdf407e2642ffbc7b477379348f54 Author: Miklos Vajna Date: Tue Dec 11 21:33:24 2007 +0100 pcsc-lite-1.4.4-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/pcsc-lite/FrugalBuild b/source/apps-extra/pcsc-lite/FrugalBuild index 082f8af..4041a9b 100644 --- a/source/apps-extra/pcsc-lite/FrugalBuild +++ b/source/apps-extra/pcsc-lite/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="PC/SC Architecture smartcard middleware library" url="http://www.linuxnet.com/middle.html" depends=('libusb' 'glibc') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') backup=('etc/pcsc/reader.conf') up2date="elinks -dump 'https://alioth.debian.org/frs/?group_id=30105'|grep 'pcsc-lite-\(.*\).tar.gz$'|Flasttar" # TODO init / cofig script(s) From vmiklos at frugalware.org Tue Dec 11 21:36:48 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 21:36:49 2007 Subject: [Frugalware-git] frugalware-current: ccid-1.3.1-1-x86_64 Message-ID: <20071211203648.5344C1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f015daaa5c90058d2aa92a8b7dcf44c793581c9 commit 1f015daaa5c90058d2aa92a8b7dcf44c793581c9 Author: Miklos Vajna Date: Tue Dec 11 21:36:45 2007 +0100 ccid-1.3.1-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/ccid/FrugalBuild b/source/apps-extra/ccid/FrugalBuild index eedb78f..ed45b67 100644 --- a/source/apps-extra/ccid/FrugalBuild +++ b/source/apps-extra/ccid/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="CCID free software driver" url="http://pcsclite.alioth.debian.org/ccid.html" depends=('pcsc-lite' 'udev') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') backup=('etc/etc/reader.conf') up2date="elinks -dump 'https://alioth.debian.org/frs/?group_id=30105'|grep 'ccid-\(.*\).tar.gz$'|Flasttar" source=(https://alioth.debian.org/frs/download.php/2193/$pkgname-$pkgver.tar.gz) From vmiklos at frugalware.org Tue Dec 11 21:43:29 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 21:43:32 2007 Subject: [Frugalware-git] frugalware-current: obexfs-0.8-1-x86_64 Message-ID: <20071211204329.AEB751190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad67bba439fa4b86037b3cc34ca41dd87a4c1689 commit ad67bba439fa4b86037b3cc34ca41dd87a4c1689 Author: Miklos Vajna Date: Tue Dec 11 21:43:20 2007 +0100 obexfs-0.8-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/obexfs/FrugalBuild b/source/apps-extra/obexfs/FrugalBuild index 3e1781f..b18b6c7 100644 --- a/source/apps-extra/obexfs/FrugalBuild +++ b/source/apps-extra/obexfs/FrugalBuild @@ -10,7 +10,7 @@ Finclude sourceforge url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFs" depends=('openobex' 'fuse' 'obexftp') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=8960&package_id=178407'|Flasttar" sha1sums=('99c0c54212a2fc874107efbc9ad2ba7ad2b7ab37') From crazy at frugalware.org Tue Dec 11 22:04:04 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 22:04:06 2007 Subject: [Frugalware-git] playground: kdebase-runtime-3.97.1_747187-0playground1-i686 Message-ID: <20071211210404.5E6A61190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=f130a234ca8efdce326e2d1b1cbafdd0fe8dc87c commit f130a234ca8efdce326e2d1b1cbafdd0fe8dc87c Author: crazy Date: Tue Dec 11 21:42:42 2007 +0100 kdebase-runtime-3.97.1_747187-0playground1-i686 * bump to an newer snapshot diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild index 4b93166..369b91e 100644 --- a/source/kde4/kdebase-runtime/FrugalBuild +++ b/source/kde4/kdebase-runtime/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdebase-runtime -pkgver=3.97.1_747048 +pkgver=3.97.1_747187 pkgrel=0playground1 pkgdesc="Programs needed at runtime by other KDE4 applications" depends=('libqtsvg' 'libkde>=3.96.1_743104' 'openexr' 'libsmbclient' 'xine-lib' 'kdepimlibs>=3.96.1_742565') @@ -11,7 +11,7 @@ archs=('i686') options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('d52b0a9baa974163a8c8a0ae5b749a66350b5593') +sha1sums=('25161ac209d761a3c9c5cd28e6d6537fe15f73e9') subpkgs=("kdebase-icons") subdescs=('Oxygen KDE4 Icons') From crazy at frugalware.org Tue Dec 11 22:40:08 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 22:40:16 2007 Subject: [Frugalware-git] playground: kdebase-workspace-3.97.1_747311-0playground1-i686 Message-ID: <20071211214008.E51051190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=3f6447557712760d261734f5c5c4e2f068177f28 commit 3f6447557712760d261734f5c5c4e2f068177f28 Author: crazy Date: Tue Dec 11 22:35:55 2007 +0100 kdebase-workspace-3.97.1_747311-0playground1-i686 * bump to an newer snapsho * removed 2 patches , need to fix different diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index 630a135..50e287c 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: crazy pkgname=kdebase-workspace -pkgver=3.97.1_747082 +pkgver=3.97.1_747311 pkgrel=0playground1 pkgdesc="Programs specific for the KDE4 desktop." depends=('libkde>=>=3.96.1_743104' 'libqt3support' 'libqtsvg' 'libxpm' 'strigi' 'xfsprogs-acl' 'libxtst' 'libqtopengl' 'libxres' \ 'lmsensors' 'libxcomposite' 'libxklavier' 'libxscrnsaver' 'qimageblitz' 'libqtscript' 'libcaptury' \ - 'libraw1394' 'bluez-libs' 'libstrigiqtdbusclient') + 'libraw1394' 'bluez-libs' 'libstrigiqtdbusclient' 'strigi-qt4-gui') makedepends=('libqtscript' 'qt4-designer') rodepends=('kde-frugalware>=0.9.0' 'xorg-server>=1.2.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop' 'xrdb' "$pkgname-libs=$pkgver") groups=('kde4' 'kde4-minimal') @@ -16,13 +16,9 @@ options=('nomirror') _F_cmake_confopts="$_F_cmake_confopts -DWITH_NetworkManager:BOOL=OFF" Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ - ksysguarddrc_use_config_install_dir.patch \ - systemsettingsrc_use_config_install_dir.patch \ fix_some_icon_names_in_directory.patch \ add-the-pager.patch) -sha1sums=('e034828a9d7e4cd9366a29a41ff037b54734f5fb' \ - 'c173303c33871f9fed4e33d16b323952a902d1aa' \ - 'eed7fe30f80be191d4d63c6e2966d7276e961446' \ +sha1sums=('8315391b7866bd6aee24bd6e985b16fe5707549f' \ '1281378a0cc3ac2d52a11f3afdbf8d8b96e0f36f' \ '16bcaa98c03b7fc7dbf8a49bbeee0a445287441d') diff --git a/source/kde4/kdebase-workspace/ksysguarddrc_use_config_install_dir.patch b/source/kde4/kdebase-workspace/ksysguarddrc_use_config_install_dir.patch deleted file mode 100644 index 799a6c7..0000000 --- a/source/kde4/kdebase-workspace/ksysguarddrc_use_config_install_dir.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: workspace/ksysguard/ksysguardd/CMakeLists.txt -=================================================================== ---- workspace/ksysguard/ksysguardd/CMakeLists.txt (Revision 738900) -+++ workspace/ksysguard/ksysguardd/CMakeLists.txt (Arbeitskopie) -@@ -4,7 +4,7 @@ - # Laurent: Verify that we install it into (kdeprefix)/etc/ and not into /etc - # otherwise it's necessary to change it. - # into kde 3.x it was installed into /etc/ --ADD_DEFINITIONS( -DKSYSGUARDDRCFILE=\"\\"${SYSCONF_INSTALL_DIR}/ksysguarddrc\\"\" ) -+ADD_DEFINITIONS( -DKSYSGUARDDRCFILE=\"\\"${CONFIG_INSTALL_DIR}/ksysguarddrc\\"\" ) - - ADD_DEFINITIONS(-DOSTYPE_${CMAKE_SYSTEM_NAME}) - -Index: workspace/ksysguard/example/CMakeLists.txt -=================================================================== ---- workspace/ksysguard/example/CMakeLists.txt (Revision 738900) -+++ workspace/ksysguard/example/CMakeLists.txt (Arbeitskopie) -@@ -1,2 +1,2 @@ --install( FILES ksysguarddrc DESTINATION ${SYSCONF_INSTALL_DIR} ) -+install( FILES ksysguarddrc DESTINATION ${CONFIG_INSTALL_DIR} ) - install( FILES ksysguard.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ksysguard ) diff --git a/source/kde4/kdebase-workspace/systemsettingsrc_use_config_install_dir.patch b/source/kde4/kdebase-workspace/systemsettingsrc_use_config_install_dir.patch deleted file mode 100644 index ca8dc5c..0000000 --- a/source/kde4/kdebase-workspace/systemsettingsrc_use_config_install_dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: workspace/systemsettings/CMakeLists.txt -=================================================================== ---- workspace/systemsettings/CMakeLists.txt (Revision 738900) -+++ workspace/systemsettings/CMakeLists.txt (Arbeitskopie) -@@ -26,7 +26,7 @@ - ########### install files ############### - - install( FILES systemsettings.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) --install( FILES systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR} ) -+install( FILES systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR} ) - install( FILES systemsettingsui.rc DESTINATION ${DATA_INSTALL_DIR}/systemsettings ) - - kde4_install_icons( ${ICON_INSTALL_DIR} ) From crazy at frugalware.org Tue Dec 11 23:11:18 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 23:11:21 2007 Subject: [Frugalware-git] playground: kdebase-3.97.1_747252-0playground1-i686 Message-ID: <20071211221118.AA94F1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=3abc4241cdab750485ba91a0a8d896e1b6c81164 commit 3abc4241cdab750485ba91a0a8d896e1b6c81164 Author: crazy Date: Tue Dec 11 23:07:54 2007 +0100 kdebase-3.97.1_747252-0playground1-i686 * bump to an newer snapshot diff --git a/source/kde4/kdebase/FrugalBuild b/source/kde4/kdebase/FrugalBuild index 8dc2022..b6ea0e9 100644 --- a/source/kde4/kdebase/FrugalBuild +++ b/source/kde4/kdebase/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdebase -pkgver=3.97.1_747070 +pkgver=3.97.1_747252 pkgrel=0playground1 pkgdesc="Basic programs for KDE4" depends=() @@ -13,7 +13,7 @@ options=('nomirror') _F_kde4_subpkgs=('dolphin' 'kfind' 'konsole' 'kwrite' 'kappfinder' 'konqueror-nsplugins' 'kdepasswd' 'kdialog' 'keditbookmarks' 'konqueror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('a7da165c7ae712ee6aa831131a22bcafa9b3bd66') +sha1sums=('cd14d9ab26842ea3dd13d9b80be70e04b366cae0') subpkgs=("${_F_kde4_subpkgs[@]}" 'libkonq') subdescs=('File Manager.' \ From crazy at frugalware.org Tue Dec 11 23:43:18 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 23:43:21 2007 Subject: [Frugalware-git] playground: kde-frugalware-0.9.0-0playground3-i686 Message-ID: <20071211224318.E0BA01190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=e38263b099a4b1eff470f32a3db1168ee87a61a4 commit e38263b099a4b1eff470f32a3db1168ee87a61a4 Author: crazy Date: Tue Dec 11 23:42:37 2007 +0100 kde-frugalware-0.9.0-0playground3-i686 * release bump * new kdmrc file * added kde4-path.sh diff --git a/source/kde4/kde-frugalware/FrugalBuild b/source/kde4/kde-frugalware/FrugalBuild index c203851..f71dbd0 100644 --- a/source/kde4/kde-frugalware/FrugalBuild +++ b/source/kde4/kde-frugalware/FrugalBuild @@ -3,24 +3,26 @@ pkgname=kde-frugalware pkgver=0.9.0 -pkgrel=0playground2 +pkgrel=0playground3 pkgdesc="KDE4 artwork for Frugalware Linux." url="http://ftp.frugalware.org/pub/other/kde/kde-frugalware/" depends=() -backup=('etc/kde4/config/kdm/kdmrc') +#backup=('etc/kde4/config/kdm/kdmrc') rodepends=('kdebase-icons' 'kdebase-runtime') options=('nodocs') groups=('kde4') archs=('i686') up2date="$pkgver" #source=(http://ftp.frugalware.org/pub/other/sources/kde/$pkgname/$pkgname-$pkgver.tar.bz2) -source=(kdmrc) +source=(kdmrc kde4-path.sh) build() { cd $Fsrcdir || Fdie - Ffilerel kdmrc /etc/kde4/config/kdm/kdmrc + Ffilerel /etc/kde4/config/kdm/kdmrc + Fexerel /etc/profile.d/kde4-path.sh } -sha1sums=('b3753827f6b1648913f61d8cf7bce1e9c5e4d09e') +sha1sums=('8a6eeca32c07d53eb0a93c42dcc2eea74e5ee955' \ + 'fc36cc3a5ccd745fd7614adabfabafd88c2d72fa') diff --git a/source/kde4/kde-frugalware/kde4-path.sh b/source/kde4/kde-frugalware/kde4-path.sh new file mode 100755 index 0000000..6904d71 --- /dev/null +++ b/source/kde4/kde-frugalware/kde4-path.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +## really DrUnK , there are bin progs ... +## /usr/sbin is TEMP ( I hope ) workaround for other issues + +export PATH=$PATH:/usr/lib/kde4/libexec:/usr/sbin diff --git a/source/kde4/kde-frugalware/kdmrc b/source/kde4/kde-frugalware/kdmrc index 9daca06..520a38f 100644 --- a/source/kde4/kde-frugalware/kdmrc +++ b/source/kde4/kde-frugalware/kdmrc @@ -1,88 +1,578 @@ +# KDM master configuration file +# +# Definition: the greeter is the login dialog, i.e., the part of KDM +# which the user sees. +# +# You can configure every X-display individually. +# Every display has a display name, which consists of a host name +# (which is empty for local displays specified in {Static|Reserve}Servers), +# a colon, and a display number. Additionally, a display belongs to a +# display class (which can be ignored in most cases; the control center +# does not support this feature at all). +# Sections with display-specific settings have the formal syntax +# "[X-" host [":" number [ "_" class ]] "-" sub-section "]" +# You can use the "*" wildcard for host, number, and class. You may omit +# trailing components; they are assumed to be "*" then. +# The host part may be a domain specification like ".inf.tu-dresden.de". +# It may also be "+", which means non-empty, i.e. remote displays only. +# From which section a setting is actually taken is determined by these +# rules: +# - an exact match takes precedence over a partial match (for the host part), +# which in turn takes precedence over a wildcard ("+" taking precedence +# over "*") +# - precedence decreases from left to right for equally exact matches +# Example: display name "myhost:0", class "dpy". +# [X-myhost:0_dpy] precedes +# [X-myhost:0_*] (same as [X-myhost:0]) precedes +# [X-myhost:*_dpy] precedes +# [X-myhost:*_*] (same as [X-myhost]) precedes +# [X-+:0_dpy] precedes +# [X-*:0_dpy] precedes +# [X-*:0_*] (same as [X-*:0]) precedes +# [X-*:*_*] (same as [X-*]) +# These sections do NOT match this display: +# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*] +# If a setting is not found in any matching section, the default is used. +# +# Every comment applies to the following section or key. Note that all +# comments will be lost if you change this file with the kcontrol frontend. +# The defaults refer to KDM's built-in values, not anything set in this file. +# +# Special characters need to be backslash-escaped (leading and trailing +# spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the +# backslash itself (\\)). +# In lists, fields are separated with commas without whitespace in between. +# Some command strings are subject to simplified sh-style word splitting: +# single quotes (') and double quotes (") have the usual meaning; the backslash +# quotes everything (not only special characters). Note that the backslashes +# need to be doubled because of the two levels of quoting. + [General] -ConfigVersion=2.3 -ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6 -PidFile=/var/run/kdm.pid -RandomDevice=/dev/urandom +# This option exists solely for the purpose of a clean automatic upgrade. +# Do not even think about changing it! +ConfigVersion=2.4 +# List of permanent displays. Displays with a hostname are foreign. A display +# class may be specified separated by an underscore. +# Default is ":0" +StaticServers=:0 +# List of on-demand displays. See StaticServers for syntax. +# Default is "" ReserveServers=:1,:2,:3 +# VTs to allocate to X-servers. A negative number means that the VT will be +# used only if it is free. If all VTs in this list are used up, the next free +# one greater than the last one in this list will be allocated. +# Default is "" ServerVTs=-7 -StaticServers=:0 +# TTYs (without /dev/) to monitor for activity while in console mode. +# Default is "" +ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6 +# Where KDM should store its PID (do not store if empty). +# Default is "" +PidFile=/var/run/kdm.pid +# Whether KDM should lock the PID file to prevent having multiple KDM +# instances running at once. Do not change unless you are brave. +# Default is true +#LockPidFile=false +# Where to store authorization files. +# Default is "/var/run/xauth" +#AuthDir=/tmp +# Whether KDM should automatically re-read configuration files, if it +# finds them having changed. +# Default is true +#AutoRescan=false +# Additional environment variables KDM should pass on to all programs it runs. +# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates; +# otherwise, it should not be necessary very often. +# Default is "" +#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR +# A character device KDM should read entropy from. +# Empty means use the system's preferred entropy device. +# Default is "" +#RandomDevice=/dev/altrandom +# Where the command sockets should be created; make it empty to disable +# them. +# Default is "/var/run/xdmctl" +#FifoDir=/tmp +# The group to which the global command socket should belong; +# can be either a name or a numerical ID. +# Default is 0 +#FifoGroup=xdmctl +# The directory in which KDM should store persistent working data. +# Default is "/var/lib/kdm" +#DataDir= +# The directory in which KDM should store users' .dmrc files. This is only +# needed if the home directories are not readable before actually logging in +# (like with AFS). +# Default is "" +#DmrcDir=/nfs-shared/var/dmrcs + +[Xdmcp] +# Whether KDM should listen to incoming XDMCP requests. +# Default is true +Enable=false +# The UDP port on which KDM should listen for XDMCP requests. Do not change. +# Default is 177 +#Port=177 +# File with the private keys of X-terminals. Required for XDM authentication. +# Default is "" +#KeyFile=/etc/kde4/config/kdm/kdmkeys +# XDMCP access control file in the usual XDM-Xaccess format. +# Default is "/etc/kde4/config/kdm/Xaccess" +#Xaccess= +# Number of seconds to wait for display to respond after the user has +# selected a host from the chooser. +# Default is 15 +#ChoiceTimeout=10 +# Strip domain name from remote display names if it is equal to the local +# domain. +# Default is true +#RemoveDomainname=false +# Use the numeric IP address of the incoming connection on multihomed hosts +# instead of the host name. +# Default is false +#SourceAddress=true +# The program which is invoked to dynamically generate replies to XDMCP +# DirectQuery or BroadcastQuery requests. +# If empty, no program is invoked and "Willing to manage" is sent. +# Default is "" +Willing=/etc/kde4/config/kdm/Xwilling [Shutdown] +# The command (subject to word splitting) to run to halt the system. +# Default is "/sbin/halt" +#HaltCmd= +# The command (subject to word splitting) to run to reboot the system. +# Default is "/sbin/reboot" +#RebootCmd= +# Whether it is allowed to shut down the system via the global command socket. +# Default is false +#AllowFifo=true +# Whether it is allowed to abort active sessions when shutting down the +# system via the global command socket. +# Default is true +#AllowFifoNow=false +# The boot manager KDM should use for offering boot options in the +# shutdown dialog. +# "None" - no boot manager +# "Grub" - Grub boot manager +# "Lilo" - Lilo boot manager (Linux on i386 & x86-64 only) +# Default is None BootManager=Grub -HaltCmd=/sbin/halt -RebootCmd=/sbin/reboot +# Rough estimations about how many seconds KDM will spend at most on +# - opening a connection to the X-server (OpenTime) if the attempt +# - times out: OpenTimeout +# - is refused: OpenRepeat * OpenDelay +# - starting a local X-server (ServerTime): +# ServerAttempts * (ServerTimeout + OpenDelay) +# - starting a display: +# - local display: ServerTime + OpenTime +# - foreign display: StartAttempts * OpenTime +# - XDMCP display: OpenTime (repeated indefinitely by client) + +# Core config for all displays [X-*-Core] -AllowNullPasswd=false -AllowRootLogin=false -AllowSdForceNow=Root -AllowShutdown=Root -AutoReLogin=false -ClientLogFile=.xsession-errors -DefaultSdMode=ForceNow -Reset=/etc/kde4/config/kdm/Xreset -ScheduledSd=Optional -Session=/etc/kde4/config/kdm/Xsession +# How long to wait before retrying to connect a display. +# Default is 15 +#OpenDelay=15 +# How long to wait before timing out a display connection attempt. +# Default is 120 +#OpenTimeout=120 +# How many connection attempts to make during a start attempt. Note that +# a timeout aborts the entire start attempt. +# Default is 5 +#OpenRepeat=5 +# Try at most that many times to start a display. If this fails, the display +# is disabled. +# Default is 4 +#StartAttempts=4 +# Ping remote display every that many minutes. +# Default is 5 +#PingInterval=5 +# Wait for a Pong that many minutes. +# Default is 5 +#PingTimeout=5 +# The name of this X-server's Xauth file. +# If empty, a random name in the AuthDir directory will be used. +# Default is "" +#AuthFile= +# Specify a file with X-resources for the greeter, chooser and background. +# The KDE frontend does not use this file, so you do not need it unless you +# use another background generator than krootimage. +# Default is "" +#Resources= +# The xrdb program to use to read the above specified recources. +# Subject to word splitting. +# Default is "/usr/bin/xrdb" +#Xrdb= +# A program to run before the greeter is shown. Can be used to start an +# xconsole or an alternative background generator. Subject to word splitting. +# Default is "" Setup=/etc/kde4/config/kdm/Xsetup +# A program to run before a user session starts. Subject to word splitting. +# Default is "" Startup=/etc/kde4/config/kdm/Xstartup -SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,/usr/share/apps/kdm/sessions +# A program to run after a user session exits. Subject to word splitting. +# Default is "" +Reset=/etc/kde4/config/kdm/Xreset +# The program which is run as the user which logs in. It is supposed to +# interpret the session argument (see SessionsDirs) and start an appropriate +# session according to it. Subject to word splitting. +# Default is "/usr/bin/xterm -ls -T" +Session=/etc/kde4/config/kdm/Xsession +# The program to run if Session fails. +# Default is "/usr/bin/xterm" +#FailsafeClient= +# The PATH for the Session program. +# Default is "/usr/local/bin:/usr/bin:/bin:/usr/games" +#UserPath= +# The PATH for Setup, Startup and Reset, etc. +# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +#SystemPath= +# The default system shell. +# Default is "/bin/sh" +#SystemShell=/bin/bash +# Where to put the user's X-server authorization file if ~/.Xauthority +# cannot be created. +# Default is "/tmp" +#UserAuthDir= +# If true, UserAuthDir will be used unconditionally. +# Default is false +#ForceUserAuthDir=true +# Whether to automatically restart sessions after X-server crashes. +# Note that enabling this makes circumventing screen lockers other than +# KDE's built-in one possible! +# Default is false +#AutoReLogin=true +# Allow root logins? +# Default is true +AllowRootLogin=false +# Allow to log in, when user has set an empty password? +# Default is true +AllowNullPasswd=false +# Who is allowed to shut down the system. This applies both to the +# greeter and to the command sockets. +# "None" - no "Shutdown..." menu entry is shown at all +# "Root" - the root password must be entered to shut down +# "All" - everybody can shut down the machine +# Default is All +AllowShutdown=Root +# Who is allowed to abort active sessions when shutting down. +# "None" - no forced shutdown is allowed at all +# "Root" - the root password must be entered to shut down forcibly +# "All" - everybody can shut down the machine forcibly +# Default is All +AllowSdForceNow=Root +# The default choice for the shutdown condition/timing. +# "Schedule" - shut down after all active sessions exit (possibly at once) +# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing +# "ForceNow" - shut down unconditionally +# Default is Schedule +#DefaultSdMode=ForceNow +# How to offer shutdown scheduling options: +# "Never" - not at all +# "Optional" - as a button in the simple shutdown dialogs +# "Always" - instead of the simple shutdown dialogs +# Default is Never +#ScheduledSd=Optional +# The directories containing session type definitions in .desktop format, +# ordered by falling priority. +# Default is "/usr/share/apps/kdm/sessions" +SessionsDirs=/etc/kde4/config/kdm/sessions,/usr/share/apps/kdm/sessions +# The file (relative to $HOME) to redirect the session output to. The +# following character pairs are replaced: +# - %d -> current display +# - %u -> current user +# - %r -> empty at first. See below. +# - %% -> a single % +# When the constructed filename cannot be used safely and the specification +# contains %r, other names will be tried - this time expanding %r +# to followed by a random number. +# Default is ".xsession-errors" +ClientLogFile=.xsession-errors-%d +# Fallback when ClientLogFile cannot be used. The same expansions are +# supported. DO NOT use relative paths here. +# Default is "/tmp/xerr-%u-%d%-r" +#ClientLogFallback=/var/log/xsession-errors/%u-%d%-r +# Whether KDM's built-in utmp/wtmp/lastlog registration should be used. +# Default is true +#UseSessReg=false +# Greeter config for all displays [X-*-Greeter] -AntiAliasing=true -ColorScheme= -EchoMode=OneStar -FaceSource=AdminOnly -FailFont=DejaVu Sans,13,-1,5,75,0,0,0,0,0 -ForgingSeed=1130862489 -GUIStyle= -#GreetFont=DejaVu Sans,24,-1,5,75,0,0,0,0,0 -#GreetString= -GreeterPos=50,50 -HiddenUsers=root -#Language= +# Specify the widget style for the greeter. Empty means to use the +# built-in default which currently is "Oxygen". +# Default is "" +#GUIStyle=Plastique +# Widget color scheme of the greeter. "" means the built-in default which +# currently is yellowish grey with some light blue and yellow elements. +# Default is "" +#ColorScheme=Pumpkin +# What should be shown in the greeter's logo are: +# "None" - nothing +# "Logo" - the image specified by LogoPixmap +# "Clock" - a neat analog clock +# Default is Clock LogoArea=Logo -#LogoPixmap=/usr/share/apps/kdm/pics/frugalware.png +# The image to show when LogoArea=Logo. +# Default is "" +LogoPixmap=/usr/share/apps/kdm/pics/kdelogo.png +# The relative coordinates (X,Y in percent) of the center of the greeter. +# Default is "50,50" +#GreeterPos=30,40 +# The screen the greeter should be displayed on in multi-headed and Xinerama +# setups. The numbering starts with 0. For Xinerama, it corresponds to the +# listing order in the active ServerLayout section of XF86Config; -1 means +# to use the upper-left screen, -2 means to use the upper-right screen. +# Default is 0 +#GreeterScreen=-1 +# The headline in the greeter. The following character pairs are replaced: +# - %d -> current display +# - %h -> host name, possibly with domain name +# - %n -> node name, most probably the host name without domain name +# - %s -> the operating system +# - %r -> the operating system's version +# - %m -> the machine (hardware) type +# - %% -> a single % +# Default is "Welcome to %s at %n" +#GreetString=K Desktop Environment (%n) +# Whether the fonts used in the greeter should be antialiased. +# Default is false +#AntiAliasing=true +# The font for the greeter headline. +# Default is "Serif,20,bold" +#GreetFont=Serif,20,5,0,50,0 +# The normal font used in the greeter. +# Default is "Sans Serif,10" +#StdFont=Sans Serif,10,5,0,50,0 +# The font used for the "Login Failed" message. +# Default is "Sans Serif,10,bold" +#FailFont=Sans Serif,10,5,0,75,0 +# What to do with the Num Lock modifier for the time the greeter is running: +# "Off" - turn off +# "On" - turn on +# "Keep" - do not change the state +# Default is Keep +#NumLock=Off +# Language and locale to use in the greeter, encoded like $LANGUAGE. +# If empty, the settings from the environment are used. +# Default is "" +#Language=de_DE +# Enable autocompletion in the username line edit. +# Default is false +UserCompletion=true +# Enable user list (names along with images) in the greeter. +# Default is true +UserList=false +# User selection for UserCompletion and UserList: +# "NotHidden" - all users except those listed in HiddenUsers +# "Selected" - only the users listed in SelectedUsers +# Default is NotHidden +#ShowUsers=Selected +# For ShowUsers=Selected. @ means all users in that group. +# Default is "" +#SelectedUsers=root,johndoe +# For ShowUsers=NotHidden. @ means all users in that group. +# Default is "" +HiddenUsers=root +# Special case of HiddenUsers: users with a non-zero UID less than this number +# will not be shown as well. +# Default is 0 +MinShowUID=500 +# Complement to MinShowUID: users with a UID greater than this number will +# not be shown as well. +# Default is 65535 MaxShowUID=65000 -MinShowUID=1000 -NumLock=On +# If false, the users are listed in the order they appear in /etc/passwd. +# If true, they are sorted alphabetically. +# Default is true +#SortUsers=false +# Specify, where the users' pictures should be taken from. +# "AdminOnly" - from /$USER.face[.icon] +# "PreferAdmin" - prefer , fallback on $HOME +# "PreferUser" - ... and the other way round +# "UserOnly" - from the user's $HOME/.face[.icon] +# Default is AdminOnly +FaceSource=PreferUser +# The directory containing the user images if FaceSource is not UserOnly. +# Default is "/usr/share/apps/kdm/faces" +#FaceDir=/usr/share/faces +# Specify, if/which user should be preselected for log in. +# "None" - do not preselect any user +# "Previous" - the user which successfully logged in last time +# "Default" - the user specified in the DefaultUser option +# Default is None +#PreselectUser=Previous +# If this is true, the password input line is focused automatically if +# a user is preselected. +# Default is false +#FocusPasswd=true +# If this is true, the entered password is echoed as bullets. Otherwise, +# no feedback is given at all. +# Default is true +#EchoPasswd=false +# If true, krootimage will be automatically started by KDM; otherwise, the +# Setup script should be used to setup the background. +# Default is true +#UseBackground=false +# The configuration file to be used by krootimage. +# Default is "/etc/kde4/config/kdm/backgroundrc" +#BackgroundCfg= +# Hold the X-server grabbed the whole time the greeter is visible. This +# may be more secure, but it will disable any background and other +# X-clients started from the Setup script. +# Default is false +#GrabServer=true +# How many seconds to wait for grab to succeed. +# Default is 3 +#GrabTimeout=3 +# Warn, if display has no X-authorization (local auth cannot be created, +# XDMCP display wants no auth, or display is foreign from StaticServers). +# Default is true +#AuthComplain=false +# Random seed for forging saved session types, etc. of unknown users. +# This value should be random but constant across the login domain. +# Default is 0 +ForgingSeed=1197408830 +# Specify conversation plugins for the login dialog. Each plugin can be +# specified as a base name (which expands to $kde_modulesdir/kgreet_$base) +# or as a full pathname. +# Default is "classic" +#PluginsLogin=sign +# Same as PluginsLogin, but for the shutdown dialog. +# Default is "classic" +#PluginsShutdown=modern +# A list of options of the form Key=Value. The conversation plugins can query +# these settings; it is up to them what possible keys are. +# Default is "" +#PluginOptions=SomeKey=randomvalue,Foo=bar +# Show the "Console Login" action in the greeter (if ServerTTY/ConsoleTTYs +# is configured). +# Default is true +#AllowConsole=false +# A program to run while the greeter is visible. It is supposed to preload +# as much as possible of the session that is going to be started (most +# probably). +# Default is "" #Preloader=/usr/bin/preloadkde -SelectedUsers=@users -ShowUsers=Selected -SortUsers=true -FaceDir=/usr/share/apps/kdm/pics/users -StdFont=DejaVu Sans,13,-1,5,50,0,0,0,0,0 -#Theme=/usr/share/apps/kdm/themes/circles -UseBackground=true -UseTheme=false -UserCompletion=false -UserList=true - +# Whether the greeter should be themed. +# Default is false +#UseTheme=true +# The theme to use for the greeter. Can point to either a directory or an XML +# file. +# Default is "" +Theme=/usr/share/apps/kdm/themes/circles +# Core config for local displays [X-:*-Core] -AllowNullPasswd=false -AllowShutdown=Root -NoPassEnable=false -NoPassUsers= -ServerArgsLocal=-br -nolisten tcp dpms +# How often to try to run the X-server. Running includes executing it and +# waiting for it to come up. +# Default is 1 +#ServerAttempts=1 +# How long to wait for a local X-server to come up. +# Default is 15 +#ServerTimeout=15 +# The command line to start the X-server, without display number and VT spec. +# This string is subject to word splitting. +# Default is "/usr/bin/X" ServerCmd=/usr/bin/X +# Additional arguments for the X-servers for local sessions. +# This string is subject to word splitting. +# Default is "" +ServerArgsLocal=-nolisten tcp +# Additional arguments for the X-servers for remote sessions. +# This string is subject to word splitting. +# Default is "" +#ServerArgsRemote= +# Restart instead of resetting the local X-server after session exit. +# Use it if the server leaks memory etc. +# Default is false +#TerminateServer=true +# The signal needed to reset the local X-server. +# Default is 1 (SIGHUP) +#ResetSignal=1 +# The signal needed to terminate the local X-server. +# Default is 15 (SIGTERM) +#TermSignal=15 +# Create X-authorizations for local displays. +# Default is true +#Authorize=false +# Which X-authorization mechanisms should be used. +# Default is "MIT-MAGIC-COOKIE-1" +#AuthNames= +# Need to reset the X-server to make it read initial Xauth file. +# Default is false +#ResetForAuth=true +# See above +AllowNullPasswd=true +# See above +AllowShutdown=All +# Enable password-less logins on this display. USE WITH EXTREME CARE! +# Default is false +#NoPassEnable=true +# The users that do not need to provide a password to log in. NEVER list root! +# "*" means all non-root users. @ means all users in that group. +# Default is "" +#NoPassUsers=fred,ethel +# Greeter config for local displays [X-:*-Greeter] -AllowClose=false -DefaultUser= -FocusPasswd=false -LoginMode=DefaultLocal +# See above PreselectUser=Previous +# See above +FocusPasswd=true +# Specify whether the greeter of local displays should start up in host chooser +# (remote) or login (local) mode and whether it is allowed to switch to the +# other mode. +# "LocalOnly" - only local login possible +# "DefaultLocal" - start up in local mode, but allow switching to remote mode +# "DefaultRemote" - ... and the other way round +# "RemoteOnly" - only choice of remote host possible +# Default is LocalOnly +LoginMode=DefaultLocal +# A list of hosts to be automatically added to the remote login menu. The +# special name "*" means broadcast. +# Default is "*" +#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com +# Show the "Restart X Server"/"Close Connection" action in the greeter. +# Default is true +AllowClose=false +# Core config for 1st local display [X-:0-Core] -AutoLoginAgain=false -AutoLoginDelay=0 -AutoLoginEnable=false -AutoLoginLocked=false -#AutoLoginUser=foo +# The VT the X-server should run on; auto-assign if zero, don't assign if -1. +# Better leave it zero and use ServerVTs. +# Default is 0 +#ServerVT=7 +# Enable automatic login. USE WITH EXTREME CARE! +# Default is false +#AutoLoginEnable=true +# If true, auto-login after logout. If false, auto-login is performed only +# when a display session starts up. +# Default is false +#AutoLoginAgain=true +# The delay in seconds before automatic login kicks in. +# Default is 0 +#AutoLoginDelay=10 +# The user to log in automatically. NEVER specify root! +# Default is "" +#AutoLoginUser=fred +# The password for the user to log in automatically. This is NOT required +# unless the user is logged into a NIS or Kerberos domain. If you use this +# option, you should "chmod 600 kdmrc" for obvious reasons. +# Default is "" +#AutoLoginPass=secret! +# Immediately lock the automatically started session. This works only with +# KDE sessions. +# Default is false +#AutoLoginLocked=true +# See above ClientLogFile=.xsession-errors -[Xdmcp] -Enable=false -Willing=/etc/kde4/config/kdm/Xwilling -Xaccess=/etc/kde4/config/kdm/Xaccess - +# Greeter config for 1st local display +[X-:0-Greeter] +# See above +#PreselectUser=Default +# The user to preselect if PreselectUser=Default. +# Default is "" +#DefaultUser=johndoe From crazy at frugalware.org Tue Dec 11 23:50:13 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 11 23:50:16 2007 Subject: [Frugalware-git] playground: kdeadmin-3.97.1_746368-0playground1-i686 Message-ID: <20071211225013.7164C1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=ec4f731e3f531f094c2b4d462d8caf767e80728f commit ec4f731e3f531f094c2b4d462d8caf767e80728f Author: crazy Date: Tue Dec 11 23:49:51 2007 +0100 kdeadmin-3.97.1_746368-0playground1-i686 * Version bump diff --git a/source/kde4/kdeadmin/FrugalBuild b/source/kde4/kdeadmin/FrugalBuild index 9a26706..d2ae063 100644 --- a/source/kde4/kdeadmin/FrugalBuild +++ b/source/kde4/kdeadmin/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdeadmin -pkgver=3.96.1_743877 +pkgver=3.97.1_746368 pkgrel=0playground1 pkgdesc="KDE Administration Programs" depends=('libkde>=3.96.1_743104' 'libqtsvg' 'kdepimlibs>=3.96.1_742565') @@ -13,7 +13,7 @@ options=('nomirror') _F_cmake_confopts="-DBUILD_kpackage:BOOL=OFF -DBUILD_knetworkconf:BOOL=OFF" Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('c0d2dfa69b92732f5c160694c6051a9c8954d9a7') +sha1sums=('f53914d8f4f3f975089c080084e0254835d8f198') build() From vmiklos at frugalware.org Tue Dec 11 23:52:51 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 23:52:52 2007 Subject: [Frugalware-git] frugalware-current: scm.sh: svn up2date change Message-ID: <20071211225251.608021190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bbdeccb38f7b5c61ad776879242e424e93e53691 commit bbdeccb38f7b5c61ad776879242e424e93e53691 Author: Miklos Vajna Date: Tue Dec 11 23:52:17 2007 +0100 scm.sh: svn up2date change change pkgver suggestion, for example: svn961 instead of 961 diff --git a/source/include/scm.sh b/source/include/scm.sh index 0915ab5..979b892 100644 --- a/source/include/scm.sh +++ b/source/include/scm.sh @@ -85,7 +85,7 @@ elif [ "$_F_scm_type" == "cvs" ]; then up2date="date +%Y%m%d" makedepends=(${makedepends[@]} 'cvs') elif [ "$_F_scm_type" == "subversion" ]; then - up2date="svn log $_F_scm_url --limit=1 |sed -n '/^r/s/r\([0-9]\+\) .*/\1/p'" + up2date="echo -n svn; svn log $_F_scm_url --limit=1 |sed -n '/^r/s/r\([0-9]\+\) .*/\1/p'" makedepends=(${makedepends[@]} 'subversion') elif [ "$_F_scm_type" == "git" ]; then up2date="date +%Y%m%d%H%M%S --date '`curl -I $_F_scm_url/HEAD 2>&1|sed -n '/^Last-Modified/s/^[^:]*: //p'`'" From vmiklos at frugalware.org Tue Dec 11 23:53:46 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 11 23:53:47 2007 Subject: [Frugalware-git] bmf: libdvdnav2-svn961-2bmf1-i686 Message-ID: <20071211225346.518301190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=c2557da1775be5ae9540e11da600b289156255d8 commit c2557da1775be5ae9540e11da600b289156255d8 Author: Miklos Vajna Date: Tue Dec 11 23:53:36 2007 +0100 libdvdnav2-svn961-2bmf1-i686 update to newer snapshot and move to /usr/lib/libdvdnav2 so that it won't conflict with libdvdnav diff --git a/source/lib-extra/libdvdnav2/FrugalBuild b/source/lib-extra/libdvdnav2/FrugalBuild index 8c09508..fb56c59 100644 --- a/source/lib-extra/libdvdnav2/FrugalBuild +++ b/source/lib-extra/libdvdnav2/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=libdvdnav2 -pkgver=svn956 -pkgrel=1 +pkgver=svn961 +pkgrel=2bmf1 pkgdesc="MPlayer's fork of libdvdnav" url="http://mplayerhq.hu" depends=('glibc') @@ -19,7 +19,9 @@ build() Funpack_scm sed -i '/\.\/configure/d' autogen.sh sh autogen.sh || return 1 - Fbuild + Fbuild --prefix=/usr/lib/libdvdnav2 + Fmv /usr/lib/libdvdnav2/bin /usr + Fmv /usr/bin/dvdnav-config /usr/bin/dvdnav2-config } # optimization OK From crazy at frugalware.org Wed Dec 12 00:31:19 2007 From: crazy at frugalware.org (crazy) Date: Wed Dec 12 00:31:20 2007 Subject: [Frugalware-git] playground: kdenetwork-3.97.1_747054-0playground1-i686 Message-ID: <20071211233119.17C251190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=aacb801b86736e9058d5bb328a51dfe93656884f commit aacb801b86736e9058d5bb328a51dfe93656884f Author: crazy Date: Wed Dec 12 00:26:38 2007 +0100 kdenetwork-3.97.1_747054-0playground1-i686 * Version bump diff --git a/source/kde4/kdenetwork/FrugalBuild b/source/kde4/kdenetwork/FrugalBuild index 1d7429b..6a1af52 100644 --- a/source/kde4/kdenetwork/FrugalBuild +++ b/source/kde4/kdenetwork/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: crazy pkgname=kdenetwork -pkgver=3.96.1_744609 +pkgver=3.97.1_747054 pkgrel=0playground1 pkgdesc="KDE Networking Programs" depends=() makedepends=('openslp' 'libvncserver' 'kdepimlibs>=3.96.1_742565' 'libidn' 'qca' 'kdebase-workspace-libs>=3.96.1_743091' \ - 'sqlite3' 'decibel' 'avahi-compat' 'libqtsvg' 'libqtnetwork' 'qimageblitz') + 'sqlite3' 'decibel' 'avahi-compat' 'libqtsvg' 'libqtnetwork' 'qimageblitz' 'boost') groups=('kde4') archs=('i686') options=('nomirror') # empty _F_kde4_subpkgs=('kget' 'knewsticker' 'kopete' 'kppp' 'krdc' 'krfb' "$pkgname-filesharing" 'kdnssd') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('7c727d63cf1a4991c4132df10f8453546bad1556') +sha1sums=('fbd7110754aac3d3b4c59339dbc5c6ecb010a387') ## TODO : init script for lisad ## NOTE to self =) filesharing need samba , kdnssd ahavi 'running' to work right. From vmiklos at frugalware.org Wed Dec 12 00:38:15 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 00:38:22 2007 Subject: [Frugalware-git] bmf: mplayer-1.0rc2-3bmf2-i686 Message-ID: <20071211233815.6E72F1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=5af649683a2ae9c104afc6bf54b3b80f43442a95 commit 5af649683a2ae9c104afc6bf54b3b80f43442a95 Author: Miklos Vajna Date: Wed Dec 12 00:38:03 2007 +0100 mplayer-1.0rc2-3bmf2-i686 - release bump - fixed build with newer libdvdnav2 diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild index 6714991..5806b9d 100644 --- a/source/xapps/mplayer/FrugalBuild +++ b/source/xapps/mplayer/FrugalBuild @@ -4,7 +4,7 @@ pkgname=mplayer pkgver=1.0rc2 pkgextraver= -pkgrel=3bmf1 +pkgrel=3bmf2 pkgdesc="The Movie Player" url="http://www.mplayerhq.hu/" depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \ @@ -49,8 +49,8 @@ build() Fconf --confdir=/etc/mplayer --enable-gui --language=all \ --enable-runtime-cpudetection --enable-liblzo \ --enable-largefiles --enable-mga --enable-xmga \ - --enable-tdfxfb --disable-vidix-internal --enable-dvdnav \ - --enable-debug + --enable-tdfxfb --disable-vidix-internal \ + --with-dvdnav-config=dvdnav2-config Fsed '^\(OPTFLAGS = .*\)' '\1 -fomit-frame-pointer' config.mak make || Fdie make DESTDIR=$Fdestdir install || Fdie From vmiklos at frugalware.org Wed Dec 12 00:52:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 00:52:10 2007 Subject: [Frugalware-git] bmf: libdvdnav2-svn961-2bmf2-i686 Message-ID: <20071211235210.13D2F1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=2d2afd5851e8a5d258e942787dde778bfbfc5fa6 commit 2d2afd5851e8a5d258e942787dde778bfbfc5fa6 Author: Miklos Vajna Date: Wed Dec 12 00:52:04 2007 +0100 libdvdnav2-svn961-2bmf2-i686 forgot to rename the m4 file diff --git a/source/lib-extra/libdvdnav2/FrugalBuild b/source/lib-extra/libdvdnav2/FrugalBuild index fb56c59..65e4a9f 100644 --- a/source/lib-extra/libdvdnav2/FrugalBuild +++ b/source/lib-extra/libdvdnav2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libdvdnav2 pkgver=svn961 -pkgrel=2bmf1 +pkgrel=2bmf2 pkgdesc="MPlayer's fork of libdvdnav" url="http://mplayerhq.hu" depends=('glibc') @@ -22,6 +22,7 @@ build() Fbuild --prefix=/usr/lib/libdvdnav2 Fmv /usr/lib/libdvdnav2/bin /usr Fmv /usr/bin/dvdnav-config /usr/bin/dvdnav2-config + Fmv /usr/share/aclocal/dvdnav.m4 /usr/share/aclocal/dvdnav2.m4 } # optimization OK From crazy at frugalware.org Wed Dec 12 01:05:19 2007 From: crazy at frugalware.org (crazy) Date: Wed Dec 12 01:05:21 2007 Subject: [Frugalware-git] playground: kdeutils-3.97.1_746842-0playground1-i686 Message-ID: <20071212000519.687A41190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=635f9c69e9cab610fb53395adc31cca57704c524 commit 635f9c69e9cab610fb53395adc31cca57704c524 Author: crazy Date: Wed Dec 12 01:01:44 2007 +0100 kdeutils-3.97.1_746842-0playground1-i686 * Version bump diff --git a/source/kde4/kdeutils/FrugalBuild b/source/kde4/kdeutils/FrugalBuild index 4dfb25b..0e04cdb 100644 --- a/source/kde4/kdeutils/FrugalBuild +++ b/source/kde4/kdeutils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdeutils -pkgver=3.96.1_744699 +pkgver=3.97.1_746842 pkgrel=0playground1 pkgdesc="KDE General Utilities" depends=() @@ -13,7 +13,7 @@ options=('nomirror') # empty _F_kde4_subpkgs=('kgpg' 'superkaramba' 'ktimer' 'khexedit' 'kfloppy' 'ark' 'kjots' 'kcalc' 'kdessh' 'sweeper' 'kwallet' 'kcharselect') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('6befb1fcf1cca32828595de7d1c9d15df186df71') +sha1sums=('156a3f56f463a39b3f9ff02b73851cb935950ea2') subpkgs=("${_F_kde4_subpkgs[@]}" 'kwikdisk' 'kregexpeditor' 'libkmilo' 'kmilo-asus' 'kmilo-dell' 'kmilo-thinkpad' 'kmilo-vaio') From crazy at frugalware.org Wed Dec 12 01:27:47 2007 From: crazy at frugalware.org (crazy) Date: Wed Dec 12 01:27:49 2007 Subject: [Frugalware-git] playground: kdemultimedia-3.97.1_747179-0playground1-i686 Message-ID: <20071212002747.EEA351190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=8f837dab149d8662166289c0f98f267f00ee33da commit 8f837dab149d8662166289c0f98f267f00ee33da Author: crazy Date: Wed Dec 12 01:26:20 2007 +0100 kdemultimedia-3.97.1_747179-0playground1-i686 * Version bump diff --git a/source/kde4/kdemultimedia/FrugalBuild b/source/kde4/kdemultimedia/FrugalBuild index 38e4df5..f6e96d9 100644 --- a/source/kde4/kdemultimedia/FrugalBuild +++ b/source/kde4/kdemultimedia/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdemultimedia -pkgver=3.96.1_744422 +pkgver=3.97.1_747179 pkgrel=0playground1 pkgdesc="KDE Multimedia Programs" depends=() @@ -15,7 +15,7 @@ _F_kde4_subpkgs=('juk' 'kmix' 'kscd' 'libkcddb' 'libkcompactdisc') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ flac.patch) -sha1sums=('a122cb500f263ceabfe49116926867fb9f9bb409' \ +sha1sums=('750c04650d640d728d006d48b17cf558c96f2e47' \ '26bdd6cd8a68b1a60753a12b29260265393e63f9') subpkgs=("${_F_kde4_subpkgs[@]}" "$pkgname-audiocd-kio") From crazy at frugalware.org Wed Dec 12 01:45:05 2007 From: crazy at frugalware.org (crazy) Date: Wed Dec 12 01:45:07 2007 Subject: [Frugalware-git] playground: kdegraphics-3.97.1_747259-0playground1-i686 Message-ID: <20071212004505.6DC7C1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=a2c6bda4dfd7502cdb0ad78dbbb762436c468f5f commit a2c6bda4dfd7502cdb0ad78dbbb762436c468f5f Author: crazy Date: Wed Dec 12 01:42:51 2007 +0100 kdegraphics-3.97.1_747259-0playground1-i686 * Version bump diff --git a/source/kde4/kdegraphics/FrugalBuild b/source/kde4/kdegraphics/FrugalBuild index 2651908..6bc1520 100644 --- a/source/kde4/kdegraphics/FrugalBuild +++ b/source/kde4/kdegraphics/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdegraphics -pkgver=3.96.1_744494 +pkgver=3.97.1_747259 pkgrel=0playground1 pkgdesc="KDE Graphics Programs" depends=('libqtnetwork' 'libkde' 'libqtsvg') @@ -13,7 +13,7 @@ options=('nomirror') _F_kde4_subpkgs=('gwenview' 'kamera' 'kolourpaint' 'kruler' 'ksnapshot' 'okular' 'libkscan' 'kcolorchooser' 'svgpart') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('23e499f44bd8675a2ce0df6b114178843b388661') +sha1sums=('4691db6aa5d3167641a0284307f40e3f9b538253') ## TODO: srigi stuff for 4.1 subpkgs=("${_F_kde4_subpkgs[@]}") From crazy at frugalware.org Wed Dec 12 02:43:38 2007 From: crazy at frugalware.org (crazy) Date: Wed Dec 12 02:43:41 2007 Subject: [Frugalware-git] playground: kdesdk-3.97.1_747279-0playground1-i686 Message-ID: <20071212014338.7566A1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=bcc6d4ba67c531d14403744dea49069b410594ee commit bcc6d4ba67c531d14403744dea49069b410594ee Author: crazy Date: Wed Dec 12 02:40:35 2007 +0100 kdesdk-3.97.1_747279-0playground1-i686 * Version bump diff --git a/source/kde4/kdesdk/FrugalBuild b/source/kde4/kdesdk/FrugalBuild index 5d64d23..97c0280 100644 --- a/source/kde4/kdesdk/FrugalBuild +++ b/source/kde4/kdesdk/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdesdk -pkgver=3.96.1_744599 +pkgver=3.97.1_747279 pkgrel=0playground1 pkgdesc="KDE Software Development Kit." depends=('libkde>=3.96.1_743104' 'libqtsvg' 'kdepimlibs') @@ -10,10 +10,11 @@ makedepends=('libqtnetwork' 'subversion' 'kdebase-workspace-libs') groups=('kde4') archs=('i686') options=('nomirror') +_F_cmake_confopts="-DBUILD_kompare:BOOL=OFF" _F_kde4_subpkgs=('umbrello' 'kbugbuster' 'kcachegrind' 'cervisia') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('00299154a0c7b3f825198009dd794954037ba45a') +sha1sums=('09d33279efecd77a28f180d81a55fb2c93746251') subpkgs=("${_F_kde4_subpkgs[@]}" 'kate' 'kuiviewer' "$pkgname-kio") subdescs=('UML Modeller.' \ From devil505linux at gmail.com Wed Dec 12 09:45:33 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Dec 12 09:45:35 2007 Subject: [Frugalware-git] frugalware-current: silly-0.1.0-1-i686 Message-ID: <20071212084533.127FA1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0b698836a56f6418f1556ea039691c20fdd3d984 commit 0b698836a56f6418f1556ea039691c20fdd3d984 Author: Devil505 Date: Wed Dec 12 09:43:38 2007 +0100 silly-0.1.0-1-i686 *New Package (from hermier) diff --git a/source/xlib/silly/FrugalBuild b/source/xlib/silly/FrugalBuild new file mode 100644 index 0000000..f449dcf --- /dev/null +++ b/source/xlib/silly/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.12 SBU +# Maintainer: Devil505 +# Contributor: Hermier + +pkgname=silly +pkgver=0.1.0 +pkgrel=1 +pkgdesc="Simple Image Loading LibrarY." +_F_sourceforge_name="SILLY" +_F_sourceforge_dirname="crayzedsgui" +_F_sourceforge_broken_up2date="1" +Finclude sourceforge +depends=('libjpeg' 'libpng' 'libstdc++') +groups=('xlib-extra') +archs=('i686') +sha1sums=('ef5c8ed6c5c57d7d792dbb9e02006c3770334869') +_F_cd_path="SILLY-$pkgver" +# optimization OK From devil505linux at gmail.com Wed Dec 12 10:23:00 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Dec 12 10:23:05 2007 Subject: [Frugalware-git] frugalware-current: *Remove silly, wrong package group Message-ID: <20071212092300.6B3021190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f45c89b103aeec51f556c86936a4b6ff0336488 commit 4f45c89b103aeec51f556c86936a4b6ff0336488 Author: Devil505 Date: Wed Dec 12 10:22:48 2007 +0100 *Remove silly, wrong package group diff --git a/source/xlib/silly/FrugalBuild b/source/xlib/silly/FrugalBuild deleted file mode 100644 index f449dcf..0000000 --- a/source/xlib/silly/FrugalBuild +++ /dev/null @@ -1,18 +0,0 @@ -# Compiling Time: 0.12 SBU -# Maintainer: Devil505 -# Contributor: Hermier - -pkgname=silly -pkgver=0.1.0 -pkgrel=1 -pkgdesc="Simple Image Loading LibrarY." -_F_sourceforge_name="SILLY" -_F_sourceforge_dirname="crayzedsgui" -_F_sourceforge_broken_up2date="1" -Finclude sourceforge -depends=('libjpeg' 'libpng' 'libstdc++') -groups=('xlib-extra') -archs=('i686') -sha1sums=('ef5c8ed6c5c57d7d792dbb9e02006c3770334869') -_F_cd_path="SILLY-$pkgver" -# optimization OK From devil505linux at gmail.com Wed Dec 12 10:28:08 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Dec 12 10:28:10 2007 Subject: [Frugalware-git] frugalware-current: silly-0.1.0-1-i686 Message-ID: <20071212092808.568261190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5bea6f09032a52a004b03d818783116c37ca39df commit 5bea6f09032a52a004b03d818783116c37ca39df Author: Devil505 Date: Wed Dec 12 10:27:32 2007 +0100 silly-0.1.0-1-i686 *New Package diff --git a/source/xlib-extra/silly/FrugalBuild b/source/xlib-extra/silly/FrugalBuild new file mode 100644 index 0000000..f449dcf --- /dev/null +++ b/source/xlib-extra/silly/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.12 SBU +# Maintainer: Devil505 +# Contributor: Hermier + +pkgname=silly +pkgver=0.1.0 +pkgrel=1 +pkgdesc="Simple Image Loading LibrarY." +_F_sourceforge_name="SILLY" +_F_sourceforge_dirname="crayzedsgui" +_F_sourceforge_broken_up2date="1" +Finclude sourceforge +depends=('libjpeg' 'libpng' 'libstdc++') +groups=('xlib-extra') +archs=('i686') +sha1sums=('ef5c8ed6c5c57d7d792dbb9e02006c3770334869') +_F_cd_path="SILLY-$pkgver" +# optimization OK From devil505linux at gmail.com Wed Dec 12 11:17:46 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Dec 12 11:17:48 2007 Subject: [Frugalware-git] frugalware-current: *added x86_64 to archs() Message-ID: <20071212101746.7F6F51190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4a2b3950170574c0b2f84b85cbd342fb04c8c61 commit a4a2b3950170574c0b2f84b85cbd342fb04c8c61 Author: Devil505 Date: Wed Dec 12 11:17:26 2007 +0100 *added x86_64 to archs() diff --git a/source/xlib-extra/silly/FrugalBuild b/source/xlib-extra/silly/FrugalBuild index f449dcf..03933a5 100644 --- a/source/xlib-extra/silly/FrugalBuild +++ b/source/xlib-extra/silly/FrugalBuild @@ -12,7 +12,7 @@ _F_sourceforge_broken_up2date="1" Finclude sourceforge depends=('libjpeg' 'libpng' 'libstdc++') groups=('xlib-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('ef5c8ed6c5c57d7d792dbb9e02006c3770334869') _F_cd_path="SILLY-$pkgver" # optimization OK From devil505linux at gmail.com Wed Dec 12 11:46:38 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Dec 12 11:46:40 2007 Subject: [Frugalware-git] frugalware-current: cegui-0.5.0b-3-i686 Message-ID: <20071212104638.409381190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39ea3d7145a838da8cb3a385e2cc29ca735df0c5 commit 39ea3d7145a838da8cb3a385e2cc29ca735df0c5 Author: Devil505 Date: Wed Dec 12 11:46:07 2007 +0100 cegui-0.5.0b-3-i686 *Rebuilt with silly diff --git a/source/xlib-extra/cegui/FrugalBuild b/source/xlib-extra/cegui/FrugalBuild index 8255ea0..bbcf417 100644 --- a/source/xlib-extra/cegui/FrugalBuild +++ b/source/xlib-extra/cegui/FrugalBuild @@ -3,9 +3,9 @@ pkgname=cegui pkgver=0.5.0b -pkgrel=2 +pkgrel=3 pkgdesc="Crazy Eddie's GUI System is a free library providing windowing and widgets for graphics APIs/engines" -depends=('freetype2' 'pcre' 'xerces-c>=2.8.0' 'libgcc' 'freeglut' 'libgl' 'libsm' 'libxext' 'libxdamage' 'expat' 'libxml2') +depends=('freetype2' 'pcre' 'xerces-c>=2.8.0' 'libgcc' 'freeglut' 'libgl' 'libsm' 'libxext' 'libxdamage' 'expat' 'libxml2' 'silly') groups=('xlib-extra') archs=('i686' 'x86_64') _F_sourceforge_dirname="crayzedsgui" @@ -14,7 +14,7 @@ Finclude sourceforge url="http://www.cegui.org.uk/" source=(${source/$pkgname-/CEGUI-} compile-fix-for-xerces-c-2.8.0.patch) _F_cd_path="CEGUI-`echo $pkgver | sed 's/b//'`" -Fconfopts="${Fconfopts} --without-devil" +Fconfopts="${Fconfopts} --without-devil --with-default-image-codec=SILLYImageCodec" sha1sums=('29c3888b1ba9a4ee246a8534244a00280c01bd60' \ '817dee3f9b83588cad27da5ae86ec323ab21b1ee') # optimization OK From devil505linux at gmail.com Wed Dec 12 13:32:35 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Dec 12 13:32:38 2007 Subject: [Frugalware-git] frugalware-current: smc-music-4.0-1-i686 Message-ID: <20071212123235.EE87A1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a0bfc7734515f883916dd45d57655564f4318df commit 4a0bfc7734515f883916dd45d57655564f4318df Author: Devil505 Date: Wed Dec 12 13:32:19 2007 +0100 smc-music-4.0-1-i686 *New Package diff --git a/source/games-extra/smc-music/FrugalBuild b/source/games-extra/smc-music/FrugalBuild new file mode 100644 index 0000000..152b42e --- /dev/null +++ b/source/games-extra/smc-music/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=smc-music +pkgver=4.0 +pkgrel=1 +pkgdesc="Music for the Super Mario Brothers Clone" +_F_sourceforge_ext="_high.zip" +_F_sourceforge_dirname="smclone" +_F_sourceforge_name="SMC_music" +_F_sourceforge_sep="_" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://www.secretmaryo.org/" +depends=('') +groups=('games-extra') +archs=('i686') +sha1sums=('529b74e9ef08f463954d68b9586b7386a58332d7') + +build() +{ + cd $Fsrcdir + Fmkdir usr/share/smc + Fcprrel data/* usr/share/smc +} \ No newline at end of file From devil505linux at gmail.com Wed Dec 12 13:46:19 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Dec 12 13:46:20 2007 Subject: [Frugalware-git] frugalware-current: smc-1.3-1-i686 Message-ID: <20071212124619.6D6F31190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6dc4868cb1a3860a44dfe3d0d0f7baa12bd1082e commit 6dc4868cb1a3860a44dfe3d0d0f7baa12bd1082e Author: Devil505 Date: Wed Dec 12 13:46:05 2007 +0100 smc-1.3-1-i686 *New Package *Closes FS#1763 diff --git a/source/games-extra/smc/FrugalBuild b/source/games-extra/smc/FrugalBuild new file mode 100644 index 0000000..42eb0fc --- /dev/null +++ b/source/games-extra/smc/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 0.06 SBU +# Maintainer: Devil505 + +pkgname=smc +pkgver=1.3 +pkgrel=1 +pkgdesc="Secret Maryo Chronicles" +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_dirname="smclone" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://www.secretmaryo.org/" +depends=('sdlimage' 'sdl_ttf' 'sdl_gfx' 'sdl_mixer' 'cegui>=0.5.0b-3' 'libboost>=1.34.1' 'freeglut' 'sdl') +rodepends=('smc-music') +makedepends=('boost>=1.34.1') +groups=('games-extra') +archs=('i686') +sha1sums=('7daa878e19e108ff2be80100c2e1e9f3fdc62d99') + +_F_desktop_name="Secret Maryo Chronicles" +_F_desktop_icon="/usr/share/smc/icon/windows_32.png" +_F_desktop_categories="Game;ArcadeGame;KidsGame;" + +build() +{ + Fbuild + Fdesktop2 +} + +# optimization OK From devil505linux at gmail.com Wed Dec 12 13:53:07 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Dec 12 13:53:08 2007 Subject: [Frugalware-git] frugalware-current: smc-1.3-2-i686 Message-ID: <20071212125307.4A5E71190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3573de4810d001de24ed4593f6bb1f55a95f70f commit d3573de4810d001de24ed4593f6bb1f55a95f70f Author: Devil505 Date: Wed Dec 12 13:52:55 2007 +0100 smc-1.3-2-i686 *Fixed .desktop diff --git a/source/games-extra/smc/FrugalBuild b/source/games-extra/smc/FrugalBuild index 42eb0fc..f14b310 100644 --- a/source/games-extra/smc/FrugalBuild +++ b/source/games-extra/smc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=smc pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Secret Maryo Chronicles" _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="smclone" @@ -18,7 +18,7 @@ archs=('i686') sha1sums=('7daa878e19e108ff2be80100c2e1e9f3fdc62d99') _F_desktop_name="Secret Maryo Chronicles" -_F_desktop_icon="/usr/share/smc/icon/windows_32.png" +_F_desktop_icon="/usr/share/smc/icon/window_32.png" _F_desktop_categories="Game;ArcadeGame;KidsGame;" build() From iron at frugalware.org Wed Dec 12 15:26:14 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Wed Dec 12 15:26:17 2007 Subject: [Frugalware-git] frugalware-current: fixed _F_archive_name issue in xfce4.sh Message-ID: <20071212142614.1B6741190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13af32f81410abd449a528b44f7401cc7abf618a commit 13af32f81410abd449a528b44f7401cc7abf618a Author: Krisztian VASAS Date: Wed Dec 12 15:25:00 2007 +0100 fixed _F_archive_name issue in xfce4.sh diff --git a/source/include/xfce4.sh b/source/include/xfce4.sh index db48f03..1e977e3 100644 --- a/source/include/xfce4.sh +++ b/source/include/xfce4.sh @@ -32,7 +32,9 @@ # project name ### -if [ -z $_F_xfce_name ] ; then +if [ ! -z $_F_xfce_name ] ; then + _F_archive_name=$_F_xfce_name +else _F_xfce_name=$pkgname fi From vmiklos at frugalware.org Wed Dec 12 16:53:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 16:53:06 2007 Subject: [Frugalware-git] homepage-ng: media: add new 0.7 review Message-ID: <20071212155303.C95421190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=168f38eb8d64837def8a7a07540364b2b66a4933 commit 168f38eb8d64837def8a7a07540364b2b66a4933 Author: Miklos Vajna Date: Wed Dec 12 16:52:58 2007 +0100 media: add new 0.7 review diff --git a/frugalware/xml/media.xml b/frugalware/xml/media.xml index 1e93350..c60ee4e 100644 --- a/frugalware/xml/media.xml +++ b/frugalware/xml/media.xml @@ -14,6 +14,13 @@
    + 2007-12-11 + English + Open Review + Frugalware 0.7 Review + http://simplyjat.blogspot.com/2007/12/frugalware-07-review.html +
    +
    2007-10-22 French FRLinux.net From hermier at frugalware.org Wed Dec 12 17:42:04 2007 From: hermier at frugalware.org (Michel Hermier) Date: Wed Dec 12 17:42:06 2007 Subject: [Frugalware-git] frugalware-current: include/xfce4.sh Message-ID: <20071212164204.652C71190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ad33735f718d30f5b01c289b79817bb43e89add commit 7ad33735f718d30f5b01c289b79817bb43e89add Author: Michel Hermier Date: Wed Dec 12 17:41:46 2007 +0100 include/xfce4.sh * More proper fix for _F_archive_name issue in xfce4.sh - Don't overwrite _F_archive_name if for some odd reasons it is different from _F_xfce_name. - Move a complicated sed to Flasttar. diff --git a/source/include/xfce4.sh b/source/include/xfce4.sh index 1e977e3..94ee136 100644 --- a/source/include/xfce4.sh +++ b/source/include/xfce4.sh @@ -32,9 +32,7 @@ # project name ### -if [ ! -z $_F_xfce_name ] ; then - _F_archive_name=$_F_xfce_name -else +if [ -z $_F_xfce_name ] ; then _F_xfce_name=$pkgname fi @@ -46,22 +44,27 @@ if [ -z $_F_xfce_goodies_dir ] ; then _F_xfce_goodies_dir=$_F_xfce_name fi +if [ -z $_F_archive_name ] ; then + _F_archive_name=$_F_xfce_name +fi + ### # == OVERWRITTEN VARIABLES # * url # * up2date # * source() ### + if echo ${groups[*]} | grep -q goodies ; then url="http://goodies.xfce.org/projects/panel-plugins/${_F_xfce_name}" dlurl="http://goodies.xfce.org/releases/$_F_xfce_goodies_dir/" - up2date="lynx -dump $dlurl | grep "$_F_xfce_name-.*${_F_xfce_goodies_ext}$" | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" + up2date="lynx -dump $dlurl | grep "$_F_xfce_name-.*${_F_xfce_goodies_ext}$" | Flasttar" source=($dlurl/${_F_xfce_name}-${pkgver}${_F_xfce_goodies_ext}) else url="http://www.xfce.org/" preup2date="lynx -dump http://www.xfce.org/archive/ | grep xfce- | tail -n1 | sed 's/.*-\(.*\)\/.*/\1/'" dlurl="$url/archive/xfce-4.4.2/src" - up2date="lynx -dump $url/archive/xfce-\$($preup2date)/src/ | grep $_F_xfce_name | Flasttarbz2" + up2date="lynx -dump $url/archive/xfce-\$($preup2date)/src/ | Flasttar" source=($dlurl/$_F_xfce_name-$pkgver.tar.bz2) fi From devil505linux at gmail.com Wed Dec 12 19:17:41 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Dec 12 19:17:42 2007 Subject: [Frugalware-git] frugalware-current: zsnes-1.51-1-i686 Message-ID: <20071212181741.0BDC81190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd3938d39dcc35a9a96e6b56b89374a87320eecf commit fd3938d39dcc35a9a96e6b56b89374a87320eecf Author: Devil505 Date: Wed Dec 12 19:16:11 2007 +0100 zsnes-1.51-1-i686 *New Package *Closes FS#1575 *Added .desktop with icon diff --git a/source/games-extra/zsnes/FrugalBuild b/source/games-extra/zsnes/FrugalBuild new file mode 100644 index 0000000..76e572f --- /dev/null +++ b/source/games-extra/zsnes/FrugalBuild @@ -0,0 +1,38 @@ +# Compiling Time: 0.60 SBU +# Maintainer: Devil505 + +pkgname=zsnes +pkgver=1.51 +_pkgver="${pkgver/./}src" +pkgrel="1" +pkgdesc="ZSNES is a SNES/Super Famicom emulator for x86 computers." +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge +url="http://www.zsnes.com/" +depends=('libgcc' 'glibc' 'libpng' 'libstdc++' 'mesa' 'zlib' 'sdl') +makedepends=('nasm') +groups=('games-extra') +archs=('i686') +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=19677 | grep ZSNES | grep Latest | sed 's/.*v\(.*\) \[.*/\1/'" +source=(${source/$pkgname-$pkgver/$pkgname$_pkgver} $pkgname.png) +_F_cd_path="zsnes_${pkgver/./_}/src" +sha1sums=('98e2664fa7b29cb41d079709301a9eef138c519c' '03bb4217f21c048d226552e53cbdfc49ff30388e') + +_F_desktop_icon="$pkgname.png" +_F_desktop_categories="Game;" + +build() +{ + Fcd + ./autogen.sh --prefix=/usr x_libraries=/usr/lib force_arch=i686 \ + --enable-release + Fmake + Fmakeinstall + Ficon $pkgname.png + Fdesktop2 + Fmkdir /usr/share/doc/zsnes-$pkgver + cd .. + cp -r docs/*.* $Fdestdir/usr/share/doc/zsnes-$pkgver/ +} + +# optimization OK \ No newline at end of file diff --git a/source/games-extra/zsnes/zsnes.png b/source/games-extra/zsnes/zsnes.png new file mode 100644 index 0000000..31608ba Binary files /dev/null and b/source/games-extra/zsnes/zsnes.png differ From vmiklos at frugalware.org Wed Dec 12 20:27:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 20:27:07 2007 Subject: [Frugalware-git] frugalware-current: stgit-0.14.1-1-i686 Message-ID: <20071212192703.BC0991190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bab03b51c9c48073a61c4622c966359003b5ab0d commit bab03b51c9c48073a61c4622c966359003b5ab0d Author: Miklos Vajna Date: Wed Dec 12 19:42:37 2007 +0100 stgit-0.14.1-1-i686 version bump diff --git a/source/devel-extra/stgit/FrugalBuild b/source/devel-extra/stgit/FrugalBuild index 793f683..c37eeae 100644 --- a/source/devel-extra/stgit/FrugalBuild +++ b/source/devel-extra/stgit/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=stgit -pkgver=0.14 +pkgver=0.14.1 pkgrel=1 pkgdesc="Provides similar functionality to Quilt on top of GIT." url="http://www.procode.org/stgit/" @@ -11,4 +11,4 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|Flasttar" source=(http://homepage.ntlworld.com/cmarinas/stgit/stgit-$pkgver.tar.gz) -sha1sums=('374f23d82d30ca0579d8077c43dd64dbbe4a6c15') +sha1sums=('c7375590e58fd9a2a59dfe9031cb9667911af2a8') From vmiklos at frugalware.org Wed Dec 12 20:27:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 20:27:09 2007 Subject: [Frugalware-git] frugalware-current: mingw-binutils-2.18.50_20071123-1-i686 Message-ID: <20071212192703.D43A41190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c7eedd54021a521d18b634be0cbdaf3262c2385 commit 7c7eedd54021a521d18b634be0cbdaf3262c2385 Author: Miklos Vajna Date: Wed Dec 12 20:20:43 2007 +0100 mingw-binutils-2.18.50_20071123-1-i686 version bump diff --git a/source/devel-extra/mingw-binutils/FrugalBuild b/source/devel-extra/mingw-binutils/FrugalBuild index 696095c..44a734d 100644 --- a/source/devel-extra/mingw-binutils/FrugalBuild +++ b/source/devel-extra/mingw-binutils/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: VMiklos pkgname=mingw-binutils -pkgver=2.17.50_20070129_1 +pkgver=2.18.50_20071123 origver=${pkgver//_/-} -pkgrel=2 +pkgrel=1 pkgdesc="Tools necessary to build Win32 programs" _F_sourceforge_dirname="mingw" Finclude sourceforge @@ -13,13 +13,12 @@ depends=('bash') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2435|grep 'binutils-.*-src.tar.gz$'|sed 's/.*binutils-\(.*\)-src.*/\1/;s/-/_/g;q'" -source=(${source/mingw-binutils-$origver/binutils-$origver-src} makeinfo.patch) -sha1sums=('a55f2e1c2f9640f259d9a6de0d5e5c7620f6e94f' \ - '467e9a8b972c97cea8862a4c8b49f18a72fceaa9') +source=(${source/mingw-binutils-$origver/binutils-$origver-src}) +sha1sums=('38e5ac17ec417f11239c21cb27c21a7fa7ae5979') build() { - Fcd binutils-$origver-src + Fcd binutils-2.18.50 Fpatchall autoconf || return 1 Fmake --prefix=/usr/lib/mingw --target=i386-mingw32msvc diff --git a/source/devel-extra/mingw-binutils/makeinfo.patch b/source/devel-extra/mingw-binutils/makeinfo.patch deleted file mode 100644 index 17b3c53..0000000 --- a/source/devel-extra/mingw-binutils/makeinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur binutils-2.18.50.0.1/configure.in binutils-2.18.50.0.1-p/configure.in ---- binutils-2.18.50.0.1/configure.in 2007-09-08 19:33:35.000000000 +0200 -+++ binutils-2.18.50.0.1-p/configure.in 2007-10-01 11:48:52.000000000 +0200 -@@ -2424,7 +2424,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" From vmiklos at frugalware.org Wed Dec 12 20:27:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 20:27:10 2007 Subject: [Frugalware-git] frugalware-current: skype4py-0.9.28.7-1-i686 Message-ID: <20071212192703.E657711901A6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=998f9ad0c3e56ee26075dfc1602e87980837d431 commit 998f9ad0c3e56ee26075dfc1602e87980837d431 Author: Miklos Vajna Date: Wed Dec 12 20:26:08 2007 +0100 skype4py-0.9.28.7-1-i686 version bump diff --git a/source/devel-extra/skype4py/FrugalBuild b/source/devel-extra/skype4py/FrugalBuild index 29ed87d..c73da75 100644 --- a/source/devel-extra/skype4py/FrugalBuild +++ b/source/devel-extra/skype4py/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=skype4py -pkgver=0.9.28.6 +pkgver=0.9.28.7 pkgrel=1 pkgdesc="A Python binding to Skype." _F_sourceforge_dirname="skype4py" @@ -12,5 +12,5 @@ Finclude sourceforge depends=('dbus-python' 'pygobject') groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('d8124e3b41e8a46f660c8053ffdfe51388455b1f') +sha1sums=('7b968b360612657ebb517ef52ce65bac8a19e2a1') _F_cd_path="Skype4Py-$pkgver" From vmiklos at frugalware.org Wed Dec 12 21:04:00 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 21:04:03 2007 Subject: [Frugalware-git] frugalware-current: emesene-r806-1-x86_64 Message-ID: <20071212200400.692231190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de5f031dba84a65f8bdec29d3bf6c6de50e194df commit de5f031dba84a65f8bdec29d3bf6c6de50e194df Author: Miklos Vajna Date: Wed Dec 12 21:01:40 2007 +0100 emesene-r806-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/emesene/FrugalBuild b/source/gnome-extra/emesene/FrugalBuild index f11f775..fadf3ed 100644 --- a/source/gnome-extra/emesene/FrugalBuild +++ b/source/gnome-extra/emesene/FrugalBuild @@ -10,7 +10,7 @@ Finclude sourceforge url="http://emesene.org/" depends=('pygtk') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=168206 | grep -m1 tar.gz | sed 's/.*ne-\(.*\).t.*/\1/'" _F_desktop_icon="emesene.png" _F_desktop_categories="Network;InstantMessaging;" From vmiklos at frugalware.org Wed Dec 12 21:07:41 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 21:07:43 2007 Subject: [Frugalware-git] frugalware-current: gimmage-0.2.3-1-x86_64 Message-ID: <20071212200741.374001190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=907f5b285502d6e51189cf7504132e69dfd9158d commit 907f5b285502d6e51189cf7504132e69dfd9158d Author: Miklos Vajna Date: Wed Dec 12 21:07:37 2007 +0100 gimmage-0.2.3-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gimmage/FrugalBuild b/source/gnome-extra/gimmage/FrugalBuild index 1fd667a..b3aacf2 100644 --- a/source/gnome-extra/gimmage/FrugalBuild +++ b/source/gnome-extra/gimmage/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="A gtkmm image viewer" Finclude berlios depends=('gtkmm' 'curl') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('732dee063553b787b65a0a5bd3d207bdb5d01df1') _F_gnome_desktop=y Finclude gnome-scriptlet From vmiklos at frugalware.org Wed Dec 12 21:15:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 21:15:13 2007 Subject: [Frugalware-git] frugalware-current: gimmie-0.2.7-1-x86_64 Message-ID: <20071212201510.5EB141190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a9f5334b0d59e9d130b6260d5d7510ba234edc26 commit a9f5334b0d59e9d130b6260d5d7510ba234edc26 Author: Miklos Vajna Date: Wed Dec 12 21:15:05 2007 +0100 gimmie-0.2.7-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gimmie/FrugalBuild b/source/gnome-extra/gimmie/FrugalBuild index 5a07f24..ed564ed 100644 --- a/source/gnome-extra/gimmie/FrugalBuild +++ b/source/gnome-extra/gimmie/FrugalBuild @@ -10,7 +10,7 @@ depends=('gnome-python-desktop-applet' 'gnome-python-desktop-print' 'gnome-pytho 'gnome-python-desktop-wnck' 'gnome-python-desktop-keyring' 'pygtk>=2.10.3-3') makedepends=('intltool' 'perl-xml') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://www.beatniksoftware.com/gimmie/releases/ | Flasttar" source=(http://www.beatniksoftware.com/gimmie/releases/$pkgname-$pkgver.tar.gz \ $pkgname-0.2.3-fix-errors.patch) From vmiklos at frugalware.org Wed Dec 12 21:27:59 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 21:28:02 2007 Subject: [Frugalware-git] frugalware-current: gnome-color-chooser-0.2.2-1-x86_64 Message-ID: <20071212202759.CE0741190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f404e24686c889518c3e09483e7c5f2c363e34de commit f404e24686c889518c3e09483e7c5f2c363e34de Author: Miklos Vajna Date: Wed Dec 12 21:27:53 2007 +0100 gnome-color-chooser-0.2.2-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gnome-color-chooser/FrugalBuild b/source/gnome-extra/gnome-color-chooser/FrugalBuild index 631700c..31e2791 100644 --- a/source/gnome-extra/gnome-color-chooser/FrugalBuild +++ b/source/gnome-extra/gnome-color-chooser/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.2.2 pkgrel=1 pkgdesc="Customize your GNOME desktop!" url="http://www.punk-ass-bitch.org/gnome-color-chooser" -archs=('i686') +archs=('i686' 'x86_64') groups=('gnome-extra') depends=('libgnomeuimm') makedepends=('perl-xml') From vmiklos at frugalware.org Wed Dec 12 21:36:21 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 21:36:24 2007 Subject: [Frugalware-git] frugalware-current: gnome-compiz-manager-0.10.4-1-x86_64 Message-ID: <20071212203621.2A21A1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=69b8e43abcca3879fe314375a51498608b99c9e6 commit 69b8e43abcca3879fe314375a51498608b99c9e6 Author: Miklos Vajna Date: Wed Dec 12 21:36:08 2007 +0100 gnome-compiz-manager-0.10.4-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gnome-compiz-manager/FrugalBuild b/source/gnome-extra/gnome-compiz-manager/FrugalBuild index d7c3621..b1aa3bd 100644 --- a/source/gnome-extra/gnome-compiz-manager/FrugalBuild +++ b/source/gnome-extra/gnome-compiz-manager/FrugalBuild @@ -9,7 +9,7 @@ url="http://gandalfn.wordpress.com/gnome-compiz-manager/" depends=('compiz-gnome>=0.6.0-3' 'gnome-desktop>=2.20.0' 'librsvg' 'libwnck') makedepends=('gob2' 'perl-xml') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://download.gna.org/gcm/$pkgname/?M=A | grep tar.gz | Flasttar" source=(http://download.gna.org/gcm/$pkgname/$pkgname-$pkgver.tar.gz) Fconfopts="${Fconfopts[@]} --enable-gnome-session" From vmiklos at frugalware.org Wed Dec 12 22:52:00 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 12 22:52:03 2007 Subject: [Frugalware-git] homepage-ng: remove www7, it's down Message-ID: <20071212215200.906351190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=17269a2bdbf9e611b7f9ef3c3b7376c7601c7ee5 commit 17269a2bdbf9e611b7f9ef3c3b7376c7601c7ee5 Author: Miklos Vajna Date: Wed Dec 12 22:51:55 2007 +0100 remove www7, it's down diff --git a/frugalware/xml/mirrors2.xml b/frugalware/xml/mirrors2.xml index 4ce5f3b..85dc365 100644 --- a/frugalware/xml/mirrors2.xml +++ b/frugalware/xml/mirrors2.xml @@ -84,16 +84,7 @@ If you modify this file, be sure it's still valid - xmllint is your friend. http://www.sourcemirrors.org 100 MBit - - 7 - http - pub/frugalware - frugalware.pimpmylinux.org - Germany - Sebastian Vassiliou - http://pimpmylinux.org/ - 100 MBit - + From crazy at frugalware.org Thu Dec 13 02:05:48 2007 From: crazy at frugalware.org (crazy) Date: Thu Dec 13 02:05:51 2007 Subject: [Frugalware-git] frugalware-current: touchmegames-0.2.0-1-i686 Message-ID: <20071213010548.B9EC61190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=19d833c9b5fe9017a4480596db2d0c3d9a7c67fc commit 19d833c9b5fe9017a4480596db2d0c3d9a7c67fc Author: crazy Date: Thu Dec 13 02:03:52 2007 +0100 touchmegames-0.2.0-1-i686 * New package diff --git a/source/games-extra/touchmegames/FrugalBuild b/source/games-extra/touchmegames/FrugalBuild new file mode 100644 index 0000000..6893b83 --- /dev/null +++ b/source/games-extra/touchmegames/FrugalBuild @@ -0,0 +1,37 @@ +# Compiling Time: 0.37 SBU +# Maintainer: crazy + +pkgname=touchmegames +pkgver=0.2.0 +pkgrel=1 +pkgdesc="A set of games in one program." +depends=('gtk+2' 'freetype2' 'libxcb' 'alsa-lib' 'libstdc++' 'libxdamage' 'libxext') +groups=('games-extra') +archs=('i686') +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +source=($source \ + makefile-fixes.patch \ + fix-paths.patch \ + tmg.png) +options=('scriptlet') +sha1sums=('f44ee316d4236d6679cfe888c713c41a35211762' \ + 'caac15e146df5002c22148567ef1b4a14f6e9531' \ + 'db8b3b39d3f53c28c17640091031c70455b3fbb4' \ + 'a2508e1949e586fdd5264ad31583528faefe9c32') + +build() +{ + unset MAKEFLAGS + Fcd $pkgname + Fpatchall + Fmkdir usr/share/{touchmegames,pixmaps} usr/bin + cd src || Fdie + make || Fdie + make DESTDIR=$Fdestdir install || Fdie + Ffile /usr/share/pixmaps/tmg.png + Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/tmg.png" "Game;" +} + + +# optimization OK diff --git a/source/games-extra/touchmegames/fix-paths.patch b/source/games-extra/touchmegames/fix-paths.patch new file mode 100644 index 0000000..7ffdb36 --- /dev/null +++ b/source/games-extra/touchmegames/fix-paths.patch @@ -0,0 +1,2140 @@ +diff -Naur touchmegames/src/compile4/interface.cpp touchmegames-p/src/compile4/interface.cpp +--- touchmegames/src/compile4/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/compile4/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -131,9 +131,9 @@ + + + for (int i = 0; i < 21; ++i) { +- p1Circs[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/blue.gif"); ++ p1Circs[i] = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/blue.gif"); + gtk_fixed_put((GtkFixed *)fixed, p1Circs[i], -80, -80); +- p2Circs[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/green.gif"); ++ p2Circs[i] = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/green.gif"); + gtk_fixed_put((GtkFixed *)fixed, p2Circs[i], -80, -80); + } + +@@ -147,12 +147,12 @@ + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(colPressed), (gpointer)this); + gtk_object_set_user_data((GtkObject *)eventBox, (void *)i); +- img = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/bg.png"); ++ img = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/bg.png"); + gtk_container_add((GtkContainer *)eventBox, img); + + } + +- scorebg = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/scorebg.gif"); ++ scorebg = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/scorebg.gif"); + + gtk_fixed_put((GtkFixed *)fixed, scorebg, -340, -290); + +@@ -385,7 +385,7 @@ + srand(sectime); + + topFixed = gtk_fixed_new(); +- img = gtk_image_new_from_file("/usr/local/share/touchmegames/images/games/bg.png"); ++ img = gtk_image_new_from_file("/usr/share/touchmegames/images/games/bg.png"); + gtk_fixed_put((GtkFixed *)topFixed, img, 0, 0); + + img = loadImage("rhbg.png"); +@@ -397,7 +397,7 @@ + gtk_box_pack_start((GtkBox *)topvbox, createTopBox(), FALSE, FALSE, 0); + + +- img = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/topbar.gif"); ++ img = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/topbar.gif"); + + gtk_box_pack_start((GtkBox *)topvbox, img, FALSE, FALSE, 5); + +@@ -407,7 +407,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(userExit), (gpointer)this); +diff -Naur touchmegames/src/consume21/events.cpp touchmegames-p/src/consume21/events.cpp +--- touchmegames/src/consume21/events.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/consume21/events.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -233,7 +233,7 @@ + if (consume->gameState != RUNNING) { + return; + } +- gtk_image_set_from_file((GtkImage *)consume->spill, "/usr/local/share/touchmegames/consume21/images/spilldown.png"); ++ gtk_image_set_from_file((GtkImage *)consume->spill, "/usr/share/touchmegames/consume21/images/spilldown.png"); + } + + void Consume21::spillReleased(GtkWidget *widget, GdkEventKey *event, gpointer ptr) { +@@ -258,7 +258,7 @@ + if (consume->gameState != RUNNING) { + return; + } +- gtk_image_set_from_file((GtkImage *)consume->collect, "/usr/local/share/touchmegames/consume21/images/collectdown.png"); ++ gtk_image_set_from_file((GtkImage *)consume->collect, "/usr/share/touchmegames/consume21/images/collectdown.png"); + } + + void Consume21::collectReleased(GtkWidget *widget, GdkEventKey *event, gpointer ptr) { +@@ -271,7 +271,7 @@ + } + g_source_remove(consume->timer); + consume->timer = gtk_timeout_add(30, consume->timeout, ptr); +- gtk_image_set_from_file((GtkImage *)consume->collect, "/usr/local/share/touchmegames/consume21/images/collectup.png"); ++ gtk_image_set_from_file((GtkImage *)consume->collect, "/usr/share/touchmegames/consume21/images/collectup.png"); + + consume->gameState = TAKE_SCORE; + } +diff -Naur touchmegames/src/consume21/interface.cpp touchmegames-p/src/consume21/interface.cpp +--- touchmegames/src/consume21/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/consume21/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -81,7 +81,7 @@ + gtk_widget_modify_fg(columnsTotal, (GtkStateType)0, &color); + gtk_container_add((GtkContainer *)eventBox, columnsTotal); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/toprightbox.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/toprightbox.png"); + gtk_fixed_put((GtkFixed *)fixed, image, 640, 20); + gtk_fixed_put((GtkFixed *)fixed, createRightTop(), 640, 20); + +@@ -92,7 +92,7 @@ + gtk_fixed_put((GtkFixed *)fixed, eventBox, 150, 130); + + +- spill = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/spillup.png"); ++ spill = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/spillup.png"); + gtk_container_add((GtkContainer *)eventBox, spill); + + g_signal_connect(G_OBJECT(eventBox), "button-press-event", +@@ -108,7 +108,7 @@ + gtk_fixed_put((GtkFixed *)fixed, eventBox, 640, 500); + + +- collect = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/collectup.png"); ++ collect = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/collectup.png"); + gtk_container_add((GtkContainer *)eventBox, collect); + + g_signal_connect(G_OBJECT(eventBox), "button-press-event", +@@ -122,7 +122,7 @@ + progress.init(); + progress.width(320); + progress.height(35); +- progress.image("/usr/local/share/touchmegames/consume21/images/progress.gif"); ++ progress.image("/usr/share/touchmegames/consume21/images/progress.gif"); + gtk_fixed_put((GtkFixed *)fixed, progress.widget(), 270, 110); + + +@@ -131,7 +131,7 @@ + + // exit button + eventBox = gtk_event_box_new(); +- button = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); ++ button = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); + gtk_container_add((GtkContainer *)eventBox, button); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); +@@ -143,7 +143,7 @@ + + + // round image +- roundImage = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/round1.png"); ++ roundImage = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/round1.png"); + gtk_fixed_put((GtkFixed *)fixed, roundImage, 520, 20); + + +@@ -237,7 +237,7 @@ + bgcolor.green = 0x2E00; + bgcolor.blue = 0xF000; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/lowrightbg.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/lowrightbg.png"); + gtk_fixed_put((GtkFixed *)fixed, image, 640, 250); + + vbox = gtk_vbox_new(FALSE, 0); +@@ -289,7 +289,7 @@ + + gtk_fixed_put((GtkFixed *)fixed, eventBox, 25, 25); + +- sstr << "/usr/local/share/touchmegames/consume21/images/" << mug << ".png"; ++ sstr << "/usr/share/touchmegames/consume21/images/" << mug << ".png"; + image = gtk_image_new_from_file(sstr.str().c_str()); + gtk_container_add((GtkContainer *)eventBox, image); + +diff -Naur touchmegames/src/consume21/support.cpp touchmegames-p/src/consume21/support.cpp +--- touchmegames/src/consume21/support.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/consume21/support.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -71,10 +71,10 @@ + progress.percent(100); + setTotalWin(0); + +- gtk_image_set_from_file((GtkImage *)spill, "/usr/local/share/touchmegames/consume21/images/spillup.png"); ++ gtk_image_set_from_file((GtkImage *)spill, "/usr/share/touchmegames/consume21/images/spillup.png"); + gtk_widget_show(spill); + +- sstr << "/usr/local/share/touchmegames/consume21/images/round" << ++round << ".png"; ++ sstr << "/usr/share/touchmegames/consume21/images/round" << ++round << ".png"; + gtk_image_set_from_file((GtkImage *)roundImage, sstr.str().c_str()); + + roundScore = 0; +diff -Naur touchmegames/src/dart01/dart01.h touchmegames-p/src/dart01/dart01.h +--- touchmegames/src/dart01/dart01.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dart01/dart01.h 2007-12-11 04:10:12.000000000 +0100 +@@ -31,7 +31,7 @@ + #include + #include + +-#define dart01Path "/usr/local/share/touchmegames/dart01/" ++#define dart01Path "/usr/share/touchmegames/dart01/" + + class DART_01 : public GAME_PTR { + private: +diff -Naur touchmegames/src/dart01/interface.cpp touchmegames-p/src/dart01/interface.cpp +--- touchmegames/src/dart01/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dart01/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -394,7 +394,7 @@ + gtk_box_pack_start((GtkBox *)midvbox, hbox, FALSE, FALSE, 0); + + for (int i = 0; i < 3; ++i) { +- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); ++ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); + gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); + dartLabels[i] = gtk_label_new(""); + rcstyle = gtk_rc_style_new(); +@@ -417,7 +417,7 @@ + g_signal_connect(G_OBJECT(eventBox), + "button-press-event", + G_CALLBACK(showMenu), (gpointer)this); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/menu.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/menu.gif"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_box_pack_start((GtkBox *)hbox, eventBox, FALSE, FALSE, 0); + +@@ -447,7 +447,7 @@ + gtk_widget_set_size_request(ppdWindow, 300, 150); + rcstyle = gtk_rc_style_new(); + +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; + gtk_widget_modify_style(ppdWindow, rcstyle); + + gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); +@@ -763,7 +763,7 @@ + ++lh; + } + eventBox = gtk_event_box_new(); +- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); ++ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), +@@ -779,7 +779,7 @@ + void DART_01::createLowTon() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/lowton.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/lowton.gif"); + + lowTon = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)lowTon, FALSE); +@@ -792,7 +792,7 @@ + void DART_01::createHighTon() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/highton.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/highton.gif"); + + highTon = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)highTon, FALSE); +@@ -805,7 +805,7 @@ + void DART_01::createTon80() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/ton80.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/ton80.gif"); + + ton80 = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)ton80, FALSE); +@@ -845,11 +845,11 @@ + + menuUp = gtk_rc_style_new(); + menuUp->color_flags[0] = GTK_RC_BG; +- menuUp->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menuup.xpm"; ++ menuUp->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menuup.xpm"; + + menuDown = gtk_rc_style_new(); + menuDown->color_flags[0] = GTK_RC_BG; +- menuDown->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menudown.xpm"; ++ menuDown->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menudown.xpm"; + + eventBox = gtk_event_box_new(); + gtk_widget_modify_style(eventBox, menuUp); +@@ -949,12 +949,12 @@ + + // create the background images + for (int i = 0; i < 8; ++i) { +- userScores[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); ++ userScores[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, userScores[i], (i & 1 ? 600 : 0), 60 + ((i / 2) * 130)); + } +- smallScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); ++ smallScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, smallScore, 300, 290); +- largeScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"); ++ largeScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/largescorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, largeScore, 250, 75); + + gtk_box_pack_start((GtkBox *)tophbox, createOpenScreen(), TRUE, FALSE, 5); +diff -Naur touchmegames/src/dartcountdown/dartcountdown.h touchmegames-p/src/dartcountdown/dartcountdown.h +--- touchmegames/src/dartcountdown/dartcountdown.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcountdown/dartcountdown.h 2007-12-11 04:10:12.000000000 +0100 +@@ -32,7 +32,7 @@ + #include + #include + +-#define dartcountdownPath "/usr/local/share/touchmegames/dartcountdown/" ++#define dartcountdownPath "/usr/share/touchmegames/dartcountdown/" + + class DartCountDown : public GAME_PTR { + private: +diff -Naur touchmegames/src/dartcountdown/interface.cpp touchmegames-p/src/dartcountdown/interface.cpp +--- touchmegames/src/dartcountdown/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcountdown/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -356,7 +356,7 @@ + + for (int i = 0; i < 3; ++i) { + +- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); ++ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); + gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); + dartLabels[i] = gtk_label_new(""); + rcstyle = gtk_rc_style_new(); +@@ -403,7 +403,7 @@ + gtk_widget_set_size_request(ppdWindow, 300, 150); + rcstyle = gtk_rc_style_new(); + +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; + gtk_widget_modify_style(ppdWindow, rcstyle); + + gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); +@@ -747,7 +747,7 @@ + + + eventBox = gtk_event_box_new(); +- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); ++ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), +@@ -763,7 +763,7 @@ + void DartCountDown::createLowTon() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/lowton.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/lowton.gif"); + + lowTon = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)lowTon, FALSE); +@@ -776,7 +776,7 @@ + void DartCountDown::createHighTon() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/highton.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/highton.gif"); + + highTon = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)highTon, FALSE); +@@ -789,7 +789,7 @@ + void DartCountDown::createTon80() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/ton80.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/ton80.gif"); + + ton80 = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)ton80, FALSE); +@@ -829,12 +829,12 @@ + + // create the background images + for (int i = 0; i < 8; ++i) { +- userScores[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); ++ userScores[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, userScores[i], (i & 1 ? 600 : 0), 60 + ((i & 1 ? i / 2: i) * 130)); + } +- smallScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); ++ smallScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, smallScore, 300, 290); +- largeScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"); ++ largeScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/largescorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, largeScore, 250, 75); + + gtk_box_pack_start((GtkBox *)tophbox, createOpenScreen(), TRUE, FALSE, 5); +diff -Naur touchmegames/src/dartCountUp/dartCountUp.h touchmegames-p/src/dartCountUp/dartCountUp.h +--- touchmegames/src/dartCountUp/dartCountUp.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartCountUp/dartCountUp.h 2007-12-11 04:10:12.000000000 +0100 +@@ -31,7 +31,7 @@ + #include + #include + +-#define dart01Path "/usr/local/share/touchmegames/dart01/" ++#define dart01Path "/usr/share/touchmegames/dart01/" + + class DART_COUNTUP : public GAME_PTR { + private: +diff -Naur touchmegames/src/dartCountUp/interface.cpp touchmegames-p/src/dartCountUp/interface.cpp +--- touchmegames/src/dartCountUp/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartCountUp/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -193,7 +193,7 @@ + + rcstyle->bg[0] = color; + rcstyle->color_flags[0] = GTK_RC_BG; +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/smallscorebg.xpm"; + gtk_widget_modify_style(eventBox, rcstyle); + pango_font_description_free(rcstyle->font_desc); + +@@ -258,7 +258,7 @@ + color.blue = 0xB400; + rcstyle->bg[0] = color; + rcstyle->color_flags[0] = GTK_RC_BG; +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/largescorebg.xpm"; + gtk_widget_modify_style(eventBox, rcstyle); + pango_font_description_free(rcstyle->font_desc); + +@@ -314,7 +314,7 @@ + color.blue = 0xB400; + rcstyle->bg[0] = color; + rcstyle->color_flags[0] = GTK_RC_BG; +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/smallscorebg.xpm"; + gtk_widget_modify_style(eventBox, rcstyle); + + pango_font_description_free(rcstyle->font_desc); +@@ -363,7 +363,7 @@ + + for (int i = 0; i < 3; ++i) { + +- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); ++ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); + gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); + dartLabels[i] = gtk_label_new(""); + rcstyle = gtk_rc_style_new(); +@@ -405,7 +405,7 @@ + gtk_widget_set_size_request(ppdWindow, 300, 150); + rcstyle = gtk_rc_style_new(); + +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; + gtk_widget_modify_style(ppdWindow, rcstyle); + + gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); +@@ -619,7 +619,7 @@ + ++lh; + } + eventBox = gtk_event_box_new(); +- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); ++ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), +diff -Naur touchmegames/src/dartcricket/dartcricket.h touchmegames-p/src/dartcricket/dartcricket.h +--- touchmegames/src/dartcricket/dartcricket.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcricket/dartcricket.h 2007-12-11 04:10:12.000000000 +0100 +@@ -31,7 +31,7 @@ + #include + #include + +-#define dartCricketPath "/usr/local/share/touchmegames/dart/" ++#define dartCricketPath "/usr/share/touchmegames/dart/" + + class DartCricket : public GAME_PTR { + private: +diff -Naur touchmegames/src/dartcricket/events.cpp touchmegames-p/src/dartcricket/events.cpp +--- touchmegames/src/dartcricket/events.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcricket/events.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -477,7 +477,7 @@ + // Bull + if (dart->markImages[dart->currentPlayer][6] == NULL) { + dart->markImages[dart->currentPlayer][6] = +- gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket/images/cross.gif"); ++ gtk_image_new_from_file("/usr/share/touchmegames/dartcricket/images/cross.gif"); + gtk_fixed_put((GtkFixed *)dart->fixed, dart->markImages[dart->currentPlayer][6], + 200 + (dart->currentPlayer < 2 ? dart->currentPlayer: + dart->currentPlayer + 1) * 80 + 10, 4 + 118 + 68 * 6); +@@ -489,16 +489,16 @@ + + if (dart->closeMarks[dart->currentPlayer][6] == 1) { + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], +- "/usr/local/share/touchmegames/dartcricket/images/slash.gif"); ++ "/usr/share/touchmegames/dartcricket/images/slash.gif"); + } + else if (dart->closeMarks[dart->currentPlayer][6] == 2) { + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], +- "/usr/local/share/touchmegames/dartcricket/images/cross.gif"); ++ "/usr/share/touchmegames/dartcricket/images/cross.gif"); + } + else if (dart->closeMarks[dart->currentPlayer][6] >= 3) { + bool gotPoints(false); + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], +- "/usr/local/share/touchmegames/dartcricket/images/closed.gif"); ++ "/usr/share/touchmegames/dartcricket/images/closed.gif"); + + + for (int i = 0; i < dart->numberOfPlayers; ++i) { +@@ -549,7 +549,7 @@ + + if (dart->markImages[dart->currentPlayer][20 - x] == NULL) { + dart->markImages[dart->currentPlayer][20 - x] = +- gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket/images/cross.gif"); ++ gtk_image_new_from_file("/usr/share/touchmegames/dartcricket/images/cross.gif"); + gtk_fixed_put((GtkFixed *)dart->fixed, dart->markImages[dart->currentPlayer][20 - x], + 200 + (dart->currentPlayer < 2 ? dart->currentPlayer: + dart->currentPlayer + 1) * 80 + 10, 4 + 118 + 68 * (20 - x)); +@@ -560,16 +560,16 @@ + dart->closeMarks[dart->currentPlayer][20 - x] += a; + if (dart->closeMarks[dart->currentPlayer][20 - x] == 1) { + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], +- "/usr/local/share/touchmegames/dartcricket/images/slash.gif"); ++ "/usr/share/touchmegames/dartcricket/images/slash.gif"); + } + else if (dart->closeMarks[dart->currentPlayer][20 - x] == 2) { + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], +- "/usr/local/share/touchmegames/dartcricket/images/cross.gif"); ++ "/usr/share/touchmegames/dartcricket/images/cross.gif"); + } + else if (dart->closeMarks[dart->currentPlayer][20 - x] >= 3) { + bool gotPoints(false); + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], +- "/usr/local/share/touchmegames/dartcricket/images/closed.gif"); ++ "/usr/share/touchmegames/dartcricket/images/closed.gif"); + + for (int i = 0; i < dart->numberOfPlayers; ++i) { + if (dart->closeMarks[i][20 - x] < 3) { +diff -Naur touchmegames/src/dartcricket/interface.cpp touchmegames-p/src/dartcricket/interface.cpp +--- touchmegames/src/dartcricket/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcricket/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -354,7 +354,7 @@ + gtk_box_pack_start((GtkBox *)rhvbox, hbox, FALSE, FALSE, 0); + + for (int i = 0; i < 3; ++i) { +- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); ++ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); + gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); + dartLabels[i] = gtk_label_new(""); + rcstyle = gtk_rc_style_new(); +@@ -378,7 +378,7 @@ + g_signal_connect(G_OBJECT(eventBox), + "button-press-event", + G_CALLBACK(showMenu), (gpointer)this); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/menu.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/menu.gif"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_box_pack_start((GtkBox *)rhvbox, eventBox, FALSE, FALSE, 0); + +@@ -409,7 +409,7 @@ + gtk_widget_set_size_request(ppdWindow, 300, 150); + rcstyle = gtk_rc_style_new(); + +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; + gtk_widget_modify_style(ppdWindow, rcstyle); + + gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); +@@ -735,7 +735,7 @@ + ++lh; + } + eventBox = gtk_event_box_new(); +- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); ++ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), +@@ -751,7 +751,7 @@ + void DartCricket::createLowTon() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/lowton.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/lowton.gif"); + + lowTon = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)lowTon, FALSE); +@@ -764,7 +764,7 @@ + void DartCricket::createHighTon() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/highton.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/highton.gif"); + + highTon = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)highTon, FALSE); +@@ -777,7 +777,7 @@ + void DartCricket::createTon80() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/ton80.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/ton80.gif"); + + ton80 = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)ton80, FALSE); +@@ -817,11 +817,11 @@ + + menuUp = gtk_rc_style_new(); + menuUp->color_flags[0] = GTK_RC_BG; +- menuUp->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menuup.xpm"; ++ menuUp->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menuup.xpm"; + + menuDown = gtk_rc_style_new(); + menuDown->color_flags[0] = GTK_RC_BG; +- menuDown->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menudown.xpm"; ++ menuDown->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menudown.xpm"; + + eventBox = gtk_event_box_new(); + gtk_widget_modify_style(eventBox, menuUp); +@@ -929,15 +929,15 @@ + + // create the background images + for (int i = 0; i < 8; ++i) { +- userScores[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); ++ userScores[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, userScores[i], (i & 1 ? 600 : 0), 60 + ((i / 2) * 130)); + } +- smallScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); ++ smallScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, smallScore, 300, 290); +- largeScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"); ++ largeScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/largescorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, largeScore, 250, 75); + +- centerBg = gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket/images/centerbg.gif"); ++ centerBg = gtk_image_new_from_file("/usr/share/touchmegames/dartcricket/images/centerbg.gif"); + gtk_fixed_put((GtkFixed *)fixed, centerBg, 200, 50); + gtk_box_pack_start((GtkBox *)tophbox, createOpenScreen(), TRUE, FALSE, 5); + +diff -Naur touchmegames/src/dartcricket10/dartcricket10.h touchmegames-p/src/dartcricket10/dartcricket10.h +--- touchmegames/src/dartcricket10/dartcricket10.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcricket10/dartcricket10.h 2007-12-11 04:10:12.000000000 +0100 +@@ -31,7 +31,7 @@ + #include + #include + +-#define dartCricketPath "/usr/local/share/touchmegames/dart/" ++#define dartCricketPath "/usr/share/touchmegames/dart/" + + class DartCricket10 : public GAME_PTR { + private: +diff -Naur touchmegames/src/dartcricket10/events.cpp touchmegames-p/src/dartcricket10/events.cpp +--- touchmegames/src/dartcricket10/events.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcricket10/events.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -476,7 +476,7 @@ + // Bull + if (dart->markImages[dart->currentPlayer][6] == NULL) { + dart->markImages[dart->currentPlayer][6] = +- gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket10/images/cross.gif"); ++ gtk_image_new_from_file("/usr/share/touchmegames/dartcricket10/images/cross.gif"); + gtk_fixed_put((GtkFixed *)dart->fixed, dart->markImages[dart->currentPlayer][6], + 200 + (dart->currentPlayer < 2 ? dart->currentPlayer: + dart->currentPlayer + 1) * 80 + 10, 4 + 118 + 68 * 6); +@@ -488,16 +488,16 @@ + + if (dart->closeMarks[dart->currentPlayer][6] == 1) { + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], +- "/usr/local/share/touchmegames/dartcricket10/images/slash.gif"); ++ "/usr/share/touchmegames/dartcricket10/images/slash.gif"); + } + else if (dart->closeMarks[dart->currentPlayer][6] == 2) { + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], +- "/usr/local/share/touchmegames/dartcricket10/images/cross.gif"); ++ "/usr/share/touchmegames/dartcricket10/images/cross.gif"); + } + else if (dart->closeMarks[dart->currentPlayer][6] >= 3) { + bool gotPoints(false); + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], +- "/usr/local/share/touchmegames/dartcricket10/images/closed.gif"); ++ "/usr/share/touchmegames/dartcricket10/images/closed.gif"); + + + for (int i = 0; i < dart->numberOfPlayers; ++i) { +@@ -548,7 +548,7 @@ + + if (dart->markImages[dart->currentPlayer][20 - x] == NULL) { + dart->markImages[dart->currentPlayer][20 - x] = +- gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket10/images/cross.gif"); ++ gtk_image_new_from_file("/usr/share/touchmegames/dartcricket10/images/cross.gif"); + gtk_fixed_put((GtkFixed *)dart->fixed, dart->markImages[dart->currentPlayer][20 - x], + 200 + (dart->currentPlayer < 2 ? dart->currentPlayer: + dart->currentPlayer + 1) * 80 + 10, 4 + 118 + 68 * (20 - x)); +@@ -559,16 +559,16 @@ + dart->closeMarks[dart->currentPlayer][20 - x] += a; + if (dart->closeMarks[dart->currentPlayer][20 - x] == 1) { + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], +- "/usr/local/share/touchmegames/dartcricket10/images/slash.gif"); ++ "/usr/share/touchmegames/dartcricket10/images/slash.gif"); + } + else if (dart->closeMarks[dart->currentPlayer][20 - x] == 2) { + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], +- "/usr/local/share/touchmegames/dartcricket10/images/cross.gif"); ++ "/usr/share/touchmegames/dartcricket10/images/cross.gif"); + } + else if (dart->closeMarks[dart->currentPlayer][20 - x] >= 3) { + bool gotPoints(false); + gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], +- "/usr/local/share/touchmegames/dartcricket10/images/closed.gif"); ++ "/usr/share/touchmegames/dartcricket10/images/closed.gif"); + + for (int i = 0; i < dart->numberOfPlayers; ++i) { + if (dart->closeMarks[i][20 - x] < 3) { +diff -Naur touchmegames/src/dartcricket10/interface.cpp touchmegames-p/src/dartcricket10/interface.cpp +--- touchmegames/src/dartcricket10/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcricket10/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -346,7 +346,7 @@ + gtk_box_pack_start((GtkBox *)rhvbox, hbox, FALSE, FALSE, 0); + + for (int i = 0; i < 3; ++i) { +- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); ++ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); + gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); + dartLabels[i] = gtk_label_new(""); + rcstyle = gtk_rc_style_new(); +@@ -368,7 +368,7 @@ + g_signal_connect(G_OBJECT(eventBox), + "button-press-event", + G_CALLBACK(showMenu), (gpointer)this); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/menu.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/menu.gif"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_box_pack_start((GtkBox *)rhvbox, eventBox, FALSE, FALSE, 0); + +@@ -399,7 +399,7 @@ + gtk_widget_set_size_request(ppdWindow, 300, 150); + rcstyle = gtk_rc_style_new(); + +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; + gtk_widget_modify_style(ppdWindow, rcstyle); + + gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); +@@ -726,7 +726,7 @@ + ++lh; + } + eventBox = gtk_event_box_new(); +- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); ++ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), +@@ -742,7 +742,7 @@ + void DartCricket10::createLowTon() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/lowton.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/lowton.gif"); + + lowTon = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)lowTon, FALSE); +@@ -755,7 +755,7 @@ + void DartCricket10::createHighTon() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/highton.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/highton.gif"); + + highTon = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)highTon, FALSE); +@@ -768,7 +768,7 @@ + void DartCricket10::createTon80() { + GtkWidget *image; + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/ton80.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/ton80.gif"); + + ton80 = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)ton80, FALSE); +@@ -808,11 +808,11 @@ + + menuUp = gtk_rc_style_new(); + menuUp->color_flags[0] = GTK_RC_BG; +- menuUp->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menuup.xpm"; ++ menuUp->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menuup.xpm"; + + menuDown = gtk_rc_style_new(); + menuDown->color_flags[0] = GTK_RC_BG; +- menuDown->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menudown.xpm"; ++ menuDown->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menudown.xpm"; + + eventBox = gtk_event_box_new(); + gtk_widget_modify_style(eventBox, menuUp); +@@ -920,15 +920,15 @@ + + // create the background images + for (int i = 0; i < 8; ++i) { +- userScores[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); ++ userScores[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, userScores[i], (i & 1 ? 600 : 0), 60 + ((i / 2) * 130)); + } +- smallScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); ++ smallScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, smallScore, 300, 290); +- largeScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"); ++ largeScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/largescorebg.xpm"); + gtk_fixed_put((GtkFixed *)fixed, largeScore, 250, 75); + +- centerBg = gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket10/images/centerbg.gif"); ++ centerBg = gtk_image_new_from_file("/usr/share/touchmegames/dartcricket10/images/centerbg.gif"); + gtk_fixed_put((GtkFixed *)fixed, centerBg, 200, 50); + gtk_box_pack_start((GtkBox *)tophbox, createOpenScreen(), TRUE, FALSE, 5); + +diff -Naur touchmegames/src/dartlowball/dartlowball.h touchmegames-p/src/dartlowball/dartlowball.h +--- touchmegames/src/dartlowball/dartlowball.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartlowball/dartlowball.h 2007-12-11 04:10:12.000000000 +0100 +@@ -31,7 +31,7 @@ + #include + #include + +-#define dart01Path "/usr/local/share/touchmegames/dart01/" ++#define dart01Path "/usr/share/touchmegames/dart01/" + + class DART_LOWBALL : public GAME_PTR { + private: +diff -Naur touchmegames/src/dartlowball/interface.cpp touchmegames-p/src/dartlowball/interface.cpp +--- touchmegames/src/dartlowball/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartlowball/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -192,7 +192,7 @@ + + rcstyle->bg[0] = color; + rcstyle->color_flags[0] = GTK_RC_BG; +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/smallscorebg.xpm"; + gtk_widget_modify_style(eventBox, rcstyle); + + pango_font_description_free(rcstyle->font_desc); +@@ -261,7 +261,7 @@ + color.blue = 0xB400; + rcstyle->bg[0] = color; + rcstyle->color_flags[0] = GTK_RC_BG; +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/largescorebg.xpm"; + gtk_widget_modify_style(eventBox, rcstyle); + + pango_font_description_free(rcstyle->font_desc); +@@ -319,7 +319,7 @@ + color.blue = 0xB400; + rcstyle->bg[0] = color; + rcstyle->color_flags[0] = GTK_RC_BG; +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/smallscorebg.xpm"; + gtk_widget_modify_style(eventBox, rcstyle); + + currentScoreLabel = gtk_label_new("0"); +@@ -367,7 +367,7 @@ + + for (int i = 0; i < 3; ++i) { + +- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); ++ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); + gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); + dartLabels[i] = gtk_label_new(""); + rcstyle = gtk_rc_style_new(); +@@ -409,7 +409,7 @@ + gtk_widget_set_size_request(ppdWindow, 300, 150); + rcstyle = gtk_rc_style_new(); + +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; + gtk_widget_modify_style(ppdWindow, rcstyle); + + gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); +@@ -623,7 +623,7 @@ + ++lh; + } + eventBox = gtk_event_box_new(); +- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); ++ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), +diff -Naur touchmegames/src/darttictactoe/darttictactoe.h touchmegames-p/src/darttictactoe/darttictactoe.h +--- touchmegames/src/darttictactoe/darttictactoe.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/darttictactoe/darttictactoe.h 2007-12-11 04:10:12.000000000 +0100 +@@ -31,7 +31,7 @@ + #include + #include + +-#define dart01Path "/usr/local/share/touchmegames/dart01/" ++#define dart01Path "/usr/share/touchmegames/dart01/" + + class DartTicTacToe : public GAME_PTR { + private: +diff -Naur touchmegames/src/darttictactoe/interface.cpp touchmegames-p/src/darttictactoe/interface.cpp +--- touchmegames/src/darttictactoe/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/darttictactoe/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -43,7 +43,7 @@ + + scoreBg->bg[0] = color; + scoreBg->color_flags[0] = GTK_RC_BG; +- scoreBg->bg_pixmap_name[0] = "/usr/local/share/touchmegames/darttictactoe/images/smallscorebg.xpm"; ++ scoreBg->bg_pixmap_name[0] = "/usr/share/touchmegames/darttictactoe/images/smallscorebg.xpm"; + + selectScoreBg = gtk_rc_style_new(); + std::cout << "Score bg " << selectScoreBg << std::endl; +@@ -53,7 +53,7 @@ + + selectScoreBg->bg[0] = color; + selectScoreBg->color_flags[0] = GTK_RC_BG; +- selectScoreBg->bg_pixmap_name[0] = "/usr/local/share/touchmegames/darttictactoe/images/selectSmallscorebg.xpm"; ++ selectScoreBg->bg_pixmap_name[0] = "/usr/share/touchmegames/darttictactoe/images/selectSmallscorebg.xpm"; + + + timeval tv; +@@ -176,7 +176,7 @@ + color.blue = 0xB400; + rcstyle->bg[0] = color; + rcstyle->color_flags[0] = GTK_RC_BG; +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/darttictactoe/images/tttbg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/darttictactoe/images/tttbg.xpm"; + gtk_widget_modify_style(eventBox, rcstyle); + + ttttable = gtk_table_new(3, 3, TRUE); +@@ -283,7 +283,7 @@ + + for (int i = 0; i < 3; ++i) { + +- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); ++ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); + gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); + dartLabels[i] = gtk_label_new(""); + rcstyle = gtk_rc_style_new(); +@@ -326,7 +326,7 @@ + gtk_widget_set_size_request(mprWindow, 300, 150); + rcstyle = gtk_rc_style_new(); + +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; + gtk_widget_modify_style(mprWindow, rcstyle); + + gtk_widget_modify_bg(mprWindow, GTK_STATE_NORMAL, &color); +@@ -523,7 +523,7 @@ + ++lh; + } + eventBox = gtk_event_box_new(); +- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); ++ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), +diff -Naur touchmegames/src/events.cpp touchmegames-p/src/events.cpp +--- touchmegames/src/events.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/events.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -153,7 +153,7 @@ + TOUCHME_GAMES *sg(reinterpret_cast(ptr)); + + gtk_widget_show(sg->bgImage); +- gtk_image_set_from_file((GtkImage *)sg->bgImage, "/usr/local/share/touchmegames/images/mainmenu/bg_main.png"); ++ gtk_image_set_from_file((GtkImage *)sg->bgImage, "/usr/share/touchmegames/images/mainmenu/bg_main.png"); + + if (sg->gameTable != NULL) { + gtk_widget_destroy(sg->gameTable); +diff -Naur touchmegames/src/flogthedolphin/flogthedolphin.h touchmegames-p/src/flogthedolphin/flogthedolphin.h +--- touchmegames/src/flogthedolphin/flogthedolphin.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/flogthedolphin/flogthedolphin.h 2007-12-11 04:10:12.000000000 +0100 +@@ -25,7 +25,7 @@ + #include + #include + +-#define ftdDeckLocation "/usr/local/share/touchmegames/flogthedolphin/images/" ++#define ftdDeckLocation "/usr/share/touchmegames/flogthedolphin/images/" + + class FLOG_THE_DOLPHIN : public GAME_PTR { + private: +diff -Naur touchmegames/src/flogthedolphin/interface.cpp touchmegames-p/src/flogthedolphin/interface.cpp +--- touchmegames/src/flogthedolphin/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/flogthedolphin/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -215,7 +215,7 @@ + + eb = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eb, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); + gtk_widget_add_events(eb, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eb), "button-press-event", + G_CALLBACK(userExit), (gpointer)this); +diff -Naur touchmegames/src/foxyboxy/events.cpp touchmegames-p/src/foxyboxy/events.cpp +--- touchmegames/src/foxyboxy/events.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/foxyboxy/events.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -125,7 +125,7 @@ + + fb->gameState = PAUSED; + gtk_image_set_from_file((GtkImage *)fb->pauseButton, +- "/usr/local/share/touchmegames/images/buttons/button_play.png"); ++ "/usr/share/touchmegames/images/buttons/button_play.png"); + } + else if (fb->gameState == PAUSED) { + for (int i = 0; i < 10; ++i) { +@@ -141,7 +141,7 @@ + + fb->gameState = RUNNING; + gtk_image_set_from_file((GtkImage *)fb->pauseButton, +- "/usr/local/share/touchmegames/images/buttons/button_pause.png"); ++ "/usr/share/touchmegames/images/buttons/button_pause.png"); + } + } + +@@ -165,7 +165,7 @@ + gboolean FoxyBoxy::paddleReleased(GtkWidget *widget, GdkEventButton *event, gpointer ptr) { + FoxyBoxy *fb(reinterpret_cast(ptr)); + fb->alreadyPressed = false; +- gtk_image_set_from_file((GtkImage *)fb->paddleImage, "/usr/local/share/touchmegames/foxyboxy/images/paddle.png"); ++ gtk_image_set_from_file((GtkImage *)fb->paddleImage, "/usr/share/touchmegames/foxyboxy/images/paddle.png"); + if (fb->spedUpTimer) { + fb->spedUpTimer = false; + if (fb->gameState == RUNNING) { +@@ -188,22 +188,22 @@ + if (event->keyval == GDK_Left) { + fb->moveLeft(false); + gtk_image_set_from_file((GtkImage *)fb->paddleImage, +- "/usr/local/share/touchmegames/foxyboxy/images/paddleleft.png"); ++ "/usr/share/touchmegames/foxyboxy/images/paddleleft.png"); + } + else if (event->keyval == GDK_Right) { + fb->moveRight(false); + gtk_image_set_from_file((GtkImage *)fb->paddleImage, +- "/usr/local/share/touchmegames/foxyboxy/images/paddleright.png"); ++ "/usr/share/touchmegames/foxyboxy/images/paddleright.png"); + } + else if (event->keyval == GDK_Up) { + fb->rotateRight(); + gtk_image_set_from_file((GtkImage *)fb->paddleImage, +- "/usr/local/share/touchmegames/foxyboxy/images/paddlerotate.png"); ++ "/usr/share/touchmegames/foxyboxy/images/paddlerotate.png"); + } + else if (event->keyval == GDK_Down) { + fb->moveDown(); + gtk_image_set_from_file((GtkImage *)fb->paddleImage, +- "/usr/local/share/touchmegames/foxyboxy/images/paddledown.png"); ++ "/usr/share/touchmegames/foxyboxy/images/paddledown.png"); + + } + return TRUE; +diff -Naur touchmegames/src/foxyboxy/interface.cpp touchmegames-p/src/foxyboxy/interface.cpp +--- touchmegames/src/foxyboxy/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/foxyboxy/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -29,7 +29,7 @@ + std::stringstream sstr; + if (type != 0) { + +- sstr << "/usr/local/share/touchmegames/foxyboxy/images/type" ++ sstr << "/usr/share/touchmegames/foxyboxy/images/type" + << type << ".png"; + + gtk_image_set_from_file((GtkImage *)blocks[i][line], sstr.str().c_str()); +@@ -37,7 +37,7 @@ + } + else { + gtk_image_set_from_file((GtkImage *)blocks[i][line], +- "/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ "/usr/share/touchmegames/foxyboxy/images/blank.gif"); + gtk_object_set_user_data((GtkObject *)blocks[i][line], (void *)0); + } + } +@@ -52,7 +52,7 @@ + ++line; + } + for (int i = 0; i < 10; ++i) { +- gtk_image_set_from_file((GtkImage *)blocks[i][0], "/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ gtk_image_set_from_file((GtkImage *)blocks[i][0], "/usr/share/touchmegames/foxyboxy/images/blank.gif"); + gtk_object_set_user_data((GtkObject *)blocks[i][0], (void *)0); + } + } +@@ -204,7 +204,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); +- pauseButton = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_pause.png"); ++ pauseButton = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_pause.png"); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(pauseGame), (gpointer)this); +@@ -291,7 +291,7 @@ + G_CALLBACK(paddlePressed), (gpointer)this); + g_signal_connect(G_OBJECT(eventBox), "button-release-event", + G_CALLBACK(paddleReleased), (gpointer)this); +- paddleImage = gtk_image_new_from_file("/usr/local/share/touchmegames/foxyboxy/images/paddle.png"); ++ paddleImage = gtk_image_new_from_file("/usr/share/touchmegames/foxyboxy/images/paddle.png"); + gtk_container_add((GtkContainer *)eventBox, paddleImage); + + +@@ -300,7 +300,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + gtk_widget_add_events(eventBox, GDK_BUTTON_RELEASE_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", +@@ -326,7 +326,7 @@ + + void FoxyBoxy::createAndShowBlocks() { + int type(nextBlockType); +- std::string imgstr("/usr/local/share/touchmegames/foxyboxy/images/type"); ++ std::string imgstr("/usr/share/touchmegames/foxyboxy/images/type"); + currentBox = (BoxTypes)type; + switch(type) { + case Type1: +@@ -416,25 +416,25 @@ + void FoxyBoxy::initBoxes() { + for (int x = 0; x < 10; ++x) { + for (int y = 0; y < 22; ++y) { +- blocks[x][y] = gtk_image_new_from_file("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ blocks[x][y] = gtk_image_new_from_file("/usr/share/touchmegames/foxyboxy/images/blank.gif"); + gtk_object_set_user_data((GtkObject *)blocks[x][y], NULL); + } + } + for (int x = 0; x < 5; ++x) { + for (int y = 0; y < 6; ++y) { +- nextBlocks[x][y] = gtk_image_new_from_file("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ nextBlocks[x][y] = gtk_image_new_from_file("/usr/share/touchmegames/foxyboxy/images/blank.gif"); + } + } + } + + void FoxyBoxy::showNextBlock() { + std::stringstream sstr; +- sstr << "/usr/local/share/touchmegames/foxyboxy/images/type" << nextBlockType << ".png"; ++ sstr << "/usr/share/touchmegames/foxyboxy/images/type" << nextBlockType << ".png"; + // clear the boxen + for (int x = 1; x < 4; ++x) { + for (int y = 1; y < 5; ++y) { + gtk_image_set_from_file((GtkImage *)nextBlocks[x][y], +- "/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ "/usr/share/touchmegames/foxyboxy/images/blank.gif"); + } + } + switch (nextBlockType) { +diff -Naur touchmegames/src/foxyboxy/support.cpp touchmegames-p/src/foxyboxy/support.cpp +--- touchmegames/src/foxyboxy/support.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/foxyboxy/support.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -120,11 +120,11 @@ + } + if (coordsOk(newCoords) > 0) { + std::stringstream imgStr; +- imgStr << "/usr/local/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; ++ imgStr << "/usr/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; + + + // first clear the old location +- showBlocks("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ showBlocks("/usr/share/touchmegames/foxyboxy/images/blank.gif"); + + // next, copy the new coords into coords + memcpy(coords, newCoords, sizeof(newCoords)); +@@ -199,22 +199,22 @@ + if (isLeft(x, y)) { + moveLeft(false); + gtk_image_set_from_file((GtkImage *)paddleImage, +- "/usr/local/share/touchmegames/foxyboxy/images/paddleleft.png"); ++ "/usr/share/touchmegames/foxyboxy/images/paddleleft.png"); + } + else if (isRight(x, y)) { + moveRight(false); + gtk_image_set_from_file((GtkImage *)paddleImage, +- "/usr/local/share/touchmegames/foxyboxy/images/paddleright.png"); ++ "/usr/share/touchmegames/foxyboxy/images/paddleright.png"); + } + else if (isRotate(x, y)) { + rotateRight(); + gtk_image_set_from_file((GtkImage *)paddleImage, +- "/usr/local/share/touchmegames/foxyboxy/images/paddlerotate.png"); ++ "/usr/share/touchmegames/foxyboxy/images/paddlerotate.png"); + } + else if (isDown(x, y)) { + moveDown(); + gtk_image_set_from_file((GtkImage *)paddleImage, +- "/usr/local/share/touchmegames/foxyboxy/images/paddledown.png"); ++ "/usr/share/touchmegames/foxyboxy/images/paddledown.png"); + } + } + +@@ -227,11 +227,11 @@ + } + if (coordsOk(newCoords) > 0) { + std::stringstream imgStr; +- imgStr << "/usr/local/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; ++ imgStr << "/usr/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; + + + // first clear the old location +- showBlocks("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ showBlocks("/usr/share/touchmegames/foxyboxy/images/blank.gif"); + + // next, copy the new coords into coords + memcpy(coords, newCoords, sizeof(newCoords)); +@@ -256,11 +256,11 @@ + } + if (coordsOk(newCoords) > 0) { + std::stringstream imgStr; +- imgStr << "/usr/local/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; ++ imgStr << "/usr/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; + + + // first clear the old location +- showBlocks("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ showBlocks("/usr/share/touchmegames/foxyboxy/images/blank.gif"); + + // next, copy the new coords into coords + memcpy(coords, newCoords, sizeof(newCoords)); +@@ -452,11 +452,11 @@ + } + if (coordsOk(newCoords) > 0) { + std::stringstream imgStr; +- imgStr << "/usr/local/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; ++ imgStr << "/usr/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; + + + // first clear the old location +- showBlocks("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ showBlocks("/usr/share/touchmegames/foxyboxy/images/blank.gif"); + + // next, copy the new coords into coords + memcpy(coords, newCoords, sizeof(newCoords)); +@@ -497,7 +497,7 @@ + while (linesToFlash[line] != -1 && line < 4) { + for (int i = 0; i < 10; ++i) { + gtk_image_set_from_file((GtkImage *)blocks[i][linesToFlash[line]], +- "/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); ++ "/usr/share/touchmegames/foxyboxy/images/blank.gif"); + } + ++line; + } +@@ -509,7 +509,7 @@ + for (int i = 0; i < 10; ++i) { + int type((int)gtk_object_get_user_data((GtkObject *)blocks[i][linesToFlash[line]])); + std::stringstream sstr; +- sstr << "/usr/local/share/touchmegames/foxyboxy/images/type" << type << ".png"; ++ sstr << "/usr/share/touchmegames/foxyboxy/images/type" << type << ".png"; + gtk_image_set_from_file((GtkImage *)blocks[i][linesToFlash[line]], + sstr.str().c_str()); + } +diff -Naur touchmegames/src/gorillathrilla/gorillathrilla.h touchmegames-p/src/gorillathrilla/gorillathrilla.h +--- touchmegames/src/gorillathrilla/gorillathrilla.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/gorillathrilla/gorillathrilla.h 2007-12-11 04:10:12.000000000 +0100 +@@ -25,7 +25,7 @@ + #include + #include + +-#define gtDeckLocation "/usr/local/share/touchmegames/gorillathrilla/images/" ++#define gtDeckLocation "/usr/share/touchmegames/gorillathrilla/images/" + + class GORILLA_THRILLA : public GAME_PTR { + private: +diff -Naur touchmegames/src/gorillathrilla/interface.cpp touchmegames-p/src/gorillathrilla/interface.cpp +--- touchmegames/src/gorillathrilla/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/gorillathrilla/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -109,7 +109,7 @@ + // left center + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(userExit), (gpointer)this); +@@ -125,7 +125,7 @@ + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + gtk_widget_add_events(eventBox, GDK_BUTTON1_MOTION_MASK); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_take_score.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_take_score.png"); + gtk_container_add((GtkContainer *)eventBox, image); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(takeScore), (gpointer)this); +@@ -199,12 +199,12 @@ + + //gtk_box_pack_start((GtkBox *)hbox, rightFixed, FALSE, FALSE, 0); + +- dispSpot = gtk_image_new_from_file("/usr/local/share/touchmegames/gorillathrilla/images/up.png"); ++ dispSpot = gtk_image_new_from_file("/usr/share/touchmegames/gorillathrilla/images/up.png"); + gtk_fixed_put(GTK_FIXED(centerFixed), dispSpot, 243, 400); + + + +- diskImage = gtk_image_new_from_file("/usr/local/share/touchmegames/gorillathrilla/images/banana.png"); ++ diskImage = gtk_image_new_from_file("/usr/share/touchmegames/gorillathrilla/images/banana.png"); + + + gtk_fixed_put(GTK_FIXED(topFixed), diskImage, 700, 80); +@@ -273,7 +273,7 @@ + label = gtk_label_new(" "); + gtk_box_pack_start((GtkBox *)hbox, label, FALSE, FALSE, 0); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/gorillathrilla/images/barrel.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/gorillathrilla/images/barrel.gif"); + gtk_container_add((GtkContainer *)eventBox, image); + + g_signal_connect(G_OBJECT(eventBox), "button-press-event", +@@ -303,7 +303,7 @@ + //gtk_box_pack_start((GtkBox *)hbox, fixed, FALSE, FALSE, 0); + //gtk_widget_show(fixed); + +- dealSpot = gtk_image_new_from_file("/usr/local/share/touchmegames/gorillathrilla/images/left.png"); ++ dealSpot = gtk_image_new_from_file("/usr/share/touchmegames/gorillathrilla/images/left.png"); + // gtk_fixed_put(GTK_FIXED(fixed), dealSpot, 400, 500); + // gtk_widget_set_uposition(dealSpot, 400, 500); + gtk_box_pack_start((GtkBox *)hbox, dealSpot, FALSE, FALSE, 10); +diff -Naur touchmegames/src/interface.cpp touchmegames-p/src/interface.cpp +--- touchmegames/src/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -36,7 +36,7 @@ + + topWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); + +- gtk_window_set_default_icon_from_file("/usr/local/share/touchmegames/images/icon1.gif", &err); ++ gtk_window_set_default_icon_from_file("/usr/share/touchmegames/images/icon1.gif", &err); + + + +@@ -60,14 +60,14 @@ + + + gameSelectFixed = gtk_fixed_new(); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/submenu/bg_sub.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/submenu/bg_sub.png"); + gtk_fixed_put((GtkFixed *)gameSelectFixed, image, 0, 0); + + startButton = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)startButton, FALSE); + gtk_widget_add_events(startButton, GDK_BUTTON_PRESS_MASK); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_start.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_start.png"); + gtk_container_add((GtkContainer *)startButton, image); + gtk_fixed_put((GtkFixed *)gameSelectFixed, startButton, 400, 330); + +@@ -79,7 +79,7 @@ + gtk_event_box_set_visible_window((GtkEventBox *)aboutButton, FALSE); + gtk_widget_add_events(aboutButton, GDK_BUTTON_PRESS_MASK); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_about.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_about.png"); + gtk_container_add((GtkContainer *)aboutButton, image); + gtk_fixed_put((GtkFixed *)gameSelectFixed, aboutButton, 600, 330); + +@@ -89,7 +89,7 @@ + + + +- gameBg = gtk_image_new_from_file("/usr/local/share/touchmegames/images/gamebuttonbg.gif"); ++ gameBg = gtk_image_new_from_file("/usr/share/touchmegames/images/gamebuttonbg.gif"); + gtk_fixed_put((GtkFixed *)gameSelectFixed, gameBg, 0, 0); + + gtk_fixed_put((GtkFixed *)gameSelectFixed, selectVbox, 0, 0); +@@ -113,7 +113,7 @@ + gtk_event_box_set_visible_window((GtkEventBox *)back, FALSE); + gtk_widget_add_events(back, GDK_BUTTON_PRESS_MASK); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_back.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_back.png"); + gtk_container_add((GtkContainer *)back, image); + gtk_box_pack_start((GtkBox *)selectBox, back, FALSE, FALSE, 10); + g_signal_connect(G_OBJECT(back), +@@ -155,7 +155,7 @@ + GtkRcStyle *rcstyle; + GdkColor color; + std::string name((*it)->name()); +- std::string imgloc("/usr/local/share/touchmegames/"); ++ std::string imgloc("/usr/share/touchmegames/"); + + ++cntr; + +@@ -177,7 +177,7 @@ + + rcstyle->bg[0] = color; + rcstyle->color_flags[0] = GTK_RC_BG; +- //rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/images/gamebuttonbg.xpm"; ++ //rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/images/gamebuttonbg.xpm"; + gtk_object_set_user_data((GtkObject *)eventBox, (void *)(cntr - 1)); + gtk_widget_modify_style(eventBox, rcstyle); + +@@ -222,7 +222,7 @@ + + } + while (cntr != 6) { +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/submenu/blankgame.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/submenu/blankgame.gif"); + //gtk_widget_set_size_request(image, 148, ); + gtk_table_attach_defaults((GtkTable *)gameTable, image, cntr % 2, (cntr % 2) + 1, cntr / 2, (cntr / 2) + 1); + ++cntr; +@@ -271,7 +271,7 @@ + gtk_event_box_set_visible_window((GtkEventBox *)arrow, FALSE); + gtk_widget_add_events(arrow, GDK_BUTTON_PRESS_MASK); + gtk_object_set_user_data((GtkObject *)arrow, (void *)((gameType << 16) | (leftStart - games.begin()))); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_left.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_left.png"); + gtk_container_add((GtkContainer *)arrow, image); + gtk_table_attach_defaults((GtkTable *)gameTable, arrow, 0, 1, 3, 4); + g_signal_connect(G_OBJECT(arrow), +@@ -285,7 +285,7 @@ + gtk_event_box_set_visible_window((GtkEventBox *)arrow, FALSE); + gtk_widget_add_events(arrow, GDK_BUTTON_PRESS_MASK); + gtk_object_set_user_data((GtkObject *)arrow, (void *)((gameType << 16) | (rightStart - games.begin() + 1))); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_right.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_right.png"); + gtk_container_add((GtkContainer *)arrow, image); + gtk_table_attach_defaults((GtkTable *)gameTable, arrow, 1, 2, 3, 4); + g_signal_connect(G_OBJECT(arrow), +@@ -411,7 +411,7 @@ + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_start.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_start.png"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_table_attach_defaults((GtkTable *)previewTable, eventBox, 0, 1, 3, 4); + +@@ -424,7 +424,7 @@ + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_about.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_about.png"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_table_attach_defaults((GtkTable *)previewTable, eventBox, 3, 4, 3, 4); + +@@ -462,7 +462,7 @@ + // DART_GAME + + // background image +- bgImage = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_main.png"); ++ bgImage = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_main.png"); + gtk_fixed_put((GtkFixed *)mainMenu, bgImage, 0, 0); + + +@@ -475,15 +475,15 @@ + gtk_widget_add_events(menuWidgets[0], GDK_BUTTON_PRESS_MASK); + + // caption below +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_cardgames.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_cardgames.png"); + menuCaptions[0] = image; + gtk_fixed_put((GtkFixed *)mainMenu, image, 130, 279); + + // cards +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); + widget = gtk_fixed_new(); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_cards.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_cards.png"); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); + gtk_container_add((GtkContainer *)menuWidgets[0], widget); + gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[0], 130, 150); +@@ -499,15 +499,15 @@ + gtk_widget_add_events(menuWidgets[1], GDK_BUTTON_PRESS_MASK); + + // caption below +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_wordhunt.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_wordhunt.png"); + menuCaptions[1] = image; + gtk_fixed_put((GtkFixed *)mainMenu, image, 330, 279); + + // words +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); + widget = gtk_fixed_new(); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_words.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_words.png"); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); + gtk_container_add((GtkContainer *)menuWidgets[1], widget); + gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[1], 330, 150); +@@ -522,15 +522,15 @@ + gtk_widget_add_events(menuWidgets[2], GDK_BUTTON_PRESS_MASK); + + // caption below +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_strategy.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_strategy.png"); + menuCaptions[2] = image; + gtk_fixed_put((GtkFixed *)mainMenu, image, 535, 280); + + // strategy +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); + widget = gtk_fixed_new(); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_strategy.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_strategy.png"); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); + gtk_container_add((GtkContainer *)menuWidgets[2], widget); + gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[2], 530, 150); +@@ -544,15 +544,15 @@ + gtk_widget_add_events(menuWidgets[3], GDK_BUTTON_PRESS_MASK); + + // caption below +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_darts.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_darts.png"); + menuCaptions[3] = image; + gtk_fixed_put((GtkFixed *)mainMenu, image, 230, 435); + + // darts +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); + widget = gtk_fixed_new(); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_darts.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_darts.png"); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); + gtk_container_add((GtkContainer *)menuWidgets[3], widget); + gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[3], 230, 305); +@@ -566,15 +566,15 @@ + gtk_widget_add_events(menuWidgets[4], GDK_BUTTON_PRESS_MASK); + + // caption below +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_misc.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_misc.png"); + menuCaptions[4] = image; + gtk_fixed_put((GtkFixed *)mainMenu, image, 430, 430); + + // misc +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); + widget = gtk_fixed_new(); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_misc.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_misc.png"); + gtk_fixed_put((GtkFixed *)widget, image, 0, 0); + gtk_container_add((GtkContainer *)menuWidgets[4], widget); + gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[4], 430, 305); +@@ -591,7 +591,7 @@ + gtk_event_box_set_visible_window((GtkEventBox *)mainBack, FALSE); + gtk_widget_add_events(mainBack, GDK_BUTTON_PRESS_MASK); + +- widget = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_back.png"); ++ widget = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_back.png"); + gtk_container_add((GtkContainer *)mainBack, widget); + g_signal_connect(G_OBJECT(mainBack), + "button-press-event", +@@ -602,7 +602,7 @@ + gtk_event_box_set_visible_window((GtkEventBox *)mainAbout, FALSE); + gtk_widget_add_events(mainAbout, GDK_BUTTON_PRESS_MASK); + +- widget = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_about.png"); ++ widget = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_about.png"); + gtk_container_add((GtkContainer *)mainAbout, widget); + g_signal_connect(G_OBJECT(mainAbout), + "button-press-event", +diff -Naur touchmegames/src/lib/gameptr.cpp touchmegames-p/src/lib/gameptr.cpp +--- touchmegames/src/lib/gameptr.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/lib/gameptr.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -51,13 +51,13 @@ + + fixed = gtk_fixed_new(); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/games/exitbg.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/games/exitbg.png"); + gtk_fixed_put((GtkFixed *)fixed, image, 0, 0); + + gtk_box_pack_start((GtkBox *)GTK_DIALOG(exitDialog)->vbox, fixed, FALSE, FALSE, 0); + vbox = gtk_vbox_new(FALSE, 0); + gtk_fixed_put((GtkFixed *)fixed, vbox, 0, 0); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/confirmexit.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/confirmexit.png"); + gtk_box_pack_start((GtkBox *)vbox, image, FALSE, FALSE, 0); + // label = gtk_label_new(" "); + // gtk_widget_set_size_request(label, 20, -1); +@@ -67,7 +67,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); +- ok = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_ok.png"); ++ ok = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_ok.png"); + gtk_container_add((GtkContainer *)eventBox, ok); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + +@@ -79,7 +79,7 @@ + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + gtk_widget_add_events(eventBox, GDK_ALL_EVENTS_MASK); +- cancel = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_cancel.png"); ++ cancel = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_cancel.png"); + gtk_container_add((GtkContainer *)eventBox, cancel); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-release-event", +@@ -656,7 +656,7 @@ + void GAME_PTR::playWave(char *waveFile) { + if (tmgWave != NULL) { + std::stringstream sstr; +- sstr << "/usr/local/share/touchmegames/" << name() << "/sounds/" << waveFile; ++ sstr << "/usr/share/touchmegames/" << name() << "/sounds/" << waveFile; + tmgWave->play((char *)sstr.str().c_str()); + } + } +@@ -668,7 +668,7 @@ + } + + GtkWidget *GAME_PTR::loadImage(std::string imageFile) { +- std::string str("/usr/local/share/touchmegames/"); ++ std::string str("/usr/share/touchmegames/"); + str += name(); + str += "/images/"; + str += imageFile; +@@ -676,7 +676,7 @@ + } + + void GAME_PTR::reloadImage(GtkWidget *widget, std::string imageFile) { +- std::string str("/usr/local/share/touchmegames/"); ++ std::string str("/usr/share/touchmegames/"); + str += name(); + str += "/images/"; + str += imageFile; +diff -Naur touchmegames/src/secretphrase/events.cpp touchmegames-p/src/secretphrase/events.cpp +--- touchmegames/src/secretphrase/events.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/secretphrase/events.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -77,7 +77,7 @@ + } + + sstr.str(""); +- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; ++ sstr << "/usr/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; + gtk_image_set_from_file((GtkImage *)sp->guessesLeftImg, sstr.str().c_str()); + sp->handleCountDown = 20; + +@@ -171,7 +171,7 @@ + sstr << sp->currentScore; + gtk_label_set_text((GtkLabel *)sp->scoreLabel, sstr.str().c_str()); + sstr.str(""); +- sstr << "/usr/local/share/touchmegames/secretphrase/images/" ++ sstr << "/usr/share/touchmegames/secretphrase/images/" + << sp->guessesLeft << ".gif"; + gtk_image_set_from_file((GtkImage *)sp->guessesLeftImg, sstr.str().c_str()); + +@@ -224,7 +224,7 @@ + + x = (sp->currentKey - 'a') % 13; + y = (sp->currentKey - 'a') / 13; +- gtk_image_set_from_file((GtkImage *)sp->lowerLetters[y][x], "/usr/local/share/touchmegames/secretphrase/images/back.gif"); ++ gtk_image_set_from_file((GtkImage *)sp->lowerLetters[y][x], "/usr/share/touchmegames/secretphrase/images/back.gif"); + sstr << sp->getNumberOfOccurences(sp->currentKey) << ' ' << (char)(key - 0x20) << "'s found."; + gtk_label_set_text((GtkLabel *)sp->infoLabel, sstr.str().c_str()); + sp->progress.hide(); +@@ -236,7 +236,7 @@ + } + else { + sstr.str(""); +- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; ++ sstr << "/usr/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; + + gtk_image_set_from_file((GtkImage *)sp->guessesLeftImg, sstr.str().c_str()); + sp->handleCountDown = 20; +@@ -283,7 +283,7 @@ + + x = (sp->currentKey - 'a') % 13; + y = (sp->currentKey - 'a') / 13; +- gtk_image_set_from_file((GtkImage *)sp->lowerLetters[y][x], "/usr/local/share/touchmegames/secretphrase/images/back.gif"); ++ gtk_image_set_from_file((GtkImage *)sp->lowerLetters[y][x], "/usr/share/touchmegames/secretphrase/images/back.gif"); + sstr << sp->getNumberOfOccurences(sp->currentKey) << ' ' << (char)(key - 0x20) << "'s found."; + gtk_label_set_text((GtkLabel *)sp->infoLabel, sstr.str().c_str()); + sp->progress.hide(); +@@ -295,7 +295,7 @@ + } + else { + sstr.str(""); +- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; ++ sstr << "/usr/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; + + gtk_image_set_from_file((GtkImage *)sp->guessesLeftImg, sstr.str().c_str()); + sp->handleCountDown = 20; +diff -Naur touchmegames/src/secretphrase/interface.cpp touchmegames-p/src/secretphrase/interface.cpp +--- touchmegames/src/secretphrase/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/secretphrase/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -85,7 +85,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(userExit), (gpointer)this); +@@ -122,15 +122,15 @@ + gtk_widget_modify_fg(label, (GtkStateType)0, &c); + gtk_box_pack_start((GtkBox *)hbox, label, FALSE, FALSE, 5); + +- guessesLeftImg = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/3.gif"); ++ guessesLeftImg = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/3.gif"); + gtk_box_pack_start((GtkBox *)hbox, guessesLeftImg, FALSE, FALSE, 10); + + fixed = gtk_fixed_new(); + gtk_fixed_set_has_window((GtkFixed *)fixed, TRUE); + gtk_widget_set_size_request(fixed, 260, 75); + +- wheelImage1 = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/wheel.gif"); +- wheelImage2 = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/wheel.gif"); ++ wheelImage1 = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/wheel.gif"); ++ wheelImage2 = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/wheel.gif"); + gtk_fixed_put((GtkFixed *)fixed, wheelImage1, 0, 0); + gtk_fixed_put((GtkFixed *)fixed, wheelImage2, 2210, 0); + +@@ -163,7 +163,7 @@ + + for (int x = 0; x < 14; ++x) { + for (int y = 0; y < 4; ++y) { +- centerLetters[y][x] = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/back.gif"); ++ centerLetters[y][x] = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/back.gif"); + gtk_table_attach_defaults((GtkTable *)table, centerLetters[y][x], x, x + 1, y, y + 1); + } + } +@@ -183,7 +183,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); +- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << (char)(x + (y * 13) + 'a') << ".gif"; ++ sstr << "/usr/share/touchmegames/secretphrase/images/" << (char)(x + (y * 13) + 'a') << ".gif"; + lowerLetters[y][x] = gtk_image_new_from_file(sstr.str().c_str()); + gtk_container_add((GtkContainer *)eventBox, lowerLetters[y][x]); + gtk_object_set_user_data((GtkObject *)eventBox, (void *)(x + (y * 13) + 'a')); +@@ -244,10 +244,10 @@ + gtk_box_pack_start((GtkBox *)vbox, hbox, FALSE, FALSE, 0); + for (int i = 0; i < 20; ++i) { + if (i & 1) { +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/lhcurtain.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/lhcurtain.gif"); + } + else { +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/rhcurtain.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/rhcurtain.gif"); + } + gtk_box_pack_start((GtkBox *)hbox, image, FALSE, FALSE, 0); + } +@@ -273,7 +273,7 @@ + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/misc.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/misc.gif"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_object_set_user_data((GtkObject *)eventBox, (void *)(CatMisc)); + gtk_table_attach_defaults((GtkTable *)table, eventBox, 0, 1, 0, 1); +@@ -286,7 +286,7 @@ + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/sports.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/sports.gif"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_object_set_user_data((GtkObject *)eventBox, (void *)(CatSports)); + gtk_table_attach_defaults((GtkTable *)table, eventBox, 1, 2, 0, 1); +@@ -300,7 +300,7 @@ + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/music.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/music.gif"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_object_set_user_data((GtkObject *)eventBox, (void *)(CatMusic)); + gtk_table_attach_defaults((GtkTable *)table, eventBox, 2, 3, 0, 1); +@@ -313,7 +313,7 @@ + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/video.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/video.gif"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_object_set_user_data((GtkObject *)eventBox, (void *)(CatVideo)); + gtk_table_attach_defaults((GtkTable *)table, eventBox, 0, 1, 1, 2); +@@ -355,7 +355,7 @@ + progress.init(); + progress.width(101); + progress.height(26); +- progress.image("/usr/local/share/touchmegames/secretphrase/images/progress.gif"); ++ progress.image("/usr/share/touchmegames/secretphrase/images/progress.gif"); + gtk_box_pack_start((GtkBox *)hbox, progress.widget(), FALSE, FALSE, 10); + pango_font_description_free(rcstyle->font_desc); + return hbox; +@@ -380,7 +380,7 @@ + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(solvePhrase), (gpointer)this); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/solvenow.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/solvenow.gif"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_box_pack_start((GtkBox *)normVbox, eventBox, FALSE, FALSE, 5); + +diff -Naur touchmegames/src/secretphrase/support.cpp touchmegames-p/src/secretphrase/support.cpp +--- touchmegames/src/secretphrase/support.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/secretphrase/support.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -90,7 +90,7 @@ + for (int x = 0; x < 14; ++x) { + for (int y = 0; y < 4; ++y) { + gtk_image_set_from_file((GtkImage *)centerLetters[y][x], +- "/usr/local/share/touchmegames/secretphrase/images/back.gif"); ++ "/usr/share/touchmegames/secretphrase/images/back.gif"); + letters[y][x] = ' '; + } + } +@@ -99,7 +99,7 @@ + + vowelsAllowed = false; + +- gtk_image_set_from_file((GtkImage *)guessesLeftImg, "/usr/local/share/touchmegames/secretphrase/images/3.gif"); ++ gtk_image_set_from_file((GtkImage *)guessesLeftImg, "/usr/share/touchmegames/secretphrase/images/3.gif"); + guessesLeft = 3; + + for (int i = 0; i < 26; ++i) { +@@ -115,7 +115,7 @@ + for (int y = 0; y < 2; ++y) { + for (int x = 0; x < 13; ++x) { + std::stringstream sstr; +- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << (char)(x + (y * 13) + 'a') << ".gif"; ++ sstr << "/usr/share/touchmegames/secretphrase/images/" << (char)(x + (y * 13) + 'a') << ".gif"; + gtk_image_set_from_file((GtkImage *)lowerLetters[y][x], sstr.str().c_str()); + } + } +@@ -215,7 +215,7 @@ + std::string descriptor, phrase, str; + XmlParser parser; + +- str = "/usr/local/share/touchmegames/secretphrase/phrases/"; ++ str = "/usr/share/touchmegames/secretphrase/phrases/"; + str += category; + str += ".xml"; + +@@ -290,26 +290,26 @@ + if (letters[y][x] == '\'') { + + gtk_image_set_from_file((GtkImage *)centerLetters[y][x], +- "/usr/local/share/touchmegames/secretphrase/images/apost.gif"); ++ "/usr/share/touchmegames/secretphrase/images/apost.gif"); + letters[y][x] = ' '; + } + else if (letters[y][x] == '-') { + gtk_image_set_from_file((GtkImage *)centerLetters[y][x], +- "/usr/local/share/touchmegames/secretphrase/images/dash.gif"); ++ "/usr/share/touchmegames/secretphrase/images/dash.gif"); + letters[y][x] = ' '; + } + else if (letters[y][x] == ',') { + gtk_image_set_from_file((GtkImage *)centerLetters[y][x], +- "/usr/local/share/touchmegames/secretphrase/images/comma.gif"); ++ "/usr/share/touchmegames/secretphrase/images/comma.gif"); + letters[y][x] = ' '; + } + else if (letters[y][x] != ' ') { + gtk_image_set_from_file((GtkImage *)centerLetters[y][x], +- "/usr/local/share/touchmegames/secretphrase/images/back.gif"); ++ "/usr/share/touchmegames/secretphrase/images/back.gif"); + } + else { + gtk_image_set_from_file((GtkImage *)centerLetters[y][x], +- "/usr/local/share/touchmegames/secretphrase/images/blank.gif"); ++ "/usr/share/touchmegames/secretphrase/images/blank.gif"); + } + } + } +@@ -336,7 +336,7 @@ + + if (letters[i][l] == ch) { + std::string str; +- str = "/usr/local/share/touchmegames/secretphrase/images/"; ++ str = "/usr/share/touchmegames/secretphrase/images/"; + str += ch; + str += ".gif"; + +@@ -375,7 +375,7 @@ + for (int x = 0; x < 14; ++x) { + if (letters[y][x] != ' ') { + std::string str; +- str = "/usr/local/share/touchmegames/secretphrase/images/"; ++ str = "/usr/share/touchmegames/secretphrase/images/"; + str += letters[y][x]; + str += ".gif"; + +diff -Naur touchmegames/src/sudoku/interface.cpp touchmegames-p/src/sudoku/interface.cpp +--- touchmegames/src/sudoku/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/sudoku/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -174,7 +174,7 @@ + progress.init(); + progress.width(151); + progress.height(32); +- progress.image("/usr/local/share/touchmegames/sudoku/images/timebar_full.png"); ++ progress.image("/usr/share/touchmegames/sudoku/images/timebar_full.png"); + progress.percent(100); + progress.text("2:00"); + color.red = 0xFFFF; +@@ -268,7 +268,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(userExit), (gpointer)this); +diff -Naur touchmegames/src/threescompany/events.cpp touchmegames-p/src/threescompany/events.cpp +--- touchmegames/src/threescompany/events.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/threescompany/events.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -415,7 +415,7 @@ + + void ThreesCompany::takeScorePressed(GtkWidget *widget, GdkEventButton *event, gpointer ptr) { + gtk_image_set_from_file((GtkImage *)gtk_bin_get_child((GtkBin *)widget), +- "/usr/local/share/touchmegames/threescompany/images/takescoredown.xpm"); ++ "/usr/share/touchmegames/threescompany/images/takescoredown.xpm"); + + } + +@@ -423,7 +423,7 @@ + ThreesCompany *tc(reinterpret_cast(ptr)); + + gtk_image_set_from_file((GtkImage *)gtk_bin_get_child((GtkBin *)widget), +- "/usr/local/share/touchmegames/threescompany/images/takescoreup.xpm"); ++ "/usr/share/touchmegames/threescompany/images/takescoreup.xpm"); + + ++tc->round; + if (tc->round <= 3) { +diff -Naur touchmegames/src/threescompany/interface.cpp touchmegames-p/src/threescompany/interface.cpp +--- touchmegames/src/threescompany/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/threescompany/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -122,7 +122,7 @@ + } + cardMask = gtk_event_box_new(); + gtk_widget_set_size_request(cardMask, 50, 50); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/threescompany/images/mask.xpm"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/threescompany/images/mask.xpm"); + gtk_container_add((GtkContainer *)cardMask, image); + gtk_event_box_set_visible_window((GtkEventBox *)cardMask, FALSE); + gtk_widget_add_events(cardMask, GDK_BUTTON_RELEASE_MASK); +@@ -226,7 +226,7 @@ + rcstyle = gtk_rc_style_new(); + + rcstyle->color_flags[0] = GTK_RC_BG; +- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/threescompany/images/background.gif"; ++ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/threescompany/images/background.gif"; + gtk_widget_modify_style(topEventBox, rcstyle); + + +@@ -285,7 +285,7 @@ + g_signal_connect(G_OBJECT(takeScore), "button-release-event", + G_CALLBACK(takeScoreReleased), (gpointer)this); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/threescompany/images/takescoreup.xpm"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/threescompany/images/takescoreup.xpm"); + gtk_container_add((GtkContainer *)takeScore, image); + gtk_box_pack_start((GtkBox *)vbox, takeScore, FALSE, FALSE, 20); + +@@ -306,7 +306,7 @@ + + eventBox2 = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox2, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); + gtk_widget_add_events(eventBox2, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox2), "button-press-event", + G_CALLBACK(userExit), (gpointer)this); +diff -Naur touchmegames/src/threescompany/support.cpp touchmegames-p/src/threescompany/support.cpp +--- touchmegames/src/threescompany/support.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/threescompany/support.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -26,8 +26,8 @@ + #include + + ThreesCompany::ThreesCompany() : gameName("threescompany"), toggleOccuring(false), +- deckLocation("/usr/local/share/touchmegames/images/cards/"), +- deckBack("/usr/local/share/touchmegames/images/cards/backs/back-2.gif") { ++ deckLocation("/usr/share/touchmegames/images/cards/"), ++ deckBack("/usr/share/touchmegames/images/cards/backs/back-2.gif") { + bgcolor.red = 0x0000; + bgcolor.green = 0x0000; + bgcolor.blue = 0x0000; +diff -Naur touchmegames/src/tritowers/events.cpp touchmegames-p/src/tritowers/events.cpp +--- touchmegames/src/tritowers/events.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/tritowers/events.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -274,7 +274,7 @@ + + void TriTowers::takeScorePressed(GtkWidget *widget, GdkEventButton *event, gpointer ptr) { + // gtk_image_set_from_file((GtkImage *)gtk_bin_get_child((GtkBin *)widget), +-// "/usr/local/share/touchmegames/tritowers/images/takescoredown.xpm"); ++// "/usr/share/touchmegames/tritowers/images/takescoredown.xpm"); + + } + +@@ -282,7 +282,7 @@ + TriTowers *tc(reinterpret_cast(ptr)); + if (widget != NULL) { + // gtk_image_set_from_file((GtkImage *)gtk_bin_get_child((GtkBin *)widget), +-// "/usr/local/share/touchmegames/tritowers/images/takescoreup.xpm"); ++// "/usr/share/touchmegames/tritowers/images/takescoreup.xpm"); + } + if (tc->gameState == PLAY_ROUND || widget == NULL) { + ++tc->round; +diff -Naur touchmegames/src/tritowers/interface.cpp touchmegames-p/src/tritowers/interface.cpp +--- touchmegames/src/tritowers/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/tritowers/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -122,7 +122,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(userExit), (gpointer)this); +@@ -138,7 +138,7 @@ + g_signal_connect(G_OBJECT(eventBox), "button-release-event", + G_CALLBACK(takeScoreReleased), (gpointer)this); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_take_score.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_take_score.png"); + gtk_container_add((GtkContainer *)eventBox, image); + gtk_fixed_put((GtkFixed *)centerFixed, eventBox, 584, 20); + //gtk_box_pack_start((GtkBox *)hbox, eventBox, FALSE, FALSE, 20); +@@ -194,7 +194,7 @@ + label = gtk_label_new(" "); + gtk_box_pack_start((GtkBox *)hbox, label, FALSE, FALSE, 0); + +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/cards/backs/deck10.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/cards/backs/deck10.png"); + + gtk_container_add((GtkContainer *)eventBox, image); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", +@@ -252,7 +252,7 @@ + // g_signal_connect(G_OBJECT(eventBox), "button-release-event", + // G_CALLBACK(takeScoreReleased), (gpointer)this); + +-// image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_take_score.png"); ++// image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_take_score.png"); + // gtk_container_add((GtkContainer *)eventBox, image); + // gtk_box_pack_start((GtkBox *)hbox, eventBox, FALSE, FALSE, 20); + +@@ -307,7 +307,7 @@ + highrun = 0; + + topFixed = gtk_fixed_new(); +- //bgImage = gtk_image_new_from_file("/usr/local/share/touchmegames/images/games/bg.png"); ++ //bgImage = gtk_image_new_from_file("/usr/share/touchmegames/images/games/bg.png"); + bgImage = loadImage("fullbg.png"); + gtk_fixed_put((GtkFixed *)topFixed, bgImage, 0, 0); + +@@ -338,18 +338,18 @@ + dealCard = NULL; + + for (int i = 0; i < 3; ++i) { +- swordImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/sword.gif"); ++ swordImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/sword.gif"); + gtk_fixed_put((GtkFixed *)centerFixed, swordImages[i], 0, -300); + } + +- bonusImages[0] = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/500.gif"); ++ bonusImages[0] = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/500.gif"); + gtk_fixed_put((GtkFixed *)centerFixed, bonusImages[0], 0, -300); +- bonusImages[1] = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/1000.gif"); ++ bonusImages[1] = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/1000.gif"); + gtk_fixed_put((GtkFixed *)centerFixed, bonusImages[1], 0, -300); +- bonusImages[2] = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/1500.gif"); ++ bonusImages[2] = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/1500.gif"); + gtk_fixed_put((GtkFixed *)centerFixed, bonusImages[2], 0, -300); + +- addingBonus = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/addingbonus.gif"); ++ addingBonus = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/addingbonus.gif"); + gtk_fixed_put((GtkFixed *)centerFixed, addingBonus, 0, -300); + round = 1; + startRound(); +diff -Naur touchmegames/src/tritowers/support.cpp touchmegames-p/src/tritowers/support.cpp +--- touchmegames/src/tritowers/support.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/tritowers/support.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -29,9 +29,9 @@ + + TriTowers::TriTowers() : gameName("tritowers"), + //deckLocation("/usr/share/apps/carddecks/cards-default/"), +- //deckBack("/usr/local/share/touchmegames/images/cards/backs/back-2.gif") { +- deckLocation("/usr/local/share/touchmegames/images/cards/default/"), +- deckBack("/usr/local/share/touchmegames/images/cards/backs/back-2.gif") { ++ //deckBack("/usr/share/touchmegames/images/cards/backs/back-2.gif") { ++ deckLocation("/usr/share/touchmegames/images/cards/default/"), ++ deckBack("/usr/share/touchmegames/images/cards/backs/back-2.gif") { + bgcolor.red = 0x0000; + bgcolor.green = 0x0000; + bgcolor.blue = 0x0000; +diff -Naur touchmegames/src/videopoker/interface.cpp touchmegames-p/src/videopoker/interface.cpp +--- touchmegames/src/videopoker/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/videopoker/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -416,7 +416,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(userExit), (gpointer)this); +diff -Naur touchmegames/src/videopoker/support.cpp touchmegames-p/src/videopoker/support.cpp +--- touchmegames/src/videopoker/support.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/videopoker/support.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -26,8 +26,8 @@ + #include + + VIDEO_POKER::VIDEO_POKER() : gameName("videopoker"), toggleOccuring(false), +- deckLocation("/usr/local/share/touchmegames/images/cards/"), +- deckBack("/usr/local/share/touchmegames/images/cards/backs/back-2.gif") { ++ deckLocation("/usr/share/touchmegames/images/cards/"), ++ deckBack("/usr/share/touchmegames/images/cards/backs/back-2.gif") { + color.red = 0xA000; + color.green = 0xA000; + color.blue = 0xA000; +diff -Naur touchmegames/src/wordhunt/interface.cpp touchmegames-p/src/wordhunt/interface.cpp +--- touchmegames/src/wordhunt/interface.cpp 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/wordhunt/interface.cpp 2007-12-11 04:10:18.000000000 +0100 +@@ -246,7 +246,7 @@ + g_signal_connect(G_OBJECT(eventBox), + "motion-notify-event", + G_CALLBACK(mouseMove), (gpointer)this); +- sstr << "/usr/local/share/touchmegames/wordhunt/images/letter.png"; ++ sstr << "/usr/share/touchmegames/wordhunt/images/letter.png"; + letters[x][y] = gtk_image_new_from_file(sstr.str().c_str()); + + gtk_container_add((GtkContainer *)eventBox, letters[x][y]); +@@ -298,7 +298,7 @@ + + eventBox = gtk_event_box_new(); + gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); +- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); ++ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); + gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(eventBox), "button-press-event", + G_CALLBACK(userExit), (gpointer)this); +@@ -470,7 +470,7 @@ + return false; + } + +- if (parser.openXmlFile("/usr/local/share/touchmegames/wordhunt/lists", "lists", errStr) == 0) { ++ if (parser.openXmlFile("/usr/share/touchmegames/wordhunt/lists", "lists", errStr) == 0) { + std::cerr << "Could not open lists file: " << errStr << std::endl; + exit(0); + } +@@ -584,7 +584,7 @@ + for (int y = 0; y < 12; ++y) { + for (int x = 0; x < 12; ++x) { + std::stringstream sstr; +- sstr << "/usr/local/share/touchmegames/wordhunt/images/letter_" << array[x][y] << ".png"; ++ sstr << "/usr/share/touchmegames/wordhunt/images/letter_" << array[x][y] << ".png"; + gtk_object_set_user_data((GtkObject *)letters[x][y], (void *)array[x][y]); + gtk_image_set_from_file((GtkImage *)letters[x][y], sstr.str().c_str()); + } +@@ -637,7 +637,7 @@ + startGame(); + + bgCircle = gtk_rc_style_new(); +- bgCircle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/wordhunt/images/letterBg.xpm"; ++ bgCircle->bg_pixmap_name[0] = "/usr/share/touchmegames/wordhunt/images/letterBg.xpm"; + + beginx = -1; + beginy = -1; +diff -Naur touchmegames/src/wordhunt/wordhunt.h touchmegames-p/src/wordhunt/wordhunt.h +--- touchmegames/src/wordhunt/wordhunt.h 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/wordhunt/wordhunt.h 2007-12-11 04:10:12.000000000 +0100 +@@ -27,7 +27,7 @@ + #include + + #define numberOfRows 12 +-#define wordHuntImagePath "/usr/local/share/touchmegames/wordhunt/images/" ++#define wordHuntImagePath "/usr/share/touchmegames/wordhunt/images/" + + class WordHunt : public GAME_PTR { + private: diff --git a/source/games-extra/touchmegames/makefile-fixes.patch b/source/games-extra/touchmegames/makefile-fixes.patch new file mode 100644 index 0000000..dae872a --- /dev/null +++ b/source/games-extra/touchmegames/makefile-fixes.patch @@ -0,0 +1,774 @@ +diff -Naur touchmegames/src/compile4/makefile touchmegames-p/src/compile4/makefile +--- touchmegames/src/compile4/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/compile4/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -57,20 +57,20 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/consume21/Makefile touchmegames-p/src/consume21/Makefile +--- touchmegames/src/consume21/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/consume21/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -59,20 +59,20 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/dart01/makefile touchmegames-p/src/dart01/makefile +--- touchmegames/src/dart01/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dart01/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -60,22 +60,22 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames ]; \ +- then mkdir /usr/local/share/touchmegames; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images +- cp $(GAME_NAME) /usr/bin ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME) $(DESTDIR)/usr/bin + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) +- rm -rf /usr/local/share/touchmegames/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) ++ rm -rf $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) +diff -Naur touchmegames/src/dartcountdown/makefile touchmegames-p/src/dartcountdown/makefile +--- touchmegames/src/dartcountdown/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcountdown/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -58,15 +58,15 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + +diff -Naur touchmegames/src/dartCountUp/makefile touchmegames-p/src/dartCountUp/makefile +--- touchmegames/src/dartCountUp/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartCountUp/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -55,15 +55,15 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + +diff -Naur touchmegames/src/dartcricket/makefile touchmegames-p/src/dartcricket/makefile +--- touchmegames/src/dartcricket/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcricket/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -58,22 +58,22 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames ]; \ +- then mkdir /usr/local/share/touchmegames; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images +- cp $(GAME_NAME) /usr/bin ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME) $(DESTDIR)/usr/bin + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) +- rm -rf /usr/local/share/touchmegames/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) ++ rm -rf $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) +diff -Naur touchmegames/src/dartcricket10/makefile touchmegames-p/src/dartcricket10/makefile +--- touchmegames/src/dartcricket10/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartcricket10/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -59,22 +59,22 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames ]; \ +- then mkdir /usr/local/share/touchmegames; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images +- cp $(GAME_NAME) /usr/bin ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME) $(DESTDIR)/usr/bin + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) +- rm -rf /usr/local/share/touchmegames/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) ++ rm -rf $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) +diff -Naur touchmegames/src/dartlowball/makefile touchmegames-p/src/dartlowball/makefile +--- touchmegames/src/dartlowball/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/dartlowball/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -55,15 +55,15 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + +diff -Naur touchmegames/src/darttictactoe/makefile touchmegames-p/src/darttictactoe/makefile +--- touchmegames/src/darttictactoe/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/darttictactoe/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -55,15 +55,15 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + +diff -Naur touchmegames/src/flogthedolphin/makefile touchmegames-p/src/flogthedolphin/makefile +--- touchmegames/src/flogthedolphin/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/flogthedolphin/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -55,24 +55,24 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/sounds ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/sounds; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/sounds ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/sounds; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images +- cp sounds/*.* /usr/local/share/touchmegames/$(GAME_NAME)/sounds ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ++ cp sounds/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/sounds + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/foxyboxy/makefile touchmegames-p/src/foxyboxy/makefile +--- touchmegames/src/foxyboxy/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/foxyboxy/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -55,20 +55,20 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).png /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).png $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/gorillathrilla/makefile touchmegames-p/src/gorillathrilla/makefile +--- touchmegames/src/gorillathrilla/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/gorillathrilla/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -55,20 +55,20 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/images/buttons/Makefile touchmegames-p/src/images/buttons/Makefile +--- touchmegames/src/images/buttons/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/images/buttons/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -1,8 +1,8 @@ + + + install: +- if [ ! -e /usr/local/share/touchmegames/images/buttons ]; \ +- then mkdir /usr/local/share/touchmegames/images/buttons; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/images/buttons ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/images/buttons; \ + fi + +- cp *.* /usr/local/share/touchmegames/images/buttons; \ +\ Kein Zeilenumbruch am Dateiende. ++ cp *.* $(DESTDIR)/usr/share/touchmegames/images/buttons; \ +\ Kein Zeilenumbruch am Dateiende. +diff -Naur touchmegames/src/images/cards/Makefile touchmegames-p/src/images/cards/Makefile +--- touchmegames/src/images/cards/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/images/cards/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -2,13 +2,13 @@ + SUBDIRS=backs default + + install: +- if [ ! -e /usr/local/share/touchmegames/images/cards ]; \ +- then mkdir /usr/local/share/touchmegames/images/cards; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/images/cards ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/images/cards; \ + fi +- cp *.* /usr/local/share/touchmegames/images/cards; \ ++ cp *.* $(DESTDIR)/usr/share/touchmegames/images/cards; \ + for i in ${SUBDIRS}; do \ +- if [ ! -e /usr/local/share/touchmegames/images/cards/$$i ]; \ +- then mkdir /usr/local/share/touchmegames/images/cards/$$i; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/images/cards/$$i ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/images/cards/$$i; \ + fi; \ +- cp $$i/*.* /usr/local/share/touchmegames/images/cards/$$i; \ ++ cp $$i/*.* $(DESTDIR)/usr/share/touchmegames/images/cards/$$i; \ + done +diff -Naur touchmegames/src/images/games/Makefile touchmegames-p/src/images/games/Makefile +--- touchmegames/src/images/games/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/images/games/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -1,8 +1,8 @@ + + + install: +- if [ ! -e /usr/local/share/touchmegames/images/games ]; \ +- then mkdir /usr/local/share/touchmegames/images/games; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/images/games ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/images/games; \ + fi + +- cp *.* /usr/local/share/touchmegames/images/games; \ +\ Kein Zeilenumbruch am Dateiende. ++ cp *.* $(DESTDIR)/usr/share/touchmegames/images/games; \ +\ Kein Zeilenumbruch am Dateiende. +diff -Naur touchmegames/src/images/mainmenu/Makefile touchmegames-p/src/images/mainmenu/Makefile +--- touchmegames/src/images/mainmenu/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/images/mainmenu/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -1,8 +1,8 @@ + + + install: +- if [ ! -e /usr/local/share/touchmegames/images/mainmenu ]; \ +- then mkdir /usr/local/share/touchmegames/images/mainmenu; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/images/mainmenu ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/images/mainmenu; \ + fi + +- cp *.* /usr/local/share/touchmegames/images/mainmenu; \ +\ Kein Zeilenumbruch am Dateiende. ++ cp *.* $(DESTDIR)/usr/share/touchmegames/images/mainmenu; \ +\ Kein Zeilenumbruch am Dateiende. +diff -Naur touchmegames/src/images/Makefile touchmegames-p/src/images/Makefile +--- touchmegames/src/images/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/images/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -2,10 +2,10 @@ + SUBDIRS=buttons cards games mainmenu submenu + + install: +- if [ ! -e /usr/local/share/touchmegames/images/ ]; \ +- then mkdir /usr/local/share/touchmegames/images/; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/images/ ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/images/; \ + fi +- cp *.* /usr/local/share/touchmegames/images ++ cp *.* $(DESTDIR)/usr/share/touchmegames/images + for i in ${SUBDIRS}; do \ + (cd $$i; ${MAKE} install;); \ + done +diff -Naur touchmegames/src/images/submenu/Makefile touchmegames-p/src/images/submenu/Makefile +--- touchmegames/src/images/submenu/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/images/submenu/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -1,8 +1,8 @@ + + + install: +- if [ ! -e /usr/local/share/touchmegames/images/submenu ]; \ +- then mkdir /usr/local/share/touchmegames/images/submenu; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/images/submenu ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/images/submenu; \ + fi + +- cp *.* /usr/local/share/touchmegames/images/submenu; \ +\ Kein Zeilenumbruch am Dateiende. ++ cp *.* $(DESTDIR)/usr/share/touchmegames/images/submenu; \ +\ Kein Zeilenumbruch am Dateiende. +diff -Naur touchmegames/src/Makefile touchmegames-p/src/Makefile +--- touchmegames/src/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -26,7 +26,7 @@ + for i in ${GAMES}; do \ + (cd $$i; ${MAKE}); \ + done +- g++ main.cpp interface.o support.o events.o -o touchmegames lib/gameptr.o lib/altprogressbar.o $(GAME_LIBS) \ ++ g++ $(CFLAGS) main.cpp interface.o support.o events.o -o touchmegames lib/gameptr.o lib/altprogressbar.o $(GAME_LIBS) \ + $(XML_LFLAGS) $(INC) $(GTK_LFLAGS) $(LIB) $(GTHREAD_LFLAGS) #lib/dartlib.o + + debug: +@@ -54,19 +54,19 @@ + + install: + if [ ! -e touchmegames ]; then make; fi +- if [ ! -e /usr/local/share/touchmegames/ ]; \ +- then mkdir /usr/local/share/touchmegames/; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/ ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/; \ + fi + + for i in ${GAMES}; do \ + (cd $$i; ${MAKE} install;); \ + done + (cd images; ${MAKE} install;); +- cp touchmegames /usr/bin ++ cp touchmegames $(DESTDIR)/usr/bin + + uninstall: +- rm -rf /usr/local/share/touchmegames +- rm -f /usr/bin/touchmegames ++ rm -rf $(DESTDIR)/usr/share/touchmegames ++ rm -f $(DESTDIR)/usr/bin/touchmegames + + clean: + for i in ${GAMES}; do \ +diff -Naur touchmegames/src/secretphrase/makefile touchmegames-p/src/secretphrase/makefile +--- touchmegames/src/secretphrase/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/secretphrase/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -66,24 +66,24 @@ + (cd phrasegenerator; $(MAKE) clean;) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/phrases ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/phrases; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/phrases ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/phrases; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images +- cp phrases/*.* /usr/local/share/touchmegames/$(GAME_NAME)/phrases ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ++ cp phrases/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/phrases + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/sudoku/Makefile touchmegames-p/src/sudoku/Makefile +--- touchmegames/src/sudoku/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/sudoku/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -59,24 +59,24 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/sounds ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/sounds; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/sounds ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/sounds; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images +- cp sounds/*.* /usr/local/share/touchmegames/$(GAME_NAME)/sounds ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ++ cp sounds/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/sounds + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/threescompany/makefile touchmegames-p/src/threescompany/makefile +--- touchmegames/src/threescompany/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/threescompany/makefile 2007-12-11 03:52:38.000000000 +0100 +@@ -55,20 +55,20 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/tritowers/Makefile touchmegames-p/src/tritowers/Makefile +--- touchmegames/src/tritowers/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/tritowers/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -55,20 +55,20 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/videopoker/makefile touchmegames-p/src/videopoker/makefile +--- touchmegames/src/videopoker/makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/videopoker/makefile 2007-12-11 03:53:03.000000000 +0100 +@@ -55,20 +55,20 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp cards/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp cards/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) +diff -Naur touchmegames/src/wordhunt/Makefile touchmegames-p/src/wordhunt/Makefile +--- touchmegames/src/wordhunt/Makefile 2007-08-08 02:03:05.000000000 +0200 ++++ touchmegames-p/src/wordhunt/Makefile 2007-12-11 03:53:31.000000000 +0100 +@@ -66,25 +66,25 @@ + rm -rf *.o *~ *.a $(GAME_NAME) + + install: +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME) ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME); \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME); \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/sounds ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/sounds; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/sounds ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/sounds; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/images ]; \ +- then mkdir /usr/local/share/touchmegames/$(GAME_NAME)/images; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ]; \ ++ then mkdir $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images; \ + fi +- if [ ! -e /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ +- then touch /usr/local/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ ++ if [ ! -e $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores ]; \ ++ then touch $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/$(GAME_NAME).scores; \ + fi +- cp lists /usr/local/share/touchmegames/$(GAME_NAME) +- cp $(GAME_NAME).gif /usr/local/share/touchmegames/$(GAME_NAME) +- cp images/*.* /usr/local/share/touchmegames/$(GAME_NAME)/images +- cp sounds/*.* /usr/local/share/touchmegames/$(GAME_NAME)/sounds ++ cp lists $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp $(GAME_NAME).gif $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME) ++ cp images/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/images ++ cp sounds/*.* $(DESTDIR)/usr/share/touchmegames/$(GAME_NAME)/sounds + if [ -e $(GAME_NAME) ]; \ +- then cp $(GAME_NAME) /usr/bin; \ ++ then cp $(GAME_NAME) $(DESTDIR)/usr/bin; \ + fi + + uninstall: +- rm -f /usr/bin/$(GAME_NAME) ++ rm -f $(DESTDIR)/usr/bin/$(GAME_NAME) diff --git a/source/games-extra/touchmegames/tmg.png b/source/games-extra/touchmegames/tmg.png new file mode 100644 index 0000000..b31197e Binary files /dev/null and b/source/games-extra/touchmegames/tmg.png differ From crazy at frugalware.org Thu Dec 13 02:14:16 2007 From: crazy at frugalware.org (crazy) Date: Thu Dec 13 02:14:18 2007 Subject: [Frugalware-git] frugalware-current: hal-info-20071212-1-i686 Message-ID: <20071213011416.C47EE1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=daf0b0144a86d0bf60bd56252097aecab01586ed commit daf0b0144a86d0bf60bd56252097aecab01586ed Author: crazy Date: Thu Dec 13 02:13:59 2007 +0100 hal-info-20071212-1-i686 * Version bump diff --git a/source/apps/hal-info/FrugalBuild b/source/apps/hal-info/FrugalBuild index dbf598e..a4996f5 100644 --- a/source/apps/hal-info/FrugalBuild +++ b/source/apps/hal-info/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=hal-info -pkgver=20071030 +pkgver=20071212 pkgrel=1 pkgdesc="hal-info contains device information for HAL." url="http://www.freedesktop.org/wiki/Software/hal" @@ -10,17 +10,12 @@ depends=() groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump 'http://hal.freedesktop.org/releases/?C=M;O=A'|grep 'hal-info-\(.*\).tar.gz'|Flasttar" -source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz just_WARN.patch) -sha1sums=('844f599b300162b0f43ddb08606a7ab36caa6399' \ - '7c5b0fea8872c24767283be17a7cbd0ffcc143c1') +source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('b5318ba7814e9b80a84375e616e1d06f6eeaeaa6') build() { - Fcd - Fpatchall - Fautoreconf - Fmake \ + Fbuild \ --datarootdir=/usr/share \ --datadir=/usr/share - Fmakeinstall } diff --git a/source/apps/hal-info/just_WARN.patch b/source/apps/hal-info/just_WARN.patch deleted file mode 100644 index 2a95e04..0000000 --- a/source/apps/hal-info/just_WARN.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur hal-info-20071011/configure.in hal-info-20071011-wth/configure.in ---- hal-info-20071011/configure.in 2007-09-25 22:32:01.000000000 +0200 -+++ hal-info-20071011-wth/configure.in 2007-10-15 15:32:14.000000000 +0200 -@@ -9,8 +9,16 @@ - - PKG_PROG_PKG_CONFIG - --if ! $PKG_CONFIG --atleast-version 0.5.10 hal; then -- AC_MSG_ERROR([hal 0.5.10 or later is required for this version of hal-info]) -+ -+PKG_CHECK_MODULES([hal], [hal], [have_hal_installed="yes"], [have_hal_installed="no"]) -+ -+if test "x$have_hal_installed" = "xyes"; then -+ if ! $PKG_CONFIG --atleast-version 0.5.10 hal; then -+ hal_now="`$PKG_CONFIG --modversion hal`" -+ AC_MSG_WARN([found $hal_now but hal 0.5.10 or later is required for this version of hal-info]) -+ fi -+else -+ AC_MSG_WARN([Hal is not installed but hal 0.5.10 or later is required for this version of hal-info]) - fi - - dnl --------------------------------------------------------------------------- -diff -Naur hal-info-20071011/VERSION hal-info-20071011-wth/VERSION ---- hal-info-20071011/VERSION 1970-01-01 01:00:00.000000000 +0100 -+++ hal-info-20071011-wth/VERSION 2007-10-15 15:32:40.000000000 +0200 -@@ -0,0 +1 @@ -+20071011 From crazy at frugalware.org Thu Dec 13 02:24:23 2007 From: crazy at frugalware.org (crazy) Date: Thu Dec 13 02:24:25 2007 Subject: [Frugalware-git] frugalware-current: knetdockapp-0.82.1-1-i686 Message-ID: <20071213012423.D73BF1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06875e624b25066009919bfa1daec231887129aa commit 06875e624b25066009919bfa1daec231887129aa Author: crazy Date: Thu Dec 13 02:23:55 2007 +0100 knetdockapp-0.82.1-1-i686 * Version bump diff --git a/source/kde-extra/knetdockapp/FrugalBuild b/source/kde-extra/knetdockapp/FrugalBuild index 8010296..7fbbb81 100644 --- a/source/kde-extra/knetdockapp/FrugalBuild +++ b/source/kde-extra/knetdockapp/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: crazy pkgname=knetdockapp -pkgver=0.82 +pkgver=0.82.1 pkgrel=1 pkgdesc="A small application that docks in the systray and monitors the activity of the selected network interface." -depends=('kdebase>=3.5.7') +depends=('kdebase>=3.5.8') license="GPL" groups=('kde-extra') archs=('i686' 'x86_64') @@ -13,7 +13,7 @@ _F_kde_id="29398" _F_kde_reconf=1 Finclude kde source=( http://www.kde-apps.org/CONTENT/content-files/29398-$pkgname-$pkgver.tar.bz2) -sha1sums=('221f79628eed9f125c1c3e8158a99a7d98257f61') +sha1sums=('881c798a864d860f330421a7c6e0b64c966e556f') # optimization OK From crazy at frugalware.org Thu Dec 13 02:52:49 2007 From: crazy at frugalware.org (crazy) Date: Thu Dec 13 02:52:51 2007 Subject: [Frugalware-git] frugalware-current: transkode-0.7-1-i686 Message-ID: <20071213015249.C28BC1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bc77b81a6fcc5fc12af012b737406be9ab455662 commit bc77b81a6fcc5fc12af012b737406be9ab455662 Author: crazy Date: Thu Dec 13 02:52:19 2007 +0100 transkode-0.7-1-i686 * Version bump diff --git a/source/kde-extra/transkode/FrugalBuild b/source/kde-extra/transkode/FrugalBuild index 4d784a4..a2ff881 100644 --- a/source/kde-extra/transkode/FrugalBuild +++ b/source/kde-extra/transkode/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=transkode -pkgver=0.6 +pkgver=0.7 pkgrel=1 pkgdesc="KDE/Qt based frontend for varios audio transcoding tools." depends=('amarok>=1.4.3') @@ -13,9 +13,9 @@ _F_sourceforge_prefix='transkode-' _F_sourceforge_ext=".tar.bz2" _F_kde_id="37669" _F_kde_defaults=0 +_F_cd_path="$pkgname" options=('force') Finclude sourceforge kde +sha1sums=('7d06419f8e62b924355869a1fb11996746bcae1b') - -sha1sums=('33636a8caddf55696a31a2e39c49b9c411bae841') # optimization OK From vmiklos at frugalware.org Thu Dec 13 09:02:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 09:02:12 2007 Subject: [Frugalware-git] frugalware-current: util.sh: don't check for gcc version if no gcc available Message-ID: <20071213080210.8A05C11901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c414618114d1f97777b91a6efac0cd5d6714323d commit c414618114d1f97777b91a6efac0cd5d6714323d Author: Miklos Vajna Date: Thu Dec 13 09:01:57 2007 +0100 util.sh: don't check for gcc version if no gcc available noticed by krix diff --git a/source/include/util.sh b/source/include/util.sh index c638729..d4abac4 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -83,7 +83,7 @@ Flocalstatedir="/var" Fmenudir="/usr/share/applications" Farchs=('i686' 'x86_64' 'ppc') Fconfopts="--prefix=$Fprefix" -_gccver=`gcc -dumpversion` +_gccver=`type -p gcc >/dev/null && gcc -dumpversion` if [ "${_gccver%%.?}" == "4.2" ]; then export CFLAGS="$CFLAGS -fno-strict-aliasing" export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" From krics at linuxforum.hu Thu Dec 13 09:32:54 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 09:32:56 2007 Subject: [Frugalware-git] frugalware-current: monotone-0.38-1-x86_64 Message-ID: <20071213083254.A8B5B11901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f95861eb66b2c8a7edbd211673e5eb586e6ac32 commit 1f95861eb66b2c8a7edbd211673e5eb586e6ac32 Author: Christian Hamar alias krix Date: Thu Dec 13 09:32:07 2007 +0100 monotone-0.38-1-x86_64 * Version bump diff --git a/source/devel-extra/monotone/FrugalBuild b/source/devel-extra/monotone/FrugalBuild index 6a19390..e600020 100644 --- a/source/devel-extra/monotone/FrugalBuild +++ b/source/devel-extra/monotone/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=monotone -pkgver=0.37 +pkgver=0.38 pkgrel=1 pkgdesc="Another distributed version (revision) control system" url="http://venge.net/monotone/" @@ -20,5 +20,5 @@ build() Fmakeinstall } -sha1sums=('7d53bd67f7539342fcc15cceb0c2f4b31ba07647') +sha1sums=('6c546ec6122f56dfc8253323e8dc45167d0918c4') # optimization OK From krics at linuxforum.hu Thu Dec 13 09:43:06 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 09:43:09 2007 Subject: [Frugalware-git] frugalware-current: poppler-0.6.3-1-x86_64 Message-ID: <20071213084306.4C6AB119039F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4681c700805aa7d6a7a5ac61eb01c737bd698047 commit 4681c700805aa7d6a7a5ac61eb01c737bd698047 Author: Christian Hamar alias krix Date: Thu Dec 13 09:42:46 2007 +0100 poppler-0.6.3-1-x86_64 * Version bump diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index cf96c01..7ff9f83 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=poppler -pkgver=0.6.2 -pkgrel=2 +pkgver=0.6.3 +pkgrel=1 pkgdesc="A PDF rendering library" url="http://poppler.freedesktop.org/" depends=('libxext' 'fontconfig' 'libstdc++' 'cairo' 'libjpeg' 'libxrender' 'libpng') @@ -46,6 +46,6 @@ build() { Frm usr/share/man } -sha1sums=('3e367cab2ba110bfe42c3ab1036597410ad591da' \ +sha1sums=('10bdce5eb8a4ed831fd047389bcbb34b7939f502' \ 'a048348d9a8c6d545714350d3ab66dc7028e4b7f') # optimization OK From vmiklos at frugalware.org Thu Dec 13 10:11:33 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 10:11:35 2007 Subject: [Frugalware-git] bmf: git-1.5.4.rc0-1-i686 Message-ID: <20071213091133.7EFAB11901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=c599b7f245a57573a55eb0d6a66cc21306fbcb99 commit c599b7f245a57573a55eb0d6a66cc21306fbcb99 Author: Miklos Vajna Date: Thu Dec 13 10:11:01 2007 +0100 git-1.5.4.rc0-1-i686 sync with current and update to new rc diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index d5821eb..1de45ca 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -4,8 +4,8 @@ USE_DEVEL=${USE_DEVEL:-"y"} pkgname=git -pkgver=1.5.3.2 -Fuse $USE_DEVEL && pkgver=1.5.3.2.111.g5166 +pkgver=1.5.3.7 +Fuse $USE_DEVEL && pkgver=1.5.4.rc0 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." url="http://www.kernel.org/pub/software/scm/git/" @@ -16,10 +16,10 @@ archs=('i686' 'x86_64') up2date="lynx -dump '$url/?C=M;O=D'|grep 'git-[0-9.]*.tar.bz2$'|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" if ! Fuse $USE_DEVEL; then source=($url/$pkgname-$pkgver.tar.bz2) - signatures=(${source[0]}.sign '' '' '') + signatures=(${source[0]}.sign '' '' '' '' '') fi -source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware) -options=('scriptlet' 'nobuild') +source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware rc.git git.sysconfig) +options=('scriptlet') subpkgs=('gitweb' 'git-gui' 'gitk') subdescs=('Web interface for Git.' 'Git GUI tool.' 'Git revision tree visualiser.') @@ -51,6 +51,9 @@ build() # we don't need the html version of manpages Fsed '^DOC_HTML=.*' 'DOC_HTML=' Documentation/Makefile + # also we want proper manlinks (how ugly docbook is) + sed -i -e "/^\tmv \$@+ \$@/i\\\\tsed -i 's|git\\\\([0-9]\\\\)|\\\\1(\\\\2)|g' \$@+" -e "s/^sed/\\\\tsed/" Documentation/Makefile + Fconf make V=1 CLFAGS="$CFLAGS" ASCIIDOC8=YesPlease ETC_GITCONFIG=/etc/gitconfig all doc test || return 1 Fmakeinstall install-doc ETC_GITCONFIG=/etc/gitconfig mandir=/usr/share/man @@ -68,15 +71,21 @@ build() # contrib dir Fcprrel contrib /usr/share/git-core/ + # bash completion + Fln /usr/share/git-core/contrib/completion/git-completion.bash /etc/bash_completion.d/git + # gitweb Fmkdir /var/www/gitweb rm gitweb/gitweb.perl cp gitweb/git* $Fdestdir/var/www/gitweb Ffile gitweb.modules.d /etc/httpd/conf/modules.d/gitweb.conf Ffile /etc/gitweb.conf - Fsplit gitweb /etc /var + Fsplit gitweb /etc/{httpd,gitweb.conf} /var Fdoc README.Frugalware + # git-daemon + Ffile git.sysconfig /etc/sysconfig/git + # git-gui Fsplit git-gui usr/bin/git-{gui,citool} Fsplit git-gui usr/share/git-gui diff --git a/source/devel-extra/git/git.sysconfig b/source/devel-extra/git/git.sysconfig new file mode 100644 index 0000000..324b90c --- /dev/null +++ b/source/devel-extra/git/git.sysconfig @@ -0,0 +1,18 @@ +# +# /etc/sysconfig/git +# +# confiugation file for the git daemon +# + +# remap all the path requests as relative to this path +BASE_PATH="/home/ftp" + +# allow pulling from all directories that look like git repositories, even if +# they do not have the git-daemon-export-ok file +EXPORT="--export-all" + +# translate ~user to $HOME/git/public +USER_PATH="--user-path=git/public" + +# the fun part +GIT_OPTIONS="--reuseaddr --base-path=$BASE_PATH $EXPORT $USER_PATH --detach --pid-file=/var/run/gitd.pid" diff --git a/source/devel-extra/git/rc.git b/source/devel-extra/git/rc.git new file mode 100644 index 0000000..a4f3d24 --- /dev/null +++ b/source/devel-extra/git/rc.git @@ -0,0 +1,43 @@ +#!/bin/bash + +# (c) 2007 Miklos Vajna +# rc.git for Frugalware +# distributed under GPL License + +# chkconfig: 2345 99 01 +# description: Git daemon + +source /lib/initscripts/functions +TEXTDOMAIN=git +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart status start stop) +daemon=$"GIT daemon" + +pid="cat /var/run/gitd.pid 2> /dev/null" # Change me! :) +source /etc/sysconfig/git + +rc_start() +{ + start_msg + if [[ "$(eval $pid)" == "" ]] ; then + git daemon $GIT_OPTIONS + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [[ "$(eval $pid)" != "" ]] ; then + kill $(eval $pid) + ok $? + rm /var/run/gitd.pid + else + ok 999 + fi +} + +rc_exec $1 From iron at frugalware.org Thu Dec 13 10:12:41 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Dec 13 10:12:42 2007 Subject: [Frugalware-git] frugalware-current: xfce4-mixer-4.4.2-1-i686 Message-ID: <20071213091241.72FFD11903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9ab3e9ff2adcd23e6fc5c2707861ad3031d28246 commit 9ab3e9ff2adcd23e6fc5c2707861ad3031d28246 Author: Krisztian VASAS Date: Thu Dec 13 10:12:09 2007 +0100 xfce4-mixer-4.4.2-1-i686 - version bump diff --git a/source/xfce4/xfce4-mixer/FrugalBuild b/source/xfce4/xfce4-mixer/FrugalBuild index 342542b..d835ca7 100644 --- a/source/xfce4/xfce4-mixer/FrugalBuild +++ b/source/xfce4/xfce4-mixer/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-mixer -pkgver=4.4.1 -pkgrel=2 +pkgver=4.4.2 +pkgrel=1 pkgdesc="The volume control plugin for the Xfce4 panel." -depends=('libxml2' 'libxfcegui4>=4.4.1' 'libxfce4mcs>=4.4.1' 'alsa-lib') -makedepends=('intltool' 'xfce4-panel>=4.4.1' 'xfce-mcs-manager>=4.4.1') +depends=('libxml2' 'libxfcegui4>=4.4.2' 'libxfce4mcs>=4.4.2' 'alsa-lib') +makedepends=('intltool' 'xfce4-panel>=4.4.2' 'xfce-mcs-manager>=4.4.2') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('23bbaf2e56adea6d1c7be9e2b7bea4b9c1d27be5') +sha1sums=('ebf035a32d8b7b84094b6477a916d692cfe6a6af') unset MAKEFLAGS Fconfopts="${Fconfopts[@]} --with-sound=alsa" From krics at linuxforum.hu Thu Dec 13 10:36:50 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 10:36:54 2007 Subject: [Frugalware-git] frugalware-current: gtk+2-2.12.3-1-x86_64 Message-ID: <20071213093650.5E3A111903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ea8d3985729219a45d16a6dbcb639ebcaaac3859 commit ea8d3985729219a45d16a6dbcb639ebcaaac3859 Author: Christian Hamar alias krix Date: Thu Dec 13 10:36:20 2007 +0100 gtk+2-2.12.3-1-x86_64 * Version bump diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index a95860d..ce0c2b5 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gtk+2 _F_gnome_name=gtk+ -pkgver=2.12.2 +pkgver=2.12.3 pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series)" depends=('libtiff' 'atk>=1.20.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \ @@ -42,7 +42,7 @@ build() { Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('495ff3ef09de44cc23718239967203bd7871b4aa' \ +sha1sums=('5af5ab069c49189abf223b25736c254da047c712' \ '7db980e782a5b04d27bffb55e3dc0190ad22e118' \ '783920d179ba0755ccab9186b6bff9f293828a96' \ '3fb0332becafa55ce2daa14e4c15c3eb6c8ddc44') From krics at linuxforum.hu Thu Dec 13 10:43:12 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 10:43:16 2007 Subject: [Frugalware-git] frugalware-current: dpkg-1.14.12-1-x86_64 Message-ID: <20071213094312.3745B11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b3daef0e7aa6ad4a9525ea10a6b890d4cbbbafef commit b3daef0e7aa6ad4a9525ea10a6b890d4cbbbafef Author: Christian Hamar alias krix Date: Thu Dec 13 10:42:58 2007 +0100 dpkg-1.14.12-1-x86_64 * Version bump diff --git a/source/apps-extra/dpkg/FrugalBuild b/source/apps-extra/dpkg/FrugalBuild index 14ae25f..b1cfb02 100644 --- a/source/apps-extra/dpkg/FrugalBuild +++ b/source/apps-extra/dpkg/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Bence Nagy pkgname=dpkg -pkgver=1.14.7 +pkgver=1.14.12 pkgrel=1 pkgdesc="Package maintenance system for Debian" url="http://www.debian.org" @@ -28,4 +28,4 @@ build() { } # optimization OK -sha1sums=('853bd1669486efb015f9b22f4992af2ac908d6c0') +sha1sums=('983cd6d96c94bfb440cd60f49688fc2474567f8c') From vmiklos at frugalware.org Thu Dec 13 11:00:17 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 11:00:19 2007 Subject: [Frugalware-git] frugalware-current: gnome-mastermind-0.3-1-x86_64 Message-ID: <20071213100017.2ED3C11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff65d53466ed5cbacbeaa2f907f16efd852f038a commit ff65d53466ed5cbacbeaa2f907f16efd852f038a Author: Miklos Vajna Date: Thu Dec 13 10:53:40 2007 +0100 gnome-mastermind-0.3-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gnome-mastermind/FrugalBuild b/source/gnome-extra/gnome-mastermind/FrugalBuild index b7c3c68..3124ef5 100644 --- a/source/gnome-extra/gnome-mastermind/FrugalBuild +++ b/source/gnome-extra/gnome-mastermind/FrugalBuild @@ -13,7 +13,7 @@ _F_gnome_desktop="y" Finclude gnome-scriptlet options=('scriptlet') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://www5.autistici.org/gnome-mastermind/ | grep -m1 .tar.gz | Flasttar" source=("http://download.gna.org/gnome-mastermind/$pkgname-$pkgver.tar.gz") sha1sums=('c3bc908faf73e32ff1ec23664d9f0720bea3952c') From vmiklos at frugalware.org Thu Dec 13 11:09:04 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 11:09:07 2007 Subject: [Frugalware-git] frugalware-current: gnome-mplayer-0.5.2-1-x86_64 Message-ID: <20071213100904.2054911904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52bfc18af6f04ab3485c92ed0dbee666d8fb1265 commit 52bfc18af6f04ab3485c92ed0dbee666d8fb1265 Author: Miklos Vajna Date: Thu Dec 13 11:08:54 2007 +0100 gnome-mplayer-0.5.2-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gnome-mplayer/FrugalBuild b/source/gnome-extra/gnome-mplayer/FrugalBuild index 7f481cc..f7ccebb 100644 --- a/source/gnome-extra/gnome-mplayer/FrugalBuild +++ b/source/gnome-extra/gnome-mplayer/FrugalBuild @@ -7,7 +7,7 @@ pkgver=0.5.2 pkgrel=1 pkgdesc="A media player for GNOME that uses MPlayer." url="http://dekorte.homeip.net/download/gnome-mplayer" -archs=('i686') +archs=('i686' 'x86_64') groups=('gnome-extra') options=('scriptlet') depends=('libgnomeui' 'mplayer') From iron at frugalware.org Thu Dec 13 11:15:26 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Dec 13 11:15:28 2007 Subject: [Frugalware-git] frugalware-current: ristretto-0.0.15-1-i686 Message-ID: <20071213101526.AA20B11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=145a3a296ee11d1633924e6718f1e127e888be74 commit 145a3a296ee11d1633924e6718f1e127e888be74 Author: Krisztian VASAS Date: Thu Dec 13 11:15:03 2007 +0100 ristretto-0.0.15-1-i686 - version bump diff --git a/source/xfce4/ristretto/FrugalBuild b/source/xfce4/ristretto/FrugalBuild index 75c2f48..589a84d 100644 --- a/source/xfce4/ristretto/FrugalBuild +++ b/source/xfce4/ristretto/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=ristretto -pkgver=0.0.13 +pkgver=0.0.15 pkgrel=1 pkgdesc="A fast and lightweight picture viewer for Xfce." makedepends=('intltool') -depends=('libxfce4util>=4.4.1' 'thunar') +depends=('libxfce4util>=4.4.2' 'thunar') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64') _F_gnome_iconcache="y" _F_xfce_goodies_ext=".tar.gz" Finclude xfce4 gnome-scriptlet url="http://goodies.xfce.org/projects/applications/ristretto" -sha1sums=('a41ed25da39f96edd0862958e9efe22331195614') +sha1sums=('eb0a2f4d724890f5ba927220b492be4bd679bc3d') # optimization OK From vmiklos at frugalware.org Thu Dec 13 11:21:00 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 11:21:06 2007 Subject: [Frugalware-git] frugalware-current: gnome-specimen-0.3.1-1-x86_64 Message-ID: <20071213102100.2701011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=02871ec5aca98394c14e4c3b1300ccf470beff97 commit 02871ec5aca98394c14e4c3b1300ccf470beff97 Author: Miklos Vajna Date: Thu Dec 13 11:19:59 2007 +0100 gnome-specimen-0.3.1-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gnome-specimen/FrugalBuild b/source/gnome-extra/gnome-specimen/FrugalBuild index 81de93b..bf3fc74 100644 --- a/source/gnome-extra/gnome-specimen/FrugalBuild +++ b/source/gnome-extra/gnome-specimen/FrugalBuild @@ -13,7 +13,7 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet options=('scriptlet') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url/geek/projects/gnome-specimen/releases/ | Flasttar" source=($url/geek/projects/gnome-specimen/releases/$pkgname-$pkgver.tar.gz) sha1sums=('374c2063b75319b1654fdabdc4e9923f94891f53') From vmiklos at frugalware.org Thu Dec 13 11:32:02 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 11:32:06 2007 Subject: [Frugalware-git] frugalware-current: gnome-video-arcade-0.5.3-1-x86_64 Message-ID: <20071213103202.44E4911904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8463606df35623f870a72b9afda607714791efe9 commit 8463606df35623f870a72b9afda607714791efe9 Author: Miklos Vajna Date: Thu Dec 13 11:31:53 2007 +0100 gnome-video-arcade-0.5.3-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gnome-video-arcade/FrugalBuild b/source/gnome-extra/gnome-video-arcade/FrugalBuild index de4f599..2566b70 100644 --- a/source/gnome-extra/gnome-video-arcade/FrugalBuild +++ b/source/gnome-extra/gnome-video-arcade/FrugalBuild @@ -16,7 +16,7 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet options=('scriptlet') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('52a0a789972257d8516a603fed77759a26fd9c45') # optimization OK From iron at frugalware.org Thu Dec 13 11:33:45 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Dec 13 11:33:47 2007 Subject: [Frugalware-git] frugalware-current: xfce4-sensors-plugin-0.10.99.3-1-i686 Message-ID: <20071213103345.BDD0B11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e254230c90f9f437d290315b216232d3b5dec229 commit e254230c90f9f437d290315b216232d3b5dec229 Author: Krisztian VASAS Date: Thu Dec 13 11:33:29 2007 +0100 xfce4-sensors-plugin-0.10.99.3-1-i686 - version bump diff --git a/source/xfce4/xfce4-sensors-plugin/FrugalBuild b/source/xfce4/xfce4-sensors-plugin/FrugalBuild index e0917b1..5ebe7e9 100644 --- a/source/xfce4/xfce4-sensors-plugin/FrugalBuild +++ b/source/xfce4/xfce4-sensors-plugin/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-sensors-plugin -pkgver=0.10.0 +pkgver=0.10.99.3 pkgrel=1 pkgdesc="A hardware sensors plugin for the Xfce4 panel." makedepends=('intltool') -depends=('libxfcegui4>=4.4.0' 'xfce4-panel>=4.4.0' 'lmsensors') +depends=('libxfcegui4>=4.4.2' 'xfce4-panel>=4.4.2' 'lmsensors') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude xfce4 Finclude gnome-scriptlet -sha1sums=('5f99dd25d7f0030595d90fbd0ecfb1c43aee5b05') +sha1sums=('66a2d8729c3020498098d2064e90f7a3d5efadc9') # optimization OK From krics at linuxforum.hu Thu Dec 13 13:41:16 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 13:41:18 2007 Subject: [Frugalware-git] frugalware-current: debootstrap-1.0.7-1-x86_64 Message-ID: <20071213124116.D984311904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a09ba3e11e62f69d466b7e966672a3b98a46439 commit 5a09ba3e11e62f69d466b7e966672a3b98a46439 Author: Christian Hamar alias krix Date: Thu Dec 13 13:41:00 2007 +0100 debootstrap-1.0.7-1-x86_64 * Version bump diff --git a/source/apps-extra/debootstrap/FrugalBuild b/source/apps-extra/debootstrap/FrugalBuild index 7991f36..30fc8c1 100644 --- a/source/apps-extra/debootstrap/FrugalBuild +++ b/source/apps-extra/debootstrap/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Bence Nagy pkgname=debootstrap -pkgver=1.0.6 +pkgver=1.0.7 srcver=`echo $pkgver | tr "_" "-"` pkgrel=1 pkgdesc="Bootstrap a basic Debian system" @@ -20,4 +20,4 @@ build() { cp -R usr/ $Fdestdir || Fdie } -sha1sums=('2d5c8cd37d15235f7a98d3d41f7b01dcb003e68a') +sha1sums=('563cc2dbe417464d0b486eaa5aa5d9cb8fb2327f') From krics at linuxforum.hu Thu Dec 13 13:47:20 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 13:47:21 2007 Subject: [Frugalware-git] frugalware-current: gnome-themes-2.20.2-1-x86_64 Message-ID: <20071213124720.3D1B011901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=176b3b9412a2e4075f2bebda5b374e7c5ec93b7f commit 176b3b9412a2e4075f2bebda5b374e7c5ec93b7f Author: Christian Hamar alias krix Date: Thu Dec 13 13:47:03 2007 +0100 gnome-themes-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome/gnome-themes/FrugalBuild b/source/gnome/gnome-themes/FrugalBuild index 9049755..4b9c674 100644 --- a/source/gnome/gnome-themes/FrugalBuild +++ b/source/gnome/gnome-themes/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-themes -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="Default themes for GNOME" url="http://www.gnome.org/" @@ -11,4 +11,4 @@ makedepends=('perl-xml' 'icon-naming-utils') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('6371222169808a94ff982fd01f0ebb5053cc85f7') +sha1sums=('16f23925a6740b915faff53d7d639f21665ed647') From krics at linuxforum.hu Thu Dec 13 13:55:06 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 13:55:10 2007 Subject: [Frugalware-git] frugalware-current: libbonobo-2.20.2-1-x86_64 Message-ID: <20071213125506.D8E6011901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ae897a7c0070cd42f86d8c1fb8bd6b58f10afd12 commit ae897a7c0070cd42f86d8c1fb8bd6b58f10afd12 Author: Christian Hamar alias krix Date: Thu Dec 13 13:55:00 2007 +0100 libbonobo-2.20.2-1-x86_64 * VErsion bump diff --git a/source/gnome/libbonobo/FrugalBuild b/source/gnome/libbonobo/FrugalBuild index e78755e..bbbb3c3 100644 --- a/source/gnome/libbonobo/FrugalBuild +++ b/source/gnome/libbonobo/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libbonobo -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="GNOME CORBA framework" url="http://www.gnome.org/" @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') install=$pkgname.install Finclude gnome source=(${source[@]} libbonobo-search-path-fix.patch) -sha1sums=('9d81eb1b604f3428cc718f6337882cb56ebbd9e2' \ +sha1sums=('cac84e3d397c018c4a9f1dce15c4ac59bfb83c41' \ 'f716a5b855c71edba7e1d77096ee8cc45b85c108') Fconfopts="$Fconfopts --enable-gtk-doc" From krics at linuxforum.hu Thu Dec 13 14:03:28 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 14:03:31 2007 Subject: [Frugalware-git] frugalware-current: gnome-keyring-2.20.2-1-x86_64 Message-ID: <20071213130328.D8F1511901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c14509fb91f7145cc94961339fd3471d280cb6d0 commit c14509fb91f7145cc94961339fd3471d280cb6d0 Author: Christian Hamar alias krix Date: Thu Dec 13 14:03:14 2007 +0100 gnome-keyring-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome/gnome-keyring/FrugalBuild b/source/gnome/gnome-keyring/FrugalBuild index 7599922..0e6b87b 100644 --- a/source/gnome/gnome-keyring/FrugalBuild +++ b/source/gnome/gnome-keyring/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-keyring -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="Password and keyring managing daemon for GNOME" url="http://www.gnome.org/" @@ -13,5 +13,5 @@ archs=('i686' 'x86_64') Finclude gnome Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('7026d22cd457c99bb0c973a79b7bc0d08430e739') +sha1sums=('adad679a8980c7c32358a90b73bf6f002e902f20') # optimization OK From krics at linuxforum.hu Thu Dec 13 14:39:10 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 14:39:12 2007 Subject: [Frugalware-git] frugalware-current: gnome-session-2.20.2-1-x86_64 Message-ID: <20071213133910.972C011903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=04912dd16cabd31b61c3855d3cdcab5a2ef1be14 commit 04912dd16cabd31b61c3855d3cdcab5a2ef1be14 Author: Christian Hamar alias krix Date: Thu Dec 13 14:38:30 2007 +0100 gnome-session-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome/gnome-session/FrugalBuild b/source/gnome/gnome-session/FrugalBuild index a738c48..5a42891 100644 --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@ -4,7 +4,7 @@ # kill_g_debug.patch should be disabled for stable releases of gnome pkgname=gnome-session -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="GNOME session manager" depends=('libgnomeui>=2.20.1.1' 'gnome-desktop>=2.20.1' \ @@ -19,7 +19,7 @@ Finclude gnome gnome-scriptlet source=(${source[@]} 02-splash-disappear.patch \ $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-0.7.png \ kill_g_debug.patch 09_splash_hide.patch 19_gnome-wm-tweaking.patch) -sha1sums=('d1dedcafe8685cfd8763e04ae3d5d696eb353797' \ +sha1sums=('741569a0cf7213bafd4cf101020782ec3cf7671b' \ 'd45d51203dc7ad290b12bc70281d59844a79be75' \ '047ac00bb24d52986aac94e232b4b40fa122f582' \ 'c6a9e03d9622b9d1b81ae4bedda950bea25de962' \ From krics at linuxforum.hu Thu Dec 13 14:49:17 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 14:49:20 2007 Subject: [Frugalware-git] frugalware-current: gnome-desktop-2.20.2-1-x86_64 Message-ID: <20071213134917.A3F4F11903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55a71f8827f4f81a605f5fa149e34365a3fbff23 commit 55a71f8827f4f81a605f5fa149e34365a3fbff23 Author: Christian Hamar alias krix Date: Thu Dec 13 14:49:04 2007 +0100 gnome-desktop-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome/gnome-desktop/FrugalBuild b/source/gnome/gnome-desktop/FrugalBuild index d2c6cd2..35f2fe6 100644 --- a/source/gnome/gnome-desktop/FrugalBuild +++ b/source/gnome/gnome-desktop/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-desktop -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="The GNOME Desktop" url="http://www.gnome.org/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-gnome-distributor=Frugalware" -sha1sums=('be035617bf66dbff87f220d419d77d55124b5314') +sha1sums=('064751161705aa61fc456ed3ffadaa366dba3e9d') # optimization OK From krics at linuxforum.hu Thu Dec 13 14:52:41 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 14:52:43 2007 Subject: [Frugalware-git] frugalware-current: gnome-menus-2.20.2-1-x86_64 Message-ID: <20071213135241.5B78811903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8c626665588d47416088bbda090045e4466f305f commit 8c626665588d47416088bbda090045e4466f305f Author: Christian Hamar alias krix Date: Thu Dec 13 14:52:36 2007 +0100 gnome-menus-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome/gnome-menus/FrugalBuild b/source/gnome/gnome-menus/FrugalBuild index 5d74188..9dd00ec 100644 --- a/source/gnome/gnome-menus/FrugalBuild +++ b/source/gnome/gnome-menus/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-menus -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="GNOME menus and menu editor" depends=('gamin' 'pygtk>=2.12.0') @@ -14,7 +14,7 @@ Finclude gnome Fsysconfdir="/etc/gnome" Fconfopts="$Fconfopts --enable-python --enable-debug=no --enable-inotify" source=(${source[@]} $pkgname-2.18.0-categorize-prefs-menu.patch) -sha1sums=('8e7500e17fba464e37708c433793bcdcb1b385b4' \ +sha1sums=('8a00c7007e9e76a60884e34c894e871b3e72755f' \ '16d2d01801f13b0aa827371cf89a2e9fb7030c08') # optimization OK From vmiklos at frugalware.org Thu Dec 13 15:18:49 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 15:18:52 2007 Subject: [Frugalware-git] frugalware-current: octave-2.9.19-1-i686 Message-ID: <20071213141849.44EB211903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=30657639fe26f1ec30ccbf800c0ba49389c6d7cb commit 30657639fe26f1ec30ccbf800c0ba49389c6d7cb Author: Miklos Vajna Date: Thu Dec 13 15:18:12 2007 +0100 octave-2.9.19-1-i686 version bump diff --git a/source/apps-extra/octave/FrugalBuild b/source/apps-extra/octave/FrugalBuild index 74d9ac9..a6cafd0 100644 --- a/source/apps-extra/octave/FrugalBuild +++ b/source/apps-extra/octave/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=octave -pkgver=2.9.18 +pkgver=2.9.19 pkgrel=1 pkgdesc="Octave is a high-level language, primarily intended for numerical computations." url="http://www.octave.org/" @@ -12,5 +12,5 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep Testing|sed 's/.*) \([^ ]*\) (.*/\1/'" source=(ftp://ftp.octave.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('a533597147990ebf19cbcf7bc3bb1ffc738b3bbb') +sha1sums=('1cee64ccbcce0aca2b771175fcfbca817c9ba705') # optimization OK From vmiklos at frugalware.org Thu Dec 13 15:24:07 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 15:24:09 2007 Subject: [Frugalware-git] frugalware-current: gnono-1.9.1-1-x86_64 Message-ID: <20071213142407.E40F911903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2bf93d60dc5861477baf3185ca9cf9c7da669e2b commit 2bf93d60dc5861477baf3185ca9cf9c7da669e2b Author: Miklos Vajna Date: Thu Dec 13 15:23:38 2007 +0100 gnono-1.9.1-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gnono/FrugalBuild b/source/gnome-extra/gnono/FrugalBuild index 36fc891..3bd5bdc 100644 --- a/source/gnome-extra/gnono/FrugalBuild +++ b/source/gnome-extra/gnono/FrugalBuild @@ -10,8 +10,9 @@ _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 Finclude sourceforge depends=('libgnomeui') +makedepends=('perl-xml') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_desktop_name="Gnono" _F_desktop_icon="gnono.png" _F_desktop_categories="Game;GNOME;" From vmiklos at frugalware.org Thu Dec 13 15:33:52 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 15:33:54 2007 Subject: [Frugalware-git] frugalware-current: gogh-0.1.2.1-1-x86_64 Message-ID: <20071213143353.004FC11903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2ecf6fda27e36d077e396487a040b9f726bc9c4 commit e2ecf6fda27e36d077e396487a040b9f726bc9c4 Author: Miklos Vajna Date: Thu Dec 13 15:33:19 2007 +0100 gogh-0.1.2.1-1-x86_64 added x86_64 to archs() diff --git a/source/gnome-extra/gogh/FrugalBuild b/source/gnome-extra/gogh/FrugalBuild index c79814f..459e4ac 100644 --- a/source/gnome-extra/gogh/FrugalBuild +++ b/source/gnome-extra/gogh/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="Gogh is a GNU/Linux bitmap graphics editor." url="http://goghproject.com/" depends=('python' 'pygtk' 'gnome-python' 'pyxml') groups=('gnome-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads.html | Flasttar" source=($url/Gogh-$pkgver.tar.gz $pkgname.png) _F_desktop_name="Gogh Bitmap Editor" From vmiklos at frugalware.org Thu Dec 13 16:43:47 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 16:43:49 2007 Subject: [Frugalware-git] frugalware-current: junit-3.8.2-1-i686 Message-ID: <20071213154347.477FF11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b5c6457cfd9f3e86b92aeb3086827c0fb3f6f9df commit b5c6457cfd9f3e86b92aeb3086827c0fb3f6f9df Author: Miklos Vajna Date: Thu Dec 13 16:43:23 2007 +0100 junit-3.8.2-1-i686 new package diff --git a/source/devel-extra/junit/FrugalBuild b/source/devel-extra/junit/FrugalBuild new file mode 100644 index 0000000..3bc7d16 --- /dev/null +++ b/source/devel-extra/junit/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.04 SBU +# Maintainer: VMiklos + +pkgname=junit +pkgver=3.8.2 +pkgrel=1 +pkgdesc="A regression testing framework." +_F_sourceforge_ext=".zip" +Finclude java sourceforge +url="http://www.junit.org/" +groups=('devel-extra') +archs=('i686') +source=(${source/-} build.xml) +sha1sums=('701578302e244e5173dca3040cce0774a5c39645' \ + 'b0c2fc9cec04aa535afe35e818c3ab6eed15330b') + +build() +{ + Fcd $pkgname$pkgver + jar xf src.jar + Fjavacleanup + cp ../build.xml . + ant dist || return 1 + Fjar $pkgname$pkgver/$pkgname.jar +} diff --git a/source/devel-extra/junit/build.xml b/source/devel-extra/junit/build.xml new file mode 100644 index 0000000..7c5d047 --- /dev/null +++ b/source/devel-extra/junit/build.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From vmiklos at frugalware.org Thu Dec 13 17:05:42 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 17:05:45 2007 Subject: [Frugalware-git] frugalware-current: apache-ant-1.7.0-1-i686 Message-ID: <20071213160542.CE20A11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d18801a06d6e81d58921a73ebd0637690e54cc4 commit 0d18801a06d6e81d58921a73ebd0637690e54cc4 Author: Miklos Vajna Date: Thu Dec 13 17:05:32 2007 +0100 apache-ant-1.7.0-1-i686 version bump diff --git a/source/devel-extra/apache-ant/FrugalBuild b/source/devel-extra/apache-ant/FrugalBuild index bec3c70..5a76f16 100644 --- a/source/devel-extra/apache-ant/FrugalBuild +++ b/source/devel-extra/apache-ant/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=apache-ant -pkgver=1.6.5 -pkgrel=3 +pkgver=1.7.0 +pkgrel=1 pkgdesc="Ant is a Java-based build tool." url="http://ant.apache.org" groups=('devel-extra') @@ -13,18 +13,18 @@ source=(http://www.apache.org/dist/ant/source/apache-ant-$pkgver-src.tar.bz2) signatures=($source.asc) Finclude java depends=('java-gcj-compat>=1.0.68') -makedepends=('ecj' 'gcc-gcj') +makedepends=('ecj' 'gcc-gcj' 'junit') build() { Fcd Fjavacleanup - ./build.sh -Ddist.dir=dist/ dist || return 1 + CLASSPATH=/usr/share/java/junit.jar ./build.sh -Ddist.dir=dist/ dist || return 1 Fmkdir /usr/bin /usr/share/doc/$pkgname-$pkgver Fsed '^ANT_LIB=.*' 'ANT_LIB="/usr/share/java"' dist/bin/ant - cp -a dist/bin/{ant,antRun,antRun.pl,complete-ant-cmd.pl,runant.pl} $Fdestdir/usr/bin + cp -a dist/bin/{ant,antRun,antRun.pl,complete-ant-cmd.pl,runant.pl} $Fdestdir/usr/bin || return 1 Fjar dist/lib/*.jar cp -a docs/* $Fdestdir/usr/share/doc/$pkgname-$pkgver/ } From krics at linuxforum.hu Thu Dec 13 21:22:51 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 21:22:53 2007 Subject: [Frugalware-git] frugalware-current: gail-1.20.2-1-x86_64 Message-ID: <20071213202251.2A0FA11903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c01f2b3369f67e424e58814014f56033ea1b10b commit 7c01f2b3369f67e424e58814014f56033ea1b10b Author: Christian Hamar alias krix Date: Thu Dec 13 21:22:23 2007 +0100 gail-1.20.2-1-x86_64 * Version bump diff --git a/source/gnome/gail/FrugalBuild b/source/gnome/gail/FrugalBuild index 75444f0..c4d5c12 100644 --- a/source/gnome/gail/FrugalBuild +++ b/source/gnome/gail/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gail -pkgver=1.20.1 +pkgver=1.20.2 pkgrel=1 pkgdesc="Accessibility support for GTK+2 and libgnomecanvas" url="http://developer.gnome.org/projects/gap" @@ -12,7 +12,7 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('cb9767641d89da64c1f0ca405319bcece907fbfb') +sha1sums=('781a6147e327c88a80a9711750995ef7aa1c7078') export CFLAGS="$CFLAGS -fno-strict-aliasing" # optimization OK From krics at linuxforum.hu Thu Dec 13 21:31:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 21:31:57 2007 Subject: [Frugalware-git] frugalware-current: libarchive-2.4.7-1-x86_64 Message-ID: <20071213203153.0A3A81B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13404d8651aa05fabec193e8b151ac45ace9210a commit 13404d8651aa05fabec193e8b151ac45ace9210a Author: Christian Hamar alias krix Date: Thu Dec 13 21:31:29 2007 +0100 libarchive-2.4.7-1-x86_64 * Version bump * Added Fconfopts --disable-xattr and --disable-acl to prevent mistakes like not built in a clean chroot and links with acl and attr libs. (which we dont need) - NOTE: make check'ed against pacman GIT tree. PASSED all test. diff --git a/source/base/libarchive/FrugalBuild b/source/base/libarchive/FrugalBuild index 1299289..ac213a6 100644 --- a/source/base/libarchive/FrugalBuild +++ b/source/base/libarchive/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libarchive -pkgver=2.4.0 +pkgver=2.4.7 pkgrel=1 pkgdesc="Library to create and read several different archive formats" groups=('base' 'chroot-core') @@ -11,6 +11,8 @@ url="http://people.freebsd.org/~kientzle/libarchive/" depends=('bzip2' 'zlib') up2date="lynx -dump $url |Flasttar" source=($url/src/$pkgname-$pkgver.tar.gz) -sha1sums=('b1d845e1c9e1631ba4b220627604832a14d84679') +sha1sums=('9889c9b80d43d245d3e710fdeb63270796eb8450') +# Need to prevent mistakes like unclean chroot build and others and be sure that DONT link to ACL* +Fconfopts=($Fconfopts --disable-xattr --disable-acl) #options=('force') # optimization OK From krics at linuxforum.hu Thu Dec 13 21:39:02 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 21:39:05 2007 Subject: [Frugalware-git] frugalware-current: file-roller-2.20.2-1-x86_64 Message-ID: <20071213203902.AB06B1B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4695accdf6040e4ae643a3e953fb89360c10e959 commit 4695accdf6040e4ae643a3e953fb89360c10e959 Author: Christian Hamar alias krix Date: Thu Dec 13 21:38:11 2007 +0100 file-roller-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome/file-roller/FrugalBuild b/source/gnome/file-roller/FrugalBuild index 8e88719..15fc10b 100644 --- a/source/gnome/file-roller/FrugalBuild +++ b/source/gnome/file-roller/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=file-roller -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="Archive manager utility for GNOME" depends=('nautilus>=2.20.0' 'rarian' 'desktop-file-utils') @@ -15,5 +15,5 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -sha1sums=('34d6ebb8297497ccc7ce585d2a622d94505815bf') +sha1sums=('9aac902667e93738bcf0cfc6c5a82718c1119c8c') # optimization OK From krics at linuxforum.hu Thu Dec 13 21:43:15 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 21:43:18 2007 Subject: [Frugalware-git] frugalware-current: zenity-2.20.1-1-x86_64 Message-ID: <20071213204315.CEACD11903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=329317f7d66f934954302d1d6875a9eb1680d77c commit 329317f7d66f934954302d1d6875a9eb1680d77c Author: Christian Hamar alias krix Date: Thu Dec 13 21:42:31 2007 +0100 zenity-2.20.1-1-x86_64 * Version bump diff --git a/source/gnome/zenity/FrugalBuild b/source/gnome/zenity/FrugalBuild index e1f0806..60cdb91 100644 --- a/source/gnome/zenity/FrugalBuild +++ b/source/gnome/zenity/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=zenity -pkgver=2.20.0 +pkgver=2.20.1 pkgrel=1 pkgdesc="A rewrite of gdialog" url="http://www.gnome.org/" @@ -14,5 +14,5 @@ archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet -sha1sums=('062cb61bc07a4de61fb531d745648552285f6858') +sha1sums=('25f2e7c6736d408c24f201b0847c82c9b49cc313') # optimization OK From krics at linuxforum.hu Thu Dec 13 21:59:13 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Dec 13 21:59:14 2007 Subject: [Frugalware-git] frugalware-current: evolution-data-server-1.12.2-1-x86_64 Message-ID: <20071213205913.33AB211903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=281f9040583213ec74cd99c3c33f368949791e8c commit 281f9040583213ec74cd99c3c33f368949791e8c Author: Christian Hamar alias krix Date: Thu Dec 13 21:57:48 2007 +0100 evolution-data-server-1.12.2-1-x86_64 * Version bump diff --git a/source/gnome/evolution-data-server/FrugalBuild b/source/gnome/evolution-data-server/FrugalBuild index bbfd1a4..385e62e 100644 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=evolution-data-server -pkgver=1.12.1 -pkgrel=2 +pkgver=1.12.2 +pkgrel=1 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop" depends=('nss>=3.11.5' 'libsoup>=2.2.102-2' 'libgnomeui>=2.20.1.1' 'heimdal>=1.0' 'gnome-keyring>=2.20.1' \ 'db>=4.6.18') @@ -11,7 +11,7 @@ makedepends=('intltool' 'gtk-doc' 'openldap>=2.3.24') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('3d91c87c257ee080baf0f182dd46079752f427ed') +sha1sums=('fe7d3ff19ee9505aef46c797d6504d2be5b7e138') export CFLAGS="$CFLAGS -fno-strict-aliasing" subpkgs=('evolution-data-server-ldap' "$pkgname-docs") From vmiklos at frugalware.org Thu Dec 13 23:36:33 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Dec 13 23:36:36 2007 Subject: [Frugalware-git] frugalware-current: remind-03.01.03-1-i686 Message-ID: <20071213223633.D8E3011903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3928e0c48456f328c5d53f0802a1f4cfece133fd commit 3928e0c48456f328c5d53f0802a1f4cfece133fd Author: Miklos Vajna Date: Thu Dec 13 23:36:10 2007 +0100 remind-03.01.03-1-i686 new package diff --git a/source/apps-extra/remind/FrugalBuild b/source/apps-extra/remind/FrugalBuild new file mode 100644 index 0000000..bd9a3e5 --- /dev/null +++ b/source/apps-extra/remind/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.06 SBU +# Maintainer: VMiklos + +pkgname=remind +pkgver=03.01.03 +pkgrel=1 +pkgdesc="A sophisticated calendar and alarm program." +url="http://www.roaringpenguin.com/products/remind" +depends=('glibc') +groups=('apps-extra') +archs=('i686') +up2date="lynx -dump $url |Flasttar" +source=(http://www.roaringpenguin.com/files/download/remind-$pkgver.tar.gz) +sha1sums=('8649909001992102e1b1e7406b9cb611f4a7efb1') +# optimization OK From vmiklos at frugalware.org Fri Dec 14 00:58:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 00:58:41 2007 Subject: [Frugalware-git] frugalware-current: wyrd-1.4.3b-1-i686 Message-ID: <20071213235840.50D2311904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8058f6825c78bd17584ae6bd989c34608e6df7cb commit 8058f6825c78bd17584ae6bd989c34608e6df7cb Author: Miklos Vajna Date: Fri Dec 14 00:52:54 2007 +0100 wyrd-1.4.3b-1-i686 new package diff --git a/source/apps-extra/wyrd/FrugalBuild b/source/apps-extra/wyrd/FrugalBuild new file mode 100644 index 0000000..b1cdacd --- /dev/null +++ b/source/apps-extra/wyrd/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.03 SBU +# Maintainer: VMiklos + +pkgname=wyrd +pkgver=1.4.3b +pkgrel=1 +pkgdesc="A text-based front-end to Remind." +url="http://www.eecs.umich.edu/~pelzlpj/wyrd/" +depends=('ncurses') +rodepends=('remind') +makedepends=('ocaml') +backup=(etc/wyrdrc) +groups=('apps-extra') +archs=('i686') +up2date="lynx -dump $url |Flasttar" +source=($url/wyrd-$pkgver.tar.gz) +sha1sums=('cb3604273a1148313786b9112effa9cf7ff508d2') + +build() +{ + Fbuild + Fdocrel doc/manual.html +} + +# optimization OK From vmiklos at frugalware.org Fri Dec 14 02:44:56 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 02:44:59 2007 Subject: [Frugalware-git] bmf: bitlbee-skype-0.2.4-1-i686 Message-ID: <20071214014456.E78D011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=87fba7e1862bc32b1b314e25282a7ec80e66fdac commit 87fba7e1862bc32b1b314e25282a7ec80e66fdac Author: Miklos Vajna Date: Fri Dec 14 02:44:43 2007 +0100 bitlbee-skype-0.2.4-1-i686 version bump diff --git a/source/network-extra/bitlbee-skype/FrugalBuild b/source/network-extra/bitlbee-skype/FrugalBuild index 1aab043..9a2bf78 100644 --- a/source/network-extra/bitlbee-skype/FrugalBuild +++ b/source/network-extra/bitlbee-skype/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=bitlbee-skype -pkgver=0.2.3 +pkgver=0.2.4 pkgrel=1 pkgdesc="A Skype plugin for BitlBee" url="http://vmiklos.hu/project/bitlbee-skype/" From boobaa at frugalware.org Fri Dec 14 08:51:11 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Dec 14 08:51:13 2007 Subject: [Frugalware-git] frugalware-current: rss2email-2.61-1-i686 Message-ID: <20071214075111.28FD911903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6b3464a0df989b1a22519877224afcf84064aaf6 commit 6b3464a0df989b1a22519877224afcf84064aaf6 Author: CSÉCSY László Date: Fri Dec 14 08:50:40 2007 +0100 rss2email-2.61-1-i686 version bump diff --git a/source/network-extra/rss2email/FrugalBuild b/source/network-extra/rss2email/FrugalBuild index c2fdb30..0a86d8c 100644 --- a/source/network-extra/rss2email/FrugalBuild +++ b/source/network-extra/rss2email/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László pkgname=rss2email -pkgver=2.60 -pkgrel=2 +pkgver=2.61 +pkgrel=1 pkgdesc="read newsfeeds from your email client" url="http://rss2email.infogami.com/" depends=('python') @@ -16,11 +16,11 @@ source=(http://$pkgname.infogami.com/$pkgname.py \ http://feedparser.org/feedparser.py \ http://lindsey.smith.googlepages.com/r2e \ README.Frugalware) -sha1sums=('1427043b2335574c57028a2692ca5fd18f461b6c' \ - '84c0c38c068c29caba9e5d415c041dace3fd1615' \ +sha1sums=('40b24ec184dabf7609d071d7e12bbaadea6d8322' \ + '778b66d2c5a6df80e609590402add947ab2cdea3' \ 'f9c2a4b3a4b2a586e74da8fdcf1760fe3a96c818' \ 'd2b9524e7558bb95ab2bc2c458f4123cfceab7b4' \ - 'd1a35df2195659491c29aef4f225525a5e7abbe7') + 'b7200b4072ffc1ad56b62c94ab284246f73316bc') build() { mkdir build From vmiklos at frugalware.org Fri Dec 14 10:30:32 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 10:30:38 2007 Subject: [Frugalware-git] frugalware-current: links-2.1pre32-1-i686 Message-ID: <20071214093032.B284711904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ec97c0caadf05b6f6fb64776a1eb85cb5bd6068 commit 0ec97c0caadf05b6f6fb64776a1eb85cb5bd6068 Author: Miklos Vajna Date: Fri Dec 14 10:28:37 2007 +0100 links-2.1pre32-1-i686 version bump diff --git a/source/network-extra/links/FrugalBuild b/source/network-extra/links/FrugalBuild index 879af7e..fd704fa 100644 --- a/source/network-extra/links/FrugalBuild +++ b/source/network-extra/links/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=links -pkgver=2.1pre31 +pkgver=2.1pre32 pkgrel=1 pkgdesc="A web browser running in both graphics and text mode." url="http://links.twibright.com/" @@ -13,6 +13,6 @@ up2date="lynx -dump $url/download.php|grep Current|sed 's/.* \(.*\)\..*/\1/'" source=($url/download/$pkgname-$pkgver.tar.bz2) Fconfopts="$Fconfopts --enable-javascript --enable-graphics --without-x" -sha1sums=('57fb3d6cf2235ac87c1583aeea386843133100a3') +sha1sums=('d63f75f3adf0f7351bc0ebd33b97773a58df961b') # optimization OK From vmiklos at frugalware.org Fri Dec 14 10:39:41 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 10:39:43 2007 Subject: [Frugalware-git] frugalware-current: kvm-56-1-i686 Message-ID: <20071214093941.973A911904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f854bd04fa41b3550fc888d2c7aace4708069cdb commit f854bd04fa41b3550fc888d2c7aace4708069cdb Author: Miklos Vajna Date: Fri Dec 14 10:39:18 2007 +0100 kvm-56-1-i686 version bump diff --git a/source/xapps-extra/kvm/FrugalBuild b/source/xapps-extra/kvm/FrugalBuild index a38d7ce..aafe5b0 100644 --- a/source/xapps-extra/kvm/FrugalBuild +++ b/source/xapps-extra/kvm/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=kvm -pkgver=55 +pkgver=56 pkgrel=1 pkgdesc="KVM is a kernel based virtual machine" url="http://kvm.sourceforge.net" @@ -12,7 +12,7 @@ archs=('i686') Finclude sourceforge kernel-version depends=("kernel>=$_F_kernelver_ver" 'sdl' 'zlib') makedepends=("kernel-source>=$_F_kernelver_ver" 'gcc-3.3') -sha1sums=('d5899f5162f40436c7cfc067789365e7ad2cfa6b') +sha1sums=('25829c90a26003f1c2b62af5fdb9db913dd63f28') Fconfopts="--prefix=$Fprefix" # no changelog in the tarball, you can reach it here: From vmiklos at frugalware.org Fri Dec 14 11:04:27 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 11:04:30 2007 Subject: [Frugalware-git] frugalware-current: web.py-0.22-1-i686 Message-ID: <20071214100427.C883011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9a6e4a8f5ce8c34a3a4f11912a2bc1bef5b7610c commit 9a6e4a8f5ce8c34a3a4f11912a2bc1bef5b7610c Author: Miklos Vajna Date: Fri Dec 14 11:04:01 2007 +0100 web.py-0.22-1-i686 new package closes #2611 diff --git a/source/devel-extra/web.py/FrugalBuild b/source/devel-extra/web.py/FrugalBuild new file mode 100644 index 0000000..681ff91 --- /dev/null +++ b/source/devel-extra/web.py/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0 SBU +# Contributor: frubru1 +# Maintainer: VMiklos + +pkgname=web.py +pkgver=0.22 +pkgrel=1 +pkgdesc="web.py is a web framework for python" +url="http://webpy.org" +depends=('python') +makedepends=('setuptools') +groups=('devel-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url/static/ | Flasttar" +source=($url/static/$pkgname-$pkgver.tar.gz) +_F_cd_path="webpy" +_F_makepkg_chkdep="python" +sha1sums=('ee8910ee2992f6212780f24c611fb479c8cee206') From vmiklos at frugalware.org Fri Dec 14 11:17:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 11:17:14 2007 Subject: [Frugalware-git] frugalware-current: amoebax-0.2.0-1-x86_64 Message-ID: <20071214101712.CA43C11903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd5ddb5a2fb520dc57cfff6e08f916e17a1be2c9 commit fd5ddb5a2fb520dc57cfff6e08f916e17a1be2c9 Author: Miklos Vajna Date: Fri Dec 14 11:11:37 2007 +0100 amoebax-0.2.0-1-x86_64 added x86_64 to archs() diff --git a/source/games-extra/amoebax/FrugalBuild b/source/games-extra/amoebax/FrugalBuild index 43aff32..5344ab6 100644 --- a/source/games-extra/amoebax/FrugalBuild +++ b/source/games-extra/amoebax/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A cute and addictive action-puzzle game." url="http://www.emma-soft.com/games/amoebax/" depends=('sdlimage' 'sdl_mixer') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html | Flasttarbz2" source=(http://www.emma-soft.com/games/amoebax/download/$pkgname-$pkgver.tar.bz2) sha1sums=('84f45f0363782c4ea7040315cbd0a43f143a5b8a') From vmiklos at frugalware.org Fri Dec 14 11:32:34 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 11:32:35 2007 Subject: [Frugalware-git] frugalware-current: armagetronad-0.2.8.2.1-1-x86_64 Message-ID: <20071214103234.2622911904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a6f6b5cdde9c7524bcc9251d5c45426ed55ff1db commit a6f6b5cdde9c7524bcc9251d5c45426ed55ff1db Author: Miklos Vajna Date: Fri Dec 14 11:32:28 2007 +0100 armagetronad-0.2.8.2.1-1-x86_64 added x86_64 to archs() diff --git a/source/games-extra/armagetronad/FrugalBuild b/source/games-extra/armagetronad/FrugalBuild index 015e374..1c14647 100644 --- a/source/games-extra/armagetronad/FrugalBuild +++ b/source/games-extra/armagetronad/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="A TRON clone in 3D" url="http://www.armagetronad.net/" depends=('sdlimage' 'libjpeg' 'libpng' 'zlib' 'mesa' 'libgl' 'libxml2' 'libstdc++' 'libx11') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_ext=".src.tar.bz2" Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php\?group_id=110997 | grep -m1 src.tar.bz2 | sed 's/^.*-\(.*\).src.*$/\1/'" From vmiklos at frugalware.org Fri Dec 14 11:54:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 11:54:25 2007 Subject: [Frugalware-git] frugalware-current: armagetronad-dedicated-0.2.8.2.1-1-x86_64 Message-ID: <20071214105423.C620F11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=33cbc5fb57d9663e23ac6fb0267307fe830d594b commit 33cbc5fb57d9663e23ac6fb0267307fe830d594b Author: Miklos Vajna Date: Fri Dec 14 11:54:20 2007 +0100 armagetronad-dedicated-0.2.8.2.1-1-x86_64 added x86_64 to archs() diff --git a/source/games-extra/armagetronad-dedicated/FrugalBuild b/source/games-extra/armagetronad-dedicated/FrugalBuild index f432cc3..cbd6627 100644 --- a/source/games-extra/armagetronad-dedicated/FrugalBuild +++ b/source/games-extra/armagetronad-dedicated/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="TRON clone in 3D (dedicated server)." url="http://www.armagetronad.net/" depends=('libxml2' 'zlib' 'libstdc++' 'libgcc') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_sourceforge_ext=".src.tar.bz2" _F_sourceforge_name=armagetronad Finclude sourceforge From vmiklos at frugalware.org Fri Dec 14 11:55:13 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 11:55:13 2007 Subject: [Frugalware-git] frugalware-current: barrage-1.0.1-1-x86_64 Message-ID: <20071214105513.18F4511904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff0ef958faf7051c2843b446022298cca8acaad0 commit ff0ef958faf7051c2843b446022298cca8acaad0 Author: Miklos Vajna Date: Fri Dec 14 11:55:11 2007 +0100 barrage-1.0.1-1-x86_64 added x86_64 to archs() diff --git a/source/games-extra/barrage/FrugalBuild b/source/games-extra/barrage/FrugalBuild index b95c136..0723a58 100644 --- a/source/games-extra/barrage/FrugalBuild +++ b/source/games-extra/barrage/FrugalBuild @@ -10,6 +10,6 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge depends=('sdl_mixer' 'glibc') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('48c1a32b2ea2a12371729e06f008c06df48695be') # optimization OK From vmiklos at frugalware.org Fri Dec 14 11:57:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 11:57:12 2007 Subject: [Frugalware-git] frugalware-current: bomberclone-0.11.7-1-x86_64 Message-ID: <20071214105711.8A2B5119039F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=398376da1db31368890869e10aa30b58966ac092 commit 398376da1db31368890869e10aa30b58966ac092 Author: Miklos Vajna Date: Fri Dec 14 11:57:08 2007 +0100 bomberclone-0.11.7-1-x86_64 added x86_64 to archs() diff --git a/source/games-extra/bomberclone/FrugalBuild b/source/games-extra/bomberclone/FrugalBuild index b9a5c04..9ecd84b 100644 --- a/source/games-extra/bomberclone/FrugalBuild +++ b/source/games-extra/bomberclone/FrugalBuild @@ -11,7 +11,7 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://bomberclone.sourceforge.net/homepage/" groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('108948667d0504cedfddaf4a55e69b221b14edbd') _F_desktop_name="Bomberclone" From vmiklos at frugalware.org Fri Dec 14 12:01:05 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 12:01:11 2007 Subject: [Frugalware-git] frugalware-current: bygfoot-2.2.0-1-x86_64 Message-ID: <20071214110105.E055511904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2e30097d8fa9372c577db8b1968f4d49060a92ed commit 2e30097d8fa9372c577db8b1968f4d49060a92ed Author: Miklos Vajna Date: Fri Dec 14 12:00:52 2007 +0100 bygfoot-2.2.0-1-x86_64 added x86_64 to archs() diff --git a/source/games-extra/bygfoot/FrugalBuild b/source/games-extra/bygfoot/FrugalBuild index 7696487..d045f87 100644 --- a/source/games-extra/bygfoot/FrugalBuild +++ b/source/games-extra/bygfoot/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge url="http://www.bygfoot.com/" depends=('gtk+2' 'libxdamage') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_cd_path="$pkgname-$pkgver-source" sha1sums=('4ed7aad57c5f675b3cb72c42b329178536201d8b') From vmiklos at frugalware.org Fri Dec 14 12:04:21 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Dec 14 12:04:23 2007 Subject: [Frugalware-git] frugalware-current: ceferino-0.97.8-1-x86_64 Message-ID: <20071214110421.BAFAD11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c314861b10bb195d94f3d9324b38787a5b2f874 commit 4c314861b10bb195d94f3d9324b38787a5b2f874 Author: Miklos Vajna Date: Fri Dec 14 12:04:17 2007 +0100 ceferino-0.97.8-1-x86_64 added x86_64 to archs() diff --git a/source/games-extra/ceferino/FrugalBuild b/source/games-extra/ceferino/FrugalBuild index cb9ba85..3f84989 100644 --- a/source/games-extra/ceferino/FrugalBuild +++ b/source/games-extra/ceferino/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A Super Pang clone" url="http://www.loosersjuegos.com.ar/juegos/ceferino/ceferino.php" depends=('sdlimage' 'sdl_mixer') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.loosersjuegos.com.ar/juegos/ceferino/descargas/?C=M;O=A'| Flasttar" source=(http://www.loosersjuegos.com.ar/juegos/ceferino/descargas/$pkgname-$pkgver.tar.gz) sha1sums=('59d0a6d889bf916a6c546df05bb0d34a05e02f84') From crazy at frugalware.org Fri Dec 14 12:37:06 2007 From: crazy at frugalware.org (crazy) Date: Fri Dec 14 12:37:07 2007 Subject: [Frugalware-git] frugalware-current: qt-3.3.8-7-i686 Message-ID: <20071214113706.0A3DB1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07d5c4030474d7e1e835f1635f6442f96b6668ac commit 07d5c4030474d7e1e835f1635f6442f96b6668ac Author: crazy Date: Fri Dec 14 12:31:09 2007 +0100 qt-3.3.8-7-i686 * Release bump * disabled OOo symlinks ( Ok @ vmiklos ) * updated qt3-copy patches diff --git a/source/xlib/qt/FrugalBuild b/source/xlib/qt/FrugalBuild index bf4fecf..36436e1 100644 --- a/source/xlib/qt/FrugalBuild +++ b/source/xlib/qt/FrugalBuild @@ -4,7 +4,7 @@ pkgname=qt pkgver=3.3.8 -pkgrel=6 +pkgrel=7 pkgmore=x11-free pkgdesc="The QT GUI toolkit." url="http://www.trolltech.com/products/qt" @@ -16,7 +16,7 @@ options=('nodocs' 'scriptlet') removes=('usr/lib/qt/mkspecs/default') up2date="lynx -dump ftp://ftp.trolltech.com/qt/source|grep '.tar.bz2$'|grep 'qt-x11-free-'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=(ftp://ftp.trolltech.com/qt/source/$pkgname-$pkgmore-$pkgver.tar.bz2 \ - http://ftp.frugalware.org/pub/other/sources/qt/patches-510500.tar.bz2 \ + http://ftp.frugalware.org/pub/other/sources/qt/patches-748368.tar.bz2 \ qt.sh apply_patches \ 01-qt-gcc4.patch \ 02-qt-rpath+FW.patch \ @@ -25,6 +25,17 @@ source=(ftp://ftp.trolltech.com/qt/source/$pkgname-$pkgmore-$pkgver.tar.bz2 \ Qt-3.3.8-UTF-8-fix.diff \ CVE-2007-3388.patch \ CVE-2007-4137.patch) +sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' \ + '540a7111b03b0ca4c0f792e7398e49f2a55fd919' \ + 'e281176c76dc9ef0f06aba57f107ccb074eb317d' \ + '7562323175ec47483dcb45c2857519f6276e0a51' \ + '54d37e3988c4b195ae960ef2c59e678151115211' \ + '0d5fcbe569723792700bad3c82abe34d5e5163c4' \ + 'dba54b91b2b00c1d052ac512d824b29d31aefb89' \ + '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871' \ + '418b09fee387959f45f75fb20fb1e54c0f14b1cb' \ + 'f7634fb0419bda723053adb885facd270ccb10ec' \ + '12c6e2c9091c710ebd031c5e82ff33f02fe7e210') export QTDIR=$startdir/src/$pkgname-$pkgmore-$pkgver export PATH=${QTDIR}/bin:${PATH} @@ -45,16 +56,20 @@ build() Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing" mkspecs/linux-g++/qmake.conf mv $Fsrcdir/{patches,apply_patches} $Fsrcdir/$pkgname-$pkgmore-$pkgver chmod +x apply_patches - echo "0007" >> patches/DISABLED + echo "0077" >> patches/DISABLED + echo "0081" >> patches/DISABLED ./apply_patches || return 1 - ./configure -v -platform linux-g++ -prefix /usr/lib/qt -release -shared \ - -qt-gif -system-libpng -system-libjpeg -system-libmng -system-zlib \ - -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng -largefile \ - -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite \ - -thread -stl -no-g++-exceptions \ - -enable-{dialogs,iconview,workspace,network,tools,kernel,widgets,opengl,stl,canvas,table,xml,sql,input} \ - -nis -pch -sm -tablet -xft -xinerama -xrender -xkb -ipv6 \ - -I /usr/include -L /usr/lib || return 1 + ./configure \ + -v -platform linux-g++ \ + -prefix /usr/lib/qt \ + -release -shared -qt-gif \ + -system-libpng -system-libjpeg -system-libmng -system-zlib \ + -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng -largefile \ + -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite \ + -thread -stl -no-g++-exceptions \ + -enable-{dialogs,iconview,workspace,network,tools,kernel,widgets,opengl,stl,canvas,table,xml,sql,input} \ + -nis -pch -sm -tablet -xft -xinerama -xrender -xkb -ipv6 \ + -I /usr/include -L /usr/lib || return 1 Fmkdir /usr/lib/qt/mkspecs cp -r mkspecs/linux-g++ $Fdestdir/usr/lib/qt/mkspecs/linux-g++ ##Fixme need patch## @@ -68,7 +83,7 @@ build() make || return 1 make INSTALL_ROOT=$Fdestdir install || return 1 Fmkdir /usr/lib/$pkgname/man - cp -r $Fsrcdir/$pkgname-$pkgmore-$pkgver/doc/man/{man1,man3} $Fdestdir/usr/lib/$pkgname/man + cp -r $Fsrcdir/$pkgname-$pkgmore-$pkgver/doc/man/{man1,man3} $Fdestdir/usr/lib/$pkgname/man || Fdie Fsed "-L$startdir/src/$pkgname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/$pkgname/lib/*.prl Fexe /etc/profile.d/qt.sh (cd $Fdestdir/usr/lib/qt/mkspecs; ln -sf linux-g++ default) @@ -79,22 +94,11 @@ build() Fln /usr/lib/qt/lib /usr/lib/qt/lib64 fi # symlinks for who don't care about ld.so.conf (OpenOffice.org) - Fln qt3/lib/libqt-mt.so.3 /usr/lib/libqt-mt.so.3 - Fln qt3/lib/libqui.so.1 /usr/lib/libqui.so.1 + #Fln qt/lib/libqt-mt.so.3 /usr/lib/libqt-mt.so.3 + #Fln qt/lib/libqui.so.1 /usr/lib/libqui.so.1 Fsplit qt-docs usr/lib/qt/phrasebooks Fsplit qt-docs usr/lib/qt/templates Fsplit qt-docs usr/lib/qt/doc } -sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' \ - '8fd70a87d8640915cdfff1eb26177b96fb8cb5d0' \ - 'e281176c76dc9ef0f06aba57f107ccb074eb317d' \ - '7562323175ec47483dcb45c2857519f6276e0a51' \ - '54d37e3988c4b195ae960ef2c59e678151115211' \ - '0d5fcbe569723792700bad3c82abe34d5e5163c4' \ - 'dba54b91b2b00c1d052ac512d824b29d31aefb89' \ - '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871' \ - '418b09fee387959f45f75fb20fb1e54c0f14b1cb' \ - 'f7634fb0419bda723053adb885facd270ccb10ec' \ - '12c6e2c9091c710ebd031c5e82ff33f02fe7e210') # optimization OK From crazy at frugalware.org Fri Dec 14 12:51:55 2007 From: crazy at frugalware.org (crazy) Date: Fri Dec 14 12:51:58 2007 Subject: [Frugalware-git] frugalware-current: touchmegames-0.2.0-1-i686 Message-ID: <20071214115155.5F04611901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b662bb6eb24ed67b88c39f1c7b5ec23ba66eea0e commit b662bb6eb24ed67b88c39f1c7b5ec23ba66eea0e Author: crazy Date: Fri Dec 14 12:51:37 2007 +0100 touchmegames-0.2.0-1-i686 * moved patch to FTP diff --git a/source/games-extra/touchmegames/FrugalBuild b/source/games-extra/touchmegames/FrugalBuild index 6893b83..eb18a5d 100644 --- a/source/games-extra/touchmegames/FrugalBuild +++ b/source/games-extra/touchmegames/FrugalBuild @@ -12,7 +12,7 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge source=($source \ makefile-fixes.patch \ - fix-paths.patch \ + http://ftp.frugalware.org/pub/other/sources/tmg/fix-paths.patch \ tmg.png) options=('scriptlet') sha1sums=('f44ee316d4236d6679cfe888c713c41a35211762' \ diff --git a/source/games-extra/touchmegames/fix-paths.patch b/source/games-extra/touchmegames/fix-paths.patch deleted file mode 100644 index 7ffdb36..0000000 --- a/source/games-extra/touchmegames/fix-paths.patch +++ /dev/null @@ -1,2140 +0,0 @@ -diff -Naur touchmegames/src/compile4/interface.cpp touchmegames-p/src/compile4/interface.cpp ---- touchmegames/src/compile4/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/compile4/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -131,9 +131,9 @@ - - - for (int i = 0; i < 21; ++i) { -- p1Circs[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/blue.gif"); -+ p1Circs[i] = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/blue.gif"); - gtk_fixed_put((GtkFixed *)fixed, p1Circs[i], -80, -80); -- p2Circs[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/green.gif"); -+ p2Circs[i] = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/green.gif"); - gtk_fixed_put((GtkFixed *)fixed, p2Circs[i], -80, -80); - } - -@@ -147,12 +147,12 @@ - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(colPressed), (gpointer)this); - gtk_object_set_user_data((GtkObject *)eventBox, (void *)i); -- img = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/bg.png"); -+ img = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/bg.png"); - gtk_container_add((GtkContainer *)eventBox, img); - - } - -- scorebg = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/scorebg.gif"); -+ scorebg = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/scorebg.gif"); - - gtk_fixed_put((GtkFixed *)fixed, scorebg, -340, -290); - -@@ -385,7 +385,7 @@ - srand(sectime); - - topFixed = gtk_fixed_new(); -- img = gtk_image_new_from_file("/usr/local/share/touchmegames/images/games/bg.png"); -+ img = gtk_image_new_from_file("/usr/share/touchmegames/images/games/bg.png"); - gtk_fixed_put((GtkFixed *)topFixed, img, 0, 0); - - img = loadImage("rhbg.png"); -@@ -397,7 +397,7 @@ - gtk_box_pack_start((GtkBox *)topvbox, createTopBox(), FALSE, FALSE, 0); - - -- img = gtk_image_new_from_file("/usr/local/share/touchmegames/compile4/images/topbar.gif"); -+ img = gtk_image_new_from_file("/usr/share/touchmegames/compile4/images/topbar.gif"); - - gtk_box_pack_start((GtkBox *)topvbox, img, FALSE, FALSE, 5); - -@@ -407,7 +407,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(userExit), (gpointer)this); -diff -Naur touchmegames/src/consume21/events.cpp touchmegames-p/src/consume21/events.cpp ---- touchmegames/src/consume21/events.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/consume21/events.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -233,7 +233,7 @@ - if (consume->gameState != RUNNING) { - return; - } -- gtk_image_set_from_file((GtkImage *)consume->spill, "/usr/local/share/touchmegames/consume21/images/spilldown.png"); -+ gtk_image_set_from_file((GtkImage *)consume->spill, "/usr/share/touchmegames/consume21/images/spilldown.png"); - } - - void Consume21::spillReleased(GtkWidget *widget, GdkEventKey *event, gpointer ptr) { -@@ -258,7 +258,7 @@ - if (consume->gameState != RUNNING) { - return; - } -- gtk_image_set_from_file((GtkImage *)consume->collect, "/usr/local/share/touchmegames/consume21/images/collectdown.png"); -+ gtk_image_set_from_file((GtkImage *)consume->collect, "/usr/share/touchmegames/consume21/images/collectdown.png"); - } - - void Consume21::collectReleased(GtkWidget *widget, GdkEventKey *event, gpointer ptr) { -@@ -271,7 +271,7 @@ - } - g_source_remove(consume->timer); - consume->timer = gtk_timeout_add(30, consume->timeout, ptr); -- gtk_image_set_from_file((GtkImage *)consume->collect, "/usr/local/share/touchmegames/consume21/images/collectup.png"); -+ gtk_image_set_from_file((GtkImage *)consume->collect, "/usr/share/touchmegames/consume21/images/collectup.png"); - - consume->gameState = TAKE_SCORE; - } -diff -Naur touchmegames/src/consume21/interface.cpp touchmegames-p/src/consume21/interface.cpp ---- touchmegames/src/consume21/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/consume21/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -81,7 +81,7 @@ - gtk_widget_modify_fg(columnsTotal, (GtkStateType)0, &color); - gtk_container_add((GtkContainer *)eventBox, columnsTotal); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/toprightbox.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/toprightbox.png"); - gtk_fixed_put((GtkFixed *)fixed, image, 640, 20); - gtk_fixed_put((GtkFixed *)fixed, createRightTop(), 640, 20); - -@@ -92,7 +92,7 @@ - gtk_fixed_put((GtkFixed *)fixed, eventBox, 150, 130); - - -- spill = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/spillup.png"); -+ spill = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/spillup.png"); - gtk_container_add((GtkContainer *)eventBox, spill); - - g_signal_connect(G_OBJECT(eventBox), "button-press-event", -@@ -108,7 +108,7 @@ - gtk_fixed_put((GtkFixed *)fixed, eventBox, 640, 500); - - -- collect = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/collectup.png"); -+ collect = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/collectup.png"); - gtk_container_add((GtkContainer *)eventBox, collect); - - g_signal_connect(G_OBJECT(eventBox), "button-press-event", -@@ -122,7 +122,7 @@ - progress.init(); - progress.width(320); - progress.height(35); -- progress.image("/usr/local/share/touchmegames/consume21/images/progress.gif"); -+ progress.image("/usr/share/touchmegames/consume21/images/progress.gif"); - gtk_fixed_put((GtkFixed *)fixed, progress.widget(), 270, 110); - - -@@ -131,7 +131,7 @@ - - // exit button - eventBox = gtk_event_box_new(); -- button = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); -+ button = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); - gtk_container_add((GtkContainer *)eventBox, button); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); -@@ -143,7 +143,7 @@ - - - // round image -- roundImage = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/round1.png"); -+ roundImage = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/round1.png"); - gtk_fixed_put((GtkFixed *)fixed, roundImage, 520, 20); - - -@@ -237,7 +237,7 @@ - bgcolor.green = 0x2E00; - bgcolor.blue = 0xF000; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/consume21/images/lowrightbg.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/consume21/images/lowrightbg.png"); - gtk_fixed_put((GtkFixed *)fixed, image, 640, 250); - - vbox = gtk_vbox_new(FALSE, 0); -@@ -289,7 +289,7 @@ - - gtk_fixed_put((GtkFixed *)fixed, eventBox, 25, 25); - -- sstr << "/usr/local/share/touchmegames/consume21/images/" << mug << ".png"; -+ sstr << "/usr/share/touchmegames/consume21/images/" << mug << ".png"; - image = gtk_image_new_from_file(sstr.str().c_str()); - gtk_container_add((GtkContainer *)eventBox, image); - -diff -Naur touchmegames/src/consume21/support.cpp touchmegames-p/src/consume21/support.cpp ---- touchmegames/src/consume21/support.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/consume21/support.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -71,10 +71,10 @@ - progress.percent(100); - setTotalWin(0); - -- gtk_image_set_from_file((GtkImage *)spill, "/usr/local/share/touchmegames/consume21/images/spillup.png"); -+ gtk_image_set_from_file((GtkImage *)spill, "/usr/share/touchmegames/consume21/images/spillup.png"); - gtk_widget_show(spill); - -- sstr << "/usr/local/share/touchmegames/consume21/images/round" << ++round << ".png"; -+ sstr << "/usr/share/touchmegames/consume21/images/round" << ++round << ".png"; - gtk_image_set_from_file((GtkImage *)roundImage, sstr.str().c_str()); - - roundScore = 0; -diff -Naur touchmegames/src/dart01/dart01.h touchmegames-p/src/dart01/dart01.h ---- touchmegames/src/dart01/dart01.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dart01/dart01.h 2007-12-11 04:10:12.000000000 +0100 -@@ -31,7 +31,7 @@ - #include - #include - --#define dart01Path "/usr/local/share/touchmegames/dart01/" -+#define dart01Path "/usr/share/touchmegames/dart01/" - - class DART_01 : public GAME_PTR { - private: -diff -Naur touchmegames/src/dart01/interface.cpp touchmegames-p/src/dart01/interface.cpp ---- touchmegames/src/dart01/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dart01/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -394,7 +394,7 @@ - gtk_box_pack_start((GtkBox *)midvbox, hbox, FALSE, FALSE, 0); - - for (int i = 0; i < 3; ++i) { -- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); -+ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); - gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); - dartLabels[i] = gtk_label_new(""); - rcstyle = gtk_rc_style_new(); -@@ -417,7 +417,7 @@ - g_signal_connect(G_OBJECT(eventBox), - "button-press-event", - G_CALLBACK(showMenu), (gpointer)this); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/menu.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/menu.gif"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_box_pack_start((GtkBox *)hbox, eventBox, FALSE, FALSE, 0); - -@@ -447,7 +447,7 @@ - gtk_widget_set_size_request(ppdWindow, 300, 150); - rcstyle = gtk_rc_style_new(); - -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; - gtk_widget_modify_style(ppdWindow, rcstyle); - - gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); -@@ -763,7 +763,7 @@ - ++lh; - } - eventBox = gtk_event_box_new(); -- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); -+ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), -@@ -779,7 +779,7 @@ - void DART_01::createLowTon() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/lowton.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/lowton.gif"); - - lowTon = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)lowTon, FALSE); -@@ -792,7 +792,7 @@ - void DART_01::createHighTon() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/highton.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/highton.gif"); - - highTon = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)highTon, FALSE); -@@ -805,7 +805,7 @@ - void DART_01::createTon80() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/ton80.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/ton80.gif"); - - ton80 = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)ton80, FALSE); -@@ -845,11 +845,11 @@ - - menuUp = gtk_rc_style_new(); - menuUp->color_flags[0] = GTK_RC_BG; -- menuUp->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menuup.xpm"; -+ menuUp->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menuup.xpm"; - - menuDown = gtk_rc_style_new(); - menuDown->color_flags[0] = GTK_RC_BG; -- menuDown->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menudown.xpm"; -+ menuDown->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menudown.xpm"; - - eventBox = gtk_event_box_new(); - gtk_widget_modify_style(eventBox, menuUp); -@@ -949,12 +949,12 @@ - - // create the background images - for (int i = 0; i < 8; ++i) { -- userScores[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); -+ userScores[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, userScores[i], (i & 1 ? 600 : 0), 60 + ((i / 2) * 130)); - } -- smallScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); -+ smallScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, smallScore, 300, 290); -- largeScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"); -+ largeScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/largescorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, largeScore, 250, 75); - - gtk_box_pack_start((GtkBox *)tophbox, createOpenScreen(), TRUE, FALSE, 5); -diff -Naur touchmegames/src/dartcountdown/dartcountdown.h touchmegames-p/src/dartcountdown/dartcountdown.h ---- touchmegames/src/dartcountdown/dartcountdown.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartcountdown/dartcountdown.h 2007-12-11 04:10:12.000000000 +0100 -@@ -32,7 +32,7 @@ - #include - #include - --#define dartcountdownPath "/usr/local/share/touchmegames/dartcountdown/" -+#define dartcountdownPath "/usr/share/touchmegames/dartcountdown/" - - class DartCountDown : public GAME_PTR { - private: -diff -Naur touchmegames/src/dartcountdown/interface.cpp touchmegames-p/src/dartcountdown/interface.cpp ---- touchmegames/src/dartcountdown/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartcountdown/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -356,7 +356,7 @@ - - for (int i = 0; i < 3; ++i) { - -- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); -+ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); - gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); - dartLabels[i] = gtk_label_new(""); - rcstyle = gtk_rc_style_new(); -@@ -403,7 +403,7 @@ - gtk_widget_set_size_request(ppdWindow, 300, 150); - rcstyle = gtk_rc_style_new(); - -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; - gtk_widget_modify_style(ppdWindow, rcstyle); - - gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); -@@ -747,7 +747,7 @@ - - - eventBox = gtk_event_box_new(); -- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); -+ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), -@@ -763,7 +763,7 @@ - void DartCountDown::createLowTon() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/lowton.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/lowton.gif"); - - lowTon = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)lowTon, FALSE); -@@ -776,7 +776,7 @@ - void DartCountDown::createHighTon() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/highton.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/highton.gif"); - - highTon = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)highTon, FALSE); -@@ -789,7 +789,7 @@ - void DartCountDown::createTon80() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/ton80.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/ton80.gif"); - - ton80 = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)ton80, FALSE); -@@ -829,12 +829,12 @@ - - // create the background images - for (int i = 0; i < 8; ++i) { -- userScores[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); -+ userScores[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, userScores[i], (i & 1 ? 600 : 0), 60 + ((i & 1 ? i / 2: i) * 130)); - } -- smallScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); -+ smallScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, smallScore, 300, 290); -- largeScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"); -+ largeScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/largescorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, largeScore, 250, 75); - - gtk_box_pack_start((GtkBox *)tophbox, createOpenScreen(), TRUE, FALSE, 5); -diff -Naur touchmegames/src/dartCountUp/dartCountUp.h touchmegames-p/src/dartCountUp/dartCountUp.h ---- touchmegames/src/dartCountUp/dartCountUp.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartCountUp/dartCountUp.h 2007-12-11 04:10:12.000000000 +0100 -@@ -31,7 +31,7 @@ - #include - #include - --#define dart01Path "/usr/local/share/touchmegames/dart01/" -+#define dart01Path "/usr/share/touchmegames/dart01/" - - class DART_COUNTUP : public GAME_PTR { - private: -diff -Naur touchmegames/src/dartCountUp/interface.cpp touchmegames-p/src/dartCountUp/interface.cpp ---- touchmegames/src/dartCountUp/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartCountUp/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -193,7 +193,7 @@ - - rcstyle->bg[0] = color; - rcstyle->color_flags[0] = GTK_RC_BG; -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/smallscorebg.xpm"; - gtk_widget_modify_style(eventBox, rcstyle); - pango_font_description_free(rcstyle->font_desc); - -@@ -258,7 +258,7 @@ - color.blue = 0xB400; - rcstyle->bg[0] = color; - rcstyle->color_flags[0] = GTK_RC_BG; -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/largescorebg.xpm"; - gtk_widget_modify_style(eventBox, rcstyle); - pango_font_description_free(rcstyle->font_desc); - -@@ -314,7 +314,7 @@ - color.blue = 0xB400; - rcstyle->bg[0] = color; - rcstyle->color_flags[0] = GTK_RC_BG; -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/smallscorebg.xpm"; - gtk_widget_modify_style(eventBox, rcstyle); - - pango_font_description_free(rcstyle->font_desc); -@@ -363,7 +363,7 @@ - - for (int i = 0; i < 3; ++i) { - -- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); -+ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); - gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); - dartLabels[i] = gtk_label_new(""); - rcstyle = gtk_rc_style_new(); -@@ -405,7 +405,7 @@ - gtk_widget_set_size_request(ppdWindow, 300, 150); - rcstyle = gtk_rc_style_new(); - -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; - gtk_widget_modify_style(ppdWindow, rcstyle); - - gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); -@@ -619,7 +619,7 @@ - ++lh; - } - eventBox = gtk_event_box_new(); -- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); -+ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), -diff -Naur touchmegames/src/dartcricket/dartcricket.h touchmegames-p/src/dartcricket/dartcricket.h ---- touchmegames/src/dartcricket/dartcricket.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartcricket/dartcricket.h 2007-12-11 04:10:12.000000000 +0100 -@@ -31,7 +31,7 @@ - #include - #include - --#define dartCricketPath "/usr/local/share/touchmegames/dart/" -+#define dartCricketPath "/usr/share/touchmegames/dart/" - - class DartCricket : public GAME_PTR { - private: -diff -Naur touchmegames/src/dartcricket/events.cpp touchmegames-p/src/dartcricket/events.cpp ---- touchmegames/src/dartcricket/events.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartcricket/events.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -477,7 +477,7 @@ - // Bull - if (dart->markImages[dart->currentPlayer][6] == NULL) { - dart->markImages[dart->currentPlayer][6] = -- gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket/images/cross.gif"); -+ gtk_image_new_from_file("/usr/share/touchmegames/dartcricket/images/cross.gif"); - gtk_fixed_put((GtkFixed *)dart->fixed, dart->markImages[dart->currentPlayer][6], - 200 + (dart->currentPlayer < 2 ? dart->currentPlayer: - dart->currentPlayer + 1) * 80 + 10, 4 + 118 + 68 * 6); -@@ -489,16 +489,16 @@ - - if (dart->closeMarks[dart->currentPlayer][6] == 1) { - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], -- "/usr/local/share/touchmegames/dartcricket/images/slash.gif"); -+ "/usr/share/touchmegames/dartcricket/images/slash.gif"); - } - else if (dart->closeMarks[dart->currentPlayer][6] == 2) { - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], -- "/usr/local/share/touchmegames/dartcricket/images/cross.gif"); -+ "/usr/share/touchmegames/dartcricket/images/cross.gif"); - } - else if (dart->closeMarks[dart->currentPlayer][6] >= 3) { - bool gotPoints(false); - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], -- "/usr/local/share/touchmegames/dartcricket/images/closed.gif"); -+ "/usr/share/touchmegames/dartcricket/images/closed.gif"); - - - for (int i = 0; i < dart->numberOfPlayers; ++i) { -@@ -549,7 +549,7 @@ - - if (dart->markImages[dart->currentPlayer][20 - x] == NULL) { - dart->markImages[dart->currentPlayer][20 - x] = -- gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket/images/cross.gif"); -+ gtk_image_new_from_file("/usr/share/touchmegames/dartcricket/images/cross.gif"); - gtk_fixed_put((GtkFixed *)dart->fixed, dart->markImages[dart->currentPlayer][20 - x], - 200 + (dart->currentPlayer < 2 ? dart->currentPlayer: - dart->currentPlayer + 1) * 80 + 10, 4 + 118 + 68 * (20 - x)); -@@ -560,16 +560,16 @@ - dart->closeMarks[dart->currentPlayer][20 - x] += a; - if (dart->closeMarks[dart->currentPlayer][20 - x] == 1) { - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], -- "/usr/local/share/touchmegames/dartcricket/images/slash.gif"); -+ "/usr/share/touchmegames/dartcricket/images/slash.gif"); - } - else if (dart->closeMarks[dart->currentPlayer][20 - x] == 2) { - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], -- "/usr/local/share/touchmegames/dartcricket/images/cross.gif"); -+ "/usr/share/touchmegames/dartcricket/images/cross.gif"); - } - else if (dart->closeMarks[dart->currentPlayer][20 - x] >= 3) { - bool gotPoints(false); - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], -- "/usr/local/share/touchmegames/dartcricket/images/closed.gif"); -+ "/usr/share/touchmegames/dartcricket/images/closed.gif"); - - for (int i = 0; i < dart->numberOfPlayers; ++i) { - if (dart->closeMarks[i][20 - x] < 3) { -diff -Naur touchmegames/src/dartcricket/interface.cpp touchmegames-p/src/dartcricket/interface.cpp ---- touchmegames/src/dartcricket/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartcricket/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -354,7 +354,7 @@ - gtk_box_pack_start((GtkBox *)rhvbox, hbox, FALSE, FALSE, 0); - - for (int i = 0; i < 3; ++i) { -- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); -+ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); - gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); - dartLabels[i] = gtk_label_new(""); - rcstyle = gtk_rc_style_new(); -@@ -378,7 +378,7 @@ - g_signal_connect(G_OBJECT(eventBox), - "button-press-event", - G_CALLBACK(showMenu), (gpointer)this); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/menu.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/menu.gif"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_box_pack_start((GtkBox *)rhvbox, eventBox, FALSE, FALSE, 0); - -@@ -409,7 +409,7 @@ - gtk_widget_set_size_request(ppdWindow, 300, 150); - rcstyle = gtk_rc_style_new(); - -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; - gtk_widget_modify_style(ppdWindow, rcstyle); - - gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); -@@ -735,7 +735,7 @@ - ++lh; - } - eventBox = gtk_event_box_new(); -- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); -+ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), -@@ -751,7 +751,7 @@ - void DartCricket::createLowTon() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/lowton.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/lowton.gif"); - - lowTon = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)lowTon, FALSE); -@@ -764,7 +764,7 @@ - void DartCricket::createHighTon() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/highton.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/highton.gif"); - - highTon = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)highTon, FALSE); -@@ -777,7 +777,7 @@ - void DartCricket::createTon80() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/ton80.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/ton80.gif"); - - ton80 = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)ton80, FALSE); -@@ -817,11 +817,11 @@ - - menuUp = gtk_rc_style_new(); - menuUp->color_flags[0] = GTK_RC_BG; -- menuUp->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menuup.xpm"; -+ menuUp->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menuup.xpm"; - - menuDown = gtk_rc_style_new(); - menuDown->color_flags[0] = GTK_RC_BG; -- menuDown->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menudown.xpm"; -+ menuDown->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menudown.xpm"; - - eventBox = gtk_event_box_new(); - gtk_widget_modify_style(eventBox, menuUp); -@@ -929,15 +929,15 @@ - - // create the background images - for (int i = 0; i < 8; ++i) { -- userScores[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); -+ userScores[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, userScores[i], (i & 1 ? 600 : 0), 60 + ((i / 2) * 130)); - } -- smallScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); -+ smallScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, smallScore, 300, 290); -- largeScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"); -+ largeScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/largescorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, largeScore, 250, 75); - -- centerBg = gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket/images/centerbg.gif"); -+ centerBg = gtk_image_new_from_file("/usr/share/touchmegames/dartcricket/images/centerbg.gif"); - gtk_fixed_put((GtkFixed *)fixed, centerBg, 200, 50); - gtk_box_pack_start((GtkBox *)tophbox, createOpenScreen(), TRUE, FALSE, 5); - -diff -Naur touchmegames/src/dartcricket10/dartcricket10.h touchmegames-p/src/dartcricket10/dartcricket10.h ---- touchmegames/src/dartcricket10/dartcricket10.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartcricket10/dartcricket10.h 2007-12-11 04:10:12.000000000 +0100 -@@ -31,7 +31,7 @@ - #include - #include - --#define dartCricketPath "/usr/local/share/touchmegames/dart/" -+#define dartCricketPath "/usr/share/touchmegames/dart/" - - class DartCricket10 : public GAME_PTR { - private: -diff -Naur touchmegames/src/dartcricket10/events.cpp touchmegames-p/src/dartcricket10/events.cpp ---- touchmegames/src/dartcricket10/events.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartcricket10/events.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -476,7 +476,7 @@ - // Bull - if (dart->markImages[dart->currentPlayer][6] == NULL) { - dart->markImages[dart->currentPlayer][6] = -- gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket10/images/cross.gif"); -+ gtk_image_new_from_file("/usr/share/touchmegames/dartcricket10/images/cross.gif"); - gtk_fixed_put((GtkFixed *)dart->fixed, dart->markImages[dart->currentPlayer][6], - 200 + (dart->currentPlayer < 2 ? dart->currentPlayer: - dart->currentPlayer + 1) * 80 + 10, 4 + 118 + 68 * 6); -@@ -488,16 +488,16 @@ - - if (dart->closeMarks[dart->currentPlayer][6] == 1) { - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], -- "/usr/local/share/touchmegames/dartcricket10/images/slash.gif"); -+ "/usr/share/touchmegames/dartcricket10/images/slash.gif"); - } - else if (dart->closeMarks[dart->currentPlayer][6] == 2) { - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], -- "/usr/local/share/touchmegames/dartcricket10/images/cross.gif"); -+ "/usr/share/touchmegames/dartcricket10/images/cross.gif"); - } - else if (dart->closeMarks[dart->currentPlayer][6] >= 3) { - bool gotPoints(false); - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][6], -- "/usr/local/share/touchmegames/dartcricket10/images/closed.gif"); -+ "/usr/share/touchmegames/dartcricket10/images/closed.gif"); - - - for (int i = 0; i < dart->numberOfPlayers; ++i) { -@@ -548,7 +548,7 @@ - - if (dart->markImages[dart->currentPlayer][20 - x] == NULL) { - dart->markImages[dart->currentPlayer][20 - x] = -- gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket10/images/cross.gif"); -+ gtk_image_new_from_file("/usr/share/touchmegames/dartcricket10/images/cross.gif"); - gtk_fixed_put((GtkFixed *)dart->fixed, dart->markImages[dart->currentPlayer][20 - x], - 200 + (dart->currentPlayer < 2 ? dart->currentPlayer: - dart->currentPlayer + 1) * 80 + 10, 4 + 118 + 68 * (20 - x)); -@@ -559,16 +559,16 @@ - dart->closeMarks[dart->currentPlayer][20 - x] += a; - if (dart->closeMarks[dart->currentPlayer][20 - x] == 1) { - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], -- "/usr/local/share/touchmegames/dartcricket10/images/slash.gif"); -+ "/usr/share/touchmegames/dartcricket10/images/slash.gif"); - } - else if (dart->closeMarks[dart->currentPlayer][20 - x] == 2) { - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], -- "/usr/local/share/touchmegames/dartcricket10/images/cross.gif"); -+ "/usr/share/touchmegames/dartcricket10/images/cross.gif"); - } - else if (dart->closeMarks[dart->currentPlayer][20 - x] >= 3) { - bool gotPoints(false); - gtk_image_set_from_file((GtkImage *)dart->markImages[dart->currentPlayer][20 - x], -- "/usr/local/share/touchmegames/dartcricket10/images/closed.gif"); -+ "/usr/share/touchmegames/dartcricket10/images/closed.gif"); - - for (int i = 0; i < dart->numberOfPlayers; ++i) { - if (dart->closeMarks[i][20 - x] < 3) { -diff -Naur touchmegames/src/dartcricket10/interface.cpp touchmegames-p/src/dartcricket10/interface.cpp ---- touchmegames/src/dartcricket10/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartcricket10/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -346,7 +346,7 @@ - gtk_box_pack_start((GtkBox *)rhvbox, hbox, FALSE, FALSE, 0); - - for (int i = 0; i < 3; ++i) { -- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); -+ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); - gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); - dartLabels[i] = gtk_label_new(""); - rcstyle = gtk_rc_style_new(); -@@ -368,7 +368,7 @@ - g_signal_connect(G_OBJECT(eventBox), - "button-press-event", - G_CALLBACK(showMenu), (gpointer)this); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/menu.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/menu.gif"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_box_pack_start((GtkBox *)rhvbox, eventBox, FALSE, FALSE, 0); - -@@ -399,7 +399,7 @@ - gtk_widget_set_size_request(ppdWindow, 300, 150); - rcstyle = gtk_rc_style_new(); - -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; - gtk_widget_modify_style(ppdWindow, rcstyle); - - gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); -@@ -726,7 +726,7 @@ - ++lh; - } - eventBox = gtk_event_box_new(); -- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); -+ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), -@@ -742,7 +742,7 @@ - void DartCricket10::createLowTon() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/lowton.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/lowton.gif"); - - lowTon = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)lowTon, FALSE); -@@ -755,7 +755,7 @@ - void DartCricket10::createHighTon() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/highton.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/highton.gif"); - - highTon = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)highTon, FALSE); -@@ -768,7 +768,7 @@ - void DartCricket10::createTon80() { - GtkWidget *image; - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/ton80.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/ton80.gif"); - - ton80 = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)ton80, FALSE); -@@ -808,11 +808,11 @@ - - menuUp = gtk_rc_style_new(); - menuUp->color_flags[0] = GTK_RC_BG; -- menuUp->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menuup.xpm"; -+ menuUp->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menuup.xpm"; - - menuDown = gtk_rc_style_new(); - menuDown->color_flags[0] = GTK_RC_BG; -- menuDown->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/menudown.xpm"; -+ menuDown->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/menudown.xpm"; - - eventBox = gtk_event_box_new(); - gtk_widget_modify_style(eventBox, menuUp); -@@ -920,15 +920,15 @@ - - // create the background images - for (int i = 0; i < 8; ++i) { -- userScores[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); -+ userScores[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, userScores[i], (i & 1 ? 600 : 0), 60 + ((i / 2) * 130)); - } -- smallScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"); -+ smallScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/smallscorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, smallScore, 300, 290); -- largeScore = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"); -+ largeScore = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/largescorebg.xpm"); - gtk_fixed_put((GtkFixed *)fixed, largeScore, 250, 75); - -- centerBg = gtk_image_new_from_file("/usr/local/share/touchmegames/dartcricket10/images/centerbg.gif"); -+ centerBg = gtk_image_new_from_file("/usr/share/touchmegames/dartcricket10/images/centerbg.gif"); - gtk_fixed_put((GtkFixed *)fixed, centerBg, 200, 50); - gtk_box_pack_start((GtkBox *)tophbox, createOpenScreen(), TRUE, FALSE, 5); - -diff -Naur touchmegames/src/dartlowball/dartlowball.h touchmegames-p/src/dartlowball/dartlowball.h ---- touchmegames/src/dartlowball/dartlowball.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartlowball/dartlowball.h 2007-12-11 04:10:12.000000000 +0100 -@@ -31,7 +31,7 @@ - #include - #include - --#define dart01Path "/usr/local/share/touchmegames/dart01/" -+#define dart01Path "/usr/share/touchmegames/dart01/" - - class DART_LOWBALL : public GAME_PTR { - private: -diff -Naur touchmegames/src/dartlowball/interface.cpp touchmegames-p/src/dartlowball/interface.cpp ---- touchmegames/src/dartlowball/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/dartlowball/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -192,7 +192,7 @@ - - rcstyle->bg[0] = color; - rcstyle->color_flags[0] = GTK_RC_BG; -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/smallscorebg.xpm"; - gtk_widget_modify_style(eventBox, rcstyle); - - pango_font_description_free(rcstyle->font_desc); -@@ -261,7 +261,7 @@ - color.blue = 0xB400; - rcstyle->bg[0] = color; - rcstyle->color_flags[0] = GTK_RC_BG; -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/largescorebg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/largescorebg.xpm"; - gtk_widget_modify_style(eventBox, rcstyle); - - pango_font_description_free(rcstyle->font_desc); -@@ -319,7 +319,7 @@ - color.blue = 0xB400; - rcstyle->bg[0] = color; - rcstyle->color_flags[0] = GTK_RC_BG; -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/smallscorebg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/smallscorebg.xpm"; - gtk_widget_modify_style(eventBox, rcstyle); - - currentScoreLabel = gtk_label_new("0"); -@@ -367,7 +367,7 @@ - - for (int i = 0; i < 3; ++i) { - -- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); -+ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); - gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); - dartLabels[i] = gtk_label_new(""); - rcstyle = gtk_rc_style_new(); -@@ -409,7 +409,7 @@ - gtk_widget_set_size_request(ppdWindow, 300, 150); - rcstyle = gtk_rc_style_new(); - -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; - gtk_widget_modify_style(ppdWindow, rcstyle); - - gtk_widget_modify_bg(ppdWindow, GTK_STATE_NORMAL, &color); -@@ -623,7 +623,7 @@ - ++lh; - } - eventBox = gtk_event_box_new(); -- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); -+ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), -diff -Naur touchmegames/src/darttictactoe/darttictactoe.h touchmegames-p/src/darttictactoe/darttictactoe.h ---- touchmegames/src/darttictactoe/darttictactoe.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/darttictactoe/darttictactoe.h 2007-12-11 04:10:12.000000000 +0100 -@@ -31,7 +31,7 @@ - #include - #include - --#define dart01Path "/usr/local/share/touchmegames/dart01/" -+#define dart01Path "/usr/share/touchmegames/dart01/" - - class DartTicTacToe : public GAME_PTR { - private: -diff -Naur touchmegames/src/darttictactoe/interface.cpp touchmegames-p/src/darttictactoe/interface.cpp ---- touchmegames/src/darttictactoe/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/darttictactoe/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -43,7 +43,7 @@ - - scoreBg->bg[0] = color; - scoreBg->color_flags[0] = GTK_RC_BG; -- scoreBg->bg_pixmap_name[0] = "/usr/local/share/touchmegames/darttictactoe/images/smallscorebg.xpm"; -+ scoreBg->bg_pixmap_name[0] = "/usr/share/touchmegames/darttictactoe/images/smallscorebg.xpm"; - - selectScoreBg = gtk_rc_style_new(); - std::cout << "Score bg " << selectScoreBg << std::endl; -@@ -53,7 +53,7 @@ - - selectScoreBg->bg[0] = color; - selectScoreBg->color_flags[0] = GTK_RC_BG; -- selectScoreBg->bg_pixmap_name[0] = "/usr/local/share/touchmegames/darttictactoe/images/selectSmallscorebg.xpm"; -+ selectScoreBg->bg_pixmap_name[0] = "/usr/share/touchmegames/darttictactoe/images/selectSmallscorebg.xpm"; - - - timeval tv; -@@ -176,7 +176,7 @@ - color.blue = 0xB400; - rcstyle->bg[0] = color; - rcstyle->color_flags[0] = GTK_RC_BG; -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/darttictactoe/images/tttbg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/darttictactoe/images/tttbg.xpm"; - gtk_widget_modify_style(eventBox, rcstyle); - - ttttable = gtk_table_new(3, 3, TRUE); -@@ -283,7 +283,7 @@ - - for (int i = 0; i < 3; ++i) { - -- dartImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/dart.gif"); -+ dartImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/dart.gif"); - gtk_box_pack_start((GtkBox *)vbox, dartImages[i], FALSE, FALSE, 2); - dartLabels[i] = gtk_label_new(""); - rcstyle = gtk_rc_style_new(); -@@ -326,7 +326,7 @@ - gtk_widget_set_size_request(mprWindow, 300, 150); - rcstyle = gtk_rc_style_new(); - -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/dart01/images/ppdbg.xpm"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/dart01/images/ppdbg.xpm"; - gtk_widget_modify_style(mprWindow, rcstyle); - - gtk_widget_modify_bg(mprWindow, GTK_STATE_NORMAL, &color); -@@ -523,7 +523,7 @@ - ++lh; - } - eventBox = gtk_event_box_new(); -- button = gtk_image_new_from_file("/usr/local/share/touchmegames/dart01/images/exitgame.gif"); -+ button = gtk_image_new_from_file("/usr/share/touchmegames/dart01/images/exitgame.gif"); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), -diff -Naur touchmegames/src/events.cpp touchmegames-p/src/events.cpp ---- touchmegames/src/events.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/events.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -153,7 +153,7 @@ - TOUCHME_GAMES *sg(reinterpret_cast(ptr)); - - gtk_widget_show(sg->bgImage); -- gtk_image_set_from_file((GtkImage *)sg->bgImage, "/usr/local/share/touchmegames/images/mainmenu/bg_main.png"); -+ gtk_image_set_from_file((GtkImage *)sg->bgImage, "/usr/share/touchmegames/images/mainmenu/bg_main.png"); - - if (sg->gameTable != NULL) { - gtk_widget_destroy(sg->gameTable); -diff -Naur touchmegames/src/flogthedolphin/flogthedolphin.h touchmegames-p/src/flogthedolphin/flogthedolphin.h ---- touchmegames/src/flogthedolphin/flogthedolphin.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/flogthedolphin/flogthedolphin.h 2007-12-11 04:10:12.000000000 +0100 -@@ -25,7 +25,7 @@ - #include - #include - --#define ftdDeckLocation "/usr/local/share/touchmegames/flogthedolphin/images/" -+#define ftdDeckLocation "/usr/share/touchmegames/flogthedolphin/images/" - - class FLOG_THE_DOLPHIN : public GAME_PTR { - private: -diff -Naur touchmegames/src/flogthedolphin/interface.cpp touchmegames-p/src/flogthedolphin/interface.cpp ---- touchmegames/src/flogthedolphin/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/flogthedolphin/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -215,7 +215,7 @@ - - eb = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eb, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); - gtk_widget_add_events(eb, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eb), "button-press-event", - G_CALLBACK(userExit), (gpointer)this); -diff -Naur touchmegames/src/foxyboxy/events.cpp touchmegames-p/src/foxyboxy/events.cpp ---- touchmegames/src/foxyboxy/events.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/foxyboxy/events.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -125,7 +125,7 @@ - - fb->gameState = PAUSED; - gtk_image_set_from_file((GtkImage *)fb->pauseButton, -- "/usr/local/share/touchmegames/images/buttons/button_play.png"); -+ "/usr/share/touchmegames/images/buttons/button_play.png"); - } - else if (fb->gameState == PAUSED) { - for (int i = 0; i < 10; ++i) { -@@ -141,7 +141,7 @@ - - fb->gameState = RUNNING; - gtk_image_set_from_file((GtkImage *)fb->pauseButton, -- "/usr/local/share/touchmegames/images/buttons/button_pause.png"); -+ "/usr/share/touchmegames/images/buttons/button_pause.png"); - } - } - -@@ -165,7 +165,7 @@ - gboolean FoxyBoxy::paddleReleased(GtkWidget *widget, GdkEventButton *event, gpointer ptr) { - FoxyBoxy *fb(reinterpret_cast(ptr)); - fb->alreadyPressed = false; -- gtk_image_set_from_file((GtkImage *)fb->paddleImage, "/usr/local/share/touchmegames/foxyboxy/images/paddle.png"); -+ gtk_image_set_from_file((GtkImage *)fb->paddleImage, "/usr/share/touchmegames/foxyboxy/images/paddle.png"); - if (fb->spedUpTimer) { - fb->spedUpTimer = false; - if (fb->gameState == RUNNING) { -@@ -188,22 +188,22 @@ - if (event->keyval == GDK_Left) { - fb->moveLeft(false); - gtk_image_set_from_file((GtkImage *)fb->paddleImage, -- "/usr/local/share/touchmegames/foxyboxy/images/paddleleft.png"); -+ "/usr/share/touchmegames/foxyboxy/images/paddleleft.png"); - } - else if (event->keyval == GDK_Right) { - fb->moveRight(false); - gtk_image_set_from_file((GtkImage *)fb->paddleImage, -- "/usr/local/share/touchmegames/foxyboxy/images/paddleright.png"); -+ "/usr/share/touchmegames/foxyboxy/images/paddleright.png"); - } - else if (event->keyval == GDK_Up) { - fb->rotateRight(); - gtk_image_set_from_file((GtkImage *)fb->paddleImage, -- "/usr/local/share/touchmegames/foxyboxy/images/paddlerotate.png"); -+ "/usr/share/touchmegames/foxyboxy/images/paddlerotate.png"); - } - else if (event->keyval == GDK_Down) { - fb->moveDown(); - gtk_image_set_from_file((GtkImage *)fb->paddleImage, -- "/usr/local/share/touchmegames/foxyboxy/images/paddledown.png"); -+ "/usr/share/touchmegames/foxyboxy/images/paddledown.png"); - - } - return TRUE; -diff -Naur touchmegames/src/foxyboxy/interface.cpp touchmegames-p/src/foxyboxy/interface.cpp ---- touchmegames/src/foxyboxy/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/foxyboxy/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -29,7 +29,7 @@ - std::stringstream sstr; - if (type != 0) { - -- sstr << "/usr/local/share/touchmegames/foxyboxy/images/type" -+ sstr << "/usr/share/touchmegames/foxyboxy/images/type" - << type << ".png"; - - gtk_image_set_from_file((GtkImage *)blocks[i][line], sstr.str().c_str()); -@@ -37,7 +37,7 @@ - } - else { - gtk_image_set_from_file((GtkImage *)blocks[i][line], -- "/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ "/usr/share/touchmegames/foxyboxy/images/blank.gif"); - gtk_object_set_user_data((GtkObject *)blocks[i][line], (void *)0); - } - } -@@ -52,7 +52,7 @@ - ++line; - } - for (int i = 0; i < 10; ++i) { -- gtk_image_set_from_file((GtkImage *)blocks[i][0], "/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ gtk_image_set_from_file((GtkImage *)blocks[i][0], "/usr/share/touchmegames/foxyboxy/images/blank.gif"); - gtk_object_set_user_data((GtkObject *)blocks[i][0], (void *)0); - } - } -@@ -204,7 +204,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); -- pauseButton = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_pause.png"); -+ pauseButton = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_pause.png"); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(pauseGame), (gpointer)this); -@@ -291,7 +291,7 @@ - G_CALLBACK(paddlePressed), (gpointer)this); - g_signal_connect(G_OBJECT(eventBox), "button-release-event", - G_CALLBACK(paddleReleased), (gpointer)this); -- paddleImage = gtk_image_new_from_file("/usr/local/share/touchmegames/foxyboxy/images/paddle.png"); -+ paddleImage = gtk_image_new_from_file("/usr/share/touchmegames/foxyboxy/images/paddle.png"); - gtk_container_add((GtkContainer *)eventBox, paddleImage); - - -@@ -300,7 +300,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - gtk_widget_add_events(eventBox, GDK_BUTTON_RELEASE_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", -@@ -326,7 +326,7 @@ - - void FoxyBoxy::createAndShowBlocks() { - int type(nextBlockType); -- std::string imgstr("/usr/local/share/touchmegames/foxyboxy/images/type"); -+ std::string imgstr("/usr/share/touchmegames/foxyboxy/images/type"); - currentBox = (BoxTypes)type; - switch(type) { - case Type1: -@@ -416,25 +416,25 @@ - void FoxyBoxy::initBoxes() { - for (int x = 0; x < 10; ++x) { - for (int y = 0; y < 22; ++y) { -- blocks[x][y] = gtk_image_new_from_file("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ blocks[x][y] = gtk_image_new_from_file("/usr/share/touchmegames/foxyboxy/images/blank.gif"); - gtk_object_set_user_data((GtkObject *)blocks[x][y], NULL); - } - } - for (int x = 0; x < 5; ++x) { - for (int y = 0; y < 6; ++y) { -- nextBlocks[x][y] = gtk_image_new_from_file("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ nextBlocks[x][y] = gtk_image_new_from_file("/usr/share/touchmegames/foxyboxy/images/blank.gif"); - } - } - } - - void FoxyBoxy::showNextBlock() { - std::stringstream sstr; -- sstr << "/usr/local/share/touchmegames/foxyboxy/images/type" << nextBlockType << ".png"; -+ sstr << "/usr/share/touchmegames/foxyboxy/images/type" << nextBlockType << ".png"; - // clear the boxen - for (int x = 1; x < 4; ++x) { - for (int y = 1; y < 5; ++y) { - gtk_image_set_from_file((GtkImage *)nextBlocks[x][y], -- "/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ "/usr/share/touchmegames/foxyboxy/images/blank.gif"); - } - } - switch (nextBlockType) { -diff -Naur touchmegames/src/foxyboxy/support.cpp touchmegames-p/src/foxyboxy/support.cpp ---- touchmegames/src/foxyboxy/support.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/foxyboxy/support.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -120,11 +120,11 @@ - } - if (coordsOk(newCoords) > 0) { - std::stringstream imgStr; -- imgStr << "/usr/local/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; -+ imgStr << "/usr/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; - - - // first clear the old location -- showBlocks("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ showBlocks("/usr/share/touchmegames/foxyboxy/images/blank.gif"); - - // next, copy the new coords into coords - memcpy(coords, newCoords, sizeof(newCoords)); -@@ -199,22 +199,22 @@ - if (isLeft(x, y)) { - moveLeft(false); - gtk_image_set_from_file((GtkImage *)paddleImage, -- "/usr/local/share/touchmegames/foxyboxy/images/paddleleft.png"); -+ "/usr/share/touchmegames/foxyboxy/images/paddleleft.png"); - } - else if (isRight(x, y)) { - moveRight(false); - gtk_image_set_from_file((GtkImage *)paddleImage, -- "/usr/local/share/touchmegames/foxyboxy/images/paddleright.png"); -+ "/usr/share/touchmegames/foxyboxy/images/paddleright.png"); - } - else if (isRotate(x, y)) { - rotateRight(); - gtk_image_set_from_file((GtkImage *)paddleImage, -- "/usr/local/share/touchmegames/foxyboxy/images/paddlerotate.png"); -+ "/usr/share/touchmegames/foxyboxy/images/paddlerotate.png"); - } - else if (isDown(x, y)) { - moveDown(); - gtk_image_set_from_file((GtkImage *)paddleImage, -- "/usr/local/share/touchmegames/foxyboxy/images/paddledown.png"); -+ "/usr/share/touchmegames/foxyboxy/images/paddledown.png"); - } - } - -@@ -227,11 +227,11 @@ - } - if (coordsOk(newCoords) > 0) { - std::stringstream imgStr; -- imgStr << "/usr/local/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; -+ imgStr << "/usr/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; - - - // first clear the old location -- showBlocks("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ showBlocks("/usr/share/touchmegames/foxyboxy/images/blank.gif"); - - // next, copy the new coords into coords - memcpy(coords, newCoords, sizeof(newCoords)); -@@ -256,11 +256,11 @@ - } - if (coordsOk(newCoords) > 0) { - std::stringstream imgStr; -- imgStr << "/usr/local/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; -+ imgStr << "/usr/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; - - - // first clear the old location -- showBlocks("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ showBlocks("/usr/share/touchmegames/foxyboxy/images/blank.gif"); - - // next, copy the new coords into coords - memcpy(coords, newCoords, sizeof(newCoords)); -@@ -452,11 +452,11 @@ - } - if (coordsOk(newCoords) > 0) { - std::stringstream imgStr; -- imgStr << "/usr/local/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; -+ imgStr << "/usr/share/touchmegames/foxyboxy/images/type" << currentBox << ".png"; - - - // first clear the old location -- showBlocks("/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ showBlocks("/usr/share/touchmegames/foxyboxy/images/blank.gif"); - - // next, copy the new coords into coords - memcpy(coords, newCoords, sizeof(newCoords)); -@@ -497,7 +497,7 @@ - while (linesToFlash[line] != -1 && line < 4) { - for (int i = 0; i < 10; ++i) { - gtk_image_set_from_file((GtkImage *)blocks[i][linesToFlash[line]], -- "/usr/local/share/touchmegames/foxyboxy/images/blank.gif"); -+ "/usr/share/touchmegames/foxyboxy/images/blank.gif"); - } - ++line; - } -@@ -509,7 +509,7 @@ - for (int i = 0; i < 10; ++i) { - int type((int)gtk_object_get_user_data((GtkObject *)blocks[i][linesToFlash[line]])); - std::stringstream sstr; -- sstr << "/usr/local/share/touchmegames/foxyboxy/images/type" << type << ".png"; -+ sstr << "/usr/share/touchmegames/foxyboxy/images/type" << type << ".png"; - gtk_image_set_from_file((GtkImage *)blocks[i][linesToFlash[line]], - sstr.str().c_str()); - } -diff -Naur touchmegames/src/gorillathrilla/gorillathrilla.h touchmegames-p/src/gorillathrilla/gorillathrilla.h ---- touchmegames/src/gorillathrilla/gorillathrilla.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/gorillathrilla/gorillathrilla.h 2007-12-11 04:10:12.000000000 +0100 -@@ -25,7 +25,7 @@ - #include - #include - --#define gtDeckLocation "/usr/local/share/touchmegames/gorillathrilla/images/" -+#define gtDeckLocation "/usr/share/touchmegames/gorillathrilla/images/" - - class GORILLA_THRILLA : public GAME_PTR { - private: -diff -Naur touchmegames/src/gorillathrilla/interface.cpp touchmegames-p/src/gorillathrilla/interface.cpp ---- touchmegames/src/gorillathrilla/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/gorillathrilla/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -109,7 +109,7 @@ - // left center - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(userExit), (gpointer)this); -@@ -125,7 +125,7 @@ - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - gtk_widget_add_events(eventBox, GDK_BUTTON1_MOTION_MASK); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_take_score.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_take_score.png"); - gtk_container_add((GtkContainer *)eventBox, image); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(takeScore), (gpointer)this); -@@ -199,12 +199,12 @@ - - //gtk_box_pack_start((GtkBox *)hbox, rightFixed, FALSE, FALSE, 0); - -- dispSpot = gtk_image_new_from_file("/usr/local/share/touchmegames/gorillathrilla/images/up.png"); -+ dispSpot = gtk_image_new_from_file("/usr/share/touchmegames/gorillathrilla/images/up.png"); - gtk_fixed_put(GTK_FIXED(centerFixed), dispSpot, 243, 400); - - - -- diskImage = gtk_image_new_from_file("/usr/local/share/touchmegames/gorillathrilla/images/banana.png"); -+ diskImage = gtk_image_new_from_file("/usr/share/touchmegames/gorillathrilla/images/banana.png"); - - - gtk_fixed_put(GTK_FIXED(topFixed), diskImage, 700, 80); -@@ -273,7 +273,7 @@ - label = gtk_label_new(" "); - gtk_box_pack_start((GtkBox *)hbox, label, FALSE, FALSE, 0); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/gorillathrilla/images/barrel.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/gorillathrilla/images/barrel.gif"); - gtk_container_add((GtkContainer *)eventBox, image); - - g_signal_connect(G_OBJECT(eventBox), "button-press-event", -@@ -303,7 +303,7 @@ - //gtk_box_pack_start((GtkBox *)hbox, fixed, FALSE, FALSE, 0); - //gtk_widget_show(fixed); - -- dealSpot = gtk_image_new_from_file("/usr/local/share/touchmegames/gorillathrilla/images/left.png"); -+ dealSpot = gtk_image_new_from_file("/usr/share/touchmegames/gorillathrilla/images/left.png"); - // gtk_fixed_put(GTK_FIXED(fixed), dealSpot, 400, 500); - // gtk_widget_set_uposition(dealSpot, 400, 500); - gtk_box_pack_start((GtkBox *)hbox, dealSpot, FALSE, FALSE, 10); -diff -Naur touchmegames/src/interface.cpp touchmegames-p/src/interface.cpp ---- touchmegames/src/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -36,7 +36,7 @@ - - topWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); - -- gtk_window_set_default_icon_from_file("/usr/local/share/touchmegames/images/icon1.gif", &err); -+ gtk_window_set_default_icon_from_file("/usr/share/touchmegames/images/icon1.gif", &err); - - - -@@ -60,14 +60,14 @@ - - - gameSelectFixed = gtk_fixed_new(); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/submenu/bg_sub.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/submenu/bg_sub.png"); - gtk_fixed_put((GtkFixed *)gameSelectFixed, image, 0, 0); - - startButton = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)startButton, FALSE); - gtk_widget_add_events(startButton, GDK_BUTTON_PRESS_MASK); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_start.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_start.png"); - gtk_container_add((GtkContainer *)startButton, image); - gtk_fixed_put((GtkFixed *)gameSelectFixed, startButton, 400, 330); - -@@ -79,7 +79,7 @@ - gtk_event_box_set_visible_window((GtkEventBox *)aboutButton, FALSE); - gtk_widget_add_events(aboutButton, GDK_BUTTON_PRESS_MASK); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_about.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_about.png"); - gtk_container_add((GtkContainer *)aboutButton, image); - gtk_fixed_put((GtkFixed *)gameSelectFixed, aboutButton, 600, 330); - -@@ -89,7 +89,7 @@ - - - -- gameBg = gtk_image_new_from_file("/usr/local/share/touchmegames/images/gamebuttonbg.gif"); -+ gameBg = gtk_image_new_from_file("/usr/share/touchmegames/images/gamebuttonbg.gif"); - gtk_fixed_put((GtkFixed *)gameSelectFixed, gameBg, 0, 0); - - gtk_fixed_put((GtkFixed *)gameSelectFixed, selectVbox, 0, 0); -@@ -113,7 +113,7 @@ - gtk_event_box_set_visible_window((GtkEventBox *)back, FALSE); - gtk_widget_add_events(back, GDK_BUTTON_PRESS_MASK); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_back.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_back.png"); - gtk_container_add((GtkContainer *)back, image); - gtk_box_pack_start((GtkBox *)selectBox, back, FALSE, FALSE, 10); - g_signal_connect(G_OBJECT(back), -@@ -155,7 +155,7 @@ - GtkRcStyle *rcstyle; - GdkColor color; - std::string name((*it)->name()); -- std::string imgloc("/usr/local/share/touchmegames/"); -+ std::string imgloc("/usr/share/touchmegames/"); - - ++cntr; - -@@ -177,7 +177,7 @@ - - rcstyle->bg[0] = color; - rcstyle->color_flags[0] = GTK_RC_BG; -- //rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/images/gamebuttonbg.xpm"; -+ //rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/images/gamebuttonbg.xpm"; - gtk_object_set_user_data((GtkObject *)eventBox, (void *)(cntr - 1)); - gtk_widget_modify_style(eventBox, rcstyle); - -@@ -222,7 +222,7 @@ - - } - while (cntr != 6) { -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/submenu/blankgame.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/submenu/blankgame.gif"); - //gtk_widget_set_size_request(image, 148, ); - gtk_table_attach_defaults((GtkTable *)gameTable, image, cntr % 2, (cntr % 2) + 1, cntr / 2, (cntr / 2) + 1); - ++cntr; -@@ -271,7 +271,7 @@ - gtk_event_box_set_visible_window((GtkEventBox *)arrow, FALSE); - gtk_widget_add_events(arrow, GDK_BUTTON_PRESS_MASK); - gtk_object_set_user_data((GtkObject *)arrow, (void *)((gameType << 16) | (leftStart - games.begin()))); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_left.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_left.png"); - gtk_container_add((GtkContainer *)arrow, image); - gtk_table_attach_defaults((GtkTable *)gameTable, arrow, 0, 1, 3, 4); - g_signal_connect(G_OBJECT(arrow), -@@ -285,7 +285,7 @@ - gtk_event_box_set_visible_window((GtkEventBox *)arrow, FALSE); - gtk_widget_add_events(arrow, GDK_BUTTON_PRESS_MASK); - gtk_object_set_user_data((GtkObject *)arrow, (void *)((gameType << 16) | (rightStart - games.begin() + 1))); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_right.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_right.png"); - gtk_container_add((GtkContainer *)arrow, image); - gtk_table_attach_defaults((GtkTable *)gameTable, arrow, 1, 2, 3, 4); - g_signal_connect(G_OBJECT(arrow), -@@ -411,7 +411,7 @@ - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_start.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_start.png"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_table_attach_defaults((GtkTable *)previewTable, eventBox, 0, 1, 3, 4); - -@@ -424,7 +424,7 @@ - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_about.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_about.png"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_table_attach_defaults((GtkTable *)previewTable, eventBox, 3, 4, 3, 4); - -@@ -462,7 +462,7 @@ - // DART_GAME - - // background image -- bgImage = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_main.png"); -+ bgImage = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_main.png"); - gtk_fixed_put((GtkFixed *)mainMenu, bgImage, 0, 0); - - -@@ -475,15 +475,15 @@ - gtk_widget_add_events(menuWidgets[0], GDK_BUTTON_PRESS_MASK); - - // caption below -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_cardgames.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_cardgames.png"); - menuCaptions[0] = image; - gtk_fixed_put((GtkFixed *)mainMenu, image, 130, 279); - - // cards -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); - widget = gtk_fixed_new(); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_cards.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_cards.png"); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); - gtk_container_add((GtkContainer *)menuWidgets[0], widget); - gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[0], 130, 150); -@@ -499,15 +499,15 @@ - gtk_widget_add_events(menuWidgets[1], GDK_BUTTON_PRESS_MASK); - - // caption below -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_wordhunt.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_wordhunt.png"); - menuCaptions[1] = image; - gtk_fixed_put((GtkFixed *)mainMenu, image, 330, 279); - - // words -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); - widget = gtk_fixed_new(); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_words.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_words.png"); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); - gtk_container_add((GtkContainer *)menuWidgets[1], widget); - gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[1], 330, 150); -@@ -522,15 +522,15 @@ - gtk_widget_add_events(menuWidgets[2], GDK_BUTTON_PRESS_MASK); - - // caption below -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_strategy.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_strategy.png"); - menuCaptions[2] = image; - gtk_fixed_put((GtkFixed *)mainMenu, image, 535, 280); - - // strategy -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); - widget = gtk_fixed_new(); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_strategy.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_strategy.png"); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); - gtk_container_add((GtkContainer *)menuWidgets[2], widget); - gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[2], 530, 150); -@@ -544,15 +544,15 @@ - gtk_widget_add_events(menuWidgets[3], GDK_BUTTON_PRESS_MASK); - - // caption below -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_darts.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_darts.png"); - menuCaptions[3] = image; - gtk_fixed_put((GtkFixed *)mainMenu, image, 230, 435); - - // darts -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); - widget = gtk_fixed_new(); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_darts.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_darts.png"); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); - gtk_container_add((GtkContainer *)menuWidgets[3], widget); - gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[3], 230, 305); -@@ -566,15 +566,15 @@ - gtk_widget_add_events(menuWidgets[4], GDK_BUTTON_PRESS_MASK); - - // caption below -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/cap_misc.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/cap_misc.png"); - menuCaptions[4] = image; - gtk_fixed_put((GtkFixed *)mainMenu, image, 430, 430); - - // misc -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/bg_icons.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/bg_icons.png"); - widget = gtk_fixed_new(); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/mainmenu/icon_misc.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/mainmenu/icon_misc.png"); - gtk_fixed_put((GtkFixed *)widget, image, 0, 0); - gtk_container_add((GtkContainer *)menuWidgets[4], widget); - gtk_fixed_put((GtkFixed *)mainMenu, menuWidgets[4], 430, 305); -@@ -591,7 +591,7 @@ - gtk_event_box_set_visible_window((GtkEventBox *)mainBack, FALSE); - gtk_widget_add_events(mainBack, GDK_BUTTON_PRESS_MASK); - -- widget = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_back.png"); -+ widget = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_back.png"); - gtk_container_add((GtkContainer *)mainBack, widget); - g_signal_connect(G_OBJECT(mainBack), - "button-press-event", -@@ -602,7 +602,7 @@ - gtk_event_box_set_visible_window((GtkEventBox *)mainAbout, FALSE); - gtk_widget_add_events(mainAbout, GDK_BUTTON_PRESS_MASK); - -- widget = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_about.png"); -+ widget = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_about.png"); - gtk_container_add((GtkContainer *)mainAbout, widget); - g_signal_connect(G_OBJECT(mainAbout), - "button-press-event", -diff -Naur touchmegames/src/lib/gameptr.cpp touchmegames-p/src/lib/gameptr.cpp ---- touchmegames/src/lib/gameptr.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/lib/gameptr.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -51,13 +51,13 @@ - - fixed = gtk_fixed_new(); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/games/exitbg.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/games/exitbg.png"); - gtk_fixed_put((GtkFixed *)fixed, image, 0, 0); - - gtk_box_pack_start((GtkBox *)GTK_DIALOG(exitDialog)->vbox, fixed, FALSE, FALSE, 0); - vbox = gtk_vbox_new(FALSE, 0); - gtk_fixed_put((GtkFixed *)fixed, vbox, 0, 0); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/confirmexit.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/confirmexit.png"); - gtk_box_pack_start((GtkBox *)vbox, image, FALSE, FALSE, 0); - // label = gtk_label_new(" "); - // gtk_widget_set_size_request(label, 20, -1); -@@ -67,7 +67,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); -- ok = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_ok.png"); -+ ok = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_ok.png"); - gtk_container_add((GtkContainer *)eventBox, ok); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - -@@ -79,7 +79,7 @@ - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - gtk_widget_add_events(eventBox, GDK_ALL_EVENTS_MASK); -- cancel = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_cancel.png"); -+ cancel = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_cancel.png"); - gtk_container_add((GtkContainer *)eventBox, cancel); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-release-event", -@@ -656,7 +656,7 @@ - void GAME_PTR::playWave(char *waveFile) { - if (tmgWave != NULL) { - std::stringstream sstr; -- sstr << "/usr/local/share/touchmegames/" << name() << "/sounds/" << waveFile; -+ sstr << "/usr/share/touchmegames/" << name() << "/sounds/" << waveFile; - tmgWave->play((char *)sstr.str().c_str()); - } - } -@@ -668,7 +668,7 @@ - } - - GtkWidget *GAME_PTR::loadImage(std::string imageFile) { -- std::string str("/usr/local/share/touchmegames/"); -+ std::string str("/usr/share/touchmegames/"); - str += name(); - str += "/images/"; - str += imageFile; -@@ -676,7 +676,7 @@ - } - - void GAME_PTR::reloadImage(GtkWidget *widget, std::string imageFile) { -- std::string str("/usr/local/share/touchmegames/"); -+ std::string str("/usr/share/touchmegames/"); - str += name(); - str += "/images/"; - str += imageFile; -diff -Naur touchmegames/src/secretphrase/events.cpp touchmegames-p/src/secretphrase/events.cpp ---- touchmegames/src/secretphrase/events.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/secretphrase/events.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -77,7 +77,7 @@ - } - - sstr.str(""); -- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; -+ sstr << "/usr/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; - gtk_image_set_from_file((GtkImage *)sp->guessesLeftImg, sstr.str().c_str()); - sp->handleCountDown = 20; - -@@ -171,7 +171,7 @@ - sstr << sp->currentScore; - gtk_label_set_text((GtkLabel *)sp->scoreLabel, sstr.str().c_str()); - sstr.str(""); -- sstr << "/usr/local/share/touchmegames/secretphrase/images/" -+ sstr << "/usr/share/touchmegames/secretphrase/images/" - << sp->guessesLeft << ".gif"; - gtk_image_set_from_file((GtkImage *)sp->guessesLeftImg, sstr.str().c_str()); - -@@ -224,7 +224,7 @@ - - x = (sp->currentKey - 'a') % 13; - y = (sp->currentKey - 'a') / 13; -- gtk_image_set_from_file((GtkImage *)sp->lowerLetters[y][x], "/usr/local/share/touchmegames/secretphrase/images/back.gif"); -+ gtk_image_set_from_file((GtkImage *)sp->lowerLetters[y][x], "/usr/share/touchmegames/secretphrase/images/back.gif"); - sstr << sp->getNumberOfOccurences(sp->currentKey) << ' ' << (char)(key - 0x20) << "'s found."; - gtk_label_set_text((GtkLabel *)sp->infoLabel, sstr.str().c_str()); - sp->progress.hide(); -@@ -236,7 +236,7 @@ - } - else { - sstr.str(""); -- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; -+ sstr << "/usr/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; - - gtk_image_set_from_file((GtkImage *)sp->guessesLeftImg, sstr.str().c_str()); - sp->handleCountDown = 20; -@@ -283,7 +283,7 @@ - - x = (sp->currentKey - 'a') % 13; - y = (sp->currentKey - 'a') / 13; -- gtk_image_set_from_file((GtkImage *)sp->lowerLetters[y][x], "/usr/local/share/touchmegames/secretphrase/images/back.gif"); -+ gtk_image_set_from_file((GtkImage *)sp->lowerLetters[y][x], "/usr/share/touchmegames/secretphrase/images/back.gif"); - sstr << sp->getNumberOfOccurences(sp->currentKey) << ' ' << (char)(key - 0x20) << "'s found."; - gtk_label_set_text((GtkLabel *)sp->infoLabel, sstr.str().c_str()); - sp->progress.hide(); -@@ -295,7 +295,7 @@ - } - else { - sstr.str(""); -- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; -+ sstr << "/usr/share/touchmegames/secretphrase/images/" << sp->guessesLeft << ".gif"; - - gtk_image_set_from_file((GtkImage *)sp->guessesLeftImg, sstr.str().c_str()); - sp->handleCountDown = 20; -diff -Naur touchmegames/src/secretphrase/interface.cpp touchmegames-p/src/secretphrase/interface.cpp ---- touchmegames/src/secretphrase/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/secretphrase/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -85,7 +85,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(userExit), (gpointer)this); -@@ -122,15 +122,15 @@ - gtk_widget_modify_fg(label, (GtkStateType)0, &c); - gtk_box_pack_start((GtkBox *)hbox, label, FALSE, FALSE, 5); - -- guessesLeftImg = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/3.gif"); -+ guessesLeftImg = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/3.gif"); - gtk_box_pack_start((GtkBox *)hbox, guessesLeftImg, FALSE, FALSE, 10); - - fixed = gtk_fixed_new(); - gtk_fixed_set_has_window((GtkFixed *)fixed, TRUE); - gtk_widget_set_size_request(fixed, 260, 75); - -- wheelImage1 = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/wheel.gif"); -- wheelImage2 = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/wheel.gif"); -+ wheelImage1 = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/wheel.gif"); -+ wheelImage2 = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/wheel.gif"); - gtk_fixed_put((GtkFixed *)fixed, wheelImage1, 0, 0); - gtk_fixed_put((GtkFixed *)fixed, wheelImage2, 2210, 0); - -@@ -163,7 +163,7 @@ - - for (int x = 0; x < 14; ++x) { - for (int y = 0; y < 4; ++y) { -- centerLetters[y][x] = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/back.gif"); -+ centerLetters[y][x] = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/back.gif"); - gtk_table_attach_defaults((GtkTable *)table, centerLetters[y][x], x, x + 1, y, y + 1); - } - } -@@ -183,7 +183,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); -- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << (char)(x + (y * 13) + 'a') << ".gif"; -+ sstr << "/usr/share/touchmegames/secretphrase/images/" << (char)(x + (y * 13) + 'a') << ".gif"; - lowerLetters[y][x] = gtk_image_new_from_file(sstr.str().c_str()); - gtk_container_add((GtkContainer *)eventBox, lowerLetters[y][x]); - gtk_object_set_user_data((GtkObject *)eventBox, (void *)(x + (y * 13) + 'a')); -@@ -244,10 +244,10 @@ - gtk_box_pack_start((GtkBox *)vbox, hbox, FALSE, FALSE, 0); - for (int i = 0; i < 20; ++i) { - if (i & 1) { -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/lhcurtain.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/lhcurtain.gif"); - } - else { -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/rhcurtain.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/rhcurtain.gif"); - } - gtk_box_pack_start((GtkBox *)hbox, image, FALSE, FALSE, 0); - } -@@ -273,7 +273,7 @@ - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/misc.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/misc.gif"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_object_set_user_data((GtkObject *)eventBox, (void *)(CatMisc)); - gtk_table_attach_defaults((GtkTable *)table, eventBox, 0, 1, 0, 1); -@@ -286,7 +286,7 @@ - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/sports.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/sports.gif"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_object_set_user_data((GtkObject *)eventBox, (void *)(CatSports)); - gtk_table_attach_defaults((GtkTable *)table, eventBox, 1, 2, 0, 1); -@@ -300,7 +300,7 @@ - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/music.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/music.gif"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_object_set_user_data((GtkObject *)eventBox, (void *)(CatMusic)); - gtk_table_attach_defaults((GtkTable *)table, eventBox, 2, 3, 0, 1); -@@ -313,7 +313,7 @@ - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, FALSE); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/video.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/video.gif"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_object_set_user_data((GtkObject *)eventBox, (void *)(CatVideo)); - gtk_table_attach_defaults((GtkTable *)table, eventBox, 0, 1, 1, 2); -@@ -355,7 +355,7 @@ - progress.init(); - progress.width(101); - progress.height(26); -- progress.image("/usr/local/share/touchmegames/secretphrase/images/progress.gif"); -+ progress.image("/usr/share/touchmegames/secretphrase/images/progress.gif"); - gtk_box_pack_start((GtkBox *)hbox, progress.widget(), FALSE, FALSE, 10); - pango_font_description_free(rcstyle->font_desc); - return hbox; -@@ -380,7 +380,7 @@ - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(solvePhrase), (gpointer)this); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/secretphrase/images/solvenow.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/secretphrase/images/solvenow.gif"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_box_pack_start((GtkBox *)normVbox, eventBox, FALSE, FALSE, 5); - -diff -Naur touchmegames/src/secretphrase/support.cpp touchmegames-p/src/secretphrase/support.cpp ---- touchmegames/src/secretphrase/support.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/secretphrase/support.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -90,7 +90,7 @@ - for (int x = 0; x < 14; ++x) { - for (int y = 0; y < 4; ++y) { - gtk_image_set_from_file((GtkImage *)centerLetters[y][x], -- "/usr/local/share/touchmegames/secretphrase/images/back.gif"); -+ "/usr/share/touchmegames/secretphrase/images/back.gif"); - letters[y][x] = ' '; - } - } -@@ -99,7 +99,7 @@ - - vowelsAllowed = false; - -- gtk_image_set_from_file((GtkImage *)guessesLeftImg, "/usr/local/share/touchmegames/secretphrase/images/3.gif"); -+ gtk_image_set_from_file((GtkImage *)guessesLeftImg, "/usr/share/touchmegames/secretphrase/images/3.gif"); - guessesLeft = 3; - - for (int i = 0; i < 26; ++i) { -@@ -115,7 +115,7 @@ - for (int y = 0; y < 2; ++y) { - for (int x = 0; x < 13; ++x) { - std::stringstream sstr; -- sstr << "/usr/local/share/touchmegames/secretphrase/images/" << (char)(x + (y * 13) + 'a') << ".gif"; -+ sstr << "/usr/share/touchmegames/secretphrase/images/" << (char)(x + (y * 13) + 'a') << ".gif"; - gtk_image_set_from_file((GtkImage *)lowerLetters[y][x], sstr.str().c_str()); - } - } -@@ -215,7 +215,7 @@ - std::string descriptor, phrase, str; - XmlParser parser; - -- str = "/usr/local/share/touchmegames/secretphrase/phrases/"; -+ str = "/usr/share/touchmegames/secretphrase/phrases/"; - str += category; - str += ".xml"; - -@@ -290,26 +290,26 @@ - if (letters[y][x] == '\'') { - - gtk_image_set_from_file((GtkImage *)centerLetters[y][x], -- "/usr/local/share/touchmegames/secretphrase/images/apost.gif"); -+ "/usr/share/touchmegames/secretphrase/images/apost.gif"); - letters[y][x] = ' '; - } - else if (letters[y][x] == '-') { - gtk_image_set_from_file((GtkImage *)centerLetters[y][x], -- "/usr/local/share/touchmegames/secretphrase/images/dash.gif"); -+ "/usr/share/touchmegames/secretphrase/images/dash.gif"); - letters[y][x] = ' '; - } - else if (letters[y][x] == ',') { - gtk_image_set_from_file((GtkImage *)centerLetters[y][x], -- "/usr/local/share/touchmegames/secretphrase/images/comma.gif"); -+ "/usr/share/touchmegames/secretphrase/images/comma.gif"); - letters[y][x] = ' '; - } - else if (letters[y][x] != ' ') { - gtk_image_set_from_file((GtkImage *)centerLetters[y][x], -- "/usr/local/share/touchmegames/secretphrase/images/back.gif"); -+ "/usr/share/touchmegames/secretphrase/images/back.gif"); - } - else { - gtk_image_set_from_file((GtkImage *)centerLetters[y][x], -- "/usr/local/share/touchmegames/secretphrase/images/blank.gif"); -+ "/usr/share/touchmegames/secretphrase/images/blank.gif"); - } - } - } -@@ -336,7 +336,7 @@ - - if (letters[i][l] == ch) { - std::string str; -- str = "/usr/local/share/touchmegames/secretphrase/images/"; -+ str = "/usr/share/touchmegames/secretphrase/images/"; - str += ch; - str += ".gif"; - -@@ -375,7 +375,7 @@ - for (int x = 0; x < 14; ++x) { - if (letters[y][x] != ' ') { - std::string str; -- str = "/usr/local/share/touchmegames/secretphrase/images/"; -+ str = "/usr/share/touchmegames/secretphrase/images/"; - str += letters[y][x]; - str += ".gif"; - -diff -Naur touchmegames/src/sudoku/interface.cpp touchmegames-p/src/sudoku/interface.cpp ---- touchmegames/src/sudoku/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/sudoku/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -174,7 +174,7 @@ - progress.init(); - progress.width(151); - progress.height(32); -- progress.image("/usr/local/share/touchmegames/sudoku/images/timebar_full.png"); -+ progress.image("/usr/share/touchmegames/sudoku/images/timebar_full.png"); - progress.percent(100); - progress.text("2:00"); - color.red = 0xFFFF; -@@ -268,7 +268,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(userExit), (gpointer)this); -diff -Naur touchmegames/src/threescompany/events.cpp touchmegames-p/src/threescompany/events.cpp ---- touchmegames/src/threescompany/events.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/threescompany/events.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -415,7 +415,7 @@ - - void ThreesCompany::takeScorePressed(GtkWidget *widget, GdkEventButton *event, gpointer ptr) { - gtk_image_set_from_file((GtkImage *)gtk_bin_get_child((GtkBin *)widget), -- "/usr/local/share/touchmegames/threescompany/images/takescoredown.xpm"); -+ "/usr/share/touchmegames/threescompany/images/takescoredown.xpm"); - - } - -@@ -423,7 +423,7 @@ - ThreesCompany *tc(reinterpret_cast(ptr)); - - gtk_image_set_from_file((GtkImage *)gtk_bin_get_child((GtkBin *)widget), -- "/usr/local/share/touchmegames/threescompany/images/takescoreup.xpm"); -+ "/usr/share/touchmegames/threescompany/images/takescoreup.xpm"); - - ++tc->round; - if (tc->round <= 3) { -diff -Naur touchmegames/src/threescompany/interface.cpp touchmegames-p/src/threescompany/interface.cpp ---- touchmegames/src/threescompany/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/threescompany/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -122,7 +122,7 @@ - } - cardMask = gtk_event_box_new(); - gtk_widget_set_size_request(cardMask, 50, 50); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/threescompany/images/mask.xpm"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/threescompany/images/mask.xpm"); - gtk_container_add((GtkContainer *)cardMask, image); - gtk_event_box_set_visible_window((GtkEventBox *)cardMask, FALSE); - gtk_widget_add_events(cardMask, GDK_BUTTON_RELEASE_MASK); -@@ -226,7 +226,7 @@ - rcstyle = gtk_rc_style_new(); - - rcstyle->color_flags[0] = GTK_RC_BG; -- rcstyle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/threescompany/images/background.gif"; -+ rcstyle->bg_pixmap_name[0] = "/usr/share/touchmegames/threescompany/images/background.gif"; - gtk_widget_modify_style(topEventBox, rcstyle); - - -@@ -285,7 +285,7 @@ - g_signal_connect(G_OBJECT(takeScore), "button-release-event", - G_CALLBACK(takeScoreReleased), (gpointer)this); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/threescompany/images/takescoreup.xpm"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/threescompany/images/takescoreup.xpm"); - gtk_container_add((GtkContainer *)takeScore, image); - gtk_box_pack_start((GtkBox *)vbox, takeScore, FALSE, FALSE, 20); - -@@ -306,7 +306,7 @@ - - eventBox2 = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox2, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); - gtk_widget_add_events(eventBox2, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox2), "button-press-event", - G_CALLBACK(userExit), (gpointer)this); -diff -Naur touchmegames/src/threescompany/support.cpp touchmegames-p/src/threescompany/support.cpp ---- touchmegames/src/threescompany/support.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/threescompany/support.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -26,8 +26,8 @@ - #include - - ThreesCompany::ThreesCompany() : gameName("threescompany"), toggleOccuring(false), -- deckLocation("/usr/local/share/touchmegames/images/cards/"), -- deckBack("/usr/local/share/touchmegames/images/cards/backs/back-2.gif") { -+ deckLocation("/usr/share/touchmegames/images/cards/"), -+ deckBack("/usr/share/touchmegames/images/cards/backs/back-2.gif") { - bgcolor.red = 0x0000; - bgcolor.green = 0x0000; - bgcolor.blue = 0x0000; -diff -Naur touchmegames/src/tritowers/events.cpp touchmegames-p/src/tritowers/events.cpp ---- touchmegames/src/tritowers/events.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/tritowers/events.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -274,7 +274,7 @@ - - void TriTowers::takeScorePressed(GtkWidget *widget, GdkEventButton *event, gpointer ptr) { - // gtk_image_set_from_file((GtkImage *)gtk_bin_get_child((GtkBin *)widget), --// "/usr/local/share/touchmegames/tritowers/images/takescoredown.xpm"); -+// "/usr/share/touchmegames/tritowers/images/takescoredown.xpm"); - - } - -@@ -282,7 +282,7 @@ - TriTowers *tc(reinterpret_cast(ptr)); - if (widget != NULL) { - // gtk_image_set_from_file((GtkImage *)gtk_bin_get_child((GtkBin *)widget), --// "/usr/local/share/touchmegames/tritowers/images/takescoreup.xpm"); -+// "/usr/share/touchmegames/tritowers/images/takescoreup.xpm"); - } - if (tc->gameState == PLAY_ROUND || widget == NULL) { - ++tc->round; -diff -Naur touchmegames/src/tritowers/interface.cpp touchmegames-p/src/tritowers/interface.cpp ---- touchmegames/src/tritowers/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/tritowers/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -122,7 +122,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(userExit), (gpointer)this); -@@ -138,7 +138,7 @@ - g_signal_connect(G_OBJECT(eventBox), "button-release-event", - G_CALLBACK(takeScoreReleased), (gpointer)this); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_take_score.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_take_score.png"); - gtk_container_add((GtkContainer *)eventBox, image); - gtk_fixed_put((GtkFixed *)centerFixed, eventBox, 584, 20); - //gtk_box_pack_start((GtkBox *)hbox, eventBox, FALSE, FALSE, 20); -@@ -194,7 +194,7 @@ - label = gtk_label_new(" "); - gtk_box_pack_start((GtkBox *)hbox, label, FALSE, FALSE, 0); - -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/cards/backs/deck10.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/cards/backs/deck10.png"); - - gtk_container_add((GtkContainer *)eventBox, image); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", -@@ -252,7 +252,7 @@ - // g_signal_connect(G_OBJECT(eventBox), "button-release-event", - // G_CALLBACK(takeScoreReleased), (gpointer)this); - --// image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_take_score.png"); -+// image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_take_score.png"); - // gtk_container_add((GtkContainer *)eventBox, image); - // gtk_box_pack_start((GtkBox *)hbox, eventBox, FALSE, FALSE, 20); - -@@ -307,7 +307,7 @@ - highrun = 0; - - topFixed = gtk_fixed_new(); -- //bgImage = gtk_image_new_from_file("/usr/local/share/touchmegames/images/games/bg.png"); -+ //bgImage = gtk_image_new_from_file("/usr/share/touchmegames/images/games/bg.png"); - bgImage = loadImage("fullbg.png"); - gtk_fixed_put((GtkFixed *)topFixed, bgImage, 0, 0); - -@@ -338,18 +338,18 @@ - dealCard = NULL; - - for (int i = 0; i < 3; ++i) { -- swordImages[i] = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/sword.gif"); -+ swordImages[i] = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/sword.gif"); - gtk_fixed_put((GtkFixed *)centerFixed, swordImages[i], 0, -300); - } - -- bonusImages[0] = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/500.gif"); -+ bonusImages[0] = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/500.gif"); - gtk_fixed_put((GtkFixed *)centerFixed, bonusImages[0], 0, -300); -- bonusImages[1] = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/1000.gif"); -+ bonusImages[1] = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/1000.gif"); - gtk_fixed_put((GtkFixed *)centerFixed, bonusImages[1], 0, -300); -- bonusImages[2] = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/1500.gif"); -+ bonusImages[2] = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/1500.gif"); - gtk_fixed_put((GtkFixed *)centerFixed, bonusImages[2], 0, -300); - -- addingBonus = gtk_image_new_from_file("/usr/local/share/touchmegames/tritowers/images/addingbonus.gif"); -+ addingBonus = gtk_image_new_from_file("/usr/share/touchmegames/tritowers/images/addingbonus.gif"); - gtk_fixed_put((GtkFixed *)centerFixed, addingBonus, 0, -300); - round = 1; - startRound(); -diff -Naur touchmegames/src/tritowers/support.cpp touchmegames-p/src/tritowers/support.cpp ---- touchmegames/src/tritowers/support.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/tritowers/support.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -29,9 +29,9 @@ - - TriTowers::TriTowers() : gameName("tritowers"), - //deckLocation("/usr/share/apps/carddecks/cards-default/"), -- //deckBack("/usr/local/share/touchmegames/images/cards/backs/back-2.gif") { -- deckLocation("/usr/local/share/touchmegames/images/cards/default/"), -- deckBack("/usr/local/share/touchmegames/images/cards/backs/back-2.gif") { -+ //deckBack("/usr/share/touchmegames/images/cards/backs/back-2.gif") { -+ deckLocation("/usr/share/touchmegames/images/cards/default/"), -+ deckBack("/usr/share/touchmegames/images/cards/backs/back-2.gif") { - bgcolor.red = 0x0000; - bgcolor.green = 0x0000; - bgcolor.blue = 0x0000; -diff -Naur touchmegames/src/videopoker/interface.cpp touchmegames-p/src/videopoker/interface.cpp ---- touchmegames/src/videopoker/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/videopoker/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -416,7 +416,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/exit.gif"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/exit.gif"); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(userExit), (gpointer)this); -diff -Naur touchmegames/src/videopoker/support.cpp touchmegames-p/src/videopoker/support.cpp ---- touchmegames/src/videopoker/support.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/videopoker/support.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -26,8 +26,8 @@ - #include - - VIDEO_POKER::VIDEO_POKER() : gameName("videopoker"), toggleOccuring(false), -- deckLocation("/usr/local/share/touchmegames/images/cards/"), -- deckBack("/usr/local/share/touchmegames/images/cards/backs/back-2.gif") { -+ deckLocation("/usr/share/touchmegames/images/cards/"), -+ deckBack("/usr/share/touchmegames/images/cards/backs/back-2.gif") { - color.red = 0xA000; - color.green = 0xA000; - color.blue = 0xA000; -diff -Naur touchmegames/src/wordhunt/interface.cpp touchmegames-p/src/wordhunt/interface.cpp ---- touchmegames/src/wordhunt/interface.cpp 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/wordhunt/interface.cpp 2007-12-11 04:10:18.000000000 +0100 -@@ -246,7 +246,7 @@ - g_signal_connect(G_OBJECT(eventBox), - "motion-notify-event", - G_CALLBACK(mouseMove), (gpointer)this); -- sstr << "/usr/local/share/touchmegames/wordhunt/images/letter.png"; -+ sstr << "/usr/share/touchmegames/wordhunt/images/letter.png"; - letters[x][y] = gtk_image_new_from_file(sstr.str().c_str()); - - gtk_container_add((GtkContainer *)eventBox, letters[x][y]); -@@ -298,7 +298,7 @@ - - eventBox = gtk_event_box_new(); - gtk_event_box_set_visible_window((GtkEventBox *)eventBox, false); -- image = gtk_image_new_from_file("/usr/local/share/touchmegames/images/buttons/button_quit.png"); -+ image = gtk_image_new_from_file("/usr/share/touchmegames/images/buttons/button_quit.png"); - gtk_widget_add_events(eventBox, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(eventBox), "button-press-event", - G_CALLBACK(userExit), (gpointer)this); -@@ -470,7 +470,7 @@ - return false; - } - -- if (parser.openXmlFile("/usr/local/share/touchmegames/wordhunt/lists", "lists", errStr) == 0) { -+ if (parser.openXmlFile("/usr/share/touchmegames/wordhunt/lists", "lists", errStr) == 0) { - std::cerr << "Could not open lists file: " << errStr << std::endl; - exit(0); - } -@@ -584,7 +584,7 @@ - for (int y = 0; y < 12; ++y) { - for (int x = 0; x < 12; ++x) { - std::stringstream sstr; -- sstr << "/usr/local/share/touchmegames/wordhunt/images/letter_" << array[x][y] << ".png"; -+ sstr << "/usr/share/touchmegames/wordhunt/images/letter_" << array[x][y] << ".png"; - gtk_object_set_user_data((GtkObject *)letters[x][y], (void *)array[x][y]); - gtk_image_set_from_file((GtkImage *)letters[x][y], sstr.str().c_str()); - } -@@ -637,7 +637,7 @@ - startGame(); - - bgCircle = gtk_rc_style_new(); -- bgCircle->bg_pixmap_name[0] = "/usr/local/share/touchmegames/wordhunt/images/letterBg.xpm"; -+ bgCircle->bg_pixmap_name[0] = "/usr/share/touchmegames/wordhunt/images/letterBg.xpm"; - - beginx = -1; - beginy = -1; -diff -Naur touchmegames/src/wordhunt/wordhunt.h touchmegames-p/src/wordhunt/wordhunt.h ---- touchmegames/src/wordhunt/wordhunt.h 2007-08-08 02:03:05.000000000 +0200 -+++ touchmegames-p/src/wordhunt/wordhunt.h 2007-12-11 04:10:12.000000000 +0100 -@@ -27,7 +27,7 @@ - #include - - #define numberOfRows 12 --#define wordHuntImagePath "/usr/local/share/touchmegames/wordhunt/images/" -+#define wordHuntImagePath "/usr/share/touchmegames/wordhunt/images/" - - class WordHunt : public GAME_PTR { - private: From crazy at frugalware.org Fri Dec 14 14:08:17 2007 From: crazy at frugalware.org (crazy) Date: Fri Dec 14 14:08:20 2007 Subject: [Frugalware-git] frugalware-current: qt4-4.3.3-2-i686 Message-ID: <20071214130817.E617811904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=40d34f9b43f5ccf7cf80aa5aed78dafa94be95e8 commit 40d34f9b43f5ccf7cf80aa5aed78dafa94be95e8 Author: crazy Date: Fri Dec 14 13:49:53 2007 +0100 qt4-4.3.3-2-i686 * release bump * synced with qt4-copy patches * re-enabled sse2 diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index 521f267..17ab95a 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -4,7 +4,7 @@ pkgname=qt4 origname=qt pkgver=4.3.3 -pkgrel=1 +pkgrel=2 pkgmore=x11-opensource-src ## Dummy package is empty .. pkgdesc="The QT4 GUI toolkit." @@ -21,7 +21,7 @@ archs=('i686' 'x86_64') options=('scriptlet' 'nodocs') up2date="lynx -dump ftp://ftp.trolltech.com/qt/source/|grep 'qt-x11-opensource-src'|grep -v rc[1-9]|grep -v beta|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.gz \ - http://ftp.frugalware.org/pub/other/sources/kde/qt4/patches-745397.tar.bz2 \ + http://ftp.frugalware.org/pub/other/sources/kde/qt4/patches-748395.tar.bz2 \ assistant4.desktop \ designer4.desktop \ linguist4.desktop \ @@ -32,7 +32,7 @@ source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.gz \ Trolltech.conf \ apply_patches) sha1sums=('77d00e2438efa793f6c16c54b64c8ba440ee3228' \ - 'a787d5204131bb02c54b834e894cd55fc66ce680' \ + 'd51138e894bc19d44d42040e3d25d2f9e37d1fc9' \ '70413a58f1d4b7260ab407482675b8028cea4e47' \ '957376dd30fdf1bbc2ff5545f2f808f90d44c4dc' \ 'bc6527ee1d672cc192c667aeb49540b166e96949' \ @@ -119,8 +119,8 @@ build() Fcd $origname-$pkgmore-$pkgver Fpatchall Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing -Wno-deprecated" mkspecs/common/g++.conf - mv $Fsrcdir/{patches-745397,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie - mv patches-745397 patches || Fdie + mv $Fsrcdir/{patches-748395,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie + mv patches-748395 patches || Fdie chmod +x apply_patches || Fdie ./apply_patches || Fdie ./configure \ @@ -158,8 +158,7 @@ build() -no-separate-debug-info \ -optimized-qmake \ -fast \ - -reduce-relocations \ - -no-sse2 || return 1 + -reduce-relocations || return 1 ## Here we go Fmessage "Running make.." From crazy at frugalware.org Fri Dec 14 16:15:24 2007 From: crazy at frugalware.org (crazy) Date: Fri Dec 14 16:15:27 2007 Subject: [Frugalware-git] playground: kdelibs-3.97.1_747313-0playground1-i686 Message-ID: <20071214151524.C9AA511904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=f47e393556e9532ad745ddc67a60a26ef4c62017 commit f47e393556e9532ad745ddc67a60a26ef4c62017 Author: crazy Date: Fri Dec 14 16:15:07 2007 +0100 kdelibs-3.97.1_747313-0playground1-i686 * fix for libusb detection * posted upstream already .. but no idea whatever someone commits diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index bdf14f6..d5a5703 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -13,11 +13,14 @@ makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell' 'libstrigiq groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') +_F_cmake_type="Debugfull" Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ - flac.patch) + flac.patch \ + fix_FindUSB.cmake.patch) sha1sums=('a9313eee508b479028341f3e881efded7f595784' \ - '0ff2c4946a6f58c0dadc7b6bd1027f46fab66218') + '0ff2c4946a6f58c0dadc7b6bd1027f46fab66218' \ + '1acfcfd793f293f3a7418d32091b25a501d5e9cc') ## TODO: groups!!! subpkgs=("$pkgname-compiletime" 'libkde' 'kspell-aspell' 'kspell-hspell' 'kspell-enchant' 'libkdecore') diff --git a/source/kde4/kdelibs/fix_FindUSB.cmake.patch b/source/kde4/kdelibs/fix_FindUSB.cmake.patch new file mode 100644 index 0000000..a30be8e --- /dev/null +++ b/source/kde4/kdelibs/fix_FindUSB.cmake.patch @@ -0,0 +1,57 @@ +Index: cmake/modules/FindUSB.cmake +=================================================================== +--- cmake/modules/FindUSB.cmake (Revision 748352) ++++ cmake/modules/FindUSB.cmake (Arbeitskopie) +@@ -1,4 +1,4 @@ +-# - Try to find the freetype library ++# - Try to find the libusb library + # Once done this defines + # + # LIBUSB_FOUND - system has libusb +@@ -12,27 +12,30 @@ + + + if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) +- + # in cache already +- set(LIBUSB_FOUND TRUE) ++ set(LIBUSB_FOUND_QUIETLY TRUE) ++endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) ++ ++IF (NOT WIN32) ++ # use pkg-config to get the directories and then use these values ++ # in the FIND_PATH() and FIND_LIBRARY() calls ++ INCLUDE(UsePkgConfig) + +-else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) +- IF (NOT WIN32) +- # use pkg-config to get the directories and then use these values +- # in the FIND_PATH() and FIND_LIBRARY() calls +- INCLUDE(UsePkgConfig) ++ PKGCONFIG(libusb _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags) ++ENDIF(NOT WIN32) + +- PKGCONFIG(libusb _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags) +- ENDIF(NOT WIN32) ++FIND_PATH(LIBUSB_INCLUDE_DIR usb.h ++ PATHS ${_libUSBIncDir} ) + +- FIND_PATH(LIBUSB_INCLUDE_DIR usb.h ) ++FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb ++ PATHS ${_libUSBLinkDir} ) + +- FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb +- PATHS ${_libUSBLinkDir} ) ++if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) ++ set(LIBUSB_FOUND TRUE) ++endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) + +- include(FindPackageHandleStandardArgs) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(USB DEFAULT_MSG LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) ++include(FindPackageHandleStandardArgs) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(USB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) + +- MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) ++MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) + +-endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) From vmiklos at frugalware.org Sat Dec 15 00:11:39 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 00:11:41 2007 Subject: [Frugalware-git] frugalware-current: desmume-0.7.3-1-x86_64 Message-ID: <20071214231139.AC2091190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d678f6dbb10834496c95cf24d96be49529692154 commit d678f6dbb10834496c95cf24d96be49529692154 Author: Miklos Vajna Date: Sat Dec 15 00:11:17 2007 +0100 desmume-0.7.3-1-x86_64 added x86_64 to archs() diff --git a/source/games-extra/desmume/FrugalBuild b/source/games-extra/desmume/FrugalBuild index 47c1d7d..53f37e1 100644 --- a/source/games-extra/desmume/FrugalBuild +++ b/source/games-extra/desmume/FrugalBuild @@ -9,6 +9,6 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge depends=('sdl' 'gtkglext' 'zziplib' 'libglade') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('df2979c81bb6f41bb03a605f3ff25c6c587072ed') # optimization OK \ No newline at end of file From vmiklos at frugalware.org Sat Dec 15 00:18:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 00:18:43 2007 Subject: [Frugalware-git] frugalware-current: extreme-tuxracer-0.35-1-x86_64 Message-ID: <20071214231840.78B9711904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3351e666e3622caa8014e73e3d9dc1db42ef78ee commit 3351e666e3622caa8014e73e3d9dc1db42ef78ee Author: Miklos Vajna Date: Sat Dec 15 00:18:33 2007 +0100 extreme-tuxracer-0.35-1-x86_64 added x86_64 to archs() diff --git a/source/games-extra/extreme-tuxracer/FrugalBuild b/source/games-extra/extreme-tuxracer/FrugalBuild index 1aa3018..d772f02 100644 --- a/source/games-extra/extreme-tuxracer/FrugalBuild +++ b/source/games-extra/extreme-tuxracer/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge url="http://www.extremetuxracer.com" depends=('sdl_mixer' 'mesa' 'tcl' 'libpng' 'freetype2') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') source=($source etracer.png) sha1sums=('8c0ece5143915a026cefccedcb30a589dc967897' \ 'b8a0fc353dbfcb32aa05f6a57893a2636d34fa84') From crazy at frugalware.org Sat Dec 15 01:26:58 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 01:27:00 2007 Subject: [Frugalware-git] frugalware-current: cfitsio-3.060-1-i686 Message-ID: <20071215002658.B71711190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ab65829673eda5dd22ec5184784ce734978572a commit 6ab65829673eda5dd22ec5184784ce734978572a Author: crazy Date: Sat Dec 15 01:26:00 2007 +0100 cfitsio-3.060-1-i686 * New package * patch stolen from gentoo , thx guys =) diff --git a/source/lib-extra/cfitsio/FrugalBuild b/source/lib-extra/cfitsio/FrugalBuild new file mode 100644 index 0000000..bb7805d --- /dev/null +++ b/source/lib-extra/cfitsio/FrugalBuild @@ -0,0 +1,33 @@ +# Compiling Time: 0.70 SBU +# Maintainer: crazy + +pkgname=cfitsio +pkgver=3.060 +pkgrel=1 +pkgdesc="C and Fortran library for manipulating FITS files" +url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" +depends=() +makedepends=('gcc-gfortran') +groups=('lib-extra') +archs=('i686') +Fpkgversep="" +## Oh well .. +up2date="lynx -dump ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/|grep 'cfitsio[0-9]\(.*\).tar.gz$'|Flasttar|sed 's/3/3./g'" +source=(ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver//.}.tar.gz \ + cfitsio-3.060-autotools.patch) +_F_cd_path="$pkgname" +sha1sums=('ec92c0d4402d2a7cf13f514c1be77665c43e0147' \ + '59489a1372e813a2107d551031426704d4ee8a0f') + +build() +{ + Fcd + rm -rf configure configure.in || Fdie + Fpatchall + Fautoreconf + Fmake + Fmakeinstall +} + + +# optimization OK diff --git a/source/lib-extra/cfitsio/cfitsio-3.060-autotools.patch b/source/lib-extra/cfitsio/cfitsio-3.060-autotools.patch new file mode 100644 index 0000000..2155ef4 --- /dev/null +++ b/source/lib-extra/cfitsio/cfitsio-3.060-autotools.patch @@ -0,0 +1,297 @@ +--- configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ configure.ac 2007-09-10 19:04:36.382298581 +0100 +@@ -0,0 +1,230 @@ ++AC_PREREQ(2.59) ++AC_INIT(cfitsio, 3.060, pence@tetra.gsfc.nasa.gov) ++AC_CONFIG_SRCDIR([fitscore.c]) ++AM_INIT_AUTOMAKE([foreign]) ++ ++AC_PROG_LIBTOOL ++ ++AC_MSG_CHECKING([whether to enable fortran api]) ++AC_ARG_ENABLE([fortran], ++ AS_HELP_STRING([--enable-fortran], [Build the fortran API]), ++ [ENABLE_FORTRAN=$enableval ++ AC_MSG_RESULT([$enableval])], ++ [ENABLE_FORTRAN=no ++ AC_MSG_RESULT([no])]) ++ ++if test x"$ENABLE_FORTRAN" = "xyes" ; then ++ AC_PROG_F77 ++ if test $F77 = 'g77'; then ++ cfortran_def=g77Fortran ++ elif test $F77 = 'ifort' ; then ++ cfortran_def=INTEL_COMPILER ++ elif test $F77 = 'gfortran' ; then ++ cfortran_def=gFortran ++ elif test $F77 = 'pgif77' ; then ++ cfortran_def=pgiFortran ++ else ++ cfortran_def=f2cFortran ++ fi ++ CFORTRAN_CPPFLAGS="-D$cfortran_def" ++fi ++ ++AC_SUBST([ENABLE_FORTRAN]) ++AM_CONDITIONAL([ENABLE_FORTRAN], test "x$ENABLE_FORTRAN" = "xyes") ++ ++# taken from original configure.in ++# determine system type ++#-------------------------------------------------------------------- ++ ++AC_PROGRAM_CHECK(uname_found, uname, 1, 0) ++if test $uname_found -eq 0 ; then ++ echo "cfitsio: No uname found; setting system type to unknown." ++ system="unknown" ++else ++ system=`uname -s`-`uname -r` ++fi ++case $system in ++ Darwin-*) ++ # For large file support (but may break Absoft compilers): ++ AC_DEFINE(_LARGEFILE_SOURCE) ++ AC_DEFINE(_FILE_OFFSET_BITS,64) ++ ;; ++ HP-UX-*) ++ if test x"$CFORTRAN_CPPFLAGS" = x ; then ++ CFORTRAN_CPPFLAGS="-Dappendus" ++ fi ++ CPPFLAGS="$CPPFLAGS -DPG_PPU" ++ LIBPRE="-Wl," ++ ;; ++ SunOS-5*) ++ if test x"$CFORTRAN_CPPFLAGS" = x ; then ++ CFORTRAN_CPPFLAGS="-Dsolaris" ++ fi ++ # For large file support: ++ AC_DEFINE(_LARGEFILE_SOURCE) ++ AC_DEFINE(_FILE_OFFSET_BITS, 64) ++ ;; ++ IRIX*) ++ CPPFLAGS="$CPPFLAGS -DHAVE_POSIX_SIGNALS" ++ ;; ++ Linux*) ++ AC_DEFINE(_LARGEFILE_SOURCE) ++ AC_DEFINE(_FILE_OFFSET_BITS,64) ++ ;; ++ CYGWIN*) ++ CPPFLAGS="$CPPFLAGS -DHAVE_POSIX_SIGNALS" ++ ;; ++ *) ++ ;; ++esac ++ ++if test x"$ENABLE_FORTRAN" = "xyes" ; then ++ CPPFLAGS="$CPPFLAGS $CFORTRAN_CPPFLAGS" ++fi ++ ++case $CC in ++ gcc) ++ GCCVERSION="`gcc -dumpversion 2>&1`" ++ AC_SUBST(GCCVERSION) ++ changequote(,) ++ if test `echo $GCCVERSION | grep -c '2\.[45678]'` -gt 0 ++ then ++ CFLAGS=`echo $CFLAGS | sed 's:-O[^ ]* *::'` ++# AC_MSG_WARN(This gcc is pretty old. Disabling optimization to be safe.) ++ fi ++ changequote([,]) ++ ;; ++ cc) ++ echo "cfitsio: Old CFLAGS is $CFLAGS" ++ CFLAGS=`echo $CFLAGS | sed -e "s/-g/-O/"` ++ case $system in ++ SunOS-5*) ++ changequote(,) ++ if test `echo $CFLAGS | grep -c fast` -gt 0 ++ then ++ echo "cfitsio: Replacing -fast with -O3" ++ CFLAGS=`echo $CFLAGS | sed 's:-fast:-O3:'` ++ fi ++ changequote([,]) ++ CFLAGS="$CFLAGS -DHAVE_ALLOCA_H -DHAVE_POSIX_SIGNALS" ++ ;; ++ *) ++ echo "== No special changes for $system" ++ ;; ++ esac ++ echo "New CFLAGS is $CFLAGS" ++ ;; ++ *) ++ # Don't do anything now ++ ;; ++esac ++ ++ ++# ================= test for the unix ftruncate function ================ ++ ++AC_MSG_CHECKING("whether ftruncate works") ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ++]], [[ ++ftruncate(0, 0); ++]])],[ ++AC_DEFINE(HAVE_FTRUNCATE) ++AC_MSG_RESULT("yes") ++],[AC_MSG_RESULT("no") ]) ++ ++# --------------------------------------------------------- ++# some systems define long long for 64-bit ints ++# --------------------------------------------------------- ++ ++AC_MSG_CHECKING("whether long long is defined") ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++]], [[ ++long long filler; ++]])],[ ++AC_DEFINE(HAVE_LONGLONG) ++AC_MSG_RESULT("yes") ++],[AC_MSG_RESULT("no") ]) ++ ++# ==================== SHARED MEMORY DRIVER SECTION ======================= ++# ++# 09-Mar-98 : modified by JB/ISDC ++# 3 checks added to support autoconfiguration of shared memory ++# driver. First generic check is made whether shared memory is supported ++# at all, then 2 more specific checks are made (architecture dependent). ++# Currently tested on : sparc-solaris, intel-linux, sgi-irix, dec-alpha-osf ++ ++# ------------------------------------------------------------------------- ++# check is System V IPC is supported on this machine ++# ------------------------------------------------------------------------- ++ ++AC_MSG_CHECKING("whether system V style IPC services are supported") ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ++#include ++#include ++]], [[ ++shmat(0, 0, 0); ++shmdt(0); ++shmget(0, 0, 0); ++semget(0, 0, 0); ++]])], ++[AC_DEFINE(HAVE_SHMEM_SERVICES) ++AC_MSG_RESULT("yes")], ++[AC_MSG_RESULT("no") ]) ++ ++ ++# ------------------------------------------------------------------------- ++# some systems define flock_t, for others we have to define it ourselves ++# ------------------------------------------------------------------------- ++ ++AC_MSG_CHECKING("do we have flock_t defined in sys/fcntl.h") ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++]], [[ ++flock_t filler; ++]])],[ ++AC_DEFINE(HAVE_FLOCK_T) ++AC_MSG_RESULT("yes") ++],[AC_MSG_RESULT("no") ]) ++ ++if test "$HAVE_FLOCK_T" != 1; then ++ AC_MSG_CHECKING("do we have flock_t defined in sys/flock.h") ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++ ]], [[ ++ flock_t filler; ++ ]])],[ ++ AC_DEFINE(HAVE_FLOCK_T) ++ AC_MSG_RESULT("yes") ++ ],[AC_MSG_RESULT("no") ]) ++fi ++ ++# ------------------------------------------------------------------------- ++# there are some idiosyncrasies with semun defs (used in semxxx). Solaris ++# does not define it at all ++# ------------------------------------------------------------------------- ++ ++AC_MSG_CHECKING("do we have union semun defined") ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++#include ++#include ++]], [[ ++union semun filler; ++]])],[ ++AC_DEFINE(HAVE_UNION_SEMUN) ++AC_MSG_RESULT("yes") ++],[AC_MSG_RESULT("no") ]) ++ ++# ==================== END OF SHARED MEMORY DRIVER SECTION ================ ++# ================= test for the unix networking functions ================ ++ ++AC_SEARCH_LIBS([gethostbyname], [nsl], cfitsio_have_nsl=1, cfitsio_have_nsl=0) ++AC_SEARCH_LIBS([connect], [socket], cfitsio_have_socket=1, ++ cfitsio_have_socket=0, [-lnsl]) ++ ++if test "$cfitsio_have_nsl" = 1 -a "$cfitsio_have_socket" = 1; then ++ AC_DEFINE(HAVE_NET_SERVICES) ++fi ++ ++# ==================== END OF unix networking SECTION ================ ++ ++# this quick check will add -lm to LIBS ++AC_CHECK_LIB(m, cos) ++AC_CONFIG_FILES([Makefile cfitsio.pc]) ++AC_OUTPUT +--- Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ Makefile.am 2007-09-10 16:02:13.520646341 +0100 +@@ -0,0 +1,43 @@ ++lib_LTLIBRARIES = libcfitsio.la ++ ++C_SOURCES = \ ++ buffers.c cfileio.c checksum.c compress.c drvrfile.c drvrmem.c \ ++ drvrnet.c drvrsmem.c drvrgsiftp.c editcol.c edithdu.c eval_l.c \ ++ eval_y.c eval_f.c fitscore.c getcol.c getcolb.c getcold.c getcole.c \ ++ getcoli.c getcolj.c getcolk.c getcoll.c getcols.c getcolsb.c \ ++ getcoluk.c getcolui.c getcoluj.c getkey.c group.c grparser.c \ ++ histo.c iraffits.c \ ++ modkey.c putcol.c putcolb.c putcold.c putcole.c putcoli.c \ ++ putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \ ++ putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \ ++ swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \ ++ pliocomp.c fits_hcompress.c fits_hdecompress.c ++ ++F77_SOURCES= ++if ENABLE_FORTRAN ++F77_SOURCES += f77_wrap1.c f77_wrap2.c f77_wrap3.c f77_wrap4.c f77_wrap.h ++endif ++ ++include_HEADERS = fitsio.h fitsio2.h longnam.h drvrsmem.h ++libcfitsio_la_SOURCES = $(C_SOURCES) $(F77_SOURCES) $(include_HEADERS) ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = cfitsio.pc ++ ++LDADD = libcfitsio.la ++noinst_PROGRAMS = testprog speed cookbook ++bin_PROGRAMS = fitscopy imcopy listhead smem ++ ++testprog_SOURCES = testprog.c ++speed_SOURCES = speed.c ++cookbook_SOURCES = cookbook.c ++ ++fitscopy_SOURCES = fitscopy.c ++listhead_SOURCES = listhead.c ++imcopy_SOURCES = imcopy.c ++smem_SOURCES = smem.c ++ ++if ENABLE_FORTRAN ++noinst_PROGRAMS += testf77 ++testf77_SOURCES = testf77.f ++endif +--- cfitsio.pc.in.orig 2007-09-05 12:35:29.153211202 +0100 ++++ cfitsio.pc.in 2007-09-05 12:30:31.664258273 +0100 +@@ -1,10 +1,10 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=${exec_prefix}/lib +-includedir=${prefix}/include ++libdir=@libdir@ ++includedir=@includedir@ + +-Name: cfitsio ++Name: @PACKAGE_NAME@ + Description: FITS File Subroutine Library +-Version: 3.006 +-Libs: -L${libdir} -lcfitsio @LIBS@ -lm ++Version: @PACKAGE_VERSION@ ++Libs: -L${libdir} -lcfitsio @LIBS@ + Cflags: -I${includedir} From crazy at frugalware.org Sat Dec 15 01:57:18 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 01:57:25 2007 Subject: [Frugalware-git] frugalware-current: libggz-0.0.14-1-i686 Message-ID: <20071215005718.48BE0119039F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5eae62ea36c84e5851db78aeaafd643a3670512a commit 5eae62ea36c84e5851db78aeaafd643a3670512a Author: crazy Date: Sat Dec 15 01:57:03 2007 +0100 libggz-0.0.14-1-i686 * New package diff --git a/source/lib-extra/libggz/FrugalBuild b/source/lib-extra/libggz/FrugalBuild new file mode 100644 index 0000000..ad07cfc --- /dev/null +++ b/source/lib-extra/libggz/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.16 SBU +# Maintainer: crazy + +pkgname=libggz +pkgver=0.0.14 +pkgrel=1 +pkgdesc="Low-level library for C development" +url="http://www.ggzgamingzone.org" +depends=('openssl' 'libgcrypt') +groups=('lib-extra') +archs=('i686') +up2date="lynx -dump 'http://ftp.belnet.be/packages/ggzgamingzone/ggz/?C=M;O=A'| grep '/[0-9]'|tail -n1|sed 's/.*z\/\(.*\)\//\1/'" +source=(http://ftp.belnet.be/packages/ggzgamingzone/ggz/$pkgver/$pkgname-$pkgver.tar.gz) +Fconfopts="$Fconfopts --disable-debug --with-tls=OpenSSL" +sha1sums=('fd4d24e2b429da7f947df79d062b2ba005206c0e') + +# optimization OK From crazy at frugalware.org Sat Dec 15 02:06:38 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 02:06:42 2007 Subject: [Frugalware-git] frugalware-current: ggz-client-libs-0.0.14-1-i686 Message-ID: <20071215010638.D796111901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ce118b807edb921bbaa111fbbd2051c2cc063ce9 commit ce118b807edb921bbaa111fbbd2051c2cc063ce9 Author: crazy Date: Sat Dec 15 02:06:08 2007 +0100 ggz-client-libs-0.0.14-1-i686 * New package diff --git a/source/lib-extra/ggz-client-libs/FrugalBuild b/source/lib-extra/ggz-client-libs/FrugalBuild new file mode 100644 index 0000000..29bbbcd --- /dev/null +++ b/source/lib-extra/ggz-client-libs/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.16 SBU +# Maintainer: crazy + +pkgname=ggz-client-libs +pkgver=0.0.14 +pkgrel=1 +pkgdesc="Client libraries for GGZ gaming zone" +url="http://www.ggzgamingzone.org" +depends=('libggz' 'expat') +groups=('lib-extra') +archs=('i686') +up2date="lynx -dump 'http://ftp.belnet.be/packages/ggzgamingzone/ggz/?C=M;O=A'| grep '/[0-9]'|tail -n1|sed 's/.*z\/\(.*\)\//\1/'" +source=(http://ftp.belnet.be/packages/ggzgamingzone/ggz/$pkgver/$pkgname-$pkgver.tar.gz) +Fconfopts="$Fconfopts --disable-debug" +sha1sums=('d36740e939828a1253788efe998a4109a49bed10') + +# optimization OK From devil505linux at gmail.com Sat Dec 15 14:34:28 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Dec 15 14:34:30 2007 Subject: [Frugalware-git] frugalware-current: warzone2100-2.0.9-1-i686 Message-ID: <20071215133428.22A8A11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b27551672620887b37cf62213a61251716f9528a commit b27551672620887b37cf62213a61251716f9528a Author: Devil505 Date: Sat Dec 15 14:34:12 2007 +0100 warzone2100-2.0.9-1-i686 *New Package *Closed FS#2633 diff --git a/source/games-extra/warzone2100/FrugalBuild b/source/games-extra/warzone2100/FrugalBuild new file mode 100644 index 0000000..54f7a16 --- /dev/null +++ b/source/games-extra/warzone2100/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.79 SBU +# Maintainer: Devil505 + +pkgname=warzone2100 +pkgver=2.0.9 +pkgrel=1 +pkgdesc="3D realtime strategy game on a future Earth" +url="http://wz2100.net" +depends=('physfs' 'libpng' 'libjpeg' 'sdl_net' 'mesa' 'openal' 'libvorbis' 'libmad') +makedepends=('gawk' 'bison' 'flex' 'zip') +groups=('games-extra') +archs=('i686') +up2date="lynx -dump $url/downloads | Flasttar" +source=(http://download.gna.org/warzone/releases/2.0/$pkgname-$pkgver.tar.bz2) +sha1sums=('17207865805429664266d85ecf9a6a8a5e68c42b') + +build() +{ + Fcd + sh autogen.sh || Fdie + Fbuild +} + +# optimization OK \ No newline at end of file From devil505linux at gmail.com Sat Dec 15 14:56:30 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Dec 15 14:56:32 2007 Subject: [Frugalware-git] frugalware-current: man-pages-fr-2.61.0-1-i686 Message-ID: <20071215135630.F03F611901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c8b9693efbbe7bddc016eefd51431151062d0312 commit c8b9693efbbe7bddc016eefd51431151062d0312 Author: Devil505 Date: Sat Dec 15 14:52:52 2007 +0100 man-pages-fr-2.61.0-1-i686 *Version Bump diff --git a/source/locale-extra/man-pages-fr/FrugalBuild b/source/locale-extra/man-pages-fr/FrugalBuild index f7a715b..e28f547 100644 --- a/source/locale-extra/man-pages-fr/FrugalBuild +++ b/source/locale-extra/man-pages-fr/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=man-pages-fr -pkgver=2.59.0 +pkgver=2.61.0 pkgrel=1 pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" From vmiklos at frugalware.org Sat Dec 15 15:02:51 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:02:53 2007 Subject: [Frugalware-git] frugalware-current: bash-3.2_033-1-i686 Message-ID: <20071215140252.0769A11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59792792d9d687b92c385deb82685c0c872e28bc commit 59792792d9d687b92c385deb82685c0c872e28bc Author: Miklos Vajna Date: Sat Dec 15 15:02:32 2007 +0100 bash-3.2_033-1-i686 update to patchlevel '033' diff --git a/source/base/bash/FrugalBuild b/source/base/bash/FrugalBuild index 179c16b..21e5a8c 100644 --- a/source/base/bash/FrugalBuild +++ b/source/base/bash/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bash basever=3.2 -patchver=025 +patchver=033 if [ -z "$patchver" ]; then pkgver=$basever else From vmiklos at frugalware.org Sat Dec 15 15:11:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:11:25 2007 Subject: [Frugalware-git] frugalware-current: perl-xml-2.36-1-i686 Message-ID: <20071215141118.55E1411904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=60b52f4495c142a19b36bc9e85cb4d5928a11e03 commit 60b52f4495c142a19b36bc9e85cb4d5928a11e03 Author: Miklos Vajna Date: Sat Dec 15 15:05:47 2007 +0100 perl-xml-2.36-1-i686 version bump diff --git a/source/devel/perl-xml/FrugalBuild b/source/devel/perl-xml/FrugalBuild index 1adae3c..3743548 100644 --- a/source/devel/perl-xml/FrugalBuild +++ b/source/devel/perl-xml/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: Zsolt Szalai pkgname=perl-xml -pkgver=2.34 -pkgrel=4 +pkgver=2.36 +pkgrel=1 pkgdesc="interface to James Clark's XML parser, expat" url="http://perl-xml.sourceforge.net/" depends=('perl' 'expat>=2.0.1') @@ -12,7 +12,7 @@ groups=('devel') archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.cpan.org/modules/by-module/XML/?M=D'|grep XML-Parser-[0-9\.]*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(http://www.cpan.org/modules/by-module/XML/XML-Parser-$pkgver.tar.gz) -sha1sums=('253cb641057d929616622408de5a572ab37a8df9') +sha1sums=('74acac4f939ebf788d8ef5163cbc9802b1b04bfa') build() { cd $startdir/src/XML-Parser-$pkgver From vmiklos at frugalware.org Sat Dec 15 15:11:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:11:27 2007 Subject: [Frugalware-git] frugalware-current: perl-term-readpassword-0.11-1-i686 Message-ID: <20071215141118.4046B11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=511fca7cf8cc87187304a26185c8ae2116d53212 commit 511fca7cf8cc87187304a26185c8ae2116d53212 Author: Miklos Vajna Date: Sat Dec 15 15:04:21 2007 +0100 perl-term-readpassword-0.11-1-i686 version bump diff --git a/source/devel/perl-term-readpassword/FrugalBuild b/source/devel/perl-term-readpassword/FrugalBuild index f857f48..f9bbcdf 100644 --- a/source/devel/perl-term-readpassword/FrugalBuild +++ b/source/devel/perl-term-readpassword/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=Term-ReadPassword _F_perl_author=P/PH/PHOENIX -pkgver=0.07 +pkgver=0.11 pkgdesc="Asking the user for a password" Finclude perl -pkgrel=2 +pkgrel=1 archs=('i686' 'x86_64') -sha1sums=('10689c1dca095e5daba93d61e67cf5d9baa91837') +sha1sums=('d68542a617f3fa8aa26c3c081302cdc4e0cd6b42') groups=('devel') From vmiklos at frugalware.org Sat Dec 15 15:11:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:11:30 2007 Subject: [Frugalware-git] frugalware-current: perl-sgml-parser-opensp-0.991-1-i686 Message-ID: <20071215141118.8D4BB11904D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0949889eaff2d61c855b51b35bfe87bc1ed340a9 commit 0949889eaff2d61c855b51b35bfe87bc1ed340a9 Author: Miklos Vajna Date: Sat Dec 15 15:07:11 2007 +0100 perl-sgml-parser-opensp-0.991-1-i686 version bump diff --git a/source/devel-extra/perl-sgml-parser-opensp/FrugalBuild b/source/devel-extra/perl-sgml-parser-opensp/FrugalBuild index 2194820..6b6a8f7 100644 --- a/source/devel-extra/perl-sgml-parser-opensp/FrugalBuild +++ b/source/devel-extra/perl-sgml-parser-opensp/FrugalBuild @@ -3,11 +3,11 @@ _F_perl_name=SGML-Parser-OpenSP _F_perl_author=B/BJ/BJOERN -pkgver=0.99 +pkgver=0.991 pkgdesc="Parse SGML documents using OpenSP" Finclude perl depends=(${depends[@]} 'libstdc++' 'opensp') archs=('i686' 'x86_64') -sha1sums=('5bb63a184aeff8282c396ce1588937e2197ef94e') +sha1sums=('dc1b86329fcc31c8720ee6b592ae1e6e5fdf63cd') # optimization OK From vmiklos at frugalware.org Sat Dec 15 15:11:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:11:32 2007 Subject: [Frugalware-git] frugalware-current: perl-config-general-2.37-1-i686 Message-ID: <20071215141118.7183711904D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ecc4335836b0314ec3052d1632c15ffc55905c45 commit ecc4335836b0314ec3052d1632c15ffc55905c45 Author: Miklos Vajna Date: Sat Dec 15 15:06:26 2007 +0100 perl-config-general-2.37-1-i686 version bump diff --git a/source/devel-extra/perl-config-general/FrugalBuild b/source/devel-extra/perl-config-general/FrugalBuild index fd34e90..145ebb4 100644 --- a/source/devel-extra/perl-config-general/FrugalBuild +++ b/source/devel-extra/perl-config-general/FrugalBuild @@ -4,11 +4,11 @@ pkgname=perl-config-general _F_perl_name=Config-General _F_perl_author=T/TL/TLINDEN -pkgver=2.36 +pkgver=2.37 pkgrel=1 pkgdesc="Generic Config Module" depends=('perl') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('31de3e22a328bb55a4d35dcb445f299b46aea828') +sha1sums=('ed976015cb75d9118670963d636a0beb6fcbc2d2') From vmiklos at frugalware.org Sat Dec 15 15:11:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:11:33 2007 Subject: [Frugalware-git] frugalware-current: perl-log-log4perl-1.14-1-i686 Message-ID: <20071215141118.9964911904D4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=89d6a3f8ff845066fe1e0e8e995e9fed3cfa14b8 commit 89d6a3f8ff845066fe1e0e8e995e9fed3cfa14b8 Author: Miklos Vajna Date: Sat Dec 15 15:07:52 2007 +0100 perl-log-log4perl-1.14-1-i686 version bump diff --git a/source/devel-extra/perl-log-log4perl/FrugalBuild b/source/devel-extra/perl-log-log4perl/FrugalBuild index 1223d78..ed6a956 100644 --- a/source/devel-extra/perl-log-log4perl/FrugalBuild +++ b/source/devel-extra/perl-log-log4perl/FrugalBuild @@ -3,8 +3,8 @@ _F_perl_name=Log-Log4perl _F_perl_author=M/MS/MSCHILLI -pkgver=1.13 +pkgver=1.14 pkgdesc="Log4j implementation for Perl" Finclude perl archs=('i686' 'x86_64') -sha1sums=('944e7b36f26a276ce7e6f7aa1056ec82900e6bdc') +sha1sums=('38934b23f3ea3e04cec985caca4ce6803dda3537') From vmiklos at frugalware.org Sat Dec 15 15:11:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:11:35 2007 Subject: [Frugalware-git] frugalware-current: perl-yaml-syck-1.00-1-i686 Message-ID: <20071215141118.B3C8211904D5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07a1d2e283ea4feef737b2b8c843753e5fe83fc7 commit 07a1d2e283ea4feef737b2b8c843753e5fe83fc7 Author: Miklos Vajna Date: Sat Dec 15 15:08:46 2007 +0100 perl-yaml-syck-1.00-1-i686 version bump diff --git a/source/devel-extra/perl-yaml-syck/FrugalBuild b/source/devel-extra/perl-yaml-syck/FrugalBuild index 931667a..abbfcc5 100644 --- a/source/devel-extra/perl-yaml-syck/FrugalBuild +++ b/source/devel-extra/perl-yaml-syck/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=YAML-Syck _F_perl_author=A/AU/AUDREYT -pkgver=0.99 +pkgver=1.00 pkgdesc="Fast, lightweight YAML loader and dumper" Finclude perl archs=('i686' 'x86_64') -sha1sums=('ba860f0e718867fa9b02861a3bd1d56ca4b7c3fb') +sha1sums=('f13c7f87bd624051d4d38bbba101ebd880087457') # optimization OK From vmiklos at frugalware.org Sat Dec 15 15:11:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:11:37 2007 Subject: [Frugalware-git] frugalware-current: perl-fuse-0.09-1-i686 Message-ID: <20071215141118.D52CC11904D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=63131e43da4de30b9e01c261a279bee781aa1555 commit 63131e43da4de30b9e01c261a279bee781aa1555 Author: Miklos Vajna Date: Sat Dec 15 15:09:44 2007 +0100 perl-fuse-0.09-1-i686 version bump diff --git a/source/devel-extra/perl-fuse/FrugalBuild b/source/devel-extra/perl-fuse/FrugalBuild index f2e6dd2..53a929c 100644 --- a/source/devel-extra/perl-fuse/FrugalBuild +++ b/source/devel-extra/perl-fuse/FrugalBuild @@ -4,13 +4,13 @@ pkgname=perl-fuse _F_perl_name=Fuse _F_perl_author=D/DP/DPAVLIN -pkgver=0.08 +pkgver=0.09 pkgrel=1 pkgdesc="Write filesystems in Perl using FUSE." depends=('perl' 'fuse') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('df0e545fe43a1ccc5d7f470834504a0657c2dd18') +sha1sums=('aa0c254b1a62f0d84ca46060652c0499f1b1b975') # optimization OK From vmiklos at frugalware.org Sat Dec 15 15:11:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:11:38 2007 Subject: [Frugalware-git] frugalware-current: perl-cgi-3.31-1-i686 Message-ID: <20071215141118.E59A411904D7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6337a1ea85e63e27822615e5b4ad700e939538e5 commit 6337a1ea85e63e27822615e5b4ad700e939538e5 Author: Miklos Vajna Date: Sat Dec 15 15:10:22 2007 +0100 perl-cgi-3.31-1-i686 version bump diff --git a/source/devel-extra/perl-cgi/FrugalBuild b/source/devel-extra/perl-cgi/FrugalBuild index c939e2f..5485c45 100644 --- a/source/devel-extra/perl-cgi/FrugalBuild +++ b/source/devel-extra/perl-cgi/FrugalBuild @@ -5,7 +5,7 @@ pkgname=perl-cgi _F_perl_name=cgi modrealname=CGI.pm _F_perl_author=L/LD/LDS -pkgver=3.29 +pkgver=3.31 pkgrel=1 pkgdesc="Simple Common Gateway Interface Class" depends=('perl') @@ -24,5 +24,5 @@ build() { Frm /usr/share/man/man3 Frm /usr/man/man3 } -sha1sums=('db5db74d2377a322f68bbc4798e95636d151bd45'\ +sha1sums=('da555876b39376a844e4f44eb9b6b112a9fa7634' \ 'd11ecb0d06afd0aacd0291708c5fac1656adb6a0') From vmiklos at frugalware.org Sat Dec 15 15:11:19 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 15:11:40 2007 Subject: [Frugalware-git] frugalware-current: perl-html-encoding-0.56-1-i686 Message-ID: <20071215141119.0985911904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=25b1d6c598aac02c0ced41d69a2ebb4d1e5af512 commit 25b1d6c598aac02c0ced41d69a2ebb4d1e5af512 Author: Miklos Vajna Date: Sat Dec 15 15:10:56 2007 +0100 perl-html-encoding-0.56-1-i686 version bump diff --git a/source/devel-extra/perl-html-encoding/FrugalBuild b/source/devel-extra/perl-html-encoding/FrugalBuild index 90ef89a..de539e7 100644 --- a/source/devel-extra/perl-html-encoding/FrugalBuild +++ b/source/devel-extra/perl-html-encoding/FrugalBuild @@ -3,8 +3,8 @@ _F_perl_name=HTML-Encoding _F_perl_author=B/BJ/BJOERN -pkgver=0.53 +pkgver=0.56 pkgdesc="Determine the encoding of HTML/XML/XHTML documents" Finclude perl archs=('i686' 'x86_64') -sha1sums=('bed06ee0b737e137c035089e99f950df664d7e55') +sha1sums=('cbf819d85268a76456b3e86333f2e9989ca4b368') From crazy at frugalware.org Sat Dec 15 19:55:44 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 19:55:46 2007 Subject: [Frugalware-git] frugalware-current: coccinella-0.96.4-1-i686 Message-ID: <20071215185544.70BFA11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00ed028d8bf308d3e349b8ac9c4871e80721bb9d commit 00ed028d8bf308d3e349b8ac9c4871e80721bb9d Author: crazy Date: Sat Dec 15 19:53:39 2007 +0100 coccinella-0.96.4-1-i686 * Version bump * depends() -> rodepends() * updated rodepends() * added missing Fdie's * removed windows and *BSD files from fpm diff --git a/source/xapps-extra/coccinella/FrugalBuild b/source/xapps-extra/coccinella/FrugalBuild index 2de0aa5..3e116c2 100644 --- a/source/xapps-extra/coccinella/FrugalBuild +++ b/source/xapps-extra/coccinella/FrugalBuild @@ -2,10 +2,11 @@ # Maintainer: crazy pkgname=coccinella -pkgver=0.96.2 +pkgver=0.96.4 pkgrel=1 pkgdesc="A Jabber instant messaging client." -depends=('tk') +depends=() +rodepends=('tk' 'alsa-lib' 'qt' 'libgl' 'libxmu' 'libxi' 'libstdc++' 'libxdamage' 'libxscrnsaver') groups=('xapps-extra') archs=('i686' 'x86_64') options=('nodocs' 'nostrip') @@ -18,11 +19,12 @@ build() { Fcd Coccinella-${pkgver}Src Fmkdir usr/lib/$pkgname usr/share/doc/$pkgname-$pkgver - cp -Ra * $Fdestdir/usr/lib/$pkgname/ + rm -rf bin/{macintosh,macosx,windows,unix/NetBSD} || Fdie + cp -Ra * $Fdestdir/usr/lib/$pkgname/ || Fdie mv $Fdestdir/usr/lib/$pkgname/{docs,README*,CHANGES*} \ - $Fdestdir/usr/share/doc/$pkgname-$pkgver - chmod 0755 $Fdestdir/usr/lib/$pkgname/Coccinella.tcl + $Fdestdir/usr/share/doc/$pkgname-$pkgver || Fdie + chmod 0755 $Fdestdir/usr/lib/$pkgname/Coccinella.tcl || Fdie Fln /usr/lib/$pkgname/Coccinella.tcl /usr/bin/$pkgname Fdesktop "/usr/bin/$pkgname" "/usr/lib/$pkgname/images/$pkgname.ico" "Network;InstantMessaging;" } -sha1sums=('c14756f307e7e789bb93bc72ab8df3af00edd782') +sha1sums=('d00e82d69d71419f825157198666a0c2f6e18540') From crazy at frugalware.org Sat Dec 15 20:03:05 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 20:03:07 2007 Subject: [Frugalware-git] frugalware-current: poppler-data-0.2.0-1-i686 Message-ID: <20071215190305.43EBD11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=05a7728b1eb3c2f1eb937a99bdf89a504c58bab4 commit 05a7728b1eb3c2f1eb937a99bdf89a504c58bab4 Author: crazy Date: Sat Dec 15 20:01:30 2007 +0100 poppler-data-0.2.0-1-i686 * Version bump diff --git a/source/apps/poppler-data/FrugalBuild b/source/apps/poppler-data/FrugalBuild index dd8786f..606eeb9 100644 --- a/source/apps/poppler-data/FrugalBuild +++ b/source/apps/poppler-data/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=poppler-data -pkgver=0.1.1 +pkgver=0.2.0 pkgrel=1 pkgdesc="Encoding files for poppler" url="http://poppler.freedesktop.org/" @@ -11,7 +11,7 @@ groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump http://poppler.freedesktop.org/|grep -m1 'poppler-data-\(.*\).tar.gz'|Flasttar" source=(http://poppler.freedesktop.org/$pkgname-$pkgver.tar.gz) -sha1sums=('97b888dfd70280bd8dcfd70391bd603d51655fa9') +sha1sums=('8961890a8d1de749a25533f8dc03b6d8321c4a20') build() { From crazy at frugalware.org Sat Dec 15 20:05:51 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 20:05:55 2007 Subject: [Frugalware-git] frugalware-current: perl-mailtools-2.02-1-i686 Message-ID: <20071215190552.03E0E1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b743aa95aefbbdbecc8fcda8a30aeba93d0d0088 commit b743aa95aefbbdbecc8fcda8a30aeba93d0d0088 Author: crazy Date: Sat Dec 15 20:05:33 2007 +0100 perl-mailtools-2.02-1-i686 * Version bump diff --git a/source/devel-extra/perl-mailtools/FrugalBuild b/source/devel-extra/perl-mailtools/FrugalBuild index 2f06f58..a039b61 100644 --- a/source/devel-extra/perl-mailtools/FrugalBuild +++ b/source/devel-extra/perl-mailtools/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=perl-mailtools -pkgver=2.00_03 +pkgver=2.02 pkgrel=1 pkgdesc="Manipulate email in perl programs" url="http://cpan.org/" @@ -27,6 +27,5 @@ build() { find $startdir/pkg/usr/lib/perl5/site_perl/current/ -name .packlist -exec rm {} \; } -# optimalization OK -sha1sums=('6a8621faf3629b42767dc404604008b43516337a') +sha1sums=('96e5c6afb3ce1492bbec71cbcc4f247581037733') From janny at frugalware.org Sat Dec 15 20:13:58 2007 From: janny at frugalware.org (janny) Date: Sat Dec 15 20:14:00 2007 Subject: [Frugalware-git] frugalware-current: devede-3.6-1-i686 Message-ID: <20071215191358.A684A11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53927762411a0098e33012b9d3f6e6e7319d26d5 commit 53927762411a0098e33012b9d3f6e6e7319d26d5 Author: janny Date: Sat Dec 15 20:13:19 2007 +0100 devede-3.6-1-i686 * new package diff --git a/source/xmultimedia-extra/devede/FrugalBuild b/source/xmultimedia-extra/devede/FrugalBuild new file mode 100644 index 0000000..7fe996d --- /dev/null +++ b/source/xmultimedia-extra/devede/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Janny + +pkgname=devede +pkgver=3.6 +pkgrel=1 +pkgdesc="DVD Video Creator" +rodepends=('gtk+' 'python' 'pygtk' 'mplayer' 'dvdauthor' 'vcdimager' 'cdrtools') +archs=('i686' 'x86_64') +groups=('xmultimedia-extra') +url=("http://www.rastersoft.com/programas/devede.html") +source=(http://www.rastersoft.com/descargas/${pkgname}-${pkgver}.tar.bz2) +up2date="lynx -dump 'http://www.rastersoft.com/programas/devede.html'|grep 'Current version'|sed 's/.*version\: \(.*\).*/\1/'" +sha1sums=('b10b3071a1cd814c3be8495ce884a57419e9d66e') + +build() { + Fcd + ./install.sh prefix="/usr" DESTDIR="${Fdestdir}" || Fdie +} From crazy at frugalware.org Sat Dec 15 20:44:15 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 20:44:20 2007 Subject: [Frugalware-git] frugalware-current: fltk2-r5990-1-i686 Message-ID: <20071215194415.CB5E011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e5f96547727fb2a3dc739f6d621a6082e96ed3f7 commit e5f96547727fb2a3dc739f6d621a6082e96ed3f7 Author: crazy Date: Sat Dec 15 20:42:39 2007 +0100 fltk2-r5990-1-i686 * Version bump * fixed C{XX}FLAGS * some build() fixes diff --git a/source/xlib-extra/fltk2/FrugalBuild b/source/xlib-extra/fltk2/FrugalBuild index 4b83bef..41f8501 100644 --- a/source/xlib-extra/fltk2/FrugalBuild +++ b/source/xlib-extra/fltk2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=fltk2 -pkgver=r5963 +pkgver=r5990 origname=fltk-2.0.x-${pkgver} pkgrel=1 pkgdesc="FLTK2 is a cross-platform C++ GUI toolkit for X." @@ -15,25 +15,29 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.fltk.org/|grep -m1 'VERSION=2'|sed 's/.*=2.*.x-\(.*\).*/\1/'" source=(http://ftp.easysw.com/pub/fltk/snapshots/$origname.tar.bz2 \ disable_crappy_test.patch) -sha1sums=('98ab5e37334fa47c292e8da5e948515ee2581fc8' \ +sha1sums=('3088429cd846dc3ad79244b4da0baf20164780c3' \ '007ac0c6e19ea5afa4c8e7eb34bf480ab2f18f74') build() { Fcd $origname + Fpatchall autoconf || return 1 Fsed '$(bindir)/fltk2-config --post' \ '$(DESTDIR)$(bindir)/fltk2-config --post' fluid/Makefile - Fbuild --enable-threads --enable-xft \ + CFLAGS="$CFLAGS -fno-strict-aliasing" CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" \ + ./configure $Fconfopts --enable-threads --enable-xft \ --with-x --enable-cairo \ - --with-optim="$CXXFLAGS" \ + --with-optim="$CXXFLAGS -fno-strict-aliasing" \ --enable-shared + make || Fdie + Fmakeinstall ## lalala not - implemented - heh ## man pages missing as well but I don't write any :-P ## themes broken - cd documentation + cd documentation || Fdie doxygen || Fdie - cd .. + cd .. || Fdie Fmkdir usr/share/doc/$pkgname-$pkgver - cp -Ra documentation $Fdestdir/usr/share/doc/$pkgname-$pkgver/ + cp -Ra documentation $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie } From vmiklos at frugalware.org Sat Dec 15 21:06:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 21:06:12 2007 Subject: [Frugalware-git] frugalware-current: mbrola-301h-2-i686 Message-ID: <20071215200610.D4F5C11903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a46cb8f66ecd3203a570bf5fa0ba2885e92e76cd commit a46cb8f66ecd3203a570bf5fa0ba2885e92e76cd Author: Miklos Vajna Date: Sat Dec 15 20:43:55 2007 +0100 mbrola-301h-2-i686 added a missing symlink (required by freetts, maybe by others, too) diff --git a/source/apps-extra/mbrola/FrugalBuild b/source/apps-extra/mbrola/FrugalBuild index a87a4aa..626a495 100644 --- a/source/apps-extra/mbrola/FrugalBuild +++ b/source/apps-extra/mbrola/FrugalBuild @@ -3,7 +3,7 @@ pkgname=mbrola pkgver=301h -pkgrel=1 +pkgrel=2 pkgdesc="Speech synthesizer based on the concatenation of diphones." url="http://tcts.fpms.ac.be/synthesis/mbrola/" depends=('glibc') @@ -17,6 +17,7 @@ build() { Fexe mbrola-linux-i386 /usr/bin/mbrola Fdoc readme.txt + Fmkdir /usr/share/mbrola + # this symlink is needed by java apps like freetts + Fln /usr/bin/mbrola /usr/share/mbrola/mbrola } - -# vim: ft=sh From janny at frugalware.org Sat Dec 15 21:28:15 2007 From: janny at frugalware.org (janny) Date: Sat Dec 15 21:28:20 2007 Subject: [Frugalware-git] frugalware-current: kcheckgmail-0.5.7.4-1-i686 Message-ID: <20071215202816.096B211904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d9eff02a31474b1b6e07665e34c207b744c59fe commit 8d9eff02a31474b1b6e07665e34c207b744c59fe Author: janny Date: Sat Dec 15 21:27:47 2007 +0100 kcheckgmail-0.5.7.4-1-i686 * version bump diff --git a/source/kde-extra/kcheckgmail/FrugalBuild b/source/kde-extra/kcheckgmail/FrugalBuild index 06dc3bd..99c9313 100644 --- a/source/kde-extra/kcheckgmail/FrugalBuild +++ b/source/kde-extra/kcheckgmail/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=kcheckgmail -pkgver=0.5.7.3 +pkgver=0.5.7.4 pkgrel=1 pkgdesc="KCheckGmail is a system tray application to notify you about how many email messages you have in your Gmail account." license="GPL" @@ -12,6 +12,6 @@ groups=('kde-extra') _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 Finclude kde sourceforge -sha1sums=('f0055a13b72e0d5e27644e875bf079f072589c3f') +sha1sums=('2a257d396149bc1845d9bef000e5f65e43ba00dd') # optimization ok From crazy at frugalware.org Sat Dec 15 21:28:35 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 21:28:37 2007 Subject: [Frugalware-git] frugalware-current: wine-0.9.51-1-i686 Message-ID: <20071215202835.6EFBF11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d91928fdeda6a7ac487a6d5620604c77bc5b2e49 commit d91928fdeda6a7ac487a6d5620604c77bc5b2e49 Author: crazy Date: Sat Dec 15 21:23:30 2007 +0100 wine-0.9.51-1-i686 * Version bump diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild index 5af4864..799e3db 100644 --- a/source/xapps/wine/FrugalBuild +++ b/source/xapps/wine/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=wine -pkgver=0.9.50 +pkgver=0.9.51 pkgrel=1 pkgdesc="An Open Source implementation of the Windows API on top of X and Unix" _F_sourceforge_ext=".tar.bz2" @@ -30,7 +30,7 @@ build() Frcd2 } -sha1sums=('5a4111e60b2e38f3eb0a2b4d9bc3de55498be5c1' \ +sha1sums=('d08a4c4cd1f21859e25902bf634e13277d3e89e0' \ 'a9c70a49cef90cf60c2e90e63753858387f7117a' \ 'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \ '8b0f7b52885c8d78ba3096a16e9caff60ffe624f') From vmiklos at frugalware.org Sat Dec 15 21:38:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Dec 15 21:38:06 2007 Subject: [Frugalware-git] frugalware-current: freetts-1.2.1-1-i686 Message-ID: <20071215203803.BD8D511904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=213a98d23b8b0ae17dc48eb526c5d7e5ee800924 commit 213a98d23b8b0ae17dc48eb526c5d7e5ee800924 Author: Miklos Vajna Date: Sat Dec 15 21:37:26 2007 +0100 freetts-1.2.1-1-i686 new package requested by crazy diff --git a/source/apps-extra/freetts/FrugalBuild b/source/apps-extra/freetts/FrugalBuild new file mode 100644 index 0000000..1276a1c --- /dev/null +++ b/source/apps-extra/freetts/FrugalBuild @@ -0,0 +1,41 @@ +# Compiling Time: 0.26 SBU +# Maintainer: VMiklos + +pkgname=freetts +pkgver=1.2.1 +pkgrel=1 +pkgdesc="A speech synthesizer." +_F_sourceforge_prefix="FreeTTS " +_F_sourceforge_ext="-src.zip" +Finclude sourceforge java +unset depends +rodepends=('j2re') +makedepends=(${makedepends[@]} 'sharutils') +source=($source jsapi-nointeractive.diff) +groups=('apps-extra') +archs=('i686') +sha1sums=('e6369ad7d971a0900998061d635d5b17b882b144' \ + '18cfd2e9c66d5de96148d120b8ae09ef3fac9a07') + +# strange. it builds with gcj but gij can't run it + +build() +{ + Fcd + Fjavacleanup + cd lib + Fpatchall + chmod +x jsapi.sh + ./jsapi.sh || return 1 + cd .. + + ant jars || return 1 + + Fjar lib/*.jar mbrola/*.jar + echo -e "#!/bin/sh\n\ngij -cp /usr/share/java/freetts.jar com.sun.speech.freetts.FreeTTS \"\$@\"" > freetts + Fexerel /usr/bin/freetts + Ffilerel /usr/share/$pkgname/speech.properties + cp -a demo $Fdestdir/usr/share/$pkgname + cp -a tools $Fdestdir/usr/share/$pkgname + Fdocrel README.txt RELEASE_NOTES acknowledgments.txt +} diff --git a/source/apps-extra/freetts/jsapi-nointeractive.diff b/source/apps-extra/freetts/jsapi-nointeractive.diff new file mode 100644 index 0000000..51b996a --- /dev/null +++ b/source/apps-extra/freetts/jsapi-nointeractive.diff @@ -0,0 +1,194 @@ +--- jsapi.sh 2001-12-20 09:51:28.000000000 -0500 ++++ jsapi-nointeractive.sh 2004-03-20 01:36:10.021810888 -0500 +@@ -10,191 +10,6 @@ + # ------ ---------- ------------------------------------------ + # 51811 -rw-rw-r-- jsapi.jar + # +-more <<- xxxFOOxxx +- +- Sun Microsystems, Inc. +- Binary Code License Agreement +- +-READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE +-TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE +-MEDIA PACKAGE. BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE +-TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING THE SOFTWARE +-ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING +-THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE +-TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE +-OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED +-ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS +-AGREEMENT. +- +-1. LICENSE TO USE. Sun grants you a non-exclusive and +-non-transferable license for the internal use only of the accompanying +-software and documentation and any error corrections provided by Sun +-(collectively "Software"), by the number of users and the class of +-computer hardware for which the corresponding fee has been paid. +- +-2. RESTRICTIONS. Software is confidential and copyrighted. Title to +-Software and all associated intellectual property rights is retained by +-Sun and/or its licensors. Except as specifically authorized in any +-Supplemental License Terms, you may not make copies of Software, other +-than a single copy of Software for archival purposes. Unless +-enforcement is prohibited by applicable law, you may not modify, +-decompile, or reverse engineer Software. You acknowledge that Software +-is not designed, licensed or intended for use in the design, +-construction, operation or maintenance of any nuclear facility. Sun +-disclaims any express or implied warranty of fitness for such uses. No +-right, title or interest in or to any trademark, service mark, logo or +-trade name of Sun or its licensors is granted under this Agreement. +- +-3. LIMITED WARRANTY. Sun warrants to you that for a period of ninety +-(90) days from the date of purchase, as evidenced by a copy of the +-receipt, the media on which Software is furnished (if any) will be free +-of defects in materials and workmanship under normal use. Except for +-the foregoing, Software is provided "AS IS". Your exclusive remedy and +-Sun's entire liability under this limited warranty will be at Sun's +-option to replace Software media or refund the fee paid for Software. +- +-4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREEMENT, ALL +-EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +-INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE +-EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. +- +-5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN +-NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, +-PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR +-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, +-ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, +-EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no +-event will Sun's liability to you, whether in contract, tort (including +-negligence), or otherwise, exceed the amount paid by you for Software +-under this Agreement. The foregoing limitations will apply even if the +-above stated warranty fails of its essential purpose. +- +-6. Termination. This Agreement is effective until terminated. You +-may terminate this Agreement at any time by destroying all copies of +-Software. This Agreement will terminate immediately without notice +-from Sun if you fail to comply with any provision of this Agreement. +-Upon Termination, you must destroy all copies of Software. +- +-7. Export Regulations. All Software and technical data delivered under +-this Agreement are subject to US export control laws and may be subject +-to export or import regulations in other countries. You agree to +-comply strictly with all such laws and regulations and acknowledge that +-you have the responsibility to obtain such licenses to export, +-re-export, or import as may be required after delivery to you. +- +-8. U.S. Government Restricted Rights. If Software is being acquired +-by or on behalf of the U.S. Government or by a U.S. Government prime +-contractor or subcontractor (at any tier), then the Government's rights +-in Software and accompanying documentation will be only as set forth in +-this Agreement; this is in accordance with 48 CFR 227.7201 through +-227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 +-CFR 2.101 and 12.212 (for non-DOD acquisitions). +- +-9. Governing Law. Any action related to this Agreement will be +-governed by California law and controlling U.S. federal law. No choice +-of law rules of any jurisdiction will apply. +- +-10. Severability. If any provision of this Agreement is held to be +-unenforceable, this Agreement will remain in effect with the provision +-omitted, unless omission would frustrate the intent of the parties, in +-which case this Agreement will immediately terminate. +- +-11. Integration. This Agreement is the entire agreement between you +-and Sun relating to its subject matter. It supersedes all prior or +-contemporaneous oral or written communications, proposals, +-representations and warranties and prevails over any conflicting or +-additional terms of any quote, order, acknowledgment, or other +-communication between the parties relating to its subject matter during +-the term of this Agreement. No modification of this Agreement will be +-binding, unless in writing and signed by an authorized representative +-of each party. +- +- JAVA(TM) SPEECH API (JSAPI) SPECIFICATION IMPLEMETATION, VERSION +- 1.0 +- SUPPLEMENTAL LICENSE TERMS +- +-These supplemental license terms ("Supplemental Terms") add to or +-modify the terms of the Binary Code License Agreement (collectively, +-the "Agreement"). Capitalized terms not defined in these Supplemental +-Terms shall have the same meanings ascribed to them in the Agreement. +-These Supplemental Terms shall supersede any inconsistent or +-conflicting terms in the Agreement, or in any license contained within +-the Software. +- +-1. Software Internal Use and Development License Grant. Subject to the +-terms and conditions of this Agreement, including, but not limited to +-Section 3 (Java(TM) Technology Restrictions) of these Supplemental +-Terms, Sun grants you a non-exclusive, non-transferable, limited +-license to reproduce internally and use internally the binary form of +-the Software, complete and unmodified, for the sole purpose of +-designing, developing and testing your Java applets and applications +-("Programs"). +- +-2. License to Distribute Software. In addition to the license granted +-in Section 1 (Software Internal Use and Development License Grant) of +-these Supplemental Terms, subject to the terms and conditions of this +-Agreement, including but not limited to Section 3 (Java Technology +-Restrictions), Sun grants you a non-exclusive, non-transferable, +-limited license to reproduce and distribute the Software in binary form +-only, provided that you (i) distribute the Software complete and +-unmodified and only bundled as part of your Programs, (ii) do not +-distribute additional software intended to replace any component(s) of +-the Software, (iii) do not remove or alter any proprietary legends or +-notices contained in the Software, (iv) only distribute the Software +-subject to a license agreement that protects Sun's interests consistent +-with the terms contained in this Agreement, and (v) agree to defend and +-indemnify Sun and its licensors from and against any damages, costs, +-liabilities, settlement amounts and/or expenses (including attorneys' +-fees) incurred in connection with any claim, lawsuit or action by any +-third party that arises or results from the use or distribution of any +-and all Programs and/or Software. +- +-3. Java Technology Restrictions. You may not modify the Java Platform +-Interface ("JPI", identified as classes contained within the "java" +-package or any subpackages of the "java" package), by creating +-additional classes within the JPI or otherwise causing the addition to +-or modification of the classes in the JPI. In the event that you +-create an additional class and associated API(s) which (i) extends the +-functionality of the Java Platform, and (ii) is exposed to third party +-software developers for the purpose of developing additional software +-which invokes such additional API, you must promptly publish broadly an +-accurate specification for such API for free use by all developers. You +-may not create, or authorize your licensees to create additional +-classes, interfaces, or subpackages that are in any way identified as +-"java", "javax", "sun" or similar convention as specified by Sun in any +-naming convention designation. +- +-4. Trademarks and Logos. You acknowledge and agree as between you and +-Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET +-trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related +-trademarks, service marks, logos and other brand designations ("Sun +-Marks"), and you agree to comply with the Sun Trademark and Logo Usage +-Requirements currently located at +-http://www.sun.com/policies/trademarks. Any use you make of the Sun +-Marks inures to Sun's benefit. +- +-5. Source Code. Software may contain source code that is provided +-solely for reference purposes pursuant to the terms of this Agreement. +-Source code may not be redistributed unless expressly provided for in +-this Agreement. +- +-6. Termination for Infringement. Either party may terminate this +-Agreement immediately should any Software become, or in either party's +-opinion be likely to become, the subject of a claim of infringement of +-any intellectual property right. +- +-For inquiries please contact: Sun Microsystems, Inc. 901 San Antonio +-Road, Palo Alto, California 94303 (LFI#108931/Form ID#011801) +-xxxFOOxxx +- +-echo "Accept (y/n)?: " +-read ans +-if [ "$ans" != "y" ] +-then +- echo 'failed to accept license' +- exit 1 +-fi + save_IFS="${IFS}" + IFS="${IFS}:" + gettext_dir=FAILED From janny at frugalware.org Sat Dec 15 21:59:51 2007 From: janny at frugalware.org (janny) Date: Sat Dec 15 21:59:53 2007 Subject: [Frugalware-git] frugalware-current: libfwbuilder-2.1.15-1-i686 Message-ID: <20071215205951.7B1EF11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd061d6a89b52fdff7669f0bf1f9da32d775ca97 commit bd061d6a89b52fdff7669f0bf1f9da32d775ca97 Author: janny Date: Sat Dec 15 21:59:22 2007 +0100 libfwbuilder-2.1.15-1-i686 * version bump diff --git a/source/xlib-extra/libfwbuilder/FrugalBuild b/source/xlib-extra/libfwbuilder/FrugalBuild index 534c68d..5f9fc4d 100644 --- a/source/xlib-extra/libfwbuilder/FrugalBuild +++ b/source/xlib-extra/libfwbuilder/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=libfwbuilder -pkgver=2.1.14 +pkgver=2.1.15 pkgrel=1 pkgdesc="Firewall Builder firewall configuration system - Core library" _F_sourceforge_dirname="fwbuilder" @@ -13,7 +13,7 @@ depends=('qt' 'libxml2' 'libxslt' 'openssl') groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.fwbuilder.org/archives/cat_release_notes.html | grep -m1 'Version' | sed 's/Version //g'" -sha1sums=('af59af8b594b7e87cdea05123ab25fb3b4ca7cac') +sha1sums=('8eae2486e9e83b98cfd74d007b50de77f9ebdbb0') build() { Fmake From janny at frugalware.org Sat Dec 15 22:35:20 2007 From: janny at frugalware.org (janny) Date: Sat Dec 15 22:35:23 2007 Subject: [Frugalware-git] frugalware-current: fwbuilder-2.1.15-1-i686 Message-ID: <20071215213520.683AF11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=818738a169fa7a0cde28723d0eca5b53f264abe1 commit 818738a169fa7a0cde28723d0eca5b53f264abe1 Author: janny Date: Sat Dec 15 22:34:44 2007 +0100 fwbuilder-2.1.15-1-i686 * version bump diff --git a/source/xapps-extra/fwbuilder/FrugalBuild b/source/xapps-extra/fwbuilder/FrugalBuild index 82dd200..27266c7 100644 --- a/source/xapps-extra/fwbuilder/FrugalBuild +++ b/source/xapps-extra/fwbuilder/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=fwbuilder -pkgver=2.1.14 +pkgver=2.1.15 pkgrel=1 pkgdesc="Firewall Builder firewall configuration system" Finclude sourceforge @@ -13,7 +13,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.fwbuilder.org/archives/cat_release_notes.html | grep -m1 'Version' | sed 's/Version //g'" options=('scriptlet') -sha1sums=('a7ec59cfa3c4a3546421996e15607bae367df970') +sha1sums=('1597c28af5b002c357c646943d2fd99fce0c35c4') build() { Fmake From janny at frugalware.org Sat Dec 15 22:38:33 2007 From: janny at frugalware.org (janny) Date: Sat Dec 15 22:38:35 2007 Subject: [Frugalware-git] frugalware-current: clamtk-3.05-1-i686 Message-ID: <20071215213833.BBF8411904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0cd7f683a6009b896722e49278bf0333a7a0db55 commit 0cd7f683a6009b896722e49278bf0333a7a0db55 Author: janny Date: Sat Dec 15 22:38:23 2007 +0100 clamtk-3.05-1-i686 * version bump diff --git a/source/xapps-extra/clamtk/FrugalBuild b/source/xapps-extra/clamtk/FrugalBuild index 16d8c5f..250d23a 100644 --- a/source/xapps-extra/clamtk/FrugalBuild +++ b/source/xapps-extra/clamtk/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=clamtk -pkgver=3.04 +pkgver=3.05 pkgrel=1 pkgdesc="ClamTk is a GUI front-end for ClamAV using gtk2-perl" url="http://clamtk.sourceforge.net/" @@ -10,7 +10,7 @@ rodepends=('perl-gtk2' 'clamav' 'perl-date-calc' 'perl-file-find-rule' 'perl-get groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('973a5aa4ed76b0cf17d323a890bddb0ae57db8e9') +sha1sums=('8880900cb04e7db6b9e1657f2fe3d7255db1d160') build() { Fcd From janny at frugalware.org Sat Dec 15 22:43:27 2007 From: janny at frugalware.org (janny) Date: Sat Dec 15 22:43:29 2007 Subject: [Frugalware-git] frugalware-current: zvbi-0.2.26-1-i686 Message-ID: <20071215214327.51E5311904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b3633092d48537571c2e4a16a0b2cd77bd757a3f commit b3633092d48537571c2e4a16a0b2cd77bd757a3f Author: janny Date: Sat Dec 15 22:43:12 2007 +0100 zvbi-0.2.26-1-i686 * version bump diff --git a/source/lib-extra/zvbi/FrugalBuild b/source/lib-extra/zvbi/FrugalBuild index 175ed92..483b556 100644 --- a/source/lib-extra/zvbi/FrugalBuild +++ b/source/lib-extra/zvbi/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=zvbi -pkgver=0.2.25 +pkgver=0.2.26 pkgrel=1 pkgdesc="Raw VBI, Teletext and Closed Caption decoding library" license="GPL" @@ -15,5 +15,5 @@ Finclude sourceforge url="http://zapping.sourceforge.net" up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2599|grep -m1 'zvbi-\(.*\).tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'" -sha1sums=('97d30fb18f013feccabdd3a0a89894ea134d87c9') +sha1sums=('a617fc016068245ce6cb8331e7e146ba8143ad51') # optimization OK From crazy at frugalware.org Sat Dec 15 23:04:44 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 23:04:46 2007 Subject: [Frugalware-git] frugalware-current: scite-1.75-1-i686 Message-ID: <20071215220444.327CE11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ee6ab2a28eac0ddbd4978ed6ce8bc9616e354f80 commit ee6ab2a28eac0ddbd4978ed6ce8bc9616e354f80 Author: crazy Date: Sat Dec 15 23:03:54 2007 +0100 scite-1.75-1-i686 * Version bump diff --git a/source/xapps-extra/scite/FrugalBuild b/source/xapps-extra/scite/FrugalBuild index cb6ad07..742c062 100644 --- a/source/xapps-extra/scite/FrugalBuild +++ b/source/xapps-extra/scite/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Bence Nagy pkgname=scite -pkgver=1.74 +pkgver=1.75 pkgrel=1 pkgdesc="A generally useful editor with facilities for building and running programs." -depends=('gtk+2') +depends=('gtk+2' 'freetype2' 'libxcb' 'libstdc++' 'libxdamage' 'libxext') groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_dirname="scintilla" Finclude sourceforge options=('scriptlet') url="http://scintilla.sourceforge.net/SciTE.html" -source=(${source/$pkgname-$pkgver.tar.gz/scite`echo $pkgver | sed -e 's/\.//g'`.tgz}) +source=(${source/$pkgname-$pkgver.tar.gz/scite${pkgver//.}.tgz}) up2date="lynx -dump http://scintilla.sourceforge.net/SciTEDownload.html| grep 'Release' | sed -n 's/Release \(.*\)$/\1/; 1 p'" backup=(/usr/share/scite/SciTEGlobal.properties) @@ -20,7 +20,7 @@ build() { cd $Fsrcdir/scintilla/gtk Fsed "^CXXFLAGS=" "CXXFLAGS=${CXXFLAGS} " makefile Fsed "\(^CXXFLAGS=.*\)-Os" "\1" makefile - Fmake + make || Fdie cd $Fsrcdir/scite/gtk Fsed "^CXXFLAGS=" "CXXFLAGS=${CXXFLAGS} " makefile Fsed "\(^CXXFLAGS=.*\)-Os" "\1" makefile @@ -29,12 +29,12 @@ build() { Fsed "Bitstream Vera Sans" "Sans-serif" ../src/SciTEGlobal.properties Fsed "Bitstream Vera Serif" "Serif" ../src/SciTEGlobal.properties Fsed "Bitstream Charter" "Serif" ../src/SciTEGlobal.properties - Fsed "netscape" "browser" ../src/Embedded.properties - # Fmake - make NO_LUA=1 || Fdie + Fsed "netscape" "browser" ../src/Embedded.properties + Fsed '`$(CONFIGTHREADS)`' '$(CONFIGTHREADS)' makefile + make || Fdie Fmakeinstall Fln /usr/bin/SciTE /usr/bin/scite } -sha1sums=('64066ed557c15821a50955b86acdda0d32e0a472') +sha1sums=('7f3e3fceccb3ea3f3580fb01e22ac8b55604355c') # optimization OK From crazy at frugalware.org Sat Dec 15 23:27:14 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 23:27:16 2007 Subject: [Frugalware-git] playground: kdebase-runtime-3.97.1_747187-0playground1-i686 Message-ID: <20071215222714.A3D4411903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=bfc482d1fea3055c0418478c56bf182e7b8a72f3 commit bfc482d1fea3055c0418478c56bf182e7b8a72f3 Author: crazy Date: Sat Dec 15 23:24:50 2007 +0100 kdebase-runtime-3.97.1_747187-0playground1-i686 * depends++ diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild index 369b91e..d1f2d00 100644 --- a/source/kde4/kdebase-runtime/FrugalBuild +++ b/source/kde4/kdebase-runtime/FrugalBuild @@ -5,7 +5,10 @@ pkgname=kdebase-runtime pkgver=3.97.1_747187 pkgrel=0playground1 pkgdesc="Programs needed at runtime by other KDE4 applications" -depends=('libqtsvg' 'libkde>=3.96.1_743104' 'openexr' 'libsmbclient' 'xine-lib' 'kdepimlibs>=3.96.1_742565') +depends=('libqtnetwork' 'libqtxml' 'bzip2' 'dbus' 'libice' 'libxext' 'libqtgui' \ + 'libxfixes' 'libkde' 'libxrender' 'gamin' 'xfsprogs-attr' 'libqtsql' 'clucene' \ + 'libstrigiqtdbusclient' 'openexr' 'xine-lib' 'libsmbclient') +makedepends=('kdepimlibs>=3.96.1_742565') groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') From crazy at frugalware.org Sat Dec 15 23:27:14 2007 From: crazy at frugalware.org (crazy) Date: Sat Dec 15 23:27:20 2007 Subject: [Frugalware-git] playground: kdelibs-3.97.1_747313-0playground1-i686 Message-ID: <20071215222714.BF86711904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=5d14f9a1c13afc5909424882d5e3b51a7fdc2b58 commit 5d14f9a1c13afc5909424882d5e3b51a7fdc2b58 Author: crazy Date: Sat Dec 15 23:27:02 2007 +0100 kdelibs-3.97.1_747313-0playground1-i686 * removed USB patch , in upstream now diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index d5a5703..bdf14f6 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -13,14 +13,11 @@ makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell' 'libstrigiq groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') -_F_cmake_type="Debugfull" Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ - flac.patch \ - fix_FindUSB.cmake.patch) + flac.patch) sha1sums=('a9313eee508b479028341f3e881efded7f595784' \ - '0ff2c4946a6f58c0dadc7b6bd1027f46fab66218' \ - '1acfcfd793f293f3a7418d32091b25a501d5e9cc') + '0ff2c4946a6f58c0dadc7b6bd1027f46fab66218') ## TODO: groups!!! subpkgs=("$pkgname-compiletime" 'libkde' 'kspell-aspell' 'kspell-hspell' 'kspell-enchant' 'libkdecore') diff --git a/source/kde4/kdelibs/fix_FindUSB.cmake.patch b/source/kde4/kdelibs/fix_FindUSB.cmake.patch deleted file mode 100644 index a30be8e..0000000 --- a/source/kde4/kdelibs/fix_FindUSB.cmake.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: cmake/modules/FindUSB.cmake -=================================================================== ---- cmake/modules/FindUSB.cmake (Revision 748352) -+++ cmake/modules/FindUSB.cmake (Arbeitskopie) -@@ -1,4 +1,4 @@ --# - Try to find the freetype library -+# - Try to find the libusb library - # Once done this defines - # - # LIBUSB_FOUND - system has libusb -@@ -12,27 +12,30 @@ - - - if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) -- - # in cache already -- set(LIBUSB_FOUND TRUE) -+ set(LIBUSB_FOUND_QUIETLY TRUE) -+endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) -+ -+IF (NOT WIN32) -+ # use pkg-config to get the directories and then use these values -+ # in the FIND_PATH() and FIND_LIBRARY() calls -+ INCLUDE(UsePkgConfig) - --else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) -- IF (NOT WIN32) -- # use pkg-config to get the directories and then use these values -- # in the FIND_PATH() and FIND_LIBRARY() calls -- INCLUDE(UsePkgConfig) -+ PKGCONFIG(libusb _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags) -+ENDIF(NOT WIN32) - -- PKGCONFIG(libusb _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags) -- ENDIF(NOT WIN32) -+FIND_PATH(LIBUSB_INCLUDE_DIR usb.h -+ PATHS ${_libUSBIncDir} ) - -- FIND_PATH(LIBUSB_INCLUDE_DIR usb.h ) -+FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb -+ PATHS ${_libUSBLinkDir} ) - -- FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb -- PATHS ${_libUSBLinkDir} ) -+if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) -+ set(LIBUSB_FOUND TRUE) -+endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - -- include(FindPackageHandleStandardArgs) -- FIND_PACKAGE_HANDLE_STANDARD_ARGS(USB DEFAULT_MSG LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) -+include(FindPackageHandleStandardArgs) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(USB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) - -- MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) -+MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) - --endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) From crazy at frugalware.org Sun Dec 16 00:00:37 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 00:00:39 2007 Subject: [Frugalware-git] playground: kdelibs-3.97.1_747311-0playground1-i686 Message-ID: <20071215230037.121DD11903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=5e38bab51bb9ba8a1eb2f357ea05465d52fb3c1c commit 5e38bab51bb9ba8a1eb2f357ea05465d52fb3c1c Author: crazy Date: Sun Dec 16 00:00:25 2007 +0100 kdelibs-3.97.1_747311-0playground1-i686 * depends++ diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index bdf14f6..ec72f2a 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: crazy pkgname=kdelibs -pkgver=3.97.1_747313 +pkgver=3.97.1_747311 pkgrel=0playground1 pkgdesc="KDE4 Core Libraries." -depends=('libqtsvg' 'libxpm' 'libxtst' 'strigi' 'xfsprogs-acl' 'pcre' 'soprano' \ - 'heimdal' 'libqt3support' 'alsa-lib' 'libungif' 'qt4-designer' 'openexr' 'jasper' \ - 'shared-mime-info' 'gamin' 'qt4-qdbus' 'bzip2' 'libqttest') -rodepends=("libkde=$pkgver") # this is an 'depend' but it won't find it while is an subpackage -makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell' 'libstrigiqtdbusclient') +depends=('qt4-qdbus' 'bzip2' 'libgcc' 'libice' 'libxext' 'libxfixes' 'gamin' 'xfsprogs-attr' 'libxrender' \ + 'libqttest' 'libxslt' 'heimdal' 'qt4-designer' 'openexr' 'jasper' 'shared-mime-info') +rodepends=("libkde=$pkgver") +makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell' 'libstrigiqtdbusclient' 'strigi' 'qt4-qdbus' \ + 'pcre' 'soprano' 'libxpm' 'libqt3support' 'alsa-lib' 'libungif' 'xfsprogs-acl' 'libqtsvg' 'libxi') groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') @@ -28,7 +28,8 @@ subdescs=('Development files.' \ 'KSpell enchant plugin.' \ 'Core libraries and files needed for KDE applications.') subdepends=("libkde=$pkgver libqtsvg libxpm libxtst strigi xfsprogs-acl libqtnetwork" \ - "libkdecore=$pkgver libqtsvg libxpm libxtst strigi xfsprogs-acl libqt3support libungif pcre soprano alsa-lib" \ + "libkdecore=$pkgver libqtsvg libxft libxpm libxtst libxcursor strigi xfsprogs-acl libstrigiqtdbusclient \ + libstdc++ libpng libxi libxrandr libxinerama libxcb libqt3support libjpeg libungif soprano alsa-lib" \ "libkde=$pkgver aspell libqtnetwork qt4-qdbus bzip2" \ "libkde=$pkgver libqtnetwork qt4-qdbus bzip2 hspell" \ "libkde=$pkgver enchant libqtnetwork qt4-qdbus bzip2" \ From crazy at frugalware.org Sun Dec 16 00:10:08 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 00:10:13 2007 Subject: [Frugalware-git] playground: kdelibs-3.97.1_747311-0playground1-i686 Message-ID: <20071215231008.EA62211903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=7d57f2bf5e794043e484c4a3123582171f04d725 commit 7d57f2bf5e794043e484c4a3123582171f04d725 Author: crazy Date: Sun Dec 16 00:09:55 2007 +0100 kdelibs-3.97.1_747311-0playground1-i686 * some more diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index ec72f2a..52cd625 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -5,11 +5,15 @@ pkgname=kdelibs pkgver=3.97.1_747311 pkgrel=0playground1 pkgdesc="KDE4 Core Libraries." -depends=('qt4-qdbus' 'bzip2' 'libgcc' 'libice' 'libxext' 'libxfixes' 'gamin' 'xfsprogs-attr' 'libxrender' \ - 'libqttest' 'libxslt' 'heimdal' 'qt4-designer' 'openexr' 'jasper' 'shared-mime-info') +depends=('qt4-qdbus' 'bzip2' 'libgcc' 'libice' 'libxext' \ + 'libxfixes' 'gamin' 'xfsprogs-attr' 'libxrender' \ + 'libqttest' 'libxslt' 'heimdal' 'qt4-designer' \ + 'openexr' 'jasper' 'shared-mime-info') rodepends=("libkde=$pkgver") -makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell' 'libstrigiqtdbusclient' 'strigi' 'qt4-qdbus' \ - 'pcre' 'soprano' 'libxpm' 'libqt3support' 'alsa-lib' 'libungif' 'xfsprogs-acl' 'libqtsvg' 'libxi') +makedepends=('libqttest' 'enchant' 'hspell' 'avahi-compat' 'aspell' \ + 'libstrigiqtdbusclient' 'strigi' 'qt4-qdbus' 'pcre' \ + 'soprano' 'libxpm' 'libqt3support' 'alsa-lib' 'libungif' \ + 'xfsprogs-acl' 'libqtsvg' 'libxi') groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') From vmiklos at frugalware.org Sun Dec 16 01:27:42 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 01:27:45 2007 Subject: [Frugalware-git] pacman-tools: chkdep: redirect ldd's stderr to devnull Message-ID: <20071216002742.C251011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=fe24260f9c1be3e11ec4df6402cee6e5bf7d6ab7 commit fe24260f9c1be3e11ec4df6402cee6e5bf7d6ab7 Author: Miklos Vajna Date: Sun Dec 16 01:27:30 2007 +0100 chkdep: redirect ldd's stderr to devnull diff --git a/chkdep b/chkdep index 89e6182..4746029 100755 --- a/chkdep +++ b/chkdep @@ -100,7 +100,7 @@ class Checks: except OSError: return libs = [] - sock = os.popen("ldd %s" % file) + sock = os.popen("ldd %s 2>%s" % (file, os.devnull)) while True: i = sock.readline() if not i: From janny at frugalware.org Sun Dec 16 11:06:20 2007 From: janny at frugalware.org (janny) Date: Sun Dec 16 11:06:22 2007 Subject: [Frugalware-git] frugalware-current: squirrelmail-1.4.13-1-i686 Message-ID: <20071216100620.41FD811903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e1f4a0f2cfe89523ca6a4932583d0d4700d05e4 commit 0e1f4a0f2cfe89523ca6a4932583d0d4700d05e4 Author: janny Date: Sun Dec 16 11:05:51 2007 +0100 squirrelmail-1.4.13-1-i686 * version bump diff --git a/source/network-extra/squirrelmail/FrugalBuild b/source/network-extra/squirrelmail/FrugalBuild index 9290b57..4d65124 100644 --- a/source/network-extra/squirrelmail/FrugalBuild +++ b/source/network-extra/squirrelmail/FrugalBuild @@ -3,10 +3,10 @@ # Contributor: Kapolnasi Tamas pkgname=squirrelmail -pkgver=1.4.11 +pkgver=1.4.13 pkgextraver= compatpluginver=2.0.9-1.0 -pkgrel=2 +pkgrel=1 pkgdesc="SquirrelMail is a standards-based webmail package written in PHP" rodepends=('php' 'php-pear-db') backup=(var/www/squirrelmail/config/config.php \ @@ -21,9 +21,9 @@ else up2date="lynx -dump http://www.squirrelmail.org/download.php|grep 'squirrelmail-'|sed -n 's/.*squirrelmail-\(.*\)\.t.*/\1/; 1 p' |sed s/$pkgextraver//" fi source=($source http://www.$pkgname.org/plugins/compatibility-$compatpluginver.tar.gz README.Frugalware) -sha1sums=('1f662e71efb1fd9ff7322672aae8faeb6c6df140' \ - '25779cf0d97b10b9dfe41c2580b723eb6bcb5f9e' \ - '1bfe33f98b235076efc97764d8b0224fb1141f65') +sha1sums=('73b79ae3c124b184f8ff2bf8c95cfd2ed051a3d1' \ + '25779cf0d97b10b9dfe41c2580b723eb6bcb5f9e' \ + '1bfe33f98b235076efc97764d8b0224fb1141f65') build() { @@ -35,6 +35,4 @@ build() Fdoc README.Frugalware # compatibility plugin Fcpr compatibility usr/share/${pkgname}/plugins/ - cd $Fdestdir/usr/share/${pkgname}/plugins/compatibility || Fdie - patch -p0 < patches/compatibility_patch-$pkgver.diff || Fdie } From devil505linux at gmail.com Sun Dec 16 11:39:55 2007 From: devil505linux at gmail.com (Devil505) Date: Sun Dec 16 11:39:58 2007 Subject: [Frugalware-git] frugalware-current: bouml-3.3.5-1-i686 Message-ID: <20071216103955.AF07C11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b2add2ad027fd14dc93a05f1c14d63fc4ae61bb7 commit b2add2ad027fd14dc93a05f1c14d63fc4ae61bb7 Author: Devil505 Date: Sun Dec 16 11:39:43 2007 +0100 bouml-3.3.5-1-i686 *New Package *Closes FS#2447 diff --git a/source/xapps-extra/bouml/FrugalBuild b/source/xapps-extra/bouml/FrugalBuild new file mode 100644 index 0000000..63324f9 --- /dev/null +++ b/source/xapps-extra/bouml/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 13.45 SBU +# Maintainer: Devil505 + +pkgname=bouml +pkgver=3.3.5 +pkgrel=1 +pkgdesc="Free UML 2 tool box with C++, Java and Idl code generation" +_F_sourceforge_sep="_" +_F_sourceforge_broken_up2date="1" +Finclude sourceforge +url="http://bouml.free.fr/" +depends=('libxext' 'libstdc++' 'qt') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +_F_cd_path="${pkgname}_${pkgver}" +sha1sums=('cd4b527c9be2a2ec21b3dff18fb0ad123e361d6d') +# optimization OK From vmiklos at frugalware.org Sun Dec 16 14:25:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:25:18 2007 Subject: [Frugalware-git] frugalware-current: xmpppy-0.4.1-1-i686 Message-ID: <20071216132512.D2AB511901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c2d99b61b1b6d3a52985bcf4b560dbbbe83bdbf3 commit c2d99b61b1b6d3a52985bcf4b560dbbbe83bdbf3 Author: Miklos Vajna Date: Sun Dec 16 13:48:16 2007 +0100 xmpppy-0.4.1-1-i686 version bump diff --git a/source/devel-extra/xmpppy/FrugalBuild b/source/devel-extra/xmpppy/FrugalBuild index 35044e7..a277111 100644 --- a/source/devel-extra/xmpppy/FrugalBuild +++ b/source/devel-extra/xmpppy/FrugalBuild @@ -2,14 +2,15 @@ # Maintainer: VMiklos pkgname=xmpppy -pkgver=0.4.0 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="Library for hanling xmpp with python." depends=('python') groups=('devel-extra') archs=('i686' 'x86_64') Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=97081|grep ']xmpppy '|sed 's/[^]]*][^]]*]\([^ ]*\) .*/\1/'" +sha1sums=('8bc83c2acc2da68dc73099f7a1137353c7d6f859') build() { @@ -18,4 +19,3 @@ build() Fbuild Fdocrel doc } -sha1sums=('d88ca59dbfe444c25dc6c65d6361c08a59842dde') From vmiklos at frugalware.org Sun Dec 16 14:25:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:25:22 2007 Subject: [Frugalware-git] frugalware-current: bzr-1.0-1-i686 Message-ID: <20071216132512.E6C7611901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2cdc124e075216e9f61af4a6189869bbdcb869ad commit 2cdc124e075216e9f61af4a6189869bbdcb869ad Author: Miklos Vajna Date: Sun Dec 16 13:53:43 2007 +0100 bzr-1.0-1-i686 version bump diff --git a/source/devel-extra/bzr/FrugalBuild b/source/devel-extra/bzr/FrugalBuild index 5064098..32b0273 100644 --- a/source/devel-extra/bzr/FrugalBuild +++ b/source/devel-extra/bzr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=bzr -pkgver=0.92 +pkgver=1.0 pkgrel=1 pkgdesc="Next generation distributed version control" url="http://bazaar-vcs.org" From vmiklos at frugalware.org Sun Dec 16 14:25:13 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:25:24 2007 Subject: [Frugalware-git] frugalware-current: perl-sub-uplevel-0.18-1-i686 Message-ID: <20071216132513.0118C1784019@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88d0ce684d7714127a35f61f966b10538de299ec commit 88d0ce684d7714127a35f61f966b10538de299ec Author: Miklos Vajna Date: Sun Dec 16 14:24:40 2007 +0100 perl-sub-uplevel-0.18-1-i686 new package (dependency for perl-net-ssleay) diff --git a/source/devel-extra/perl-sub-uplevel/FrugalBuild b/source/devel-extra/perl-sub-uplevel/FrugalBuild new file mode 100644 index 0000000..5bdc676 --- /dev/null +++ b/source/devel-extra/perl-sub-uplevel/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Zsolt Szalai + +_F_perl_name=Sub-Uplevel +_F_perl_author=D/DA/DAGOLDEN +pkgver=0.18 +pkgdesc="apparently run a function in a higher stack frame" +Finclude perl +sha1sums=('0e0324cf4d0f48904539d576b86d8a9097363a33') From vmiklos at frugalware.org Sun Dec 16 14:27:08 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:27:11 2007 Subject: [Frugalware-git] frugalware-current: perl-test-exception-0.26-1-i686 Message-ID: <20071216132708.ECED011901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c05bc42fc88329a2445d15dccb5333ee78bfae41 commit c05bc42fc88329a2445d15dccb5333ee78bfae41 Author: Miklos Vajna Date: Sun Dec 16 14:27:02 2007 +0100 perl-test-exception-0.26-1-i686 new package (dependency for perl-net-ssleay) diff --git a/source/devel-extra/perl-test-exception/FrugalBuild b/source/devel-extra/perl-test-exception/FrugalBuild new file mode 100644 index 0000000..baba7ae --- /dev/null +++ b/source/devel-extra/perl-test-exception/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Zsolt Szalai + +_F_perl_name=Test-Exception +_F_perl_author=A/AD/ADIE +pkgver=0.26 +pkgdesc="Test exception based code" +Finclude perl +sha1sums=('38bd08c35d781e2445a65ea31676dc0516994a89') From vmiklos at frugalware.org Sun Dec 16 14:31:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:31:42 2007 Subject: [Frugalware-git] frugalware-current: perl-array-compare-1.14-1-i686 Message-ID: <20071216133140.F41E511901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c529ce3e2ef2882487c18bcae6b5f586b088d50 commit 3c529ce3e2ef2882487c18bcae6b5f586b088d50 Author: Miklos Vajna Date: Sun Dec 16 14:31:30 2007 +0100 perl-array-compare-1.14-1-i686 new package (dependency for perl-net-ssleay) diff --git a/source/devel-extra/perl-array-compare/FrugalBuild b/source/devel-extra/perl-array-compare/FrugalBuild new file mode 100644 index 0000000..3e0450d --- /dev/null +++ b/source/devel-extra/perl-array-compare/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Zsolt Szalai + +_F_perl_name=Array-Compare +_F_perl_author=D/DA/DAVECROSS +pkgver=1.14 +pkgdesc="Perl extension for comparing arrays." +Finclude perl +sha1sums=('b750816d7412d3ba072f479481d8c42b01da95aa') From vmiklos at frugalware.org Sun Dec 16 14:35:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:35:27 2007 Subject: [Frugalware-git] frugalware-current: perl-tree-dag_node-1.06-1-i686 Message-ID: <20071216133524.5E38111901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca70ceaa5078d2a1509f64034ee9f8f1a273cd15 commit ca70ceaa5078d2a1509f64034ee9f8f1a273cd15 Author: Miklos Vajna Date: Sun Dec 16 14:35:16 2007 +0100 perl-tree-dag_node-1.06-1-i686 new package (dependency for perl-net-ssleay) diff --git a/source/devel-extra/perl-tree-dag_node/FrugalBuild b/source/devel-extra/perl-tree-dag_node/FrugalBuild new file mode 100644 index 0000000..422a01f --- /dev/null +++ b/source/devel-extra/perl-tree-dag_node/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Zsolt Szalai + +_F_perl_name=Tree-DAG_Node +_F_perl_author=C/CO/COGENT +pkgver=1.06 +pkgdesc="(super)class for representing nodes in a tree" +Finclude perl +sha1sums=('8f412087b33942df06f20ca7c2e8ea0bd2354742') From vmiklos at frugalware.org Sun Dec 16 14:36:47 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:36:50 2007 Subject: [Frugalware-git] frugalware-current: perl-test-warn-0.10-1-i686 Message-ID: <20071216133647.C34D611901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fcd5c49ba9a3ff90bc9202dd9d6827bf8fc18908 commit fcd5c49ba9a3ff90bc9202dd9d6827bf8fc18908 Author: Miklos Vajna Date: Sun Dec 16 14:36:42 2007 +0100 perl-test-warn-0.10-1-i686 new package (dependency for perl-net-ssleay) diff --git a/source/devel-extra/perl-test-warn/FrugalBuild b/source/devel-extra/perl-test-warn/FrugalBuild new file mode 100644 index 0000000..6027529 --- /dev/null +++ b/source/devel-extra/perl-test-warn/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Zsolt Szalai + +_F_perl_name=Test-Warn +_F_perl_author=C/CH/CHORNY +pkgver=0.10 +pkgdesc="Perl extension to test methods for warnings" +Finclude perl +sha1sums=('d2ee498519f1b144de04763fe5bb916ce30e56d2') From vmiklos at frugalware.org Sun Dec 16 14:47:15 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:47:16 2007 Subject: [Frugalware-git] frugalware-current: perl-net-ssleay-1.32-1-i686 Message-ID: <20071216134715.2CF7611901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e17660bf63beaceb020a1c5b349d1685692bf64f commit e17660bf63beaceb020a1c5b349d1685692bf64f Author: Miklos Vajna Date: Sun Dec 16 14:47:10 2007 +0100 perl-net-ssleay-1.32-1-i686 - version bump - big cleanup - use Finclude perl, remove custom options, up2date, source and build - added new makedepends diff --git a/source/devel/perl-net-ssleay/FrugalBuild b/source/devel/perl-net-ssleay/FrugalBuild index d13419b..a839185 100644 --- a/source/devel/perl-net-ssleay/FrugalBuild +++ b/source/devel/perl-net-ssleay/FrugalBuild @@ -1,26 +1,14 @@ # Compiling Time: ~0.1 SBU # Maintainer: Zsolt Szalai -modrealname=Net_SSLeay.pm -_F_perl_name=Net_SSLeay +_F_perl_name=Net-SSLeay _F_perl_author=F/FL/FLORA -pkgname=perl-net-ssleay -pkgver=1.30 -pkgrel=1 +pkgver=1.32 pkgdesc="Perl extension for using OpenSSL" -url="http://cpan.org/" -makedepends=('perl') -depends=('openssl' 'perl') +depends=('openssl') +makedepends=('perl-array-compare' 'perl-sub-uplevel' 'perl-test-exception' 'perl-test-warn' 'perl-tree-dag_node') +_F_conf_perl_pipefrom="echo n" +Finclude perl groups=('devel') archs=('i686' 'x86_64') -options=('nofakeroot') -up2date="lynx -dump -nolist 'http://search.cpan.org/search?query=${_F_perl_name}&mode=all'|grep -m1 '$_F_perl_name.pm-' | sed -e 's/.*${_F_perl_name}.pm-\(.*\) .*/\1/' -e 's/ .*//'" -source=(http://search.cpan.org/CPAN/authors/id/$_F_perl_author/$modrealname-$pkgver.tar.gz) -sha1sums=('c020af556a43d83675bae4419d63a34ade30ab81') - -build() { - Fcd $modrealname-$pkgver - perl Makefile.PL /usr DESTDIR=$Fdestdir || Fdie - make || Fdie - Fmakeinstall -} +sha1sums=('e57c6c36f0df7bf211c435a38330de2e93d141bb') From vmiklos at frugalware.org Sun Dec 16 14:56:25 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:56:27 2007 Subject: [Frugalware-git] frugalware-current: perl-sub-uplevel-0.18-1-x86_64 Message-ID: <20071216135625.865C411903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=70617bb8ad41bd86db80df072a3544e82abc4fbe commit 70617bb8ad41bd86db80df072a3544e82abc4fbe Author: Miklos Vajna Date: Sun Dec 16 14:56:22 2007 +0100 perl-sub-uplevel-0.18-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-sub-uplevel/FrugalBuild b/source/devel-extra/perl-sub-uplevel/FrugalBuild index 5bdc676..48dd0cb 100644 --- a/source/devel-extra/perl-sub-uplevel/FrugalBuild +++ b/source/devel-extra/perl-sub-uplevel/FrugalBuild @@ -7,3 +7,4 @@ pkgver=0.18 pkgdesc="apparently run a function in a higher stack frame" Finclude perl sha1sums=('0e0324cf4d0f48904539d576b86d8a9097363a33') +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Sun Dec 16 14:56:47 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 14:56:48 2007 Subject: [Frugalware-git] frugalware-current: perl-test-exception-0.26-1-x86_64 Message-ID: <20071216135647.1F26A1784019@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4850e818a594a3b1154d0bb032953237c306a5b9 commit 4850e818a594a3b1154d0bb032953237c306a5b9 Author: Miklos Vajna Date: Sun Dec 16 14:56:44 2007 +0100 perl-test-exception-0.26-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-test-exception/FrugalBuild b/source/devel-extra/perl-test-exception/FrugalBuild index baba7ae..7a0c90c 100644 --- a/source/devel-extra/perl-test-exception/FrugalBuild +++ b/source/devel-extra/perl-test-exception/FrugalBuild @@ -7,3 +7,4 @@ pkgver=0.26 pkgdesc="Test exception based code" Finclude perl sha1sums=('38bd08c35d781e2445a65ea31676dc0516994a89') +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Sun Dec 16 15:03:54 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 15:03:56 2007 Subject: [Frugalware-git] frugalware-current: perl-array-compare-1.14-1-x86_64 Message-ID: <20071216140354.F131511904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f492989bba31c30485706f64f016fd717e89fe2 commit 1f492989bba31c30485706f64f016fd717e89fe2 Author: Miklos Vajna Date: Sun Dec 16 15:03:51 2007 +0100 perl-array-compare-1.14-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-array-compare/FrugalBuild b/source/devel-extra/perl-array-compare/FrugalBuild index 3e0450d..babf953 100644 --- a/source/devel-extra/perl-array-compare/FrugalBuild +++ b/source/devel-extra/perl-array-compare/FrugalBuild @@ -7,3 +7,4 @@ pkgver=1.14 pkgdesc="Perl extension for comparing arrays." Finclude perl sha1sums=('b750816d7412d3ba072f479481d8c42b01da95aa') +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Sun Dec 16 15:05:36 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 15:05:37 2007 Subject: [Frugalware-git] frugalware-current: perl-tree-dag_node-1.06-1-x86_64 Message-ID: <20071216140536.4279D11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0f53e99bb83b1da8234670731b3c1f5e851cfdb8 commit 0f53e99bb83b1da8234670731b3c1f5e851cfdb8 Author: Miklos Vajna Date: Sun Dec 16 15:05:34 2007 +0100 perl-tree-dag_node-1.06-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-tree-dag_node/FrugalBuild b/source/devel-extra/perl-tree-dag_node/FrugalBuild index 422a01f..26dbfce 100644 --- a/source/devel-extra/perl-tree-dag_node/FrugalBuild +++ b/source/devel-extra/perl-tree-dag_node/FrugalBuild @@ -7,3 +7,4 @@ pkgver=1.06 pkgdesc="(super)class for representing nodes in a tree" Finclude perl sha1sums=('8f412087b33942df06f20ca7c2e8ea0bd2354742') +archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Sun Dec 16 15:06:44 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Dec 16 15:06:45 2007 Subject: [Frugalware-git] frugalware-current: perl-test-warn-0.10-1-x86_64 Message-ID: <20071216140644.37BBA11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7be3814278aa8d6f1d7017f6ac465d90dc7edf71 commit 7be3814278aa8d6f1d7017f6ac465d90dc7edf71 Author: Miklos Vajna Date: Sun Dec 16 15:06:42 2007 +0100 perl-test-warn-0.10-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/perl-test-warn/FrugalBuild b/source/devel-extra/perl-test-warn/FrugalBuild index 6027529..f11549c 100644 --- a/source/devel-extra/perl-test-warn/FrugalBuild +++ b/source/devel-extra/perl-test-warn/FrugalBuild @@ -7,3 +7,4 @@ pkgver=0.10 pkgdesc="Perl extension to test methods for warnings" Finclude perl sha1sums=('d2ee498519f1b144de04763fe5bb916ce30e56d2') +archs=(${archs[@]} 'x86_64') From devil505linux at gmail.com Sun Dec 16 15:46:07 2007 From: devil505linux at gmail.com (Devil505) Date: Sun Dec 16 15:46:11 2007 Subject: [Frugalware-git] frugalware-current: bomberclone-0.11.8-1-i686 Message-ID: <20071216144607.4F2BB11901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84cc772e3b19ffba1e102881be26ca41af69764d commit 84cc772e3b19ffba1e102881be26ca41af69764d Author: Devil505 Date: Sun Dec 16 15:45:53 2007 +0100 bomberclone-0.11.8-1-i686 *Version Bump diff --git a/source/games-extra/bomberclone/FrugalBuild b/source/games-extra/bomberclone/FrugalBuild index 9ecd84b..cd630aa 100644 --- a/source/games-extra/bomberclone/FrugalBuild +++ b/source/games-extra/bomberclone/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=bomberclone -pkgver=0.11.7 +pkgver=0.11.8 pkgrel=1 pkgdesc="BomberMan clone with network game support" depends=('sdlimage' 'glibc' 'sdl_mixer') @@ -12,7 +12,7 @@ Finclude sourceforge url="http://bomberclone.sourceforge.net/homepage/" groups=('games-extra') archs=('i686' 'x86_64') -sha1sums=('108948667d0504cedfddaf4a55e69b221b14edbd') +sha1sums=('a900b716683f9267bfd28d9687049e1f65335f95') _F_desktop_name="Bomberclone" _F_desktop_icon="/usr/share/games/bomberclone/pixmaps/$pkgname.png" From crazy at frugalware.org Sun Dec 16 15:55:49 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 15:55:51 2007 Subject: [Frugalware-git] frugalware-current: eric4-4.0.4-1-i686 Message-ID: <20071216145549.4C5D011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6bf347a442497c5ad87e8d35429b1eecbd5ed5c commit e6bf347a442497c5ad87e8d35429b1eecbd5ed5c Author: crazy Date: Sun Dec 16 15:53:27 2007 +0100 eric4-4.0.4-1-i686 * Version bump diff --git a/source/xapps-extra/eric4/FrugalBuild b/source/xapps-extra/eric4/FrugalBuild index e8be86e..d2c5fe1 100644 --- a/source/xapps-extra/eric4/FrugalBuild +++ b/source/xapps-extra/eric4/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=eric4 -pkgver=4.0.3 +pkgver=4.0.4 pkgrel=1 pkgdesc="Eric4 is a full featured Python (and Ruby) IDE that is written in PyQt4." _F_sourceforge_dirname="eric-ide" @@ -15,11 +15,11 @@ source=($source \ ${source/eric4-$pkgver/eric4-i18n-ru-$pkgver} \ ${source/eric4-$pkgver/eric4-i18n-cs_CZ-$pkgver} $pkgname.desktop) -sha1sums=('81b467768bce5c3736ff35e0f59ec9d718a7248e' \ - '9d87642b6f900550c860b5d92dc41d21d0483cbb' \ - '64bc254d5717720876f5411182361d0f82a31eb0' \ - 'c6dd1a2486eee7e259f7da88faf3daae3215fabd' \ - '5d4c00bfd2828347514acccc55cf8c833c3bc0ee' \ +sha1sums=('902e851423d2ccdf43e977514b710c29d7c96f54' \ + '6ea4a9a1bb2ef66166298d142fad7eaf325e29a5' \ + 'accd9806b546f431b0d09e5b6312f0f9d07951a9' \ + '43b9a7c1a116270d46cb20f46e0d76af17859aa4' \ + '0e66f6ebcbdfcd4a840f7139a45d1666dcee2186' \ 'bdc6b72e48c1cab4bf779ed72a61b42cc1f997e5') groups=('xapps-extra') archs=('i686' 'x86_64') From devil505linux at gmail.com Sun Dec 16 15:59:18 2007 From: devil505linux at gmail.com (Devil505) Date: Sun Dec 16 15:59:21 2007 Subject: [Frugalware-git] frugalware-current: homebank-3.6-1-i686 Message-ID: <20071216145918.F2F8F11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=acd366c7a84f4ad15ad199542823fba6953e2eb6 commit acd366c7a84f4ad15ad199542823fba6953e2eb6 Author: Devil505 Date: Sun Dec 16 15:56:57 2007 +0100 homebank-3.6-1-i686 *Version Bump diff --git a/source/xapps-extra/homebank/FrugalBuild b/source/xapps-extra/homebank/FrugalBuild index 318d891..57e141f 100644 --- a/source/xapps-extra/homebank/FrugalBuild +++ b/source/xapps-extra/homebank/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 pkgname=homebank -pkgver=3.5 -pkgrel=2 +pkgver=3.6 +pkgrel=1 pkgdesc="HomeBank is the free software you have always wanted to manage your personal accounts at home" url="http://homebank.free.fr" depends=('gtk+2' 'libxdamage' 'libofx>=0.9.0') @@ -13,6 +13,6 @@ groups=('xapps-extra') archs=('i686') up2date="lynx -dump '$url/public/?M=A' | Flasttar" source=($url/public/$pkgname-$pkgver.tar.gz) -sha1sums=('e5c3260dc7f79eca6177744501587199df730fd1') +sha1sums=('020b6fdc4eaf766d7861717390bdca1c5f8ec73f') # optimization OK From crazy at frugalware.org Sun Dec 16 16:02:06 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 16:02:11 2007 Subject: [Frugalware-git] frugalware-current: sofia-sip-1.12.7-1-i686 Message-ID: <20071216150206.8CC1F11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2dca9ae5eef11fe2bca38ce1c14a6bd96fd12e5d commit 2dca9ae5eef11fe2bca38ce1c14a6bd96fd12e5d Author: crazy Date: Sun Dec 16 16:01:07 2007 +0100 sofia-sip-1.12.7-1-i686 * Version bump diff --git a/source/lib-extra/sofia-sip/FrugalBuild b/source/lib-extra/sofia-sip/FrugalBuild index 6da9478..487aac7 100644 --- a/source/lib-extra/sofia-sip/FrugalBuild +++ b/source/lib-extra/sofia-sip/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=sofia-sip -pkgver=1.12.6 +pkgver=1.12.7 pkgrel=1 pkgdesc="Sofia-SIP is an open-source SIP User-Agent library" depends=('glib2' 'openssl') @@ -11,6 +11,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') _F_sourceforge_broken_up2date=1 Finclude sourceforge -sha1sums=('4930b76c6857eb1f1022d730df39f297229e7a2d') +sha1sums=('a6d90edd2dbe476f81d2b30ab05ddeabd4f2292c') # optimization OK From crazy at frugalware.org Sun Dec 16 16:11:13 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 16:11:15 2007 Subject: [Frugalware-git] frugalware-current: telepathy-glib-0.7.0-1-i686 Message-ID: <20071216151113.092F311903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb8308f26fd8d170553be00dec88de20fb462c45 commit bb8308f26fd8d170553be00dec88de20fb462c45 Author: crazy Date: Sun Dec 16 16:10:49 2007 +0100 telepathy-glib-0.7.0-1-i686 * Version bump diff --git a/source/lib-extra/telepathy-glib/FrugalBuild b/source/lib-extra/telepathy-glib/FrugalBuild index 93d8542..03f0905 100644 --- a/source/lib-extra/telepathy-glib/FrugalBuild +++ b/source/lib-extra/telepathy-glib/FrugalBuild @@ -3,15 +3,16 @@ # Contributor: AlexExtreme pkgname=telepathy-glib -pkgver=0.5.14 +pkgver=0.7.0 pkgrel=1 pkgdesc="A glib library to ease writing telepathy clients in glib." url="http://telepathy.freedesktop.org/wiki/" -depends=('libtelepathy>=0.0.57') +depends=('dbus-glib') +makedepends=('libxslt') groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-glib/ | Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) #signatures=(${source[0]}.asc) # no .asc for .12,.13 :s -sha1sums=('b8c64daeba744793ceb051ab1e522686d8515c70') +sha1sums=('e0c813a2dd1d47709de43d0625cb749a255dc095') # optimization OK From crazy at frugalware.org Sun Dec 16 16:13:47 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 16:13:49 2007 Subject: [Frugalware-git] frugalware-current: libtelepathy-0.3.1-1-i686 Message-ID: <20071216151347.4239E11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a2fb59192f2432feef135ae491dce36121f634c commit 0a2fb59192f2432feef135ae491dce36121f634c Author: crazy Date: Sun Dec 16 16:13:30 2007 +0100 libtelepathy-0.3.1-1-i686 * Version bump diff --git a/source/lib-extra/libtelepathy/FrugalBuild b/source/lib-extra/libtelepathy/FrugalBuild index 027fb81..c40ce95 100644 --- a/source/lib-extra/libtelepathy/FrugalBuild +++ b/source/lib-extra/libtelepathy/FrugalBuild @@ -3,15 +3,15 @@ # Contributor: AlexExtreme pkgname=libtelepathy -pkgver=0.0.57 +pkgver=0.3.1 pkgrel=1 pkgdesc="A glib library to ease writing telepathy clients in glib." url="http://telepathy.freedesktop.org/wiki/" -depends=('glib2' 'dbus-glib>=0.74' 'libxslt') +depends=('glib2' 'dbus-glib>=0.74' 'libxslt' 'telepathy-glib>=0.7.0') groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://telepathy.freedesktop.org/releases/libtelepathy/|Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('bb87f0148dfd09f4b947fde82a20f2d83419417e') +sha1sums=('6689152ee0bf44614361aef1dc74d55ca946b1a4') # optimization OK From crazy at frugalware.org Sun Dec 16 16:21:02 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 16:21:06 2007 Subject: [Frugalware-git] frugalware-current: loudmouth-1.3.2-1-i686 Message-ID: <20071216152102.6AFDD11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e1694a75719f541793f674f613353fb4c11552bd commit e1694a75719f541793f674f613353fb4c11552bd Author: crazy Date: Sun Dec 16 16:20:38 2007 +0100 loudmouth-1.3.2-1-i686 * Version bump diff --git a/source/apps-extra/loudmouth/FrugalBuild b/source/apps-extra/loudmouth/FrugalBuild index 4d42fee..ac13315 100644 --- a/source/apps-extra/loudmouth/FrugalBuild +++ b/source/apps-extra/loudmouth/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=loudmouth -pkgver=1.2.2 -pkgrel=3 +pkgver=1.3.2 +pkgrel=1 pkgdesc="A lightweight and easy-to-use C library for programming with the Jabber protocol." url="http://www.loudmouth-project.org/" depends=('libgcrypt' 'gnutls>=2.0.0' 'libtasn1>=0.3.6' 'glib2' 'zlib' 'check') @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump "$url/download"|Flasttarbz2" source=(http://ftp.imendio.com/pub/imendio/$pkgname/src/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --enable-debug=no" -sha1sums=('2489b92ec520c85a11358f35047740d0b88c39a3') +sha1sums=('ca602df05343ca2c8667758d959160e94df8df59') # optimization OK From crazy at frugalware.org Sun Dec 16 16:29:26 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 16:29:28 2007 Subject: [Frugalware-git] frugalware-current: telepathy-gabble-0.7.1-1-i686 Message-ID: <20071216152926.A719B11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8dfae4b312c7e82991cda652c3f9042143162bab commit 8dfae4b312c7e82991cda652c3f9042143162bab Author: crazy Date: Sun Dec 16 16:29:02 2007 +0100 telepathy-gabble-0.7.1-1-i686 * Version bump diff --git a/source/lib-extra/telepathy-gabble/FrugalBuild b/source/lib-extra/telepathy-gabble/FrugalBuild index a399ef5..1cea45b 100644 --- a/source/lib-extra/telepathy-gabble/FrugalBuild +++ b/source/lib-extra/telepathy-gabble/FrugalBuild @@ -3,16 +3,16 @@ # Conreibutor: AlexExtreme pkgname=telepathy-gabble -pkgver=0.5.14 +pkgver=0.7.1 pkgrel=1 pkgdesc="Telepathy is a D-Bus framework for unifying real time communication." url="http://telepathy.freedesktop.org/" -depends=('dbus-glib>=0.74' 'loudmouth>=1.2.1' 'telepathy-glib>=0.5.14') +depends=('dbus-glib>=0.74' 'loudmouth>=1.3.2' 'telepathy-glib>=0.7.0' 'libidn') makedepends=('libxslt') groups=('lib-extra') archs=('i686') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-gabble | Flasttar" source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/$pkgname-$pkgver.tar.gz) -sha1sums=('f5824fc6cc1b17e685725c147c4ac21fcd0c0884') +sha1sums=('cc3b3e86fd995660c5aeb9f80698a440c699c952') # optimization OK From crazy at frugalware.org Sun Dec 16 16:35:52 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 16:35:54 2007 Subject: [Frugalware-git] frugalware-current: farsight-0.1.25-2-i686 Message-ID: <20071216153552.1B4F411904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97856d4002b02f55a12cad376a4516530dbd1329 commit 97856d4002b02f55a12cad376a4516530dbd1329 Author: crazy Date: Sun Dec 16 16:35:35 2007 +0100 farsight-0.1.25-2-i686 * rebuild diff --git a/source/xlib-extra/farsight/FrugalBuild b/source/xlib-extra/farsight/FrugalBuild index a9079a2..33b2e54 100644 --- a/source/xlib-extra/farsight/FrugalBuild +++ b/source/xlib-extra/farsight/FrugalBuild @@ -4,10 +4,10 @@ pkgname=farsight pkgver=0.1.25 -pkgrel=1 +pkgrel=2 pkgdesc="Farsight is an audio/video conferencing framework" url="http://farsight.freedesktop.org/" -depends=('dbus-glib>=0.74' 'gst-plugins-farsight>=0.12.5' 'glib2' 'clinkc' 'sofia-sip') +depends=('dbus-glib>=0.74' 'gst-plugins-farsight>=0.12.5' 'glib2' 'clinkc' 'sofia-sip>=1.12.7') groups=('xlib-extra') archs=('i686') up2date="lynx -dump http://farsight.freedesktop.org/releases/$pkgname | Flasttar" From crazy at frugalware.org Sun Dec 16 16:39:01 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 16:39:04 2007 Subject: [Frugalware-git] frugalware-current: telepathy-sharp-20070402-2-i686 Message-ID: <20071216153901.8660011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6b0c650f9105596cdc4a908c4438b9df8193774a commit 6b0c650f9105596cdc4a908c4438b9df8193774a Author: crazy Date: Sun Dec 16 16:38:48 2007 +0100 telepathy-sharp-20070402-2-i686 * rebuild diff --git a/source/lib-extra/telepathy-sharp/FrugalBuild b/source/lib-extra/telepathy-sharp/FrugalBuild index e041a26..07e0eb5 100644 --- a/source/lib-extra/telepathy-sharp/FrugalBuild +++ b/source/lib-extra/telepathy-sharp/FrugalBuild @@ -3,10 +3,10 @@ pkgname=telepathy-sharp pkgver=20070402 -pkgrel=1 +pkgrel=2 pkgdesc="Mono C# bindings for Telepathy" url="http://telepathy.freedesktop.org/" -depends=('libtelepathy' 'mono') +depends=('libtelepathy>=0.3.1' 'mono') makedepends=('gnome-common') groups=('lib-extra') archs=('i686') From crazy at frugalware.org Sun Dec 16 16:42:41 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 16:42:44 2007 Subject: [Frugalware-git] frugalware-current: telepathy-stream-engine-0.3.25-2-i686 Message-ID: <20071216154241.AD10311904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=079d43283003d8d69c335ed19088d40ac448b624 commit 079d43283003d8d69c335ed19088d40ac448b624 Author: crazy Date: Sun Dec 16 16:42:26 2007 +0100 telepathy-stream-engine-0.3.25-2-i686 * rebuild diff --git a/source/xapps-extra/telepathy-stream-engine/FrugalBuild b/source/xapps-extra/telepathy-stream-engine/FrugalBuild index 7447ea8..09081f7 100644 --- a/source/xapps-extra/telepathy-stream-engine/FrugalBuild +++ b/source/xapps-extra/telepathy-stream-engine/FrugalBuild @@ -4,10 +4,10 @@ pkgname=telepathy-stream-engine pkgver=0.3.25 -pkgrel=1 +pkgrel=2 pkgdesc="A stream engine for Telepathy" url="http://telepathy.freedesktop.org/wiki/" -depends=('libtelepathy>=0.0.57' 'farsight>=0.1.25' 'dbus-glib>=0.74' 'libx11') +depends=('libtelepathy>=0.3.1' 'farsight>=0.1.25-2' 'dbus-glib>=0.74' 'libx11') groups=('xapps-extra') archs=('i686') up2date="lynx -dump http://telepathy.freedesktop.org/releases/stream-engine/ | Flasttar" From crazy at frugalware.org Sun Dec 16 16:52:37 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 16:52:39 2007 Subject: [Frugalware-git] frugalware-current: tapioca-glib-0.14.0.1-1-i686 Message-ID: <20071216155237.40FFD11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1900917893b7fe56c7303509a6e3d330705aee7d commit 1900917893b7fe56c7303509a6e3d330705aee7d Author: crazy Date: Sun Dec 16 16:52:20 2007 +0100 tapioca-glib-0.14.0.1-1-i686 * Version bump * use released tarballs from sf.net * changed maintainer to me diff --git a/source/xlib-extra/tapioca-glib/FrugalBuild b/source/xlib-extra/tapioca-glib/FrugalBuild index 76bde3f..9207316 100644 --- a/source/xlib-extra/tapioca-glib/FrugalBuild +++ b/source/xlib-extra/tapioca-glib/FrugalBuild @@ -1,22 +1,18 @@ # Compiling Time: 0.26 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Contributor: AlexExtreme pkgname=tapioca-glib -pkgver=20070326 +pkgver=0.14.0.1 pkgrel=1 -url="http://tapioca-voip.sourceforge.net" pkgdesc="Core Tapioca library" -depends=('libtelepathy' 'farsight' 'gtk+2' 'dbus-glib>=0.72') +depends=('dbus-glib') groups=('xlib-extra') archs=('i686') -up2date="$pkgver" -source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -signatures=($source.asc) - -build() { - Fcd - NOCONFIGURE=y ./autogen.sh || Fdie - Fbuild -} +_F_sourceforge_dirname="tapioca-voip" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://tapioca-voip.sourceforge.net" +sha1sums=('4f6edab87f25da1d657398e4c1ea3794a4626eed') # optimization OK From crazy at frugalware.org Sun Dec 16 17:04:28 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 17:04:31 2007 Subject: [Frugalware-git] frugalware-current: 7zip-4.57-1-i686 Message-ID: <20071216160428.EC87411904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ce5c150b681a4d789791286506a1bf54ba1537b commit 4ce5c150b681a4d789791286506a1bf54ba1537b Author: crazy Date: Sun Dec 16 17:03:42 2007 +0100 7zip-4.57-1-i686 * Version bump diff --git a/source/apps-extra/7zip/FrugalBuild b/source/apps-extra/7zip/FrugalBuild index c8ec621..f171ffc 100644 --- a/source/apps-extra/7zip/FrugalBuild +++ b/source/apps-extra/7zip/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Tuxbubling pkgname=7zip -pkgver=4.55 +pkgver=4.57 pkgrel=1 pkgdesc="7-Zip is a file archiver with high compression ratio." _F_sourceforge_name="p7zip" @@ -36,5 +36,5 @@ build() } -sha1sums=('7dd6f75c031f15f3d379af3e208e2e4d65f55bb7') +sha1sums=('eda5de3d35567e2633373dbe60313527a6a4db27') # optimization OK From crazy at frugalware.org Sun Dec 16 17:14:48 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 17:14:51 2007 Subject: [Frugalware-git] frugalware-current: portaudio-19_20071207-1-i686 Message-ID: <20071216161448.8DC1111904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39369612c21342e615312c53960f3ff7bddf99df commit 39369612c21342e615312c53960f3ff7bddf99df Author: crazy Date: Sun Dec 16 17:14:32 2007 +0100 portaudio-19_20071207-1-i686 * Version bump diff --git a/source/multimedia-extra/portaudio/FrugalBuild b/source/multimedia-extra/portaudio/FrugalBuild index 36aa055..4caa500 100644 --- a/source/multimedia-extra/portaudio/FrugalBuild +++ b/source/multimedia-extra/portaudio/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=portaudio -pkgver=19_061121 +pkgver=19_20071207 pkgrel=1 pkgdesc="PortAudio is a free, cross platform, open-source, audio I/O library" url="http://www.portaudio.com/" @@ -13,6 +13,6 @@ up2date="lynx -dump http://www.portaudio.com/download.html|grep -m1 '.tar.gz'|se source=($url/archives/pa_stable_v${pkgver}.tar.gz) _F_cd_path="$pkgname" Fconfopts="$Fconfopts --with-jack=no" -sha1sums=('798fc900251e2df423ba9e60b832ca76f85c3ad0') +sha1sums=('3841453bb7be672a15b6b632ade6f225eb0a4efc') # optimization OK From crazy at frugalware.org Sun Dec 16 17:37:32 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 17:37:34 2007 Subject: [Frugalware-git] frugalware-current: mixxx-1.5.0.1-2-i686 Message-ID: <20071216163732.5440111904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c88189e826c02bc5277172d027ba022207e82c83 commit c88189e826c02bc5277172d027ba022207e82c83 Author: crazy Date: Sun Dec 16 17:36:14 2007 +0100 mixxx-1.5.0.1-2-i686 * rebuild with portaudio diff --git a/source/kde-extra/mixxx/FrugalBuild b/source/kde-extra/mixxx/FrugalBuild index f4de422..f8ee902 100644 --- a/source/kde-extra/mixxx/FrugalBuild +++ b/source/kde-extra/mixxx/FrugalBuild @@ -3,9 +3,9 @@ pkgname=mixxx pkgver=1.5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open source DJ tool." -depends=('libmad' 'libid3tag' 'libvorbis' 'libsndfile' 'portaudio' 'jack' +depends=('libmad' 'libid3tag' 'libvorbis' 'libsndfile' 'portaudio>=19_20071207' 'jack' 'audiofile' 'python' 'qt' 'libstdc++' 'libgcc') makedepends=('alsa-lib') groups=('kde-extra') From crazy at frugalware.org Sun Dec 16 17:47:51 2007 From: crazy at frugalware.org (crazy) Date: Sun Dec 16 17:47:53 2007 Subject: [Frugalware-git] frugalware-current: cpulimit-1.1-1-i686 Message-ID: <20071216164751.E152D11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9e16a774f2ff1fbbc63931c5112cf923e7e2be3 commit b9e16a774f2ff1fbbc63931c5112cf923e7e2be3 Author: crazy Date: Sun Dec 16 17:47:42 2007 +0100 cpulimit-1.1-1-i686 * up2date fix diff --git a/source/apps-extra/cpulimit/FrugalBuild b/source/apps-extra/cpulimit/FrugalBuild index 366b44b..44dec6a 100644 --- a/source/apps-extra/cpulimit/FrugalBuild +++ b/source/apps-extra/cpulimit/FrugalBuild @@ -8,8 +8,8 @@ pkgdesc="CPU Usage Limiter for Linux" depends=('glibc') groups=('apps-extra') archs=('i686' 'x86_64') -_F_sourceforge_broken_up2date=1 Finclude sourceforge +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=174425'|grep 'cpulimit-\(.*\).tar.gz$'|Flasttar" sha1sums=('9f020c22d633e3f6289c69844bd7136c1f2704f1') build() From boobaa at frugalware.org Sun Dec 16 23:03:49 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Dec 16 23:03:51 2007 Subject: [Frugalware-git] frugalware-current: man-pages-2.73-1-i686 Message-ID: <20071216220349.9797C11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=70a1d991c5b66ac66194e1c1605c369d8113c6bc commit 70a1d991c5b66ac66194e1c1605c369d8113c6bc Author: CSÉCSY László Date: Sun Dec 16 23:03:42 2007 +0100 man-pages-2.73-1-i686 version bump diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index d534cca..cf7b1ae 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=man-pages -pkgver=2.70 +pkgver=2.73 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -41,4 +41,4 @@ build() Frm /usr/share/man/man4/mouse.4 } # optimization OK - noarch -sha1sums=('92a1e01b6e78f849b318493df7c2ddb43a0ba878') +sha1sums=('fc4738ee6eaef0435efc7f6c34d4f785bb0f1b55') From boobaa at frugalware.org Mon Dec 17 08:09:15 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Dec 17 08:09:17 2007 Subject: [Frugalware-git] frugalware-current: poedit-1.3.9-1-i686 Message-ID: <20071217070915.3705611904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3356e7bb2fb5d7bf61de8f676b4728588badeb7f commit 3356e7bb2fb5d7bf61de8f676b4728588badeb7f Author: CSÉCSY László Date: Mon Dec 17 08:09:05 2007 +0100 poedit-1.3.9-1-i686 version bump diff --git a/source/xlib-extra/poedit/FrugalBuild b/source/xlib-extra/poedit/FrugalBuild index b2209c2..dbafadb 100644 --- a/source/xlib-extra/poedit/FrugalBuild +++ b/source/xlib-extra/poedit/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=poedit -pkgver=1.3.8 +pkgver=1.3.9 pkgrel=1 pkgdesc="cross-platform gettext catalogs (.po files) editor" url="http://www.poedit.org/" @@ -19,4 +19,4 @@ build() { } # optimization OK -sha1sums=('6d7f812bfaadce61dde370eaf8692474f0ae026e') +sha1sums=('c5fc46ca86797d9e78336c69e05e7302dc1a134e') From boobaa at frugalware.org Mon Dec 17 08:16:33 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Dec 17 08:16:36 2007 Subject: [Frugalware-git] frugalware-current: amavisd-new-2.5.3-1-i686 Message-ID: <20071217071633.EEB1B1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=579e9b284d921bb60bcddc4d11482463834bc3b4 commit 579e9b284d921bb60bcddc4d11482463834bc3b4 Author: CSÉCSY László Date: Mon Dec 17 08:16:27 2007 +0100 amavisd-new-2.5.3-1-i686 version bump diff --git a/source/network-extra/amavisd-new/FrugalBuild b/source/network-extra/amavisd-new/FrugalBuild index 9ae1dd9..852fad8 100644 --- a/source/network-extra/amavisd-new/FrugalBuild +++ b/source/network-extra/amavisd-new/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Zoltan Kiss pkgname=amavisd-new -pkgver=2.5.2 +pkgver=2.5.3 pkgrel=1 pkgdesc="Amavisd-new is a high-performance interface between mailer (MTA) and content checkers" url="http://www.ijs.si/software/amavisd/" @@ -17,9 +17,9 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url |grep -A 2 'Most recent versions'|grep 'amavis' |sed 's/.*amavisd-new-\(.*\)\.tar.*/\1/;q'" source=($url/amavisd-new-$pkgver.tar.gz 10-amavisconf 20-userconf \ rc.amavisd-new amavisconf README.Frugalware) -sha1sums=('2465131448ce10dac8511450695ff63bc565e6db' \ +sha1sums=('2e1460ad505ad4251a876ec506d021a392c7c0c0' \ '648421546adab952f6ace5834c269f8a80256b84' \ - '681dea305554a05b4a7279b56c7c1282650fcb8f' \ + '019e9ff54de600b5bc68e4c810a17befe1b0e16f' \ 'abbe37aedba303f48e7827841e9e84dc2bb02ca7' \ '0817540bbce13a5ac1861d1e82dcbcf740f977e8' \ 'f09d2c56d797c699c3dffcc0c21b293d0098d0a5') From krics at linuxforum.hu Mon Dec 17 08:26:15 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 08:26:17 2007 Subject: [Frugalware-git] frugalware-current: gnome-panel-2.20.2-1-x86_64 Message-ID: <20071217072615.E03EA11901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68f75c6f8c1a127a53c9955e6f98d2ee87c8dd4f commit 68f75c6f8c1a127a53c9955e6f98d2ee87c8dd4f Author: Christian Hamar alias krix Date: Mon Dec 17 08:25:44 2007 +0100 gnome-panel-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome/gnome-panel/FrugalBuild b/source/gnome/gnome-panel/FrugalBuild index 1762b4b..05ae8b0 100644 --- a/source/gnome/gnome-panel/FrugalBuild +++ b/source/gnome/gnome-panel/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-panel -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="GNOME panel and core applets" rodepends=('alacarte>=0.11.1.1') @@ -26,7 +26,7 @@ _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('92288158cd4ab9cc56557ca4345292316e7af6bd') +sha1sums=('d3bf83e825afc47e620129f63b0fd00229ef12a7') build() { Fcd From boobaa at frugalware.org Mon Dec 17 08:30:39 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Mon Dec 17 08:30:42 2007 Subject: [Frugalware-git] frugalware-current: vnstat-1.5-1-i686 Message-ID: <20071217073039.A117811901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e49d3cf9fcf5fa004341a9af4533fa2b63f10f51 commit e49d3cf9fcf5fa004341a9af4533fa2b63f10f51 Author: CSÉCSY László Date: Mon Dec 17 08:30:29 2007 +0100 vnstat-1.5-1-i686 version bump diff --git a/source/network-extra/vnstat/FrugalBuild b/source/network-extra/vnstat/FrugalBuild index 34ff48d..f6ca6a8 100644 --- a/source/network-extra/vnstat/FrugalBuild +++ b/source/network-extra/vnstat/FrugalBuild @@ -3,23 +3,21 @@ # Contributor: RyD pkgname=vnstat -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="Console-based network traffic monitor that uses the /proc filesystem to get the needed information" url="http://humdi.net/vnstat/" depends=('glibc') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://humdi.net/vnstat/ | grep vnstat-[0-9\.]*tar.gz$ | sed 's/.*t-\(.*\)\.t.*/\1/'" -source=(http://humdi.net/vnstat/vnstat-1.4.tar.gz cron.patch) -sha1sums=('49a51c91dc655f5ff78615db778b982e6e4b2bc2' \ - '56aea9e8acc3fb7e6cd6896d65ff493caf3d50f3') +up2date="lynx -dump http://humdi.net/vnstat/ | grep -m1 vnstat-[0-9\.]*tar.gz$ | sed 's/.*t-\(.*\)\.t.*/\1/'" +source=(http://humdi.net/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('f3c72b02754e189387a192927c43cd0f093cf755') build() { - Fpatchall - Fmake - Fmakeinstall + Fmkdir etc + Fbuild } -# optimalization OK +# optimization OK From krics at linuxforum.hu Mon Dec 17 08:48:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 08:48:41 2007 Subject: [Frugalware-git] frugalware-current: gtkhtml-3.16.2-1-x86_64 Message-ID: <20071217074838.A542411903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5cd158a9572b24afce1cc056dfe7a8e2cdb0d617 commit 5cd158a9572b24afce1cc056dfe7a8e2cdb0d617 Author: Christian Hamar alias krix Date: Mon Dec 17 08:48:21 2007 +0100 gtkhtml-3.16.2-1-x86_64 * Version bump diff --git a/source/gnome/gtkhtml/FrugalBuild b/source/gnome/gtkhtml/FrugalBuild index 3245ed3..8bdeb7b 100644 --- a/source/gnome/gtkhtml/FrugalBuild +++ b/source/gnome/gtkhtml/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gtkhtml -pkgver=3.16.1 +pkgver=3.16.2 pkgrel=1 pkgdesc="A lightweight HTML rendering/printing/editing engine" depends=('gail>=1.20.1' 'libgnomeui>=2.20.1.1' \ @@ -13,5 +13,5 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('d9be478f1cbdcb2f8b624b78bc9f546a24491ab9') +sha1sums=('3726e6a08af3e95df3222aaee5a6b1cbe0fb064d') # optimization OK From krics at linuxforum.hu Mon Dec 17 08:54:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 08:54:39 2007 Subject: [Frugalware-git] frugalware-current: gnome-python-2.20.1-1-x86_64 Message-ID: <20071217075438.162C711903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7e8fe6f1c54bc3ceb1530d6dd6d993dc9f17c884 commit 7e8fe6f1c54bc3ceb1530d6dd6d993dc9f17c884 Author: Christian Hamar alias krix Date: Mon Dec 17 08:54:29 2007 +0100 gnome-python-2.20.1-1-x86_64 * Version bump diff --git a/source/gnome/gnome-python/FrugalBuild b/source/gnome/gnome-python/FrugalBuild index 6aeb8a9..84c61db 100644 --- a/source/gnome/gnome-python/FrugalBuild +++ b/source/gnome/gnome-python/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-python -pkgver=2.20.0 +pkgver=2.20.1 pkgrel=1 pkgdesc="Python bindings for GNOME" url="http://www.daa.com.au/~james/pygtk/" @@ -11,5 +11,5 @@ groups=('gnome') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('4dfc3bfde3f4ebebc41e3ca59b0106006ca0c29b') +sha1sums=('654419b0082d101d76ecc79d9fe47b0d8ea5461b') # optimization OK From krics at linuxforum.hu Mon Dec 17 09:59:29 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 09:59:32 2007 Subject: [Frugalware-git] frugalware-current: evolution-2.12.2-1-x86_64 Message-ID: <20071217085929.B0E2411904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e1a4c047f9b609ab8d7f28c65c42c7f132c2604f commit e1a4c047f9b609ab8d7f28c65c42c7f132c2604f Author: Christian Hamar alias krix Date: Mon Dec 17 09:59:07 2007 +0100 evolution-2.12.2-1-x86_64 * Version bump diff --git a/source/gnome/evolution/FrugalBuild b/source/gnome/evolution/FrugalBuild index 104fbb4..8b91af3 100644 --- a/source/gnome/evolution/FrugalBuild +++ b/source/gnome/evolution/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=evolution -pkgver=2.12.1 +pkgver=2.12.2 pkgrel=1 pkgdesc="Integrated mail, calendar and address book suite for GNOME" -depends=('gail>=1.20.1' 'gal>=2.5.3-3' 'evolution-data-server>=1.12.1' 'gtkhtml>=3.16.1' \ +depends=('gail>=1.20.1' 'gal>=2.5.3-3' 'evolution-data-server>=1.12.1' 'gtkhtml>=3.16.2' \ 'gnome-spell>=1.0.8' 'rarian' 'heimdal>=1.0' \ 'evolution-data-server-ldap>=1.12.1' 'libbonobo>=2.20.0' 'nss>=3.11.5' 'nspr>=4.6.6' \ 'libnotify') @@ -70,6 +70,6 @@ build() { Fbuild_gnome_scriptlet } -sha1sums=('d867983300523449cc3e026f72bf2e2a4c6f6bcf' \ +sha1sums=('7096fa54cfd61a8cf1902a711a0c1191e314d511' \ '41988b2a14c10156b60a6000efc058c59248b5e2') # optimization OK From krics at linuxforum.hu Mon Dec 17 10:06:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 10:06:51 2007 Subject: [Frugalware-git] frugalware-current: gtksourceview-2.0.2-1-x86_64 Message-ID: <20071217090649.70FEF1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f3a52b6e1ab71e76235607222e6740847b96c14 commit 6f3a52b6e1ab71e76235607222e6740847b96c14 Author: Christian Hamar alias krix Date: Mon Dec 17 10:06:40 2007 +0100 gtksourceview-2.0.2-1-x86_64 * Version bump diff --git a/source/gnome/gtksourceview/FrugalBuild b/source/gnome/gtksourceview/FrugalBuild index 467d0f9..bc2b8cc 100644 --- a/source/gnome/gtksourceview/FrugalBuild +++ b/source/gnome/gtksourceview/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gtksourceview -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" depends=('libgnomeprintui>=2.18.1' 'gtk+2>=2.12.1' 'gnome-vfs>=2.20.0') @@ -16,5 +16,5 @@ build() { Frm usr/share/gtksourceview-2.0/language-specs/boo.lang } -sha1sums=('cab4a2fd722a740d947767a319f55ef076f7701f') +sha1sums=('df728a822b55dc6c3370e011c8904a5be5c357a8') # optimization OK From krics at linuxforum.hu Mon Dec 17 10:19:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 10:19:52 2007 Subject: [Frugalware-git] frugalware-current: eog-2.20.3-1-x86_64 Message-ID: <20071217091949.6CDF411904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b90cfaea92861c16a3e318d422c9ee6d4b0f0250 commit b90cfaea92861c16a3e318d422c9ee6d4b0f0250 Author: Christian Hamar alias krix Date: Mon Dec 17 10:19:40 2007 +0100 eog-2.20.3-1-x86_64 * Version bump diff --git a/source/gnome/eog/FrugalBuild b/source/gnome/eog/FrugalBuild index 99a271f..d4baeaf 100644 --- a/source/gnome/eog/FrugalBuild +++ b/source/gnome/eog/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=eog -pkgver=2.20.2 +pkgver=2.20.3 pkgrel=1 pkgdesc="An image viewing and cataloging program for GNOME" depends=('libexif' 'libgnomeui>=2.20.0' 'rarian' 'desktop-file-utils' \ @@ -16,5 +16,5 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -sha1sums=('eca46e393cd02bf5156c30a6f64a9341e0a3bcca') +sha1sums=('7a89765c9c87b0c029b4bf92458440884951f659') # optimization OK From krics at linuxforum.hu Mon Dec 17 10:41:35 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 10:41:37 2007 Subject: [Frugalware-git] frugalware-current: gedit-2.20.4-1-x86_64 Message-ID: <20071217094135.73E3311904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c05b193cbb3966c84369a43c1eb9526524138e5 commit 2c05b193cbb3966c84369a43c1eb9526524138e5 Author: Christian Hamar alias krix Date: Mon Dec 17 10:41:23 2007 +0100 gedit-2.20.4-1-x86_64 * VErsion bump diff --git a/source/gnome/gedit/FrugalBuild b/source/gnome/gedit/FrugalBuild index fbe6c70..f7ad102 100644 --- a/source/gnome/gedit/FrugalBuild +++ b/source/gnome/gedit/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gedit -pkgver=2.20.3 +pkgver=2.20.4 pkgrel=1 pkgdesc="A text editor for GNOME" url="http://www.gnome.org/" @@ -15,7 +15,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/gedit.schemas' \ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('ccbb9bad00101ed465c39da05b0dcaf8ea881120') +sha1sums=('82bf5fe2e119018936fca0b89196c9e86c69ee3f') subpkgs=("$pkgname-python") subdescs=('gedit python plugins') From krics at linuxforum.hu Mon Dec 17 10:48:18 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 10:48:20 2007 Subject: [Frugalware-git] frugalware-current: vte-0.16.10-2-x86_64 Message-ID: <20071217094818.6074C11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3df6d1bdb8e88d3e4ecd3710ab7e01ed79bee378 commit 3df6d1bdb8e88d3e4ecd3710ab7e01ed79bee378 Author: Christian Hamar alias krix Date: Mon Dec 17 10:48:09 2007 +0100 vte-0.16.10-2-x86_64 * VErsion bump diff --git a/source/gnome/vte/FrugalBuild b/source/gnome/vte/FrugalBuild index 8403a94..1eddbfb 100644 --- a/source/gnome/vte/FrugalBuild +++ b/source/gnome/vte/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=vte -pkgver=0.16.9 +pkgver=0.16.10 pkgrel=2 pkgdesc="Virtual Terminal Emulator" url="http://www.gnome.org/" @@ -11,7 +11,7 @@ makedepends=('pygtk>=2.12.0' 'gtk-doc' 'perl-xml') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('53a49c7d5fae41ac6ec9b79e6b290e99e3f10860') +sha1sums=('d6c1fd8a65d52fa42c38bf4f3372989945b16177') Fconfopts="$Fconfopts --enable-gtk-doc" subpkgs=('vte-python') From krics at linuxforum.hu Mon Dec 17 10:57:32 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 10:57:35 2007 Subject: [Frugalware-git] frugalware-current: gnome-terminal-2.18.3-1-x86_64 Message-ID: <20071217095732.80A1A11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0f87bc8a5f6aa5ac3e857bcd567aaf2ef223c14 commit c0f87bc8a5f6aa5ac3e857bcd567aaf2ef223c14 Author: Christian Hamar alias krix Date: Mon Dec 17 10:57:25 2007 +0100 gnome-terminal-2.18.3-1-x86_64 * Version bump diff --git a/source/gnome/gnome-terminal/FrugalBuild b/source/gnome/gnome-terminal/FrugalBuild index 5e36599..8b84189 100644 --- a/source/gnome/gnome-terminal/FrugalBuild +++ b/source/gnome/gnome-terminal/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-terminal -pkgver=2.18.2 +pkgver=2.18.3 pkgrel=1 pkgdesc="GNOME terminal emulator" url="http://www.gnome.org/" -depends=('libgnomeui>=2.20.0' 'startup-notification' 'vte>=0.16.9' 'rarian' 'gnome-vfs>=2.20.0' \ +depends=('libgnomeui>=2.20.0' 'startup-notification' 'vte>=0.16.10' 'rarian' 'gnome-vfs>=2.20.0' \ 'avahi-glib>=0.6.17' 'dbus-glib>=0.71') makedepends=('intltool' 'gnome-doc-utils>=0.9.2') groups=('gnome' 'gnome-minimal') @@ -16,7 +16,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-terminal.schemas') Finclude gnome gnome-scriptlet source=(${source[@]} 00-$pkgname-2.12.0-prompt.patch \ 01-$pkgname-2.12.0-bindings.patch) -sha1sums=('a37dff35e90ab1c2e15d47d5731ff0fb596dbd4d' \ +sha1sums=('ca8e55a1a033c731462ac27a1b92e52cac2dc238' \ '825da7671bf95eaa970d44de52cd3586205717ca' \ '0146084932430786185eaacafc06852a87cfe632') From krics at linuxforum.hu Mon Dec 17 11:04:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 11:04:55 2007 Subject: [Frugalware-git] frugalware-current: libarchive-2.4.8-1-x86_64 Message-ID: <20071217100453.DA12911904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34ae43c76c6a4052a5a20aebcea1dd54941d1032 commit 34ae43c76c6a4052a5a20aebcea1dd54941d1032 Author: Christian Hamar alias krix Date: Mon Dec 17 11:04:47 2007 +0100 libarchive-2.4.8-1-x86_64 * Version bump diff --git a/source/base/libarchive/FrugalBuild b/source/base/libarchive/FrugalBuild index ac213a6..155cc5a 100644 --- a/source/base/libarchive/FrugalBuild +++ b/source/base/libarchive/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libarchive -pkgver=2.4.7 +pkgver=2.4.8 pkgrel=1 pkgdesc="Library to create and read several different archive formats" groups=('base' 'chroot-core') @@ -11,7 +11,7 @@ url="http://people.freebsd.org/~kientzle/libarchive/" depends=('bzip2' 'zlib') up2date="lynx -dump $url |Flasttar" source=($url/src/$pkgname-$pkgver.tar.gz) -sha1sums=('9889c9b80d43d245d3e710fdeb63270796eb8450') +sha1sums=('129b07ee35e3eede8581904272efe6950a99eaaa') # Need to prevent mistakes like unclean chroot build and others and be sure that DONT link to ACL* Fconfopts=($Fconfopts --disable-xattr --disable-acl) #options=('force') From krics at linuxforum.hu Mon Dec 17 11:53:29 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 11:53:34 2007 Subject: [Frugalware-git] frugalware-current: pidgin-2.3.1-1-x86_64 Message-ID: <20071217105329.C1C1011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bfb3f985b14a8df161e8c2293640f3046807fd64 commit bfb3f985b14a8df161e8c2293640f3046807fd64 Author: Christian Hamar alias krix Date: Mon Dec 17 11:53:15 2007 +0100 pidgin-2.3.1-1-x86_64 * Version bump diff --git a/source/xapps/pidgin/FrugalBuild b/source/xapps/pidgin/FrugalBuild index 3200c99..ad5cd86 100644 --- a/source/xapps/pidgin/FrugalBuild +++ b/source/xapps/pidgin/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: voroskoi pkgname=pidgin -pkgver=2.2.2 +pkgver=2.3.1 pkgrel=1 pkgdesc="A multi-protocol instant messaging (IM) client" url="http://www.pidgin.im/" @@ -21,7 +21,7 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge options=('scriptlet') source=(${source[@]} perl-fix.patch) -sha1sums=('ff955c3a2509d257c7fda1a48af6bdde439b0d8a' \ +sha1sums=('d247d085e89360c2a6bd8e4775b7814fd02d10c9' \ 'c3facfbc8ec54b6b5a4f83a827cd766658fd9777') build() { From krics at linuxforum.hu Mon Dec 17 11:59:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 11:59:52 2007 Subject: [Frugalware-git] frugalware-current: pidgin-plugin-guifications-2.16-1-x86_64 Message-ID: <20071217105949.AE24B11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7cfd9e410fde427b657a4e7e92e177bdeda51cf7 commit 7cfd9e410fde427b657a4e7e92e177bdeda51cf7 Author: Christian Hamar alias krix Date: Mon Dec 17 11:59:40 2007 +0100 pidgin-plugin-guifications-2.16-1-x86_64 * Version bump diff --git a/source/xapps-extra/pidgin-plugin-guifications/FrugalBuild b/source/xapps-extra/pidgin-plugin-guifications/FrugalBuild index 7f239f8..d9dfaf7 100644 --- a/source/xapps-extra/pidgin-plugin-guifications/FrugalBuild +++ b/source/xapps-extra/pidgin-plugin-guifications/FrugalBuild @@ -3,11 +3,11 @@ pkgname=pidgin-plugin-guifications _F_archive_name=pidgin-guifications -pkgver=2.14 +pkgver=2.16 pkgrel=1 pkgdesc="Gaim Guifications Plugin" url="http://plugins.guifications.org/" -depends=('pidgin>=2.0.0') +depends=('pidgin>=2.3.1') makedepends=('perl-xml') groups=('xapps-extra') archs=('i686' 'x86_64') @@ -17,6 +17,6 @@ conflicts=('gaim-plugin-guifications') provides=('gaim-plugin-guifications') replaces=('gaim-plugin-guifications') Fconfopts="$Fconfopts --disable-deprecated" -sha1sums=('e023527de383dc9346bcf257b2b07dcae4b324d3') +sha1sums=('c5a5a5bc8885a2dfb1da5645a6740ec9638ff496') # optimization OK From krics at linuxforum.hu Mon Dec 17 12:22:17 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 12:22:21 2007 Subject: [Frugalware-git] frugalware-current: medit-0.9.0-1-x86_64 Message-ID: <20071217112217.D191011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e3c86999e28ac429bdb4756b8dc86e272632d31 commit 9e3c86999e28ac429bdb4756b8dc86e272632d31 Author: Christian Hamar alias krix Date: Mon Dec 17 12:22:03 2007 +0100 medit-0.9.0-1-x86_64 * Version bump diff --git a/source/xapps-extra/medit/FrugalBuild b/source/xapps-extra/medit/FrugalBuild index be50f25..91e8d1f 100644 --- a/source/xapps-extra/medit/FrugalBuild +++ b/source/xapps-extra/medit/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: detto pkgname=medit -pkgver=0.8.10 +pkgver=0.9.0 pkgrel=1 pkgdesc="A useful programming and around-programming text editor." depends=('libxml2' 'pygtk') @@ -15,7 +15,7 @@ _F_sourceforge_dirname="mooedit" Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=167563|grep -m1 'medit-\(.*\).tar.bz2'|sed 's/.*it-\(.*\).t.*/\1/'" source=(${source[@]} kill_iconcacheupdate.patch) -sha1sums=('c40c40f779757a3bef356fd993442c2d7f6354c7' \ +sha1sums=('2eae77fdba39114162735dceae09f6f0344815cc' \ '9af280e0d17a19c908c83fd4e7914730a0b876a8') # optimization OK From krics at linuxforum.hu Mon Dec 17 12:53:22 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 12:53:25 2007 Subject: [Frugalware-git] frugalware-current: gnome-games-2.20.2-1-x86_64 Message-ID: <20071217115322.8020211904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec497a7c25f70b27f50bfe0a910b5d03dbdaa22d commit ec497a7c25f70b27f50bfe0a910b5d03dbdaa22d Author: Christian Hamar alias krix Date: Mon Dec 17 12:53:13 2007 +0100 gnome-games-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome-extra/gnome-games/FrugalBuild b/source/gnome-extra/gnome-games/FrugalBuild index 91f4091..cf05ebe 100644 --- a/source/gnome-extra/gnome-games/FrugalBuild +++ b/source/gnome-extra/gnome-games/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-games -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="Games for GNOME" url="http://www.gnome.org/" @@ -32,5 +32,5 @@ _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-scores-group=users --with-scores-user=root" -sha1sums=('6dbf2777441965d4e799ba99284195a99ed8fd4b') +sha1sums=('f6d91695d5ac96e5ebdea3facaec84c8fa452415') # optimization OK From krics at linuxforum.hu Mon Dec 17 12:58:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 12:58:40 2007 Subject: [Frugalware-git] frugalware-current: liferea-1.4.9-1-x86_64 Message-ID: <20071217115838.4818011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13b1485ca78227df1d259c29f2cc3edb073dceaa commit 13b1485ca78227df1d259c29f2cc3edb073dceaa Author: Christian Hamar alias krix Date: Mon Dec 17 12:58:30 2007 +0100 liferea-1.4.9-1-x86_64 * Version bump diff --git a/source/gnome-extra/liferea/FrugalBuild b/source/gnome-extra/liferea/FrugalBuild index 4486bc7..9309e36 100644 --- a/source/gnome-extra/liferea/FrugalBuild +++ b/source/gnome-extra/liferea/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=liferea -pkgver=1.4.8 +pkgver=1.4.9 pkgrel=1 pkgdesc="Liferea is a news aggregator for online news feeds." license="GPL2" @@ -17,7 +17,7 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet up2date="lynx -dump http://liferea.sourceforge.net|grep -m1 'Stable'|sed 's/.*ea \(.*\) (.*/\1/'" -sha1sums=('6e64c7bacd39e04034107f569e9e2d00fad37474') +sha1sums=('3a6c9a5d1a4b3563d945c8bdc3eab17650d5b5e7') build() { Fcd $pkgname-$pkgver From krics at linuxforum.hu Mon Dec 17 13:01:59 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 13:02:01 2007 Subject: [Frugalware-git] frugalware-current: roxterm-1.8.1-1-x86_64 Message-ID: <20071217120159.C82E411904CD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d2db03570d332af27e1e565076d1d2b7f043ee8 commit 3d2db03570d332af27e1e565076d1d2b7f043ee8 Author: Christian Hamar alias krix Date: Mon Dec 17 13:01:52 2007 +0100 roxterm-1.8.1-1-x86_64 * Version bump diff --git a/source/gnome-extra/roxterm/FrugalBuild b/source/gnome-extra/roxterm/FrugalBuild index 32d1823..b64a43d 100644 --- a/source/gnome-extra/roxterm/FrugalBuild +++ b/source/gnome-extra/roxterm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=roxterm -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="a terminal emulator intended to provide similar features to gnome-terminal, based on the same VTE library, but with a smaller footprint and quicker start-up time." _F_gnome_desktop="y" @@ -19,6 +19,6 @@ build() { Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver } -sha1sums=('ff033784bcc2fa6e566afe7039849052432cbd92') +sha1sums=('5999938aedb1ebc1e4ae784a2eeb3454664ebf1b') # optimization OK From krics at linuxforum.hu Mon Dec 17 13:11:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 13:11:56 2007 Subject: [Frugalware-git] frugalware-current: goffice-0.5.4-1-x86_64 Message-ID: <20071217121153.A11CF11901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08d29d446ac8db2c92ff293d4726ecedba3ed88e commit 08d29d446ac8db2c92ff293d4726ecedba3ed88e Author: Christian Hamar alias krix Date: Mon Dec 17 13:11:45 2007 +0100 goffice-0.5.4-1-x86_64 * Version bump diff --git a/source/gnome-extra/goffice/FrugalBuild b/source/gnome-extra/goffice/FrugalBuild index 8396118..1c218a5 100644 --- a/source/gnome-extra/goffice/FrugalBuild +++ b/source/gnome-extra/goffice/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=goffice -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="A glib/gtk set of document centric objects and utilities" url="http://www.gnome.org/" @@ -13,6 +13,6 @@ archs=('x86_64' 'i686') _F_gnome_scrollkeeper="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet -sha1sums=('123a6b7166dc443dcd6237adbf71a14c73e7f089') +sha1sums=('23acbf709ad748c2dddfc0b72fec156816d7a48b') # optimization OK From krics at linuxforum.hu Mon Dec 17 13:24:09 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 13:24:17 2007 Subject: [Frugalware-git] frugalware-current: g-wrap-1.9.9-1-x86_64 Message-ID: <20071217122409.A696A11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b1e52bae83d7777636f695dafdc5c9d379942984 commit b1e52bae83d7777636f695dafdc5c9d379942984 Author: Christian Hamar alias krix Date: Mon Dec 17 13:24:00 2007 +0100 g-wrap-1.9.9-1-x86_64 * Version bump * Fsed out ALL -Werror stuff... diff --git a/source/lib-extra/g-wrap/FrugalBuild b/source/lib-extra/g-wrap/FrugalBuild index e33e0fe..c51f588 100644 --- a/source/lib-extra/g-wrap/FrugalBuild +++ b/source/lib-extra/g-wrap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=g-wrap -pkgver=1.9.7 +pkgver=1.9.9 pkgrel=1 pkgdesc="A tool for exporting C libraries into Scheme interpreters" url="http://www.nongnu.org/g-wrap/" @@ -13,11 +13,22 @@ options=('scriptlet') Finclude sourceforge up2date=("lynx -dump http://download.savannah.gnu.org/releases/g-wrap/ | Flasttar") source=(http://download.savannah.gnu.org/releases/g-wrap/$pkgname-$pkgver.tar.gz \ - g-wrap-consistent.patch g-wrap-glib2.patch g-wrap-info.patch) -sha1sums=('403434170d0302f8dbce1c4f85116fa8cd0bba0d' \ - 'bdc56abb92b8c7a6518b43d09e3e1dfde9092151' \ - '46b35197d0710cf156427df4e239a890a2dd35e7' \ - '3e024ebfbf29a9b1d1064b27b6448030c4e2d9c3') -Fconfopts="$Fconfopts --with-lib-libffi=/usr" + g-wrap-consistent.patch g-wrap-info.patch) +sha1sums=('75227eae833df996702e5b475b06693decf187d7' \ + 'bdc56abb92b8c7a6518b43d09e3e1dfde9092151' \ + '3e024ebfbf29a9b1d1064b27b6448030c4e2d9c3') +Fconfopts="$Fconfopts --with-lib-libffi=/usr --disable-werror" + +build() { + Fcd + Fconf --with-lib-libffi=/usr --disable-werror + # DIE DIE DIE!!! + for werror in `find . -iname Makefile` + do + Fsed "-Werror" "" $werror + done + make || Fdie + Fmakeinstall +} # optimization OK From devil505linux at gmail.com Mon Dec 17 13:48:32 2007 From: devil505linux at gmail.com (Devil505) Date: Mon Dec 17 13:48:36 2007 Subject: [Frugalware-git] frugalware-current: bouml-3.4-1-i686 Message-ID: <20071217124832.EDD8611904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=088c8113a2489046dd830e84b6024f366c6e6db9 commit 088c8113a2489046dd830e84b6024f366c6e6db9 Author: Devil505 Date: Mon Dec 17 13:48:21 2007 +0100 bouml-3.4-1-i686 *Version Bump diff --git a/source/xapps-extra/bouml/FrugalBuild b/source/xapps-extra/bouml/FrugalBuild index 63324f9..b78c820 100644 --- a/source/xapps-extra/bouml/FrugalBuild +++ b/source/xapps-extra/bouml/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=bouml -pkgver=3.3.5 +pkgver=3.4 pkgrel=1 pkgdesc="Free UML 2 tool box with C++, Java and Idl code generation" _F_sourceforge_sep="_" @@ -14,5 +14,5 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686') _F_cd_path="${pkgname}_${pkgver}" -sha1sums=('cd4b527c9be2a2ec21b3dff18fb0ad123e361d6d') +sha1sums=('93a8b0caebe136ad15c41b17ca087245d942c1d3') # optimization OK From hermier at frugalware.org Mon Dec 17 13:59:27 2007 From: hermier at frugalware.org (Michel Hermier) Date: Mon Dec 17 13:59:29 2007 Subject: [Frugalware-git] frugalware-current: directfb-1.0.1-1-i686 Message-ID: <20071217125927.785F811904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a426c3a6adeaa754af419d8995eba139cd6960d commit 0a426c3a6adeaa754af419d8995eba139cd6960d Author: Michel Hermier Date: Mon Dec 17 13:57:31 2007 +0100 directfb-1.0.1-1-i686 * Fix up2date (bump is needed). diff --git a/source/xlib/directfb/FrugalBuild b/source/xlib/directfb/FrugalBuild index 7e62f2f..0ed2f5a 100644 --- a/source/xlib/directfb/FrugalBuild +++ b/source/xlib/directfb/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=directfb +_F_archive_name=DirectFB pkgver=1.0.1 _pkgver=1.0-0 pkgrel=1 @@ -11,8 +12,8 @@ license="LGPL" depends=('sdl' 'sysfsutils' 'freetype2' 'libpng' 'libjpeg' 'libmpeg3' 'zlib') groups=('xlib') archs=('i686' 'x86_64') -up2date="lynx -dump http://directfb.org/index.php?path=Main%2FDownloads | grep -m1 tar.gz | sed 's/.*B-\(.*\).t.*/\1/'" -source=(http://www.directfb.org/downloads/Core/DirectFB-$pkgver.tar.gz \ +up2date="lynx -dump http://directfb.org/index.php?path=Main%2FDownloads | Flasttar" +source=(http://www.directfb.org/downloads/Core/$_F_archive_name-$pkgver.tar.gz \ directfb-0.9.25.1-sysfs.diff) sha1sums=('4c6e76089a3a60284bfa95b92761f5e90c3db46e' \ 'edcd80bcc94f4e0370b2e39c12335f5eb5d8869d') From crazy at frugalware.org Mon Dec 17 15:07:09 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 15:07:11 2007 Subject: [Frugalware-git] frugalware-current: cputnik-0.2.0-3-i686 Message-ID: <20071217140709.B54D211901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0f3322cb01800d5394322c0a67be6e79efce1058 commit 0f3322cb01800d5394322c0a67be6e79efce1058 Author: crazy Date: Mon Dec 17 15:05:27 2007 +0100 cputnik-0.2.0-3-i686 * mute up2date for now , project died * propably this package will go away diff --git a/source/x11-extra/cputnik/FrugalBuild b/source/x11-extra/cputnik/FrugalBuild index 0fcdd47..a71a591 100644 --- a/source/x11-extra/cputnik/FrugalBuild +++ b/source/x11-extra/cputnik/FrugalBuild @@ -9,7 +9,8 @@ url="http://clay.ll.pl/dockapps.html" depends=('windowmaker' 'libxcb' 'libxext' 'libx11' 'libxpm') groups=('x11-extra' 'wmaker-dockapps') archs=('i686' 'x86_64') -up2date="lynx -dump http://dockapps.org/file.php/id/273 | grep '\][0-9\.]*\ \[' | cut -d ']' -f 4 | cut -d ' ' -f 1" +#up2date="lynx -dump http://dockapps.org/file.php/id/273 | grep '\][0-9\.]*\ \[' | cut -d ']' -f 4 | cut -d ' ' -f 1" +up2date="$pkgver" #source=(http://clay.ll.pl/download/$pkgname-$pkgver.tar.gz) source=(http://dockapps.org/files/273/576/$pkgname-$pkgver.tar.gz) sha1sums=('8c0a9d96094fcc9410fa71cb0e914ad6ce3b1007') From crazy at frugalware.org Mon Dec 17 15:07:09 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 15:07:14 2007 Subject: [Frugalware-git] frugalware-current: wmcalclock-1.25-2-i686 Message-ID: <20071217140709.C82E111904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=872c726fdb6c87e0e1510eba7b943b87800f929f commit 872c726fdb6c87e0e1510eba7b943b87800f929f Author: crazy Date: Mon Dec 17 15:06:59 2007 +0100 wmcalclock-1.25-2-i686 * muted up2date for now diff --git a/source/x11-extra/wmcalclock/FrugalBuild b/source/x11-extra/wmcalclock/FrugalBuild index c15b980..0d404d2 100644 --- a/source/x11-extra/wmcalclock/FrugalBuild +++ b/source/x11-extra/wmcalclock/FrugalBuild @@ -9,7 +9,8 @@ url="http://dockapps.org/file.php/id/9" depends=('windowmaker') groups=('x11-extra' 'wmaker-dockapps') archs=('i686' 'x86_64') -up2date="lynx --dump http://dockapps.org/file.php/id/9 | grep \]wmCalClock- | cut -d '-' -f 2 | cut -d '.' -f 1-2" +#up2date="lynx -dump http://dockapps.org/file.php/id/9 | grep \]wmCalClock- | cut -d '-' -f 2 | cut -d '.' -f 1-2" +up2date="$pkgver" source=(http://dockapps.org/download.php/id/16/wmCalClock-$pkgver.tar.gz) sha1sums=('2678ebf688a629123f25ae2df746ac28b9855198') From crazy at frugalware.org Mon Dec 17 15:23:24 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 15:23:29 2007 Subject: [Frugalware-git] frugalware-current: gtk-gnutella-0.96.4-1-i686 Message-ID: <20071217142324.9FA6411904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd3cdf29b04ab7e3e2b154ddc090b3a335867c2b commit bd3cdf29b04ab7e3e2b154ddc090b3a335867c2b Author: crazy Date: Mon Dec 17 15:13:27 2007 +0100 gtk-gnutella-0.96.4-1-i686 * up2date fix * changed maintainer to me diff --git a/source/xapps-extra/gtk-gnutella/FrugalBuild b/source/xapps-extra/gtk-gnutella/FrugalBuild index 19b8edf..42bdf37 100644 --- a/source/xapps-extra/gtk-gnutella/FrugalBuild +++ b/source/xapps-extra/gtk-gnutella/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.46 SBU -# Maintainer: Miklos Nemeth +# Maintainer: crazy # Contributor: geekitus pkgname=gtk-gnutella @@ -10,8 +10,10 @@ depends=('gtk+2' 'glib2' 'libxml2') archs=('i686' 'x86_64') groups=('xapps-extra') options=('scriptlet') +_F_sourceforge_broken_up2date=1 _F_sourceforge_ext=".tar.bz2" Finclude sourceforge +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=4467'|grep 'gtk-gnutella-[0-9]\(.*\).tar.bz2$'|Flasttarbz2" sha1sums=('03893f83b44f677a6cc8af277115f40b6d208a18') build() From crazy at frugalware.org Mon Dec 17 15:23:24 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 15:23:31 2007 Subject: [Frugalware-git] frugalware-current: perl-libintl-1.16-3-i686 Message-ID: <20071217142324.B222811904CD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bbab6b8362c245a9745a9b63f7d784102b2a9980 commit bbab6b8362c245a9745a9b63f7d784102b2a9980 Author: crazy Date: Mon Dec 17 15:20:30 2007 +0100 perl-libintl-1.16-3-i686 * up2date fix diff --git a/source/devel-extra/perl-libintl/FrugalBuild b/source/devel-extra/perl-libintl/FrugalBuild index 0d322c6..9447142 100644 --- a/source/devel-extra/perl-libintl/FrugalBuild +++ b/source/devel-extra/perl-libintl/FrugalBuild @@ -10,7 +10,7 @@ Finclude perl pkgname=perl-libintl pkgrel=3 archs=('i686' 'x86_64') -up2date="lynx -dump http://search.cpan.org/~guido/libintl-perl-$pkgver/lib/Locale/TextDomain.pm | grep -m1 Download | sed 's/.*rl-\(.*\).t.*/\1/'" +up2date="lynx -dump http://search.cpan.org/~guido/|grep 'libintl-perl-\(.*\).tar.gz$'|sed 's/.*rl-\(.*\).t.*/\1/'" sha1sums=('7a496e50ea3c6674202e556c1a7d9f1fc3357eb5') # optimization OK From crazy at frugalware.org Mon Dec 17 15:23:24 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 15:23:34 2007 Subject: [Frugalware-git] frugalware-current: perl-file-nfslock-1.20-1-i686 Message-ID: <20071217142324.BD2AE11904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6657442b7420f4a0286dd7b9d36aeb2db89a6ca5 commit 6657442b7420f4a0286dd7b9d36aeb2db89a6ca5 Author: crazy Date: Mon Dec 17 15:23:12 2007 +0100 perl-file-nfslock-1.20-1-i686 * up2date fix diff --git a/source/devel/perl-file-nfslock/FrugalBuild b/source/devel/perl-file-nfslock/FrugalBuild index 18454df..611f3c9 100644 --- a/source/devel/perl-file-nfslock/FrugalBuild +++ b/source/devel/perl-file-nfslock/FrugalBuild @@ -7,6 +7,6 @@ pkgver=1.20 pkgdesc="Perl module to do NFS locking" Finclude perl archs=('i686' 'x86_64') -up2date="lynx -dump http://search.cpan.org/~bbb/File-NFSLock-1.20/lib/File/NFSLock.pm | grep -m1 Download | sed 's/.*ck-\(.*\).t.*/\1/'" +up2date="lynx -dump http://search.cpan.org/~bbb/|grep 'File-NFSLock-\(.*\).tar.gz$'|sed 's/.*ck-\(.*\).t.*/\1/'" sha1sums=('de254502b47a9b4013ee6b5f6b8b553dc323dab5') groups=('devel') From crazy at frugalware.org Mon Dec 17 15:33:06 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 15:33:08 2007 Subject: [Frugalware-git] frugalware-current: compiz.sh Message-ID: <20071217143306.2DD1011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6d7f644d70d19c8e56a67351c88192932aa38ccc commit 6d7f644d70d19c8e56a67351c88192932aa38ccc Author: crazy Date: Mon Dec 17 15:32:56 2007 +0100 compiz.sh * quick fix for _F_archive_name breakage * should fix all broken compiz* up2date's * set _F_archive_name to $_F_compiz_name diff --git a/source/include/compiz.sh b/source/include/compiz.sh index 1457124..5dc2906 100644 --- a/source/include/compiz.sh +++ b/source/include/compiz.sh @@ -36,6 +36,8 @@ compizver=0.6.0 if [ -z "$_F_compiz_name" ]; then _F_compiz_name=$pkgname +else # -n $_F_compiz_name + _F_archive_name=$_F_compiz_name fi if [ -z "$_F_compiz_version" ]; then From krics at linuxforum.hu Mon Dec 17 15:37:58 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 15:38:00 2007 Subject: [Frugalware-git] frugalware-current: gnucash-2.2.2-1-x86_64 Message-ID: <20071217143758.182C011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=baf199a57db196a069ba748ffe4c3bd21117cb84 commit baf199a57db196a069ba748ffe4c3bd21117cb84 Author: Christian Hamar alias krix Date: Mon Dec 17 15:36:45 2007 +0100 gnucash-2.2.2-1-x86_64 * Version bump * use unset MAKEFLAGS (coz broke build) diff --git a/source/gnome-extra/gnucash/FrugalBuild b/source/gnome-extra/gnucash/FrugalBuild index c7014de..b1b27ec 100644 --- a/source/gnome-extra/gnucash/FrugalBuild +++ b/source/gnome-extra/gnucash/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=gnucash -pkgver=2.2.0 +pkgver=2.2.2 pkgrel=1 pkgdesc="GnuCash is an application to keep track of your finances." url="http://www.gnucash.org/" -depends=('yelp' 'libgnomeprintui' 'g-wrap' 'libofx' 'libgsf-gnome' \ - 'aqbanking>=2.3.2' 'slib>=3a3-2' 'gtkhtml' 'goffice' 'dbus-glib' \ +depends=('yelp' 'libgnomeprintui' 'g-wrap>=1.9.9' 'libofx' 'libgsf-gnome' \ + 'aqbanking>=2.3.2' 'slib>=3a3-2' 'gtkhtml' 'goffice>=0.5.4' 'dbus-glib' \ 'libgnomeprint' 'libgnomeprintui') makedepends=('intltool' 'postgresql') groups=('gnome-extra') @@ -32,6 +32,7 @@ _F_gnome_desktop="y" Finclude gnome gnome-scriptlet up2date=("lynx -dump http://www.gnucash.org/pub/gnucash/sources/stable/ | grep gnucash | grep -v gnucash-docs| Flasttar") source=(http://www.gnucash.org/pub/gnucash/sources/stable/$pkgname-$pkgver.tar.gz) +unset MAKEFLAGS -sha1sums=('5857b863a6f9b40c8280442ee69ca14a69289a3f') +sha1sums=('cf040f5eb934521303d4e758b3f0eef112dbb5af') # optimization OK From crazy at frugalware.org Mon Dec 17 15:53:42 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 15:53:44 2007 Subject: [Frugalware-git] frugalware-current: wxexamples Message-ID: <20071217145342.4523C11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ddadbcd25db31090d3873591b96390ae480bdf8 commit 8ddadbcd25db31090d3873591b96390ae480bdf8 Author: crazy Date: Mon Dec 17 15:52:34 2007 +0100 wxexamples * removed from tree * broken , project ( desco ) does not exists anymore etc diff --git a/source/xapps-extra/wxexamples/FrugalBuild b/source/xapps-extra/wxexamples/FrugalBuild deleted file mode 100644 index 6ff4ce6..0000000 --- a/source/xapps-extra/wxexamples/FrugalBuild +++ /dev/null @@ -1,24 +0,0 @@ -# Compiling Time: ~1.4 SBU -# Maintainer: Priyank Gosalia - -pkgname=wxexamples -pkgver=2.6.3.1 -pkgrel=2 -pkgdesc="wxWidgets examples" -url="http://www.bluelion.hu/" -depends=('wxgtk>=2.8.7') -options=('scriptlet') -groups=('xapps-extra') -archs=('x86_64' 'i686') -up2date="lynx -dump http://www.bluelion.hu/projects_hu.php|grep 'wxWidgets examples'|sed 's/.*examples.*v\([0-9\.]*\).*/\1/'" -#source=(http://www.bluelion.hu/projects/$pkgname/$pkgname-$pkgver.tar.bz2) -source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/xapps-extra/wxexamples/wxexamples-2.6.3.1.tar.bz2) -sha1sums=('710b11f8d3b4dd4d7bcf16a9f18de2adf5dfa7fb') - -build() -{ - Fmkdir /usr/share/$pkgname-$pkgver - Fcd - cp -a * $Fdestdir/usr/share/$pkgname-$pkgver || Fdie -} - From krics at linuxforum.hu Mon Dec 17 15:55:18 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 15:55:23 2007 Subject: [Frugalware-git] frugalware-current: gnumeric-1.7.91-1-x86_64 Message-ID: <20071217145519.09CC011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c914f30e1b1745241cccd6922a78db334c777abc commit c914f30e1b1745241cccd6922a78db334c777abc Author: Christian Hamar alias krix Date: Mon Dec 17 15:54:41 2007 +0100 gnumeric-1.7.91-1-x86_64 * Version bump diff --git a/source/gnome-extra/gnumeric/FrugalBuild b/source/gnome-extra/gnumeric/FrugalBuild index 4746571..780820e 100644 --- a/source/gnome-extra/gnumeric/FrugalBuild +++ b/source/gnome-extra/gnumeric/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=gnumeric -pkgver=1.7.90 +pkgver=1.7.91 pkgrel=1 pkgdesc="The GNOME spreadsheet" url="http://www.gnome.org/projects/gnumeric/" -depends=('libgnomedb>=2.99.5' 'libgda>=2.99.5' 'libgsf-gnome' 'desktop-file-utils' 'goffice>=0.5.3') +depends=('libgnomedb>=2.99.5' 'libgda>=2.99.5' 'libgsf-gnome' 'desktop-file-utils' 'goffice>=0.5.4') makedepends=('intltool' 'pygtk') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -27,5 +27,5 @@ build() { Frm /usr/share/mc/ } -sha1sums=('a8b863bdd2d4661673399dea55f98175b041ae32') +sha1sums=('8e262feb072be1309efed4cdbafacd5d4af90b02') # optimization OK From crazy at frugalware.org Mon Dec 17 16:01:29 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 16:01:30 2007 Subject: [Frugalware-git] frugalware-current: chromium-0.9.12-1-i686 Message-ID: <20071217150129.131D111901A6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8dec1b4a5bd23a63205023893d8514f8a64ec671 commit 8dec1b4a5bd23a63205023893d8514f8a64ec671 Author: crazy Date: Mon Dec 17 16:01:12 2007 +0100 chromium-0.9.12-1-i686 * up2date fix , _F_archive_name brekage diff --git a/source/games-extra/chromium/FrugalBuild b/source/games-extra/chromium/FrugalBuild index f9981ec..94de6a0 100644 --- a/source/games-extra/chromium/FrugalBuild +++ b/source/games-extra/chromium/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=chromium +_F_archive_name=$pkgname-src pkgver=0.9.12 pkgrel=1 pkgdesc="Chromium is a fast-paced, arcade style, top-scrolling space shooter game." @@ -19,10 +20,10 @@ _F_desktop_name="Chromium B.S.U" _F_desktop_exec="chromium" _F_desktop_icon="chromium.png" _F_desktop_categories="Game;" -sha1sums=('d333f4100c9b5b4eb6d6bdf4bc4ebd3a7066c5a0'\ - '7828f54f8570b27736a9bf1da004ac297bbd0dfb'\ - 'c92698b0791e744f9e005657a560e8c095e650c0'\ - 'fc6041b069bd10d55969cb92d37e25ee71cb154c'\ +sha1sums=('d333f4100c9b5b4eb6d6bdf4bc4ebd3a7066c5a0' \ + '7828f54f8570b27736a9bf1da004ac297bbd0dfb' \ + 'c92698b0791e744f9e005657a560e8c095e650c0' \ + 'fc6041b069bd10d55969cb92d37e25ee71cb154c' \ '49c2dca0dc05a29872d743bed457c984fae179ce') build() From krics at linuxforum.hu Mon Dec 17 16:07:26 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Dec 17 16:07:28 2007 Subject: [Frugalware-git] frugalware-current: deskbar-applet-2.20.2-1-x86_64 Message-ID: <20071217150726.7A20611904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=382688b4a26faf117670874052a5487eb4b62db2 commit 382688b4a26faf117670874052a5487eb4b62db2 Author: Christian Hamar alias krix Date: Mon Dec 17 16:07:14 2007 +0100 deskbar-applet-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome-extra/deskbar-applet/FrugalBuild b/source/gnome-extra/deskbar-applet/FrugalBuild index be1de91..97d170c 100644 --- a/source/gnome-extra/deskbar-applet/FrugalBuild +++ b/source/gnome-extra/deskbar-applet/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=deskbar-applet -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="The Deskbar applet for gnome" url="http://www.gnome.org/" @@ -18,5 +18,5 @@ _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet unset MAKEFLAGS -sha1sums=('831d01365f0fa473744b64e5959e51512658c168') +sha1sums=('5366175651ca188fcb2d9ceb4c52a19cff463f06') # optimization OK From janny at frugalware.org Mon Dec 17 16:10:22 2007 From: janny at frugalware.org (janny) Date: Mon Dec 17 16:10:23 2007 Subject: [Frugalware-git] frugalware-current: gimp-2.4.3-1-i686 Message-ID: <20071217151022.5152A11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=31d4ba849edc207f85cde23062aeb9f071129497 commit 31d4ba849edc207f85cde23062aeb9f071129497 Author: janny Date: Mon Dec 17 16:07:59 2007 +0100 gimp-2.4.3-1-i686 * version bump diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index 527584e..826a09a 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=gimp -pkgver=2.4.2 +pkgver=2.4.3 pkgrel=1 pkgdesc="The GNU Image Manipulation Program" url="http://www.gimp.org/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') makedepends=('gimp-print' 'perl-xml') up2date="lynx -dump $url/downloads/|grep tar.bz2|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" source=(ftp://ftp.gimp.org/pub/gimp/v2.4/$pkgname-$pkgver.tar.bz2) -sha1sums=('4913a411abde3fccae5350e00a9bd20742715367') +sha1sums=('2be7a61d11c86da41e4645fee518a7bfe951302a') options=('scriptlet') _F_gnome_desktop="y" Finclude gnome-scriptlet From crazy at frugalware.org Mon Dec 17 16:48:49 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 16:48:53 2007 Subject: [Frugalware-git] frugalware-current: lyx-1.5.3-1-i686 Message-ID: <20071217154849.4C8D911904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=14e979d32da0c276cb9b358d4d2893aa340cda92 commit 14e979d32da0c276cb9b358d4d2893aa340cda92 Author: crazy Date: Mon Dec 17 16:45:23 2007 +0100 lyx-1.5.3-1-i686 * Version bump diff --git a/source/xapps-extra/lyx/FrugalBuild b/source/xapps-extra/lyx/FrugalBuild index 7a7309c..85b8a17 100644 --- a/source/xapps-extra/lyx/FrugalBuild +++ b/source/xapps-extra/lyx/FrugalBuild @@ -3,8 +3,8 @@ # Conteibutor: Bence Nagy pkgname=lyx -pkgver=1.5.2 -pkgrel=2 +pkgver=1.5.3 +pkgrel=1 pkgdesc="An advanced open-source document processor based on TeX" url='http://www.lyx.org' depends=('tetex' 'python' 'perl' 'imagemagick' 'aspell' 'libqtgui' 'libboost-mt>=1.34.1' 'aspell') @@ -15,7 +15,7 @@ options=('scriptlet') up2date="lynx -dump 'http://lyx.cybermirror.org/stable/?D=A'|Flasttarbz2" source=(http://lyx.cybermirror.org/stable/$pkgname-$pkgver.tar.bz2 \ boost.patch) -sha1sums=('1b1e8de870972ae5ea14bcdd91d6e4f326491b9c' \ +sha1sums=('828c7e03329cf65dcc9331fdf00b73cc8367e4f9' \ '60f5824faa4e55896e1729e249bd9ae1e423beba') From devil505linux at gmail.com Mon Dec 17 19:00:37 2007 From: devil505linux at gmail.com (Devil505) Date: Mon Dec 17 19:00:39 2007 Subject: [Frugalware-git] frugalware-current: thelastripper-1.1.1-1-i686 Message-ID: <20071217180037.C99C711904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84d5f9b95821dc9651917e58c56a0588f83a25b3 commit 84d5f9b95821dc9651917e58c56a0588f83a25b3 Author: Devil505 Date: Mon Dec 17 18:59:34 2007 +0100 thelastripper-1.1.1-1-i686 *New Package *Closes FS#2022 diff --git a/source/gnome-extra/thelastripper/FrugalBuild b/source/gnome-extra/thelastripper/FrugalBuild new file mode 100644 index 0000000..a1013a1 --- /dev/null +++ b/source/gnome-extra/thelastripper/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.03 SBU +# Maintainer: Devil505 + +pkgname=thelastripper +pkgver=1.1.1 +pkgrel=1 +pkgdesc="A Last.FM Ripper" +url="http://thelastripper.com/" +depends=('gnome-icon-theme' 'mono' 'gnome-sharp') +makedepends=('pkgconfig') +groups=('gnome-extra') +archs=('i686') +Finclude mono +up2date="lynx -dump http://code.google.com/p/thelastripper/ | Flasttar" +source=("http://thelastripper.googlecode.com/files/$pkgname-$pkgver.tar.gz") +sha1sums=('9af5ce8cb36989be72a7564f6c9f3089e3d00ca3') + +build() +{ + Fcd + Fmonoexport + Fbuild + Fmonocleanup +} \ No newline at end of file From priyank at frugalware.org Mon Dec 17 19:28:06 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 19:28:09 2007 Subject: [Frugalware-git] frugalware-current: brasero-0.6.90-1-i686 Message-ID: <20071217182806.B72AB11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b1df4818c027ef41e22b286ebd7c9ed95908c9a8 commit b1df4818c027ef41e22b286ebd7c9ed95908c9a8 Author: Priyank Date: Mon Nov 26 12:39:59 2007 +0530 brasero-0.6.90-1-i686 * Version bump diff --git a/source/gnome-extra/brasero/FrugalBuild b/source/gnome-extra/brasero/FrugalBuild index 4b43884..581f96a 100644 --- a/source/gnome-extra/brasero/FrugalBuild +++ b/source/gnome-extra/brasero/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=brasero -pkgver=0.6.1 -pkgrel=2 +pkgver=0.6.90 +pkgrel=1 pkgdesc="A CD/DVD Burning application for the GNOME desktop." url="http://www.gnome.org/projects/brasero/" makedepends=('intltool') @@ -22,7 +22,7 @@ _F_gnome_iconcache="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-search --enable-playlist --enable-preview --enable-inotify --enable-libnotify --disable-schemas-install --enable-caches=no" -sha1sums=('0f162961ae9ae27df1daa20a5591f845ac422b0a') +sha1sums=('882bf2c826c27c9ded3afffdb003fb8224449f50') # optimization OK From priyank at frugalware.org Mon Dec 17 19:28:07 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 19:28:11 2007 Subject: [Frugalware-git] frugalware-current: leafpad-0.8.13-1-i686 Message-ID: <20071217182807.35F0211904CD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a98d9dcfd62e12b9935931c8551f49a51f0e2b6f commit a98d9dcfd62e12b9935931c8551f49a51f0e2b6f Author: Priyank Date: Mon Dec 17 23:56:44 2007 +0530 leafpad-0.8.13-1-i686 * Version bump diff --git a/source/xapps-extra/leafpad/FrugalBuild b/source/xapps-extra/leafpad/FrugalBuild index 6045a93..184a231 100644 --- a/source/xapps-extra/leafpad/FrugalBuild +++ b/source/xapps-extra/leafpad/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=leafpad -pkgver=0.8.12 +pkgver=0.8.13 pkgrel=1 pkgdesc="A gtk2 based simple text editor." url="http://tarot.freeshell.org/leafpad" @@ -13,6 +13,6 @@ up2date="lynx -dump $url | grep -m1 tar.gz$ | sed -ne 's/.*d-\(.*\).*.tar.gz/\1/ source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz) _F_gnome_iconcache="y" Finclude gnome-scriptlet -sha1sums=('4d70e98a3bdb0c6c22cebc6341d915505990d7c0') +sha1sums=('d0e9f4115519aad14024fd86e43b912b3f139b8f') # optimization OK From priyank at frugalware.org Mon Dec 17 19:34:34 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 19:34:36 2007 Subject: [Frugalware-git] frugalware-current: python-logilab-common-0.25.1-1-i686 Message-ID: <20071217183434.45A6C11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0485cab865b518495791fd201157811e381f000 commit f0485cab865b518495791fd201157811e381f000 Author: Priyank Date: Tue Dec 18 00:03:21 2007 +0530 python-logilab-common-0.25.1-1-i686 * Version bump diff --git a/source/devel-extra/python-logilab-common/FrugalBuild b/source/devel-extra/python-logilab-common/FrugalBuild index 5d7c973..34e2a42 100644 --- a/source/devel-extra/python-logilab-common/FrugalBuild +++ b/source/devel-extra/python-logilab-common/FrugalBuild @@ -4,7 +4,7 @@ pkgname=python-logilab-common _F_archive_name=logilab-common -pkgver=0.23.1 +pkgver=0.25.1 pkgrel=1 pkgdesc="Providing low level functionnalities needed for logilab python programs." url="http://www.logilab.org/projects/common/project_view" @@ -14,5 +14,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.logilab.org/ftp/pub/common | Flasttar" source=(ftp://ftp.logilab.org/pub/common/logilab-common-$pkgver.tar.gz) _F_cd_path=logilab-common-$pkgver -sha1sums=('712687f2168fdb2cfeba0125efdbf0c6ffa15f08') +sha1sums=('bfda9de20cfc74d2dcf3df10c3c072411b7c601a') From priyank at frugalware.org Mon Dec 17 19:37:05 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 19:37:09 2007 Subject: [Frugalware-git] frugalware-current: pysqlite2-2.4.0-1-i686 Message-ID: <20071217183705.A679A11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d30794de6eacb46ca3b131d9be530ff57a165bab commit d30794de6eacb46ca3b131d9be530ff57a165bab Author: Priyank Date: Tue Dec 18 00:05:50 2007 +0530 pysqlite2-2.4.0-1-i686 * Version bump diff --git a/source/devel-extra/pysqlite2/FrugalBuild b/source/devel-extra/pysqlite2/FrugalBuild index 7f5ffec..d795314 100644 --- a/source/devel-extra/pysqlite2/FrugalBuild +++ b/source/devel-extra/pysqlite2/FrugalBuild @@ -4,16 +4,16 @@ pkgname=pysqlite2 _F_archive_name=pysqlite -pkgver=2.3.5 -pkgrel=2 +pkgver=2.4.0 +pkgrel=1 pkgdesc="Python DB-API 2.0 interface for SQLite." url="http://initd.org/tracker/pysqlite" depends=('python' 'sqlite3>=3.4.1') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://initd.org/tracker/pysqlite/wiki/pysqlite' | grep -m1 tar.gz | Flasttar" -source=(http://initd.org/pub/software/pysqlite/releases/2.3/$pkgver/pysqlite-$pkgver.tar.gz) -sha1sums=('aede5abea1b0c84e030c175169e062f9d92c6b4e') +source=(http://initd.org/pub/software/pysqlite/releases/2.4/$pkgver/pysqlite-$pkgver.tar.gz) +sha1sums=('53720df970945e65466350e4bcd59b974e4e7500') build() { From priyank at frugalware.org Mon Dec 17 19:41:49 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 19:41:52 2007 Subject: [Frugalware-git] frugalware-current: bluez-libs-3.23-1-i686 Message-ID: <20071217184149.D78EE11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0d69b3666595f751d1da4739f28487f4a1a3e9a commit b0d69b3666595f751d1da4739f28487f4a1a3e9a Author: Priyank Date: Tue Dec 18 00:10:06 2007 +0530 bluez-libs-3.23-1-i686 * Version bump diff --git a/source/lib/bluez-libs/FrugalBuild b/source/lib/bluez-libs/FrugalBuild index 00e2bc4..7f9e4a3 100644 --- a/source/lib/bluez-libs/FrugalBuild +++ b/source/lib/bluez-libs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=bluez-libs -pkgver=3.22 +pkgver=3.23 pkgrel=1 pkgdesc="Library to use the BlueZ Linux Bluetooth stack" url="http://bluez.sourceforge.net/" @@ -11,5 +11,5 @@ groups=('lib') archs=('i686' 'x86_64') up2date="lynx -dump http://www.bluez.org/download.html|grep 'bluez-libs-'|sed -n 's/.*bluez-libs-\(.*\)\.t.*/\1/; 1 p'" source=($url/download/$pkgname-$pkgver.tar.gz) -sha1sums=('64be2fe074dcad297dcff83cc70efc932c4579e6') +sha1sums=('56ca1abb3a6d4bb0bd4d6e4e8cac1cae30b26a42') # optimization OK From priyank at frugalware.org Mon Dec 17 19:49:01 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 19:49:04 2007 Subject: [Frugalware-git] frugalware-current: bluez-utils-3.23-1-i686 Message-ID: <20071217184901.D31DF11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=441af3d1c4c4ce8621c42a8d0dd68e68b91d5ec6 commit 441af3d1c4c4ce8621c42a8d0dd68e68b91d5ec6 Author: Priyank Date: Tue Dec 18 00:17:46 2007 +0530 bluez-utils-3.23-1-i686 * Updated depends * Version bump diff --git a/source/apps-extra/bluez-utils/FrugalBuild b/source/apps-extra/bluez-utils/FrugalBuild index 5839b74..2520805 100644 --- a/source/apps-extra/bluez-utils/FrugalBuild +++ b/source/apps-extra/bluez-utils/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=bluez-utils -pkgver=3.22 +pkgver=3.23 pkgrel=1 pkgdesc="Bluetooth tools and daemons" url="http://bluez.sourceforge.net/" -depends=('dbus-glib>=0.71' 'hal' 'alsa-lib' 'openobex>=1.3-10' 'bluez-libs>=3.22') +depends=('dbus-glib>=0.71' 'hal' 'alsa-lib' 'openobex>=1.3-10' 'bluez-libs>=3.23') makedepends=('alsa-lib' 'fuse') groups=('apps-extra') archs=('i686' 'x86_64') backup=(etc/sysconfig/bluetooth etc/bluetooth/hcid.conf etc/bluetooth/rfcomm.conf etc/bluetooth/uart.conf) up2date="lynx -dump http://www.bluez.org/download.html|grep bluez-utils-|sed -n 's/.*bluez-utils-\(.*\)\.t.*/\1/; 1 p'" source=("http://bluez.sourceforge.net/download/bluez-utils-$pkgver.tar.gz" rc.bluetooth uart.conf bluetooth.default) -sha1sums=('cf42787567ea3e099bd52c37fe11c1919fc5900e' \ +sha1sums=('095abf39d7c4663cf59b176867c4a03fbedde719' \ '831cbfe1e96fc72ca71e9ec5b2b0209512f90ccc' \ '706231256b0ef53e20f22b4f163e8008f092d28a' \ 'cc763966542a83f0de4c56268c541a7b43aa2182') From priyank at frugalware.org Mon Dec 17 19:56:44 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 19:56:48 2007 Subject: [Frugalware-git] frugalware-current: blueman-0.3_2-1-i686 Message-ID: <20071217185644.865C21190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=41f42823000c6d9b4610f279169417d6599c6e6e commit 41f42823000c6d9b4610f279169417d6599c6e6e Author: Priyank Date: Tue Dec 18 00:25:18 2007 +0530 blueman-0.3_2-1-i686 * Removed blueman-makefile.diff * Updated depends and added missing ones * Fixed up2date and version bump diff --git a/source/gnome-extra/blueman/FrugalBuild b/source/gnome-extra/blueman/FrugalBuild index 30cbb9d..394793c 100644 --- a/source/gnome-extra/blueman/FrugalBuild +++ b/source/gnome-extra/blueman/FrugalBuild @@ -2,25 +2,24 @@ # Maintainer: Priyank Gosalia pkgname=blueman -pkgver=0.19 +pkgver=0.3_2 pkgrel=1 pkgdesc="A Bluetooth management utility for GNOME." -_F_sourceforge_ext="-all.tar.gz" -Finclude sourceforge -url="http://walmis.balticum.lt/" -depends=() -rodepends=('gnome-bluetooth' 'gnome-vfs-obexftp' 'pybluez' 'dbus-python' 'bluez-utils>=3.19') +url="http://blueman.tuxfamily.org/" +depends=('pyrex' 'bluez-libs>=3.23') +rodepends=('gnome-bluetooth' 'gnome-vfs-obexftp' 'pybluez' 'dbus-python' 'bluez-utils>=3.23') groups=('gnome-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url | grep -A1 Current | tail -n1 | sed 's/ //g'" -source=(${source[@]} $pkgname-makefile.diff) -sha1sums=('8fcc0de14069fb3a6bac63899d62c962b4eccb8a' \ - '10954ef32210dfa3712bdb8dfda35ac1261ddfdf') +options=('force') +up2date="lynx -dump http://download.tuxfamily.org/$pkgname/tarballs | grep tar.gz -m1 | Flasttar | sed 's/-/_/'" +source=(http://download.tuxfamily.org/$pkgname/tarballs/$pkgname-${pkgver/_/-}.tar.gz) +sha1sums=('824711dff63593a4c25f1185e3678f457695da27') build() { - cd $Fsrcdir - patch -Np0 < $pkgname-makefile.diff - make prefix=$Fdestdir/usr install - Fcp /usr/share/blueman/icons/bluetooth.png /usr/share/pixmaps/blueman.png + Fcd $pkgname-0.3 + python setup.py install --root $Fdestdir --prefix /usr +# Fcp /usr/share/blueman/icons/bluetooth.png /usr/share/pixmaps/blueman.png } + +# optimization OK diff --git a/source/gnome-extra/blueman/blueman-makefile.diff b/source/gnome-extra/blueman/blueman-makefile.diff deleted file mode 100644 index 6a8da89..0000000 --- a/source/gnome-extra/blueman/blueman-makefile.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- makefile 2007-10-02 17:55:40.000000000 +0530 -+++ makefile.new 2007-10-02 17:59:07.000000000 +0530 -@@ -2,15 +2,18 @@ - prefix = /usr - - install: -+ mkdir -p $(prefix)/bin - mkdir -p $(prefix)/share/blueman - mkdir -p $(prefix)/share/blueman/icons - mkdir -p $(prefix)/share/blueman/icons/devices - mkdir -p $(prefix)/share/blueman/icons/signal -+ mkdir -p ${prefix}/share/applications -+ mkdir -p ${prefix}/share/pixmaps - install icons/*.* $(prefix)/share/blueman/icons - install icons/devices/*.* $(prefix)/share/blueman/icons/devices - install icons/signal/*.* $(prefix)/share/blueman/icons/signal -- install *.desktop /usr/share/applications -- -+ install *.desktop ${prefix}/share/applications -+ - mkdir -p $(prefix)/share/blueman/lib - - install src/*.py $(prefix)/share/blueman/lib/ -@@ -18,7 +21,7 @@ - - install src/*.glade $(prefix)/share/blueman/ - -- install src/blueman $(prefix)/bin -+ install src/blueman $(prefix)/bin/ - - uninstall: - -rm -r $(prefix)/share/blueman From priyank at frugalware.org Mon Dec 17 20:01:53 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 20:01:55 2007 Subject: [Frugalware-git] frugalware-current: kdebluetooth-1.0_beta8-5-i686 Message-ID: <20071217190153.58DE511904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dc20110351544b213f981e2f3cb7834631c46570 commit dc20110351544b213f981e2f3cb7834631c46570 Author: Priyank Date: Tue Dec 18 00:30:43 2007 +0530 kdebluetooth-1.0_beta8-5-i686 * rebuild with new bluez-libs-3.23 diff --git a/source/kde-extra/kdebluetooth/FrugalBuild b/source/kde-extra/kdebluetooth/FrugalBuild index 4d88dfb..9060088 100644 --- a/source/kde-extra/kdebluetooth/FrugalBuild +++ b/source/kde-extra/kdebluetooth/FrugalBuild @@ -4,10 +4,10 @@ pkgname=kdebluetooth pkgver=1.0_beta8 -pkgrel=4 +pkgrel=5 pkgdesc="KDE Bluetooth Framework" -depends=('kdepim>=3.5.7' 'dbus>=1.0.2' 'bluez-libs>=3.22' 'openobex>=1.3-10' \ - 'bluez-utils>=3.22' 'obexftp>=0.20-5' 'libgcc' 'libxfixes') +depends=('kdepim>=3.5.7' 'dbus>=1.0.2' 'bluez-libs>=3.23' 'openobex>=1.3-10' \ + 'bluez-utils>=3.23' 'obexftp>=0.20-5' 'libgcc' 'libxfixes') groups=('kde-extra') archs=('i686' 'x86_64') _F_sourceforge_dirname="kde-bluetooth" From priyank at frugalware.org Mon Dec 17 20:03:52 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 20:03:55 2007 Subject: [Frugalware-git] frugalware-current: kmobiletools-0.5.0_beta3-7 Message-ID: <20071217190352.A901A11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f487451fbb58a61725f7581218879e6b17de0c4a commit f487451fbb58a61725f7581218879e6b17de0c4a Author: Priyank Date: Tue Dec 18 00:33:21 2007 +0530 kmobiletools-0.5.0_beta3-7 * Rebuild with kdebluetooth-1.0_beta8-5 diff --git a/source/kde-extra/kmobiletools/FrugalBuild b/source/kde-extra/kmobiletools/FrugalBuild index e1bddcc..40dc8eb 100644 --- a/source/kde-extra/kmobiletools/FrugalBuild +++ b/source/kde-extra/kmobiletools/FrugalBuild @@ -3,11 +3,11 @@ pkgname=kmobiletools pkgver=0.5.0_beta3 -pkgrel=6 +pkgrel=7 pkgdesc="A complete management system for mobile phones." ## this could be added to depends as well but not sure about : ## http://sourceforge.net/project/showfiles.php?group_id=132142 -depends=('kdepim>=3.5.7' 'kdebluetooth>=1.0_beta8-4') +depends=('kdepim>=3.5.7' 'kdebluetooth>=1.0_beta8-5') rodepends=('bluez-hcidump>=1.40' 'bluez-firmware') groups=('kde-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Mon Dec 17 20:06:03 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 20:06:05 2007 Subject: [Frugalware-git] playground: kdelibs-3.97.1_749703-0playground1-i686 Message-ID: <20071217190603.6B22E11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=aedb84b91413b0f798193ff2d4192af36618c856 commit aedb84b91413b0f798193ff2d4192af36618c856 Author: crazy Date: Mon Dec 17 19:56:15 2007 +0100 kdelibs-3.97.1_749703-0playground1-i686 * update to an newer snapshot * maybe not a good idea while monday but :P diff --git a/source/kde4/kdelibs/FrugalBuild b/source/kde4/kdelibs/FrugalBuild index 52cd625..e536f4d 100644 --- a/source/kde4/kdelibs/FrugalBuild +++ b/source/kde4/kdelibs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdelibs -pkgver=3.97.1_747311 +pkgver=3.97.1_749703 pkgrel=0playground1 pkgdesc="KDE4 Core Libraries." depends=('qt4-qdbus' 'bzip2' 'libgcc' 'libice' 'libxext' \ @@ -20,7 +20,7 @@ options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ flac.patch) -sha1sums=('a9313eee508b479028341f3e881efded7f595784' \ +sha1sums=('ac8ab9b8cfaa59535bdf498dcf893936f1f5ea89' \ '0ff2c4946a6f58c0dadc7b6bd1027f46fab66218') ## TODO: groups!!! From priyank at frugalware.org Mon Dec 17 20:11:26 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 20:11:26 2007 Subject: [Frugalware-git] frugalware-current: gnome-bluetooth-0.9.1-2-i686 Message-ID: <20071217191126.114D011901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3119f1881942871d4a081ab25332496297b36944 commit 3119f1881942871d4a081ab25332496297b36944 Author: Priyank Date: Tue Dec 18 00:40:15 2007 +0530 gnome-bluetooth-0.9.1-2-i686 * Rebuild with newer bluez-libs-3.23-1-i686 diff --git a/source/gnome-extra/gnome-bluetooth/FrugalBuild b/source/gnome-extra/gnome-bluetooth/FrugalBuild index a52362a..29e9141 100644 --- a/source/gnome-extra/gnome-bluetooth/FrugalBuild +++ b/source/gnome-extra/gnome-bluetooth/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gnome-bluetooth pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem." url="http://www.usefulinc.com/software/gnome-bluetooth/" makedepends=('intltool' 'pkgconfig') -depends=('bluez-utils>=3.20' 'bluez-libs>=3.20' 'gob2' 'pygtk' \ +depends=('bluez-utils>=3.23' 'bluez-libs>=3.23' 'gob2' 'pygtk' \ 'librsvg>=2.18.2' 'gnome-python>=2.20.0' 'libbtctl-python>=0.9.0' \ 'libgnomeui>=2.20.0') groups=('gnome-extra') From priyank at frugalware.org Mon Dec 17 20:13:05 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 20:13:09 2007 Subject: [Frugalware-git] frugalware-current: bluez-gnome-0.14-4-i686 Message-ID: <20071217191305.385D511904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ac4aa10dc2b3048e057c394dc5af1ba57639dc94 commit ac4aa10dc2b3048e057c394dc5af1ba57639dc94 Author: Priyank Date: Tue Dec 18 00:41:36 2007 +0530 bluez-gnome-0.14-4-i686 * Rebuild with newer bluez-libs-3.23-1-i686 diff --git a/source/gnome-extra/bluez-gnome/FrugalBuild b/source/gnome-extra/bluez-gnome/FrugalBuild index 76ea678..4390ad6 100644 --- a/source/gnome-extra/bluez-gnome/FrugalBuild +++ b/source/gnome-extra/bluez-gnome/FrugalBuild @@ -3,11 +3,11 @@ pkgname=bluez-gnome pkgver=0.14 -pkgrel=3 +pkgrel=4 pkgdesc="Bluetooth tools for GNOME" url="http://www.bluez.org/" -depends=('dbus-glib>=0.71' 'openobex>=1.3-10' 'bluez-libs>=3.22' 'libnotify' 'gconf' 'gtk+2') -rodepends=('bluez-utils>=3.22') +depends=('dbus-glib>=0.71' 'openobex>=1.3-10' 'bluez-libs>=3.23' 'libnotify' 'gconf' 'gtk+2') +rodepends=('bluez-utils>=3.23') makedepends=('perl-xml' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Mon Dec 17 20:26:20 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 20:26:22 2007 Subject: [Frugalware-git] playground: kdepimlibs-3.97.1_747802-0playground1-i686 Message-ID: <20071217192620.3E9E2119039F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=a5624c216a5061c3f436e60d310cbf3ad2248156 commit a5624c216a5061c3f436e60d310cbf3ad2248156 Author: crazy Date: Mon Dec 17 20:24:53 2007 +0100 kdepimlibs-3.97.1_747802-0playground1-i686 * update to an newer snapshot diff --git a/source/kde4/kdepimlibs/FrugalBuild b/source/kde4/kdepimlibs/FrugalBuild index dbbf019..9c61853 100644 --- a/source/kde4/kdepimlibs/FrugalBuild +++ b/source/kde4/kdepimlibs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdepimlibs -pkgver=3.97.1_747159 +pkgver=3.97.1_747802 pkgrel=0playground1 pkgdesc="Personal Information Management (PIM) libraries for KDE4." depends=('libkde' 'libice' 'libxext' 'libxfixes' 'libqtgui' 'gamin' 'xfsprogs-attr' \ @@ -13,6 +13,6 @@ archs=('i686') options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('1eaa19505a1c13ca860a0164739466158ea3cd29') +sha1sums=('d60dae6dd0543df3426b87d04650b7ad8405b095') # optimization OK From priyank at frugalware.org Mon Dec 17 20:26:38 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 20:26:41 2007 Subject: [Frugalware-git] frugalware-current: wput-0.6.1-1-i686 Message-ID: <20071217192638.20F2B11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a91ed99b30f7c0ac8e4d1879fcf2aac4777aeae commit 5a91ed99b30f7c0ac8e4d1879fcf2aac4777aeae Author: Priyank Date: Tue Dec 18 00:54:50 2007 +0530 wput-0.6.1-1-i686 * Version bump * Fix build() diff --git a/source/network-extra/wput/FrugalBuild b/source/network-extra/wput/FrugalBuild index aa79976..5ee76b7 100644 --- a/source/network-extra/wput/FrugalBuild +++ b/source/network-extra/wput/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=wput -pkgver=0.6 +pkgver=0.6.1 pkgrel=1 pkgdesc="A command line tool to upload files to FTP site, the opposite to wget" url="http://wput.sourceforge.net/" @@ -11,11 +11,10 @@ groups=('network-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=.tgz Finclude sourceforge -sha1sums=('83c2a538041f667398b23611a993eafa738ab01d') +sha1sums=('1c11d831b2403d838babe4416d4c7af434a7e300') build() { Fmkdir usr/{bin,share/man/man1} - Fcd wput Fbuild } From priyank at frugalware.org Mon Dec 17 20:44:40 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 20:44:44 2007 Subject: [Frugalware-git] frugalware-current: glade-2.12.2-1-i686 Message-ID: <20071217194440.CFD1C11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a599d9419f68a146e77fb4945cb1fa893fb8703 commit 5a599d9419f68a146e77fb4945cb1fa893fb8703 Author: Priyank Date: Tue Dec 18 01:12:40 2007 +0530 glade-2.12.2-1-i686 * Version bump diff --git a/source/gnome-extra/glade/FrugalBuild b/source/gnome-extra/glade/FrugalBuild index 6707289..8a6b26b 100644 --- a/source/gnome-extra/glade/FrugalBuild +++ b/source/gnome-extra/glade/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: BMH1980 pkgname=glade -pkgver=2.12.1 -pkgrel=3 +pkgver=2.12.2 +pkgrel=1 pkgdesc="Glade is a GUI builder for GTK+ and Gnome." url="http://glade.gnome.org/" license="GPL2" @@ -15,7 +15,7 @@ archs=('i686' 'x86_64') _F_gnome_scrollkeeper=y Finclude gnome gnome-scriptlet source=(${source[@]} $pkgname-2.6.5-simplegladepython.1.patch simple-glade-codegen.py) -sha1sums=('19b0152da79c4ff24b5d5277370ffc3bda8ee07a' \ +sha1sums=('a43d89b147296244ba4b2efc67e8772d5155afff' \ 'd55aa3c049dfa9a431e4e2b029866f97928bea3a' \ '8e63a1badbb998f2273d3bf948c8cead14a94e70') From priyank at frugalware.org Mon Dec 17 20:45:38 2007 From: priyank at frugalware.org (Priyank) Date: Mon Dec 17 20:45:41 2007 Subject: [Frugalware-git] frugalware-current: perl-anyevent-2.8-1-i686 Message-ID: <20071217194538.9CCCC11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8bbf84d303505bcd1708349291083026a6d7acf1 commit 8bbf84d303505bcd1708349291083026a6d7acf1 Author: Priyank Date: Tue Dec 18 01:14:26 2007 +0530 perl-anyevent-2.8-1-i686 * Version bump diff --git a/source/devel-extra/perl-anyevent/FrugalBuild b/source/devel-extra/perl-anyevent/FrugalBuild index b1ac133..27688a4 100644 --- a/source/devel-extra/perl-anyevent/FrugalBuild +++ b/source/devel-extra/perl-anyevent/FrugalBuild @@ -4,9 +4,9 @@ _F_perl_name=AnyEvent _F_perl_author=M/ML/MLEHMANN -pkgver=2.7 +pkgver=2.8 pkgdesc="Perl framework for multiple event loops." depends=('perl-event') Finclude perl archs=('i686' 'x86_64') -sha1sums=('20ce79565d7f91196d466eeff1ccd55068b6e9d1') +sha1sums=('4d0f1dadd9f7600317566478a7140bb9b7b56a8f') From crazy at frugalware.org Mon Dec 17 21:18:31 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 21:18:34 2007 Subject: [Frugalware-git] playground: kdebase-runtime-3.97.1_749702-0playground1-i686 Message-ID: <20071217201831.D8BA911904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=b92e9182cd8369aad06cc83c98236b84ee7301c9 commit b92e9182cd8369aad06cc83c98236b84ee7301c9 Author: crazy Date: Mon Dec 17 20:57:01 2007 +0100 kdebase-runtime-3.97.1_749702-0playground1-i686 * update to an newer snapshot * depends() fixes diff --git a/source/kde4/kdebase-runtime/FrugalBuild b/source/kde4/kdebase-runtime/FrugalBuild index d1f2d00..776aa04 100644 --- a/source/kde4/kdebase-runtime/FrugalBuild +++ b/source/kde4/kdebase-runtime/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: crazy pkgname=kdebase-runtime -pkgver=3.97.1_747187 +pkgver=3.97.1_749702 pkgrel=0playground1 pkgdesc="Programs needed at runtime by other KDE4 applications" -depends=('libqtnetwork' 'libqtxml' 'bzip2' 'dbus' 'libice' 'libxext' 'libqtgui' \ - 'libxfixes' 'libkde' 'libxrender' 'gamin' 'xfsprogs-attr' 'libqtsql' 'clucene' \ - 'libstrigiqtdbusclient' 'openexr' 'xine-lib' 'libsmbclient') +depends=('libkde' 'gamin' 'xfsprogs-attr' 'libxrender' 'libice' 'libxext' 'libxfixes' \ + 'libqtnetwork' 'bzip2' 'qt4-qdbus' 'libqtgui' 'libgcc' 'pcre' 'libqtsql' \ + 'xine-lib' 'libsmbclient' 'openexr' 'clucene' 'strigi') makedepends=('kdepimlibs>=3.96.1_742565') groups=('kde4' 'kde4-minimal') archs=('i686') options=('nomirror') Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('25161ac209d761a3c9c5cd28e6d6537fe15f73e9') +sha1sums=('006ba333dd6cabb8885d644c87472a9a5e523b8e') subpkgs=("kdebase-icons") subdescs=('Oxygen KDE4 Icons') From vmiklos at frugalware.org Mon Dec 17 21:44:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:44:13 2007 Subject: [Frugalware-git] frugalware-current: kernel-2.6.23-4-i686 Message-ID: <20071217204411.936DB11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5263955f0752a065a6003cf879a1bb60fd96ba0d commit 5263955f0752a065a6003cf879a1bb60fd96ba0d Author: Miklos Vajna Date: Mon Dec 17 21:42:44 2007 +0100 kernel-2.6.23-4-i686 update to patchlevel '11' diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index ab5c07b..5aa8eca 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 14.20 SBU +# Compiling Time: 13.99 SBU # Maintainer: VMiklos _F_kernel_patches=('aic7xxx-suspend.patch') diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 655069e..9dd0294 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,5 +16,5 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### _F_kernelver_ver=2.6.23 -_F_kernelver_rel=3 -_F_kernelver_stable=9 +_F_kernelver_rel=4 +_F_kernelver_stable=11 From vmiklos at frugalware.org Mon Dec 17 21:55:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:35 2007 Subject: [Frugalware-git] frugalware-current: fglrx-8.42.3-5-i686 Message-ID: <20071217205511.5F78E11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3edbb85176da52fe6164e23b8be85e5cd7937aac commit 3edbb85176da52fe6164e23b8be85e5cd7937aac Author: Miklos Vajna Date: Mon Dec 17 21:49:19 2007 +0100 fglrx-8.42.3-5-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index 8db5b12..760f5ca 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -4,7 +4,7 @@ pkgname=fglrx pkgver=8.42.3 -pkgrel=4 +pkgrel=5 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it From vmiklos at frugalware.org Mon Dec 17 21:55:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:37 2007 Subject: [Frugalware-git] frugalware-current: rt2500-1.1.0_b4-32-i686 Message-ID: <20071217205511.C0E1C11904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8176478980d0e5e6f3460ab690e4d09ab6587f90 commit 8176478980d0e5e6f3460ab690e4d09ab6587f90 Author: Miklos Vajna Date: Mon Dec 17 21:49:22 2007 +0100 rt2500-1.1.0_b4-32-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/network-extra/rt2500/FrugalBuild b/source/network-extra/rt2500/FrugalBuild index d68abc1..cbd2771 100644 --- a/source/network-extra/rt2500/FrugalBuild +++ b/source/network-extra/rt2500/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rt2500 pkgver=1.1.0_b4 -pkgrel=31 +pkgrel=32 pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 and rt2500 chipsets." _F_sourceforge_dirname="rt2400" Finclude kernel-module sourceforge From vmiklos at frugalware.org Mon Dec 17 21:55:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:38 2007 Subject: [Frugalware-git] frugalware-current: rlocate-0.5.6-8-i686 Message-ID: <20071217205512.2660A176C017@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=337dac395a1152c7e692a8963e40ce5e508e2da1 commit 337dac395a1152c7e692a8963e40ce5e508e2da1 Author: Miklos Vajna Date: Mon Dec 17 21:49:24 2007 +0100 rlocate-0.5.6-8-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/apps-extra/rlocate/FrugalBuild b/source/apps-extra/rlocate/FrugalBuild index 319e4f5..7aa2867 100644 --- a/source/apps-extra/rlocate/FrugalBuild +++ b/source/apps-extra/rlocate/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rlocate pkgver=0.5.6 -pkgrel=7 +pkgrel=8 pkgdesc="rlocate is an implementation of the locate command" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module From vmiklos at frugalware.org Mon Dec 17 21:55:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:39 2007 Subject: [Frugalware-git] frugalware-current: qc-usb-0.6.6-26-i686 Message-ID: <20071217205511.9F29511904CD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=da2578dec14cf6221dfceba10eea86617170276d commit da2578dec14cf6221dfceba10eea86617170276d Author: Miklos Vajna Date: Mon Dec 17 21:49:20 2007 +0100 qc-usb-0.6.6-26-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index 24fa8c8..5d00ef9 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=25 +pkgrel=26 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Mon Dec 17 21:55:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:41 2007 Subject: [Frugalware-git] frugalware-current: ipw3945-1.2.2-8-i686 Message-ID: <20071217205512.73AA1176C018@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad9c590b83a3da3f85bee3534cbac711c91201aa commit ad9c590b83a3da3f85bee3534cbac711c91201aa Author: Miklos Vajna Date: Mon Dec 17 21:49:26 2007 +0100 ipw3945-1.2.2-8-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/network-extra/ipw3945/FrugalBuild b/source/network-extra/ipw3945/FrugalBuild index f4806ad..1c98c1f 100644 --- a/source/network-extra/ipw3945/FrugalBuild +++ b/source/network-extra/ipw3945/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ipw3945 pkgver=1.2.2 -pkgrel=7 +pkgrel=8 pkgdesc="Intel PRO/Wireless 3945ABG Driver for Linux" _F_sourceforge_ext=".tgz" Finclude sourceforge kernel-module From vmiklos at frugalware.org Mon Dec 17 21:55:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:43 2007 Subject: [Frugalware-git] frugalware-current: dazuko-2.3.4-5-i686 Message-ID: <20071217205512.BBC2611904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ba3e8e04d871b2854b5dd0fe52fe5b0a0776ffa commit 0ba3e8e04d871b2854b5dd0fe52fe5b0a0776ffa Author: Miklos Vajna Date: Mon Dec 17 21:49:27 2007 +0100 dazuko-2.3.4-5-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index c376427..1452817 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dazuko pkgver=2.3.4 -pkgrel=4 +pkgrel=5 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From vmiklos at frugalware.org Mon Dec 17 21:55:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:45 2007 Subject: [Frugalware-git] frugalware-current: acx100-20071003-4-i686 Message-ID: <20071217205512.E96C411904CD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b15ad6893ca731e80d871cab833784995268bf19 commit b15ad6893ca731e80d871cab833784995268bf19 Author: Miklos Vajna Date: Mon Dec 17 21:49:29 2007 +0100 acx100-20071003-4-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index 29bf2c7..3ac2ce3 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 origname=acx-mac80211 pkgver=20071003 -pkgrel=3 +pkgrel=4 pkgdesc="The ACX100/ACX111 wireless network driver." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname=${pkgname} From vmiklos at frugalware.org Mon Dec 17 21:55:13 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:54 2007 Subject: [Frugalware-git] frugalware-current: gspcav1-1.00.18-14-i686 Message-ID: <20071217205513.602BC11904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d6804d551198e9ea36b94eee55f2d034906890cd commit d6804d551198e9ea36b94eee55f2d034906890cd Author: Miklos Vajna Date: Mon Dec 17 21:49:31 2007 +0100 gspcav1-1.00.18-14-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild index 130059d..02252f4 100644 --- a/source/multimedia-extra/gspcav1/FrugalBuild +++ b/source/multimedia-extra/gspcav1/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gspcav1 pkgver=1.00.18 -pkgrel=13 +pkgrel=14 pkgdate=20070508 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" From vmiklos at frugalware.org Mon Dec 17 21:55:13 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:57 2007 Subject: [Frugalware-git] frugalware-current: truecrypt-4.3-16-i686 Message-ID: <20071217205513.C535511904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ce3a384442b2075c4ea5191d2abf234ba40547c2 commit ce3a384442b2075c4ea5191d2abf234ba40547c2 Author: Miklos Vajna Date: Mon Dec 17 21:49:33 2007 +0100 truecrypt-4.3-16-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/apps-extra/truecrypt/FrugalBuild b/source/apps-extra/truecrypt/FrugalBuild index e57fc28..2484447 100644 --- a/source/apps-extra/truecrypt/FrugalBuild +++ b/source/apps-extra/truecrypt/FrugalBuild @@ -4,7 +4,7 @@ pkgname=truecrypt pkgver=4.3 pkgextraver=a -pkgrel=15 +pkgrel=16 pkgdesc="A free open-source disk encryption software" url="http://www.truecrypt.org/" Finclude kernel-module From vmiklos at frugalware.org Mon Dec 17 21:55:14 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:55:59 2007 Subject: [Frugalware-git] frugalware-current: acerhk-0.5.35-4-i686 Message-ID: <20071217205514.18D8E11904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9466599587e041d23c57411b3285f4bee02107b commit e9466599587e041d23c57411b3285f4bee02107b Author: Miklos Vajna Date: Mon Dec 17 21:49:34 2007 +0100 acerhk-0.5.35-4-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 5a8531c..cdc1d9e 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=3 +pkgrel=4 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From vmiklos at frugalware.org Mon Dec 17 21:55:14 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:00 2007 Subject: [Frugalware-git] frugalware-current: wlan-ng-0.2.8-13-i686 Message-ID: <20071217205514.6744611904D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=11e42668b71fbc0ffad1aec701ded8f5f3010ed4 commit 11e42668b71fbc0ffad1aec701ded8f5f3010ed4 Author: Miklos Vajna Date: Mon Dec 17 21:49:36 2007 +0100 wlan-ng-0.2.8-13-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index 9100a6b..4cb1ba2 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -3,7 +3,7 @@ pkgname=wlan-ng pkgver=0.2.8 -pkgrel=12 +pkgrel=13 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" Finclude kernel-module From vmiklos at frugalware.org Mon Dec 17 21:55:15 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:01 2007 Subject: [Frugalware-git] frugalware-current: kqemu-1.3.0pre11-19-i686 Message-ID: <20071217205515.5C673176C018@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2fd1869e8e36eb7caf89f23c1e009dd0288e244 commit e2fd1869e8e36eb7caf89f23c1e009dd0288e244 Author: Miklos Vajna Date: Mon Dec 17 21:49:38 2007 +0100 kqemu-1.3.0pre11-19-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild index c4ba9f9..c83858c 100644 --- a/source/xapps-extra/kqemu/FrugalBuild +++ b/source/xapps-extra/kqemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kqemu pkgver=1.3.0pre11 -pkgrel=18 +pkgrel=19 pkgdesc="QEMU Accelerator Module" url="http://fabrice.bellard.free.fr/qemu/" depends=('qemu') From vmiklos at frugalware.org Mon Dec 17 21:55:16 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:02 2007 Subject: [Frugalware-git] frugalware-current: lirc-0.8.2-13-i686 Message-ID: <20071217205516.4FD8B11904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65672e8837b661687baf52b5dbb74d833b0f98d6 commit 65672e8837b661687baf52b5dbb74d833b0f98d6 Author: Miklos Vajna Date: Mon Dec 17 21:49:39 2007 +0100 lirc-0.8.2-13-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index 7ff380e..f9bd045 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.2 -pkgrel=12 +pkgrel=13 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" Finclude kernel-module sourceforge From vmiklos at frugalware.org Mon Dec 17 21:55:16 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:04 2007 Subject: [Frugalware-git] frugalware-current: madwifi-0.9.3.3-5-i686 Message-ID: <20071217205516.CF61211904D4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=622377e49e67e38f719347910c24d65ffa529fd6 commit 622377e49e67e38f719347910c24d65ffa529fd6 Author: Miklos Vajna Date: Mon Dec 17 21:49:41 2007 +0100 madwifi-0.9.3.3-5-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index a196dac..618186a 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.3.3 -pkgrel=4 +pkgrel=5 pkgdesc="Madwifi drivers for Atheros wireless chipsets" url="http://madwifi.sourceforge.net/" Finclude kernel-module From vmiklos at frugalware.org Mon Dec 17 21:55:17 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:05 2007 Subject: [Frugalware-git] frugalware-current: nvidia-96xx-96.43.01-4-i686 Message-ID: <20071217205517.85FCE176C018@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d212712e626bbee2165e2572dd5b0f3cca0048b commit 3d212712e626bbee2165e2572dd5b0f3cca0048b Author: Miklos Vajna Date: Mon Dec 17 21:49:43 2007 +0100 nvidia-96xx-96.43.01-4-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild index 5e5acce..c455830 100644 --- a/source/x11-extra/nvidia-96xx/FrugalBuild +++ b/source/x11-extra/nvidia-96xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-96xx pkgver=96.43.01 -pkgrel=3 +pkgrel=4 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx' 'nvidia') From vmiklos at frugalware.org Mon Dec 17 21:55:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:06 2007 Subject: [Frugalware-git] frugalware-current: rt2400-1.2.2_b3-14-i686 Message-ID: <20071217205518.0A01F11904D0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa9c0b8a4b10d91078ebdbd4054d683de74caa9b commit aa9c0b8a4b10d91078ebdbd4054d683de74caa9b Author: Miklos Vajna Date: Mon Dec 17 21:49:44 2007 +0100 rt2400-1.2.2_b3-14-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/network-extra/rt2400/FrugalBuild b/source/network-extra/rt2400/FrugalBuild index d3c9fdb..94e8b8b 100644 --- a/source/network-extra/rt2400/FrugalBuild +++ b/source/network-extra/rt2400/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rt2400 pkgver=1.2.2_b3 -pkgrel=13 +pkgrel=14 pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 chipsets." Finclude kernel-module sourceforge url="http://rt2x00.serialmonkey.com/wiki/index.php" From vmiklos at frugalware.org Mon Dec 17 21:55:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:07 2007 Subject: [Frugalware-git] frugalware-current: adm8211-20060111-32-i686 Message-ID: <20071217205518.71C0911904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=926f0d79ccfd12cd04057336f40b64a2ba44158b commit 926f0d79ccfd12cd04057336f40b64a2ba44158b Author: Miklos Vajna Date: Mon Dec 17 21:49:46 2007 +0100 adm8211-20060111-32-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/network-extra/adm8211/FrugalBuild b/source/network-extra/adm8211/FrugalBuild index a1b3627..dc1faf3 100644 --- a/source/network-extra/adm8211/FrugalBuild +++ b/source/network-extra/adm8211/FrugalBuild @@ -3,7 +3,7 @@ pkgname=adm8211 pkgver=20060111 -pkgrel=31 +pkgrel=32 pkgdesc="IEEE 802.11 wireless LAN driver for adm8211 based cards" url="http://aluminum.sourmilk.net/adm8211/" Finclude kernel-module From vmiklos at frugalware.org Mon Dec 17 21:55:19 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:09 2007 Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.50-3-i686 Message-ID: <20071217205519.07823176C01A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d12d99db7d01b0d1d6739600cbcf545e45d7a48e commit d12d99db7d01b0d1d6739600cbcf545e45d7a48e Author: Miklos Vajna Date: Mon Dec 17 21:49:50 2007 +0100 ndiswrapper-1.50-3-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index 5d3683f..1d57dbe 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.50 -pkgrel=2 +pkgrel=3 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge From vmiklos at frugalware.org Mon Dec 17 21:55:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:10 2007 Subject: [Frugalware-git] frugalware-current: nvidia-100.14.19-4-i686 Message-ID: <20071217205518.9EC6711904D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0fa2dce588a671bba4f7b4cd1c9df6d342293429 commit 0fa2dce588a671bba4f7b4cd1c9df6d342293429 Author: Miklos Vajna Date: Mon Dec 17 21:49:48 2007 +0100 nvidia-100.14.19-4-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 065d631..8a93a68 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=100.14.19 -pkgrel=3 +pkgrel=4 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') From vmiklos at frugalware.org Mon Dec 17 21:55:19 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:11 2007 Subject: [Frugalware-git] frugalware-current: r8169-6.004.00-3-i686 Message-ID: <20071217205519.72A7C11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e594dfde2978f85b7d0e197e26cd3763533ac2b commit 8e594dfde2978f85b7d0e197e26cd3763533ac2b Author: Miklos Vajna Date: Mon Dec 17 21:49:52 2007 +0100 r8169-6.004.00-3-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index 7f683bd..e355061 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.004.00 -pkgrel=2 +pkgrel=3 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Mon Dec 17 21:55:20 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Dec 17 21:56:12 2007 Subject: [Frugalware-git] frugalware-current: virtualbox-1.5.2-7-i686 Message-ID: <20071217205520.0887511904D3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ef63b7fa916e5821940eba82139ff1d4af9b0d4 commit 7ef63b7fa916e5821940eba82139ff1d4af9b0d4 Author: Miklos Vajna Date: Mon Dec 17 21:49:53 2007 +0100 virtualbox-1.5.2-7-i686 rebuilt with kernel-2.6.23-4 diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index e268162..1f155db 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -5,7 +5,7 @@ pkgname=virtualbox realname=VirtualBox pkgver=1.5.2 -pkgrel=6 +pkgrel=7 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" _F_kernelmod_scriptlet=$pkgname.install From janny at frugalware.org Mon Dec 17 22:11:51 2007 From: janny at frugalware.org (janny) Date: Mon Dec 17 22:12:03 2007 Subject: [Frugalware-git] fwlive: kernel-fwlive-2.6.23-3-i686 Message-ID: <20071217211151.DA0B011903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=de3fb31aa9bbeb5f7244a5ef40bd50e281d7b508 commit de3fb31aa9bbeb5f7244a5ef40bd50e281d7b508 Author: janny Date: Mon Dec 17 22:01:35 2007 +0100 kernel-fwlive-2.6.23-3-i686 * version bump diff --git a/source/base-extra/kernel-fwlive/FrugalBuild b/source/base-extra/kernel-fwlive/FrugalBuild index cd83b63..b002e3a 100644 --- a/source/base-extra/kernel-fwlive/FrugalBuild +++ b/source/base-extra/kernel-fwlive/FrugalBuild @@ -1,19 +1,13 @@ # Compiling Time: 11.75 SBU # Maintainer: Janny -pkgver=2.6.22 -_F_kernel_stable=1 -pkgrel=1 +pkgver=2.6.23 +_F_kernelver_rel=3 +_F_kernelver_stable=9 _F_kernel_name="-fwlive" _F_kernel_uname="-fw$pkgrel" -_F_kernel_patches=(http://frugalware.org/~janny/patchs/kernel/$pkgver/aacraid.diff \ - http://frugalware.org/~janny/patchs/kernel/$pkgver/pxa27x.diff \ - http://frugalware.org/~janny/patchs/kernel/$pkgver/jbd.diff \ - http://frugalware.org/~janny/patchs/kernel/$pkgver/squashfs3.2-patch \ - http://frugalware.org/~janny/patchs/kernel/$pkgver/ksize.patch \ - http://frugalware.org/~janny/patchs/kernel/$pkgver/lhash.diff \ - http://frugalware.org/~janny/patchs/kernel/$pkgver/sqlzma2k-3.2-r2.patch \ - http://ftp.frugalware.org/pub/other/sources/kernel/linux-2.6.22-squashfs_fixup.patch) +_F_kernel_patches=(http://frugalware.org/~janny/patchs/kernel/2.6.23/aic7xxx-suspend.patch \ + http://frugalware.org/~janny/patchs/kernel/2.6.23/squashfs3.3-patch) Finclude kernel source=(config ${source[@]}) signatures=('' "${signatures[@]}") diff --git a/source/base-extra/kernel-fwlive/aacraid.diff b/source/base-extra/kernel-fwlive/aacraid.diff deleted file mode 100644 index 05765df..0000000 --- a/source/base-extra/kernel-fwlive/aacraid.diff +++ /dev/null @@ -1,35 +0,0 @@ -Are the shortlogs useful - yes .. they catch what appear to be mistakes - -Specifically: What happened to the aacraid ioctl security fix ? Did someone decide it -wasn't needed or did it get lost somewhere on the way ? - -While this looks scary the only obvious exploit cases are where the user can -open a device level file on an AACraid. Very few people put scanners or CD -devices on one so the actual impact is probably minimal. - -Alan - --- - -Signed-off-by: Alan Cox - ---- a/drivers/scsi/aacraid/linit.c 2007-07-09 10:51:55.653223304 +0100 -+++ b/drivers/scsi/aacraid/linit.c 2007-07-09 10:51:55.653223304 +0100 -@@ -453,6 +453,8 @@ - static int aac_ioctl(struct scsi_device *sdev, int cmd, void __user * arg) - { - struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata; -+ if (!capable(CAP_SYS_RAWIO)) -+ return -EPERM; - return aac_do_ioctl(dev, cmd, arg); - } - -@@ -645,6 +647,8 @@ - static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) - { - struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata; -+ if (!capable(CAP_SYS_RAWIO)) -+ return -EPERM; - return aac_compat_do_ioctl(dev, cmd, (unsigned long)arg); - } - diff --git a/source/base-extra/kernel-fwlive/config b/source/base-extra/kernel-fwlive/config index e549bb6..96ee04b 100644 --- a/source/base-extra/kernel-fwlive/config +++ b/source/base-extra/kernel-fwlive/config @@ -1,8 +1,11 @@ # # Automatically generated make config: don't edit +# Linux kernel version: 2.6.23.1 +# Thu Oct 25 03:28:36 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y @@ -12,6 +15,7 @@ CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_X86=y CONFIG_MMU=y CONFIG_ZONE_DMA=y +CONFIG_QUICKLIST=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y @@ -21,30 +25,26 @@ CONFIG_DMI=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # -# Code maturity level options +# General setup # CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set +# CONFIG_USER_NS is not set CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 CONFIG_CPUSETS=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -56,6 +56,7 @@ CONFIG_SYSCTL=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -63,18 +64,19 @@ CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y -CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set @@ -82,14 +84,11 @@ CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y CONFIG_STOP_MACHINE=y - -# -# Block layer -# CONFIG_BLOCK=y CONFIG_LBD=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_LSF=y +CONFIG_BLK_DEV_BSG=y # # IO Schedulers @@ -144,26 +143,30 @@ CONFIG_M486=y # CONFIG_MGEODE_LX is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set CONFIG_X86_GENERIC=y CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_XADD=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_F00F_BUG=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y -# CONFIG_SCHED_MC is not set +CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -188,6 +191,7 @@ CONFIG_X86_CPUID=m CONFIG_EDD=m CONFIG_DELL_RBU=m CONFIG_DCDBAS=m +CONFIG_DMIID=y # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set @@ -207,11 +211,14 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_NR_QUICK=1 +CONFIG_VIRT_TO_BUS=y # CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y # CONFIG_EFI is not set -CONFIG_IRQBALANCE=y +# CONFIG_IRQBALANCE is not set CONFIG_SECCOMP=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set @@ -233,19 +240,17 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_PM=y CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set -# CONFIG_PM_SYSFS_DEPRECATED is not set -CONFIG_SOFTWARE_SUSPEND=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_SMP_POSSIBLE=y +CONFIG_SUSPEND=y +CONFIG_HIBERNATION_SMP_POSSIBLE=y +CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="" -CONFIG_SUSPEND_SMP=y - -# -# ACPI (Advanced Configuration and Power Interface) Support -# CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_SLEEP_PROC_FS=y -CONFIG_ACPI_SLEEP_PROC_SLEEP=y CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROC_EVENT=y CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m @@ -257,8 +262,6 @@ CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m CONFIG_ACPI_ASUS=m -CONFIG_ACPI_IBM=m -CONFIG_ACPI_IBM_BAY=y CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set @@ -268,16 +271,11 @@ CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m - -# -# APM (Advanced Power Management) BIOS Support -# -CONFIG_APM=y +CONFIG_APM=m # CONFIG_APM_IGNORE_USER_SUSPEND is not set # CONFIG_APM_DO_ENABLE is not set # CONFIG_APM_CPU_IDLE is not set # CONFIG_APM_DISPLAY_BLANK is not set -# CONFIG_APM_RTC_IS_GMT is not set # CONFIG_APM_ALLOW_INTS is not set CONFIG_APM_REAL_MODE_POWER_OFF=y @@ -308,7 +306,6 @@ CONFIG_X86_POWERNOW_K8=m CONFIG_X86_POWERNOW_K8_ACPI=y CONFIG_X86_GX_SUSPMOD=m CONFIG_X86_SPEEDSTEP_CENTRINO=m -CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y CONFIG_X86_SPEEDSTEP_ICH=m CONFIG_X86_SPEEDSTEP_SMI=m @@ -331,16 +328,16 @@ CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_PCI=y # CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y +CONFIG_PCI_GODIRECT=y +# CONFIG_PCI_GOANY is not set CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_PCIEAER=y +CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set CONFIG_HT_IRQ=y CONFIG_ISA_DMA_API=y CONFIG_ISA=y @@ -380,15 +377,8 @@ CONFIG_I82365=m CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=m - -# -# PCI Hotplug Support -# CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_COMPAQ=m -# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set -CONFIG_HOTPLUG_PCI_IBM=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set @@ -409,7 +399,6 @@ CONFIG_NET=y # # Networking options # -# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -427,7 +416,6 @@ CONFIG_ASK_IP_FIB_HASH=y CONFIG_IP_FIB_HASH=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y -# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y @@ -462,6 +450,8 @@ CONFIG_TCP_CONG_VEGAS=m CONFIG_TCP_CONG_SCALABLE=m # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_VENO is not set +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m CONFIG_DEFAULT_BIC=y # CONFIG_DEFAULT_CUBIC is not set # CONFIG_DEFAULT_HTCP is not set @@ -470,19 +460,16 @@ CONFIG_DEFAULT_BIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set - -# -# IP: Virtual Server Configuration -# # CONFIG_IP_VS is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IPV6_ROUTE_INFO is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set +CONFIG_IPV6_MIP6=m CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m @@ -506,8 +493,6 @@ CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK_ENABLED=m -CONFIG_NF_CONNTRACK_SUPPORT=y -# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set CONFIG_NF_CONNTRACK=m CONFIG_NF_CT_ACCT=y CONFIG_NF_CONNTRACK_MARK=y @@ -515,6 +500,7 @@ CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_EVENTS is not set CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m @@ -533,10 +519,12 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m @@ -558,6 +546,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_U32=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m # @@ -654,25 +643,13 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m # CONFIG_BRIDGE_EBT_ULOG is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m @@ -710,9 +687,6 @@ CONFIG_WAN_ROUTER=m # CONFIG_NET_SCHED=y CONFIG_NET_SCH_FIFO=y -CONFIG_NET_SCH_CLK_JIFFIES=y -# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set -# CONFIG_NET_SCH_CLK_CPU is not set # # Queueing/Scheduling @@ -722,6 +696,7 @@ CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RR=m CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m @@ -760,8 +735,8 @@ CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_PEDIT=m # CONFIG_NET_ACT_SIMP is not set +# CONFIG_NET_CLS_POLICE is not set CONFIG_NET_CLS_IND=y -CONFIG_NET_ESTIMATOR=y # # Network testing @@ -831,6 +806,7 @@ CONFIG_GIRBIL_DONGLE=m CONFIG_MCP2120_DONGLE=m CONFIG_OLD_BELKIN_DONGLE=m CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m # # Old SIR device drivers @@ -880,6 +856,20 @@ CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -887,8 +877,10 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set -CONFIG_WIRELESS_EXT=y -CONFIG_FIB_RULES=y +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m +CONFIG_NET_9P=m +# CONFIG_NET_9P_DEBUG is not set # # Device Drivers @@ -900,16 +892,10 @@ CONFIG_FIB_RULES=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# CONFIG_CONNECTOR=m - -# -# Memory Technology Devices (MTD) -# CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set CONFIG_MTD_CONCAT=m @@ -957,7 +943,6 @@ CONFIG_MTD_CFI_UTIL=m CONFIG_MTD_RAM=m CONFIG_MTD_ROM=m CONFIG_MTD_ABSENT=m -# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access @@ -1009,29 +994,32 @@ CONFIG_MTD_DOCPROBE=m CONFIG_MTD_DOCECC=m # CONFIG_MTD_DOCPROBE_ADVANCED is not set CONFIG_MTD_DOCPROBE_ADDRESS=0 - -# -# NAND Flash Device Drivers -# CONFIG_MTD_NAND=m CONFIG_MTD_NAND_VERIFY_WRITE=y # CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_DISKONCHIP is not set CONFIG_MTD_NAND_CAFE=m CONFIG_MTD_NAND_CS553X=m CONFIG_MTD_NAND_NANDSIM=m - -# -# OneNAND Flash Device Drivers -# +CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_ONENAND=m CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_OTP=y # -# Parallel port support +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options # +# CONFIG_MTD_UBI_DEBUG is not set CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m @@ -1042,10 +1030,6 @@ CONFIG_PARPORT_PC_PCMCIA=m CONFIG_PARPORT_AX88796=m CONFIG_PARPORT_1284=y CONFIG_PARPORT_NOT_PC=y - -# -# Plug and Play support -# CONFIG_PNP=y # CONFIG_PNP_DEBUG is not set @@ -1056,10 +1040,7 @@ CONFIG_ISAPNP=y CONFIG_PNPBIOS=y CONFIG_PNPBIOS_PROC_FS=y CONFIG_PNPACPI=y - -# -# Block devices -# +CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=y CONFIG_BLK_DEV_XD=m CONFIG_PARIDE=m @@ -1092,8 +1073,8 @@ CONFIG_PARIDE_KBIC=m CONFIG_PARIDE_KTTI=m CONFIG_PARIDE_ON20=m CONFIG_PARIDE_ON26=m -CONFIG_BLK_CPQ_DA=m -CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_BLK_CPQ_DA=y +CONFIG_BLK_CPQ_CISS_DA=y CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=y CONFIG_BLK_DEV_UMEM=m @@ -1111,21 +1092,20 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD_WCACHE=y CONFIG_ATA_OVER_ETH=m - -# -# Misc devices -# +CONFIG_MISC_DEVICES=y CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m +CONFIG_EEPROM_93CX6=m CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ASUS_LAPTOP=m CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m - -# -# ATA/ATAPI/MFM/RLL support -# +CONFIG_SONYPI_COMPAT=y +CONFIG_THINKPAD_ACPI=m +# CONFIG_THINKPAD_ACPI_DEBUG is not set +CONFIG_THINKPAD_ACPI_BAY=y CONFIG_IDE=y CONFIG_BLK_DEV_IDE=y @@ -1144,18 +1124,20 @@ CONFIG_BLK_DEV_IDEFLOPPY=m # CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_BLK_DEV_IDEACPI is not set # CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y # # IDE chipset support/bugfixes # -CONFIG_IDE_GENERIC=y +CONFIG_IDE_GENERIC=m CONFIG_BLK_DEV_CMD640=y CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPNP=y +# CONFIG_BLK_DEV_IDEPNP is not set CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y +CONFIG_IDEPCI_PCIBUS_ORDER=y # CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y +# CONFIG_BLK_DEV_GENERIC is not set CONFIG_BLK_DEV_OPTI621=y CONFIG_BLK_DEV_RZ1000=y CONFIG_BLK_DEV_IDEDMA_PCI=y @@ -1177,7 +1159,7 @@ CONFIG_BLK_DEV_HPT34X=y CONFIG_BLK_DEV_HPT366=y CONFIG_BLK_DEV_JMICRON=y CONFIG_BLK_DEV_SC1200=y -CONFIG_BLK_DEV_PIIX=y +# CONFIG_BLK_DEV_PIIX is not set CONFIG_BLK_DEV_IT8213=y CONFIG_BLK_DEV_IT821X=y CONFIG_BLK_DEV_NS87415=m @@ -1212,6 +1194,7 @@ CONFIG_BLK_DEV_IDEDMA=y # CONFIG_RAID_ATTRS=m CONFIG_SCSI=y +CONFIG_SCSI_DMA=y CONFIG_SCSI_TGT=m CONFIG_SCSI_NETLINK=y CONFIG_SCSI_PROC_FS=y @@ -1233,7 +1216,8 @@ CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -1243,11 +1227,9 @@ CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y CONFIG_SCSI_SAS_LIBSAS_DEBUG=y - -# -# SCSI low-level drivers -# +CONFIG_SCSI_LOWLEVEL=y CONFIG_ISCSI_TCP=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m @@ -1260,7 +1242,6 @@ CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=y CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_PROBE_EISA_VL is not set # CONFIG_AIC7XXX_DEBUG_ENABLE is not set CONFIG_AIC7XXX_DEBUG_MASK=0 # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set @@ -1268,7 +1249,6 @@ CONFIG_SCSI_AIC7XXX_OLD=m CONFIG_SCSI_AIC79XX=m CONFIG_AIC79XX_CMDS_PER_DEVICE=4 CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_ENABLE_RD_STRM is not set # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set @@ -1323,7 +1303,6 @@ CONFIG_SCSI_NCR_Q720=m CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32 CONFIG_SCSI_NCR53C8XX_SYNC=20 -# CONFIG_SCSI_NCR53C8XX_PROFILE is not set CONFIG_SCSI_PAS16=m CONFIG_SCSI_PSI240I=m CONFIG_SCSI_QLOGIC_FAS=m @@ -1333,7 +1312,6 @@ CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_SEAGATE=m CONFIG_SCSI_SIM710=m -CONFIG_53C700_IO_MAPPED=y CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m @@ -1346,21 +1324,15 @@ CONFIG_SCSI_ULTRASTOR=m CONFIG_SCSI_NSP32=m CONFIG_SCSI_DEBUG=m CONFIG_SCSI_SRP=m - -# -# PCMCIA SCSI adapter support -# +CONFIG_SCSI_LOWLEVEL_PCMCIA=y CONFIG_PCMCIA_AHA152X=m CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_ACPI=y CONFIG_SATA_AHCI=y CONFIG_SATA_SVW=m CONFIG_ATA_PIIX=y @@ -1377,12 +1349,11 @@ CONFIG_SATA_ULI=y CONFIG_SATA_VIA=y CONFIG_SATA_VITESSE=y CONFIG_SATA_INIC162X=m -CONFIG_SATA_INTEL_COMBINED=y -CONFIG_SATA_ACPI=y CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m CONFIG_PATA_ARTOP=m CONFIG_PATA_ATIIXP=m +CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_CMD64X=m CONFIG_PATA_CS5520=m CONFIG_PATA_CS5530=m @@ -1394,6 +1365,7 @@ CONFIG_PATA_HPT366=m CONFIG_PATA_HPT37X=m CONFIG_PATA_HPT3X2N=m CONFIG_PATA_HPT3X3=m +CONFIG_PATA_HPT3X3_DMA=y CONFIG_PATA_ISAPNP=m CONFIG_PATA_IT821X=m CONFIG_PATA_IT8213=m @@ -1420,28 +1392,12 @@ CONFIG_PATA_SIS=y CONFIG_PATA_VIA=m CONFIG_PATA_WINBOND=m CONFIG_PATA_WINBOND_VLB=m - -# -# Old CD-ROM drivers (not SCSI, not IDE) -# -CONFIG_CD_NO_IDESCSI=y -CONFIG_AZTCD=m -CONFIG_GSCD=m -CONFIG_MCDX=m -CONFIG_OPTCD=m -CONFIG_SJCD=m -CONFIG_ISP16_CDI=m -CONFIG_CDU535=m - -# -# Multi-device support (RAID and LVM) -# CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y -# CONFIG_MD_RAID10 is not set +CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m CONFIG_MD_RAID5_RESHAPE=y CONFIG_MD_MULTIPATH=m @@ -1453,6 +1409,7 @@ CONFIG_DM_CRYPT=m # CONFIG_DM_MIRROR is not set # CONFIG_DM_ZERO is not set # CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set # # Fusion MPT device support @@ -1464,38 +1421,37 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m +# CONFIG_FUSION_LOGGING is not set # # IEEE 1394 (FireWire) support # +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m CONFIG_IEEE1394=y # # Subsystem Options # # CONFIG_IEEE1394_VERBOSEDEBUG is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y # -# Device Drivers +# Controllers # CONFIG_IEEE1394_PCILYNX=m CONFIG_IEEE1394_OHCI1394=m # -# Protocol Drivers +# Protocols # CONFIG_IEEE1394_VIDEO1394=m CONFIG_IEEE1394_SBP2=m # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m - -# -# I2O device support -# CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y @@ -1505,26 +1461,16 @@ CONFIG_I2O_BUS=m CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m - -# -# Macintosh device drivers -# -# CONFIG_MAC_EMUMOUSEBTN is not set - -# -# Network device support -# +# CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y +CONFIG_NETDEVICES_MULTIQUEUE=y CONFIG_IFB=m CONFIG_DUMMY=m CONFIG_BONDING=m +CONFIG_MACVLAN=m CONFIG_EQUALIZER=m CONFIG_TUN=m CONFIG_NET_SB1000=m - -# -# ARCnet devices -# CONFIG_ARCNET=m CONFIG_ARCNET_1201=m CONFIG_ARCNET_1051=m @@ -1536,10 +1482,6 @@ CONFIG_ARCNET_RIM_I=m CONFIG_ARCNET_COM20020=m CONFIG_ARCNET_COM20020_ISA=m CONFIG_ARCNET_COM20020_PCI=m - -# -# PHY device support -# CONFIG_PHYLIB=m # @@ -1553,13 +1495,10 @@ CONFIG_CICADA_PHY=m CONFIG_VITESSE_PHY=m CONFIG_SMSC_PHY=m CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m CONFIG_FIXED_PHY=m CONFIG_FIXED_MII_10_FDX=y CONFIG_FIXED_MII_100_FDX=y - -# -# Ethernet (10 or 100Mbit) -# CONFIG_NET_ETHERNET=y CONFIG_MII=m CONFIG_HAPPYMEAL=m @@ -1586,10 +1525,6 @@ CONFIG_SMC9194=m CONFIG_NET_VENDOR_RACAL=y CONFIG_NI52=m CONFIG_NI65=m - -# -# Tulip family network device support -# CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_TULIP=m @@ -1611,7 +1546,7 @@ CONFIG_EEXPRESS=m CONFIG_EEXPRESS_PRO=m CONFIG_HPLAN_PLUS=m CONFIG_HPLAN=m -CONFIG_LP486E=m +# CONFIG_LP486E is not set CONFIG_ETH16I=m CONFIG_NE2000=m CONFIG_ZNET=m @@ -1659,10 +1594,7 @@ CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m CONFIG_DE620=m - -# -# Ethernet (1000 Mbit) -# +CONFIG_NETDEV_1000=y CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m @@ -1678,16 +1610,14 @@ CONFIG_R8169=m CONFIG_SIS190=m CONFIG_SKGE=m CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set CONFIG_SK98LIN=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m CONFIG_QLA3XXX=m CONFIG_ATL1=m - -# -# Ethernet (10000 Mbit) -# +CONFIG_NETDEV_10000=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1_NAPI=y @@ -1698,10 +1628,8 @@ CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m - -# -# Token Ring devices -# +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y CONFIG_TR=y CONFIG_IBMTR=m CONFIG_IBMOL=m @@ -1716,28 +1644,16 @@ CONFIG_MADGEMC=m CONFIG_SMCTR=m # -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -CONFIG_NET_WIRELESS_RTNETLINK=y - -# -# Obsolete Wireless cards support (pre-802.11) +# Wireless LAN # +CONFIG_WLAN_PRE80211=y CONFIG_STRIP=m CONFIG_ARLAN=m CONFIG_WAVELAN=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# +CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m - -# -# Wireless 802.11b ISA/PCI cards support -# CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set @@ -1745,8 +1661,11 @@ CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y # CONFIG_IPW2200_RADIOTAP is not set # CONFIG_IPW2200_PROMISCUOUS is not set -# CONFIG_IPW2200_QOS is not set +CONFIG_IPW2200_QOS=y # CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +# CONFIG_LIBERTAS_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1755,29 +1674,21 @@ CONFIG_NORTEL_HERMES=m CONFIG_PCI_HERMES=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m CONFIG_AIRO_CS=m CONFIG_PCMCIA_ATMEL=m CONFIG_PCMCIA_WL3501=m - -# -# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support -# CONFIG_PRISM54=m CONFIG_USB_ZD1201=m +CONFIG_RTL8187=m CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_HOSTAP_FIRMWARE is not set CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m CONFIG_BCM43XX=m -# CONFIG_BCM43XX_DEBUG is not set +CONFIG_BCM43XX_DEBUG=y CONFIG_BCM43XX_DMA=y CONFIG_BCM43XX_PIO=y CONFIG_BCM43XX_DMA_AND_PIO_MODE=y @@ -1785,11 +1696,32 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y # CONFIG_BCM43XX_PIO_MODE is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set -CONFIG_NET_WIRELESS=y # -# PCMCIA network device support +# USB Network Adapters # +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET_MII=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m CONFIG_NET_PCMCIA=y CONFIG_PCMCIA_3C589=m CONFIG_PCMCIA_3C574=m @@ -1801,10 +1733,6 @@ CONFIG_PCMCIA_XIRC2PS=m CONFIG_PCMCIA_AXNET=m CONFIG_ARCNET_COM20020_CS=m CONFIG_PCMCIA_IBMTR=m - -# -# Wan interfaces -# CONFIG_WAN=y CONFIG_HOSTESS_SV11=m CONFIG_COSA=m @@ -1846,10 +1774,7 @@ CONFIG_LAPBETHER=m CONFIG_X25_ASY=m CONFIG_SBNI=m # CONFIG_SBNI_MULTILINE is not set - -# -# ATM drivers -# +CONFIG_ATM_DRIVERS=y # CONFIG_ATM_DUMMY is not set CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m @@ -1894,6 +1819,7 @@ CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m CONFIG_SLIP=m CONFIG_SLIP_COMPRESSED=y CONFIG_SLHC=m @@ -1903,23 +1829,10 @@ CONFIG_NET_FC=y CONFIG_SHAPER=m CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y -CONFIG_NETPOLL_RX=y CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y - -# -# ISDN subsystem -# CONFIG_ISDN=m - -# -# Old ISDN4Linux -# # CONFIG_ISDN_I4L is not set - -# -# CAPI subsystem -# CONFIG_ISDN_CAPI=m CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y # CONFIG_CAPI_TRACE is not set @@ -1931,10 +1844,6 @@ CONFIG_ISDN_CAPI_CAPIFS=m # # CAPI hardware drivers # - -# -# Active AVM cards -# CONFIG_CAPI_AVM=y CONFIG_ISDN_DRV_AVMB1_B1ISA=m CONFIG_ISDN_DRV_AVMB1_B1PCI=m @@ -1944,10 +1853,6 @@ CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m CONFIG_ISDN_DRV_AVMB1_AVM_CS=m CONFIG_ISDN_DRV_AVMB1_T1PCI=m CONFIG_ISDN_DRV_AVMB1_C4=m - -# -# Active Eicon DIVA Server cards -# CONFIG_CAPI_EICON=y CONFIG_ISDN_DIVAS=m CONFIG_ISDN_DIVAS_BRIPCI=y @@ -1955,10 +1860,6 @@ CONFIG_ISDN_DIVAS_PRIPCI=y CONFIG_ISDN_DIVAS_DIVACAPI=m CONFIG_ISDN_DIVAS_USERIDI=m CONFIG_ISDN_DIVAS_MAINT=m - -# -# Telephony Support -# CONFIG_PHONE=m CONFIG_PHONE_IXJ=m CONFIG_PHONE_IXJ_PCMCIA=m @@ -1968,6 +1869,7 @@ CONFIG_PHONE_IXJ_PCMCIA=m # CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -1995,7 +1897,14 @@ CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_INPORT=m CONFIG_MOUSE_ATIXL=y CONFIG_MOUSE_LOGIBM=m @@ -2026,8 +1935,18 @@ CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m # CONFIG_JOYSTICK_JOYDUMP is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m CONFIG_TOUCHSCREEN_MTOUCH=m @@ -2036,10 +1955,24 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m CONFIG_INPUT_UINPUT=m # @@ -2093,6 +2026,7 @@ CONFIG_STALDRV=y # CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m @@ -2123,20 +2057,12 @@ CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m CONFIG_TIPAR=m - -# -# IPMI -# CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m - -# -# Watchdog Cards -# CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2154,7 +2080,6 @@ CONFIG_IB700_WDT=m CONFIG_IBMASR=m CONFIG_WAFER_WDT=m CONFIG_I6300ESB_WDT=m -CONFIG_I8XX_TCO=m CONFIG_ITCO_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_SC1200_WDT=m @@ -2195,7 +2120,9 @@ CONFIG_HW_RANDOM_AMD=y CONFIG_HW_RANDOM_GEODE=y CONFIG_HW_RANDOM_VIA=y CONFIG_NVRAM=m -CONFIG_RTC=y +CONFIG_RTC=m +CONFIG_GEN_RTC=y +CONFIG_GEN_RTC_X=y CONFIG_DTLK=m CONFIG_R3964=m CONFIG_APPLICOM=m @@ -2238,21 +2165,15 @@ CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=m - -# -# TPM devices -# CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m CONFIG_TELCLOCK=m - -# -# I2C support -# +CONFIG_DEVPORT=y CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m # @@ -2274,18 +2195,20 @@ CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_I810=m CONFIG_I2C_PIIX4=m -CONFIG_I2C_ISA=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_OCORES=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m +CONFIG_I2C_SIMTEC=m CONFIG_SCx200_ACB=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m +CONFIG_I2C_TAOS_EVM=m # CONFIG_I2C_STUB is not set +CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m CONFIG_I2C_VOODOO3=m @@ -2296,11 +2219,13 @@ CONFIG_I2C_PCA_ISA=m # CONFIG_SENSORS_DS1337=m CONFIG_SENSORS_DS1374=m +CONFIG_DS1682=m CONFIG_SENSORS_EEPROM=m CONFIG_SENSORS_PCF8574=m CONFIG_SENSORS_PCA9539=m CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_MAX6875=m +CONFIG_SENSORS_TSL2550=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -2310,6 +2235,7 @@ CONFIG_SENSORS_MAX6875=m # SPI support # CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set CONFIG_SPI_MASTER=y # @@ -2317,15 +2243,14 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BITBANG=m # CONFIG_SPI_BUTTERFLY is not set +CONFIG_SPI_LM70_LLP=m # # SPI Protocol Masters # CONFIG_SPI_AT25=m - -# -# Dallas's 1-wire bus -# +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m CONFIG_W1=m CONFIG_W1_CON=y @@ -2343,13 +2268,16 @@ CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m CONFIG_W1_SLAVE_DS2433=m # CONFIG_W1_SLAVE_DS2433_CRC is not set - -# -# Hardware Monitoring support -# +CONFIG_W1_SLAVE_DS2760=m +CONFIG_POWER_SUPPLY=m +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_BATTERY_DS2760=m CONFIG_HWMON=y CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -2365,6 +2293,7 @@ CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM70=m @@ -2377,13 +2306,17 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m @@ -2395,6 +2328,7 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2409,14 +2343,7 @@ CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y - -# -# Video Capture Adapters -# - -# -# Video Capture Adapters -# +CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_TVAUDIO=m @@ -2426,6 +2353,9 @@ CONFIG_VIDEO_TDA9875=m CONFIG_VIDEO_TEA6415C=m CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m CONFIG_VIDEO_KS0127=m @@ -2436,10 +2366,14 @@ CONFIG_VIDEO_SAA7114=m CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7127=m CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m CONFIG_VIDEO_VIVI=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y @@ -2455,6 +2389,7 @@ CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m CONFIG_TUNER_3036=m +# CONFIG_TUNER_TEA5761 is not set CONFIG_VIDEO_STRADIS=m CONFIG_VIDEO_ZORAN_ZR36060=m CONFIG_VIDEO_ZORAN=m @@ -2477,14 +2412,12 @@ CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_CAFE_CCIC=m - -# -# V4L USB devices -# +CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m -# CONFIG_VIDEO_PVRUSB2_29XXX is not set -# CONFIG_VIDEO_PVRUSB2_24XXX is not set +CONFIG_VIDEO_PVRUSB2_29XXX=y +CONFIG_VIDEO_PVRUSB2_24XXX=y # CONFIG_VIDEO_PVRUSB2_SYSFS is not set CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_USBVISION=m @@ -2503,10 +2436,8 @@ CONFIG_USB_STV680=m CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set - -# -# Radio Adapters -# +CONFIG_USB_ZR364XX=m +CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_CADET=m CONFIG_RADIO_RTRACK=m CONFIG_RADIO_RTRACK2=m @@ -2523,13 +2454,9 @@ CONFIG_RADIO_TYPHOON=m CONFIG_RADIO_TYPHOON_PROC_FS=y CONFIG_RADIO_ZOLTRIX=m CONFIG_USB_DSBR=m - -# -# Digital Video Broadcasting Devices -# -CONFIG_DVB=y CONFIG_DVB_CORE=m CONFIG_DVB_CORE_ATTACH=y +CONFIG_DVB_CAPTURE_DRIVERS=y # # Supported SAA7146 based PCI Adapters @@ -2563,6 +2490,9 @@ CONFIG_DVB_USB_GP8PSK=m CONFIG_DVB_USB_NOVA_T_USB2=m CONFIG_DVB_USB_TTUSB2=m CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_CINERGYT2=m @@ -2629,6 +2559,7 @@ CONFIG_DVB_DIB7000P=m # CONFIG_DVB_VES1820=m CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m CONFIG_DVB_STV0297=m # @@ -2645,9 +2576,9 @@ CONFIG_DVB_LGDT330X=m # CONFIG_DVB_PLL=m CONFIG_DVB_TDA826X=m +CONFIG_DVB_TDA827X=m CONFIG_DVB_TUNER_QT1010=m CONFIG_DVB_TUNER_MT2060=m -CONFIG_DVB_TUNER_LGH06XF=m # # Miscellaneous devices @@ -2661,23 +2592,42 @@ CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_BUF=m CONFIG_VIDEO_BUF_DVB=m CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m +CONFIG_DAB=y CONFIG_USB_DABUSB=m # # Graphics support # CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# +CONFIG_VGASTATE=y +CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set +CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y CONFIG_FB_SVGALIB=m # CONFIG_FB_MACMODES is not set CONFIG_FB_BACKLIGHT=y @@ -2693,8 +2643,9 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m +CONFIG_FB_VGA16=y CONFIG_FB_VESA=y +# CONFIG_FB_HECUBA is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set @@ -2702,6 +2653,8 @@ CONFIG_FB_VESA=y CONFIG_FB_I810=m CONFIG_FB_I810_GTF=y # CONFIG_FB_I810_I2C is not set +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m CONFIG_FB_INTEL=m # CONFIG_FB_INTEL_DEBUG is not set CONFIG_FB_INTEL_I2C=y @@ -2731,8 +2684,11 @@ CONFIG_FB_SIS_315=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set # CONFIG_FB_CYBLA is not set # CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set # CONFIG_FB_GEODE is not set CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set @@ -2741,12 +2697,14 @@ CONFIG_FB_SM501=m # Console display driver support # CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_VIDEO_SELECT=y CONFIG_MDA_CONSOLE=m CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y @@ -2758,10 +2716,6 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set - -# -# Logo configuration -# # CONFIG_LOGO is not set # @@ -2807,12 +2761,15 @@ CONFIG_SND_MTS64=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AD1848_LIB=m +CONFIG_SND_CS4231_LIB=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB8_DSP=m +CONFIG_SND_SB16_DSP=m # # ISA devices # -CONFIG_SND_AD1848_LIB=m -CONFIG_SND_CS4231_LIB=m CONFIG_SND_ADLIB=m CONFIG_SND_AD1816A=m CONFIG_SND_AD1848=m @@ -2841,9 +2798,11 @@ CONFIG_SND_SB8=m CONFIG_SND_SB16=m CONFIG_SND_SBAWE=m CONFIG_SND_SB16_CSP=y +# CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL is not set CONFIG_SND_SGALAXY=m CONFIG_SND_SSCAPE=m CONFIG_SND_WAVEFRONT=m +# CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL is not set # # PCI devices @@ -2865,6 +2824,7 @@ CONFIG_SND_CMIPCI=m CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m CONFIG_SND_CS5535AUDIO=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m @@ -2895,7 +2855,9 @@ CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_KORG1212=m +# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MAESTRO3=m +# CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL is not set CONFIG_SND_MIXART=m CONFIG_SND_NM256=m CONFIG_SND_PCXHR=m @@ -2909,6 +2871,7 @@ CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +# CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL is not set CONFIG_SND_AC97_POWER_SAVE=y # @@ -2916,6 +2879,8 @@ CONFIG_SND_AC97_POWER_SAVE=y # CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y # # PCMCIA devices @@ -2924,25 +2889,36 @@ CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # -# SoC audio support +# System on Chip audio support # # CONFIG_SND_SOC is not set # -# Open Sound System +# SoC Audio support for SuperH # -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m # -# HID Devices +# Open Sound System # +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_DEBUG is not set # -# USB support +# USB Input Devices # +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +CONFIG_HID_FF=y +CONFIG_HID_PID=y +CONFIG_LOGITECH_FF=y +CONFIG_PANTHERLORD_FF=y +# CONFIG_THRUSTMASTER_FF is not set +CONFIG_ZEROPLUS_FF=y +CONFIG_USB_HIDDEV=y +CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y @@ -2953,8 +2929,10 @@ CONFIG_USB=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_PERSIST is not set # CONFIG_USB_OTG is not set # @@ -2964,7 +2942,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set -# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_ISP116X_HCD=m CONFIG_USB_OHCI_HCD=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set @@ -2974,6 +2951,7 @@ CONFIG_USB_UHCI_HCD=m CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m # # USB Device Class drivers @@ -3003,69 +2981,10 @@ CONFIG_USB_STORAGE_KARMA=y # CONFIG_USB_LIBUSUAL is not set # -# USB Input Devices -# -CONFIG_USB_HID=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -CONFIG_HID_FF=y -CONFIG_HID_PID=y -CONFIG_LOGITECH_FF=y -CONFIG_PANTHERLORD_FF=y -CONFIG_THRUSTMASTER_FF=y -CONFIG_ZEROPLUS_FF=y -CONFIG_USB_HIDDEV=y -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_ACECAD=m -CONFIG_USB_KBTAB=m -CONFIG_USB_POWERMATE=m -CONFIG_USB_TOUCHSCREEN=m -CONFIG_USB_TOUCHSCREEN_EGALAX=y -CONFIG_USB_TOUCHSCREEN_PANJIT=y -CONFIG_USB_TOUCHSCREEN_3M=y -CONFIG_USB_TOUCHSCREEN_ITM=y -CONFIG_USB_TOUCHSCREEN_ETURBO=y -CONFIG_USB_TOUCHSCREEN_GUNZE=y -CONFIG_USB_TOUCHSCREEN_DMC_TSC10=y -CONFIG_USB_YEALINK=m -CONFIG_USB_XPAD=m -CONFIG_USB_ATI_REMOTE=m -CONFIG_USB_ATI_REMOTE2=m -CONFIG_USB_KEYSPAN_REMOTE=m -CONFIG_USB_APPLETOUCH=m -CONFIG_USB_GTCO=m - -# # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET_MII=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_MON is not set # @@ -3117,6 +3036,7 @@ CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -3170,14 +3090,19 @@ CONFIG_USB_XUSBATM=m # USB Gadget Support # CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set CONFIG_USB_GADGET_NET2280=y CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y @@ -3189,20 +3114,22 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set # -# MMC/SD Card support +# MMC/SD Card Drivers # -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=m -CONFIG_MMC_SDHCI=m -CONFIG_MMC_WBSD=m -CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_BLOCK_BOUNCE=y # -# LED devices +# MMC/SD Host Controller Drivers # +CONFIG_MMC_SDHCI=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m @@ -3217,13 +3144,10 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m - -# -# InfiniBand support -# CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y @@ -3231,17 +3155,14 @@ CONFIG_INFINIBAND_AMSO1100=m # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set CONFIG_INFINIBAND_CXGB3=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_MLX4_INFINIBAND=m CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_ISER=m - -# -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) -# -CONFIG_EDAC=m +CONFIG_EDAC=y # # Reporting subsystems @@ -3252,43 +3173,62 @@ CONFIG_EDAC_AMD76X=m CONFIG_EDAC_E7XXX=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m CONFIG_EDAC_I82860=m CONFIG_EDAC_R82600=m -CONFIG_EDAC_POLL=y - -# -# Real Time Clock -# -CONFIG_RTC_LIB=m -CONFIG_RTC_CLASS=m +CONFIG_EDAC_I5000=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set # # RTC interfaces # -CONFIG_RTC_INTF_SYSFS=m -CONFIG_RTC_INTF_PROC=m -CONFIG_RTC_INTF_DEV=m +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m # -# RTC drivers +# I2C RTC drivers # -CONFIG_RTC_DRV_CMOS=m -CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y + +# +# SPI RTC drivers +# CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_TEST=m CONFIG_RTC_DRV_MAX6902=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T59=m CONFIG_RTC_DRV_V3020=m # +# on-CPU RTC drivers +# + +# # DMA Engine support # CONFIG_DMA_ENGINE=y @@ -3302,24 +3242,24 @@ CONFIG_NET_DMA=y # DMA Devices # CONFIG_INTEL_IOATDMA=m - -# -# Auxiliary Display support -# +CONFIG_AUXDISPLAY=y CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 CONFIG_KS0108_DELAY=2 CONFIG_CFAG12864B=m CONFIG_CFAG12864B_RATE=20 - -# -# Virtualization -# +CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m # +# Userspace I/O +# +CONFIG_UIO=m +CONFIG_UIO_CIF=m + +# # File systems # CONFIG_EXT2_FS=y @@ -3336,9 +3276,9 @@ CONFIG_EXT4DEV_FS_XATTR=y CONFIG_EXT4DEV_FS_POSIX_ACL=y CONFIG_EXT4DEV_FS_SECURITY=y CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set +CONFIG_JBD_DEBUG=y CONFIG_JBD2=m -# CONFIG_JBD2_DEBUG is not set +CONFIG_JBD2_DEBUG=y CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=y # CONFIG_REISERFS_CHECK is not set @@ -3356,7 +3296,7 @@ CONFIG_XFS_FS=y CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set +CONFIG_XFS_RT=y CONFIG_GFS2_FS=m CONFIG_GFS2_FS_LOCKING_NOLOCK=m CONFIG_GFS2_FS_LOCKING_DLM=m @@ -3463,6 +3403,7 @@ CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +# CONFIG_SUNRPC_BIND34 is not set CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -3485,7 +3426,7 @@ CONFIG_NCPFS_EXTRAS=y CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set CONFIG_AFS_FS=m -CONFIG_RXRPC=m +# CONFIG_AFS_DEBUG is not set # CONFIG_9P_FS is not set # @@ -3509,6 +3450,7 @@ CONFIG_LDM_PARTITION=y # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set # # Native Language Support @@ -3558,15 +3500,8 @@ CONFIG_NLS_UTF8=m # Distributed Lock Manager # CONFIG_DLM=m -CONFIG_DLM_TCP=y -# CONFIG_DLM_SCTP is not set # CONFIG_DLM_DEBUG is not set - -# -# Instrumentation Support -# -# CONFIG_PROFILING is not set -# CONFIG_KPROBES is not set +# CONFIG_INSTRUMENTATION is not set # # Kernel hacking @@ -3578,10 +3513,42 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=15 +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_FRAME_POINTER is not set +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set CONFIG_EARLY_PRINTK=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set + +# +# Page alloc debug is incompatible with Software Suspend on i386 +# +# CONFIG_DEBUG_RODATA is not set +# CONFIG_4KSTACKS is not set CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y CONFIG_DOUBLEFAULT=y @@ -3597,12 +3564,13 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_CAPABILITIES=m CONFIG_SECURITY_ROOTPLUG=m # CONFIG_SECURITY_SELINUX is not set - -# -# Cryptographic options -# +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ABLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y @@ -3621,6 +3589,7 @@ CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_BLOWFISH=m @@ -3641,27 +3610,30 @@ CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m - -# -# Hardware crypto devices -# +CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_CRYPTO_DEV_GEODE=m -# + + +CONFIG_SQUASHFS=n# # Library routines # CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m +CONFIG_CRC_ITU_T=m CONFIG_CRC32=y +CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m @@ -3669,6 +3641,8 @@ CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y diff --git a/source/base-extra/kernel-fwlive/jbd.diff b/source/base-extra/kernel-fwlive/jbd.diff deleted file mode 100644 index 11901c5..0000000 --- a/source/base-extra/kernel-fwlive/jbd.diff +++ /dev/null @@ -1,18 +0,0 @@ -We have to check that also the second checkpoint list is non-empty before -dropping the transaction. - -Signed-off-by: Jan Kara - -diff -rupX /home/jack/.kerndiffexclude linux-2.6.16-rc1/fs/jbd/commit.c linux-2.6.16-rc1-1-checkpoint-fix/fs/jbd/commit.c ---- linux-2.6.16-rc1/fs/jbd/commit.c 2006-01-15 00:20:12.000000000 +0100 -+++ linux-2.6.16-rc1-1-checkpoint-fix/fs/jbd/commit.c 2006-01-17 23:35:19.000000000 +0100 -@@ -829,7 +829,8 @@ restart_loop: - journal->j_committing_transaction = NULL; - spin_unlock(&journal->j_state_lock); - -- if (commit_transaction->t_checkpoint_list == NULL) { -+ if (commit_transaction->t_checkpoint_list == NULL && -+ commit_transaction->t_checkpoint_io_list == NULL) { - __journal_drop_transaction(journal, commit_transaction); - } else { - if (journal->j_checkpoint_transactions == NULL) { diff --git a/source/base-extra/kernel-fwlive/ksize.patch b/source/base-extra/kernel-fwlive/ksize.patch deleted file mode 100644 index 2b92800..0000000 --- a/source/base-extra/kernel-fwlive/ksize.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- mm/slab.c 9 Apr 2006 01:09:51 -0000 1.1 -+++ mm/slab.c 9 Apr 2006 01:10:33 -0000 1.2 -@@ -3861,3 +3861,4 @@ unsigned int ksize(const void *objp) - - return obj_size(virt_to_cache(objp)); - } -+EXPORT_SYMBOL(ksize); diff --git a/source/base-extra/kernel-fwlive/lhash.diff b/source/base-extra/kernel-fwlive/lhash.diff deleted file mode 100644 index 304f9ae..0000000 --- a/source/base-extra/kernel-fwlive/lhash.diff +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur linux-2.6.22.orig/fs/namei.c linux-2.6.22/fs/namei.c ---- linux-2.6.22.orig/fs/namei.c 2007-07-09 01:32:17.000000000 +0200 -+++ linux-2.6.22/fs/namei.c 2007-07-11 16:01:09.000000000 +0200 -@@ -1280,7 +1280,7 @@ - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static inline struct dentry * __lookup_hash(struct qstr *name, struct dentry *base, struct nameidata *nd) -+struct dentry * __lookup_hash(struct qstr *name, struct dentry * base, struct nameidata *nd) - { - struct dentry *dentry; - struct inode *inode; -@@ -2766,6 +2766,7 @@ - EXPORT_SYMBOL(get_write_access); /* binfmt_aout */ - EXPORT_SYMBOL(getname); - EXPORT_SYMBOL(lock_rename); -+EXPORT_SYMBOL(__lookup_hash); - EXPORT_SYMBOL(lookup_one_len); - EXPORT_SYMBOL(page_follow_link_light); - EXPORT_SYMBOL(page_put_link); -diff -Naur linux-2.6.22.orig/include/linux/namei.h linux-2.6.22/include/linux/namei.h ---- linux-2.6.22.orig/include/linux/namei.h 2007-07-09 01:32:17.000000000 +0200 -+++ linux-2.6.22/include/linux/namei.h 2007-07-11 16:03:39.000000000 +0200 -@@ -81,6 +81,7 @@ - extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); - extern void release_open_intent(struct nameidata *); - -+struct dentry * __lookup_hash(struct qstr *name, struct dentry * base, struct nameidata *nd); - extern struct dentry * lookup_one_len(const char *, struct dentry *, int); - extern struct dentry *lookup_one_len_kern(const char *, struct dentry *, int); - diff --git a/source/base-extra/kernel-fwlive/pxa27x.diff b/source/base-extra/kernel-fwlive/pxa27x.diff deleted file mode 100644 index a061352..0000000 --- a/source/base-extra/kernel-fwlive/pxa27x.diff +++ /dev/null @@ -1,22 +0,0 @@ -The PXA2xx keyboard driver does not compile with 2.6.22 -The following patch fixes it - -Signed-off-by: Mike Rapoport -Acked-by: Rodolfo Giometti - - drivers/input/keyboard/pxa27x_keyboard.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/drivers/input/keyboard/pxa27x_keyboard.c b/drivers/input/keyboard/pxa27x_keyboard.c -index f9e82c9..ebe5eac 100644 ---- a/drivers/input/keyboard/pxa27x_keyboard.c -+++ b/drivers/input/keyboard/pxa27x_keyboard.c -@@ -140,7 +140,7 @@ static int pxakbd_resume(struct platform_device *pdev) - KPREC = pdata->reg_kprec; - - /* Enable unit clock */ -- pxa_set_cken(CKEN19_KEYPAD, 1); -+ pxa_set_cken(CKEN_KEYPAD, 1); - } - - mutex_unlock(&input_dev->mutex); diff --git a/source/base-extra/kernel-fwlive/sqlzma2k-3.2-r2.patch b/source/base-extra/kernel-fwlive/sqlzma2k-3.2-r2.patch deleted file mode 100644 index 9754202..0000000 --- a/source/base-extra/kernel-fwlive/sqlzma2k-3.2-r2.patch +++ /dev/null @@ -1,533 +0,0 @@ -Index: linux-2.6.20/fs/squashfs/inode.c -=================================================================== -RCS file: linux-2.6.20/fs/squashfs/inode.c,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- linux-2.6.20/fs/squashfs/inode.c 16 Jan 2007 03:30:24 -0000 1.1 -+++ linux-2.6.20/fs/squashfs/inode.c 16 Jan 2007 05:08:17 -0000 1.2 -@@ -33,6 +33,25 @@ - #include - - #include "squashfs.h" -+#include "sqlzma.h" -+#include "sqmagic.h" -+ -+#define KeepPreemptive -+#undef KeepPreemptive -+struct sqlzma { -+#ifdef KeepPreemptive -+ struct mutex mtx; -+#endif -+ unsigned char read_data[SQUASHFS_FILE_MAX_SIZE]; -+ struct sqlzma_un un; -+}; -+static DEFINE_PER_CPU(struct sqlzma *, sqlzma); -+ -+#define dpri(fmt, args...) /* printk("%s:%d: " fmt, __func__, __LINE__, ##args) */ -+#define dpri_un(un) dpri("un{%d, {%d %p}, {%d %p}, {%d %p}}\n", \ -+ (un)->un_lzma, (un)->un_a[0].sz, (un)->un_a[0].buf, \ -+ (un)->un_a[1].sz, (un)->un_a[1].buf, \ -+ (un)->un_a[2].sz, (un)->un_a[2].buf) - - static void vfs_read_inode(struct inode *i); - static struct dentry *squashfs_get_parent(struct dentry *child); -@@ -238,66 +257,74 @@ SQSH_EXTERN unsigned int squashfs_read_d - } - - if (compressed) { -- int zlib_err = 0; -+ int zlib_err = Z_STREAM_END; -+ int rest, start; -+ enum {Src, Dst}; -+ struct sized_buf sbuf[2]; -+ struct sqlzma *percpu; - - /* - * uncompress block - */ -- -- mutex_lock(&msblk->read_data_mutex); -- -- msblk->stream.next_out = buffer; -- msblk->stream.avail_out = srclength; -- -- for (bytes = 0; k < b; k++) { -- avail_bytes = (c_byte - bytes) > (msblk->devblksize - offset) ? -- msblk->devblksize - offset : -- c_byte - bytes; -+ for (k = 0; k < b; k++) { - wait_on_buffer(bh[k]); - if (!buffer_uptodate(bh[k])) -- goto release_mutex; -- -- msblk->stream.next_in = bh[k]->b_data + offset; -- msblk->stream.avail_in = avail_bytes; -- -- if (k == 0) { -- zlib_err = zlib_inflateInit(&msblk->stream); -- if (zlib_err != Z_OK) { -- ERROR("zlib_inflateInit returned unexpected result 0x%x, srclength %d\n", -- zlib_err, srclength); -- goto release_mutex; -- } -- -- if (avail_bytes == 0) { -- offset = 0; -- brelse(bh[k]); -- continue; -- } -- } -- -- zlib_err = zlib_inflate(&msblk->stream, Z_NO_FLUSH); -- if (zlib_err != Z_OK && zlib_err != Z_STREAM_END) { -- ERROR("zlib_inflate returned unexpected result 0x%x, srclength %d, avail_in %d, avail_out %d\n", -- zlib_err, srclength, msblk->stream.avail_in, msblk->stream.avail_out); -- goto release_mutex; -- } -+ goto block_release; -+ } - -- bytes += avail_bytes; -+ avail_bytes = 0; -+ for (k = 0; !avail_bytes && k < b; k++) { -+ avail_bytes = msblk->devblksize - offset; -+ if (c_byte < avail_bytes) -+ avail_bytes = c_byte; -+ if (avail_bytes) -+ break; - offset = 0; - brelse(bh[k]); - } -+ bytes = 0; -+ if (!avail_bytes) -+ goto block_release; // nothing to be process - -- if (zlib_err != Z_STREAM_END) -- goto release_mutex; -- -- zlib_err = zlib_inflateEnd(&msblk->stream); -- if (zlib_err != Z_OK) { -- ERROR("zlib_inflateEnd returned unexpected result 0x%x, srclength %d\n", -- zlib_err, srclength); -+ start = k; -+ /* it disables preemption */ -+ percpu = get_cpu_var(sqlzma); -+#ifdef KeepPreemptive -+ put_cpu_var(sqlzma); -+ mutex_lock(&percpu->mtx); -+#endif -+ -+ for (; k < b; k++) { -+ memcpy(percpu->read_data + bytes, bh[k]->b_data + offset, -+ avail_bytes); -+ bytes += avail_bytes; -+ offset = 0; -+ brelse(bh[k]); -+ avail_bytes = msblk->devblksize - offset; -+ rest = c_byte - bytes; -+ if (rest < avail_bytes) -+ avail_bytes = rest; -+ } -+ -+ sbuf[Src].buf = percpu->read_data; -+ sbuf[Src].sz = bytes; -+ sbuf[Dst].buf = buffer; -+ sbuf[Dst].sz = srclength; -+ dpri_un(&percpu->un); -+ dpri("src %d %p, dst %d %p\n", sbuf[Src].sz, sbuf[Src].buf, -+ sbuf[Dst].sz, sbuf[Dst].buf); -+ zlib_err = sqlzma_un(&percpu->un, sbuf + Src, sbuf + Dst); -+ bytes = percpu->un.un_reslen; -+ -+#ifdef KeepPreemptive -+ mutex_unlock(&percpu->mtx); -+#else -+ put_cpu_var(sqlzma); -+#endif -+ if (unlikely(zlib_err)) { -+ dpri("zlib_err %d\n", zlib_err); - goto release_mutex; - } -- bytes = msblk->stream.total_out; -- mutex_unlock(&msblk->read_data_mutex); - } else { - int i; - -@@ -325,7 +352,7 @@ SQSH_EXTERN unsigned int squashfs_read_d - return bytes; - - release_mutex: -- mutex_unlock(&msblk->read_data_mutex); -+ //mutex_unlock(&msblk->read_data_mutex); - - block_release: - for (; k < b; k++) -@@ -1106,29 +1133,28 @@ static int squashfs_fill_super(struct su - { - struct squashfs_sb_info *msblk; - struct squashfs_super_block *sblk; -- int i; -+ int i, err; - char b[BDEVNAME_SIZE]; - struct inode *root; -+ void *label; - - TRACE("Entered squashfs_read_superblock\n"); - -+ err = -ENOMEM; - if (!(s->s_fs_info = kmalloc(sizeof(struct squashfs_sb_info), - GFP_KERNEL))) { - ERROR("Failed to allocate superblock\n"); - goto failure; - } -+ label = &&out_fsinfo; - memset(s->s_fs_info, 0, sizeof(struct squashfs_sb_info)); - msblk = s->s_fs_info; -- if (!(msblk->stream.workspace = vmalloc(zlib_inflate_workspacesize()))) { -- ERROR("Failed to allocate zlib workspace\n"); -- goto failure; -- } - sblk = &msblk->sblk; - - msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE); - msblk->devblksize_log2 = ffz(~msblk->devblksize); - -- mutex_init(&msblk->read_data_mutex); -+ //mutex_init(&msblk->read_data_mutex); - mutex_init(&msblk->read_page_mutex); - mutex_init(&msblk->block_cache_mutex); - mutex_init(&msblk->fragment_mutex); -@@ -1137,45 +1163,60 @@ static int squashfs_fill_super(struct su - init_waitqueue_head(&msblk->waitq); - init_waitqueue_head(&msblk->fragment_wait_queue); - -+ err = -EINVAL; - sblk->bytes_used = sizeof(struct squashfs_super_block); - if (!squashfs_read_data(s, (char *) sblk, SQUASHFS_START, - sizeof(struct squashfs_super_block) | - SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, sizeof(struct squashfs_super_block))) { - SERROR("unable to read superblock\n"); -- goto failed_mount; -+ goto *label; - } - - /* Check it is a SQUASHFS superblock */ -+ s->s_magic = sblk->s_magic; - msblk->swap = 0; -- if ((s->s_magic = sblk->s_magic) != SQUASHFS_MAGIC) { -- if (sblk->s_magic == SQUASHFS_MAGIC_SWAP) { -- struct squashfs_super_block ssblk; -- -- WARNING("Mounting a different endian SQUASHFS " -- "filesystem on %s\n", bdevname(s->s_bdev, b)); -- -- SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk); -- memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block)); -- msblk->swap = 1; -- } else { -- SERROR("Can't find a SQUASHFS superblock on %s\n", -- bdevname(s->s_bdev, b)); -- goto failed_mount; -- } -+ dpri("magic 0x%x\n", sblk->s_magic); -+ switch (sblk->s_magic) { -+ struct squashfs_super_block ssblk; -+ -+ case SQUASHFS_MAGIC_SWAP: -+ /*FALLTHROUGH*/ -+ case SQUASHFS_MAGIC_LZMA_SWAP: -+ WARNING("Mounting a different endian SQUASHFS " -+ "filesystem on %s\n", bdevname(s->s_bdev, b)); -+ -+ SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk); -+ memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block)); -+ msblk->swap = 1; -+ /*FALLTHROUGH*/ -+ case SQUASHFS_MAGIC: -+ case SQUASHFS_MAGIC_LZMA: -+ break; -+ default: -+ SERROR("Can't find a SQUASHFS superblock on %s\n", -+ bdevname(s->s_bdev, b)); -+ goto *label; -+ } -+ -+ { -+ struct sqlzma *p; -+ dpri("block_size %d\n", sblk->block_size); -+ BUG_ON(sblk->block_size > sizeof(p->read_data)); - } - - /* Check the MAJOR & MINOR versions */ -+ err = -EINVAL; - if(!supported_squashfs_filesystem(msblk, silent)) -- goto failed_mount; -+ goto *label; - - /* Check the filesystem does not extend beyond the end of the - block device */ - if(sblk->bytes_used < 0 || sblk->bytes_used > i_size_read(s->s_bdev->bd_inode)) -- goto failed_mount; -+ goto *label; - - /* Check the root inode for sanity */ - if (SQUASHFS_INODE_OFFSET(sblk->root_inode) > SQUASHFS_METADATA_SIZE) -- goto failed_mount; -+ goto *label; - - TRACE("Found valid superblock on %s\n", bdevname(s->s_bdev, b)); - TRACE("Inodes are %scompressed\n", -@@ -1205,11 +1246,13 @@ static int squashfs_fill_super(struct su - s->s_op = &squashfs_super_ops; - - /* Init inode_table block pointer array */ -+ err = -ENOMEM; - if (!(msblk->block_cache = kmalloc(sizeof(struct squashfs_cache) * - SQUASHFS_CACHED_BLKS, GFP_KERNEL))) { - ERROR("Failed to allocate block cache\n"); -- goto failed_mount; -+ goto *label; - } -+ label = &&out_block_cache; - - for (i = 0; i < SQUASHFS_CACHED_BLKS; i++) - msblk->block_cache[i].block = SQUASHFS_INVALID_BLK; -@@ -1219,17 +1262,21 @@ static int squashfs_fill_super(struct su - /* Allocate read_page block */ - if (!(msblk->read_page = kmalloc(sblk->block_size, GFP_KERNEL))) { - ERROR("Failed to allocate read_page block\n"); -- goto failed_mount; -+ goto *label; - } -+ label = &&out_read_page; - - /* Allocate uid and gid tables */ - if (!(msblk->uid = kmalloc((sblk->no_uids + sblk->no_guids) * - sizeof(unsigned int), GFP_KERNEL))) { - ERROR("Failed to allocate uid/gid table\n"); -- goto failed_mount; -+ goto *label; - } -+ label = &&out_uid; - msblk->guid = msblk->uid + sblk->no_uids; - -+ dpri("swap %d\n", msblk->swap); -+ err = -EINVAL; - if (msblk->swap) { - unsigned int suid[sblk->no_uids + sblk->no_guids]; - -@@ -1238,7 +1285,7 @@ static int squashfs_fill_super(struct su - sizeof(unsigned int)) | - SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) { - ERROR("unable to read uid/gid table\n"); -- goto failed_mount; -+ goto *label; - } - - SQUASHFS_SWAP_DATA(msblk->uid, suid, (sblk->no_uids + -@@ -1249,18 +1296,20 @@ static int squashfs_fill_super(struct su - sizeof(unsigned int)) | - SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) { - ERROR("unable to read uid/gid table\n"); -- goto failed_mount; -+ goto *label; - } - - - if (sblk->s_major == 1 && squashfs_1_0_supported(msblk)) - goto allocate_root; - -+ err = -ENOMEM; - if (!(msblk->fragment = kmalloc(sizeof(struct squashfs_fragment_cache) * - SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL))) { - ERROR("Failed to allocate fragment block cache\n"); -- goto failed_mount; -+ goto *label; - } -+ label = &&out_fragment; - - for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) { - msblk->fragment[i].locked = 0; -@@ -1272,7 +1321,7 @@ static int squashfs_fill_super(struct su - - /* Allocate and read fragment index table */ - if (msblk->read_fragment_index_table(s) == 0) -- goto failed_mount; -+ goto *label; - - if(sblk->s_major < 3 || sblk->lookup_table_start == SQUASHFS_INVALID_BLK) - goto allocate_root; -@@ -1285,9 +1334,12 @@ static int squashfs_fill_super(struct su - s->s_export_op = &squashfs_export_ops; - - allocate_root: -+ dpri("alloate_root\n"); - root = new_inode(s); -- if ((msblk->read_inode)(root, sblk->root_inode) == 0) -+ if ((msblk->read_inode)(root, sblk->root_inode) == 0) { -+ iput(root); - goto failed_mount; -+ } - insert_inode_hash(root); - - if ((s->s_root = d_alloc_root(root)) == NULL) { -@@ -1302,18 +1354,20 @@ allocate_root: - failed_mount: - kfree(msblk->inode_lookup_table); - kfree(msblk->fragment_index); -+ kfree(msblk->fragment_index_2); -+ out_fragment: - kfree(msblk->fragment); -+ out_uid: - kfree(msblk->uid); -+ out_read_page: - kfree(msblk->read_page); -+ out_block_cache: - kfree(msblk->block_cache); -- kfree(msblk->fragment_index_2); -- vfree(msblk->stream.workspace); -+ out_fsinfo: - kfree(s->s_fs_info); - s->s_fs_info = NULL; -- return -EINVAL; -- --failure: -- return -ENOMEM; -+ failure: -+ return err; - } - - -@@ -1324,7 +1378,7 @@ static int squashfs_statfs(struct dentry - - TRACE("Entered squashfs_statfs\n"); - -- buf->f_type = SQUASHFS_MAGIC; -+ buf->f_type = sblk->s_magic; - buf->f_bsize = sblk->block_size; - buf->f_blocks = ((sblk->bytes_used - 1) >> sblk->block_log) + 1; - buf->f_bfree = buf->f_bavail = 0; -@@ -2235,7 +2289,6 @@ static void squashfs_put_super(struct su - kfree(sbi->fragment_index); - kfree(sbi->fragment_index_2); - kfree(sbi->meta_index); -- vfree(sbi->stream.workspace); - kfree(s->s_fs_info); - s->s_fs_info = NULL; - } -@@ -2251,17 +2304,62 @@ static int squashfs_get_sb(struct file_s - } - - -+static void free_sqlzma(void) -+{ -+ int cpu; -+ struct sqlzma *p; -+ -+ for_each_online_cpu(cpu) { -+ p = per_cpu(sqlzma, cpu); -+ if (p) { -+#ifdef KeepPreemptive -+ mutex_destroy(&p->mtx); -+#endif -+ sqlzma_fin(&p->un); -+ kfree(p); -+ } -+ } -+} -+ - static int __init init_squashfs_fs(void) - { -+ struct sqlzma *p; -+ int cpu; - int err = init_inodecache(); - if (err) - goto out; - -+ for_each_online_cpu(cpu) { -+ dpri("%d: %p\n", cpu, per_cpu(sqlzma, cpu)); -+ err = -ENOMEM; -+ p = kmalloc(sizeof(struct sqlzma), GFP_KERNEL); -+ if (p) { -+#ifdef KeepPreemptive -+ mutex_init(&p->mtx); -+#endif -+ err = sqlzma_init(&p->un, 1, 0); -+ if (unlikely(err)) { -+ ERROR("Failed to intialize uncompress workspace\n"); -+ break; -+ } -+ per_cpu(sqlzma, cpu) = p; -+ err = 0; -+ } else -+ break; -+ } -+ if (unlikely(err)) { -+ free_sqlzma(); -+ goto out; -+ } -+ - printk(KERN_INFO "squashfs: version 3.2-r2 (2007/01/15) " -- "Phillip Lougher\n"); -+ "Phillip Lougher\n" -+ "squashfs: LZMA suppport for slax.org by jro\n"); - -- if ((err = register_filesystem(&squashfs_fs_type))) -+ if ((err = register_filesystem(&squashfs_fs_type))) { -+ free_sqlzma(); - destroy_inodecache(); -+ } - - out: - return err; -@@ -2271,6 +2369,7 @@ out: - static void __exit exit_squashfs_fs(void) - { - unregister_filesystem(&squashfs_fs_type); -+ free_sqlzma(); - destroy_inodecache(); - } - -@@ -2324,6 +2423,6 @@ static void destroy_inodecache(void) - - module_init(init_squashfs_fs); - module_exit(exit_squashfs_fs); --MODULE_DESCRIPTION("squashfs 3.2-r2, a compressed read-only filesystem"); --MODULE_AUTHOR("Phillip Lougher "); -+MODULE_DESCRIPTION("squashfs 3.2-r2, a compressed read-only filesystem, and LZMA suppport for slax.org"); -+MODULE_AUTHOR("Phillip Lougher , and LZMA suppport for slax.org by jro"); - MODULE_LICENSE("GPL"); -Index: linux-2.6.20/include/linux/squashfs_fs_sb.h -=================================================================== -RCS file: linux-2.6.20/include/linux/squashfs_fs_sb.h,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- linux-2.6.20/include/linux/squashfs_fs_sb.h 16 Jan 2007 03:30:24 -0000 1.1 -+++ linux-2.6.20/include/linux/squashfs_fs_sb.h 16 Jan 2007 05:08:17 -0000 1.2 -@@ -24,6 +24,7 @@ - */ - - #include -+#include "sqlzma.h" - - struct squashfs_cache { - long long block; -@@ -54,7 +55,7 @@ struct squashfs_sb_info { - long long *fragment_index; - unsigned int *fragment_index_2; - char *read_page; -- struct mutex read_data_mutex; -+ //struct mutex read_data_mutex; - struct mutex read_page_mutex; - struct mutex block_cache_mutex; - struct mutex fragment_mutex; -@@ -62,7 +63,6 @@ struct squashfs_sb_info { - wait_queue_head_t waitq; - wait_queue_head_t fragment_wait_queue; - struct meta_index *meta_index; -- z_stream stream; - long long *inode_lookup_table; - int (*read_inode)(struct inode *i, squashfs_inode_t \ - inode); diff --git a/source/base-extra/kernel-fwlive/squashfs3.2-patch b/source/base-extra/kernel-fwlive/squashfs3.2-patch deleted file mode 100644 index 1165fd8..0000000 --- a/source/base-extra/kernel-fwlive/squashfs3.2-patch +++ /dev/null @@ -1,4386 +0,0 @@ -diff -x .gitignore -Nurp linux-2.6.20/fs/Kconfig linux-2.6.20-squashfs3.2-r2/fs/Kconfig ---- linux-2.6.20/fs/Kconfig 2006-12-25 01:13:12.000000000 +0000 -+++ linux-2.6.20-squashfs3.2-r2/fs/Kconfig 2007-01-16 02:06:03.000000000 +0000 -@@ -1404,6 +1404,71 @@ config CRAMFS - - If unsure, say N. - -+config SQUASHFS -+ tristate "SquashFS 3.2 - Squashed file system support" -+ select ZLIB_INFLATE -+ help -+ Saying Y here includes support for SquashFS 3.2 (a Compressed Read-Only File -+ System). Squashfs is a highly compressed read-only filesystem for Linux. -+ It uses zlib compression to compress both files, inodes and directories. -+ Inodes in the system are very small and all blocks are packed to minimise -+ data overhead. Block sizes greater than 4K are supported up to a maximum of 64K. -+ SquashFS 3.1 supports 64 bit filesystems and files (larger than 4GB), full -+ uid/gid information, hard links and timestamps. -+ -+ Squashfs is intended for general read-only filesystem use, for archival -+ use (i.e. in cases where a .tar.gz file may be used), and in embedded -+ systems where low overhead is needed. Further information and filesystem tools -+ are available from http://squashfs.sourceforge.net. -+ -+ If you want to compile this as a module ( = code which can be -+ inserted in and removed from the running kernel whenever you want), -+ say M here and read . The module -+ will be called squashfs. Note that the root file system (the one -+ containing the directory /) cannot be compiled as a module. -+ -+ If unsure, say N. -+ -+config SQUASHFS_EMBEDDED -+ -+ bool "Additional options for memory-constrained systems" -+ depends on SQUASHFS -+ default n -+ help -+ Saying Y here allows you to specify cache sizes and how Squashfs -+ allocates memory. This is only intended for memory constrained -+ systems. -+ -+ If unsure, say N. -+ -+config SQUASHFS_FRAGMENT_CACHE_SIZE -+ int "Number of fragments cached" if SQUASHFS_EMBEDDED -+ depends on SQUASHFS -+ default "3" -+ help -+ By default SquashFS caches the last 3 fragments read from -+ the filesystem. Increasing this amount may mean SquashFS -+ has to re-read fragments less often from disk, at the expense -+ of extra system memory. Decreasing this amount will mean -+ SquashFS uses less memory at the expense of extra reads from disk. -+ -+ Note there must be at least one cached fragment. Anything -+ much more than three will probably not make much difference. -+ -+config SQUASHFS_VMALLOC -+ bool "Use Vmalloc rather than Kmalloc" if SQUASHFS_EMBEDDED -+ depends on SQUASHFS -+ default n -+ help -+ By default SquashFS uses kmalloc to obtain fragment cache memory. -+ Kmalloc memory is the standard kernel allocator, but it can fail -+ on memory constrained systems. Because of the way Vmalloc works, -+ Vmalloc can succeed when kmalloc fails. Specifying this option -+ will make SquashFS always use Vmalloc to allocate the -+ fragment cache memory. -+ -+ If unsure, say N. -+ - config VXFS_FS - tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" - depends on BLOCK -diff -x .gitignore -Nurp linux-2.6.20/fs/Makefile linux-2.6.20-squashfs3.2-r2/fs/Makefile ---- linux-2.6.20/fs/Makefile 2006-12-25 01:13:12.000000000 +0000 -+++ linux-2.6.20-squashfs3.2-r2/fs/Makefile 2007-01-16 02:06:03.000000000 +0000 -@@ -68,6 +68,7 @@ obj-$(CONFIG_JBD) += jbd/ - obj-$(CONFIG_JBD2) += jbd2/ - obj-$(CONFIG_EXT2_FS) += ext2/ - obj-$(CONFIG_CRAMFS) += cramfs/ -+obj-$(CONFIG_SQUASHFS) += squashfs/ - obj-$(CONFIG_RAMFS) += ramfs/ - obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ - obj-$(CONFIG_CODA_FS) += coda/ -diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/inode.c linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c ---- linux-2.6.20/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c 2007-01-16 02:28:36.000000000 +0000 -@@ -0,0 +1,2329 @@ -+/* -+ * Squashfs - a compressed read only filesystem for Linux -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * inode.c -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "squashfs.h" -+ -+static void vfs_read_inode(struct inode *i); -+static struct dentry *squashfs_get_parent(struct dentry *child); -+static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode); -+static int squashfs_statfs(struct dentry *, struct kstatfs *); -+static int squashfs_symlink_readpage(struct file *file, struct page *page); -+static long long read_blocklist(struct inode *inode, int index, -+ int readahead_blks, char *block_list, -+ unsigned short **block_p, unsigned int *bsize); -+static int squashfs_readpage(struct file *file, struct page *page); -+static int squashfs_readpage4K(struct file *file, struct page *page); -+static int squashfs_readdir(struct file *, void *, filldir_t); -+static struct dentry *squashfs_lookup(struct inode *, struct dentry *, -+ struct nameidata *); -+static int squashfs_remount(struct super_block *s, int *flags, char *data); -+static void squashfs_put_super(struct super_block *); -+static int squashfs_get_sb(struct file_system_type *,int, const char *, void *, -+ struct vfsmount *); -+static struct inode *squashfs_alloc_inode(struct super_block *sb); -+static void squashfs_destroy_inode(struct inode *inode); -+static int init_inodecache(void); -+static void destroy_inodecache(void); -+ -+static struct file_system_type squashfs_fs_type = { -+ .owner = THIS_MODULE, -+ .name = "squashfs", -+ .get_sb = squashfs_get_sb, -+ .kill_sb = kill_block_super, -+ .fs_flags = FS_REQUIRES_DEV -+}; -+ -+static const unsigned char squashfs_filetype_table[] = { -+ DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK -+}; -+ -+static struct super_operations squashfs_super_ops = { -+ .alloc_inode = squashfs_alloc_inode, -+ .destroy_inode = squashfs_destroy_inode, -+ .statfs = squashfs_statfs, -+ .put_super = squashfs_put_super, -+ .remount_fs = squashfs_remount -+}; -+ -+static struct super_operations squashfs_export_super_ops = { -+ .alloc_inode = squashfs_alloc_inode, -+ .destroy_inode = squashfs_destroy_inode, -+ .statfs = squashfs_statfs, -+ .put_super = squashfs_put_super, -+ .read_inode = vfs_read_inode -+}; -+ -+static struct export_operations squashfs_export_ops = { -+ .get_parent = squashfs_get_parent -+}; -+ -+SQSH_EXTERN const struct address_space_operations squashfs_symlink_aops = { -+ .readpage = squashfs_symlink_readpage -+}; -+ -+SQSH_EXTERN const struct address_space_operations squashfs_aops = { -+ .readpage = squashfs_readpage -+}; -+ -+SQSH_EXTERN const struct address_space_operations squashfs_aops_4K = { -+ .readpage = squashfs_readpage4K -+}; -+ -+static const struct file_operations squashfs_dir_ops = { -+ .read = generic_read_dir, -+ .readdir = squashfs_readdir -+}; -+ -+SQSH_EXTERN struct inode_operations squashfs_dir_inode_ops = { -+ .lookup = squashfs_lookup -+}; -+ -+ -+static struct buffer_head *get_block_length(struct super_block *s, -+ int *cur_index, int *offset, int *c_byte) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ unsigned short temp; -+ struct buffer_head *bh; -+ -+ if (!(bh = sb_bread(s, *cur_index))) -+ goto out; -+ -+ if (msblk->devblksize - *offset == 1) { -+ if (msblk->swap) -+ ((unsigned char *) &temp)[1] = *((unsigned char *) -+ (bh->b_data + *offset)); -+ else -+ ((unsigned char *) &temp)[0] = *((unsigned char *) -+ (bh->b_data + *offset)); -+ brelse(bh); -+ if (!(bh = sb_bread(s, ++(*cur_index)))) -+ goto out; -+ if (msblk->swap) -+ ((unsigned char *) &temp)[0] = *((unsigned char *) -+ bh->b_data); -+ else -+ ((unsigned char *) &temp)[1] = *((unsigned char *) -+ bh->b_data); -+ *c_byte = temp; -+ *offset = 1; -+ } else { -+ if (msblk->swap) { -+ ((unsigned char *) &temp)[1] = *((unsigned char *) -+ (bh->b_data + *offset)); -+ ((unsigned char *) &temp)[0] = *((unsigned char *) -+ (bh->b_data + *offset + 1)); -+ } else { -+ ((unsigned char *) &temp)[0] = *((unsigned char *) -+ (bh->b_data + *offset)); -+ ((unsigned char *) &temp)[1] = *((unsigned char *) -+ (bh->b_data + *offset + 1)); -+ } -+ *c_byte = temp; -+ *offset += 2; -+ } -+ -+ if (SQUASHFS_CHECK_DATA(msblk->sblk.flags)) { -+ if (*offset == msblk->devblksize) { -+ brelse(bh); -+ if (!(bh = sb_bread(s, ++(*cur_index)))) -+ goto out; -+ *offset = 0; -+ } -+ if (*((unsigned char *) (bh->b_data + *offset)) != -+ SQUASHFS_MARKER_BYTE) { -+ ERROR("Metadata block marker corrupt @ %x\n", -+ *cur_index); -+ brelse(bh); -+ goto out; -+ } -+ (*offset)++; -+ } -+ return bh; -+ -+out: -+ return NULL; -+} -+ -+ -+SQSH_EXTERN unsigned int squashfs_read_data(struct super_block *s, char *buffer, -+ long long index, unsigned int length, -+ long long *next_index, int srclength) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ struct buffer_head *bh[((SQUASHFS_FILE_MAX_SIZE - 1) >> -+ msblk->devblksize_log2) + 2]; -+ unsigned int offset = index & ((1 << msblk->devblksize_log2) - 1); -+ unsigned int cur_index = index >> msblk->devblksize_log2; -+ int bytes, avail_bytes, b = 0, k = 0; -+ unsigned int compressed; -+ unsigned int c_byte = length; -+ -+ if (c_byte) { -+ bytes = msblk->devblksize - offset; -+ compressed = SQUASHFS_COMPRESSED_BLOCK(c_byte); -+ c_byte = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); -+ -+ TRACE("Block @ 0x%llx, %scompressed size %d, src size %d\n", index, compressed -+ ? "" : "un", (unsigned int) c_byte, srclength); -+ -+ if (c_byte > srclength || index < 0 || (index + c_byte) > sblk->bytes_used) -+ goto read_failure; -+ -+ if (!(bh[0] = sb_getblk(s, cur_index))) -+ goto block_release; -+ -+ for (b = 1; bytes < c_byte; b++) { -+ if (!(bh[b] = sb_getblk(s, ++cur_index))) -+ goto block_release; -+ bytes += msblk->devblksize; -+ } -+ ll_rw_block(READ, b, bh); -+ } else { -+ if (index < 0 || (index + 2) > sblk->bytes_used) -+ goto read_failure; -+ -+ if (!(bh[0] = get_block_length(s, &cur_index, &offset, -+ &c_byte))) -+ goto read_failure; -+ -+ bytes = msblk->devblksize - offset; -+ compressed = SQUASHFS_COMPRESSED(c_byte); -+ c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte); -+ -+ TRACE("Block @ 0x%llx, %scompressed size %d\n", index, compressed -+ ? "" : "un", (unsigned int) c_byte); -+ -+ if (c_byte > srclength || (index + c_byte) > sblk->bytes_used) -+ goto read_failure; -+ -+ for (b = 1; bytes < c_byte; b++) { -+ if (!(bh[b] = sb_getblk(s, ++cur_index))) -+ goto block_release; -+ bytes += msblk->devblksize; -+ } -+ ll_rw_block(READ, b - 1, bh + 1); -+ } -+ -+ if (compressed) { -+ int zlib_err = 0; -+ -+ /* -+ * uncompress block -+ */ -+ -+ mutex_lock(&msblk->read_data_mutex); -+ -+ msblk->stream.next_out = buffer; -+ msblk->stream.avail_out = srclength; -+ -+ for (bytes = 0; k < b; k++) { -+ avail_bytes = (c_byte - bytes) > (msblk->devblksize - offset) ? -+ msblk->devblksize - offset : -+ c_byte - bytes; -+ wait_on_buffer(bh[k]); -+ if (!buffer_uptodate(bh[k])) -+ goto release_mutex; -+ -+ msblk->stream.next_in = bh[k]->b_data + offset; -+ msblk->stream.avail_in = avail_bytes; -+ -+ if (k == 0) { -+ zlib_err = zlib_inflateInit(&msblk->stream); -+ if (zlib_err != Z_OK) { -+ ERROR("zlib_inflateInit returned unexpected result 0x%x, srclength %d\n", -+ zlib_err, srclength); -+ goto release_mutex; -+ } -+ -+ if (avail_bytes == 0) { -+ offset = 0; -+ brelse(bh[k]); -+ continue; -+ } -+ } -+ -+ zlib_err = zlib_inflate(&msblk->stream, Z_NO_FLUSH); -+ if (zlib_err != Z_OK && zlib_err != Z_STREAM_END) { -+ ERROR("zlib_inflate returned unexpected result 0x%x, srclength %d, avail_in %d, avail_out %d\n", -+ zlib_err, srclength, msblk->stream.avail_in, msblk->stream.avail_out); -+ goto release_mutex; -+ } -+ -+ bytes += avail_bytes; -+ offset = 0; -+ brelse(bh[k]); -+ } -+ -+ if (zlib_err != Z_STREAM_END) -+ goto release_mutex; -+ -+ zlib_err = zlib_inflateEnd(&msblk->stream); -+ if (zlib_err != Z_OK) { -+ ERROR("zlib_inflateEnd returned unexpected result 0x%x, srclength %d\n", -+ zlib_err, srclength); -+ goto release_mutex; -+ } -+ bytes = msblk->stream.total_out; -+ mutex_unlock(&msblk->read_data_mutex); -+ } else { -+ int i; -+ -+ for(i = 0; i < b; i++) { -+ wait_on_buffer(bh[i]); -+ if(!buffer_uptodate(bh[i])) -+ goto block_release; -+ } -+ -+ for (bytes = 0; k < b; k++) { -+ avail_bytes = (c_byte - bytes) > (msblk->devblksize - offset) ? -+ msblk->devblksize - offset : -+ c_byte - bytes; -+ memcpy(buffer + bytes, bh[k]->b_data + offset, avail_bytes); -+ bytes += avail_bytes; -+ offset = 0; -+ brelse(bh[k]); -+ } -+ } -+ -+ if (next_index) -+ *next_index = index + c_byte + (length ? 0 : -+ (SQUASHFS_CHECK_DATA(msblk->sblk.flags) -+ ? 3 : 2)); -+ return bytes; -+ -+release_mutex: -+ mutex_unlock(&msblk->read_data_mutex); -+ -+block_release: -+ for (; k < b; k++) -+ brelse(bh[k]); -+ -+read_failure: -+ ERROR("sb_bread failed reading block 0x%x\n", cur_index); -+ return 0; -+} -+ -+ -+SQSH_EXTERN int squashfs_get_cached_block(struct super_block *s, char *buffer, -+ long long block, unsigned int offset, -+ int length, long long *next_block, -+ unsigned int *next_offset) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ int n, i, bytes, return_length = length; -+ long long next_index; -+ -+ TRACE("Entered squashfs_get_cached_block [%llx:%x]\n", block, offset); -+ -+ while ( 1 ) { -+ for (i = 0; i < SQUASHFS_CACHED_BLKS; i++) -+ if (msblk->block_cache[i].block == block) -+ break; -+ -+ mutex_lock(&msblk->block_cache_mutex); -+ -+ if (i == SQUASHFS_CACHED_BLKS) { -+ /* read inode header block */ -+ for (i = msblk->next_cache, n = SQUASHFS_CACHED_BLKS; -+ n ; n --, i = (i + 1) % -+ SQUASHFS_CACHED_BLKS) -+ if (msblk->block_cache[i].block != -+ SQUASHFS_USED_BLK) -+ break; -+ -+ if (n == 0) { -+ wait_queue_t wait; -+ -+ init_waitqueue_entry(&wait, current); -+ add_wait_queue(&msblk->waitq, &wait); -+ set_current_state(TASK_UNINTERRUPTIBLE); -+ mutex_unlock(&msblk->block_cache_mutex); -+ schedule(); -+ set_current_state(TASK_RUNNING); -+ remove_wait_queue(&msblk->waitq, &wait); -+ continue; -+ } -+ msblk->next_cache = (i + 1) % SQUASHFS_CACHED_BLKS; -+ -+ if (msblk->block_cache[i].block == -+ SQUASHFS_INVALID_BLK) { -+ if (!(msblk->block_cache[i].data = -+ kmalloc(SQUASHFS_METADATA_SIZE, -+ GFP_KERNEL))) { -+ ERROR("Failed to allocate cache" -+ "block\n"); -+ mutex_unlock(&msblk->block_cache_mutex); -+ goto out; -+ } -+ } -+ -+ msblk->block_cache[i].block = SQUASHFS_USED_BLK; -+ mutex_unlock(&msblk->block_cache_mutex); -+ -+ msblk->block_cache[i].length = squashfs_read_data(s, -+ msblk->block_cache[i].data, block, 0, &next_index, SQUASHFS_METADATA_SIZE); -+ if (msblk->block_cache[i].length == 0) { -+ ERROR("Unable to read cache block [%llx:%x]\n", -+ block, offset); -+ mutex_lock(&msblk->block_cache_mutex); -+ msblk->block_cache[i].block = SQUASHFS_INVALID_BLK; -+ kfree(msblk->block_cache[i].data); -+ wake_up(&msblk->waitq); -+ mutex_unlock(&msblk->block_cache_mutex); -+ goto out; -+ } -+ -+ mutex_lock(&msblk->block_cache_mutex); -+ wake_up(&msblk->waitq); -+ msblk->block_cache[i].block = block; -+ msblk->block_cache[i].next_index = next_index; -+ TRACE("Read cache block [%llx:%x]\n", block, offset); -+ } -+ -+ if (msblk->block_cache[i].block != block) { -+ mutex_unlock(&msblk->block_cache_mutex); -+ continue; -+ } -+ -+ bytes = msblk->block_cache[i].length - offset; -+ -+ if (bytes < 1) { -+ mutex_unlock(&msblk->block_cache_mutex); -+ goto out; -+ } else if (bytes >= length) { -+ if (buffer) -+ memcpy(buffer, msblk->block_cache[i].data + -+ offset, length); -+ if (msblk->block_cache[i].length - offset == length) { -+ *next_block = msblk->block_cache[i].next_index; -+ *next_offset = 0; -+ } else { -+ *next_block = block; -+ *next_offset = offset + length; -+ } -+ mutex_unlock(&msblk->block_cache_mutex); -+ goto finish; -+ } else { -+ if (buffer) { -+ memcpy(buffer, msblk->block_cache[i].data + -+ offset, bytes); -+ buffer += bytes; -+ } -+ block = msblk->block_cache[i].next_index; -+ mutex_unlock(&msblk->block_cache_mutex); -+ length -= bytes; -+ offset = 0; -+ } -+ } -+ -+finish: -+ return return_length; -+out: -+ return 0; -+} -+ -+ -+static int get_fragment_location(struct super_block *s, unsigned int fragment, -+ long long *fragment_start_block, -+ unsigned int *fragment_size) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ long long start_block = -+ msblk->fragment_index[SQUASHFS_FRAGMENT_INDEX(fragment)]; -+ int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET(fragment); -+ struct squashfs_fragment_entry fragment_entry; -+ -+ if (msblk->swap) { -+ struct squashfs_fragment_entry sfragment_entry; -+ -+ if (!squashfs_get_cached_block(s, (char *) &sfragment_entry, -+ start_block, offset, -+ sizeof(sfragment_entry), &start_block, -+ &offset)) -+ goto out; -+ SQUASHFS_SWAP_FRAGMENT_ENTRY(&fragment_entry, &sfragment_entry); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) &fragment_entry, -+ start_block, offset, -+ sizeof(fragment_entry), &start_block, -+ &offset)) -+ goto out; -+ -+ *fragment_start_block = fragment_entry.start_block; -+ *fragment_size = fragment_entry.size; -+ -+ return 1; -+ -+out: -+ return 0; -+} -+ -+ -+SQSH_EXTERN void release_cached_fragment(struct squashfs_sb_info *msblk, struct -+ squashfs_fragment_cache *fragment) -+{ -+ mutex_lock(&msblk->fragment_mutex); -+ fragment->locked --; -+ wake_up(&msblk->fragment_wait_queue); -+ mutex_unlock(&msblk->fragment_mutex); -+} -+ -+ -+SQSH_EXTERN struct squashfs_fragment_cache *get_cached_fragment(struct super_block -+ *s, long long start_block, -+ int length) -+{ -+ int i, n; -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ while ( 1 ) { -+ mutex_lock(&msblk->fragment_mutex); -+ -+ for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS && -+ msblk->fragment[i].block != start_block; i++); -+ -+ if (i == SQUASHFS_CACHED_FRAGMENTS) { -+ for (i = msblk->next_fragment, n = -+ SQUASHFS_CACHED_FRAGMENTS; n && -+ msblk->fragment[i].locked; n--, i = (i + 1) % -+ SQUASHFS_CACHED_FRAGMENTS); -+ -+ if (n == 0) { -+ wait_queue_t wait; -+ -+ init_waitqueue_entry(&wait, current); -+ add_wait_queue(&msblk->fragment_wait_queue, -+ &wait); -+ set_current_state(TASK_UNINTERRUPTIBLE); -+ mutex_unlock(&msblk->fragment_mutex); -+ schedule(); -+ set_current_state(TASK_RUNNING); -+ remove_wait_queue(&msblk->fragment_wait_queue, -+ &wait); -+ continue; -+ } -+ msblk->next_fragment = (msblk->next_fragment + 1) % -+ SQUASHFS_CACHED_FRAGMENTS; -+ -+ if (msblk->fragment[i].data == NULL) -+ if (!(msblk->fragment[i].data = SQUASHFS_ALLOC -+ (SQUASHFS_FILE_MAX_SIZE))) { -+ ERROR("Failed to allocate fragment " -+ "cache block\n"); -+ mutex_unlock(&msblk->fragment_mutex); -+ goto out; -+ } -+ -+ msblk->fragment[i].block = SQUASHFS_INVALID_BLK; -+ msblk->fragment[i].locked = 1; -+ mutex_unlock(&msblk->fragment_mutex); -+ -+ if (!(msblk->fragment[i].length = squashfs_read_data(s, -+ msblk->fragment[i].data, -+ start_block, length, NULL, sblk->block_size))) { -+ ERROR("Unable to read fragment cache block " -+ "[%llx]\n", start_block); -+ msblk->fragment[i].locked = 0; -+ smp_mb(); -+ goto out; -+ } -+ -+ mutex_lock(&msblk->fragment_mutex); -+ msblk->fragment[i].block = start_block; -+ TRACE("New fragment %d, start block %lld, locked %d\n", -+ i, msblk->fragment[i].block, -+ msblk->fragment[i].locked); -+ mutex_unlock(&msblk->fragment_mutex); -+ break; -+ } -+ -+ msblk->fragment[i].locked++; -+ mutex_unlock(&msblk->fragment_mutex); -+ TRACE("Got fragment %d, start block %lld, locked %d\n", i, -+ msblk->fragment[i].block, -+ msblk->fragment[i].locked); -+ break; -+ } -+ -+ return &msblk->fragment[i]; -+ -+out: -+ return NULL; -+} -+ -+ -+static void squashfs_new_inode(struct squashfs_sb_info *msblk, struct inode *i, -+ struct squashfs_base_inode_header *inodeb) -+{ -+ i->i_ino = inodeb->inode_number; -+ i->i_mtime.tv_sec = inodeb->mtime; -+ i->i_atime.tv_sec = inodeb->mtime; -+ i->i_ctime.tv_sec = inodeb->mtime; -+ i->i_uid = msblk->uid[inodeb->uid]; -+ i->i_mode = inodeb->mode; -+ i->i_size = 0; -+ if (inodeb->guid == SQUASHFS_GUIDS) -+ i->i_gid = i->i_uid; -+ else -+ i->i_gid = msblk->guid[inodeb->guid]; -+} -+ -+ -+static squashfs_inode_t squashfs_inode_lookup(struct super_block *s, int ino) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ long long start = msblk->inode_lookup_table[SQUASHFS_LOOKUP_BLOCK(ino - 1)]; -+ int offset = SQUASHFS_LOOKUP_BLOCK_OFFSET(ino - 1); -+ squashfs_inode_t inode; -+ -+ TRACE("Entered squashfs_inode_lookup, inode_number = %d\n", ino); -+ -+ if (msblk->swap) { -+ squashfs_inode_t sinode; -+ -+ if (!squashfs_get_cached_block(s, (char *) &sinode, start, offset, -+ sizeof(sinode), &start, &offset)) -+ goto out; -+ SQUASHFS_SWAP_INODE_T((&inode), &sinode); -+ } else if (!squashfs_get_cached_block(s, (char *) &inode, start, offset, -+ sizeof(inode), &start, &offset)) -+ goto out; -+ -+ TRACE("squashfs_inode_lookup, inode = 0x%llx\n", inode); -+ -+ return inode; -+ -+out: -+ return SQUASHFS_INVALID_BLK; -+} -+ -+ -+static void vfs_read_inode(struct inode *i) -+{ -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ squashfs_inode_t inode = squashfs_inode_lookup(i->i_sb, i->i_ino); -+ -+ TRACE("Entered vfs_read_inode\n"); -+ -+ if(inode != SQUASHFS_INVALID_BLK) -+ (msblk->read_inode)(i, inode); -+} -+ -+ -+static struct dentry *squashfs_get_parent(struct dentry *child) -+{ -+ struct inode *i = child->d_inode; -+ struct inode *parent = iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode); -+ struct dentry *rv; -+ -+ TRACE("Entered squashfs_get_parent\n"); -+ -+ if(parent == NULL) { -+ rv = ERR_PTR(-EACCES); -+ goto out; -+ } -+ -+ rv = d_alloc_anon(parent); -+ if(rv == NULL) -+ rv = ERR_PTR(-ENOMEM); -+ -+out: -+ return rv; -+} -+ -+ -+SQSH_EXTERN struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode, unsigned int inode_number) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct inode *i = iget_locked(s, inode_number); -+ -+ TRACE("Entered squashfs_iget\n"); -+ -+ if(i && (i->i_state & I_NEW)) { -+ (msblk->read_inode)(i, inode); -+ unlock_new_inode(i); -+ } -+ -+ return i; -+} -+ -+ -+static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode) -+{ -+ struct super_block *s = i->i_sb; -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long block = SQUASHFS_INODE_BLK(inode) + -+ sblk->inode_table_start; -+ unsigned int offset = SQUASHFS_INODE_OFFSET(inode); -+ long long next_block; -+ unsigned int next_offset; -+ union squashfs_inode_header id, sid; -+ struct squashfs_base_inode_header *inodeb = &id.base, -+ *sinodeb = &sid.base; -+ -+ TRACE("Entered squashfs_read_inode\n"); -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) sinodeb, block, -+ offset, sizeof(*sinodeb), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_BASE_INODE_HEADER(inodeb, sinodeb, -+ sizeof(*sinodeb)); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) inodeb, block, -+ offset, sizeof(*inodeb), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ squashfs_new_inode(msblk, i, inodeb); -+ -+ switch(inodeb->inode_type) { -+ case SQUASHFS_FILE_TYPE: { -+ unsigned int frag_size; -+ long long frag_blk; -+ struct squashfs_reg_inode_header *inodep = &id.reg; -+ struct squashfs_reg_inode_header *sinodep = &sid.reg; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_REG_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ frag_blk = SQUASHFS_INVALID_BLK; -+ if (inodep->fragment != SQUASHFS_INVALID_FRAG && -+ !get_fragment_location(s, -+ inodep->fragment, &frag_blk, &frag_size)) -+ goto failed_read; -+ -+ i->i_nlink = 1; -+ i->i_size = inodep->file_size; -+ i->i_fop = &generic_ro_fops; -+ i->i_mode |= S_IFREG; -+ i->i_blocks = ((i->i_size - 1) >> 9) + 1; -+ SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk; -+ SQUASHFS_I(i)->u.s1.fragment_size = frag_size; -+ SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->u.s1.block_list_start = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ if (sblk->block_size > 4096) -+ i->i_data.a_ops = &squashfs_aops; -+ else -+ i->i_data.a_ops = &squashfs_aops_4K; -+ -+ TRACE("File inode %x:%x, start_block %llx, " -+ "block_list_start %llx, offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, next_block, -+ next_offset); -+ break; -+ } -+ case SQUASHFS_LREG_TYPE: { -+ unsigned int frag_size; -+ long long frag_blk; -+ struct squashfs_lreg_inode_header *inodep = &id.lreg; -+ struct squashfs_lreg_inode_header *sinodep = &sid.lreg; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_LREG_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ frag_blk = SQUASHFS_INVALID_BLK; -+ if (inodep->fragment != SQUASHFS_INVALID_FRAG && -+ !get_fragment_location(s, -+ inodep->fragment, &frag_blk, &frag_size)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_size = inodep->file_size; -+ i->i_fop = &generic_ro_fops; -+ i->i_mode |= S_IFREG; -+ i->i_blocks = ((i->i_size - 1) >> 9) + 1; -+ SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk; -+ SQUASHFS_I(i)->u.s1.fragment_size = frag_size; -+ SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->u.s1.block_list_start = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ if (sblk->block_size > 4096) -+ i->i_data.a_ops = &squashfs_aops; -+ else -+ i->i_data.a_ops = &squashfs_aops_4K; -+ -+ TRACE("File inode %x:%x, start_block %llx, " -+ "block_list_start %llx, offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, next_block, -+ next_offset); -+ break; -+ } -+ case SQUASHFS_DIR_TYPE: { -+ struct squashfs_dir_inode_header *inodep = &id.dir; -+ struct squashfs_dir_inode_header *sinodep = &sid.dir; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_DIR_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_size = inodep->file_size; -+ i->i_op = &squashfs_dir_inode_ops; -+ i->i_fop = &squashfs_dir_ops; -+ i->i_mode |= S_IFDIR; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->offset = inodep->offset; -+ SQUASHFS_I(i)->u.s2.directory_index_count = 0; -+ SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode; -+ -+ TRACE("Directory inode %x:%x, start_block %x, offset " -+ "%x\n", SQUASHFS_INODE_BLK(inode), -+ offset, inodep->start_block, -+ inodep->offset); -+ break; -+ } -+ case SQUASHFS_LDIR_TYPE: { -+ struct squashfs_ldir_inode_header *inodep = &id.ldir; -+ struct squashfs_ldir_inode_header *sinodep = &sid.ldir; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_LDIR_INODE_HEADER(inodep, -+ sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_size = inodep->file_size; -+ i->i_op = &squashfs_dir_inode_ops; -+ i->i_fop = &squashfs_dir_ops; -+ i->i_mode |= S_IFDIR; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->offset = inodep->offset; -+ SQUASHFS_I(i)->u.s2.directory_index_start = next_block; -+ SQUASHFS_I(i)->u.s2.directory_index_offset = -+ next_offset; -+ SQUASHFS_I(i)->u.s2.directory_index_count = -+ inodep->i_count; -+ SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode; -+ -+ TRACE("Long directory inode %x:%x, start_block %x, " -+ "offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, inodep->offset); -+ break; -+ } -+ case SQUASHFS_SYMLINK_TYPE: { -+ struct squashfs_symlink_inode_header *inodep = -+ &id.symlink; -+ struct squashfs_symlink_inode_header *sinodep = -+ &sid.symlink; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_SYMLINK_INODE_HEADER(inodep, -+ sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_size = inodep->symlink_size; -+ i->i_op = &page_symlink_inode_operations; -+ i->i_data.a_ops = &squashfs_symlink_aops; -+ i->i_mode |= S_IFLNK; -+ SQUASHFS_I(i)->start_block = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ -+ TRACE("Symbolic link inode %x:%x, start_block %llx, " -+ "offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ next_block, next_offset); -+ break; -+ } -+ case SQUASHFS_BLKDEV_TYPE: -+ case SQUASHFS_CHRDEV_TYPE: { -+ struct squashfs_dev_inode_header *inodep = &id.dev; -+ struct squashfs_dev_inode_header *sinodep = &sid.dev; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_DEV_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_mode |= (inodeb->inode_type == -+ SQUASHFS_CHRDEV_TYPE) ? S_IFCHR : -+ S_IFBLK; -+ init_special_inode(i, i->i_mode, -+ old_decode_dev(inodep->rdev)); -+ -+ TRACE("Device inode %x:%x, rdev %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->rdev); -+ break; -+ } -+ case SQUASHFS_FIFO_TYPE: -+ case SQUASHFS_SOCKET_TYPE: { -+ struct squashfs_ipc_inode_header *inodep = &id.ipc; -+ struct squashfs_ipc_inode_header *sinodep = &sid.ipc; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_IPC_INODE_HEADER(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_nlink = inodep->nlink; -+ i->i_mode |= (inodeb->inode_type == SQUASHFS_FIFO_TYPE) -+ ? S_IFIFO : S_IFSOCK; -+ init_special_inode(i, i->i_mode, 0); -+ break; -+ } -+ default: -+ ERROR("Unknown inode type %d in squashfs_iget!\n", -+ inodeb->inode_type); -+ goto failed_read1; -+ } -+ -+ return 1; -+ -+failed_read: -+ ERROR("Unable to read inode [%llx:%x]\n", block, offset); -+ -+failed_read1: -+ make_bad_inode(i); -+ return 0; -+} -+ -+ -+static int read_inode_lookup_table(struct super_block *s) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ unsigned int length = SQUASHFS_LOOKUP_BLOCK_BYTES(sblk->inodes); -+ -+ TRACE("In read_inode_lookup_table, length %d\n", length); -+ -+ /* Allocate inode lookup table */ -+ if (!(msblk->inode_lookup_table = kmalloc(length, GFP_KERNEL))) { -+ ERROR("Failed to allocate inode lookup table\n"); -+ return 0; -+ } -+ -+ if (!squashfs_read_data(s, (char *) msblk->inode_lookup_table, -+ sblk->lookup_table_start, length | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, length)) { -+ ERROR("unable to read inode lookup table\n"); -+ return 0; -+ } -+ -+ if (msblk->swap) { -+ int i; -+ long long block; -+ -+ for (i = 0; i < SQUASHFS_LOOKUP_BLOCKS(sblk->inodes); i++) { -+ SQUASHFS_SWAP_LOOKUP_BLOCKS((&block), -+ &msblk->inode_lookup_table[i], 1); -+ msblk->inode_lookup_table[i] = block; -+ } -+ } -+ -+ return 1; -+} -+ -+ -+static int read_fragment_index_table(struct super_block *s) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ unsigned int length = SQUASHFS_FRAGMENT_INDEX_BYTES(sblk->fragments); -+ -+ if(length == 0) -+ return 1; -+ -+ /* Allocate fragment index table */ -+ if (!(msblk->fragment_index = kmalloc(length, GFP_KERNEL))) { -+ ERROR("Failed to allocate fragment index table\n"); -+ return 0; -+ } -+ -+ if (!squashfs_read_data(s, (char *) msblk->fragment_index, -+ sblk->fragment_table_start, length | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, length)) { -+ ERROR("unable to read fragment index table\n"); -+ return 0; -+ } -+ -+ if (msblk->swap) { -+ int i; -+ long long fragment; -+ -+ for (i = 0; i < SQUASHFS_FRAGMENT_INDEXES(sblk->fragments); i++) { -+ SQUASHFS_SWAP_FRAGMENT_INDEXES((&fragment), -+ &msblk->fragment_index[i], 1); -+ msblk->fragment_index[i] = fragment; -+ } -+ } -+ -+ return 1; -+} -+ -+ -+static int supported_squashfs_filesystem(struct squashfs_sb_info *msblk, int silent) -+{ -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ msblk->read_inode = squashfs_read_inode; -+ msblk->read_blocklist = read_blocklist; -+ msblk->read_fragment_index_table = read_fragment_index_table; -+ -+ if (sblk->s_major == 1) { -+ if (!squashfs_1_0_supported(msblk)) { -+ SERROR("Major/Minor mismatch, Squashfs 1.0 filesystems " -+ "are unsupported\n"); -+ SERROR("Please recompile with " -+ "Squashfs 1.0 support enabled\n"); -+ return 0; -+ } -+ } else if (sblk->s_major == 2) { -+ if (!squashfs_2_0_supported(msblk)) { -+ SERROR("Major/Minor mismatch, Squashfs 2.0 filesystems " -+ "are unsupported\n"); -+ SERROR("Please recompile with " -+ "Squashfs 2.0 support enabled\n"); -+ return 0; -+ } -+ } else if(sblk->s_major != SQUASHFS_MAJOR || sblk->s_minor > -+ SQUASHFS_MINOR) { -+ SERROR("Major/Minor mismatch, trying to mount newer %d.%d " -+ "filesystem\n", sblk->s_major, sblk->s_minor); -+ SERROR("Please update your kernel\n"); -+ return 0; -+ } -+ -+ return 1; -+} -+ -+ -+static int squashfs_fill_super(struct super_block *s, void *data, int silent) -+{ -+ struct squashfs_sb_info *msblk; -+ struct squashfs_super_block *sblk; -+ int i; -+ char b[BDEVNAME_SIZE]; -+ struct inode *root; -+ -+ TRACE("Entered squashfs_read_superblock\n"); -+ -+ if (!(s->s_fs_info = kmalloc(sizeof(struct squashfs_sb_info), -+ GFP_KERNEL))) { -+ ERROR("Failed to allocate superblock\n"); -+ goto failure; -+ } -+ memset(s->s_fs_info, 0, sizeof(struct squashfs_sb_info)); -+ msblk = s->s_fs_info; -+ if (!(msblk->stream.workspace = vmalloc(zlib_inflate_workspacesize()))) { -+ ERROR("Failed to allocate zlib workspace\n"); -+ goto failure; -+ } -+ sblk = &msblk->sblk; -+ -+ msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE); -+ msblk->devblksize_log2 = ffz(~msblk->devblksize); -+ -+ mutex_init(&msblk->read_data_mutex); -+ mutex_init(&msblk->read_page_mutex); -+ mutex_init(&msblk->block_cache_mutex); -+ mutex_init(&msblk->fragment_mutex); -+ mutex_init(&msblk->meta_index_mutex); -+ -+ init_waitqueue_head(&msblk->waitq); -+ init_waitqueue_head(&msblk->fragment_wait_queue); -+ -+ sblk->bytes_used = sizeof(struct squashfs_super_block); -+ if (!squashfs_read_data(s, (char *) sblk, SQUASHFS_START, -+ sizeof(struct squashfs_super_block) | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, sizeof(struct squashfs_super_block))) { -+ SERROR("unable to read superblock\n"); -+ goto failed_mount; -+ } -+ -+ /* Check it is a SQUASHFS superblock */ -+ msblk->swap = 0; -+ if ((s->s_magic = sblk->s_magic) != SQUASHFS_MAGIC) { -+ if (sblk->s_magic == SQUASHFS_MAGIC_SWAP) { -+ struct squashfs_super_block ssblk; -+ -+ WARNING("Mounting a different endian SQUASHFS " -+ "filesystem on %s\n", bdevname(s->s_bdev, b)); -+ -+ SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk); -+ memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block)); -+ msblk->swap = 1; -+ } else { -+ SERROR("Can't find a SQUASHFS superblock on %s\n", -+ bdevname(s->s_bdev, b)); -+ goto failed_mount; -+ } -+ } -+ -+ /* Check the MAJOR & MINOR versions */ -+ if(!supported_squashfs_filesystem(msblk, silent)) -+ goto failed_mount; -+ -+ /* Check the filesystem does not extend beyond the end of the -+ block device */ -+ if(sblk->bytes_used < 0 || sblk->bytes_used > i_size_read(s->s_bdev->bd_inode)) -+ goto failed_mount; -+ -+ /* Check the root inode for sanity */ -+ if (SQUASHFS_INODE_OFFSET(sblk->root_inode) > SQUASHFS_METADATA_SIZE) -+ goto failed_mount; -+ -+ TRACE("Found valid superblock on %s\n", bdevname(s->s_bdev, b)); -+ TRACE("Inodes are %scompressed\n", -+ SQUASHFS_UNCOMPRESSED_INODES -+ (sblk->flags) ? "un" : ""); -+ TRACE("Data is %scompressed\n", -+ SQUASHFS_UNCOMPRESSED_DATA(sblk->flags) -+ ? "un" : ""); -+ TRACE("Check data is %s present in the filesystem\n", -+ SQUASHFS_CHECK_DATA(sblk->flags) ? -+ "" : "not"); -+ TRACE("Filesystem size %lld bytes\n", sblk->bytes_used); -+ TRACE("Block size %d\n", sblk->block_size); -+ TRACE("Number of inodes %d\n", sblk->inodes); -+ if (sblk->s_major > 1) -+ TRACE("Number of fragments %d\n", sblk->fragments); -+ TRACE("Number of uids %d\n", sblk->no_uids); -+ TRACE("Number of gids %d\n", sblk->no_guids); -+ TRACE("sblk->inode_table_start %llx\n", sblk->inode_table_start); -+ TRACE("sblk->directory_table_start %llx\n", sblk->directory_table_start); -+ if (sblk->s_major > 1) -+ TRACE("sblk->fragment_table_start %llx\n", -+ sblk->fragment_table_start); -+ TRACE("sblk->uid_start %llx\n", sblk->uid_start); -+ -+ s->s_flags |= MS_RDONLY; -+ s->s_op = &squashfs_super_ops; -+ -+ /* Init inode_table block pointer array */ -+ if (!(msblk->block_cache = kmalloc(sizeof(struct squashfs_cache) * -+ SQUASHFS_CACHED_BLKS, GFP_KERNEL))) { -+ ERROR("Failed to allocate block cache\n"); -+ goto failed_mount; -+ } -+ -+ for (i = 0; i < SQUASHFS_CACHED_BLKS; i++) -+ msblk->block_cache[i].block = SQUASHFS_INVALID_BLK; -+ -+ msblk->next_cache = 0; -+ -+ /* Allocate read_page block */ -+ if (!(msblk->read_page = kmalloc(sblk->block_size, GFP_KERNEL))) { -+ ERROR("Failed to allocate read_page block\n"); -+ goto failed_mount; -+ } -+ -+ /* Allocate uid and gid tables */ -+ if (!(msblk->uid = kmalloc((sblk->no_uids + sblk->no_guids) * -+ sizeof(unsigned int), GFP_KERNEL))) { -+ ERROR("Failed to allocate uid/gid table\n"); -+ goto failed_mount; -+ } -+ msblk->guid = msblk->uid + sblk->no_uids; -+ -+ if (msblk->swap) { -+ unsigned int suid[sblk->no_uids + sblk->no_guids]; -+ -+ if (!squashfs_read_data(s, (char *) &suid, sblk->uid_start, -+ ((sblk->no_uids + sblk->no_guids) * -+ sizeof(unsigned int)) | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) { -+ ERROR("unable to read uid/gid table\n"); -+ goto failed_mount; -+ } -+ -+ SQUASHFS_SWAP_DATA(msblk->uid, suid, (sblk->no_uids + -+ sblk->no_guids), (sizeof(unsigned int) * 8)); -+ } else -+ if (!squashfs_read_data(s, (char *) msblk->uid, sblk->uid_start, -+ ((sblk->no_uids + sblk->no_guids) * -+ sizeof(unsigned int)) | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) { -+ ERROR("unable to read uid/gid table\n"); -+ goto failed_mount; -+ } -+ -+ -+ if (sblk->s_major == 1 && squashfs_1_0_supported(msblk)) -+ goto allocate_root; -+ -+ if (!(msblk->fragment = kmalloc(sizeof(struct squashfs_fragment_cache) * -+ SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL))) { -+ ERROR("Failed to allocate fragment block cache\n"); -+ goto failed_mount; -+ } -+ -+ for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) { -+ msblk->fragment[i].locked = 0; -+ msblk->fragment[i].block = SQUASHFS_INVALID_BLK; -+ msblk->fragment[i].data = NULL; -+ } -+ -+ msblk->next_fragment = 0; -+ -+ /* Allocate and read fragment index table */ -+ if (msblk->read_fragment_index_table(s) == 0) -+ goto failed_mount; -+ -+ if(sblk->s_major < 3 || sblk->lookup_table_start == SQUASHFS_INVALID_BLK) -+ goto allocate_root; -+ -+ /* Allocate and read inode lookup table */ -+ if (read_inode_lookup_table(s) == 0) -+ goto failed_mount; -+ -+ s->s_op = &squashfs_export_super_ops; -+ s->s_export_op = &squashfs_export_ops; -+ -+allocate_root: -+ root = new_inode(s); -+ if ((msblk->read_inode)(root, sblk->root_inode) == 0) -+ goto failed_mount; -+ insert_inode_hash(root); -+ -+ if ((s->s_root = d_alloc_root(root)) == NULL) { -+ ERROR("Root inode create failed\n"); -+ iput(root); -+ goto failed_mount; -+ } -+ -+ TRACE("Leaving squashfs_read_super\n"); -+ return 0; -+ -+failed_mount: -+ kfree(msblk->inode_lookup_table); -+ kfree(msblk->fragment_index); -+ kfree(msblk->fragment); -+ kfree(msblk->uid); -+ kfree(msblk->read_page); -+ kfree(msblk->block_cache); -+ kfree(msblk->fragment_index_2); -+ vfree(msblk->stream.workspace); -+ kfree(s->s_fs_info); -+ s->s_fs_info = NULL; -+ return -EINVAL; -+ -+failure: -+ return -ENOMEM; -+} -+ -+ -+static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf) -+{ -+ struct squashfs_sb_info *msblk = dentry->d_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ TRACE("Entered squashfs_statfs\n"); -+ -+ buf->f_type = SQUASHFS_MAGIC; -+ buf->f_bsize = sblk->block_size; -+ buf->f_blocks = ((sblk->bytes_used - 1) >> sblk->block_log) + 1; -+ buf->f_bfree = buf->f_bavail = 0; -+ buf->f_files = sblk->inodes; -+ buf->f_ffree = 0; -+ buf->f_namelen = SQUASHFS_NAME_LEN; -+ -+ return 0; -+} -+ -+ -+static int squashfs_symlink_readpage(struct file *file, struct page *page) -+{ -+ struct inode *inode = page->mapping->host; -+ int index = page->index << PAGE_CACHE_SHIFT, length, bytes; -+ long long block = SQUASHFS_I(inode)->start_block; -+ int offset = SQUASHFS_I(inode)->offset; -+ void *pageaddr = kmap(page); -+ -+ TRACE("Entered squashfs_symlink_readpage, page index %ld, start block " -+ "%llx, offset %x\n", page->index, -+ SQUASHFS_I(inode)->start_block, -+ SQUASHFS_I(inode)->offset); -+ -+ for (length = 0; length < index; length += bytes) { -+ if (!(bytes = squashfs_get_cached_block(inode->i_sb, NULL, -+ block, offset, PAGE_CACHE_SIZE, &block, -+ &offset))) { -+ ERROR("Unable to read symbolic link [%llx:%x]\n", block, -+ offset); -+ goto skip_read; -+ } -+ } -+ -+ if (length != index) { -+ ERROR("(squashfs_symlink_readpage) length != index\n"); -+ bytes = 0; -+ goto skip_read; -+ } -+ -+ bytes = (i_size_read(inode) - length) > PAGE_CACHE_SIZE ? PAGE_CACHE_SIZE : -+ i_size_read(inode) - length; -+ -+ if (!(bytes = squashfs_get_cached_block(inode->i_sb, pageaddr, block, -+ offset, bytes, &block, &offset))) -+ ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset); -+ -+skip_read: -+ memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes); -+ kunmap(page); -+ flush_dcache_page(page); -+ SetPageUptodate(page); -+ unlock_page(page); -+ -+ return 0; -+} -+ -+ -+struct meta_index *locate_meta_index(struct inode *inode, int index, int offset) -+{ -+ struct meta_index *meta = NULL; -+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -+ int i; -+ -+ mutex_lock(&msblk->meta_index_mutex); -+ -+ TRACE("locate_meta_index: index %d, offset %d\n", index, offset); -+ -+ if(msblk->meta_index == NULL) -+ goto not_allocated; -+ -+ for (i = 0; i < SQUASHFS_META_NUMBER; i ++) -+ if (msblk->meta_index[i].inode_number == inode->i_ino && -+ msblk->meta_index[i].offset >= offset && -+ msblk->meta_index[i].offset <= index && -+ msblk->meta_index[i].locked == 0) { -+ TRACE("locate_meta_index: entry %d, offset %d\n", i, -+ msblk->meta_index[i].offset); -+ meta = &msblk->meta_index[i]; -+ offset = meta->offset; -+ } -+ -+ if (meta) -+ meta->locked = 1; -+ -+not_allocated: -+ mutex_unlock(&msblk->meta_index_mutex); -+ -+ return meta; -+} -+ -+ -+struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip) -+{ -+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -+ struct meta_index *meta = NULL; -+ int i; -+ -+ mutex_lock(&msblk->meta_index_mutex); -+ -+ TRACE("empty_meta_index: offset %d, skip %d\n", offset, skip); -+ -+ if(msblk->meta_index == NULL) { -+ if (!(msblk->meta_index = kmalloc(sizeof(struct meta_index) * -+ SQUASHFS_META_NUMBER, GFP_KERNEL))) { -+ ERROR("Failed to allocate meta_index\n"); -+ goto failed; -+ } -+ for(i = 0; i < SQUASHFS_META_NUMBER; i++) { -+ msblk->meta_index[i].inode_number = 0; -+ msblk->meta_index[i].locked = 0; -+ } -+ msblk->next_meta_index = 0; -+ } -+ -+ for(i = SQUASHFS_META_NUMBER; i && -+ msblk->meta_index[msblk->next_meta_index].locked; i --) -+ msblk->next_meta_index = (msblk->next_meta_index + 1) % -+ SQUASHFS_META_NUMBER; -+ -+ if(i == 0) { -+ TRACE("empty_meta_index: failed!\n"); -+ goto failed; -+ } -+ -+ TRACE("empty_meta_index: returned meta entry %d, %p\n", -+ msblk->next_meta_index, -+ &msblk->meta_index[msblk->next_meta_index]); -+ -+ meta = &msblk->meta_index[msblk->next_meta_index]; -+ msblk->next_meta_index = (msblk->next_meta_index + 1) % -+ SQUASHFS_META_NUMBER; -+ -+ meta->inode_number = inode->i_ino; -+ meta->offset = offset; -+ meta->skip = skip; -+ meta->entries = 0; -+ meta->locked = 1; -+ -+failed: -+ mutex_unlock(&msblk->meta_index_mutex); -+ return meta; -+} -+ -+ -+void release_meta_index(struct inode *inode, struct meta_index *meta) -+{ -+ meta->locked = 0; -+ smp_mb(); -+} -+ -+ -+static int read_block_index(struct super_block *s, int blocks, char *block_list, -+ long long *start_block, int *offset) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ unsigned int *block_listp; -+ int block = 0; -+ -+ if (msblk->swap) { -+ char sblock_list[blocks << 2]; -+ -+ if (!squashfs_get_cached_block(s, sblock_list, *start_block, -+ *offset, blocks << 2, start_block, offset)) { -+ ERROR("Unable to read block list [%llx:%x]\n", -+ *start_block, *offset); -+ goto failure; -+ } -+ SQUASHFS_SWAP_INTS(((unsigned int *)block_list), -+ ((unsigned int *)sblock_list), blocks); -+ } else -+ if (!squashfs_get_cached_block(s, block_list, *start_block, -+ *offset, blocks << 2, start_block, offset)) { -+ ERROR("Unable to read block list [%llx:%x]\n", -+ *start_block, *offset); -+ goto failure; -+ } -+ -+ for (block_listp = (unsigned int *) block_list; blocks; -+ block_listp++, blocks --) -+ block += SQUASHFS_COMPRESSED_SIZE_BLOCK(*block_listp); -+ -+ return block; -+ -+failure: -+ return -1; -+} -+ -+ -+#define SIZE 256 -+ -+static inline int calculate_skip(int blocks) { -+ int skip = (blocks - 1) / ((SQUASHFS_SLOTS * SQUASHFS_META_ENTRIES + 1) * SQUASHFS_META_INDEXES); -+ return skip >= 7 ? 7 : skip + 1; -+} -+ -+ -+static int get_meta_index(struct inode *inode, int index, -+ long long *index_block, int *index_offset, -+ long long *data_block, char *block_list) -+{ -+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int skip = calculate_skip(i_size_read(inode) >> sblk->block_log); -+ int offset = 0; -+ struct meta_index *meta; -+ struct meta_entry *meta_entry; -+ long long cur_index_block = SQUASHFS_I(inode)->u.s1.block_list_start; -+ int cur_offset = SQUASHFS_I(inode)->offset; -+ long long cur_data_block = SQUASHFS_I(inode)->start_block; -+ int i; -+ -+ index /= SQUASHFS_META_INDEXES * skip; -+ -+ while ( offset < index ) { -+ meta = locate_meta_index(inode, index, offset + 1); -+ -+ if (meta == NULL) { -+ if ((meta = empty_meta_index(inode, offset + 1, -+ skip)) == NULL) -+ goto all_done; -+ } else { -+ if(meta->entries == 0) -+ goto failed; -+ offset = index < meta->offset + meta->entries ? index : -+ meta->offset + meta->entries - 1; -+ meta_entry = &meta->meta_entry[offset - meta->offset]; -+ cur_index_block = meta_entry->index_block + sblk->inode_table_start; -+ cur_offset = meta_entry->offset; -+ cur_data_block = meta_entry->data_block; -+ TRACE("get_meta_index: offset %d, meta->offset %d, " -+ "meta->entries %d\n", offset, meta->offset, -+ meta->entries); -+ TRACE("get_meta_index: index_block 0x%llx, offset 0x%x" -+ " data_block 0x%llx\n", cur_index_block, -+ cur_offset, cur_data_block); -+ } -+ -+ for (i = meta->offset + meta->entries; i <= index && -+ i < meta->offset + SQUASHFS_META_ENTRIES; i++) { -+ int blocks = skip * SQUASHFS_META_INDEXES; -+ -+ while (blocks) { -+ int block = blocks > (SIZE >> 2) ? (SIZE >> 2) : -+ blocks; -+ int res = read_block_index(inode->i_sb, block, -+ block_list, &cur_index_block, -+ &cur_offset); -+ -+ if (res == -1) -+ goto failed; -+ -+ cur_data_block += res; -+ blocks -= block; -+ } -+ -+ meta_entry = &meta->meta_entry[i - meta->offset]; -+ meta_entry->index_block = cur_index_block - sblk->inode_table_start; -+ meta_entry->offset = cur_offset; -+ meta_entry->data_block = cur_data_block; -+ meta->entries ++; -+ offset ++; -+ } -+ -+ TRACE("get_meta_index: meta->offset %d, meta->entries %d\n", -+ meta->offset, meta->entries); -+ -+ release_meta_index(inode, meta); -+ } -+ -+all_done: -+ *index_block = cur_index_block; -+ *index_offset = cur_offset; -+ *data_block = cur_data_block; -+ -+ return offset * SQUASHFS_META_INDEXES * skip; -+ -+failed: -+ release_meta_index(inode, meta); -+ return -1; -+} -+ -+ -+static long long read_blocklist(struct inode *inode, int index, -+ int readahead_blks, char *block_list, -+ unsigned short **block_p, unsigned int *bsize) -+{ -+ long long block_ptr; -+ int offset; -+ long long block; -+ int res = get_meta_index(inode, index, &block_ptr, &offset, &block, -+ block_list); -+ -+ TRACE("read_blocklist: res %d, index %d, block_ptr 0x%llx, offset" -+ " 0x%x, block 0x%llx\n", res, index, block_ptr, offset, -+ block); -+ -+ if(res == -1) -+ goto failure; -+ -+ index -= res; -+ -+ while ( index ) { -+ int blocks = index > (SIZE >> 2) ? (SIZE >> 2) : index; -+ int res = read_block_index(inode->i_sb, blocks, block_list, -+ &block_ptr, &offset); -+ if (res == -1) -+ goto failure; -+ block += res; -+ index -= blocks; -+ } -+ -+ if (read_block_index(inode->i_sb, 1, block_list, -+ &block_ptr, &offset) == -1) -+ goto failure; -+ *bsize = *((unsigned int *) block_list); -+ -+ return block; -+ -+failure: -+ return 0; -+} -+ -+ -+static int squashfs_readpage(struct file *file, struct page *page) -+{ -+ struct inode *inode = page->mapping->host; -+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ unsigned char *block_list; -+ long long block; -+ unsigned int bsize, i = 0, bytes = 0, byte_offset = 0; -+ int index = page->index >> (sblk->block_log - PAGE_CACHE_SHIFT); -+ void *pageaddr; -+ struct squashfs_fragment_cache *fragment = NULL; -+ char *data_ptr = msblk->read_page; -+ -+ int mask = (1 << (sblk->block_log - PAGE_CACHE_SHIFT)) - 1; -+ int start_index = page->index & ~mask; -+ int end_index = start_index | mask; -+ -+ TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n", -+ page->index, -+ SQUASHFS_I(inode)->start_block); -+ -+ if (!(block_list = kmalloc(SIZE, GFP_KERNEL))) { -+ ERROR("Failed to allocate block_list\n"); -+ goto skip_read; -+ } -+ -+ if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> -+ PAGE_CACHE_SHIFT)) -+ goto skip_read; -+ -+ if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK -+ || index < (i_size_read(inode) >> -+ sblk->block_log)) { -+ if ((block = (msblk->read_blocklist)(inode, index, 1, -+ block_list, NULL, &bsize)) == 0) -+ goto skip_read; -+ -+ mutex_lock(&msblk->read_page_mutex); -+ -+ if (!(bytes = squashfs_read_data(inode->i_sb, msblk->read_page, -+ block, bsize, NULL, sblk->block_size))) { -+ ERROR("Unable to read page, block %llx, size %x\n", block, -+ bsize); -+ mutex_unlock(&msblk->read_page_mutex); -+ goto skip_read; -+ } -+ } else { -+ if ((fragment = get_cached_fragment(inode->i_sb, -+ SQUASHFS_I(inode)-> -+ u.s1.fragment_start_block, -+ SQUASHFS_I(inode)->u.s1.fragment_size)) -+ == NULL) { -+ ERROR("Unable to read page, block %llx, size %x\n", -+ SQUASHFS_I(inode)-> -+ u.s1.fragment_start_block, -+ (int) SQUASHFS_I(inode)-> -+ u.s1.fragment_size); -+ goto skip_read; -+ } -+ bytes = SQUASHFS_I(inode)->u.s1.fragment_offset + -+ (i_size_read(inode) & (sblk->block_size -+ - 1)); -+ byte_offset = SQUASHFS_I(inode)->u.s1.fragment_offset; -+ data_ptr = fragment->data; -+ } -+ -+ for (i = start_index; i <= end_index && byte_offset < bytes; -+ i++, byte_offset += PAGE_CACHE_SIZE) { -+ struct page *push_page; -+ int avail = (bytes - byte_offset) > PAGE_CACHE_SIZE ? -+ PAGE_CACHE_SIZE : bytes - byte_offset; -+ -+ TRACE("bytes %d, i %d, byte_offset %d, available_bytes %d\n", -+ bytes, i, byte_offset, avail); -+ -+ push_page = (i == page->index) ? page : -+ grab_cache_page_nowait(page->mapping, i); -+ -+ if (!push_page) -+ continue; -+ -+ if (PageUptodate(push_page)) -+ goto skip_page; -+ -+ pageaddr = kmap_atomic(push_page, KM_USER0); -+ memcpy(pageaddr, data_ptr + byte_offset, avail); -+ memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail); -+ kunmap_atomic(pageaddr, KM_USER0); -+ flush_dcache_page(push_page); -+ SetPageUptodate(push_page); -+skip_page: -+ unlock_page(push_page); -+ if(i != page->index) -+ page_cache_release(push_page); -+ } -+ -+ if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK -+ || index < (i_size_read(inode) >> -+ sblk->block_log)) -+ mutex_unlock(&msblk->read_page_mutex); -+ else -+ release_cached_fragment(msblk, fragment); -+ -+ kfree(block_list); -+ return 0; -+ -+skip_read: -+ pageaddr = kmap_atomic(page, KM_USER0); -+ memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes); -+ kunmap_atomic(pageaddr, KM_USER0); -+ flush_dcache_page(page); -+ SetPageUptodate(page); -+ unlock_page(page); -+ -+ kfree(block_list); -+ return 0; -+} -+ -+ -+static int squashfs_readpage4K(struct file *file, struct page *page) -+{ -+ struct inode *inode = page->mapping->host; -+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ unsigned char *block_list; -+ long long block; -+ unsigned int bsize, bytes = 0; -+ void *pageaddr; -+ -+ TRACE("Entered squashfs_readpage4K, page index %lx, start block %llx\n", -+ page->index, -+ SQUASHFS_I(inode)->start_block); -+ -+ if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> -+ PAGE_CACHE_SHIFT)) { -+ block_list = NULL; -+ goto skip_read; -+ } -+ -+ if (!(block_list = kmalloc(SIZE, GFP_KERNEL))) { -+ ERROR("Failed to allocate block_list\n"); -+ goto skip_read; -+ } -+ -+ if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK -+ || page->index < (i_size_read(inode) >> -+ sblk->block_log)) { -+ block = (msblk->read_blocklist)(inode, page->index, 1, -+ block_list, NULL, &bsize); -+ if(block == 0) -+ goto skip_read; -+ -+ mutex_lock(&msblk->read_page_mutex); -+ bytes = squashfs_read_data(inode->i_sb, msblk->read_page, block, -+ bsize, NULL, sblk->block_size); -+ if (bytes) { -+ pageaddr = kmap_atomic(page, KM_USER0); -+ memcpy(pageaddr, msblk->read_page, bytes); -+ kunmap_atomic(pageaddr, KM_USER0); -+ } else -+ ERROR("Unable to read page, block %llx, size %x\n", -+ block, bsize); -+ mutex_unlock(&msblk->read_page_mutex); -+ } else { -+ struct squashfs_fragment_cache *fragment = -+ get_cached_fragment(inode->i_sb, -+ SQUASHFS_I(inode)-> -+ u.s1.fragment_start_block, -+ SQUASHFS_I(inode)-> u.s1.fragment_size); -+ if (fragment) { -+ bytes = i_size_read(inode) & (sblk->block_size - 1); -+ pageaddr = kmap_atomic(page, KM_USER0); -+ memcpy(pageaddr, fragment->data + SQUASHFS_I(inode)-> -+ u.s1.fragment_offset, bytes); -+ kunmap_atomic(pageaddr, KM_USER0); -+ release_cached_fragment(msblk, fragment); -+ } else -+ ERROR("Unable to read page, block %llx, size %x\n", -+ SQUASHFS_I(inode)-> -+ u.s1.fragment_start_block, (int) -+ SQUASHFS_I(inode)-> u.s1.fragment_size); -+ } -+ -+skip_read: -+ pageaddr = kmap_atomic(page, KM_USER0); -+ memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes); -+ kunmap_atomic(pageaddr, KM_USER0); -+ flush_dcache_page(page); -+ SetPageUptodate(page); -+ unlock_page(page); -+ -+ kfree(block_list); -+ return 0; -+} -+ -+ -+static int get_dir_index_using_offset(struct super_block *s, long long -+ *next_block, unsigned int *next_offset, -+ long long index_start, -+ unsigned int index_offset, int i_count, -+ long long f_pos) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int i, length = 0; -+ struct squashfs_dir_index index; -+ -+ TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n", -+ i_count, (unsigned int) f_pos); -+ -+ f_pos =- 3; -+ if (f_pos == 0) -+ goto finish; -+ -+ for (i = 0; i < i_count; i++) { -+ if (msblk->swap) { -+ struct squashfs_dir_index sindex; -+ squashfs_get_cached_block(s, (char *) &sindex, -+ index_start, index_offset, -+ sizeof(sindex), &index_start, -+ &index_offset); -+ SQUASHFS_SWAP_DIR_INDEX(&index, &sindex); -+ } else -+ squashfs_get_cached_block(s, (char *) &index, -+ index_start, index_offset, -+ sizeof(index), &index_start, -+ &index_offset); -+ -+ if (index.index > f_pos) -+ break; -+ -+ squashfs_get_cached_block(s, NULL, index_start, index_offset, -+ index.size + 1, &index_start, -+ &index_offset); -+ -+ length = index.index; -+ *next_block = index.start_block + sblk->directory_table_start; -+ } -+ -+ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; -+ -+finish: -+ return length + 3; -+} -+ -+ -+static int get_dir_index_using_name(struct super_block *s, long long -+ *next_block, unsigned int *next_offset, -+ long long index_start, -+ unsigned int index_offset, int i_count, -+ const char *name, int size) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int i, length = 0; -+ struct squashfs_dir_index *index; -+ char *str; -+ -+ TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count); -+ -+ if (!(str = kmalloc(sizeof(struct squashfs_dir_index) + -+ (SQUASHFS_NAME_LEN + 1) * 2, GFP_KERNEL))) { -+ ERROR("Failed to allocate squashfs_dir_index\n"); -+ goto failure; -+ } -+ -+ index = (struct squashfs_dir_index *) (str + SQUASHFS_NAME_LEN + 1); -+ strncpy(str, name, size); -+ str[size] = '\0'; -+ -+ for (i = 0; i < i_count; i++) { -+ if (msblk->swap) { -+ struct squashfs_dir_index sindex; -+ squashfs_get_cached_block(s, (char *) &sindex, -+ index_start, index_offset, -+ sizeof(sindex), &index_start, -+ &index_offset); -+ SQUASHFS_SWAP_DIR_INDEX(index, &sindex); -+ } else -+ squashfs_get_cached_block(s, (char *) index, -+ index_start, index_offset, -+ sizeof(struct squashfs_dir_index), -+ &index_start, &index_offset); -+ -+ squashfs_get_cached_block(s, index->name, index_start, -+ index_offset, index->size + 1, -+ &index_start, &index_offset); -+ -+ index->name[index->size + 1] = '\0'; -+ -+ if (strcmp(index->name, str) > 0) -+ break; -+ -+ length = index->index; -+ *next_block = index->start_block + sblk->directory_table_start; -+ } -+ -+ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; -+ kfree(str); -+failure: -+ return length + 3; -+} -+ -+ -+static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir) -+{ -+ struct inode *i = file->f_dentry->d_inode; -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long next_block = SQUASHFS_I(i)->start_block + -+ sblk->directory_table_start; -+ int next_offset = SQUASHFS_I(i)->offset, length = 0, -+ dir_count; -+ struct squashfs_dir_header dirh; -+ struct squashfs_dir_entry *dire; -+ -+ TRACE("Entered squashfs_readdir [%llx:%x]\n", next_block, next_offset); -+ -+ if (!(dire = kmalloc(sizeof(struct squashfs_dir_entry) + -+ SQUASHFS_NAME_LEN + 1, GFP_KERNEL))) { -+ ERROR("Failed to allocate squashfs_dir_entry\n"); -+ goto finish; -+ } -+ -+ while(file->f_pos < 3) { -+ char *name; -+ int size, i_ino; -+ -+ if(file->f_pos == 0) { -+ name = "."; -+ size = 1; -+ i_ino = i->i_ino; -+ } else { -+ name = ".."; -+ size = 2; -+ i_ino = SQUASHFS_I(i)->u.s2.parent_inode; -+ } -+ TRACE("Calling filldir(%x, %s, %d, %d, %d, %d)\n", -+ (unsigned int) dirent, name, size, (int) -+ file->f_pos, i_ino, -+ squashfs_filetype_table[1]); -+ -+ if (filldir(dirent, name, size, -+ file->f_pos, i_ino, -+ squashfs_filetype_table[1]) < 0) { -+ TRACE("Filldir returned less than 0\n"); -+ goto finish; -+ } -+ file->f_pos += size; -+ } -+ -+ length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_start, -+ SQUASHFS_I(i)->u.s2.directory_index_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_count, -+ file->f_pos); -+ -+ while (length < i_size_read(i)) { -+ /* read directory header */ -+ if (msblk->swap) { -+ struct squashfs_dir_header sdirh; -+ -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, -+ next_block, next_offset, sizeof(sdirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdirh); -+ SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh, -+ next_block, next_offset, sizeof(dirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(dirh); -+ } -+ -+ dir_count = dirh.count + 1; -+ while (dir_count--) { -+ if (msblk->swap) { -+ struct squashfs_dir_entry sdire; -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ &sdire, next_block, next_offset, -+ sizeof(sdire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdire); -+ SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ dire, next_block, next_offset, -+ sizeof(*dire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(*dire); -+ } -+ -+ if (!squashfs_get_cached_block(i->i_sb, dire->name, -+ next_block, next_offset, -+ dire->size + 1, &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += dire->size + 1; -+ -+ if (file->f_pos >= length) -+ continue; -+ -+ dire->name[dire->size + 1] = '\0'; -+ -+ TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d, %d)\n", -+ (unsigned int) dirent, dire->name, -+ dire->size + 1, (int) file->f_pos, -+ dirh.start_block, dire->offset, -+ dirh.inode_number + dire->inode_number, -+ squashfs_filetype_table[dire->type]); -+ -+ if (filldir(dirent, dire->name, dire->size + 1, -+ file->f_pos, -+ dirh.inode_number + dire->inode_number, -+ squashfs_filetype_table[dire->type]) -+ < 0) { -+ TRACE("Filldir returned less than 0\n"); -+ goto finish; -+ } -+ file->f_pos = length; -+ } -+ } -+ -+finish: -+ kfree(dire); -+ return 0; -+ -+failed_read: -+ ERROR("Unable to read directory block [%llx:%x]\n", next_block, -+ next_offset); -+ kfree(dire); -+ return 0; -+} -+ -+ -+static struct dentry *squashfs_lookup(struct inode *i, struct dentry *dentry, -+ struct nameidata *nd) -+{ -+ const unsigned char *name = dentry->d_name.name; -+ int len = dentry->d_name.len; -+ struct inode *inode = NULL; -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long next_block = SQUASHFS_I(i)->start_block + -+ sblk->directory_table_start; -+ int next_offset = SQUASHFS_I(i)->offset, length = 0, -+ dir_count; -+ struct squashfs_dir_header dirh; -+ struct squashfs_dir_entry *dire; -+ -+ TRACE("Entered squashfs_lookup [%llx:%x]\n", next_block, next_offset); -+ -+ if (!(dire = kmalloc(sizeof(struct squashfs_dir_entry) + -+ SQUASHFS_NAME_LEN + 1, GFP_KERNEL))) { -+ ERROR("Failed to allocate squashfs_dir_entry\n"); -+ goto exit_lookup; -+ } -+ -+ if (len > SQUASHFS_NAME_LEN) -+ goto exit_lookup; -+ -+ length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_start, -+ SQUASHFS_I(i)->u.s2.directory_index_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_count, name, -+ len); -+ -+ while (length < i_size_read(i)) { -+ /* read directory header */ -+ if (msblk->swap) { -+ struct squashfs_dir_header sdirh; -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, -+ next_block, next_offset, sizeof(sdirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdirh); -+ SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh, -+ next_block, next_offset, sizeof(dirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(dirh); -+ } -+ -+ dir_count = dirh.count + 1; -+ while (dir_count--) { -+ if (msblk->swap) { -+ struct squashfs_dir_entry sdire; -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ &sdire, next_block,next_offset, -+ sizeof(sdire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdire); -+ SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ dire, next_block,next_offset, -+ sizeof(*dire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(*dire); -+ } -+ -+ if (!squashfs_get_cached_block(i->i_sb, dire->name, -+ next_block, next_offset, dire->size + 1, -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += dire->size + 1; -+ -+ if (name[0] < dire->name[0]) -+ goto exit_lookup; -+ -+ if ((len == dire->size + 1) && !strncmp(name, dire->name, len)) { -+ squashfs_inode_t ino = SQUASHFS_MKINODE(dirh.start_block, -+ dire->offset); -+ -+ TRACE("calling squashfs_iget for directory " -+ "entry %s, inode %x:%x, %d\n", name, -+ dirh.start_block, dire->offset, -+ dirh.inode_number + dire->inode_number); -+ -+ inode = squashfs_iget(i->i_sb, ino, dirh.inode_number + dire->inode_number); -+ -+ goto exit_lookup; -+ } -+ } -+ } -+ -+exit_lookup: -+ kfree(dire); -+ if (inode) -+ return d_splice_alias(inode, dentry); -+ d_add(dentry, inode); -+ return ERR_PTR(0); -+ -+failed_read: -+ ERROR("Unable to read directory block [%llx:%x]\n", next_block, -+ next_offset); -+ goto exit_lookup; -+} -+ -+ -+static int squashfs_remount(struct super_block *s, int *flags, char *data) -+{ -+ *flags |= MS_RDONLY; -+ return 0; -+} -+ -+ -+static void squashfs_put_super(struct super_block *s) -+{ -+ int i; -+ -+ if (s->s_fs_info) { -+ struct squashfs_sb_info *sbi = s->s_fs_info; -+ if (sbi->block_cache) -+ for (i = 0; i < SQUASHFS_CACHED_BLKS; i++) -+ if (sbi->block_cache[i].block != -+ SQUASHFS_INVALID_BLK) -+ kfree(sbi->block_cache[i].data); -+ if (sbi->fragment) -+ for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) -+ SQUASHFS_FREE(sbi->fragment[i].data); -+ kfree(sbi->fragment); -+ kfree(sbi->block_cache); -+ kfree(sbi->read_page); -+ kfree(sbi->uid); -+ kfree(sbi->fragment_index); -+ kfree(sbi->fragment_index_2); -+ kfree(sbi->meta_index); -+ vfree(sbi->stream.workspace); -+ kfree(s->s_fs_info); -+ s->s_fs_info = NULL; -+ } -+} -+ -+ -+static int squashfs_get_sb(struct file_system_type *fs_type, int flags, -+ const char *dev_name, void *data, -+ struct vfsmount *mnt) -+{ -+ return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super, -+ mnt); -+} -+ -+ -+static int __init init_squashfs_fs(void) -+{ -+ int err = init_inodecache(); -+ if (err) -+ goto out; -+ -+ printk(KERN_INFO "squashfs: version 3.2-r2 (2007/01/15) " -+ "Phillip Lougher\n"); -+ -+ if ((err = register_filesystem(&squashfs_fs_type))) -+ destroy_inodecache(); -+ -+out: -+ return err; -+} -+ -+ -+static void __exit exit_squashfs_fs(void) -+{ -+ unregister_filesystem(&squashfs_fs_type); -+ destroy_inodecache(); -+} -+ -+ -+static struct kmem_cache * squashfs_inode_cachep; -+ -+ -+static struct inode *squashfs_alloc_inode(struct super_block *sb) -+{ -+ struct squashfs_inode_info *ei; -+ ei = kmem_cache_alloc(squashfs_inode_cachep, GFP_KERNEL); -+ if (!ei) -+ return NULL; -+ return &ei->vfs_inode; -+} -+ -+ -+static void squashfs_destroy_inode(struct inode *inode) -+{ -+ kmem_cache_free(squashfs_inode_cachep, SQUASHFS_I(inode)); -+} -+ -+ -+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags) -+{ -+ struct squashfs_inode_info *ei = foo; -+ -+ if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == -+ SLAB_CTOR_CONSTRUCTOR) -+ inode_init_once(&ei->vfs_inode); -+} -+ -+ -+static int __init init_inodecache(void) -+{ -+ squashfs_inode_cachep = kmem_cache_create("squashfs_inode_cache", -+ sizeof(struct squashfs_inode_info), -+ 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT, -+ init_once, NULL); -+ if (squashfs_inode_cachep == NULL) -+ return -ENOMEM; -+ return 0; -+} -+ -+ -+static void destroy_inodecache(void) -+{ -+ kmem_cache_destroy(squashfs_inode_cachep); -+} -+ -+ -+module_init(init_squashfs_fs); -+module_exit(exit_squashfs_fs); -+MODULE_DESCRIPTION("squashfs 3.2-r2, a compressed read-only filesystem"); -+MODULE_AUTHOR("Phillip Lougher "); -+MODULE_LICENSE("GPL"); -diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/Makefile linux-2.6.20-squashfs3.2-r2/fs/squashfs/Makefile ---- linux-2.6.20/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/Makefile 2007-01-12 00:06:09.000000000 +0000 -@@ -0,0 +1,7 @@ -+# -+# Makefile for the linux squashfs routines. -+# -+ -+obj-$(CONFIG_SQUASHFS) += squashfs.o -+squashfs-y += inode.o -+squashfs-y += squashfs2_0.o -diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/squashfs2_0.c linux-2.6.20-squashfs3.2-r2/fs/squashfs/squashfs2_0.c ---- linux-2.6.20/fs/squashfs/squashfs2_0.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/squashfs2_0.c 2007-01-12 02:27:20.000000000 +0000 -@@ -0,0 +1,742 @@ -+/* -+ * Squashfs - a compressed read only filesystem for Linux -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs2_0.c -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "squashfs.h" -+static int squashfs_readdir_2(struct file *file, void *dirent, filldir_t filldir); -+static struct dentry *squashfs_lookup_2(struct inode *, struct dentry *, -+ struct nameidata *); -+ -+static struct file_operations squashfs_dir_ops_2 = { -+ .read = generic_read_dir, -+ .readdir = squashfs_readdir_2 -+}; -+ -+static struct inode_operations squashfs_dir_inode_ops_2 = { -+ .lookup = squashfs_lookup_2 -+}; -+ -+static unsigned char squashfs_filetype_table[] = { -+ DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK -+}; -+ -+static int read_fragment_index_table_2(struct super_block *s) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ if (!(msblk->fragment_index_2 = kmalloc(SQUASHFS_FRAGMENT_INDEX_BYTES_2 -+ (sblk->fragments), GFP_KERNEL))) { -+ ERROR("Failed to allocate uid/gid table\n"); -+ return 0; -+ } -+ -+ if (SQUASHFS_FRAGMENT_INDEX_BYTES_2(sblk->fragments) && -+ !squashfs_read_data(s, (char *) -+ msblk->fragment_index_2, -+ sblk->fragment_table_start, -+ SQUASHFS_FRAGMENT_INDEX_BYTES_2 -+ (sblk->fragments) | -+ SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, SQUASHFS_FRAGMENT_INDEX_BYTES_2(sblk->fragments))) { -+ ERROR("unable to read fragment index table\n"); -+ return 0; -+ } -+ -+ if (msblk->swap) { -+ int i; -+ unsigned int fragment; -+ -+ for (i = 0; i < SQUASHFS_FRAGMENT_INDEXES_2(sblk->fragments); -+ i++) { -+ SQUASHFS_SWAP_FRAGMENT_INDEXES_2((&fragment), -+ &msblk->fragment_index_2[i], 1); -+ msblk->fragment_index_2[i] = fragment; -+ } -+ } -+ -+ return 1; -+} -+ -+ -+static int get_fragment_location_2(struct super_block *s, unsigned int fragment, -+ long long *fragment_start_block, -+ unsigned int *fragment_size) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ long long start_block = -+ msblk->fragment_index_2[SQUASHFS_FRAGMENT_INDEX_2(fragment)]; -+ int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET_2(fragment); -+ struct squashfs_fragment_entry_2 fragment_entry; -+ -+ if (msblk->swap) { -+ struct squashfs_fragment_entry_2 sfragment_entry; -+ -+ if (!squashfs_get_cached_block(s, (char *) &sfragment_entry, -+ start_block, offset, -+ sizeof(sfragment_entry), &start_block, -+ &offset)) -+ goto out; -+ SQUASHFS_SWAP_FRAGMENT_ENTRY_2(&fragment_entry, &sfragment_entry); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) &fragment_entry, -+ start_block, offset, -+ sizeof(fragment_entry), &start_block, -+ &offset)) -+ goto out; -+ -+ *fragment_start_block = fragment_entry.start_block; -+ *fragment_size = fragment_entry.size; -+ -+ return 1; -+ -+out: -+ return 0; -+} -+ -+ -+static void squashfs_new_inode(struct squashfs_sb_info *msblk, struct inode *i, -+ struct squashfs_base_inode_header_2 *inodeb, unsigned int ino) -+{ -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ i->i_ino = ino; -+ i->i_mtime.tv_sec = sblk->mkfs_time; -+ i->i_atime.tv_sec = sblk->mkfs_time; -+ i->i_ctime.tv_sec = sblk->mkfs_time; -+ i->i_uid = msblk->uid[inodeb->uid]; -+ i->i_mode = inodeb->mode; -+ i->i_nlink = 1; -+ i->i_size = 0; -+ if (inodeb->guid == SQUASHFS_GUIDS) -+ i->i_gid = i->i_uid; -+ else -+ i->i_gid = msblk->guid[inodeb->guid]; -+} -+ -+ -+static int squashfs_read_inode_2(struct inode *i, squashfs_inode_t inode) -+{ -+ struct super_block *s = i->i_sb; -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ unsigned int block = SQUASHFS_INODE_BLK(inode) + -+ sblk->inode_table_start; -+ unsigned int offset = SQUASHFS_INODE_OFFSET(inode); -+ unsigned int ino = i->i_ino; -+ long long next_block; -+ unsigned int next_offset; -+ union squashfs_inode_header_2 id, sid; -+ struct squashfs_base_inode_header_2 *inodeb = &id.base, -+ *sinodeb = &sid.base; -+ -+ TRACE("Entered squashfs_iget\n"); -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) sinodeb, block, -+ offset, sizeof(*sinodeb), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_BASE_INODE_HEADER_2(inodeb, sinodeb, -+ sizeof(*sinodeb)); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) inodeb, block, -+ offset, sizeof(*inodeb), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ squashfs_new_inode(msblk, i, inodeb, ino); -+ -+ switch(inodeb->inode_type) { -+ case SQUASHFS_FILE_TYPE: { -+ struct squashfs_reg_inode_header_2 *inodep = &id.reg; -+ struct squashfs_reg_inode_header_2 *sinodep = &sid.reg; -+ long long frag_blk; -+ unsigned int frag_size = 0; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_REG_INODE_HEADER_2(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ frag_blk = SQUASHFS_INVALID_BLK; -+ if (inodep->fragment != SQUASHFS_INVALID_FRAG && -+ !get_fragment_location_2(s, -+ inodep->fragment, &frag_blk, &frag_size)) -+ goto failed_read; -+ -+ i->i_size = inodep->file_size; -+ i->i_fop = &generic_ro_fops; -+ i->i_mode |= S_IFREG; -+ i->i_mtime.tv_sec = inodep->mtime; -+ i->i_atime.tv_sec = inodep->mtime; -+ i->i_ctime.tv_sec = inodep->mtime; -+ i->i_blocks = ((i->i_size - 1) >> 9) + 1; -+ SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk; -+ SQUASHFS_I(i)->u.s1.fragment_size = frag_size; -+ SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->u.s1.block_list_start = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ if (sblk->block_size > 4096) -+ i->i_data.a_ops = &squashfs_aops; -+ else -+ i->i_data.a_ops = &squashfs_aops_4K; -+ -+ TRACE("File inode %x:%x, start_block %x, " -+ "block_list_start %llx, offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, next_block, -+ next_offset); -+ break; -+ } -+ case SQUASHFS_DIR_TYPE: { -+ struct squashfs_dir_inode_header_2 *inodep = &id.dir; -+ struct squashfs_dir_inode_header_2 *sinodep = &sid.dir; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_DIR_INODE_HEADER_2(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_size = inodep->file_size; -+ i->i_op = &squashfs_dir_inode_ops_2; -+ i->i_fop = &squashfs_dir_ops_2; -+ i->i_mode |= S_IFDIR; -+ i->i_mtime.tv_sec = inodep->mtime; -+ i->i_atime.tv_sec = inodep->mtime; -+ i->i_ctime.tv_sec = inodep->mtime; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->offset = inodep->offset; -+ SQUASHFS_I(i)->u.s2.directory_index_count = 0; -+ SQUASHFS_I(i)->u.s2.parent_inode = 0; -+ -+ TRACE("Directory inode %x:%x, start_block %x, offset " -+ "%x\n", SQUASHFS_INODE_BLK(inode), -+ offset, inodep->start_block, -+ inodep->offset); -+ break; -+ } -+ case SQUASHFS_LDIR_TYPE: { -+ struct squashfs_ldir_inode_header_2 *inodep = &id.ldir; -+ struct squashfs_ldir_inode_header_2 *sinodep = &sid.ldir; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_LDIR_INODE_HEADER_2(inodep, -+ sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_size = inodep->file_size; -+ i->i_op = &squashfs_dir_inode_ops_2; -+ i->i_fop = &squashfs_dir_ops_2; -+ i->i_mode |= S_IFDIR; -+ i->i_mtime.tv_sec = inodep->mtime; -+ i->i_atime.tv_sec = inodep->mtime; -+ i->i_ctime.tv_sec = inodep->mtime; -+ SQUASHFS_I(i)->start_block = inodep->start_block; -+ SQUASHFS_I(i)->offset = inodep->offset; -+ SQUASHFS_I(i)->u.s2.directory_index_start = next_block; -+ SQUASHFS_I(i)->u.s2.directory_index_offset = -+ next_offset; -+ SQUASHFS_I(i)->u.s2.directory_index_count = -+ inodep->i_count; -+ SQUASHFS_I(i)->u.s2.parent_inode = 0; -+ -+ TRACE("Long directory inode %x:%x, start_block %x, " -+ "offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->start_block, inodep->offset); -+ break; -+ } -+ case SQUASHFS_SYMLINK_TYPE: { -+ struct squashfs_symlink_inode_header_2 *inodep = -+ &id.symlink; -+ struct squashfs_symlink_inode_header_2 *sinodep = -+ &sid.symlink; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_SYMLINK_INODE_HEADER_2(inodep, -+ sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_size = inodep->symlink_size; -+ i->i_op = &page_symlink_inode_operations; -+ i->i_data.a_ops = &squashfs_symlink_aops; -+ i->i_mode |= S_IFLNK; -+ SQUASHFS_I(i)->start_block = next_block; -+ SQUASHFS_I(i)->offset = next_offset; -+ -+ TRACE("Symbolic link inode %x:%x, start_block %llx, " -+ "offset %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ next_block, next_offset); -+ break; -+ } -+ case SQUASHFS_BLKDEV_TYPE: -+ case SQUASHFS_CHRDEV_TYPE: { -+ struct squashfs_dev_inode_header_2 *inodep = &id.dev; -+ struct squashfs_dev_inode_header_2 *sinodep = &sid.dev; -+ -+ if (msblk->swap) { -+ if (!squashfs_get_cached_block(s, (char *) -+ sinodep, block, offset, -+ sizeof(*sinodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ SQUASHFS_SWAP_DEV_INODE_HEADER_2(inodep, sinodep); -+ } else -+ if (!squashfs_get_cached_block(s, (char *) -+ inodep, block, offset, -+ sizeof(*inodep), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ i->i_mode |= (inodeb->inode_type == -+ SQUASHFS_CHRDEV_TYPE) ? S_IFCHR : -+ S_IFBLK; -+ init_special_inode(i, i->i_mode, -+ old_decode_dev(inodep->rdev)); -+ -+ TRACE("Device inode %x:%x, rdev %x\n", -+ SQUASHFS_INODE_BLK(inode), offset, -+ inodep->rdev); -+ break; -+ } -+ case SQUASHFS_FIFO_TYPE: -+ case SQUASHFS_SOCKET_TYPE: { -+ -+ i->i_mode |= (inodeb->inode_type == SQUASHFS_FIFO_TYPE) -+ ? S_IFIFO : S_IFSOCK; -+ init_special_inode(i, i->i_mode, 0); -+ break; -+ } -+ default: -+ ERROR("Unknown inode type %d in squashfs_iget!\n", -+ inodeb->inode_type); -+ goto failed_read1; -+ } -+ -+ return 1; -+ -+failed_read: -+ ERROR("Unable to read inode [%x:%x]\n", block, offset); -+ -+failed_read1: -+ return 0; -+} -+ -+ -+static int get_dir_index_using_offset(struct super_block *s, long long -+ *next_block, unsigned int *next_offset, -+ long long index_start, -+ unsigned int index_offset, int i_count, -+ long long f_pos) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int i, length = 0; -+ struct squashfs_dir_index_2 index; -+ -+ TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n", -+ i_count, (unsigned int) f_pos); -+ -+ if (f_pos == 0) -+ goto finish; -+ -+ for (i = 0; i < i_count; i++) { -+ if (msblk->swap) { -+ struct squashfs_dir_index_2 sindex; -+ squashfs_get_cached_block(s, (char *) &sindex, -+ index_start, index_offset, -+ sizeof(sindex), &index_start, -+ &index_offset); -+ SQUASHFS_SWAP_DIR_INDEX_2(&index, &sindex); -+ } else -+ squashfs_get_cached_block(s, (char *) &index, -+ index_start, index_offset, -+ sizeof(index), &index_start, -+ &index_offset); -+ -+ if (index.index > f_pos) -+ break; -+ -+ squashfs_get_cached_block(s, NULL, index_start, index_offset, -+ index.size + 1, &index_start, -+ &index_offset); -+ -+ length = index.index; -+ *next_block = index.start_block + sblk->directory_table_start; -+ } -+ -+ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; -+ -+finish: -+ return length; -+} -+ -+ -+static int get_dir_index_using_name(struct super_block *s, long long -+ *next_block, unsigned int *next_offset, -+ long long index_start, -+ unsigned int index_offset, int i_count, -+ const char *name, int size) -+{ -+ struct squashfs_sb_info *msblk = s->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ int i, length = 0; -+ struct squashfs_dir_index_2 *index; -+ char *str; -+ -+ TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count); -+ -+ if (!(str = kmalloc(sizeof(struct squashfs_dir_index) + -+ (SQUASHFS_NAME_LEN + 1) * 2, GFP_KERNEL))) { -+ ERROR("Failed to allocate squashfs_dir_index\n"); -+ goto failure; -+ } -+ -+ index = (struct squashfs_dir_index_2 *) (str + SQUASHFS_NAME_LEN + 1); -+ strncpy(str, name, size); -+ str[size] = '\0'; -+ -+ for (i = 0; i < i_count; i++) { -+ if (msblk->swap) { -+ struct squashfs_dir_index_2 sindex; -+ squashfs_get_cached_block(s, (char *) &sindex, -+ index_start, index_offset, -+ sizeof(sindex), &index_start, -+ &index_offset); -+ SQUASHFS_SWAP_DIR_INDEX_2(index, &sindex); -+ } else -+ squashfs_get_cached_block(s, (char *) index, -+ index_start, index_offset, -+ sizeof(struct squashfs_dir_index_2), -+ &index_start, &index_offset); -+ -+ squashfs_get_cached_block(s, index->name, index_start, -+ index_offset, index->size + 1, -+ &index_start, &index_offset); -+ -+ index->name[index->size + 1] = '\0'; -+ -+ if (strcmp(index->name, str) > 0) -+ break; -+ -+ length = index->index; -+ *next_block = index->start_block + sblk->directory_table_start; -+ } -+ -+ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; -+ kfree(str); -+failure: -+ return length; -+} -+ -+ -+static int squashfs_readdir_2(struct file *file, void *dirent, filldir_t filldir) -+{ -+ struct inode *i = file->f_dentry->d_inode; -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long next_block = SQUASHFS_I(i)->start_block + -+ sblk->directory_table_start; -+ int next_offset = SQUASHFS_I(i)->offset, length = 0, -+ dir_count; -+ struct squashfs_dir_header_2 dirh; -+ struct squashfs_dir_entry_2 *dire; -+ -+ TRACE("Entered squashfs_readdir_2 [%llx:%x]\n", next_block, next_offset); -+ -+ if (!(dire = kmalloc(sizeof(struct squashfs_dir_entry) + -+ SQUASHFS_NAME_LEN + 1, GFP_KERNEL))) { -+ ERROR("Failed to allocate squashfs_dir_entry\n"); -+ goto finish; -+ } -+ -+ length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_start, -+ SQUASHFS_I(i)->u.s2.directory_index_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_count, -+ file->f_pos); -+ -+ while (length < i_size_read(i)) { -+ /* read directory header */ -+ if (msblk->swap) { -+ struct squashfs_dir_header_2 sdirh; -+ -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, -+ next_block, next_offset, sizeof(sdirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdirh); -+ SQUASHFS_SWAP_DIR_HEADER_2(&dirh, &sdirh); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh, -+ next_block, next_offset, sizeof(dirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(dirh); -+ } -+ -+ dir_count = dirh.count + 1; -+ while (dir_count--) { -+ if (msblk->swap) { -+ struct squashfs_dir_entry_2 sdire; -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ &sdire, next_block, next_offset, -+ sizeof(sdire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdire); -+ SQUASHFS_SWAP_DIR_ENTRY_2(dire, &sdire); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ dire, next_block, next_offset, -+ sizeof(*dire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(*dire); -+ } -+ -+ if (!squashfs_get_cached_block(i->i_sb, dire->name, -+ next_block, next_offset, -+ dire->size + 1, &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += dire->size + 1; -+ -+ if (file->f_pos >= length) -+ continue; -+ -+ dire->name[dire->size + 1] = '\0'; -+ -+ TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d)\n", -+ (unsigned int) dirent, dire->name, -+ dire->size + 1, (int) file->f_pos, -+ dirh.start_block, dire->offset, -+ squashfs_filetype_table[dire->type]); -+ -+ if (filldir(dirent, dire->name, dire->size + 1, -+ file->f_pos, SQUASHFS_MK_VFS_INODE( -+ dirh.start_block, dire->offset), -+ squashfs_filetype_table[dire->type]) -+ < 0) { -+ TRACE("Filldir returned less than 0\n"); -+ goto finish; -+ } -+ file->f_pos = length; -+ } -+ } -+ -+finish: -+ kfree(dire); -+ return 0; -+ -+failed_read: -+ ERROR("Unable to read directory block [%llx:%x]\n", next_block, -+ next_offset); -+ kfree(dire); -+ return 0; -+} -+ -+ -+static struct dentry *squashfs_lookup_2(struct inode *i, struct dentry *dentry, -+ struct nameidata *nd) -+{ -+ const unsigned char *name = dentry->d_name.name; -+ int len = dentry->d_name.len; -+ struct inode *inode = NULL; -+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info; -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ long long next_block = SQUASHFS_I(i)->start_block + -+ sblk->directory_table_start; -+ int next_offset = SQUASHFS_I(i)->offset, length = 0, -+ dir_count; -+ struct squashfs_dir_header_2 dirh; -+ struct squashfs_dir_entry_2 *dire; -+ int sorted = sblk->s_major == 2 && sblk->s_minor >= 1; -+ -+ TRACE("Entered squashfs_lookup_2 [%llx:%x]\n", next_block, next_offset); -+ -+ if (!(dire = kmalloc(sizeof(struct squashfs_dir_entry) + -+ SQUASHFS_NAME_LEN + 1, GFP_KERNEL))) { -+ ERROR("Failed to allocate squashfs_dir_entry\n"); -+ goto exit_loop; -+ } -+ -+ if (len > SQUASHFS_NAME_LEN) -+ goto exit_loop; -+ -+ length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_start, -+ SQUASHFS_I(i)->u.s2.directory_index_offset, -+ SQUASHFS_I(i)->u.s2.directory_index_count, name, -+ len); -+ -+ while (length < i_size_read(i)) { -+ /* read directory header */ -+ if (msblk->swap) { -+ struct squashfs_dir_header_2 sdirh; -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, -+ next_block, next_offset, sizeof(sdirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdirh); -+ SQUASHFS_SWAP_DIR_HEADER_2(&dirh, &sdirh); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh, -+ next_block, next_offset, sizeof(dirh), -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(dirh); -+ } -+ -+ dir_count = dirh.count + 1; -+ while (dir_count--) { -+ if (msblk->swap) { -+ struct squashfs_dir_entry_2 sdire; -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ &sdire, next_block,next_offset, -+ sizeof(sdire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(sdire); -+ SQUASHFS_SWAP_DIR_ENTRY_2(dire, &sdire); -+ } else { -+ if (!squashfs_get_cached_block(i->i_sb, (char *) -+ dire, next_block,next_offset, -+ sizeof(*dire), &next_block, -+ &next_offset)) -+ goto failed_read; -+ -+ length += sizeof(*dire); -+ } -+ -+ if (!squashfs_get_cached_block(i->i_sb, dire->name, -+ next_block, next_offset, dire->size + 1, -+ &next_block, &next_offset)) -+ goto failed_read; -+ -+ length += dire->size + 1; -+ -+ if (sorted && name[0] < dire->name[0]) -+ goto exit_loop; -+ -+ if ((len == dire->size + 1) && !strncmp(name, -+ dire->name, len)) { -+ squashfs_inode_t ino = -+ SQUASHFS_MKINODE(dirh.start_block, -+ dire->offset); -+ unsigned int inode_number = SQUASHFS_MK_VFS_INODE(dirh.start_block, -+ dire->offset); -+ -+ TRACE("calling squashfs_iget for directory " -+ "entry %s, inode %x:%x, %lld\n", name, -+ dirh.start_block, dire->offset, ino); -+ -+ inode = squashfs_iget(i->i_sb, ino, inode_number); -+ -+ goto exit_loop; -+ } -+ } -+ } -+ -+exit_loop: -+ kfree(dire); -+ d_add(dentry, inode); -+ return ERR_PTR(0); -+ -+failed_read: -+ ERROR("Unable to read directory block [%llx:%x]\n", next_block, -+ next_offset); -+ goto exit_loop; -+} -+ -+ -+int squashfs_2_0_supported(struct squashfs_sb_info *msblk) -+{ -+ struct squashfs_super_block *sblk = &msblk->sblk; -+ -+ msblk->read_inode = squashfs_read_inode_2; -+ msblk->read_fragment_index_table = read_fragment_index_table_2; -+ -+ sblk->bytes_used = sblk->bytes_used_2; -+ sblk->uid_start = sblk->uid_start_2; -+ sblk->guid_start = sblk->guid_start_2; -+ sblk->inode_table_start = sblk->inode_table_start_2; -+ sblk->directory_table_start = sblk->directory_table_start_2; -+ sblk->fragment_table_start = sblk->fragment_table_start_2; -+ -+ return 1; -+} -diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/squashfs.h linux-2.6.20-squashfs3.2-r2/fs/squashfs/squashfs.h ---- linux-2.6.20/fs/squashfs/squashfs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/squashfs.h 2007-01-12 01:42:11.000000000 +0000 -@@ -0,0 +1,87 @@ -+/* -+ * Squashfs - a compressed read only filesystem for Linux -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs.h -+ */ -+ -+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY -+#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY -+#endif -+ -+#ifdef SQUASHFS_TRACE -+#define TRACE(s, args...) printk(KERN_NOTICE "SQUASHFS: "s, ## args) -+#else -+#define TRACE(s, args...) {} -+#endif -+ -+#define ERROR(s, args...) printk(KERN_ERR "SQUASHFS error: "s, ## args) -+ -+#define SERROR(s, args...) do { \ -+ if (!silent) \ -+ printk(KERN_ERR "SQUASHFS error: "s, ## args);\ -+ } while(0) -+ -+#define WARNING(s, args...) printk(KERN_WARNING "SQUASHFS: "s, ## args) -+ -+static inline struct squashfs_inode_info *SQUASHFS_I(struct inode *inode) -+{ -+ return list_entry(inode, struct squashfs_inode_info, vfs_inode); -+} -+ -+#if defined(CONFIG_SQUASHFS_1_0_COMPATIBILITY ) || defined(CONFIG_SQUASHFS_2_0_COMPATIBILITY) -+#define SQSH_EXTERN -+extern unsigned int squashfs_read_data(struct super_block *s, char *buffer, -+ long long index, unsigned int length, -+ long long *next_index, int srclength); -+extern int squashfs_get_cached_block(struct super_block *s, char *buffer, -+ long long block, unsigned int offset, -+ int length, long long *next_block, -+ unsigned int *next_offset); -+extern void release_cached_fragment(struct squashfs_sb_info *msblk, struct -+ squashfs_fragment_cache *fragment); -+extern struct squashfs_fragment_cache *get_cached_fragment(struct super_block -+ *s, long long start_block, -+ int length); -+extern struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode, unsigned int inode_number); -+extern const struct address_space_operations squashfs_symlink_aops; -+extern const struct address_space_operations squashfs_aops; -+extern const struct address_space_operations squashfs_aops_4K; -+extern struct inode_operations squashfs_dir_inode_ops; -+#else -+#define SQSH_EXTERN static -+#endif -+ -+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY -+extern int squashfs_1_0_supported(struct squashfs_sb_info *msblk); -+#else -+static inline int squashfs_1_0_supported(struct squashfs_sb_info *msblk) -+{ -+ return 0; -+} -+#endif -+ -+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY -+extern int squashfs_2_0_supported(struct squashfs_sb_info *msblk); -+#else -+static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk) -+{ -+ return 0; -+} -+#endif -diff -x .gitignore -Nurp linux-2.6.20/include/linux/squashfs_fs.h linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs.h ---- linux-2.6.20/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs.h 2007-01-12 00:06:09.000000000 +0000 -@@ -0,0 +1,934 @@ -+#ifndef SQUASHFS_FS -+#define SQUASHFS_FS -+ -+/* -+ * Squashfs -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs_fs.h -+ */ -+ -+#ifndef CONFIG_SQUASHFS_2_0_COMPATIBILITY -+#define CONFIG_SQUASHFS_2_0_COMPATIBILITY -+#endif -+ -+#ifdef CONFIG_SQUASHFS_VMALLOC -+#define SQUASHFS_ALLOC(a) vmalloc(a) -+#define SQUASHFS_FREE(a) vfree(a) -+#else -+#define SQUASHFS_ALLOC(a) kmalloc(a, GFP_KERNEL) -+#define SQUASHFS_FREE(a) kfree(a) -+#endif -+#define SQUASHFS_CACHED_FRAGMENTS CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE -+#define SQUASHFS_MAJOR 3 -+#define SQUASHFS_MINOR 0 -+#define SQUASHFS_MAGIC 0x73717368 -+#define SQUASHFS_MAGIC_SWAP 0x68737173 -+#define SQUASHFS_START 0 -+ -+/* size of metadata (inode and directory) blocks */ -+#define SQUASHFS_METADATA_SIZE 8192 -+#define SQUASHFS_METADATA_LOG 13 -+ -+/* default size of data blocks */ -+#define SQUASHFS_FILE_SIZE 65536 -+#define SQUASHFS_FILE_LOG 16 -+ -+#define SQUASHFS_FILE_MAX_SIZE 65536 -+ -+/* Max number of uids and gids */ -+#define SQUASHFS_UIDS 256 -+#define SQUASHFS_GUIDS 255 -+ -+/* Max length of filename (not 255) */ -+#define SQUASHFS_NAME_LEN 256 -+ -+#define SQUASHFS_INVALID ((long long) 0xffffffffffff) -+#define SQUASHFS_INVALID_FRAG ((unsigned int) 0xffffffff) -+#define SQUASHFS_INVALID_BLK ((long long) -1) -+#define SQUASHFS_USED_BLK ((long long) -2) -+ -+/* Filesystem flags */ -+#define SQUASHFS_NOI 0 -+#define SQUASHFS_NOD 1 -+#define SQUASHFS_CHECK 2 -+#define SQUASHFS_NOF 3 -+#define SQUASHFS_NO_FRAG 4 -+#define SQUASHFS_ALWAYS_FRAG 5 -+#define SQUASHFS_DUPLICATE 6 -+#define SQUASHFS_EXPORT 7 -+ -+#define SQUASHFS_BIT(flag, bit) ((flag >> bit) & 1) -+ -+#define SQUASHFS_UNCOMPRESSED_INODES(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_NOI) -+ -+#define SQUASHFS_UNCOMPRESSED_DATA(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_NOD) -+ -+#define SQUASHFS_UNCOMPRESSED_FRAGMENTS(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_NOF) -+ -+#define SQUASHFS_NO_FRAGMENTS(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_NO_FRAG) -+ -+#define SQUASHFS_ALWAYS_FRAGMENTS(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_ALWAYS_FRAG) -+ -+#define SQUASHFS_DUPLICATES(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_DUPLICATE) -+ -+#define SQUASHFS_EXPORTABLE(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_EXPORT) -+ -+#define SQUASHFS_CHECK_DATA(flags) SQUASHFS_BIT(flags, \ -+ SQUASHFS_CHECK) -+ -+#define SQUASHFS_MKFLAGS(noi, nod, check_data, nof, no_frag, always_frag, \ -+ duplicate_checking, exortable) (noi | (nod << 1) | (check_data << 2) \ -+ | (nof << 3) | (no_frag << 4) | (always_frag << 5) | \ -+ (duplicate_checking << 6) | (exportable << 7)) -+ -+/* Max number of types and file types */ -+#define SQUASHFS_DIR_TYPE 1 -+#define SQUASHFS_FILE_TYPE 2 -+#define SQUASHFS_SYMLINK_TYPE 3 -+#define SQUASHFS_BLKDEV_TYPE 4 -+#define SQUASHFS_CHRDEV_TYPE 5 -+#define SQUASHFS_FIFO_TYPE 6 -+#define SQUASHFS_SOCKET_TYPE 7 -+#define SQUASHFS_LDIR_TYPE 8 -+#define SQUASHFS_LREG_TYPE 9 -+ -+/* 1.0 filesystem type definitions */ -+#define SQUASHFS_TYPES 5 -+#define SQUASHFS_IPC_TYPE 0 -+ -+/* Flag whether block is compressed or uncompressed, bit is set if block is -+ * uncompressed */ -+#define SQUASHFS_COMPRESSED_BIT (1 << 15) -+ -+#define SQUASHFS_COMPRESSED_SIZE(B) (((B) & ~SQUASHFS_COMPRESSED_BIT) ? \ -+ (B) & ~SQUASHFS_COMPRESSED_BIT : SQUASHFS_COMPRESSED_BIT) -+ -+#define SQUASHFS_COMPRESSED(B) (!((B) & SQUASHFS_COMPRESSED_BIT)) -+ -+#define SQUASHFS_COMPRESSED_BIT_BLOCK (1 << 24) -+ -+#define SQUASHFS_COMPRESSED_SIZE_BLOCK(B) (((B) & \ -+ ~SQUASHFS_COMPRESSED_BIT_BLOCK) ? (B) & \ -+ ~SQUASHFS_COMPRESSED_BIT_BLOCK : SQUASHFS_COMPRESSED_BIT_BLOCK) -+ -+#define SQUASHFS_COMPRESSED_BLOCK(B) (!((B) & SQUASHFS_COMPRESSED_BIT_BLOCK)) -+ -+/* -+ * Inode number ops. Inodes consist of a compressed block number, and an -+ * uncompressed offset within that block -+ */ -+#define SQUASHFS_INODE_BLK(a) ((unsigned int) ((a) >> 16)) -+ -+#define SQUASHFS_INODE_OFFSET(a) ((unsigned int) ((a) & 0xffff)) -+ -+#define SQUASHFS_MKINODE(A, B) ((squashfs_inode_t)(((squashfs_inode_t) (A)\ -+ << 16) + (B))) -+ -+/* Compute 32 bit VFS inode number from squashfs inode number */ -+#define SQUASHFS_MK_VFS_INODE(a, b) ((unsigned int) (((a) << 8) + \ -+ ((b) >> 2) + 1)) -+/* XXX */ -+ -+/* Translate between VFS mode and squashfs mode */ -+#define SQUASHFS_MODE(a) ((a) & 0xfff) -+ -+/* fragment and fragment table defines */ -+#define SQUASHFS_FRAGMENT_BYTES(A) ((A) * sizeof(struct squashfs_fragment_entry)) -+ -+#define SQUASHFS_FRAGMENT_INDEX(A) (SQUASHFS_FRAGMENT_BYTES(A) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEX_OFFSET(A) (SQUASHFS_FRAGMENT_BYTES(A) % \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEXES(A) ((SQUASHFS_FRAGMENT_BYTES(A) + \ -+ SQUASHFS_METADATA_SIZE - 1) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEX_BYTES(A) (SQUASHFS_FRAGMENT_INDEXES(A) *\ -+ sizeof(long long)) -+ -+/* inode lookup table defines */ -+#define SQUASHFS_LOOKUP_BYTES(A) ((A) * sizeof(squashfs_inode_t)) -+ -+#define SQUASHFS_LOOKUP_BLOCK(A) (SQUASHFS_LOOKUP_BYTES(A) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_LOOKUP_BLOCK_OFFSET(A) (SQUASHFS_LOOKUP_BYTES(A) % \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_LOOKUP_BLOCKS(A) ((SQUASHFS_LOOKUP_BYTES(A) + \ -+ SQUASHFS_METADATA_SIZE - 1) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_LOOKUP_BLOCK_BYTES(A) (SQUASHFS_LOOKUP_BLOCKS(A) *\ -+ sizeof(long long)) -+ -+/* cached data constants for filesystem */ -+#define SQUASHFS_CACHED_BLKS 8 -+ -+#define SQUASHFS_MAX_FILE_SIZE_LOG 64 -+ -+#define SQUASHFS_MAX_FILE_SIZE ((long long) 1 << \ -+ (SQUASHFS_MAX_FILE_SIZE_LOG - 2)) -+ -+#define SQUASHFS_MARKER_BYTE 0xff -+ -+/* meta index cache */ -+#define SQUASHFS_META_INDEXES (SQUASHFS_METADATA_SIZE / sizeof(unsigned int)) -+#define SQUASHFS_META_ENTRIES 31 -+#define SQUASHFS_META_NUMBER 8 -+#define SQUASHFS_SLOTS 4 -+ -+struct meta_entry { -+ long long data_block; -+ unsigned int index_block; -+ unsigned short offset; -+ unsigned short pad; -+}; -+ -+struct meta_index { -+ unsigned int inode_number; -+ unsigned int offset; -+ unsigned short entries; -+ unsigned short skip; -+ unsigned short locked; -+ unsigned short pad; -+ struct meta_entry meta_entry[SQUASHFS_META_ENTRIES]; -+}; -+ -+ -+/* -+ * definitions for structures on disk -+ */ -+ -+typedef long long squashfs_block_t; -+typedef long long squashfs_inode_t; -+ -+struct squashfs_super_block { -+ unsigned int s_magic; -+ unsigned int inodes; -+ unsigned int bytes_used_2; -+ unsigned int uid_start_2; -+ unsigned int guid_start_2; -+ unsigned int inode_table_start_2; -+ unsigned int directory_table_start_2; -+ unsigned int s_major:16; -+ unsigned int s_minor:16; -+ unsigned int block_size_1:16; -+ unsigned int block_log:16; -+ unsigned int flags:8; -+ unsigned int no_uids:8; -+ unsigned int no_guids:8; -+ unsigned int mkfs_time /* time of filesystem creation */; -+ squashfs_inode_t root_inode; -+ unsigned int block_size; -+ unsigned int fragments; -+ unsigned int fragment_table_start_2; -+ long long bytes_used; -+ long long uid_start; -+ long long guid_start; -+ long long inode_table_start; -+ long long directory_table_start; -+ long long fragment_table_start; -+ long long lookup_table_start; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_index { -+ unsigned int index; -+ unsigned int start_block; -+ unsigned char size; -+ unsigned char name[0]; -+} __attribute__ ((packed)); -+ -+#define SQUASHFS_BASE_INODE_HEADER \ -+ unsigned int inode_type:4; \ -+ unsigned int mode:12; \ -+ unsigned int uid:8; \ -+ unsigned int guid:8; \ -+ unsigned int mtime; \ -+ unsigned int inode_number; -+ -+struct squashfs_base_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+} __attribute__ ((packed)); -+ -+struct squashfs_ipc_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+} __attribute__ ((packed)); -+ -+struct squashfs_dev_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ unsigned short rdev; -+} __attribute__ ((packed)); -+ -+struct squashfs_symlink_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ unsigned short symlink_size; -+ char symlink[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_reg_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ squashfs_block_t start_block; -+ unsigned int fragment; -+ unsigned int offset; -+ unsigned int file_size; -+ unsigned short block_list[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_lreg_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ squashfs_block_t start_block; -+ unsigned int fragment; -+ unsigned int offset; -+ long long file_size; -+ unsigned short block_list[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ unsigned int file_size:19; -+ unsigned int offset:13; -+ unsigned int start_block; -+ unsigned int parent_inode; -+} __attribute__ ((packed)); -+ -+struct squashfs_ldir_inode_header { -+ SQUASHFS_BASE_INODE_HEADER; -+ unsigned int nlink; -+ unsigned int file_size:27; -+ unsigned int offset:13; -+ unsigned int start_block; -+ unsigned int i_count:16; -+ unsigned int parent_inode; -+ struct squashfs_dir_index index[0]; -+} __attribute__ ((packed)); -+ -+union squashfs_inode_header { -+ struct squashfs_base_inode_header base; -+ struct squashfs_dev_inode_header dev; -+ struct squashfs_symlink_inode_header symlink; -+ struct squashfs_reg_inode_header reg; -+ struct squashfs_lreg_inode_header lreg; -+ struct squashfs_dir_inode_header dir; -+ struct squashfs_ldir_inode_header ldir; -+ struct squashfs_ipc_inode_header ipc; -+}; -+ -+struct squashfs_dir_entry { -+ unsigned int offset:13; -+ unsigned int type:3; -+ unsigned int size:8; -+ int inode_number:16; -+ char name[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_header { -+ unsigned int count:8; -+ unsigned int start_block; -+ unsigned int inode_number; -+} __attribute__ ((packed)); -+ -+struct squashfs_fragment_entry { -+ long long start_block; -+ unsigned int size; -+ unsigned int pending; -+} __attribute__ ((packed)); -+ -+extern int squashfs_uncompress_block(void *d, int dstlen, void *s, int srclen); -+extern int squashfs_uncompress_init(void); -+extern int squashfs_uncompress_exit(void); -+ -+/* -+ * macros to convert each packed bitfield structure from little endian to big -+ * endian and vice versa. These are needed when creating or using a filesystem -+ * on a machine with different byte ordering to the target architecture. -+ * -+ */ -+ -+#define SQUASHFS_SWAP_START \ -+ int bits;\ -+ int b_pos;\ -+ unsigned long long val;\ -+ unsigned char *s;\ -+ unsigned char *d; -+ -+#define SQUASHFS_SWAP_SUPER_BLOCK(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_super_block));\ -+ SQUASHFS_SWAP((s)->s_magic, d, 0, 32);\ -+ SQUASHFS_SWAP((s)->inodes, d, 32, 32);\ -+ SQUASHFS_SWAP((s)->bytes_used_2, d, 64, 32);\ -+ SQUASHFS_SWAP((s)->uid_start_2, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->guid_start_2, d, 128, 32);\ -+ SQUASHFS_SWAP((s)->inode_table_start_2, d, 160, 32);\ -+ SQUASHFS_SWAP((s)->directory_table_start_2, d, 192, 32);\ -+ SQUASHFS_SWAP((s)->s_major, d, 224, 16);\ -+ SQUASHFS_SWAP((s)->s_minor, d, 240, 16);\ -+ SQUASHFS_SWAP((s)->block_size_1, d, 256, 16);\ -+ SQUASHFS_SWAP((s)->block_log, d, 272, 16);\ -+ SQUASHFS_SWAP((s)->flags, d, 288, 8);\ -+ SQUASHFS_SWAP((s)->no_uids, d, 296, 8);\ -+ SQUASHFS_SWAP((s)->no_guids, d, 304, 8);\ -+ SQUASHFS_SWAP((s)->mkfs_time, d, 312, 32);\ -+ SQUASHFS_SWAP((s)->root_inode, d, 344, 64);\ -+ SQUASHFS_SWAP((s)->block_size, d, 408, 32);\ -+ SQUASHFS_SWAP((s)->fragments, d, 440, 32);\ -+ SQUASHFS_SWAP((s)->fragment_table_start_2, d, 472, 32);\ -+ SQUASHFS_SWAP((s)->bytes_used, d, 504, 64);\ -+ SQUASHFS_SWAP((s)->uid_start, d, 568, 64);\ -+ SQUASHFS_SWAP((s)->guid_start, d, 632, 64);\ -+ SQUASHFS_SWAP((s)->inode_table_start, d, 696, 64);\ -+ SQUASHFS_SWAP((s)->directory_table_start, d, 760, 64);\ -+ SQUASHFS_SWAP((s)->fragment_table_start, d, 824, 64);\ -+ SQUASHFS_SWAP((s)->lookup_table_start, d, 888, 64);\ -+} -+ -+#define SQUASHFS_SWAP_BASE_INODE_CORE(s, d, n)\ -+ SQUASHFS_MEMSET(s, d, n);\ -+ SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ -+ SQUASHFS_SWAP((s)->mode, d, 4, 12);\ -+ SQUASHFS_SWAP((s)->uid, d, 16, 8);\ -+ SQUASHFS_SWAP((s)->guid, d, 24, 8);\ -+ SQUASHFS_SWAP((s)->mtime, d, 32, 32);\ -+ SQUASHFS_SWAP((s)->inode_number, d, 64, 32); -+ -+#define SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, n) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, n)\ -+} -+ -+#define SQUASHFS_SWAP_IPC_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_ipc_inode_header))\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DEV_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_dev_inode_header)); \ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->rdev, d, 128, 16);\ -+} -+ -+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_symlink_inode_header));\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->symlink_size, d, 128, 16);\ -+} -+ -+#define SQUASHFS_SWAP_REG_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_reg_inode_header));\ -+ SQUASHFS_SWAP((s)->start_block, d, 96, 64);\ -+ SQUASHFS_SWAP((s)->fragment, d, 160, 32);\ -+ SQUASHFS_SWAP((s)->offset, d, 192, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 224, 32);\ -+} -+ -+#define SQUASHFS_SWAP_LREG_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_lreg_inode_header));\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 128, 64);\ -+ SQUASHFS_SWAP((s)->fragment, d, 192, 32);\ -+ SQUASHFS_SWAP((s)->offset, d, 224, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 256, 64);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_dir_inode_header));\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 128, 19);\ -+ SQUASHFS_SWAP((s)->offset, d, 147, 13);\ -+ SQUASHFS_SWAP((s)->start_block, d, 160, 32);\ -+ SQUASHFS_SWAP((s)->parent_inode, d, 192, 32);\ -+} -+ -+#define SQUASHFS_SWAP_LDIR_INODE_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \ -+ sizeof(struct squashfs_ldir_inode_header));\ -+ SQUASHFS_SWAP((s)->nlink, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 128, 27);\ -+ SQUASHFS_SWAP((s)->offset, d, 155, 13);\ -+ SQUASHFS_SWAP((s)->start_block, d, 168, 32);\ -+ SQUASHFS_SWAP((s)->i_count, d, 200, 16);\ -+ SQUASHFS_SWAP((s)->parent_inode, d, 216, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INDEX(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_index));\ -+ SQUASHFS_SWAP((s)->index, d, 0, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 32, 32);\ -+ SQUASHFS_SWAP((s)->size, d, 64, 8);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_HEADER(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_header));\ -+ SQUASHFS_SWAP((s)->count, d, 0, 8);\ -+ SQUASHFS_SWAP((s)->start_block, d, 8, 32);\ -+ SQUASHFS_SWAP((s)->inode_number, d, 40, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_ENTRY(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_entry));\ -+ SQUASHFS_SWAP((s)->offset, d, 0, 13);\ -+ SQUASHFS_SWAP((s)->type, d, 13, 3);\ -+ SQUASHFS_SWAP((s)->size, d, 16, 8);\ -+ SQUASHFS_SWAP((s)->inode_number, d, 24, 16);\ -+} -+ -+#define SQUASHFS_SWAP_FRAGMENT_ENTRY(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_fragment_entry));\ -+ SQUASHFS_SWAP((s)->start_block, d, 0, 64);\ -+ SQUASHFS_SWAP((s)->size, d, 64, 32);\ -+} -+ -+#define SQUASHFS_SWAP_INODE_T(s, d) SQUASHFS_SWAP_LONG_LONGS(s, d, 1) -+ -+#define SQUASHFS_SWAP_SHORTS(s, d, n) {\ -+ int entry;\ -+ int bit_position;\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, n * 2);\ -+ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \ -+ 16)\ -+ SQUASHFS_SWAP(s[entry], d, bit_position, 16);\ -+} -+ -+#define SQUASHFS_SWAP_INTS(s, d, n) {\ -+ int entry;\ -+ int bit_position;\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, n * 4);\ -+ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \ -+ 32)\ -+ SQUASHFS_SWAP(s[entry], d, bit_position, 32);\ -+} -+ -+#define SQUASHFS_SWAP_LONG_LONGS(s, d, n) {\ -+ int entry;\ -+ int bit_position;\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, n * 8);\ -+ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \ -+ 64)\ -+ SQUASHFS_SWAP(s[entry], d, bit_position, 64);\ -+} -+ -+#define SQUASHFS_SWAP_DATA(s, d, n, bits) {\ -+ int entry;\ -+ int bit_position;\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, n * bits / 8);\ -+ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \ -+ bits)\ -+ SQUASHFS_SWAP(s[entry], d, bit_position, bits);\ -+} -+ -+#define SQUASHFS_SWAP_FRAGMENT_INDEXES(s, d, n) SQUASHFS_SWAP_LONG_LONGS(s, d, n) -+#define SQUASHFS_SWAP_LOOKUP_BLOCKS(s, d, n) SQUASHFS_SWAP_LONG_LONGS(s, d, n) -+ -+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY -+ -+struct squashfs_base_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+} __attribute__ ((packed)); -+ -+struct squashfs_ipc_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned int type:4; -+ unsigned int offset:4; -+} __attribute__ ((packed)); -+ -+struct squashfs_dev_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned short rdev; -+} __attribute__ ((packed)); -+ -+struct squashfs_symlink_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned short symlink_size; -+ char symlink[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_reg_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned int mtime; -+ unsigned int start_block; -+ unsigned int file_size:32; -+ unsigned short block_list[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_inode_header_1 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:4; /* index into uid table */ -+ unsigned int guid:4; /* index into guid table */ -+ unsigned int file_size:19; -+ unsigned int offset:13; -+ unsigned int mtime; -+ unsigned int start_block:24; -+} __attribute__ ((packed)); -+ -+#define SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, n) \ -+ SQUASHFS_MEMSET(s, d, n);\ -+ SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ -+ SQUASHFS_SWAP((s)->mode, d, 4, 12);\ -+ SQUASHFS_SWAP((s)->uid, d, 16, 4);\ -+ SQUASHFS_SWAP((s)->guid, d, 20, 4); -+ -+#define SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, n) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, n)\ -+} -+ -+#define SQUASHFS_SWAP_IPC_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_ipc_inode_header_1));\ -+ SQUASHFS_SWAP((s)->type, d, 24, 4);\ -+ SQUASHFS_SWAP((s)->offset, d, 28, 4);\ -+} -+ -+#define SQUASHFS_SWAP_DEV_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_dev_inode_header_1));\ -+ SQUASHFS_SWAP((s)->rdev, d, 24, 16);\ -+} -+ -+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_symlink_inode_header_1));\ -+ SQUASHFS_SWAP((s)->symlink_size, d, 24, 16);\ -+} -+ -+#define SQUASHFS_SWAP_REG_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_reg_inode_header_1));\ -+ SQUASHFS_SWAP((s)->mtime, d, 24, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 56, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 88, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INODE_HEADER_1(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \ -+ sizeof(struct squashfs_dir_inode_header_1));\ -+ SQUASHFS_SWAP((s)->file_size, d, 24, 19);\ -+ SQUASHFS_SWAP((s)->offset, d, 43, 13);\ -+ SQUASHFS_SWAP((s)->mtime, d, 56, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 88, 24);\ -+} -+ -+#endif -+ -+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY -+ -+struct squashfs_dir_index_2 { -+ unsigned int index:27; -+ unsigned int start_block:29; -+ unsigned char size; -+ unsigned char name[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_base_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+} __attribute__ ((packed)); -+ -+struct squashfs_ipc_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+} __attribute__ ((packed)); -+ -+struct squashfs_dev_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned short rdev; -+} __attribute__ ((packed)); -+ -+struct squashfs_symlink_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned short symlink_size; -+ char symlink[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_reg_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned int mtime; -+ unsigned int start_block; -+ unsigned int fragment; -+ unsigned int offset; -+ unsigned int file_size:32; -+ unsigned short block_list[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned int file_size:19; -+ unsigned int offset:13; -+ unsigned int mtime; -+ unsigned int start_block:24; -+} __attribute__ ((packed)); -+ -+struct squashfs_ldir_inode_header_2 { -+ unsigned int inode_type:4; -+ unsigned int mode:12; /* protection */ -+ unsigned int uid:8; /* index into uid table */ -+ unsigned int guid:8; /* index into guid table */ -+ unsigned int file_size:27; -+ unsigned int offset:13; -+ unsigned int mtime; -+ unsigned int start_block:24; -+ unsigned int i_count:16; -+ struct squashfs_dir_index_2 index[0]; -+} __attribute__ ((packed)); -+ -+union squashfs_inode_header_2 { -+ struct squashfs_base_inode_header_2 base; -+ struct squashfs_dev_inode_header_2 dev; -+ struct squashfs_symlink_inode_header_2 symlink; -+ struct squashfs_reg_inode_header_2 reg; -+ struct squashfs_dir_inode_header_2 dir; -+ struct squashfs_ldir_inode_header_2 ldir; -+ struct squashfs_ipc_inode_header_2 ipc; -+}; -+ -+struct squashfs_dir_header_2 { -+ unsigned int count:8; -+ unsigned int start_block:24; -+} __attribute__ ((packed)); -+ -+struct squashfs_dir_entry_2 { -+ unsigned int offset:13; -+ unsigned int type:3; -+ unsigned int size:8; -+ char name[0]; -+} __attribute__ ((packed)); -+ -+struct squashfs_fragment_entry_2 { -+ unsigned int start_block; -+ unsigned int size; -+} __attribute__ ((packed)); -+ -+#define SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, n)\ -+ SQUASHFS_MEMSET(s, d, n);\ -+ SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ -+ SQUASHFS_SWAP((s)->mode, d, 4, 12);\ -+ SQUASHFS_SWAP((s)->uid, d, 16, 8);\ -+ SQUASHFS_SWAP((s)->guid, d, 24, 8);\ -+ -+#define SQUASHFS_SWAP_BASE_INODE_HEADER_2(s, d, n) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, n)\ -+} -+ -+#define SQUASHFS_SWAP_IPC_INODE_HEADER_2(s, d) \ -+ SQUASHFS_SWAP_BASE_INODE_HEADER_2(s, d, sizeof(struct squashfs_ipc_inode_header_2)) -+ -+#define SQUASHFS_SWAP_DEV_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_dev_inode_header_2)); \ -+ SQUASHFS_SWAP((s)->rdev, d, 32, 16);\ -+} -+ -+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_symlink_inode_header_2));\ -+ SQUASHFS_SWAP((s)->symlink_size, d, 32, 16);\ -+} -+ -+#define SQUASHFS_SWAP_REG_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_reg_inode_header_2));\ -+ SQUASHFS_SWAP((s)->mtime, d, 32, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 64, 32);\ -+ SQUASHFS_SWAP((s)->fragment, d, 96, 32);\ -+ SQUASHFS_SWAP((s)->offset, d, 128, 32);\ -+ SQUASHFS_SWAP((s)->file_size, d, 160, 32);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_dir_inode_header_2));\ -+ SQUASHFS_SWAP((s)->file_size, d, 32, 19);\ -+ SQUASHFS_SWAP((s)->offset, d, 51, 13);\ -+ SQUASHFS_SWAP((s)->mtime, d, 64, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 96, 24);\ -+} -+ -+#define SQUASHFS_SWAP_LDIR_INODE_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \ -+ sizeof(struct squashfs_ldir_inode_header_2));\ -+ SQUASHFS_SWAP((s)->file_size, d, 32, 27);\ -+ SQUASHFS_SWAP((s)->offset, d, 59, 13);\ -+ SQUASHFS_SWAP((s)->mtime, d, 72, 32);\ -+ SQUASHFS_SWAP((s)->start_block, d, 104, 24);\ -+ SQUASHFS_SWAP((s)->i_count, d, 128, 16);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_INDEX_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_index_2));\ -+ SQUASHFS_SWAP((s)->index, d, 0, 27);\ -+ SQUASHFS_SWAP((s)->start_block, d, 27, 29);\ -+ SQUASHFS_SWAP((s)->size, d, 56, 8);\ -+} -+#define SQUASHFS_SWAP_DIR_HEADER_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_header_2));\ -+ SQUASHFS_SWAP((s)->count, d, 0, 8);\ -+ SQUASHFS_SWAP((s)->start_block, d, 8, 24);\ -+} -+ -+#define SQUASHFS_SWAP_DIR_ENTRY_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_entry_2));\ -+ SQUASHFS_SWAP((s)->offset, d, 0, 13);\ -+ SQUASHFS_SWAP((s)->type, d, 13, 3);\ -+ SQUASHFS_SWAP((s)->size, d, 16, 8);\ -+} -+ -+#define SQUASHFS_SWAP_FRAGMENT_ENTRY_2(s, d) {\ -+ SQUASHFS_SWAP_START\ -+ SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_fragment_entry_2));\ -+ SQUASHFS_SWAP((s)->start_block, d, 0, 32);\ -+ SQUASHFS_SWAP((s)->size, d, 32, 32);\ -+} -+ -+#define SQUASHFS_SWAP_FRAGMENT_INDEXES_2(s, d, n) SQUASHFS_SWAP_INTS(s, d, n) -+ -+/* fragment and fragment table defines */ -+#define SQUASHFS_FRAGMENT_BYTES_2(A) (A * sizeof(struct squashfs_fragment_entry_2)) -+ -+#define SQUASHFS_FRAGMENT_INDEX_2(A) (SQUASHFS_FRAGMENT_BYTES_2(A) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEX_OFFSET_2(A) (SQUASHFS_FRAGMENT_BYTES_2(A) % \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEXES_2(A) ((SQUASHFS_FRAGMENT_BYTES_2(A) + \ -+ SQUASHFS_METADATA_SIZE - 1) / \ -+ SQUASHFS_METADATA_SIZE) -+ -+#define SQUASHFS_FRAGMENT_INDEX_BYTES_2(A) (SQUASHFS_FRAGMENT_INDEXES_2(A) *\ -+ sizeof(int)) -+ -+#endif -+ -+#ifdef __KERNEL__ -+ -+/* -+ * macros used to swap each structure entry, taking into account -+ * bitfields and different bitfield placing conventions on differing -+ * architectures -+ */ -+ -+#include -+ -+#ifdef __BIG_ENDIAN -+ /* convert from little endian to big endian */ -+#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, \ -+ tbits, b_pos) -+#else -+ /* convert from big endian to little endian */ -+#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, \ -+ tbits, 64 - tbits - b_pos) -+#endif -+ -+#define _SQUASHFS_SWAP(value, p, pos, tbits, SHIFT) {\ -+ b_pos = pos % 8;\ -+ val = 0;\ -+ s = (unsigned char *)p + (pos / 8);\ -+ d = ((unsigned char *) &val) + 7;\ -+ for(bits = 0; bits < (tbits + b_pos); bits += 8) \ -+ *d-- = *s++;\ -+ value = (val >> (SHIFT))/* & ((1 << tbits) - 1)*/;\ -+} -+ -+#define SQUASHFS_MEMSET(s, d, n) memset(s, 0, n); -+ -+#endif -+#endif -diff -x .gitignore -Nurp linux-2.6.20/include/linux/squashfs_fs_i.h linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_i.h ---- linux-2.6.20/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_i.h 2007-01-12 00:06:09.000000000 +0000 -@@ -0,0 +1,45 @@ -+#ifndef SQUASHFS_FS_I -+#define SQUASHFS_FS_I -+/* -+ * Squashfs -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs_fs_i.h -+ */ -+ -+struct squashfs_inode_info { -+ long long start_block; -+ unsigned int offset; -+ union { -+ struct { -+ long long fragment_start_block; -+ unsigned int fragment_size; -+ unsigned int fragment_offset; -+ long long block_list_start; -+ } s1; -+ struct { -+ long long directory_index_start; -+ unsigned int directory_index_offset; -+ unsigned int directory_index_count; -+ unsigned int parent_inode; -+ } s2; -+ } u; -+ struct inode vfs_inode; -+}; -+#endif -diff -x .gitignore -Nurp linux-2.6.20/include/linux/squashfs_fs_sb.h linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_sb.h ---- linux-2.6.20/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_sb.h 2007-01-12 01:23:47.000000000 +0000 -@@ -0,0 +1,74 @@ -+#ifndef SQUASHFS_FS_SB -+#define SQUASHFS_FS_SB -+/* -+ * Squashfs -+ * -+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * squashfs_fs_sb.h -+ */ -+ -+#include -+ -+struct squashfs_cache { -+ long long block; -+ int length; -+ long long next_index; -+ char *data; -+}; -+ -+struct squashfs_fragment_cache { -+ long long block; -+ int length; -+ unsigned int locked; -+ char *data; -+}; -+ -+struct squashfs_sb_info { -+ struct squashfs_super_block sblk; -+ int devblksize; -+ int devblksize_log2; -+ int swap; -+ struct squashfs_cache *block_cache; -+ struct squashfs_fragment_cache *fragment; -+ int next_cache; -+ int next_fragment; -+ int next_meta_index; -+ unsigned int *uid; -+ unsigned int *guid; -+ long long *fragment_index; -+ unsigned int *fragment_index_2; -+ char *read_page; -+ struct mutex read_data_mutex; -+ struct mutex read_page_mutex; -+ struct mutex block_cache_mutex; -+ struct mutex fragment_mutex; -+ struct mutex meta_index_mutex; -+ wait_queue_head_t waitq; -+ wait_queue_head_t fragment_wait_queue; -+ struct meta_index *meta_index; -+ z_stream stream; -+ long long *inode_lookup_table; -+ int (*read_inode)(struct inode *i, squashfs_inode_t \ -+ inode); -+ long long (*read_blocklist)(struct inode *inode, int \ -+ index, int readahead_blks, char *block_list, \ -+ unsigned short **block_p, unsigned int *bsize); -+ int (*read_fragment_index_table)(struct super_block *s); -+}; -+#endif -diff -x .gitignore -Nurp linux-2.6.20/init/do_mounts_rd.c linux-2.6.20-squashfs3.2-r2/init/do_mounts_rd.c ---- linux-2.6.20/init/do_mounts_rd.c 2006-11-29 21:57:37.000000000 +0000 -+++ linux-2.6.20-squashfs3.2-r2/init/do_mounts_rd.c 2007-01-16 02:06:03.000000000 +0000 -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in - * numbers could not be found. - * - * We currently check for the following magic numbers: -+ * squashfs - * minix - * ext2 - * romfs -@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start - struct ext2_super_block *ext2sb; - struct romfs_super_block *romfsb; - struct cramfs_super *cramfsb; -+ struct squashfs_super_block *squashfsb; - int nblocks = -1; - unsigned char *buf; - -@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start - ext2sb = (struct ext2_super_block *) buf; - romfsb = (struct romfs_super_block *) buf; - cramfsb = (struct cramfs_super *) buf; -+ squashfsb = (struct squashfs_super_block *) buf; - memset(buf, 0xe5, size); - - /* -@@ -101,6 +105,18 @@ identify_ramdisk_image(int fd, int start - goto done; - } - -+ /* squashfs is at block zero too */ -+ if (squashfsb->s_magic == SQUASHFS_MAGIC) { -+ printk(KERN_NOTICE -+ "RAMDISK: squashfs filesystem found at block %d\n", -+ start_block); -+ if (squashfsb->s_major < 3) -+ nblocks = (squashfsb->bytes_used_2+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS; -+ else -+ nblocks = (squashfsb->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS; -+ goto done; -+ } -+ - /* - * Read block 1 to test for minix and ext2 superblock - */ From crazy at frugalware.org Mon Dec 17 23:23:04 2007 From: crazy at frugalware.org (crazy) Date: Mon Dec 17 23:23:05 2007 Subject: [Frugalware-git] playground: kdebase-workspace-3.97.1_749701-0playground1-i686 Message-ID: <20071217222304.987DB11903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=2a474b922a35ac488d0b740e5ea31781831a024c commit 2a474b922a35ac488d0b740e5ea31781831a024c Author: crazy Date: Mon Dec 17 23:17:52 2007 +0100 kdebase-workspace-3.97.1_749701-0playground1-i686 * update to an newer snapshot * some more missing icon fixed * depend() , makedepends() fix diff --git a/source/kde4/kdebase-workspace/FrugalBuild b/source/kde4/kdebase-workspace/FrugalBuild index 50e287c..35eb128 100644 --- a/source/kde4/kdebase-workspace/FrugalBuild +++ b/source/kde4/kdebase-workspace/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: crazy pkgname=kdebase-workspace -pkgver=3.97.1_747311 +pkgver=3.97.1_749701 pkgrel=0playground1 pkgdesc="Programs specific for the KDE4 desktop." depends=('libkde>=>=3.96.1_743104' 'libqt3support' 'libqtsvg' 'libxpm' 'strigi' 'xfsprogs-acl' 'libxtst' 'libqtopengl' 'libxres' \ 'lmsensors' 'libxcomposite' 'libxklavier' 'libxscrnsaver' 'qimageblitz' 'libqtscript' 'libcaptury' \ - 'libraw1394' 'bluez-libs' 'libstrigiqtdbusclient' 'strigi-qt4-gui') -makedepends=('libqtscript' 'qt4-designer') + 'libraw1394' 'bluez-libs' 'libstrigiqtdbusclient' 'strigi-qt4-gui' 'libusb') +makedepends=('libqtscript' 'qt4-designer' 'xorg-server') rodepends=('kde-frugalware>=0.9.0' 'xorg-server>=1.2.0' 'xsetroot' 'dbus-x11' 'xmessage' 'xrandr' 'xset' 'xprop' 'xrdb' "$pkgname-libs=$pkgver") groups=('kde4' 'kde4-minimal') archs=('i686') @@ -17,17 +17,18 @@ _F_cmake_confopts="$_F_cmake_confopts -DWITH_NetworkManager:BOOL=OFF" Finclude kde4 source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \ fix_some_icon_names_in_directory.patch \ - add-the-pager.patch) -sha1sums=('8315391b7866bd6aee24bd6e985b16fe5707549f' \ - '1281378a0cc3ac2d52a11f3afdbf8d8b96e0f36f' \ - '16bcaa98c03b7fc7dbf8a49bbeee0a445287441d') + add-the-pager.patch \ + monday.patch) +sha1sums=('84377d6a18eb6e80e75c662d9ce64b991938c490' \ + '52f6d12dfca946f9c941188883c2571b24557f0d' \ + '16bcaa98c03b7fc7dbf8a49bbeee0a445287441d' \ + 'cb746bc22aaf3fbe3a22e6cd84eedebabf3e1cc9') ## TODO: kdm ## FIXME: QT4 subpkgs=("$pkgname-libs") subdescs=('Libraries for KDE Workspace.') -subdepends=("libkde>=3.96.1_743104 strigi xfsprogs-acl libxpm libqtsvg \ - libqtscript libxtst libqtopengl qimageblitz libxcomposite libqt3support qt4-designer") +subdepends=("libqtnetwork qt4-qdbus bzip2 libgcc libkde gamin xfsprogs-attr libxrender libice libqtopengl libgl libxdamage libxcomposite libqtsql") subgroups=('kde4 kde4-libs') subarchs=('i686') @@ -50,9 +51,9 @@ build() ## Wallpapers are by now ,, uhh crappy , we need plasma* one now kill the rest ## When the newer obe are merged this will have -wallpapers package - Frm usr/share/wallpapers/* - cp -ra ../wallpapers/*plasma* $Fdestdir/usr/share/wallpapers/ || Fdie - Fsed "Wallpaper=.*" "Wallpaper=plasma-default.png" $Fdestdir/etc/kde4/config/kdm/backgroundrc + #Frm usr/share/wallpapers/* + #cp -ra ../wallpapers/*plasma* $Fdestdir/usr/share/wallpapers/ || Fdie + #Fsed "Wallpaper=.*" "Wallpaper=plasma-default.png" $Fdestdir/etc/kde4/config/kdm/backgroundrc } diff --git a/source/kde4/kdebase-workspace/fix_some_icon_names_in_directory.patch b/source/kde4/kdebase-workspace/fix_some_icon_names_in_directory.patch index d20b2df..12aba45 100644 --- a/source/kde4/kdebase-workspace/fix_some_icon_names_in_directory.patch +++ b/source/kde4/kdebase-workspace/fix_some_icon_names_in_directory.patch @@ -1,8 +1,7 @@ -Index: menu/desktop/kde-development-translation.directory -=================================================================== ---- menu/desktop/kde-development-translation.directory (Revision 744587) -+++ menu/desktop/kde-development-translation.directory (Arbeitskopie) -@@ -65,7 +65,7 @@ +diff -Naur kdebase-workspace-3.97.1_749701/menu/desktop/kde-development-translation.directory kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-development-translation.directory +--- kdebase-workspace-3.97.1_749701/menu/desktop/kde-development-translation.directory 2007-12-17 18:41:21.000000000 +0100 ++++ kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-development-translation.directory 2007-12-17 22:12:53.000000000 +0100 +@@ -66,7 +66,7 @@ Name[x-test]=xxTranslationxx Name[zh_CN]=翻译 Name[zh_TW]=çżťč­Ż @@ -11,18 +10,78 @@ Index: menu/desktop/kde-development-translation.directory [Desktop Entry] Encoding=UTF-8 -@@ -134,5 +134,5 @@ +@@ -136,5 +136,5 @@ Name[x-test]=xxTranslationxx Name[zh_CN]=翻译 Name[zh_TW]=çżťč­Ż -Icon=locale +Icon=preferences-desktop-locale -Index: menu/desktop/kde-utilities-peripherals.directory -=================================================================== ---- menu/desktop/kde-utilities-peripherals.directory (Revision 744587) -+++ menu/desktop/kde-utilities-peripherals.directory (Arbeitskopie) -@@ -66,7 +66,7 @@ +diff -Naur kdebase-workspace-3.97.1_749701/menu/desktop/kde-development-webdevelopment.directory kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-development-webdevelopment.directory +--- kdebase-workspace-3.97.1_749701/menu/desktop/kde-development-webdevelopment.directory 2007-12-17 18:41:21.000000000 +0100 ++++ kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-development-webdevelopment.directory 2007-12-17 22:27:12.000000000 +0100 +@@ -64,7 +64,7 @@ + Name[x-test]=xxWeb Developmentxx + Name[zh_CN]=Web 开发 + Name[zh_TW]=網頁開發 +-Icon=package-network ++Icon=applications-internet + + [Desktop Entry] + Encoding=UTF-8 +@@ -132,5 +132,5 @@ + Name[x-test]=xxWeb Developmentxx + Name[zh_CN]=Web 开发 + Name[zh_TW]=網頁開發 +-Icon=package-network ++Icon=applications-internet + +diff -Naur kdebase-workspace-3.97.1_749701/menu/desktop/kde-editors.directory kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-editors.directory +--- kdebase-workspace-3.97.1_749701/menu/desktop/kde-editors.directory 2007-12-17 18:41:21.000000000 +0100 ++++ kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-editors.directory 2007-12-17 22:12:53.000000000 +0100 +@@ -65,4 +65,4 @@ + Name[xh]=Abahleli + Name[zh_CN]=编辑器 + Name[zh_TW]=編輯器 +-Icon=package_editors ++Icon=accessories-text-editor +diff -Naur kdebase-workspace-3.97.1_749701/menu/desktop/kde-more.directory kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-more.directory +--- kdebase-workspace-3.97.1_749701/menu/desktop/kde-more.directory 2007-12-17 18:41:21.000000000 +0100 ++++ kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-more.directory 2007-12-17 22:25:27.000000000 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=Directory +-Icon=package ++Icon=applications-other + Name=More Applications + Name[af]=Meer Programme + Name[ar]=المزيد من التطبيقات +diff -Naur kdebase-workspace-3.97.1_749701/menu/desktop/kde-unknown.directory kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-unknown.directory +--- kdebase-workspace-3.97.1_749701/menu/desktop/kde-unknown.directory 2007-12-17 18:41:21.000000000 +0100 ++++ kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-unknown.directory 2007-12-17 22:12:53.000000000 +0100 +@@ -62,4 +62,4 @@ + Name[wa]=Pierdous & rtrovĂŠs + Name[x-test]=xxLost & Foundxx + Name[zh_CN]=观感 +-Icon=help ++Icon=system-help +diff -Naur kdebase-workspace-3.97.1_749701/menu/desktop/kde-utilities-file.directory kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-utilities-file.directory +--- kdebase-workspace-3.97.1_749701/menu/desktop/kde-utilities-file.directory 2007-12-17 18:41:21.000000000 +0100 ++++ kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-utilities-file.directory 2007-12-17 22:18:50.000000000 +0100 +@@ -65,7 +65,7 @@ + Name[x-test]=xxFilexx + Name[zh_CN]=文件 + Name[zh_TW]=檔案 +-Icon=kfm ++Icon=system-file-manager + Comment=File + Comment[af]=LĂŞer + Comment[ar]=ملف +diff -Naur kdebase-workspace-3.97.1_749701/menu/desktop/kde-utilities-peripherals.directory kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-utilities-peripherals.directory +--- kdebase-workspace-3.97.1_749701/menu/desktop/kde-utilities-peripherals.directory 2007-12-17 18:41:21.000000000 +0100 ++++ kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-utilities-peripherals.directory 2007-12-17 22:12:53.000000000 +0100 +@@ -67,7 +67,7 @@ Name[xh]=Iilayini zomda Name[zh_CN]=外设 Name[zh_TW]=週邊設備 @@ -31,10 +90,9 @@ Index: menu/desktop/kde-utilities-peripherals.directory Comment=Peripherals Comment[af]=Randapparatuur Comment[ar]=الأجهزة الطرفية -Index: menu/desktop/kde-utilities-pim.directory -=================================================================== ---- menu/desktop/kde-utilities-pim.directory (Revision 744587) -+++ menu/desktop/kde-utilities-pim.directory (Arbeitskopie) +diff -Naur kdebase-workspace-3.97.1_749701/menu/desktop/kde-utilities-pim.directory kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-utilities-pim.directory +--- kdebase-workspace-3.97.1_749701/menu/desktop/kde-utilities-pim.directory 2007-12-17 18:41:22.000000000 +0100 ++++ kdebase-workspace-3.97.1_749701-p/menu/desktop/kde-utilities-pim.directory 2007-12-17 22:12:53.000000000 +0100 @@ -17,7 +17,7 @@ Name[uk]=Керування інформацією Name[x-test]=xxPIMxx @@ -44,23 +102,3 @@ Index: menu/desktop/kde-utilities-pim.directory Comment=PIM Comment[af]=Persoonlike Informasie Bestuurder Comment[ar]=مدير المعلومات الشخصي -Index: menu/desktop/kde-unknown.directory -=================================================================== ---- menu/desktop/kde-unknown.directory (Revision 744587) -+++ menu/desktop/kde-unknown.directory (Arbeitskopie) -@@ -61,4 +61,4 @@ - Name[wa]=Pierdous & rtrovĂŠs - Name[x-test]=xxLost & Foundxx - Name[zh_CN]=观感 --Icon=help -+Icon=system-help -Index: menu/desktop/kde-editors.directory -=================================================================== ---- menu/desktop/kde-editors.directory (Revision 744587) -+++ menu/desktop/kde-editors.directory (Arbeitskopie) -@@ -64,4 +64,4 @@ - Name[xh]=Abahleli - Name[zh_CN]=编辑器 - Name[zh_TW]=編輯器 --Icon=package_editors -+Icon=accessories-text-editor diff --git a/source/kde4/kdebase-workspace/monday.patch b/source/kde4/kdebase-workspace/monday.patch new file mode 100644 index 0000000..4f97594 --- /dev/null +++ b/source/kde4/kdebase-workspace/monday.patch @@ -0,0 +1,141 @@ +Index: libs/plasma/corona.cpp +=================================================================== +--- libs/plasma/corona.cpp (Revision 749701) ++++ libs/plasma/corona.cpp (Revision 749756) +@@ -443,14 +443,19 @@ + + void Corona::screenResized(int screen) + { ++ bool desktopFound = false; + foreach (Containment *c, d->containments) { + if (c->screen() == screen) { + // trigger a relayout + c->setScreen(screen); +- return; ++ desktopFound = desktopFound || c->containmentType() == Containment::DesktopContainment; + } + } + ++ if (desktopFound) { ++ return; ++ } ++ + // a new screen appeared. neat. + // FIXME: apparently QDesktopWidget doesn't do the Right Thing when a new screen is plugged in + // at runtime. seems it gets confused and thinks it's all one big screen? need to +Index: libs/plasma/applet.cpp +=================================================================== +--- libs/plasma/applet.cpp (Revision 749701) ++++ libs/plasma/applet.cpp (Revision 749756) +@@ -672,6 +672,8 @@ + + d->failed = failed; + prepareGeometryChange(); ++ ++ d->failureText = 0; + qDeleteAll(QGraphicsItem::children()); + delete layout(); + +@@ -690,8 +692,6 @@ + .brush(QPalette::Normal).color()); + failureLayout->addItem(d->failureText); + setGeometry(QRectF(geometry().topLeft(), d->failureText->sizeHint())); +- } else { +- d->failureText = 0; + } + + update(); +Index: kwin/effects/desktopgrid.cpp +=================================================================== +--- kwin/effects/desktopgrid.cpp (Revision 749701) ++++ kwin/effects/desktopgrid.cpp (Revision 749756) +@@ -503,10 +503,10 @@ + effects->setElevatedWindow( window_move, true ); + } + } +- else if( me->buttons() == Qt::MidButton && window_move == NULL ) ++ else if(( me->buttons() == Qt::MidButton || me->buttons() == Qt::RightButton ) && window_move == NULL ) + { + EffectWindow* w = windowAt( me->pos()); +- if( w != NULL && w->isMovable()) ++ if( w != NULL ) + { + if( w->isOnAllDesktops()) + effects->windowToDesktop( w, posToDesktop( me->pos())); +Index: kwin/effects.cpp +=================================================================== +--- kwin/effects.cpp (Revision 749701) ++++ kwin/effects.cpp (Revision 749756) +@@ -345,7 +345,7 @@ + void EffectsHandlerImpl::windowToDesktop( EffectWindow* w, int desktop ) + { + Client* cl = dynamic_cast< Client* >( static_cast(w)->window()); +- if( cl && cl->isMovable()) ++ if( cl && !cl->isDesktop() && !cl->isDock() && !cl->isTopMenu()) + Workspace::self()->sendClientToDesktop( cl, desktop, true ); + } + +Index: plasma/applets/kickoff/core/systemmodel.cpp +=================================================================== +--- plasma/applets/kickoff/core/systemmodel.cpp (Revision 749701) ++++ plasma/applets/kickoff/core/systemmodel.cpp (Revision 749756) +@@ -238,6 +238,10 @@ + return access->filePath(); + } + } ++ else if (index.parent().row()==0) { ++ KUrl url = d->placesModel->url(sourceIndex); ++ return url.isLocalFile() ? url.path() : url.prettyUrl(); ++ } + + return QVariant(); + } else if (role==DiskUsedSpaceRole || role== DiskFreeSpaceRole) { +Index: plasma/applets/kickoff/core/models.cpp +=================================================================== +--- plasma/applets/kickoff/core/models.cpp (Revision 749701) ++++ plasma/applets/kickoff/core/models.cpp (Revision 749756) +@@ -91,11 +91,13 @@ + } + else { + item = new QStandardItem; +- const QString basename = QFileInfo(urlString).baseName(); ++ const QString subTitle = url.isLocalFile() ? url.path() : url.prettyUrl(); ++ QString basename = QFileInfo(urlString).baseName(); ++ if (basename.isNull()) ++ basename = subTitle; + item->setText(basename); + item->setIcon(KIcon(KMimeType::iconNameForUrl(url))); + item->setData(url.url(), Kickoff::UrlRole); +- QString subTitle = url.isLocalFile() && url.path().length() > 1 ? url.path() : url.prettyUrl(); + item->setData(subTitle, Kickoff::SubTitleRole); + + setSpecialUrlProperties(url, item); +Index: plasma/applets/kickoff/ui/launcher.cpp +=================================================================== +--- plasma/applets/kickoff/ui/launcher.cpp (Revision 749701) ++++ plasma/applets/kickoff/ui/launcher.cpp (Revision 749756) +@@ -168,7 +168,7 @@ + ItemDelegate *delegate = new ItemDelegate; + view->setItemDelegate(delegate); + view->setItemStateProvider(delegate); +- addView(i18n("Recently Used"), KIcon("view-calendar-week"), model, view); ++ addView(i18n("Recently Used"), KIcon("preferences-system-time"), model, view); + + QAction *clearApplications = new QAction(KIcon("edit-clear-history"), i18n("Clear Recent Applications"), q); + QAction *clearDocuments = new QAction(KIcon("edit-clear-history"), i18n("Clear Recent Documents"), q); +Index: plasma/applets/pager/pager.cpp +=================================================================== +--- plasma/applets/pager/pager.cpp (Revision 749701) ++++ plasma/applets/pager/pager.cpp (Revision 749756) +@@ -244,7 +244,10 @@ + globalcg.writeEntry("rows", m_rows); + // force an update of the column count in recalculateGeometry + m_columns = 0; +- updateConstraints(); ++ m_size = QSizeF(-1, -1); ++ recalculateGeometry(); ++ recalculateWindowRects(); ++ update(); + } + } + From crazy at frugalware.org Tue Dec 18 00:14:28 2007 From: crazy at frugalware.org (crazy) Date: Tue Dec 18 00:14:32 2007 Subject: [Frugalware-git] playground: kdebase-3.97.1_749607-0playground1-i686 Message-ID: <20071217231428.E389611903A0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=8c105f23145f227dad1fbd705202497d7acb7357 commit 8c105f23145f227dad1fbd705202497d7acb7357 Author: crazy Date: Tue Dec 18 00:10:39 2007 +0100 kdebase-3.97.1_749607-0playground1-i686 * update to an newer snapshot * fix Home icon diff --git a/source/kde4/kdebase/FrugalBuild b/source/kde4/kdebase/FrugalBuild index b6ea0e9..3363240 100644 --- a/source/kde4/kdebase/FrugalBuild +++ b/source/kde4/kdebase/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kdebase -pkgver=3.97.1_747252 +pkgver=3.97.1_749607 pkgrel=0playground1 pkgdesc="Basic programs for KDE4" depends=() @@ -12,8 +12,9 @@ archs=('i686') options=('nomirror') _F_kde4_subpkgs=('dolphin' 'kfind' 'konsole' 'kwrite' 'kappfinder' 'konqueror-nsplugins' 'kdepasswd' 'kdialog' 'keditbookmarks' 'konqueror') Finclude kde4 -source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2) -sha1sums=('cd14d9ab26842ea3dd13d9b80be70e04b366cae0') +source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 fix_Home_icon.patch) +sha1sums=('6f580735220162df0bf8cadacfe70dbc2f9dcd71' \ + 'c82cc6f03fce1c311c6dc8420ed5301dc9ba9ba9') subpkgs=("${_F_kde4_subpkgs[@]}" 'libkonq') subdescs=('File Manager.' \ @@ -50,7 +51,7 @@ build() kde4_split "lib/konq" libkonq - ## split it + ## maybe kill off that thing is broken as hell .. kde4_install kinfocenter } diff --git a/source/kde4/kdebase/fix_Home_icon.patch b/source/kde4/kdebase/fix_Home_icon.patch new file mode 100644 index 0000000..283392c --- /dev/null +++ b/source/kde4/kdebase/fix_Home_icon.patch @@ -0,0 +1,12 @@ +diff -Naur kdebase-3.97.1_749607/konqueror/Home.desktop kdebase-3.97.1_749607-p/konqueror/Home.desktop +--- kdebase-3.97.1_749607/konqueror/Home.desktop 2007-12-17 18:37:58.000000000 +0100 ++++ kdebase-3.97.1_749607-p/konqueror/Home.desktop 2007-12-17 23:45:44.000000000 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Type=Application + Exec=kfmclient openProfile filemanagement +-Icon=folder_home ++Icon=go-home + Terminal=false + + Name=Home From vmiklos at frugalware.org Tue Dec 18 01:42:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 01:42:30 2007 Subject: [Frugalware-git] bmf: git-1.5.4.rc0.56.g6fbe42c-1-i686 Message-ID: <20071218004218.639BA11901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=f5c7adbf9478e02846bb03ff0291053713e1ab36 commit f5c7adbf9478e02846bb03ff0291053713e1ab36 Author: Miklos Vajna Date: Tue Dec 18 01:42:10 2007 +0100 git-1.5.4.rc0.56.g6fbe42c-1-i686 - update to newer snapshot - html version of manpages are back, needed by git help -w diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 1de45ca..5606a52 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -3,9 +3,13 @@ USE_DEVEL=${USE_DEVEL:-"y"} +# most people won't need the html version of manpages, but we don't want to +# break git help -w +USE_HTMLMAN=${USE_HTMLMAN:-"y"} + pkgname=git pkgver=1.5.3.7 -Fuse $USE_DEVEL && pkgver=1.5.4.rc0 +Fuse $USE_DEVEL && pkgver=1.5.4.rc0.56.g6fbe42c pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." url="http://www.kernel.org/pub/software/scm/git/" @@ -46,10 +50,15 @@ build() Fsed ' (on debian)' '' templates/hooks--post-receive # don't install the source of the manpages - Fsed ' \*.txt' '' Documentation/install-webdoc.sh + Fsed '\t\*.txt ' '\t' Documentation/install-webdoc.sh + + # fix the path of html manpages + Fsed 'htmldir=$(sharedir)/doc/git-doc' "htmldir=\$(sharedir)/doc/git-$pkgver" Makefile - # we don't need the html version of manpages - Fsed '^DOC_HTML=.*' 'DOC_HTML=' Documentation/Makefile + if ! Fuse $USE_HTMLMAN; then + # we don't need the html version of manpages + Fsed '^DOC_HTML=.*' 'DOC_HTML=' Documentation/Makefile + fi # also we want proper manlinks (how ugly docbook is) sed -i -e "/^\tmv \$@+ \$@/i\\\\tsed -i 's|git\\\\([0-9]\\\\)|\\\\1(\\\\2)|g' \$@+" -e "s/^sed/\\\\tsed/" Documentation/Makefile @@ -90,10 +99,12 @@ build() Fsplit git-gui usr/bin/git-{gui,citool} Fsplit git-gui usr/share/git-gui Fsplit git-gui usr/share/man/man1/git-{gui,citool}.1 + Fsplit git-gui usr/share/doc/git-$pkgver/html/git-{gui,citool}.html # gitk Fsplit gitk usr/bin/gitk Fsplit gitk usr/share/man/man1/gitk.1 + Fsplit git-gui usr/share/doc/git-$pkgver/html/gitk.html } # optimization OK From vmiklos at frugalware.org Tue Dec 18 01:51:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 01:51:05 2007 Subject: [Frugalware-git] frugalware-current: perl-xml-xslt-0.48-1-i686 Message-ID: <20071218005103.280DB11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=755823e051d9cf30e40535d0fd41217c0b7e4fcc commit 755823e051d9cf30e40535d0fd41217c0b7e4fcc Author: Miklos Vajna Date: Tue Dec 18 01:50:39 2007 +0100 perl-xml-xslt-0.48-1-i686 new package diff --git a/source/devel-extra/perl-xml-xslt/FrugalBuild b/source/devel-extra/perl-xml-xslt/FrugalBuild new file mode 100644 index 0000000..4e962a1 --- /dev/null +++ b/source/devel-extra/perl-xml-xslt/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Zsolt Szalai + +_F_perl_name=XML-XSLT +_F_perl_author=J/JS/JSTOWE +pkgver=0.48 +pkgdesc="A perl module for processing XSLT" +Finclude perl +sha1sums=('10beeeaa1da815f6ed202c0824249916f2b2c36d') From vmiklos at frugalware.org Tue Dec 18 02:04:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 02:04:12 2007 Subject: [Frugalware-git] frugalware-current: docbook2x-0.8.8-1-i686 Message-ID: <20071218010410.3398611904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d963dc7060b4d082f1b75a988a339b9382da55b commit 0d963dc7060b4d082f1b75a988a339b9382da55b Author: Miklos Vajna Date: Tue Dec 18 02:03:59 2007 +0100 docbook2x-0.8.8-1-i686 new package diff --git a/source/apps-extra/docbook2x/FrugalBuild b/source/apps-extra/docbook2x/FrugalBuild new file mode 100644 index 0000000..2c6f635 --- /dev/null +++ b/source/apps-extra/docbook2x/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.02 SBU +# Maintainer: VMiklos + +pkgname=docbook2x +pkgver=0.8.8 +pkgrel=1 +pkgdesc="Converts DocBook documents to man and Texinfo format." +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_name="docbook2X" +Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=7856|grep docbook2X-|sed 's/.*-\(.*\)\.t.*/\1/;q'" +depends=('perl-xml-writer' 'perl-xml-xslt' 'perl-sgmlspm' 'perl-xml-sax' 'libxslt') +groups=('apps-extra') +archs=('i686') +sha1sums=('7dc34d420f8aae2a0c0cdb39f52146ce005bf902') +Fconfopts="$Fconfopts --with-xslt-processor=libxslt" +_F_cd_path="$_F_sourceforge_name-$pkgver" +# optimization OK From vmiklos at frugalware.org Tue Dec 18 02:42:56 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 02:42:57 2007 Subject: [Frugalware-git] frugalware-current: docbook2x-0.8.8-2-i686 Message-ID: <20071218014256.2C71011904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5369b65e9ce6b38f1678ca3cb3e68eadb471e83 commit d5369b65e9ce6b38f1678ca3cb3e68eadb471e83 Author: Miklos Vajna Date: Tue Dec 18 02:42:51 2007 +0100 docbook2x-0.8.8-2-i686 forgot to add install scriptlet diff --git a/source/apps-extra/docbook2x/FrugalBuild b/source/apps-extra/docbook2x/FrugalBuild index 2c6f635..c511997 100644 --- a/source/apps-extra/docbook2x/FrugalBuild +++ b/source/apps-extra/docbook2x/FrugalBuild @@ -3,7 +3,7 @@ pkgname=docbook2x pkgver=0.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="Converts DocBook documents to man and Texinfo format." _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="docbook2X" diff --git a/source/apps-extra/docbook2x/docbook2x.install b/source/apps-extra/docbook2x/docbook2x.install new file mode 100644 index 0000000..fa9f15d --- /dev/null +++ b/source/apps-extra/docbook2x/docbook2x.install @@ -0,0 +1,27 @@ +post_install() +{ + xmlcatalog --noout --add "public" \ + "-//Steve Cheng//DOCUMENT DocBook Texinfo Stylesheet//EN" \ + "file:///usr/share/docbook2X/xslt/texi/docbook.xsl" /etc/xml/catalog && + xmlcatalog --noout --add "public" \ + "-//Steve Cheng//DOCUMENT DocBook Man-page Stylesheet//EN" \ + "file:///usr/share/docbook2X/xslt/man/docbook.xsl" /etc/xml/catalog && + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook2x.sourceforge.net/latest/xslt/" \ + "file:///usr/share/docbook2X/xslt/" /etc/xml/catalog && + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook2x.sf.net/latest/xslt/" \ + "file:///usr/share/docbook2X/xslt/" /etc/xml/catalog +} + +pre_remove() +{ + xmlcatalog --noout --del "-//Steve Cheng//DOCUMENT DocBook Texinfo Stylesheet//EN" /etc/xml/catalog && + xmlcatalog --noout --del "-//Steve Cheng//DOCUMENT DocBook Man-page Stylesheet//EN" /etc/xml/catalog && + xmlcatalog --noout --del "http://docbook2x.sourceforge.net/latest/xslt/" /etc/xml/catalog && + xmlcatalog --noout --del "http://docbook2x.sf.net/latest/xslt/" /etc/xml/catalog +} + +op=$1 +shift +$op $* From vmiklos at frugalware.org Tue Dec 18 02:53:54 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 02:53:57 2007 Subject: [Frugalware-git] frugalware-current: docbook2x-0.8.8-2-i686 Message-ID: <20071218015354.EA96F11904C1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c030c7046822080e721e05c974c2b9eeb064c88 commit 7c030c7046822080e721e05c974c2b9eeb064c88 Author: Miklos Vajna Date: Tue Dec 18 02:53:50 2007 +0100 docbook2x-0.8.8-2-i686 brr, i just noticed autoconf variables are used in the perl config, that won't work diff --git a/source/apps-extra/docbook2x/FrugalBuild b/source/apps-extra/docbook2x/FrugalBuild index c511997..8e56c3c 100644 --- a/source/apps-extra/docbook2x/FrugalBuild +++ b/source/apps-extra/docbook2x/FrugalBuild @@ -13,6 +13,14 @@ depends=('perl-xml-writer' 'perl-xml-xslt' 'perl-sgmlspm' 'perl-xml-sax' 'libxsl groups=('apps-extra') archs=('i686') sha1sums=('7dc34d420f8aae2a0c0cdb39f52146ce005bf902') -Fconfopts="$Fconfopts --with-xslt-processor=libxslt" -_F_cd_path="$_F_sourceforge_name-$pkgver" + +build() +{ + Fcd $_F_sourceforge_name-$pkgver + Fconf --with-xslt-processor=libxslt + # perl can't understand autoconf + Fsed '${prefix}' '/usr' perl/config.pl + make || return 1 + Fmakeinstall +} # optimization OK From vmiklos at frugalware.org Tue Dec 18 09:45:13 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 09:45:16 2007 Subject: [Frugalware-git] frugalware-current: docbook2x-0.8.3-1-i686 Message-ID: <20071218084513.E83421190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a908b2b5ae9f372b2d268e2d7d618f62bb3ab33 commit 3a908b2b5ae9f372b2d268e2d7d618f62bb3ab33 Author: Miklos Vajna Date: Tue Dec 18 09:44:58 2007 +0100 docbook2x-0.8.3-1-i686 - downgrade to older version - i know, it sounds stupid but it turns out that the newer version is not yet supported where we need this package, ie as a makedepend for git diff --git a/source/apps-extra/docbook2x/FrugalBuild b/source/apps-extra/docbook2x/FrugalBuild index 8e56c3c..4ef4961 100644 --- a/source/apps-extra/docbook2x/FrugalBuild +++ b/source/apps-extra/docbook2x/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=docbook2x -pkgver=0.8.8 -pkgrel=2 +pkgver=0.8.3 +pkgrel=1 pkgdesc="Converts DocBook documents to man and Texinfo format." _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="docbook2X" @@ -12,15 +12,15 @@ up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=7856|g depends=('perl-xml-writer' 'perl-xml-xslt' 'perl-sgmlspm' 'perl-xml-sax' 'libxslt') groups=('apps-extra') archs=('i686') -sha1sums=('7dc34d420f8aae2a0c0cdb39f52146ce005bf902') +sha1sums=('02e16e055d7c37bd6cb4ddac5abb6f4033e6ac82') build() { Fcd $_F_sourceforge_name-$pkgver - Fconf --with-xslt-processor=libxslt - # perl can't understand autoconf - Fsed '${prefix}' '/usr' perl/config.pl - make || return 1 + Fsed 'doc ' '' Makefile.am + Fautoreconf + Fbuild --with-xslt-processor=libxslt Fmakeinstall } + # optimization OK From priyank at frugalware.org Tue Dec 18 09:49:30 2007 From: priyank at frugalware.org (Priyank) Date: Tue Dec 18 09:49:33 2007 Subject: [Frugalware-git] frugalware-current: jircii-42-1-i686 Message-ID: <20071218084930.C099511901A6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=199ff432178ebf5f2668b992aa8155e9b2481cab commit 199ff432178ebf5f2668b992aa8155e9b2481cab Author: Priyank Date: Tue Dec 18 14:13:17 2007 +0530 jircii-42-1-i686 * Version Bump diff --git a/source/network-extra/jircii/FrugalBuild b/source/network-extra/jircii/FrugalBuild index f6ee7c8..94a46da 100644 --- a/source/network-extra/jircii/FrugalBuild +++ b/source/network-extra/jircii/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=jircii -pkgver=41 -pkgrel=2 +pkgver=42 +pkgrel=1 pkgdesc="jIRCii is an IRC client written in Java." url="http://jircii.hick.org/" depends=() @@ -15,7 +15,7 @@ source=($url/download/jerkb$pkgver.tgz) _F_desktop_name="jIRCii" _F_desktop_categories="Network;" _F_desktop_icon="jircii.png" -sha1sums=('9a11d5f95e49628f6604979d47d5dece81c4eef7') +sha1sums=('916ab95567d5414370a5d495e964f1c79a20e292') build() { From krics at linuxforum.hu Tue Dec 18 09:51:57 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 18 09:52:00 2007 Subject: [Frugalware-git] frugalware-current: ufoai-2.1.1-1-x86_64 Message-ID: <20071218085157.C6FF711901A6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84998eb579fc32136d8b9b58370e8de2d5e66b95 commit 84998eb579fc32136d8b9b58370e8de2d5e66b95 Author: Christian Hamar alias krix Date: Tue Dec 18 09:50:49 2007 +0100 ufoai-2.1.1-1-x86_64 * Version bump * Updated patch to new upstream diff --git a/source/games-extra/ufoai/FrugalBuild b/source/games-extra/ufoai/FrugalBuild index 03c8856..e1e8e80 100644 --- a/source/games-extra/ufoai/FrugalBuild +++ b/source/games-extra/ufoai/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=ufoai -pkgver=2.1 +pkgver=2.1.1 pkgrel=1 pkgdesc="UFO: ALIEN INVASION is a squad-based tactical strategy game in the tradition of the old X-COM PC games, but with a twist." url="http://ufoai.sourceforge.net" @@ -58,9 +58,9 @@ build() { Fdesktop "/usr/bin/ufo" "/usr/share/pixmaps/ufoai.png" "Game;StrategyGame;" } -sha1sums=('8eb87f3ce4152a7788f6d008348d055049ed7946'\ - '9f9f8515bf97d0488ca9d6143d2a56640d3d85d0'\ - '7c1d91d26a33d91ee43da2e56a93f6a2b7469e21'\ - '10701a135efa2e368c085462386d5de2506efe62'\ - '93d5ecd1c952cc6523f6ca1c81b46dce0004aaaf') +sha1sums=('b0d9e6edcbbe0ea1f64ce5d4a08e7cefe1f42b6c' \ + '719e25c498b48f583d81500de81693853dee1ffa' \ + '7c1d91d26a33d91ee43da2e56a93f6a2b7469e21' \ + '10701a135efa2e368c085462386d5de2506efe62' \ + '0852a0d90931c6deaba0a79bdfded12341c5496b') # optimization OK diff --git a/source/games-extra/ufoai/xf.diff b/source/games-extra/ufoai/xf.diff index c9a0001..e2c66c8 100644 --- a/source/games-extra/ufoai/xf.diff +++ b/source/games-extra/ufoai/xf.diff @@ -1,12 +1,12 @@ -diff -Naur ufoai-2.1-source.orig/build/ref_gl.mk ufoai-2.1-source/build/ref_gl.mk ---- ufoai-2.1-source.orig/build/ref_gl.mk 2007-04-11 23:26:21.000000000 +0200 -+++ ufoai-2.1-source/build/ref_gl.mk 2007-04-11 23:33:45.000000000 +0200 -@@ -65,7 +65,7 @@ +diff -Naur ufoai-2.1.1-source.orig/build/ref_gl.mk ufoai-2.1.1-source/build/ref_gl.mk +--- ufoai-2.1.1-source.orig/build/ref_gl.mk 2007-12-18 09:41:10.000000000 +0100 ++++ ufoai-2.1.1-source/build/ref_gl.mk 2007-12-18 09:41:45.000000000 +0100 +@@ -66,7 +66,7 @@ # Say about to build the target $(REF_GLX_TARGET) : $(REF_GLX_OBJS) $(REF_GL_OBJS) $(BUILDDIR)/.dirs - @echo " * [GLX] ... linking"; \ -- $(CC) $(LDFLAGS) $(SHARED_LDFLAGS) -o $@ $(REF_GLX_OBJS) $(REF_GL_OBJS) $(LIBS) $(LNKFLAGS) $(SDL_LIBS) -+ $(CC) $(LDFLAGS) $(SHARED_LDFLAGS) -o $@ $(REF_GLX_OBJS) $(REF_GL_OBJS) $(LIBS) $(LNKFLAGS) -lXxf86vm $(SDL_LIBS) + @echo " * [GLX] ... linking $(LNKFLAGS) ($(REF_GLX_LIBS))"; \ +- $(CC) $(LDFLAGS) $(SHARED_LDFLAGS) -o $@ $(REF_GLX_OBJS) $(REF_GL_OBJS) $(REF_GLX_LIBS) $(LNKFLAGS) ++ $(CC) $(LDFLAGS) $(SHARED_LDFLAGS) -o $@ $(REF_GLX_OBJS) $(REF_GL_OBJS) $(REF_GLX_LIBS) -lXxf86vm $(LNKFLAGS) #--------------------------------------------------------------------------------------------------------------------- From vmiklos at frugalware.org Tue Dec 18 10:43:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 10:43:20 2007 Subject: [Frugalware-git] frugalware-current: docbook2x-0.8.3-2-i686 Message-ID: <20071218094318.CE83611901A6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88e9339e5a202b2584c6acf236f4bfd1bf98aa54 commit 88e9339e5a202b2584c6acf236f4bfd1bf98aa54 Author: Miklos Vajna Date: Tue Dec 18 10:42:54 2007 +0100 docbook2x-0.8.3-2-i686 - add patch to enable default utf8 output - the default input is utf8, so why converting it by default? diff --git a/source/apps-extra/docbook2x/FrugalBuild b/source/apps-extra/docbook2x/FrugalBuild index 4ef4961..572b6be 100644 --- a/source/apps-extra/docbook2x/FrugalBuild +++ b/source/apps-extra/docbook2x/FrugalBuild @@ -3,7 +3,7 @@ pkgname=docbook2x pkgver=0.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Converts DocBook documents to man and Texinfo format." _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="docbook2X" @@ -12,7 +12,9 @@ up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=7856|g depends=('perl-xml-writer' 'perl-xml-xslt' 'perl-sgmlspm' 'perl-xml-sax' 'libxslt') groups=('apps-extra') archs=('i686') -sha1sums=('02e16e055d7c37bd6cb4ddac5abb6f4033e6ac82') +source=($source utf-8-default.patch) +sha1sums=('02e16e055d7c37bd6cb4ddac5abb6f4033e6ac82' \ + 'f84ba25cf4139005b5b5aaf1d813fd3f5d14f92b') build() { diff --git a/source/apps-extra/docbook2x/utf-8-default.patch b/source/apps-extra/docbook2x/utf-8-default.patch new file mode 100644 index 0000000..d0aea19 --- /dev/null +++ b/source/apps-extra/docbook2x/utf-8-default.patch @@ -0,0 +1,12 @@ +diff -Naur docbook2X-0.8.3.orig/perl/db2x_texixml.pl docbook2X-0.8.3/perl/db2x_texixml.pl +--- docbook2X-0.8.3.orig/perl/db2x_texixml.pl 2004-07-16 00:03:26.000000000 +0200 ++++ docbook2X-0.8.3/perl/db2x_texixml.pl 2007-12-18 10:35:37.000000000 +0100 +@@ -60,7 +60,7 @@ + use Getopt::Long; + Getopt::Long::Configure('bundling'); + my $cmdoptions = { +- 'encoding' => 'us-ascii', ++ 'encoding' => 'utf-8', + 'list-files' => 0, + 'to-stdout' => 0, + 'info' => 0, From krics at linuxforum.hu Tue Dec 18 10:45:45 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 18 10:45:47 2007 Subject: [Frugalware-git] frugalware-current: wesnoth-1.2.8-1-x86_64 Message-ID: <20071218094545.A7CC711901A6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=48daed0485253e63ebfb9304b9fee53ee16fb740 commit 48daed0485253e63ebfb9304b9fee53ee16fb740 Author: Christian Hamar alias krix Date: Tue Dec 18 10:42:20 2007 +0100 wesnoth-1.2.8-1-x86_64 * Version bump diff --git a/source/games-extra/wesnoth/FrugalBuild b/source/games-extra/wesnoth/FrugalBuild index da796e7..430dc2b 100644 --- a/source/games-extra/wesnoth/FrugalBuild +++ b/source/games-extra/wesnoth/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=wesnoth -pkgver=1.2.7 +pkgver=1.2.8 pkgrel=1 pkgdesc="Wesnoth is a turn based strategy game played in the fantasy world" url="http://www.wesnoth.org/" @@ -15,6 +15,6 @@ source=(http://www.wesnoth.org/files/$pkgname-$pkgver.tar.bz2) Fconfopts="$Fconfopts --enable-server --enable-editor --enable-tools \ --enable-campaing-server --with-kde --with-gnome \ --with-fifodir=/var/run/wesnothd" -sha1sums=('04ebdda9fe7ed8d728343331e2d37fe01f12ad16') +sha1sums=('da02b2bf952d4e309e47ce332930c1509e9a4d2e') # optimization OK From krics at linuxforum.hu Tue Dec 18 10:54:07 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 18 10:54:10 2007 Subject: [Frugalware-git] frugalware-current: vte-0.16.11-1-x86_64 Message-ID: <20071218095407.CA7F511901A6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39df96592bc6249e3e3916983f5afa0d9c04da1a commit 39df96592bc6249e3e3916983f5afa0d9c04da1a Author: Christian Hamar alias krix Date: Tue Dec 18 10:53:45 2007 +0100 vte-0.16.11-1-x86_64 * Version bump diff --git a/source/gnome/vte/FrugalBuild b/source/gnome/vte/FrugalBuild index 1eddbfb..d9e4749 100644 --- a/source/gnome/vte/FrugalBuild +++ b/source/gnome/vte/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=vte -pkgver=0.16.10 -pkgrel=2 +pkgver=0.16.11 +pkgrel=1 pkgdesc="Virtual Terminal Emulator" url="http://www.gnome.org/" depends=('gtk+2>=2.12.0') @@ -11,7 +11,7 @@ makedepends=('pygtk>=2.12.0' 'gtk-doc' 'perl-xml') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('d6c1fd8a65d52fa42c38bf4f3372989945b16177') +sha1sums=('59273ad4dd6e46483f333aeb652b723de0f1780f') Fconfopts="$Fconfopts --enable-gtk-doc" subpkgs=('vte-python') From vmiklos at frugalware.org Tue Dec 18 11:59:37 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 11:59:39 2007 Subject: [Frugalware-git] bmf: git-1.5.4.rc0.67.gf9c5a80-1-i686 Message-ID: <20071218105937.2D8EF1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=ed88eab058d3e449a2b2014ea49dbe941ae9c738 commit ed88eab058d3e449a2b2014ea49dbe941ae9c738 Author: Miklos Vajna Date: Tue Dec 18 11:59:09 2007 +0100 git-1.5.4.rc0.67.gf9c5a80-1-i686 - update to newer snapshot - added info doc - added scriptlet for info dir diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 5606a52..e62d5c8 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -9,12 +9,12 @@ USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git pkgver=1.5.3.7 -Fuse $USE_DEVEL && pkgver=1.5.4.rc0.56.g6fbe42c +Fuse $USE_DEVEL && pkgver=1.5.4.rc0.67.gf9c5a80 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." url="http://www.kernel.org/pub/software/scm/git/" depends=('curl>=7.16.0' 'openssl') -makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'sgml-common' 'xmlto' 'cpio') +makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x' 'sgml-common' 'xmlto' 'cpio') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump '$url/?C=M;O=D'|grep 'git-[0-9.]*.tar.bz2$'|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" @@ -24,6 +24,7 @@ if ! Fuse $USE_DEVEL; then fi source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware rc.git git.sysconfig) options=('scriptlet') +Finclude texinfo subpkgs=('gitweb' 'git-gui' 'gitk') subdescs=('Web interface for Git.' 'Git GUI tool.' 'Git revision tree visualiser.') @@ -64,8 +65,8 @@ build() sed -i -e "/^\tmv \$@+ \$@/i\\\\tsed -i 's|git\\\\([0-9]\\\\)|\\\\1(\\\\2)|g' \$@+" -e "s/^sed/\\\\tsed/" Documentation/Makefile Fconf - make V=1 CLFAGS="$CFLAGS" ASCIIDOC8=YesPlease ETC_GITCONFIG=/etc/gitconfig all doc test || return 1 - Fmakeinstall install-doc ETC_GITCONFIG=/etc/gitconfig mandir=/usr/share/man + make V=1 CLFAGS="$CFLAGS" ASCIIDOC8=YesPlease ETC_GITCONFIG=/etc/gitconfig DOCBOOK2X_TEXI=docbook2texi all doc info test || return 1 + Fmakeinstall install-doc install-info ETC_GITCONFIG=/etc/gitconfig mandir=/usr/share/man Ffilerel perl/private-Error.pm /usr/lib/perl5/site_perl/current/Error.pm make -C Documentation WEBDOC_DEST=$Fdestdir/usr/share/doc/$pkgname-$pkgver install-webdoc || return 1 # broken symlink @@ -99,12 +100,12 @@ build() Fsplit git-gui usr/bin/git-{gui,citool} Fsplit git-gui usr/share/git-gui Fsplit git-gui usr/share/man/man1/git-{gui,citool}.1 - Fsplit git-gui usr/share/doc/git-$pkgver/html/git-{gui,citool}.html + Fsplit git-gui usr/share/doc/git-$pkgver/git-{gui,citool}.html # gitk Fsplit gitk usr/bin/gitk Fsplit gitk usr/share/man/man1/gitk.1 - Fsplit git-gui usr/share/doc/git-$pkgver/html/gitk.html + Fsplit git-gui usr/share/doc/git-$pkgver/gitk.html } # optimization OK From vmiklos at frugalware.org Tue Dec 18 12:16:04 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 12:16:07 2007 Subject: [Frugalware-git] frugalware-current: texinfo.sh: usr/info -> usr/share/info Message-ID: <20071218111604.B7A811190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=22a9a392616e860874ced5d59c106fac0f517dc7 commit 22a9a392616e860874ced5d59c106fac0f517dc7 Author: Miklos Vajna Date: Tue Dec 18 12:12:20 2007 +0100 texinfo.sh: usr/info -> usr/share/info also update the dir file after a remove diff --git a/source/include/texinfo.install b/source/include/texinfo.install index edf425f..eb6664e 100644 --- a/source/include/texinfo.install +++ b/source/include/texinfo.install @@ -1,10 +1,15 @@ post_install() { - echo -n "generating the top-level Info node... " - mkinfodir /usr/info > /usr/info/dir 2>/dev/null + echo -n "updating the top-level info node... " + mkinfodir /usr/share/info > /usr/share/info/dir 2>/dev/null echo "done." } +post_remove() +{ + post_install +} + op=$1 shift From vmiklos at frugalware.org Tue Dec 18 13:09:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 13:09:25 2007 Subject: [Frugalware-git] pacman-tools: bumppkg: newer git requires force to clean Message-ID: <20071218120923.450F51190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=192eeb4f491480310d2c761ae76461d811d831a3 commit 192eeb4f491480310d2c761ae76461d811d831a3 Author: Miklos Vajna Date: Tue Dec 18 13:09:13 2007 +0100 bumppkg: newer git requires force to clean diff --git a/bumppkg b/bumppkg index 54b1d2b..eb0e661 100755 --- a/bumppkg +++ b/bumppkg @@ -62,7 +62,7 @@ src_cleanup() Fmessage "cleaning up old source files" root="`get_root`" if [ "$F_makepkg_scm" = "git" ]; then - git clean -x . + git clean -x -d -f . else local i workdir From vmiklos at frugalware.org Tue Dec 18 15:09:26 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 15:09:33 2007 Subject: [Frugalware-git] frugalware-current: psyco-1.6-1-i686 Message-ID: <20071218140926.887261190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=528e3f9710eaa078a5bf493c9868544738aba77f commit 528e3f9710eaa078a5bf493c9868544738aba77f Author: Miklos Vajna Date: Tue Dec 18 13:12:15 2007 +0100 psyco-1.6-1-i686 version bump diff --git a/source/devel-extra/psyco/FrugalBuild b/source/devel-extra/psyco/FrugalBuild index 9045891..227a135 100644 --- a/source/devel-extra/psyco/FrugalBuild +++ b/source/devel-extra/psyco/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=psyco -pkgver=1.5.2 +pkgver=1.6 pkgrel=1 pkgdesc="Can massively speed up the execution of any Python code." url="http://psyco.sourceforge.net/" @@ -12,4 +12,4 @@ archs=('i686' '!x86_64') _F_sourceforge_ext="-src.tar.gz" Finclude sourceforge # optimization OK -sha1sums=('acdd491372cff5076b02763e856ecdd99e28f705') +sha1sums=('3c1ffa70b1a37bd855454d41d41a830e9ea82e7d') From vmiklos at frugalware.org Tue Dec 18 15:09:26 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 15:09:35 2007 Subject: [Frugalware-git] frugalware-current: intltool-0.37.0-1-i686 Message-ID: <20071218140926.9A4441190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9a8e10cec5ef0bf8ceeed0a544ad6b7aca9acdec commit 9a8e10cec5ef0bf8ceeed0a544ad6b7aca9acdec Author: Miklos Vajna Date: Tue Dec 18 13:14:24 2007 +0100 intltool-0.37.0-1-i686 version bump diff --git a/source/gnome/intltool/FrugalBuild b/source/gnome/intltool/FrugalBuild index a3db291..940e54c 100644 --- a/source/gnome/intltool/FrugalBuild +++ b/source/gnome/intltool/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=intltool -pkgver=0.36.3 +pkgver=0.37.0 pkgrel=1 pkgdesc="Contains scripts and autoconf magic for internationalizing various kinds of data files." url="http://www.gnome.org/" @@ -11,4 +11,4 @@ groups=('gnome') archs=('i686' 'x86_64') _F_gnome_devel=y Finclude gnome -sha1sums=('e1878d27b2947cea3359f1ea267ab5f88fa6a0e4') +sha1sums=('dcb9a1ccbde6d27926dbd30814e43f4eed5538ff') From vmiklos at frugalware.org Tue Dec 18 15:09:26 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 15:09:37 2007 Subject: [Frugalware-git] frugalware-current: fuse-2.7.2-1-i686 Message-ID: <20071218140926.C494911901A6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=31f805bffd660c08d47251b8e30776f6b130d9ea commit 31f805bffd660c08d47251b8e30776f6b130d9ea Author: Miklos Vajna Date: Tue Dec 18 13:17:33 2007 +0100 fuse-2.7.2-1-i686 version bump diff --git a/source/apps-extra/fuse/FrugalBuild b/source/apps-extra/fuse/FrugalBuild index 4dc99b3..a16a91f 100644 --- a/source/apps-extra/fuse/FrugalBuild +++ b/source/apps-extra/fuse/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=fuse -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=1 pkgdesc="An interface for filesystems implemented in userspace." Finclude sourceforge @@ -11,7 +11,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=121684 |grep 2.X|sed -e 's/.*]\([0-9\.]*\) [A-Z].*/\1/;q'" source=($source rc.fuse rc.fuse-hu.po README.Frugalware) -sha1sums=('ea28a61ff63cd0cf12cd7c9c092a57d79c12edf8' \ +sha1sums=('cd0feca90dd0605e1af05e8afec3f98381823394' \ '83a44b6f6e87d304b42915983a5eff64c9484e07' \ 'b6077229d093f8c01f002e84068e3ce7e795e479' \ 'e176bb09187bae3ef613cf7d6338b2d9210bef59') From vmiklos at frugalware.org Tue Dec 18 15:09:26 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 15:09:38 2007 Subject: [Frugalware-git] frugalware-current: sshfs-fuse-1.9-1-i686 Message-ID: <20071218140926.E7E8411901A7@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=99c83f40d54a89c422b5361c541333b7f6e62709 commit 99c83f40d54a89c422b5361c541333b7f6e62709 Author: Miklos Vajna Date: Tue Dec 18 13:18:17 2007 +0100 sshfs-fuse-1.9-1-i686 version bump diff --git a/source/apps-extra/sshfs-fuse/FrugalBuild b/source/apps-extra/sshfs-fuse/FrugalBuild index e4c7019..d942d52 100644 --- a/source/apps-extra/sshfs-fuse/FrugalBuild +++ b/source/apps-extra/sshfs-fuse/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=sshfs-fuse -pkgver=1.8 +pkgver=1.9 pkgrel=1 pkgdesc="A filesystem client based on the SSH File Transfer Protocol." depends=('fuse' 'glib2') @@ -23,4 +23,4 @@ build() # optimization OK -sha1sums=('ab1df8d8b2a601bc22959a14e95e57fae5fc3787') +sha1sums=('dfd3a72c76f6b4fac4105b23ca228d8166a0510a') From vmiklos at frugalware.org Tue Dec 18 15:09:27 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 15:09:40 2007 Subject: [Frugalware-git] frugalware-current: zsh-4.2.7-1-i686 Message-ID: <20071218140927.1BD3E11901A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13218afa3c6ed32a4c8e2c6556302837073b726d commit 13218afa3c6ed32a4c8e2c6556302837073b726d Author: Miklos Vajna Date: Tue Dec 18 15:07:15 2007 +0100 zsh-4.2.7-1-i686 version bump diff --git a/source/apps/zsh/FrugalBuild b/source/apps/zsh/FrugalBuild index e8fbee2..94da9a7 100644 --- a/source/apps/zsh/FrugalBuild +++ b/source/apps/zsh/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=zsh -pkgver=4.2.6 -pkgrel=2 +pkgver=4.2.7 +pkgrel=1 pkgdesc="Zsh is a shell designed for interactive use" url="http://www.zsh.org/" depends=('termcap' 'ncurses') @@ -12,9 +12,9 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/pub/|grep zsh-[0-9\.]*tar.bz2$|sed -n -e 's/.*h-\(.*\)\.t.*/\1/' -e '1 p'" source=(http://www.zsh.org/pub/$pkgname-$pkgver.tar.bz2 \ http://www.zsh.org/pub/$pkgname-$pkgver-doc.tar.bz2 zshrc) -sha1sums=('e00c3eda3f52c9514bb625bb56e4480358170d39' \ - '84bbc025469d126698b8a09f8328795fed9a1b72' \ - '156d68981ec2af41f3fbf86980cfe4b94f094350') +sha1sums=('64c598cd48b78dff9d29341ea0cd904e7aa49541' \ + '2aef0d011abc9586f7bb9e0f2379fa48bc0dc17b' \ + '156d68981ec2af41f3fbf86980cfe4b94f094350') build() { From vmiklos at frugalware.org Tue Dec 18 15:09:27 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 15:09:41 2007 Subject: [Frugalware-git] frugalware-current: linkchecker-4.8-1-i686 Message-ID: <20071218140927.0729811901A8@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d2e10058626992ea9e80d212de5c114b87017dae commit d2e10058626992ea9e80d212de5c114b87017dae Author: Miklos Vajna Date: Tue Dec 18 13:23:01 2007 +0100 linkchecker-4.8-1-i686 version bump diff --git a/source/network-extra/linkchecker/FrugalBuild b/source/network-extra/linkchecker/FrugalBuild index 40b1eac..60ea574 100644 --- a/source/network-extra/linkchecker/FrugalBuild +++ b/source/network-extra/linkchecker/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: VMiklos pkgname=linkchecker -pkgver=4.7 +pkgver=4.8 pkgrel=1 pkgdesc="Check websites and HTML documents for broken links." depends=('python>=2.5') groups=('network-extra') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('91653bfc9dff30e3be24fac574b6a71c812d1a5e') +sha1sums=('d846cffcd07278cb2f6284f1e1a9780503f99433') build() { From vmiklos at frugalware.org Tue Dec 18 18:54:17 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 18:54:19 2007 Subject: [Frugalware-git] frugalware-current: openjdk-1.6.0-6-i686 Message-ID: <20071218175417.BB2D21190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3bd0d38dddc791b406a7c5f4f52c6d04e9818e9e commit 3bd0d38dddc791b406a7c5f4f52c6d04e9818e9e Author: Miklos Vajna Date: Tue Dec 18 18:53:46 2007 +0100 openjdk-1.6.0-6-i686 add libstdc++ to openjre's subdepends() we love 'open'jre ;) diff --git a/source/devel-extra/openjdk/FrugalBuild b/source/devel-extra/openjdk/FrugalBuild index 12ffa49..1abcc9f 100644 --- a/source/devel-extra/openjdk/FrugalBuild +++ b/source/devel-extra/openjdk/FrugalBuild @@ -21,7 +21,7 @@ source=(http://www.java.net/download/openjdk/jdk7/promoted/b$build_id/$rel_id.zi subpkgs=('openjre') subdescs=("Sun's java runtime environment (GPL version)") -subdepends=('unixodbc libice libxp libxi libsm libxtst libxt alsa-lib') +subdepends=('unixodbc libice libxp libxi libsm libxtst libxt alsa-lib libstdc++') subconflicts=('j2re') subgroups=('xlib-extra') subarchs=('i686') From vmiklos at frugalware.org Tue Dec 18 22:44:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Dec 18 22:44:26 2007 Subject: [Frugalware-git] frugalware-current: mako-0.1.9-1-i686 Message-ID: <20071218214424.F25FE1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f2f869713636b096c6afdeb8fd4d01f2f4219bc commit 5f2f869713636b096c6afdeb8fd4d01f2f4219bc Author: Miklos Vajna Date: Tue Dec 18 22:44:04 2007 +0100 mako-0.1.9-1-i686 new package closes #2612 diff --git a/source/devel-extra/mako/FrugalBuild b/source/devel-extra/mako/FrugalBuild new file mode 100644 index 0000000..7b22298 --- /dev/null +++ b/source/devel-extra/mako/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0 SBU +# Contributor: frubru1 +# Maintainer: VMiklos + +pkgname=mako +_F_archive_name="Mako" +pkgver=0.1.9 +pkgrel=1 +pkgdesc="Mako is a template library written in Python." +url="http://www.makotemplates.org" +depends=('python') +makedepends=('setuptools') +groups=('devel-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump http://pypi.python.org/packages/source/M/Mako/ |Flasttar" +source=(http://pypi.python.org/packages/source/M/Mako/$_F_archive_name-$pkgver.tar.gz) +sha1sums=('e27ed586e88d523ba132ea2bed7d90950981b7c0') +_F_makepkg_chkdep="python" From janny at frugalware.org Tue Dec 18 22:59:37 2007 From: janny at frugalware.org (janny) Date: Tue Dec 18 22:59:39 2007 Subject: [Frugalware-git] frugalware-current: clamav-0.92-1-i686 Message-ID: <20071218215937.760951190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eea718f8004f12a330b73ea6704c49c7161167ca commit eea718f8004f12a330b73ea6704c49c7161167ca Author: janny Date: Tue Dec 18 22:58:45 2007 +0100 clamav-0.92-1-i686 * version bump diff --git a/source/apps-extra/clamav/FrugalBuild b/source/apps-extra/clamav/FrugalBuild index c33cb15..282b57e 100644 --- a/source/apps-extra/clamav/FrugalBuild +++ b/source/apps-extra/clamav/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=clamav -pkgver=0.91.2 +pkgver=0.92 pkgrel=1 pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX" depends=('gmp' 'bzip2' 'curl>=7.16.0') @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge source=($source rc.clamav rc.clamav-hu.po) -sha1sums=('f18007c3045a1d78967adad805c6934d46ca6419' \ +sha1sums=('b6573acd9a7bb6bf3bd4b39a0102ce0be764c5bc' \ '90b22c99927b56992ac05042029d2702db79a8b0' \ '57d36966c45adfd6b3ebd10b91874194924ab2c3') From boobaa at frugalware.org Wed Dec 19 08:29:36 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Dec 19 08:29:39 2007 Subject: [Frugalware-git] frugalware-current: wireshark-0.99.7-1-i686 Message-ID: <20071219072936.7DC281190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59610fd5cf7bdb04a5ba52d393f50d962622301e commit 59610fd5cf7bdb04a5ba52d393f50d962622301e Author: CSÉCSY László Date: Wed Dec 19 08:29:27 2007 +0100 wireshark-0.99.7-1-i686 version bump closes #2605 in -current diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index 12fc64b..d3d6278 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László pkgname=wireshark -pkgver=0.99.6 -pkgrel=4 +pkgver=0.99.7 +pkgrel=1 pkgdesc="The world's most popular network protocol analyzer" url="http://www.wireshark.org/" depends=('heimdal>=1.0' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=2.0.0') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump 'http://www.wireshark.org/download/src/?C=M;O=D' | grep -m1 tar.gz | sed 's/.*wireshark-\(.*\)\.tar\.gz.*/\1/'" source=(http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2) -sha1sums=('91f57158a75adca36c79c35525eb3cf57b927075') +sha1sums=('3cb6e11410d5151734db19d4fc03b42ecb226277') build() { From krics at linuxforum.hu Wed Dec 19 08:30:20 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 08:30:22 2007 Subject: [Frugalware-git] frugalware-current: evince-2.20.2-1-x86_64 Message-ID: <20071219073020.D5D101190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd515c0c0fb3ecbe919b8c6f3575ff6e342e5fc8 commit fd515c0c0fb3ecbe919b8c6f3575ff6e342e5fc8 Author: Christian Hamar alias krix Date: Wed Dec 19 08:30:01 2007 +0100 evince-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome/evince/FrugalBuild b/source/gnome/evince/FrugalBuild index 6225b8d..e9c9ddd 100644 --- a/source/gnome/evince/FrugalBuild +++ b/source/gnome/evince/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=evince -pkgver=2.20.1 -pkgrel=2 +pkgver=2.20.2 +pkgrel=1 pkgdesc="A document viewer for GNOME" depends=('libgnomeui>=2.20.1.1' 'poppler-glib>=0.6' 'ghostscript' 'rarian' 'desktop-file-utils' \ 't1lib' 'dbus-glib>=0.74' 'tetex-kpathsea' 'djvulibre') @@ -22,7 +22,7 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet url="http://www.gnome.org/projects/evince/" -sha1sums=('785813845e30794c31a688507d1628067241d5d1') +sha1sums=('9d8d847314d728e579009eae76f2a84e17c9c893') subpkgs=('evince-nautilus') subdescs=('Evince plugin for Nautilus') From krics at linuxforum.hu Wed Dec 19 08:52:05 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 08:52:08 2007 Subject: [Frugalware-git] frugalware-current: claws-mail-3.2.0-1-x86_64 Message-ID: <20071219075205.68B681190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65f7a8b0805906a8cccbbbac9e47d8afd7d7d28f commit 65f7a8b0805906a8cccbbbac9e47d8afd7d7d28f Author: Christian Hamar alias krix Date: Wed Dec 19 08:51:53 2007 +0100 claws-mail-3.2.0-1-x86_64 * Version bump * NEED test ('cause #2575) diff --git a/source/xapps-extra/claws-mail/FrugalBuild b/source/xapps-extra/claws-mail/FrugalBuild index ec97d1f..a7898e8 100644 --- a/source/xapps-extra/claws-mail/FrugalBuild +++ b/source/xapps-extra/claws-mail/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Bence Nagy pkgname=claws-mail -pkgver=3.0.2 +pkgver=3.2.0 pkgrel=1 pkgdesc="The extended version of Sylpheed, a GTK+ based, lightweight, and fast e-mail client" groups=('xapps-extra') @@ -28,7 +28,7 @@ build() { --enable-spamassassin-plugin cd tools || Fdie make || Fdie - for tool in *.pl *.py *.rc *.sh tb2* update-po uudec; do + for tool in *.pl *.py *.sh tb2* update-po uudec; do Fexerel /usr/lib/claws-mail/tools/${tool} done Ffilerel /usr/lib/claws-mail/tools/multiwebsearch.conf @@ -39,5 +39,5 @@ build() { Ffilerel claws-mail.desktop /usr/share/applications/claws-mail.desktop } -sha1sums=('a607aca53a349f3a0a8d8f7a51f4754705e12350') +sha1sums=('23e093afb9cae541f4ace74f41178a551aec3921') # optimization OK From krics at linuxforum.hu Wed Dec 19 09:10:13 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 09:10:17 2007 Subject: [Frugalware-git] frugalware-current: imagemagick-6.3.7_5-1-x86_64 Message-ID: <20071219081013.3DF891190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=945f0e4ab7bc7034f46c10047b1a8bb4ff917b9e commit 945f0e4ab7bc7034f46c10047b1a8bb4ff917b9e Author: Christian Hamar alias krix Date: Wed Dec 19 09:09:59 2007 +0100 imagemagick-6.3.7_5-1-x86_64 * Version bump diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild index 3fd7cc1..a21194e 100644 --- a/source/xapps/imagemagick/FrugalBuild +++ b/source/xapps/imagemagick/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Christian Hamar alias krix pkgname=imagemagick -pkgver=6.3.7_0 +pkgver=6.3.7_5 pkgrel=1 pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files." url="http://www.imagemagick.org" @@ -17,7 +17,7 @@ options=('scriptlet') up2date="lynx -dump ftp://ftp.imagemagick.net/pub/ImageMagick/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'" source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \ libpng_mmx_patch_x86_64.patch) -sha1sums=('a3dd3eac1179c3963c3144f2b3aa68955bde41ba' \ +sha1sums=('c1d2ddfce5046b71dd7745203a965f413846f55e' \ 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') build() { From krics at linuxforum.hu Wed Dec 19 09:54:09 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 09:54:10 2007 Subject: [Frugalware-git] frugalware-current: tablelist-4.8-1-x86_64 Message-ID: <20071219085409.460551190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b60cccc41e1dab2e03333ca9fab7f166196cd35 commit 1b60cccc41e1dab2e03333ca9fab7f166196cd35 Author: Christian Hamar alias krix Date: Wed Dec 19 09:54:02 2007 +0100 tablelist-4.8-1-x86_64 * Version bump diff --git a/source/xapps-extra/tablelist/FrugalBuild b/source/xapps-extra/tablelist/FrugalBuild index f9f7865..0b62945 100644 --- a/source/xapps-extra/tablelist/FrugalBuild +++ b/source/xapps-extra/tablelist/FrugalBuild @@ -4,7 +4,7 @@ pkgname=tablelist Fpkgversep="" -pkgver=4.6 +pkgver=4.8 pkgrel=1 pkgdesc="The Multi-Column Listbox Package" url="http://www.nemethi.de" @@ -30,4 +30,4 @@ build() { Ffilerel /usr/lib/tcl8.4/$pkgname$pkgver/$i.tcl done } -sha1sums=('1c01d77a9d633ca92b33fc0daa37494b4a84fa6c') +sha1sums=('d97bdb6f937f3610fca758815fc200465fcf65e8') From krics at linuxforum.hu Wed Dec 19 09:58:35 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 09:58:36 2007 Subject: [Frugalware-git] frugalware-current: libdc1394-2.0.0_rc9-1-x86_64 Message-ID: <20071219085835.B108B1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ccbf1330365521b2d820a36e8f3eca173ef7d5ab commit ccbf1330365521b2d820a36e8f3eca173ef7d5ab Author: Christian Hamar alias krix Date: Wed Dec 19 09:58:28 2007 +0100 libdc1394-2.0.0_rc9-1-x86_64 * Version bump diff --git a/source/lib/libdc1394/FrugalBuild b/source/lib/libdc1394/FrugalBuild index 0af38f9..65ba91d 100644 --- a/source/lib/libdc1394/FrugalBuild +++ b/source/lib/libdc1394/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libdc1394 -pkgver=2.0.0_rc7 +pkgver=2.0.0_rc9 pkgrel=1 pkgdesc="a program to extract Microsoft Cabinet files" Finclude sourceforge @@ -19,6 +19,6 @@ build() { Fbuild --without-x } -sha1sums=('2610df9c3a35b548365ace04a4eaeeb90ff8a471') +sha1sums=('7144ce2dd0363cb6b32591c6f29ea49c2d715d07') # optimization OK From krics at linuxforum.hu Wed Dec 19 10:07:45 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 10:07:48 2007 Subject: [Frugalware-git] frugalware-current: glade3-3.4.1-1-x86_64 Message-ID: <20071219090745.971701190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53fbb826e0752a554a56f5349638a394cf898bc4 commit 53fbb826e0752a554a56f5349638a394cf898bc4 Author: Christian Hamar alias krix Date: Wed Dec 19 10:07:33 2007 +0100 glade3-3.4.1-1-x86_64 * Version bump diff --git a/source/gnome-extra/glade3/FrugalBuild b/source/gnome-extra/glade3/FrugalBuild index d333d73..9304fb1 100644 --- a/source/gnome-extra/glade3/FrugalBuild +++ b/source/gnome-extra/glade3/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=glade3 -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Glade is a GUI builder for GTK+ and Gnome. (VERSION 3)" url="http://glade.gnome.org/" depends=('atk>=1.18.0' 'libgnomeui>=2.18.0' 'pango' 'devhelp') -makedepends=('perl-xml') +makedepends=('perl-xml' 'gtk-doc') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" @@ -15,7 +15,7 @@ Finclude gnome gnome-scriptlet source=(${source[@]} desktop-file-fixes.patch) groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('79710d932db8fdd19a5aff21727af14059d16763' \ +sha1sums=('09a02307674ee71612a37e476c6f19c91a70c321' \ '28a0ecf9ea108499ea25af1238f3a8fccf9a05d7') Fconfopts="$Fconfopts --enable-gtk-doc" From krics at linuxforum.hu Wed Dec 19 10:23:41 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 10:23:42 2007 Subject: [Frugalware-git] frugalware-current: python-musicbrainz2-0.5.0-1-x86_64 Message-ID: <20071219092341.09ECD1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af9e2222cb62642ea39b0954e04f46c63dddbb09 commit af9e2222cb62642ea39b0954e04f46c63dddbb09 Author: Christian Hamar alias krix Date: Wed Dec 19 10:23:30 2007 +0100 python-musicbrainz2-0.5.0-1-x86_64 * Version bump diff --git a/source/devel-extra/python-musicbrainz2/FrugalBuild b/source/devel-extra/python-musicbrainz2/FrugalBuild index 7fca51a..e9bec29 100644 --- a/source/devel-extra/python-musicbrainz2/FrugalBuild +++ b/source/devel-extra/python-musicbrainz2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=python-musicbrainz2 -pkgver=0.4.1 +pkgver=0.5.0 pkgrel=1 pkgdesc="An interface to the MusicBrainz XML web service" url="http://musicbrainz.org/products/python-musicbrainz2/" @@ -12,4 +12,4 @@ archs=('i686' 'x86_64') license="BSD" up2date="lynx -dump 'http://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/?C=M;O=D'|grep $pkgname.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('3b44727beef2e0898984b612d82e59179a9ef726') +sha1sums=('a8ce247d286e9d4b8291730efe858252bafb592a') From krics at linuxforum.hu Wed Dec 19 10:29:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 10:29:41 2007 Subject: [Frugalware-git] frugalware-current: picard-0.9.0-1-x86_64 Message-ID: <20071219092938.E04CA1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=23a94a767209e8cceeb626724ce88a50e2d8e966 commit 23a94a767209e8cceeb626724ce88a50e2d8e966 Author: Christian Hamar alias krix Date: Wed Dec 19 10:29:27 2007 +0100 picard-0.9.0-1-x86_64 * Version bump diff --git a/source/xmultimedia-extra/picard/FrugalBuild b/source/xmultimedia-extra/picard/FrugalBuild index 3e0bae6..b2cf364 100644 --- a/source/xmultimedia-extra/picard/FrugalBuild +++ b/source/xmultimedia-extra/picard/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=picard -pkgver=0.7.2 -pkgrel=3 +pkgver=0.9.0 +pkgrel=1 pkgdesc="The next generation MusicBrainz tagger" url="http://musicbrainz.org/products/picard/" depends=('python-ctypes' 'python-musicbrainz2' 'libtunepimp-python>=0.5.3' 'libmusicbrainz' \ @@ -12,15 +12,14 @@ groups=('xmultimedia-extra') archs=('i686' 'x86_64') options=('nostrip' 'scriptlet') up2date="lynx -dump 'http://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/?C=M;O=D'|grep $pkgname.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/$pkgname-$pkgver.tar.gz wxpy28.patch) -sha1sums=('4046bcaf3b481c13f7bcbb2f2a858eacdbba1184' \ - 'f81e2aa7c52b351a7425fca1d8276c4558d2fc06') +source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('45d04acfc1daef405e1b0e2a1779802c663ce8dc') build() { Fcd - Fpatchall - # Need a patch from svn to run with libtunepimp 0.4 (autofinger disabled :( ) python setup.py install --prefix "$Fprefix" --root "$Fdestdir" || Fdie # Wrapper fixup sed -i -e "s|/var/tmp/fst/pkg||g" "$Fdestdir/usr/bin/picard" || Fdie } + +# optimization OK From krics at linuxforum.hu Wed Dec 19 10:42:04 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 10:42:13 2007 Subject: [Frugalware-git] frugalware-current: java-access-bridge-1.20.2-1-x86_64 Message-ID: <20071219094204.C5ECE11901A6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6dc24193975c5cca44aa46c0a86d1afcc2ccb0d commit e6dc24193975c5cca44aa46c0a86d1afcc2ccb0d Author: Christian Hamar alias krix Date: Wed Dec 19 10:41:54 2007 +0100 java-access-bridge-1.20.2-1-x86_64 * Version bump diff --git a/source/gnome-extra/java-access-bridge/FrugalBuild b/source/gnome-extra/java-access-bridge/FrugalBuild index ee25b2a..e1c851b 100644 --- a/source/gnome-extra/java-access-bridge/FrugalBuild +++ b/source/gnome-extra/java-access-bridge/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=java-access-bridge -pkgver=1.20.0 +pkgver=1.20.2 pkgrel=1 pkgdesc="Java access bridge for GNOME" url="http://www.gnome.org/" @@ -11,4 +11,4 @@ makedepends=('intltool' 'j2sdk' 'j2re' 'gcc-gcj' 'libbonobo>=2.20.0' 'at-spi>=1. groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('f51467da046e387896a662006c4a7d449d79b0a8') +sha1sums=('f4844d97af5084593dc0ff5030ba86fded0987e8') From krics at linuxforum.hu Wed Dec 19 10:49:31 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 10:49:33 2007 Subject: [Frugalware-git] frugalware-current: gnome-speech-0.4.17-1-x86_64 Message-ID: <20071219094931.8ABBD1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ad13133cfd0be25ea1721356527a350695fae93 commit 7ad13133cfd0be25ea1721356527a350695fae93 Author: Christian Hamar alias krix Date: Wed Dec 19 10:49:24 2007 +0100 gnome-speech-0.4.17-1-x86_64 * Version bump diff --git a/source/gnome-extra/gnome-speech/FrugalBuild b/source/gnome-extra/gnome-speech/FrugalBuild index a6f0ebf..393c0d8 100644 --- a/source/gnome-extra/gnome-speech/FrugalBuild +++ b/source/gnome-extra/gnome-speech/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-speech -pkgver=0.4.16 -pkgrel=2 +pkgver=0.4.17 +pkgrel=1 pkgdesc="GNOME Text-to-Speech" url="http://www.gnome.org/" depends=('libbonobo>=2.20.0' 'festival') @@ -12,5 +12,5 @@ groups=('gnome-extra') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('fcc3860a471b926878a5fe6c5dfcae3ef9390b81') +sha1sums=('d9dc96ffac1d16a86580ae45d60da22999fa1c98') # optimization OK From krics at linuxforum.hu Wed Dec 19 11:39:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 11:39:40 2007 Subject: [Frugalware-git] frugalware-current: notecase-1.7.4-1-x86_64 Message-ID: <20071219103938.023611190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5368de70329e4d8f781b9adf4b82bd80a19dbaa4 commit 5368de70329e4d8f781b9adf4b82bd80a19dbaa4 Author: Christian Hamar alias krix Date: Wed Dec 19 11:39:30 2007 +0100 notecase-1.7.4-1-x86_64 * Version bump diff --git a/source/gnome-extra/notecase/FrugalBuild b/source/gnome-extra/notecase/FrugalBuild index 9b17807..f4365da 100644 --- a/source/gnome-extra/notecase/FrugalBuild +++ b/source/gnome-extra/notecase/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=notecase -pkgver=1.7.2 +pkgver=1.7.4 pkgrel=1 pkgdesc="a hierarchical note manager (aka. outliner)" url="http://notecase.sourceforge.net/" @@ -14,5 +14,5 @@ _F_gnome_desktop="y" _F_gnome_mime="y" Finclude sourceforge gnome-scriptlet options=('scriptlet') -sha1sums=('79c47e719a4785de82386bfa81fb6e7d367ee970') +sha1sums=('9156194f48553ae4a17f9fcf7151d42c0f146793') # optimization OK From krics at linuxforum.hu Wed Dec 19 11:51:25 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 11:51:28 2007 Subject: [Frugalware-git] frugalware-current: epiphany-2.20.2-1-x86_64 Message-ID: <20071219105125.A214A1190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=758a4ef4902000915f2ca94132eb469695340c2c commit 758a4ef4902000915f2ca94132eb469695340c2c Author: Christian Hamar alias krix Date: Wed Dec 19 11:51:16 2007 +0100 epiphany-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome-extra/epiphany/FrugalBuild b/source/gnome-extra/epiphany/FrugalBuild index 597dc4d..98ab240 100644 --- a/source/gnome-extra/epiphany/FrugalBuild +++ b/source/gnome-extra/epiphany/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=epiphany -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=1 pkgdesc="GNOME webbrowser based on the mozilla rendering engine" url="http://www.gnome.org/projects/epiphany/" @@ -21,6 +21,6 @@ groups=('gnome-extra') archs=('x86_64' 'i686') Fconfopts="$Fconfopts -with-gecko=xulrunner \ --enable-python --enable-certificate-manager --enable-gtk-doc" -sha1sums=('f7f15f5c8c9c4146ef92583f306e98265c8b0011') +sha1sums=('e1950b7abb0f25fb3fd15cab08bf4b6ccc60fa97') # optimization OK From krics at linuxforum.hu Wed Dec 19 12:06:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 19 12:06:56 2007 Subject: [Frugalware-git] frugalware-current: dhcpcd-3.1.8-1-x86_64 Message-ID: <20071219110653.A20E91190005@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca693d079b8357d2c26255a3631d5d03d40d4805 commit ca693d079b8357d2c26255a3631d5d03d40d4805 Author: Christian Hamar alias krix Date: Wed Dec 19 12:06:44 2007 +0100 dhcpcd-3.1.8-1-x86_64 * Version bump * Modified patch for new upstream diff --git a/source/base/dhcpcd/FrugalBuild b/source/base/dhcpcd/FrugalBuild index eb51c58..34cc740 100644 --- a/source/base/dhcpcd/FrugalBuild +++ b/source/base/dhcpcd/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=dhcpcd -pkgver=3.1.7 +pkgver=3.1.8 pkgrel=1 pkgdesc="A DHCP client daemon" url="http://dhcpcd.berlios.de" @@ -14,8 +14,8 @@ _F_berlios_ext=".tar.bz2" Finclude berlios source=(${source[@]} dhcpcd-3.0.17-service-paths.patch \ dhcpcd-3.0.2-dont-log-to-stdout.patch) -sha1sums=('d8ccca65f9c576eaf39f0a4edb2c087e95fc6314' \ - '661bacf94b26bec5ae8f9fe27083adb03ea5c5b4' \ +sha1sums=('528b43049d5c7646d78108aa2043897df7f8d1f9' \ + 'de3022c0b006ea0c1bbe8ea5873632d3394f50ef' \ '171e1b8bffe2b9c12744029cb516d7c245c8770b') build() { diff --git a/source/base/dhcpcd/dhcpcd-3.0.17-service-paths.patch b/source/base/dhcpcd/dhcpcd-3.0.17-service-paths.patch index 211dae0..c9807a3 100644 --- a/source/base/dhcpcd/dhcpcd-3.0.17-service-paths.patch +++ b/source/base/dhcpcd/dhcpcd-3.0.17-service-paths.patch @@ -1,17 +1,21 @@ -diff -Naur dhcpcd-3.1.5.orig/config.h dhcpcd-3.1.5/config.h ---- dhcpcd-3.1.5.orig/config.h 2007-08-26 22:04:38.000000000 +0200 -+++ dhcpcd-3.1.5/config.h 2007-08-26 22:05:56.000000000 +0200 -@@ -61,11 +61,11 @@ - #define NTPFILE ETCDIR "/ntp.conf" - #define NTPDRIFTFILE ETCDIR "/ntp.drift" - #define NTPLOGFILE "/var/log/ntp.log" --#define NTPSERVICE ETCDIR "/init.d/ntpd" -+#define NTPSERVICE ETCDIR "/rc.d/rc.ntpd" - #define NTPRESTARTARGS "--nodeps", "--quiet", "conditionalrestart" - - #define OPENNTPFILE ETCDIR "/ntpd.conf" --#define OPENNTPSERVICE ETCDIR "/init.d/ntpd" -+#define OPENNTPSERVICE ETCDIR "/rc.d/rc.ntpd" - #define OPENNTPRESTARTARGS "--nodeps", "--quiet", "conditionalrestart" - - #define DEFAULT_SCRIPT ETCDIR "/" PACKAGE ".sh" +diff -Naur dhcpcd-3.1.8.orig/config.h dhcpcd-3.1.8/config.h +--- dhcpcd-3.1.8.orig/config.h 2007-12-19 12:02:56.000000000 +0100 ++++ dhcpcd-3.1.8/config.h 2007-12-19 12:03:36.000000000 +0100 +@@ -72,7 +72,7 @@ + # define SERVICE "OPENRC" + # define NISSERVICE ETCDIR "/init.d/ypbind" + # define NISRESTARTARGS "--nodeps", "--quiet", "conditionalrestart" +-# define NTPSERVICE ETCDIR "/init.d/ntpd" ++# define NTPSERVICE ETCDIR "/rc.d/ntpd" + # define NTPRESTARTARGS "--nodeps", "--quiet", "conditionalrestart" + #elif ENABLE_BSDRC + # define SERVICE "BSDRC" +@@ -96,7 +96,7 @@ + # define SERVICE "SYSV" + # define NISSERVICE ETCDIR "/init.d/ypbind" + # define NISRESTARTARGS "restart" +-# define NTPSERVICE ETCDIR "/init.d/ntpd" ++# define NTPSERVICE ETCDIR "/rc.d/ntpd" + # define NTPRESTARTARGS "restart" + #else + # undef ENABLE_NIS From vmiklos at frugalware.org Wed Dec 19 13:22:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 19 13:22:27 2007 Subject: [Frugalware-git] frugalware-current: simgear-1.0.0-1-i686 Message-ID: <20071219122224.7BBF1119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6bcfc20bf5d52d9ac4b9e181844a80f8ba144f3a commit 6bcfc20bf5d52d9ac4b9e181844a80f8ba144f3a Author: Miklos Vajna Date: Wed Dec 19 13:21:57 2007 +0100 simgear-1.0.0-1-i686 version bump diff --git a/source/xlib-extra/simgear/FrugalBuild b/source/xlib-extra/simgear/FrugalBuild index 08a9ae0..c6e5d57 100644 --- a/source/xlib-extra/simgear/FrugalBuild +++ b/source/xlib-extra/simgear/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=simgear -pkgver=0.3.10 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="Libraries to be used as building blocks for quickly assembling 3d simulations" url="http://www.simgear.org/" depends=() @@ -12,7 +12,7 @@ groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep 'Version [0-9\.]* '|sed -n 's/.*n \(.*\) i.*/\1/;1 p'" source=(ftp://ftp.simgear.org/pub/$pkgname/Source/SimGear-$pkgver.tar.gz) -sha1sums=('83e8435b52463fdb2736ccb2f0e42b572528131f') +sha1sums=('cad6cc8a205005731633d8dec994cfa299f90e8a') build() { From vmiklos at frugalware.org Wed Dec 19 13:22:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 19 13:22:29 2007 Subject: [Frugalware-git] frugalware-current: kvm-57-1-i686 Message-ID: <20071219122224.6E62B1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=541d43181cca5ba505e38aabecadcab055b1ced5 commit 541d43181cca5ba505e38aabecadcab055b1ced5 Author: Miklos Vajna Date: Wed Dec 19 13:05:04 2007 +0100 kvm-57-1-i686 version bump diff --git a/source/xapps-extra/kvm/FrugalBuild b/source/xapps-extra/kvm/FrugalBuild index aafe5b0..63a1257 100644 --- a/source/xapps-extra/kvm/FrugalBuild +++ b/source/xapps-extra/kvm/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=kvm -pkgver=56 +pkgver=57 pkgrel=1 pkgdesc="KVM is a kernel based virtual machine" url="http://kvm.sourceforge.net" @@ -12,7 +12,7 @@ archs=('i686') Finclude sourceforge kernel-version depends=("kernel>=$_F_kernelver_ver" 'sdl' 'zlib') makedepends=("kernel-source>=$_F_kernelver_ver" 'gcc-3.3') -sha1sums=('25829c90a26003f1c2b62af5fdb9db913dd63f28') +sha1sums=('128d28fe342aad59ce5fdf7f29d16de5cd15bb95') Fconfopts="--prefix=$Fprefix" # no changelog in the tarball, you can reach it here: From vmiklos at frugalware.org Wed Dec 19 13:51:07 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 19 13:51:08 2007 Subject: [Frugalware-git] frugalware-current: module-init-tools-3.4-2-i686 Message-ID: <20071219125107.C60E61190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dde23034343d2a0796449a78ef7a690a86766de7 commit dde23034343d2a0796449a78ef7a690a86766de7 Author: Miklos Vajna Date: Wed Dec 19 13:50:04 2007 +0100 module-init-tools-3.4-2-i686 - added patch to prefer modprobe.d over modprobe.conf. this change should not be problematic as we did not use those dirs/files so far - rc.modules now handles module parameters again. closes #2626 diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index 70c153b..f5d3547 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -1,10 +1,9 @@ # Compiling Time: 0.01 SBU # Maintainer: VMiklos -# Modified by Adam Zlehovszky pkgname=module-init-tools pkgver=3.4 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://kerneltools.org/KernelTools.org" depends=('glibc') @@ -13,16 +12,21 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') backup=('etc/rc.d/rc.modules' 'etc/sysconfig/modules') up2date="lynx -dump http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/|Flasttarbz2" -source=(http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/$pkgname-$pkgver.tar.bz2 rc.modules modules) +source=(http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/$pkgname-$pkgver.tar.bz2 rc.modules modules \ + prefer-modprobe.d.patch) sha1sums=('fcdf758d171211b72210d48b7303ccb5651a1850' \ - '4eea32f43b0adafc380ee88d70dc8f03a0b4b062' \ - '4c840e22304f1b152be871b7b4eb99c0cecf482f') + '8cbe625456dffe92b6ea3207a3a09eca2a7c4ad7' \ + '4c840e22304f1b152be871b7b4eb99c0cecf482f' \ + '4adb4039cc9d2dc1339dd35058094a8fc90a5da2') options=('scriptlet') build() { Fsed '2>&1' '' Makefile* - Fbuild --exec-prefix=/ --enable-zlib + Fpatchall + Fautoreconf + Fmake --exec-prefix=/ --enable-zlib + Fmakeinstall Fmv /bin/lsmod /sbin/ Ffile /etc/sysconfig/modules Frcd modules diff --git a/source/base/module-init-tools/prefer-modprobe.d.patch b/source/base/module-init-tools/prefer-modprobe.d.patch new file mode 100644 index 0000000..4fbfa49 --- /dev/null +++ b/source/base/module-init-tools/prefer-modprobe.d.patch @@ -0,0 +1,23 @@ +diff -Naur module-init-tools-3.4/Makefile.am module-init-tools-3.4-p/Makefile.am +--- module-init-tools-3.4/Makefile.am 2007-10-07 23:51:46.000000000 +0200 ++++ module-init-tools-3.4-p/Makefile.am 2007-12-19 13:31:01.000000000 +0100 +@@ -31,7 +31,7 @@ + + sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static + bin_PROGRAMS = lsmod +-sbin_SCRIPTS = generate-modprobe.conf ++#sbin_SCRIPTS = generate-modprobe.conf + INSTALL = $(SHELL) $(top_srcdir)/install-with-care + + TESTS = tests/runtests +diff -Naur module-init-tools-3.4/modprobe.c module-init-tools-3.4-p/modprobe.c +--- module-init-tools-3.4/modprobe.c 2007-10-07 23:57:23.000000000 +0200 ++++ module-init-tools-3.4-p/modprobe.c 2007-12-19 13:29:38.000000000 +0100 +@@ -1226,7 +1226,6 @@ + + static const char *default_configs[] = + { +- "/etc/modprobe.conf", + "/etc/modprobe.d", + }; + diff --git a/source/base/module-init-tools/rc.modules b/source/base/module-init-tools/rc.modules index 7d1f783..c3bdc9a 100644 --- a/source/base/module-init-tools/rc.modules +++ b/source/base/module-init-tools/rc.modules @@ -52,17 +52,11 @@ if [ "$1" = "start" ]; then ## Starting reading conf file and loading modules if [ -r $MODCONFFILE ]; then start "$modprobe" - Firstcount=$(wc -l < "$MODCONFFILE") - ## Fix line count - NUM=$(expr $Firstcount + 1) - - for module in $(seq $NUM) + while read module do - read module - ## Removing bad lines if [ "$module" != "" -a "$(echo $module | grep -v '#')" ];then - $MODPROBEBIN $module + echo $MODPROBEBIN $module fi done < $MODCONFFILE From vmiklos at frugalware.org Wed Dec 19 14:15:53 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 19 14:15:55 2007 Subject: [Frugalware-git] frugalware-current: udev-118-1-i686 Message-ID: <20071219131553.8832E1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fbaf2e7aebd4064c50a7d69927747dd8f681f413 commit fbaf2e7aebd4064c50a7d69927747dd8f681f413 Author: Miklos Vajna Date: Wed Dec 19 14:13:23 2007 +0100 udev-118-1-i686 - version bump - updated rc.udev to use udevadm trigger/settle instead of the obsolete udevstart (from crazy) - removed the hotplug service, it's now part of rc.udev - the /etc/sysconfig/blacklist file now has a new format, read modprobe.conf(5) to see the new syntax. the old format is converted automatically diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index 2563216..2e3101c 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=udev -pkgver=117 +pkgver=118 pkgrel=1 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" @@ -16,9 +16,8 @@ conflicts=('devfsd' 'pcmcia-cs' 'hotplug') replaces=('hotplug') up2date="lynx -dump '$url?C=M;O=D'|grep 'udev-.*tar.bz2 '|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($url/$pkgname-$pkgver.tar.gz rc.udev blacklist \ - rc.hotplug rc.hotplug-hu.po \ README.Frugalware) -signatures=("${source[0]}.sign" '' '' '' '' '') +signatures=("${source[0]}.sign" '' '' '') # if you update this package, you MUST test it carefully, # including the rules. run 'udevtest -h' for the later @@ -31,7 +30,6 @@ build() Fpatchall make V=1 || return 1 Fmakeinstall EXTRAS="extras/ata_id extras/cdrom_id extras/path_id extras/edd_id extras/firmware extras/floppy extras/scsi_id extras/usb_id extras/volume_id extras/rule_generator" - Fexerel /sbin/udevstart Fmkdir /lib/udev/devices # there is a newer version of this in the packages folder, don't # overwrite it @@ -44,8 +42,9 @@ build() # all the other not needed we don't have these archs Frm etc/udev/rules.d/40-{alsa,ppc,s390,ia64}.rules Fexe /etc/rc.d/rc.udev - Frcd2 hotplug Ffile /etc/sysconfig/blacklist + Fmkdir /etc/modprobe.d + Fln /etc/sysconfig/blacklist /etc/modprobe.d/blacklist Fdoc README.Frugalware mknod -m 700 $Fdestdir/dev/console c 5 1 chgrp tty $Fdestdir/dev/console diff --git a/source/base/udev/blacklist b/source/base/udev/blacklist index f7660f6..11ecf22 100644 --- a/source/base/udev/blacklist +++ b/source/base/udev/blacklist @@ -4,8 +4,7 @@ # no matter which driver happens to get probed first. Sometimes user # mode tools can also control driver binding. # -# Syntax: driver name alone (without any spaces) on a line. Other -# lines are ignored. +# Syntax: see modprobe.conf(5), basically: # - -seclvl +# blacklist foo +# blacklist bar diff --git a/source/base/udev/rc.hotplug b/source/base/udev/rc.hotplug deleted file mode 100644 index ae781f9..0000000 --- a/source/base/udev/rc.hotplug +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# (c) 2003-2006 Miklos Vajna -# (c) 2005 Marcus Habermehl -# rc.hotplug for Frugalware -# distributed under GPL License - -# chkconfig: 2345 06 99 -# description: Automatic hardware detection - -source /lib/initscripts/functions -TEXTDOMAIN=hotplug -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop) - -rc_start() -{ - msg $"Activating hardware detection" - for i in `find /sys/devices/ -name modalias |grep pci` - do - modlist="$modlist $(modprobe --show-depends `cat $i` 2>/dev/null|sed 's|insmod [^ ]*/\([^ ]*\)\.ko|\1|g')" - done - if [ -e /etc/sysconfig/blacklist ]; then - for i in `cat /etc/sysconfig/blacklist|sed 's/#.*$//'`; - do - blacklist="$blacklist s/$i//;" - done - modlist=`echo "$modlist"|sed "$blacklist"` - fi - echo "0" > /proc/sys/kernel/printk - for i in `echo $modlist|sed 's/ /\n/g'|sort -u` - do - modprobe $i >/dev/null 2>&1 - done - # closes #281 - sleep 1 - ok $? -} - -rc_stop() -{ - /bin/true -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/udev/rc.hotplug-hu.po b/source/base/udev/rc.hotplug-hu.po deleted file mode 100644 index b0f6bfe..0000000 --- a/source/base/udev/rc.hotplug-hu.po +++ /dev/null @@ -1,24 +0,0 @@ -# Hungarian translations for rc.hotplug package. -# Copyright (C) 2006 THE rc.hotplug'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.hotplug package. -# , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.hotplug\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-05 12:37+0100\n" -"PO-Revision-Date: 2006-01-05 12:28+0100\n" -"Last-Translator: \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.hotplug:25 -msgid "Activating hardware detection" -msgstr "Az automatikus hardverfelismerés indítása" - -#~ msgid "Stopping hotpluggable subsystem" -#~ msgstr "A hotplug alrendszer leállítása" diff --git a/source/base/udev/rc.hotplug.pot b/source/base/udev/rc.hotplug.pot deleted file mode 100644 index eb052c4..0000000 --- a/source/base/udev/rc.hotplug.pot +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-05 12:37+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.hotplug:25 -msgid "Activating hardware detection" -msgstr "" diff --git a/source/base/udev/rc.udev b/source/base/udev/rc.udev index 09b2ccf..36afc39 100644 --- a/source/base/udev/rc.udev +++ b/source/base/udev/rc.udev @@ -14,6 +14,8 @@ mount / -o rw,remount mount none -t sysfs /sys +export MODPROBE_OPTIONS="--use-backlist" + . /etc/udev/udev.conf prog=udev @@ -22,38 +24,6 @@ bin=/sbin/udev udevd=/sbin/udevd udev_root="/dev" -run_udev () { - # handle block devices and their partitions - for i in ${sysfs_dir}/block/*; do - # add each drive - export DEVPATH=${i#${sysfs_dir}} - #echo "$DEVPATH" - $bin block - - # add each partition, on each device - for j in $i/*; do - if [ -f $j/dev ]; then - export DEVPATH=${j#${sysfs_dir}} - #echo "$DEVPATH" - $bin block - fi - done - done - # all other device classes - for i in ${sysfs_dir}/class/*; do - for j in $i/*; do - if [ -f $j/dev ]; then - export DEVPATH=${j#${sysfs_dir}} - CLASS=`echo ${i#${sysfs_dir}} | \ - cut --delimiter='/' --fields=3-` - #echo "$DEVPATH" - $bin $CLASS - fi - done - done - return 0 -} - make_extra_nodes () { # there are a few things that sysfs does not export for us. # these things go here (and remember to remove them in @@ -70,6 +40,13 @@ make_extra_nodes () { mkdir $udev_root/shm } +start() +{ + /sbin/udevadm trigger + # Wait for udev events + /sbin/udevadm settle +} + # don't use udev if sysfs is not mounted. if [ ! -d $sysfs_dir/block ]; then exit 1 @@ -83,11 +60,6 @@ export ACTION=add export UDEV_NO_SLEEP=1 #echo "Creating initial udev device nodes:" -# You can use the shell scripts above by calling run_udev or execute udevstart -# which does the same thing, but much faster by not using shell. -# Only comment out one of the following lines. -#run_udev -/sbin/udevstart #echo "making extra nodes" make_extra_nodes @@ -103,13 +75,18 @@ if ! [ `pidof -o %PPID /sbin/udevd` ]; then /sbin/udevd --daemon fi +mkdir -p /dev/.udev/queue +start + # Make udevsend the hotplug multiplexer if [ -f "/sys/class/tty/console/uevent" ]; then # trigger the sorted events echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug -else - echo "/sbin/udevsend" > /proc/sys/kernel/hotplug -fi +fi + +## just in case we have a box with a lot USB or external HW try detecting again +start + mount / -o ro,remount # end of rc.udev diff --git a/source/base/udev/udev.install b/source/base/udev/udev.install index 15f858a..422e11a 100644 --- a/source/base/udev/udev.install +++ b/source/base/udev/udev.install @@ -2,15 +2,18 @@ post_install() { cd /etc/rc.d/rcS.d ln -sf ../rc.udev S00rc.udev - chkconfig --add rc.hotplug } post_upgrade() { - # force once the usage of hotplug - if [ `vercmp $2 079` -lt 0 ] ; then - chkconfig --add rc.hotplug + # can be removed after Frugalware-0.7 + # remove obsolete hotplug service + chkconfig --del rc.hotplug &>/dev/null + # convert the blaclist file to the new format + if ! greq -q blacklist /etc/sysconfig/blacklist; then + sed -i 's/^\(.\)/blacklist \1/' /etc/sysconfig/blacklist fi + if [ -e /etc/sysconfig/udev ]; then echo "warning: /etc/sysconfig/udev is now obsolete, please read" echo "/usr/share/doc/udev-`echo $1|sed 's/\(.*\)-.*/\1/'`/README.Frugalware!" @@ -41,7 +44,6 @@ post_upgrade() pre_remove() { rm /etc/rc.d/rcS.d/S00rc.udev - chkconfig --del rc.hotplug } op=$1 From vmiklos at frugalware.org Wed Dec 19 14:33:00 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 19 14:33:02 2007 Subject: [Frugalware-git] frugalware-current: udev-118-2-i686 Message-ID: <20071219133300.8B46E1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a0fb72e4321641e9ef3f260ecb3d6572a21dcc6 commit 3a0fb72e4321641e9ef3f260ecb3d6572a21dcc6 Author: Miklos Vajna Date: Wed Dec 19 14:32:51 2007 +0100 udev-118-2-i686 typo fix in the install file diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index 2e3101c..c249240 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -3,7 +3,7 @@ pkgname=udev pkgver=118 -pkgrel=1 +pkgrel=2 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" backup=(etc/udev/{udev.conf,rules.d/50-udev-default.rules} \ diff --git a/source/base/udev/udev.install b/source/base/udev/udev.install index 422e11a..599036b 100644 --- a/source/base/udev/udev.install +++ b/source/base/udev/udev.install @@ -10,8 +10,8 @@ post_upgrade() # remove obsolete hotplug service chkconfig --del rc.hotplug &>/dev/null # convert the blaclist file to the new format - if ! greq -q blacklist /etc/sysconfig/blacklist; then - sed -i 's/^\(.\)/blacklist \1/' /etc/sysconfig/blacklist + if ! grep -q blacklist /etc/sysconfig/blacklist; then + sed -i 's/^\([^#]\)/blacklist \1/' /etc/sysconfig/blacklist fi if [ -e /etc/sysconfig/udev ]; then From janny at frugalware.org Wed Dec 19 14:35:37 2007 From: janny at frugalware.org (janny) Date: Wed Dec 19 14:35:40 2007 Subject: [Frugalware-git] frugalware-current: gspcav1-1.00.20rc2-1-i686 Message-ID: <20071219133537.F23E91190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7a2002db6ec6349748c1eba4d114b51c3288b178 commit 7a2002db6ec6349748c1eba4d114b51c3288b178 Author: janny Date: Wed Dec 19 14:35:11 2007 +0100 gspcav1-1.00.20rc2-1-i686 * version bump diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild index 02252f4..f3ebb56 100644 --- a/source/multimedia-extra/gspcav1/FrugalBuild +++ b/source/multimedia-extra/gspcav1/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: Janny pkgname=gspcav1 -pkgver=1.00.18 -pkgrel=14 -pkgdate=20070508 +pkgver=1.00.20rc2 +pkgrel=1 +pkgdate=20071214 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" license="GPL" @@ -14,7 +14,7 @@ groups=('multimedia-extra') replaces=('spca5xx') up2date="lynx -dump $url/download.html|grep -m1 'gspcav1'|sed 's/.*version \(.*\) da.*/\1/'" source=(http://mxhaard.free.fr/spca50x/Download/$pkgname-$pkgdate.tar.gz) -sha1sums=('c7c63c9ee3be36dfe0d69b814239d398ced5f91a') +sha1sums=('27ed5a15eab79fbd0f43e2029b5a66f8f11183b2') build() { # no Fcheckkernel, crosscompilation verified From vmiklos at frugalware.org Wed Dec 19 14:35:49 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 19 14:35:50 2007 Subject: [Frugalware-git] frugalware-current: gammu-1.16.0-1-i686 Message-ID: <20071219133549.AD1871190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88f480aa90fcbcba26e670571682e70b4a44dd1c commit 88f480aa90fcbcba26e670571682e70b4a44dd1c Author: Miklos Vajna Date: Wed Dec 19 14:35:38 2007 +0100 gammu-1.16.0-1-i686 version bump diff --git a/source/apps-extra/gammu/FrugalBuild b/source/apps-extra/gammu/FrugalBuild index fd7737c..cc837b5 100644 --- a/source/apps-extra/gammu/FrugalBuild +++ b/source/apps-extra/gammu/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=gammu -pkgver=1.11.92 -pkgrel=2 +pkgver=1.16.0 +pkgrel=1 pkgdesc="Mobile phones tools for Unix (Linux)" url="http://www.gammu.org/wiki/index.php?title=Gammu:Main_Page" backup=(etc/gammu/gammurc) @@ -14,6 +14,9 @@ archs=('x86_64' 'i686') up2date="lynx -dump http://dl.cihar.com/gammu/releases/|Flasttarbz2" source=(http://dl.cihar.com/gammu/releases/$pkgname-$pkgver.tar.bz2 \ gammurc-path-fix.patch README.Frugalware) +sha1sums=('b2d58b19b2ff7203a7fc527dc2b150854d6b212f' \ + '68632cf0b015118b7a9c97d9b905fe47bcd927d4' \ + 'f9908ebbf95e95bbfe4298e10aa93fa84cf2cf6f') # NOTE: check new releases about cmake bug in gammu. # dont use make install DESTDIR=** things. Use the right cmake way if they fixed @@ -58,8 +61,4 @@ build() Fdoc README.Frugalware } -sha1sums=('0d00ac580e0479061c7e4760f129000b3e9ff299' \ - '68632cf0b015118b7a9c97d9b905fe47bcd927d4' \ - 'f9908ebbf95e95bbfe4298e10aa93fa84cf2cf6f') - # optimization OK From vmiklos at frugalware.org Wed Dec 19 14:44:19 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 19 14:44:22 2007 Subject: [Frugalware-git] frugalware-current: module-init-tools-3.4-2-i686 Message-ID: <20071219134419.C226C1190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=893ac8432d1bca4b25add9a450c4e041c5daed82 commit 893ac8432d1bca4b25add9a450c4e041c5daed82 Author: Miklos Vajna Date: Wed Dec 19 14:42:31 2007 +0100 module-init-tools-3.4-2-i686 add an empty /etc/modprobe.d dir which isn't useful at all but makes users happy diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index f5d3547..3258723 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -29,6 +29,7 @@ build() Fmakeinstall Fmv /bin/lsmod /sbin/ Ffile /etc/sysconfig/modules + Fmkdir /etc/modprobe.d Frcd modules } From vmiklos at frugalware.org Wed Dec 19 14:58:27 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 19 14:58:32 2007 Subject: [Frugalware-git] frugalware-current: fgfs-base-1.0.0-1-x86_64 Message-ID: <20071219135827.38DF21190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de6c06aff787f224ba67d0e88187e4a4ea3f9eba commit de6c06aff787f224ba67d0e88187e4a4ea3f9eba Author: Miklos Vajna Date: Wed Dec 19 14:55:23 2007 +0100 fgfs-base-1.0.0-1-x86_64 version bump diff --git a/source/games-extra/fgfs-base/FrugalBuild b/source/games-extra/fgfs-base/FrugalBuild index 4b3cd63..5522562 100644 --- a/source/games-extra/fgfs-base/FrugalBuild +++ b/source/games-extra/fgfs-base/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=fgfs-base -pkgver=0.9.10 +pkgver=1.0.0 pkgrel=1 pkgdesc="Textures, models, data, aircraft, sample scenery, and configs files for FlightGear" url="http://www.flightgear.org/" @@ -11,7 +11,7 @@ groups=('games-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/Downloads/source.shtml|grep 'Release: Version \([0-9\.]*\) ('|sed 's/.*n \(.*\) (.*/\1/;q'" source=(ftp://ftp.flightgear.org/pub/fgfs/Shared/$pkgname-$pkgver.tar.bz2) -sha1sums=('4fc61a0791613e95f23c733cf32f7ac107478dfc') +sha1sums=('f971719171cbea9a7d92a93b5f30b75ea194ac51') build() { From vmiklos at frugalware.org Wed Dec 19 15:53:08 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Dec 19 15:53:11 2007 Subject: [Frugalware-git] frugalware-current: flightgear-1.0.0-1-x86_64 Message-ID: <20071219145308.EF2571190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1711d20c77f2d304033a299d93ba5e26e2fa397a commit 1711d20c77f2d304033a299d93ba5e26e2fa397a Author: Miklos Vajna Date: Wed Dec 19 15:52:58 2007 +0100 flightgear-1.0.0-1-x86_64 version bump diff --git a/source/games-extra/flightgear/FrugalBuild b/source/games-extra/flightgear/FrugalBuild index d427687..2689e04 100644 --- a/source/games-extra/flightgear/FrugalBuild +++ b/source/games-extra/flightgear/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=flightgear -pkgver=0.9.10 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="An open-source, multi-platform flight simulator." url="http://www.flightgear.org/" depends=('libgl' 'zlib' 'freealut' 'freeglut' 'fgfs-base' 'plib') @@ -12,6 +12,7 @@ groups=('games-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/Downloads/source.shtml|grep 'Release: Version \([0-9\.]*\) ('|sed 's/.*n \(.*\) (.*/\1/;q'" source=(ftp://ftp.flightgear.org/pub/fgfs/Source/FlightGear-$pkgver.tar.gz) +sha1sums=('27de60d87316160eb9eb70bb82cd7ee2ed0407df') build() { @@ -22,5 +23,3 @@ build() } # optimization ok - -sha1sums=('29911b9c17cece50a9e7d501f2259c89c0fa44ba') From priyank at frugalware.org Wed Dec 19 20:11:13 2007 From: priyank at frugalware.org (Priyank) Date: Wed Dec 19 20:11:17 2007 Subject: [Frugalware-git] fun: intltool updates Message-ID: <20071219191113.704041190054@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=941914575d22faeedd0ec2618588704c339093cd commit 941914575d22faeedd0ec2618588704c339093cd Author: Priyank Date: Thu Dec 20 00:39:28 2007 +0530 intltool updates diff --git a/intltool-extract.in b/intltool-extract.in index 7b83435..246b7ac 100644 --- a/intltool-extract.in +++ b/intltool-extract.in @@ -32,7 +32,7 @@ ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; -my $VERSION = "0.36.2"; +my $VERSION = "0.36.3"; ## Loaded modules use strict; diff --git a/intltool-merge.in b/intltool-merge.in index e5671d7..c574585 100644 --- a/intltool-merge.in +++ b/intltool-merge.in @@ -35,7 +35,7 @@ ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; -my $VERSION = "0.36.2"; +my $VERSION = "0.36.3"; ## Loaded modules use strict; @@ -292,10 +292,9 @@ sub gather_po_files { next if /^#/; - if (/([-a-zA-Z_@.]+)\n/) + for my $lang (split) { - my $lang = $1; - + chomp ($lang); my $po_file = $PO_DIR . "/" . $lang . ".po"; if (-e $po_file) { $po_files_by_lang{$lang} = $po_file; @@ -576,6 +575,7 @@ sub entity_encode_int_minimalist return "&" if $_ == 38; return "'" if $_ == 39; return "<" if $_ == 60; + return ">" if $_ == 62; return chr $_; } @@ -1076,14 +1076,25 @@ sub xml_merge_output close OUTPUT; print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; } - } - open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree); - close OUTPUT; - print "CREATED $OUTFILE\n" unless $QUIET_ARG; + if ( ! -d "C" ) { + mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n"; + } + open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + my $tree = readXml($FILE); + print_header($FILE, \*OUTPUT); + parseTree(\*OUTPUT, $tree); + close OUTPUT; + print "CREATED C/$OUTFILE\n" unless $QUIET_ARG; + } else { + open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + my $tree = readXml($FILE); + print_header($FILE, \*OUTPUT); + parseTree(\*OUTPUT, $tree); + close OUTPUT; + print "CREATED $OUTFILE\n" unless $QUIET_ARG; + } } sub keys_merge_translations diff --git a/intltool-update.in b/intltool-update.in index bffd10f..33f8689 100644 --- a/intltool-update.in +++ b/intltool-update.in @@ -30,7 +30,7 @@ ## Release information my $PROGRAM = "intltool-update"; -my $VERSION = "0.36.2"; +my $VERSION = "0.36.3"; my $PACKAGE = "intltool"; ## Loaded modules @@ -334,7 +334,7 @@ sub FindLeftoutFiles push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; - }, "$SRCDIR/.."; + }, "$SRCDIR/.." if "$SRCDIR" ne "."; open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; @buf_potfiles = grep !/^(#|\s*$)/, ; @@ -434,8 +434,8 @@ sub FindLeftoutFiles last; } - ## N_ Q_ and _ are the three macros defined in gi8n.h - if (/[NQ]?_ *\(QUOTEDTEXT/) + ## C_ N_ Q_ and _ are the macros defined in gi8n.h + if (/[CNQ]?_ *\(QUOTEDTEXT/) { if (defined isNotValidMissing (unpack("x3 A*", $file))) { ## Remove the first 3 chars and add newline @@ -777,7 +777,7 @@ sub GeneratePOTemplate my $XGETTEXT_KEYWORDS = &FindPOTKeywords; push @xgettext_argument, $XGETTEXT_KEYWORDS; my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress; - push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS; + push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS; push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; my $xgettext_command = join ' ', @xgettext_argument; From priyank at frugalware.org Wed Dec 19 20:11:13 2007 From: priyank at frugalware.org (Priyank) Date: Wed Dec 19 20:11:20 2007 Subject: [Frugalware-git] fun: migrated to libnotify (for notifications) Message-ID: <20071219191113.BEA07119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=415ff211372f3460b9f67b5f66d4ca76c9e31245 commit 415ff211372f3460b9f67b5f66d4ca76c9e31245 Author: Priyank Date: Thu Dec 20 00:40:35 2007 +0530 migrated to libnotify (for notifications) * libnotify seems to be easier to use and more flexible * Dropped eggtrayicon, libsexy diff --git a/configure.ac b/configure.ac index 5226e64..d37f6b4 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ if test "x$DBUSBINDINGTOOL" = "xno"; then fi AC_SUBST(DBUS_BINDING_TOOL) -ui_modules="gtk+-2.0 >= 2.12.0 libglade-2.0 >= 2.6.0" +ui_modules="gtk+-2.0 >= 2.12.0 libglade-2.0 >= 2.6.0 libnotify" PKG_CHECK_MODULES([FUND], [dbus-glib-1 >= 0.73]) PKG_CHECK_MODULES([FUN], [$ui_modules]) diff --git a/src/Makefile.am b/src/Makefile.am index 155302c..14c8501 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,8 +9,6 @@ bin_PROGRAMS = fun fund_SOURCES = fund.c fun_SOURCES = wejpconfig.c \ fun-config.c \ - eggtrayicon.c \ - sexy-tooltip.c \ fun-tooltip.c \ fun-messages.c \ fun-ui.c \ diff --git a/src/fun-tooltip.c b/src/fun-tooltip.c index 2f7c558..bc65edb 100644 --- a/src/fun-tooltip.c +++ b/src/fun-tooltip.c @@ -21,145 +21,50 @@ */ #include -#include #include "fun-tooltip.h" -FunTooltip *fun_tooltip_new (void) +NotifyNotification *fun_tooltip_new (GtkStatusIcon *icon) { - FunTooltip *tooltip; - GtkWidget *label1; - GtkWidget *label2; + NotifyNotification *tooltip = NULL; - /* main tooltip window */ - tooltip = g_malloc (sizeof(FunTooltip)); - tooltip->window = gtk_window_new (GTK_WINDOW_POPUP); - - gtk_window_set_resizable (GTK_WINDOW(tooltip->window), FALSE); - gtk_window_set_decorated (GTK_WINDOW(tooltip->window), FALSE); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW(tooltip->window), TRUE); - gtk_window_set_skip_pager_hint (GTK_WINDOW(tooltip->window), TRUE); - - /* the two main layout boxes */ - tooltip->hbox = gtk_hbox_new (FALSE, 4); - tooltip->vbox = gtk_vbox_new (FALSE, 0); - - /* pack the boxes */ - gtk_container_add (GTK_CONTAINER(tooltip->window), tooltip->hbox); - gtk_box_pack_end (GTK_BOX(tooltip->hbox), tooltip->vbox, FALSE, FALSE, 2); - - /* tooltip icon */ - tooltip->icon = gtk_image_new_from_pixbuf (NULL); - gtk_misc_set_padding (GTK_MISC(tooltip->icon), 4, 4); - gtk_box_pack_start (GTK_BOX(tooltip->hbox), tooltip->icon, TRUE, TRUE, 0); - - /* labels */ - label1 = gtk_label_new (NULL); - g_object_set (G_OBJECT(label1), "use-markup", TRUE, NULL); - gtk_box_pack_start (GTK_BOX(tooltip->vbox), label1, TRUE, FALSE, 1); - gtk_misc_set_alignment (GTK_MISC(label1), 0, 0); - label2 = gtk_label_new (NULL); - g_object_set (G_OBJECT(label2), "use-markup", TRUE, NULL); - gtk_box_pack_start (GTK_BOX(tooltip->vbox), label2, TRUE, FALSE, 1); - gtk_misc_set_alignment (GTK_MISC(label2), 0, 0); + tooltip = notify_notification_new ("Frugalware Update Notifier", + NULL, + "fun", + NULL); + notify_notification_set_category (tooltip, "information"); + notify_notification_set_timeout (tooltip, NOTIFY_EXPIRES_DEFAULT); + notify_notification_set_urgency (tooltip, NOTIFY_URGENCY_NORMAL); + notify_notification_attach_to_status_icon (tooltip, icon); return tooltip; } -void fun_tooltip_set_text1 (FunTooltip *tooltip, const gchar *text, gboolean formatting) +void fun_tooltip_set_text (NotifyNotification *tooltip, const gchar *summary, const gchar *body) { - GList *list; - gchar *markup; - - if ( (list = gtk_container_get_children (GTK_CONTAINER(tooltip->vbox))) != NULL ) - { - if (text == NULL) - { - gtk_label_set_text (GTK_LABEL(list->data), NULL); - gtk_widget_hide (GTK_WIDGET(list->data)); - return; - } - - if (formatting == TRUE) - { - markup = g_markup_printf_escaped ("%s", text); - gtk_label_set_markup (GTK_LABEL(list->data), markup); - g_free (markup); - } - else - { - gtk_label_set_text (GTK_LABEL(list->data), text); - } - - g_list_free (list); - } + if (tooltip) + notify_notification_update (tooltip, summary, body, "fun"); return; } -void fun_tooltip_set_text2 (FunTooltip *tooltip, const gchar *text, gboolean formatting) +void fun_tooltip_show (GtkStatusIcon *icon, NotifyNotification *tooltip) { - GList *list; - gchar *markup; - - if ( (list = gtk_container_get_children (GTK_CONTAINER(tooltip->vbox))) != NULL ) + if (tooltip) { - if ((list = g_list_nth (list, 1)) == NULL) - return; - - if (text == NULL) - { - gtk_label_set_text (GTK_LABEL(list->data), NULL); - gtk_widget_hide (GTK_WIDGET(list->data)); - return; - } - if (formatting == TRUE) - { - markup = g_markup_printf_escaped ("%s", text); - gtk_label_set_markup (GTK_LABEL(list->data), markup); - g_free (markup); - } - else - { - gtk_label_set_text (GTK_LABEL(list->data), text); - } - gtk_widget_show (GTK_WIDGET(list->data)); - g_list_free (list); - } - - return; -} - -void fun_tooltip_set_icon (FunTooltip *tooltip, GdkPixbuf *pixbuf) -{ - gtk_image_set_from_pixbuf (GTK_IMAGE(tooltip->icon), pixbuf); - - return; -} - -void fun_tooltip_show (FunTooltip *tooltip) -{ - if (tooltip != NULL) - { - gtk_widget_show (GTK_WIDGET(tooltip->hbox)); - gtk_widget_show (GTK_WIDGET(tooltip->window)); + GdkScreen *screen = NULL; + GdkRectangle area; + + gtk_status_icon_get_geometry (icon, &screen, &area, NULL); + notify_notification_set_geometry_hints (tooltip, screen, area.x, area.y); + notify_notification_show (tooltip, NULL); } - return; -} -void fun_tooltip_hide (FunTooltip *tooltip) -{ - if (tooltip != NULL) - gtk_widget_hide (GTK_WIDGET(tooltip->window)); - return; } -void fun_tooltip_destroy (FunTooltip *tooltip) +void fun_tooltip_destroy (NotifyNotification *tooltip) { - gtk_widget_destroy (GTK_WIDGET(tooltip->vbox)); - gtk_widget_destroy (GTK_WIDGET(tooltip->hbox)); - gtk_widget_destroy (GTK_WIDGET(tooltip->window)); - g_free (tooltip); + g_object_unref (tooltip); return; } diff --git a/src/fun-tooltip.h b/src/fun-tooltip.h index b9ac4ae..429cb6c 100644 --- a/src/fun-tooltip.h +++ b/src/fun-tooltip.h @@ -2,37 +2,22 @@ #define _FUN_TOOLTIP_H #include - -/* FunTooltip structure */ -typedef struct { - GtkWidget *window; - GtkWidget *hbox; - GtkWidget *vbox; - GtkWidget *icon; -} FunTooltip; +#include +#include /* Fun Tooltip Functions */ /* Create a new tooltip */ -FunTooltip *fun_tooltip_new (void); +NotifyNotification *fun_tooltip_new (GtkStatusIcon *icon); /* Sets the tooltip text (label1) */ -void fun_tooltip_set_text1 (FunTooltip *tooltip, const gchar *text, gboolean formatting); - -/* Sets the tooltip text (label2) */ -void fun_tooltip_set_text2 (FunTooltip *tooltip, const gchar *text, gboolean formatting); - -/* Sets the icon for the tooltip */ -void fun_tooltip_set_icon (FunTooltip *tooltip, GdkPixbuf *pixbuf); +void fun_tooltip_set_text (NotifyNotification *tooltip, const gchar *summary, const gchar *body); /* Show the tooltip */ -void fun_tooltip_show (FunTooltip *tooltip); - -/* Hide the tooltip */ -void fun_tooltip_hide (FunTooltip *tooltip); +void fun_tooltip_show (GtkStatusIcon *icon, NotifyNotification *tooltip); /* Destroy the tooltip object and free the memory */ -void fun_tooltip_destroy (FunTooltip *tooltip); +void fun_tooltip_destroy (NotifyNotification *tooltip); #endif diff --git a/src/fun-ui.c b/src/fun-ui.c index 38ace3c..43da8cb 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -25,8 +25,6 @@ #include "fun-messages.h" #include "fun-tooltip.h" #include "fun-dbus.h" -#include "sexy-tooltip.h" -#include "eggtrayicon.h" #ifdef HAVE_CONFIG_H #include "config.h" @@ -35,6 +33,7 @@ static void fun_about_show (void); static void fun_about_hide (void); static void fun_main_window_init (void); +static void fun_main_window_show (void); static void fun_main_window_hide (void); static void fun_launch_gfpm (void); static void fun_populate_updates_tvw (gchar *plist); @@ -44,11 +43,9 @@ static void fun_populate_updates_tvw (gchar *plist); extern GladeXML *xml; -EggTrayIcon *icon = NULL; -FunTooltip *tooltip = NULL; -GtkWidget *stooltip; +static GtkStatusIcon *icon = NULL; +static NotifyNotification *tooltip = NULL; -static GtkStatusIcon *fun_icon = NULL; static GtkWidget *fun_about_dlg = NULL; static GtkWidget *fun_main_window = NULL; static GtkWidget *fun_statusbar = NULL; @@ -103,125 +100,30 @@ static void fun_restart (void); static GdkPixbuf * fun_get_icon (const char *icon, int size); static void fun_update_status (const char *message); -static gboolean cb_fun_systray_icon_clicked (GtkWidget *widget, GdkEventButton *event, gpointer data); -static gboolean cb_fun_systray_enter_notify (GtkWidget *widget, GdkEventCrossing *event, gpointer data); -static gboolean cb_fun_systray_leave_notify (GtkWidget *widget, GdkEventCrossing *event, gpointer data); +static gboolean cb_fun_systray_icon_clicked (GtkStatusIcon *widget, guint button, guint activate_time, gpointer data); static void cb_fun_config_dlg_close_clicked (GtkWidget *button, gpointer data); void fun_systray_create (void) { - gchar *icon_file; - GdkPixbuf *icon_image; - GdkPixbuf *icon_tooltip; - GtkWidget *systray_icon; - GdkColor color; - /* create the tray icon */ - icon = egg_tray_icon_new ("Frugalware Update Notifier"); - icon_image = fun_get_icon ("fun", 24); - systray_icon = gtk_image_new_from_pixbuf (icon_image); - gtk_container_add (GTK_CONTAINER (icon), systray_icon); - g_object_unref (icon_image); - - stooltip = sexy_tooltip_new (); - gdk_color_parse ("white", &color); - gtk_widget_modify_bg (GTK_WIDGET(stooltip), GTK_STATE_NORMAL, &color); + icon = gtk_status_icon_new_from_icon_name ("fun"); /* set the default tooltip */ - tooltip = fun_tooltip_new (); - fun_tooltip_set_text1 (tooltip, "Frugalware Update Notifier", TRUE); - icon_tooltip = fun_get_icon ("fun", 32); - fun_tooltip_set_icon (tooltip, icon_tooltip); - g_object_unref (icon_tooltip); - - g_signal_connect (icon, "button-press-event", G_CALLBACK (cb_fun_systray_icon_clicked), NULL); - g_signal_connect (icon