From vmiklos at frugalware.org Thu Nov 1 00:00:50 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 00:00:54 2007 Subject: [Frugalware-git] frugalware-current: util.sh: allow filenames like patch-version in Fpatch() Message-ID: <20071031230050.B66F713A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e4f94cd98f92c109ea7bb9ccc3855ac804db05ea commit e4f94cd98f92c109ea7bb9ccc3855ac804db05ea Author: Miklos Vajna Date: Wed Oct 31 23:59:32 2007 +0100 util.sh: allow filenames like patch-version in Fpatch() - basically if you use Fpatch directly then you know what you are doing, so we won't check if the filename has a .diff or .patch* extension - you're a big boy - thx crazy for the idea diff --git a/source/include/util.sh b/source/include/util.sh index 0cce07a..927eb2b 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -445,9 +445,9 @@ Fpatch() { Fcd local i level="1" Fmessage "Using patch: $1" - if [ -n "`echo "$1" | grep '\.\(patch[0-9]*\|diff\)\.gz$'`" ]; then + if [ -n "`echo "$1" | grep '\.gz$'`" ]; then i=`basename "$1" .gz` - elif [ -n "`echo "$1" | grep '\.\(patch[0-9]*\|diff\)\.bz2$'`" ]; then + elif [ -n "`echo "$1" | grep '\.bz2$'`" ]; then i=`basename "$1" .bz2` else i=$1 From vmiklos at frugalware.org Thu Nov 1 01:04:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 01:04:43 2007 Subject: [Frugalware-git] homepage-ng: FSA310-kernel Message-ID: <20071101000440.DD8BB13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=84d3180687ec5b2d9f3a85601a2e2fdcf97e6c6d commit 84d3180687ec5b2d9f3a85601a2e2fdcf97e6c6d Author: Miklos Vajna Date: Thu Nov 1 01:04:28 2007 +0100 FSA310-kernel diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 2ab0ae7..1ec5bfe 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 310 + 2007-11-01 + vmiklos + kernel + 2.6.22-6 + 2.6.22-7sayshell1 + http://bugs.frugalware.org/task/2455 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3731 + Evan Teran has reported a security issue in the Linux kernel, which potentially can be exploited by malicious, local users to cause a DoS (Denial of Service). + The vulnerability is caused due to an error in ptrace when single-stepping a debugged child process with invalid values in the "CS" register, which can be exploited to cause a kernel oops. + + 309 2007-10-25 voroskoi From crazy at frugalware.org Thu Nov 1 01:26:56 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 1 01:26:58 2007 Subject: [Frugalware-git] frugalware-current: lshw-B.02.12.01-2-i686 Message-ID: <20071101002656.CB3D213A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=869e01a9d4dd2fe9a1c66c48fe26513089fe7a62 commit 869e01a9d4dd2fe9a1c66c48fe26513089fe7a62 Author: crazy Date: Thu Nov 1 01:26:00 2007 +0100 lshw-B.02.12.01-2-i686 * relbump * added missing scriptlet option diff --git a/source/apps-extra/lshw/FrugalBuild b/source/apps-extra/lshw/FrugalBuild index 76bb696..a86d755 100644 --- a/source/apps-extra/lshw/FrugalBuild +++ b/source/apps-extra/lshw/FrugalBuild @@ -4,13 +4,14 @@ pkgname=lshw pkgver=B.02.12.01 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to provide information on the hardware configuration of the machine." url="http://ezix.org/project/wiki/HardwareLiSter" license="GPL2" groups=('apps-extra') archs=('i686' 'x86_64') makedepends=('gtk+2') +options=('scriptlet') depends=('libstdc++') up2date="lynx -dump $url|grep -m 1 latest|grep -o '[A-Z][0-9\.]\+[0-9]'" source=(http://ezix.org/software/files/$pkgname-$pkgver.tar.gz) From voroskoi at frugalware.org Thu Nov 1 06:32:26 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 06:32:31 2007 Subject: [Frugalware-git] frugalware-current: nemesi-0.6.0-2-i686 Message-ID: <20071101053226.F3A1C13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=54211bc671c56fb6302ddad7d53d170d93a1f048 commit 54211bc671c56fb6302ddad7d53d170d93a1f048 Author: voroskoi Date: Thu Nov 1 06:32:19 2007 +0100 nemesi-0.6.0-2-i686 s/xespgs/xghostscript/ diff --git a/source/xmultimedia-extra/nemesi/FrugalBuild b/source/xmultimedia-extra/nemesi/FrugalBuild index 90a95f5..779aaa0 100644 --- a/source/xmultimedia-extra/nemesi/FrugalBuild +++ b/source/xmultimedia-extra/nemesi/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=2 pkgdesc="Network Media Streamer." url="http://streaming.polito.it/" depends=('sdl' 'gtk+2' 'freetype2>=2.3.4' 'ffmpeg>=20070422' 'libnms') -makedepends=('xespgs' 'groff') +makedepends=('xghostscript' 'groff') groups=('xmultimedia-extra') options=('scriptlet') archs=('i686') ## !x86_64 I think :| From voroskoi at frugalware.org Thu Nov 1 06:37:32 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 06:37:33 2007 Subject: [Frugalware-git] frugalware-current: doxygen-1.5.3-1-i686 Message-ID: <20071101053732.5A64313A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ae62007790245022e7a011283cf34acc81bfa260 commit ae62007790245022e7a011283cf34acc81bfa260 Author: voroskoi Date: Thu Nov 1 06:37:28 2007 +0100 doxygen-1.5.3-1-i686 s/espgs/ghostscript/ diff --git a/source/devel-extra/doxygen/FrugalBuild b/source/devel-extra/doxygen/FrugalBuild index dab190e..de93077 100644 --- a/source/devel-extra/doxygen/FrugalBuild +++ b/source/devel-extra/doxygen/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Doxygen is the documentation system for C/C++" url="http://www.doxygen.org/" depends=('libpng' 'libstdc++') -makedepends=('tetex' 'espgs' 'graphviz') +makedepends=('tetex' 'ghostscript' 'graphviz') groups=('devel-extra') archs=('x86_64' 'i686') up2date="lynx -dump ftp://ftp.stack.nl/pub/users/dimitri/|grep 'doxygen-[0-9\.]*src.tar.gz'|tail -n 1|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'| sed -n 's/.src//;1 p'" From voroskoi at frugalware.org Thu Nov 1 06:56:08 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 06:56:09 2007 Subject: [Frugalware-git] frugalware-current: texmaker-1.6-2-x86_64 Message-ID: <20071101055608.35CB013A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46d4c772a1b9c3b7661ac05a88941702e551f8c0 commit 46d4c772a1b9c3b7661ac05a88941702e551f8c0 Author: voroskoi Date: Thu Nov 1 06:52:18 2007 +0100 texmaker-1.6-2-x86_64 x86_64 goes to archs s/xespgs/xghostscript/ diff --git a/source/xapps-extra/texmaker/FrugalBuild b/source/xapps-extra/texmaker/FrugalBuild index 2afe3e9..f1a59cf 100644 --- a/source/xapps-extra/texmaker/FrugalBuild +++ b/source/xapps-extra/texmaker/FrugalBuild @@ -3,15 +3,16 @@ pkgname=texmaker pkgver=1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Texmaker is a free LaTeX editor." url="http://www.xm1math.net/texmaker/" depends=('qt4>=4.3.0') -rodepends=('xespgs') +rodepends=('xghostscript') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url |grep Version |sed -ne 's/.*ion \(.*\) (.*/\1/;1p'" source=(http://www.xm1math.net/texmaker/texmaker-$pkgver.tar.bz2) +sha1sums=('8da3a6370214f97b568126439408a7774b017c1d') build() { Fcd @@ -20,6 +21,5 @@ build() { Fmake Fmakeinstall INSTALL_ROOT=$Fdestdir } -sha1sums=('8da3a6370214f97b568126439408a7774b017c1d') # optimization OK From voroskoi at frugalware.org Thu Nov 1 06:56:30 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 06:56:31 2007 Subject: [Frugalware-git] frugalware-current: foo2zjs-2007_10_30-1-i686 Message-ID: <20071101055630.956C013A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f26295b0a0b9dacc1efd563088a8dea1393ba08f commit f26295b0a0b9dacc1efd563088a8dea1393ba08f Author: voroskoi Date: Thu Nov 1 06:55:57 2007 +0100 foo2zjs-2007_10_30-1-i686 version bump, haven't found the proper tar.gz fixed {ro,}depends() diff --git a/source/apps-extra/foo2zjs/FrugalBuild b/source/apps-extra/foo2zjs/FrugalBuild index 01c2a7d..5965ce9 100644 --- a/source/apps-extra/foo2zjs/FrugalBuild +++ b/source/apps-extra/foo2zjs/FrugalBuild @@ -1,9 +1,9 @@ # Compiling Time: 0.32 SBU # Maintainer: Christian Hamar alias krix -# Orig Maintainer: pete (pete [at] teamlupus.hu) +# Contributor: pete (pete [at] teamlupus.hu) pkgname=foo2zjs -pkgver=2007_10_12 +pkgver=2007_10_30 pkgrel=1 pkgdesc="A linux printer driver for ZjStream protocol" url="http://foo2zjs.rkkda.com/" @@ -13,8 +13,8 @@ source=($url/$pkgname.tar.gz $pkgname-destdir.patch) groups=('apps-extra') archs=('i686' 'x86_64') # Deps revised, now it more close to correct (libjpeg?) -depends=( 'espgs' 'groff' 'a2ps') -rodepends=('cups' 'espgs' 'libjpeg' 'foomatic-filters-ppds' 'udev') +depends=('espgs' 'groff' 'a2ps') +rodepends=('cups' 'libjpeg' 'foomatic-filters-ppds' 'udev') ## TODO: add some firmware wrapper ? I mean for /lib/firmware ?!? build() { @@ -38,7 +38,7 @@ build() { Ffilerel hplj10xx.rules /etc/udev/rules.d/11-hplj10xx.rules Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver } - -sha1sums=('b63fe31485ce217cd7f34868254ae2979f40c4d3' \ +sha1sums=('86bedce14766ac2f3f9aaf54984f824bcce8c2a4' \ '7b89eae53167a7ebef0cd9f7f405f2a787e3d13c') + # optimization OK From voroskoi at frugalware.org Thu Nov 1 07:19:11 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 07:19:13 2007 Subject: [Frugalware-git] frugalware-current: cups-1.3.4-1-i686 Message-ID: <20071101061911.79F3B13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a8df357920e7108baa7f7e1f4974a479a3a94565 commit a8df357920e7108baa7f7e1f4974a479a3a94565 Author: voroskoi Date: Thu Nov 1 07:12:35 2007 +0100 cups-1.3.4-1-i686 version bump closes #2540 in -current diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild index 88422ce..a9a6af5 100644 --- a/source/apps/cups/FrugalBuild +++ b/source/apps/cups/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=cups -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=1 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" @@ -49,9 +49,7 @@ build() { Fsplit libcups usr/lib/libcups.so* } -sha1sums=('9603e9ddba78a6103c48a9f917ea35ebd05ef7e0' \ +sha1sums=('f8b1bf6fc807a2a35f5d2eb0ec0d67398417779c' \ 'ad90c43de181d362f6c507f366904472d01ae585' \ 'f19bb889e3535e1284d0b93606da48aa61089c8a' \ '03197abb98eff18d3ede3000a61c7783b8c1ad92') - -# optimization OK From priyank at frugalware.org Thu Nov 1 08:24:42 2007 From: priyank at frugalware.org (Priyank) Date: Thu Nov 1 08:24:44 2007 Subject: [Frugalware-git] frugalware-current: seahorse-2.20.1-1-i686 Message-ID: <20071101072442.09C7313A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9a06367608386f8035bcca1b36a3a2af095c500d commit 9a06367608386f8035bcca1b36a3a2af095c500d Author: Priyank Date: Thu Nov 1 12:48:34 2007 +0530 seahorse-2.20.1-1-i686 * Version bump diff --git a/source/gnome-extra/seahorse/FrugalBuild b/source/gnome-extra/seahorse/FrugalBuild index 78331e0..819b997 100644 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=seahorse -pkgver=2.20.0 +pkgver=2.20.1 pkgrel=1 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/" @@ -20,9 +20,7 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" _F_gnome_mime="y" Finclude gnome gnome-scriptlet -source=(${source[@]} seahorse-configure_gedit_fix.diff) -sha1sums=('902efb15908b8d1955d54c08cebc941db3e0b310' \ - 'cebe08f0e021bf8c722d3ba78fa3c757b3ab34a2') +sha1sums=('7e8f5684598cfb7232a804e3462ee5ea583e6254') subpkgs=("$pkgname-gedit" "$pkgname-nautilus" "$pkgname-applet") subdescs=('seahorse encryption plugin for gedit' \ 'seahorse encryption extension for nautilus' \ From voroskoi at frugalware.org Thu Nov 1 08:31:12 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 08:31:16 2007 Subject: [Frugalware-git] frugalware-current: foo2zjs-2007_10_30-2-i686 Message-ID: <20071101073112.705C213A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fa54e0a91ea621d7efc66599fe5ee316c415e72 commit 5fa54e0a91ea621d7efc66599fe5ee316c415e72 Author: voroskoi Date: Thu Nov 1 08:30:25 2007 +0100 foo2zjs-2007_10_30-2-i686 forgot to change espgs to ghostscript :/ diff --git a/source/apps-extra/foo2zjs/FrugalBuild b/source/apps-extra/foo2zjs/FrugalBuild index 5965ce9..62dba8d 100644 --- a/source/apps-extra/foo2zjs/FrugalBuild +++ b/source/apps-extra/foo2zjs/FrugalBuild @@ -4,7 +4,7 @@ pkgname=foo2zjs pkgver=2007_10_30 -pkgrel=1 +pkgrel=2 pkgdesc="A linux printer driver for ZjStream protocol" url="http://foo2zjs.rkkda.com/" license="GPL2" @@ -13,7 +13,7 @@ source=($url/$pkgname.tar.gz $pkgname-destdir.patch) groups=('apps-extra') archs=('i686' 'x86_64') # Deps revised, now it more close to correct (libjpeg?) -depends=('espgs' 'groff' 'a2ps') +depends=('ghostscript' 'groff' 'a2ps') rodepends=('cups' 'libjpeg' 'foomatic-filters-ppds' 'udev') ## TODO: add some firmware wrapper ? I mean for /lib/firmware ?!? From priyank at frugalware.org Thu Nov 1 08:34:10 2007 From: priyank at frugalware.org (Priyank) Date: Thu Nov 1 08:34:13 2007 Subject: [Frugalware-git] frugalware-current: xarchiver-0.4.6-3-i686 Message-ID: <20071101073410.E67E313A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a049ba3ee4cd26387f30cdda991c3a7b6e847f85 commit a049ba3ee4cd26387f30cdda991c3a7b6e847f85 Author: Priyank Date: Thu Nov 1 13:01:30 2007 +0530 xarchiver-0.4.6-3-i686 * Added missing _F_gnome_desktop=y diff --git a/source/xfce4/xarchiver/FrugalBuild b/source/xfce4/xarchiver/FrugalBuild index 7f00c8f..2305bd0 100644 --- a/source/xfce4/xarchiver/FrugalBuild +++ b/source/xfce4/xarchiver/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xarchiver pkgver=0.4.6 -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight GTK2 only frontend to zip, bzip2, gzip, rar, 7z, arj and rpm." url="http://xarchiver.xfce.org" depends=('gtk+2' 'gzip' 'bzip2' 'tar') @@ -12,6 +12,7 @@ archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge _F_gnome_iconcache="y" +_F_gnome_desktop="y" Finclude gnome-scriptlet install=xarchiver.install sha1sums=('db80abdebf3396ded3cf8d2224e88c987a2d9c32') From priyank at frugalware.org Thu Nov 1 08:40:53 2007 From: priyank at frugalware.org (Priyank) Date: Thu Nov 1 08:40:55 2007 Subject: [Frugalware-git] frugalware-current: thunar-archive-plugin-0.2.4-3-i686 Message-ID: <20071101074054.0A19513A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f5304e5f1f5c4801fa0cd57e0388cf93f5f45af commit 3f5304e5f1f5c4801fa0cd57e0388cf93f5f45af Author: Priyank Date: Thu Nov 1 13:08:37 2007 +0530 thunar-archive-plugin-0.2.4-3-i686 * should depend on xarchiver-0.4.6-3 and not squeeze as the latter is quite buggy. diff --git a/source/xfce4-extra/thunar-archive-plugin/FrugalBuild b/source/xfce4-extra/thunar-archive-plugin/FrugalBuild index d7c97ff..5768ce1 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=2 +pkgrel=3 pkgdesc="Thunar archive plugin." url="http://www.foo-projects.org/~benny/projects/thunar-archive-plugin/" makedepends=('intltool') -depends=('thunar>=0.8.0' 'squeeze>=0.2.1') +depends=('thunar>=0.8.0' 'xarchiver>=0.4.6-3') _F_gnome_iconcache="y" Finclude gnome-scriptlet groups=('xfce4-extra') From voroskoi at frugalware.org Thu Nov 1 08:44:31 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 08:44:35 2007 Subject: [Frugalware-git] frugalware-0.7: cups-1.3.2-2sayshell1-x86_64 Message-ID: <20071101074431.57D2D13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=3a2bb126684ab6a00feff3d7c7b47d12327053a1 commit 3a2bb126684ab6a00feff3d7c7b47d12327053a1 Author: voroskoi Date: Thu Nov 1 08:44:03 2007 +0100 cups-1.3.2-2sayshell1-x86_64 secfix relbump, closes #2540 diff --git a/source/apps/cups/CVE-2007-4351.diff b/source/apps/cups/CVE-2007-4351.diff new file mode 100644 index 0000000..da0d07a --- /dev/null +++ b/source/apps/cups/CVE-2007-4351.diff @@ -0,0 +1,153 @@ +Index: ipp.c +=================================================================== +--- cups/ipp.c (revision 7023) ++++ cups/ipp.c (working copy) +@@ -1306,6 +1306,12 @@ + { + case IPP_TAG_INTEGER : + case IPP_TAG_ENUM : ++ if (n != 4) ++ { ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); ++ } ++ + if ((*cb)(src, buffer, 4) < 4) + { + DEBUG_puts("ippReadIO: Unable to read integer value!"); +@@ -1318,6 +1324,12 @@ + value->integer = n; + break; + case IPP_TAG_BOOLEAN : ++ if (n != 1) ++ { ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); ++ } ++ + if ((*cb)(src, buffer, 1) < 1) + { + DEBUG_puts("ippReadIO: Unable to read boolean value!"); +@@ -1335,6 +1347,12 @@ + case IPP_TAG_CHARSET : + case IPP_TAG_LANGUAGE : + case IPP_TAG_MIMETYPE : ++ if (n >= sizeof(buffer)) ++ { ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); ++ } ++ + if ((*cb)(src, buffer, n) < n) + { + DEBUG_puts("ippReadIO: unable to read name!"); +@@ -1347,6 +1365,12 @@ + value->string.text)); + break; + case IPP_TAG_DATE : ++ if (n != 11) ++ { ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); ++ } ++ + if ((*cb)(src, value->date, 11) < 11) + { + DEBUG_puts("ippReadIO: Unable to date integer value!"); +@@ -1354,6 +1378,12 @@ + } + break; + case IPP_TAG_RESOLUTION : ++ if (n != 9) ++ { ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); ++ } ++ + if ((*cb)(src, buffer, 9) < 9) + { + DEBUG_puts("ippReadIO: Unable to read resolution value!"); +@@ -1370,6 +1400,12 @@ + (ipp_res_t)buffer[8]; + break; + case IPP_TAG_RANGE : ++ if (n != 8) ++ { ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); ++ } ++ + if ((*cb)(src, buffer, 8) < 8) + { + DEBUG_puts("ippReadIO: Unable to read range value!"); +@@ -1385,7 +1421,7 @@ + break; + case IPP_TAG_TEXTLANG : + case IPP_TAG_NAMELANG : +- if (n > sizeof(buffer) || n < 4) ++ if (n >= sizeof(buffer) || n < 4) + { + DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); + return (IPP_ERROR); +@@ -1411,22 +1447,27 @@ + + n = (bufptr[0] << 8) | bufptr[1]; + +- if (n >= sizeof(string)) ++ if ((bufptr + 2 + n) >= (buffer + sizeof(buffer)) || ++ n >= sizeof(string)) + { +- memcpy(string, bufptr + 2, sizeof(string) - 1); +- string[sizeof(string) - 1] = '\0'; ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); + } +- else +- { +- memcpy(string, bufptr + 2, n); +- string[n] = '\0'; +- } + ++ memcpy(string, bufptr + 2, n); ++ string[n] = '\0'; ++ + value->string.charset = _cupsStrAlloc((char *)string); + + bufptr += 2 + n; + n = (bufptr[0] << 8) | bufptr[1]; + ++ if ((bufptr + 2 + n) >= (buffer + sizeof(buffer))) ++ { ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); ++ } ++ + bufptr[2 + n] = '\0'; + value->string.text = _cupsStrAlloc((char *)bufptr + 2); + break; +@@ -1468,6 +1509,12 @@ + * we need to carry over... + */ + ++ if (n >= sizeof(buffer)) ++ { ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); ++ } ++ + if ((*cb)(src, buffer, n) < n) + { + DEBUG_puts("ippReadIO: Unable to read member name value!"); +@@ -1489,6 +1536,12 @@ + break; + + default : /* Other unsupported values */ ++ if (n > sizeof(buffer)) ++ { ++ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); ++ return (IPP_ERROR); ++ } ++ + value->unknown.length = n; + if (n > 0) + { diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild index edbb78d..9ce9b4a 100644 --- a/source/apps/cups/FrugalBuild +++ b/source/apps/cups/FrugalBuild @@ -4,7 +4,7 @@ pkgname=cups pkgver=1.3.2 -pkgrel=1 +pkgrel=2sayshell1 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" depends=('libtiff' 'libpng' 'libjpeg') @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs}) up2date="lynx -dump $url |grep Stable |sed -e 's/.*v\(.*\)/\1/'" source=(ftp://ftp.easysw.com/pub/cups/$pkgver/cups-$pkgver-source.tar.bz2 \ - rc.cups rc.cups-{hu,de}.po) + rc.cups rc.cups-{hu,de}.po CVE-2007-4351.diff) subpkgs=('libcups') subdescs=('Main library of the CUPS printing system.') @@ -52,6 +52,7 @@ build() { sha1sums=('6915f4499ac258a59afc5b3541b17f56b3bfb66f' \ 'ad90c43de181d362f6c507f366904472d01ae585' \ 'f19bb889e3535e1284d0b93606da48aa61089c8a' \ - '03197abb98eff18d3ede3000a61c7783b8c1ad92') + '03197abb98eff18d3ede3000a61c7783b8c1ad92' \ + '79b9bc071bb4ab0ccf032a51f815adf96264dd52') # optimization OK From voroskoi at frugalware.org Thu Nov 1 08:56:25 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 08:56:27 2007 Subject: [Frugalware-git] frugalware-current: latex2html-2002_2_1-6-i686 Message-ID: <20071101075625.DCB4E13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=56c61fb927cea95651cb249921dec7b9d7b4e7d4 commit 56c61fb927cea95651cb249921dec7b9d7b4e7d4 Author: voroskoi Date: Thu Nov 1 08:55:44 2007 +0100 latex2html-2002_2_1-6-i686 s/espgs/ghostscript/ diff --git a/source/xapps-extra/latex2html/FrugalBuild b/source/xapps-extra/latex2html/FrugalBuild index 95e9307..041907e 100644 --- a/source/xapps-extra/latex2html/FrugalBuild +++ b/source/xapps-extra/latex2html/FrugalBuild @@ -4,10 +4,10 @@ pkgname=latex2html pkgver=2002_2_1 -pkgrel=5 +pkgrel=6 pkgdesc="A converter written in Perl that converts LaTeX documents to HTML." url="http://saftsack.fs.uni-bayreuth.de/~latex2ht/" -depends=('perl' 'espgs' 'tetex' 'libpng' 'libungif' 'netpbm') +depends=('perl' 'ghostscript' 'tetex' 'libpng' 'libungif' 'netpbm') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') @@ -29,4 +29,3 @@ build() { Fdeststrip /usr/lib/latex2html/{*.pm,*.pl} /usr/bin/latex2html chmod 755 $Fdestdir/usr/bin/{pstoimg,$pkgname,texexpand} } - From voroskoi at frugalware.org Thu Nov 1 09:20:38 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 09:20:41 2007 Subject: [Frugalware-git] frugalware-0.7: wordpress-2.3.1-1sayshell1-i686 Message-ID: <20071101082038.C296A13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=76f4ee177e257d452c786a52692c04f5f9bfc74b commit 76f4ee177e257d452c786a52692c04f5f9bfc74b Author: voroskoi Date: Thu Nov 1 09:15:25 2007 +0100 wordpress-2.3.1-1sayshell1-i686 secfix bump, closes #2535 diff --git a/source/network-extra/wordpress/FrugalBuild b/source/network-extra/wordpress/FrugalBuild index 57adeb6..96fdcbe 100644 --- a/source/network-extra/wordpress/FrugalBuild +++ b/source/network-extra/wordpress/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László pkgname=wordpress -pkgver=2.2.3 -pkgrel=1 +pkgver=2.3.1 +pkgrel=1sayshell1 pkgdesc="a state-of-the-art semantic personal publishing platform" url="http://wordpress.org/" rodepends=('php>=4.2' 'mysql>=4.0') @@ -21,4 +21,4 @@ build() Fmv ../src/$pkgname /var/www/$pkgname } # optimization OK - noarch -sha1sums=('171ed6bba94301406cb94b725d2f9ecca6cefecc') +sha1sums=('bf1dc2db2f1ae2be5981548cd7c9a686453981cf') From voroskoi at frugalware.org Thu Nov 1 09:41:48 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 09:41:51 2007 Subject: [Frugalware-git] frugalware-current: django-0.96.1-1-i686 Message-ID: <20071101084148.5259A13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=325905255f3fd3d7be0e01bb08fbddcc1f8ff7e9 commit 325905255f3fd3d7be0e01bb08fbddcc1f8ff7e9 Author: voroskoi Date: Thu Nov 1 09:41:22 2007 +0100 django-0.96.1-1-i686 secfix bump, closes #2543 in -current diff --git a/source/devel-extra/django/FrugalBuild b/source/devel-extra/django/FrugalBuild index 86c2be5..225dd89 100644 --- a/source/devel-extra/django/FrugalBuild +++ b/source/devel-extra/django/FrugalBuild @@ -1,9 +1,10 @@ # Compiling Time: 0.02 SBU -# Maintainer: AlexExtreme +# Contributor: AlexExtreme +# Maintainer: voroskoi pkgname=django _F_archive_name=Django -pkgver=0.96 +pkgver=0.96.1 pkgrel=1 pkgdesc="Django is a Python web framework" url="http://www.djangoproject.com" @@ -13,4 +14,4 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.djangoproject.com/download/ | Flasttar" source=(http://media.djangoproject.com/releases/0.96/$_F_archive_name-$pkgver.tar.gz) -sha1sums=('8870e0946ffe33a78293616d89b640fa58c6fe33') +sha1sums=('85270f857ff405983cae9a1ef76dfb3303ca6eec') From voroskoi at frugalware.org Thu Nov 1 10:10:29 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 10:10:32 2007 Subject: [Frugalware-git] frugalware-0.7: django-0.96-2sayshell1-i686 Message-ID: <20071101091029.7849013A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=de7aa043ad217da8f8cf56288bb82532705302a1 commit de7aa043ad217da8f8cf56288bb82532705302a1 Author: voroskoi Date: Thu Nov 1 10:06:33 2007 +0100 django-0.96-2sayshell1-i686 secfix relbump, closes #2543 diff --git a/source/devel-extra/django/FrugalBuild b/source/devel-extra/django/FrugalBuild index f809df5..ef516b7 100644 --- a/source/devel-extra/django/FrugalBuild +++ b/source/devel-extra/django/FrugalBuild @@ -3,7 +3,7 @@ pkgname=django pkgver=0.96 -pkgrel=1 +pkgrel=2sayshell1 pkgdesc="Django is a Python web framework" url="http://www.djangoproject.com" depends=('python') @@ -11,6 +11,7 @@ makedepends=('setuptools') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.djangoproject.com/download/ | grep Django | Flasttar" -source=(http://media.djangoproject.com/releases/0.96/Django-$pkgver.tar.gz) +source=(http://media.djangoproject.com/releases/0.96/Django-$pkgver.tar.gz i18n-0.96.diff) _F_cd_path="Django-$pkgver" -sha1sums=('8870e0946ffe33a78293616d89b640fa58c6fe33') +sha1sums=('8870e0946ffe33a78293616d89b640fa58c6fe33' \ + 'ec3ee321be55b38998eb09a86e23c115035883c7') diff --git a/source/devel-extra/django/i18n-0.96.diff b/source/devel-extra/django/i18n-0.96.diff new file mode 100644 index 0000000..744327f --- /dev/null +++ b/source/devel-extra/django/i18n-0.96.diff @@ -0,0 +1,147 @@ +--- Django-0.96/django/utils/translation/trans_real.py.orig 2007-02-12 10:50:35.000000000 +1100 ++++ Django-0.96/django/utils/translation/trans_real.py 2007-10-24 15:07:03.000000000 +1000 +@@ -1,6 +1,9 @@ + "Translation helper functions" + +-import os, re, sys ++import locale ++import os ++import re ++import sys + import gettext as gettext_module + from cStringIO import StringIO + from django.utils.functional import lazy +@@ -25,15 +28,25 @@ + # The default translation is based on the settings file. + _default = None + +-# This is a cache for accept-header to translation object mappings to prevent +-# the accept parser to run multiple times for one user. ++# This is a cache for normalised accept-header languages to prevent multiple ++# file lookups when checking the same locale on repeated requests. + _accepted = {} + +-def to_locale(language): ++# Format of Accept-Language header values. From RFC 2616, section 14.4 and 3.9. ++accept_language_re = re.compile(r''' ++ ([A-Za-z]{1,8}(?:-[A-Za-z]{1,8})*|\*) # "en", "en-au", "x-y-z", "*" ++ (?:;q=(0(?:\.\d{,3})?|1(?:.0{,3})?))? # Optional "q=1.00", "q=0.8" ++ (?:\s*,\s*|$) # Multiple accepts per header. ++ ''', re.VERBOSE) ++ ++def to_locale(language, to_lower=False): + "Turns a language name (en-us) into a locale name (en_US)." + p = language.find('-') + if p >= 0: +- return language[:p].lower()+'_'+language[p+1:].upper() ++ if to_lower: ++ return language[:p].lower()+'_'+language[p+1:].lower() ++ else: ++ return language[:p].lower()+'_'+language[p+1:].upper() + else: + return language.lower() + +@@ -309,46 +322,40 @@ + if lang_code in supported and lang_code is not None and check_for_language(lang_code): + return lang_code + +- lang_code = request.COOKIES.get('django_language', None) +- if lang_code in supported and lang_code is not None and check_for_language(lang_code): ++ lang_code = request.COOKIES.get('django_language') ++ if lang_code and lang_code in supported and check_for_language(lang_code): + return lang_code + +- accept = request.META.get('HTTP_ACCEPT_LANGUAGE', None) +- if accept is not None: +- +- t = _accepted.get(accept, None) +- if t is not None: +- return t +- +- def _parsed(el): +- p = el.find(';q=') +- if p >= 0: +- lang = el[:p].strip() +- order = int(float(el[p+3:].strip())*100) +- else: +- lang = el +- order = 100 +- p = lang.find('-') +- if p >= 0: +- mainlang = lang[:p] +- else: +- mainlang = lang +- return (lang, mainlang, order) +- +- langs = [_parsed(el) for el in accept.split(',')] +- langs.sort(lambda a,b: -1*cmp(a[2], b[2])) +- +- for lang, mainlang, order in langs: +- if lang in supported or mainlang in supported: +- langfile = gettext_module.find('django', globalpath, [to_locale(lang)]) +- if langfile: +- # reconstruct the actual language from the language +- # filename, because otherwise we might incorrectly +- # report de_DE if we only have de available, but +- # did find de_DE because of language normalization +- lang = langfile[len(globalpath):].split(os.path.sep)[1] +- _accepted[accept] = lang +- return lang ++ accept = request.META.get('HTTP_ACCEPT_LANGUAGE', '') ++ for lang, unused in parse_accept_lang_header(accept): ++ if lang == '*': ++ break ++ ++ # We have a very restricted form for our language files (no encoding ++ # specifier, since they all must be UTF-8 and only one possible ++ # language each time. So we avoid the overhead of gettext.find() and ++ # look up the MO file manually. ++ ++ normalized = locale.locale_alias.get(to_locale(lang, True)) ++ if not normalized: ++ continue ++ ++ # Remove the default encoding from locale_alias ++ normalized = normalized.split('.')[0] ++ ++ if normalized in _accepted: ++ # We've seen this locale before and have an MO file for it, so no ++ # need to check again. ++ return _accepted[normalized] ++ ++ for lang in (normalized, normalized.split('_')[0]): ++ if lang not in supported: ++ continue ++ langfile = os.path.join(globalpath, lang, 'LC_MESSAGES', ++ 'django.mo') ++ if os.path.exists(langfile): ++ _accepted[normalized] = lang ++ return lang + + return settings.LANGUAGE_CODE + +@@ -494,3 +501,24 @@ + return ''.join([str(el) for el in strings]) + + string_concat = lazy(string_concat, str) ++ ++def parse_accept_lang_header(lang_string): ++ """ ++ Parses the lang_string, which is the body of an HTTP Accept-Language ++ header, and returns a list of (lang, q-value), ordered by 'q' values. ++ ++ Any format errors in lang_string results in an empty list being returned. ++ """ ++ result = [] ++ pieces = accept_language_re.split(lang_string) ++ if pieces[-1]: ++ return [] ++ for i in range(0, len(pieces) - 1, 3): ++ first, lang, priority = pieces[i : i + 3] ++ if first: ++ return [] ++ priority = priority and float(priority) or 1.0 ++ result.append((lang, priority)) ++ result.sort(lambda x, y: -cmp(x[1], y[1])) ++ return result ++ From voroskoi at frugalware.org Thu Nov 1 11:26:24 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 11:26:26 2007 Subject: [Frugalware-git] frugalware-0.7: liferea-1.2.23-2sayshell1-i686 Message-ID: <20071101102624.068A313A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=b2d9281cca84a17fc28a65c95822dfd23c5f740d commit b2d9281cca84a17fc28a65c95822dfd23c5f740d Author: voroskoi Date: Thu Nov 1 11:24:54 2007 +0100 liferea-1.2.23-2sayshell1-i686 secfix relbump, closes #2544 diff --git a/source/gnome-extra/liferea/FrugalBuild b/source/gnome-extra/liferea/FrugalBuild index 17c6aeb..afffac8 100644 --- a/source/gnome-extra/liferea/FrugalBuild +++ b/source/gnome-extra/liferea/FrugalBuild @@ -3,7 +3,7 @@ pkgname=liferea pkgver=1.2.23 -pkgrel=1 +pkgrel=2sayshell1 pkgdesc="Liferea is a news aggregator for online news feeds." license="GPL2" groups=('gnome-extra') @@ -15,12 +15,15 @@ _F_gnome_schemas=('/etc/gconf/schemas/liferea.schemas') _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet +source=(${source[@]} feedlist_permission.diff) up2date="lynx -dump http://liferea.sourceforge.net|grep -m1 'Stable'|sed 's/.*]\(.*\) .*/\1/'" -sha1sums=('270a20b59925cc083ab17f3028bae4a296255df2') +sha1sums=('270a20b59925cc083ab17f3028bae4a296255df2' \ + 'a836df98985de38bb23930222902fdc9552264bc') build() { Fcd $pkgname-$pkgver Fsed '' '&\n ' opml/*.opml + Fpatchall Fmake Fmakeinstall Fsed "LD_LIBRARY_PATH=:" "LD_LIBRARY_PATH=/usr/lib/xulrunner:" $Fdestdir/usr/bin/$pkgname diff --git a/source/gnome-extra/liferea/feedlist_permission.diff b/source/gnome-extra/liferea/feedlist_permission.diff new file mode 100644 index 0000000..d27dda0 --- /dev/null +++ b/source/gnome-extra/liferea/feedlist_permission.diff @@ -0,0 +1,35 @@ +diff -aur liferea-1.2.23/src/common.c fw_liferea-1.2.23/src/common.c +--- liferea-1.2.23/src/common.c 2007-08-19 19:17:58.000000000 +0200 ++++ fw_liferea-1.2.23/src/common.c 2007-11-01 11:10:14.000000000 +0100 +@@ -908,6 +908,9 @@ + + g_free(cachePath); + /* lifereaUserPath reused globally */ ++ ++ /* ensure reasonable default umask */ ++ umask (077); + } + + const gchar * common_get_cache_path(void) { +diff -aur liferea-1.2.23/src/export.c fw_liferea-1.2.23/src/export.c +--- liferea-1.2.23/src/export.c 2007-06-21 00:22:10.000000000 +0200 ++++ fw_liferea-1.2.23/src/export.c 2007-11-01 11:11:30.000000000 +0100 +@@ -126,15 +126,15 @@ + error = TRUE; + } + +- if(trusted) +- old_umask = umask(077); ++ if(!trusted) ++ old_umask = umask(022); /* give read permissions for other, per-default we wouldn't give it... */ + + if(-1 == common_save_xml(doc, backupFilename)) { + g_warning("Could not export to OPML file!!"); + error = TRUE; + } + +- if(trusted) ++ if(!trusted) + umask(old_umask); + + xmlFreeDoc(doc); From boobaa at frugalware.org Thu Nov 1 11:29:00 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Nov 1 11:29:01 2007 Subject: [Frugalware-git] frugalware-current: k9copy-1.2.0-1-i686 Message-ID: <20071101102900.ECBCA13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ecdb3051b30572c20a7a96499109c0fa2777606e commit ecdb3051b30572c20a7a96499109c0fa2777606e Author: CSÉCSY László Date: Thu Nov 1 11:28:52 2007 +0100 k9copy-1.2.0-1-i686 version bump diff --git a/source/kde-extra/k9copy/FrugalBuild b/source/kde-extra/k9copy/FrugalBuild index 005e95a..ae4d180 100644 --- a/source/kde-extra/k9copy/FrugalBuild +++ b/source/kde-extra/k9copy/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=k9copy -pkgver=1.1.3 +pkgver=1.2.0 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=('2ef4dea252cce9d1dca0dfb8f439e8f7449ee582') +sha1sums=('c1585998774b5debdeec3ea0efb7254f6deb3ca6') From priyank at frugalware.org Thu Nov 1 14:06:59 2007 From: priyank at frugalware.org (Priyank) Date: Thu Nov 1 14:07:01 2007 Subject: [Frugalware-git] frugalware-current: deluge-0.5.6.2-1-i686 Message-ID: <20071101130659.CF43D13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8901605e41f1d53d56f68e1a41a257b87d7702e commit d8901605e41f1d53d56f68e1a41a257b87d7702e Author: Priyank Date: Thu Nov 1 18:35:47 2007 +0530 deluge-0.5.6.2-1-i686 * removed seahorse-configure_gedit_fix.diff (fixed in upstream) diff --git a/source/gnome-extra/seahorse/seahorse-configure_gedit_fix.diff b/source/gnome-extra/seahorse/seahorse-configure_gedit_fix.diff deleted file mode 100644 index 6e6cce3..0000000 --- a/source/gnome-extra/seahorse/seahorse-configure_gedit_fix.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur seahorse-2.20.0/configure.in seahorse-2.20.0.new/configure.in ---- seahorse-2.20.0/configure.in 2007-09-19 09:16:40.000000000 +0530 -+++ seahorse-2.20.0.new/configure.in 2007-09-25 12:19:15.000000000 +0530 -@@ -607,13 +607,14 @@ - # - Bonobo plugins <= 2.12. - # - Glib type plugins > 2.13 - -- PKG_CHECK_MODULES(GEDIT, gedit-2.16 >= 2.15.0, [with_gedit_plugin=yes], -+ PKG_CHECK_MODULES(GEDIT, gedit-2.20 >= 2.20.0, [with_gedit_plugin=yes], -+ [PKG_CHECK_MODULES(GEDIT, gedit-2.16 >= 2.15.0, [with_gedit_plugin=yes], - [PKG_CHECK_MODULES(GEDIT, gedit-2.14 >= 2.13.0, [with_gedit_plugin=yes], - [PKG_CHECK_MODULES(GEDIT, gedit-2.12 >= 2.12.0, [with_gedit_bonobo=yes], - [PKG_CHECK_MODULES(GEDIT, gedit-2.10 >= 2.9.0, [with_gedit_bonobo=yes], - [PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, [with_gedit_bonobo=yes], - [PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0, [with_gedit_bonobo=yes], -- [enable_gedit=no])])])])])]) -+ [enable_gedit=no])])])])])])]) - - if test "$enable_gedit" = "yes"; then - echo "enabling gedit plugin..." From hermier at frugalware.org Thu Nov 1 14:14:28 2007 From: hermier at frugalware.org (Michel Hermier) Date: Thu Nov 1 14:14:30 2007 Subject: [Frugalware-git] frugalware-current: eric-3.9.5-1-i686 Message-ID: <20071101131428.737EE13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d745aed9a9d5c92d96f4eab22a39a29492c57ab commit 8d745aed9a9d5c92d96f4eab22a39a29492c57ab Author: Michel Hermier Date: Thu Nov 1 13:49:06 2007 +0100 eric-3.9.5-1-i686 * Fix site url. * Fix up2date. diff --git a/source/xapps-extra/eric/FrugalBuild b/source/xapps-extra/eric/FrugalBuild index 5ae8076..be1d595 100644 --- a/source/xapps-extra/eric/FrugalBuild +++ b/source/xapps-extra/eric/FrugalBuild @@ -7,9 +7,9 @@ pkgrel=1 pkgdesc="Eric is a full featured Python (and Ruby) IDE that is written in PyQt." _F_sourceforge_dirname="$pkgname-ide" Finclude sourceforge python -url="http://www.die-offenbachs.de/detlev/eric3.html" +url="http://www.die-offenbachs.de/eric/index.html" license="GPL2" -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=119070'|grep -om1 'eric-\(.*\).tar.gz'|Flasttar" +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=119070&package_id=130253'|grep -v eric-i18n|Flasttar" source=($source ${source/eric-$pkgver/eric-i18n-de-$pkgver} \ ${source/eric-$pkgver/eric-i18n-fr-$pkgver} \ ${source/eric-$pkgver/eric-i18n-ru-$pkgver} $pkgname.desktop) From hermier at frugalware.org Thu Nov 1 14:14:28 2007 From: hermier at frugalware.org (Michel Hermier) Date: Thu Nov 1 14:14:30 2007 Subject: [Frugalware-git] frugalware-current: eric4-4.0.3-1-i686 Message-ID: <20071101131428.82E8E13A405F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3b03f59c99cd41acaaeb9db54ff1c2adc2af2a8 commit d3b03f59c99cd41acaaeb9db54ff1c2adc2af2a8 Author: Michel Hermier Date: Thu Nov 1 13:59:32 2007 +0100 eric4-4.0.3-1-i686 * Fix up2date. diff --git a/source/xapps-extra/eric4/FrugalBuild b/source/xapps-extra/eric4/FrugalBuild index b867ea7..4976238 100644 --- a/source/xapps-extra/eric4/FrugalBuild +++ b/source/xapps-extra/eric4/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Eric4 is a full featured Python (and Ruby) IDE that is written in PyQt4 _F_sourceforge_dirname="eric-ide" Finclude sourceforge python url="http://www.die-offenbachs.de/eric/index.html" -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=119070'|grep -om1 'eric4-\(.*\).tar.gz'|Flasttar" +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=119070&package_id=233329'|grep -v eric4-i18n|Flasttar" source=($source \ ${source/eric4-$pkgver/eric4-i18n-de-$pkgver} \ ${source/eric4-$pkgver/eric4-i18n-fr-$pkgver} \ From hermier at frugalware.org Thu Nov 1 14:14:28 2007 From: hermier at frugalware.org (Michel Hermier) Date: Thu Nov 1 14:14:30 2007 Subject: [Frugalware-git] frugalware-current: util.sh Message-ID: <20071101131428.C894F13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=057ff5343ce07b2044f31fbad5864d052b8ad276 commit 057ff5343ce07b2044f31fbad5864d052b8ad276 Author: Michel Hermier Date: Thu Nov 1 14:09:49 2007 +0100 util.sh * Avoid an uinnecessary grep. * Fix the sed program to spit all the version it find (was spitting only the last line before). * Imporve the sed match patern to be sure that before the archive name we have a '/'. diff --git a/source/include/util.sh b/source/include/util.sh index 927eb2b..78afdd6 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -806,7 +806,7 @@ Flastarchive() { if [ -z "$_F_archive_name" ]; then _F_archive_name="$pkgname" fi - grep ".*$_F_archive_name$Fpkgversep.*\($1\).*"|sed -n "s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/;$ p"|Fsort|tail -n1 + sed -n "s/.*\/$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" | Fsort | tail -n1 } ### From priyank at frugalware.org Thu Nov 1 14:16:30 2007 From: priyank at frugalware.org (Priyank) Date: Thu Nov 1 14:16:30 2007 Subject: [Frugalware-git] frugalware-current: python-sqlobject-0.9.2-1-i686 Message-ID: <20071101131630.4CC6713A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=72e7e1d12085e315333616f63ffb5a1f245779cc commit 72e7e1d12085e315333616f63ffb5a1f245779cc Author: Priyank Date: Thu Nov 1 18:43:06 2007 +0530 python-sqlobject-0.9.2-1-i686 * Version bump diff --git a/source/devel-extra/python-sqlobject/FrugalBuild b/source/devel-extra/python-sqlobject/FrugalBuild index f88b704..e2132f8 100644 --- a/source/devel-extra/python-sqlobject/FrugalBuild +++ b/source/devel-extra/python-sqlobject/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: enda pkgname=python-sqlobject -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=1 pkgdesc="SQLObject is a popular Object Relational Manager for providing an object interface to your database." url="http://sqlobject.org/" @@ -14,5 +14,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://cheeseshop.python.org/pypi/SQLObject | grep -m1 SQLObject | sed 's/.*ct \(.*\) *O.*/\1/' | tr -d ' '" source=(http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-$pkgver.tar.gz) _F_cd_path="SQLObject-$pkgver" -sha1sums=('a6e50b0b47f04403dd46d31c46739b64e55c145d') +sha1sums=('457d33857c1eb21854695bd38853479485f50f69') From vmiklos at frugalware.org Thu Nov 1 14:43:37 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 14:43:38 2007 Subject: [Frugalware-git] frugalware-current: git-1.5.3.5-1-i686 Message-ID: <20071101134337.B120513A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5facde5688e6c767d85bd0e85533afee00be6f16 commit 5facde5688e6c767d85bd0e85533afee00be6f16 Author: Miklos Vajna Date: Thu Nov 1 14:43:25 2007 +0100 git-1.5.3.5-1-i686 version bump diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 10694e8..9c9c331 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -4,9 +4,9 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=git -pkgver=1.5.3.4 +pkgver=1.5.3.5 Fuse $USE_DEVEL && pkgver=1.5.3.rc7.30.g947ad2 -pkgrel=3 +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') From vmiklos at frugalware.org Thu Nov 1 15:16:07 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 15:16:10 2007 Subject: [Frugalware-git] frugalware-current: googleearth-4.2-1-i686 Message-ID: <20071101141607.3DCB113A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c52ade95bd28841a26bc9c21f2f50f269103b0e8 commit c52ade95bd28841a26bc9c21f2f50f269103b0e8 Author: Miklos Vajna Date: Thu Nov 1 15:13:43 2007 +0100 googleearth-4.2-1-i686 version bump diff --git a/source/xapps-extra/googleearth/FrugalBuild b/source/xapps-extra/googleearth/FrugalBuild index 91d1420..67f93a3 100644 --- a/source/xapps-extra/googleearth/FrugalBuild +++ b/source/xapps-extra/googleearth/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: VMiklos pkgname=googleearth -pkgver=4 +pkgver=4.2 pkgrel=1 pkgdesc="A 3D interface to the planet" url="http://earth.google.com/" depends=('mesa' 'libsm' 'openssl' 'curl' 'libstdc++' 'libxcursor' 'libmng' 'libxft' 'libpng') groups=('xapps-extra') archs=('i686') -up2date="lynx -dump http://earth.google.com/download-earth.html|grep Version|sed 's/.*Version //;q'" +up2date="lynx -dump http://earth.google.com/download-earth.html|grep '(beta)'|sed 's/.* \(.*\) (beta.*/\1/'" source=(http://dl.google.com/earth/client/current/GoogleEarthLinux.bin) sha1sums=('d387de66ed5375eaf5be8fd5ce188fc047066de2') options=('nobuild' 'nostrip') @@ -21,9 +21,9 @@ build() Fsed '$SETUP_INSTALLPATH/' '' postinstall.sh Fsed ' --user' ' --system' postinstall.sh Fsed '$SETUP_INSTALLPATH' '1' postinstall.sh - Fsed '/usr' "$Fdestdir/usr" linux/xdg/xdg-m{ime,enu} - Fsed '-x $x/update-mime' '-d junk' linux/xdg/xdg-m{ime,enu} - Fsed '-x $x/update-desktop' '-d junk' linux/xdg/xdg-m{ime,enu} + Fsed '/usr' "$Fdestdir/usr" linux/xdg/xdg-{mime,desktop-menu} + Fsed '-x $x/update-mime' '-d junk' linux/xdg/xdg-{mime,desktop-menu} + Fsed '-x $x/update-desktop' '-d junk' linux/xdg/xdg-{mime,desktop-menu} Fmkdir /usr/{bin,share/{appl{ications,nk},gnome/apps,mime/packages}} ./postinstall.sh || return 1 Ficonrel googleearth-icon.png From vmiklos at frugalware.org Thu Nov 1 15:40:19 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 15:40:20 2007 Subject: [Frugalware-git] pacman-tools: genchangelog: use git log --follow Message-ID: <20071101144019.CA82E13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=ae96efb416ca07e93cfb24fbe36ea49f053a09e4 commit ae96efb416ca07e93cfb24fbe36ea49f053a09e4 Author: Miklos Vajna Date: Thu Nov 1 15:40:01 2007 +0100 genchangelog: use git log --follow so, if you rename a package, the changelog will not be truncated diff --git a/genchangelog b/genchangelog index f08a77b..5004dbf 100644 --- a/genchangelog +++ b/genchangelog @@ -27,7 +27,7 @@ CHROOT=1 if [ ! -e Changelog ] || [ `stat -c %Y Changelog` -lt `stat -c %Y FrugalBuild` ]; then if [ "$F_makepkg_scm" = "git" ]; then echo -n "running git log... " - git log -M FrugalBuild > Changelog + git log --follow FrugalBuild > Changelog else echo -n "running darcs changes... " darcs changes FrugalBuild > Changelog From vmiklos at frugalware.org Thu Nov 1 15:41:45 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 15:41:47 2007 Subject: [Frugalware-git] pacman-tools: genchangelog: set uploader if it's not done by repoman already Message-ID: <20071101144145.E7B4C13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=4e68f83725ef23491fc12663f5ee079631f7a2c2 commit 4e68f83725ef23491fc12663f5ee079631f7a2c2 Author: Miklos Vajna Date: Thu Nov 1 15:41:42 2007 +0100 genchangelog: set uploader if it's not done by repoman already diff --git a/genchangelog b/genchangelog index 5004dbf..8805d4d 100644 --- a/genchangelog +++ b/genchangelog @@ -11,6 +11,7 @@ strip_url() echo $1 | sed 's|^.*://.*/||g' } [ -z "$arch" ] && arch=`arch` +[ -z "$uploader" ] && uploader=`echo $HOME|sed 's|.*/\(.*\)$|\1|'` echo $* |grep -q -- --check && exit 0 From crazy at frugalware.org Thu Nov 1 16:14:34 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 1 16:14:35 2007 Subject: [Frugalware-git] frugalware-current: eric4-4.0.3-1-i686 Message-ID: <20071101151434.4414013A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa1fde5dd248fe4262821fa13483d800cec8a5b5 commit aa1fde5dd248fe4262821fa13483d800cec8a5b5 Author: crazy Date: Thu Nov 1 16:14:25 2007 +0100 eric4-4.0.3-1-i686 * revert to old up2date *which* does work * Flast* thing is *broken* so use sed here diff --git a/source/xapps-extra/eric4/FrugalBuild b/source/xapps-extra/eric4/FrugalBuild index 4976238..e8be86e 100644 --- a/source/xapps-extra/eric4/FrugalBuild +++ b/source/xapps-extra/eric4/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Eric4 is a full featured Python (and Ruby) IDE that is written in PyQt4 _F_sourceforge_dirname="eric-ide" Finclude sourceforge python url="http://www.die-offenbachs.de/eric/index.html" -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=119070&package_id=233329'|grep -v eric4-i18n|Flasttar" +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=119070'|grep -om1 'eric4-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=($source \ ${source/eric4-$pkgver/eric4-i18n-de-$pkgver} \ ${source/eric4-$pkgver/eric4-i18n-fr-$pkgver} \ From crazy at frugalware.org Thu Nov 1 16:25:43 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 1 16:25:44 2007 Subject: [Frugalware-git] frugalware-current: eric-3.9.5-1-i686 Message-ID: <20071101152543.1BA2A13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b035dce6d87981a3ab94d9f5daa7d5c56826411e commit b035dce6d87981a3ab94d9f5daa7d5c56826411e Author: crazy Date: Thu Nov 1 16:25:30 2007 +0100 eric-3.9.5-1-i686 * rever to old up2date and use sed as well diff --git a/source/xapps-extra/eric/FrugalBuild b/source/xapps-extra/eric/FrugalBuild index be1d595..7922e49 100644 --- a/source/xapps-extra/eric/FrugalBuild +++ b/source/xapps-extra/eric/FrugalBuild @@ -9,7 +9,7 @@ _F_sourceforge_dirname="$pkgname-ide" Finclude sourceforge python url="http://www.die-offenbachs.de/eric/index.html" license="GPL2" -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=119070&package_id=130253'|grep -v eric-i18n|Flasttar" +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=119070'|grep -om1 'eric-\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=($source ${source/eric-$pkgver/eric-i18n-de-$pkgver} \ ${source/eric-$pkgver/eric-i18n-fr-$pkgver} \ ${source/eric-$pkgver/eric-i18n-ru-$pkgver} $pkgname.desktop) @@ -40,8 +40,8 @@ build() Fsplit $pkgname-i18n-fr $_F_python_libdir/eric3/i18n/eric3_fr.qm Fsplit $pkgname-i18n-ru $_F_python_libdir/eric3/i18n/eric3_ru.qm } -sha1sums=('bc67b3093576eb1952d6e7c40e52fd0368c365a7'\ - 'ac8aba11e9b1875329692c41c43c220bb62d9232'\ - '2ea11fb5aca45a71dff0d071dc4f01de432706bc'\ - '871578b4f30b5963f4a6c7bb8c6f438e19a74931'\ +sha1sums=('bc67b3093576eb1952d6e7c40e52fd0368c365a7' \ + 'ac8aba11e9b1875329692c41c43c220bb62d9232' \ + '2ea11fb5aca45a71dff0d071dc4f01de432706bc' \ + '871578b4f30b5963f4a6c7bb8c6f438e19a74931' \ 'd056a237d96c1ae195e8157d4981856bb350fed9') From krics at linuxforum.hu Thu Nov 1 16:31:33 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 16:31:37 2007 Subject: [Frugalware-git] pacman-g2: Fixed a wrong casting (was a warning) Message-ID: <20071101153133.5564813A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=6871204e1e5d53b5bb5b640a1cb06c169397254e commit 6871204e1e5d53b5bb5b640a1cb06c169397254e Author: Christian Hamar alias krix Date: Thu Nov 1 16:31:25 2007 +0100 Fixed a wrong casting (was a warning) * In add.c need to cast to (long) not to (int) diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c index 2890d68..09f9a1a 100644 --- a/lib/libpacman/add.c +++ b/lib/libpacman/add.c @@ -187,7 +187,7 @@ int _pacman_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) /* copy over the install reason */ pmpkg_t *local = _pacman_db_get_pkgfromcache(db, info->name); if(local) { - info->reason = (int)_pacman_pkg_getinfo(local, PM_PKG_REASON); + info->reason = (long)_pacman_pkg_getinfo(local, PM_PKG_REASON); } /* add the package to the transaction */ From krics at linuxforum.hu Thu Nov 1 16:34:37 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 16:34:39 2007 Subject: [Frugalware-git] frugalware-current: libarchive-2.4.0-1-x86_64 Message-ID: <20071101153437.872FD13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=feae4c72cbbc337d04cc9a635709c8aaf1acd896 commit feae4c72cbbc337d04cc9a635709c8aaf1acd896 Author: Christian Hamar alias krix Date: Thu Nov 1 16:34:14 2007 +0100 libarchive-2.4.0-1-x86_64 * Version bump * Tested with pactest make check was 100% PASSED - Well that means nothing so just take care :)) diff --git a/source/base/libarchive/FrugalBuild b/source/base/libarchive/FrugalBuild index 354b9a9..1299289 100644 --- a/source/base/libarchive/FrugalBuild +++ b/source/base/libarchive/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=libarchive -pkgver=2.2.8 -pkgrel=2 +pkgver=2.4.0 +pkgrel=1 pkgdesc="Library to create and read several different archive formats" groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') @@ -11,6 +11,6 @@ url="http://people.freebsd.org/~kientzle/libarchive/" depends=('bzip2' 'zlib') up2date="lynx -dump $url |Flasttar" source=($url/src/$pkgname-$pkgver.tar.gz) -sha1sums=('49decd6a15152a0f666de10c947afee1a52566af') -options=('force') +sha1sums=('b1d845e1c9e1631ba4b220627604832a14d84679') +#options=('force') # optimization OK From krics at linuxforum.hu Thu Nov 1 16:40:45 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 16:40:48 2007 Subject: [Frugalware-git] frugalware-current: eog-2.20.2-1-x86_64 Message-ID: <20071101154045.CC9A113A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=227a9045a38282cbd920d19371a532891c90879e commit 227a9045a38282cbd920d19371a532891c90879e Author: Christian Hamar alias krix Date: Thu Nov 1 16:40:08 2007 +0100 eog-2.20.2-1-x86_64 * Version bump diff --git a/source/gnome/eog/FrugalBuild b/source/gnome/eog/FrugalBuild index f4685ad..99a271f 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.1 +pkgver=2.20.2 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=('9d8f9c15e6e5aa8a9ffda03cb5ca29d7e735829b') +sha1sums=('eca46e393cd02bf5156c30a6f64a9341e0a3bcca') # optimization OK From krics at linuxforum.hu Thu Nov 1 16:47:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 16:47:03 2007 Subject: [Frugalware-git] frugalware-current: exaile-0.2.11-1-x86_64 Message-ID: <20071101154700.A015E13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=503fb58de4e4bcd393c7a378c2849554f89bd799 commit 503fb58de4e4bcd393c7a378c2849554f89bd799 Author: Christian Hamar alias krix Date: Thu Nov 1 16:46:33 2007 +0100 exaile-0.2.11-1-x86_64 * Version bump * Fixed cdpath again.. :S diff --git a/source/gnome-extra/exaile/FrugalBuild b/source/gnome-extra/exaile/FrugalBuild index 6a28b74..aa9ef89 100644 --- a/source/gnome-extra/exaile/FrugalBuild +++ b/source/gnome-extra/exaile/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=exaile -pkgver=0.2.10 +pkgver=0.2.11 pkgrel=1 pkgdesc="Exaile is a media player aiming to be similar to KDE's AmaroK, but for GTK+" url="http://www.exaile.org" @@ -17,8 +17,8 @@ archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump 'http://www.exaile.org/downloads'|grep -m1 '.tar.gz'|sed 's/.*_\(.*\).t.*/\1/'" source=($url/files/${pkgname}_$pkgver.tar.gz) -_F_cd_path="${pkgname}_${pkgver}" -sha1sums=('201052c99762405fa99132f6ded308543fd1998b') +_F_cd_path="${pkgname}-${pkgver}" +sha1sums=('db90d68ca4699cc9cb7f0bccb0af039e790072b7') build() { # Fixup for prefix :P From krics at linuxforum.hu Thu Nov 1 16:52:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 16:52:03 2007 Subject: [Frugalware-git] frugalware-current: gnomad2-2.9.0-1-x86_64 Message-ID: <20071101155200.D4A1813A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=735af9d301be2ebf4578ac2657626c2f393479f4 commit 735af9d301be2ebf4578ac2657626c2f393479f4 Author: Christian Hamar alias krix Date: Thu Nov 1 16:51:42 2007 +0100 gnomad2-2.9.0-1-x86_64 * Version bump * Added taglib as depends() diff --git a/source/gnome-extra/gnomad2/FrugalBuild b/source/gnome-extra/gnomad2/FrugalBuild index 7cc57bc..4faac6b 100644 --- a/source/gnome-extra/gnomad2/FrugalBuild +++ b/source/gnome-extra/gnomad2/FrugalBuild @@ -3,11 +3,11 @@ # Contributor: BMH1980 pkgname=gnomad2 -pkgver=2.8.13 -pkgrel=2 +pkgver=2.9.0 +pkgrel=1 pkgdesc="Gnomad2 transfer tracks/files from/to a Creative Nomad Jukebox (all brands)." url="http://gnomad2.sourceforge.net/" -depends=('gtk+2>=2.10.2' 'libmtp>=0.2.1' 'libid3tag' 'libnjb' 'dbus-glib') +depends=('gtk+2>=2.10.2' 'libmtp>=0.2.1' 'libid3tag' 'libnjb' 'dbus-glib' 'taglib') makedepends=('perl-xml') license="GPL2" groups=('gnome-extra') @@ -15,6 +15,6 @@ archs=('i686' 'x86_64') options=('scriptlet') _F_sourceforge_broken_up2date=1 Finclude sourceforge -sha1sums=('d61b41998873b789e396b3943b3e706332d9d25b') +sha1sums=('9ac31398f6a11f0fc2311ca390f74fe4134971dc') # optimization OK From hermier at frugalware.org Thu Nov 1 16:54:48 2007 From: hermier at frugalware.org (Michel Hermier) Date: Thu Nov 1 16:54:50 2007 Subject: [Frugalware-git] frugalware-current: util.sh Message-ID: <20071101155448.9B09A13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55d122a127ba39a36682dd0ed8911d0358b26c56 commit 55d122a127ba39a36682dd0ed8911d0358b26c56 Author: Michel Hermier Date: Thu Nov 1 16:53:42 2007 +0100 util.sh * Revert / matching at the front of the archive name. diff --git a/source/include/util.sh b/source/include/util.sh index 78afdd6..b926679 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -806,7 +806,7 @@ Flastarchive() { if [ -z "$_F_archive_name" ]; then _F_archive_name="$pkgname" fi - sed -n "s/.*\/$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" | Fsort | tail -n1 + sed -n "s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" | Fsort | tail -n1 } ### From krics at linuxforum.hu Thu Nov 1 17:02:33 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 17:02:36 2007 Subject: [Frugalware-git] frugalware-current: goffice-0.5.1-1-x86_64 Message-ID: <20071101160233.4A22913A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1bb45962e84ba0e8082bfbcf2334910147ebfc2c commit 1bb45962e84ba0e8082bfbcf2334910147ebfc2c Author: Christian Hamar alias krix Date: Thu Nov 1 17:01:52 2007 +0100 goffice-0.5.1-1-x86_64 * Version bump diff --git a/source/gnome-extra/goffice/FrugalBuild b/source/gnome-extra/goffice/FrugalBuild index 2963819..ea7ebbe 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.4.2 +pkgver=0.5.1 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=('63d5ee9be7ea0e568ee103f7d9da961149efbcfb') +sha1sums=('e518301a6cb416b791a0b745c3e49056774126bf') # optimization OK From krics at linuxforum.hu Thu Nov 1 17:19:42 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 17:19:44 2007 Subject: [Frugalware-git] frugalware-current: gnumeric-1.7.13-1-x86_64 Message-ID: <20071101161942.550C613A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b7272d4a7ce183eed861da55f311270c6c51394f commit b7272d4a7ce183eed861da55f311270c6c51394f Author: Christian Hamar alias krix Date: Thu Nov 1 17:16:22 2007 +0100 gnumeric-1.7.13-1-x86_64 * Version bump * Some # for Frugalbuild :) diff --git a/source/gnome-extra/gnumeric/FrugalBuild b/source/gnome-extra/gnumeric/FrugalBuild index 955c77f..febeb23 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.10 +pkgver=1.7.13 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.4.0') +depends=('libgnomedb>=2.99.5' 'libgda>=2.99.5' 'libgsf-gnome' 'desktop-file-utils' 'goffice>=0.5.1') makedepends=('intltool' 'pygtk') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -19,11 +19,11 @@ _F_gnome_devel="y" Finclude gnome gnome-scriptlet build() { - Fpatchall +# Fpatchall Fcd - Fsed "libgda-2.0" "libgda-3.0" configure.in - Fsed "libgnomedb-2.0" "libgnomedb-3.0" configure.in - Fautoreconf +# Fsed "libgda-2.0" "libgda-3.0" configure.in +# Fsed "libgnomedb-2.0" "libgnomedb-3.0" configure.in +# Fautoreconf Fbuild_slice_scrollkeeper Fmake --enable-ssindex --disable-schemas-install --disable-scrollkeeper Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 @@ -31,5 +31,5 @@ build() { Frm /usr/share/mc/ } -sha1sums=('8222ecec9ea3e3f9d9e1d3c0b223224658697a9a') +sha1sums=('d5f5f20fa7389735752f016ab0207c07ea476831') # optimization OK From krics at linuxforum.hu Thu Nov 1 17:24:55 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 17:24:58 2007 Subject: [Frugalware-git] frugalware-current: gwenhywfar-2.6.2-1-x86_64 Message-ID: <20071101162455.E22E213A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab20c24e24cf4d21694c93892bce05939589d6d4 commit ab20c24e24cf4d21694c93892bce05939589d6d4 Author: Christian Hamar alias krix Date: Thu Nov 1 17:24:29 2007 +0100 gwenhywfar-2.6.2-1-x86_64 * Version bump diff --git a/source/lib-extra/gwenhywfar/FrugalBuild b/source/lib-extra/gwenhywfar/FrugalBuild index c9fba34..7d7c0e8 100644 --- a/source/lib-extra/gwenhywfar/FrugalBuild +++ b/source/lib-extra/gwenhywfar/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gwenhywfar -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=1 pkgdesc="a multi-platform helper library for networking and security applications and libraries." depends=('openssl' 'libxml2') @@ -17,5 +17,5 @@ build() { Fbuild --enable-release=yes } -sha1sums=('6fd20e998946ea6d7b3d154d34090021d86adcf8') +sha1sums=('ba0329604fc8c125e209387f32f28c15b8728150') # optimization OK From krics at linuxforum.hu Thu Nov 1 17:37:13 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 17:37:16 2007 Subject: [Frugalware-git] frugalware-current: aqbanking-2.3.3-1-x86_64 Message-ID: <20071101163713.D6A6E13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f67a578b1ac649559dd9a6e0d2d1ca69c52c4022 commit f67a578b1ac649559dd9a6e0d2d1ca69c52c4022 Author: Christian Hamar alias krix Date: Thu Nov 1 17:35:54 2007 +0100 aqbanking-2.3.3-1-x86_64 * Version bump diff --git a/source/lib-extra/aqbanking/FrugalBuild b/source/lib-extra/aqbanking/FrugalBuild index 7a24076..610688f 100644 --- a/source/lib-extra/aqbanking/FrugalBuild +++ b/source/lib-extra/aqbanking/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=aqbanking -pkgver=2.3.2 +pkgver=2.3.3 pkgrel=1 pkgdesc="AqBanking is a library for online banking and financial applications." url="http://http://www.aquamaniac.de/aqbanking/" -depends=('gwenhywfar>=2.6.1' 'libofx' 'libchipcard3') +depends=('gwenhywfar>=2.6.2' 'libofx' 'libchipcard3') makedepends=('qt' 'gtk+2' 'libglade') groups=('lib-extra') archs=('i686' 'x86_64') @@ -24,4 +24,4 @@ build() { } # optimization OK -sha1sums=('e7814a486b404c58adabad1ba45c97d0724ce33d') +sha1sums=('214288f6bf9c7855ff048c7e3c17520b3c0247e8') From priyank at frugalware.org Thu Nov 1 18:01:20 2007 From: priyank at frugalware.org (Priyank) Date: Thu Nov 1 18:01:23 2007 Subject: [Frugalware-git] frugalware-current: gnome-mplayer-0.5.1-1-i686 Message-ID: <20071101170120.BDCDC13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb832b9f0fc74501bc38bcd3bec11f20073dc70f commit bb832b9f0fc74501bc38bcd3bec11f20073dc70f Author: Priyank Date: Thu Nov 1 22:29:18 2007 +0530 gnome-mplayer-0.5.1-1-i686 * Version bump * New maintainer diff --git a/source/gnome-extra/gnome-mplayer/FrugalBuild b/source/gnome-extra/gnome-mplayer/FrugalBuild index d5719e9..7a78669 100644 --- a/source/gnome-extra/gnome-mplayer/FrugalBuild +++ b/source/gnome-extra/gnome-mplayer/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.08 SBU -# Maintainer: detto +# Maintainer: Priyank Gosalia +# Contributor: detto pkgname=gnome-mplayer -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="A media player for GNOME that uses MPlayer." url="http://dekorte.homeip.net/download/gnome-mplayer" @@ -12,7 +13,7 @@ options=('scriptlet') depends=('libgnomeui' 'mplayer') up2date="lynx -dump $url | grep ".tar.gz" -m1 | cut -d '-' -f4 | sed -n 's|.tar.gz||p'" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('6a7a219eef033d7f25f7c45353a91539f42f5a78') +sha1sums=('514791f5eef56a738e2465be0e92708a69efc4cb') _F_gnome_schemas=('/etc/gconf/schemas/gnome-mplayer.schemas') Finclude gnome-scriptlet From voroskoi at frugalware.org Thu Nov 1 19:04:44 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 19:04:46 2007 Subject: [Frugalware-git] frugalware-current: nginx-0.5.32-1-i686 Message-ID: <20071101180444.046FF13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7e55e2020c955489adc56e1add93c3e84fe13f29 commit 7e55e2020c955489adc56e1add93c3e84fe13f29 Author: voroskoi Date: Thu Nov 1 19:04:22 2007 +0100 nginx-0.5.32-1-i686 fix up2date diff --git a/source/network-extra/nginx/FrugalBuild b/source/network-extra/nginx/FrugalBuild index 6e6e78b..b4844ee 100644 --- a/source/network-extra/nginx/FrugalBuild +++ b/source/network-extra/nginx/FrugalBuild @@ -12,7 +12,7 @@ groups=('network-extra') archs=('i686' 'x86_64') provides=('httpd') backup=(etc/$pkgname/$pkgname.conf) -up2date="lynx -dump $url |sort -r |Flasttar" +up2date="lynx -dump ${url} |grep stable |sed 's/.*-\(.*\),.*/\1/'" source=(http://sysoev.ru/nginx/nginx-$pkgver.tar.gz rc.$pkgname nginx.logrotate \ nginx-install.patch) From krics at linuxforum.hu Thu Nov 1 19:11:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 1 19:11:02 2007 Subject: [Frugalware-git] frugalware-current: mksh-R32-1-x86_64 Message-ID: <20071101181100.69E9913A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=14668a711bfd6600669aea5b8f22819d449855b9 commit 14668a711bfd6600669aea5b8f22819d449855b9 Author: Christian Hamar alias krix Date: Thu Nov 1 19:10:34 2007 +0100 mksh-R32-1-x86_64 * Version bump * Take over m8r ship diff --git a/source/apps-extra/mksh/FrugalBuild b/source/apps-extra/mksh/FrugalBuild index 2ca9efb..3a2283c 100644 --- a/source/apps-extra/mksh/FrugalBuild +++ b/source/apps-extra/mksh/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.09 SBU -# Maintainer: DNAku +# Maintainer: Christian Hamar alias krix +# Former Maintainer: DNAku pkgname=mksh -pkgver=R30 +pkgver=R32 pkgrel=1 pkgdesc="The MirOS KornShell" url="http://mirbsd.de/mksh" @@ -26,5 +27,5 @@ build() { Ffilerel mksh.1 /usr/man/man1/mksh.1 } -sha1sums=('2784ffb60e53d0739b06512f1642d867ccd23319') +sha1sums=('9a4156c213d7361d7481cdfca014aaa93c1cc37b') # optimization OK From crazy at frugalware.org Thu Nov 1 19:34:06 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 1 19:34:09 2007 Subject: [Frugalware-git] frugalware-current: kdelibs-3.5.8-2-i686 Message-ID: <20071101183406.7536813A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f94b305e61ad75d772727338115c19181633487 commit 3f94b305e61ad75d772727338115c19181633487 Author: crazy Date: Thu Nov 1 19:33:27 2007 +0100 kdelibs-3.5.8-2-i686 * relbump * added /usr/env dir ( yeah I know ) * added and patch from svn to fix some regressions diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild index c7c05b0..8003e18 100644 --- a/source/kde/kdelibs/FrugalBuild +++ b/source/kde/kdelibs/FrugalBuild @@ -4,7 +4,7 @@ pkgname=kdelibs pkgver=3.5.8 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries." depends=('arts>=1.5.8' 'hicolor-icon-theme' 'libxslt' 'pcre' 'openmotif' 'openssl' 'libart_lgpl' 'gamin' 'bzip2' \ 'xfsprogs-acl' 'openexr>=1.4.0a-2' 'libidn' 'aspell' 'jasper>=1.900.1-2' 'avahi-qt3>=0.6.14-2' \ @@ -17,6 +17,7 @@ archs=('i686' 'x86_64') _F_kde_reconf=1 Finclude kde source=(${source[@]} kde.sh \ + from_svn-fix.patch \ kdelibs-kill-broken-AM_LDFLAGS_use_foo_LDFLAGS_to_fix_automake1.10.patch \ fix-warning.patch \ x-mplayer2.desktop \ @@ -58,10 +59,13 @@ build() Fexe /etc/profile.d/kde.sh Frm /usr/share/icons/hicolor/index.theme Ffile /usr/share/mimelnk/application/x-mplayer2.desktop + Fmkdir /usr/env + touch $Fdestdir/usr/env/.hold || Fdie } sha1sums=('b524a5d9969e7319bb5ffb926a39fd6afb39b2ed' \ 'b67afb54be3b2ac24ba9a491cb38a871a27a6316' \ + 'f37193c90fbf72e33334d995421202b375245c71' \ '916c2a2c5e28f4d72720d37348f9c813114adabf' \ '538d8f2076e360f1d733e79b7c35b5326edb41af' \ 'e45f5f357859f243e627cfaa7bd9682ac49c2eab' \ diff --git a/source/kde/kdelibs/from_svn-fix.patch b/source/kde/kdelibs/from_svn-fix.patch new file mode 100644 index 0000000..c2f607a --- /dev/null +++ b/source/kde/kdelibs/from_svn-fix.patch @@ -0,0 +1,110 @@ +SVN commit 724472 by lunakl: + +Handle properly X timestamps that are so high that they cannot be +represented properly as signed long, only unsigned. This fixes +focus e.g. when mailing a link from Konqueror. + +CCMAIL: kde-packagers@kde.org +Since such X timestamps happen right after startup on both of my 10.3 machines, +I suggest packagers consider adding this patch to their 3.5.8 packages. + + + + M +8 -4 kstartupinfo.cpp + + +--- kdelibs/kdecore/kstartupinfo.cpp #724471:724472 ++++ kdelibs/kdecore/kstartupinfo.cpp #724471:724472 +@@ -545,7 +545,7 @@ + + void KStartupInfo::setNewStartupId( QWidget* window, const QCString& startup_id ) + { +- long activate = true; ++ bool activate = true; + kapp->setStartupId( startup_id ); + if( window != NULL ) + { +@@ -937,7 +937,7 @@ + #ifdef Q_WS_X11 + extern Time qt_x_user_time; + #else +- long qt_x_user_time = 0; ++ unsigned long qt_x_user_time = 0; + #endif + QCString id = QString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec ) + .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8(); +@@ -1078,7 +1078,9 @@ + if( pos >= 0 ) + { + bool ok; +- long time = d->id.mid( pos + 5 ).toLong( &ok ); ++ unsigned long time = d->id.mid( pos + 5 ).toULong( &ok ); ++ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps ++ time = d->id.mid( pos + 5 ).toLong( &ok ); + if( ok ) + return time; + } +@@ -1093,7 +1095,9 @@ + if( pos2 >= 0 ) + { + bool ok; +- long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok ); ++ unsigned long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toULong( &ok ); ++ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps ++ time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok ); + if( ok ) + return time; + } +--- kdelibs/kioslave/http/http.cc 2007/09/26 17:08:43 717341 ++++ kdelibs/kioslave/http/http.cc 2007/10/17 04:11:51 726097 +@@ -3409,10 +3409,6 @@ + + } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1))); + +- // Send the current response before processing starts or it +- // might never get sent... +- forwardHttpResponseHeader(); +- + // Now process the HTTP/1.1 upgrade + QStringList::Iterator opt = upgradeOffers.begin(); + for( ; opt != upgradeOffers.end(); ++opt) { +@@ -3818,6 +3814,10 @@ + mimeType( m_strMimeType ); + } + ++ // Do not move send response header before any redirection as it seems ++ // to screw up some sites. See BR# 150904. ++ forwardHttpResponseHeader(); ++ + if (m_request.method == HTTP_HEAD) + return true; + +@@ -3830,10 +3830,10 @@ + // Check... + createCacheEntry(m_strMimeType, expireDate); // Create a cache entry + if (!m_request.fcache) +- { +- m_request.bCachedWrite = false; // Error creating cache entry. +- kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n"; +- } ++ { ++ m_request.bCachedWrite = false; // Error creating cache entry. ++ kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n"; ++ } + m_request.expireDate = expireDate; + m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2; + } +--- kdelibs/kdeui/kactionclasses.cpp 2007/08/30 19:30:39 706570 ++++ kdelibs/kdeui/kactionclasses.cpp 2007/10/20 20:49:01 727528 +@@ -667,8 +667,8 @@ + KToolBar* bar = static_cast( widget ); + int id_ = KAction::getToolButtonID(); + bar->insertCombo( comboItems(), id_, isEditable(), +- SIGNAL( activated( int ) ), this, +- SLOT( slotActivated( int ) ), isEnabled(), ++ SIGNAL( activated( const QString & ) ), this, ++ SLOT( slotActivated( const QString & ) ), isEnabled(), + toolTip(), -1, index ); + + QComboBox *cb = bar->getCombo( id_ ); + From voroskoi at frugalware.org Thu Nov 1 20:18:47 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 20:18:49 2007 Subject: [Frugalware-git] frugalware-current: mythtv-0.20.2-1-x86_64 Message-ID: <20071101191847.F067413A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1fa2a5dabe78aa1c582ca2362598b53c45fb8aad commit 1fa2a5dabe78aa1c582ca2362598b53c45fb8aad Author: voroskoi Date: Thu Nov 1 20:18:06 2007 +0100 mythtv-0.20.2-1-x86_64 version bump diff --git a/source/xapps-extra/mythtv/FrugalBuild b/source/xapps-extra/mythtv/FrugalBuild index 76bdc75..f004886 100644 --- a/source/xapps-extra/mythtv/FrugalBuild +++ b/source/xapps-extra/mythtv/FrugalBuild @@ -1,10 +1,10 @@ -# Compiling Time: 9.03 SBU +# Compiling Time: 15.03 SBU # Contributor: Massimo Chiappini # Maintainer: voroskoi pkgname=mythtv -pkgver=0.20 -pkgrel=2 +pkgver=0.20.2 +pkgrel=1 pkgdesc="MythTV is a homebrew PVR project." url="http://mythtv.org/" depends=('qt' 'lame' 'libxvmc' 'libdvb' 'lirc') @@ -12,8 +12,8 @@ rodepends=('mysql') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://ftp.osuosl.org/pub/mythtv/ |grep mythtv-[0-9] |Flasttarbz2" -source=(http://ftp.osuosl.org/pub/mythtv/mythtv-$pkgver.tar.bz2 rc.mythtv \ - README.Frugalware mythtv-0.20-vsync.patch) +source=(http://ftp.osuosl.org/pub/mythtv/mythtv-$pkgver.tar.bz2 \ + rc.mythtv README.Frugalware) build() { Fpatchall @@ -27,9 +27,8 @@ build() { Ffilerel database/mc.sql /usr/share/mythtv Frcd2 } -sha1sums=('be6d2666a689340d40ca608f6a8a3af10f752a55'\ - '22696806db38c127b244e0b51e0bf4ea66ade0f4'\ - 'a40bd04924c584b44e7062ded3a4fef6a9eaf6c2'\ - 'd89e9b70f9968876ee0a40cc7ad4686e1589212c') +sha1sums=('d2859a210f387e642c41ad79c33a706dd62817de' \ + '22696806db38c127b244e0b51e0bf4ea66ade0f4' \ + 'a40bd04924c584b44e7062ded3a4fef6a9eaf6c2') # optimization OK From voroskoi at frugalware.org Thu Nov 1 20:42:37 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 20:42:39 2007 Subject: [Frugalware-git] frugalware-current: acx100-20071003-1-i686 Message-ID: <20071101194237.51E1E13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c4279c66836ff8595d838e48e542c709372ac025 commit c4279c66836ff8595d838e48e542c709372ac025 Author: voroskoi Date: Thu Nov 1 20:39:58 2007 +0100 acx100-20071003-1-i686 version bump using mac80211 version of the driver diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index 9d3d74a..682e870 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -1,29 +1,31 @@ -# Compiling Time: ~0.04 SBU +# Compiling Time: 0.03 SBU # Maintainer: voroskoi pkgname=acx100 -pkgver=0.3.36 -pkgdate=20070101 -pkgrel=17 +origname=acx-mac80211 +pkgver=20071003 +pkgrel=1 pkgdesc="The ACX100/ACX111 wireless network driver." -url="http://www.cmartin.tk/acx" -Finclude kernel-module +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_dirname=${pkgname} +_F_sourceforge_name=${origname} +Finclude kernel-module sourceforge depends=(${depends[@]} 'wireless_tools') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |grep acx-2 |Flasttarbz2 |sed s/$pkgdate/$pkgver/" -source=($url/acx-$pkgdate.tar.bz2 \ +_F_archive_name=${origname} +up2date="lynx -dump http://acx100.sourceforge.net/wiki/Main_Page |Flasttarbz2" +source=(${source[@]} enable_pci_usb.diff \ http://195.66.192.167/linux/acx_patches/fw.tar.bz2 \ - http://195.66.192.167/linux/acx_patches/acx_fw/acx100usb_dlink_dwl120+/fw1/ACX100_USB.bin \ - acx100-0.3.36-kernel2622.diff) + http://195.66.192.167/linux/acx_patches/acx_fw/acx100usb_dlink_dwl120+/fw1/ACX100_USB.bin) build() { # no Fcheckkernel, crosscompilation verified - Fcd acx-$pkgdate + Fcd ${origname}-${pkgver} Fpatchall - make -C $_F_kernelmod_dir/build M=`pwd` || Fdie + make -C $_F_kernelmod_dir/build M=`pwd` CONFIG_ACX_MAC80211=m CONFIG_ACX_MAC80211_PCI=y CONFIG_ACX_MAC80211_USB=y || Fdie Fmkdir $_F_kernelmod_dir/net - Ffilerel $_F_kernelmod_dir/net/acx.ko + Ffilerel $_F_kernelmod_dir/net/${origname}.ko Ffile /lib/firmware/ACX100_USB.bin Ffile fw/acx111_1.2.1.34/tiacx111 /lib/firmware Ffile fw/acx111_2.3.1.31/* /lib/firmware @@ -37,7 +39,7 @@ build() { # optimalization OK - uses the kernel's option -sha1sums=('5c7259c09bc754529910aceead6087876177a143' \ +sha1sums=('5e62f70cd84c6c0ecb78358585e7e44901d2ce30' \ + 'fb00fa540e2eb43246cca48817fb03c80310771f' \ '5b5ef1a9d6441f5f8345e1957cd7686e730897f6' \ - '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4' \ - '2a385b78e656d6430bb730594cbb7724901e5d58') + '6446b0736b6b08e6dc25620f7584e4f7a1a11cb4') From crazy at frugalware.org Thu Nov 1 20:44:34 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 1 20:44:36 2007 Subject: [Frugalware-git] frugalware-current: dbus-1.1.2-1-i686 Message-ID: <20071101194434.E6BDB13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e6ba144a150c57573a2b66c25658d09ed3b5061 commit 9e6ba144a150c57573a2b66c25658d09ed3b5061 Author: crazy Date: Thu Nov 1 20:43:29 2007 +0100 dbus-1.1.2-1-i686 * Version bump * changed on how we use auto dbus-launch * we use now /usr/bin/dbus-1-launch ( which is old /etc/profile.d/dbus.sh ) * for KDE3 we symlink dbus-1-launch to /usr/env/dbus-1-launch.sh and * for GNOME/XFCE we use /etc/xdg/autostart/dbus-1-launch.desktop to start it * these changes should make boobaa happy :P * added an patch to fix compile errors also diff --git a/source/apps/dbus/FrugalBuild b/source/apps/dbus/FrugalBuild index 91bc946..63008af 100644 --- a/source/apps/dbus/FrugalBuild +++ b/source/apps/dbus/FrugalBuild @@ -2,22 +2,24 @@ # Maintainer: crazy pkgname=dbus -pkgver=1.0.2 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software_2fdbus" -depends=('libxml2') +depends=('libxml2' 'expat') makedepends=('libx11' 'libsm' 'doxygen') rodepends=('shadow') groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump http://dbus.freedesktop.org/releases/dbus/|Flasttar" source=(http://dbus.freedesktop.org/releases/dbus/$pkgname-$pkgver.tar.gz \ - rc.$pkgname dbus.sh dbus-0.95-dont-crash.patch) -sha1sums=('2870efd6ea0b5b0d14e52195f560238a74bb1e0e' \ + rc.$pkgname activation-helper.patch \ + dbus-1-launch dbus-1-launch.desktop) +sha1sums=('4f4b1e430807acc2ed5aa3e21bde3015661423a9' \ 'b5b036bbdd1a3fbe97218ae57bdd565f85160cd9' \ + 'fcbdbb62ea65cb5a32ee2facbf277c575d5b6879' \ '740af74eb43cadf1277346029577aadd3d10f2b5' \ - '7c35583080fdf47bab1888cbcad75870bace315c') + 'da9efab479aa3a2a8fb365a89ed658646486c39f') subpkgs=('dbus-x11') subconflicts=('dbus-gtk+2') @@ -31,34 +33,47 @@ subarchs=('i686 x86_64') build() { Fbuild \ + --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --exec-prefix=/ \ --libdir=/usr/lib \ --bindir=/usr/bin \ + --libexecdir=/usr/lib/$pkgname-1 \ --with-x \ --with-system-pid-file=/var/run/dbus/dbus.pid \ --with-system-socket=/var/run/dbus/system_bus_socket \ --with-session-socket-dir=/tmp \ --with-dbus-user=messagebus \ --enable-doxygen-docs \ - --with-xml=libxml \ --enable-dnotify \ --with-gnu-ld \ --disable-xml-docs \ - --enable-asserts=no \ - --enable-checks=no \ - --enable-tests=no \ + --disable-asserts \ + --disable-checks \ + --disable-tests \ --disable-selinux Frcd + ## not sure about that Fmkdir /var/run/console - Fexe /etc/profile.d/dbus.sh + + ## DO NOT change that without to ask the Maintainer! ## + ## Install wrapper + Fexe /usr/bin/dbus-1-launch + + ## we use /usr/env for KDE3 so let us symlink to there + Fln /usr/bin/dbus-1-launch /usr/env/dbus-1-launch.sh + + ## and we use /etc/xdg/autostart for GNOME/XFCE + Fexe /etc/xdg/autostart/dbus-1-launch.desktop + ## just to keep this dirs Fmkdir /etc/dbus-1/system.d/.holdme Fmkdir /usr/share/dbus-1/services/.holdme Fmkdir /var/run/dbus/.holdme - Fsplit dbus-x11 usr/bin/dbus-launch etc/profile.d/dbus.sh + + Fsplit dbus-x11 usr/bin/dbus-launch usr/env /etc/xdg usr/bin/dbus-1-launch } diff --git a/source/apps/dbus/activation-helper.patch b/source/apps/dbus/activation-helper.patch new file mode 100644 index 0000000..440146b --- /dev/null +++ b/source/apps/dbus/activation-helper.patch @@ -0,0 +1,36 @@ +--- a/bus/activation-helper.c ++++ b/bus/activation-helper.c +@@ -381,14 +381,20 @@ exec_for_correct_user (char *exec, char + } + + static dbus_bool_t +-check_bus_name (const char *bus_name, DBusError *error) ++check_bus_name (const char *bus_name, ++ DBusError *error) + { +- if (!_dbus_check_is_valid_bus_name (bus_name)) ++ DBusString str; ++ ++ _dbus_string_init_const (&str, bus_name); ++ if (!_dbus_validate_bus_name (&str, 0, _dbus_string_get_length (&str))) + { + dbus_set_error (error, DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND, +- "bus name '%s' not found\n", bus_name); ++ "bus name '%s' is not a valid bus name\n", ++ bus_name); + return FALSE; + } ++ + return TRUE; + } + +@@ -517,7 +523,8 @@ check_dbus_user (BusConfigParser *parser + } + + dbus_bool_t +-run_launch_helper (const char *bus_name, DBusError *error) ++run_launch_helper (const char *bus_name, ++ DBusError *error) + { + BusConfigParser *parser; + dbus_bool_t retval; diff --git a/source/apps/dbus/dbus-0.95-dont-crash.patch b/source/apps/dbus/dbus-0.95-dont-crash.patch deleted file mode 100644 index fd62914..0000000 --- a/source/apps/dbus/dbus-0.95-dont-crash.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- dbus-0.94/tools/dbus-launch.h.dont-crash 2006-11-12 23:44:51.000000000 -0500 -+++ dbus-0.94/tools/dbus-launch.h 2006-11-12 23:45:14.000000000 -0500 -@@ -49,7 +49,7 @@ - - #ifdef DBUS_BUILD_X11 - /* defined in dbus-launch-x11.c */ --int x11_init (void); -+int x11_init (int should_init_x_atoms); - int x11_get_address (char **paddress, pid_t *pid, long *wid); - int x11_save_address (char *address, pid_t pid, long *wid); - void x11_handle_event (void); ---- dbus-0.94/tools/dbus-launch-x11.c.dont-crash 2006-11-12 23:44:38.000000000 -0500 -+++ dbus-0.94/tools/dbus-launch-x11.c 2006-11-12 23:47:25.000000000 -0500 -@@ -247,6 +247,12 @@ - - machine = get_machine_uuid (); - -+ if (machine == NULL) -+ { -+ verbose ("Could not determine machine identity; aborting X11 integration.\n"); -+ return FALSE; -+ } -+ - atom_name = malloc (strlen (machine) + strlen (user_name) + 2 + - MAX (strlen (selection_prefix), - MAX (strlen (address_prefix), -@@ -441,9 +447,10 @@ - } - - int --x11_init (void) -+x11_init (int should_init_x_atoms) - { -- return open_x11 () != NULL && init_x_atoms (xdisplay); -+ return (open_x11 () != NULL) && -+ (!should_init_x_atoms || init_x_atoms (xdisplay)); - } - - void ---- dbus-0.94/tools/dbus-launch.c.dont-crash 2006-11-12 23:45:00.000000000 -0500 -+++ dbus-0.94/tools/dbus-launch.c 2006-11-12 23:47:09.000000000 -0500 -@@ -381,7 +381,7 @@ - sigaction (SIGTERM, &act, NULL); - - #ifdef DBUS_BUILD_X11 -- x11_init(); -+ x11_init (FALSE); - if (xdisplay != NULL) - { - x_fd = ConnectionNumber (xdisplay); -@@ -790,7 +790,7 @@ - exit_with_session = TRUE; - } - -- if (!x11_init ()) -+ if (!x11_init (TRUE)) - { - fprintf (stderr, "Autolaunch error: X11 initialization failed.\n"); - exit (1); diff --git a/source/apps/dbus/dbus-1-launch b/source/apps/dbus/dbus-1-launch new file mode 100644 index 0000000..3d24bcf --- /dev/null +++ b/source/apps/dbus/dbus-1-launch @@ -0,0 +1,8 @@ +#!/bin/sh + +dbuslaunch="`which dbus-launch 2>/dev/null`" +if [ "`whoami`" != "fst" -a "`whoami`" != "root" ]; then + if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + eval `$dbuslaunch --auto-syntax --exit-with-session` + fi +fi diff --git a/source/apps/dbus/dbus-1-launch.desktop b/source/apps/dbus/dbus-1-launch.desktop new file mode 100644 index 0000000..09b80ee --- /dev/null +++ b/source/apps/dbus/dbus-1-launch.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=dbus-1-launch +Comment=dbus-launch starter +Exec=/usr/bin/dbus-1-launch +Terminal=false + diff --git a/source/apps/dbus/dbus.install b/source/apps/dbus/dbus.install index 6ea3587..4601b95 100644 --- a/source/apps/dbus/dbus.install +++ b/source/apps/dbus/dbus.install @@ -5,6 +5,10 @@ post_install() /usr/sbin/groupadd -g 38 messagebus 2>/dev/null /usr/sbin/useradd -s /bin/false -c "D-BUS system user" -d '/' -u 38 -g messagebus messagebus 2>/dev/null fi + ## DO NOT touch that or things will break! + chown root:messagebus /usr/lib/dbus-1/dbus-daemon-launch-helper + chmod 4750 /usr/lib/dbus-1/dbus-daemon-launch-helper + if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then /usr/sbin/chkconfig --add rc.dbus fi @@ -20,6 +24,10 @@ post_upgrade() /usr/sbin/groupadd -g 38 messagebus 2>/dev/null /usr/sbin/useradd -s /bin/false -c "D-BUS system user" -d '/' -u 38 -g messagebus messagebus 2>/dev/null fi + ## DO NOT touch that or things will break! + chown root:messagebus /usr/lib/dbus-1/dbus-daemon-launch-helper + chmod 4750 /usr/lib/dbus-1/dbus-daemon-launch-helper + } pre_remove() { diff --git a/source/apps/dbus/dbus.sh b/source/apps/dbus/dbus.sh deleted file mode 100644 index 3d24bcf..0000000 --- a/source/apps/dbus/dbus.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -dbuslaunch="`which dbus-launch 2>/dev/null`" -if [ "`whoami`" != "fst" -a "`whoami`" != "root" ]; then - if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - eval `$dbuslaunch --auto-syntax --exit-with-session` - fi -fi From voroskoi at frugalware.org Thu Nov 1 20:52:03 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 20:52:06 2007 Subject: [Frugalware-git] frugalware-current: acx100-20071003-1-i686 Message-ID: <20071101195203.53DC013A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34f32f8b5891bf89c7647e1c1324eb9949c7bcc6 commit 34f32f8b5891bf89c7647e1c1324eb9949c7bcc6 Author: voroskoi Date: Thu Nov 1 20:47:28 2007 +0100 acx100-20071003-1-i686 forgot to add/remove patch diff --git a/source/network-extra/acx100/acx100-0.3.36-kernel2622.diff b/source/network-extra/acx100/acx100-0.3.36-kernel2622.diff deleted file mode 100644 index 535bc89..0000000 --- a/source/network-extra/acx100/acx100-0.3.36-kernel2622.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/common.c -+++ b/common.c -@@ -2760,7 +2760,7 @@ acx_l_rxmonitor(acx_device_t *adev, cons - skb->dev = adev->ndev; - skb->dev->last_rx = jiffies; - -- skb->mac.raw = skb->data; -+ skb_reset_mac_header(skb); - skb->ip_summed = CHECKSUM_NONE; - skb->pkt_type = PACKET_OTHERHOST; - skb->protocol = htons(ETH_P_80211_RAW); diff --git a/source/network-extra/acx100/enable_pci_usb.diff b/source/network-extra/acx100/enable_pci_usb.diff new file mode 100644 index 0000000..2835c4c --- /dev/null +++ b/source/network-extra/acx100/enable_pci_usb.diff @@ -0,0 +1,12 @@ +diff -aur acx-mac80211-20071003/acx_config.h fw_acx-mac80211-20071003/acx_config.h +--- acx-mac80211-20071003/acx_config.h 2007-10-03 17:42:39.000000000 +0200 ++++ fw_acx-mac80211-20071003/acx_config.h 2007-11-01 20:06:21.000000000 +0100 +@@ -1,6 +1,6 @@ + /* temporary hack until proper Kconfig integration */ +-//#define CONFIG_ACX_MAC80211_PCI 1 +-//#define CONFIG_ACX_MAC80211_USB 1 ++#define CONFIG_ACX_MAC80211_PCI 1 ++#define CONFIG_ACX_MAC80211_USB 1 + + #define ACX_RELEASE "v0.3.36-mac80211" + From voroskoi at frugalware.org Thu Nov 1 20:56:20 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 20:56:21 2007 Subject: [Frugalware-git] frugalware-current: mythplugins-0.20.2-1-x86_64 Message-ID: <20071101195620.38A4613A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7205a6fb41276f983336beab00e5e9c5336f1ca7 commit 7205a6fb41276f983336beab00e5e9c5336f1ca7 Author: voroskoi Date: Thu Nov 1 20:55:47 2007 +0100 mythplugins-0.20.2-1-x86_64 version bump removed no more necessary flac patch diff --git a/source/xapps-extra/mythplugins/FrugalBuild b/source/xapps-extra/mythplugins/FrugalBuild index 5def964..4ac7a43 100644 --- a/source/xapps-extra/mythplugins/FrugalBuild +++ b/source/xapps-extra/mythplugins/FrugalBuild @@ -3,15 +3,14 @@ # Maintainer: voroskoi pkgname=mythplugins -pkgver=0.20a -pkgrel=3 +pkgver=0.20.2 +pkgrel=1 url="http://mythtv.org/" pkgdesc="All the official MythTV plugins." depends=('mythtv' 'libmad' 'libid3tag' 'libvorbis' 'flac>=1.1.3' 'libcdaudio' 'cdparanoia') groups=('xapps-extra') archs=('i686' 'x86_64') -source=(http://ftp.osuosl.org/pub/mythtv/mythplugins-$pkgver.tar.bz2 \ - mythplugins-0.20a-flac113.diff) +source=(http://ftp.osuosl.org/pub/mythtv/mythplugins-$pkgver.tar.bz2) up2date="lynx -dump http://ftp.osuosl.org/pub/mythtv/ |grep mythplugins|Flasttarbz2" build() { @@ -21,7 +20,6 @@ build() { make || Fdie Fmakeinstall INSTALL_ROOT=$Fdestdir } -sha1sums=('7f9044d9c0a1d830f07077d6aac1b9a82cc8e3b8'\ - '3648331b99a86471a87e75ab1ebe0b3d1c08d2ad') +sha1sums=('b227fc1f90faeb4fb950eef39c80981fecfba027') # optimization OK diff --git a/source/xapps-extra/mythplugins/mythplugins-0.20a-flac113.diff b/source/xapps-extra/mythplugins/mythplugins-0.20a-flac113.diff deleted file mode 100644 index 2179b88..0000000 --- a/source/xapps-extra/mythplugins/mythplugins-0.20a-flac113.diff +++ /dev/null @@ -1,301 +0,0 @@ -diff -Naur mythplugins-0.20a.orig/mythmusic/mythmusic/flacdecoder.cpp mythplugins-0.20a/mythmusic/mythmusic/flacdecoder.cpp ---- mythplugins-0.20a.orig/mythmusic/mythmusic/flacdecoder.cpp 2006-04-16 06:54:27.000000000 +0200 -+++ mythplugins-0.20a/mythmusic/mythmusic/flacdecoder.cpp 2007-01-30 20:34:24.000000000 +0100 -@@ -17,7 +17,7 @@ - - #include - --static FLAC__SeekableStreamDecoderReadStatus flacread(const FLAC__SeekableStreamDecoder *decoder, FLAC__byte bufferp[], unsigned *bytes, void *client_data) -+static FLAC__StreamDecoderReadStatus flacread(const FLAC__StreamDecoder *decoder, FLAC__byte bufferp[], size_t *bytes, void *client_data) - { - decoder = decoder; - -@@ -26,27 +26,27 @@ - - if (len == -1) - { -- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; -+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT; - } - - *bytes = len; -- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK; -+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; - } - --static FLAC__SeekableStreamDecoderSeekStatus flacseek(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) -+static FLAC__StreamDecoderSeekStatus flacseek(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) - { - decoder = decoder; - FlacDecoder *dflac = (FlacDecoder *)client_data; - - if (!dflac->input()->isDirectAccess()) -- return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR; -+ return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR; - - if (dflac->input()->at(absolute_byte_offset)) -- return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK; -- return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR; -+ return FLAC__STREAM_DECODER_SEEK_STATUS_OK; -+ return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR; - } - --static FLAC__SeekableStreamDecoderTellStatus flactell(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) -+static FLAC__StreamDecoderTellStatus flactell(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) - { - decoder = decoder; - FlacDecoder *dflac = (FlacDecoder *)client_data; -@@ -54,20 +54,20 @@ - long t = dflac->input()->at(); - *absolute_byte_offset = t; - -- return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK; -+ return FLAC__STREAM_DECODER_TELL_STATUS_OK; - } - --static FLAC__SeekableStreamDecoderLengthStatus flaclength(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) -+static FLAC__StreamDecoderLengthStatus flaclength(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) - { - decoder = decoder; - - FlacDecoder *dflac = (FlacDecoder *)client_data; - - *stream_length = dflac->input()->size(); -- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK; -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_OK; - } - --static FLAC__bool flaceof(const FLAC__SeekableStreamDecoder *decoder, void *client_data) -+static FLAC__bool flaceof(const FLAC__StreamDecoder *decoder, void *client_data) - { - decoder = decoder; - -@@ -76,7 +76,7 @@ - return dflac->input()->atEnd(); - } - --static FLAC__StreamDecoderWriteStatus flacwrite(const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) -+static FLAC__StreamDecoderWriteStatus flacwrite(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) - { - decoder = decoder; - -@@ -132,7 +132,7 @@ - } - } - --static void flacmetadata(const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) -+static void flacmetadata(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) - { - decoder = decoder; - -@@ -156,11 +156,11 @@ - } - } - --static void flacerror(const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) -+static void flacerror(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) - { - decoder = decoder; - -- FLAC__FileDecoder *file_decoder = (FLAC__FileDecoder *)client_data; -+ FLAC__StreamDecoder *file_decoder = (FLAC__StreamDecoder *)client_data; - - file_decoder = file_decoder; - status = status; -@@ -262,17 +262,19 @@ - } - } - -- decoder = FLAC__seekable_stream_decoder_new(); -- FLAC__seekable_stream_decoder_set_md5_checking(decoder, false); -- FLAC__seekable_stream_decoder_set_read_callback(decoder, flacread); -- FLAC__seekable_stream_decoder_set_seek_callback(decoder, flacseek); -- FLAC__seekable_stream_decoder_set_tell_callback(decoder, flactell); -- FLAC__seekable_stream_decoder_set_length_callback(decoder, flaclength); -- FLAC__seekable_stream_decoder_set_eof_callback(decoder, flaceof); -- FLAC__seekable_stream_decoder_set_write_callback(decoder, flacwrite); -- FLAC__seekable_stream_decoder_set_metadata_callback(decoder, flacmetadata); -- FLAC__seekable_stream_decoder_set_error_callback(decoder, flacerror); -- FLAC__seekable_stream_decoder_set_client_data(decoder, this); -+ decoder = FLAC__stream_decoder_new(); -+ FLAC__stream_decoder_set_md5_checking(decoder, false); -+ FLAC__stream_decoder_init_stream( -+ decoder, -+ flacread, -+ flacseek, -+ flactell, -+ flaclength, -+ flaceof, -+ flacwrite, -+ flacmetadata, -+ flacerror, -+ this); - - freq = 0; - bitrate = 0; -@@ -281,8 +283,7 @@ - totalTime = 0; - totalTime = totalTime < 0 ? 0 : totalTime; - -- FLAC__seekable_stream_decoder_init(decoder); -- FLAC__seekable_stream_decoder_process_until_end_of_metadata(decoder); -+ FLAC__stream_decoder_process_until_end_of_metadata(decoder); - - inited = TRUE; - return TRUE; -@@ -295,8 +296,8 @@ - - void FlacDecoder::deinit() - { -- FLAC__seekable_stream_decoder_finish(decoder); -- FLAC__seekable_stream_decoder_delete(decoder); -+ FLAC__stream_decoder_finish(decoder); -+ FLAC__stream_decoder_delete(decoder); - - if (input()->isOpen()) - input()->close(); -@@ -330,7 +331,7 @@ - } - - bool flacok = true; -- FLAC__SeekableStreamDecoderState decoderstate; -+ FLAC__StreamDecoderState decoderstate; - - while (! done && ! finish) { - lock(); -@@ -340,12 +341,12 @@ - FLAC__uint64 sample = (FLAC__uint64)(seekTime * 44100.0); - if (sample > totalsamples - 50) - sample = totalsamples - 50; -- FLAC__seekable_stream_decoder_seek_absolute(decoder, sample); -+ FLAC__stream_decoder_seek_absolute(decoder, sample); - seekTime = -1.0; - } - -- flacok = FLAC__seekable_stream_decoder_process_single(decoder); -- decoderstate = FLAC__seekable_stream_decoder_get_state(decoder); -+ flacok = FLAC__stream_decoder_process_single(decoder); -+ decoderstate = FLAC__stream_decoder_get_state(decoder); - - if (decoderstate == 0 || decoderstate == 1) - { -diff -Naur mythplugins-0.20a.orig/mythmusic/mythmusic/flacdecoder.h mythplugins-0.20a/mythmusic/mythmusic/flacdecoder.h ---- mythplugins-0.20a.orig/mythmusic/mythmusic/flacdecoder.h 2005-10-27 16:10:56.000000000 +0200 -+++ mythplugins-0.20a/mythmusic/mythmusic/flacdecoder.h 2007-01-30 20:21:33.000000000 +0100 -@@ -35,7 +35,7 @@ - char *output_buf; - ulong output_bytes, output_at; - -- FLAC__SeekableStreamDecoder *decoder; -+ FLAC__StreamDecoder *decoder; - - unsigned int bks; - bool done, finish; -diff -Naur mythplugins-0.20a.orig/mythmusic/mythmusic/flacencoder.cpp mythplugins-0.20a/mythmusic/mythmusic/flacencoder.cpp ---- mythplugins-0.20a.orig/mythmusic/mythmusic/flacencoder.cpp 2005-01-28 07:17:08.000000000 +0100 -+++ mythplugins-0.20a/mythmusic/mythmusic/flacencoder.cpp 2007-01-30 20:48:47.000000000 +0100 -@@ -9,7 +9,7 @@ - #include "flacencoder.h" - #include "metaioflacvorbiscomment.h" - --#include -+#include - #include - #include - -@@ -29,32 +29,34 @@ - int rice_parameter_search_dist = 0; - int max_lpc_order = 8; - -- encoder = FLAC__file_encoder_new(); -+ encoder = FLAC__stream_encoder_new(); - -- FLAC__file_encoder_set_streamable_subset(encoder, true); -- FLAC__file_encoder_set_do_mid_side_stereo(encoder, do_mid_side); -- FLAC__file_encoder_set_loose_mid_side_stereo(encoder, loose_mid_side); -- FLAC__file_encoder_set_channels(encoder, NUM_CHANNELS); -- FLAC__file_encoder_set_bits_per_sample(encoder, 16); -- FLAC__file_encoder_set_sample_rate(encoder, 44100); -- FLAC__file_encoder_set_blocksize(encoder, blocksize); -- FLAC__file_encoder_set_max_lpc_order(encoder, max_lpc_order); -- FLAC__file_encoder_set_qlp_coeff_precision(encoder, qlp_coeff_precision); -- FLAC__file_encoder_set_do_qlp_coeff_prec_search(encoder, false); -- FLAC__file_encoder_set_do_escape_coding(encoder, do_escape_coding); -- FLAC__file_encoder_set_do_exhaustive_model_search(encoder, -+ FLAC__stream_encoder_set_streamable_subset(encoder, true); -+ FLAC__stream_encoder_set_do_mid_side_stereo(encoder, do_mid_side); -+ FLAC__stream_encoder_set_loose_mid_side_stereo(encoder, loose_mid_side); -+ FLAC__stream_encoder_set_channels(encoder, NUM_CHANNELS); -+ FLAC__stream_encoder_set_bits_per_sample(encoder, 16); -+ FLAC__stream_encoder_set_sample_rate(encoder, 44100); -+ FLAC__stream_encoder_set_blocksize(encoder, blocksize); -+ FLAC__stream_encoder_set_max_lpc_order(encoder, max_lpc_order); -+ FLAC__stream_encoder_set_qlp_coeff_precision(encoder, qlp_coeff_precision); -+ FLAC__stream_encoder_set_do_qlp_coeff_prec_search(encoder, false); -+ FLAC__stream_encoder_set_do_escape_coding(encoder, do_escape_coding); -+ FLAC__stream_encoder_set_do_exhaustive_model_search(encoder, - do_exhaustive_model_search); -- FLAC__file_encoder_set_min_residual_partition_order(encoder, -+ FLAC__stream_encoder_set_min_residual_partition_order(encoder, - min_residual_partition_order); -- FLAC__file_encoder_set_max_residual_partition_order(encoder, -+ FLAC__stream_encoder_set_max_residual_partition_order(encoder, - max_residual_partition_order); -- FLAC__file_encoder_set_rice_parameter_search_dist(encoder, -+ FLAC__stream_encoder_set_rice_parameter_search_dist(encoder, - rice_parameter_search_dist); - -- FLAC__file_encoder_set_filename(encoder, outfile.local8Bit()); -- -- int ret = FLAC__file_encoder_init(encoder); -- if (ret != FLAC__FILE_ENCODER_OK) -+ int ret = FLAC__stream_encoder_init_file( -+ encoder, -+ outfile.local8Bit(), -+ NULL, -+ NULL); -+ if(ret != FLAC__STREAM_ENCODER_INIT_STATUS_OK) - { - VERBOSE(VB_GENERAL, QString("Error initializing FLAC encoder." - " Got return code: %1").arg(ret)); -@@ -70,8 +72,8 @@ - - if (encoder) - { -- FLAC__file_encoder_finish(encoder); -- FLAC__file_encoder_delete(encoder); -+ FLAC__stream_encoder_finish(encoder); -+ FLAC__stream_encoder_delete(encoder); - } - - if (metadata) -@@ -102,7 +104,7 @@ - - if(sampleindex == MAX_SAMPLES || (length == 0 && sampleindex > 0) ) - { -- if (!FLAC__file_encoder_process(encoder, -+ if (!FLAC__stream_encoder_process(encoder, - (const FLAC__int32 * const *) input, - sampleindex)) - { -diff -Naur mythplugins-0.20a.orig/mythmusic/mythmusic/flacencoder.h mythplugins-0.20a/mythmusic/mythmusic/flacencoder.h ---- mythplugins-0.20a.orig/mythmusic/mythmusic/flacencoder.h 2005-02-06 19:27:45.000000000 +0100 -+++ mythplugins-0.20a/mythmusic/mythmusic/flacencoder.h 2007-01-30 20:19:08.000000000 +0100 -@@ -4,7 +4,7 @@ - #include - - #define HAVE_INTTYPES_H --#include -+#include - - #include "encoder.h" - -@@ -21,7 +21,7 @@ - int addSamples(int16_t *bytes, unsigned int len); - - private: -- FLAC__FileEncoder *encoder; -+ FLAC__StreamEncoder *encoder; - unsigned int sampleindex; - FLAC__int32 inputin[NUM_CHANNELS][MAX_SAMPLES]; - FLAC__int32 *input[NUM_CHANNELS]; From voroskoi at frugalware.org Thu Nov 1 20:57:31 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 20:57:34 2007 Subject: [Frugalware-git] frugalware-current: qca-tls-1.0-2-i686 Message-ID: <20071101195731.CFCFF13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68d83cff28a9689930adf513622ba3d3087f5caa commit 68d83cff28a9689930adf513622ba3d3087f5caa Author: voroskoi Date: Thu Nov 1 20:55:56 2007 +0100 qca-tls-1.0-2-i686 up2date fix diff --git a/source/xlib/qca-tls/FrugalBuild b/source/xlib/qca-tls/FrugalBuild index 140905f..cc20c36 100644 --- a/source/xlib/qca-tls/FrugalBuild +++ b/source/xlib/qca-tls/FrugalBuild @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') license="LGPL" depends=('qt' 'openssl' 'gcc') source=(http://delta.affinix.com/download/qca/$pkgname-$pkgver.tar.bz2 00-qca-tls-gcc4.patch0) -up2date="lynx -dump $url |grep qca-tls |sed -ne 's/.*s-\(.*\).t.*/\1/;1 p'" +up2date="lynx -dump http://delta.affinix.com/download/qca/ |Flasttarbz2" sha1sums=('775e764c5be342048eba11dae5c5fd3b636d23c5' \ '24b15b4022ecc672797fa6b5f398fd45c290f83e') From crazy at frugalware.org Thu Nov 1 21:08:48 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 1 21:08:50 2007 Subject: [Frugalware-git] frugalware-current: xapian-core-1.0.4-1-i686 Message-ID: <20071101200848.D05C713A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=86cae37c52593b09c7275e8d05b08afb55278b31 commit 86cae37c52593b09c7275e8d05b08afb55278b31 Author: crazy Date: Thu Nov 1 21:06:53 2007 +0100 xapian-core-1.0.4-1-i686 * Version bump diff --git a/source/lib-extra/xapian-core/FrugalBuild b/source/lib-extra/xapian-core/FrugalBuild index 7bbd749..b16758d 100644 --- a/source/lib-extra/xapian-core/FrugalBuild +++ b/source/lib-extra/xapian-core/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=xapian-core -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="Xapian is an Open Source Search Engine Library." url="http://www.xapian.org/" @@ -13,6 +13,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.xapian.org/|grep 'stable version'|sed 's/.*is \(.*\), .*/\1/'" source=(http://www.oligarchy.co.uk/xapian/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('4df3edb104ebab10c4f8ee7694971a894e8d18b4') +sha1sums=('96cbf94870163e71d19bfde9ade945c40dde1ea7') # optimization OK From voroskoi at frugalware.org Thu Nov 1 21:13:02 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Nov 1 21:13:04 2007 Subject: [Frugalware-git] frugalware-current: mythplugins-0.20.2-1-i686 Message-ID: <20071101201302.6FCC013A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88a4615ca0c352103cc66af259a43f3e385443e6 commit 88a4615ca0c352103cc66af259a43f3e385443e6 Author: voroskoi Date: Thu Nov 1 21:12:28 2007 +0100 mythplugins-0.20.2-1-i686 mythtv=0.20.2 should be in depends() diff --git a/source/xapps-extra/mythplugins/FrugalBuild b/source/xapps-extra/mythplugins/FrugalBuild index 4ac7a43..7fbf47f 100644 --- a/source/xapps-extra/mythplugins/FrugalBuild +++ b/source/xapps-extra/mythplugins/FrugalBuild @@ -7,7 +7,7 @@ pkgver=0.20.2 pkgrel=1 url="http://mythtv.org/" pkgdesc="All the official MythTV plugins." -depends=('mythtv' 'libmad' 'libid3tag' 'libvorbis' 'flac>=1.1.3' 'libcdaudio' 'cdparanoia') +depends=('mythtv=0.20.2' 'libmad' 'libid3tag' 'libvorbis' 'flac>=1.1.3' 'libcdaudio' 'cdparanoia') groups=('xapps-extra') archs=('i686' 'x86_64') source=(http://ftp.osuosl.org/pub/mythtv/mythplugins-$pkgver.tar.bz2) From crazy at frugalware.org Thu Nov 1 21:58:15 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 1 21:58:16 2007 Subject: [Frugalware-git] frugalware-current: pinot-0.80-1-i686 Message-ID: <20071101205815.0D73013A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f92ff4996132ee1c5944ce342ee71d4a25b26467 commit f92ff4996132ee1c5944ce342ee71d4a25b26467 Author: crazy Date: Thu Nov 1 21:56:58 2007 +0100 pinot-0.80-1-i686 * Version bump diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild index d0f861e..6bc7ab2 100644 --- a/source/xapps-extra/pinot/FrugalBuild +++ b/source/xapps-extra/pinot/FrugalBuild @@ -2,38 +2,35 @@ # Maintainer: crazy pkgname=pinot -pkgver=0.76 -pkgrel=2 +pkgver=0.80 +pkgrel=1 pkgdesc="Personal search and metasearch for the Free Desktop" url="http://pinot.berlios.de/" -depends=('openssl' 'curl' 'cairomm' 'dbus-glib' 'xapian-core>=1.0.3' 'gmime' 'atk' 'gtkmm' 'boost>=1.34.0-4' \ - 'libtextcat' 'taglib' 'freetype2' 'libxcb' 'pango' 'libxml++' 'sqlite3>=3.3.8-2' \ +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') -rodepends=('unzip' 'poppler-pdftools' 'unrtf') +# add catdvi package to the repos +rodepends=('unzip' 'poppler-pdftools' 'unrtf' 'catdoc') license="GPL" options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -Finclude berlios -source=($source \ - fix_SMP_build.patch \ - dbusxapianindex_reload03.patch \ - desktop.patch) -sha1sums=('e76b717636589bb31dda43dd489de5b851add080' \ - 'a347515f4be9566218c7232e6cb73ae3257999f4' \ - '20261834a958955918e7e3eca9b9d498f6acfaa7' \ - 'a0e47dc21fa7073357b5c5729d3ad22c1f2df43d') +Finclude berlios +sha1sums=('b3ad8a698dc027dba4c89c155abf28303cf22353') build() { Fcd - Fpatchall + Fsed 'pinot.png' 'pinot' *desktop touch INSTALL ChangeLog || Fdie mkdir m4 || Fdie Fautoreconf Fmake Fmakeinstall + ## for KDE3 + Fln /etc/xdg/autostart/pinot-dbus-daemon.desktop \ + /usr/share/autostart/pinot-dbus-daemon.desktop } # optimization OK diff --git a/source/xapps-extra/pinot/dbusxapianindex_reload03.patch b/source/xapps-extra/pinot/dbusxapianindex_reload03.patch deleted file mode 100644 index d33097d..0000000 --- a/source/xapps-extra/pinot/dbusxapianindex_reload03.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- pinot-0.76_bak/Index/DBusXapianIndex.cpp 2007-08-22 21:58:20.000000000 +0800 -+++ pinot-0.76/Index/DBusXapianIndex.cpp 2007-09-01 11:23:26.000000000 +0800 -@@ -17,15 +17,6 @@ - */ - - #include --extern "C" --{ --#if DBUS_VERSION < 1000000 --#define DBUS_API_SUBJECT_TO_CHANGE --#endif --#include --#include --#include --} - - #include "Languages.h" - #include "XapianDatabaseFactory.h" -@@ -302,7 +293,7 @@ - /// Asks the D-Bus service to reload its configuration. - bool DBusXapianIndex::reload(void) - { -- bool reloading = false; -+ gboolean reloading = FALSE; - - DBusGConnection *pBus = getBusConnection(); - if (pBus == NULL) -@@ -333,7 +324,12 @@ - g_object_unref(pBusProxy); - // FIXME: don't we have to call dbus_g_connection_unref(pBus); ? - -- return reloading; -+ if (reloading == TRUE) -+ { -+ return true; -+ } -+ -+ return false; - } - - ---- pinot-0.76_bak/Index/DBusXapianIndex.h 2007-08-22 21:54:40.000000000 +0800 -+++ pinot-0.76/Index/DBusXapianIndex.h 2007-09-01 11:23:37.000000000 +0800 -@@ -21,12 +21,15 @@ - - #include - #include -+#include "config.h" - extern "C" - { - #if DBUS_VERSION < 1000000 - #define DBUS_API_SUBJECT_TO_CHANGE - #endif - #include -+#include -+#include - } - - #include "XapianIndex.h" ---- pinot-0.76_bak/UI/GTK2/src/pinot.cc 2007-08-22 22:01:28.000000000 +0800 -+++ pinot-0.76/UI/GTK2/src/pinot.cc 2007-09-01 10:55:10.000000000 +0800 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include "config.h" - extern "C" - { - #if DBUS_VERSION < 1000000 -@@ -50,7 +51,6 @@ - #include "ViewHistory.h" - #include "DownloaderInterface.h" - #include "XapianIndex.h" --#include "config.h" - #include "NLS.h" - #include "PinotSettings.h" - #include "mainWindow.hh" diff --git a/source/xapps-extra/pinot/desktop.patch b/source/xapps-extra/pinot/desktop.patch deleted file mode 100644 index 67ee343..0000000 --- a/source/xapps-extra/pinot/desktop.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- pinot-0.76/pinot.desktop 2007-03-28 11:52:34.000000000 +0200 -+++ pinot-0.76-p/pinot.desktop 2007-09-06 23:05:06.000000000 +0200 -@@ -16,7 +16,7 @@ - Comment[sv]=SĂśk pĂĽ webben och i dina dokument - Exec=pinot - StartupNotify=true --Icon=pinot.png -+Icon=pinot - Terminal=false - Type=Application - Categories=GTK;Core;Network;Filesystem; ---- pinot-0.76/pinot-dbus-daemon.desktop 2006-11-12 03:50:07.000000000 +0100 -+++ pinot-0.76-p/pinot-dbus-daemon.desktop 2007-09-06 23:04:55.000000000 +0200 -@@ -2,7 +2,7 @@ - Name=Pinot - Comment=Search the Web and your documents - Exec=pinot-dbus-daemon --Icon=pinot.png -+Icon=pinot - Terminal=false - Type=Application - Categories= diff --git a/source/xapps-extra/pinot/fix_SMP_build.patch b/source/xapps-extra/pinot/fix_SMP_build.patch deleted file mode 100644 index 3a5d28f..0000000 --- a/source/xapps-extra/pinot/fix_SMP_build.patch +++ /dev/null @@ -1,73 +0,0 @@ -Index: Search/Makefile.am -=================================================================== ---- Search/Makefile.am (Revision 954) -+++ Search/Makefile.am (Arbeitskopie) -@@ -28,7 +28,6 @@ - noinst_LTLIBRARIES = libSearch.la - endif - --bin_PROGRAMS = pinot-search - - libSearch_la_SOURCES = \ - AbstractGenerator.cpp \ -@@ -55,16 +54,25 @@ - SOAPEnvNS.cpp - endif - --pinot_search_SOURCES = \ -- pinot-search.cpp -+bin_PROGRAMS = pinot-search - - pinot_search_LDADD = -L../Utils -L../Tokenize -L../Collect -L../Index -LGoogle -Lxesam \ - @SEARCH_LIBS@ -lIndex -lCollect -lTokenize -lUtils -lBasicUtils \ - @GLIBMM_LIBS@ @INDEX_LIBS@ @SOAP_LIBS@ @XML_LIBS@ @GMIME_LIBS@ @HTTP_LIBS@ @MISC_LIBS@ - -+pinot_search_SOURCES = \ -+ pinot-search.cpp -+ -+if HAVE_SOAP -+pinot_search_DEPENDENCIES = libSearch.la libSearchSOAP.la -+else -+pinot_search_DEPENDENCIES = libSearch.la -+endif -+ - SOAPEnvC.cpp : SOAPEnv.h - soapcpp2 -pSOAPEnv SOAPEnv.h - -+ - AM_CXXFLAGS = -I$(srcdir)/../Utils -I$(srcdir)/../Tokenize -I$(srcdir)/../Tokenize/filters \ - -I$(srcdir)/../Collect -I$(srcdir)/../Index -IGoogle -Ixesam \ - @HTTP_CFLAGS@ @XML_CFLAGS@ @INDEX_CFLAGS@ @SOAP_CFLAGS@ @GMIME_CFLAGS@ @GLIBMM_CFLAGS@ -Index: Index/Makefile.am -=================================================================== ---- Index/Makefile.am (Revision 954) -+++ Index/Makefile.am (Arbeitskopie) -@@ -12,8 +12,6 @@ - - noinst_LTLIBRARIES = libIndex.la - --bin_PROGRAMS = pinot-index -- - libIndex_la_SOURCES = \ - DBusXapianIndex.cpp \ - FilterWrapper.cpp \ -@@ -23,13 +21,17 @@ - XapianDatabaseFactory.cpp \ - XapianIndex.cpp - --pinot_index_SOURCES = \ -- pinot-index.cpp -+bin_PROGRAMS = pinot-index - - pinot_index_LDADD = -L../Utils -L../Tokenize -L../Collect \ - -lIndex -lCollect -lTokenize -lBasicUtils -lUtils \ - @GLIBMM_LIBS@ @INDEX_LIBS@ @DBUS_LIBS@ @XML_LIBS@ @GMIME_LIBS@ @HTTP_LIBS@ @MISC_LIBS@ - -+pinot_index_SOURCES = \ -+ pinot-index.cpp -+ -+pinot_index_DEPENDENCIES = libIndex.la -+ - AM_CXXFLAGS = -I$(srcdir)/../Utils -I$(srcdir)/../Tokenize -I$(srcdir)/../Tokenize/filters \ - -I$(srcdir)/../Collect @HTTP_CFLAGS@ @GMIME_CFLAGS@ @XML_CFLAGS@ @DBUS_CFLAGS@ @INDEX_CFLAGS@ - From crazy at frugalware.org Thu Nov 1 22:06:07 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 1 22:06:08 2007 Subject: [Frugalware-git] frugalware-current: recoll-1.8.1-6-i686 Message-ID: <20071101210607.2334D13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=02da9825d7c481c81362f584f3ac797ae372074b commit 02da9825d7c481c81362f584f3ac797ae372074b Author: crazy Date: Thu Nov 1 22:05:20 2007 +0100 recoll-1.8.1-6-i686 * rebuild with xapian diff --git a/source/xapps-extra/recoll/FrugalBuild b/source/xapps-extra/recoll/FrugalBuild index 78be589..7a2391f 100644 --- a/source/xapps-extra/recoll/FrugalBuild +++ b/source/xapps-extra/recoll/FrugalBuild @@ -3,11 +3,11 @@ pkgname=recoll pkgver=1.8.1 -pkgrel=5 +pkgrel=6 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.3' 'gamin' 'aspell') +depends=('qt' 'xapian-core>=1.0.4' 'gamin' 'aspell') rodepends=('xpdf' 'id3lib' 'catdoc' 'gawk' 'antiword' 'pstotext' 'djvulibre>=3.5.18' 'file' 'unrtf') backup=('usr/share/recoll/examples/{recoll.conf,mimemap,mimeconf}') license="GPL" From vmiklos at frugalware.org Thu Nov 1 23:07:43 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 23:07:45 2007 Subject: [Frugalware-git] frugalware-current: apache-2.2.6-1-i686 Message-ID: <20071101220743.0104213A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b3fb98d671adc4caf8ece85ceb72fa908346aa6 commit 2b3fb98d671adc4caf8ece85ceb72fa908346aa6 Author: Miklos Vajna Date: Thu Nov 1 23:07:02 2007 +0100 apache-2.2.6-1-i686 added rc_restart() to init script diff --git a/source/network/apache/rc.httpd b/source/network/apache/rc.httpd index f5c24ff..bbb861b 100644 --- a/source/network/apache/rc.httpd +++ b/source/network/apache/rc.httpd @@ -40,6 +40,13 @@ rc_stop() fi } -rc_exec $1 +rc_restart() +{ + if [ ! -z "$(eval $pid)" ]; then + apachectl graceful + else + ok 999 + fi +} -# vim: ft=sh +rc_exec $1 From vmiklos at frugalware.org Thu Nov 1 23:11:34 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 23:11:36 2007 Subject: [Frugalware-git] frugalware-current: postfix-2.4.6-1-i686 Message-ID: <20071101221134.D2AF213A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6100fa393623f2c7d980ec6a129f6c4b16e28078 commit 6100fa393623f2c7d980ec6a129f6c4b16e28078 Author: Miklos Vajna Date: Thu Nov 1 23:11:31 2007 +0100 postfix-2.4.6-1-i686 added proper restart target to the init script diff --git a/source/network/postfix/FrugalBuild b/source/network/postfix/FrugalBuild index c142843..6e0c670 100644 --- a/source/network/postfix/FrugalBuild +++ b/source/network/postfix/FrugalBuild @@ -26,9 +26,9 @@ source=($mirror/official/$pkgname-$pkgver.tar.gz \ README.Frugalware http://vda.sourceforge.net/VDA/postfix-$vdaver-vda-ng.patch.gz) -sha1sums=('226222707fd8d963d3173070cac96370c453ffa7'\ - 'aef63e40eb4321f2cf7985983964e93e9c2a4cd0'\ - 'b05736300a01bc6d4d0ca7bb92704de29b68651d'\ +sha1sums=('226222707fd8d963d3173070cac96370c453ffa7' \ + '2cc54da13d2a73e3027061fd8c4c4ce4ae44a361' \ + 'b05736300a01bc6d4d0ca7bb92704de29b68651d' \ '7bc3a9639e64747b49bd862dc7cc326ab3aacd72') build() diff --git a/source/network/postfix/messages/postfix.en b/source/network/postfix/messages/postfix.en index 071d5a5..758af93 100644 --- a/source/network/postfix/messages/postfix.en +++ b/source/network/postfix/messages/postfix.en @@ -1,2 +1,3 @@ stoppostfix="Stopping Postfix" startpostfix="Starting Postfix" +restartpostfix="Restarting Postfix" diff --git a/source/network/postfix/messages/postfix.hu b/source/network/postfix/messages/postfix.hu index d540a70..142cd3c 100644 --- a/source/network/postfix/messages/postfix.hu +++ b/source/network/postfix/messages/postfix.hu @@ -1,2 +1,3 @@ stoppostfix="A postfix leállítása" startpostfix="A postfix indítása" +restartpostfix="A postfix ujraindítása" diff --git a/source/network/postfix/rc.postfix b/source/network/postfix/rc.postfix index daa6e8c..75179b5 100644 --- a/source/network/postfix/rc.postfix +++ b/source/network/postfix/rc.postfix @@ -1,7 +1,7 @@ #!/bin/sh -# (c) 2003 Vajna Miklos -# rc.postfix for FrugalWare +# (c) 2003, 2007 Miklos Vajna +# rc.postfix for Frugalware # distributed under GPL License . /etc/rc.d/rc.functions @@ -15,9 +15,9 @@ if [ "$1" = "stop" ]; then postfix stop > /dev/null 2>&1 ok $? elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start + start "$restartpostfix" + postfix reload + ok $? else # start start "$startpostfix" if ! grep -q '^myhostname =' /etc/postfix/main.cf; then From vmiklos at frugalware.org Thu Nov 1 23:28:43 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 23:28:46 2007 Subject: [Frugalware-git] frugalware-current: gnome-user-docs-2.20.1-2-i686 Message-ID: <20071101222843.C9E3F13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bee8d475f464aaf56eabb5c1a6337a55a15a0a2e commit bee8d475f464aaf56eabb5c1a6337a55a15a0a2e Author: Miklos Vajna Date: Thu Nov 1 23:28:40 2007 +0100 gnome-user-docs-2.20.1-2-i686 rebuild, -1 is corrupted diff --git a/source/gnome/gnome-user-docs/FrugalBuild b/source/gnome/gnome-user-docs/FrugalBuild index e86684c..0f3c495 100644 --- a/source/gnome/gnome-user-docs/FrugalBuild +++ b/source/gnome/gnome-user-docs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-user-docs pkgver=2.20.1 -pkgrel=1 +pkgrel=2 pkgdesc="User documentation for GNOME" url="http://www.gnome.org/" depends=('rarian') From vmiklos at frugalware.org Thu Nov 1 23:35:37 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 23:35:40 2007 Subject: [Frugalware-git] frugalware-current: rtl8110-1.07-2-i686 Message-ID: <20071101223537.845B013A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4697a5edc8f4925e4359d5f11bc3e63682d0d530 commit 4697a5edc8f4925e4359d5f11bc3e63682d0d530 Author: Miklos Vajna Date: Thu Nov 1 23:35:31 2007 +0100 rtl8110-1.07-2-i686 remove package, this will never work with kernels >= 2.6.23 voroskoi said he'll prepare a replacement pkg soon diff --git a/source/network-extra/rtl8110/FrugalBuild b/source/network-extra/rtl8110/FrugalBuild deleted file mode 100644 index 3ead1c5..0000000 --- a/source/network-extra/rtl8110/FrugalBuild +++ /dev/null @@ -1,23 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: voroskoi - -pkgname=rtl8110 -pkgver=1.07 -pkgrel=2 -pkgdesc="Realtek driver(r1000) for RTL8169/8110 cards." -url="http://www.realtek.com.tw" -Finclude kernel-module -groups=('network-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump ftp://202.65.194.211/cn/nic/ |grep r1000 |sed -ne 's/.*_v\(.*\).tgz/\1/;$ p'" -source=(ftp://202.65.194.211/cn/nic/r1000_v$pkgver.tgz compile-Makefile.diff) - -build() { - Fcd r1000_v$pkgver - Fpatchall - cd src - make -C $_F_kernelmod_dir/build M=`pwd` || Fdie - Ffilerel $_F_kernelmod_dir/net/r1000.ko -} -sha1sums=('d904352345d0adb716ba12fb788b8a80ff75afc3' \ - 'df5f8e38705bf77acad8cb828fa20206890d43da') diff --git a/source/network-extra/rtl8110/compile-Makefile.diff b/source/network-extra/rtl8110/compile-Makefile.diff deleted file mode 100644 index e6773a3..0000000 --- a/source/network-extra/rtl8110/compile-Makefile.diff +++ /dev/null @@ -1,41 +0,0 @@ -diff -aur r1000_v1.07/src/Makefile fw_r1000_v1.07/src/Makefile ---- r1000_v1.07/src/Makefile 2007-06-22 03:38:18.000000000 +0200 -+++ fw_r1000_v1.07/src/Makefile 2007-09-08 12:33:21.000000000 +0200 -@@ -21,19 +21,6 @@ - # - ################################################################################ - --KVER := $(shell uname -r) --KDIR := /lib/modules/$(KVER)/build --KMISC := /lib/modules/$(KVER)/kernel/drivers/net/ --KEXT := $(shell echo $(KVER) | sed -ne 's/^2\.[567]\..*/k/p')o --KFLAG := 2$(shell echo $(KVER) | sed -ne 's/^2\.[4]\..*/4/p')x -+r1000-objs := r1000_ioctl.o r1000_n.o - --modules: -- $(MAKE) -f Makefile_linux24x -- strip --strip-debug r1000.$(KEXT) -- --clean: -- rm -rf *.o *.ko *~ core* .dep* .*.d .*.cmd *.mod.c *.a *.s .*.flags -- -- --install: -- install -m 644 -c r1000.$(KEXT) $(KMISC) -+obj-m += r1000.o -diff -aur r1000_v1.07/src/r1000_n.c fw_r1000_v1.07/src/r1000_n.c ---- r1000_v1.07/src/r1000_n.c 2007-08-17 19:36:53.000000000 +0200 -+++ fw_r1000_v1.07/src/r1000_n.c 2007-09-08 12:34:27.000000000 +0200 -@@ -72,9 +72,9 @@ - MODULE_DEVICE_TABLE (pci, r1000_pci_tbl); - MODULE_AUTHOR ("Realtek"); - MODULE_DESCRIPTION ("Linux device driver for Realtek Ethernet Controllers"); --MODULE_PARM (speed, "1-" __MODULE_STRING(MAX_UNITS) "i"); --MODULE_PARM (duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); --MODULE_PARM (autoneg, "1-" __MODULE_STRING(MAX_UNITS) "i"); -+MODULE_PARM_DESC (speed, "1-" __MODULE_STRING(MAX_UNITS) "i"); -+MODULE_PARM_DESC (duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); -+MODULE_PARM_DESC (autoneg, "1-" __MODULE_STRING(MAX_UNITS) "i"); - MODULE_LICENSE("GPL"); - - From devil505linux at gmail.com Thu Nov 1 23:42:00 2007 From: devil505linux at gmail.com (Devil505) Date: Thu Nov 1 23:42:02 2007 Subject: [Frugalware-git] frugalware-current: desmume-0.7.3-1-i686 Message-ID: <20071101224200.404AE13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b5899d56ea96699731a68f0b53fe6072ad006c7b commit b5899d56ea96699731a68f0b53fe6072ad006c7b Author: Devil505 Date: Thu Nov 1 23:40:15 2007 +0100 desmume-0.7.3-1-i686 diff --git a/source/games-extra/desmume/FrugalBuild b/source/games-extra/desmume/FrugalBuild new file mode 100644 index 0000000..47c1d7d --- /dev/null +++ b/source/games-extra/desmume/FrugalBuild @@ -0,0 +1,14 @@ +# Compiling Time: 0.21 SBU +# Maintainer: Devil505 + +pkgname=desmume +pkgver=0.7.3 +pkgrel=1 +pkgdesc="Emulator for Nintendo DS." +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('sdl' 'gtkglext' 'zziplib' 'libglade') +groups=('games-extra') +archs=('i686') +sha1sums=('df2979c81bb6f41bb03a605f3ff25c6c587072ed') +# optimization OK \ No newline at end of file From vmiklos at frugalware.org Thu Nov 1 23:56:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 1 23:56:26 2007 Subject: [Frugalware-git] frugalware-0.7: cdemu-0.8-27sayshell1-i686 Message-ID: <20071101225624.A550C13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=28c5567d5ed1fdc2bdff4b2a6bd87238001bfe02 commit 28c5567d5ed1fdc2bdff4b2a6bd87238001bfe02 Author: Miklos Vajna Date: Thu Nov 1 23:56:06 2007 +0100 cdemu-0.8-27sayshell1-i686 rebuilt with kernel-2.6.22-7sayshell1 (sorry, somehow i forgot about this module) diff --git a/source/apps-extra/cdemu/FrugalBuild b/source/apps-extra/cdemu/FrugalBuild index eccf891..a2ed45b 100644 --- a/source/apps-extra/cdemu/FrugalBuild +++ b/source/apps-extra/cdemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cdemu pkgver=0.8 -pkgrel=26 +pkgrel=27sayshell1 pkgdesc="A kernel module designed to simulate a CD drive with just simple cue/bin files." Finclude kernel-module depends=(${depends[@]} 'python') From voroskoi at frugalware.org Fri Nov 2 00:27:07 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Nov 2 00:27:08 2007 Subject: [Frugalware-git] frugalware-current: cups-1.3.4-2-i686 Message-ID: <20071101232707.17F8913A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9c049875fa84259c2727465a95a06565b9dc81e7 commit 9c049875fa84259c2727465a95a06565b9dc81e7 Author: voroskoi Date: Fri Nov 2 00:26:43 2007 +0100 cups-1.3.4-2-i686 added icon to the fpm also fix cups.desktop to use it diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild index a9a6af5..fdac256 100644 --- a/source/apps/cups/FrugalBuild +++ b/source/apps/cups/FrugalBuild @@ -4,7 +4,7 @@ pkgname=cups pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" depends=('libtiff' 'libpng' 'libjpeg') @@ -23,6 +23,7 @@ subgroups=('lib') subarchs=('i686 x86_64') build() { + Fsed "Icon=cups" "Icon=/usr/share/pixmaps/cups-128.png" desktop/cups.desktop Fpatchall # Do NOT remove --libdir option, needed for x86_64 to put libs into /usr/lib Fmake --with-cups-user=lp \ @@ -36,6 +37,8 @@ build() { --disable-ldap make BUILDROOT=$Fdestdir install || Fdie + Ficonrel desktop/cups-128.png + # samba support ( if [ ! -r $Fdestdir/usr/lib/cups/backend/smb ]; then Fln /usr/bin/smbspool /usr/lib/cups/backend/smb From vmiklos at frugalware.org Fri Nov 2 01:33:13 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 01:33:16 2007 Subject: [Frugalware-git] frugalware-current: openssh-4.7p1-3-i686 Message-ID: <20071102003313.259FB13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=86aa60a8c25069fabef470f34bf729c6bdbff55f commit 86aa60a8c25069fabef470f34bf729c6bdbff55f Author: Miklos Vajna Date: Fri Nov 2 01:32:41 2007 +0100 openssh-4.7p1-3-i686 drop buggy and unnecessary pid variable from the init script ok voroskoi@ diff --git a/source/network/openssh/FrugalBuild b/source/network/openssh/FrugalBuild index a117f92..f2ceebb 100644 --- a/source/network/openssh/FrugalBuild +++ b/source/network/openssh/FrugalBuild @@ -32,7 +32,7 @@ build() --with-mantype=man \ --with-xauth=/usr/bin/xauth Fmkdir /var/empty - echo "You need this file so pacman will not remove /var/empty accidentally." > $Fdestdir/var/empty/.openssh || Fdie + echo "You need this file so pacman-g2 will not remove /var/empty accidentally." > $Fdestdir/var/empty/.openssh || Fdie Frm /etc/ssh/ssh_host_{dsa_key,dsa_key.pub,rsa_key,rsa_key.pub,key,key.pub} Frcd2 sshd Frcd2 tunnel diff --git a/source/network/openssh/rc.sshd b/source/network/openssh/rc.sshd index 3ee2afb..1ea8015 100644 --- a/source/network/openssh/rc.sshd +++ b/source/network/openssh/rc.sshd @@ -15,8 +15,6 @@ TEXTDOMAINDIR=/lib/initscripts/messages actions=(restart start stop) daemon=$"SSH daemon" -pid="pidof sshd 2> /dev/null" - rc_start() { start_msg if [ ! -r /var/run/sshd.pid ]; then From priyank at frugalware.org Fri Nov 2 07:28:43 2007 From: priyank at frugalware.org (Priyank) Date: Fri Nov 2 07:28:45 2007 Subject: [Frugalware-git] frugalware-current: uptimed-0.3.12-1-i686 Message-ID: <20071102062843.CDEEE13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=19f53a1da27a076dd6c0b7f4334cbf50944846bf commit 19f53a1da27a076dd6c0b7f4334cbf50944846bf Author: Priyank Date: Fri Nov 2 11:56:14 2007 +0530 uptimed-0.3.12-1-i686 * Version bump diff --git a/source/apps-extra/uptimed/FrugalBuild b/source/apps-extra/uptimed/FrugalBuild index 35fdc61..ec3df86 100644 --- a/source/apps-extra/uptimed/FrugalBuild +++ b/source/apps-extra/uptimed/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: theD3viL pkgname=uptimed -pkgver=0.3.9 +pkgver=0.3.12 pkgrel=1 pkgdesc="A deamon which logs your uptime and uprecords." url="http://podgorny.cz/uptimed" @@ -14,8 +14,8 @@ install="uptimed.install" up2date="lynx -dump http://podgorny.cz/uptimed/releases | Flasttarbz2" source=(http://podgorny.cz/uptimed/releases/$pkgname-$pkgver.tar.bz2 \ rc.uptimed) -sha1sums=('ca675c41abaf994e34238a15aa60012273f8c8c0' \ - '679143e3177b8fd45e097f6eaab25ac3ad080b7d') +sha1sums=('753ab59bb99d7b88a35174ce83081ad0bb224e56' \ + '679143e3177b8fd45e097f6eaab25ac3ad080b7d') build() { From devil505linux at gmail.com Fri Nov 2 09:26:51 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 2 09:26:56 2007 Subject: [Frugalware-git] frugalware-current: bygfoot-2.2.0-1-i686 Message-ID: <20071102082651.4CFD413A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1659ac6c4fc811625712545e22dfd206bc2fde58 commit 1659ac6c4fc811625712545e22dfd206bc2fde58 Author: Devil505 Date: Fri Nov 2 09:24:32 2007 +0100 bygfoot-2.2.0-1-i686 *New Package diff --git a/source/games-extra/bygfoot/FrugalBuild b/source/games-extra/bygfoot/FrugalBuild new file mode 100644 index 0000000..5896c09 --- /dev/null +++ b/source/games-extra/bygfoot/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.36 SBU +# Maintainer: Devil505 + +pkgname=bygfoot +pkgver=2.2.0 +pkgrel=1 +pkgdesc="Football (a.k.a. soccer) management game" +_F_sourceforge_ext="-source.tar.bz2" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('gtk+2' 'libxdamage') +groups=('games-extra') +archs=('i686') +_F_cd_path="$pkgname-$pkgver-source" +sha1sums=('4ed7aad57c5f675b3cb72c42b329178536201d8b') + +_F_desktop_name="Bygfoot" +_F_desktop_icon="/usr/share/bygfoot/support_files/pixmaps/bygfoot_icon.png" +_F_desktop_categories="Game;" + +build() +{ + Fbuild + Fdesktop2 +} +# optimization OK From krics at linuxforum.hu Fri Nov 2 09:45:44 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 2 09:45:45 2007 Subject: [Frugalware-git] frugalware-current: doxygen-1.5.4-1-x86_64 Message-ID: <20071102084544.CB66213A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9fd955af885ad2eb79274e40f3569fd3c39a257a commit 9fd955af885ad2eb79274e40f3569fd3c39a257a Author: Christian Hamar alias krix Date: Fri Nov 2 09:44:53 2007 +0100 doxygen-1.5.4-1-x86_64 * Version bump diff --git a/source/devel-extra/doxygen/FrugalBuild b/source/devel-extra/doxygen/FrugalBuild index de93077..0d006dd 100644 --- a/source/devel-extra/doxygen/FrugalBuild +++ b/source/devel-extra/doxygen/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=doxygen -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=1 pkgdesc="Doxygen is the documentation system for C/C++" url="http://www.doxygen.org/" @@ -32,7 +32,7 @@ build() { $Fdestdir/usr/share/doc/$pkgname-$pkgver } -sha1sums=('13bb3c234d1ec429919673b87bd42f849708b808' \ +sha1sums=('1a815f7de6b412f7852d57dec9eb50f7c4b03268' \ '08e08e9fee37844a00db0eb261bd704c95ac109e' \ 'a500895e541227daf5791af1ae5f267ebb1ae7d4' \ '4d4583ea8acc976a7f0f9dafa28c70f6cc494729') From krics at linuxforum.hu Fri Nov 2 09:47:43 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 2 09:47:45 2007 Subject: [Frugalware-git] frugalware-current: perl-archive-zip-1.22-1-x86_64 Message-ID: <20071102084743.D1A7C13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=baca07385b3d46048d1eb6327ee9f74a6ab0f393 commit baca07385b3d46048d1eb6327ee9f74a6ab0f393 Author: Christian Hamar alias krix Date: Fri Nov 2 09:47:26 2007 +0100 perl-archive-zip-1.22-1-x86_64 * Version bump diff --git a/source/devel/perl-archive-zip/FrugalBuild b/source/devel/perl-archive-zip/FrugalBuild index 2cd3abc..49aa70c 100644 --- a/source/devel/perl-archive-zip/FrugalBuild +++ b/source/devel/perl-archive-zip/FrugalBuild @@ -1,7 +1,7 @@ # Compiling Time: ~0.1 SBU # Maintainer: Christian Hamar alias krix -pkgver=1.20 +pkgver=1.22 pkgrel=1 pkgdesc="Module allows a Perl program to create, manipulate, read, and write Zip archive files." url="http://cpan.org/" @@ -11,4 +11,4 @@ _F_perl_author="A/AD/ADAMK" Finclude perl groups=('devel') archs=('i686' 'x86_64') -sha1sums=('78daea059025645673f26c88dae9a86446a9badb') +sha1sums=('eced1f119518fef83ee50da93e2c809587136106') From krics at linuxforum.hu Fri Nov 2 10:04:32 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 2 10:04:35 2007 Subject: [Frugalware-git] frugalware-current: anjuta-2.2.2-1-x86_64 Message-ID: <20071102090432.1415513A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b6e2acb41b213277b91fb30c57b923316d1508af commit b6e2acb41b213277b91fb30c57b923316d1508af Author: Christian Hamar alias krix Date: Fri Nov 2 10:02:53 2007 +0100 anjuta-2.2.2-1-x86_64 * Version bump * Take over m8rship diff --git a/source/gnome-extra/anjuta/FrugalBuild b/source/gnome-extra/anjuta/FrugalBuild index f88f67f..ca39ac9 100644 --- a/source/gnome-extra/anjuta/FrugalBuild +++ b/source/gnome-extra/anjuta/FrugalBuild @@ -1,9 +1,10 @@ -# Compiling Time: 0.93 SBU -# Maintainer: AlexExtreme +# Compiling Time: 3.06 SBU +# Maintainer: Christian Hamar alias krix +# Contributor: AlexExtreme pkgname=anjuta -pkgver=2.2.1 -pkgrel=2 +pkgver=2.2.2 +pkgrel=1 pkgdesc="Anjuta is a versatile IDE for C and C++, written for GTK/GNOME." depends=('gdl' 'gnome-build>=0.2.0' 'guile>=1.8.2' 'autogen' 'glade3' 'devhelp' 'graphviz>=2.14-2' 'libgnomeprintui' 'vte' 'subversion' 'gtksourceview') makedepends=('perl-xml' 'intltool' 'gnome-doc-utils') @@ -16,7 +17,7 @@ Finclude sourceforge gnome-scriptlet options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('6851dc78d4be518bada9d6fa51f95d43789d7ea9') +sha1sums=('45fccec45f32515e17b195eee816ada5dc13c330') build() { From voroskoi at frugalware.org Fri Nov 2 10:09:57 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Nov 2 10:09:58 2007 Subject: [Frugalware-git] homepage-ng: FSA311-wordpress Message-ID: <20071102090957.0B08F13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=c8817d6431324be7c2d0bab76805ab63cbe6367f commit c8817d6431324be7c2d0bab76805ab63cbe6367f Author: voroskoi Date: Fri Nov 2 10:09:51 2007 +0100 FSA311-wordpress diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 1ec5bfe..48cf1b2 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 311 + 2007-11-02 + voroskoi + wordpress + 2.2.3-1 + 2.3.1-1sayshell1 + http://bugs.frugalware.org/task/2535 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5710 + Janek Vind has discovered a vulnerability in WordPress, which can be exploited by malicious people to conduct cross-site scripting attacks. + Input passed to the "posts_columns" parameter in wp-admin/edit-post-rows.php is not properly sanitised before being returned to the user. This can be exploited to execute arbitrary HTML and script code in a user's browser session in context of an affected site. Successful exploitation requires that "register_globals" is enabled. + + 310 2007-11-01 vmiklos From devil505linux at gmail.com Fri Nov 2 10:14:42 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 2 10:14:44 2007 Subject: [Frugalware-git] frugalware-current: bygfoot-2.2.0-1-i686 Message-ID: <20071102091442.DA45613A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=28e804467b7a1c01ec1a9dfcda93fb1ab84afbe6 commit 28e804467b7a1c01ec1a9dfcda93fb1ab84afbe6 Author: Devil505 Date: Fri Nov 2 10:13:50 2007 +0100 bygfoot-2.2.0-1-i686 *Added official website url diff --git a/source/games-extra/bygfoot/FrugalBuild b/source/games-extra/bygfoot/FrugalBuild index 5896c09..7696487 100644 --- a/source/games-extra/bygfoot/FrugalBuild +++ b/source/games-extra/bygfoot/FrugalBuild @@ -8,6 +8,7 @@ pkgdesc="Football (a.k.a. soccer) management game" _F_sourceforge_ext="-source.tar.bz2" _F_sourceforge_broken_up2date=1 Finclude sourceforge +url="http://www.bygfoot.com/" depends=('gtk+2' 'libxdamage') groups=('games-extra') archs=('i686') From krics at linuxforum.hu Fri Nov 2 10:30:02 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 2 10:30:04 2007 Subject: [Frugalware-git] frugalware-current: xchat-2.8.4-5-x86_64 Message-ID: <20071102093002.71C9913A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84e39587b523b4bcfd611f3ccf6d49d174e9d233 commit 84e39587b523b4bcfd611f3ccf6d49d174e9d233 Author: Christian Hamar alias krix Date: Fri Nov 2 10:27:52 2007 +0100 xchat-2.8.4-5-x86_64 * Release bump * Apply one more official patch from xchat.org * Fixed SBU diff --git a/source/xapps/xchat/FrugalBuild b/source/xapps/xchat/FrugalBuild index 48ddc59..d7f74d2 100644 --- a/source/xapps/xchat/FrugalBuild +++ b/source/xapps/xchat/FrugalBuild @@ -1,10 +1,10 @@ -# Compiling time: 0.01 SBU +# Compiling time: 0.40 SBU # Maintainer: Christian Hamar alias krix # Contributor: VMiklos pkgname=xchat pkgver=2.8.4 -pkgrel=4 +pkgrel=5 pkgdesc="A GTK+2 based IRC client" url="http://www.xchat.org/" depends=('gtk+2>=2.12.0-3' 'openssl' 'glib2>=2.14.1-5' 'libsexy' 'dbus-glib') @@ -15,7 +15,8 @@ up2date="lynx -dump $url|grep Source: | sed 's/.* \([0-9\.]*\)$/\1/'" source=(http://www.xchat.org/files/source/`echo $pkgver|sed 's/\([0-9].[0-9]\).[0-9]/\1/'`/$pkgname-$pkgver.tar.bz2 \ README.Frugalware \ xchat-2.6.1-fw.diff \ - http://www.xchat.org/files/source/2.8/patches/xc284-scrollbmkdir.diff) + http://www.xchat.org/files/source/2.8/patches/xc284-scrollbmkdir.diff \ + http://www.xchat.org/files/source/2.8/patches/xc284-improvescrollback.diff) #_F_gnome_schemas=('etc/gconf/schemas/apps_xchat_url_handler.schemas') _F_gnome_desktop="y" options=('scriptlet') @@ -47,5 +48,6 @@ build() sha1sums=('6ac509624c241edfac5d53d9d4ece63d917613d6' \ 'd3042890e443739f4637ccd289d4a04b7d5b879b' \ 'f05f3ffc59e0dc9241d31d4786a4cca893592e99' \ - '1f6c5071ffc16f9012c82f3f84739083806285f0') + '1f6c5071ffc16f9012c82f3f84739083806285f0' \ + '533bc8d851055ef6dfaa4a01e47e6febd4919192') # optimization OK From krics at linuxforum.hu Fri Nov 2 10:38:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 2 10:38:53 2007 Subject: [Frugalware-git] frugalware-current: stlport-5.1.4-1-x86_64 Message-ID: <20071102093849.6428913A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f1f72e688c78086ddb04e1059050176f4477512 commit 4f1f72e688c78086ddb04e1059050176f4477512 Author: Christian Hamar alias krix Date: Fri Nov 2 10:38:11 2007 +0100 stlport-5.1.4-1-x86_64 * Version bump diff --git a/source/lib-extra/stlport/FrugalBuild b/source/lib-extra/stlport/FrugalBuild index 57bf3eb..ec6810e 100644 --- a/source/lib-extra/stlport/FrugalBuild +++ b/source/lib-extra/stlport/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=871f97e55c9cd616bd0ea78e55466c43998f6041 commit 871f97e55c9cd616bd0ea78e55466c43998f6041 Author: Christian Hamar alias krix Date: Fri Nov 2 10:42:57 2007 +0100 perl-poe-filter-ircd-2.32-1-x86_64 * Version bump * Take m8rship diff --git a/source/devel-extra/perl-poe-filter-ircd/FrugalBuild b/source/devel-extra/perl-poe-filter-ircd/FrugalBuild index bd0b8fc..c3def71 100644 --- a/source/devel-extra/perl-poe-filter-ircd/FrugalBuild +++ b/source/devel-extra/perl-poe-filter-ircd/FrugalBuild @@ -1,13 +1,14 @@ # Compiling Time: 0.1 SBU -# Maintainer: Zsolt Szalai +# Maintainer: Christian Hamar alias krix +# Contributor: Zsolt Szalai _F_perl_name=POE-Filter-IRCD _F_perl_author=B/BI/BINGOS -pkgver=2.31 +pkgver=2.32 pkgrel=1 pkgdesc="A POE-based parser for the IRC protocol." depends=('perl-poe>=0.33') Finclude perl groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('819f0a07b2620cfb608abeac6334348bdc431403') +sha1sums=('991139a9a3e3ae664b356508f922f8dd6d6c0e4f') From krics at linuxforum.hu Fri Nov 2 10:45:19 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 2 10:45:21 2007 Subject: [Frugalware-git] frugalware-current: perl-poe-component-irc-5.36-1-x86_64 Message-ID: <20071102094519.112D813A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3745b5f53b9d3f820b42387b1bcfd92538e745be commit 3745b5f53b9d3f820b42387b1bcfd92538e745be Author: Christian Hamar alias krix Date: Fri Nov 2 10:44:58 2007 +0100 perl-poe-component-irc-5.36-1-x86_64 * Version bump * Take m8rship diff --git a/source/devel-extra/perl-poe-component-irc/FrugalBuild b/source/devel-extra/perl-poe-component-irc/FrugalBuild index 408f8bf..7048bbf 100644 --- a/source/devel-extra/perl-poe-component-irc/FrugalBuild +++ b/source/devel-extra/perl-poe-component-irc/FrugalBuild @@ -1,13 +1,14 @@ # Compiling Time: 0.1 SBU -# Maintainer: Zsolt Szalai +# Maintainer: Christian Hamar alias krix +# Contributor: Zsolt Szalai _F_perl_name=POE-Component-IRC _F_perl_author=B/BI/BINGOS -pkgver=5.34 +pkgver=5.36 pkgrel=1 pkgdesc="A fully event-driven IRC client module." -depends=('perl-poe' 'perl-poe-filter-ircd>=2.31' 'perl-poe-component-client-dns') +depends=('perl-poe' 'perl-poe-filter-ircd>=2.32' 'perl-poe-component-client-dns') Finclude perl groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('5c1b3d63e938aefe83a94b28023445707d4eaa6a') +sha1sums=('1b720d5163d40df60b49d7f1dff951b0c9064261') From voroskoi at frugalware.org Fri Nov 2 10:57:30 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Nov 2 10:57:33 2007 Subject: [Frugalware-git] homepage-ng: FSA312-cups Message-ID: <20071102095730.64AFB13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=0cbbc2cdcabc0c14cf70fddc8333c9b5b0a588fe commit 0cbbc2cdcabc0c14cf70fddc8333c9b5b0a588fe Author: voroskoi Date: Fri Nov 2 10:57:24 2007 +0100 FSA312-cups diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 48cf1b2..6f03282 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 312 + 2007-11-02 + voroskoi + cups + 1.3.2-1 + 1.3.2-2sayshell1 + http://bugs.frugalware.org/task/2540 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4351 + Secunia Research has discovered a vulnerability in CUPS, which can be exploited by malicious people to compromise a vulnerable system. + The vulnerability is caused due to a boundary error within the "ippReadIO()" function in cups/ipp.c when processing IPP (Internet Printing Protocol) tags. This can be exploited to overwrite one byte on the stack with a zero by sending an IPP request containing specially crafted "textWithLanguage" or "nameWithLanguage" tags. Successful exploitation allows execution of arbitrary code. + + 311 2007-11-02 voroskoi From voroskoi at frugalware.org Fri Nov 2 11:00:28 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Nov 2 11:00:29 2007 Subject: [Frugalware-git] homepage-ng: date_fixes Message-ID: <20071102100028.6101C13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=0376bf98c84f5560a567c0e2e2cd98e992c3947c commit 0376bf98c84f5560a567c0e2e2cd98e992c3947c Author: voroskoi Date: Fri Nov 2 11:00:20 2007 +0100 date_fixes fix date for FSA296 and FSA297 diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 6f03282..fafdba9 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -256,7 +256,7 @@ 297 - 2007-11-19 + 2007-10-19 voroskoi wesnoth 1.2.6-1 @@ -268,7 +268,7 @@ 296 - 2007-11-19 + 2007-10-19 voroskoi libpng 1.2.20-1 From krics at linuxforum.hu Fri Nov 2 11:01:28 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 2 11:01:28 2007 Subject: [Frugalware-git] frugalware-current: imagemagick-6.3.6_5-1-x86_64 Message-ID: <20071102100128.3812C13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c55159fe7f5389fcf821c3e7eb9258ff141e41b8 commit c55159fe7f5389fcf821c3e7eb9258ff141e41b8 Author: Christian Hamar alias krix Date: Fri Nov 2 10:59:33 2007 +0100 imagemagick-6.3.6_5-1-x86_64 * Version bump diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild index 4937c72..3b349eb 100644 --- a/source/xapps/imagemagick/FrugalBuild +++ b/source/xapps/imagemagick/FrugalBuild @@ -1,9 +1,9 @@ # Compiling time: 4.06 SBU # Contributor: Bence Nagy -# Maintainer: voroskoi +# Maintainer: Christian Hamar alias krix pkgname=imagemagick -pkgver=6.3.6_3 +pkgver=6.3.6_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=('137e599a3beb599156e99e5eac384acf6919c34e' \ +sha1sums=('507f2a39bc68de0211152313b23e6a9b1d965362' \ 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') build() { From voroskoi at frugalware.org Fri Nov 2 11:04:50 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Nov 2 11:04:52 2007 Subject: [Frugalware-git] homepage-ng: FSA313-django Message-ID: <20071102100450.D87FF13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=3a4be859fbb79f0b922c11daa4bd96f8e458a982 commit 3a4be859fbb79f0b922c11daa4bd96f8e458a982 Author: voroskoi Date: Fri Nov 2 11:04:24 2007 +0100 FSA313-django diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index fafdba9..d3a5c5a 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 313 + 2007-11-02 + voroskoi + django + 0.96-1 + 0.96-2sayshell1 + http://bugs.frugalware.org/task/2543 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5712 + A vulnerability has been reported in Django, which potentially can be exploited by malicious people to cause a DoS (Denial of Service). + The vulnerability is caused due to the Django internationalization system ("i18n") incorrectly processing HTTP headers. This can be exploited to allocate large amounts of memory by sending specially crafted HTTP "Accept-Language" requests. Successful exploitation requires that the "USE_I18N" option and the "i18n" middleware component are enabled. + + 312 2007-11-02 voroskoi From voroskoi at frugalware.org Fri Nov 2 11:08:30 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Nov 2 11:08:31 2007 Subject: [Frugalware-git] homepage-ng: FSA314-liferea Message-ID: <20071102100830.D459613A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=9d81379aedc1f712d8e9712adcb0ea316b005b6f commit 9d81379aedc1f712d8e9712adcb0ea316b005b6f Author: voroskoi Date: Fri Nov 2 11:08:25 2007 +0100 FSA314-liferea diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index d3a5c5a..d6d3487 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 314 + 2007-11-02 + voroskoi + liferea + 1.2.23-1 + 1.2.23-2sayshell1 + http://bugs.frugalware.org/task/2544 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5751 + A security issue has been reported in Liferea, which can be exploited by malicious, local users to disclose sensitive information. + The security issue is caused due to incorrect file permissions being set for the "feedlist.opml" backup file. This can be exploited to retrieve feed or proxy authentication usernames and passwords. + + 313 2007-11-02 voroskoi From krics at linuxforum.hu Fri Nov 2 11:18:20 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 2 11:18:21 2007 Subject: [Frugalware-git] frugalware-current: sabayon-2.20.1-1-x86_64 Message-ID: <20071102101820.9400D13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=10605bbc0fa07cecdc709c43368dd3100dc88322 commit 10605bbc0fa07cecdc709c43368dd3100dc88322 Author: Christian Hamar alias krix Date: Fri Nov 2 11:17:55 2007 +0100 sabayon-2.20.1-1-x86_64 * Version bump * Take m8rship * Updated patches diff --git a/source/gnome-extra/sabayon/FrugalBuild b/source/gnome-extra/sabayon/FrugalBuild index 461bb88..dc424b4 100644 --- a/source/gnome-extra/sabayon/FrugalBuild +++ b/source/gnome-extra/sabayon/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.81 SBU -# Maintainer: AlexExtreme +# Maintainer: Christian Hamar alias krix +# Contributor: AlexExtreme pkgname=sabayon -pkgver=2.18.1 +pkgver=2.20.1 pkgrel=1 pkgdesc="Sabayon is a user profile system for Gnome" url="http://www.gnome.org/projects/sabayon" @@ -12,9 +13,9 @@ depends=('gnome-desktop' 'xorg-server' 'gnome-python' 'python-ldap' 'pessulus>=2 makedepends=('intltool' 'gnome-doc-utils') Finclude gnome python source=(${source[@]} $pkgname-2.17.90-use-gksu.patch pessulus_integration.patch) -sha1sums=('5454d852a448daaf3a82d88982f25ed008f19c5b' \ - 'a7596bd6dc25c32054d587024d74550f089d0aeb' \ - '0b4e54e016dfab1e48cf3620fb40e9e91059fd14') +sha1sums=('2937960a732c086019c3fdea6a02b901dbca0b7a' \ + '4c9b182d97f3ba7d0ac510ccc6e7f920b86aa20b' \ + '207c0af0b5bc9ef2297db8501ec29134c3b189f2') install=sabayon.install build() { diff --git a/source/gnome-extra/sabayon/pessulus_integration.patch b/source/gnome-extra/sabayon/pessulus_integration.patch index af1d30d..608bfaf 100644 --- a/source/gnome-extra/sabayon/pessulus_integration.patch +++ b/source/gnome-extra/sabayon/pessulus_integration.patch @@ -1,21 +1,21 @@ -diff -urN sabayon-2.12.4.orig/admin-tool/lockdownappliersabayon.py sabayon-2.12.4/admin-tool/lockdownappliersabayon.py ---- sabayon-2.12.4.orig/admin-tool/lockdownappliersabayon.py 2006-12-27 14:14:38.000000000 +0000 -+++ sabayon-2.12.4/admin-tool/lockdownappliersabayon.py 2006-12-27 14:23:21.000000000 +0000 -@@ -20,7 +20,7 @@ - import util - import sessionwindow +diff -Naur sabayon-2.20.1.orig/admin-tool/lockdownappliersabayon.py sabayon-2.20.1/admin-tool/lockdownappliersabayon.py +--- sabayon-2.20.1.orig/admin-tool/lockdownappliersabayon.py 2007-11-02 11:08:21.000000000 +0100 ++++ sabayon-2.20.1/admin-tool/lockdownappliersabayon.py 2007-11-02 11:09:16.000000000 +0100 +@@ -22,7 +22,7 @@ + import debuglog + import errors -from sabayon.lockdown import lockdownapplier +from Pessulus import lockdownapplier def dprint (fmt, *args): - util.debug_print (util.DEBUG_ADMINTOOL, fmt % args) -diff -urN sabayon-2.12.4.orig/admin-tool/sessionwindow.py sabayon-2.12.4/admin-tool/sessionwindow.py ---- sabayon-2.12.4.orig/admin-tool/sessionwindow.py 2006-12-27 14:14:38.000000000 +0000 -+++ sabayon-2.12.4/admin-tool/sessionwindow.py 2006-12-27 14:23:21.000000000 +0000 -@@ -29,7 +29,7 @@ - import saveconfirm - import aboutdialog + debuglog.debug_log (False, debuglog.DEBUG_LOG_DOMAIN_ADMIN_TOOL, fmt % args) +diff -Naur sabayon-2.20.1.orig/admin-tool/sessionwindow.py sabayon-2.20.1/admin-tool/sessionwindow.py +--- sabayon-2.20.1.orig/admin-tool/sessionwindow.py 2007-11-02 11:08:21.000000000 +0100 ++++ sabayon-2.20.1/admin-tool/sessionwindow.py 2007-11-02 11:09:59.000000000 +0100 +@@ -31,7 +31,7 @@ + import debuglog + import errors from lockdownappliersabayon import LockdownApplierSabayon -from sabayon.lockdown import maindialog as lockdowndialog +from Pessulus import maindialog as lockdowndialog diff --git a/source/gnome-extra/sabayon/sabayon-2.17.90-use-gksu.patch b/source/gnome-extra/sabayon/sabayon-2.17.90-use-gksu.patch index 5086754..6c32094 100644 --- a/source/gnome-extra/sabayon/sabayon-2.17.90-use-gksu.patch +++ b/source/gnome-extra/sabayon/sabayon-2.17.90-use-gksu.patch @@ -1,12 +1,24 @@ -diff -urN sabayon-2.17.90.orig/admin-tool/sabayon.desktop.in sabayon-2.17.90/admin-tool/sabayon.desktop.in ---- sabayon-2.17.90.orig/admin-tool/sabayon.desktop.in 2007-02-10 16:12:17.000000000 +0000 -+++ sabayon-2.17.90/admin-tool/sabayon.desktop.in 2007-02-10 16:12:29.000000000 +0000 +diff -Naur sabayon-2.20.1.orig/admin-tool/sabayon.desktop sabayon-2.20.1/admin-tool/sabayon.desktop +--- sabayon-2.20.1.orig/admin-tool/sabayon.desktop 2007-11-02 11:08:21.000000000 +0100 ++++ sabayon-2.20.1/admin-tool/sabayon.desktop 2007-11-02 11:11:02.000000000 +0100 +@@ -119,7 +119,7 @@ + Comment[zh_CN]=为用户建立并编辑配置文件 + Comment[zh_HK]=建立與編輯使用者設定組合 + Comment[zh_TW]=建立與編輯使用者設定組合 +-Exec=gnomesu sabayon ++Exec=gksu sabayon + Terminal=false + Type=Application + Icon=sabayon +diff -Naur sabayon-2.20.1.orig/admin-tool/sabayon.desktop.in sabayon-2.20.1/admin-tool/sabayon.desktop.in +--- sabayon-2.20.1.orig/admin-tool/sabayon.desktop.in 2007-11-02 11:08:21.000000000 +0100 ++++ sabayon-2.20.1/admin-tool/sabayon.desktop.in 2007-11-02 11:10:56.000000000 +0100 @@ -2,7 +2,7 @@ Encoding=UTF-8 _Name=User Profile Editor _Comment=Establish and Edit Profiles for Users --Exec=sabayon +-Exec=gnomesu sabayon +Exec=gksu sabayon Terminal=false Type=Application - Icon=sabayon.png + Icon=sabayon From vmiklos at frugalware.org Fri Nov 2 13:30:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 13:30:25 2007 Subject: [Frugalware-git] frugalware-current: inotify-tools-3.11-1-i686 Message-ID: <20071102123023.A1B9913A40D6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df34235e3f3a1313af3a500692255ee17f2349ff commit df34235e3f3a1313af3a500692255ee17f2349ff Author: Miklos Vajna Date: Fri Nov 2 13:29:50 2007 +0100 inotify-tools-3.11-1-i686 groups() fix diff --git a/source/apps/inotify-tools/FrugalBuild b/source/apps/inotify-tools/FrugalBuild index 200cce8..3c763e5 100644 --- a/source/apps/inotify-tools/FrugalBuild +++ b/source/apps/inotify-tools/FrugalBuild @@ -6,7 +6,7 @@ pkgver=3.11 pkgrel=1 pkgdesc="inotify-tools is a set of command-line programs for Linux providing a simple interface to inotify" depends=() -groups=('apps-extra') +groups=('apps') archs=('i686' 'x86_64') _F_sourceforge_broken_up2date=1 Finclude sourceforge From vmiklos at frugalware.org Fri Nov 2 13:45:43 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 13:45:44 2007 Subject: [Frugalware-git] frugalware-current: binutils-2.18.50.0.2-1-i686 Message-ID: <20071102124543.0DEF013A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5efd940b3ea1d3cecbbabc8dcf18967259414261 commit 5efd940b3ea1d3cecbbabc8dcf18967259414261 Author: Miklos Vajna Date: Fri Nov 2 13:45:38 2007 +0100 binutils-2.18.50.0.2-1-i686 up2date fix diff --git a/source/devel/binutils/FrugalBuild b/source/devel/binutils/FrugalBuild index d49071b..572f503 100644 --- a/source/devel/binutils/FrugalBuild +++ b/source/devel/binutils/FrugalBuild @@ -9,8 +9,8 @@ url="http://www.gnu.org/software/binutils/" depends=('bash' 'glibc>=2.6-2') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') -# for now, we need a devel version to utilize glibc-2.6 -up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.18/2.18.50.0.1/'" +# for now, we need a devel version to utilize glibc-2.7 +up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|grep '$pkgname-\(.*\).tar.bz2$'|sort -n -r|head -n1|Flasttarbz2|sed 's/2.18/2.18.50.0.2/'" #Fup2gnubz2 source=(http://www2.kernel.org/pub/linux/devel/$pkgname/$pkgname-$pkgver.tar.bz2) #source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2) From vmiklos at frugalware.org Fri Nov 2 13:49:29 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 13:49:30 2007 Subject: [Frugalware-git] frugalware-current: fakeroot-1.8.3-1-i686 Message-ID: <20071102124929.322E213A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=62e951fe683815be3f7cd00ad39c2061ed27efb4 commit 62e951fe683815be3f7cd00ad39c2061ed27efb4 Author: Miklos Vajna Date: Fri Nov 2 13:48:50 2007 +0100 fakeroot-1.8.3-1-i686 version bump diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild index 6a64f54..e1e4d3e 100644 --- a/source/devel/fakeroot/FrugalBuild +++ b/source/devel/fakeroot/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: VMiklos pkgname=fakeroot -pkgver=1.8.2 +pkgver=1.8.3 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=('37d2746b9b90ac4f32dd80a42b9417adf0ada069') +sha1sums=('59c613647d0e537767b4b61ed5c7be621932a709') # optimization OK From crazy at frugalware.org Fri Nov 2 13:50:00 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 2 13:50:04 2007 Subject: [Frugalware-git] frugalware-current: libgpg-error-1.6-1-i686 Message-ID: <20071102125000.468E313A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af3445d595371e3271b928b0ac51ae7cc5fd93cf commit af3445d595371e3271b928b0ac51ae7cc5fd93cf Author: crazy Date: Fri Nov 2 13:49:35 2007 +0100 libgpg-error-1.6-1-i686 * Versionb bump diff --git a/source/lib/libgpg-error/FrugalBuild b/source/lib/libgpg-error/FrugalBuild index c22e1d5..3e6c4dd 100644 --- a/source/lib/libgpg-error/FrugalBuild +++ b/source/lib/libgpg-error/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik pkgname=libgpg-error -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="Support library for libgcrypt" url="http://www.gnupg.org" @@ -12,6 +12,6 @@ archs=('i686' 'x86_64') depends=('glibc') up2date="lynx -dump http://www.gnupg.org/\(en\)/download/index.html |grep libgpg-error.*tar |sed -n -e 's/.*r-\(.*\)\.t.*/\1/;s/-/_/;1 p'" source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$pkgver.tar.bz2) -sha1sums=('1f83d9af8e8ed3bcbf3a5e9018db257dc6336655') +sha1sums=('2f387d0c34dd55eaf3b5f3c2570e9033eb540bc3') # optimization OK From vmiklos at frugalware.org Fri Nov 2 13:51:50 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 13:51:53 2007 Subject: [Frugalware-git] frugalware-current: csup-20060318-1-i686 Message-ID: <20071102125150.E2EBB13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a758f23f5c50e50dea7d2b941d3582ba54f17e23 commit a758f23f5c50e50dea7d2b941d3582ba54f17e23 Author: Miklos Vajna Date: Fri Nov 2 13:51:36 2007 +0100 csup-20060318-1-i686 up2date fix remove old replaces() line diff --git a/source/devel-extra/csup/FrugalBuild b/source/devel-extra/csup/FrugalBuild index d7aa501..16f583e 100644 --- a/source/devel-extra/csup/FrugalBuild +++ b/source/devel-extra/csup/FrugalBuild @@ -7,11 +7,9 @@ pkgrel=1 pkgdesc="A solid CVSup replacement for checkout-only functionality." url="http://www.mu.org/~mux/csup.html" depends=('openssl' 'zlib' 'glibc') -# can be removed after Frugalware-0.7 is out -replaces=('cvsup') groups=('devel-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |Flasttgz" +up2date="lynx -dump $url |sed 's/snap-//' |Flasttgz" source=(http://mu.org/~mux/csup-snap-$pkgver.tgz) sha1sums=('209c53137245e3e5e2cea98151115043d993ce35') From priyank at frugalware.org Fri Nov 2 14:13:31 2007 From: priyank at frugalware.org (Priyank) Date: Fri Nov 2 14:13:33 2007 Subject: [Frugalware-git] fun: renamed updnotifierd to fund Message-ID: <20071102131331.704B213A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=8e981b4c879f475d5562e64c1e062812c0247ff9 commit 8e981b4c879f475d5562e64c1e062812c0247ff9 Author: Priyank Date: Fri Nov 2 18:42:19 2007 +0530 renamed updnotifierd to fund diff --git a/Makefile.am b/Makefile.am index 0b8e3df..007992d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = src dbusdir = $(DBUS_SYS_DIR) -dbus_DATA = updnotifierd.conf +dbus_DATA = fund.conf EXTRA_DIST = $(dbus_DATA) diff --git a/configure.ac b/configure.ac index a5ed71c..dba106d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) AC_INIT([updnotifierd], 0.1, [frugalware-devel@frugalware.org], updnotifierd) -AC_CONFIG_SRCDIR([src/updnotifierd.c]) +AC_CONFIG_SRCDIR([src/fund.c]) AC_LANG(C) AM_CONFIG_HEADER(config.h) AC_CANONICAL_SYSTEM diff --git a/fund.conf b/fund.conf new file mode 100644 index 0000000..1bfeb25 --- /dev/null +++ b/fund.conf @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index 1caffbc..078dcf3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,10 +3,10 @@ INCLUDES = @UPDNOTIFIERD_CFLAGS@ \ -DPREFIX=\"$(prefix)\" \ -fPIC -sbin_PROGRAMS = updnotifierd +sbin_PROGRAMS = fund bin_PROGRAMS = fun -updnotifierd_SOURCES = updnotifierd.c +fund_SOURCES = fund.c fun_SOURCES = eggtrayicon.c \ sexy-tooltip.c \ fun-tooltip.c \ @@ -14,15 +14,15 @@ fun_SOURCES = eggtrayicon.c \ fun-dbus.c \ fun.c -updnotifierd_LDADD= @UPDNOTIFIERD_LIBS@ -lpacman -lfwutil +fund_LDADD= @UPDNOTIFIERD_LIBS@ -lpacman -lfwutil fun_LDADD= @FUN_LIBS@ @UPDNOTIFIERD_LIBS@ -BUILT_SOURCES = updnotifierd-dbus-glue.h +BUILT_SOURCES = fund-dbus-glue.h -updnotifierd-dbus-glue.h: updnotifierd.xml - @DBUSBINDINGTOOL@ --mode=glib-server --prefix=updnotifierd \ - $(srcdir)/updnotifierd.xml > updnotifierd-dbus-glue.h +fund-dbus-glue.h: fund.xml + @DBUSBINDINGTOOL@ --mode=glib-server --prefix=fund \ + $(srcdir)/fund.xml > fund-dbus-glue.h -EXTRA_DIST = updnotifierd.xml +EXTRA_DIST = fund.xml DISTCLEANFILES = \ - updnotifierd-dbus-glue.h + fund-dbus-glue.h diff --git a/src/fund.c b/src/fund.c new file mode 100644 index 0000000..dd61487 --- /dev/null +++ b/src/fund.c @@ -0,0 +1,238 @@ +/* + * updatenotifierd.c for updatenotifier + * + * Copyright (C) 2007 by Priyank Gosalia + * Portions of this code are borrowed fron netconfigd + * netconfigd is Copyright (C) 2007 Alex Smith + * + * 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. + */ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "updnotifierd.h" +#include "updnotifierd-dbus-glue.h" + +typedef void* netbuf; +static PM_DB *sync_db = NULL; +static PM_DB *local_db = NULL; + +G_DEFINE_TYPE(UpdNotifier, updnotifierd, G_TYPE_OBJECT); + +void updnotifierd_class_init(UpdNotifierClass *class) { + // Nothing here +} + +void updnotifierd_init(UpdNotifier *server) { + GError *error = NULL; + DBusGProxy *driver_proxy; + int request_ret; + + // Init the DBus connection + server->connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); + if (server->connection == NULL) { + g_warning("Unable to connect to dbus: %s", error->message); + g_error_free(error); + return; + } + + dbus_g_object_type_install_info(updnotifierd_get_type(), &dbus_glib_updnotifierd_object_info); + + // Register DBUS path + dbus_g_connection_register_g_object(server->connection, "/org/frugalware/UpdNotifier", G_OBJECT(server)); + + // Register the service name, the constant here are defined in dbus-glib-bindings.h + driver_proxy = dbus_g_proxy_new_for_name(server->connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); + + if (!org_freedesktop_DBus_request_name (driver_proxy, "org.frugalware.UpdNotifier", 0, &request_ret, &error)) { + g_warning("Unable to register service: %s", error->message); + g_error_free(error); + } + + g_object_unref(driver_proxy); +} + +static void +_log_cb (unsigned short level, char *msg) { + g_print ("%s\n", msg); + + return; +} + +static gboolean +_updatenotifierd_init_pacman () { + /* initialize the pacman-g2 library */ + if (pacman_initialize ("/") == -1) + return FALSE; + + /* register the main repo */ + /* FIXME: Later add support for custom repos */ + sync_db = pacman_db_register ("frugalware-current"); + local_db = pacman_db_register ("local"); + + if (sync_db == NULL) + return FALSE; + if (local_db == NULL) + return FALSE; + + /* parse the pacman-g2 config */ + pacman_parse_config ("/etc/pacman.conf", NULL, ""); + pacman_set_option (PM_OPT_LOGMASK, (long)-1); + pacman_set_option (PM_OPT_LOGCB, (long)_log_cb); + + return TRUE; +} + +GList* _updnotifierd_update_database (void) { + PM_LIST *packages = NULL; + GList *ret = NULL; + int retval = 0; + + /* update the pacman database */ + retval = pacman_db_update (0, sync_db); + + /* something went wrong */ + if (retval== -1) { + printf ("%s\n", pacman_strerror(pm_errno)); + return ret; + } + + if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, NULL, NULL, NULL) == -1) { + gchar *errorstr = g_strdup_printf ("Failed to init transaction (%s)\n", pacman_strerror(pm_errno)); + g_print (errorstr); + g_free (errorstr); + return ret; + } + else { + if (pacman_trans_sysupgrade() == -1) { + g_print (pacman_strerror(pm_errno)); + } + else { + packages = pacman_trans_getinfo (PM_TRANS_PACKAGES); + if (packages == NULL) { + g_print ("No new updates are available\n"); + } + else { + PM_LIST *i = NULL; + + for (i=pacman_list_first(packages);i!=NULL;i=pacman_list_next(i)) { + PM_SYNCPKG *spkg = pacman_list_getdata (i); + PM_PKG *pkg = pacman_sync_getinfo (spkg, PM_SYNC_PKG); + ret = g_list_append (ret, g_strdup((char*)pacman_pkg_getinfo(pkg,PM_PKG_NAME))); + } + } + pacman_trans_release (); + } + } + + return ret; +} + +gboolean updnotifier_update_database(UpdNotifier *obj, gchar **packages, GError **error) { + GList *list = NULL; + if ((list = _updnotifierd_update_database())==NULL) { + *packages = NULL; + return FALSE; + } + else { + GString *tmp = g_string_new (""); + for (list; list!=NULL;list=g_list_next(list)) { + tmp = g_string_append (tmp, list->data); + tmp = g_string_append (tmp, " "); + } + *packages = g_strdup (tmp->str); + return TRUE; + } +} + +gboolean updnotifier_test_service(UpdNotifier *obj, gint *ret, GError **error) { + *ret = 1; + return TRUE; +} + +void usage() { + printf("Fund v" VERSION "\n"); + printf(" --help Display this help text\n"); + printf(" --daemon Fork into the background\n"); +} + +int main (int argc, char *argv[]) { + GMainLoop *main_loop; + UpdNotifier *server; + int i = 1; + int daemonize = 0; + + // Parse command line options + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "--daemon")) + daemonize = 1; + else if (!strcmp(argv[i], "--help")) { + usage(); + return 0; + } else { + usage(); + return 1; + } + } + + if (getuid() != 0) { + printf("Must run as root!\n"); + exit(1); + } + + // Daemonize if wanted + if (daemonize) { + switch (fork()) { + case 0: + break; + case -1: + printf("Can't fork: %s\n", strerror(errno)); + exit(1); + break; + default: + exit(0); + } + + fclose(stdin); + fclose(stdout); + fclose(stderr); + } + + // Connect to syslog + openlog("updnotifierd", LOG_PID, LOG_DAEMON); + + syslog(LOG_INFO, "Fund v" VERSION " started..."); + + g_type_init(); + + server = g_object_new(updnotifierd_get_type(), NULL); + + _updatenotifierd_init_pacman (); + main_loop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(main_loop); + + return 0; +} + diff --git a/src/fund.h b/src/fund.h new file mode 100644 index 0000000..dee4fde --- /dev/null +++ b/src/fund.h @@ -0,0 +1,43 @@ +/*************************************************************************** + * netconfigd.h + * Author(s): Alex Smith + * Copyright (C) 2007 Frugalware Developer Team + ****************************************************************************/ + +/* + * 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. + */ + +#ifndef _UPDNOTIFIERD_H +#define _UPDNOTIFIERD_H + +typedef struct +{ + GObject parent; + DBusGConnection *connection; +} UpdNotifier; + +typedef struct +{ + GObjectClass parent_class; +} UpdNotifierClass; + +static void updnotifierd_init(UpdNotifier *server); +static void updnotifierd_class_init(UpdNotifierClass *class); + +gboolean updnotifier_update_database(UpdNotifier *obj, gchar **packages, GError **error); +gboolean updnotifier_test_service(UpdNotifier *obj, gint *ret, GError **error); + +#endif diff --git a/src/fund.xml b/src/fund.xml new file mode 100644 index 0000000..305d636 --- /dev/null +++ b/src/fund.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/updnotifierd.c b/src/updnotifierd.c deleted file mode 100644 index dd61487..0000000 --- a/src/updnotifierd.c +++ /dev/null @@ -1,238 +0,0 @@ -/* - * updatenotifierd.c for updatenotifier - * - * Copyright (C) 2007 by Priyank Gosalia - * Portions of this code are borrowed fron netconfigd - * netconfigd is Copyright (C) 2007 Alex Smith - * - * 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. - */ - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "updnotifierd.h" -#include "updnotifierd-dbus-glue.h" - -typedef void* netbuf; -static PM_DB *sync_db = NULL; -static PM_DB *local_db = NULL; - -G_DEFINE_TYPE(UpdNotifier, updnotifierd, G_TYPE_OBJECT); - -void updnotifierd_class_init(UpdNotifierClass *class) { - // Nothing here -} - -void updnotifierd_init(UpdNotifier *server) { - GError *error = NULL; - DBusGProxy *driver_proxy; - int request_ret; - - // Init the DBus connection - server->connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); - if (server->connection == NULL) { - g_warning("Unable to connect to dbus: %s", error->message); - g_error_free(error); - return; - } - - dbus_g_object_type_install_info(updnotifierd_get_type(), &dbus_glib_updnotifierd_object_info); - - // Register DBUS path - dbus_g_connection_register_g_object(server->connection, "/org/frugalware/UpdNotifier", G_OBJECT(server)); - - // Register the service name, the constant here are defined in dbus-glib-bindings.h - driver_proxy = dbus_g_proxy_new_for_name(server->connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); - - if (!org_freedesktop_DBus_request_name (driver_proxy, "org.frugalware.UpdNotifier", 0, &request_ret, &error)) { - g_warning("Unable to register service: %s", error->message); - g_error_free(error); - } - - g_object_unref(driver_proxy); -} - -static void -_log_cb (unsigned short level, char *msg) { - g_print ("%s\n", msg); - - return; -} - -static gboolean -_updatenotifierd_init_pacman () { - /* initialize the pacman-g2 library */ - if (pacman_initialize ("/") == -1) - return FALSE; - - /* register the main repo */ - /* FIXME: Later add support for custom repos */ - sync_db = pacman_db_register ("frugalware-current"); - local_db = pacman_db_register ("local"); - - if (sync_db == NULL) - return FALSE; - if (local_db == NULL) - return FALSE; - - /* parse the pacman-g2 config */ - pacman_parse_config ("/etc/pacman.conf", NULL, ""); - pacman_set_option (PM_OPT_LOGMASK, (long)-1); - pacman_set_option (PM_OPT_LOGCB, (long)_log_cb); - - return TRUE; -} - -GList* _updnotifierd_update_database (void) { - PM_LIST *packages = NULL; - GList *ret = NULL; - int retval = 0; - - /* update the pacman database */ - retval = pacman_db_update (0, sync_db); - - /* something went wrong */ - if (retval== -1) { - printf ("%s\n", pacman_strerror(pm_errno)); - return ret; - } - - if (pacman_trans_init(PM_TRANS_TYPE_SYNC, 0, NULL, NULL, NULL) == -1) { - gchar *errorstr = g_strdup_printf ("Failed to init transaction (%s)\n", pacman_strerror(pm_errno)); - g_print (errorstr); - g_free (errorstr); - return ret; - } - else { - if (pacman_trans_sysupgrade() == -1) { - g_print (pacman_strerror(pm_errno)); - } - else { - packages = pacman_trans_getinfo (PM_TRANS_PACKAGES); - if (packages == NULL) { - g_print ("No new updates are available\n"); - } - else { - PM_LIST *i = NULL; - - for (i=pacman_list_first(packages);i!=NULL;i=pacman_list_next(i)) { - PM_SYNCPKG *spkg = pacman_list_getdata (i); - PM_PKG *pkg = pacman_sync_getinfo (spkg, PM_SYNC_PKG); - ret = g_list_append (ret, g_strdup((char*)pacman_pkg_getinfo(pkg,PM_PKG_NAME))); - } - } - pacman_trans_release (); - } - } - - return ret; -} - -gboolean updnotifier_update_database(UpdNotifier *obj, gchar **packages, GError **error) { - GList *list = NULL; - if ((list = _updnotifierd_update_database())==NULL) { - *packages = NULL; - return FALSE; - } - else { - GString *tmp = g_string_new (""); - for (list; list!=NULL;list=g_list_next(list)) { - tmp = g_string_append (tmp, list->data); - tmp = g_string_append (tmp, " "); - } - *packages = g_strdup (tmp->str); - return TRUE; - } -} - -gboolean updnotifier_test_service(UpdNotifier *obj, gint *ret, GError **error) { - *ret = 1; - return TRUE; -} - -void usage() { - printf("Fund v" VERSION "\n"); - printf(" --help Display this help text\n"); - printf(" --daemon Fork into the background\n"); -} - -int main (int argc, char *argv[]) { - GMainLoop *main_loop; - UpdNotifier *server; - int i = 1; - int daemonize = 0; - - // Parse command line options - for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "--daemon")) - daemonize = 1; - else if (!strcmp(argv[i], "--help")) { - usage(); - return 0; - } else { - usage(); - return 1; - } - } - - if (getuid() != 0) { - printf("Must run as root!\n"); - exit(1); - } - - // Daemonize if wanted - if (daemonize) { - switch (fork()) { - case 0: - break; - case -1: - printf("Can't fork: %s\n", strerror(errno)); - exit(1); - break; - default: - exit(0); - } - - fclose(stdin); - fclose(stdout); - fclose(stderr); - } - - // Connect to syslog - openlog("updnotifierd", LOG_PID, LOG_DAEMON); - - syslog(LOG_INFO, "Fund v" VERSION " started..."); - - g_type_init(); - - server = g_object_new(updnotifierd_get_type(), NULL); - - _updatenotifierd_init_pacman (); - main_loop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(main_loop); - - return 0; -} - diff --git a/src/updnotifierd.h b/src/updnotifierd.h deleted file mode 100644 index dee4fde..0000000 --- a/src/updnotifierd.h +++ /dev/null @@ -1,43 +0,0 @@ -/*************************************************************************** - * netconfigd.h - * Author(s): Alex Smith - * Copyright (C) 2007 Frugalware Developer Team - ****************************************************************************/ - -/* - * 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. - */ - -#ifndef _UPDNOTIFIERD_H -#define _UPDNOTIFIERD_H - -typedef struct -{ - GObject parent; - DBusGConnection *connection; -} UpdNotifier; - -typedef struct -{ - GObjectClass parent_class; -} UpdNotifierClass; - -static void updnotifierd_init(UpdNotifier *server); -static void updnotifierd_class_init(UpdNotifierClass *class); - -gboolean updnotifier_update_database(UpdNotifier *obj, gchar **packages, GError **error); -gboolean updnotifier_test_service(UpdNotifier *obj, gint *ret, GError **error); - -#endif diff --git a/src/updnotifierd.xml b/src/updnotifierd.xml deleted file mode 100644 index 305d636..0000000 --- a/src/updnotifierd.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/updnotifierd.conf b/updnotifierd.conf deleted file mode 100644 index 1bfeb25..0000000 --- a/updnotifierd.conf +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - From priyank at frugalware.org Fri Nov 2 14:14:11 2007 From: priyank at frugalware.org (Priyank) Date: Fri Nov 2 14:14:13 2007 Subject: [Frugalware-git] fun: renamed updnotifierd to fun in configure.ac Message-ID: <20071102131411.4F27B13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=5463cf2cf6fe7afeb61f9e1e739dc99f55127bec commit 5463cf2cf6fe7afeb61f9e1e739dc99f55127bec Author: Priyank Date: Fri Nov 2 18:43:00 2007 +0530 renamed updnotifierd to fun in configure.ac diff --git a/configure.ac b/configure.ac index dba106d..b6b8240 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) -AC_INIT([updnotifierd], 0.1, [frugalware-devel@frugalware.org], updnotifierd) +AC_INIT([fun], 0.1, [frugalware-devel@frugalware.org], fun) AC_CONFIG_SRCDIR([src/fund.c]) AC_LANG(C) AM_CONFIG_HEADER(config.h) From vmiklos at frugalware.org Fri Nov 2 14:16:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 14:16:11 2007 Subject: [Frugalware-git] frugalware-current: scratchbox-1.0.8-1-i686 Message-ID: <20071102131610.19A2813A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0c8418acd798f0882c8384952a247a949001330 commit f0c8418acd798f0882c8384952a247a949001330 Author: Miklos Vajna Date: Fri Nov 2 14:16:04 2007 +0100 scratchbox-1.0.8-1-i686 version bump diff --git a/source/devel-extra/scratchbox/FrugalBuild b/source/devel-extra/scratchbox/FrugalBuild index e0b0b6a..f4ba6bb 100644 --- a/source/devel-extra/scratchbox/FrugalBuild +++ b/source/devel-extra/scratchbox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=scratchbox -pkgver=1.0.6 +pkgver=1.0.8 pkgrel=1 pkgdesc="A cross-compilation toolkit to make embedded application development easier." url="http://www.scratchbox.org/" @@ -10,15 +10,13 @@ depends=('glibc') groups=('devel-extra') archs=('i686' '!x86_64') up2date="lynx -dump http://scratchbox.org/download/files/sbox-releases/apophis/src/|Flasttar" -source=(http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-core-1.0.6-i386.tar.gz \ - http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-devkit-debian-1.0.3-i386.tar.gz \ - http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-devkit-doctools-1.0.4-i386.tar.gz \ - http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-devkit-perl-1.0.3-i386.tar.gz \ - http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-libs-1.0.6-i386.tar.gz \ - http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-toolchain-arm-gcc4.01-glibc2.3-1.0.3-i386.tar.gz \ - http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-toolchain-host-gcc-1.0.6-i386.tar.gz \ - http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-toolchain-i686-gcc3.3-glibc2.3-1.0.3-i386.tar.gz \ +source=(http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-core-$pkgver-i386.tar.gz \ + http://scratchbox.org/download/files/sbox-releases/apophis/tarball/scratchbox-libs-$pkgver-i386.tar.gz \ README.Frugalware rc.scratchbox) +sha1sums=('d9a90409728eeb116679d2d9c519ab1458b30745' \ + '229e4a3c3d82026072947b5f9b8428d82bd6fc7f' \ + 'c08ba6dc88526fe55cf0958f0b81b4dc3270c55e' \ + '7f17d4a73c673e58d736f3363ae732c63870d301') options=('nostrip') # why wasting our time with this if it's already done? build() @@ -30,13 +28,3 @@ build() Fexe /etc/rc.d/rc.scratchbox Fdoc README.Frugalware } -sha1sums=('59b0aea28b2d307549a03c8a027a805ae730bdf1' \ - '77a6fdee1cca26da19a361898de5a43b128cbfcb' \ - 'a599ad434c1cca2296eca1f59266c4d371e59a3d' \ - '4069cc5728f1030318e9a3ce5a58ec7a467a6127' \ - '2590acc9f94afea65e5138abe452886bb1a621a6' \ - 'd096bb3bf1c04de5ea77b0f73c19e18f3e8a1412' \ - '667bc25111ed471f35027b8e8e99b97787fe343d' \ - 'd5fa33061e6b89f93863a1ec1925c9f5dc0ec05a' \ - 'e3876b80bc1b6e0fc52e58865ad8ee7067c19747' \ - '7f17d4a73c673e58d736f3363ae732c63870d301') From priyank at frugalware.org Fri Nov 2 14:16:47 2007 From: priyank at frugalware.org (Priyank) Date: Fri Nov 2 14:16:49 2007 Subject: [Frugalware-git] fun: fixed headers in fund.c Message-ID: <20071102131647.9C73013A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=e30a9674ed9b7976b2fbf9320bb30c8d3866b7e3 commit e30a9674ed9b7976b2fbf9320bb30c8d3866b7e3 Author: Priyank Date: Fri Nov 2 18:45:36 2007 +0530 fixed headers in fund.c diff --git a/src/fund.c b/src/fund.c index dd61487..0eed6ae 100644 --- a/src/fund.c +++ b/src/fund.c @@ -32,8 +32,8 @@ #include #include #include -#include "updnotifierd.h" -#include "updnotifierd-dbus-glue.h" +#include "fund.h" +#include "fund-dbus-glue.h" typedef void* netbuf; static PM_DB *sync_db = NULL; diff --git a/src/fund.h b/src/fund.h index dee4fde..6e44223 100644 --- a/src/fund.h +++ b/src/fund.h @@ -20,8 +20,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _UPDNOTIFIERD_H -#define _UPDNOTIFIERD_H +#ifndef _FUND_H +#define _FUND_H typedef struct { From priyank at frugalware.org Fri Nov 2 14:19:37 2007 From: priyank at frugalware.org (Priyank) Date: Fri Nov 2 14:19:37 2007 Subject: [Frugalware-git] fun: fund.c Message-ID: <20071102131937.2953E13A40D2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=36602735f61f4eca818da1e0bbf3529f69feb94d commit 36602735f61f4eca818da1e0bbf3529f69feb94d Author: Priyank Date: Fri Nov 2 18:47:57 2007 +0530 fund.c * fixed wrong argument diff --git a/src/fund.c b/src/fund.c index 0eed6ae..daaba2b 100644 --- a/src/fund.c +++ b/src/fund.c @@ -58,7 +58,7 @@ void updnotifierd_init(UpdNotifier *server) { return; } - dbus_g_object_type_install_info(updnotifierd_get_type(), &dbus_glib_updnotifierd_object_info); + dbus_g_object_type_install_info(updnotifierd_get_type(), &dbus_glib_fund_object_info); // Register DBUS path dbus_g_connection_register_g_object(server->connection, "/org/frugalware/UpdNotifier", G_OBJECT(server)); From priyank at frugalware.org Fri Nov 2 14:31:09 2007 From: priyank at frugalware.org (Priyank) Date: Fri Nov 2 14:31:11 2007 Subject: [Frugalware-git] fun: removed license from fund.h Message-ID: <20071102133109.5C20213A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=3348882445bde36c6739f9613ff6a81746e1f4d3 commit 3348882445bde36c6739f9613ff6a81746e1f4d3 Author: Priyank Date: Fri Nov 2 18:59:54 2007 +0530 removed license from fund.h diff --git a/src/fund.h b/src/fund.h index 6e44223..e38ef23 100644 --- a/src/fund.h +++ b/src/fund.h @@ -1,25 +1,3 @@ -/*************************************************************************** - * netconfigd.h - * Author(s): Alex Smith - * Copyright (C) 2007 Frugalware Developer Team - ****************************************************************************/ - -/* - * 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. - */ - #ifndef _FUND_H #define _FUND_H From crazy at frugalware.org Fri Nov 2 14:34:43 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 2 14:34:44 2007 Subject: [Frugalware-git] frugalware-current: faad2-2.6.1-1-i686 Message-ID: <20071102133443.4143013A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8378b5f4991bbb9b036b41b168091205e1690056 commit 8378b5f4991bbb9b036b41b168091205e1690056 Author: crazy Date: Fri Nov 2 14:34:08 2007 +0100 faad2-2.6.1-1-i686 * Version bump * added an patch to install libmp4ff * looks like some apps need that diff --git a/source/multimedia/faad2/FrugalBuild b/source/multimedia/faad2/FrugalBuild index bb2436c..48d8cef 100644 --- a/source/multimedia/faad2/FrugalBuild +++ b/source/multimedia/faad2/FrugalBuild @@ -2,25 +2,27 @@ # Maintainer: crazy pkgname=faad2 -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc="ISO AAC audio decoder" url="http://www.audiocoding.com/" _F_sourceforge_dirname="faac" _F_sourceforge_broken_up2date=1 Finclude sourceforge +source=($source install-libmp4ff.patch) depends=('libstdc++') -## we need this for now to not break everything :s rodepends=('libmp4v2') groups=('multimedia') archs=('i686' 'x86_64') makedepends=('libsndfile' 'id3lib' 'sysfsutils') -sha1sums=('6af7fb40fc063effd5cb6c43e0b372e77408a01a') +sha1sums=('b4ad33d3c4dfa6dbf3011a3da34c631926cabfad' \ + '9100ad20cfa684f3f546563ff0072f99968ca7cf') build() { Fcd $pkgname + Fpatchall Fautoreconf Fmake --with-drm Fmakeinstall diff --git a/source/multimedia/faad2/install-libmp4ff.patch b/source/multimedia/faad2/install-libmp4ff.patch new file mode 100644 index 0000000..33dd932 --- /dev/null +++ b/source/multimedia/faad2/install-libmp4ff.patch @@ -0,0 +1,23 @@ +diff -Naur faad2/common/mp4ff/Makefile.am faad2-libmp4ff/common/mp4ff/Makefile.am +--- faad2/common/mp4ff/Makefile.am 2006-05-07 20:09:00.000000000 +0200 ++++ faad2-libmp4ff/common/mp4ff/Makefile.am 2007-11-02 14:20:01.000000000 +0100 +@@ -1,4 +1,6 @@ +-noinst_LTLIBRARIES = libmp4ff.la ++lib_LTLIBRARIES = libmp4ff.la ++ ++include_HEADERS = mp4ff.h + + libmp4ff_la_CFLAGS = -DUSE_TAGGING=1 + +diff -Naur faad2/common/mp4ff/mp4ff.h faad2-libmp4ff/common/mp4ff/mp4ff.h +--- faad2/common/mp4ff/mp4ff.h 2007-11-01 13:33:29.000000000 +0100 ++++ faad2-libmp4ff/common/mp4ff/mp4ff.h 2007-11-02 14:19:30.000000000 +0100 +@@ -35,7 +35,7 @@ + extern "C" { + #endif /* __cplusplus */ + +-#include "mp4ff_int_types.h" ++#include + + /* file callback structure */ + typedef struct From vmiklos at frugalware.org Fri Nov 2 14:36:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 14:36:42 2007 Subject: [Frugalware-git] frugalware-current: b2evolution-1.10.3-1-i686 Message-ID: <20071102133640.3B80713A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=27565ab5253a8b561a8770bbf49c3cc0b5f2f649 commit 27565ab5253a8b561a8770bbf49c3cc0b5f2f649 Author: Miklos Vajna Date: Fri Nov 2 14:22:08 2007 +0100 b2evolution-1.10.3-1-i686 version bump diff --git a/source/network-extra/b2evolution/FrugalBuild b/source/network-extra/b2evolution/FrugalBuild index 605141b..4c42548 100644 --- a/source/network-extra/b2evolution/FrugalBuild +++ b/source/network-extra/b2evolution/FrugalBuild @@ -2,21 +2,21 @@ # Maintainer: VMiklos pkgname=b2evolution -pkgver=1.10.2 +pkgver=1.10.3 pkgrel=1 pkgdesc="A powerful blog tool you can install on your own website." _F_sourceforge_dirname="evocms" -_F_sourceforge_ext="-2007-06-08.zip" +_F_sourceforge_ext="-2007-11-01.zip" Finclude sourceforge url="http://b2evolution.net/" rodepends=('apache' 'php' 'mysql' 'webappconfig') depends=() groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://b2evolution.net/downloads/index.html|grep Stable|sed 's/ \+\([0-9.]*\) .*/\1/'" +up2date="lynx -dump http://b2evolution.net/downloads/index.html|grep Stable|sed 's/ \+\([0-9.]*\) .*/\1/;q'" backup=(var/www/b2evolution/blogs/conf/_basic_config.php) source=($source b2evosetup README.Frugalware) -sha1sums=('db548ee50248c134088aee829dab0c5daf6b25fb' \ +sha1sums=('88c706b8de1475c3f3ab4fde6919448d41256d22' \ '8341c7f3831489959840a5d0f5eb55c6afb6fc58' \ '3b1583125ff4604da9519c05675e2e7a310681cb') options=('stick') From crazy at frugalware.org Fri Nov 2 14:40:53 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 2 14:40:54 2007 Subject: [Frugalware-git] frugalware-current: xmms-aac-2.6.1-1-i686 Message-ID: <20071102134053.A98D913A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=36071af03608025554504455f0ad44a821a403f9 commit 36071af03608025554504455f0ad44a821a403f9 Author: crazy Date: Fri Nov 2 14:40:25 2007 +0100 xmms-aac-2.6.1-1-i686 * Version bump * new m8r diff --git a/source/xlib-extra/xmms-aac/FrugalBuild b/source/xlib-extra/xmms-aac/FrugalBuild index 45fb08e..ba901ce 100644 --- a/source/xlib-extra/xmms-aac/FrugalBuild +++ b/source/xlib-extra/xmms-aac/FrugalBuild @@ -1,19 +1,20 @@ # Compiling Time: 0.01 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Contributor: AlexExtreme pkgname=xmms-aac -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc="ISO AAC audio decoder plugin for xmms" _F_sourceforge_dirname="faac" _F_sourceforge_name="faad2" _F_sourceforge_broken_up2date=1 Finclude sourceforge -depends=('libstdc++' 'xmms' 'faad2>=2.6') +depends=('libstdc++' 'xmms' 'faad2>=2.6.1') groups=('xlib-extra') archs=('i686' 'x86_64') makedepends=('libsndfile' 'id3lib' 'sysfsutils') -sha1sums=('6af7fb40fc063effd5cb6c43e0b372e77408a01a') +sha1sums=('b4ad33d3c4dfa6dbf3011a3da34c631926cabfad') build() { From priyank at frugalware.org Fri Nov 2 14:42:10 2007 From: priyank at frugalware.org (Priyank) Date: Fri Nov 2 14:42:12 2007 Subject: [Frugalware-git] frugalware-current: dcraw-8.78-1-i686 Message-ID: <20071102134210.6F2C913A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6bd8e8802d7daa76dd7b2531812b01c5bb19a6d6 commit 6bd8e8802d7daa76dd7b2531812b01c5bb19a6d6 Author: Priyank Date: Fri Nov 2 19:08:46 2007 +0530 dcraw-8.78-1-i686 * Version bump diff --git a/source/apps-extra/dcraw/FrugalBuild b/source/apps-extra/dcraw/FrugalBuild index f2c4097..6b5c8c2 100644 --- a/source/apps-extra/dcraw/FrugalBuild +++ b/source/apps-extra/dcraw/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=dcraw -pkgver=8.77 +pkgver=8.78 pkgrel=1 pkgdesc="A command line based converter for raw digital photos." url="http://www.cybercom.net/~dcoffin/dcraw/" @@ -12,8 +12,8 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.cybercom.net/~dcoffin/dcraw/dcraw.c | grep -m1 VERSION | sed 's/.*N \"\(.*\).\"*/\1/'" source=($url/$pkgname.{c,1}) -sha1sums=('f8fc479af6a1cfd13fc239f3a6f35849c6cb3576' \ - '8d5177c206f7751750ff1e4b7a7ed9c0df6e1b05') +sha1sums=('73f8fb22162f3ee06bdda39b356ff3ff83836c7d' \ + 'd39d739fc0d2a92c227808f0d9aca3f976f2419c') build() { From vmiklos at frugalware.org Fri Nov 2 14:49:43 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 14:49:46 2007 Subject: [Frugalware-git] frugalware-current: star-1.5a87-1-i686 Message-ID: <20071102134944.0050A13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0bd27aca09ccae4e47f597ea2ed46addfadca9fd commit 0bd27aca09ccae4e47f597ea2ed46addfadca9fd Author: Miklos Vajna Date: Fri Nov 2 14:49:25 2007 +0100 star-1.5a87-1-i686 version bump diff --git a/source/apps-extra/star/FrugalBuild b/source/apps-extra/star/FrugalBuild index b568652..f4121ad 100644 --- a/source/apps-extra/star/FrugalBuild +++ b/source/apps-extra/star/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Michael Surette pkgname=star -pkgver=1.5a86 +pkgver=1.5a87 pkgrel=1 pkgdesc="very fast and Posix 1003.1 compliant tar" url="http://cdrecord.berlios.de/old/private/star.html" @@ -13,7 +13,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="elinks -dump ftp://ftp.berlios.de/pub/star/alpha |grep [0-9].tar.bz2|tail -n1|sed -e 's/.*star-//' -e 's/.tar.bz2//'" source=("ftp://ftp.berlios.de/pub/$pkgname/alpha/$pkgname-$pkgver.tar.bz2") -sha1sums=('a59ba08231cb1cc26d2bcc02ec26177c5dd54236') +sha1sums=('5f6cb97f075f7b44cdd8dd8b86ca1f5b1940c2ff') build() { From vmiklos at frugalware.org Fri Nov 2 15:04:59 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 15:05:02 2007 Subject: [Frugalware-git] frugalware-current: geoip-1.4.3-1-i686 Message-ID: <20071102140500.0156813A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8b7a7b15417455addccb19540ffa8525db976b45 commit 8b7a7b15417455addccb19540ffa8525db976b45 Author: Miklos Vajna Date: Fri Nov 2 15:04:55 2007 +0100 geoip-1.4.3-1-i686 version bump diff --git a/source/lib-extra/geoip/FrugalBuild b/source/lib-extra/geoip/FrugalBuild index 4f41502..b0c5a20 100644 --- a/source/lib-extra/geoip/FrugalBuild +++ b/source/lib-extra/geoip/FrugalBuild @@ -3,7 +3,7 @@ pkgname=geoip _F_archive_name=GeoIP -pkgver=1.4.0 +pkgver=1.4.3 pkgrel=1 pkgdesc="Easily lookup countries by IP addresses, even when Reverse DNS entries don't exist." url="http://www.maxmind.com/app/c" @@ -13,6 +13,7 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.maxmind.com/download/geoip/api/c/?M=D|Flasttar" source=(http://www.maxmind.com/download/geoip/api/c/$_F_archive_name-$pkgver.tar.gz) +sha1sums=('a363899448eb75813c17415a3aa6c6c8e0617bbf') build() { @@ -21,6 +22,4 @@ build() make DESTDIR=$Fdestdir install } - # optimization OK -sha1sums=('a108e33661db98a43a9c7334816c1dce6d759c46') From vmiklos at frugalware.org Fri Nov 2 15:23:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 15:23:25 2007 Subject: [Frugalware-git] frugalware-current: tools/fpm2db Message-ID: <20071102142324.826F413A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=14be4fcfe97e07f64146b53d91e9a9dafd8a6b1d commit 14be4fcfe97e07f64146b53d91e9a9dafd8a6b1d Author: Miklos Vajna Date: Fri Nov 2 15:21:52 2007 +0100 tools/fpm2db path quoting fixes diff --git a/tools/fpm2db b/tools/fpm2db index 692e162..9b4ea42 100755 --- a/tools/fpm2db +++ b/tools/fpm2db @@ -126,7 +126,7 @@ EOF elif key == "Description": # FIXME: we here hardcore the encoding of the FBs if not self.desc: - self.desc = "".join(line.split(' : ')[1:]).replace(r"'", r"\'").decode('latin1') + self.desc = "".join(line.split(' : ')[1:]).decode('latin1') elif key == "URL": self.url = "".join(line.split(' : ')[1:]) elif key == "Build Date": @@ -202,29 +202,28 @@ EOF for i in li: if i == "None": return - self.cursor.execute("""insert into %s (pkg_id, %s) - values ('%d', '%s');""" % (member, - member[:-1], self.id, i)) + self.cursor.execute("""insert into %s (pkg_id, %s) values (%%s, %%s);""" % (member, + member[:-1]), (self.id, i)) def insertgroups(self): for i in self.groups: # get the group id or insert it if necessary - self.cursor.execute("select id from groups where name = '%s' limit 1" % i) + self.cursor.execute("select id from groups where name = %s limit 1", (i)) row = self.cursor.fetchone() if row: gid = row['id'] else: - self.cursor.execute("insert into groups (name) values ('%s');" % (i)) + self.cursor.execute("insert into groups (name) values (%s);", (i)) self.cursor.execute("SELECT LAST_INSERT_ID()") row = self.cursor.fetchone() gid = row['LAST_INSERT_ID()'] # now link the pkg with this group self.cursor.execute("""insert into ct_groups (pkg_id, - group_id) values ('%d', '%d');""" % + group_id) values (%s, %s);""", (self.id, gid)) def dellist(self, member): - self.cursor.execute("delete from %s where pkg_id = %d" % (member, self.id)) + self.cursor.execute("delete from %s where pkg_id = %d" % (member, int(self.id))) def insertlistid(self, member): li = getattr(self, member) @@ -237,8 +236,8 @@ EOF else: ver=None # get the id of i - self.cursor.execute("""select id from packages where pkgname = '%s' - and arch = '%s' and fwver = '%s' limit 1""" % + self.cursor.execute("""select id from packages where pkgname = %s + and arch = %s and fwver = %s limit 1""", (i, self.arch, self.fwver)) row = self.cursor.fetchone() if row: @@ -248,12 +247,12 @@ EOF continue if not ver: self.cursor.execute("""insert into %s (pkg_id, - %s_id) values ('%d', '%d');""" % + %s_id) values (%s, %s);""" % (member, member[:-1], self.id, id)) else: self.cursor.execute("""insert into %s (pkg_id, - %s_id, version) values ('%d', '%d', '%s');""" % + %s_id, version) values (%s, %s, %s);""", (member, member[:-1], self.id, id, ver)) def insertlists(self): @@ -270,7 +269,7 @@ EOF def delete(self): # check if there is such a package & get the id self.cursor.execute("""select id from packages where pkgname = - '%s' and arch = '%s' and fwver = '%s'""" % + %s and arch = %s and fwver = %s""", (self.parent, self.arch, self.fwver)) row = self.cursor.fetchone() if row: @@ -279,7 +278,7 @@ EOF print 'WARNING: package %s not found, probably already deleted!' % (self.parent) return - self.cursor.execute("delete from packages where id = %d" % self.id) + self.cursor.execute("delete from packages where id = %d", self.id) self.dellists() def update(self): @@ -289,8 +288,8 @@ EOF if not self.updateable: print "Can't find the package!" return - self.cursor.execute("""select id, pkgver from packages where pkgname = '%s' - and arch = '%s' and fwver = '%s' limit 1""" % + self.cursor.execute("""select id, pkgver from packages where pkgname = %s + and arch = %s and fwver = %s limit 1""", (self.pkgname, self.arch, self.fwver)) row = self.cursor.fetchone() if row and row['pkgver'] == self.pkgver: @@ -298,19 +297,19 @@ EOF elif row: self.id = row['id'] # uploader_id and parent_id - self.cursor.execute("select id from uploaders where login = '%s' limit 1" % (self.uploader)) + self.cursor.execute("select id from uploaders where login = %s limit 1", (self.uploader)) row = self.cursor.fetchone() if row: self.uploader_id = row['id'] else: - self.cursor.execute("insert into uploaders (login) values ('%s');" % (self.uploader)) + self.cursor.execute("insert into uploaders (login) values (%s);", (self.uploader)) self.cursor.execute("SELECT LAST_INSERT_ID()") row = self.cursor.fetchone() self.uploader_id = row['LAST_INSERT_ID()'] if self.parent: - self.cursor.execute("""select id from packages where pkgname = '%s' - and arch = '%s' and fwver = '%s' limit 1""" % + self.cursor.execute("""select id from packages where pkgname = %s + and arch = %s and fwver = %s limit 1""", (self.parent, self.arch, self.fwver)) row = self.cursor.fetchone() if row: @@ -322,10 +321,10 @@ EOF insert into packages (pkgname, pkgver, `desc`, url, sha1sum, arch, size, usize, parent_id, maintainer, uploader_id, fwver, builddate) - VALUES ('%s', '%s', '%s', '%s', '%s', '%s', - '%d', '%d', '%d', '%s', '%d', - '%s', '%s'); - ''' % (self.pkgname, self.pkgver, self.desc, self.url, self.sha1sum, self.arch, + VALUES (%s, %s, %s, %s, %s, %s, + %s, %s, %s, %s, %s, + %s, %s); + ''', (self.pkgname, self.pkgver, self.desc, self.url, self.sha1sum, self.arch, self.size, self.usize, self.parent_id, self.maintainer, self.uploader_id, self.fwver, time.strftime("%Y-%m-%d %H:%M:%S", time.strptime(self.builddate)))) self.cursor.execute("SELECT LAST_INSERT_ID()") @@ -333,11 +332,11 @@ EOF self.id = row['LAST_INSERT_ID()'] self.insertlists() else: - self.cursor.execute(''' update packages set pkgname = '%s', - pkgver = '%s', `desc` = '%s', url = '%s', sha1sum = - '%s', arch = '%s', size = '%d', usize = '%d', parent_id - = '%d', maintainer = '%s', uploader_id = '%d', fwver = - '%s', builddate = '%s' where id = '%d' ''' % + self.cursor.execute(''' update packages set pkgname = %s, + pkgver = %s, `desc` = %s, url = %s, sha1sum = + %s, arch = %s, size = %s, usize = %s, parent_id + = %s, maintainer = %s, uploader_id = %s, fwver = + %s, builddate = %s where id = %s ''', (self.pkgname, self.pkgver, self.desc, self.url, self.sha1sum, self.arch, self.size, self.usize, self.parent_id, self.maintainer, self.uploader_id, From crazy at frugalware.org Fri Nov 2 15:24:21 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 2 15:24:24 2007 Subject: [Frugalware-git] frugalware-current: hal-info-20071030-1-i686 Message-ID: <20071102142421.767FC13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d24a6e92af42a8c12d4b5bdb435ce5f9c4da6eb3 commit d24a6e92af42a8c12d4b5bdb435ce5f9c4da6eb3 Author: crazy Date: Fri Nov 2 15:22:29 2007 +0100 hal-info-20071030-1-i686 * Version bump diff --git a/source/apps/hal-info/FrugalBuild b/source/apps/hal-info/FrugalBuild index 88dbf79..dbf598e 100644 --- a/source/apps/hal-info/FrugalBuild +++ b/source/apps/hal-info/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=hal-info -pkgver=20070618 +pkgver=20071030 pkgrel=1 pkgdesc="hal-info contains device information for HAL." url="http://www.freedesktop.org/wiki/Software/hal" @@ -10,7 +10,17 @@ 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) -## brr broken p*** of c**** -Fconfopts="$Fconfopts --datarootdir=/usr/share --datadir=/usr/share" -sha1sums=('0b586373cdf425180c9fe803b576fd7ca86c07c4') +source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz just_WARN.patch) +sha1sums=('844f599b300162b0f43ddb08606a7ab36caa6399' \ + '7c5b0fea8872c24767283be17a7cbd0ffcc143c1') + +build() +{ + Fcd + Fpatchall + Fautoreconf + Fmake \ + --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 new file mode 100644 index 0000000..2a95e04 --- /dev/null +++ b/source/apps/hal-info/just_WARN.patch @@ -0,0 +1,27 @@ +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 devil505linux at gmail.com Fri Nov 2 15:26:31 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 2 15:26:33 2007 Subject: [Frugalware-git] frugalware-current: twitux-0.50-1-i686 Message-ID: <20071102142631.D936213A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=38c30020bcd225890ff37334bfbf9a3d4a89052e commit 38c30020bcd225890ff37334bfbf9a3d4a89052e Author: Devil505 Date: Fri Nov 2 15:25:11 2007 +0100 twitux-0.50-1-i686 *New Package diff --git a/source/gnome-extra/twitux/FrugalBuild b/source/gnome-extra/twitux/FrugalBuild new file mode 100644 index 0000000..0ebfac9 --- /dev/null +++ b/source/gnome-extra/twitux/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling Time: 0.08 SBU +# Maintainer: Devil505 + +pkgname=twitux +pkgver=0.50 +pkgrel=1 +pkgdesc="A Twitter client for the Gnome desktop." +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://live.gnome.org/DanielMorales/Twitux" +depends=('libsexy' 'gconf' 'libsoup' 'libnotify' 'libxdamage') +makedepends=('perl-xml') +_F_gnome_desktop="y" +Finclude gnome-scriptlet +groups=('gnome-extra') +archs=('i686') +sha1sums=('3e9e6f93aa36db7dfcd712b30b3017c4e61de1e0') + +# optimization OK From vmiklos at frugalware.org Fri Nov 2 15:26:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 15:26:41 2007 Subject: [Frugalware-git] frugalware-current: libnxml-0.18.1-1-i686 Message-ID: <20071102142640.4E37A13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=625f22346d17af656786d92d214eedcae73d635c commit 625f22346d17af656786d92d214eedcae73d635c Author: Miklos Vajna Date: Fri Nov 2 15:26:28 2007 +0100 libnxml-0.18.1-1-i686 version bump diff --git a/source/lib-extra/libnxml/FrugalBuild b/source/lib-extra/libnxml/FrugalBuild index c70f24f..4eef240 100644 --- a/source/lib-extra/libnxml/FrugalBuild +++ b/source/lib-extra/libnxml/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=libnxml -pkgver=0.9 -pkgrel=2 +pkgver=0.18.1 +pkgrel=1 pkgdesc="nXML is a C library for parsing, writing and creating XML 1.0 and 1.1 files or streams." url="http://www2.autistici.org/bakunin/libnxml" depends=('openssl' 'curl>=7.16.0') @@ -11,6 +11,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |Flasttar" source=($url/libnxml-$pkgver.tar.gz) -sha1sums=('ad5d31af281069be38d7d5176441a18f1b04b70b') +sha1sums=('a158e759273e89d78675a1e35b05332ecac94b09') # optimization OK From vmiklos at frugalware.org Fri Nov 2 15:31:55 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 15:31:57 2007 Subject: [Frugalware-git] frugalware-current: tools/fpm2db: revert two unnecessary/double quoting Message-ID: <20071102143155.43BDE13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=370cd06ba4b373fd3394b5b92bc8d0bab93ee024 commit 370cd06ba4b373fd3394b5b92bc8d0bab93ee024 Author: Miklos Vajna Date: Fri Nov 2 15:31:50 2007 +0100 tools/fpm2db: revert two unnecessary/double quoting diff --git a/tools/fpm2db b/tools/fpm2db index 9b4ea42..2ba9d31 100755 --- a/tools/fpm2db +++ b/tools/fpm2db @@ -247,13 +247,13 @@ EOF continue if not ver: self.cursor.execute("""insert into %s (pkg_id, - %s_id) values (%s, %s);""" % - (member, member[:-1], self.id, + %s) values (%s, %s);""" % + (member, "%s_id" % member[:-1], self.id, id)) else: self.cursor.execute("""insert into %s (pkg_id, - %s_id, version) values (%s, %s, %s);""", - (member, member[:-1], self.id, id, ver)) + %s, version) values (%s, %s, %s);""", + (member, "%s_id" % member[:-1], self.id, id, ver)) def insertlists(self): for i in ["depends", "conflicts", "provides"]: From vmiklos at frugalware.org Fri Nov 2 15:34:54 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 15:34:56 2007 Subject: [Frugalware-git] frugalware-current: libmrss-0.18.0-1-i686 Message-ID: <20071102143454.CBDDB13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=30e5619eb68d3c1e71738296cd9a937e89d3835c commit 30e5619eb68d3c1e71738296cd9a937e89d3835c Author: Miklos Vajna Date: Fri Nov 2 15:34:48 2007 +0100 libmrss-0.18.0-1-i686 version bump diff --git a/source/lib-extra/libmrss/FrugalBuild b/source/lib-extra/libmrss/FrugalBuild index 6a97d7a..ab8d613 100644 --- a/source/lib-extra/libmrss/FrugalBuild +++ b/source/lib-extra/libmrss/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=libmrss -pkgver=0.9 -pkgrel=2 +pkgver=0.18.0 +pkgrel=1 pkgdesc="A C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams." url="http://www2.autistici.org/bakunin/libmrss/" depends=('libnxml>=0.9-2') @@ -11,5 +11,5 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |Flasttar" source=($url/libmrss-$pkgver.tar.gz) -sha1sums=('893fe4595c5db18a3bff1a55c56903c6fe71ef61') +sha1sums=('5818009906d481d6874ca9a208137fe7f929aa90') # optimization OK From vmiklos at frugalware.org Fri Nov 2 15:37:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 15:37:19 2007 Subject: [Frugalware-git] frugalware-current: tools/fpm2db: the previous fix was still problematic Message-ID: <20071102143718.2B49213A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7162f3227efab296f031338c7db9f441cc474d1 commit a7162f3227efab296f031338c7db9f441cc474d1 Author: Miklos Vajna Date: Fri Nov 2 15:37:15 2007 +0100 tools/fpm2db: the previous fix was still problematic diff --git a/tools/fpm2db b/tools/fpm2db index 2ba9d31..7aabae3 100755 --- a/tools/fpm2db +++ b/tools/fpm2db @@ -246,14 +246,13 @@ EOF # print "WARNING: can't find %s '%s'!" % (member, i) continue if not ver: - self.cursor.execute("""insert into %s (pkg_id, - %s) values (%s, %s);""" % - (member, "%s_id" % member[:-1], self.id, - id)) + self.cursor.execute("""insert into %%s (pkg_id, + %s_id) values (%%s, %%s);""" % member[:-1], + (member, self.id, id)) else: - self.cursor.execute("""insert into %s (pkg_id, - %s, version) values (%s, %s, %s);""", - (member, "%s_id" % member[:-1], self.id, id, ver)) + self.cursor.execute("""insert into %%s (pkg_id, + %s_id, version) values (%%s, %%s, %%s);""" % member[:-1], + (member, self.id, id, ver)) def insertlists(self): for i in ["depends", "conflicts", "provides"]: From crazy at frugalware.org Fri Nov 2 15:40:15 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 2 15:40:16 2007 Subject: [Frugalware-git] frugalware-current: hal-0.5.10-1-i686 Message-ID: <20071102144015.0DCF413A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6152040ffd27c164b819242afa4f279ec8d08e0 commit e6152040ffd27c164b819242afa4f279ec8d08e0 Author: crazy Date: Fri Nov 2 15:39:31 2007 +0100 hal-0.5.10-1-i686 * Version bump * as always removed / added patches * subpackage gone diff --git a/source/apps/hal/01-parted.patch b/source/apps/hal/01-parted.patch new file mode 100644 index 0000000..e6df31e --- /dev/null +++ b/source/apps/hal/01-parted.patch @@ -0,0 +1,34 @@ +diff -Naur hal-0.5.10/configure.in hal-0.5.10-p/configure.in +--- hal-0.5.10/configure.in 2007-09-25 17:47:27.000000000 +0200 ++++ hal-0.5.10-p/configure.in 2007-11-02 15:03:49.000000000 +0100 +@@ -244,7 +244,7 @@ + AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used]) + AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found])) + AC_CHECK_LIB(dl, dlopen, [], AC_MSG_ERROR([*** dl library (libdl) not found])) +- AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6, 1.8.7]) ++ AC_MSG_CHECKING([for libparted >= 1.7.1 or >= 1.8.0]) + LDFLAGS=-lparted + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include +@@ -258,18 +258,14 @@ + if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 ) + printf( "Found libparted %s", ped_get_version() ) ; + +- if ((major == 1 && minor == 7 && micro == 1) || +- (major == 1 && minor == 8 && micro == 0) || +- (major == 1 && minor == 8 && micro == 1) || +- (major == 1 && minor == 8 && micro == 2) || +- (major == 1 && minor == 8 && micro == 6) || +- (major == 1 && minor == 8 && micro == 7)) ++ if ((major == 1 && minor == 7 && micro >= 1) || ++ (major == 1 && minor == 8 && micro >= 0)) + return 0; + + return 1; + } + ]])], AC_MSG_RESULT([]), +- AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2/1.8.6 or 1.8.7])) ++ AC_MSG_ERROR([*** Requires libparted >= 1.7.1 or >= 1.8.0])) + PARTED_LIBS=-lparted + AC_SUBST(PARTED_LIBS) + LDFLAGS= diff --git a/source/apps/hal/FrugalBuild b/source/apps/hal/FrugalBuild index 636a247..40d10da 100644 --- a/source/apps/hal/FrugalBuild +++ b/source/apps/hal/FrugalBuild @@ -3,15 +3,15 @@ # Contributor: Christian Hamar alias krix pkgname=hal -pkgver=0.5.9.1 -pkgrel=2 +pkgver=0.5.10 +pkgrel=1 pkgdesc="Hardware Abstraction Layer" url="http://www.freedesktop.org/wiki/Software/hal" -depends=('dbus-glib>=0.71' 'udev>=100' 'glib2' 'libcap' 'dbus>=1.0.0' \ +depends=('dbus-glib>=0.74' 'udev>=100' 'glib2' 'libcap' 'dbus>=1.1.2' \ 'libusb' 'popt' 'pciutils' 'parted>=1.8.8' 'shadow>=4.0.18.1-2' \ 'dmidecode' 'usbutils' 'zlib') -makedepends=('pkgconfig' 'perl-xml' 'python>=2.5' 'intltool') -rodepends=('hal-info') +makedepends=('pkgconfig' 'perl-xml' 'intltool') +rodepends=('hal-info>=20071030') groups=('apps') replaces=('submount') options=('scriptlet') @@ -19,32 +19,23 @@ archs=('i686' 'x86_64') up2date="lynx -dump 'http://hal.freedesktop.org/releases/?C=M;O=A'|grep -v 'hal-info'|grep -v 'gnome'|grep -v PolicyKit|Flasttar" source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ rc.hald \ + 01-parted.patch \ hal.conf.in.patch \ hal-device-manager.desktop \ ntfs-3g.patch \ - hal-allow_uid_for_ntfs.diff \ - hal-performance_pci.ids_v5.diff \ - hal-0.5.9-parted.diff) -sha1sums=('fc29322a0beba73c2eab3e0a44f9b820a5fbccdd' \ + hal-performance_pci.ids_v5.diff) +sha1sums=('8d67499df61590c11fd3203004d69e8a45abb8fa' \ 'ab629a3ea7df51df48abad30731590b8e86e908f' \ + '1d411b592b781336c5ff7ca2b4a2ad208af5acbe' \ 'be12d1327ca93e1830c5784f395e904b107f1947' \ '0c4968cbb842bdae350901728d81eed9895445fa' \ '2273e77c0c3c52aca31294b2b1a829937d0a3c18' \ - '32cd5a5043b2f817dc1d59fc98d7382fbca8a7fe' \ - '654235977c83f76433f9737f37b8a18f04136b35' \ - '3e0f5e494715f4b8fcc903b8c0eafdaa2745422e') + '654235977c83f76433f9737f37b8a18f04136b35') -subpkgs=("$pkgname-device-manager") -subdescs=('GNOME based device manager for HAL') -subdepends=('python>=2.5') -subrodepends=("dbus-python pygtk gnome-python $pkgname=$pkgver") -subgroups=('gnome-extra') -subarchs=('i686 x86_64') build() { - - Fmkdir usr/share/applications + Fcd Fpatchall Fautoreconf #autoreconf -v -i -f -d --warnings=all || return 1 @@ -61,21 +52,18 @@ build() --with-macbookpro=no \ --prefix=/usr \ --datadir=/usr/share \ + --libexecdir=/usr/lib/$pkgname \ --disable-acpi-acpid \ --enable-acpi-proc \ - --enable-acl-management \ --with-os-type=Frugalware \ --with-backend=linux \ --host=${CHOST} \ --build=${CHOST} + # TODO: package pm-tools and libsmbios .. ### BLAHHHHHHHHHHHHH Fmakeinstall - Fexe /usr/share/applications/$pkgname-device-manager.desktop - Fsplit $pkgname-device-manager usr/share/hal/device-manager - Fsplit $pkgname-device-manager usr/share/applications - Fsplit $pkgname-device-manager usr/bin/hal-device-manager - Frm /etc/hotplug.d - Fmkdir /media + Frm /etc/hotplug.d + Fmkdir /media Frcd hald } diff --git a/source/apps/hal/hal-0.5.9-parted.diff b/source/apps/hal/hal-0.5.9-parted.diff deleted file mode 100644 index 28d4cae..0000000 --- a/source/apps/hal/hal-0.5.9-parted.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur hal-0.5.9.orig/configure.in hal-0.5.9/configure.in ---- hal-0.5.9.orig/configure.in 2007-04-03 06:36:44.000000000 +0200 -+++ hal-0.5.9/configure.in 2007-05-14 23:48:12.000000000 +0200 -@@ -193,7 +193,7 @@ - AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used]) - AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found])) - AC_CHECK_LIB(dl, dlopen, [], AC_MSG_ERROR([*** dl library (libdl) not found])) -- AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6]) -+ AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6, 1.8.7, 1.8.8]) - LDFLAGS=-lparted - AC_TRY_RUN( - #include -@@ -211,12 +211,14 @@ - (major == 1 && minor == 8 && micro == 0) || - (major == 1 && minor == 8 && micro == 1) || - (major == 1 && minor == 8 && micro == 2) || -- (major == 1 && minor == 8 && micro == 6)) -+ (major == 1 && minor == 8 && micro == 6) || -+ (major == 1 && minor == 8 && micro == 7) || -+ (major == 1 && minor == 8 && micro == 8)) - return 0; - - return 1; - } -- ,AC_MSG_RESULT( ),AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6]) ) -+ ,AC_MSG_RESULT( ),AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2/1.8.6/1.8.7 or 1.8.8]) ) - PARTED_LIBS=-lparted - AC_SUBST(PARTED_LIBS) - LDFLAGS= diff --git a/source/apps/hal/hal-allow_uid_for_ntfs.diff b/source/apps/hal/hal-allow_uid_for_ntfs.diff deleted file mode 100644 index 5d3d8ca..0000000 --- a/source/apps/hal/hal-allow_uid_for_ntfs.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c -index ef8d1a9..47412a8 100644 ---- a/tools/hal-storage-mount.c -+++ b/tools/hal-storage-mount.c -@@ -728,6 +728,7 @@ #endif - */ - if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 && - strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 && -+ strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 && - strcmp (libhal_volume_get_fstype (volume), "udf") != 0) { - pol_change_uid = wants_to_change_uid; - } diff --git a/source/apps/hal/hal.install b/source/apps/hal/hal.install index 9ecda1f..2023d8d 100644 --- a/source/apps/hal/hal.install +++ b/source/apps/hal/hal.install @@ -2,13 +2,13 @@ post_install() { if ! grep -q '^hald:' /etc/group; then - groupadd -g 39 hald + /usr/sbin/groupadd -g 39 hald fi if ! grep -q '^hald:' /etc/passwd; then - useradd -c 'HAL Daemon' -u 39 -g hald -G cdrom,floppy,camera,storage -d '/' -s /bin/false hald + /usr/sbin/useradd -c 'HAL Daemon' -u 39 -g hald -G cdrom,floppy,camera,storage -d '/' -s /bin/false hald ## kill password - passwd -l hald 2>/dev/null >/dev/null + /usr/bin/passwd -l hald 2>/dev/null >/dev/null fi if [ -x /usr/sbin/chkconfig ]; then From vmiklos at frugalware.org Fri Nov 2 15:44:49 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 15:44:50 2007 Subject: [Frugalware-git] frugalware-current: tools/fpm2db: hopefully the last fix Message-ID: <20071102144449.0F91B13A405F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88a9cd3796847ec8582992fb5e4770d246de78bb commit 88a9cd3796847ec8582992fb5e4770d246de78bb Author: Miklos Vajna Date: Fri Nov 2 15:44:33 2007 +0100 tools/fpm2db: hopefully the last fix diff --git a/tools/fpm2db b/tools/fpm2db index 7aabae3..c858f52 100755 --- a/tools/fpm2db +++ b/tools/fpm2db @@ -246,13 +246,13 @@ EOF # print "WARNING: can't find %s '%s'!" % (member, i) continue if not ver: - self.cursor.execute("""insert into %%s (pkg_id, - %s_id) values (%%s, %%s);""" % member[:-1], - (member, self.id, id)) + self.cursor.execute("""insert into %s (pkg_id, + %s_id) values (%%s, %%s);""" % (member, member[:-1]), + (self.id, id)) else: - self.cursor.execute("""insert into %%s (pkg_id, - %s_id, version) values (%%s, %%s, %%s);""" % member[:-1], - (member, self.id, id, ver)) + self.cursor.execute("""insert into %s (pkg_id, + %s_id, version) values (%%s, %%s, %%s);""" % (member, member[:-1]), + (self.id, id, ver)) def insertlists(self): for i in ["depends", "conflicts", "provides"]: From vmiklos at frugalware.org Fri Nov 2 15:44:48 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 15:44:51 2007 Subject: [Frugalware-git] frugalware-current: man-pages-fr-2.46.0-1-i686 Message-ID: <20071102144448.E11AB13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=038929e25213b6e5879d5fb4b9b14cd902a69aaf commit 038929e25213b6e5879d5fb4b9b14cd902a69aaf Author: Miklos Vajna Date: Fri Nov 2 15:43:32 2007 +0100 man-pages-fr-2.46.0-1-i686 version bump diff --git a/source/locale-extra/man-pages-fr/FrugalBuild b/source/locale-extra/man-pages-fr/FrugalBuild index 698c998..f59af8d 100644 --- a/source/locale-extra/man-pages-fr/FrugalBuild +++ b/source/locale-extra/man-pages-fr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=man-pages-fr -pkgver=2.43.0 +pkgver=2.46.0 pkgrel=1 pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" From devil505linux at gmail.com Fri Nov 2 15:45:48 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 2 15:45:49 2007 Subject: [Frugalware-git] frugalware-current: twitux-0.50-2-i686 Message-ID: <20071102144548.111B113A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07b0c77de4bf764bdcd1dd9566928ec6b13c1e95 commit 07b0c77de4bf764bdcd1dd9566928ec6b13c1e95 Author: Devil505 Date: Fri Nov 2 15:44:06 2007 +0100 twitux-0.50-2-i686 *Added scriptlet options, thx crazy diff --git a/source/gnome-extra/twitux/FrugalBuild b/source/gnome-extra/twitux/FrugalBuild index 0ebfac9..590179f 100644 --- a/source/gnome-extra/twitux/FrugalBuild +++ b/source/gnome-extra/twitux/FrugalBuild @@ -3,7 +3,7 @@ pkgname=twitux pkgver=0.50 -pkgrel=1 +pkgrel=2 pkgdesc="A Twitter client for the Gnome desktop." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 @@ -13,6 +13,7 @@ depends=('libsexy' 'gconf' 'libsoup' 'libnotify' 'libxdamage') makedepends=('perl-xml') _F_gnome_desktop="y" Finclude gnome-scriptlet +options=('scriptlet') groups=('gnome-extra') archs=('i686') sha1sums=('3e9e6f93aa36db7dfcd712b30b3017c4e61de1e0') From vmiklos at frugalware.org Fri Nov 2 15:49:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 15:49:14 2007 Subject: [Frugalware-git] frugalware-current: tools/fpm2db: and a fix for repoman clean Message-ID: <20071102144911.9758D1A6804D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7bd34397824d9081cba8c5a8a88068600537bde9 commit 7bd34397824d9081cba8c5a8a88068600537bde9 Author: Miklos Vajna Date: Fri Nov 2 15:48:43 2007 +0100 tools/fpm2db: and a fix for repoman clean diff --git a/tools/fpm2db b/tools/fpm2db index c858f52..ea2391b 100755 --- a/tools/fpm2db +++ b/tools/fpm2db @@ -277,7 +277,7 @@ EOF print 'WARNING: package %s not found, probably already deleted!' % (self.parent) return - self.cursor.execute("delete from packages where id = %d", self.id) + self.cursor.execute("delete from packages where id = %d" % self.id) self.dellists() def update(self): From vmiklos at frugalware.org Fri Nov 2 16:25:25 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 2 16:25:28 2007 Subject: [Frugalware-git] frugalware-current: man-pages-extras-fr-0.7.3-1-i686 Message-ID: <20071102152525.8817A13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=adbc8117995326e26d893dca3b92341e57a0f14f commit adbc8117995326e26d893dca3b92341e57a0f14f Author: Miklos Vajna Date: Fri Nov 2 16:25:11 2007 +0100 man-pages-extras-fr-0.7.3-1-i686 version bump diff --git a/source/locale-extra/man-pages-extras-fr/FrugalBuild b/source/locale-extra/man-pages-extras-fr/FrugalBuild index 6c62ff9..0041db9 100644 --- a/source/locale-extra/man-pages-extras-fr/FrugalBuild +++ b/source/locale-extra/man-pages-extras-fr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=man-pages-extras-fr -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" From crazy at frugalware.org Fri Nov 2 19:14:44 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 2 19:14:46 2007 Subject: [Frugalware-git] frugalware-current: qt4-4.3.2-1-i686 Message-ID: <20071102181444.0150E13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af06fc578f96f3383c1a8c8c88beb13a47ba1dd3 commit af06fc578f96f3383c1a8c8c88beb13a47ba1dd3 Author: crazy Date: Fri Nov 2 18:59:51 2007 +0100 qt4-4.3.2-1-i686 * Version bump * synced patches with qt4-copy * this is last time the bump is done that way * next ver/rel bump will have everything split off diff --git a/source/kde-extra/qt4/FrugalBuild b/source/kde-extra/qt4/FrugalBuild index f92231b..7f0a484 100644 --- a/source/kde-extra/qt4/FrugalBuild +++ b/source/kde-extra/qt4/FrugalBuild @@ -3,8 +3,8 @@ pkgname=qt4 origname=qt -pkgver=4.3.1 -pkgrel=3 +pkgver=4.3.2 +pkgrel=1 pkgmore=x11-opensource-src pkgdesc="The QT4 GUI toolkit." url="http://www.trolltech.com/products/qt" @@ -17,8 +17,7 @@ archs=('i686' 'x86_64') options=('nodocs' 'scriptlet') 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-r716585.tar.bz2 \ - CVE-2007-4137.patch \ + http://ftp.frugalware.org/pub/other/sources/kde/qt4/patches-r732042.tar.bz2 \ assistant4.desktop designer4.desktop linguist4.desktop qt4config.desktop \ dummy.patch qt4.sh.off Trolltech.conf apply_patches) @@ -28,6 +27,9 @@ export PATH=${QTDIR}/bin:${PATH} export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} export YACC='yacc -d' +## corelib gui network opengl qt3support +## script sql svg tools xml + subpkgs=("$pkgname-docs") subdescs=('QT4 Documentation.') subdepends=() @@ -39,8 +41,8 @@ build() Fcd $origname-$pkgmore-$pkgver Fpatchall Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing -Wno-deprecated" mkspecs/common/g++.conf - mv $Fsrcdir/{patches-r716585,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie - mv patches-r716585 patches || Fdie + mv $Fsrcdir/{patches-r732042,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie + mv patches-r732042 patches || Fdie #echo "0118" >> patches/DISABLED || Fdie #echo "0176" >> patches/DISABLED || Fdie #echo "0177" >> patches/DISABLED || Fdie @@ -121,9 +123,8 @@ build() ln -sf linux-g++ default || Fdie } -sha1sums=('ca59cfdcfc390cf16c6e6b503546e8bb2cc8e1e2' \ - 'fdffe57818a2a7c7252f9a295a3f8744cd7d9895' \ - 'bc00ca6a74edde2a8536988b47e75cc68cb0cb25' \ +sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \ + 'f30fcd8715ee711956ba51387b441d71eaef05dc' \ '991ed0d2f047e0ead54efc050c652595b7bed00b' \ '19281b54674d4071a3814200fd8a64e097ece2e8' \ '410b18b9a496cf551f7ff6cb282c719c874bc883' \ From priyank at frugalware.org Fri Nov 2 19:31:58 2007 From: priyank at frugalware.org (Priyank) Date: Fri Nov 2 19:32:03 2007 Subject: [Frugalware-git] frugalware-current: gnome-mplayer-0.5.2-1-i686 Message-ID: <20071102183158.B462F13A405F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eed957b5b4c055f4081a813192f26a1957a33413 commit eed957b5b4c055f4081a813192f26a1957a33413 Author: Priyank Date: Fri Nov 2 23:59:55 2007 +0530 gnome-mplayer-0.5.2-1-i686 * Version bump diff --git a/source/gnome-extra/gnome-mplayer/FrugalBuild b/source/gnome-extra/gnome-mplayer/FrugalBuild index 7a78669..7f481cc 100644 --- a/source/gnome-extra/gnome-mplayer/FrugalBuild +++ b/source/gnome-extra/gnome-mplayer/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: detto pkgname=gnome-mplayer -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="A media player for GNOME that uses MPlayer." url="http://dekorte.homeip.net/download/gnome-mplayer" @@ -13,7 +13,7 @@ options=('scriptlet') depends=('libgnomeui' 'mplayer') up2date="lynx -dump $url | grep ".tar.gz" -m1 | cut -d '-' -f4 | sed -n 's|.tar.gz||p'" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('514791f5eef56a738e2465be0e92708a69efc4cb') +sha1sums=('b696ff065d1a9416f088ac63c0d2af41c4376e1c') _F_gnome_schemas=('/etc/gconf/schemas/gnome-mplayer.schemas') Finclude gnome-scriptlet From crazy at frugalware.org Fri Nov 2 20:54:54 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 2 20:54:58 2007 Subject: [Frugalware-git] frugalware-current: kde-theme-qtcurve-0.55.1-1-i686 Message-ID: <20071102195454.78FF113A405F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ee425446467df68ba9649f526bd3444571b2d5d5 commit ee425446467df68ba9649f526bd3444571b2d5d5 Author: crazy Date: Fri Nov 2 20:54:03 2007 +0100 kde-theme-qtcurve-0.55.1-1-i686 * and the missing part .. diff --git a/source/kde/kde-theme-qtcurve/FrugalBuild b/source/kde/kde-theme-qtcurve/FrugalBuild index 6019c1b..4299a57 100644 --- a/source/kde/kde-theme-qtcurve/FrugalBuild +++ b/source/kde/kde-theme-qtcurve/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: crazy pkgname=kde-theme-qtcurve -pkgver=0.54.0 +pkgver=0.55.1 pkgrel=1 pkgdesc="KDE QtCurve Theme" depends=('kdelibs>=3.5.8') -makedepends=('gtk+2>=2.12.1' 'freetype2') +makedepends=('gtk+2>=2.12.1' 'freetype2' 'cmake') groups=('kde') archs=('i686' 'x86_64') _F_kde_id2="40492" @@ -14,6 +14,8 @@ options=('force') Finclude kde source=(http://home.freeuk.com/cpdrummond/{QtCurve-KDE3,QtCurve-Gtk2}-$pkgver.tar.bz2) up2date="lynx -dump 'http://www.kde-look.org/content/show.php?content=40492'|grep 'Source download'| grep 'KDE 3'|sed 's/.*- \(.*\).*)/\1/'" +sha1sums=('330b7784ee969b14eb36eb12a6b43c86cbc28503' \ + '33dec172db7a924739706ef67be72a2b61d9b6c2') subpkgs=('qtcurve-gtk2') subconflicts=('qtcurve-gtk') From crazy at frugalware.org Fri Nov 2 20:54:54 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 2 20:54:59 2007 Subject: [Frugalware-git] frugalware-current: kde-theme-qtcurve-0.55.1-1-i686 Message-ID: <20071102195454.50A4413A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b194e2246d89f9423b98f342c64dd372a2d8c0f2 commit b194e2246d89f9423b98f342c64dd372a2d8c0f2 Author: crazy Date: Fri Nov 2 20:51:39 2007 +0100 kde-theme-qtcurve-0.55.1-1-i686 * Version bump ( again ) * works here on gnome and kde * please don't bug me about nvidia bugs, * poke nvidia folks kthx diff --git a/source/kde/kde-theme-qtcurve/FrugalBuild b/source/kde/kde-theme-qtcurve/FrugalBuild index 6410934..6019c1b 100644 --- a/source/kde/kde-theme-qtcurve/FrugalBuild +++ b/source/kde/kde-theme-qtcurve/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=kde-theme-qtcurve -pkgver=0.53 -pkgrel=3 +pkgver=0.54.0 +pkgrel=1 pkgdesc="KDE QtCurve Theme" depends=('kdelibs>=3.5.8') makedepends=('gtk+2>=2.12.1' 'freetype2') @@ -12,8 +12,7 @@ archs=('i686' 'x86_64') _F_kde_id2="40492" options=('force') Finclude kde -source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/kde/$pkgname/{QtCurve-KDE3,QtCurve-Gtk2}-$pkgver.tar.gz \ - admin_fix.patch) +source=(http://home.freeuk.com/cpdrummond/{QtCurve-KDE3,QtCurve-Gtk2}-$pkgver.tar.bz2) up2date="lynx -dump 'http://www.kde-look.org/content/show.php?content=40492'|grep 'Source download'| grep 'KDE 3'|sed 's/.*- \(.*\).*)/\1/'" subpkgs=('qtcurve-gtk2') @@ -27,21 +26,38 @@ subarchs=('i686 x86_64') build() { + c_build() + { + mkdir build || Fdie + cd build || Fdie + } + Fcd QtCurve-Gtk2-$pkgver - Fmake --enable-mozilla-userjs - Fmakeinstall + c_build + cmake .. \ + -DLIBINSTALL_DIR=/usr/lib \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_COLOR_MAKEFILE=Off \ + -DCMAKE_VERBOSE_MAKEFILE=On \ + -DQTC_ADD_EVENT_FILTER=true \ + -DQTC_MODIFY_MOZILLA=false \ + -DQTC_MODIFY_MOZILLA_USER_JS=false \ + || Fdie + make || Fdie + make DESTDIR=$Fdestdir install || Fdie Fsplit qtcurve-gtk2 /usr - cd ../QtCurve-KDE3-$pkgver - Fpatch admin_fix.patch - make -f admin/Makefile.common cvs || Fdie - Fmake \ - --disable-debug --without-debug \ - --disable-dependency-tracking \ - --enable-tab-mouse-over - Fmakeinstall + cd $Fsrcdir/QtCurve-KDE3-$pkgver || Fdie + c_build + cmake .. \ + -DLIBINSTALL_DIR=/usr/lib \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_COLOR_MAKEFILE=Off \ + -DCMAKE_VERBOSE_MAKEFILE=On \ + || Fdie + make || Fdie + make DESTDIR=$Fdestdir install || Fdie } -sha1sums=('38375805b5f47c88eb8e73052feba2ee171e5fae' \ - 'c1a3a61dd46f1b046b61e65ccd2f07098ba0c4ff' \ - '5f99980cc75133c5a8c0b9ebc533aad6b257337d') # optimization OK diff --git a/source/kde/kde-theme-qtcurve/admin_fix.patch b/source/kde/kde-theme-qtcurve/admin_fix.patch deleted file mode 100644 index e308e54..0000000 --- a/source/kde/kde-theme-qtcurve/admin_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp QtCurve-KDE3-0.46/admin/cvs.sh QtCurve-KDE3-0.46-p/admin/cvs.sh ---- QtCurve-KDE3-0.46/admin/cvs.sh 2006-11-05 18:44:45.000000000 +0100 -+++ QtCurve-KDE3-0.46-p/admin/cvs.sh 2006-11-29 16:43:15.000000000 +0100 -@@ -70,7 +70,7 @@ case $AUTOMAKE_STRING in - echo "*** KDE requires automake $required_automake_version" - exit 1 - ;; -- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) : ;; -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* ) : ;; - "" ) - echo "*** AUTOMAKE NOT FOUND!." - echo "*** KDE requires automake $required_automake_version" From hermier at frugalware.org Fri Nov 2 22:13:51 2007 From: hermier at frugalware.org (Michel Hermier) Date: Fri Nov 2 22:13:53 2007 Subject: [Frugalware-git] pacman-g2: pacman-g2 Message-ID: <20071102211351.7854613A405F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7c75056db634265f456f97371bd37f2ecd00788c commit 7c75056db634265f456f97371bd37f2ecd00788c Author: Michel Hermier Date: Fri Nov 2 22:09:35 2007 +0100 pacman-g2 * Partial fix for out of the source builds (documentation still fails). * Moved an LDFLAGS from _LDADD to _LDFLAGS, sounds more logical. diff --git a/Makefile.am b/Makefile.am index fa1442a..f47e77c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib/libftp lib/libpacman src/vercmp src/pacman-g2 scripts doc doc/hu etc +SUBDIRS = lib/libftp lib/libpacman src/vercmp src/versort src/pacman-g2 scripts doc doc/hu etc if HAS_PERL SUBDIRS += bindings/perl diff --git a/lib/libpacman/Makefile.am b/lib/libpacman/Makefile.am index 25e2d38..514966a 100644 --- a/lib/libpacman/Makefile.am +++ b/lib/libpacman/Makefile.am @@ -39,7 +39,7 @@ include_HEADERS = pacman.h libpacman_la_SOURCES = $(TARGETS) libpacman_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO) -libpacman_la_LIBADD = $(top_srcdir)/lib/libftp/libftp.la +libpacman_la_LIBADD = $(top_builddir)/lib/libftp/libftp.la if HAS_DOXYGEN all: doxygen.in diff --git a/src/pacman-g2/Makefile.am b/src/pacman-g2/Makefile.am index 839b558..3eed4ad 100644 --- a/src/pacman-g2/Makefile.am +++ b/src/pacman-g2/Makefile.am @@ -18,12 +18,12 @@ pacman_g2_SOURCES = util.c log.c list.c package.c download.c trans.c add.c \ pacman_g2_static_SOURCES = $(pacman_g2_SOURCES) pacman_g2_LDADD = \ - $(top_srcdir)/lib/libpacman/libpacman.la + $(top_builddir)/lib/libpacman/libpacman.la -pacman_g2_static_LDADD = \ - $(top_srcdir)/lib/libpacman/.libs/libpacman.a $(LDFLAGS) +pacman_g2_static_LDADD = $(pacman_g2_LDADD) -pacman_g2_static_LDFLAGS = -all-static +pacman_g2_static_LDFLAGS = -all-static $(LDFLAGS) install-exec-hook: ln -s pacman-g2 $(DESTDIR)$(bindir)/pacman + diff --git a/src/vercmp/Makefile.am b/src/vercmp/Makefile.am index cd247a1..fcdc9c3 100644 --- a/src/vercmp/Makefile.am +++ b/src/vercmp/Makefile.am @@ -6,5 +6,6 @@ AM_CFLAGS = \ vercmp_SOURCES = vercmp.c -vercmp_LDADD = $(top_srcdir)/lib/libpacman/libpacman.la \ - $(top_srcdir)/lib/libftp/libftp.la +vercmp_LDADD = \ + $(top_builddir)/lib/libpacman/libpacman.la \ + $(top_builddir)/lib/libftp/libftp.la From hermier at frugalware.org Fri Nov 2 22:13:51 2007 From: hermier at frugalware.org (Michel Hermier) Date: Fri Nov 2 22:13:55 2007 Subject: [Frugalware-git] pacman-g2: ftplib: Don't use src == dest in some sprintf. Message-ID: <20071102211351.50FE613A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=08ba88e6f81b5537140e7853c81a4c8a6cfecd83 commit 08ba88e6f81b5537140e7853c81a4c8a6cfecd83 Author: Michel Hermier Date: Sun Sep 9 09:06:13 2007 +0200 ftplib: Don't use src == dest in some sprintf. diff --git a/lib/libftp/ftplib.c b/lib/libftp/ftplib.c index cbe3d70..f19d926 100644 --- a/lib/libftp/ftplib.c +++ b/lib/libftp/ftplib.c @@ -1517,23 +1517,30 @@ GLOBALREF int HttpGet(const char *host, const char *outputfile, const char *path int *size, netbuf *nControl, unsigned int offset, const struct tm *mtime1, struct tm *mtime2) { - char buf[512]; + char buf[512], tmp[512]; + + snprintf(buf, sizeof(buf), "GET %s HTTP/1.1\r\nHost: %s\r\n", path, host); - sprintf(buf, "GET %s HTTP/1.1\r\nHost: %s\r\n", path, host); if (offset > 0) - sprintf(buf, "%sRange: bytes=%d-\r\n", buf, offset); + { + snprintf(tmp, sizeof(tmp); "Range: bytes=%d-\r\n", offset); + strncat(buf, tmp, sizeof(buf)-strlen(buf)-1); + } + if (mtime1 && mtime1->tm_year) { char mtime[30]; /* Format: * "If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT\r\n" */ strftime(mtime, sizeof(mtime), "%a, %d %b %Y %H:%M:%S GMT", mtime1); - sprintf(buf, "%sIf-Modified-Since: %s\r\n", buf, mtime); + snprintf(tmp, sizeof(tmp), "If-Modified-Since: %s\r\n", mtime); + strncat(buf, tmp, sizeof(buf)-strlen(buf)-1); } - if(strlen(buf)+3 > sizeof(buf)) + + strncat(buf, "\r\n", sizeof(buf)); + + if(strlen(buf) == sizeof(buf)-1) return(0); - else - strcat(buf, "\r\n"); if (!HttpSendCmd(buf,'2',nControl)) { From hermier at frugalware.org Fri Nov 2 22:13:51 2007 From: hermier at frugalware.org (Michel Hermier) Date: Fri Nov 2 22:13:55 2007 Subject: [Frugalware-git] pacman-g2: pacman-g2 Message-ID: <20071102211351.ABBFF1A6804D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=764627df689e63a41b70c6012888fa5902087967 commit 764627df689e63a41b70c6012888fa5902087967 Author: Michel Hermier Date: Fri Nov 2 22:12:07 2007 +0100 pacman-g2 * Add versort. diff --git a/configure.ac b/configure.ac index daef86c..6f77386 100644 --- a/configure.ac +++ b/configure.ac @@ -425,6 +425,7 @@ lib/libftp/Makefile src/pacman-g2/Makefile src/pacman-g2/po/Makefile.in src/vercmp/Makefile +src/versort/Makefile scripts/Makefile doc/Makefile doc/hu/Makefile diff --git a/src/versort/Makefile.am b/src/versort/Makefile.am new file mode 100644 index 0000000..6e2007d --- /dev/null +++ b/src/versort/Makefile.am @@ -0,0 +1,10 @@ +bin_PROGRAMS = versort + +AM_CFLAGS = \ + -I$(top_srcdir)/lib/libpacman \ + -I$(top_srcdir)/src/pacman-g2 + +versort_SOURCES = versort.c + +versort_LDADD = $(top_builddir)/lib/libpacman/libpacman.la \ + $(top_builddir)/lib/libftp/libftp.la diff --git a/src/versort/versort.c b/src/versort/versort.c new file mode 100644 index 0000000..54d9cce --- /dev/null +++ b/src/versort/versort.c @@ -0,0 +1,137 @@ +/* + * versort.c + * + * Copyright (c) 2007 by Michel Hermier + * + * 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. + */ + +#include + +#include +#include +#include +#include + +#define BUFFER_CHUNK 4096 + +static char *buffer = NULL; +static size_t buffer_nmemb = 0; +static size_t buffer_size = 0; + +static char **index = NULL; +static size_t index_nmemb = 0; +static size_t index_size = 0; + +static void readfd(int fd) +{ + size_t buffer_read = 0; + ssize_t buffer_left = -1; // Extra '\0' at the end. + + do { + buffer_nmemb += buffer_read; + buffer_left -= buffer_read; + + if (buffer_left <= 0) { + buffer_size += BUFFER_CHUNK; + buffer_left += BUFFER_CHUNK; + buffer = realloc(buffer, buffer_size * sizeof(char)); + if (!buffer) + exit(EXIT_FAILURE); + } + } while((buffer_read = read(fd, &buffer[buffer_nmemb], buffer_left)) > 0); + + if (buffer_read == -1) + { + perror("read"); + exit(EXIT_FAILURE); + } + + buffer[buffer_nmemb] = '\0'; +} + +#define STATUS_MARK 0 +#define STATUS_SEARCH 1 + +static void makeindex() +{ + size_t tmp_index = 0; + int status = STATUS_MARK; + + if (buffer_nmemb > 0) + { + while(tmp_index != buffer_nmemb) + { + if (tmp_index == index_size) { + index_size += BUFFER_CHUNK; + index = realloc(index, index_size * sizeof(char *)); + if (!index) + exit(EXIT_FAILURE); + } + + switch (status) + { + case STATUS_MARK: // Mark a new buffer + index[index_nmemb] = &buffer[tmp_index]; + ++index_nmemb; + status = STATUS_SEARCH; + break; + case STATUS_SEARCH: + switch(buffer[tmp_index]) + { + case '\n': + // Seek for \r if needed + buffer[tmp_index] = '\0'; + // Intentional fall down + case '\0': + status = STATUS_MARK; + } + break; + } + ++tmp_index; + } + } +} + +static void printindex() +{ + size_t i; + + for (i = 0; i < index_nmemb; i++) + puts(index[i]); +} + +static int vercmpp(const void *p1, const void *p2) +{ + return pacman_pkg_vercmp(*(const char **)p1, *(const char **)p2); +} + +int main(int argc, char *argv[]) +{ + + readfd(0); //stdin + + makeindex(); + + qsort(index, index_nmemb, sizeof(char *), vercmpp); + + printindex(); + + free(index); + free(buffer); + + exit(EXIT_SUCCESS); +} From janny at frugalware.org Fri Nov 2 22:38:13 2007 From: janny at frugalware.org (janny) Date: Fri Nov 2 22:38:14 2007 Subject: [Frugalware-git] frugalware-current: gdal-1.4.3-1-i686 Message-ID: <20071102213813.0D38D13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e4636258130989a167816354f3dcf7aafce74d3 commit 9e4636258130989a167816354f3dcf7aafce74d3 Author: janny Date: Fri Nov 2 22:29:35 2007 +0100 gdal-1.4.3-1-i686 version bump diff --git a/source/apps-extra/gdal/FrugalBuild b/source/apps-extra/gdal/FrugalBuild index 0663a02..57aff9c 100644 --- a/source/apps-extra/gdal/FrugalBuild +++ b/source/apps-extra/gdal/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=gdal -pkgver=1.4.2 +pkgver=1.4.3 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=('42fc753f6fa70a66b9e619365575bcfb60a5003d') +sha1sums=('2d3251dfdfc38270c0d9c30f2475b6767b09b1ab') build() { Fbuild --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin \ From boobaa at frugalware.org Fri Nov 2 23:06:00 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Nov 2 23:06:03 2007 Subject: [Frugalware-git] frugalware-current: k3b-1.0.4-1-i686 Message-ID: <20071102220600.E324E13A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=40409232dd2ffbe283d34c6c405b48d5f105dc5d commit 40409232dd2ffbe283d34c6c405b48d5f105dc5d Author: CSÉCSY László Date: Fri Nov 2 23:05:53 2007 +0100 k3b-1.0.4-1-i686 version bump diff --git a/source/kde/k3b/FrugalBuild b/source/kde/k3b/FrugalBuild index fad6637..5cd9a99 100644 --- a/source/kde/k3b/FrugalBuild +++ b/source/kde/k3b/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: CSÉCSY László pkgname=k3b -pkgver=1.0.3 -pkgrel=2 +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' \ @@ -21,5 +21,5 @@ options=('scriptlet') Fconfopts="$Fconfopts --enable-mt" # optimization OK -sha1sums=('cf9eee45eebd280a069c7f94924237bdec6bbd06'\ +sha1sums=('c420c6ca3a1f7405081a85014ef3e3f70e269223'\ '8704ffb71684abde5b8288054ae25fda386244cc') From crazy at frugalware.org Fri Nov 2 23:07:01 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 2 23:07:04 2007 Subject: [Frugalware-git] frugalware-current: kde-theme-qtcurve-0.55.1-2-i686 Message-ID: <20071102220701.0814313A405D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07e49fdc417e2b768eb9b8f09eeeca6fdadc7f5b commit 07e49fdc417e2b768eb9b8f09eeeca6fdadc7f5b Author: crazy Date: Fri Nov 2 23:05:49 2007 +0100 kde-theme-qtcurve-0.55.1-2-i686 * relbump * disbaled *EVENT_FILTER* stuff , it seems to * segfaults apps on some system :/ diff --git a/source/kde/kde-theme-qtcurve/FrugalBuild b/source/kde/kde-theme-qtcurve/FrugalBuild index 4299a57..b7b4c96 100644 --- a/source/kde/kde-theme-qtcurve/FrugalBuild +++ b/source/kde/kde-theme-qtcurve/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kde-theme-qtcurve pkgver=0.55.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE QtCurve Theme" depends=('kdelibs>=3.5.8') makedepends=('gtk+2>=2.12.1' 'freetype2' 'cmake') @@ -42,7 +42,7 @@ build() -DCMAKE_BUILD_TYPE=None \ -DCMAKE_COLOR_MAKEFILE=Off \ -DCMAKE_VERBOSE_MAKEFILE=On \ - -DQTC_ADD_EVENT_FILTER=true \ + -DQTC_ADD_EVENT_FILTER=false \ -DQTC_MODIFY_MOZILLA=false \ -DQTC_MODIFY_MOZILLA_USER_JS=false \ || Fdie From boobaa at frugalware.org Fri Nov 2 23:13:23 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Nov 2 23:13:26 2007 Subject: [Frugalware-git] frugalware-current: k3b-i18n-1.0.4-1-i686 Message-ID: <20071102221323.68E3B13A8010@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2598a68e8ccf96c134307b26b42a2fd1bad528a2 commit 2598a68e8ccf96c134307b26b42a2fd1bad528a2 Author: CSÉCSY László Date: Fri Nov 2 23:12:59 2007 +0100 k3b-i18n-1.0.4-1-i686 version bump diff --git a/source/locale-extra/k3b-i18n/FrugalBuild b/source/locale-extra/k3b-i18n/FrugalBuild index 70241b6..352ace5 100644 --- a/source/locale-extra/k3b-i18n/FrugalBuild +++ b/source/locale-extra/k3b-i18n/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=k3b-i18n -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="Localization for k3b, the cd kreator" url="http://www.k3b.org/" @@ -13,4 +13,4 @@ _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="k3b" Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=26138'|grep -m1 'k3b-i18n-'|sed 's/.*i18n-\(.*\).t.* .*/\1/'" -sha1sums=('7904774f0944aa2f388392e4623079a7082157bc') +sha1sums=('e111ba113c2ff47730bc5cb4a7f6f88911bc2b94') From boobaa at frugalware.org Fri Nov 2 23:19:41 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Nov 2 23:19:43 2007 Subject: [Frugalware-git] frugalware-current: bibletime-1.6.4-1-i686 Message-ID: <20071102221941.9817613A8010@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39fbf99bfb5ef04025195daa3fae9cc278eb8ced commit 39fbf99bfb5ef04025195daa3fae9cc278eb8ced Author: CSÉCSY László Date: Fri Nov 2 23:19:22 2007 +0100 bibletime-1.6.4-1-i686 version bump diff --git a/source/kde-extra/bibletime/FrugalBuild b/source/kde-extra/bibletime/FrugalBuild index bcb1e36..95d6a93 100644 --- a/source/kde-extra/bibletime/FrugalBuild +++ b/source/kde-extra/bibletime/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Bence Nagy pkgname=bibletime -pkgver=1.6.3b -pkgrel=2 +pkgver=1.6.4 +pkgrel=1 pkgdesc="Bible study software for KDE" depends=('libxi' 'libxmu' 'sword' 'qt' 'kdelibs' 'clucene') groups=('kde-extra') @@ -16,4 +16,4 @@ Finclude sourceforge kde url='http://www.bibletime.info' # optimization OK -sha1sums=('d16b9641d692dff39e3f2a2e09793fbaf80fdd4c') +sha1sums=('22fc0495891ddcf2574fff5254a1a7745bb521cc') From voroskoi at frugalware.org Sat Nov 3 00:09:56 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 3 00:09:59 2007 Subject: [Frugalware-git] frugalware-current: r8169-6.003.00-1-i686 Message-ID: <20071102230957.1157913A8010@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c212345195d55e4ccb4596d21d5b3b9d4c522318 commit c212345195d55e4ccb4596d21d5b3b9d4c522318 Author: voroskoi Date: Sat Nov 3 00:09:46 2007 +0100 r8169-6.003.00-1-i686 new package diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild new file mode 100644 index 0000000..fa63ee9 --- /dev/null +++ b/source/network-extra/r8169/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling Time: 0.01 SBU +# Maintainer: voroskoi + +pkgname=r8169 +pkgver=6.003.00 +pkgrel=1 +Finclude sourceforge kernel-module +pkgdesc="Realtek driver for RTL8169/8110 cards." +url="http://www.realtek.com.tw" +groups=('network-extra') +archs=('i686' 'x86_64') +# remove after 0.8 +replaces=('rtl8110') +up2date="lynx -dump ftp://202.65.194.211/cn/nic/ |grep ${pkgname} |Flasttarbz2" +source=(ftp://202.65.194.211/cn/nic/${pkgname}-${pkgver}.tar.bz2 \ + linux-2.6.23.diff README.Frugalware) +sha1sums=('34f3f97e12b1ee0a744fba001bddbdde046e4194' \ + 'f93873ce119e5107eb09c96919c0bbf49fe7d15f' \ + '8d8c6c6075fe07122fa1328467756ec2bfe96252') + +build() { + #Fcheckkernel + Fbuild_kernelmod_scriptlet + Fmkdir ${_F_kernelmod_dir}/kernel/drivers/net + Fsed '$(shell uname -r)' "${_F_kernelmod_uname}" src/Makefile + Fsed 'KMISC\(.*\)/lib\(.*\)' "KMISC\1${Fdestdir}/lib\2" src/Makefile + Fbuild + Fmv ${_F_kernelmod_dir}/kernel/drivers/net/{,realtek-}${pkgname}.ko +} diff --git a/source/network-extra/r8169/README.Frugalware b/source/network-extra/r8169/README.Frugalware new file mode 100644 index 0000000..3c2d584 --- /dev/null +++ b/source/network-extra/r8169/README.Frugalware @@ -0,0 +1,20 @@ +== About the driver + +This is the r8169 driver from realtek. This in _not_ the same r8169 +presented in linux kernel. + +This driver supports: RTL8169S/8110S, RTL8169SB/8110SB, RTL8110SC + +== Using the driver + +To use this driver you have to remove the offcial r8169 if loaded. + + rmmod r8169 + +You can load this module with + + modprobe realtek-r8169 + +It might be a good idea to blacklist r8169 nad add realtek-r8169 to +/etc/sysconfig/modules, so you do not have to play thig game after +every reboot. diff --git a/source/network-extra/r8169/linux-2.6.23.diff b/source/network-extra/r8169/linux-2.6.23.diff new file mode 100644 index 0000000..6b0f412 --- /dev/null +++ b/source/network-extra/r8169/linux-2.6.23.diff @@ -0,0 +1,23 @@ +diff -aur r8169-6.003.00/src/r8169_n.c fw_r8169-6.003.00/src/r8169_n.c +--- r8169-6.003.00/src/r8169_n.c 2007-08-24 13:21:31.000000000 +0200 ++++ fw_r8169-6.003.00/src/r8169_n.c 2007-11-02 01:07:53.000000000 +0100 +@@ -1052,9 +1052,6 @@ + .get_strings = rtl8169_get_strings, + .get_stats_count = rtl8169_get_stats_count, + .get_ethtool_stats = rtl8169_get_ethtool_stats, +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) +- .get_perm_addr = ethtool_op_get_perm_addr, +-#endif + }; + + static void rtl8169_get_mac_version(struct rtl8169_private *tp, void __iomem *ioaddr) +@@ -2605,7 +2602,8 @@ + skb = dev_alloc_skb(pkt_size + align); + if (skb) { + skb_reserve(skb, (align - 1) & (u32)skb->data); +- eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0); ++ //eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0); ++ skb_copy_from_linear_data(*sk_buff, skb->data, pkt_size); + *sk_buff = skb; + rtl8169_mark_to_asic(desc, rx_buf_sz); + ret = 0; From janny at frugalware.org Sat Nov 3 00:17:42 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 00:17:45 2007 Subject: [Frugalware-git] homepage-ng: add new fwlive packages repo Message-ID: <20071102231742.9844813A8010@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=0ad109a542ee05044e3ed07d5132ee6e0b4b46ad commit 0ad109a542ee05044e3ed07d5132ee6e0b4b46ad Author: janny Date: Sat Nov 3 00:01:53 2007 +0100 add new fwlive packages repo diff --git a/git/repos/fwlive_pkgs b/git/repos/fwlive_pkgs new file mode 120000 index 0000000..1c224cb --- /dev/null +++ b/git/repos/fwlive_pkgs @@ -0,0 +1 @@ +../../../people/janny/fwlive_pkgs \ No newline at end of file From vmiklos at frugalware.org Sat Nov 3 00:51:02 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 00:51:03 2007 Subject: [Frugalware-git] frugalware-current: bibletime-i18n-1.6.3b-1-i686 Message-ID: <20071102235102.E729013A8010@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f07abd054708b0ae6c504e03c6499d26063c3b97 commit f07abd054708b0ae6c504e03c6499d26063c3b97 Author: Miklos Vajna Date: Sat Nov 3 00:50:16 2007 +0100 bibletime-i18n-1.6.3b-1-i686 typo in build: the filename is different on ftp diff --git a/source/locale-extra/bibletime-i18n/FrugalBuild b/source/locale-extra/bibletime-i18n/FrugalBuild index 917ec6f..137cae3 100644 --- a/source/locale-extra/bibletime-i18n/FrugalBuild +++ b/source/locale-extra/bibletime-i18n/FrugalBuild @@ -18,7 +18,7 @@ source=(`echo $source | sed 's/-i18n//'` \ build() { Fcd - mv ../hu.po po/ + mv ../bibletime-i18n-1.6.3b-hu.po po/hu.po Fbuild } From crazy at frugalware.org Sat Nov 3 01:39:39 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 01:39:42 2007 Subject: [Frugalware-git] frugalware-current: audacious-1.4.0_rc1-1-i686 Message-ID: <20071103003939.8732613A8010@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=19720d6f18e0efa19d748356a06d6f97971fbe61 commit 19720d6f18e0efa19d748356a06d6f97971fbe61 Author: crazy Date: Sat Nov 3 01:38:45 2007 +0100 audacious-1.4.0_rc1-1-i686 * Version bump diff --git a/source/xmultimedia-extra/audacious/FrugalBuild b/source/xmultimedia-extra/audacious/FrugalBuild index 4cf7651..4dea567 100644 --- a/source/xmultimedia-extra/audacious/FrugalBuild +++ b/source/xmultimedia-extra/audacious/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=audacious -pkgver=1.4.0_beta4 +pkgver=1.4.0_rc1 pkgrel=1 pkgdesc="Audacious is a fork from BMP 0.9.7.1" url="http://audacious-media-player.org/" @@ -19,4 +19,4 @@ _F_cd_path="$pkgname-`echo $pkgver|sed 's/_/-/'`" Fconfopts="$Fconfopts --enable-chardet --enable-ipv6 --disable-dependency-tracking --disable-sse2" # optimalization OK -sha1sums=('c038097aa7938ac4489501d331623e09e359fb67') +sha1sums=('27f8cf578a1e36cbd962af6560d6667f3931a64b') From crazy at frugalware.org Sat Nov 3 01:52:52 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 01:52:53 2007 Subject: [Frugalware-git] frugalware-current: audacious-plugins-1.4.0_rc1-1-i686 Message-ID: <20071103005252.0BEA313A8010@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7fda515f5374ad2ea76f5b412f1dc1e1236c7456 commit 7fda515f5374ad2ea76f5b412f1dc1e1236c7456 Author: crazy Date: Sat Nov 3 01:50:42 2007 +0100 audacious-plugins-1.4.0_rc1-1-i686 * Versuon bump diff --git a/source/xmultimedia-extra/audacious-plugins/FrugalBuild b/source/xmultimedia-extra/audacious-plugins/FrugalBuild index be10910..5aea140 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.0_beta4 +pkgver=1.4.0_rc1 pkgrel=1 pkgdesc="Plugins for audacious." url="http://audacious-media-player.org/" -depends=('openssl' 'curl>=7.16.0' 'dbus-glib' 'sdl' 'audacious>=1.4.0_beta4' 'faad2' \ +depends=('openssl' 'curl>=7.16.0' 'dbus-glib' 'sdl' 'audacious>=1.4.0_rc1' '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=('37620634e89579a08e90d71c3df7149e5ba71b0a') +sha1sums=('adc9f3bd605b5ff2f1aed365f5fb2a7b4f0e0213') From crazy at frugalware.org Sat Nov 3 03:22:22 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 03:22:25 2007 Subject: [Frugalware-git] frugalware-current: audacious-1.4.0_rc1-2-i686 Message-ID: <20071103022222.BEBA113A8010@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5db8f178536356b48271bad1732c9084615545c commit d5db8f178536356b48271bad1732c9084615545c Author: crazy Date: Sat Nov 3 03:21:41 2007 +0100 audacious-1.4.0_rc1-2-i686 * deleted that horrible GCrap _default_ GTK theme diff --git a/source/xmultimedia-extra/audacious/FrugalBuild b/source/xmultimedia-extra/audacious/FrugalBuild index 4dea567..8b34108 100644 --- a/source/xmultimedia-extra/audacious/FrugalBuild +++ b/source/xmultimedia-extra/audacious/FrugalBuild @@ -3,7 +3,7 @@ pkgname=audacious pkgver=1.4.0_rc1 -pkgrel=1 +pkgrel=2 pkgdesc="Audacious is a fork from BMP 0.9.7.1" url="http://audacious-media-player.org/" depends=('gtk+2>=2.12.1' 'taglib' 'libglade' 'libxml2' 'glib2>=2.14.2' 'libmcs>=0.6.0' 'dbus-glib') @@ -16,7 +16,18 @@ 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/_/-/'`" -Fconfopts="$Fconfopts --enable-chardet --enable-ipv6 --disable-dependency-tracking --disable-sse2" +sha1sums=('27f8cf578a1e36cbd962af6560d6667f3931a64b') + +build() +{ + Fbuild \ + --enable-chardet \ + --enable-ipv6 \ + --disable-dependency-tracking \ + --disable-sse2 + ## That *DEFAULT* Gtk Theme is *REALLY* crappy + Frm usr/share/audacious/Skins/Default/gtk-2.0 +} # optimalization OK -sha1sums=('27f8cf578a1e36cbd962af6560d6667f3931a64b') + From priyank at frugalware.org Sat Nov 3 06:28:08 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 06:28:10 2007 Subject: [Frugalware-git] fun: changed update interval to 40 seconds Message-ID: <20071103052808.34F9F13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=288a51da88f1531af68119a152bc21fd55642359 commit 288a51da88f1531af68119a152bc21fd55642359 Author: Priyank Date: Sat Nov 3 10:56:47 2007 +0530 changed update interval to 40 seconds diff --git a/src/fun-ui.c b/src/fun-ui.c index b077dfe..680066a 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -230,7 +230,7 @@ void fun_ui_init (void) { GError *error = NULL; - guint seconds = 20; + guint seconds = 40; fun_systray_create (); if (fun_dbus_perform_service (TEST_SERVICE) == FALSE) diff --git a/src/fund.c b/src/fund.c index daaba2b..d449765 100644 --- a/src/fund.c +++ b/src/fund.c @@ -1,5 +1,5 @@ /* - * updatenotifierd.c for updatenotifier + * fund.c for fun * * Copyright (C) 2007 by Priyank Gosalia * Portions of this code are borrowed fron netconfigd From priyank at frugalware.org Sat Nov 3 06:29:09 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 06:29:11 2007 Subject: [Frugalware-git] fun: use the name "fund" for syslog Message-ID: <20071103052909.18D0C13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=1d2632e77db9707be29bf0057601dc3b3fc27eed commit 1d2632e77db9707be29bf0057601dc3b3fc27eed Author: Priyank Date: Sat Nov 3 10:57:55 2007 +0530 use the name "fund" for syslog diff --git a/src/fund.c b/src/fund.c index d449765..55915f2 100644 --- a/src/fund.c +++ b/src/fund.c @@ -221,9 +221,9 @@ int main (int argc, char *argv[]) { } // Connect to syslog - openlog("updnotifierd", LOG_PID, LOG_DAEMON); + openlog("fund", LOG_PID, LOG_DAEMON); - syslog(LOG_INFO, "Fund v" VERSION " started..."); + syslog(LOG_INFO, "fund v" VERSION " started..."); g_type_init(); From priyank at frugalware.org Sat Nov 3 06:48:24 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 06:48:25 2007 Subject: [Frugalware-git] fun: fun-dbus: fun_dbus_perform_service() Message-ID: <20071103054824.9AD3C13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=17a35b6ff02cfbc7c9c817ad987e2c3b9bacf416 commit 17a35b6ff02cfbc7c9c817ad987e2c3b9bacf416 Author: Priyank Date: Sat Nov 3 11:17:11 2007 +0530 fun-dbus: fun_dbus_perform_service() Added another argument which is used to pass the list of updates to the caller. diff --git a/src/fun-dbus.c b/src/fun-dbus.c index ff1a019..db83a96 100644 --- a/src/fun-dbus.c +++ b/src/fun-dbus.c @@ -40,7 +40,7 @@ fun_dbus_init (void) } gboolean -fun_dbus_perform_service (guint service) +fun_dbus_perform_service (guint service, gchar **package_list) { DBusMessage *message = NULL; DBusMessage *reply = NULL; @@ -49,7 +49,6 @@ fun_dbus_perform_service (guint service) switch (service) { - gchar **package_list = NULL; case PERFORM_UPDATE: { dbus_error_init (&error); @@ -65,13 +64,19 @@ fun_dbus_perform_service (guint service) return FALSE; } if (!dbus_message_get_args (reply, &error, - DBUS_TYPE_STRING, &package_list, + DBUS_TYPE_STRING, package_list, DBUS_TYPE_INVALID)) { fprintf (stderr, "ERROR: %s\n", error.message); dbus_error_free (&error); return FALSE; } + /* if there are any updates, display a notification */ + if (package_list != NULL) + { + + } + dbus_message_unref (reply); dbus_message_unref (message); break; diff --git a/src/fun-dbus.h b/src/fun-dbus.h index 9317d13..724be78 100644 --- a/src/fun-dbus.h +++ b/src/fun-dbus.h @@ -11,6 +11,6 @@ gboolean fun_dbus_init (void); -gboolean fun_dbus_perform_service (guint); +gboolean fun_dbus_perform_service (guint, gchar **); #endif diff --git a/src/fun-ui.c b/src/fun-ui.c index 680066a..6e88cd9 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -233,7 +233,7 @@ fun_ui_init (void) guint seconds = 40; fun_systray_create (); - if (fun_dbus_perform_service (TEST_SERVICE) == FALSE) + if (fun_dbus_perform_service (TEST_SERVICE, NULL) == FALSE) { g_print ("Failed to connect to the fun daemon\n"); connected = FALSE; @@ -255,7 +255,7 @@ fun_timeout_conn (void) { if (connected == TRUE) return FALSE; - if (fun_dbus_perform_service (TEST_SERVICE) == FALSE) + if (fun_dbus_perform_service (TEST_SERVICE, NULL) == FALSE) { connected = FALSE; } @@ -272,12 +272,16 @@ fun_timeout_conn (void) static gboolean fun_timeout_func (void) { + gchar *plist = NULL; /* Don't do anything if we're not connected to the daemon */ if (!connected) return TRUE; - if (fun_dbus_perform_service (PERFORM_UPDATE)==TRUE) + if (fun_dbus_perform_service (PERFORM_UPDATE, &plist)==TRUE) + { + g_print ("\nlist is\n %s", plist); g_print ("Yeaahaaw! success\n"); + } else g_print ("Damn !\n"); From priyank at frugalware.org Sat Nov 3 07:06:30 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 07:06:32 2007 Subject: [Frugalware-git] fun: fun-ui Message-ID: <20071103060630.2AEC113A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=662baf903dd5e157a84ee7f385ad67d5f02da3a2 commit 662baf903dd5e157a84ee7f385ad67d5f02da3a2 Author: Priyank Date: Sat Nov 3 11:35:15 2007 +0530 fun-ui * Display a notification when an update is available * Minor changes in tooltip geometry diff --git a/src/fun-dbus.c b/src/fun-dbus.c index db83a96..a11483e 100644 --- a/src/fun-dbus.c +++ b/src/fun-dbus.c @@ -71,11 +71,6 @@ fun_dbus_perform_service (guint service, gchar **package_list) dbus_error_free (&error); return FALSE; } - /* if there are any updates, display a notification */ - if (package_list != NULL) - { - - } dbus_message_unref (reply); dbus_message_unref (message); diff --git a/src/fun-ui.c b/src/fun-ui.c index 6e88cd9..1125ba0 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -32,7 +32,7 @@ static void fun_about_show (void); static void fun_about_hide (void); -#define FUN_ICON "fun.png" +#define FUN_ICON "fun.png" #define FUN_TOOLTIP_ICON "fun.png" EggTrayIcon *icon = NULL; @@ -137,7 +137,7 @@ cb_fun_systray_enter_notify (GtkWidget *widget, GdkEventCrossing *event, gpointe rectangle.x = 2500; rectangle.y = 2500; rectangle.width = 100; - rectangle.height = 50; + rectangle.height = 70; screen = gtk_widget_get_screen (GTK_WIDGET(icon)); sexy_tooltip_position_to_rect (SEXY_TOOLTIP(stooltip), &rectangle, screen); gtk_widget_show_all (stooltip); @@ -152,7 +152,7 @@ cb_fun_systray_enter_notify (GtkWidget *widget, GdkEventCrossing *event, gpointe else { rectangle.x = x-(w/4); - rectangle.y = y-120; + rectangle.y = y-130; } sexy_tooltip_position_to_rect (SEXY_TOOLTIP(stooltip), &rectangle, screen); @@ -230,7 +230,7 @@ void fun_ui_init (void) { GError *error = NULL; - guint seconds = 40; + guint seconds = 15; fun_systray_create (); if (fun_dbus_perform_service (TEST_SERVICE, NULL) == FALSE) @@ -279,8 +279,12 @@ fun_timeout_func (void) if (fun_dbus_perform_service (PERFORM_UPDATE, &plist)==TRUE) { - g_print ("\nlist is\n %s", plist); - g_print ("Yeaahaaw! success\n"); + //g_print ("\nlist is\n %s", plist); + //g_print ("Yeaahaaw! success\n"); + fun_tooltip_set_text1 (tooltip, "Updates are available", TRUE); + fun_tooltip_set_text2 (tooltip, "Click here to know more..", TRUE); + fun_tooltip_show (tooltip); + cb_fun_systray_enter_notify (NULL, NULL, NULL); } else g_print ("Damn !\n"); From priyank at frugalware.org Sat Nov 3 07:47:06 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 07:47:06 2007 Subject: [Frugalware-git] fun: added a new configuration file parser - wejpconfig Message-ID: <20071103064706.329F513A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=8d172261e1d7f3c3b4849b55282b4b3a6129865d commit 8d172261e1d7f3c3b4849b55282b4b3a6129865d Author: Priyank Date: Sat Nov 3 12:15:41 2007 +0530 added a new configuration file parser - wejpconfig diff --git a/src/wejpconfig.c b/src/wejpconfig.c new file mode 100644 index 0000000..d81a118 --- /dev/null +++ b/src/wejpconfig.c @@ -0,0 +1,233 @@ +/* + * Wejp's Config File Parser + * + * File: wejpconfig.c + * + * Copyright (c) 2003-2004 Johannes Heimansberg + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 + */ + +#define VERSION 20051026 +#include +#include +#include +#include "wejpconfig.h" + +/* Returns the complete path to ~/"filename" */ +char *cfg_get_path_to_config_file(char *filename) +{ + char *home_directory, *path_to_config_file; + + home_directory = getenv("HOME"); + path_to_config_file = (char*)malloc((strlen(home_directory) + + strlen(filename) + 2) * sizeof(char)); + sprintf(path_to_config_file, "%s/%s", home_directory, filename); + return path_to_config_file; +} + +/* Must be called before the first use of a ConfigFile struct element */ +void cfg_init_config_file_struct(ConfigFile *cf) +{ + cf->lastkey = 0; +} + +/* Checks wether the config file exists or not */ +int cfg_check_config_file(char *filename) +{ + FILE *file; + int result = 0; + file = fopen(filename, "r"); + if (file == NULL) + result = -1; + else + fclose(file); + return result; +} + +/* Add a new key to the configuration */ +int cfg_add_key(ConfigFile *cf, char *key, char *value) +{ + int result = 0; + int strsize = 0; + int i; + + if (cfg_get_key_value(*cf, key) != NULL) /* Key already exists->overwrite */ + { + for (i = 0; i < cf->lastkey; i++) + if (strncmp(key, cf->key[i], 127) == 0) + { + free(cf->key[i]); /* Free allocated memory */ + free(cf->value[i]); + + /* Allocate memory for the new string and save it... */ + strsize = (strlen(key) < 127 ? strlen(key) : 126) + 1; + cf->key[i] = (char*)malloc(strsize * sizeof(char)); + sprintf(cf->key[i], "%s", key); + + strsize = (strlen(key) < 127 ? strlen(value) : 126) + 1; + cf->value[i] = (char*)malloc(strsize * sizeof(char)); + sprintf(cf->value[i], "%s", value); + break; + } + } + else if (cf->lastkey < MAXKEYS) + { + strsize = (strlen(key) < 127 ? strlen(key) : 126) + 1; + cf->key[cf->lastkey] = (char*)malloc(strsize * sizeof(char)); + sprintf(cf->key[cf->lastkey], "%s", key); + + strsize = (strlen(key) < 127 ? strlen(value) : 126) + 1; + cf->value[cf->lastkey] = (char*)malloc(strsize * sizeof(char)); + sprintf(cf->value[cf->lastkey], "%s", value); + + (cf->lastkey)++; + } + else + result = -1; + return result; +} + +/* Frees all memory allocated by read_config_file() */ +void cfg_free_config_file_struct(ConfigFile *cf) +{ + int i; + for (i = 0; i < cf->lastkey; i++) + { + free(cf->key[i]); + free(cf->value[i]); + } + cf->lastkey = -1; +} + +/* Loads a config file from disk */ +int cfg_read_config_file(ConfigFile *cf, char *filename) +{ + FILE *file; + char ch; + int bufcnt; + char key_buffer[128] = "", value_buffer[128] = ""; + + /* parse config file and read keys+key values */ + file = fopen(filename, "r"); + if (file) + { + while(!feof(file)) + { + ch = fgetc(file); + /* Skip blanks... */ + if (ch == ' ' || ch == '\t') + while (ch == ' ' || ch == '\t') ch = fgetc(file); + /* ...and comments (#)... */ + if (ch == '#') + while (ch != '\n' && ch != '\r') ch = fgetc(file); + + bufcnt = 0; + /* Read key name: */ + while (ch != ' ' && ch != '\t' && ch != '\n' && ch != '\r' && + ch != '=' && !feof(file) && bufcnt < 126) + { + key_buffer[bufcnt] = ch; + bufcnt++; + ch = fgetc(file); + } + key_buffer[bufcnt] = '\0'; + + while (ch != '=' && !feof(file)) + { + ch = fgetc(file); + } + ch = fgetc(file); + + /* Skip blanks... */ + if (ch == ' ' || ch == '\t') + while (ch == ' ' || ch == '\t') ch = fgetc(file); + + /* Read key value: */ + bufcnt = 0; + while (ch != '\n' && ch != '\r' && !feof(file) && + !feof(file) && bufcnt < 126) + { + value_buffer[bufcnt] = ch; + bufcnt++; + ch = fgetc(file); + } + value_buffer[bufcnt] = '\0'; + + if (strlen(key_buffer) > 0) + cfg_add_key(cf, key_buffer, value_buffer); + } + fclose(file); + } + else + { + printf("config: Cannot open config file!\n"); + return -2; + } + return 0; +} + +/* Saves the configuration to file */ +int cfg_write_config_file(ConfigFile *cf, char *filename) +{ + FILE *file; + int i = 0, result = 0; + char buffer[128]; + + file = fopen(filename, "w"); + if (file != NULL) + { + while (i < cf->lastkey) + { + sprintf(buffer, "%s=%s\n", cf->key[i], cf->value[i]); + fwrite(buffer, strlen(buffer) * sizeof(char), 1, file); + i++; + } + fclose(file); + } + else + { + printf("config: failed opening %s\n", filename); + result = -1; + } + return result; +} + +/* Returns the value (as string) of "key" */ +char *cfg_get_key_value(ConfigFile cf, char *key) +{ + char *result = NULL; + int i; + + for (i = 0; i < cf.lastkey; i++) + if (strncmp(key, cf.key[i], 127) == 0) + { + result = cf.value[i]; + break; + } + return result; +} + +int cfg_is_key_available(ConfigFile cf, char *key) +{ + int result = FALSE; + int i; + for (i = 0; i < cf.lastkey; i++) + if (strncmp(key, cf.key[i], 127) == 0) + { + result = TRUE; + break; + } + return result; +} diff --git a/src/wejpconfig.h b/src/wejpconfig.h new file mode 100644 index 0000000..403731c --- /dev/null +++ b/src/wejpconfig.h @@ -0,0 +1,46 @@ +/* + * Wejp's Config File Parser + * + * File: wejpconfig.h + * + * Copyright (c) 2003-2004 Johannes Heimansberg + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 + */ + +#ifndef _CONFIG_H +#define _CONFIG_H +#ifndef TRUE +#define TRUE 1 +#define FALSE 0 +#endif +#define MAXKEYS 128 + +typedef struct +{ + char *key[MAXKEYS]; + char *value[MAXKEYS]; + int lastkey; +} ConfigFile; +#endif + +void cfg_init_config_file_struct(ConfigFile *cf); +int cfg_add_key(ConfigFile *cf, char *key, char *value); +void cfg_free_config_file_struct(ConfigFile *cf); +int cfg_read_config_file(ConfigFile *cf, char *filename); +int cfg_write_config_file(ConfigFile *cf, char *filename); +char *cfg_get_key_value(ConfigFile cf, char *key); +int cfg_check_config_file(char *filename); +char *cfg_get_path_to_config_file(char *filename); +int cfg_is_key_available(ConfigFile cf, char *key); From priyank at frugalware.org Sat Nov 3 07:49:46 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 07:49:47 2007 Subject: [Frugalware-git] fun: fun-config: a wrapper to access the configuration file from wejpconfig Message-ID: <20071103064946.90A6613A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=6f4a50a9143d1623cb03ab1de031a2736394bb6d commit 6f4a50a9143d1623cb03ab1de031a2736394bb6d Author: Priyank Date: Sat Nov 3 12:18:32 2007 +0530 fun-config: a wrapper to access the configuration file from wejpconfig * Initial import diff --git a/src/Makefile.am b/src/Makefile.am index 078dcf3..966da1d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,9 @@ sbin_PROGRAMS = fund bin_PROGRAMS = fun fund_SOURCES = fund.c -fun_SOURCES = eggtrayicon.c \ +fun_SOURCES = wejpconfig.c \ + fun-config.c \ + eggtrayicon.c \ sexy-tooltip.c \ fun-tooltip.c \ fun-ui.c \ diff --git a/src/fun-config.c b/src/fun-config.c new file mode 100644 index 0000000..47cee83 --- /dev/null +++ b/src/fun-config.c @@ -0,0 +1,112 @@ +/* + * fun-config.c for fun + * + * Copyright (C) 2007 by Priyank Gosalia + * Portions of this code are borrowed fron gimmix + * gimmix is Copyright (C) 2006-2007 Priyank Gosalia + * + * 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. + */ + +#include +#include +#include +#include +#include "fun-config.h" + +#define CONFIG_FILE ".funrc" + +static ConfigFile conf; + +bool +fun_config_init (void) +{ + char *rcfile = NULL; + + cfg_init_config_file_struct (&conf); + cfg_add_key (&conf, "update_interval", "60"); + rcfile = cfg_get_path_to_config_file (CONFIG_FILE); + if (cfg_read_config_file (&conf, rcfile) != 0) + { + fun_config_save (); + g_free (rcfile); + return false; + } + else + { + g_free (rcfile); + return true; + } + + return false; +} + +char * +fun_config_get_value_string (const char *key) +{ + char *ret = NULL; + + ret = cfg_get_key_value (conf, (char*)key); + + return ret; +} + +int +fun_config_get_value_int (const char *key) +{ + int ret = -1; + + ret = atoi (cfg_get_key_value (conf, (char*)key)); + + return ret; +} + +void +fun_config_save (void) +{ + char *rcfile; + + rcfile = cfg_get_path_to_config_file (CONFIG_FILE); + cfg_write_config_file (&conf, rcfile); + chmod (rcfile, S_IRUSR|S_IWUSR); + g_free (rcfile); + + return; +} + +bool +fun_config_exists (void) +{ + char *config_file = NULL; + bool status; + + config_file = cfg_get_path_to_config_file (CONFIG_FILE); + if (g_file_test(config_file, G_FILE_TEST_EXISTS)) + status = true; + else + status = false; + + free (config_file); + return status; +} + +void +fun_config_free (void) +{ + cfg_free_config_file_struct (&conf); + + return; +} + diff --git a/src/fun-config.h b/src/fun-config.h new file mode 100644 index 0000000..ce8ff99 --- /dev/null +++ b/src/fun-config.h @@ -0,0 +1,26 @@ +#ifndef _FUN_CONFIG_H_ +#define _FUN_CONFIG_H + +#include +#include +#include "wejpconfig.h" + +/* Returns true if file exists otherwise false */ +bool fun_config_exists (void); + +/* Parse config file and set the initial config values */ +bool fun_config_init (void); + +/* Save current settings back to funrc */ +void fun_config_save (void); + +/* Read a value from funrc and return it as a string */ +char * fun_config_get_value_string (const char *); + +/* Read a value from funrc and return it as an int */ +int fun_config_get_value_int (const char *); + +/* Free conf */ +void fun_config_free (void); + +#endif From priyank at frugalware.org Sat Nov 3 07:52:50 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 07:52:51 2007 Subject: [Frugalware-git] fun: fun now reads update_interval value from .funrc Message-ID: <20071103065250.1BE6013A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=44d4f7a045932c0db73d9bcf6af14f756f27c77c commit 44d4f7a045932c0db73d9bcf6af14f756f27c77c Author: Priyank Date: Sat Nov 3 12:21:36 2007 +0530 fun now reads update_interval value from .funrc * connection retry timeout is now hardcoded to 30 seconds * update_interval field in .funrc specifies the update check interval in minutes * default is 60 minutes diff --git a/src/fun-ui.c b/src/fun-ui.c index 1125ba0..94fca42 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -21,6 +21,7 @@ */ #include +#include "fun-config.h" #include "fun-tooltip.h" #include "fun-dbus.h" #include "sexy-tooltip.h" @@ -230,7 +231,7 @@ void fun_ui_init (void) { GError *error = NULL; - guint seconds = 15; + gulong seconds = 0; fun_systray_create (); if (fun_dbus_perform_service (TEST_SERVICE, NULL) == FALSE) @@ -238,9 +239,11 @@ fun_ui_init (void) g_print ("Failed to connect to the fun daemon\n"); connected = FALSE; /* start the connection retry timeout */ - g_timeout_add_seconds (seconds, (GSourceFunc)fun_timeout_conn, NULL); + g_timeout_add_seconds (30, (GSourceFunc)fun_timeout_conn, NULL); return; } + seconds = fun_config_get_value_int ("update_interval") * 60; + g_print ("%d\n", seconds); connected = TRUE; diff --git a/src/fun.c b/src/fun.c index b996a36..7078500 100644 --- a/src/fun.c +++ b/src/fun.c @@ -21,6 +21,7 @@ #include #include #include +#include "fun-config.h" int main (int argc, char **argv) @@ -29,6 +30,7 @@ main (int argc, char **argv) if (fun_dbus_init() == FALSE) return 1; + fun_config_init (); fun_ui_init (); gtk_main (); From priyank at frugalware.org Sat Nov 3 08:06:03 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 08:06:04 2007 Subject: [Frugalware-git] fun: the dbus service is now known as FWUpdateNotifier Message-ID: <20071103070603.6F98413A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=87d8a33a29ea925bdd8f16094d2ad8f9456cd7dc commit 87d8a33a29ea925bdd8f16094d2ad8f9456cd7dc Author: Priyank Date: Sat Nov 3 12:34:49 2007 +0530 the dbus service is now known as FWUpdateNotifier diff --git a/src/fund.c b/src/fund.c index 55915f2..07deca4 100644 --- a/src/fund.c +++ b/src/fund.c @@ -39,13 +39,13 @@ typedef void* netbuf; static PM_DB *sync_db = NULL; static PM_DB *local_db = NULL; -G_DEFINE_TYPE(UpdNotifier, updnotifierd, G_TYPE_OBJECT); +G_DEFINE_TYPE(FWUpdateNotifier, fund, G_TYPE_OBJECT); -void updnotifierd_class_init(UpdNotifierClass *class) { +void fund_class_init(FWUpdateNotifierClass *class) { // Nothing here } -void updnotifierd_init(UpdNotifier *server) { +void fund_init(FWUpdateNotifier *server) { GError *error = NULL; DBusGProxy *driver_proxy; int request_ret; @@ -58,10 +58,10 @@ void updnotifierd_init(UpdNotifier *server) { return; } - dbus_g_object_type_install_info(updnotifierd_get_type(), &dbus_glib_fund_object_info); + dbus_g_object_type_install_info(fund_get_type(), &dbus_glib_fund_object_info); // Register DBUS path - dbus_g_connection_register_g_object(server->connection, "/org/frugalware/UpdNotifier", G_OBJECT(server)); + dbus_g_connection_register_g_object(server->connection, "/org/frugalware/FWUpdateNotifier", G_OBJECT(server)); // Register the service name, the constant here are defined in dbus-glib-bindings.h driver_proxy = dbus_g_proxy_new_for_name(server->connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); @@ -150,7 +150,7 @@ GList* _updnotifierd_update_database (void) { return ret; } -gboolean updnotifier_update_database(UpdNotifier *obj, gchar **packages, GError **error) { +gboolean fund_update_database(FWUpdateNotifier *obj, gchar **packages, GError **error) { GList *list = NULL; if ((list = _updnotifierd_update_database())==NULL) { *packages = NULL; @@ -167,7 +167,7 @@ gboolean updnotifier_update_database(UpdNotifier *obj, gchar **packages, GError } } -gboolean updnotifier_test_service(UpdNotifier *obj, gint *ret, GError **error) { +gboolean fund_test_service(FWUpdateNotifier *obj, gint *ret, GError **error) { *ret = 1; return TRUE; } @@ -180,7 +180,7 @@ void usage() { int main (int argc, char *argv[]) { GMainLoop *main_loop; - UpdNotifier *server; + FWUpdateNotifier *server; int i = 1; int daemonize = 0; @@ -227,7 +227,7 @@ int main (int argc, char *argv[]) { g_type_init(); - server = g_object_new(updnotifierd_get_type(), NULL); + server = g_object_new(fund_get_type(), NULL); _updatenotifierd_init_pacman (); main_loop = g_main_loop_new(NULL, FALSE); diff --git a/src/fund.h b/src/fund.h index e38ef23..5a4a81f 100644 --- a/src/fund.h +++ b/src/fund.h @@ -5,17 +5,17 @@ typedef struct { GObject parent; DBusGConnection *connection; -} UpdNotifier; +} FWUpdateNotifier; typedef struct { GObjectClass parent_class; -} UpdNotifierClass; +} FWUpdateNotifierClass; -static void updnotifierd_init(UpdNotifier *server); -static void updnotifierd_class_init(UpdNotifierClass *class); +static void fund_init(FWUpdateNotifier *server); +static void fund_class_init(FWUpdateNotifierClass *class); -gboolean updnotifier_update_database(UpdNotifier *obj, gchar **packages, GError **error); -gboolean updnotifier_test_service(UpdNotifier *obj, gint *ret, GError **error); +gboolean fund_update_database(FWUpdateNotifier *obj, gchar **packages, GError **error); +gboolean fund_test_service(FWUpdateNotifier *obj, gint *ret, GError **error); #endif diff --git a/src/fund.xml b/src/fund.xml index 305d636..b36fb7c 100644 --- a/src/fund.xml +++ b/src/fund.xml @@ -1,12 +1,12 @@ - - - + + + - + - + From voroskoi at frugalware.org Sat Nov 3 08:37:57 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 3 08:37:59 2007 Subject: [Frugalware-git] frugalware-current: r8169-6.003.00-1-x86_64 Message-ID: <20071103073757.EA56113A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de8686a1a8577079a7a21970e6ee2ea1bcbbc42b commit de8686a1a8577079a7a21970e6ee2ea1bcbbc42b Author: voroskoi Date: Sat Nov 3 08:37:49 2007 +0100 r8169-6.003.00-1-x86_64 fix SMP build diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index fa63ee9..109efbe 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -19,6 +19,7 @@ sha1sums=('34f3f97e12b1ee0a744fba001bddbdde046e4194' \ '8d8c6c6075fe07122fa1328467756ec2bfe96252') build() { + unset MAKEFLAGS #Fcheckkernel Fbuild_kernelmod_scriptlet Fmkdir ${_F_kernelmod_dir}/kernel/drivers/net From voroskoi at frugalware.org Sat Nov 3 08:47:49 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 3 08:47:50 2007 Subject: [Frugalware-git] frugalware-current: mythplugins-0.20.2-2-x86_64 Message-ID: <20071103074749.1649813A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bab0b3456f31dfdb7cd07139ada75e551b528dfe commit bab0b3456f31dfdb7cd07139ada75e551b528dfe Author: voroskoi Date: Sat Nov 3 08:47:22 2007 +0100 mythplugins-0.20.2-2-x86_64 now all plugin has it's separate package diff --git a/source/xapps-extra/mythplugins/FrugalBuild b/source/xapps-extra/mythplugins/FrugalBuild index 7fbf47f..a7fc43a 100644 --- a/source/xapps-extra/mythplugins/FrugalBuild +++ b/source/xapps-extra/mythplugins/FrugalBuild @@ -1,25 +1,159 @@ -# Compiling Time: 0.23 SBU +# Compiling Time: 4.66 SBU # Contributor: Massimo Chiappini # Maintainer: voroskoi pkgname=mythplugins +_mythtvver=0.20.2 pkgver=0.20.2 -pkgrel=1 +pkgrel=2 url="http://mythtv.org/" pkgdesc="All the official MythTV plugins." -depends=('mythtv=0.20.2' 'libmad' 'libid3tag' 'libvorbis' 'flac>=1.1.3' 'libcdaudio' 'cdparanoia') +makedepends=("mythtv>=${_mythtvver}" 'libmad' 'libid3tag' 'libvorbis' 'flac>=1.1.3' 'libcdaudio' 'cdparanoia' \ + 'libexif' 'kdelibs' 'sdl' 'fftw' 'faac' 'festival' 'speech_tools') +depends=() groups=('xapps-extra') archs=('i686' 'x86_64') source=(http://ftp.osuosl.org/pub/mythtv/mythplugins-$pkgver.tar.bz2) up2date="lynx -dump http://ftp.osuosl.org/pub/mythtv/ |grep mythplugins|Flasttarbz2" +sha1sums=('b227fc1f90faeb4fb950eef39c80981fecfba027') + +subpkgs=('mytharchive' 'mythbrowser' 'mythcontrols' 'mythdvd' \ + 'mythflix' 'mythgallery' 'mythgame' 'mythmusic' \ + 'mythnews' 'mythphone' 'mythvideo' 'mythweather' 'mythweb') +subdescs=('MythTV plugin that lets you create DVDs from or archive your recorded shows.' \ + 'Mini web browser for MythTV.' \ + 'Experimental controls for MythTV.' \ + 'DVD playback and ripping plugin for MythTV.' \ + 'Netflix access plugin for MythTV.' \ + 'Image gallery plugin for MythTV.' \ + 'Emulation plugin for MythTV.' \ + 'Music playing plugin for MythTV.' \ + 'News checking plugin for MythTV.' \ + 'Plugin that allows phone calls to be made to MythTV.' \ + 'Video playback and browsing plugin for MythTV.' \ + 'Weather checking plugin for MythTV.' \ + 'Web interface for MythTV backend') +subdepends=("mythtv>=${_mythtvver}" "mythtv>=${_mythtvver} kdelibs" "mythtv>=${_mythtvver}" "mythtv>=${_mythtvver}" \ + "mythtv>=${_mythtvver}" "mythtv>=${_mythtvver} libexif" "mythtv>=${_mythtvver}" \ + "mythtv>=${_mythtvver} fftw sdl libmad libid3tag libvorbis flac>=1.1.3 libcdaudio cdparanoia" \ + "mythtv>=${_mythtvver}" "mythtv>=${_mythtvver}" "mythtv>=${_mythtvver}" "mythtv>=${_mythtvver}" \ + "mythtv>=${_mythtvver}") +subgroups=('xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' \ + 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') + +rodepends=${subpkgs[@]} build() { Fpatchall - Fconf --enable-all --disable-mythbrowser + Fconf --enable-all qmake mythplugins.pro || Fdie make || Fdie Fmakeinstall INSTALL_ROOT=$Fdestdir + + # common part of the split + for pkg in $(seq 0 $((${#subpkgs[@]} - 2))); do + if [ -e ${Fdestdir}/usr/lib/mythtv/plugins/lib${subpkgs[${pkg}]}.so ]; then + Fsplit ${subpkgs[${pkg}]} usr/lib/mythtv/plugins/lib${subpkgs[${pkg}]}.so + fi + Fsplit ${subpkgs[${pkg}]} usr/share/mythtv/i18n/${subpkgs[${pkg}]}* + if [ -d ${Fdestdir}/usr/share/mythtv/${subpkgs[${pkg}]} ]; then + Fsplit ${subpkgs[${pkg}]} usr/share/mythtv/${subpkgs[${pkg}]} + fi + done + + # mytharchive + Fsplit mytharchive usr/bin/mytharchivehelper + Fsplit mytharchive usr/share/mythtv/archive* + Fsplit mytharchive usr/share/mythtv/themes/default/ma_* + #Fsplit mytharchive usr/share/mythtv/archivemenu.xml + Fsplit mytharchive usr/share/mythtv/themes/default/mythburn-ui.xml + Fsplit mytharchive usr/share/mythtv/themes/default/mythnative-ui.xml + Fsplit mytharchive usr/share/mythtv/themes/default/mytharchive-ui.xml + + # mythbrowser + Fsplit mythbrowser usr/bin/mythbrowser + Fsplit mythbrowser usr/lib/mythtv/plugins/libmythbookmarkmanager.so + Fsplit mythbrowser usr/share/mythtv/themes/default/webpage.png + + # mythcontrols + Fsplit mythcontrols usr/share/mythtv/themes/default/kb-button-on.png + Fsplit mythcontrols usr/share/mythtv/themes/default/kb-button-off.png + Fsplit mythcontrols usr/share/mythtv/themes/default/controls-ui.xml + + # mythdvd - FIXME: rc.mtd + Fsplit mythdvd usr/share/mythtv/themes/default/md_* + Fsplit mythdvd usr/share/mythtv/themes/default/dvd-ui.xml + Fsplit mythdvd usr/share/mythtv/dvd_settings.xml + Fsplit mythdvd usr/share/mythtv/dvdmenu.xml + Fsplit mythdvd usr/bin/mtd + + # mythflix + Fsplit mythflix usr/share/mythtv/netflix_menu.xml + Fsplit mythflix usr/share/mythtv/themes/default/netflix-ui.xml + Fsplit mythflix usr/share/mythtv/themes/default/title_netflix.png + Fsplit mythflix usr/share/mythtv/themes/default/news-info-bg.png + #Fsplit mythflix usr/share/mythtv/mythflix/scripts/netflix.pl + #Fsplit mythflix usr/share/mythtv/mythflix/netflix-rss.xml + + # mythgallery + Fsplit mythgallery usr/share/mythtv/themes/default/gallery* + + # mythgame + Fsplit mythgame usr/share/mythtv/themes/default/game-ui.xml + Fsplit mythgame usr/share/mythtv/game_settings.xml + + # mythmusic - FIXME: AAC support + Fsplit mythmusic usr/share/mythtv/themes/default/mm* + Fsplit mythmusic usr/share/mythtv/themes/default/*button* + Fsplit mythmusic usr/share/mythtv/themes/default/music* + Fsplit mythmusic usr/share/mythtv/themes/default/selectionbar.png + Fsplit mythmusic usr/share/mythtv/themes/default/track_info_background.png + Fsplit mythmusic usr/share/mythtv/musicmenu.xml + Fsplit mythmusic usr/share/mythtv/music_settings.xml + + # mythnews + Fsplit mythnews usr/share/mythtv/themes/default/news* + #Fsplit mythnews usr/share/mythtv/mythnews/news-sites.xml + + # mythphone - FIXME: festival support + Fsplit mythphone usr/share/mythtv/themes/default/mp* + Fsplit mythphone usr/share/mythtv/themes/default/phone.png + Fsplit mythphone usr/share/mythtv/themes/default/webcam-ui.xml + Fsplit mythphone usr/share/mythtv/themes/default/phone-ui.xml + + # mythvideo + Fsplit mythvideo usr/share/mythtv/themes/default/mv* + Fsplit mythvideo usr/share/mythtv/themes/default/video-ui.xml + Fsplit mythvideo usr/share/mythtv/video_settings.xml + Fsplit mythvideo usr/share/mythtv/videomenu.xml + + # mythweather + Fsplit mythweather usr/share/mythtv/themes/default/mw* + Fsplit mythweather usr/share/mythtv/themes/default/*cloudy* + Fsplit mythweather usr/share/mythtv/themes/default/lshowers.png + Fsplit mythweather usr/share/mythtv/themes/default/flurries.png + Fsplit mythweather usr/share/mythtv/themes/default/fog.png + Fsplit mythweather usr/share/mythtv/themes/default/rainsnow.png + Fsplit mythweather usr/share/mythtv/themes/default/sunny.png + Fsplit mythweather usr/share/mythtv/themes/default/thunshowers.png + Fsplit mythweather usr/share/mythtv/themes/default/fair.png + Fsplit mythweather usr/share/mythtv/themes/default/unknown.png + Fsplit mythweather usr/share/mythtv/themes/default/snowshow.png + Fsplit mythweather usr/share/mythtv/themes/default/weather-ui.xml + Fsplit mythweather usr/share/mythtv/themes/default/logo.png + Fsplit mythweather usr/share/mythtv/themes/default/showers.png + + # mythweb + mythwebdir="var/www/html/mythweb" + Fmkdir ${mythwebdir}/{image_cache,php_sessions} + cp -r ${Fsrcdir}/mythplugins-${pkgver}/mythweb/* ${Fdestdir}/${mythwebdir} || Fdie + cp ${Fsrcdir}/mythplugins-${pkgver}/mythweb/.htaccess ${Fdestdir}/${mythwebdir} || Fdie + Frm ${mythwebdir}/{README,TODO} + chown -R nobody:nobody ${Fdestdir}/${mythwebdir} || Fdie + chmod g+rw ${Fdestdir}/${mythwebdir}/{image_cache,php_sessions,data} || Fdie + Fsplit mythweb ${mythwebdir} } -sha1sums=('b227fc1f90faeb4fb950eef39c80981fecfba027') # optimization OK From janny at frugalware.org Sat Nov 3 09:00:47 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 09:00:50 2007 Subject: [Frugalware-git] frugalware-current: firefox-2.0.0.9-1-i686 Message-ID: <20071103080047.9063F13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6292e27adadcddbc29b2b0f2e57bf04fcf39c608 commit 6292e27adadcddbc29b2b0f2e57bf04fcf39c608 Author: janny Date: Sat Nov 3 08:55:05 2007 +0100 firefox-2.0.0.9-1-i686 version bump change maintainer diff --git a/source/base-extra/kernel-fwlive/config b/source/base-extra/kernel-fwlive/config deleted file mode 100644 index e549bb6..0000000 --- a/source/base-extra/kernel-fwlive/config +++ /dev/null @@ -1,3681 +0,0 @@ -# -# Automatically generated make config: don't edit -# -CONFIG_X86_32=y -CONFIG_GENERIC_TIME=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_X86=y -CONFIG_MMU=y -CONFIG_ZONE_DMA=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_DMI=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - -# -# Code maturity level options -# -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_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CPUSETS=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -# CONFIG_EMBEDDED is not set -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SHMEM=y -CONFIG_SLAB=y -CONFIG_VM_EVENT_COUNTERS=y -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 -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 - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" - -# -# Processor type and features -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -CONFIG_X86_PC=y -# CONFIG_X86_ELAN is not set -# CONFIG_X86_VOYAGER is not set -# CONFIG_X86_NUMAQ is not set -# CONFIG_X86_SUMMIT is not set -# CONFIG_X86_BIGSMP is not set -# CONFIG_X86_VISWS is not set -# CONFIG_X86_GENERICARCH is not set -# CONFIG_X86_ES7000 is not set -# CONFIG_PARAVIRT is not set -# CONFIG_M386 is not set -CONFIG_M486=y -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MCORE2 is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP2 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -CONFIG_X86_GENERIC=y -CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=7 -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_INTEL_USERCOPY=y -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_NR_CPUS=8 -CONFIG_SCHED_SMT=y -# CONFIG_SCHED_MC is not set -# CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_BKL=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_MCE=y -CONFIG_X86_MCE_NONFATAL=m -CONFIG_X86_MCE_P4THERMAL=y -CONFIG_VM86=y -CONFIG_TOSHIBA=m -CONFIG_I8K=m -CONFIG_X86_REBOOTFIXUPS=y -CONFIG_MICROCODE=m -CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_X86_MSR=m -CONFIG_X86_CPUID=m - -# -# Firmware Drivers -# -CONFIG_EDD=m -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -# CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_STATIC=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set -CONFIG_ZONE_DMA_FLAG=1 -# CONFIG_HIGHPTE is not set -# CONFIG_MATH_EMULATION is not set -CONFIG_MTRR=y -# CONFIG_EFI is not set -CONFIG_IRQBALANCE=y -CONFIG_SECCOMP=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 -CONFIG_KEXEC=y -# CONFIG_CRASH_DUMP is not set -CONFIG_PHYSICAL_START=0x100000 -# CONFIG_RELOCATABLE is not set -CONFIG_PHYSICAL_ALIGN=0x100000 -CONFIG_HOTPLUG_CPU=y -# CONFIG_COMPAT_VDSO is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y - -# -# Power management options (ACPI, APM) -# -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_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_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m -CONFIG_ACPI_DOCK=m -CONFIG_ACPI_BAY=m -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 -CONFIG_ACPI_EC=y -CONFIG_ACPI_POWER=y -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_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 - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m -# CONFIG_CPU_FREQ_DEBUG is not set -CONFIG_CPU_FREQ_STAT=m -# CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=m -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# CPUFreq processor drivers -# -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_POWERNOW_K6=m -CONFIG_X86_POWERNOW_K7=m -CONFIG_X86_POWERNOW_K7_ACPI=y -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 -CONFIG_X86_P4_CLOCKMOD=m -CONFIG_X86_CPUFREQ_NFORCE2=m -CONFIG_X86_LONGRUN=m -CONFIG_X86_LONGHAUL=m -CONFIG_X86_E_POWERSAVER=m - -# -# shared options -# -# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set -CONFIG_X86_SPEEDSTEP_LIB=m -# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set - -# -# Bus options (PCI, PCMCIA, EISA, MCA, ISA) -# -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_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_PCI_MSI=y -CONFIG_HT_IRQ=y -CONFIG_ISA_DMA_API=y -CONFIG_ISA=y -CONFIG_EISA=y -# CONFIG_EISA_VLB_PRIMING is not set -CONFIG_EISA_PCI_EISA=y -CONFIG_EISA_VIRTUAL_ROOT=y -CONFIG_EISA_NAMES=y -CONFIG_MCA=y -CONFIG_MCA_LEGACY=y -CONFIG_MCA_PROC_FS=y -# CONFIG_SCx200 is not set -CONFIG_K8_NB=y - -# -# PCCARD (PCMCIA/CardBus) support -# -CONFIG_PCCARD=y -# CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -# CONFIG_PCMCIA_IOCTL is not set -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_PD6729=m -CONFIG_I82092=m -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 -CONFIG_HOTPLUG_PCI_SHPC=m - -# -# Executable file formats -# -CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m - -# -# Networking -# -CONFIG_NET=y - -# -# Networking options -# -# CONFIG_NETDEBUG is not set -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=y -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -CONFIG_NET_KEY=m -# CONFIG_NET_KEY_MIGRATE is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set -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 -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=y -CONFIG_TCP_CONG_CUBIC=m -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -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_DEFAULT_BIC=y -# CONFIG_DEFAULT_CUBIC is not set -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_WESTWOOD is not set -# 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_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -# CONFIG_IPV6_SUBTREES is not set -CONFIG_NETLABEL=y -CONFIG_NETWORK_SECMARK=y -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -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 -# CONFIG_NF_CONNTRACK_SECMARK is not set -# CONFIG_NF_CONNTRACK_EVENTS is not set -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -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_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -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_HASHLIMIT=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_PROC_COMPAT=y -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_IPRANGE=m -CONFIG_IP_NF_MATCH_TOS=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_SAME=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration (EXPERIMENTAL) -# -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_OWNER=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_RAW=m - -# -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m - -# -# Bridge: Netfilter Configuration -# -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -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 -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -# CONFIG_DECNET_ROUTER is not set -CONFIG_LLC=y -CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_LTPC=m -CONFIG_COPS=m -CONFIG_COPS_DAYNA=y -CONFIG_COPS_TANGENT=y -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y -CONFIG_WAN_ROUTER=m - -# -# QoS and/or fair queueing -# -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 -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -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_IND=y -CONFIG_NET_ESTIMATOR=y - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -CONFIG_HAMRADIO=y - -# -# Packet Radio protocols -# -CONFIG_AX25=m -# CONFIG_AX25_DAMA_SLAVE is not set -CONFIG_NETROM=m -CONFIG_ROSE=m - -# -# AX.25 network device drivers -# -CONFIG_MKISS=m -CONFIG_6PACK=m -CONFIG_BPQETHER=m -CONFIG_SCC=m -CONFIG_SCC_DELAY=y -CONFIG_SCC_TRXECHO=y -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_BAYCOM_PAR=m -CONFIG_BAYCOM_EPP=m -CONFIG_YAM=m -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m - -# -# Old SIR device drivers -# - -# -# Old Serial dongle support -# - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_TOSHIBA_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -CONFIG_MCS_FIR=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_CMTP=m -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUSB=m -CONFIG_BT_HCIUSB_SCO=y -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -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 - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -# 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 -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_FTL=m -CONFIG_NFTL=m -CONFIG_NFTL_RW=y -CONFIG_INFTL=m -CONFIG_RFD_FTL=m -CONFIG_SSFDC=m - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -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 -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=m -CONFIG_MTD_PHYSMAP_START=0x8000000 -CONFIG_MTD_PHYSMAP_LEN=0x4000000 -CONFIG_MTD_PHYSMAP_BANKWIDTH=2 -CONFIG_MTD_PNC2000=m -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -CONFIG_MTD_TS5500=m -CONFIG_MTD_SBC_GXX=m -CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m -CONFIG_MTD_ESB2ROM=m -CONFIG_MTD_CK804XROM=m -CONFIG_MTD_SCB2_FLASH=m -CONFIG_MTD_NETtel=m -CONFIG_MTD_DILNETPC=m -CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 -CONFIG_MTD_L440GX=m -CONFIG_MTD_PCI=m -CONFIG_MTD_PLATRAM=m - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -CONFIG_MTD_PMC551_BUGFIX=y -# CONFIG_MTD_PMC551_DEBUG is not set -CONFIG_MTD_DATAFLASH=m -CONFIG_MTD_M25P80=m -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLOCK2MTD=m - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -CONFIG_MTD_DOC2001PLUS=m -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_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_ONENAND=m -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -CONFIG_MTD_ONENAND_OTP=y - -# -# Parallel port support -# -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -# CONFIG_PARPORT_PC_FIFO is not set -# CONFIG_PARPORT_PC_SUPERIO is not set -CONFIG_PARPORT_PC_PCMCIA=m -# CONFIG_PARPORT_GSC is not set -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 - -# -# Protocols -# -CONFIG_ISAPNP=y -CONFIG_PNPBIOS=y -CONFIG_PNPBIOS_PROC_FS=y -CONFIG_PNPACPI=y - -# -# Block devices -# -CONFIG_BLK_DEV_FD=y -CONFIG_BLK_DEV_XD=m -CONFIG_PARIDE=m - -# -# Parallel IDE high-level drivers -# -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m - -# -# Parallel IDE protocol modules -# -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_BPCK6=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -CONFIG_PARIDE_EPATC8=y -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -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_CISS_SCSI_TAPE=y -CONFIG_BLK_DEV_DAC960=y -CONFIG_BLK_DEV_UMEM=m -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -CONFIG_CDROM_PKTCDVD_WCACHE=y -CONFIG_ATA_OVER_ETH=m - -# -# Misc devices -# -CONFIG_IBM_ASM=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_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -# CONFIG_BLK_DEV_HD_IDE is not set -CONFIG_BLK_DEV_IDEDISK=y -CONFIG_IDEDISK_MULTI_MODE=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_IDETAPE=m -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 - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_CMD640=y -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPNP=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_SHARE_IRQ=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_OPTI621=y -CONFIG_BLK_DEV_RZ1000=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -# CONFIG_IDEDMA_ONLYDISK is not set -CONFIG_BLK_DEV_AEC62XX=y -CONFIG_BLK_DEV_ALI15X3=y -# CONFIG_WDC_ALI15X3 is not set -CONFIG_BLK_DEV_AMD74XX=y -CONFIG_BLK_DEV_ATIIXP=y -CONFIG_BLK_DEV_CMD64X=y -CONFIG_BLK_DEV_TRIFLEX=y -CONFIG_BLK_DEV_CY82C693=y -CONFIG_BLK_DEV_CS5520=y -CONFIG_BLK_DEV_CS5530=y -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_HPT34X=y -# CONFIG_HPT34X_AUTODMA is not set -CONFIG_BLK_DEV_HPT366=y -CONFIG_BLK_DEV_JMICRON=y -CONFIG_BLK_DEV_SC1200=y -CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_IT8213=y -CONFIG_BLK_DEV_IT821X=y -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=y -CONFIG_PDC202XX_BURST=y -CONFIG_BLK_DEV_PDC202XX_NEW=y -CONFIG_BLK_DEV_SVWKS=y -CONFIG_BLK_DEV_SIIMAGE=y -CONFIG_BLK_DEV_SIS5513=y -CONFIG_BLK_DEV_SLC90E66=y -CONFIG_BLK_DEV_TRM290=y -CONFIG_BLK_DEV_VIA82CXXX=y -CONFIG_BLK_DEV_TC86C001=y -# CONFIG_IDE_ARM is not set -CONFIG_IDE_CHIPSETS=y - -# -# Note: most of these also require special kernel boot parameters -# -CONFIG_BLK_DEV_4DRIVES=y -CONFIG_BLK_DEV_ALI14XX=m -CONFIG_BLK_DEV_DTC2278=m -CONFIG_BLK_DEV_HT6560B=m -CONFIG_BLK_DEV_QD65XX=m -CONFIG_BLK_DEV_UMC8672=m -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -# CONFIG_BLK_DEV_HD is not set - -# -# SCSI device support -# -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=y -CONFIG_SCSI_TGT=m -CONFIG_SCSI_NETLINK=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=y -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=y -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_LIBSAS_DEBUG=y - -# -# SCSI low-level drivers -# -CONFIG_ISCSI_TCP=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_7000FASST=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AHA152X=m -CONFIG_SCSI_AHA1542=m -CONFIG_SCSI_AHA1740=m -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 -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 -CONFIG_SCSI_AIC94XX=m -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_IN2000=m -CONFIG_SCSI_ARCMSR=m -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=y -# CONFIG_SCSI_OMIT_FLASHPOINT is not set -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_DTC3280=m -CONFIG_SCSI_EATA=m -# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set -# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m -CONFIG_SCSI_FD_MCS=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_GENERIC_NCR5380=m -CONFIG_SCSI_GENERIC_NCR5380_MMIO=m -CONFIG_SCSI_GENERIC_NCR53C400=y -CONFIG_SCSI_IBMMCA=m -CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y -CONFIG_IBMMCA_SCSI_DEV_RESET=y -CONFIG_SCSI_IPS=y -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_NCR53C406A=m -CONFIG_SCSI_NCR_D700=m -CONFIG_SCSI_STEX=y -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=m -# CONFIG_SCSI_IPR_TRACE is not set -# CONFIG_SCSI_IPR_DUMP is not set -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 -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -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 -CONFIG_SCSI_T128=m -CONFIG_SCSI_U14_34F=m -# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set -# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set -CONFIG_SCSI_U14_34F_MAX_TAGS=8 -CONFIG_SCSI_ULTRASTOR=m -CONFIG_SCSI_NSP32=m -CONFIG_SCSI_DEBUG=m -CONFIG_SCSI_SRP=m - -# -# PCMCIA SCSI adapter support -# -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_SATA_AHCI=y -CONFIG_SATA_SVW=m -CONFIG_ATA_PIIX=y -CONFIG_SATA_MV=m -CONFIG_SATA_NV=y -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_PROMISE=y -CONFIG_SATA_SX4=y -CONFIG_SATA_SIL=y -CONFIG_SATA_SIL24=y -CONFIG_SATA_SIS=y -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_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5535=m -CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=m -CONFIG_ATA_GENERIC=m -CONFIG_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_HPT3X3=m -CONFIG_PATA_ISAPNP=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_IT8213=m -CONFIG_PATA_JMICRON=y -CONFIG_PATA_LEGACY=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_QDI=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RZ1000=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_SIL680=m -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_RAID456=m -CONFIG_MD_RAID5_RESHAPE=y -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=m -# CONFIG_DM_SNAPSHOT is not set -# CONFIG_DM_MIRROR is not set -# CONFIG_DM_ZERO is not set -# CONFIG_DM_MULTIPATH is not set - -# -# Fusion MPT device support -# -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -CONFIG_FUSION_LAN=m - -# -# IEEE 1394 (FireWire) support -# -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 -# -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_OHCI1394=m - -# -# Protocol Drivers -# -CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -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 -CONFIG_I2O_CONFIG=m -CONFIG_I2O_CONFIG_OLD_IOCTL=y -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_NETDEVICES=y -CONFIG_IFB=m -CONFIG_DUMMY=m -CONFIG_BONDING=m -CONFIG_EQUALIZER=m -CONFIG_TUN=m -CONFIG_NET_SB1000=m - -# -# ARCnet devices -# -CONFIG_ARCNET=m -CONFIG_ARCNET_1201=m -CONFIG_ARCNET_1051=m -CONFIG_ARCNET_RAW=m -CONFIG_ARCNET_CAP=m -CONFIG_ARCNET_COM90xx=m -CONFIG_ARCNET_COM90xxIO=m -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 - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_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 -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m -CONFIG_EL2=m -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_EL3=m -CONFIG_3C515=m -CONFIG_ELMC=m -CONFIG_ELMC_II=m -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_LANCE=m -CONFIG_NET_VENDOR_SMC=y -CONFIG_WD80x3=m -CONFIG_ULTRAMCA=m -CONFIG_ULTRA=m -CONFIG_ULTRA32=m -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 -# CONFIG_TULIP_MWI is not set -CONFIG_TULIP_MMIO=y -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_PCMCIA_XIRCOM=m -CONFIG_AT1700=m -CONFIG_DEPCA=m -CONFIG_HP100=m -CONFIG_NET_ISA=y -CONFIG_E2100=m -CONFIG_EWRK3=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m -CONFIG_LP486E=m -CONFIG_ETH16I=m -CONFIG_NE2000=m -CONFIG_ZNET=m -CONFIG_SEEQ8005=m -CONFIG_NE2_MCA=m -CONFIG_IBMLANA=m -CONFIG_NET_PCI=y -CONFIG_PCNET32=m -# CONFIG_PCNET32_NAPI is not set -CONFIG_AMD8111_ETH=m -# CONFIG_AMD8111E_NAPI is not set -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_ADAPTEC_STARFIRE_NAPI=y -CONFIG_AC3200=m -CONFIG_APRICOT=m -CONFIG_B44=m -CONFIG_FORCEDETH=m -# CONFIG_FORCEDETH_NAPI is not set -CONFIG_CS89x0=m -CONFIG_DGRS=m -CONFIG_EEPRO100=m -CONFIG_E100=m -CONFIG_LNE390=m -CONFIG_FEALNX=m -CONFIG_NATSEMI=m -CONFIG_NE2K_PCI=m -CONFIG_NE3210=m -CONFIG_ES3210=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -CONFIG_8139TOO_PIO=y -# CONFIG_8139TOO_TUNE_TWISTER is not set -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_SIS900=m -CONFIG_EPIC100=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m -CONFIG_VIA_RHINE=m -CONFIG_VIA_RHINE_MMIO=y -# CONFIG_VIA_RHINE_NAPI is not set -CONFIG_SC92031=m -CONFIG_NET_POCKET=y -CONFIG_ATP=m -CONFIG_DE600=m -CONFIG_DE620=m - -# -# Ethernet (1000 Mbit) -# -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set -# CONFIG_R8169_VLAN is not set -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_SK98LIN=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_QLA3XXX=m -CONFIG_ATL1=m - -# -# Ethernet (10000 Mbit) -# -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T1_NAPI=y -CONFIG_CHELSIO_T3=m -CONFIG_IXGB=m -CONFIG_IXGB_NAPI=y -CONFIG_S2IO=m -CONFIG_S2IO_NAPI=y -CONFIG_MYRI10GE=m -CONFIG_NETXEN_NIC=m - -# -# Token Ring devices -# -CONFIG_TR=y -CONFIG_IBMTR=m -CONFIG_IBMOL=m -CONFIG_IBMLS=m -CONFIG_3C359=m -CONFIG_TMS380TR=m -CONFIG_TMSPCI=m -CONFIG_SKISA=m -CONFIG_PROTEON=m -CONFIG_ABYSS=m -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) -# -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_PCMCIA_RAYCS=m - -# -# Wireless 802.11b ISA/PCI cards support -# -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -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_DEBUG is not set -CONFIG_AIRO=m -CONFIG_HERMES=m -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -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_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_BCM43XX=m -# CONFIG_BCM43XX_DEBUG is not set -CONFIG_BCM43XX_DMA=y -CONFIG_BCM43XX_PIO=y -CONFIG_BCM43XX_DMA_AND_PIO_MODE=y -# CONFIG_BCM43XX_DMA_MODE is not set -# CONFIG_BCM43XX_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_NET_WIRELESS=y - -# -# PCMCIA network device support -# -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_SMC91C92=m -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 -CONFIG_LANMEDIA=m -CONFIG_SEALEVEL_4021=m -CONFIG_HDLC=m -CONFIG_HDLC_RAW=m -CONFIG_HDLC_RAW_ETH=m -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC_PPP=m -CONFIG_HDLC_X25=m -CONFIG_PCI200SYN=m -CONFIG_WANXL=m -CONFIG_PC300=m -CONFIG_PC300_MLPPP=y - -# -# Cyclades-PC300 MLPPP support is disabled. -# - -# -# Refer to the file README.mlppp, provided by PC300 package. -# -CONFIG_PC300TOO=m -CONFIG_N2=m -CONFIG_C101=m -CONFIG_FARSYNC=m -CONFIG_DSCC4=m -# CONFIG_DSCC4_PCISYNC is not set -# CONFIG_DSCC4_PCI_RST is not set -CONFIG_DLCI=m -CONFIG_DLCI_MAX=8 -CONFIG_SDLA=m -CONFIG_WAN_ROUTER_DRIVERS=m -CONFIG_CYCLADES_SYNC=m -CONFIG_CYCLOMX_X25=y -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m -CONFIG_SBNI=m -# CONFIG_SBNI_MULTILINE is not set - -# -# ATM drivers -# -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -# CONFIG_ATM_NICSTAR_USE_SUNI is not set -# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E_MAYBE=m -# CONFIG_ATM_FORE200E_PCA is not set -CONFIG_ATM_HE=m -# CONFIG_ATM_HE_USE_SUNI is not set -CONFIG_FDDI=y -CONFIG_DEFXX=m -# CONFIG_DEFXX_MMIO is not set -CONFIG_SKFP=m -CONFIG_HIPPI=y -CONFIG_ROADRUNNER=m -# CONFIG_ROADRUNNER_LARGE_RINGS is not set -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set -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 -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -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 -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_T1ISA=m -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 -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 - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=y - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_TSDEV=m -CONFIG_INPUT_TSDEV_SCREEN_X=240 -CONFIG_INPUT_TSDEV_SCREEN_Y=320 -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_INPORT=m -CONFIG_MOUSE_ATIXL=y -CONFIG_MOUSE_LOGIBM=m -CONFIG_MOUSE_PC110PAD=m -CONFIG_MOUSE_VSXXXAA=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -# CONFIG_JOYSTICK_JOYDUMP is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_WISTRON_BTNS=m -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_UINPUT=m - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_COMPUTONE=m -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -CONFIG_DIGIEPCA=m -CONFIG_ESPSERIAL=m -CONFIG_MOXA_INTELLIO=m -CONFIG_MOXA_SMARTIO=m -CONFIG_MOXA_SMARTIO_NEW=m -CONFIG_ISI=m -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -CONFIG_SYNCLINK_GT=m -CONFIG_N_HDLC=m -CONFIG_SPECIALIX=m -CONFIG_SPECIALIX_RTSCTS=y -CONFIG_SX=m -CONFIG_RIO=m -# CONFIG_RIO_OLDPCI is not set -CONFIG_STALDRV=y - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_FOURPORT=m -CONFIG_SERIAL_8250_ACCENT=m -CONFIG_SERIAL_8250_BOCA=m -CONFIG_SERIAL_8250_EXAR_ST16C554=m -CONFIG_SERIAL_8250_HUB6=m -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_8250_MCA=m - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_JSM=m -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 -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 - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_SC520_WDT=m -CONFIG_EUROTECH_WDT=m -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 -CONFIG_PC87413_WDT=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_CPU5_WDT=m -CONFIG_SMSC37B787_WDT=m -CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m - -# -# ISA-based Watchdog Cards -# -CONFIG_PCWATCHDOG=m -CONFIG_MIXCOMWD=m -CONFIG_WDT=m -CONFIG_WDT_501=y - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_INTEL=y -CONFIG_HW_RANDOM_AMD=y -CONFIG_HW_RANDOM_GEODE=y -CONFIG_HW_RANDOM_VIA=y -CONFIG_NVRAM=m -CONFIG_RTC=y -CONFIG_DTLK=m -CONFIG_R3964=m -CONFIG_APPLICOM=m -CONFIG_SONYPI=m -CONFIG_AGP=m -CONFIG_AGP_ALI=m -CONFIG_AGP_ATI=m -CONFIG_AGP_AMD=m -CONFIG_AGP_AMD64=m -CONFIG_AGP_INTEL=m -CONFIG_AGP_NVIDIA=m -CONFIG_AGP_SIS=m -CONFIG_AGP_SWORKS=m -CONFIG_AGP_VIA=m -CONFIG_AGP_EFFICEON=m -CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m -CONFIG_DRM_I915=m -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m - -# -# PCMCIA character devices -# -CONFIG_SYNCLINK_CS=m -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m -CONFIG_MWAVE=m -CONFIG_PC8736x_GPIO=m -CONFIG_NSC_GPIO=m -CONFIG_CS5535_GPIO=m -# CONFIG_RAW_DRIVER is not set -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_I2C=m -CONFIG_I2C_CHARDEV=m - -# -# I2C Algorithms -# -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCF=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -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_SCx200_ACB=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -# CONFIG_I2C_STUB is not set -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m -CONFIG_I2C_VOODOO3=m -CONFIG_I2C_PCA_ISA=m - -# -# Miscellaneous I2C Chip support -# -CONFIG_SENSORS_DS1337=m -CONFIG_SENSORS_DS1374=m -CONFIG_SENSORS_EEPROM=m -CONFIG_SENSORS_PCF8574=m -CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_MAX6875=m -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# SPI support -# -CONFIG_SPI=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_BITBANG=m -# CONFIG_SPI_BUTTERFLY is not set - -# -# SPI Protocol Masters -# -CONFIG_SPI_AT25=m - -# -# Dallas's 1-wire bus -# -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m - -# -# 1-wire Slaves -# -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_HWMON=y -CONFIG_HWMON_VID=m -CONFIG_SENSORS_ABITUGURU=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_FSCHER=m -CONFIG_SENSORS_FSCPOS=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_VIA686A=m -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_HDAPS=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_SM501=m - -# -# Multimedia devices -# -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_ADV_DEBUG is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TDA9875=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA7111=m -CONFIG_VIDEO_SAA7114=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_VPX3220=m -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_VIVI=m -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y -CONFIG_VIDEO_SAA6588=m -CONFIG_VIDEO_PMS=m -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_CPIA=m -CONFIG_VIDEO_CPIA_PP=m -CONFIG_VIDEO_CPIA_USB=m -CONFIG_VIDEO_CPIA2=m -CONFIG_VIDEO_SAA5246A=m -CONFIG_VIDEO_SAA5249=m -CONFIG_TUNER_3036=m -CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DPC=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CAFE_CCIC=m - -# -# V4L USB devices -# -CONFIG_VIDEO_PVRUSB2=m -# CONFIG_VIDEO_PVRUSB2_29XXX is not set -# CONFIG_VIDEO_PVRUSB2_24XXX is not set -# CONFIG_VIDEO_PVRUSB2_SYSFS is not set -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m -CONFIG_USB_IBMCAM=m -CONFIG_USB_KONICAWC=m -CONFIG_USB_QUICKCAM_MESSENGER=m -CONFIG_USB_ET61X251=m -CONFIG_VIDEO_OVCAMCHIP=m -CONFIG_USB_W9968CF=m -CONFIG_USB_OV511=m -CONFIG_USB_SE401=m -CONFIG_USB_SN9C102=m -CONFIG_USB_STV680=m -CONFIG_USB_ZC0301=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set - -# -# Radio Adapters -# -CONFIG_RADIO_CADET=m -CONFIG_RADIO_RTRACK=m -CONFIG_RADIO_RTRACK2=m -CONFIG_RADIO_AZTECH=m -CONFIG_RADIO_GEMTEK=m -CONFIG_RADIO_GEMTEK_PCI=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_MAESTRO=m -CONFIG_RADIO_SF16FMI=m -CONFIG_RADIO_SF16FMR2=m -CONFIG_RADIO_TERRATEC=m -CONFIG_RADIO_TRUST=m -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 - -# -# Supported SAA7146 based PCI Adapters -# -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m - -# -# Supported USB Adapters -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_DVB_CINERGYT2=m -# CONFIG_DVB_CINERGYT2_TUNING is not set - -# -# Supported FlexCopII (B2C2) Adapters -# -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set - -# -# Supported BT878 Adapters -# -CONFIG_DVB_BT8XX=m - -# -# Supported Pluto2 Adapters -# -CONFIG_DVB_PLUTO2=m - -# -# Supported DVB Frontends -# - -# -# Customise DVB Frontends -# -# CONFIG_DVB_FE_CUSTOMISE is not set - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_STV0299=m -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_MT312=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_TDA10086=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m - -# -# Tuners/PLL support -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUNER_QT1010=m -CONFIG_DVB_TUNER_MT2060=m -CONFIG_DVB_TUNER_LGH06XF=m - -# -# Miscellaneous devices -# -CONFIG_DVB_LNBP21=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_TUA6100=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_BUF=m -CONFIG_VIDEO_BUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_USB_DABUSB=m - -# -# Graphics support -# -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_BACKLIGHT_PROGEAR=m -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SVGALIB=m -# CONFIG_FB_MACMODES is not set -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m -CONFIG_FB_VESA=y -# CONFIG_FB_HGA is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -CONFIG_FB_I810=m -CONFIG_FB_I810_GTF=y -# CONFIG_FB_I810_I2C is not set -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y -CONFIG_FB_MATROX=m -# CONFIG_FB_MATROX_MILLENIUM is not set -# CONFIG_FB_MATROX_MYSTIQUE is not set -CONFIG_FB_MATROX_G=y -CONFIG_FB_MATROX_I2C=m -CONFIG_FB_MATROX_MAVEN=m -CONFIG_FB_MATROX_MULTIHEAD=y -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -# CONFIG_FB_ATY_CT is not set -# CONFIG_FB_ATY_GX is not set -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -# CONFIG_FB_SAVAGE is not set -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_CYBLA is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_GEODE is not set -CONFIG_FB_SM501=m -# CONFIG_FB_VIRTUAL is not set - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_VIDEO_SELECT=y -CONFIG_MDA_CONSOLE=m -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set -# 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 - -# -# Sound -# -CONFIG_SOUND=y - -# -# Advanced Linux Sound Architecture -# -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_RTCTIMER=m -CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y -# CONFIG_SND_DYNAMIC_MINORS is not set -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set - -# -# Generic devices -# -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL4_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DUMMY=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_MTS64=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m -CONFIG_SND_PORTMAN2X4=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 -CONFIG_SND_ALS100=m -CONFIG_SND_AZT2320=m -CONFIG_SND_CMI8330=m -CONFIG_SND_CS4231=m -CONFIG_SND_CS4232=m -CONFIG_SND_CS4236=m -CONFIG_SND_DT019X=m -CONFIG_SND_ES968=m -CONFIG_SND_ES1688=m -CONFIG_SND_ES18XX=m -CONFIG_SND_GUS_SYNTH=m -CONFIG_SND_GUSCLASSIC=m -CONFIG_SND_GUSEXTREME=m -CONFIG_SND_GUSMAX=m -CONFIG_SND_INTERWAVE=m -CONFIG_SND_INTERWAVE_STB=m -CONFIG_SND_OPL3SA2=m -CONFIG_SND_OPTI92X_AD1848=m -CONFIG_SND_OPTI92X_CS4231=m -CONFIG_SND_OPTI93X=m -CONFIG_SND_MIRO=m -CONFIG_SND_SB8=m -CONFIG_SND_SB16=m -CONFIG_SND_SBAWE=m -CONFIG_SND_SB16_CSP=y -CONFIG_SND_SGALAXY=m -CONFIG_SND_SSCAPE=m -CONFIG_SND_WAVEFRONT=m - -# -# PCI devices -# -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AZT3328=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_FM801_TEA575X=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m -CONFIG_SND_AC97_POWER_SAVE=y - -# -# USB devices -# -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_USX2Y=m - -# -# PCMCIA devices -# -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m - -# -# SoC audio support -# -# CONFIG_SND_SOC is not set - -# -# Open Sound System -# -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m - -# -# HID Devices -# -CONFIG_HID=y -# CONFIG_HID_DEBUG is not set - -# -# USB support -# -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set -# CONFIG_USB_OTG is not set - -# -# USB Host Controller Drivers -# -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 -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -# - -# -# may also be needed; see USB_STORAGE Help for more information -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_DPCM=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -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 - -# -# USB port drivers -# -CONFIG_USB_USS720=m - -# -# USB Serial Converter support -# -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_AIRPRIME=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP2101=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_FUNSOFT=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_HP4X=m -CONFIG_USB_SERIAL_SAFE=m -CONFIG_USB_SERIAL_SAFE_PADDED=y -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -# CONFIG_USB_SERIAL_DEBUG is not set -CONFIG_USB_EZUSB=y - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_AUERSWALD=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_BERRY_CHARGE=m -CONFIG_USB_LED=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_PHIDGET=m -CONFIG_USB_PHIDGETKIT=m -CONFIG_USB_PHIDGETMOTORCONTROL=m -CONFIG_USB_PHIDGETSERVO=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -# CONFIG_USB_SISUSBVGA_CON is not set -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m - -# -# USB DSL modem support -# -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m - -# -# USB Gadget Support -# -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y -CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_PXA2XX 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_AT91 is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -CONFIG_USB_GADGET_DUALSPEED=y -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=m -# CONFIG_USB_ETH_RNDIS is not set -# CONFIG_USB_GADGETFS is not set -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 - -# -# MMC/SD Card support -# -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 - -# -# LED devices -# -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m - -# -# LED drivers -# - -# -# LED Triggers -# -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_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -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 - -# -# Reporting subsystems -# -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_MM_EDAC=m -CONFIG_EDAC_AMD76X=m -CONFIG_EDAC_E7XXX=m -CONFIG_EDAC_E752X=m -CONFIG_EDAC_I82875P=m -CONFIG_EDAC_I82860=m -CONFIG_EDAC_R82600=m -CONFIG_EDAC_POLL=y - -# -# Real Time Clock -# -CONFIG_RTC_LIB=m -CONFIG_RTC_CLASS=m - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=m -CONFIG_RTC_INTF_PROC=m -CONFIG_RTC_INTF_DEV=m -CONFIG_RTC_INTF_DEV_UIE_EMUL=y - -# -# 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_PCF8563=m -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 -CONFIG_RTC_DRV_V3020=m - -# -# DMA Engine support -# -CONFIG_DMA_ENGINE=y - -# -# DMA Clients -# -CONFIG_NET_DMA=y - -# -# DMA Devices -# -CONFIG_INTEL_IOATDMA=m - -# -# Auxiliary Display support -# -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 - -# -# Virtualization -# -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m - -# -# File systems -# -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -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_JBD2=m -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=y -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -CONFIG_JFS_STATISTICS=y -CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=y -CONFIG_XFS_QUOTA=y -CONFIG_XFS_SECURITY=y -CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_NOLOCK=m -CONFIG_GFS2_FS_LOCKING_DLM=m -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_DEBUG_MASKLOG=y -# CONFIG_MINIX_FS is not set -CONFIG_ROMFS_FS=m -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_QUOTA=y -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_DNOTIFY=y -CONFIG_AUTOFS_FS=m -CONFIG_AUTOFS4_FS=m -CONFIG_FUSE_FS=m - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -# CONFIG_MSDOS_FS is not set -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_HUGETLBFS is not set -# CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y -CONFIG_CONFIGFS_FS=m - -# -# Miscellaneous filesystems -# -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_RTIME=y -CONFIG_JFFS2_RUBIN=y -# CONFIG_JFFS2_CMODE_NONE is not set -CONFIG_JFFS2_CMODE_PRIORITY=y -# CONFIG_JFFS2_CMODE_SIZE is not set -CONFIG_CRAMFS=m -CONFIG_VXFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set - -# -# Network File Systems -# -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -CONFIG_NFS_V4=y -CONFIG_NFS_DIRECTIO=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -CONFIG_NFSD_V4=y -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_XATTR is not set -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_EXPERIMENTAL is not set -CONFIG_NCP_FS=m -CONFIG_NCPFS_PACKET_SIGNING=y -CONFIG_NCPFS_IOCTL_LOCKING=y -CONFIG_NCPFS_STRONG=y -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_NLS=y -CONFIG_NCPFS_EXTRAS=y -CONFIG_CODA_FS=m -# CONFIG_CODA_FS_OLD_API is not set -CONFIG_AFS_FS=m -CONFIG_RXRPC=m -# CONFIG_9P_FS is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -# CONFIG_MINIX_SUBPARTITION is not set -CONFIG_SOLARIS_X86_PARTITION=y -# CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_KARMA_PARTITION is not set -# CONFIG_EFI_PARTITION is not set - -# -# Native Language Support -# -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -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 - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set -CONFIG_ENABLE_MUST_CHECK=y -# CONFIG_MAGIC_SYSRQ is not set -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_BUGVERBOSE=y -CONFIG_EARLY_PRINTK=y -CONFIG_X86_FIND_SMP_CONFIG=y -CONFIG_X86_MPPARSE=y -CONFIG_DOUBLEFAULT=y - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y -CONFIG_SECURITY=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set -CONFIG_SECURITY_CAPABILITIES=m -CONFIG_SECURITY_ROOTPLUG=m -# CONFIG_SECURITY_SELINUX is not set - -# -# Cryptographic options -# -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_586=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_TEST=m - -# -# Hardware crypto devices -# -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_GEODE=m - -# -# Library routines -# -CONFIG_BITREVERSE=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_AUDIT_GENERIC=y -CONFIG_ZLIB_INFLATE=m -CONFIG_ZLIB_DEFLATE=m -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_PLIST=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_SMP=y -CONFIG_X86_HT=y -CONFIG_X86_BIOS_REBOOT=y -CONFIG_X86_TRAMPOLINE=y -CONFIG_KTIME_SCALAR=y - -CONFIG_SQUASHFS=n \ No newline at end of file diff --git a/source/kde-extra/kipi-plugins/FrugalBuild b/source/kde-extra/kipi-plugins/FrugalBuild deleted file mode 100644 index 0d1f580..0000000 --- a/source/kde-extra/kipi-plugins/FrugalBuild +++ /dev/null @@ -1,20 +0,0 @@ -# Compiling time: 3.85 SBU -# Maintainer: Janny - -pkgname=kipi-plugins -pkgver=0.1.4 -pkgrel=3 -pkgdesc="kipi-plugins is based in part on the work of the Independent JPEG Group." -license="GPL" -depends=('libkexif' 'libkipi' 'libgphoto2' 'imlib2' 'exiv2>=0.15' 'libkexiv2>=0.1.5-2' 'libkdcraw') -archs=('i686' 'x86_64') -groups=('kde-extra') -_F_sourceforge_dirname="kipi" -_F_sourceforge_ext=".tar.bz2" -_F_sourceforge_broken_up2date=1 -_F_kde_reconf=1 -Finclude kde sourceforge -Fconfopts="$Fconfopts --enable-closure" -sha1sums=('53d3609a257dfc0e429681438c60486cf4815fc6') - -# optimization OK diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 8b2a946..fd47151 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling time: 19.80 SBU -# Maintainer: AlexExtreme +# Compiling time: 18.33 SBU +# Maintainer: Janny # Contributor: VMiklos pkgname=firefox -pkgver=2.0.0.8 +pkgver=2.0.0.9 pkgrel=1 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/" diff --git a/source/xlib-extra/fvwm-devel/FrugalBuild b/source/xlib-extra/fvwm-devel/FrugalBuild deleted file mode 100644 index 0034c23..0000000 --- a/source/xlib-extra/fvwm-devel/FrugalBuild +++ /dev/null @@ -1,28 +0,0 @@ -# Compiling Time: 1.36 SBU -# Maintainer: Janny -# Contributor: VMiklos - -pkgname=fvwm-devel -origname=fvwm -pkgver=2.5.21 -pkgrel=1 -pkgdesc="An ICCCM-compliant multiple virtual desktop window manager, development release. " -url="http://www.fvwm.org" -depends=('libsm' 'libxinerama' 'readline' 'termcap' 'imlib' 'fribidi' 'libxft' 'libpng' 'libxpm') -groups=('xlib-extra') -conflicts=('fvwm') -archs=('i686' 'x86_64') -up2date="lynx -dump http://fvwm.org/download/|grep 'Unstable Release'|sed 's/.* (\([0-9\.]\+\)): .*/\1/'" -source=(ftp://ftp.fvwm.org/pub/$origname/version-2/$origname-$pkgver.tar.gz $origname.desktop xinitrc.$origname) -sha1sums=('d2b5390ee806d3d61d0cf8725d2598bc21acb858' \ - 'aac25fcdbbe3ef8c13d4eb92208b2e0d64fc4485' \ - '6ee65c9cb2ba144f47f8c619c8177607a248c5ab') - -build() { - Fcd $origname-$pkgver/ - Fbuild - Ffile etc/X11/sessions/$origname.desktop - Fexe etc/X11/xinit/xinitrc.$origname -} - -# optimization OK From janny at frugalware.org Sat Nov 3 09:18:18 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 09:18:21 2007 Subject: [Frugalware-git] frugalware-current: Revert "firefox-2.0.0.9-1-i686" Message-ID: <20071103081818.744C013A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b19359aaccb40920438039ac30af807dbdbd1809 commit b19359aaccb40920438039ac30af807dbdbd1809 Author: janny Date: Sat Nov 3 09:17:33 2007 +0100 Revert "firefox-2.0.0.9-1-i686" This reverts commit 6292e27adadcddbc29b2b0f2e57bf04fcf39c608. diff --git a/source/base-extra/kernel-fwlive/config b/source/base-extra/kernel-fwlive/config new file mode 100644 index 0000000..e549bb6 --- /dev/null +++ b/source/base-extra/kernel-fwlive/config @@ -0,0 +1,3681 @@ +# +# Automatically generated make config: don't edit +# +CONFIG_X86_32=y +CONFIG_GENERIC_TIME=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_SEMAPHORE_SLEEPERS=y +CONFIG_X86=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +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_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_CPUSETS=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +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 +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 + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_SMP=y +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_NUMAQ is not set +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_VISWS is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_ES7000 is not set +# CONFIG_PARAVIRT is not set +# CONFIG_M386 is not set +CONFIG_M486=y +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MCORE2 is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=7 +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_INTEL_USERCOPY=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +# CONFIG_SCHED_MC is not set +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_BKL=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_NONFATAL=m +CONFIG_X86_MCE_P4THERMAL=y +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +# CONFIG_HIGHPTE is not set +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +# CONFIG_EFI is not set +CONFIG_IRQBALANCE=y +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_PHYSICAL_START=0x100000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management options (ACPI, APM) +# +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_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_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=m +CONFIG_ACPI_BAY=m +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 +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +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_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 + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=m +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +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 +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m + +# +# shared options +# +# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set +CONFIG_X86_SPEEDSTEP_LIB=m +# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set + +# +# Bus options (PCI, PCMCIA, EISA, MCA, ISA) +# +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_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_PCI_MSI=y +CONFIG_HT_IRQ=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +CONFIG_EISA=y +# CONFIG_EISA_VLB_PRIMING is not set +CONFIG_EISA_PCI_EISA=y +CONFIG_EISA_VIRTUAL_ROOT=y +CONFIG_EISA_NAMES=y +CONFIG_MCA=y +CONFIG_MCA_LEGACY=y +CONFIG_MCA_PROC_FS=y +# CONFIG_SCx200 is not set +CONFIG_K8_NB=y + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +# CONFIG_PCMCIA_IOCTL is not set +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +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 +CONFIG_HOTPLUG_PCI_SHPC=m + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +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 +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +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_DEFAULT_BIC=y +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# 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_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_SUBTREES is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +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 +# CONFIG_NF_CONNTRACK_SECMARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +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_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +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_HASHLIMIT=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +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 +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set +CONFIG_LLC=y +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +CONFIG_ECONET_AUNUDP=y +CONFIG_ECONET_NATIVE=y +CONFIG_WAN_ROUTER=m + +# +# QoS and/or fair queueing +# +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 +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +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_IND=y +CONFIG_NET_ESTIMATOR=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +# CONFIG_AX25_DAMA_SLAVE is not set +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +CONFIG_SCC_DELAY=y +CONFIG_SCC_TRXECHO=y +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m + +# +# Old SIR device drivers +# + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_TOSHIBA_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +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 + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# 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 +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +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 +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_PNC2000=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_DILNETPC=m +CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_M25P80=m +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +CONFIG_MTD_DOC2001PLUS=m +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_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_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_MTD_ONENAND_OTP=y + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +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 + +# +# Protocols +# +CONFIG_ISAPNP=y +CONFIG_PNPBIOS=y +CONFIG_PNPBIOS_PROC_FS=y +CONFIG_PNPACPI=y + +# +# Block devices +# +CONFIG_BLK_DEV_FD=y +CONFIG_BLK_DEV_XD=m +CONFIG_PARIDE=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_BPCK6=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +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_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=y +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m + +# +# Misc devices +# +CONFIG_IBM_ASM=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_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +# CONFIG_BLK_DEV_HD_IDE is not set +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m +CONFIG_BLK_DEV_IDECD=y +CONFIG_BLK_DEV_IDETAPE=m +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 + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_CMD640=y +CONFIG_BLK_DEV_CMD640_ENHANCED=y +CONFIG_BLK_DEV_IDEPNP=y +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=y +CONFIG_BLK_DEV_OPTI621=y +CONFIG_BLK_DEV_RZ1000=y +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +# CONFIG_IDEDMA_ONLYDISK is not set +CONFIG_BLK_DEV_AEC62XX=y +CONFIG_BLK_DEV_ALI15X3=y +# CONFIG_WDC_ALI15X3 is not set +CONFIG_BLK_DEV_AMD74XX=y +CONFIG_BLK_DEV_ATIIXP=y +CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_TRIFLEX=y +CONFIG_BLK_DEV_CY82C693=y +CONFIG_BLK_DEV_CS5520=y +CONFIG_BLK_DEV_CS5530=y +CONFIG_BLK_DEV_CS5535=m +CONFIG_BLK_DEV_HPT34X=y +# CONFIG_HPT34X_AUTODMA is not set +CONFIG_BLK_DEV_HPT366=y +CONFIG_BLK_DEV_JMICRON=y +CONFIG_BLK_DEV_SC1200=y +CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_IT8213=y +CONFIG_BLK_DEV_IT821X=y +CONFIG_BLK_DEV_NS87415=m +CONFIG_BLK_DEV_PDC202XX_OLD=y +CONFIG_PDC202XX_BURST=y +CONFIG_BLK_DEV_PDC202XX_NEW=y +CONFIG_BLK_DEV_SVWKS=y +CONFIG_BLK_DEV_SIIMAGE=y +CONFIG_BLK_DEV_SIS5513=y +CONFIG_BLK_DEV_SLC90E66=y +CONFIG_BLK_DEV_TRM290=y +CONFIG_BLK_DEV_VIA82CXXX=y +CONFIG_BLK_DEV_TC86C001=y +# CONFIG_IDE_ARM is not set +CONFIG_IDE_CHIPSETS=y + +# +# Note: most of these also require special kernel boot parameters +# +CONFIG_BLK_DEV_4DRIVES=y +CONFIG_BLK_DEV_ALI14XX=m +CONFIG_BLK_DEV_DTC2278=m +CONFIG_BLK_DEV_HT6560B=m +CONFIG_BLK_DEV_QD65XX=m +CONFIG_BLK_DEV_UMC8672=m +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_LIBSAS_DEBUG=y + +# +# SCSI low-level drivers +# +CONFIG_ISCSI_TCP=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AHA1740=m +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 +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 +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=y +# CONFIG_SCSI_OMIT_FLASHPOINT is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_FD_MCS=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m +CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IBMMCA=m +CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y +CONFIG_IBMMCA_SCSI_DEV_RESET=y +CONFIG_SCSI_IPS=y +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_NCR53C406A=m +CONFIG_SCSI_NCR_D700=m +CONFIG_SCSI_STEX=y +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +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 +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +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 +CONFIG_SCSI_T128=m +CONFIG_SCSI_U14_34F=m +# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set +# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set +CONFIG_SCSI_U14_34F_MAX_TAGS=8 +CONFIG_SCSI_ULTRASTOR=m +CONFIG_SCSI_NSP32=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_SRP=m + +# +# PCMCIA SCSI adapter support +# +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_SATA_AHCI=y +CONFIG_SATA_SVW=m +CONFIG_ATA_PIIX=y +CONFIG_SATA_MV=m +CONFIG_SATA_NV=y +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_PROMISE=y +CONFIG_SATA_SX4=y +CONFIG_SATA_SIL=y +CONFIG_SATA_SIL24=y +CONFIG_SATA_SIS=y +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_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +CONFIG_PATA_ISAPNP=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_IT8213=m +CONFIG_PATA_JMICRON=y +CONFIG_PATA_LEGACY=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_SIL680=m +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_RAID456=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set + +# +# Fusion MPT device support +# +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m + +# +# IEEE 1394 (FireWire) support +# +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 +# +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocol Drivers +# +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +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 +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +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_NETDEVICES=y +CONFIG_IFB=m +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_NET_SB1000=m + +# +# ARCnet devices +# +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +CONFIG_ARCNET_CAP=m +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +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 + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_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 +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL1=m +CONFIG_EL2=m +CONFIG_ELPLUS=m +CONFIG_EL16=m +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_ELMC=m +CONFIG_ELMC_II=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_LANCE=m +CONFIG_NET_VENDOR_SMC=y +CONFIG_WD80x3=m +CONFIG_ULTRAMCA=m +CONFIG_ULTRA=m +CONFIG_ULTRA32=m +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 +# CONFIG_TULIP_MWI is not set +CONFIG_TULIP_MMIO=y +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_AT1700=m +CONFIG_DEPCA=m +CONFIG_HP100=m +CONFIG_NET_ISA=y +CONFIG_E2100=m +CONFIG_EWRK3=m +CONFIG_EEXPRESS=m +CONFIG_EEXPRESS_PRO=m +CONFIG_HPLAN_PLUS=m +CONFIG_HPLAN=m +CONFIG_LP486E=m +CONFIG_ETH16I=m +CONFIG_NE2000=m +CONFIG_ZNET=m +CONFIG_SEEQ8005=m +CONFIG_NE2_MCA=m +CONFIG_IBMLANA=m +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +# CONFIG_PCNET32_NAPI is not set +CONFIG_AMD8111_ETH=m +# CONFIG_AMD8111E_NAPI is not set +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_ADAPTEC_STARFIRE_NAPI=y +CONFIG_AC3200=m +CONFIG_APRICOT=m +CONFIG_B44=m +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_CS89x0=m +CONFIG_DGRS=m +CONFIG_EEPRO100=m +CONFIG_E100=m +CONFIG_LNE390=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_NE3210=m +CONFIG_ES3210=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +# CONFIG_VIA_RHINE_NAPI is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m + +# +# Ethernet (1000 Mbit) +# +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000_NAPI=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +# CONFIG_R8169_NAPI is not set +# CONFIG_R8169_VLAN is not set +CONFIG_SIS190=m +CONFIG_SKGE=m +CONFIG_SKY2=m +CONFIG_SK98LIN=m +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m + +# +# Ethernet (10000 Mbit) +# +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m +CONFIG_IXGB=m +CONFIG_IXGB_NAPI=y +CONFIG_S2IO=m +CONFIG_S2IO_NAPI=y +CONFIG_MYRI10GE=m +CONFIG_NETXEN_NIC=m + +# +# Token Ring devices +# +CONFIG_TR=y +CONFIG_IBMTR=m +CONFIG_IBMOL=m +CONFIG_IBMLS=m +CONFIG_3C359=m +CONFIG_TMS380TR=m +CONFIG_TMSPCI=m +CONFIG_SKISA=m +CONFIG_PROTEON=m +CONFIG_ABYSS=m +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) +# +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_PCMCIA_RAYCS=m + +# +# Wireless 802.11b ISA/PCI cards support +# +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +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_DEBUG is not set +CONFIG_AIRO=m +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +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_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_BCM43XX=m +# CONFIG_BCM43XX_DEBUG is not set +CONFIG_BCM43XX_DMA=y +CONFIG_BCM43XX_PIO=y +CONFIG_BCM43XX_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_DMA_MODE is not set +# CONFIG_BCM43XX_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +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 +CONFIG_LANMEDIA=m +CONFIG_SEALEVEL_4021=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_PPP=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +CONFIG_PC300=m +CONFIG_PC300_MLPPP=y + +# +# Cyclades-PC300 MLPPP support is disabled. +# + +# +# Refer to the file README.mlppp, provided by PC300 package. +# +CONFIG_PC300TOO=m +CONFIG_N2=m +CONFIG_C101=m +CONFIG_FARSYNC=m +CONFIG_DSCC4=m +# CONFIG_DSCC4_PCISYNC is not set +# CONFIG_DSCC4_PCI_RST is not set +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +CONFIG_SDLA=m +CONFIG_WAN_ROUTER_DRIVERS=m +CONFIG_CYCLADES_SYNC=m +CONFIG_CYCLOMX_X25=y +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +CONFIG_SBNI=m +# CONFIG_SBNI_MULTILINE is not set + +# +# ATM drivers +# +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E_MAYBE=m +# CONFIG_ATM_FORE200E_PCA is not set +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +CONFIG_HIPPI=y +CONFIG_ROADRUNNER=m +# CONFIG_ROADRUNNER_LARGE_RINGS is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=m +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +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 +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +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 +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +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 +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 + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_TSDEV=m +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_INPORT=m +CONFIG_MOUSE_ATIXL=y +CONFIG_MOUSE_LOGIBM=m +CONFIG_MOUSE_PC110PAD=m +CONFIG_MOUSE_VSXXXAA=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +# CONFIG_JOYSTICK_JOYDUMP is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_COMPUTONE=m +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_DIGIEPCA=m +CONFIG_ESPSERIAL=m +CONFIG_MOXA_INTELLIO=m +CONFIG_MOXA_SMARTIO=m +CONFIG_MOXA_SMARTIO_NEW=m +CONFIG_ISI=m +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_N_HDLC=m +CONFIG_SPECIALIX=m +CONFIG_SPECIALIX_RTSCTS=y +CONFIG_SX=m +CONFIG_RIO=m +# CONFIG_RIO_OLDPCI is not set +CONFIG_STALDRV=y + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_FOURPORT=m +CONFIG_SERIAL_8250_ACCENT=m +CONFIG_SERIAL_8250_BOCA=m +CONFIG_SERIAL_8250_EXAR_ST16C554=m +CONFIG_SERIAL_8250_HUB6=m +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_MCA=m + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +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 + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_SC520_WDT=m +CONFIG_EUROTECH_WDT=m +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 +CONFIG_PC87413_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m +CONFIG_WDT_501=y + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_INTEL=y +CONFIG_HW_RANDOM_AMD=y +CONFIG_HW_RANDOM_GEODE=y +CONFIG_HW_RANDOM_VIA=y +CONFIG_NVRAM=m +CONFIG_RTC=y +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m +CONFIG_DRM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_I810=m +CONFIG_DRM_I830=m +CONFIG_DRM_I915=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_CS5535_GPIO=m +# CONFIG_RAW_DRIVER is not set +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_I2C=m +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +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_SCx200_ACB=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +# CONFIG_I2C_STUB is not set +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m +CONFIG_I2C_VOODOO3=m +CONFIG_I2C_PCA_ISA=m + +# +# Miscellaneous I2C Chip support +# +CONFIG_SENSORS_DS1337=m +CONFIG_SENSORS_DS1374=m +CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_PCF8574=m +CONFIG_SENSORS_PCA9539=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_MAX6875=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_AT25=m + +# +# Dallas's 1-wire bus +# +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +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_HWMON=y +CONFIG_HWMON_VID=m +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_FSCHER=m +CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_HDAPS=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_SM501=m + +# +# Multimedia devices +# +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_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_PP=m +CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_TUNER_3036=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CAFE_CCIC=m + +# +# V4L USB devices +# +CONFIG_VIDEO_PVRUSB2=m +# CONFIG_VIDEO_PVRUSB2_29XXX is not set +# CONFIG_VIDEO_PVRUSB2_24XXX is not set +# CONFIG_VIDEO_PVRUSB2_SYSFS is not set +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set + +# +# Radio Adapters +# +CONFIG_RADIO_CADET=m +CONFIG_RADIO_RTRACK=m +CONFIG_RADIO_RTRACK2=m +CONFIG_RADIO_AZTECH=m +CONFIG_RADIO_GEMTEK=m +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m +CONFIG_RADIO_SF16FMI=m +CONFIG_RADIO_SF16FMR2=m +CONFIG_RADIO_TERRATEC=m +CONFIG_RADIO_TRUST=m +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 + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +# CONFIG_DVB_CINERGYT2_TUNING is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_MT312=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_TDA10086=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m + +# +# Tuners/PLL support +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUNER_QT1010=m +CONFIG_DVB_TUNER_MT2060=m +CONFIG_DVB_TUNER_LGH06XF=m + +# +# Miscellaneous devices +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_TUA6100=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_BUF=m +CONFIG_VIDEO_BUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_USB_DABUSB=m + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SVGALIB=m +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_VESA=y +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +# CONFIG_FB_I810_I2C is not set +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +CONFIG_FB_MATROX=m +# CONFIG_FB_MATROX_MILLENIUM is not set +# CONFIG_FB_MATROX_MYSTIQUE is not set +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_MATROX_MULTIHEAD=y +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY128_BACKLIGHT=y +CONFIG_FB_ATY=m +# CONFIG_FB_ATY_CT is not set +# CONFIG_FB_ATY_GX is not set +CONFIG_FB_ATY_BACKLIGHT=y +CONFIG_FB_S3=m +# CONFIG_FB_SAVAGE is not set +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_CYBLA is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_GEODE is not set +CONFIG_FB_SM501=m +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_VIDEO_SELECT=y +CONFIG_MDA_CONSOLE=m +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# 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 + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_RTCTIMER=m +CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=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 +CONFIG_SND_ALS100=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4232=m +CONFIG_SND_CS4236=m +CONFIG_SND_DT019X=m +CONFIG_SND_ES968=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_GUS_SYNTH=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +CONFIG_SND_SB8=m +CONFIG_SND_SB16=m +CONFIG_SND_SBAWE=m +CONFIG_SND_SB16_CSP=y +CONFIG_SND_SGALAXY=m +CONFIG_SND_SSCAPE=m +CONFIG_SND_WAVEFRONT=m + +# +# PCI devices +# +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_AC97_POWER_SAVE=y + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m + +# +# PCMCIA devices +# +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +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 +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +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 + +# +# USB port drivers +# +CONFIG_USB_USS720=m + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m + +# +# USB DSL modem support +# +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_PXA2XX 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_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +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 + +# +# MMC/SD Card support +# +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 + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# + +# +# LED Triggers +# +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_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +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 + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m +CONFIG_EDAC_POLL=y + +# +# Real Time Clock +# +CONFIG_RTC_LIB=m +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=m +CONFIG_RTC_INTF_PROC=m +CONFIG_RTC_INTF_DEV=m +CONFIG_RTC_INTF_DEV_UIE_EMUL=y + +# +# 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_PCF8563=m +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 +CONFIG_RTC_DRV_V3020=m + +# +# DMA Engine support +# +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m + +# +# Auxiliary Display support +# +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 + +# +# Virtualization +# +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4DEV_FS=m +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_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=y +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_NOLOCK=m +CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_CRAMFS=m +CONFIG_VXFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +CONFIG_AFS_FS=m +CONFIG_RXRPC=m +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +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 + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +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_BUGVERBOSE=y +CONFIG_EARLY_PRINTK=y +CONFIG_X86_FIND_SMP_CONFIG=y +CONFIG_X86_MPPARSE=y +CONFIG_DOUBLEFAULT=y + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_DEBUG_PROC_KEYS=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_CAPABILITIES=m +CONFIG_SECURITY_ROOTPLUG=m +# CONFIG_SECURITY_SELINUX is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m + +# +# Hardware crypto devices +# +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_X86_SMP=y +CONFIG_X86_HT=y +CONFIG_X86_BIOS_REBOOT=y +CONFIG_X86_TRAMPOLINE=y +CONFIG_KTIME_SCALAR=y + +CONFIG_SQUASHFS=n \ No newline at end of file diff --git a/source/kde-extra/kipi-plugins/FrugalBuild b/source/kde-extra/kipi-plugins/FrugalBuild new file mode 100644 index 0000000..0d1f580 --- /dev/null +++ b/source/kde-extra/kipi-plugins/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling time: 3.85 SBU +# Maintainer: Janny + +pkgname=kipi-plugins +pkgver=0.1.4 +pkgrel=3 +pkgdesc="kipi-plugins is based in part on the work of the Independent JPEG Group." +license="GPL" +depends=('libkexif' 'libkipi' 'libgphoto2' 'imlib2' 'exiv2>=0.15' 'libkexiv2>=0.1.5-2' 'libkdcraw') +archs=('i686' 'x86_64') +groups=('kde-extra') +_F_sourceforge_dirname="kipi" +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_broken_up2date=1 +_F_kde_reconf=1 +Finclude kde sourceforge +Fconfopts="$Fconfopts --enable-closure" +sha1sums=('53d3609a257dfc0e429681438c60486cf4815fc6') + +# optimization OK diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index fd47151..8b2a946 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling time: 18.33 SBU -# Maintainer: Janny +# Compiling time: 19.80 SBU +# Maintainer: AlexExtreme # Contributor: VMiklos pkgname=firefox -pkgver=2.0.0.9 +pkgver=2.0.0.8 pkgrel=1 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/" diff --git a/source/xlib-extra/fvwm-devel/FrugalBuild b/source/xlib-extra/fvwm-devel/FrugalBuild new file mode 100644 index 0000000..0034c23 --- /dev/null +++ b/source/xlib-extra/fvwm-devel/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 1.36 SBU +# Maintainer: Janny +# Contributor: VMiklos + +pkgname=fvwm-devel +origname=fvwm +pkgver=2.5.21 +pkgrel=1 +pkgdesc="An ICCCM-compliant multiple virtual desktop window manager, development release. " +url="http://www.fvwm.org" +depends=('libsm' 'libxinerama' 'readline' 'termcap' 'imlib' 'fribidi' 'libxft' 'libpng' 'libxpm') +groups=('xlib-extra') +conflicts=('fvwm') +archs=('i686' 'x86_64') +up2date="lynx -dump http://fvwm.org/download/|grep 'Unstable Release'|sed 's/.* (\([0-9\.]\+\)): .*/\1/'" +source=(ftp://ftp.fvwm.org/pub/$origname/version-2/$origname-$pkgver.tar.gz $origname.desktop xinitrc.$origname) +sha1sums=('d2b5390ee806d3d61d0cf8725d2598bc21acb858' \ + 'aac25fcdbbe3ef8c13d4eb92208b2e0d64fc4485' \ + '6ee65c9cb2ba144f47f8c619c8177607a248c5ab') + +build() { + Fcd $origname-$pkgver/ + Fbuild + Ffile etc/X11/sessions/$origname.desktop + Fexe etc/X11/xinit/xinitrc.$origname +} + +# optimization OK From janny at frugalware.org Sat Nov 3 09:26:16 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 09:26:17 2007 Subject: [Frugalware-git] frugalware-current: firefox-2.0.0.9-1-i686 Message-ID: <20071103082616.4CEDB13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=25f940eea097efd022122f965062b920a9bd5ada commit 25f940eea097efd022122f965062b920a9bd5ada Author: janny Date: Sat Nov 3 09:23:50 2007 +0100 firefox-2.0.0.9-1-i686 version bump change maintainer diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 8b2a946..fd47151 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling time: 19.80 SBU -# Maintainer: AlexExtreme +# Compiling time: 18.33 SBU +# Maintainer: Janny # Contributor: VMiklos pkgname=firefox -pkgver=2.0.0.8 +pkgver=2.0.0.9 pkgrel=1 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/" From devil505linux at gmail.com Sat Nov 3 09:29:47 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 09:29:48 2007 Subject: [Frugalware-git] frugalware-current: freedroid-1.0.2-1-i686 Message-ID: <20071103082947.E422313A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06e71fcb6be29f8b20488b518d1ab164d6c63498 commit 06e71fcb6be29f8b20488b518d1ab164d6c63498 Author: Devil505 Date: Sat Nov 3 09:24:19 2007 +0100 freedroid-1.0.2-1-i686 *New Package diff --git a/source/games-extra/freedroid/FrugalBuild b/source/games-extra/freedroid/FrugalBuild new file mode 100644 index 0000000..190b198 --- /dev/null +++ b/source/games-extra/freedroid/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling Time: 0.11 SBU +# Maintainer: Devil505 + +pkgname=freedroid +pkgver=1.0.2 +pkgrel=1 +pkgdesc="A clone of the game Paradroid." +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://freedroid.sourceforge.net/" +depends=('libvorbis' 'zlib' 'sdl_mixer' 'sdlimage') +groups=('games-extra') +archs=('i686') +source=($source $pkgname.png) +sha1sums=('69593c8e4d204d8e523f6e4b4f1091dd69fdef24' \ + '77f6152664f1f8c282d2df37b5a02966b2a0a141') + +_F_desktop_name="Freedroid" +_F_desktop_icon="$pkgname.png" +_F_desktop_categories="Game;ArcadeGame;" + +build() +{ + Fbuild + Ficon $pkgname.png + Fdesktop2 +} + +# optimization OK \ No newline at end of file diff --git a/source/games-extra/freedroid/freedroid.png b/source/games-extra/freedroid/freedroid.png new file mode 100644 index 0000000..6db9f21 Binary files /dev/null and b/source/games-extra/freedroid/freedroid.png differ From devil505linux at gmail.com Sat Nov 3 09:43:38 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 09:43:40 2007 Subject: [Frugalware-git] frugalware-current: hot-babe-0.2.2-1-i686 Message-ID: <20071103084338.A831313A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f180278c87c9523250fb7c597f4ea17ca8aa255 commit 9f180278c87c9523250fb7c597f4ea17ca8aa255 Author: Devil505 Date: Sat Nov 3 09:42:27 2007 +0100 hot-babe-0.2.2-1-i686 *New Package diff --git a/source/xapps-extra/hot-babe/FrugalBuild b/source/xapps-extra/hot-babe/FrugalBuild new file mode 100644 index 0000000..e592cd6 --- /dev/null +++ b/source/xapps-extra/hot-babe/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=hot-babe +pkgver=0.2.2 +pkgrel=1 +pkgdesc="A system load monitor that displays the system activity in a very special way" +url="http://dindinx.net/hotbabe/" +depends=('gtk+2' 'libxdamage') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +up2date="lynx -dump $url/download.php | grep -m1 tar.bz2 | Flasttarbz2" +source=($url/downloads/$pkgname-$pkgver.tar.bz2) +sha1sums=('145948c9208c369b4cdf9f9f29c02462518c6e85') + +_F_desktop_name="Hot Babe" +_F_desktop_icon="hot-babe.xpm" +_F_desktop_exec="hot-babe --geometry -0+0" +_F_desktop_desc="A system load monitor" +_F_desktop_categories="System;Utility;" + +build() { + Fcd + Fsed '/local' '' Makefile + Fmake + Fmakeinstall + Fdesktop2 +} +# optimization OK From janny at frugalware.org Sat Nov 3 10:03:20 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 10:03:22 2007 Subject: [Frugalware-git] frugalware-current: mysql-administrator-1.2-1-i686 Message-ID: <20071103090320.388CD13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=43bb06cb55c2ac1fb7c1aa291f85f09eabce9081 commit 43bb06cb55c2ac1fb7c1aa291f85f09eabce9081 Author: janny Date: Sat Nov 3 10:02:41 2007 +0100 mysql-administrator-1.2-1-i686 new package diff --git a/source/xapps-extra/mysql-administrator/FrugalBuild b/source/xapps-extra/mysql-administrator/FrugalBuild new file mode 100644 index 0000000..7428745 --- /dev/null +++ b/source/xapps-extra/mysql-administrator/FrugalBuild @@ -0,0 +1,38 @@ +# Compiling Time: 2.23 SBU +# Maintainer: Janny + +pkgname=mysql-administrator +pkgver=1.2 +date="20071024" +pkgrel=1 +pkgdesc="MySQL GUI Tools - Administrator" +url="http://www.mysql.com/products/tools/" +depends=('libmysqlclient' 'gtk+2' 'libsigc++2' 'libxdamage' \ + 'libgnomeprint' 'libglade' 'glibmm' 'gtkmm') +makedepends=('mysql') +groups=('xapps-extra') +archs=('i686') +license="GPL-2" +up2date="lynx -dump http://frugalware.org/~janny/snapshots/$pkgname/|Flasttarbz2" +source=(http://frugalware.org/~janny/snapshots/$pkgname/$pkgname-$date.tar.bz2 \ + http://frugalware.org/~janny/snapshots/mysql-gui-common/mysql-gui-common-$date.tar.bz2) +sha1sums=('92d659ea678040c388b34685d44c0084b9ad2782' '21b79751e6585b595f89eb354a41885a194bd43b') + +build() { + Fcd mysql-gui-common + sh ./autogen.sh + Fmake --with-commondirname=common/administrator + cd .. + Fcd mysql-administrator + sh ./autogen.sh + Fmake --with-commondirname=common/administrator + cd .. + Fcd mysql-gui-common + Fmakeinstall + cd .. + Fcd mysql-administrator + Fmakeinstall + Fsed 'MA_DIR="$DIRNAME"' 'MA_DIR="/"' $Fdestdir/usr/bin/mysql-administrator +} + +# optimization OK From voroskoi at frugalware.org Sat Nov 3 10:38:05 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 3 10:38:08 2007 Subject: [Frugalware-git] frugalware-current: fbpager-0.1.4-4-x86_64 Message-ID: <20071103093805.EFF6813A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53fcb0b6dac69b124f03a7828c749028b4b893fe commit 53fcb0b6dac69b124f03a7828c749028b4b893fe Author: voroskoi Date: Sat Nov 3 10:37:24 2007 +0100 fbpager-0.1.4-4-x86_64 rebuilt with gcc4 added a pach to fix build errors fixed makedepends(), rodepends() and depends() fixed up2date new m8r diff --git a/source/x11-extra/fbpager/FrugalBuild b/source/x11-extra/fbpager/FrugalBuild index a96a292..1c1c0ac 100644 --- a/source/x11-extra/fbpager/FrugalBuild +++ b/source/x11-extra/fbpager/FrugalBuild @@ -1,16 +1,21 @@ # Compiling Time: 0.13 SBU -# Maintainer: Shrift +# Contributor: Shrift +# Maintainer: voroskoi pkgname=fbpager pkgver=0.1.4 -pkgrel=3 +pkgrel=4 pkgdesc="FBpager is a pager application for fluxbox" url="http://www.fluxbox.org/fbpager/" -depends=('fluxbox') +makedepends=('mesa') +depends=('libsm' 'libxrender' 'libstdc++') +rodepends=('fluxbox') groups=('x11-extra') archs=('i686' 'x86_64') -up2date="lynx -dump 'http://www.fluxbox.org/download/?M=D'|grep fbpager|grep tar.gz$|sed -ne 's/.*r-\(.*\)\.t.*/\1/;1 p'" -source=(http://www.fluxbox.org/download/$pkgname-$pkgver.tar.gz) -sha1sums=('73415dd7911f24e338b2b1bfc43f4aeb53daa5b2') +up2date="lynx -dump ${url} |grep tar.gz$ |sed 's/.*-\(.*\).t.*/\1/'" +source=(http://www.fluxbox.org/download/$pkgname-$pkgver.tar.gz g++-4.1_namespace.patch) +sha1sums=('73415dd7911f24e338b2b1bfc43f4aeb53daa5b2' \ + '0182937480fd7c0511217736c3e43ab129eaa01d') +unset MAKEFLAGS -# optimalization OK +# optimization OK diff --git a/source/x11-extra/fbpager/g++-4.1_namespace.patch b/source/x11-extra/fbpager/g++-4.1_namespace.patch new file mode 100644 index 0000000..85f6d82 --- /dev/null +++ b/source/x11-extra/fbpager/g++-4.1_namespace.patch @@ -0,0 +1,83 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_g++-4.1_namespace.dpatch by +## +## DP: FTBFS fixes for g++-4.1 and above + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./src/Resources.hh /home/sean/tmp/dpep-work.kCLHyF/fbpager-0.1.4/src/Resources.hh +--- ./src/Resources.hh 2004-03-02 17:49:51.000000000 +0100 ++++ /home/sean/tmp/dpep-work.kCLHyF/fbpager-0.1.4/src/Resources.hh 2006-05-29 22:05:44.000000000 +0200 +@@ -8,8 +8,10 @@ + #include + #include + ++namespace FbTk { ++ + template<> +-void FbTk::Resource:: ++void Resource:: + setFromString(char const *strval) { + if (strcasecmp(strval, "true") == 0 || + strcasecmp(strval, "yes") == 0) +@@ -19,38 +21,37 @@ + } + + template<> +-std::string FbTk::Resource:: ++std::string Resource:: + getString() { + return std::string(**this == true ? "true" : "false"); + } + + template <> +-void FbTk::Resource::setFromString(const char *str) { ++void Resource::setFromString(const char *str) { + *(*this) = (str ? str : ""); + } + + template <> +-std::string FbTk::Resource::getString() { ++std::string Resource::getString() { + return *(*this); + } + + template <> +-void FbTk::Resource::setFromString(const char *str) { ++void Resource::setFromString(const char *str) { + if (str == 0) + return; + sscanf(str, "%d", &(*(*this))); + } + + template <> +-std::string FbTk::Resource::getString() { ++std::string Resource::getString() { + char buff[16]; + sprintf(buff, "%d", (*(*this))); + return std::string(buff); + } + +-namespace FbPager { + template <> +-void FbTk::Resource::setFromString(const char *str) { ++void Resource::setFromString(const char *str) { + if (strcmp("TopToBottom", str) == 0) + *(*this) = FbPager::FbPager::TOP_TO_BOTTOM; + else +@@ -58,7 +59,7 @@ + } + + template <> +-std::string FbTk::Resource::getString() { ++std::string Resource::getString() { + switch (*(*this)) { + case FbPager::FbPager::LEFT_TO_RIGHT: + return "LeftToRight"; +@@ -67,6 +68,6 @@ + } + } + +-} // end namespace FbPager ++} // end namespace FbTk + + #endif // RESOURCES From janny at frugalware.org Sat Nov 3 10:51:22 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 10:51:25 2007 Subject: [Frugalware-git] frugalware-current: qemu-launcher-1.7.4-1-i686 Message-ID: <20071103095122.94CB713A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94c769164651ecd413842c19f60e45f7817b81c7 commit 94c769164651ecd413842c19f60e45f7817b81c7 Author: janny Date: Sat Nov 3 10:50:55 2007 +0100 qemu-launcher-1.7.4-1-i686 version bump new m8r diff --git a/source/xapps-extra/qemu-launcher/FrugalBuild b/source/xapps-extra/qemu-launcher/FrugalBuild index 021122e..d5fb4dc 100644 --- a/source/xapps-extra/qemu-launcher/FrugalBuild +++ b/source/xapps-extra/qemu-launcher/FrugalBuild @@ -1,8 +1,8 @@ # Compiling Time: 0 SBU -# Maintainer: AlexExtreme +# Maintainer: Janny pkgname=qemu-launcher -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Qemu Launcher is a Gtk front-end for the Qemu x86 and x86-64 PC emulator." url="http://projects.wanderings.us/qemu_launcher" @@ -15,7 +15,7 @@ Finclude gnome-scriptlet options=('scriptlet') up2date="lynx -dump 'http://projects.wanderings.us/qemu_launcher#download'|grep -m1 '* V'|sed 's/.*V\(.*\).*/\1/'" source=(http://download.gna.org/qemulaunch/1.7.x/${pkgname}_$pkgver.tar.gz makefile.patch) -sha1sums=('b689864426746d764091fe8ac44b3a42f69602fd' \ +sha1sums=('efff5546243b8c34f87e08c8d97367c0cff9968c' \ 'cc1db74a52b91ffef9764478ba3155c1d0fd04fd') From devil505linux at gmail.com Sat Nov 3 11:25:22 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 11:25:23 2007 Subject: [Frugalware-git] frugalware-current: tagtool-0.12.3-1-i686 Message-ID: <20071103102522.6FAB313A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aed3d99a0deefc9613f5bb8ccf7ec05ee3ea4640 commit aed3d99a0deefc9613f5bb8ccf7ec05ee3ea4640 Author: Devil505 Date: Sat Nov 3 11:24:25 2007 +0100 tagtool-0.12.3-1-i686 *New Package diff --git a/source/xapps-extra/tagtool/FrugalBuild b/source/xapps-extra/tagtool/FrugalBuild new file mode 100644 index 0000000..b286ed6 --- /dev/null +++ b/source/xapps-extra/tagtool/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.17 SBU +# Maintainer: Devil505 + +pkgname=tagtool +pkgver=0.12.3 +pkgrel=1 +pkgdesc="Audio Tag Tool Ogg/Mp3 Tagger." +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('libglade' 'libvorbis' 'id3lib' 'libxdamage') +makedepends=('intltool' 'perl-xml') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +sha1sums=('e7ed4ebf8f9881cf38b2340b18e95947f658308e') + +# optimization OK From janny at frugalware.org Sat Nov 3 12:04:28 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 12:04:30 2007 Subject: [Frugalware-git] frugalware-current: sugarcrm-4.5.1g-1-i686 Message-ID: <20071103110428.655B113A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fe5f506e4f5a85bed01f42cd3bd0b46ca6fa2d03 commit fe5f506e4f5a85bed01f42cd3bd0b46ca6fa2d03 Author: janny Date: Sat Nov 3 12:03:20 2007 +0100 sugarcrm-4.5.1g-1-i686 version bump fixed up2date() fixed source() diff --git a/source/network-extra/sugarcrm/FrugalBuild b/source/network-extra/sugarcrm/FrugalBuild index ed01689..8fa69f4 100644 --- a/source/network-extra/sugarcrm/FrugalBuild +++ b/source/network-extra/sugarcrm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=sugarcrm origname=SugarOS -pkgver=4.5.1e +pkgver=4.5.1g pkgrel=1 pkgdesc="Opensourced CRM application." url="http://www.sugarforge.org" @@ -11,12 +11,10 @@ license="MPL-1.1" rodepends=('apache' 'php' 'mysql' 'imap') archs=('i686' 'x86_64') groups=('network-extra') -up2date="lynx -dump $url/content/downloads/|grep 'SugarOS.*\.zip'|sort|sed -n 's/.*-\([0-9\.a-z]\+\)\.zip.*/\1/;1p'" -# check $dirnum -#dirnum=`lynx -dump $url/content/downloads/|grep 'SugarOS.*\.zip'|sort|sed 's/.*.php\///g;s/\/.*.//;1q'` -dirnum=3103 -source=(http://www.sugarforge.org/frs/download.php/$dirnum/$origname-$pkgver.zip README.Frugalware) -sha1sums=('b321a8f8dbaf77d953bf1296708297ca97708b14' \ +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 \ + README.Frugalware) +sha1sums=('7bb0605e9b49fd0ea79db79cf3b54da767e590c9' \ '2ad5db72181854016c96c83635244dc75226ff77') build() { From devil505linux at gmail.com Sat Nov 3 12:18:33 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 12:18:36 2007 Subject: [Frugalware-git] frugalware-current: tmw-0.0.23-1-i686 Message-ID: <20071103111833.6C21613A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fc770469329588be297c69603a12426f9d74bb1 commit 5fc770469329588be297c69603a12426f9d74bb1 Author: Devil505 Date: Sat Nov 3 12:14:20 2007 +0100 tmw-0.0.23-1-i686 *New Package *I'll add a package for musics later diff --git a/source/games-extra/tmw/FrugalBuild b/source/games-extra/tmw/FrugalBuild new file mode 100644 index 0000000..81d8f8f --- /dev/null +++ b/source/games-extra/tmw/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 1.03 SBU +# Maintainer: Devil505 + +pkgname=tmw +pkgver=0.0.23 +pkgrel=1 +pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." +_F_sourceforge_dirname="themanaworld" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://themanaworld.org" +depends=('sdlimage' 'sdl_mixer' 'guichan' 'libgl' 'curl' 'sdl_net' 'physfs' 'libxdamage' 'libxml2' 'freeglut') +groups=('games-extra') +archs=('i686') +sha1sums=('eb9f0642f69fcd28e725042dbe021f1706c6c8a1') + +# optimization OK From voroskoi at frugalware.org Sat Nov 3 12:25:08 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 3 12:25:11 2007 Subject: [Frugalware-git] frugalware-current: lm1100-1.0.2a-1-i686 Message-ID: <20071103112508.DFB7013A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f6180bdf1b4a6ca9d97b86de64e5153bc779438 commit 6f6180bdf1b4a6ca9d97b86de64e5153bc779438 Author: voroskoi Date: Sat Nov 3 12:21:56 2007 +0100 lm1100-1.0.2a-1-i686 new package from Matthias Griebel, closes #2183 my changes: - add ppd files for printers, so foomatic-filters-ppds not needed - ghostscript goes to rodepends() - patch for A4 paper size support - also install some utils, i'm not sure they are necessary diff --git a/source/apps-extra/lm1100/FrugalBuild b/source/apps-extra/lm1100/FrugalBuild new file mode 100644 index 0000000..d1b3ad6 --- /dev/null +++ b/source/apps-extra/lm1100/FrugalBuild @@ -0,0 +1,45 @@ +# Compiling Time: 0.02 SBU +# Maintainer: Matthias Griebel + +pkgname=lm1100 +pkgver=1.0.2a +pkgrel=1 +pkgdesc='Lexmark 1000/1100 rasteriser.' +url='http://www.openprinting.org/download/printing/lm1100/' +groups=('apps-extra') +depends=('libstdc++') +rodepends=('ghostscript') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | grep -m1 tar.gz$ | sed 's/.*lm1100\.\(.*\).t.*/\1/'" +source=($url/$pkgname.$pkgver.tar.gz \ + lm1100-gcc.patch a4_page.patch \ + Lexmark-1000-lm1100.ppd Lexmark-1020-lm1100.ppd Lexmark-1100-lm1100.ppd) +sha1sums=('1a88be767f907b04df4f3b713abb6be6ede643eb' \ + '7b4cedbe159165c29212ba95b3a56b3a53e8ece8' \ + 'e16dcc99ea8c08d9c38d671891b6cd5c8d2480c5' \ + '4e060fdb6f30f8b41353c8f396ede5c9f3f1c938' \ + '3c33858814ff4faa272562f42f7d16533a690c32' \ + '86f63cb928234c2b49575332b1df59fa678245f0') +_F_cd_path=$pkgname.$pkgver + +build() { + Fpatchall + Fsed 'CC =.*$' "CC = g++ $CFLAGS" Makefile + Fmake + Fmkdir /usr/bin + Fexerel $pkgname /usr/bin + + # utils - FIXME: is this good for something? + Fmkdir /usr/share/lm1100 + Fexerel byteutil.pl /usr/share/lm1100 + Fexerel lexmark2ppm.pl /usr/share/lm1100 + Fexerel ps-to-printer.fpi /usr/share/lm1100 + + # ppds + Fmkdir /usr/share/cups/model/Lexmark + Ffile Lexmark-1000-lm1100.ppd /usr/share/cups/model/Lexmark + Ffile Lexmark-1020-lm1100.ppd /usr/share/cups/model/Lexmark + Ffile Lexmark-1100-lm1100.ppd /usr/share/cups/model/Lexmark +} + +# optimization OK diff --git a/source/apps-extra/lm1100/Lexmark-1000-lm1100.ppd b/source/apps-extra/lm1100/Lexmark-1000-lm1100.ppd new file mode 100644 index 0000000..f9dc5ff --- /dev/null +++ b/source/apps-extra/lm1100/Lexmark-1000-lm1100.ppd @@ -0,0 +1,248 @@ +*PPD-Adobe: "4.3" +*% +*% For information on using this, and to obtain the required backend +*% script, consult http://www.openprinting.org/ +*% +*% This file is published under the GNU General Public License +*% +*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with +*% all programs and environments which use PPD files for dealing with +*% printer capability information. The printer must be configured with the +*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This +*% file and "foomatic-rip" work together to support PPD-controlled printer +*% driver option access with arbitrary free software printer drivers and +*% printing spoolers. +*% +*% To save this file on your disk, wait until the download has completed +*% (the animation of the browser logo must stop) and then use the +*% "Save as..." command in the "File" menu of your browser or in the +*% pop-up manu when you click on this document with the right mouse button. +*% DO NOT cut and paste this file into an editor with your mouse. This can +*% introduce additional line breaks which lead to unexpected results. +*% +*% You may save this file as 'Lexmark-1000-lm1100.ppd' +*% +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "LM1100.PPD" +*Manufacturer: "Lexmark" +*Product: "(1000)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" +*%pprRIP: foomatic-rip other +*ModelName: "Lexmark 1000" +*ShortNickName: "Lexmark 1000 lm1100" +*NickName: "Lexmark 1000 Foomatic/lm1100 (recommended)" +*PSVersion: "(3010.000) 550" +*PSVersion: "(3010.000) 651" +*PSVersion: "(3010.000) 652" +*PSVersion: "(3010.000) 653" +*PSVersion: "(3010.000) 704" +*PSVersion: "(3010.000) 705" +*PSVersion: "(3010.000) 800" +*LanguageLevel: "3" +*ColorDevice: True +*DefaultColorSpace: RGB +*FileSystem: False +*Throughput: "1" +*LandscapeOrientation: Plus90 +*TTRasterizer: Type42 +*1284DeviceID: "DRV:Dlm1100,R1,M0,TF;" + +*driverName lm1100/lm1100: "" +*driverType F/Filter: "" +*driverUrl: "http://www.openprinting.org/download/printing/lm1100/" +*driverObsolete: False + + + + +*VariablePaperSize: False + +*FoomaticIDs: Lexmark-1000 lm1100 +*FoomaticRIPCommandLine: "gs -q -sDEVICE=ppmraw -r300 %A -dBATCH -dNOP&& +AUSE -dPARANOIDSAFER %Z -sOutputFile=- - | lm1100 %B -" +*End + +*OpenGroup: General/General + +*OpenUI *PageSize/Page Size: PickOne +*OrderDependency: 100 AnySetup *PageSize +*DefaultPageSize: Letter +*PageSize Letter/US Letter: "<>setpagedevice" +*PageSize A4/A4: "<>setpagedevice" +*PageSize A5/A5: "<>setpagedevice" +*PageSize B5/B5 (JIS): "<>setpagedevice" +*PageSize Env10/Envelope #10: "<>setpagedevice" +*PageSize EnvC5/Envelope C5: "<>setpagedevice" +*PageSize EnvDL/Envelope DL: "<>setpagedevice" +*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" +*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageSize Executive/Executive: "<>setpagedevice" +*PageSize Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageSize + +*OpenUI *PageRegion: PickOne +*OrderDependency: 100 AnySetup *PageRegion +*DefaultPageRegion: Letter +*PageRegion Letter/US Letter: "<>setpagedevice" +*PageRegion A4/A4: "<>setpagedevice" +*PageRegion A5/A5: "<>setpagedevice" +*PageRegion B5/B5 (JIS): "<>setpagedevice" +*PageRegion Env10/Envelope #10: "<>setpagedevice" +*PageRegion EnvC5/Envelope C5: "<>setpagedevice" +*PageRegion EnvDL/Envelope DL: "<>setpagedevice" +*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" +*PageRegion EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageRegion Executive/Executive: "<>setpagedevice" +*PageRegion Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageRegion + +*DefaultImageableArea: Letter +*ImageableArea Letter/US Letter: "18 36 594 756" +*ImageableArea A4/A4: "18 36 577 806" +*ImageableArea A5/A5: "18 36 403 559" +*ImageableArea B5/B5 (JIS): "18 36 498 693" +*ImageableArea Env10/Envelope #10: "18 36 279 648" +*ImageableArea EnvC5/Envelope C5: "18 36 441 613" +*ImageableArea EnvDL/Envelope DL: "18 36 294 588" +*ImageableArea EnvISOB5/Envelope B5: "18 36 481 673" +*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504" +*ImageableArea Executive/Executive: "18 36 504 720" +*ImageableArea Legal/US Legal: "18 36 594 972" + +*DefaultPaperDimension: Letter +*PaperDimension Letter/US Letter: "612 792" +*PaperDimension A4/A4: "595 842" +*PaperDimension A5/A5: "421 595" +*PaperDimension B5/B5 (JIS): "516 729" +*PaperDimension Env10/Envelope #10: "297 684" +*PaperDimension EnvC5/Envelope C5: "459 649" +*PaperDimension EnvDL/Envelope DL: "312 624" +*PaperDimension EnvISOB5/Envelope B5: "499 709" +*PaperDimension EnvMonarch/Envelope Monarch: "279 540" +*PaperDimension Executive/Executive: "522 756" +*PaperDimension Legal/US Legal: "612 1008" + +*OpenUI *InkType/Ink Type: PickOne +*FoomaticRIPOption InkType: enum CmdLine B +*OrderDependency: 100 AnySetup *InkType +*DefaultInkType: Color +*InkType Black/Black cartridge: "%% FoomaticRIPOptionSetting: InkType=Black" +*FoomaticRIPOptionSetting InkType=Black: " -bw" +*InkType Color/Color cartridge: "%% FoomaticRIPOptionSetting: InkType=Color" +*FoomaticRIPOptionSetting InkType=Color: "" +*CloseUI: *InkType + +*CloseGroup: General + +*OpenGroup: Adjustment/Adjustment + +*OpenUI *Brightness/Brightness: PickOne +*FoomaticRIPOption Brightness: int CmdLine B +*FoomaticRIPOptionPrototype Brightness: " -b %s" +*FoomaticRIPOptionRange Brightness: 0 255 +*OrderDependency: 110 AnySetup *Brightness +*DefaultBrightness: 100 +*FoomaticRIPDefaultBrightness: 100 +*Brightness 0/0: "%% FoomaticRIPOptionSetting: Brightness=0" +*Brightness 5/5: "%% FoomaticRIPOptionSetting: Brightness=5" +*Brightness 10/10: "%% FoomaticRIPOptionSetting: Brightness=10" +*Brightness 15/15: "%% FoomaticRIPOptionSetting: Brightness=15" +*Brightness 20/20: "%% FoomaticRIPOptionSetting: Brightness=20" +*Brightness 25/25: "%% FoomaticRIPOptionSetting: Brightness=25" +*Brightness 30/30: "%% FoomaticRIPOptionSetting: Brightness=30" +*Brightness 35/35: "%% FoomaticRIPOptionSetting: Brightness=35" +*Brightness 40/40: "%% FoomaticRIPOptionSetting: Brightness=40" +*Brightness 45/45: "%% FoomaticRIPOptionSetting: Brightness=45" +*Brightness 50/50: "%% FoomaticRIPOptionSetting: Brightness=50" +*Brightness 55/55: "%% FoomaticRIPOptionSetting: Brightness=55" +*Brightness 60/60: "%% FoomaticRIPOptionSetting: Brightness=60" +*Brightness 65/65: "%% FoomaticRIPOptionSetting: Brightness=65" +*Brightness 70/70: "%% FoomaticRIPOptionSetting: Brightness=70" +*Brightness 75/75: "%% FoomaticRIPOptionSetting: Brightness=75" +*Brightness 80/80: "%% FoomaticRIPOptionSetting: Brightness=80" +*Brightness 85/85: "%% FoomaticRIPOptionSetting: Brightness=85" +*Brightness 90/90: "%% FoomaticRIPOptionSetting: Brightness=90" +*Brightness 95/95: "%% FoomaticRIPOptionSetting: Brightness=95" +*Brightness 100/100: "%% FoomaticRIPOptionSetting: Brightness=100" +*Brightness 105/105: "%% FoomaticRIPOptionSetting: Brightness=105" +*Brightness 110/110: "%% FoomaticRIPOptionSetting: Brightness=110" +*Brightness 115/115: "%% FoomaticRIPOptionSetting: Brightness=115" +*Brightness 120/120: "%% FoomaticRIPOptionSetting: Brightness=120" +*Brightness 125/125: "%% FoomaticRIPOptionSetting: Brightness=125" +*Brightness 130/130: "%% FoomaticRIPOptionSetting: Brightness=130" +*Brightness 135/135: "%% FoomaticRIPOptionSetting: Brightness=135" +*Brightness 140/140: "%% FoomaticRIPOptionSetting: Brightness=140" +*Brightness 145/145: "%% FoomaticRIPOptionSetting: Brightness=145" +*Brightness 150/150: "%% FoomaticRIPOptionSetting: Brightness=150" +*Brightness 155/155: "%% FoomaticRIPOptionSetting: Brightness=155" +*Brightness 160/160: "%% FoomaticRIPOptionSetting: Brightness=160" +*Brightness 165/165: "%% FoomaticRIPOptionSetting: Brightness=165" +*Brightness 170/170: "%% FoomaticRIPOptionSetting: Brightness=170" +*Brightness 175/175: "%% FoomaticRIPOptionSetting: Brightness=175" +*Brightness 180/180: "%% FoomaticRIPOptionSetting: Brightness=180" +*Brightness 185/185: "%% FoomaticRIPOptionSetting: Brightness=185" +*Brightness 190/190: "%% FoomaticRIPOptionSetting: Brightness=190" +*Brightness 195/195: "%% FoomaticRIPOptionSetting: Brightness=195" +*Brightness 200/200: "%% FoomaticRIPOptionSetting: Brightness=200" +*Brightness 205/205: "%% FoomaticRIPOptionSetting: Brightness=205" +*Brightness 210/210: "%% FoomaticRIPOptionSetting: Brightness=210" +*Brightness 215/215: "%% FoomaticRIPOptionSetting: Brightness=215" +*Brightness 220/220: "%% FoomaticRIPOptionSetting: Brightness=220" +*Brightness 225/225: "%% FoomaticRIPOptionSetting: Brightness=225" +*Brightness 230/230: "%% FoomaticRIPOptionSetting: Brightness=230" +*Brightness 235/235: "%% FoomaticRIPOptionSetting: Brightness=235" +*Brightness 240/240: "%% FoomaticRIPOptionSetting: Brightness=240" +*Brightness 245/245: "%% FoomaticRIPOptionSetting: Brightness=245" +*Brightness 250/250: "%% FoomaticRIPOptionSetting: Brightness=250" +*Brightness 255/255: "%% FoomaticRIPOptionSetting: Brightness=255" +*CloseUI: *Brightness + +*CloseGroup: Adjustment + + +*% Generic boilerplate PPD stuff as standard PostScript fonts and so on + +*DefaultFont: Courier +*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM +*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM +*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM +*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM +*Font Bookman-Demi: Standard "(001.004S)" Standard ROM +*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM +*Font Bookman-Light: Standard "(001.004S)" Standard ROM +*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM +*Font Courier: Standard "(002.004S)" Standard ROM +*Font Courier-Bold: Standard "(002.004S)" Standard ROM +*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM +*Font Courier-Oblique: Standard "(002.004S)" Standard ROM +*Font Helvetica: Standard "(001.006S)" Standard ROM +*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM +*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM +*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM +*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM +*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM +*Font Palatino-Bold: Standard "(001.005S)" Standard ROM +*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM +*Font Palatino-Italic: Standard "(001.005S)" Standard ROM +*Font Palatino-Roman: Standard "(001.005S)" Standard ROM +*Font Symbol: Special "(001.007S)" Special ROM +*Font Times-Bold: Standard "(001.007S)" Standard ROM +*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM +*Font Times-Italic: Standard "(001.007S)" Standard ROM +*Font Times-Roman: Standard "(001.007S)" Standard ROM +*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM +*Font ZapfDingbats: Special "(001.004S)" Standard ROM + diff --git a/source/apps-extra/lm1100/Lexmark-1020-lm1100.ppd b/source/apps-extra/lm1100/Lexmark-1020-lm1100.ppd new file mode 100644 index 0000000..04f6bb6 --- /dev/null +++ b/source/apps-extra/lm1100/Lexmark-1020-lm1100.ppd @@ -0,0 +1,248 @@ +*PPD-Adobe: "4.3" +*% +*% For information on using this, and to obtain the required backend +*% script, consult http://www.openprinting.org/ +*% +*% This file is published under the GNU General Public License +*% +*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with +*% all programs and environments which use PPD files for dealing with +*% printer capability information. The printer must be configured with the +*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This +*% file and "foomatic-rip" work together to support PPD-controlled printer +*% driver option access with arbitrary free software printer drivers and +*% printing spoolers. +*% +*% To save this file on your disk, wait until the download has completed +*% (the animation of the browser logo must stop) and then use the +*% "Save as..." command in the "File" menu of your browser or in the +*% pop-up manu when you click on this document with the right mouse button. +*% DO NOT cut and paste this file into an editor with your mouse. This can +*% introduce additional line breaks which lead to unexpected results. +*% +*% You may save this file as 'Lexmark-1020-lm1100.ppd' +*% +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "LM1100.PPD" +*Manufacturer: "Lexmark" +*Product: "(1020)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" +*%pprRIP: foomatic-rip other +*ModelName: "Lexmark 1020" +*ShortNickName: "Lexmark 1020 lm1100" +*NickName: "Lexmark 1020 Foomatic/lm1100 (recommended)" +*PSVersion: "(3010.000) 550" +*PSVersion: "(3010.000) 651" +*PSVersion: "(3010.000) 652" +*PSVersion: "(3010.000) 653" +*PSVersion: "(3010.000) 704" +*PSVersion: "(3010.000) 705" +*PSVersion: "(3010.000) 800" +*LanguageLevel: "3" +*ColorDevice: True +*DefaultColorSpace: RGB +*FileSystem: False +*Throughput: "1" +*LandscapeOrientation: Plus90 +*TTRasterizer: Type42 +*1284DeviceID: "DRV:Dlm1100,R1,M0,TF;" + +*driverName lm1100/lm1100: "" +*driverType F/Filter: "" +*driverUrl: "http://www.openprinting.org/download/printing/lm1100/" +*driverObsolete: False + + + + +*VariablePaperSize: False + +*FoomaticIDs: Lexmark-1020 lm1100 +*FoomaticRIPCommandLine: "gs -q -sDEVICE=ppmraw -r300 %A -dBATCH -dNOP&& +AUSE -dPARANOIDSAFER %Z -sOutputFile=- - | lm1100 %B -" +*End + +*OpenGroup: General/General + +*OpenUI *PageSize/Page Size: PickOne +*OrderDependency: 100 AnySetup *PageSize +*DefaultPageSize: Letter +*PageSize Letter/US Letter: "<>setpagedevice" +*PageSize A4/A4: "<>setpagedevice" +*PageSize A5/A5: "<>setpagedevice" +*PageSize B5/B5 (JIS): "<>setpagedevice" +*PageSize Env10/Envelope #10: "<>setpagedevice" +*PageSize EnvC5/Envelope C5: "<>setpagedevice" +*PageSize EnvDL/Envelope DL: "<>setpagedevice" +*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" +*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageSize Executive/Executive: "<>setpagedevice" +*PageSize Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageSize + +*OpenUI *PageRegion: PickOne +*OrderDependency: 100 AnySetup *PageRegion +*DefaultPageRegion: Letter +*PageRegion Letter/US Letter: "<>setpagedevice" +*PageRegion A4/A4: "<>setpagedevice" +*PageRegion A5/A5: "<>setpagedevice" +*PageRegion B5/B5 (JIS): "<>setpagedevice" +*PageRegion Env10/Envelope #10: "<>setpagedevice" +*PageRegion EnvC5/Envelope C5: "<>setpagedevice" +*PageRegion EnvDL/Envelope DL: "<>setpagedevice" +*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" +*PageRegion EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageRegion Executive/Executive: "<>setpagedevice" +*PageRegion Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageRegion + +*DefaultImageableArea: Letter +*ImageableArea Letter/US Letter: "18 36 594 756" +*ImageableArea A4/A4: "18 36 577 806" +*ImageableArea A5/A5: "18 36 403 559" +*ImageableArea B5/B5 (JIS): "18 36 498 693" +*ImageableArea Env10/Envelope #10: "18 36 279 648" +*ImageableArea EnvC5/Envelope C5: "18 36 441 613" +*ImageableArea EnvDL/Envelope DL: "18 36 294 588" +*ImageableArea EnvISOB5/Envelope B5: "18 36 481 673" +*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504" +*ImageableArea Executive/Executive: "18 36 504 720" +*ImageableArea Legal/US Legal: "18 36 594 972" + +*DefaultPaperDimension: Letter +*PaperDimension Letter/US Letter: "612 792" +*PaperDimension A4/A4: "595 842" +*PaperDimension A5/A5: "421 595" +*PaperDimension B5/B5 (JIS): "516 729" +*PaperDimension Env10/Envelope #10: "297 684" +*PaperDimension EnvC5/Envelope C5: "459 649" +*PaperDimension EnvDL/Envelope DL: "312 624" +*PaperDimension EnvISOB5/Envelope B5: "499 709" +*PaperDimension EnvMonarch/Envelope Monarch: "279 540" +*PaperDimension Executive/Executive: "522 756" +*PaperDimension Legal/US Legal: "612 1008" + +*OpenUI *InkType/Ink Type: PickOne +*FoomaticRIPOption InkType: enum CmdLine B +*OrderDependency: 100 AnySetup *InkType +*DefaultInkType: Color +*InkType Black/Black cartridge: "%% FoomaticRIPOptionSetting: InkType=Black" +*FoomaticRIPOptionSetting InkType=Black: " -bw" +*InkType Color/Color cartridge: "%% FoomaticRIPOptionSetting: InkType=Color" +*FoomaticRIPOptionSetting InkType=Color: "" +*CloseUI: *InkType + +*CloseGroup: General + +*OpenGroup: Adjustment/Adjustment + +*OpenUI *Brightness/Brightness: PickOne +*FoomaticRIPOption Brightness: int CmdLine B +*FoomaticRIPOptionPrototype Brightness: " -b %s" +*FoomaticRIPOptionRange Brightness: 0 255 +*OrderDependency: 110 AnySetup *Brightness +*DefaultBrightness: 100 +*FoomaticRIPDefaultBrightness: 100 +*Brightness 0/0: "%% FoomaticRIPOptionSetting: Brightness=0" +*Brightness 5/5: "%% FoomaticRIPOptionSetting: Brightness=5" +*Brightness 10/10: "%% FoomaticRIPOptionSetting: Brightness=10" +*Brightness 15/15: "%% FoomaticRIPOptionSetting: Brightness=15" +*Brightness 20/20: "%% FoomaticRIPOptionSetting: Brightness=20" +*Brightness 25/25: "%% FoomaticRIPOptionSetting: Brightness=25" +*Brightness 30/30: "%% FoomaticRIPOptionSetting: Brightness=30" +*Brightness 35/35: "%% FoomaticRIPOptionSetting: Brightness=35" +*Brightness 40/40: "%% FoomaticRIPOptionSetting: Brightness=40" +*Brightness 45/45: "%% FoomaticRIPOptionSetting: Brightness=45" +*Brightness 50/50: "%% FoomaticRIPOptionSetting: Brightness=50" +*Brightness 55/55: "%% FoomaticRIPOptionSetting: Brightness=55" +*Brightness 60/60: "%% FoomaticRIPOptionSetting: Brightness=60" +*Brightness 65/65: "%% FoomaticRIPOptionSetting: Brightness=65" +*Brightness 70/70: "%% FoomaticRIPOptionSetting: Brightness=70" +*Brightness 75/75: "%% FoomaticRIPOptionSetting: Brightness=75" +*Brightness 80/80: "%% FoomaticRIPOptionSetting: Brightness=80" +*Brightness 85/85: "%% FoomaticRIPOptionSetting: Brightness=85" +*Brightness 90/90: "%% FoomaticRIPOptionSetting: Brightness=90" +*Brightness 95/95: "%% FoomaticRIPOptionSetting: Brightness=95" +*Brightness 100/100: "%% FoomaticRIPOptionSetting: Brightness=100" +*Brightness 105/105: "%% FoomaticRIPOptionSetting: Brightness=105" +*Brightness 110/110: "%% FoomaticRIPOptionSetting: Brightness=110" +*Brightness 115/115: "%% FoomaticRIPOptionSetting: Brightness=115" +*Brightness 120/120: "%% FoomaticRIPOptionSetting: Brightness=120" +*Brightness 125/125: "%% FoomaticRIPOptionSetting: Brightness=125" +*Brightness 130/130: "%% FoomaticRIPOptionSetting: Brightness=130" +*Brightness 135/135: "%% FoomaticRIPOptionSetting: Brightness=135" +*Brightness 140/140: "%% FoomaticRIPOptionSetting: Brightness=140" +*Brightness 145/145: "%% FoomaticRIPOptionSetting: Brightness=145" +*Brightness 150/150: "%% FoomaticRIPOptionSetting: Brightness=150" +*Brightness 155/155: "%% FoomaticRIPOptionSetting: Brightness=155" +*Brightness 160/160: "%% FoomaticRIPOptionSetting: Brightness=160" +*Brightness 165/165: "%% FoomaticRIPOptionSetting: Brightness=165" +*Brightness 170/170: "%% FoomaticRIPOptionSetting: Brightness=170" +*Brightness 175/175: "%% FoomaticRIPOptionSetting: Brightness=175" +*Brightness 180/180: "%% FoomaticRIPOptionSetting: Brightness=180" +*Brightness 185/185: "%% FoomaticRIPOptionSetting: Brightness=185" +*Brightness 190/190: "%% FoomaticRIPOptionSetting: Brightness=190" +*Brightness 195/195: "%% FoomaticRIPOptionSetting: Brightness=195" +*Brightness 200/200: "%% FoomaticRIPOptionSetting: Brightness=200" +*Brightness 205/205: "%% FoomaticRIPOptionSetting: Brightness=205" +*Brightness 210/210: "%% FoomaticRIPOptionSetting: Brightness=210" +*Brightness 215/215: "%% FoomaticRIPOptionSetting: Brightness=215" +*Brightness 220/220: "%% FoomaticRIPOptionSetting: Brightness=220" +*Brightness 225/225: "%% FoomaticRIPOptionSetting: Brightness=225" +*Brightness 230/230: "%% FoomaticRIPOptionSetting: Brightness=230" +*Brightness 235/235: "%% FoomaticRIPOptionSetting: Brightness=235" +*Brightness 240/240: "%% FoomaticRIPOptionSetting: Brightness=240" +*Brightness 245/245: "%% FoomaticRIPOptionSetting: Brightness=245" +*Brightness 250/250: "%% FoomaticRIPOptionSetting: Brightness=250" +*Brightness 255/255: "%% FoomaticRIPOptionSetting: Brightness=255" +*CloseUI: *Brightness + +*CloseGroup: Adjustment + + +*% Generic boilerplate PPD stuff as standard PostScript fonts and so on + +*DefaultFont: Courier +*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM +*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM +*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM +*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM +*Font Bookman-Demi: Standard "(001.004S)" Standard ROM +*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM +*Font Bookman-Light: Standard "(001.004S)" Standard ROM +*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM +*Font Courier: Standard "(002.004S)" Standard ROM +*Font Courier-Bold: Standard "(002.004S)" Standard ROM +*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM +*Font Courier-Oblique: Standard "(002.004S)" Standard ROM +*Font Helvetica: Standard "(001.006S)" Standard ROM +*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM +*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM +*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM +*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM +*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM +*Font Palatino-Bold: Standard "(001.005S)" Standard ROM +*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM +*Font Palatino-Italic: Standard "(001.005S)" Standard ROM +*Font Palatino-Roman: Standard "(001.005S)" Standard ROM +*Font Symbol: Special "(001.007S)" Special ROM +*Font Times-Bold: Standard "(001.007S)" Standard ROM +*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM +*Font Times-Italic: Standard "(001.007S)" Standard ROM +*Font Times-Roman: Standard "(001.007S)" Standard ROM +*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM +*Font ZapfDingbats: Special "(001.004S)" Standard ROM + diff --git a/source/apps-extra/lm1100/Lexmark-1100-lm1100.ppd b/source/apps-extra/lm1100/Lexmark-1100-lm1100.ppd new file mode 100644 index 0000000..99ad066 --- /dev/null +++ b/source/apps-extra/lm1100/Lexmark-1100-lm1100.ppd @@ -0,0 +1,248 @@ +*PPD-Adobe: "4.3" +*% +*% For information on using this, and to obtain the required backend +*% script, consult http://www.openprinting.org/ +*% +*% This file is published under the GNU General Public License +*% +*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with +*% all programs and environments which use PPD files for dealing with +*% printer capability information. The printer must be configured with the +*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This +*% file and "foomatic-rip" work together to support PPD-controlled printer +*% driver option access with arbitrary free software printer drivers and +*% printing spoolers. +*% +*% To save this file on your disk, wait until the download has completed +*% (the animation of the browser logo must stop) and then use the +*% "Save as..." command in the "File" menu of your browser or in the +*% pop-up manu when you click on this document with the right mouse button. +*% DO NOT cut and paste this file into an editor with your mouse. This can +*% introduce additional line breaks which lead to unexpected results. +*% +*% You may save this file as 'Lexmark-1100-lm1100.ppd' +*% +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "LM1100.PPD" +*Manufacturer: "Lexmark" +*Product: "(1100)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" +*%pprRIP: foomatic-rip other +*ModelName: "Lexmark 1100" +*ShortNickName: "Lexmark 1100 lm1100" +*NickName: "Lexmark 1100 Foomatic/lm1100 (recommended)" +*PSVersion: "(3010.000) 550" +*PSVersion: "(3010.000) 651" +*PSVersion: "(3010.000) 652" +*PSVersion: "(3010.000) 653" +*PSVersion: "(3010.000) 704" +*PSVersion: "(3010.000) 705" +*PSVersion: "(3010.000) 800" +*LanguageLevel: "3" +*ColorDevice: True +*DefaultColorSpace: RGB +*FileSystem: False +*Throughput: "1" +*LandscapeOrientation: Plus90 +*TTRasterizer: Type42 +*1284DeviceID: "DRV:Dlm1100,R1,M0,TF;" + +*driverName lm1100/lm1100: "" +*driverType F/Filter: "" +*driverUrl: "http://www.openprinting.org/download/printing/lm1100/" +*driverObsolete: False + + + + +*VariablePaperSize: False + +*FoomaticIDs: Lexmark-1100 lm1100 +*FoomaticRIPCommandLine: "gs -q -sDEVICE=ppmraw -r300 %A -dBATCH -dNOP&& +AUSE -dPARANOIDSAFER %Z -sOutputFile=- - | lm1100 %B -" +*End + +*OpenGroup: General/General + +*OpenUI *PageSize/Page Size: PickOne +*OrderDependency: 100 AnySetup *PageSize +*DefaultPageSize: Letter +*PageSize Letter/US Letter: "<>setpagedevice" +*PageSize A4/A4: "<>setpagedevice" +*PageSize A5/A5: "<>setpagedevice" +*PageSize B5/B5 (JIS): "<>setpagedevice" +*PageSize Env10/Envelope #10: "<>setpagedevice" +*PageSize EnvC5/Envelope C5: "<>setpagedevice" +*PageSize EnvDL/Envelope DL: "<>setpagedevice" +*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" +*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageSize Executive/Executive: "<>setpagedevice" +*PageSize Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageSize + +*OpenUI *PageRegion: PickOne +*OrderDependency: 100 AnySetup *PageRegion +*DefaultPageRegion: Letter +*PageRegion Letter/US Letter: "<>setpagedevice" +*PageRegion A4/A4: "<>setpagedevice" +*PageRegion A5/A5: "<>setpagedevice" +*PageRegion B5/B5 (JIS): "<>setpagedevice" +*PageRegion Env10/Envelope #10: "<>setpagedevice" +*PageRegion EnvC5/Envelope C5: "<>setpagedevice" +*PageRegion EnvDL/Envelope DL: "<>setpagedevice" +*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" +*PageRegion EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageRegion Executive/Executive: "<>setpagedevice" +*PageRegion Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageRegion + +*DefaultImageableArea: Letter +*ImageableArea Letter/US Letter: "18 36 594 756" +*ImageableArea A4/A4: "18 36 577 806" +*ImageableArea A5/A5: "18 36 403 559" +*ImageableArea B5/B5 (JIS): "18 36 498 693" +*ImageableArea Env10/Envelope #10: "18 36 279 648" +*ImageableArea EnvC5/Envelope C5: "18 36 441 613" +*ImageableArea EnvDL/Envelope DL: "18 36 294 588" +*ImageableArea EnvISOB5/Envelope B5: "18 36 481 673" +*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504" +*ImageableArea Executive/Executive: "18 36 504 720" +*ImageableArea Legal/US Legal: "18 36 594 972" + +*DefaultPaperDimension: Letter +*PaperDimension Letter/US Letter: "612 792" +*PaperDimension A4/A4: "595 842" +*PaperDimension A5/A5: "421 595" +*PaperDimension B5/B5 (JIS): "516 729" +*PaperDimension Env10/Envelope #10: "297 684" +*PaperDimension EnvC5/Envelope C5: "459 649" +*PaperDimension EnvDL/Envelope DL: "312 624" +*PaperDimension EnvISOB5/Envelope B5: "499 709" +*PaperDimension EnvMonarch/Envelope Monarch: "279 540" +*PaperDimension Executive/Executive: "522 756" +*PaperDimension Legal/US Legal: "612 1008" + +*OpenUI *InkType/Ink Type: PickOne +*FoomaticRIPOption InkType: enum CmdLine B +*OrderDependency: 100 AnySetup *InkType +*DefaultInkType: Color +*InkType Black/Black cartridge: "%% FoomaticRIPOptionSetting: InkType=Black" +*FoomaticRIPOptionSetting InkType=Black: " -bw" +*InkType Color/Color cartridge: "%% FoomaticRIPOptionSetting: InkType=Color" +*FoomaticRIPOptionSetting InkType=Color: "" +*CloseUI: *InkType + +*CloseGroup: General + +*OpenGroup: Adjustment/Adjustment + +*OpenUI *Brightness/Brightness: PickOne +*FoomaticRIPOption Brightness: int CmdLine B +*FoomaticRIPOptionPrototype Brightness: " -b %s" +*FoomaticRIPOptionRange Brightness: 0 255 +*OrderDependency: 110 AnySetup *Brightness +*DefaultBrightness: 100 +*FoomaticRIPDefaultBrightness: 100 +*Brightness 0/0: "%% FoomaticRIPOptionSetting: Brightness=0" +*Brightness 5/5: "%% FoomaticRIPOptionSetting: Brightness=5" +*Brightness 10/10: "%% FoomaticRIPOptionSetting: Brightness=10" +*Brightness 15/15: "%% FoomaticRIPOptionSetting: Brightness=15" +*Brightness 20/20: "%% FoomaticRIPOptionSetting: Brightness=20" +*Brightness 25/25: "%% FoomaticRIPOptionSetting: Brightness=25" +*Brightness 30/30: "%% FoomaticRIPOptionSetting: Brightness=30" +*Brightness 35/35: "%% FoomaticRIPOptionSetting: Brightness=35" +*Brightness 40/40: "%% FoomaticRIPOptionSetting: Brightness=40" +*Brightness 45/45: "%% FoomaticRIPOptionSetting: Brightness=45" +*Brightness 50/50: "%% FoomaticRIPOptionSetting: Brightness=50" +*Brightness 55/55: "%% FoomaticRIPOptionSetting: Brightness=55" +*Brightness 60/60: "%% FoomaticRIPOptionSetting: Brightness=60" +*Brightness 65/65: "%% FoomaticRIPOptionSetting: Brightness=65" +*Brightness 70/70: "%% FoomaticRIPOptionSetting: Brightness=70" +*Brightness 75/75: "%% FoomaticRIPOptionSetting: Brightness=75" +*Brightness 80/80: "%% FoomaticRIPOptionSetting: Brightness=80" +*Brightness 85/85: "%% FoomaticRIPOptionSetting: Brightness=85" +*Brightness 90/90: "%% FoomaticRIPOptionSetting: Brightness=90" +*Brightness 95/95: "%% FoomaticRIPOptionSetting: Brightness=95" +*Brightness 100/100: "%% FoomaticRIPOptionSetting: Brightness=100" +*Brightness 105/105: "%% FoomaticRIPOptionSetting: Brightness=105" +*Brightness 110/110: "%% FoomaticRIPOptionSetting: Brightness=110" +*Brightness 115/115: "%% FoomaticRIPOptionSetting: Brightness=115" +*Brightness 120/120: "%% FoomaticRIPOptionSetting: Brightness=120" +*Brightness 125/125: "%% FoomaticRIPOptionSetting: Brightness=125" +*Brightness 130/130: "%% FoomaticRIPOptionSetting: Brightness=130" +*Brightness 135/135: "%% FoomaticRIPOptionSetting: Brightness=135" +*Brightness 140/140: "%% FoomaticRIPOptionSetting: Brightness=140" +*Brightness 145/145: "%% FoomaticRIPOptionSetting: Brightness=145" +*Brightness 150/150: "%% FoomaticRIPOptionSetting: Brightness=150" +*Brightness 155/155: "%% FoomaticRIPOptionSetting: Brightness=155" +*Brightness 160/160: "%% FoomaticRIPOptionSetting: Brightness=160" +*Brightness 165/165: "%% FoomaticRIPOptionSetting: Brightness=165" +*Brightness 170/170: "%% FoomaticRIPOptionSetting: Brightness=170" +*Brightness 175/175: "%% FoomaticRIPOptionSetting: Brightness=175" +*Brightness 180/180: "%% FoomaticRIPOptionSetting: Brightness=180" +*Brightness 185/185: "%% FoomaticRIPOptionSetting: Brightness=185" +*Brightness 190/190: "%% FoomaticRIPOptionSetting: Brightness=190" +*Brightness 195/195: "%% FoomaticRIPOptionSetting: Brightness=195" +*Brightness 200/200: "%% FoomaticRIPOptionSetting: Brightness=200" +*Brightness 205/205: "%% FoomaticRIPOptionSetting: Brightness=205" +*Brightness 210/210: "%% FoomaticRIPOptionSetting: Brightness=210" +*Brightness 215/215: "%% FoomaticRIPOptionSetting: Brightness=215" +*Brightness 220/220: "%% FoomaticRIPOptionSetting: Brightness=220" +*Brightness 225/225: "%% FoomaticRIPOptionSetting: Brightness=225" +*Brightness 230/230: "%% FoomaticRIPOptionSetting: Brightness=230" +*Brightness 235/235: "%% FoomaticRIPOptionSetting: Brightness=235" +*Brightness 240/240: "%% FoomaticRIPOptionSetting: Brightness=240" +*Brightness 245/245: "%% FoomaticRIPOptionSetting: Brightness=245" +*Brightness 250/250: "%% FoomaticRIPOptionSetting: Brightness=250" +*Brightness 255/255: "%% FoomaticRIPOptionSetting: Brightness=255" +*CloseUI: *Brightness + +*CloseGroup: Adjustment + + +*% Generic boilerplate PPD stuff as standard PostScript fonts and so on + +*DefaultFont: Courier +*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM +*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM +*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM +*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM +*Font Bookman-Demi: Standard "(001.004S)" Standard ROM +*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM +*Font Bookman-Light: Standard "(001.004S)" Standard ROM +*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM +*Font Courier: Standard "(002.004S)" Standard ROM +*Font Courier-Bold: Standard "(002.004S)" Standard ROM +*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM +*Font Courier-Oblique: Standard "(002.004S)" Standard ROM +*Font Helvetica: Standard "(001.006S)" Standard ROM +*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM +*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM +*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM +*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM +*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM +*Font Palatino-Bold: Standard "(001.005S)" Standard ROM +*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM +*Font Palatino-Italic: Standard "(001.005S)" Standard ROM +*Font Palatino-Roman: Standard "(001.005S)" Standard ROM +*Font Symbol: Special "(001.007S)" Special ROM +*Font Times-Bold: Standard "(001.007S)" Standard ROM +*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM +*Font Times-Italic: Standard "(001.007S)" Standard ROM +*Font Times-Roman: Standard "(001.007S)" Standard ROM +*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM +*Font ZapfDingbats: Special "(001.004S)" Standard ROM + diff --git a/source/apps-extra/lm1100/a4_page.patch b/source/apps-extra/lm1100/a4_page.patch new file mode 100644 index 0000000..53f36d6 --- /dev/null +++ b/source/apps-extra/lm1100/a4_page.patch @@ -0,0 +1,109 @@ +diff -pru a/LexmarkProtocol300c.cc b/LexmarkProtocol300c.cc +--- a/LexmarkProtocol300c.cc 2006-07-02 17:04:36.000000000 +0400 ++++ b/LexmarkProtocol300c.cc 2006-06-25 12:47:32.000000000 +0400 +@@ -59,6 +59,9 @@ Rect LexmarkProtocol300c::getPageSize(in + if(pageType == LETTER_PAGE) + //300x300 dpi 8 1/2 x 11 inch page + return Rect(0,0,2550,3300); ++ if(pageType == A4_PAGE) ++ //300x300 dpi 8.3 x 11.7 inch page ++ return Rect(0,0,2490,3510); + + die("Bad page type %d",pageType); + return Rect(); +diff -pru a/LexmarkProtocolBW.cc b/LexmarkProtocolBW.cc +--- a/LexmarkProtocolBW.cc 2006-07-02 17:04:36.000000000 +0400 ++++ b/LexmarkProtocolBW.cc 2006-07-02 17:01:11.000000000 +0400 +@@ -58,6 +58,9 @@ Rect LexmarkProtocolBW::getPageSize(int + if(pageType == LETTER_PAGE) + //300x300 dpi 8 1/2 x 11 inch page + return Rect(0,0,2550,3300); ++ if(pageType == A4_PAGE) ++ //300x300 dpi 8.3 x 11.7 inch page ++ return Rect(0,0,2490,3510); + + die("Bad page type %d",pageType); + return Rect(); +diff -pru a/PrinterProtocol.h b/PrinterProtocol.h +--- a/PrinterProtocol.h 2000-11-21 11:06:22.000000000 +0300 ++++ b/PrinterProtocol.h 2006-06-24 12:40:50.000000000 +0400 +@@ -2,5 +2,6 @@ + #define _PRINTER_PROTOCOL_H + + #define LETTER_PAGE 1 ++#define A4_PAGE 2 + + #endif +diff -pru a/main.cc b/main.cc +--- a/main.cc 2000-11-21 11:06:22.000000000 +0300 ++++ b/main.cc 2006-06-24 13:33:39.000000000 +0400 +@@ -34,18 +34,19 @@ Foundation, Inc., 59 Temple Place - Suit + + #define SPONGE_BUF 512000 + +-static void print(FILE *fp, SpongeWriter *sp, bool blackwhite, int brightness); ++static void print(FILE *fp, SpongeWriter *sp, bool blackwhite, int brightness, int pagesize); + + + int main(int argc, char *argv[]) + { +- if(argc < 2 || argc >5) ++ if(argc < 2 || argc >7) + { + die("Usage: %s [-bw] [-b value] \n -bw black and white cartridge printing\n -b brightness value 0-255 defaults to 255. Less brightness = more ink\n",argv[0]); + } + + bool blackwhite = false; + int brightness = 255; ++ int pagesize = LETTER_PAGE; + int file_index = 0; + + while(++file_index < argc -1) +@@ -54,6 +55,14 @@ int main(int argc, char *argv[]) + blackwhite = true; + else if(strcmp(argv[file_index],"-b") == 0) + brightness = atoi(argv[++file_index]); ++ else if(strcmp(argv[file_index++],"-p") == 0){ ++ if(strcmp(argv[file_index],"letter") == 0) ++ pagesize = LETTER_PAGE; ++ else if(strcmp(argv[file_index],"a4") == 0) ++ pagesize = A4_PAGE; ++ else ++ die("Invalid page size `%s`\n",argv[++file_index]); ++ } + } + + SpongeWriter sp(SPONGE_BUF,1); +@@ -67,7 +76,7 @@ int main(int argc, char *argv[]) + if(fd == NULL) + die("Couldn't open %s for reading\n",argv[file_index]); + +- print(fd,&sp,blackwhite,brightness); ++ print(fd,&sp,blackwhite,brightness,pagesize); + } + else { + // reading from stdin, accept as many images that are sent +@@ -78,12 +87,12 @@ int main(int argc, char *argv[]) + break; + ungetc(c,stdin); + +- print(stdin,&sp,blackwhite,brightness); ++ print(stdin,&sp,blackwhite,brightness,pagesize); + } + } + } + +-void print(FILE *fd,SpongeWriter *sp,bool blackwhite, int brightness) ++void print(FILE *fd,SpongeWriter *sp,bool blackwhite, int brightness, int pagesize) + { + Reader r(fd,false); + char buffer[255]; +@@ -105,7 +114,7 @@ void print(FILE *fd,SpongeWriter *sp,boo + p = new LexmarkProtocol300c(sp); + + //get the page size +- Rect pageSize = p->getPageSize(LETTER_PAGE); ++ Rect pageSize = p->getPageSize(pagesize); + + Head h(&m,p, &pageSize); + diff --git a/source/apps-extra/lm1100/lm1100-gcc.patch b/source/apps-extra/lm1100/lm1100-gcc.patch new file mode 100644 index 0000000..074a16e --- /dev/null +++ b/source/apps-extra/lm1100/lm1100-gcc.patch @@ -0,0 +1,122 @@ +diff -aur lm1100.1.0.2a/Jet.h fw_lm1100.1.0.2a/Jet.h +--- lm1100.1.0.2a/Jet.h 2000-11-21 09:06:22.000000000 +0100 ++++ fw_lm1100.1.0.2a/Jet.h 2007-11-02 11:42:16.000000000 +0100 +@@ -45,7 +45,7 @@ + Coord imageStart; // start of image from edge of paper + + bool insideImage(int x, int y); +- bool Jet::needsPainting(int ix, int iy, int bit); ++ bool needsPainting(int ix, int iy, int bit); + + public: + /* Range of paper jet covers when head is at 0,0 */ +@@ -54,7 +54,7 @@ + /* Range of paper jet needs to cover to get the entire image */ + void getImageRange(Rect *dest); + Coord *getPreferredImageStart(Coord *start); +- int Jet::getPreferredEnd(); ++ int getPreferredEnd(); + bool finished(); + void setImageStart(Coord *imageStart); + void paint(int startX, int endX, int y, class LexmarkProtocol *protocol); +diff -aur lm1100.1.0.2a/LexmarkProtocol300c.cc fw_lm1100.1.0.2a/LexmarkProtocol300c.cc +--- lm1100.1.0.2a/LexmarkProtocol300c.cc 2000-11-21 09:06:22.000000000 +0100 ++++ fw_lm1100.1.0.2a/LexmarkProtocol300c.cc 2007-11-02 11:45:55.000000000 +0100 +@@ -69,7 +69,7 @@ + Jet **LexmarkProtocol300c::createJets(int *numJets, Map *imageMap) + { + *numJets = 6; +- class Jet **jets = new (Jet *)[6]; ++ class Jet **jets = new Jet *[6]; + jets[0] = new Jet(0,9,0,imageMap,LEFT_JET,0,8); + jets[1] = new Jet(1,0,0,imageMap,RIGHT_JET,0,8); + jets[2] = new Jet(2,-9,20,imageMap,LEFT_JET,1,8); +diff -aur lm1100.1.0.2a/LexmarkProtocolBW.cc fw_lm1100.1.0.2a/LexmarkProtocolBW.cc +--- lm1100.1.0.2a/LexmarkProtocolBW.cc 2000-11-21 09:06:22.000000000 +0100 ++++ fw_lm1100.1.0.2a/LexmarkProtocolBW.cc 2007-11-02 11:47:31.000000000 +0100 +@@ -68,7 +68,7 @@ + Jet **LexmarkProtocolBW::createJets(int *numJets, Map *imageMap) + { + *numJets = 2; +- class Jet **jets = new (Jet *)[2]; ++ class Jet **jets = new Jet *[2]; + jets[0] = new Jet(0,9,0,imageMap,LEFT_JET,0,28); + jets[1] = new Jet(0,0,0,imageMap,RIGHT_JET,0,28); + +diff -aur lm1100.1.0.2a/LinkedList.h fw_lm1100.1.0.2a/LinkedList.h +--- lm1100.1.0.2a/LinkedList.h 2000-11-21 09:06:22.000000000 +0100 ++++ fw_lm1100.1.0.2a/LinkedList.h 2007-11-02 11:40:57.000000000 +0100 +@@ -26,8 +26,8 @@ + void *object; + LinkedList *next; + +- LinkedList::LinkedList(); +- LinkedList::LinkedList(void * object); ++ LinkedList(); ++ LinkedList(void * object); + }; + + #endif +Only in fw_lm1100.1.0.2a/: lm1100 +diff -aur lm1100.1.0.2a/Map.h fw_lm1100.1.0.2a/Map.h +--- lm1100.1.0.2a/Map.h 2000-11-21 09:06:22.000000000 +0100 ++++ fw_lm1100.1.0.2a/Map.h 2007-11-02 11:40:31.000000000 +0100 +@@ -41,7 +41,7 @@ + int height; /* height of map in cells */ + + Map(int width, int height, int cellSize); +- Map::~Map(); ++ ~Map(); + + void cacheLines(int start, int len); + void addAlgorithm(MapAlgorithm *algorithm); +diff -aur lm1100.1.0.2a/PaintLine300c.h fw_lm1100.1.0.2a/PaintLine300c.h +--- lm1100.1.0.2a/PaintLine300c.h 2000-11-21 09:06:22.000000000 +0100 ++++ fw_lm1100.1.0.2a/PaintLine300c.h 2007-11-02 11:43:35.000000000 +0100 +@@ -32,7 +32,7 @@ + int size; + int x,y; + +- friend LexmarkProtocol300c; ++ friend class LexmarkProtocol300c; + + public: + void pad(int pad_amount); +diff -aur lm1100.1.0.2a/PaintLineBW.h fw_lm1100.1.0.2a/PaintLineBW.h +--- lm1100.1.0.2a/PaintLineBW.h 2000-11-21 09:06:22.000000000 +0100 ++++ fw_lm1100.1.0.2a/PaintLineBW.h 2007-11-02 11:46:29.000000000 +0100 +@@ -33,7 +33,7 @@ + int size; + int x,y; + +- friend LexmarkProtocolBW; ++ friend class LexmarkProtocolBW; + + public: + void pad(int pad_amount); +diff -aur lm1100.1.0.2a/PPMRaw.h fw_lm1100.1.0.2a/PPMRaw.h +--- lm1100.1.0.2a/PPMRaw.h 2000-11-21 09:06:22.000000000 +0100 ++++ fw_lm1100.1.0.2a/PPMRaw.h 2007-11-02 11:48:13.000000000 +0100 +@@ -32,7 +32,7 @@ + + public: + PPMRaw(Reader *reader,bool readMagic); +- static void PPMRaw::readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic); ++ static void readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic); + + virtual void getRGB(RGB *rgb, int x, int y); + +diff -aur lm1100.1.0.2a/Rect.h fw_lm1100.1.0.2a/Rect.h +--- lm1100.1.0.2a/Rect.h 2000-11-21 09:06:22.000000000 +0100 ++++ fw_lm1100.1.0.2a/Rect.h 2007-11-02 11:41:48.000000000 +0100 +@@ -23,8 +23,8 @@ + class Rect + { + public: +- Rect::Rect(); +- Rect::Rect(int x, int y, int width, int height); ++ Rect(); ++ Rect(int x, int y, int width, int height); + + int x,y,width,height; + From vmiklos at frugalware.org Sat Nov 3 13:05:53 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 13:05:56 2007 Subject: [Frugalware-git] frugalware-current: r8169-6.003.00-1-i686 Message-ID: <20071103120553.C58C513A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bca6f3a77df7cdf902cbfb7a92bae0f2a7c3feb4 commit bca6f3a77df7cdf902cbfb7a92bae0f2a7c3feb4 Author: Miklos Vajna Date: Sat Nov 3 13:05:21 2007 +0100 r8169-6.003.00-1-i686 fix up README.Frugalware (syntax + spelling fixes) diff --git a/source/network-extra/r8169/README.Frugalware b/source/network-extra/r8169/README.Frugalware index 3c2d584..34dde5b 100644 --- a/source/network-extra/r8169/README.Frugalware +++ b/source/network-extra/r8169/README.Frugalware @@ -1,20 +1,24 @@ -== About the driver +=== About the driver -This is the r8169 driver from realtek. This in _not_ the same r8169 -presented in linux kernel. +This is the r8169 driver from Realtek. This in _not_ the same r8169 +presented in Linux kernel. This driver supports: RTL8169S/8110S, RTL8169SB/8110SB, RTL8110SC -== Using the driver +=== Using the driver -To use this driver you have to remove the offcial r8169 if loaded. +To use this driver you have to remove the official r8169 if loaded. - rmmod r8169 +---- +# rmmod r8169 +---- You can load this module with - modprobe realtek-r8169 +---- +# modprobe realtek-r8169 +---- -It might be a good idea to blacklist r8169 nad add realtek-r8169 to -/etc/sysconfig/modules, so you do not have to play thig game after +It might be a good idea to blacklist `r8169` and add `realtek-r8169` to +`/etc/sysconfig/modules`, so you do not have to play this game after every reboot. From hermier at frugalware.org Sat Nov 3 13:07:08 2007 From: hermier at frugalware.org (Michel Hermier) Date: Sat Nov 3 13:07:09 2007 Subject: [Frugalware-git] pacman-g2: versort Message-ID: <20071103120708.B4EA813A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=9eb49167460c63372ede87e321bd4a6f5a684334 commit 9eb49167460c63372ede87e321bd4a6f5a684334 Author: Michel Hermier Date: Sat Nov 3 13:06:18 2007 +0100 versort * Add options/usage supports. * Added option to reverse the sorting. diff --git a/src/versort/versort.c b/src/versort/versort.c index 54d9cce..f514dec 100644 --- a/src/versort/versort.c +++ b/src/versort/versort.c @@ -19,15 +19,30 @@ * USA. */ -#include +#include "config.h" +#include +#include +#include #include #include #include #include +#include "pacman.h" +#include "util.h" + #define BUFFER_CHUNK 4096 +static char const short_options[] = "hr"; + +static struct option const long_options[] = +{ + {"help", no_argument, NULL, 'h'}, + {"reverse", no_argument, NULL, 'r'}, + {NULL, 0, NULL, 0}, +}; + static char *buffer = NULL; static size_t buffer_nmemb = 0; static size_t buffer_size = 0; @@ -36,6 +51,16 @@ static char **index = NULL; static size_t index_nmemb = 0; static size_t index_size = 0; +static int sort_reverse = 0; + +static void usage(const char *appname) +{ + printf(_("usage: %s [options]\n"), appname); + printf(_("options:\n")); + printf(_(" -h, --help display this help\n")); + printf(_(" -r, --reverse reverse ordering of the sort\n")); +} + static void readfd(int fd) { size_t buffer_read = 0; @@ -116,11 +141,27 @@ static void printindex() static int vercmpp(const void *p1, const void *p2) { - return pacman_pkg_vercmp(*(const char **)p1, *(const char **)p2); + int result = pacman_pkg_vercmp(*(const char **)p1, *(const char **)p2); + return sort_reverse ? -result : result; } int main(int argc, char *argv[]) { + int opt; + + while((opt = getopt_long(argc, argv, short_options, long_options, NULL)) >= 0) + { + switch(opt) + { + case 'r': + sort_reverse = 1; + break; + case 'h': + default: + usage(basename(argv[0])); + exit(EXIT_FAILURE); + } + } readfd(0); //stdin From devil505linux at gmail.com Sat Nov 3 13:14:39 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 13:14:41 2007 Subject: [Frugalware-git] frugalware-current: tmwmusic-0.0.20-1-i686 Message-ID: <20071103121439.CA87213A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=edd67bad28dce2b858889ec556f1f993c7933a03 commit edd67bad28dce2b858889ec556f1f993c7933a03 Author: Devil505 Date: Sat Nov 3 13:04:38 2007 +0100 tmwmusic-0.0.20-1-i686 *New Package diff --git a/source/games-extra/tmwmusic/FrugalBuild b/source/games-extra/tmwmusic/FrugalBuild new file mode 100644 index 0000000..67d964c --- /dev/null +++ b/source/games-extra/tmwmusic/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=tmwmusic +pkgver=0.0.20 +pkgrel="1" +pkgdesc="Music for The Mana World." +_F_sourceforge_dirname="themanaworld" +_F_sourceforge_broken_up2date=2 +Finclude sourceforge +url="http://themanaworld.org" +depends=('tmw') +groups=('games-extra') +archs=('i686') +sha1sums=('c1e3126ff7f53f6e12caaf885a493cd5c4aed6e3') +build() +{ + Fcd + Fmkdir usr/share/tmw + Fcprrel data usr/share/tmw +} \ No newline at end of file From vmiklos at frugalware.org Sat Nov 3 13:53:53 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 13:53:56 2007 Subject: [Frugalware-git] frugalware-current: sudo-1.6.9p8-1-i686 Message-ID: <20071103125353.59D3313A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=30c54809e66b69a2385e0ebcbcb5067f0e363c43 commit 30c54809e66b69a2385e0ebcbcb5067f0e363c43 Author: Miklos Vajna Date: Sat Nov 3 13:53:37 2007 +0100 sudo-1.6.9p8-1-i686 upgrade to patchlevel 'p8' diff --git a/source/apps/sudo/FrugalBuild b/source/apps/sudo/FrugalBuild index cefeaea..a4f587e 100644 --- a/source/apps/sudo/FrugalBuild +++ b/source/apps/sudo/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=sudo -pkgver=1.6.9p7 +pkgver=1.6.9p8 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=('f070cca0a99daa08480fb99e60108fc330f0207f' \ +sha1sums=('d4408550e4ebd2089edb2a7cc3f4ce9f7ba919f3' \ 'ff0745f1d95c614f55e8fd1f85abee2486cf24ba') build() From priyank at frugalware.org Sat Nov 3 13:54:15 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 13:54:17 2007 Subject: [Frugalware-git] fun: forgot to rename service name in other files Message-ID: <20071103125415.63D2C13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=24a051460a74c4cce6c6bef017da4c6fcfc696dc commit 24a051460a74c4cce6c6bef017da4c6fcfc696dc Author: Priyank Date: Sat Nov 3 18:22:45 2007 +0530 forgot to rename service name in other files diff --git a/fund.conf b/fund.conf index 1bfeb25..dfa0ed7 100644 --- a/fund.conf +++ b/fund.conf @@ -3,18 +3,18 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - - - + + + - - - + + + - - - + + + diff --git a/src/fun-dbus.c b/src/fun-dbus.c index a11483e..e467793 100644 --- a/src/fun-dbus.c +++ b/src/fun-dbus.c @@ -52,9 +52,9 @@ fun_dbus_perform_service (guint service, gchar **package_list) case PERFORM_UPDATE: { dbus_error_init (&error); - message = dbus_message_new_method_call ("org.frugalware.UpdNotifier", - "/org/frugalware/UpdNotifier", - "org.frugalware.UpdNotifier", + message = dbus_message_new_method_call ("org.frugalware.FWUpdateNotifier", + "/org/frugalware/FWUpdateNotifier", + "org.frugalware.FWUpdateNotifier", "PerformUpdate"); reply = dbus_connection_send_with_reply_and_block (fun_conn, message, reply_timeout, &error); if (dbus_error_is_set(&error)) @@ -80,9 +80,9 @@ fun_dbus_perform_service (guint service, gchar **package_list) { guint ret = 0; dbus_error_init (&error); - message = dbus_message_new_method_call ("org.frugalware.UpdNotifier", - "/org/frugalware/UpdNotifier", - "org.frugalware.UpdNotifier", + message = dbus_message_new_method_call ("org.frugalware.FWUpdateNotifier", + "/org/frugalware/FWUpdateNotifier", + "org.frugalware.FWUpdateNotifier", "TestService"); reply = dbus_connection_send_with_reply_and_block (fun_conn, message, reply_timeout, &error); if (dbus_error_is_set(&error)) diff --git a/src/fund.c b/src/fund.c index 07deca4..bf87fd6 100644 --- a/src/fund.c +++ b/src/fund.c @@ -66,7 +66,7 @@ void fund_init(FWUpdateNotifier *server) { // Register the service name, the constant here are defined in dbus-glib-bindings.h driver_proxy = dbus_g_proxy_new_for_name(server->connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); - if (!org_freedesktop_DBus_request_name (driver_proxy, "org.frugalware.UpdNotifier", 0, &request_ret, &error)) { + if (!org_freedesktop_DBus_request_name (driver_proxy, "org.frugalware.FWUpdateNotifier", 0, &request_ret, &error)) { g_warning("Unable to register service: %s", error->message); g_error_free(error); } From priyank at frugalware.org Sat Nov 3 13:56:08 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 13:56:11 2007 Subject: [Frugalware-git] fun: fix a small typo in license Message-ID: <20071103125608.71ABD13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=5b99f3a35dfeb82e3221e0a94a7a092d60a91a19 commit 5b99f3a35dfeb82e3221e0a94a7a092d60a91a19 Author: Priyank Date: Sat Nov 3 18:24:53 2007 +0530 fix a small typo in license diff --git a/src/fund.c b/src/fund.c index bf87fd6..b9f5cb0 100644 --- a/src/fund.c +++ b/src/fund.c @@ -2,7 +2,7 @@ * fund.c for fun * * Copyright (C) 2007 by Priyank Gosalia - * Portions of this code are borrowed fron netconfigd + * Portions of this code are borrowed from netconfigd * netconfigd is Copyright (C) 2007 Alex Smith * * This program is free software; you can redistribute it and/or modify From priyank at frugalware.org Sat Nov 3 13:57:05 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 13:57:06 2007 Subject: [Frugalware-git] fun: more typos fixed Message-ID: <20071103125705.2110313A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=0601dd6252f071bcb404b8fa813269b945a2e14f commit 0601dd6252f071bcb404b8fa813269b945a2e14f Author: Priyank Date: Sat Nov 3 18:25:48 2007 +0530 more typos fixed diff --git a/src/fun-config.c b/src/fun-config.c index 47cee83..c60b3cd 100644 --- a/src/fun-config.c +++ b/src/fun-config.c @@ -2,7 +2,7 @@ * fun-config.c for fun * * Copyright (C) 2007 by Priyank Gosalia - * Portions of this code are borrowed fron gimmix + * Portions of this code are borrowed from gimmix * gimmix is Copyright (C) 2006-2007 Priyank Gosalia * * This program is free software; you can redistribute it and/or modify diff --git a/src/fun-tooltip.c b/src/fun-tooltip.c index 15f3dc5..2f7c558 100644 --- a/src/fun-tooltip.c +++ b/src/fun-tooltip.c @@ -2,7 +2,7 @@ * fun-tooltip.c for fun * * Copyright (C) 2007 by Priyank Gosalia - * Portions of this code are borrowed fron gimmix + * Portions of this code are borrowed from gimmix * gimmix is Copyright (C) 2006-2007 Priyank Gosalia * * This program is free software; you can redistribute it and/or modify diff --git a/src/fun-ui.c b/src/fun-ui.c index 94fca42..aa09570 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -2,7 +2,7 @@ * fun-ui.c for fun * * Copyright (C) 2007 by Priyank Gosalia - * Portions of this code are borrowed fron gimmix + * Portions of this code are borrowed from gimmix * gimmix is Copyright (C) 2006-2007 Priyank Gosalia * * This program is free software; you can redistribute it and/or modify From vmiklos at frugalware.org Sat Nov 3 13:58:45 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 13:58:48 2007 Subject: [Frugalware-git] frugalware-current: live-2007.11.01-1-i686 Message-ID: <20071103125845.A023F13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d32e8ad4697092393cdd06e879a000a890ae2571 commit d32e8ad4697092393cdd06e879a000a890ae2571 Author: Miklos Vajna Date: Sat Nov 3 13:58:36 2007 +0100 live-2007.11.01-1-i686 version bump diff --git a/source/multimedia/live/FrugalBuild b/source/multimedia/live/FrugalBuild index 8eafc90..1159261 100644 --- a/source/multimedia/live/FrugalBuild +++ b/source/multimedia/live/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=live -pkgver=2007.08.03a +pkgver=2007.11.01 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=('27e79c9c273a85b05bce75bd4d837254d74438e9') +sha1sums=('77160cf3cdb62be7410c938101983bfed254d2bd') build() { From janny at frugalware.org Sat Nov 3 14:07:53 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 14:07:57 2007 Subject: [Frugalware-git] frugalware-current: xcache-1.2.1-1-i686 Message-ID: <20071103130753.233F613A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ce43802135a230b8535fb19b76de3496bd20544 commit 1ce43802135a230b8535fb19b76de3496bd20544 Author: janny Date: Sat Nov 3 14:07:27 2007 +0100 xcache-1.2.1-1-i686 version bump modified with new url up2date(),source(),README diff --git a/source/network-extra/xcache/FrugalBuild b/source/network-extra/xcache/FrugalBuild index 19a0903..2410658 100644 --- a/source/network-extra/xcache/FrugalBuild +++ b/source/network-extra/xcache/FrugalBuild @@ -2,30 +2,37 @@ # Maintainer: Janny pkgname=xcache -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 -url="http://trac.lighttpd.net/xcache/" +url="http://xcache.lighttpd.net" pkgdesc="XCache is a fast, stable PHP opcode cacher." depends=('php') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://210.51.190.228/pub/XCache/Releases/|Flasttar" -source=(http://210.51.190.228/pub/XCache/Releases/$pkgname-$pkgver.tar.gz \ +up2date="lynx -dump $url/wiki/ReleaseArchive|grep Release-[0-9\.]|sort|sed -n 's/.*Release-\(.*\)\.*/\1/;1 p'" +source=($url/pub/Releases/$pkgver/$pkgname-$pkgver.tar.bz2 \ README.Frugalware) -sha1sums=('79227f1d95f8cb7bc57cf14b1a2948ade92bbfdc' \ - 'a9c415163ddb8f50e761bc35db92f10da65a2497') +sha1sums=('3ba91e1d617f51e27aa0c0a7accefb0bb5e69949' \ + '95e73c8bc8334f13cf7434b822bb18a0cb671505') build() { - Fcd $pkgname/ + Fcd phpize || Fdie - Fmake --enable-xcache --enable-xcache-coverager + Fmake --enable-xcache=shared \ + --enable-xcache-constant \ + --enable-xcache-optimizer \ + --enable-xcache-coverager \ + --enable-xcache-assembler \ + --enable-xcache-encoder \ + --enable-xcache-decoder cd modules - Fexerel /usr/lib/php/$pkgname.so + Fexerel usr/lib/php/$pkgname.so + cd .. Fmkdir /usr/share/xcache/admin - Fcpr $pkgname/admin/* usr/share/xcache/admin + Fcpr $pkgname-$pkgver/admin/* usr/share/xcache/admin Fdoc README.Frugalware - Ffile $pkgname/xcache.ini usr/share/doc/$pkgname-$pkgver/ + Ffilerel xcache.ini usr/share/doc/$pkgname-$pkgver/ } # optimization OK diff --git a/source/network-extra/xcache/README.Frugalware b/source/network-extra/xcache/README.Frugalware index 86b14c7..177c374 100644 --- a/source/network-extra/xcache/README.Frugalware +++ b/source/network-extra/xcache/README.Frugalware @@ -17,4 +17,4 @@ Installing As PHP Extension? WARNING: Use >> with cat, not simply > -Please take a look on http://trac.lighttpd.net/xcache/wiki[xcache wiki]. +Please take a look on http://xcache.lighttpd.net/[xcache wiki]. From devil505linux at gmail.com Sat Nov 3 14:23:37 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 14:23:44 2007 Subject: [Frugalware-git] frugalware-current: tmwmusic-0.0.20-2-i686 Message-ID: <20071103132337.091C113A8010@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=175871eff1e49bd5db80ebb766a536dcae9d9506 commit 175871eff1e49bd5db80ebb766a536dcae9d9506 Author: Devil505 Date: Sat Nov 3 14:06:32 2007 +0100 tmwmusic-0.0.20-2-i686 *Remove tmw as depends diff --git a/source/games-extra/tmwmusic/FrugalBuild b/source/games-extra/tmwmusic/FrugalBuild index 67d964c..25b7ea7 100644 --- a/source/games-extra/tmwmusic/FrugalBuild +++ b/source/games-extra/tmwmusic/FrugalBuild @@ -3,13 +3,13 @@ pkgname=tmwmusic pkgver=0.0.20 -pkgrel="1" +pkgrel="2" pkgdesc="Music for The Mana World." _F_sourceforge_dirname="themanaworld" _F_sourceforge_broken_up2date=2 Finclude sourceforge url="http://themanaworld.org" -depends=('tmw') +depends=('') groups=('games-extra') archs=('i686') sha1sums=('c1e3126ff7f53f6e12caaf885a493cd5c4aed6e3') From devil505linux at gmail.com Sat Nov 3 14:23:37 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 14:23:45 2007 Subject: [Frugalware-git] frugalware-current: tmwmusic-0.0.20-2-i686 Message-ID: <20071103132337.1EB2513A8030@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b2a9b82a90fd7da87a208681755a84f283bc9ec3 commit b2a9b82a90fd7da87a208681755a84f283bc9ec3 Author: Devil505 Date: Sat Nov 3 14:07:16 2007 +0100 tmwmusic-0.0.20-2-i686 *remove tmw as depends diff --git a/source/games-extra/tmwmusic/FrugalBuild b/source/games-extra/tmwmusic/FrugalBuild index 25b7ea7..1852bde 100644 --- a/source/games-extra/tmwmusic/FrugalBuild +++ b/source/games-extra/tmwmusic/FrugalBuild @@ -9,7 +9,7 @@ _F_sourceforge_dirname="themanaworld" _F_sourceforge_broken_up2date=2 Finclude sourceforge url="http://themanaworld.org" -depends=('') +depends=() groups=('games-extra') archs=('i686') sha1sums=('c1e3126ff7f53f6e12caaf885a493cd5c4aed6e3') From devil505linux at gmail.com Sat Nov 3 14:23:37 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 14:23:45 2007 Subject: [Frugalware-git] frugalware-current: tmwmusic-0.0.20-2-i686 Message-ID: <20071103132337.3E34C13A8031@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd539c487b221672385cf47f63bc549d629a7eff commit bd539c487b221672385cf47f63bc549d629a7eff Author: Devil505 Date: Sat Nov 3 14:22:13 2007 +0100 tmwmusic-0.0.20-2-i686 *Fixed depends diff --git a/source/games-extra/tmwmusic/FrugalBuild b/source/games-extra/tmwmusic/FrugalBuild index 1852bde..8ced3dc 100644 --- a/source/games-extra/tmwmusic/FrugalBuild +++ b/source/games-extra/tmwmusic/FrugalBuild @@ -3,7 +3,7 @@ pkgname=tmwmusic pkgver=0.0.20 -pkgrel="2" +pkgrel=2 pkgdesc="Music for The Mana World." _F_sourceforge_dirname="themanaworld" _F_sourceforge_broken_up2date=2 From vmiklos at frugalware.org Sat Nov 3 14:24:35 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 14:24:37 2007 Subject: [Frugalware-git] frugalware-current: squashfs-3.2_r2-5-i686 Message-ID: <20071103132435.57B74108813A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8ff6483b4b3eca21735ddf1697f98bfa39655bb commit d8ff6483b4b3eca21735ddf1697f98bfa39655bb Author: Miklos Vajna Date: Sat Nov 3 14:10:49 2007 +0100 squashfs-3.2_r2-5-i686 bin, moved to the fwlive repo diff --git a/source/apps-extra/squashfs/FrugalBuild b/source/apps-extra/squashfs/FrugalBuild deleted file mode 100644 index 7e82bd9..0000000 --- a/source/apps-extra/squashfs/FrugalBuild +++ /dev/null @@ -1,53 +0,0 @@ -# Compiling Time: 0.26 SBU -# Maintainer: VMiklos - -pkgname=squashfs -pkgver=3.2_r2 -kver=2.6.22-1 -kdir=/lib/modules/${kver/-/-fw}/kernel/fs/squashfs -pkgrel=5 -pkgdesc="A highly compressed read-only filesystem for Linux." -depends=('zlib' "kernel-fwlive=$kver") -makedepends=("kernel-fwlive-source=$kver") -groups=('apps-extra') -archs=('i686' 'x86_64') -#_F_kernel_name="-fwlive" -Finclude sourceforge -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=63835|grep squashfs[0-9]|sed 's/[^]]*][^]]*]squashfs\([^ ]*\) .*/\1/;s/-/_/g;q'" -source=(${source/squashfs-/squashfs} \ - http://$_F_sourceforge_mirror.dl.sourceforge.net/sevenzip/lzma443.tar.bz2 \ - ftp://ftp.slax.org/source/slax/kernel/2.6.21.5/src-core/patches/squashfs/sqlzma.tar.bz2 \ - mksquashfs.quiet.patch) -options=('scriptlet') - -build() -{ - rm -rf lzma443 - mkdir -p lzma443 || Fdie - tar -C lzma443 -xf lzma443.tar.bz2 || Fdie - rm sqlzma2k-3.2-r2.patch - patch -p0 Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3b1d289995e8e5125491b933adb199b76496dc1a commit 3b1d289995e8e5125491b933adb199b76496dc1a Author: Miklos Vajna Date: Sat Nov 3 14:05:18 2007 +0100 trm-0.2.1-2-i686 url and up2date fix diff --git a/source/multimedia-extra/trm/FrugalBuild b/source/multimedia-extra/trm/FrugalBuild index 6c1057a..53912a7 100644 --- a/source/multimedia-extra/trm/FrugalBuild +++ b/source/multimedia-extra/trm/FrugalBuild @@ -5,11 +5,11 @@ pkgname=trm pkgver=0.2.1 pkgrel=2 pkgdesc="The TRM Generator is a small test application that generates Relatable TRM acoustic fingerprints." -url="http://www.musicbrainz.org/products/trmgen/download.html" +url="http://musicbrainz.org/doc/TRMGen" depends=('libmusicbrainz' 'id3lib' 'libvorbis') groups=('multimedia-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.musicbrainz.org/products/trmgen/download.html|grep 'Source Distribution'|tr -s ' '|cut -d ' ' -f 5" +up2date="lynx -dump $url |Flasttar" source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname-$pkgver.tar.gz) sha1sums=('ea032c38ca83266026e0c10919749814282994e9') @@ -20,6 +20,4 @@ build() Fmakeinstall prefix=$Fdestdir/usr } -# optimalization OK - -# vim: ft=sh +# optimization OK From vmiklos at frugalware.org Sat Nov 3 14:24:35 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 14:24:37 2007 Subject: [Frugalware-git] frugalware-current: ltp-20071031-1-i686 Message-ID: <20071103132435.79FC1108813A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1863d9ace7163d25f5a2443817c219a9e41391cb commit 1863d9ace7163d25f5a2443817c219a9e41391cb Author: Miklos Vajna Date: Sat Nov 3 14:23:43 2007 +0100 ltp-20071031-1-i686 version bump diff --git a/source/apps-extra/ltp/FrugalBuild b/source/apps-extra/ltp/FrugalBuild index 6ef536e..6cda2e8 100644 --- a/source/apps-extra/ltp/FrugalBuild +++ b/source/apps-extra/ltp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=ltp -pkgver=20070930 +pkgver=20071031 # sometimes != $pkgver realver=$pkgver pkgrel=1 @@ -16,6 +16,10 @@ groups=('apps-extra') archs=('i686' 'x86_64') source=(${source/ltp-/ltp-full-} $pkgname-{IDcheck_noninteractive,runltp_path}.diff \ ltp-20061222-linux2619.diff) +sha1sums=('5f98a5fb82699827f1d55f0c65507ee105d4cfb9' \ + 'c7a2132257cf1c430a9692009952084746722c40' \ + 'e9ff5dbafdd07ebe796b2f064066d7dbb7c7b6c5' \ + '0a6f6665340d6745904936484c42e6e874a0fc2d') build() { Fcd $pkgname-full-$realver @@ -27,9 +31,5 @@ build() { cp runltp runalltests.sh $Fdestdir/usr/bin/ || Fdie } -sha1sums=('2416c7695aa5c77d8d298269a4280717b4f1330b' \ - 'c7a2132257cf1c430a9692009952084746722c40' \ - 'e9ff5dbafdd07ebe796b2f064066d7dbb7c7b6c5' \ - '0a6f6665340d6745904936484c42e6e874a0fc2d') # optimization OK From janny at frugalware.org Sat Nov 3 14:28:26 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 14:28:28 2007 Subject: [Frugalware-git] frugalware-current: courier-authlib-0.60.2-1-i686 Message-ID: <20071103132826.A95C0108813A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a5b424d4b5587b006710bb4fb3a504574c549f36 commit a5b424d4b5587b006710bb4fb3a504574c549f36 Author: janny Date: Sat Nov 3 14:27:57 2007 +0100 courier-authlib-0.60.2-1-i686 version bump new m8r diff --git a/source/network-extra/courier-authlib/FrugalBuild b/source/network-extra/courier-authlib/FrugalBuild index fa4f2bf..847fa5d 100644 --- a/source/network-extra/courier-authlib/FrugalBuild +++ b/source/network-extra/courier-authlib/FrugalBuild @@ -1,9 +1,10 @@ # Compiling Time: 0.93 SBU -# Maintainer: Karoly CZOVEK +# Maintainer: Janny +# Contributor: Karoly CZOVEK pkgname=courier-authlib -pkgver=0.59.3 -pkgrel=2 +pkgver=0.60.2 +pkgrel=1 pkgdesc="The Courier authentication library & daemon" _F_sourceforge_dirname="courier" _F_sourceforge_ext=".tar.bz2" @@ -18,11 +19,11 @@ backup=('etc/courier/authdaemonrc' 'etc/courier/authlib/userdb') up2date="lynx -dump 'http://www.courier-mta.org/download.php'|grep authlib|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($source rc.courier-authlib rc.courier-authlib-de.po authdaemonrc.frugal \ README.frugalware) -sha1sums=('d82dd91bac9e51755c9da98736cff96228be4e29' \ - '0f9b61c096dc7d164c1c2733cdd9742534731c79' \ - '2ac194885e90df15d3d7fc3f38f3822cd931fa9a' \ - '57669b3fd1d3dda9d4e00d91a6a53ab31fd8e5a0' \ - '752746ca155da14869eeaaee0062da8e9f0ba05e') +sha1sums=('cd5969075de212ecfb406ffb1ac974ea939ddcc0' \ + '0f9b61c096dc7d164c1c2733cdd9742534731c79' \ + '2ac194885e90df15d3d7fc3f38f3822cd931fa9a' \ + '57669b3fd1d3dda9d4e00d91a6a53ab31fd8e5a0' \ + '752746ca155da14869eeaaee0062da8e9f0ba05e') build() { @@ -61,7 +62,7 @@ build() # creating userdb file Fmkdir /etc/courier/authlib/ - touch $Fdestdir/etc/courier/authlib/userdb + touch $Fdestdir/etc/courier/authlib/userdb || Fdie # place my sample config file in confdir Ffile authdaemonrc.frugal /etc/courier/authdaemonrc @@ -71,6 +72,4 @@ build() Frcd2 } -# optimalization OK - # optimization OK From devil505linux at gmail.com Sat Nov 3 14:41:12 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 14:41:16 2007 Subject: [Frugalware-git] frugalware-current: tmw-0.0.23-2-i686 Message-ID: <20071103134112.E339313A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=20c29d6eef896fd1a7956c5975c87373040ce3c8 commit 20c29d6eef896fd1a7956c5975c87373040ce3c8 Author: Devil505 Date: Sat Nov 3 14:36:35 2007 +0100 tmw-0.0.23-2-i686 *Added tmwmusic as rodepends, thx crazy diff --git a/source/games-extra/tmw/FrugalBuild b/source/games-extra/tmw/FrugalBuild index 81d8f8f..422cc46 100644 --- a/source/games-extra/tmw/FrugalBuild +++ b/source/games-extra/tmw/FrugalBuild @@ -3,13 +3,14 @@ pkgname=tmw pkgver=0.0.23 -pkgrel=1 +pkgrel=2 pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." _F_sourceforge_dirname="themanaworld" _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://themanaworld.org" depends=('sdlimage' 'sdl_mixer' 'guichan' 'libgl' 'curl' 'sdl_net' 'physfs' 'libxdamage' 'libxml2' 'freeglut') +rodepends=('tmwmusic') groups=('games-extra') archs=('i686') sha1sums=('eb9f0642f69fcd28e725042dbe021f1706c6c8a1') From janny at frugalware.org Sat Nov 3 14:47:25 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 14:47:27 2007 Subject: [Frugalware-git] frugalware-current: courier-imap-4.2.1-1-i686 Message-ID: <20071103134725.1C7AD13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=403a20c64bdddf0ac3228c3c7f033006605aa260 commit 403a20c64bdddf0ac3228c3c7f033006605aa260 Author: janny Date: Sat Nov 3 14:46:52 2007 +0100 courier-imap-4.2.1-1-i686 version bump new m8r diff --git a/source/network-extra/courier-imap/FrugalBuild b/source/network-extra/courier-imap/FrugalBuild index 8c776ce..a74f2b4 100644 --- a/source/network-extra/courier-imap/FrugalBuild +++ b/source/network-extra/courier-imap/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 1.00 SBU -# Maintainer: Karoly CZOVEK +# Maintainer: Janny +# Contributor: Karoly CZOVEK pkgname=courier-imap -pkgver=4.1.3 +pkgver=4.2.1 pkgrel=1 pkgdesc="The Courier IMAP and POP3 server" _F_sourceforge_dirname="courier" @@ -17,6 +18,12 @@ 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' \ + '0da77a7b652876916c7e228bc889586cc5e45176' \ + '036597f9d7609fc172509c07198be5057a1d6651' \ + '52babf7670b08ab32b426f1d7dd3692c8aa49b4c' \ + 'ef5b76338d24269e07782253958de63bb2194a11' \ + 'b1f5cc4d3b83e2aefb14841de12eb9b3a0948859') build() { @@ -74,14 +81,4 @@ build() Frcd courier-pop3d-ssl } - -# optimalization OK -sha1sums=('d0042e585d6df658a41a1768887d135c89e51ac0' \ - '0da77a7b652876916c7e228bc889586cc5e45176' \ - '036597f9d7609fc172509c07198be5057a1d6651' \ - '52babf7670b08ab32b426f1d7dd3692c8aa49b4c' \ - 'ef5b76338d24269e07782253958de63bb2194a11' \ - 'b1f5cc4d3b83e2aefb14841de12eb9b3a0948859') - - # optimization OK From priyank at frugalware.org Sat Nov 3 14:49:39 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 14:49:41 2007 Subject: [Frugalware-git] fun: fun-config Message-ID: <20071103134939.5C52B13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=34aceca484fa089b24529c6a6688ef759693a331 commit 34aceca484fa089b24529c6a6688ef759693a331 Author: Priyank Date: Sat Nov 3 19:18:24 2007 +0530 fun-config * Added a new function fun_config_set_value_int() to save configuration data diff --git a/src/fun-config.c b/src/fun-config.c index c60b3cd..069be8e 100644 --- a/src/fun-config.c +++ b/src/fun-config.c @@ -74,6 +74,16 @@ fun_config_get_value_int (const char *key) } void +fun_config_set_value_int (const char *key, int value) +{ + char *val = g_strdup_printf ("%d", value); + cfg_add_key (&conf, key, val); + g_free (val); + + return; +} + +void fun_config_save (void) { char *rcfile; diff --git a/src/fun-config.h b/src/fun-config.h index ce8ff99..7251834 100644 --- a/src/fun-config.h +++ b/src/fun-config.h @@ -20,6 +20,9 @@ char * fun_config_get_value_string (const char *); /* Read a value from funrc and return it as an int */ int fun_config_get_value_int (const char *); +/* Set a value for a particular key in funrc */ +void fun_config_set_value_int (const char *, int); + /* Free conf */ void fun_config_free (void); From priyank at frugalware.org Sat Nov 3 14:50:23 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 14:50:24 2007 Subject: [Frugalware-git] fun: fun-ui Message-ID: <20071103135023.5F81513A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=eec6e13eec6c9d814322c9f13e9b4f1f6021bb88 commit eec6e13eec6c9d814322c9f13e9b4f1f6021bb88 Author: Priyank Date: Sat Nov 3 19:19:07 2007 +0530 fun-ui * Added a new preferences dialog diff --git a/src/fun-ui.c b/src/fun-ui.c index aa09570..68f0636 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -43,6 +43,7 @@ GtkWidget *stooltip; static GtkStatusIcon *fun_icon = NULL; static GtkWidget *fun_about_dlg = NULL; static GdkPixbuf *fun_about_pixbuf = NULL; +static GtkWidget *fun_config_dlg = NULL; static gboolean connected = FALSE; /* credits */ @@ -63,10 +64,14 @@ static const gchar translators[] = ""; static gboolean fun_timeout_func (void); static gboolean fun_timeout_conn (void); +static void fun_config_dialog_show (void); + 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 void cb_fun_config_dlg_close_clicked (GtkWidget *button, gpointer data); + void fun_systray_create (void) { @@ -194,6 +199,12 @@ cb_fun_systray_icon_clicked (GtkWidget *widget, GdkEventButton *event, gpointer gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); gtk_widget_show (menu_item); + /* Preferences */ + menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES, NULL); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (fun_config_dialog_show), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + gtk_widget_show (menu_item); + /* Quit */ menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (gtk_main_quit), NULL); @@ -213,6 +224,26 @@ cb_fun_systray_icon_clicked (GtkWidget *widget, GdkEventButton *event, gpointer } } +static void +cb_fun_config_dlg_close_clicked (GtkWidget *button, gpointer data) +{ + GtkAdjustment *adj = NULL; + guint interval = 0; + guint old_interval = 0; + + adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(data)); + interval = gtk_adjustment_get_value (adj); + old_interval = fun_config_get_value_int ("update_interval"); + /* if nothing is changed */ + if (old_interval == interval) + return; + fun_config_set_value_int ("update_interval", interval); + fun_config_save (); + gtk_widget_hide (fun_config_dlg); + + return; +} + void fun_systray_destroy (void) { @@ -227,6 +258,89 @@ fun_systray_destroy (void) return; } +static void +fun_config_dialog_show (void) +{ + if (!GTK_WIDGET_VISIBLE(fun_config_dlg)) + { + gtk_widget_show (fun_config_dlg); + gtk_window_present (GTK_WINDOW(fun_config_dlg)); + } + else + { + gtk_window_present (GTK_WINDOW(fun_config_dlg)); + } + + return; +} + +static void +fun_config_dialog_init (void) +{ + GtkWidget *vbox1; + GtkWidget *hbox2; + GtkWidget *image1; + GtkWidget *label2; + GtkWidget *hbox1; + GtkWidget *label1; + GtkObject *spinbutton1_adj; + GtkWidget *spinbutton1; + GtkWidget *hbuttonbox1; + GtkWidget *pref_close; + + fun_config_dlg = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_default_size (fun_config_dlg, 350, 150); + //gtk_window_set_resizable (fun_config_dlg, FALSE); + + vbox1 = gtk_vbox_new (FALSE, 5); + gtk_widget_show (vbox1); + gtk_container_add (GTK_CONTAINER (fun_config_dlg), vbox1); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), 6); + + hbox2 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox2); + gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, TRUE, 5); + + image1 = gtk_image_new_from_file ("/usr/share/fun/fun.png"); + gtk_widget_show (image1); + gtk_box_pack_start (GTK_BOX (hbox2), image1, FALSE, TRUE, 0); + gtk_misc_set_alignment (GTK_MISC (image1), 0, 0); + + label2 = gtk_label_new ("Configure Frugalware Update Nofitier"); + gtk_widget_show (label2); + gtk_box_pack_start (GTK_BOX (hbox2), label2, TRUE, TRUE, 0); + gtk_label_set_use_markup (GTK_LABEL (label2), TRUE); + gtk_misc_set_alignment (GTK_MISC (label2), 0.05, 0.5); + + hbox1 = gtk_hbox_new (FALSE, 5); + gtk_widget_show (hbox1); + gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0); + + label1 = gtk_label_new ("Update Interval (minutes) :"); + gtk_widget_show (label1); + gtk_box_pack_start (GTK_BOX (hbox1), label1, TRUE, TRUE, 0); + gtk_label_set_use_markup (GTK_LABEL (label1), TRUE); + gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5); + + spinbutton1_adj = gtk_adjustment_new (1, 1, 60, 1, 10, 10); + spinbutton1 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton1_adj), 1, 0); + gtk_widget_show (spinbutton1); + gtk_box_pack_start (GTK_BOX (hbox1), spinbutton1, FALSE, TRUE, 0); + + hbuttonbox1 = gtk_hbutton_box_new (); + gtk_widget_show (hbuttonbox1); + gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, FALSE, TRUE, 0); + gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_END); + + pref_close = gtk_button_new_from_stock ("gtk-close"); + gtk_widget_show (pref_close); + gtk_container_add (GTK_CONTAINER (hbuttonbox1), pref_close); + GTK_WIDGET_SET_FLAGS (pref_close, GTK_CAN_DEFAULT); + g_signal_connect (G_OBJECT(pref_close), "clicked", G_CALLBACK(cb_fun_config_dlg_close_clicked), (gpointer)spinbutton1); + + return; +} + void fun_ui_init (void) { @@ -234,6 +348,8 @@ fun_ui_init (void) gulong seconds = 0; fun_systray_create (); + fun_config_dialog_init (); + if (fun_dbus_perform_service (TEST_SERVICE, NULL) == FALSE) { g_print ("Failed to connect to the fun daemon\n"); @@ -243,8 +359,6 @@ fun_ui_init (void) return; } seconds = fun_config_get_value_int ("update_interval") * 60; - g_print ("%d\n", seconds); - connected = TRUE; /* register the timeout */ From krics at linuxforum.hu Sat Nov 3 14:50:26 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Nov 3 14:50:33 2007 Subject: [Frugalware-git] frugalware-current: anjuta-2.3.0-1-x86_64 Message-ID: <20071103135026.30E5D13A4063@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9610f6d265c5b94b65d8b3eaa4902fefd26690c5 commit 9610f6d265c5b94b65d8b3eaa4902fefd26690c5 Author: Christian Hamar alias krix Date: Sat Nov 3 14:47:50 2007 +0100 anjuta-2.3.0-1-x86_64 * Version bump diff --git a/source/gnome-extra/anjuta/FrugalBuild b/source/gnome-extra/anjuta/FrugalBuild index ca39ac9..046e508 100644 --- a/source/gnome-extra/anjuta/FrugalBuild +++ b/source/gnome-extra/anjuta/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=anjuta -pkgver=2.2.2 +pkgver=2.3.0 pkgrel=1 pkgdesc="Anjuta is a versatile IDE for C and C++, written for GTK/GNOME." depends=('gdl' 'gnome-build>=0.2.0' 'guile>=1.8.2' 'autogen' 'glade3' 'devhelp' 'graphviz>=2.14-2' 'libgnomeprintui' 'vte' 'subversion' 'gtksourceview') @@ -17,7 +17,7 @@ Finclude sourceforge gnome-scriptlet options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('45fccec45f32515e17b195eee816ada5dc13c330') +sha1sums=('384408f8b26818d9b6af07d78d46d12ed332f082') build() { From krics at linuxforum.hu Sat Nov 3 15:17:25 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Nov 3 15:17:27 2007 Subject: [Frugalware-git] frugalware-current: libdvbpsi-0.1.6-1-x86_64 Message-ID: <20071103141725.1543E13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f6c77eeec015c46a7d1bf6a973001529fa3413b commit 9f6c77eeec015c46a7d1bf6a973001529fa3413b Author: Christian Hamar alias krix Date: Sat Nov 3 15:17:02 2007 +0100 libdvbpsi-0.1.6-1-x86_64 * Version bump * Fixed source URI * Fixed SBU * Removed old md5sum entry :) diff --git a/source/multimedia/libdvbpsi/FrugalBuild b/source/multimedia/libdvbpsi/FrugalBuild index 5a1e99b..7c817a6 100644 --- a/source/multimedia/libdvbpsi/FrugalBuild +++ b/source/multimedia/libdvbpsi/FrugalBuild @@ -1,22 +1,21 @@ -# Compiling Time: ~0.27 SBU +# Compiling Time: 0.16 SBU # Maintainer: Christian Hamar alias krix pkgname=libdvbpsi -pkgver=0.1.5 -pkgrel=2 +pkgver=0.1.6 +pkgrel=1 pkgdesc="library for MPEG TS/DVB PSI tables decoding and generation" url="http://www.videolan.org/libdvbpsi" depends=('glibc') up2date="lynx -dump 'http://download.videolan.org/pub/libdvbpsi/'|grep libdvbpsi|sort -n -r|head -n1|sed 's/.*si//;s/\///g'" -source=(http://www.videolan.org/pub/libdvbpsi/$pkgver/${pkgname}4-$pkgver.tar.gz) -md5sums=('47612d2f8a4d4dee746a166d8b7f6f77') +source=(http://www.videolan.org/pub/libdvbpsi/$pkgver/${pkgname}5-$pkgver.tar.gz) license=('GPL2') groups=('multimedia') archs=('x86_64' 'i686') -sha1sums=('5974b94b27ea7197eb6a38b8a590be3e76435087') +sha1sums=('29300cf234f7daecb783335d1e2688231521a58e') build() { - Fcd ${pkgname}4-$pkgver + Fcd ${pkgname}5-$pkgver Fsed '-O6' '' configure Fbuild --enable-release } From janny at frugalware.org Sat Nov 3 15:24:15 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 15:24:18 2007 Subject: [Frugalware-git] frugalware-current: monodevelop-0.16-3-i686 Message-ID: <20071103142415.7F39B13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7eccc0b0797776fcd5bb912d30a9cbceea8329be commit 7eccc0b0797776fcd5bb912d30a9cbceea8329be Author: janny Date: Sat Nov 3 15:23:15 2007 +0100 monodevelop-0.16-3-i686 rebuild with new ff 2.0.0.9 diff --git a/source/gnome-extra/monodevelop/FrugalBuild b/source/gnome-extra/monodevelop/FrugalBuild index 59f57da..e075708 100644 --- a/source/gnome-extra/monodevelop/FrugalBuild +++ b/source/gnome-extra/monodevelop/FrugalBuild @@ -3,11 +3,11 @@ pkgname=monodevelop pkgver=0.16 -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.8' 'ikvm' 'boo' 'gnome-sharp') + 'mono-tools>=1.2.4-2' 'firefox=2.0.0.9' 'ikvm' 'boo' 'gnome-sharp') makedepends=('intltool') groups=('gnome-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Sat Nov 3 15:32:20 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 15:32:22 2007 Subject: [Frugalware-git] pacman-tools: repoman: don't mention dg stash, dg pull will do it automatically Message-ID: <20071103143220.27CBF13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=d1d180dcdb21fe77b2147485ab55119ced586bb6 commit d1d180dcdb21fe77b2147485ab55119ced586bb6 Author: Miklos Vajna Date: Sat Nov 3 15:30:35 2007 +0100 repoman: don't mention dg stash, dg pull will do it automatically diff --git a/repoman b/repoman index 73aa687..4a7887d 100755 --- a/repoman +++ b/repoman @@ -145,7 +145,7 @@ fpmmerge() die "rsync failed! :/" fi # now push - dg pull -a || die 'dg pull failed: try dg stash; dg pull; dg stash apply; dg stash clear' + dg pull -a || die 'dg pull failed' git diff|grep -q -- 'diff --cc' && die 'detected conflicts' dg push -a # finally run repoman cl for each @@ -401,7 +401,7 @@ sync() opts="" fi if [ "$F_makepkg_scm" = "git" ]; then - cmd="dg pull $opts || die 'dg pull failed: try dg stash; dg pull; dg stash apply; dg stash clear'; git diff|grep -q -- 'diff --cc' && die 'detected conflicts'; dg push $opts" + cmd="dg pull $opts || (git diff|grep -q -- 'diff --cc' && echo 'detected conflicts'; die 'dg pull failed'); dg push $opts" else cmd="darcs push --match 'name $modpkgname' $opts" fi From vmiklos at frugalware.org Sat Nov 3 15:33:13 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 15:33:15 2007 Subject: [Frugalware-git] pacman-tools: dg: pull now works even if there are uncommitted changes Message-ID: <20071103143313.C16A113A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=95f2c336f593541fd8a98ac5c69d3167217fcceb commit 95f2c336f593541fd8a98ac5c69d3167217fcceb Author: Miklos Vajna Date: Sat Nov 3 15:33:09 2007 +0100 dg: pull now works even if there are uncommitted changes diff --git a/darcs-git.py b/darcs-git.py index ed6428c..54a925f 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -632,8 +632,16 @@ Options: if ret in ("n", "q"): sys.exit(0) print "Invalid response, try again!" + if os.system("git diff-index --quiet --cached HEAD && git diff-files --quiet") != 0: + changes = True + if os.system("git stash") != 0: + sys.exit(1) + else: + changes = False if os.system("git rebase %s" % options.gitopts) != 0: sys.exit(1) + if changes and os.system("git stash apply --index && sed -i '$d' `git rev-parse --show-cdup`.git/logs/refs/stash") != 0: + sys.exit(1) def get(argv): def usage(ret): From krics at linuxforum.hu Sat Nov 3 15:36:02 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Nov 3 15:36:04 2007 Subject: [Frugalware-git] frugalware-current: wvstreams-4.4.1-1-x86_64 Message-ID: <20071103143602.8755B13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a588a50c4e0321f49c9ae25fd0cea917dfd9486 commit 4a588a50c4e0321f49c9ae25fd0cea917dfd9486 Author: Christian Hamar alias krix Date: Sat Nov 3 15:34:55 2007 +0100 wvstreams-4.4.1-1-x86_64 * Version bump * Deleted old patches * Bring fresh patches (from gentoo) * Fixed SBU diff --git a/source/network/wvstreams/FrugalBuild b/source/network/wvstreams/FrugalBuild index 583eed1..da9e07c 100644 --- a/source/network/wvstreams/FrugalBuild +++ b/source/network/wvstreams/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 0.01 SBU +# Compiling Time: 0.85 SBU # Maintainer: Christian Hamar alias krix # Contributor: Karoly CZOVEK pkgname=wvstreams -pkgver=4.2.2 +pkgver=4.4.1 pkgrel=1 pkgdesc="A network programming library in C++" groups=('network') @@ -13,17 +13,25 @@ makedepends=('qt' 'tcl' 'tk') url="http://alumnit.ca/wiki/?DownloadReleases" up2date="lynx -dump -nolist 'http://alumnit.ca/wiki/?DownloadReleases'|grep 'wvstreams-\(.*\).tar.gz'|sed 's/.*-\(.*\).tar.*$/\1/'" source=(http://wvstreams.googlecode.com/files/$pkgname-$pkgver.tar.gz \ - wvstreams-4.2.2-linux-serial.patch \ - wvstreams-4.2.2-wireless-user.patch \ - wvstreams-4.2.2-MOC-fix.patch \ wvstreams-4.2.2-tcl_8_4.patch \ - wvstreams-4.2.2-external-xplc.patch) -sha1sums=('a44a9ded6339fb2c53eb472d0763e4cf6b0c0534' \ - '4ea60c31b55f0fdbc94803a6b588af83cad5de3a' \ - 'f1bed39371eb648bc8fb4e6d64693c59003c7d91' \ - 'af28e60552446b408c1751713d7e8b4cebb7a4c8' \ - '7503c63a29fde6a87d47257cc2bd3afceda6e841' \ - 'd3480b6cd9a11e2415a0e259a3d93a6e64f26d73') + wvstreams-4.4-external-xplc.patch \ + wvstreams-4.4-linux-serial.patch \ + wvstreams-4.4-MOC-fix.patch \ + wvstreams-4.4-sigaction.patch \ + wvstreams-4.4-type-punned.patch \ + wvstreams-4.4-uniconfd-ini.patch \ + wvstreams-4.4-wireless-user.patch \ + wvstreams-4.4-wvconfemu.patch) +sha1sums=('1c84bb50f1528a4014f62c1bd645815fedea713a' \ + '7503c63a29fde6a87d47257cc2bd3afceda6e841' \ + '2e6d36d4249679e2ffa25f6bee9f191338e8a9ca' \ + '8852774b47f941edbf24943b5895f3497ddc18c9' \ + '2a9ea9c18329f6494c981cbc176e09a6e7b1b3ec' \ + '7ca737f3faf5b611596d1f114dbc199a928425b5' \ + '2e997401fb98fa70bd26a21f084fb3ec246044ba' \ + '0823b65f5ef5c09b4446a0ed923fca438287c122' \ + '0d6e3a6f78f9a2829ea2225f6f09b0ee5147e2f1' \ + '33eeb9b0288f2d0ceedcbacf11ad10c4550c36cf') build() { Fcd @@ -40,10 +48,10 @@ build() { # Another braindead thing. touch include/wvautoconf.h.in configure || Fdie - Fconf --localstatedir=/var --without-pam --with-xplc --with-qt=/usr/lib/qt \ + Fconf --localstatedir=/var/lib --without-pam --with-xplc --with-qt=/usr/lib/qt \ --disable-debug --with-tcl make CXXOPTS="$CXXFLAGS -fPIC" COPTS="$CFLAGS -fPIC" VERBOSE="1" || Fdie Fmakeinstall } -# optimalization OK +# optimization OK diff --git a/source/network/wvstreams/wvstreams-4.2.2-MOC-fix.patch b/source/network/wvstreams/wvstreams-4.2.2-MOC-fix.patch deleted file mode 100644 index 9ab381c..0000000 --- a/source/network/wvstreams/wvstreams-4.2.2-MOC-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur wvstreams-4.2.2.orig/wvrules.mk wvstreams-4.2.2/wvrules.mk ---- wvstreams-4.2.2.orig/wvrules.mk 2005-11-24 21:46:51.000000000 +0200 -+++ wvstreams-4.2.2/wvrules.mk 2006-02-03 21:26:59.439036250 +0200 -@@ -296,7 +296,7 @@ - %.E: %.cc; $(call wvcxx,$@,$<,$*,,-E) - %.E: %.cpp; $(call wvcxx,$@,$<,$*,,-E) - --%.moc: %.h; moc -o $@ $< -+%.moc: %.h; $(MOC) -o $@ $< - - %: %.o; $(call wvlink,$@,$^) - %.t: %.t.o; $(call wvlink,$@,$(call reverse,$(filter %.o,$^)) $(filter-out %.o,$^) $(LIBWVTEST)) diff --git a/source/network/wvstreams/wvstreams-4.2.2-external-xplc.patch b/source/network/wvstreams/wvstreams-4.2.2-external-xplc.patch deleted file mode 100644 index 40db380..0000000 --- a/source/network/wvstreams/wvstreams-4.2.2-external-xplc.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nur wvstreams-4.2.2.orig/configure.ac wvstreams-4.2.2/configure.ac ---- wvstreams-4.2.2.orig/configure.ac 2006-01-12 20:31:50.000000000 +0200 -+++ wvstreams-4.2.2/configure.ac 2006-02-03 21:24:41.546418500 +0200 -@@ -542,7 +542,6 @@ - - # xplc - if test "$with_xplc" != "no"; then -- if test "$with_xplc" = ""; then - if pkg-config --modversion xplc-${xplc_version}; then - WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-${xplc_version}`]) - WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-${xplc_version}`]) -@@ -554,15 +553,6 @@ - else - with_xplc='no' - fi -- else -- WV_APPEND(CPPFLAGS, [-I$with_xplc/include]) -- WV_APPEND(LDFLAGS, [-L$with_xplc]) -- AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE]) -- LIBS_save="$LIBS" -- AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no]) -- LIBS="$LIBS_save" -- xplc_pc="xplc-${xplc_version}" -- fi - # What if we can't find it? - if test "$with_xplc" = "no" && test -d xplc; then - WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include]) -@@ -570,7 +560,7 @@ - AC_CONFIG_SUBDIRS(xplc) - build_xplc=yes - with_xplc='$(WVSTREAMS)/xplc' -- xplc_pc='wvxplc' -+ xplc_pc='wvxplc' - fi - fi - diff --git a/source/network/wvstreams/wvstreams-4.2.2-linux-serial.patch b/source/network/wvstreams/wvstreams-4.2.2-linux-serial.patch deleted file mode 100644 index f5d5215..0000000 --- a/source/network/wvstreams/wvstreams-4.2.2-linux-serial.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nur wvstreams-4.2.2.orig/streams/wvmodem.cc wvstreams-4.2.2/streams/wvmodem.cc ---- wvstreams-4.2.2.orig/streams/wvmodem.cc 2005-11-24 21:46:51.000000000 +0200 -+++ wvstreams-4.2.2/streams/wvmodem.cc 2006-02-03 21:17:54.993010500 +0200 -@@ -192,22 +192,22 @@ - drain(); - - #if HAVE_LINUX_SERIAL_H -- struct serial_struct old_sinfo, sinfo; -- sinfo.reserved_char[0] = 0; -- if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0) -- log("Cannot get information for serial port."); -- else -- { -- sinfo = old_sinfo; -- // Why there are two closing wait timeouts, is beyond me -- // but there are... apparently the second one is deprecated -- // but why take a chance... -- sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE; -- sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE; -- -- if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0) -- log("Cannot set information for serial port."); -- } -+ if (getuid() == 0) -+ { -+ struct serial_struct sinfo; -+ if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this -+ { -+ // Why there are two closing wait timeouts, is beyond me -+ // but there are... apparently the second one is deprecated -+ // but why take a chance... -+ sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE; -+ sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE; -+ -+ //Ignore errors because ltmodem module implement TIOCGSERIAL but do not implement TIOCSSERIAL (go figure...) -+ //see http://bugs.gentoo.org/show_bug.cgi?id=85754 -+ ioctl(getrfd(), TIOCSSERIAL, &sinfo); -+ } -+ } - #endif - - // set up the terminal characteristics. diff --git a/source/network/wvstreams/wvstreams-4.2.2-wireless-user.patch b/source/network/wvstreams/wvstreams-4.2.2-wireless-user.patch deleted file mode 100644 index cbb7f2d..0000000 --- a/source/network/wvstreams/wvstreams-4.2.2-wireless-user.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur wvstreams-4.2.2.orig/linuxstreams/wvinterface.cc wvstreams-4.2.2/linuxstreams/wvinterface.cc ---- wvstreams-4.2.2.orig/linuxstreams/wvinterface.cc 2005-11-24 21:46:47.000000000 +0200 -+++ wvstreams-4.2.2/linuxstreams/wvinterface.cc 2006-02-03 21:19:32.635112750 +0200 -@@ -21,6 +21,7 @@ - #include - #include - -+#include - #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */ - #include - diff --git a/source/network/wvstreams/wvstreams-4.4-MOC-fix.patch b/source/network/wvstreams/wvstreams-4.4-MOC-fix.patch new file mode 100644 index 0000000..7f835d7 --- /dev/null +++ b/source/network/wvstreams/wvstreams-4.4-MOC-fix.patch @@ -0,0 +1,12 @@ +diff -Nru wvstreams-4.4.orig/wvrules.mk wvstreams-4.4/wvrules.mk +--- wvstreams-4.4.orig/wvrules.mk 2007-08-17 22:45:07.000000000 +0300 ++++ wvstreams-4.4/wvrules.mk 2007-08-17 22:53:05.000000000 +0300 +@@ -294,7 +294,7 @@ + %.E: %.cc; $(call wvcxx,$@,$<,$*,,-E) + %.E: %.cpp; $(call wvcxx,$@,$<,$*,,-E) + +-%.moc: %.h; moc -o $@ $< ++%.moc: %.h; $(MOC) -o $@ $< + + %: %.o; $(call wvlink,$@,$^) + %.t: %.t.o; $(call wvlink,$@,$(call reverse,$(filter %.o,$^)) $(filter-out %.o,$^) $(LIBWVTEST)) diff --git a/source/network/wvstreams/wvstreams-4.4-external-xplc.patch b/source/network/wvstreams/wvstreams-4.4-external-xplc.patch new file mode 100644 index 0000000..744c96b --- /dev/null +++ b/source/network/wvstreams/wvstreams-4.4-external-xplc.patch @@ -0,0 +1,36 @@ +diff -Nru wvstreams-4.4.orig/configure.ac wvstreams-4.4/configure.ac +--- wvstreams-4.4.orig/configure.ac 2007-08-17 22:43:47.000000000 +0300 ++++ wvstreams-4.4/configure.ac 2007-08-17 22:52:07.000000000 +0300 +@@ -488,7 +488,6 @@ + + # xplc + if test "$with_xplc" != "no"; then +- if test "$with_xplc" = ""; then + if pkg-config --modversion xplc-${xplc_version}; then + WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-${xplc_version}`]) + WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-${xplc_version}`]) +@@ -500,15 +499,6 @@ + else + with_xplc='no' + fi +- else +- WV_APPEND(CPPFLAGS, [-I$with_xplc/include]) +- WV_APPEND(LDFLAGS, [-L$with_xplc]) +- AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE]) +- LIBS_save="$LIBS" +- AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no]) +- LIBS="$LIBS_save" +- xplc_pc="xplc-${xplc_version}" +- fi + # What if we can't find it? + if test "$with_xplc" = "no" && test -d xplc; then + WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include]) +@@ -516,7 +506,7 @@ + AC_CONFIG_SUBDIRS(xplc) + build_xplc=yes + with_xplc='$(WVSTREAMS)/xplc' +- xplc_pc='wvxplc' ++ xplc_pc='wvxplc' + fi + fi + diff --git a/source/network/wvstreams/wvstreams-4.4-linux-serial.patch b/source/network/wvstreams/wvstreams-4.4-linux-serial.patch new file mode 100644 index 0000000..7b8fa08 --- /dev/null +++ b/source/network/wvstreams/wvstreams-4.4-linux-serial.patch @@ -0,0 +1,42 @@ +diff -Nru wvstreams-4.4.orig/streams/wvmodem.cc wvstreams-4.4/streams/wvmodem.cc +--- wvstreams-4.4.orig/streams/wvmodem.cc 2007-07-20 00:22:57.000000000 +0300 ++++ wvstreams-4.4/streams/wvmodem.cc 2007-08-17 22:36:21.000000000 +0300 +@@ -194,22 +194,22 @@ + drain(); + + #if HAVE_LINUX_SERIAL_H +- struct serial_struct old_sinfo, sinfo; +- sinfo.reserved_char[0] = 0; +- if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0) +- log("Cannot get information for serial port."); +- else +- { +- sinfo = old_sinfo; +- // Why there are two closing wait timeouts, is beyond me +- // but there are... apparently the second one is deprecated +- // but why take a chance... +- sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE; +- sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE; +- +- if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0) +- log("Cannot set information for serial port."); +- } ++ if (getuid() == 0) ++ { ++ struct serial_struct sinfo; ++ if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this ++ { ++ // Why there are two closing wait timeouts, is beyond me ++ // but there are... apparently the second one is deprecated ++ // but why take a chance... ++ sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE; ++ sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE; ++ ++ //Ignore errors because ltmodem module implement TIOCGSERIAL but do not implement TIOCSSERIAL (go figure...) ++ //see http://bugs.gentoo.org/show_bug.cgi?id=85754 ++ ioctl(getrfd(), TIOCSSERIAL, &sinfo); ++ } ++ } + #endif + + // set up the terminal characteristics. diff --git a/source/network/wvstreams/wvstreams-4.4-sigaction.patch b/source/network/wvstreams/wvstreams-4.4-sigaction.patch new file mode 100644 index 0000000..3478430 --- /dev/null +++ b/source/network/wvstreams/wvstreams-4.4-sigaction.patch @@ -0,0 +1,11 @@ +diff -Nru wvstreams-4.4.orig/utils/wvcrash.cc wvstreams-4.4/utils/wvcrash.cc +--- wvstreams-4.4.orig/utils/wvcrash.cc 2007-07-20 00:22:55.000000000 +0300 ++++ wvstreams-4.4/utils/wvcrash.cc 2007-08-17 22:49:50.000000000 +0300 +@@ -385,7 +385,6 @@ + act.sa_handler = wvcrash; + sigfillset(&act.sa_mask); + act.sa_flags = SA_ONSTACK | SA_RESTART; +- act.sa_restorer = NULL; + + if (sigaction(sig, &act, NULL)) + fprintf(stderr, "Failed to setup wvcrash handler for signal %d: %s\n", diff --git a/source/network/wvstreams/wvstreams-4.4-type-punned.patch b/source/network/wvstreams/wvstreams-4.4-type-punned.patch new file mode 100644 index 0000000..f4dff0f --- /dev/null +++ b/source/network/wvstreams/wvstreams-4.4-type-punned.patch @@ -0,0 +1,17 @@ +diff -Nru wvstreams-4.4.orig/urlget/wvhttppool.cc wvstreams-4.4/urlget/wvhttppool.cc +--- wvstreams-4.4.orig/urlget/wvhttppool.cc 2007-07-20 00:22:36.000000000 +0300 ++++ wvstreams-4.4/urlget/wvhttppool.cc 2007-08-17 23:07:41.000000000 +0300 +@@ -43,7 +43,12 @@ + { + WvBufUrlStream *x = new WvBufUrlStream; + outstream = x; +- x->death_notify = (WvStream **)&outstream; ++ union { ++ WvBufUrlStream** ppbufurlstream; ++ WvStream** ppstream; ++ } s; ++ s.ppbufurlstream = &outstream; ++ x->death_notify = s.ppstream; + x->url = url; + + putstream = content_source; diff --git a/source/network/wvstreams/wvstreams-4.4-uniconfd-ini.patch b/source/network/wvstreams/wvstreams-4.4-uniconfd-ini.patch new file mode 100644 index 0000000..e6b8c48 --- /dev/null +++ b/source/network/wvstreams/wvstreams-4.4-uniconfd-ini.patch @@ -0,0 +1,14 @@ +diff -Nru wvstreams-4.4.orig/Makefile wvstreams-4.4/Makefile +--- wvstreams-4.4.orig/Makefile 2007-07-20 19:31:03.000000000 +0300 ++++ wvstreams-4.4/Makefile 2007-08-17 22:39:56.000000000 +0300 +@@ -185,8 +185,8 @@ + $(INSTALL_PROGRAM) uniconf/tests/uni $(DESTDIR)$(bindir)/ + $(INSTALL) -d $(DESTDIR)$(sbindir) + $(INSTALL_PROGRAM) uniconf/daemon/uniconfd $(DESTDIR)$(sbindir)/ +- $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/uniconf +- touch $(DESTDIR)$(localstatedir)/lib/uniconf/uniconfd.ini ++ $(INSTALL) -d $(DESTDIR)$(localstatedir)/uniconf ++ $(INSTALL_DATA) uniconf/daemon/uniconfd.ini $(DESTDIR)$(localstatedir)/uniconf + $(INSTALL) -d $(DESTDIR)$(mandir)/man8 + $(INSTALL_DATA) uniconf/daemon/uniconfd.8 $(DESTDIR)$(mandir)/man8 + $(INSTALL_DATA) uniconf/tests/uni.8 $(DESTDIR)$(mandir)/man8 diff --git a/source/network/wvstreams/wvstreams-4.4-wireless-user.patch b/source/network/wvstreams/wvstreams-4.4-wireless-user.patch new file mode 100644 index 0000000..7f3d9cb --- /dev/null +++ b/source/network/wvstreams/wvstreams-4.4-wireless-user.patch @@ -0,0 +1,11 @@ +diff -Nru wvstreams-4.4.orig/linuxstreams/wvinterface.cc wvstreams-4.4/linuxstreams/wvinterface.cc +--- wvstreams-4.4.orig/linuxstreams/wvinterface.cc 2007-07-20 00:22:51.000000000 +0300 ++++ wvstreams-4.4/linuxstreams/wvinterface.cc 2007-08-17 22:38:13.000000000 +0300 +@@ -21,6 +21,7 @@ + #include + #include + ++#include /* Needed for __user definition */ + #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */ + #include + diff --git a/source/network/wvstreams/wvstreams-4.4-wvconfemu.patch b/source/network/wvstreams/wvstreams-4.4-wvconfemu.patch new file mode 100644 index 0000000..6c942c2 --- /dev/null +++ b/source/network/wvstreams/wvstreams-4.4-wvconfemu.patch @@ -0,0 +1,13 @@ +diff -Nru wvstreams-4.4.orig/vars.mk wvstreams-4.4/vars.mk +--- wvstreams-4.4.orig/vars.mk 2007-08-18 00:13:15.000000000 +0300 ++++ wvstreams-4.4/vars.mk 2007-08-17 23:39:09.000000000 +0300 +@@ -156,7 +156,8 @@ + streams/wvfile.o \ + streams/wvstreamclone.o \ + streams/wvconstream.o \ +- utils/wvcrashbase.o ++ utils/wvcrashbase.o \ ++ uniconf/wvconfemu.o + + TESTOBJS = utils/wvtest.o + From janny at frugalware.org Sat Nov 3 15:39:50 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 15:39:53 2007 Subject: [Frugalware-git] frugalware-current: libfwbuilder-2.1.14-1-i686 Message-ID: <20071103143950.A52CC13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af26a84bccaabcd55b8510e4ffb8affd264d7e6a commit af26a84bccaabcd55b8510e4ffb8affd264d7e6a Author: janny Date: Sat Nov 3 15:38:24 2007 +0100 libfwbuilder-2.1.14-1-i686 version bump new m8r diff --git a/source/xlib-extra/libfwbuilder/FrugalBuild b/source/xlib-extra/libfwbuilder/FrugalBuild index b31df2b..534c68d 100644 --- a/source/xlib-extra/libfwbuilder/FrugalBuild +++ b/source/xlib-extra/libfwbuilder/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.48 SBU -# Maintainer: AlexExtreme +# Maintainer: Janny +# Contributor: AlexExtreme pkgname=libfwbuilder -pkgver=2.1.11 +pkgver=2.1.14 pkgrel=1 pkgdesc="Firewall Builder firewall configuration system - Core library" _F_sourceforge_dirname="fwbuilder" @@ -12,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=('e397d2ac572a3ed97ec59cb960fb5e65fa7c2620') +sha1sums=('af59af8b594b7e87cdea05123ab25fb3b4ca7cac') build() { Fmake From krics at linuxforum.hu Sat Nov 3 15:41:06 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Nov 3 15:41:10 2007 Subject: [Frugalware-git] frugalware-current: wvdial-1.60-1-x86_64 Message-ID: <20071103144106.67D2F13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e684789b2dfd475cd319c1fddaee05c3116be78d commit e684789b2dfd475cd319c1fddaee05c3116be78d Author: Christian Hamar alias krix Date: Sat Nov 3 15:40:39 2007 +0100 wvdial-1.60-1-x86_64 * Version bump * Updated patch for upstream diff --git a/source/network/wvdial/FrugalBuild b/source/network/wvdial/FrugalBuild index 4382dcb..0ce6be9 100644 --- a/source/network/wvdial/FrugalBuild +++ b/source/network/wvdial/FrugalBuild @@ -3,18 +3,18 @@ # Contributor: Karoly CZOVEK pkgname=wvdial -pkgver=1.56 +pkgver=1.60 pkgrel=1 pkgdesc="WVDial CLI dialer" groups=('network') +depends=('wvstreams>=4.4.1' 'zlib') archs=('i686' 'x86_64') up2date="lynx -dump -nolist 'http://alumnit.ca/wiki/?DownloadReleases'|grep 'wvdial-\(.*\).tar.gz'|sed 's/.*-\(.*\).tar.*$/\1/'" url="http://alumnit.ca/download/" source=($url/$pkgname-$pkgver.tar.gz wvdial-1.55-destdir.patch) backup=(etc/ppp/peers/{wvdial,wvdial-pipe}) -depends=('wvstreams>=4.2.2' 'zlib') -sha1sums=('6a0ed7508b93b56f7bc4c5dc7faa4a3e6a911d18' \ - 'bffe3094be91ab1b1efe89acdad498a9c8dce787') +sha1sums=('d44914065258d316cff28494d4409cd27a07cfa6' \ + '1ad466b246767cffcae3217909774cc01398aea7') build() { Fbuild diff --git a/source/network/wvdial/wvdial-1.55-destdir.patch b/source/network/wvdial/wvdial-1.55-destdir.patch index 5c9927b..7f70255 100644 --- a/source/network/wvdial/wvdial-1.55-destdir.patch +++ b/source/network/wvdial/wvdial-1.55-destdir.patch @@ -1,21 +1,19 @@ -diff -Nur wvdial-1.55.orig/Makefile wvdial-1.55/Makefile ---- wvdial-1.55.orig/Makefile 2005-12-03 00:54:13.000000000 +0200 -+++ wvdial-1.55/Makefile 2006-02-03 22:21:11.402271250 +0200 -@@ -1,7 +1,7 @@ - ifeq ($(TOPDIR),) - TOPDIR=. +diff -Naur wvdial-1.60.orig/Makefile wvdial-1.60/Makefile +--- wvdial-1.60.orig/Makefile 2007-11-03 15:39:03.000000000 +0100 ++++ wvdial-1.60/Makefile 2007-11-03 15:39:48.000000000 +0100 +@@ -1,5 +1,5 @@ -- prefix=/usr/local -+ prefix=${DESTDIR}/usr - WVSTREAMS_INC= - WVSTREAMS_LIB= - WVSTREAMS_BIN=$(prefix)/bin -@@ -24,7 +24,7 @@ +-prefix=/usr/local ++prefix=${DESTDIR}/usr + WVSTREAMS_INC= + WVSTREAMS_LIB= + WVSTREAMS_BIN=$(prefix)/bin +@@ -19,7 +19,7 @@ BINDIR=${prefix}/bin MANDIR=${prefix}/share/man -PPPDIR=/etc/ppp/peers +PPPDIR=${DESTDIR}/etc/ppp/peers - include $(TOPDIR)/wvrules.mk + include wvrules.mk From krics at linuxforum.hu Sat Nov 3 15:47:14 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Nov 3 15:47:17 2007 Subject: [Frugalware-git] frugalware-current: perl-pathtools-3.25_01-1-x86_64 Message-ID: <20071103144714.C867313A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d80a477d17df5e6022100026a028fd305e7516a commit 0d80a477d17df5e6022100026a028fd305e7516a Author: Christian Hamar alias krix Date: Sat Nov 3 15:46:53 2007 +0100 perl-pathtools-3.25_01-1-x86_64 * Version bump * Take m8rship diff --git a/source/devel-extra/perl-pathtools/FrugalBuild b/source/devel-extra/perl-pathtools/FrugalBuild index 5da115c..cdc72ba 100644 --- a/source/devel-extra/perl-pathtools/FrugalBuild +++ b/source/devel-extra/perl-pathtools/FrugalBuild @@ -1,16 +1,17 @@ # Compiling Time: 0.1 SBU -# Maintainer: Zsolt Szalai +# Maintainer: Christian Hamar alias krix +# Contributor: Zsolt Szalai pkgname=perl-pathtools _F_perl_name=PathTools _F_perl_author=K/KW/KWILLIAMS -pkgver=3.25 +pkgver=3.25_01 pkgrel=1 pkgdesc="portably perform operations on file names" Finclude perl up2date="lynx -dump http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/|grep 'PathTools-\(.*\).tar.gz'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" archs=('i686' 'x86_64') -sha1sums=('cbaf1a5aab6f7d50adbd00046010ae7e51e033ba') +sha1sums=('6f5253bc938ccbcedb9bfadf9473e2419c3ac683') build() { From vmiklos at frugalware.org Sat Nov 3 15:49:53 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 15:49:55 2007 Subject: [Frugalware-git] frugalware-current: fbset-2.1-2-i686 Message-ID: <20071103144953.6933613A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff20268e9137b9642a4e17cbef0bc40cda756b32 commit ff20268e9137b9642a4e17cbef0bc40cda756b32 Author: Miklos Vajna Date: Sat Nov 3 15:42:50 2007 +0100 fbset-2.1-2-i686 up2date fix diff --git a/source/base/fbset/FrugalBuild b/source/base/fbset/FrugalBuild index f599c87..48b3df6 100644 --- a/source/base/fbset/FrugalBuild +++ b/source/base/fbset/FrugalBuild @@ -9,7 +9,7 @@ url="http://home.tvd.be/cr26864/Linux/fbdev/" depends=('glibc') groups=('base') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump http://packages.debian.org/stable/source/fbset |grep -m1 fbset |sed 's/-.*//g'|sed 's/.*(//g'" +up2date="lynx -dump http://ftp.debian.org/debian/pool/main/f/fbset/|sed 's/_/-/;s/\.orig//'|Flasttar" source=(http://ftp.debian.org/debian/pool/main/f/$pkgname/fbset_$pkgver.orig.tar.gz) sha1sums=('9352ffd5f9daec29da4601501139dc589a95c14c') From krics at linuxforum.hu Sat Nov 3 16:00:07 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Nov 3 16:00:12 2007 Subject: [Frugalware-git] frugalware-current: pan-0.132-1-x86_64 Message-ID: <20071103150007.86E1213A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55fdc3f37a06e818d417b4577f6fb647398ba6ff commit 55fdc3f37a06e818d417b4577f6fb647398ba6ff Author: Christian Hamar alias krix Date: Sat Nov 3 15:59:25 2007 +0100 pan-0.132-1-x86_64 * Fixed up2date * Version bump diff --git a/source/gnome-extra/pan/FrugalBuild b/source/gnome-extra/pan/FrugalBuild index aaeb93f..e936fca 100644 --- a/source/gnome-extra/pan/FrugalBuild +++ b/source/gnome-extra/pan/FrugalBuild @@ -3,12 +3,12 @@ # Contributor: BMH1980 pkgname=pan -pkgver=0.131 +pkgver=0.132 pkgrel=1 pkgdesc="A newsreader for GNOME" url="http://pan.rebelbase.com/" license="GPL2" -up2date="lynx -dump http://pan.rebelbase.com/download/|grep -m1 'beta'|sed 's/.*pan \(.*\)(beta)*/\1/'" +up2date="lynx -dump http://pan.rebelbase.com/download/|grep -m1 'beta'|sed 's/.*pan \(.*\) (beta)*/\1/'" source=($url/download/releases/$pkgver/source/$pkgname-$pkgver.tar.bz2) groups=('gnome-extra') archs=('i686' 'x86_64') @@ -22,5 +22,5 @@ if [ "$CARCH" == "x86_64" ]; then export CXXFLAGS="$CXXFLAGS -fPIC" fi -sha1sums=('d5669c979841c3c0873530f430a70d980257a561') +sha1sums=('dc0bf586145b9d617039f49101874fbc76a9dc18') # optimization OK From vmiklos at frugalware.org Sat Nov 3 16:09:28 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 16:09:30 2007 Subject: [Frugalware-git] frugalware-current: gimp-2.4.0-1-x86_64 Message-ID: <20071103150928.3429E13A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fc4557ed2ed224539fac6869ad555db8f377f20c commit fc4557ed2ed224539fac6869ad555db8f377f20c Author: Miklos Vajna Date: Sat Nov 3 16:02:38 2007 +0100 gimp-2.4.0-1-x86_64 - version bump - updated icon and desktop file diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index 0ce9275..4d6f5bb 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: VMiklos pkgname=gimp -pkgver=2.2.17 -pkgrel=2 +pkgver=2.4.0 +pkgrel=1 pkgdesc="The GNU Image Manipulation Program" url="http://www.gimp.org/" depends=('librsvg' 'libmng' 'libexif>=0.6.12-3' 'alsa-lib' 'libgtkhtml>=2.11.1-2' \ - 'desktop-file-utils' 'lcms') + 'desktop-file-utils' 'lcms' 'pygtk') groups=('xapps') archs=('i686' 'x86_64') makedepends=('gimp-print' 'perl-xml') up2date="lynx -dump $url/downloads/|grep tar.bz2|sed 's/.*-\(.*\)\.t.*/\1/'" -source=(ftp://ftp.gimp.org/pub/gimp/v2.2/$pkgname-$pkgver.tar.bz2) -sha1sums=('e7bbfe5fd685f625f023af7f8fe5774feed26116') +source=(ftp://ftp.gimp.org/pub/gimp/v2.4/$pkgname-$pkgver.tar.bz2) +sha1sums=('55a1f8118c26bb58cd329200a53088d3d5734ca0') options=('scriptlet') _F_gnome_desktop="y" Finclude gnome-scriptlet @@ -22,12 +22,12 @@ Finclude gnome-scriptlet build() { - Fsed 'Icon=.*' 'Icon=gimp.png' data/misc/gimp.desktop.in.in + Fsed 'Icon=.*' 'Icon=gimp.png' desktop/gimp.desktop.in.in Fmkdir /usr/share/{applications,application-registry,mime-info} # gutenprint will provide the printing plugin Fbuild --disable-print Fmkdir /usr/share/pixmaps - Fln ../gimp/2.0/images/wilber-icon.png /usr/share/pixmaps/gimp.png + Fln ../gimp/2.0/images/gimp-logo.png /usr/share/pixmaps/gimp.png Fbuild_gnome_scriptlet } diff --git a/source/xapps/gimp/libpng-api.patch b/source/xapps/gimp/libpng-api.patch deleted file mode 100644 index 6ae48db..0000000 --- a/source/xapps/gimp/libpng-api.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur gimp-2.2.11/plug-ins/common/png.c gimp-2.2.11-p/plug-ins/common/png.c ---- gimp-2.2.11/plug-ins/common/png.c 2004-11-23 15:28:43.000000000 +0100 -+++ gimp-2.2.11-p/plug-ins/common/png.c 2006-07-03 02:19:04.076152295 +0200 -@@ -1,5 +1,5 @@ - /* -- * "$Id: png.c,v 1.118 2004/11/23 14:28:43 mitch Exp $" -+ * "$Id: png.c,v 1.118.2.1 2006/04/23 07:01:47 yosh Exp $" - * - * Portable Network Graphics (PNG) plug-in for The GIMP -- an image - * manipulation program -@@ -1012,7 +1012,11 @@ - * Done with the file... - */ - -+#if PNG_LIBPNG_VER > 99 -+ png_destroy_read_struct (&pp, &info, NULL); -+#else - png_read_destroy (pp, info, NULL); -+#endif - - g_free (pixel); - g_free (pixels); -@@ -1441,7 +1445,12 @@ - }; - - png_write_end (pp, info); -+ -+#if PNG_LIBPNG_VER > 99 -+ png_destroy_write_struct (&pp, &info); -+#else - png_write_destroy (pp); -+#endif - - g_free (pixel); - g_free (pixels); From Kovacs at genesis.frugalware.org Sat Nov 3 16:17:58 2007 From: Kovacs at genesis.frugalware.org (Kovacs@genesis.frugalware.org) Date: Sat Nov 3 16:18:00 2007 Subject: [Frugalware-git] frugalware-current: mysql-administrator-1.2-1-x86_64 Message-ID: <20071103151758.ED2B313A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6dd85f0aeb76638609aaffee999d8a87de28fb35 commit 6dd85f0aeb76638609aaffee999d8a87de28fb35 Author: Kovacs, Janos Date: Sat Nov 3 16:17:34 2007 +0100 mysql-administrator-1.2-1-x86_64 version bump diff --git a/source/xapps-extra/mysql-administrator/FrugalBuild b/source/xapps-extra/mysql-administrator/FrugalBuild index 7428745..9944e1b 100644 --- a/source/xapps-extra/mysql-administrator/FrugalBuild +++ b/source/xapps-extra/mysql-administrator/FrugalBuild @@ -11,7 +11,7 @@ depends=('libmysqlclient' 'gtk+2' 'libsigc++2' 'libxdamage' \ 'libgnomeprint' 'libglade' 'glibmm' 'gtkmm') makedepends=('mysql') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') license="GPL-2" up2date="lynx -dump http://frugalware.org/~janny/snapshots/$pkgname/|Flasttarbz2" source=(http://frugalware.org/~janny/snapshots/$pkgname/$pkgname-$date.tar.bz2 \ From janny at frugalware.org Sat Nov 3 16:19:31 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 16:19:32 2007 Subject: [Frugalware-git] frugalware-current: fwbuilder-2.1.14-1-i686 Message-ID: <20071103151931.1983813A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=19f1eeae3a4884ccbaa9c07b31ea82edb13d9009 commit 19f1eeae3a4884ccbaa9c07b31ea82edb13d9009 Author: janny Date: Sat Nov 3 16:18:49 2007 +0100 fwbuilder-2.1.14-1-i686 version bump new m8r diff --git a/source/xapps-extra/fwbuilder/FrugalBuild b/source/xapps-extra/fwbuilder/FrugalBuild index 060f675..82dd200 100644 --- a/source/xapps-extra/fwbuilder/FrugalBuild +++ b/source/xapps-extra/fwbuilder/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.06 SBU -# Maintainer: AlexExtreme +# Maintainer: Janny +# Contributor: AlexExtreme pkgname=fwbuilder -pkgver=2.1.11 +pkgver=2.1.14 pkgrel=1 pkgdesc="Firewall Builder firewall configuration system" Finclude sourceforge @@ -12,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=('871d2704b289b0d940ad5b7981ffe8364617ad45') +sha1sums=('a7ec59cfa3c4a3546421996e15607bae367df970') build() { Fmake From vmiklos at frugalware.org Sat Nov 3 17:05:00 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 3 17:05:02 2007 Subject: [Frugalware-git] frugalware-current: gimp-2.4.0-1-x86_64 Message-ID: <20071103160500.ADA4313A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=61937a7a4347ba246c2f9ff82c1c8739a52532a3 commit 61937a7a4347ba246c2f9ff82c1c8739a52532a3 Author: Miklos Vajna Date: Sat Nov 3 17:04:35 2007 +0100 gimp-2.4.0-1-x86_64 up2date fix diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index 4d6f5bb..e2f0b0e 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -11,7 +11,7 @@ depends=('librsvg' 'libmng' 'libexif>=0.6.12-3' 'alsa-lib' 'libgtkhtml>=2.11.1-2 groups=('xapps') archs=('i686' 'x86_64') makedepends=('gimp-print' 'perl-xml') -up2date="lynx -dump $url/downloads/|grep tar.bz2|sed 's/.*-\(.*\)\.t.*/\1/'" +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=('55a1f8118c26bb58cd329200a53088d3d5734ca0') options=('scriptlet') From janny at frugalware.org Sat Nov 3 17:25:56 2007 From: janny at frugalware.org (janny) Date: Sat Nov 3 17:25:58 2007 Subject: [Frugalware-git] frugalware-current: gimp-2.4.1-1-i686 Message-ID: <20071103162556.263C213A4060@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a8a597e34725e4b45317d5776c85a52508117706 commit a8a597e34725e4b45317d5776c85a52508117706 Author: janny Date: Sat Nov 3 17:17:26 2007 +0100 gimp-2.4.1-1-i686 version bump diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index e2f0b0e..a11d68d 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -1,8 +1,9 @@ # Compiling time: 3.80 SBU -# Maintainer: VMiklos +# Maintainer: Janny +# Contributor: VMiklos pkgname=gimp -pkgver=2.4.0 +pkgver=2.4.1 pkgrel=1 pkgdesc="The GNU Image Manipulation Program" url="http://www.gimp.org/" @@ -13,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=('55a1f8118c26bb58cd329200a53088d3d5734ca0') +sha1sums=('5d554959e9583845acff713e5f65e02fcf37db0c') options=('scriptlet') _F_gnome_desktop="y" Finclude gnome-scriptlet From crazy at frugalware.org Sat Nov 3 18:16:48 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 18:16:53 2007 Subject: [Frugalware-git] kernel-rt: kernel-rt-2.6.23-1-i686 Message-ID: <20071103171648.8F8AE1A68050@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel-rt.git;a=commitdiff;h=58824be3c470c6cd97bf631b9578439fd0308487 commit 58824be3c470c6cd97bf631b9578439fd0308487 Author: crazy Date: Sat Nov 3 18:15:41 2007 +0100 kernel-rt-2.6.23-1-i686 * added install file diff --git a/source/base-extra/kernel-rt/kernel-rt.install b/source/base-extra/kernel-rt/kernel-rt.install new file mode 100644 index 0000000..088fe56 --- /dev/null +++ b/source/base-extra/kernel-rt/kernel-rt.install @@ -0,0 +1,83 @@ +grub_convert() +{ + disk=`echo $1|sed 's/[0-9]*$//'` + partnum=`echo $1|sed 's|/dev/[a-z]*||'` + grubdisk=`grep $disk /boot/grub/device.map |sed 's/(\(.*\))\t.*/\1/'` + echo "($grubdisk,$(($partnum-1)))" +} + +bootdev=`df /boot|grep ^/dev|tr -s ' '|cut -d ' ' -f 1` +grubbootdev=`grub_convert $bootdev` +rootdev=`df /|grep ^/dev|tr -s ' '|cut -d ' ' -f 1` + +# hack for /boot +if [ "`df /boot|grep ^/dev|tr -s ' '|cut -d ' ' -f 1`" = \ + "`df /|grep ^/dev|tr -s ' '|cut -d ' ' -f 1`" ]; then + bootstring=/boot +fi + +#remove $1 kernel patchset +rmgr() + { + MENU="/boot/grub/menu.lst" + if [ -e $MENU ]; then + echo "INFO: Removing kernel-$1 entries from grub menu.lst" + # grep 2 menu.lst ! $1 + grep -v $1 $MENU >> /tmp/.menu.lst + ## backup the menu.lst, who knows :p + mv -f $MENU $MENU.old + ## mv the tmpMENU without our $patchset to menu.lst + mv -f /tmp/.menu.lst $MENU + else + echo "Cannot remove the kernel entry from your menu.lst :(. Please remove the entry manually." + fi +} + +# arg 1: the new package version +post_install() +{ + kernelver=`ls /boot/vmlinuz-*-rt-fw*|sed 's|/boot/vmlinuz-||'` + + if ! [ -e /boot/vmlinuz-rt ]; then + cd /boot + ln -sf vmlinuz-$kernelver vmlinuz-rt + ln -sf config-$kernelver config-rt + ln -sf System.map-$kernelver System.map-rt + fi + if [ -e /boot/grub/menu.lst ]; then + if ! grep -q "Frugalware.*Real-Time" /boot/grub/menu.lst; then + echo >>/boot/grub/menu.lst + echo "title `cat /etc/frugalware-release` Real-Time - $kernelver" >>/boot/grub/menu.lst + echo " kernel $grubbootdev$bootstring/vmlinuz-rt ro quiet root=$rootdev vga=791" >>/boot/grub/menu.lst + fi + fi + +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() +{ + fwver=`cat /etc/frugalware-release|sed 's/Frugalware \(.*\) (.*)/\1/'` + post_install $1 + [ -e /boot/grub/menu.lst ] && \ + sed -i "s/^\(title Frugalware $fwver (.*) Real-Time -\) [^ ]*$/\1 $kernelver/" /boot/grub/menu.lst +} + + +post_remove() +{ + if [ -L /boot/vmlinuz-rt ]; then + cd /boot + rm vmlinuz-rt + rm config-rt + rm System.map-rt + fi + rmgr "rt" +} + +op=$1 +shift + +$op $* + From crazy at frugalware.org Sat Nov 3 18:16:48 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 18:16:54 2007 Subject: [Frugalware-git] kernel-rt: kernel-rt-2.6.23-1-i686 Message-ID: <20071103171648.6E5C41A6804D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel-rt.git;a=commitdiff;h=5e1ec99f5160529a8c165884859a7b9d04c8e6f6 commit 5e1ec99f5160529a8c165884859a7b9d04c8e6f6 Author: crazy Date: Sat Nov 3 18:13:35 2007 +0100 kernel-rt-2.6.23-1-i686 * lets start to make the musician's * using Frugalware happy .. * in fact I don't really have time for this but heh diff --git a/source/base-extra/kernel-rt/FrugalBuild b/source/base-extra/kernel-rt/FrugalBuild new file mode 100644 index 0000000..60b29f2 --- /dev/null +++ b/source/base-extra/kernel-rt/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 11.74 SBU +# Maintainer: crazy + +pkgver=2.6.23 +pkgrel=1 +_F_kernel_stable=1 +_F_kernel_dontsedarch=1 +_F_kernel_name="-rt" +_F_kernel_patches=(http://www.kernel.org/pub/linux/kernel/projects/rt/patch-2.6.23.1-rt5.bz2 \ + aic7xxx-suspend.patch) +Finclude kernel +pkgdesc="The Linux Kernel and modules (Real-Time Preempt)" +url="http://rt.wiki.kernel.org/index.php/Main_Page" +groups=('base-extra') +archs=('i686') +# that up2date is not really correct , is there just to see what lastest version of the patch is +up2date="lynx -dump http://www.kernel.org/pub/linux/kernel/projects/rt/|grep -v broken|grep -v sign|grep -m1 '.bz2'|sed 's/.*ch-\(.*\).bz2.*/\1/'" +unset install +install=kernel-rt.install diff --git a/source/base-extra/kernel-rt/config b/source/base-extra/kernel-rt/config new file mode 100644 index 0000000..bf19b58 --- /dev/null +++ b/source/base-extra/kernel-rt/config @@ -0,0 +1,3638 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.23.1-rt5 +# Sat Nov 3 15:44:04 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 +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +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 +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +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_USER_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_CPUSETS=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_RADIX_TREE_CONCURRENT=y +CONFIG_RADIX_TREE_OPTIMISTIC=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +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_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBD=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_LSF=y +CONFIG_BLK_DEV_BSG=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_NUMAQ is not set +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_VISWS is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_ES7000 is not set +# CONFIG_PARAVIRT is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MCORE2 is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +# 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_GENERIC_SPINLOCK=y +CONFIG_ASM_SEMAPHORES=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_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=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_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_DESKTOP is not set +CONFIG_PREEMPT_RT=y +CONFIG_PREEMPT=y +CONFIG_PREEMPT_SOFTIRQS=y +CONFIG_PREEMPT_HARDIRQS=y +CONFIG_PREEMPT_BKL=y +# CONFIG_CLASSIC_RCU is not set +CONFIG_PREEMPT_RCU=y +# CONFIG_PREEMPT_RCU_BOOST is not set +# CONFIG_RCU_TRACE is not set +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_NONFATAL=m +CONFIG_X86_MCE_P4THERMAL=y +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m + +# +# Firmware Drivers +# +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 +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_RESOURCES_64BIT=y +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 is not set +CONFIG_REGPARM=y +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_PHYSICAL_START=0x100000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_COMPAT_VDSO is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management options (ACPI, APM) +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +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_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=m +CONFIG_ACPI_BAY=m +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_ASUS=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m +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_ALLOW_INTS is not set +CONFIG_APM_REAL_MODE_POWER_OFF=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=m +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +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_TABLE=y +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m + +# +# shared options +# +# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set +CONFIG_X86_SPEEDSTEP_LIB=m +# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set + +# +# CPU idle PM support +# +# CONFIG_CPU_IDLE is not set + +# +# Bus options (PCI, PCMCIA, EISA, MCA, ISA) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +CONFIG_PCI_GODIRECT=y +# CONFIG_PCI_GOANY is not set +CONFIG_PCI_DIRECT=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_HT_IRQ=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +CONFIG_EISA=y +# CONFIG_EISA_VLB_PRIMING is not set +CONFIG_EISA_PCI_EISA=y +CONFIG_EISA_VIRTUAL_ROOT=y +CONFIG_EISA_NAMES=y +CONFIG_MCA=y +CONFIG_MCA_LEGACY=y +CONFIG_MCA_PROC_FS=y +# CONFIG_SCx200 is not set +CONFIG_K8_NB=y + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +# CONFIG_PCMCIA_IOCTL is not set +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_I82365=m +CONFIG_TCIC=m +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=m +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +# CONFIG_HOTPLUG_PCI_CPCI is not set +CONFIG_HOTPLUG_PCI_SHPC=m + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +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 +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="bic" +# CONFIG_TCP_MD5SIG is not set +# 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=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_SUBTREES is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK_ENABLED=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set +# 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 +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +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 +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +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 + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +# CONFIG_BRIDGE_EBT_ULOG is not set +# CONFIG_IP_DCCP is not set +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 +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set +CONFIG_LLC=y +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +CONFIG_ECONET_AUNUDP=y +CONFIG_ECONET_NATIVE=y +CONFIG_WAN_ROUTER=m + +# +# QoS and/or fair queueing +# +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_FIFO=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +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 +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +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 + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +# CONFIG_AX25_DAMA_SLAVE is not set +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +CONFIG_SCC_DELAY=y +CONFIG_SCC_TRXECHO=y +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +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 +# + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_TOSHIBA_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +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 +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m +CONFIG_NET_9P=m +# CONFIG_NET_9P_DEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=m +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_PNC2000=m +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_DILNETPC=m +CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_M25P80=m +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +# CONFIG_MTD_DOCPROBE_ADVANCED is not set +CONFIG_MTD_DOCPROBE_ADDRESS=0 +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 +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_MTD_ONENAND_OTP=y + +# +# 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 +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +CONFIG_ISAPNP=y +CONFIG_PNPBIOS=y +CONFIG_PNPBIOS_PROC_FS=y +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=y +CONFIG_BLK_DEV_XD=m +CONFIG_PARIDE=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_BPCK6=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=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 +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m +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 +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 + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +# CONFIG_BLK_DEV_HD_IDE is not set +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m +CONFIG_BLK_DEV_IDECD=y +CONFIG_BLK_DEV_IDETAPE=m +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=m +CONFIG_BLK_DEV_CMD640=y +CONFIG_BLK_DEV_CMD640_ENHANCED=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 is not set +CONFIG_BLK_DEV_OPTI621=y +CONFIG_BLK_DEV_RZ1000=y +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +# CONFIG_IDEDMA_ONLYDISK is not set +CONFIG_BLK_DEV_AEC62XX=y +CONFIG_BLK_DEV_ALI15X3=y +# CONFIG_WDC_ALI15X3 is not set +CONFIG_BLK_DEV_AMD74XX=y +CONFIG_BLK_DEV_ATIIXP=y +CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_TRIFLEX=y +CONFIG_BLK_DEV_CY82C693=y +CONFIG_BLK_DEV_CS5520=y +CONFIG_BLK_DEV_CS5530=y +CONFIG_BLK_DEV_CS5535=m +CONFIG_BLK_DEV_HPT34X=y +# CONFIG_HPT34X_AUTODMA is not set +CONFIG_BLK_DEV_HPT366=y +CONFIG_BLK_DEV_JMICRON=y +CONFIG_BLK_DEV_SC1200=y +# CONFIG_BLK_DEV_PIIX is not set +CONFIG_BLK_DEV_IT8213=y +CONFIG_BLK_DEV_IT821X=y +CONFIG_BLK_DEV_NS87415=m +CONFIG_BLK_DEV_PDC202XX_OLD=y +CONFIG_PDC202XX_BURST=y +CONFIG_BLK_DEV_PDC202XX_NEW=y +CONFIG_BLK_DEV_SVWKS=y +CONFIG_BLK_DEV_SIIMAGE=y +CONFIG_BLK_DEV_SIS5513=y +CONFIG_BLK_DEV_SLC90E66=y +CONFIG_BLK_DEV_TRM290=y +CONFIG_BLK_DEV_VIA82CXXX=y +CONFIG_BLK_DEV_TC86C001=y +# CONFIG_IDE_ARM is not set +CONFIG_IDE_CHIPSETS=y + +# +# Note: most of these also require special kernel boot parameters +# +CONFIG_BLK_DEV_4DRIVES=y +CONFIG_BLK_DEV_ALI14XX=m +CONFIG_BLK_DEV_DTC2278=m +CONFIG_BLK_DEV_HT6560B=m +CONFIG_BLK_DEV_QD65XX=m +CONFIG_BLK_DEV_UMC8672=m +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=y +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 +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AHA1740=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=y +CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=4 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=y +# CONFIG_SCSI_OMIT_FLASHPOINT is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_FD_MCS=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m +CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IBMMCA=m +CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y +CONFIG_IBMMCA_SCSI_DEV_RESET=y +CONFIG_SCSI_IPS=y +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_NCR53C406A=m +CONFIG_SCSI_NCR_D700=m +CONFIG_SCSI_STEX=y +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_NCR_Q720=m +CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8 +CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32 +CONFIG_SCSI_NCR53C8XX_SYNC=20 +CONFIG_SCSI_PAS16=m +CONFIG_SCSI_PSI240I=m +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +CONFIG_SCSI_SEAGATE=m +CONFIG_SCSI_SIM710=m +CONFIG_SCSI_SYM53C416=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_T128=m +CONFIG_SCSI_U14_34F=m +# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set +# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set +CONFIG_SCSI_U14_34F_MAX_TAGS=8 +CONFIG_SCSI_ULTRASTOR=m +CONFIG_SCSI_NSP32=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_SRP=m +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 +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 +CONFIG_SATA_MV=m +CONFIG_SATA_NV=y +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_PROMISE=y +CONFIG_SATA_SX4=y +CONFIG_SATA_SIL=y +CONFIG_SATA_SIL24=y +CONFIG_SATA_SIS=y +CONFIG_SATA_ULI=y +CONFIG_SATA_VIA=y +CONFIG_SATA_VITESSE=y +CONFIG_SATA_INIC162X=m +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 +CONFIG_PATA_CS5535=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_ATA_GENERIC=m +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 +CONFIG_PATA_JMICRON=y +CONFIG_PATA_LEGACY=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=y +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m +CONFIG_PATA_WINBOND_VLB=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=y +CONFIG_MD_RAID1=y +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +# CONFIG_DM_SNAPSHOT is not set +# 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 +# +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +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 + +# +# Controllers +# +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m + +# +# 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 +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +# 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 +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +CONFIG_ARCNET_CAP=m +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +CONFIG_ARCNET_RIM_I=m +CONFIG_ARCNET_COM20020=m +CONFIG_ARCNET_COM20020_ISA=m +CONFIG_ARCNET_COM20020_PCI=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +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 +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL1=m +CONFIG_EL2=m +CONFIG_ELPLUS=m +CONFIG_EL16=m +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_ELMC=m +CONFIG_ELMC_II=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_LANCE=m +CONFIG_NET_VENDOR_SMC=y +CONFIG_WD80x3=m +CONFIG_ULTRAMCA=m +CONFIG_ULTRA=m +CONFIG_ULTRA32=m +CONFIG_SMC9194=m +CONFIG_NET_VENDOR_RACAL=y +CONFIG_NI52=m +CONFIG_NI65=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +CONFIG_TULIP_MMIO=y +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_AT1700=m +CONFIG_DEPCA=m +CONFIG_HP100=m +CONFIG_NET_ISA=y +CONFIG_E2100=m +CONFIG_EWRK3=m +CONFIG_EEXPRESS=m +CONFIG_EEXPRESS_PRO=m +CONFIG_HPLAN_PLUS=m +CONFIG_HPLAN=m +# CONFIG_LP486E is not set +CONFIG_ETH16I=m +CONFIG_NE2000=m +CONFIG_ZNET=m +CONFIG_SEEQ8005=m +CONFIG_NE2_MCA=m +CONFIG_IBMLANA=m +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +# CONFIG_PCNET32_NAPI is not set +CONFIG_AMD8111_ETH=m +# CONFIG_AMD8111E_NAPI is not set +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_ADAPTEC_STARFIRE_NAPI=y +CONFIG_AC3200=m +CONFIG_APRICOT=m +CONFIG_B44=m +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_CS89x0=m +CONFIG_DGRS=m +CONFIG_EEPRO100=m +CONFIG_E100=m +CONFIG_LNE390=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_NE3210=m +CONFIG_ES3210=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +# CONFIG_VIA_RHINE_NAPI is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000_NAPI=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +# CONFIG_R8169_NAPI is not set +# CONFIG_R8169_VLAN is not set +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 +CONFIG_NETDEV_10000=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m +CONFIG_IXGB=m +CONFIG_IXGB_NAPI=y +CONFIG_S2IO=m +CONFIG_S2IO_NAPI=y +CONFIG_MYRI10GE=m +CONFIG_NETXEN_NIC=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TR=y +CONFIG_IBMTR=m +CONFIG_IBMOL=m +CONFIG_IBMLS=m +CONFIG_3C359=m +CONFIG_TMS380TR=m +CONFIG_TMSPCI=m +CONFIG_SKISA=m +CONFIG_PROTEON=m +CONFIG_ABYSS=m +CONFIG_MADGEMC=m +CONFIG_SMCTR=m + +# +# Wireless LAN +# +CONFIG_WLAN_PRE80211=y +CONFIG_STRIP=m +CONFIG_ARLAN=m +CONFIG_WAVELAN=m +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_WLAN_80211=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +# CONFIG_IPW2200_RADIOTAP is not set +# CONFIG_IPW2200_PROMISCUOUS 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 +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_PCMCIA_WL3501=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_RTL8187=m +CONFIG_HOSTAP=m +# CONFIG_HOSTAP_FIRMWARE is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_BCM43XX=m +CONFIG_BCM43XX_DEBUG=y +CONFIG_BCM43XX_DMA=y +CONFIG_BCM43XX_PIO=y +CONFIG_BCM43XX_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_DMA_MODE is not set +# CONFIG_BCM43XX_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set + +# +# 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 +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +CONFIG_ARCNET_COM20020_CS=m +CONFIG_PCMCIA_IBMTR=m +CONFIG_WAN=y +CONFIG_HOSTESS_SV11=m +CONFIG_COSA=m +CONFIG_LANMEDIA=m +CONFIG_SEALEVEL_4021=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_PPP=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +CONFIG_PC300=m +CONFIG_PC300_MLPPP=y + +# +# Cyclades-PC300 MLPPP support is disabled. +# + +# +# Refer to the file README.mlppp, provided by PC300 package. +# +CONFIG_PC300TOO=m +CONFIG_N2=m +CONFIG_C101=m +CONFIG_FARSYNC=m +CONFIG_DSCC4=m +# CONFIG_DSCC4_PCISYNC is not set +# CONFIG_DSCC4_PCI_RST is not set +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +CONFIG_SDLA=m +CONFIG_WAN_ROUTER_DRIVERS=m +CONFIG_CYCLADES_SYNC=m +CONFIG_CYCLOMX_X25=y +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +CONFIG_SBNI=m +# CONFIG_SBNI_MULTILINE is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E_MAYBE=m +# CONFIG_ATM_FORE200E_PCA is not set +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +CONFIG_HIPPI=y +CONFIG_ROADRUNNER=m +# CONFIG_ROADRUNNER_LARGE_RINGS is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +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 +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +CONFIG_NET_FC=y +# CONFIG_SHAPER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_ISDN=m +# CONFIG_ISDN_I4L is not set +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +# CONFIG_CAPI_TRACE is not set +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +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 +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_PHONE=m +CONFIG_PHONE_IXJ=m +CONFIG_PHONE_IXJ_PCMCIA=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_TSDEV=m +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_XTKBD=m +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 +CONFIG_MOUSE_PC110PAD=m +CONFIG_MOUSE_VSXXXAA=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +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 +CONFIG_TOUCHSCREEN_MK712=m +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 + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_COMPUTONE=m +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_DIGIEPCA=m +CONFIG_ESPSERIAL=m +CONFIG_MOXA_INTELLIO=m +CONFIG_MOXA_SMARTIO=m +CONFIG_MOXA_SMARTIO_NEW=m +CONFIG_ISI=m +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_N_HDLC=m +CONFIG_SPECIALIX=m +CONFIG_SPECIALIX_RTSCTS=y +CONFIG_SX=m +CONFIG_RIO=m +# CONFIG_RIO_OLDPCI is not set +CONFIG_STALDRV=y + +# +# Serial drivers +# +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 +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_FOURPORT=m +CONFIG_SERIAL_8250_ACCENT=m +CONFIG_SERIAL_8250_BOCA=m +CONFIG_SERIAL_8250_EXAR_ST16C554=m +CONFIG_SERIAL_8250_HUB6=m +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_MCA=m + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_PRINTER=m +CONFIG_LP_CONSOLE=y +CONFIG_PPDEV=m +CONFIG_TIPAR=m +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 +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_SC520_WDT=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m +CONFIG_WDT_501=y + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_INTEL=y +CONFIG_HW_RANDOM_AMD=y +CONFIG_HW_RANDOM_GEODE=y +CONFIG_HW_RANDOM_VIA=y +CONFIG_NVRAM=m +CONFIG_RTC=m +# CONFIG_RTC_HISTOGRAM is not set +CONFIG_BLOCKER=y +CONFIG_LPPTEST=m +CONFIG_GEN_RTC=y +CONFIG_GEN_RTC_X=y +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m +CONFIG_DRM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_I810=m +CONFIG_DRM_I830=m +CONFIG_DRM_I915=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_CS5535_GPIO=m +# CONFIG_RAW_DRIVER is not set +CONFIG_HPET=y +# CONFIG_HPET_RTC_IRQ is not set +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_RMEM=m +CONFIG_ALLOC_RTSJ_MEM=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_I810=m +CONFIG_I2C_PIIX4=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 +CONFIG_I2C_PCA_ISA=m + +# +# Miscellaneous I2C Chip support +# +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 +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set +CONFIG_SPI_LM70_LLP=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +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 +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_F71805F=m +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 +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +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 +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +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 + +# +# Multifunction device drivers +# +CONFIG_MFD_SM501=m + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +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 +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +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 +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_PP=m +CONFIG_VIDEO_CPIA_USB=m +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 +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +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 +CONFIG_V4L_USB_DRIVERS=y +CONFIG_VIDEO_PVRUSB2=m +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 +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_ZR364XX=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_CADET=m +CONFIG_RADIO_RTRACK=m +CONFIG_RADIO_RTRACK2=m +CONFIG_RADIO_AZTECH=m +CONFIG_RADIO_GEMTEK=m +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m +CONFIG_RADIO_SF16FMI=m +CONFIG_RADIO_SF16FMR2=m +CONFIG_RADIO_TERRATEC=m +CONFIG_RADIO_TRUST=m +CONFIG_RADIO_TYPHOON=m +CONFIG_RADIO_TYPHOON_PROC_FS=y +CONFIG_RADIO_ZOLTRIX=m +CONFIG_USB_DSBR=m +CONFIG_DVB_CORE=m +CONFIG_DVB_CORE_ATTACH=y +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +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 +# CONFIG_DVB_CINERGYT2_TUNING is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_MT312=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_TDA10086=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m + +# +# Tuners/PLL support +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TDA827X=m +CONFIG_DVB_TUNER_QT1010=m +CONFIG_DVB_TUNER_MT2060=m + +# +# Miscellaneous devices +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_TUA6100=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +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_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=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 +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +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 +# CONFIG_FB_RIVA is not set +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 +CONFIG_FB_MATROX=m +# CONFIG_FB_MATROX_MILLENIUM is not set +# CONFIG_FB_MATROX_MYSTIQUE is not set +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_MATROX_MULTIHEAD=y +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY128_BACKLIGHT=y +CONFIG_FB_ATY=m +# CONFIG_FB_ATY_CT is not set +# CONFIG_FB_ATY_GX is not set +CONFIG_FB_ATY_BACKLIGHT=y +CONFIG_FB_S3=m +# CONFIG_FB_SAVAGE is not set +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +# CONFIG_FB_NEOMAGIC is not set +# 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 + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +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_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_RTCTIMER=m +CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +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_ADLIB=m +CONFIG_SND_AD1816A=m +CONFIG_SND_AD1848=m +CONFIG_SND_ALS100=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4232=m +CONFIG_SND_CS4236=m +CONFIG_SND_DT019X=m +CONFIG_SND_ES968=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_GUS_SYNTH=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +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 +# +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +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 +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +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 +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +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 + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y + +# +# PCMCIA devices +# +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m + +# +# System on Chip audio support +# +# CONFIG_SND_SOC is not set + +# +# SoC Audio support for SuperH +# + +# +# 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 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 +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# 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 + +# +# USB Host Controller Drivers +# +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_ISP116X_HCD=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +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 +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_KARMA=y +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +# CONFIG_USB_MON is not set + +# +# USB port drivers +# +CONFIG_USB_USS720=m + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +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 +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m + +# +# USB DSL modem support +# +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# 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 +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +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 Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y + +# +# 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 + +# +# LED drivers +# + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +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 +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 +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_MM_EDAC=m +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_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=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1672=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_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 + +# +# DMA Clients +# +CONFIG_NET_DMA=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +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 +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4DEV_FS=m +CONFIG_EXT4DEV_FS_XATTR=y +CONFIG_EXT4DEV_FS_POSIX_ACL=y +CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_JBD=y +CONFIG_JBD_DEBUG=y +CONFIG_JBD2=m +CONFIG_JBD2_DEBUG=y +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=y +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_NOLOCK=m +CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_CRAMFS=m +CONFIG_VXFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +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 +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# 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 +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Distributed Lock Manager +# +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set +# CONFIG_INSTRUMENTATION is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_EVENT_TRACE is not set +# CONFIG_FUNCTION_TRACE is not set +# CONFIG_WAKEUP_TIMING is not set +# CONFIG_CRITICAL_PREEMPT_TIMING is not set +# CONFIG_CRITICAL_IRQSOFF_TIMING is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_EARLY_PRINTK=y +CONFIG_X86_FIND_SMP_CONFIG=y +CONFIG_X86_MPPARSE=y +CONFIG_DOUBLEFAULT=y + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_DEBUG_PROC_KEYS=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_CAPABILITIES=m +# CONFIG_REALTIME_CAPABILITIES is not set +CONFIG_SECURITY_ROOTPLUG=m +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 +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +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 +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m +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 + +# +# 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_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 +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 +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_X86_SMP=y +CONFIG_X86_HT=y +CONFIG_X86_BIOS_REBOOT=y +CONFIG_X86_TRAMPOLINE=y +CONFIG_KTIME_SCALAR=y From crazy at frugalware.org Sat Nov 3 18:16:48 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 18:16:55 2007 Subject: [Frugalware-git] kernel-rt: kernel-rt-2.6.23-1-i686 Message-ID: <20071103171648.B30191A68051@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel-rt.git;a=commitdiff;h=327dbc297d263f9eebc23e02f381b57f534d9ebc commit 327dbc297d263f9eebc23e02f381b57f534d9ebc Author: crazy Date: Sat Nov 3 18:16:30 2007 +0100 kernel-rt-2.6.23-1-i686 * Upss fogrot the patch diff --git a/source/base-extra/kernel-rt/aic7xxx-suspend.patch b/source/base-extra/kernel-rt/aic7xxx-suspend.patch new file mode 100644 index 0000000..0ba3571 --- /dev/null +++ b/source/base-extra/kernel-rt/aic7xxx-suspend.patch @@ -0,0 +1,691 @@ +From 2dc1cdee053846fafc98a819bdad1533ac7c2f04 Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke +Date: Fri, 19 Oct 2007 09:13:17 +0200 +Subject: [PATCH 1/4] aic7xxx: Add suspend/resume support + +The aic7xxx driver already contains fragments for suspend/resume +support. So we only need to update them to the current interface +and have full PCI suspend/resume. + +Signed-off-by: Hannes Reinecke +Tested-by: Jens Axboe +--- + drivers/scsi/aic7xxx/aic7770.c | 16 ----- + drivers/scsi/aic7xxx/aic79xx.h | 9 +++ + drivers/scsi/aic7xxx/aic79xx_core.c | 33 +--------- + drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 112 ++++++++++++++++++++++++++------ + drivers/scsi/aic7xxx/aic79xx_pci.c | 24 ------- + drivers/scsi/aic7xxx/aic79xx_pci.h | 25 +++++++ + drivers/scsi/aic7xxx/aic7xxx.h | 18 +---- + drivers/scsi/aic7xxx/aic7xxx_core.c | 41 +----------- + drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 91 +++++++++++++++++++++----- + drivers/scsi/aic7xxx/aic7xxx_pci.c | 16 +---- + 10 files changed, 208 insertions(+), 177 deletions(-) + +diff --git a/drivers/scsi/aic7xxx/aic7770.c b/drivers/scsi/aic7xxx/aic7770.c +index c4d1723..6d86a9b 100644 +--- a/drivers/scsi/aic7xxx/aic7770.c ++++ b/drivers/scsi/aic7xxx/aic7770.c +@@ -60,8 +60,6 @@ + #define ID_OLV_274xD 0x04907783 /* Olivetti OEM (Differential) */ + + static int aic7770_chip_init(struct ahc_softc *ahc); +-static int aic7770_suspend(struct ahc_softc *ahc); +-static int aic7770_resume(struct ahc_softc *ahc); + static int aha2840_load_seeprom(struct ahc_softc *ahc); + static ahc_device_setup_t ahc_aic7770_VL_setup; + static ahc_device_setup_t ahc_aic7770_EISA_setup; +@@ -155,8 +153,6 @@ aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io) + return (error); + + ahc->bus_chip_init = aic7770_chip_init; +- ahc->bus_suspend = aic7770_suspend; +- ahc->bus_resume = aic7770_resume; + + error = ahc_reset(ahc, /*reinit*/FALSE); + if (error != 0) +@@ -272,18 +268,6 @@ aic7770_chip_init(struct ahc_softc *ahc) + return (ahc_chip_init(ahc)); + } + +-static int +-aic7770_suspend(struct ahc_softc *ahc) +-{ +- return (ahc_suspend(ahc)); +-} +- +-static int +-aic7770_resume(struct ahc_softc *ahc) +-{ +- return (ahc_resume(ahc)); +-} +- + /* + * Read the 284x SEEPROM. + */ +diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h +index 27adbb2..a96a2ff 100644 +--- a/drivers/scsi/aic7xxx/aic79xx.h ++++ b/drivers/scsi/aic7xxx/aic79xx.h +@@ -1003,8 +1003,15 @@ struct ahd_suspend_channel_state { + uint8_t seqctl; + }; + ++struct ahd_suspend_pci_state { ++ uint32_t devconfig; ++ uint8_t command; ++ uint8_t csize_lattime; ++}; ++ + struct ahd_suspend_state { + struct ahd_suspend_channel_state channel[2]; ++ struct ahd_suspend_pci_state pci_state; + uint8_t optionmode; + uint8_t dscommand0; + uint8_t dspcistatus; +@@ -1343,6 +1350,8 @@ struct ahd_softc *ahd_alloc(void *platform_arg, char *name); + int ahd_softc_init(struct ahd_softc *); + void ahd_controller_info(struct ahd_softc *ahd, char *buf); + int ahd_init(struct ahd_softc *ahd); ++void ahd_shutdown(void *arg); ++void ahd_restart(struct ahd_softc *ahd); + int ahd_default_config(struct ahd_softc *ahd); + int ahd_parse_vpddata(struct ahd_softc *ahd, + struct vpd_config *vpd); +diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c +index 05f692b..91f6f4f 100644 +--- a/drivers/scsi/aic7xxx/aic79xx_core.c ++++ b/drivers/scsi/aic7xxx/aic79xx_core.c +@@ -255,7 +255,6 @@ static void ahd_freeze_devq(struct ahd_softc *ahd, + static void ahd_handle_scb_status(struct ahd_softc *ahd, + struct scb *scb); + static struct ahd_phase_table_entry* ahd_lookup_phase_entry(int phase); +-static void ahd_shutdown(void *arg); + static void ahd_update_coalescing_values(struct ahd_softc *ahd, + u_int timer, + u_int maxcmds, +@@ -357,7 +356,7 @@ ahd_complete_scb(struct ahd_softc *ahd, struct scb *scb) + /* + * Restart the sequencer program from address zero + */ +-static void ++void + ahd_restart(struct ahd_softc *ahd) + { + +@@ -5456,7 +5455,7 @@ ahd_free(struct ahd_softc *ahd) + return; + } + +-static void ++void + ahd_shutdown(void *arg) + { + struct ahd_softc *ahd; +@@ -7175,34 +7174,6 @@ ahd_pause_and_flushwork(struct ahd_softc *ahd) + ahd->flags &= ~AHD_ALL_INTERRUPTS; + } + +-#if 0 +-int +-ahd_suspend(struct ahd_softc *ahd) +-{ +- +- ahd_pause_and_flushwork(ahd); +- +- if (LIST_FIRST(&ahd->pending_scbs) != NULL) { +- ahd_unpause(ahd); +- return (EBUSY); +- } +- ahd_shutdown(ahd); +- return (0); +-} +-#endif /* 0 */ +- +-#if 0 +-int +-ahd_resume(struct ahd_softc *ahd) +-{ +- +- ahd_reset(ahd, /*reinit*/TRUE); +- ahd_intr_enable(ahd, TRUE); +- ahd_restart(ahd); +- return (0); +-} +-#endif /* 0 */ +- + /************************** Busy Target Table *********************************/ + /* + * Set SCBPTR to the SCB that contains the busy +diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c +index c62ce41..8aa6302 100644 +--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c ++++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c +@@ -43,15 +43,6 @@ + #include "aic79xx_inline.h" + #include "aic79xx_pci.h" + +-static int ahd_linux_pci_dev_probe(struct pci_dev *pdev, +- const struct pci_device_id *ent); +-static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, +- u_long *base, u_long *base2); +-static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd, +- u_long *bus_addr, +- uint8_t __iomem **maddr); +-static void ahd_linux_pci_dev_remove(struct pci_dev *pdev); +- + /* Define the macro locally since it's different for different class of chips. + */ + #define ID(x) \ +@@ -83,12 +74,82 @@ static struct pci_device_id ahd_linux_pci_id_table[] = { + + MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table); + +-static struct pci_driver aic79xx_pci_driver = { +- .name = "aic79xx", +- .probe = ahd_linux_pci_dev_probe, +- .remove = ahd_linux_pci_dev_remove, +- .id_table = ahd_linux_pci_id_table +-}; ++#ifdef CONFIG_PM ++int ++ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg) ++{ ++ struct ahd_softc *ahd = pci_get_drvdata(pdev); ++ ++ /* ++ * Shutdown the HBA ++ */ ++ ahd_pause_and_flushwork(ahd); ++ ++ if (LIST_FIRST(&ahd->pending_scbs) != NULL) { ++ ahd_unpause(ahd); ++ return -EBUSY; ++ } ++ ++ ahd_shutdown(ahd); ++ ++ /* ++ * Save chip register configuration data for chip resets ++ * that occur during runtime and resume events. ++ */ ++ pci_read_config_dword(ahd->dev_softc, DEVCONFIG, ++ &ahd->suspend_state.pci_state.devconfig); ++ pci_read_config_byte(ahd->dev_softc, PCIR_COMMAND, ++ &ahd->suspend_state.pci_state.command); ++ pci_read_config_byte(ahd->dev_softc, CSIZE_LATTIME, ++ &ahd->suspend_state.pci_state.csize_lattime); ++ ++ pci_save_state(pdev); ++ pci_disable_device(pdev); ++ ++ if (mesg.event == PM_EVENT_SUSPEND) ++ pci_set_power_state(pdev, PCI_D3hot); ++ ++ return 0; ++} ++ ++int ++ahd_linux_pci_dev_resume(struct pci_dev *pdev) ++{ ++ struct ahd_softc *ahd = pci_get_drvdata(pdev); ++ int rc; ++ ++ pci_set_power_state(pdev, PCI_D0); ++ pci_restore_state(pdev); ++ ++ rc = pci_enable_device(pdev); ++ if (rc) { ++ dev_printk(KERN_ERR, &pdev->dev, ++ "failed to enable device after resume (%d)\n", rc); ++ return rc; ++ } ++ ++ pci_set_master(pdev); ++ ++ /* ++ * Restore additional PCI registers ++ */ ++ pci_write_config_dword(ahd->dev_softc, DEVCONFIG, ++ ahd->suspend_state.pci_state.devconfig); ++ pci_write_config_byte(ahd->dev_softc, PCIR_COMMAND, ++ ahd->suspend_state.pci_state.command); ++ pci_write_config_byte(ahd->dev_softc, CSIZE_LATTIME, ++ ahd->suspend_state.pci_state.csize_lattime); ++ ++ /* ++ * Restart the HBA ++ */ ++ ahd_reset(ahd, /*reinit*/TRUE); ++ ahd_intr_enable(ahd, TRUE); ++ ahd_restart(ahd); ++ ++ return 0; ++} ++#endif /* CONFIG_PM */ + + static void + ahd_linux_pci_dev_remove(struct pci_dev *pdev) +@@ -97,7 +158,7 @@ ahd_linux_pci_dev_remove(struct pci_dev *pdev) + u_long s; + + if (ahd->platform_data && ahd->platform_data->host) +- scsi_remove_host(ahd->platform_data->host); ++ scsi_remove_host(ahd->platform_data->host); + + ahd_lock(ahd, &s); + ahd_intr_enable(ahd, FALSE); +@@ -195,6 +256,17 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + return (0); + } + ++static struct pci_driver aic79xx_pci_driver = { ++ .name = "aic79xx", ++ .probe = ahd_linux_pci_dev_probe, ++#ifdef CONFIG_PM ++ .suspend = ahd_linux_pci_dev_suspend, ++ .resume = ahd_linux_pci_dev_resume, ++#endif ++ .remove = ahd_linux_pci_dev_remove, ++ .id_table = ahd_linux_pci_id_table ++}; ++ + int + ahd_linux_pci_init(void) + { +@@ -276,7 +348,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd) + /* + * If its allowed, we prefer memory mapped access. + */ +- command = ahd_pci_read_config(ahd->dev_softc, PCIR_COMMAND, 4); ++ pci_read_config_dword(ahd->dev_softc, PCIR_COMMAND, &command); + command &= ~(PCIM_CMD_PORTEN|PCIM_CMD_MEMEN); + base = 0; + maddr = NULL; +@@ -287,8 +359,8 @@ ahd_pci_map_registers(struct ahd_softc *ahd) + ahd->bshs[0].maddr = maddr; + ahd->tags[1] = BUS_SPACE_MEMIO; + ahd->bshs[1].maddr = maddr + 0x100; +- ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, +- command | PCIM_CMD_MEMEN, 4); ++ pci_write_config_dword(ahd->dev_softc, PCIR_COMMAND, ++ command | PCIM_CMD_MEMEN); + + if (ahd_pci_test_register_access(ahd) != 0) { + +@@ -332,7 +404,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd) + base, base2); + } + } +- ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, command, 4); ++ pci_write_config_dword(ahd->dev_softc, PCIR_COMMAND, command); + return (error); + } + +diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c +index 0bada00..c8617e0 100644 +--- a/drivers/scsi/aic7xxx/aic79xx_pci.c ++++ b/drivers/scsi/aic7xxx/aic79xx_pci.c +@@ -209,12 +209,6 @@ static struct ahd_pci_identity ahd_pci_ident_table [] = + + static const u_int ahd_num_pci_devs = ARRAY_SIZE(ahd_pci_ident_table); + +-#define DEVCONFIG 0x40 +-#define PCIXINITPAT 0x0000E000ul +-#define PCIXINIT_PCI33_66 0x0000E000ul +-#define PCIXINIT_PCIX50_66 0x0000C000ul +-#define PCIXINIT_PCIX66_100 0x0000A000ul +-#define PCIXINIT_PCIX100_133 0x00008000ul + #define PCI_BUS_MODES_INDEX(devconfig) \ + (((devconfig) & PCIXINITPAT) >> 13) + static const char *pci_bus_modes[] = +@@ -229,24 +223,6 @@ static const char *pci_bus_modes[] = + "PCI 33 or 66Mhz" + }; + +-#define TESTMODE 0x00000800ul +-#define IRDY_RST 0x00000200ul +-#define FRAME_RST 0x00000100ul +-#define PCI64BIT 0x00000080ul +-#define MRDCEN 0x00000040ul +-#define ENDIANSEL 0x00000020ul +-#define MIXQWENDIANEN 0x00000008ul +-#define DACEN 0x00000004ul +-#define STPWLEVEL 0x00000002ul +-#define QWENDIANSEL 0x00000001ul +- +-#define DEVCONFIG1 0x44 +-#define PREQDIS 0x01 +- +-#define CSIZE_LATTIME 0x0c +-#define CACHESIZE 0x000000fful +-#define LATTIME 0x0000ff00ul +- + static int ahd_check_extport(struct ahd_softc *ahd); + static void ahd_configure_termination(struct ahd_softc *ahd, + u_int adapter_control); +diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.h b/drivers/scsi/aic7xxx/aic79xx_pci.h +index 16b7c70..67ea5ae 100644 +--- a/drivers/scsi/aic7xxx/aic79xx_pci.h ++++ b/drivers/scsi/aic7xxx/aic79xx_pci.h +@@ -69,4 +69,29 @@ + #define ID_AHA_39320D_HP 0x8011900500AC0E11ull + #define ID_AHA_39320D_B_HP 0x801C900500AC0E11ull + ++#define DEVCONFIG 0x40 ++#define PCIXINITPAT 0x0000E000ul ++#define PCIXINIT_PCI33_66 0x0000E000ul ++#define PCIXINIT_PCIX50_66 0x0000C000ul ++#define PCIXINIT_PCIX66_100 0x0000A000ul ++#define PCIXINIT_PCIX100_133 0x00008000ul ++ ++#define TESTMODE 0x00000800ul ++#define IRDY_RST 0x00000200ul ++#define FRAME_RST 0x00000100ul ++#define PCI64BIT 0x00000080ul ++#define MRDCEN 0x00000040ul ++#define ENDIANSEL 0x00000020ul ++#define MIXQWENDIANEN 0x00000008ul ++#define DACEN 0x00000004ul ++#define STPWLEVEL 0x00000002ul ++#define QWENDIANSEL 0x00000001ul ++ ++#define DEVCONFIG1 0x44 ++#define PREQDIS 0x01 ++ ++#define CSIZE_LATTIME 0x0c ++#define CACHESIZE 0x000000fful ++#define LATTIME 0x0000ff00ul ++ + #endif /* _AIC79XX_PCI_H_ */ +diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h +index e1bd57b..80ceeaf 100644 +--- a/drivers/scsi/aic7xxx/aic7xxx.h ++++ b/drivers/scsi/aic7xxx/aic7xxx.h +@@ -899,8 +899,6 @@ union ahc_bus_softc { + + typedef void (*ahc_bus_intr_t)(struct ahc_softc *); + typedef int (*ahc_bus_chip_init_t)(struct ahc_softc *); +-typedef int (*ahc_bus_suspend_t)(struct ahc_softc *); +-typedef int (*ahc_bus_resume_t)(struct ahc_softc *); + typedef void ahc_callback_t (void *); + + struct ahc_softc { +@@ -962,16 +960,6 @@ struct ahc_softc { + ahc_bus_chip_init_t bus_chip_init; + + /* +- * Bus specific suspend routine. +- */ +- ahc_bus_suspend_t bus_suspend; +- +- /* +- * Bus specific resume routine. +- */ +- ahc_bus_resume_t bus_resume; +- +- /* + * Target mode related state kept on a per enabled lun basis. + * Targets that are not enabled will have null entries. + * As an initiator, we keep one target entry for our initiator +@@ -1153,6 +1141,7 @@ struct ahc_pci_identity *ahc_find_pci_device(ahc_dev_softc_t); + int ahc_pci_config(struct ahc_softc *, + struct ahc_pci_identity *); + int ahc_pci_test_register_access(struct ahc_softc *); ++void ahc_pci_resume(struct ahc_softc *ahc); + + /*************************** EISA/VL Front End ********************************/ + struct aic7770_identity *aic7770_find_device(uint32_t); +@@ -1179,14 +1168,13 @@ int ahc_chip_init(struct ahc_softc *ahc); + int ahc_init(struct ahc_softc *ahc); + void ahc_intr_enable(struct ahc_softc *ahc, int enable); + void ahc_pause_and_flushwork(struct ahc_softc *ahc); +-int ahc_suspend(struct ahc_softc *ahc); +-int ahc_resume(struct ahc_softc *ahc); + void ahc_set_unit(struct ahc_softc *, int); + void ahc_set_name(struct ahc_softc *, char *); + void ahc_alloc_scbs(struct ahc_softc *ahc); + void ahc_free(struct ahc_softc *ahc); + int ahc_reset(struct ahc_softc *ahc, int reinit); +-void ahc_shutdown(void *arg); ++void ahc_restart(struct ahc_softc *ahc); ++void ahc_shutdown(struct ahc_softc *ahc); + + /*************************** Interrupt Services *******************************/ + void ahc_clear_intstat(struct ahc_softc *ahc); +diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c +index f350b5e..40f7072 100644 +--- a/drivers/scsi/aic7xxx/aic7xxx_core.c ++++ b/drivers/scsi/aic7xxx/aic7xxx_core.c +@@ -3984,13 +3984,10 @@ ahc_free(struct ahc_softc *ahc) + } + + void +-ahc_shutdown(void *arg) ++ahc_shutdown(struct ahc_softc *ahc) + { +- struct ahc_softc *ahc; + int i; + +- ahc = (struct ahc_softc *)arg; +- + /* This will reset most registers to 0, but not all */ + ahc_reset(ahc, /*reinit*/FALSE); + ahc_outb(ahc, SCSISEQ, 0); +@@ -5078,42 +5075,6 @@ ahc_pause_and_flushwork(struct ahc_softc *ahc) + ahc->flags &= ~AHC_ALL_INTERRUPTS; + } + +-int +-ahc_suspend(struct ahc_softc *ahc) +-{ +- +- ahc_pause_and_flushwork(ahc); +- +- if (LIST_FIRST(&ahc->pending_scbs) != NULL) { +- ahc_unpause(ahc); +- return (EBUSY); +- } +- +-#ifdef AHC_TARGET_MODE +- /* +- * XXX What about ATIOs that have not yet been serviced? +- * Perhaps we should just refuse to be suspended if we +- * are acting in a target role. +- */ +- if (ahc->pending_device != NULL) { +- ahc_unpause(ahc); +- return (EBUSY); +- } +-#endif +- ahc_shutdown(ahc); +- return (0); +-} +- +-int +-ahc_resume(struct ahc_softc *ahc) +-{ +- +- ahc_reset(ahc, /*reinit*/TRUE); +- ahc_intr_enable(ahc, TRUE); +- ahc_restart(ahc); +- return (0); +-} +- + /************************** Busy Target Table *********************************/ + /* + * Return the untagged transaction id for a given target/channel lun. +diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +index ea5687d..847485f 100644 +--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c ++++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +@@ -41,15 +41,7 @@ + + #include "aic7xxx_osm.h" + #include "aic7xxx_pci.h" +- +-static int ahc_linux_pci_dev_probe(struct pci_dev *pdev, +- const struct pci_device_id *ent); +-static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, +- u_long *base); +-static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc, +- u_long *bus_addr, +- uint8_t __iomem **maddr); +-static void ahc_linux_pci_dev_remove(struct pci_dev *pdev); ++#include "aic7xxx_inline.h" + + /* Define the macro locally since it's different for different class of chips. + */ +@@ -130,12 +122,68 @@ static struct pci_device_id ahc_linux_pci_id_table[] = { + + MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table); + +-static struct pci_driver aic7xxx_pci_driver = { +- .name = "aic7xxx", +- .probe = ahc_linux_pci_dev_probe, +- .remove = ahc_linux_pci_dev_remove, +- .id_table = ahc_linux_pci_id_table +-}; ++#ifdef CONFIG_PM ++static int ++ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg) ++{ ++ struct ahc_softc *ahc = pci_get_drvdata(pdev); ++ ++ ahc_pause_and_flushwork(ahc); ++ ++ if (LIST_FIRST(&ahc->pending_scbs) != NULL) { ++ ahc_unpause(ahc); ++ return -EBUSY; ++ } ++ ++#ifdef AHC_TARGET_MODE ++ /* ++ * XXX What about ATIOs that have not yet been serviced? ++ * Perhaps we should just refuse to be suspended if we ++ * are acting in a target role. ++ */ ++ if (ahc->pending_device != NULL) { ++ ahc_unpause(ahc); ++ return -EBUSY; ++ } ++#endif ++ ahc_shutdown(ahc); ++ ++ pci_save_state(pdev); ++ pci_disable_device(pdev); ++ ++ if (mesg.event == PM_EVENT_SUSPEND) ++ pci_set_power_state(pdev, PCI_D3hot); ++ ++ return 0; ++} ++ ++static int ++ahc_linux_pci_dev_resume(struct pci_dev *pdev) ++{ ++ struct ahc_softc *ahc = pci_get_drvdata(pdev); ++ int rc; ++ ++ pci_set_power_state(pdev, PCI_D0); ++ pci_restore_state(pdev); ++ ++ rc = pci_enable_device(pdev); ++ if (rc) { ++ dev_printk(KERN_ERR, &pdev->dev, ++ "failed to enable device after resume (%d)\n", rc); ++ return rc; ++ } ++ ++ pci_set_master(pdev); ++ ++ ahc_pci_resume(ahc); ++ ++ ahc_reset(ahc, /*reinit*/TRUE); ++ ahc_intr_enable(ahc, TRUE); ++ ahc_restart(ahc); ++ ++ return rc; ++} ++#endif /* CONFIG_PM */ + + static void + ahc_linux_pci_dev_remove(struct pci_dev *pdev) +@@ -144,7 +192,7 @@ ahc_linux_pci_dev_remove(struct pci_dev *pdev) + u_long s; + + if (ahc->platform_data && ahc->platform_data->host) +- scsi_remove_host(ahc->platform_data->host); ++ scsi_remove_host(ahc->platform_data->host); + + ahc_lock(ahc, &s); + ahc_intr_enable(ahc, FALSE); +@@ -243,6 +291,17 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + return (0); + } + ++static struct pci_driver aic7xxx_pci_driver = { ++ .name = "aic7xxx", ++ .probe = ahc_linux_pci_dev_probe, ++#ifdef CONFIG_PM ++ .suspend = ahc_linux_pci_dev_suspend, ++ .resume = ahc_linux_pci_dev_resume, ++#endif ++ .remove = ahc_linux_pci_dev_remove, ++ .id_table = ahc_linux_pci_id_table ++}; ++ + int + ahc_linux_pci_init(void) + { +diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c +index 09c8172..ae35937 100644 +--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c ++++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c +@@ -633,8 +633,6 @@ static void write_brdctl(struct ahc_softc *ahc, uint8_t value); + static uint8_t read_brdctl(struct ahc_softc *ahc); + static void ahc_pci_intr(struct ahc_softc *ahc); + static int ahc_pci_chip_init(struct ahc_softc *ahc); +-static int ahc_pci_suspend(struct ahc_softc *ahc); +-static int ahc_pci_resume(struct ahc_softc *ahc); + + static int + ahc_9005_subdevinfo_valid(uint16_t device, uint16_t vendor, +@@ -791,8 +789,6 @@ ahc_pci_config(struct ahc_softc *ahc, struct ahc_pci_identity *entry) + + ahc->bus_intr = ahc_pci_intr; + ahc->bus_chip_init = ahc_pci_chip_init; +- ahc->bus_suspend = ahc_pci_suspend; +- ahc->bus_resume = ahc_pci_resume; + + /* Remeber how the card was setup in case there is no SEEPROM */ + if ((ahc_inb(ahc, HCNTRL) & POWRDN) == 0) { +@@ -2024,18 +2020,9 @@ ahc_pci_chip_init(struct ahc_softc *ahc) + return (ahc_chip_init(ahc)); + } + +-static int +-ahc_pci_suspend(struct ahc_softc *ahc) +-{ +- return (ahc_suspend(ahc)); +-} +- +-static int ++void + ahc_pci_resume(struct ahc_softc *ahc) + { +- +- pci_set_power_state(ahc->dev_softc, AHC_POWER_STATE_D0); +- + /* + * We assume that the OS has restored our register + * mappings, etc. Just update the config space registers +@@ -2063,7 +2050,6 @@ ahc_pci_resume(struct ahc_softc *ahc) + &sxfrctl1); + ahc_release_seeprom(&sd); + } +- return (ahc_resume(ahc)); + } + + static int + From priyank at frugalware.org Sat Nov 3 18:33:12 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 18:33:13 2007 Subject: [Frugalware-git] frugalware-current: ristretto-0.0.10-1-i686 Message-ID: <20071103173312.28DCD1A6804D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=012e8a6b424682524fa1bcb23361ff255fbeb216 commit 012e8a6b424682524fa1bcb23361ff255fbeb216 Author: Priyank Date: Sat Nov 3 23:00:58 2007 +0530 ristretto-0.0.10-1-i686 * Version bup diff --git a/source/xfce4/ristretto/FrugalBuild b/source/xfce4/ristretto/FrugalBuild index b8f80f1..30d407e 100644 --- a/source/xfce4/ristretto/FrugalBuild +++ b/source/xfce4/ristretto/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=ristretto -pkgver=0.0.9 +pkgver=0.0.10 pkgrel=1 pkgdesc="A fast and lightweight picture viewer for Xfce." makedepends=('intltool') @@ -13,6 +13,6 @@ _F_gnome_iconcache="y" _F_xfce_goodies_ext=".tar.gz" Finclude xfce4 gnome-scriptlet url="http://goodies.xfce.org/projects/applications/ristretto" -sha1sums=('b3c99b73eca3567b8ce30156497c2e4262afb2af') +sha1sums=('3f9b2b3fd5f91b8f6a047ed8798d090699ed995c') # optimization OK From crazy at frugalware.org Sat Nov 3 18:40:59 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 18:41:02 2007 Subject: [Frugalware-git] kernel-rt: nvidia-96xx-rt-96.43.01-1-i686 Message-ID: <20071103174059.92B8E1678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel-rt.git;a=commitdiff;h=7b542e28650f71d696ec9ac12b3c06d5eda697f3 commit 7b542e28650f71d696ec9ac12b3c06d5eda697f3 Author: crazy Date: Sat Nov 3 18:38:20 2007 +0100 nvidia-96xx-rt-96.43.01-1-i686 * and time to start weird hacks =) diff --git a/source/x11-extra/nvidia-96xx-rt/FrugalBuild b/source/x11-extra/nvidia-96xx-rt/FrugalBuild new file mode 100644 index 0000000..3b2c838 --- /dev/null +++ b/source/x11-extra/nvidia-96xx-rt/FrugalBuild @@ -0,0 +1,49 @@ +# Compiling Time: 0.01 SBU +# Maintainer: AlexExtreme + +pkgname=nvidia-96xx-rt +pkgver=96.43.01 +pkgrel=1 +pkgdesc="3d accelerated display driver for Nvidia cards" +url="http://www.nvidia.com/object/linux_display_archive.html" +conflicts=('libgl' 'libglx' 'nvidia') +provides=('libgl' 'libglx') +replaces=('nvidia-legacy') +removes=(usr/bin/nvidia-{bug-report.sh,settings,xconfig} + usr/lib/{libGLcore.so.1,libXvMCNVIDIA.a,libnvidia-cfg.so.1,libnvidia-tls.so.1} + usr/lib/xorg/modules/drivers/nvidia_drv.{,s}o usr/share/applications/nvidia-settings.desktop) +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump http://www.nvidia.com/object/unix.html | grep -m1 'Latest Legacy.*1.0-96xx series'|sed 's/.*]//;s/-/_/'" +if [ "$CARCH" == "i686" ]; then + _arch=x86 + pkgnum=1 + sha1sums=('b92e46eb09514a15023e60dadda616b8811ce28b') +else + _arch=x86_64 + pkgnum=2 + sha1sums=('d0dc8d61c32631eb397a8348630eadbae2744e96') +fi +source=(http://us.download.nvidia.com/XFree86/Linux-$_arch/$pkgver/NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum.run) +options=('nostrip' 'nodocs') +_F_kernelmod_scriptlet=$pkgname.install +_F_kernelmod_name="-rt" +_F_kernelmod_ver=2.6.23 +_F_kernelmod_rel=1 +Finclude kernel-module +depends=(${depends[@]} 'xorg-server>=1.1.0' 'pciutils' "nvidia-96xx=96.43.01") +# make it depends on nvidia-96xx and just build the kernel mod for -rt + +build() +{ + + cd $Fsrcdir + sh ./*.run --extract-only + + cd usr/src/nv || Fdie + ln -s Makefile.kbuild Makefile || Fdie + make SYSSRC=$_F_kernelmod_dir/build module || Fdie + cd ../../.. || Fdie + Ffilerel usr/src/nv/nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko + Fbuild_kernelmod_scriptlet +} diff --git a/source/x11-extra/nvidia-96xx-rt/nvidia-96xx-rt.install b/source/x11-extra/nvidia-96xx-rt/nvidia-96xx-rt.install new file mode 100644 index 0000000..e605ee5 --- /dev/null +++ b/source/x11-extra/nvidia-96xx-rt/nvidia-96xx-rt.install @@ -0,0 +1,60 @@ +post_install() { + echo "*** In order to use this package you have to accept Nvidia's license which" + echo "*** can be found at /usr/share/doc/nvidia/LICENSE." + echo "*** If you don't accept it, please remove the package!" + ## well here a 'WARNING' only on install | update because I don't know this + ## metamodes option will work for all + devnr=`lspci -nn|grep "GeForce4 \(.*\) Go \(.*\)M"|sed 's/.*:\(.*\)].*/\1/'` + + if [ "$devnr" ]; then + if [ "$devnr" -eq 0179 ]; then + echo "" + echo "*** WARNING: Nvidia - GeForce4 440/420 Go 32/64M - with PCI ID: - 0x$devnr - detected." + echo "*** WARNING: If you get an black screen try add this line to your xorg.conf in the DefaultDepth Section:" + echo "Option "\"metamodes\" "\"DFP: nvidia-auto-select +0+0; DFP: 800x600 +0+0; DFP: 640x480 +0+0\"" + echo "" + fi + fi + + sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf + sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 0 ]; then + echo nvidia >> /etc/sysconfig/modules + fi + /sbin/depmod -a $_F_kernelmod_uname + /sbin/modprobe nvidia +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + if test `lsmod | grep ^nvidia | wc -l` -gt 0; then + rmmod nvidia + fi + + sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf + sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf + + exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` + if [ "$exist" -eq 1 ]; then + grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp + mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules + fi + if [ -e /usr/lib/xorg/temp/libglx.so ]; then + mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ + fi +} + +post_remove() { + depmod -a $_F_kernelmod_uname + echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" + echo "*** pacman-g2 -S libgl libglx ****" +} + +op=$1 +shift +$op $* From crazy at frugalware.org Sat Nov 3 18:40:59 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 18:41:04 2007 Subject: [Frugalware-git] kernel-rt: nvidia-96xx-rt-96.43.01-1-i686 Message-ID: <20071103174059.BAA211A6804D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel-rt.git;a=commitdiff;h=1819eb719407a191aac4ab681d105bcda2904b16 commit 1819eb719407a191aac4ab681d105bcda2904b16 Author: crazy Date: Sat Nov 3 18:40:44 2007 +0100 nvidia-96xx-rt-96.43.01-1-i686 * remove x86_64 , I cannot test these on that arch diff --git a/source/x11-extra/nvidia-96xx-rt/FrugalBuild b/source/x11-extra/nvidia-96xx-rt/FrugalBuild index 3b2c838..858a63f 100644 --- a/source/x11-extra/nvidia-96xx-rt/FrugalBuild +++ b/source/x11-extra/nvidia-96xx-rt/FrugalBuild @@ -13,16 +13,12 @@ removes=(usr/bin/nvidia-{bug-report.sh,settings,xconfig} usr/lib/{libGLcore.so.1,libXvMCNVIDIA.a,libnvidia-cfg.so.1,libnvidia-tls.so.1} usr/lib/xorg/modules/drivers/nvidia_drv.{,s}o usr/share/applications/nvidia-settings.desktop) groups=('x11-extra') -archs=('i686' 'x86_64') +archs=('i686') up2date="lynx -dump http://www.nvidia.com/object/unix.html | grep -m1 'Latest Legacy.*1.0-96xx series'|sed 's/.*]//;s/-/_/'" if [ "$CARCH" == "i686" ]; then _arch=x86 pkgnum=1 sha1sums=('b92e46eb09514a15023e60dadda616b8811ce28b') -else - _arch=x86_64 - pkgnum=2 - sha1sums=('d0dc8d61c32631eb397a8348630eadbae2744e96') fi source=(http://us.download.nvidia.com/XFree86/Linux-$_arch/$pkgver/NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum.run) options=('nostrip' 'nodocs') From priyank at frugalware.org Sat Nov 3 19:34:26 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 3 19:34:29 2007 Subject: [Frugalware-git] fun: fun-ui Message-ID: <20071103183426.C7D011678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=a3f3f587fa877980e3e473f9ce5278c20eeb740c commit a3f3f587fa877980e3e473f9ce5278c20eeb740c Author: Priyank Date: Sun Nov 4 00:02:56 2007 +0530 fun-ui * read the value of update_interval from funrc and update the preferences combobox accordingly * fixed a logical bug diff --git a/src/fun-ui.c b/src/fun-ui.c index 68f0636..e4c3f46 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -44,6 +44,7 @@ static GtkStatusIcon *fun_icon = NULL; static GtkWidget *fun_about_dlg = NULL; static GdkPixbuf *fun_about_pixbuf = NULL; static GtkWidget *fun_config_dlg = NULL; +static GtkAdjustment *fun_config_upd_int_adj = NULL; static gboolean connected = FALSE; /* credits */ @@ -235,10 +236,11 @@ cb_fun_config_dlg_close_clicked (GtkWidget *button, gpointer data) interval = gtk_adjustment_get_value (adj); old_interval = fun_config_get_value_int ("update_interval"); /* if nothing is changed */ - if (old_interval == interval) - return; - fun_config_set_value_int ("update_interval", interval); - fun_config_save (); + if (old_interval != interval) + { + fun_config_set_value_int ("update_interval", interval); + fun_config_save (); + } gtk_widget_hide (fun_config_dlg); return; @@ -263,6 +265,7 @@ fun_config_dialog_show (void) { if (!GTK_WIDGET_VISIBLE(fun_config_dlg)) { + gtk_adjustment_set_value (fun_config_upd_int_adj, fun_config_get_value_int("update_interval")); gtk_widget_show (fun_config_dlg); gtk_window_present (GTK_WINDOW(fun_config_dlg)); } @@ -322,8 +325,8 @@ fun_config_dialog_init (void) gtk_label_set_use_markup (GTK_LABEL (label1), TRUE); gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5); - spinbutton1_adj = gtk_adjustment_new (1, 1, 60, 1, 10, 10); - spinbutton1 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton1_adj), 1, 0); + fun_config_upd_int_adj = gtk_adjustment_new (1, 1, 60, 1, 10, 10); + spinbutton1 = gtk_spin_button_new (GTK_ADJUSTMENT (fun_config_upd_int_adj), 1, 0); gtk_widget_show (spinbutton1); gtk_box_pack_start (GTK_BOX (hbox1), spinbutton1, FALSE, TRUE, 0); From crazy at frugalware.org Sat Nov 3 19:42:53 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 19:42:54 2007 Subject: [Frugalware-git] kernel-rt: nvidia-96xx-rt-96.43.01-1-i686 Message-ID: <20071103184253.0B4EE1678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel-rt.git;a=commitdiff;h=f20d1e0d144b25e29dba1416e83c314eba912ac3 commit f20d1e0d144b25e29dba1416e83c314eba912ac3 Author: crazy Date: Sat Nov 3 19:40:43 2007 +0100 nvidia-96xx-rt-96.43.01-1-i686 * I should get some more sleep ;) * we don't need any custom install files here * we just build the kernel mod and depend on 'nvidia-96xx' * which is doing this 'custom' stuff heh diff --git a/source/x11-extra/nvidia-96xx-rt/nvidia-96xx-rt.install b/source/x11-extra/nvidia-96xx-rt/nvidia-96xx-rt.install deleted file mode 100644 index e605ee5..0000000 --- a/source/x11-extra/nvidia-96xx-rt/nvidia-96xx-rt.install +++ /dev/null @@ -1,60 +0,0 @@ -post_install() { - echo "*** In order to use this package you have to accept Nvidia's license which" - echo "*** can be found at /usr/share/doc/nvidia/LICENSE." - echo "*** If you don't accept it, please remove the package!" - ## well here a 'WARNING' only on install | update because I don't know this - ## metamodes option will work for all - devnr=`lspci -nn|grep "GeForce4 \(.*\) Go \(.*\)M"|sed 's/.*:\(.*\)].*/\1/'` - - if [ "$devnr" ]; then - if [ "$devnr" -eq 0179 ]; then - echo "" - echo "*** WARNING: Nvidia - GeForce4 440/420 Go 32/64M - with PCI ID: - 0x$devnr - detected." - echo "*** WARNING: If you get an black screen try add this line to your xorg.conf in the DefaultDepth Section:" - echo "Option "\"metamodes\" "\"DFP: nvidia-auto-select +0+0; DFP: 800x600 +0+0; DFP: 640x480 +0+0\"" - echo "" - fi - fi - - sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf - sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 0 ]; then - echo nvidia >> /etc/sysconfig/modules - fi - /sbin/depmod -a $_F_kernelmod_uname - /sbin/modprobe nvidia -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - if test `lsmod | grep ^nvidia | wc -l` -gt 0; then - rmmod nvidia - fi - - sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf - sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf - - exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` - if [ "$exist" -eq 1 ]; then - grep -v '^nvidia' /etc/sysconfig/modules > /etc/sysconfig/modules.tmp - mv /etc/sysconfig/modules.tmp /etc/sysconfig/modules - fi - if [ -e /usr/lib/xorg/temp/libglx.so ]; then - mv /usr/lib/xorg/temp/libglx.so /usr/lib/xorg/modules/extensions/ - fi -} - -post_remove() { - depmod -a $_F_kernelmod_uname - echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" - echo "*** pacman-g2 -S libgl libglx ****" -} - -op=$1 -shift -$op $* From crazy at frugalware.org Sat Nov 3 19:42:53 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 19:42:54 2007 Subject: [Frugalware-git] kernel-rt: nvidia-96xx-rt-96.43.01-1-i686 Message-ID: <20071103184253.45DBB1678013@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel-rt.git;a=commitdiff;h=8ae9b859b4f16bbda52e3734fef0d408c04ec82d commit 8ae9b859b4f16bbda52e3734fef0d408c04ec82d Author: crazy Date: Sat Nov 3 19:42:07 2007 +0100 nvidia-96xx-rt-96.43.01-1-i686 * remove install file from here we don't need it diff --git a/source/x11-extra/nvidia-96xx-rt/FrugalBuild b/source/x11-extra/nvidia-96xx-rt/FrugalBuild index 858a63f..e595e03 100644 --- a/source/x11-extra/nvidia-96xx-rt/FrugalBuild +++ b/source/x11-extra/nvidia-96xx-rt/FrugalBuild @@ -22,7 +22,6 @@ if [ "$CARCH" == "i686" ]; then fi source=(http://us.download.nvidia.com/XFree86/Linux-$_arch/$pkgver/NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum.run) options=('nostrip' 'nodocs') -_F_kernelmod_scriptlet=$pkgname.install _F_kernelmod_name="-rt" _F_kernelmod_ver=2.6.23 _F_kernelmod_rel=1 From crazy at frugalware.org Sat Nov 3 20:44:59 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 20:45:01 2007 Subject: [Frugalware-git] kernelrt: nvidia-96xx-rt-96.43.01-1-i686 Message-ID: <20071103194459.C72AF1678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelrt.git;a=commitdiff;h=2595a53da4ada455b6c1031326ae2803118d35d9 commit 2595a53da4ada455b6c1031326ae2803118d35d9 Author: crazy Date: Sat Nov 3 20:44:07 2007 +0100 nvidia-96xx-rt-96.43.01-1-i686 * added missing Fdie * fix cd path for -rt diff --git a/source/x11-extra/nvidia-96xx-rt/FrugalBuild b/source/x11-extra/nvidia-96xx-rt/FrugalBuild index e595e03..1251417 100644 --- a/source/x11-extra/nvidia-96xx-rt/FrugalBuild +++ b/source/x11-extra/nvidia-96xx-rt/FrugalBuild @@ -33,9 +33,9 @@ build() { cd $Fsrcdir - sh ./*.run --extract-only + sh ./*.run --extract-only || Fdie - cd usr/src/nv || Fdie + cd NVIDIA-Linux-$_arch-$pkgver-pkg$pkgnum/usr/src/nv || Fdie ln -s Makefile.kbuild Makefile || Fdie make SYSSRC=$_F_kernelmod_dir/build module || Fdie cd ../../.. || Fdie From crazy at frugalware.org Sat Nov 3 21:08:52 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 21:08:54 2007 Subject: [Frugalware-git] frugalware-current: nvidia-100.14.19-1-i686 Message-ID: <20071103200852.E19821678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4172bd95060b146cccdb3be6a403b080172821e7 commit 4172bd95060b146cccdb3be6a403b080172821e7 Author: crazy Date: Sat Nov 3 21:04:54 2007 +0100 nvidia-100.14.19-1-i686 * fix buggy install file.. * don't assume 'xorg.conf' exists test that first * use absolute paths for rmmod etc * fix License location diff --git a/source/x11-extra/nvidia/nvidia.install b/source/x11-extra/nvidia/nvidia.install index 397f151..0578996 100644 --- a/source/x11-extra/nvidia/nvidia.install +++ b/source/x11-extra/nvidia/nvidia.install @@ -1,10 +1,14 @@ post_install() { echo "*** In order to use this package you have to accept Nvidia's license which" - echo "*** can be found at /usr/share/doc/nvidia/LICENSE." + echo "*** can be found at /usr/share/doc/nvidia-*/LICENSE." echo "*** If you don't accept it, please remove the package!" - sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf - sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf + sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + else + echo "WARNING: /etc/X11/xorg.conf does not exist!" + fi exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` if [ "$exist" -eq 0 ]; then @@ -20,11 +24,13 @@ post_upgrade() { pre_remove() { if test `lsmod | grep ^nvidia | wc -l` -gt 0; then - rmmod nvidia + /sbin/rmmod nvidia + fi + + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf + sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf fi - - sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf - sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` if [ "$exist" -eq 1 ]; then @@ -37,7 +43,7 @@ pre_remove() { } post_remove() { - depmod -a $_F_kernelmod_uname + /sbin/depmod -a $_F_kernelmod_uname echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" echo "*** pacman-g2 -S libgl libglx ****" } From crazy at frugalware.org Sat Nov 3 21:08:53 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 21:08:56 2007 Subject: [Frugalware-git] frugalware-current: nvidia-96xx-96.43.01-1-i686 Message-ID: <20071103200853.17FA91678013@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64f8a223697e466874aad5e71f45b64bd4a4eede commit 64f8a223697e466874aad5e71f45b64bd4a4eede Author: crazy Date: Sat Nov 3 21:08:41 2007 +0100 nvidia-96xx-96.43.01-1-i686 * fix the buggy file here as well diff --git a/source/x11-extra/nvidia-96xx/nvidia-96xx.install b/source/x11-extra/nvidia-96xx/nvidia-96xx.install index e605ee5..8796cd6 100644 --- a/source/x11-extra/nvidia-96xx/nvidia-96xx.install +++ b/source/x11-extra/nvidia-96xx/nvidia-96xx.install @@ -1,10 +1,10 @@ post_install() { echo "*** In order to use this package you have to accept Nvidia's license which" - echo "*** can be found at /usr/share/doc/nvidia/LICENSE." + echo "*** can be found at /usr/share/doc/nvidia-*/LICENSE." echo "*** If you don't accept it, please remove the package!" ## well here a 'WARNING' only on install | update because I don't know this ## metamodes option will work for all - devnr=`lspci -nn|grep "GeForce4 \(.*\) Go \(.*\)M"|sed 's/.*:\(.*\)].*/\1/'` + devnr=`/usr/sbin/lspci -nn|grep "GeForce4 \(.*\) Go \(.*\)M"|sed 's/.*:\(.*\)].*/\1/'` if [ "$devnr" ]; then if [ "$devnr" -eq 0179 ]; then @@ -16,8 +16,12 @@ post_install() { fi fi - sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf - sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*Load "dri"/# Load "dri"/' /etc/X11/xorg.conf + sed -i 's/Driver.*"\(nv\|vesa\|vga\)"/Driver "nvidia"/' /etc/X11/xorg.conf + else + echo "WARNING: /etc/X11/xorg.conf does not exist!" + fi exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` if [ "$exist" -eq 0 ]; then @@ -33,11 +37,13 @@ post_upgrade() { pre_remove() { if test `lsmod | grep ^nvidia | wc -l` -gt 0; then - rmmod nvidia + /sbin/rmmod nvidia fi - sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf - sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf + if [ -e /etc/X11/xorg.conf ]; then + sed -i 's/^.*# Load "dri"/Load "dri"/' /etc/X11/xorg.conf + sed -i 's/\(^Driver *\)"nvidia"/\1"nv"/' /etc/X11/xorg.conf + fi exist=`cat /etc/sysconfig/modules | grep nvidia | wc -l` if [ "$exist" -eq 1 ]; then @@ -50,7 +56,7 @@ pre_remove() { } post_remove() { - depmod -a $_F_kernelmod_uname + /sbin/depmod -a $_F_kernelmod_uname echo "*** Nvidia driver is removed now. To have a working Xorg Server again run : ***" echo "*** pacman-g2 -S libgl libglx ****" } From devil505linux at gmail.com Sat Nov 3 21:17:07 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 3 21:17:09 2007 Subject: [Frugalware-git] frugalware-current: toppler-1.1.3-1-i686 Message-ID: <20071103201707.A255C1678013@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=47a0d5d3e2080a600d777a174f0947f0b96b1c68 commit 47a0d5d3e2080a600d777a174f0947f0b96b1c68 Author: Devil505 Date: Sat Nov 3 21:14:36 2007 +0100 toppler-1.1.3-1-i686 *New package from katungo *Closes FS#2331 diff --git a/source/games-extra/toppler/FrugalBuild b/source/games-extra/toppler/FrugalBuild new file mode 100644 index 0000000..91b1656 --- /dev/null +++ b/source/games-extra/toppler/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.14 SBU +# Maintainer: Devil505 +# Contributor: Katungo <@frugalware.org> + +pkgname=toppler +pkgver=1.1.3 +pkgrel=1 +pkgdesc="Tower toppler, a Nebulus clone" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://toppler.sourceforge.net" +depends=('zlib' 'sdl_mixer') +groups=('games-extra') +archs=('i686') +sha1sums=('563839ceec44626574fcb10f677d2ab8f82dba29') + +# optimization OK \ No newline at end of file From crazy at frugalware.org Sat Nov 3 21:19:45 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 21:19:48 2007 Subject: [Frugalware-git] kernelrt: nvidia-96xx-rt-96.43.01-2-i686 Message-ID: <20071103201945.6E6CC1678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelrt.git;a=commitdiff;h=3fae23284233a4d7c66e9f4cde72db3030653de7 commit 3fae23284233a4d7c66e9f4cde72db3030653de7 Author: crazy Date: Sat Nov 3 21:18:52 2007 +0100 nvidia-96xx-rt-96.43.01-2-i686 * blah these nvidia packages are buggy as hell diff --git a/source/x11-extra/nvidia-96xx-rt/FrugalBuild b/source/x11-extra/nvidia-96xx-rt/FrugalBuild index 1251417..7f030df 100644 --- a/source/x11-extra/nvidia-96xx-rt/FrugalBuild +++ b/source/x11-extra/nvidia-96xx-rt/FrugalBuild @@ -3,11 +3,9 @@ pkgname=nvidia-96xx-rt pkgver=96.43.01 -pkgrel=1 +pkgrel=2 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" -conflicts=('libgl' 'libglx' 'nvidia') -provides=('libgl' 'libglx') replaces=('nvidia-legacy') removes=(usr/bin/nvidia-{bug-report.sh,settings,xconfig} usr/lib/{libGLcore.so.1,libXvMCNVIDIA.a,libnvidia-cfg.so.1,libnvidia-tls.so.1} From crazy at frugalware.org Sat Nov 3 21:28:13 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 21:28:15 2007 Subject: [Frugalware-git] frugalware-current: kernel*.install Message-ID: <20071103202813.425461678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5338a78268936a27110a98909c4546216fa5f9f commit d5338a78268936a27110a98909c4546216fa5f9f Author: crazy Date: Sat Nov 3 21:26:11 2007 +0100 kernel*.install * use absolute paths * -> installing kernel... /var/lib/pacman/local/kernel-2.6.23-1/install: line 11: depmod: command not found diff --git a/source/include/kernel-module.install b/source/include/kernel-module.install index 4583384..b389d4f 100644 --- a/source/include/kernel-module.install +++ b/source/include/kernel-module.install @@ -1,6 +1,6 @@ post_install() { - depmod -a $_F_kernelmod_uname + /sbin/depmod -a $_F_kernelmod_uname } post_upgrade() diff --git a/source/include/kernel.install b/source/include/kernel.install index f0884c7..ea49333 100644 --- a/source/include/kernel.install +++ b/source/include/kernel.install @@ -8,7 +8,7 @@ post_install() ln -sf config-$ver config ln -sf System.map-$ver System.map fi - depmod -a $ver + /sbin/depmod -a $ver } # arg 1: the new package version From crazy at frugalware.org Sat Nov 3 21:36:40 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 3 21:36:43 2007 Subject: [Frugalware-git] kernelrt: kernel-rt-2.6.23-1-i686 Message-ID: <20071103203640.812ED1678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelrt.git;a=commitdiff;h=9e7aa237938d7f0676c828b3eeaa5251ba93ffc0 commit 9e7aa237938d7f0676c828b3eeaa5251ba93ffc0 Author: crazy Date: Sat Nov 3 21:36:28 2007 +0100 kernel-rt-2.6.23-1-i686 * just shut up in chroot diff --git a/source/base-extra/kernel-rt/kernel-rt.install b/source/base-extra/kernel-rt/kernel-rt.install index 088fe56..1f7b847 100644 --- a/source/base-extra/kernel-rt/kernel-rt.install +++ b/source/base-extra/kernel-rt/kernel-rt.install @@ -2,7 +2,7 @@ grub_convert() { disk=`echo $1|sed 's/[0-9]*$//'` partnum=`echo $1|sed 's|/dev/[a-z]*||'` - grubdisk=`grep $disk /boot/grub/device.map |sed 's/(\(.*\))\t.*/\1/'` + grubdisk=`grep $disk /boot/grub/device.map 2>/dev/null | sed 's/(\(.*\))\t.*/\1/'` echo "($grubdisk,$(($partnum-1)))" } @@ -29,7 +29,8 @@ rmgr() ## mv the tmpMENU without our $patchset to menu.lst mv -f /tmp/.menu.lst $MENU else - echo "Cannot remove the kernel entry from your menu.lst :(. Please remove the entry manually." + echo "Cannot remove the kernel entry from your menu.lst :(" + echo "Please remove the entry manually." fi } From boobaa at frugalware.org Sat Nov 3 21:46:11 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 3 21:46:13 2007 Subject: [Frugalware-git] frugalware-current: bibletime-i18n-1.6.4-1-i686 Message-ID: <20071103204611.EA01E1678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=634c13b7c284fecd10749b29528c82b218e0f2ca commit 634c13b7c284fecd10749b29528c82b218e0f2ca Author: CSÉCSY László Date: Sat Nov 3 21:45:48 2007 +0100 bibletime-i18n-1.6.4-1-i686 version bump duh, upstream dropped the hu translation because they don't read emails diff --git a/source/locale-extra/bibletime-i18n/FrugalBuild b/source/locale-extra/bibletime-i18n/FrugalBuild index 137cae3..6049e68 100644 --- a/source/locale-extra/bibletime-i18n/FrugalBuild +++ b/source/locale-extra/bibletime-i18n/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Bence Nagy pkgname=bibletime-i18n -pkgver=1.6.3b +pkgver=1.6.4 pkgrel=1 pkgdesc="Bible study software for KDE (internalization)" url='http://www.bibletime.info' @@ -19,8 +19,13 @@ source=(`echo $source | sed 's/-i18n//'` \ build() { Fcd mv ../bibletime-i18n-1.6.3b-hu.po po/hu.po + cd po || Fdie + msgfmt --statistics -o hu.gmo hu.po || Fdie + Fsed zh_TW\.po 'zh_TW.po hu.po' Makefile.am + Fsed zh_TW\.po 'zh_TW.po hu.po' Makefile.in + cd .. || Fdie Fbuild } -sha1sums=('35d9561985733e540f7b66cb4b1f3e1bc7a5ecda' \ +sha1sums=('b77284758811daf48a814ca61e3ce9d0aecf52b3' \ '8010b806aa38d291e8aaf28953d7dd3bde6557b1') From crazy at frugalware.org Sun Nov 4 02:34:41 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 4 02:34:43 2007 Subject: [Frugalware-git] frugalware-current: gutenprint-5.0.1-2-i686 Message-ID: <20071104013441.744191678013@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d4cd8a67c04eed9edf8a1328471c423f642794c commit 0d4cd8a67c04eed9edf8a1328471c423f642794c Author: crazy Date: Sun Nov 4 02:32:13 2007 +0100 gutenprint-5.0.1-2-i686 * relbump * BRR .. janny *PLEASE* start to read stuff when you bump packages IT is *REALLY* ANNOYING! * it need be rebuild with gimp >=2.4 because now these packages conflicts. * -- error: failed to commit transaction (conflicting files) * -- gutenprint: /usr/lib/gimp/2.0/plug-ins/print exists in filesystem * Docs said --with-gimp2-as-gutenprint is automaciaclly added when >= 2.4 * is detected but I've still add it , who knows.. * Also added missing scriptlet option , changed makedepends to >= style so we depend * on right gimp version. * Added --enable-debug to workaround auto* bugs in that package , without it will compile with -O6! * Ohh well and finally voroskoi may want to slap me while touching his package , * but it was really only because these conflicts and while at it I've found the * other 2 small problems. diff --git a/source/apps-extra/gutenprint/FrugalBuild b/source/apps-extra/gutenprint/FrugalBuild index cf4b978..08afed2 100644 --- a/source/apps-extra/gutenprint/FrugalBuild +++ b/source/apps-extra/gutenprint/FrugalBuild @@ -4,10 +4,10 @@ pkgname=gutenprint pkgver=5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="IJS printer driver for Ghostscript and CUPS" depends=('cups>=1.1.15' 'readline') -makedepends=('gimp') +makedepends=('gimp>=2.4.1') rodepends=('foomatic-filters>=2.0') groups=('apps-extra') archs=('i686' 'x86_64') @@ -16,13 +16,15 @@ replaces=('gimp-print') provides=('gimp-print') _F_sourceforge_dirname=gimp-print _F_sourceforge_ext=.tar.bz2 +options=('scriptlet') Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=1537'|grep gutenprint-|sed 's/.*gutenprint-[^ ]* [^ ]*\]\([^ ]*\) .*/\1/;q'" sha1sums=('352e18cdd9a514a8388b7ed858ded8f5cab678b7') -Fconfopts="$Fconfopts --enable-escputil \ +Fconfopts="$Fconfopts --enable-debug \ + --enable-escputil \ --with-foomatic3 \ --with-readline \ - --with-gimp2 \ + --with-gimp2-as-gutenprint \ --enable-cups-level3-ppds \ --disable-translated-cups-ppds \ --disable-simplified-cups-ppds" From vmiklos at frugalware.org Sun Nov 4 03:05:21 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 4 03:05:25 2007 Subject: [Frugalware-git] frugalware-current: iproute2-070710-3-i686 Message-ID: <20071104020521.C58371678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fe85f3ada103f4ac4c47b52742b30e168ae04b76 commit fe85f3ada103f4ac4c47b52742b30e168ae04b76 Author: Miklos Vajna Date: Sun Nov 4 03:05:05 2007 +0100 iproute2-070710-3-i686 added init script and config file for ipv6 tunnels diff --git a/source/network/iproute2/FrugalBuild b/source/network/iproute2/FrugalBuild index 26cf9dd..6a3ce5f 100644 --- a/source/network/iproute2/FrugalBuild +++ b/source/network/iproute2/FrugalBuild @@ -5,17 +5,18 @@ pkgname=iproute2 pkgver=070710 _F_kernelmod_pkgver=2.6.22 -pkgrel=2 +pkgrel=3 pkgdesc="kernel routing and traffic control utilities" url="http://linux-net.osdl.org/index.php/Iproute2" groups=('network') +backup=('etc/sysconfig/ipv6tunnel') archs=('i686' 'x86_64') depends=('glibc' 'db>=4.6.18') makedepends=('bison') up2date="lynx -dump 'http://developer.osdl.org/dev/iproute2/download/?C=M;O=D'|grep '$pkgname-$_F_kernelmod_pkgver-\(.*\).tar.gz'|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(http://developer.osdl.org/dev/iproute2/download/$pkgname-$_F_kernelmod_pkgver-$pkgver.tar.gz \ - iproute-socket_h-fix.patch) -signatures=("$source.sign" '') + iproute-socket_h-fix.patch {rc.,}ipv6tunnel) +signatures=("$source.sign" '' '' '') _F_cd_path="." build() { @@ -23,6 +24,8 @@ build() { "DOCDIR=/usr/share/doc/iproute2-$pkgver" Makefile Fsed "CFLAGS =" "CFLAGS +=" Makefile Fbuild + Ffile /etc/sysconfig/ipv6tunnel + Frcd2 ipv6tunnel } # optimization OK diff --git a/source/network/iproute2/ipv6tunnel b/source/network/iproute2/ipv6tunnel new file mode 100644 index 0000000..26d0173 --- /dev/null +++ b/source/network/iproute2/ipv6tunnel @@ -0,0 +1,15 @@ +# +# /etc/sysconfig/ipv6tunnel +# +# confiugation file for ipv6 tunnels +# + +remote="" +local="" + +# tunnels to start/stop +# note: that the last address will be used by default for outgoing connections + +addresses=() + +# vim: ft=sh diff --git a/source/network/iproute2/rc.ipv6tunnel b/source/network/iproute2/rc.ipv6tunnel new file mode 100644 index 0000000..afd5fb1 --- /dev/null +++ b/source/network/iproute2/rc.ipv6tunnel @@ -0,0 +1,57 @@ +#!/bin/bash + +# (c) 2007 Miklos Vajna +# rc.ipv6tunnel for Frugalware +# distributed under GPL License + +# chkconfig: 2345 44 56 +# description: Manage IPv6 tunneles. + +source /lib/initscripts/functions +TEXTDOMAINDIR=/lib/initscripts/functions +TEXTDOMAIN=ipv6tunnel + +actions=(restart start status stop) +daemon=$"IPv6 Tunnels" + +pid="grep -q sixbongw /proc/net/dev" + +source /etc/sysconfig/ipv6tunnel + +rc_start() +{ + start_msg + if ! $pid; then + ip tunnel add sixbongw mode sit remote $remote local $local ttl 64 + ifconfig sixbongw up + for i in "${addresses[@]}" + do + ifconfig sixbongw add $i + done + route -A inet6 add ::/0 dev sixbongw + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if $pid; then + route -A inet6 del ::/0 dev sixbongw + for i in "${addresses[@]}" + do + ifconfig sixbongw del $i + done + ifconfig sixbongw down + ip tunnel del sixbongw + ok $? + else + ok 999 + fi +} + +rc_exec $1 + +# vim: ft=sh From crazy at frugalware.org Sun Nov 4 03:13:20 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 4 03:13:22 2007 Subject: [Frugalware-git] frugalware-current: libburn-0.4.0-1-i686 Message-ID: <20071104021320.249C21678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f2b535429a3afe94fcc552f82e081c6db4a3dd95 commit f2b535429a3afe94fcc552f82e081c6db4a3dd95 Author: crazy Date: Sun Nov 4 03:12:46 2007 +0100 libburn-0.4.0-1-i686 * Version bump diff --git a/source/lib-extra/libburn/FrugalBuild b/source/lib-extra/libburn/FrugalBuild index 21388bc..b4f39e7 100644 --- a/source/lib-extra/libburn/FrugalBuild +++ b/source/lib-extra/libburn/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=libburn -pkgver=0.3.8 +pkgver=0.4.0 pkgrel=1 pkgdesc="Disc reading/writing library." url="http://libburnia.pykix.org/" @@ -11,6 +11,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://libburnia.pykix.org|grep -m1 'libburn-\(.*\).tar.gz'|sed 's/.*-\(.*\).tar.gz.*/\1/'" source=(http://libburnia-download.pykix.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('462f4d044734ccb52405a44fe18c5ba90a373521') +sha1sums=('c0628e1d9487461360a7a609b60125a9fdf4be6c') # optimization OK From crazy at frugalware.org Sun Nov 4 04:12:54 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 4 04:12:56 2007 Subject: [Frugalware-git] frugalware-current: xine-plugin-1.0-1-i686 Message-ID: <20071104031254.59B0A1A6804D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52db9f04bb3b7641f1094bdd46841593342ef142 commit 52db9f04bb3b7641f1094bdd46841593342ef142 Author: crazy Date: Sun Nov 4 04:12:36 2007 +0100 xine-plugin-1.0-1-i686 * New package * closes #2549 diff --git a/source/xapps-extra/xine-plugin/FrugalBuild b/source/xapps-extra/xine-plugin/FrugalBuild new file mode 100644 index 0000000..f2f7661 --- /dev/null +++ b/source/xapps-extra/xine-plugin/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.10 SBU +# Maintainer: crazy +# Contributor: Michel Hermier + +pkgname=xine-plugin +pkgver=1.0 +pkgrel=1 +pkgdesc="Embedded stream playback plugin for mozilla" +url="http://www.xinehq.de/" +depends=('xine-lib') +rodepends=('firefox') +groups=('xapps-extra') +archs=('i686') +up2date="lynx -dump http://www.xinehq.de/index.php/releases | Flasttar" +source=(http://prdownloads.sourceforge.net/xine/$pkgname-$pkgver.tar.bz2) +Fconfopts="$Fconfopts --with-plugindir=/usr/lib/mozilla/plugins" +sha1sums=('69096b7f727334b14759a851eb09dfead753d417') + +# optimization OK From crazy at frugalware.org Sun Nov 4 05:51:58 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 4 05:52:00 2007 Subject: [Frugalware-git] frugalware-current: php-5.2.4-2-i686 Message-ID: <20071104045158.122181678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=109f5a57614d29d381ce09dae7f65f7e6df24910 commit 109f5a57614d29d381ce09dae7f65f7e6df24910 Author: crazy Date: Sun Nov 4 05:48:44 2007 +0100 php-5.2.4-2-i686 * relbump * added PDO support , atcually : * pdo_dblib pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite * closes #2463 * also added mhash support diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index 81834bb..615e137 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -4,14 +4,15 @@ pkgname=php pkgver=5.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net" backup=(etc/{php.ini,httpd/conf/modules.d/$pkgname.conf}) depends=('openssl' 'libjpeg' 'freetype2>=2.3.1' 'libpng' 'gdbm' 'libxslt' 'curl>=7.16.1' 'libxml2' 'libmcrypt' \ - 'libidn' 'libmysqlclient' 'libpq>=8.2.3' 'sqlite3') + 'libidn' 'libmysqlclient' 'libpq>=8.2.3' 'sqlite3' 're2c') provides=('php-pear-archive_tar' 'php-pear-console_getopt' 'php-pear-pear') -makedepends=('apache' 'imap>=2006e-2' 'bzip2' 'mta' 'tidy' 'freetds' 'mysql' 'postgresql>=8.2.3' 'openldap' 'libldap') +makedepends=('apache' 'imap>=2006e-2' 'bzip2' 'mta' 'tidy' 'freetds' 'mysql' \ + 'postgresql>=8.2.3' 'openldap' 'libldap' 'unixodbc' 'mhash') groups=('devel') archs=('i686' 'x86_64') up2date="lynx -dump http://www.php.net/downloads.php |grep 'Complete Source Code' -3|sed -n 's/.*P \(.*\)/\1/;2 p'" @@ -47,6 +48,11 @@ build() --enable-pcntl \ --enable-sysvmsg \ --enable-mbstring \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared,/usr \ + --with-pdo-mysql=shared,/usr \ + --with-pdo-dblib=shared \ + --with-pdo-sqlite=shared,/usr \ --without-db2 \ --without-db3 \ --with-ttf \ @@ -76,7 +82,8 @@ build() --with-ldap=shared \ --with-mssql=shared \ --with-mime-magic \ - --with-sqlite=shared" + --with-sqlite=shared \ + --with-mhash=shared,/usr" ## this is true for both # OK make install does not really like SMP and random dies so .. From vmiklos at frugalware.org Mon Nov 5 13:29:02 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:14 2007 Subject: [Frugalware-git] frugalwareutils: typo fix in print_mouse_options() Message-ID: <20071105122902.8B9D21A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=8b66a91a6c085b2231a6f555849e08d4d1387093 commit 8b66a91a6c085b2231a6f555849e08d4d1387093 Author: Miklos Vajna Date: Mon Nov 5 11:15:36 2007 +0100 typo fix in print_mouse_options() diff --git a/libfwxconfig/libfwxconfig.c b/libfwxconfig/libfwxconfig.c index 93fe550..d030833 100644 --- a/libfwxconfig/libfwxconfig.c +++ b/libfwxconfig/libfwxconfig.c @@ -43,7 +43,7 @@ static void print_mouse_options(FILE *fp) { fprintf(fp, "Option \"ZAxisMapping\" \"4 5\"\n" - "Option \"Buttons\" \"3\"\n" + "Option \"Buttons\" \"3\"\n"); } static void print_kbd_options(FILE *fp) From vmiklos at frugalware.org Mon Nov 5 13:29:02 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:16 2007 Subject: [Frugalware-git] frugalwareutils: renamed the doc dir to apidoc, doc will be something we want to localize Message-ID: <20071105122902.A8E161A68053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=35fd2800d47dfa016208fe5cffc391fb8c8562bd commit 35fd2800d47dfa016208fe5cffc391fb8c8562bd Author: Miklos Vajna Date: Mon Nov 5 11:35:26 2007 +0100 renamed the doc dir to apidoc, doc will be something we want to localize diff --git a/Makefile b/Makefile index b52729a..d32ba5a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Makefile for frugalwareutils # -# Copyright (C) 2006 Miklos Vajna +# Copyright (C) 2006, 2007 Miklos Vajna # # 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 @@ -19,7 +19,7 @@ -include config.mak -include Makefile.inc -SUBDIRS = doc libfwutil libfwdialog setup \ +SUBDIRS = apidoc libfwutil libfwdialog setup \ libfwnetconfig netconfig \ libfwtimeconfig timeconfig \ libfwraidconfig raidconfig \ diff --git a/apidoc/Makefile b/apidoc/Makefile new file mode 100644 index 0000000..9f5482e --- /dev/null +++ b/apidoc/Makefile @@ -0,0 +1,38 @@ +# Makefile for frugalwareutils +# +# Copyright (C) 2006 Miklos Vajna +# +# 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; version 2 of the License. +# +# 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 +# + +-include ../Makefile.inc +-include ../config.mak + +compile: +ifneq ($(doxygen),) + cd .. && doxygen Doxyfile + rm -rf man3/_* +endif + +install: +ifneq ($(doxygen),) + for i in man3/* frugalwareutils.3; do \ + $(INSTALL) -m644 $$i $(DESTDIR)$(mandir)/man3/; \ + done +endif + +clean: + rm -rf man3 + +prepare: diff --git a/apidoc/frugalwareutils.3 b/apidoc/frugalwareutils.3 new file mode 100644 index 0000000..c67947f --- /dev/null +++ b/apidoc/frugalwareutils.3 @@ -0,0 +1,25 @@ +.TH frugalwareutils 3 "17 Jun 2006" "Frugalware 0.5" "" +.SH NAME +frugalwareutils \- Developer documentation for the Frugalware configuration +libraries +.SH SYNOPSIS +For ease of access, the frugalwareutils manual has been split up into several +sections. + +.nf +libfwutil Functions to make writing Frugalware configuration tools + easier. +libfwdialog Functions to make libdialog usage easier. +libfwnetconfig Functions to make network configuration easier. +libfwtimeconfig Functions to make time configuration easier. +libfwraidconfig Functions to make RAID configuration easier. +libfwmouseconfig Functions to make mouse configuration easier. +libfwxconfig Functions to make X configuration easier. +libfwxwmonfig Functions to make XDM configuration easier. +libfwgrubonfig Functions to make GRUB configuration easier. +.fi + +.SH AUTHORS +Written by Miklos Vajna. +.SH "REPORTING BUGS" +If you find any bug, then please file a bugreport at . diff --git a/doc/Makefile b/doc/Makefile deleted file mode 100644 index 9f5482e..0000000 --- a/doc/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Makefile for frugalwareutils -# -# Copyright (C) 2006 Miklos Vajna -# -# 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; version 2 of the License. -# -# 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 -# - --include ../Makefile.inc --include ../config.mak - -compile: -ifneq ($(doxygen),) - cd .. && doxygen Doxyfile - rm -rf man3/_* -endif - -install: -ifneq ($(doxygen),) - for i in man3/* frugalwareutils.3; do \ - $(INSTALL) -m644 $$i $(DESTDIR)$(mandir)/man3/; \ - done -endif - -clean: - rm -rf man3 - -prepare: diff --git a/doc/frugalwareutils.3 b/doc/frugalwareutils.3 deleted file mode 100644 index c67947f..0000000 --- a/doc/frugalwareutils.3 +++ /dev/null @@ -1,25 +0,0 @@ -.TH frugalwareutils 3 "17 Jun 2006" "Frugalware 0.5" "" -.SH NAME -frugalwareutils \- Developer documentation for the Frugalware configuration -libraries -.SH SYNOPSIS -For ease of access, the frugalwareutils manual has been split up into several -sections. - -.nf -libfwutil Functions to make writing Frugalware configuration tools - easier. -libfwdialog Functions to make libdialog usage easier. -libfwnetconfig Functions to make network configuration easier. -libfwtimeconfig Functions to make time configuration easier. -libfwraidconfig Functions to make RAID configuration easier. -libfwmouseconfig Functions to make mouse configuration easier. -libfwxconfig Functions to make X configuration easier. -libfwxwmonfig Functions to make XDM configuration easier. -libfwgrubonfig Functions to make GRUB configuration easier. -.fi - -.SH AUTHORS -Written by Miklos Vajna. -.SH "REPORTING BUGS" -If you find any bug, then please file a bugreport at . From vmiklos at frugalware.org Mon Nov 5 13:29:02 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:17 2007 Subject: [Frugalware-git] frugalwareutils: configure: typo fixes in --help output Message-ID: <20071105122902.B73781A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=326a7f9dd6c16e1fdf5f9523c6dbd3f88ecff8c6 commit 326a7f9dd6c16e1fdf5f9523c6dbd3f88ecff8c6 Author: Miklos Vajna Date: Mon Nov 5 12:21:08 2007 +0100 configure: typo fixes in --help output diff --git a/configure.ac b/configure.ac index 9df59e8..9b40e90 100644 --- a/configure.ac +++ b/configure.ac @@ -45,12 +45,12 @@ else AC_MSG_ERROR("pacman library not found!"); fi -AC_ARG_ENABLE([doxygen], AS_HELP_STRING([--disable-doxygen], [Enable doxygen support (default: test)])) +AC_ARG_ENABLE([doxygen], AS_HELP_STRING([--disable-doxygen], [Disable doxygen support (default: test)])) if test "$enable_doxygen" != "no"; then AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, []) fi -AC_ARG_ENABLE([po4a], AS_HELP_STRING([--disable-po4a], [Enable po4a support (default: test)])) +AC_ARG_ENABLE([po4a], AS_HELP_STRING([--disable-po4a], [Disable po4a support (default: test)])) if test "$enable_po4a" != "no"; then AC_CHECK_PROG(PO4A, po4a, po4a, []) fi From vmiklos at frugalware.org Mon Nov 5 13:29:02 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:18 2007 Subject: [Frugalware-git] frugalwareutils: configure: add check for asciidoc Message-ID: <20071105122902.D05071A68053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=43bbc389fc7c815fbdb352d58051054cb709d84e commit 43bbc389fc7c815fbdb352d58051054cb709d84e Author: Miklos Vajna Date: Mon Nov 5 12:22:40 2007 +0100 configure: add check for asciidoc diff --git a/configure.ac b/configure.ac index 9b40e90..e800647 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,11 @@ if test "$enable_doxygen" != "no"; then AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, []) fi +AC_ARG_ENABLE([asciidoc], AS_HELP_STRING([--disable-asciidoc], [Disable asciidoc support (default: test)])) +if test "$enable_asciidoc" != "no"; then + AC_CHECK_PROG(DOXYGEN, asciidoc, asciidoc, []) +fi + AC_ARG_ENABLE([po4a], AS_HELP_STRING([--disable-po4a], [Disable po4a support (default: test)])) if test "$enable_po4a" != "no"; then AC_CHECK_PROG(PO4A, po4a, po4a, []) From vmiklos at frugalware.org Mon Nov 5 13:29:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:19 2007 Subject: [Frugalware-git] frugalwareutils: converted netconfig manpage to asciidoc Message-ID: <20071105122903.11A601A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=b7c5be119959a9768f2e82d49cef82bd11c23215 commit b7c5be119959a9768f2e82d49cef82bd11c23215 Author: Miklos Vajna Date: Mon Nov 5 13:06:28 2007 +0100 converted netconfig manpage to asciidoc TODO: re-add po4a support diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000..2f8f9fc --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,51 @@ +# Makefile for frugalwareutils +# +# Copyright (C) 2007 Miklos Vajna +# +# 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; version 2 of the License. +# +# 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 +# + +-include ../Makefile.inc +-include ../config.mak + +XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2 +DOCS = $(wildcard *.txt) +MANS = $(subst .txt,.1,$(DOCS)) + +ifneq ($(doxygen),) +compile: $(MANS) +else +compile: +endif + +install: +ifneq ($(asciidoc),) + $(INSTALL) -m644 $(MANS) $(DESTDIR)$(man1dir) +endif + +clean: + rm -f *.1 + +prepare: + +%.html: %.txt + asciidoc $^ + +%.xml: %.txt + asciidoc -d manpage -b docbook $^ + sed -i '/` kernel +parameter. In that case the given profile will be loaded instead of `default` +on system startup. + +This profile is divided into sections or interfaces. Each section defines an +interface that netconfig should initialize. The exception to this is the +options section, which defines global options. + +== CONFIG: OPTIONS + +dns = :: + Explicitly defines dns addresses (ie. when using a static ip). Multiple + usage is ok. + +domain = :: + Defines the local domain name. If defined more than once, the first + will be used. + +desc = :: + A brief description of this network profile. Used by the graphical frontend. + +adsl_username = :: + If you have an adsl (pppoe) connection, your adsl username. + +adsl_password = :: + If you have an adsl connection, your adsl password. + +adsl_interface = :: + If you have an adsl connection, the Ethernet interface connected to the + DSL modem. + +== CONFIG: INTERFACES + +Each section defines an interface. The interface name is defined by the string +within square brackets (ie. the two below are `eth0` and `eth1`). The available +directives: + +options = [netmask [broadcast ]:: + Defines the ip address, netmask and broadcast address of the interface. + Multiple usage is ok for eth0:1, eth0:2, etc. See the other format of + this directive for dhcp. + +options = dhcp:: + Use dhcp for this interface. When this format is used, the other "options" lines are ignored. + +pre_up = :: + +post_up = :: + +pre_down = :: + +post_down = :: + The syntax of these directives are the same: you can define there + commands to be executed before the interface is up, after the interface + is up, before it is down, and after, respectively. Multiple usage is + OK, the commands are executed in the specified order. + +mac = :: + Overwrites the mac address of the card. If defined more than once, the + first will be used. + +essid = :: + Set the ESSID (or Network Name - in some products it may also be called + Domain ID) for wireless network adapters. If defined more than once, + the first will be used. + +mode = :: + Set the operating mode of the device, for wireless network adapters. The mode + can be Ad- Hoc (network composed of only one cell and without Access Point), + Managed (node connects to a net- work composed of many Access Points, with + roaming), Master (the node is the synchronisation master or acts as an Access + Point), Repeater (the node forwards packets between other wireless nodes), + Secondary (the node acts as a backup master/repeater), Monitor (the node is not + associated with any cell and passively monitor all packets on the frequency) or + Auto. If defined more than once, the first will be used. + +gateway = [default gw] :: + Route packets via a gateway. + +NOTE: The specified gateway must be reachable first. If the `default gw` prefix +is used, then adds a default route. If defined more than once, the first will +be used. If using DHCP, then this directive is ignored. + +key = :: + Used to manipulate encryption or scrambling keys and security mode for + wireless networks. + +dhcp_opts = :: + These options are passed to the dhcp client daemon. The default is `-t + 10`. You may want to specify here the dhcp hostname, then you'll need `-t 10 -h + `. + +dhcpclient = :: + This specifies the dhcp client to use. It can be either dhcpcd + (default) or dhclient. + +== EXAMPLES + +=== Static Address + +---- +[options] +dns = 192.168.1.1 + +[eth0] +options = 192.168.1.102 netmask 255.255.255.0 +gateway = default gw 192.168.1.1 +---- + +=== ADSL with NAT + +---- +[options] +adsl_username = user@provider.com +adsl_password = secret +adsl_interface = eth1 +[eth1] +options = 192.168.1.102 netmask 255.255.255.0 +post_up = iptables -t nat -A POSTROUTING -j MASQUERADE +---- + +=== The `key=` directive + +---- +key = 0123-4567-89 +key = [3] 0123-4567-89 +key = s:password [2] +key = [2] +key = open +key = off +key = restricted [3] 0123456789 +key = 01-23 key 45-67 [4] key [4] +---- + +=== Initialize before `iwconfig` + +If you have to to initialize the card with `ifconfig up` before +using iwconfig: + +---- +[eth1] +pre_up = ifconfig eth1 up +post_down = ifconfig eth1 down +---- + +NOTE: If you use several pre_up and/or post_down lines, this pre_up should be +the first, and this post_down should be the last one. + +=== Using wpa_supplicant + +If you want to use wpa_supplicant instead of the simple encryption (using +key = secret), then use the following pre_up and post_down lines: + +---- +pre_up = wpa_supplicant -Dwext -iwlan0 -c /etc/wpa_supplicant.conf -w -B +post_down = killall wpa_supplicant +---- + +You also need to edit `/etc/wpa_supplicant.conf`. A possible correct setup is: + +---- +ctrl_interface=/var/run/wpa_supplicant + +network={ + ssid="youressid" + psk="secret" +} +---- + +== AUTHOR + +Written by Miklos Vajna. + +== REPORTING BUGS + +If you find any bug, then please file a bugreport at . + +== SEE ALSO + +*ifconfig*(8), *route*(8), *iwconfig*(8), *dhcpcd*(8) diff --git a/netconfig/Makefile b/netconfig/Makefile index b7e5fa4..1cd1ac4 100644 --- a/netconfig/Makefile +++ b/netconfig/Makefile @@ -37,7 +37,7 @@ LDFLAGS += -L../libfwnetconfig -lfwnetconfig # setup CFLAGS += -I../setup -SUBDIRS = doc po +SUBDIRS = po CONFNAME = netconfig -include ../Makefile.inc diff --git a/netconfig/doc/Makefile b/netconfig/doc/Makefile deleted file mode 100644 index f451ab1..0000000 --- a/netconfig/doc/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Makefile for frugalwareutils -# -# Copyright (C) 2006 Miklos Vajna -# -# 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; version 2 of the License. -# -# 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 -# - --include ../../config.mak --include ../../Makefile.inc - -SUBDIRS = po - -LANGS = fr hu - -compile: -ifneq ($(po4a),) - po4a -k 0 po4a.cfg -endif - -install: - $(INSTALL) -m644 netconfig.5 $(DESTDIR)$(mandir)/man5/netconfig.5 -ifneq ($(po4a),) - for lang in $(LANGS); do \ - mkdir -p $(DESTDIR)$(mandir)/$$lang/man5/; \ - $(INSTALL) -m644 $$lang/netconfig.5 $(DESTDIR)$(mandir)/$$lang/man5/netconfig.5; \ - done -endif - -clean: - rm -rf $(LANGS) - +$(DO_RECURSIVE) - -prepare: diff --git a/netconfig/doc/addendum.5.fr b/netconfig/doc/addendum.5.fr deleted file mode 100644 index 3390bbc..0000000 --- a/netconfig/doc/addendum.5.fr +++ /dev/null @@ -1,3 +0,0 @@ -PO4A-HEADER:mode=after;position=AUTEURS;beginboundary=.SH -.SH TRADUCTION -Enda . diff --git a/netconfig/doc/addendum.5.hu b/netconfig/doc/addendum.5.hu deleted file mode 100644 index bff7a06..0000000 --- a/netconfig/doc/addendum.5.hu +++ /dev/null @@ -1,3 +0,0 @@ -PO4A-HEADER:mode=after;position=SZERZŐK;beginboundary=.SH -.SH FORDÍTÁS -Vajna Milkós . diff --git a/netconfig/doc/netconfig.5 b/netconfig/doc/netconfig.5 deleted file mode 100644 index fcfcd94..0000000 --- a/netconfig/doc/netconfig.5 +++ /dev/null @@ -1,168 +0,0 @@ -.TH netconfig 5 "August 5, 2006" "Frugalware 0.6" "" -.SH NAME -/etc/sysconfig/network/ \- configuration of network interfaces -.SH CONFIGURATION -Every file in /etc/sysconfig/network represents a network profile. When -netconfig invoked with the start paramter, then the profile named 'default' -(/etc/sysconfig/network/default) will be read. - -This behaviour can be overwritten by the "network=" kernel -parameter. In that case the given profile will be loaded instead of 'default'. - -This profile is divided into sections or \fIinterfaces\fP. Each section -defines an interface that netconfig should initialize. The exception to this is -the \fIoptions\fP section, which defines global options. -.TP -.SH Example for static IP: -.RS -.nf -[options] -dns = 192.168.1.1 - -[eth0] -options = 192.168.1.102 netmask 255.255.255.0 -gateway = default gw 192.168.1.1 -.fi -.TP -.SH Example for static ADSL with NAT: -.RS -.nf -[options] -adsl_username = user@provider.com -adsl_password = secret -adsl_interface = eth1 -[eth1] -options = 192.168.1.102 netmask 255.255.255.0 -post_up = iptables -t nat -A POSTROUTING -j MASQUERADE -.fi -.RE -.SH CONFIG: OPTIONS -.TP -.B "dns = " -Explicitly defines dns addresses (ie. when using a static ip). Multiple usage is ok. -.TP -.B "domain = " -Defines the local domain name. If defined more than once, the first will be used. -.TP -.B "desc = " -A brief description of this network profile. Used by netconfig. -.TP -.B "adsl_username = " -If you have an adsl (pppoe) connection, your adsl username. -.TP -.B "adsl_password = " -If you have an adsl connection, your adsl password. -.TP -.B "adsl_interface = " -If you have an adsl connection, the Ethernet interface connected to the DSL modem. -.SH CONFIG: INTERFACES -Each section defines an interface. -The interface name is defined by the string within square brackets (eg, the two -above are 'eth0' and 'eth1'). The available directives: -.TP -.B "options = [netmask [broadcast ]" -Defines the ip address, netmask and broadcast address of the interface. -Multiple usage is ok for eth0:1, eth0:2, etc. See the other format of this -directive for dhcp. -.TP -.B "options = dhcp" -Use dhcp for this interface. When this format is used, the other "options" lines are ignored. -.TP -.B "pre_up = " -.TP -.B "post_up = " -.TP -.B "pre_down = " -.TP -.B "post_down = " -The syntax of these directives are the same: you can define there commands to be executed -before the interface is up, after the interface is up, before it is down, and after, -respectively. Multiple usage is ok, the commands are executed in the specified order. -.TP -.B "mac = " -Overwrites the mac address of the card. If defined more than once, the first will be used. -.TP -.B "essid = " -Set the ESSID (or Network Name - in some products it may also be called Domain ID) for -wireless network adapters. If defined more than once, the first will be used. -.TP -.B "mode = " -Set the operating mode of the device, for wireless network adapters. The mode -can be Ad- Hoc (network composed of only one cell and without Access -Point), Managed (node connects to a network composed of many Access Points, -with roaming), Master (the node is the synchronisation master or acts as -an Access Point), Repeater (the node forwards packets between other wireless -nodes), Secondary (the node acts as a backup master/repeater), Monitor (the -node is not associ- ated with any cell and passively monitor all packets on -the frequency) or Auto. If defined more than once, the first will be used. -.TP -.B "gateway = [default gw] " -Route packets via a gateway. NOTE: The specified gateway must be reachable first. If the -"default gw" prefix is used, then adds a default route. If defined more than once, -the first will be used. If using dhcp, then this directive is ignored. -.TP -.B "key = " -Used to manipulate encryption or scrambling keys and security mode for wireless networks. -Examples: -.RS -.nf -key = 0123-4567-89 -key = [3] 0123-4567-89 -key = s:password [2] -key = [2] -key = open -key = off -key = restricted [3] 0123456789 -key = 01-23 key 45-67 [4] key [4] -.fi -.RE -.TP -.B "dhcp_opts = " -These options are passed to the dhcp client daemon. The default is "-t 10". You may want to -specify here the dhcp hostname, then you'll need "-t 10 -h ". -.TP -.B "dhcpclient = " -This specifies the dhcp client to use. It can be either dhcpcd (default) or dhclient. -.SH "SPECIAL WIRELESS CARDS" -Some users reported that they had to initialize the card with ifconfig - up before using iwconfig. - -Example: -.nf -[eth1] -pre_up = ifconfig eth1 up -post_down = ifconfig eth1 down -.fi - -NOTE: if you use several pre_up and/or post_down lines, this pre_up should be -the first, and this post_down should be the last one. - -.SH "USING WPA_SUPPLICANT" - -If you want to use wpa_supplicant instead of the simple encryption (using key = -secret), then use the following pre_up and post_down lines: - -.nf -pre_up = wpa_supplicant -Dwext -iwlan0 -c /etc/wpa_supplicant.conf -w -B -post_down = killall wpa_supplicant -.fi - -You also need to edit /etc/wpa_supplicant.conf: comment every network block and -add one like this: - -.nf -network={ - ssid="youressid" - psk="secret" -} -.fi - -.SH AUTHORS -Written by Miklos Vajna. -.SH "REPORTING BUGS" -If you find any bug, then please file a bugreport at . -.SH "SEE ALSO" -.BR ifconfig (8), -.BR route (8), -.BR iwconfig (8), -.BR dhcpcd (8) diff --git a/netconfig/doc/po/Makefile b/netconfig/doc/po/Makefile deleted file mode 100644 index e3d8b19..0000000 --- a/netconfig/doc/po/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# Makefile for frugalwareutils -# -# Copyright (C) 2006 Miklos Vajna -# -# 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; version 2 of the License. -# -# 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 -# - --include ../../../config.mak --include ../../../Makefile.inc - -LANGS=hu - -compile: - -install: - -update-po: netconfig.5.pot - for lang in $(LANGS); do \ - if msgmerge $$lang.po netconfig.5.pot -o $$lang.new.po; then \ - mv -f $$lang.new.po $$lang.po; \ - else \ - echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.new.po; \ - fi; \ - done - -clean: - rm -f netconfig.5.pot diff --git a/netconfig/doc/po/fr.po b/netconfig/doc/po/fr.po deleted file mode 100644 index 3e22e86..0000000 --- a/netconfig/doc/po/fr.po +++ /dev/null @@ -1,504 +0,0 @@ -# French translations for PACKAGE package -# Traduction anglaise du package PACKAGE -# Copyright (C) 2006 Free Software Foundation, Inc. -# , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-05-05 13:22+0200\n" -"PO-Revision-Date: 2006-09-10 04:05+0100\n" -"Last-Translator: Enda \n" -"Language-Team: French \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -# type: TH -#: netconfig.5:1 -#, no-wrap -msgid "netconfig" -msgstr "" - -# type: TH -#: netconfig.5:1 -#, no-wrap -msgid "August 5, 2006" -msgstr "" - -# type: TH -#: netconfig.5:1 -#, no-wrap -msgid "Frugalware 0.6" -msgstr "" - -# type: SH -#: netconfig.5:2 -#, no-wrap -msgid "NAME" -msgstr "NOM" - -# type: Plain text -#: netconfig.5:4 -msgid "/etc/sysconfig/network/ - configuration of network interfaces" -msgstr "/etc/sysconfig/network/ - configuration des interfaces réseau" - -# type: SH -#: netconfig.5:4 -#, no-wrap -msgid "CONFIGURATION" -msgstr "" - -# type: Plain text -#: netconfig.5:8 -#, fuzzy -msgid "" -"Every file in /etc/sysconfig/network represents a network profile. When " -"netconfig invoked with the start paramter, then the profile named " -"'default' (/etc/sysconfig/network/default) will be read." -msgstr "" -"Chaque fichier dans /etc/sysconfig/network représente un profil réseau. " -"Quand netconfig est lancé avec le paramčtre start, alors le profil nommé " -"'default' (/etc/sysconfig/network/default) sera lu. Ce profil est divisé en " -"sections ou I. Chaque section défini une interface que " -"netconfig doit initialiser. L'exception ŕ cela est la section I, " -"qui défini les options globales." - -# type: Plain text -#: netconfig.5:11 -msgid "" -"This behaviour can be overwritten by the \"network=EprofilenameE\" " -"kernel parameter. In that case the given profile will be loaded instead of " -"'default'." -msgstr "" - -# type: Plain text -#: netconfig.5:15 -#, fuzzy -msgid "" -"This profile is divided into sections or I. Each section " -"defines an interface that netconfig should initialize. The exception to this " -"is the I section, which defines global options." -msgstr "" -"Chaque fichier dans /etc/sysconfig/network représente un profil réseau. " -"Quand netconfig est lancé avec le paramčtre start, alors le profil nommé " -"'default' (/etc/sysconfig/network/default) sera lu. Ce profil est divisé en " -"sections ou I. Chaque section défini une interface que " -"netconfig doit initialiser. L'exception ŕ cela est la section I, " -"qui défini les options globales." - -# type: SH -#: netconfig.5:16 netconfig.5:119 -#, no-wrap -msgid "Example:" -msgstr "Exemple:" - -# type: Plain text -#: netconfig.5:21 -#, no-wrap -msgid "" -"[options]\n" -"dns = 157.181.177.34\n" -msgstr "" - -# type: Plain text -#: netconfig.5:25 -#, no-wrap -msgid "" -"[eth0]\n" -"options = 192.168.1.102 netmask 255.255.255.0\n" -"gateway = default gw 192.168.1.1\n" -msgstr "" - -# type: SH -#: netconfig.5:27 -#, no-wrap -msgid "CONFIG: OPTIONS" -msgstr "" - -# type: TP -#: netconfig.5:28 -#, no-wrap -msgid "BipE>" -msgstr "" - -# type: Plain text -#: netconfig.5:31 -#, fuzzy -msgid "" -"Explicitly defines dns addresses (ie. when using a static ip). Multiple " -"usage is ok." -msgstr "" -"Défini explicitement les adresses dns (ie. lors de l'utilisation d'une " -"adresse ip statique). On peut utiliser plusieurs fois ce paramčtre." - -# type: TP -#: netconfig.5:31 -#, no-wrap -msgid "BdomainE>" -msgstr "" - -# type: Plain text -#: netconfig.5:34 -msgid "" -"Defines the local domain name. If defined more than once, the first will be " -"used." -msgstr "" -"Défini le nom de domaine local. Si défini plus d'une fois, la premičre " -"instruction sera utilisée." - -# type: TP -#: netconfig.5:34 -#, no-wrap -msgid "BdescriptionE>" -msgstr "" - -# type: Plain text -#: netconfig.5:37 -msgid "A brief description of this network profile. Used by netconfig." -msgstr "Une brčve description de ce profil réseau. Utilisé par netconfig." - -# type: TP -#: netconfig.5:37 -#, no-wrap -msgid "BusernameE>" -msgstr "" - -# type: Plain text -#: netconfig.5:40 -msgid "If you have an adsl (pppoe) connection, your adsl username." -msgstr "" - -# type: TP -#: netconfig.5:40 -#, no-wrap -msgid "BpasswordE>" -msgstr "" - -# type: Plain text -#: netconfig.5:43 -msgid "If you have an adsl connection, your adsl password." -msgstr "si vous avez une connexion adsl, votre mot de passe adsl." - -# type: TP -#: netconfig.5:43 -#, no-wrap -msgid "BinterfaceE>" -msgstr "" - -# type: Plain text -#: netconfig.5:46 -msgid "" -"If you have an adsl connection, the Ethernet interface connected to the DSL " -"modem." -msgstr "" -"Si vous avez une connexion adsl, l'interface réseau connectée au modem DSL." - -# type: SH -#: netconfig.5:46 -#, no-wrap -msgid "CONFIG: INTERFACES" -msgstr "" - -# type: Plain text -#: netconfig.5:50 -msgid "" -"Each section defines an interface. The interface name is defined by the " -"string within square brackets (eg, the two above are 'eth0' and 'eth1'). The " -"available directives:" -msgstr "" -"Chaque section défini une interface. Le nom de l'interface est défini par " -"la chaîne entre apostrophe (eg, les deux ci dessus sont 'eth0' and 'eth1'). " -"Les directives disponibles:" - -# type: TP -#: netconfig.5:50 -#, no-wrap -msgid "BipE [netmask EnetmaskE [broadcast EbroadcastE]>" -msgstr "" - -# type: Plain text -#: netconfig.5:55 -msgid "" -"Defines the ip address, netmask and broadcast address of the interface. " -"Multiple usage is ok for eth0:1, eth0:2, etc. See the other format of this " -"directive for dhcp." -msgstr "" -"Défini l'adresse ip, le masque réseau et l'adresse de broadcast de " -"l'interface. On peut le renseigner plusieurs fois pour eth0:1, eth0:2, etc. " -"Voir l'autre réglage de cette directive pour utiliser le dhcp." - -# type: TP -#: netconfig.5:55 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: netconfig.5:58 -msgid "" -"Use dhcp for this interface. When this format is used, the other \"options\" " -"lines are ignored." -msgstr "" -"Configurer cette interface pour le dhcp. Quand ce format est utilisé, les " -"autres lignes \"options\" sont ignorées." - -# type: TP -#: netconfig.5:58 -#, no-wrap -msgid "BcommandE>" -msgstr "" - -# type: TP -#: netconfig.5:60 -#, no-wrap -msgid "BcommandE>" -msgstr "" - -# type: TP -#: netconfig.5:62 -#, no-wrap -msgid "BcommandE>" -msgstr "" - -# type: TP -#: netconfig.5:64 -#, no-wrap -msgid "BcommandE>" -msgstr "" - -# type: Plain text -#: netconfig.5:69 -#, fuzzy -msgid "" -"The syntax of these directives are the same: you can define there commands " -"to be executed before the interface is up, after the interface is up, before " -"it is down, and after, respectively. Multiple usage is ok, the commands are " -"executed in the specified order." -msgstr "" -"La syntaxe de ces directives est la męme: vous pouvez définir les commandes " -"ŕ exécuter respectivement avant que l'interface ne se lance, aprčs que " -"l'interface se soit lancée, avant qu'elle s'arręte, et aprčs. L'usage de " -"commande multiple est autorisé, les commandes seront exécutées dans l'ordre " -"spécifié." - -# type: TP -#: netconfig.5:69 -#, no-wrap -msgid "Bmac addressE>" -msgstr "" - -# type: Plain text -#: netconfig.5:72 -msgid "" -"Overwrites the mac address of the card. If defined more than once, the first " -"will be used." -msgstr "" -"Se substitue ŕ l'adresse mac de la carte. Si ce paramčtre est défini " -"plusieurs fois, la premičre définition sera utilisée." - -# type: TP -#: netconfig.5:72 -#, no-wrap -msgid "BessidE>" -msgstr "" - -# type: Plain text -#: netconfig.5:76 -msgid "" -"Set the ESSID (or Network Name - in some products it may also be called " -"Domain ID) for wireless network adapters. If defined more than once, the " -"first will be used." -msgstr "" -"Défini le ESSID (ou Nom du Réseau - dans certain produit, cela peut " -"s'appeler Domain ID) pour les adaptateurs wifi. S'il y'en a plus d'un de " -"défini, le premier sera utilisé." - -# type: TP -#: netconfig.5:76 -#, no-wrap -msgid "BmodeE>" -msgstr "" - -# type: Plain text -#: netconfig.5:86 -msgid "" -"Set the operating mode of the device, for wireless network adapters. The " -"mode can be Ad- Hoc (network composed of only one cell and without Access " -"Point), Managed (node connects to a network composed of many Access Points, " -"with roaming), Master (the node is the synchronisation master or acts as an " -"Access Point), Repeater (the node forwards packets between other wireless " -"nodes), Secondary (the node acts as a backup master/repeater), Monitor (the " -"node is not associ- ated with any cell and passively monitor all packets on " -"the frequency) or Auto. If defined more than once, the first will be used." -msgstr "" - -# type: TP -#: netconfig.5:86 -#, no-wrap -msgid "BipE>" -msgstr "" - -# type: Plain text -#: netconfig.5:91 -msgid "" -"Route packets via a gateway. NOTE: The specified gateway must be reachable " -"first. If the \"default gw\" prefix is used, then adds a default route. If " -"defined more than once, the first will be used. If using dhcp, then this " -"directive is ignored." -msgstr "" -"Routez les paquets via une passerelle. NOTE: La passerelle indiquée doit " -"d'abord ętre joignable. si le préfixe \"default gw\" est utilisé, alors cela " -"ajoute une route par défaut. S'il y'en a plus d'une de définies, la premičre " -"sera utilisée. Si vous ętes en dhcp, alors cette directive sera ignorée." - -# type: TP -#: netconfig.5:91 -#, no-wrap -msgid "BkeyE>" -msgstr "" - -# type: Plain text -#: netconfig.5:95 -msgid "" -"Used to manipulate encryption or scrambling keys and security mode for " -"wireless networks. Examples:" -msgstr "" -"Utilisé pour manipuler le cryptage ou le masquage des touches ainsi que que " -"le mode sécurisé pour les réseaux sans fil. Exemples:" - -# type: Plain text -#: netconfig.5:105 -#, no-wrap -msgid "" -"key = 0123-4567-89\n" -"key = [3] 0123-4567-89\n" -"key = s:password [2]\n" -"key = [2]\n" -"key = open\n" -"key = off\n" -"key = restricted [3] 0123456789\n" -"key = 01-23 key 45-67 [4] key [4]\n" -msgstr "" - -# type: TP -#: netconfig.5:107 -#, no-wrap -msgid "BoptionsE>" -msgstr "" - -# type: Plain text -#: netconfig.5:111 -msgid "" -"These options are passed to the dhcp client daemon. The default is \"-t 10" -"\". You may want to specify here the dhcp hostname, then you'll need \"-t 10 " -"-h EhostnameE\"." -msgstr "" -"Ces options sont passées au client dhcp. Le défaut est \"-t 10\". Vous " -"pouvez vouloir spécifier ici le nom d'hôte dhcp, dans ce cas vous aurez " -"besoin de \"-t 10 -h EhostnameE\"." - -# type: TP -#: netconfig.5:111 -#, no-wrap -msgid "Bdhcp clientE>" -msgstr "" - -# type: Plain text -#: netconfig.5:114 -msgid "" -"This specifies the dhcp client to use. It can be either dhcpcd (default) or " -"dhclient." -msgstr "" - -# type: SH -#: netconfig.5:114 -#, no-wrap -msgid "SPECIAL WIRELESS CARDS" -msgstr "" - -# type: Plain text -#: netconfig.5:117 -msgid "" -"Some users reported that they had to initialize the card with ifconfig " -"EinterfaceE up before using iwconfig." -msgstr "" - -# type: Plain text -#: netconfig.5:123 -#, no-wrap -msgid "" -"[eth1]\n" -"pre_up = ifconfig eth1 up\n" -"post_down = ifconfig eth1 down\n" -msgstr "" - -# type: Plain text -#: netconfig.5:127 -msgid "" -"NOTE: if you use several pre_up and/or post_down lines, this pre_up should " -"be the first, and this post_down should be the last one." -msgstr "" - -# type: SH -#: netconfig.5:128 -#, no-wrap -msgid "USING WPA_SUPPLICANT" -msgstr "" - -# type: Plain text -#: netconfig.5:132 -msgid "" -"If you want to use wpa_supplicant instead of the simple encryption (using " -"key = secret), then use the following pre_up and post_down lines:" -msgstr "" - -# type: Plain text -#: netconfig.5:136 -#, no-wrap -msgid "" -"pre_up = wpa_supplicant -Dwext -c /etc/wpa_supplicant.conf -w -B\n" -"post_down = killall wpa_supplicant\n" -msgstr "" - -# type: SH -#: netconfig.5:138 -#, no-wrap -msgid "AUTHORS" -msgstr "AUTEURS" - -# type: Plain text -#: netconfig.5:140 -msgid "Written by Miklos Vajna." -msgstr "Écrit par Miklos Vajna." - -# type: SH -#: netconfig.5:140 -#, no-wrap -msgid "REPORTING BUGS" -msgstr "SIGNALER DES BUGS" - -# type: Plain text -#: netconfig.5:142 -msgid "" -"If you find any bug, then please file a bugreport at Ehttp://bugs." -"frugalware.org/E." -msgstr "" -"Si vous trouvez des bugs, merci de remplir un rapport de bug sur Ehttp://" -"bugs.frugalware.org/E." - -# type: SH -#: netconfig.5:142 -#, no-wrap -msgid "SEE ALSO" -msgstr "VOIR ÉGALEMENT" - -# type: Plain text -#: netconfig.5:146 -msgid "B(8), B(8), B(8), B(8)" -msgstr "" - -# type: TH -#~ msgid "January 18, 2006" -#~ msgstr "18 Janvier 2006" diff --git a/netconfig/doc/po/hu.po b/netconfig/doc/po/hu.po deleted file mode 100644 index 66b58cf..0000000 --- a/netconfig/doc/po/hu.po +++ /dev/null @@ -1,529 +0,0 @@ -# translation of hu.po to -# Hungarian translations for netconfig.5 package -# Copyright (C) 2006, 2007 Free Software Foundation, Inc. -# -# , 2006. -# VMiklos , 2007. -msgid "" -msgstr "" -"Project-Id-Version: hu\n" -"POT-Creation-Date: 2007-05-05 13:22+0200\n" -"PO-Revision-Date: 2007-02-10 19:14+0100\n" -"Last-Translator: VMiklos \n" -"Language-Team: \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" -"X-Generator: KBabel 1.11.4\n" - -# type: TH -#: netconfig.5:1 -#, no-wrap -msgid "netconfig" -msgstr "netconfig" - -# type: TH -#: netconfig.5:1 -#, no-wrap -msgid "August 5, 2006" -msgstr "2006 Augusztus 5" - -# type: TH -#: netconfig.5:1 -#, fuzzy, no-wrap -msgid "Frugalware 0.6" -msgstr "Frugalware 0.5" - -# type: SH -#: netconfig.5:2 -#, no-wrap -msgid "NAME" -msgstr "NÉV" - -# type: Plain text -#: netconfig.5:4 -msgid "/etc/sysconfig/network/ - configuration of network interfaces" -msgstr "/etc/sysconfig/network/ - hálózati interfészek beállításai" - -# type: SH -#: netconfig.5:4 -#, no-wrap -msgid "CONFIGURATION" -msgstr "BEÁLLÍTÁS" - -# type: Plain text -#: netconfig.5:8 -msgid "" -"Every file in /etc/sysconfig/network represents a network profile. When " -"netconfig invoked with the start paramter, then the profile named " -"'default' (/etc/sysconfig/network/default) will be read." -msgstr "" -"Minden file a /etc/sysconfig/network alatt egy hálózati profilt jelent. " -"Amikor a netconfig a start paraméterrel indul, a 'default' (/etc/sysconfig/" -"network/default) kerül betöltésre." - -# type: Plain text -#: netconfig.5:11 -msgid "" -"This behaviour can be overwritten by the \"network=EprofilenameE\" " -"kernel parameter. In that case the given profile will be loaded instead of " -"'default'." -msgstr "" -"Ez a viselkedés felülírható a \"network=EprofilnévE\" kernel " -"paraméterrel. Ebben az esetben az adott profil kerül betöltésre a 'default' " -"helyett." - -# type: Plain text -#: netconfig.5:15 -msgid "" -"This profile is divided into sections or I. Each section " -"defines an interface that netconfig should initialize. The exception to this " -"is the I section, which defines global options." -msgstr "" -"Egy profil részekre vagy I van bontva. Minden rész egy " -"interfészt definiál amit a netconfignak inicializálni kell. Kivétel az " -"I rész, ami a globális beállításokat tartalmazza." - -# type: SH -#: netconfig.5:16 netconfig.5:119 -#, no-wrap -msgid "Example:" -msgstr "Példa" - -# type: Plain text -#: netconfig.5:21 -#, no-wrap -msgid "" -"[options]\n" -"dns = 157.181.177.34\n" -msgstr "" -"[options]\n" -"dns = 157.181.177.34\n" - -# type: Plain text -#: netconfig.5:25 -#, no-wrap -msgid "" -"[eth0]\n" -"options = 192.168.1.102 netmask 255.255.255.0\n" -"gateway = default gw 192.168.1.1\n" -msgstr "" -"[eth0]\n" -"options = 192.168.1.102 netmask 255.255.255.0\n" -"gateway = default gw 192.168.1.1\n" - -# type: SH -#: netconfig.5:27 -#, no-wrap -msgid "CONFIG: OPTIONS" -msgstr "BEÁLLÍTÁSOK: OPCIÓK" - -# type: TP -#: netconfig.5:28 -#, no-wrap -msgid "BipE>" -msgstr "BipE>" - -# type: Plain text -#: netconfig.5:31 -#, fuzzy -msgid "" -"Explicitly defines dns addresses (ie. when using a static ip). Multiple " -"usage is ok." -msgstr "" -"Fixen definiál dns címeket (pl. statikus ip használatakor). A többszörös " -"használat megengedett." - -# type: TP -#: netconfig.5:31 -#, no-wrap -msgid "BdomainE>" -msgstr "BdomainE>" - -# type: Plain text -#: netconfig.5:34 -msgid "" -"Defines the local domain name. If defined more than once, the first will be " -"used." -msgstr "" -"A helyi domainnevet definiálja. Ha többször van definiálva, az első lesz " -"érvényes." - -# type: TP -#: netconfig.5:34 -#, no-wrap -msgid "BdescriptionE>" -msgstr "BleírásE>" - -# type: Plain text -#: netconfig.5:37 -msgid "A brief description of this network profile. Used by netconfig." -msgstr "Egy rövid leírása ennek a hálózati profilnak. A netconfig használja." - -# type: TP -#: netconfig.5:37 -#, no-wrap -msgid "BusernameE>" -msgstr "BfelhasználónévE>" - -# type: Plain text -#: netconfig.5:40 -msgid "If you have an adsl (pppoe) connection, your adsl username." -msgstr "Ha használ adsl (pppoe) kapcsolatot, az adsl felhasználóneve." - -# type: TP -#: netconfig.5:40 -#, no-wrap -msgid "BpasswordE>" -msgstr "BjelszóE>" - -# type: Plain text -#: netconfig.5:43 -msgid "If you have an adsl connection, your adsl password." -msgstr "Ha használ adsl kapcsolatot, az adsl jelszava." - -# type: TP -#: netconfig.5:43 -#, no-wrap -msgid "BinterfaceE>" -msgstr "BinterfészE>" - -# type: Plain text -#: netconfig.5:46 -msgid "" -"If you have an adsl connection, the Ethernet interface connected to the DSL " -"modem." -msgstr "" -"Ha használ adsl kapcsolatot, a hálózati interfész neve amelyre a DSL modem " -"kapcsolódik." - -# type: SH -#: netconfig.5:46 -#, no-wrap -msgid "CONFIG: INTERFACES" -msgstr "BEÁLLÍTÁSOK: INTERFÉSZEK" - -# type: Plain text -#: netconfig.5:50 -msgid "" -"Each section defines an interface. The interface name is defined by the " -"string within square brackets (eg, the two above are 'eth0' and 'eth1'). The " -"available directives:" -msgstr "" -"Minden rész egy interfészt definiál. Az interfész nevét szögletes zárójelbe " -"téve kell megadni (pl a fenti kettő 'eth0' és 'eth1'). A rendelkezésre álló " -"direktívák:" - -# type: TP -#: netconfig.5:50 -#, no-wrap -msgid "BipE [netmask EnetmaskE [broadcast EbroadcastE]>" -msgstr "BipE [netmask EnetmaszkE [broadcast EbroadcastcímE]>" - -# type: Plain text -#: netconfig.5:55 -msgid "" -"Defines the ip address, netmask and broadcast address of the interface. " -"Multiple usage is ok for eth0:1, eth0:2, etc. See the other format of this " -"directive for dhcp." -msgstr "" -"Megadja egy interfész ip címét, netmaszkját és broadcast címét. A többszörös " -"használat megengedett az eth0:1, eth0:2, stb. esetére. Lásd még egy másik " -"formátumát ennek a direktívának dhcp esetére." - -# type: TP -#: netconfig.5:55 -#, fuzzy, no-wrap -msgid "B" -msgstr "B" - -# type: Plain text -#: netconfig.5:58 -msgid "" -"Use dhcp for this interface. When this format is used, the other \"options\" " -"lines are ignored." -msgstr "" -"dhcp használata ehhez az interfészhez. Ez a formátum prioritást élvez a " -"többi \"options\" sorhoz képest." - -# type: TP -#: netconfig.5:58 -#, no-wrap -msgid "BcommandE>" -msgstr "BparancsE>" - -# type: TP -#: netconfig.5:60 -#, no-wrap -msgid "BcommandE>" -msgstr "BparancsE>" - -# type: TP -#: netconfig.5:62 -#, no-wrap -msgid "BcommandE>" -msgstr "BparancsE>" - -# type: TP -#: netconfig.5:64 -#, no-wrap -msgid "BcommandE>" -msgstr "BparancsE>" - -# type: Plain text -#: netconfig.5:69 -#, fuzzy -msgid "" -"The syntax of these directives are the same: you can define there commands " -"to be executed before the interface is up, after the interface is up, before " -"it is down, and after, respectively. Multiple usage is ok, the commands are " -"executed in the specified order." -msgstr "" -"Ezen direktívák szintaktikája azonos: lehetővé teszi parancsok végrehajtását " -"az interfész aktiválása előtt, után, annak leállítása előtt és után, ebben a " -"sorrendben. A többszörös használat megengedett, a parancsok a megadás " -"sorrendjében lesznek végrehajtva." - -# type: TP -#: netconfig.5:69 -#, no-wrap -msgid "Bmac addressE>" -msgstr "Bmac címE>" - -# type: Plain text -#: netconfig.5:72 -msgid "" -"Overwrites the mac address of the card. If defined more than once, the first " -"will be used." -msgstr "" -"Felülírja a kártya mac címét. Ha többször van definiálva, az első lesz " -"érvényes." - -# type: TP -#: netconfig.5:72 -#, no-wrap -msgid "BessidE>" -msgstr "BessidE>" - -# type: Plain text -#: netconfig.5:76 -msgid "" -"Set the ESSID (or Network Name - in some products it may also be called " -"Domain ID) for wireless network adapters. If defined more than once, the " -"first will be used." -msgstr "" -"Az ESSID-t (vagy Hálózati név - más termékeknél Domain ID-ként is " -"hivatkoznak rá) határozza meg a vezetéknélküli hálózatokhoz. Ha többször van " -"definiálva, az első lesz érvényes." - -# type: TP -#: netconfig.5:76 -#, fuzzy, no-wrap -msgid "BmodeE>" -msgstr "BkeyE>" - -# type: Plain text -#: netconfig.5:86 -msgid "" -"Set the operating mode of the device, for wireless network adapters. The " -"mode can be Ad- Hoc (network composed of only one cell and without Access " -"Point), Managed (node connects to a network composed of many Access Points, " -"with roaming), Master (the node is the synchronisation master or acts as an " -"Access Point), Repeater (the node forwards packets between other wireless " -"nodes), Secondary (the node acts as a backup master/repeater), Monitor (the " -"node is not associ- ated with any cell and passively monitor all packets on " -"the frequency) or Auto. If defined more than once, the first will be used." -msgstr "" -"Beállítja az eszköz működési módját a vezetéknéküli hálózati csatolók " -"számára. A mód lehet Ad-Hoc (a hálózatban nincs Access Point), Managed (a " -"hálózatban több Access Point van), Master (a csomópont a szinkronizációs " -"master vagy Access Pointként viselkedik), Repeater (a csomópont csomagokat " -"továbbít más vezetéknélküli csomópontoknak) ,Secondary (a csomópont egy " -"tartalék master/repeater), Monitor (a csomópont nem kapcsolódik egy " -"csomóponthoz sem, csak figyeli a frenkvencián az összes csomagot) vagy Auto. " -"Ha többször van definiálva, akkor az első lesz érvényes." - -# type: TP -#: netconfig.5:86 -#, no-wrap -msgid "BipE>" -msgstr "BipE>" - -# type: Plain text -#: netconfig.5:91 -msgid "" -"Route packets via a gateway. NOTE: The specified gateway must be reachable " -"first. If the \"default gw\" prefix is used, then adds a default route. If " -"defined more than once, the first will be used. If using dhcp, then this " -"directive is ignored." -msgstr "" -"A csomagokat egy megadott útválasztón keresztül irányítja. MEGJEGYZÉS: A " -"megadott útválasztó előszor elérhető kell, hogy legyen. Ha többször van " -"definiálva, az első lesz évényes. dhcp használata esetén ez a direktíva " -"figyelmen kívül lesz hagyva." - -# type: TP -#: netconfig.5:91 -#, no-wrap -msgid "BkeyE>" -msgstr "BkeyE>" - -# type: Plain text -#: netconfig.5:95 -msgid "" -"Used to manipulate encryption or scrambling keys and security mode for " -"wireless networks. Examples:" -msgstr "Titkosítási kulcsok es biztonsági módok megadásához használt. Példák:" - -# type: Plain text -#: netconfig.5:105 -#, no-wrap -msgid "" -"key = 0123-4567-89\n" -"key = [3] 0123-4567-89\n" -"key = s:password [2]\n" -"key = [2]\n" -"key = open\n" -"key = off\n" -"key = restricted [3] 0123456789\n" -"key = 01-23 key 45-67 [4] key [4]\n" -msgstr "" -"key = 0123-4567-89\n" -"key = [3] 0123-4567-89\n" -"key = s:password [2]\n" -"key = [2]\n" -"key = open\n" -"key = off\n" -"key = restricted [3] 0123456789\n" -"key = 01-23 key 45-67 [4] key [4]\n" - -# type: TP -#: netconfig.5:107 -#, no-wrap -msgid "BoptionsE>" -msgstr "BopciókE>" - -# type: Plain text -#: netconfig.5:111 -msgid "" -"These options are passed to the dhcp client daemon. The default is \"-t 10" -"\". You may want to specify here the dhcp hostname, then you'll need \"-t 10 " -"-h EhostnameE\"." -msgstr "" -"Ezeket az opciókat a dhcp kliens démon kapja meg. Az alapértelmezett a \"-t " -"10\". Abban az esetben ha dhcp hostnevet szeretne megadni, a \"-t 10 -h " -"EhostnévE\"-re lesz szüksége." - -# type: TP -#: netconfig.5:111 -#, no-wrap -msgid "Bdhcp clientE>" -msgstr "Bdhcp kliensE>" - -# type: Plain text -#: netconfig.5:114 -#, fuzzy -msgid "" -"This specifies the dhcp client to use. It can be either dhcpcd (default) or " -"dhclient." -msgstr "Megadja a használandó dhcp klienst. dhcpcd vagy dhclient lehet." - -# type: SH -#: netconfig.5:114 -#, no-wrap -msgid "SPECIAL WIRELESS CARDS" -msgstr "SPECIÁLIS VEZETÉKNÉLKÜLI KÁRTYÁK" - -# type: Plain text -#: netconfig.5:117 -msgid "" -"Some users reported that they had to initialize the card with ifconfig " -"EinterfaceE up before using iwconfig." -msgstr "" -"Néhány felhasználó jelezte, hogy szükséges volt a kártyájukat az ifconfig " -"EinterfaceE up paranccsal inicializálni az iwconfig használata előtt." - -# type: Plain text -#: netconfig.5:123 -#, no-wrap -msgid "" -"[eth1]\n" -"pre_up = ifconfig eth1 up\n" -"post_down = ifconfig eth1 down\n" -msgstr "" -"[eth1]\n" -"pre_up = ifconfig eth1 up\n" -"post_down = ifconfig eth1 down\n" - -# type: Plain text -#: netconfig.5:127 -msgid "" -"NOTE: if you use several pre_up and/or post_down lines, this pre_up should " -"be the first, and this post_down should be the last one." -msgstr "" -"MEGJEGYZÉS: ha több pre_up és/vagy post_down sor van, akkor ez a pre_up kell " -"legyen az első, és ez a post_down kell legyen az utolsó." - -# type: SH -#: netconfig.5:128 -#, no-wrap -msgid "USING WPA_SUPPLICANT" -msgstr "A WPA_SUPPLICANT HASZNÁLATA" - -# type: Plain text -#: netconfig.5:132 -#, fuzzy -msgid "" -"If you want to use wpa_supplicant instead of the simple encryption (using " -"key = secret), then use the following pre_up and post_down lines:" -msgstr "" -"Ha wpa_sullicantot akar használni sima titkosítás helyett (a key = titkot " -"használva), akkor használja a következő pre_up és post_down sorokat: " - -# type: Plain text -#: netconfig.5:136 -#, no-wrap -msgid "" -"pre_up = wpa_supplicant -Dwext -c /etc/wpa_supplicant.conf -w -B\n" -"post_down = killall wpa_supplicant\n" -msgstr "" -"pre_up = wpa_supplicant -Dwext -c /etc/wpa_supplicant.conf -w -B\n" -"post_down = killall wpa_supplicant\n" - -# type: SH -#: netconfig.5:138 -#, no-wrap -msgid "AUTHORS" -msgstr "SZERZŐK" - -# type: Plain text -#: netconfig.5:140 -msgid "Written by Miklos Vajna." -msgstr "Írta Vajna Miklós" - -# type: SH -#: netconfig.5:140 -#, no-wrap -msgid "REPORTING BUGS" -msgstr "HIBÁK JELZÉSE" - -# type: Plain text -#: netconfig.5:142 -msgid "" -"If you find any bug, then please file a bugreport at Ehttp://bugs." -"frugalware.org/E." -msgstr "" -"Ha bármilyen hibát talál, azt kérjük jelezze (angolul) a Ehttp://bugs." -"frugalware.org/E címen." - -# type: SH -#: netconfig.5:142 -#, no-wrap -msgid "SEE ALSO" -msgstr "LÁSD MÉG" - -# type: Plain text -#: netconfig.5:146 -msgid "B(8), B(8), B(8), B(8)" -msgstr "B(8), B(8), B(8), B(8)" diff --git a/netconfig/doc/po4a.cfg b/netconfig/doc/po4a.cfg deleted file mode 100644 index 9b611bc..0000000 --- a/netconfig/doc/po4a.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[po4a_langs] fr hu -[po4a_paths] po/netconfig.5.pot $lang:po/$lang.po -[type: man] netconfig.5 \ - $lang:$lang/netconfig.5 add_$lang:addendum.5.$lang \ - opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE" From vmiklos at frugalware.org Mon Nov 5 13:29:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:20 2007 Subject: [Frugalware-git] frugalwareutils: netconfig/usage(): remove duplicated help Message-ID: <20071105122903.36D8D1A68053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=457640e3de78fa5c54e039480502eaf21c53190c commit 457640e3de78fa5c54e039480502eaf21c53190c Author: Miklos Vajna Date: Mon Nov 5 13:07:42 2007 +0100 netconfig/usage(): remove duplicated help diff --git a/netconfig/netconfig.c b/netconfig/netconfig.c index 63c8e22..61f88bc 100644 --- a/netconfig/netconfig.c +++ b/netconfig/netconfig.c @@ -43,15 +43,9 @@ int nco_lodown = 0; fwnet_profile_t *sigprof; -int usage(const char *myname) +int usage() { - printf(_("usage: %s [options] start|stop|restart|status|list [interface]\n"), myname); - printf(_(" %s [options] [profile] [interface]\n"), myname); - printf(_("-h | --help This help.\n")); - printf(_("-f | --fast Fast mode, used by the setup.\n")); - printf(_(" --dry-run Do not actually perform the operation.\n")); - printf(_(" --loup Bring up the loopback interface.\n")); - printf(_(" --lodown Bring down the loopback interface.\n")); + system("man netconfig"); return(0); } @@ -267,7 +261,7 @@ int run(int argc, char **argv) fwutil_i18ninit(__FILE__); if(nco_usage) { - usage(argv[0]); + usage(); return(0); } From vmiklos at frugalware.org Mon Nov 5 13:29:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:20 2007 Subject: [Frugalware-git] frugalwareutils: move netconfig manpage to section 1 from section 5 Message-ID: <20071105122903.7375A1A68053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=09f6e76afac901d017551e1c0bd02083d676912b commit 09f6e76afac901d017551e1c0bd02083d676912b Author: Miklos Vajna Date: Mon Nov 5 13:10:07 2007 +0100 move netconfig manpage to section 1 from section 5 as it no longer just describes its config file diff --git a/Makefile b/Makefile index d32ba5a..e8adeab 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,8 @@ install: $(INSTALL) -d $(DESTDIR)$(fwlibdir) $(INSTALL) -d $(DESTDIR)$(libexecdir) $(INSTALL) -d $(DESTDIR)$(sysconfdir)/sysconfig/network + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 $(INSTALL) -d $(DESTDIR)$(mandir)/man3 - $(INSTALL) -d $(DESTDIR)$(mandir)/man5 $(INSTALL) -d $(DESTDIR)$(includedir) +$(DO_RECURSIVE) diff --git a/doc/Makefile b/doc/Makefile index 2f8f9fc..a0b07c6 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -31,7 +31,7 @@ endif install: ifneq ($(asciidoc),) - $(INSTALL) -m644 $(MANS) $(DESTDIR)$(man1dir) + $(INSTALL) -m644 $(MANS) $(DESTDIR)$(mandir)/man1 endif clean: From vmiklos at frugalware.org Mon Nov 5 13:29:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:20 2007 Subject: [Frugalware-git] frugalwareutils: configure.ac: typo Message-ID: <20071105122903.E05511A68055@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=9e805a460fe6f544fe98987876179f5d5107fe92 commit 9e805a460fe6f544fe98987876179f5d5107fe92 Author: Miklos Vajna Date: Mon Nov 5 13:11:21 2007 +0100 configure.ac: typo diff --git a/configure.ac b/configure.ac index e800647..84fbc91 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ fi AC_ARG_ENABLE([asciidoc], AS_HELP_STRING([--disable-asciidoc], [Disable asciidoc support (default: test)])) if test "$enable_asciidoc" != "no"; then - AC_CHECK_PROG(DOXYGEN, asciidoc, asciidoc, []) + AC_CHECK_PROG(ASCIIDOC, asciidoc, asciidoc, []) fi AC_ARG_ENABLE([po4a], AS_HELP_STRING([--disable-po4a], [Disable po4a support (default: test)])) From vmiklos at frugalware.org Mon Nov 5 13:29:04 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:21 2007 Subject: [Frugalware-git] frugalwareutils: add asciidoc to config.mak.in Message-ID: <20071105122904.C02201A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=102d3a10b653895d73d360d384366cc5c48d0e82 commit 102d3a10b653895d73d360d384366cc5c48d0e82 Author: Miklos Vajna Date: Mon Nov 5 13:14:05 2007 +0100 add asciidoc to config.mak.in diff --git a/config.mak.in b/config.mak.in index 5c11785..fad86d8 100644 --- a/config.mak.in +++ b/config.mak.in @@ -11,4 +11,5 @@ mandir = @mandir@ localedir = ${prefix}/share/locale includedir = @includedir@ doxygen = @DOXYGEN@ +asciidoc = @ASCIIDOC@ po4a = @PO4A@ From vmiklos at frugalware.org Mon Nov 5 13:29:04 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:21 2007 Subject: [Frugalware-git] frugalwareutils: doc: user doc is generated by asciidoc, not doxygen Message-ID: <20071105122904.E4DEC1A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=4c900a202cb60f5af91628ddeb029c339e421097 commit 4c900a202cb60f5af91628ddeb029c339e421097 Author: Miklos Vajna Date: Mon Nov 5 13:17:46 2007 +0100 doc: user doc is generated by asciidoc, not doxygen diff --git a/doc/Makefile b/doc/Makefile index a0b07c6..9617cfb 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -23,7 +23,7 @@ XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2 DOCS = $(wildcard *.txt) MANS = $(subst .txt,.1,$(DOCS)) -ifneq ($(doxygen),) +ifneq ($(asciidoc),) compile: $(MANS) else compile: From vmiklos at frugalware.org Mon Nov 5 13:29:05 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:22 2007 Subject: [Frugalware-git] frugalwareutils: run compile/install in the doc subdir, too Message-ID: <20071105122905.208971A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=e51142439f53c80d7afe6ff9418cf9248b856025 commit e51142439f53c80d7afe6ff9418cf9248b856025 Author: Miklos Vajna Date: Mon Nov 5 13:21:27 2007 +0100 run compile/install in the doc subdir, too diff --git a/Makefile b/Makefile index e8adeab..9da0aae 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ -include config.mak -include Makefile.inc -SUBDIRS = apidoc libfwutil libfwdialog setup \ +SUBDIRS = doc apidoc libfwutil libfwdialog setup \ libfwnetconfig netconfig \ libfwtimeconfig timeconfig \ libfwraidconfig raidconfig \ From vmiklos at frugalware.org Mon Nov 5 13:29:05 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:29:22 2007 Subject: [Frugalware-git] frugalwareutils: add .gitignore files Message-ID: <20071105122905.6D09B1A68053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=34c58b9946c08e0acf815788a9de3581034e6746 commit 34c58b9946c08e0acf815788a9de3581034e6746 Author: Miklos Vajna Date: Mon Nov 5 13:26:44 2007 +0100 add .gitignore files diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..43ed648 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +*.po +*.mo +*.gmo +*.so* +*.1 +configure +config.status +aclocal.m4 +autom4te.cache +config.log +config.mak +install-sh diff --git a/libfwxconfig/.gitignore b/libfwxconfig/.gitignore new file mode 100644 index 0000000..593e59c --- /dev/null +++ b/libfwxconfig/.gitignore @@ -0,0 +1 @@ +xconfig-helper diff --git a/setup/.gitignore b/setup/.gitignore new file mode 100644 index 0000000..146f275 --- /dev/null +++ b/setup/.gitignore @@ -0,0 +1 @@ +setup From vmiklos at frugalware.org Mon Nov 5 13:35:27 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:35:29 2007 Subject: [Frugalware-git] pacman-tools: syncpkgcd: handle the case when it's not possible to report the result of a build Message-ID: <20071105123527.68FC71A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=a4cd6738c2e771753d5cfd57f0640e2cc7a48e6e commit a4cd6738c2e771753d5cfd57f0640e2cc7a48e6e Author: Miklos Vajna Date: Mon Nov 5 00:41:53 2007 +0100 syncpkgcd: handle the case when it's not possible to report the result of a build diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index 61ba25c..c9c9eea 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -136,12 +136,18 @@ class Syncpkgcd: sock.close() except IOError: buf = "No log available." - server.report_result(config.server_user, config.server_pass, pkg, 1, base64.encodestring(buf)) + try: + server.report_result(config.server_user, config.server_pass, pkg, 1, base64.encodestring(buf)) + except socket.error: + pass self.system("git clean -x -d") return self.system("repoman -t %s -k sync" % tree) self.log(pkg, "build finished") - server.report_result(config.server_user, config.server_pass, pkg, 0) + try: + server.report_result(config.server_user, config.server_pass, pkg, 0) + except socket.error: + pass self.system("git clean -x -d") def log(self, pkg, action): From vmiklos at frugalware.org Mon Nov 5 13:36:04 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:36:06 2007 Subject: [Frugalware-git] frugalware-current: gnokii-0.6.20-2-i686 Message-ID: <20071105123604.2A6821A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5395bc6524f31338a26ac800af523232c3b4ff0c commit 5395bc6524f31338a26ac800af523232c3b4ff0c Author: Miklos Vajna Date: Sun Nov 4 23:17:23 2007 +0100 gnokii-0.6.20-2-i686 - moved back to xapps, kdepim needs it - split mysql and postgresql backends diff --git a/source/xapps-extra/gnokii/FrugalBuild b/source/xapps-extra/gnokii/FrugalBuild deleted file mode 100644 index 25282b4..0000000 --- a/source/xapps-extra/gnokii/FrugalBuild +++ /dev/null @@ -1,35 +0,0 @@ -# Compiling Time: 0.49 SBU -# Maintainer: VMiklos - -pkgname=gnokii -pkgver=0.6.20 -pkgrel=1 -pkgdesc="Tools and user space driver for use with mobile phones" -url="http://www.gnokii.org/" -backup=(etc/gnokiirc) -depends=('bluez-libs' 'libmysqlclient' 'libpq' 'gtk+2' 'libxdamage') -makedepends=('postgresql' 'mysql') -groups=('xapps-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump $url/download/gnokii/ | grep ]gnokii | sed -n -e 's/.*gnokii-\(.*\)\.tar\.bz2.*/\1/' -e '1 p'" -source=(http://gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2) -sha1sums=('6c51477d7e1358020ff52274f78a6dc595429d22') - -build() -{ - unset MAKEFLAGS - Fmake --enable-security - Fmakeinstall - cd smsd - Fmake libfile.la - Fmakeinstall - cd .. - Fsed '/usr/local' "$Fprefix" Docs/sample/gnokiirc - Ffilerel Docs/sample/gnokiirc /etc/gnokiirc - Ffilerel Docs/sample/logo/gnokii.xpm /usr/share/pixmaps/xgnokii.xpm - cd Docs - Fmakeinstall - Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver -} - -# optimization OK diff --git a/source/xapps/gnokii/FrugalBuild b/source/xapps/gnokii/FrugalBuild new file mode 100644 index 0000000..441409f --- /dev/null +++ b/source/xapps/gnokii/FrugalBuild @@ -0,0 +1,44 @@ +# Compiling Time: 0.49 SBU +# Maintainer: VMiklos + +pkgname=gnokii +pkgver=0.6.20 +pkgrel=2 +pkgdesc="Tools and user space driver for use with mobile phones" +url="http://www.gnokii.org/" +backup=(etc/gnokiirc) +depends=('bluez-libs' 'gtk+2' 'libxdamage') +makedepends=('postgresql' 'mysql') +groups=('xapps') +archs=('i686' 'x86_64') +up2date="lynx -dump $url/download/gnokii/ | grep ]gnokii | sed -n -e 's/.*gnokii-\(.*\)\.tar\.bz2.*/\1/' -e '1 p'" +source=(http://gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2) +sha1sums=('6c51477d7e1358020ff52274f78a6dc595429d22') + +subpkgs=($pkgname-{mysql,pq}) +subdescs=('MySQL support for gnokii.' 'PostgreSQL support for gnokii.') +subdepends=("$pkgname=$pkgver glib2 libmysqlclient" "$pkgname=$pkgver glib2 libpq") +subgroups=('xapps-extra' 'xapps-extra') +subarchs=('i686 x86_64' 'i686 x86_64') + +build() +{ + unset MAKEFLAGS + Fmake --enable-security + Fmakeinstall + cd smsd + Fmake libfile.la + Fmakeinstall + cd .. + Fsed '/usr/local' "$Fprefix" Docs/sample/gnokiirc + Ffilerel Docs/sample/gnokiirc /etc/gnokiirc + Ffilerel Docs/sample/logo/gnokii.xpm /usr/share/pixmaps/xgnokii.xpm + cd Docs + Fmakeinstall + Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver + + Fsplit $pkgname-mysql usr/lib/smsd/libmysql* + Fsplit $pkgname-pq usr/lib/smsd/libpq* +} + +# optimization OK From vmiklos at frugalware.org Mon Nov 5 13:36:04 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:36:07 2007 Subject: [Frugalware-git] frugalware-current: netbeans-5.5.1-2-i686 Message-ID: <20071105123604.527591A68053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8326779db248aa7d3731064a90dbbc082f71ac5f commit 8326779db248aa7d3731064a90dbbc082f71ac5f Author: Miklos Vajna Date: Mon Nov 5 00:19:31 2007 +0100 netbeans-5.5.1-2-i686 add LIBXCB_ALLOW_SLOPPY_LOCK hack to the wrapper script, otherwise netbeans won't start (TODO: add a proper fix instead of this hack) diff --git a/source/devel-extra/netbeans/FrugalBuild b/source/devel-extra/netbeans/FrugalBuild index 2f73556..e6634ba 100644 --- a/source/devel-extra/netbeans/FrugalBuild +++ b/source/devel-extra/netbeans/FrugalBuild @@ -4,7 +4,7 @@ pkgname=netbeans pkgver=5.5.1 pkgdate=200704122300 -pkgrel=1 +pkgrel=2 pkgdesc="The original free Java IDE, and so much more." url="http://www.netbeans.info/" depends=('j2sdk') @@ -17,7 +17,7 @@ source=(http://us2-mirror.netbeans.info/download/${pkgver//./_}/fcs/$pkgdate/net netbeans) sha1sums=('b4235a16b0edb8048bfd4173803d65712c618ac9' \ 'd8c652541c8b91c3dcb27f507ac75311bf37b965' \ - '35ce58650d87267fb1ca1bfe9d4168c80859efdb') + '572bf826930f9f7ebac988895cc7d0465f4ebfd8') build() { diff --git a/source/devel-extra/netbeans/netbeans b/source/devel-extra/netbeans/netbeans index b0127ed..7445e84 100644 --- a/source/devel-extra/netbeans/netbeans +++ b/source/devel-extra/netbeans/netbeans @@ -1,3 +1,7 @@ #!/bin/sh +# hack! + +export LIBXCB_ALLOW_SLOPPY_LOCK=1 + /usr/lib/netbeans/bin/netbeans $@ From vmiklos at frugalware.org Mon Nov 5 13:36:04 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 13:36:08 2007 Subject: [Frugalware-git] frugalware-current: bind-9.4.1-3-i686 Message-ID: <20071105123604.701D81A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3be8e83c6e645053355e891ca27b93b8f880b209 commit 3be8e83c6e645053355e891ca27b93b8f880b209 Author: Miklos Vajna Date: Mon Nov 5 10:48:11 2007 +0100 bind-9.4.1-3-i686 update caching-example/named.ca see http://www.ripe.net/ripe/maillists/archives/dns-wg/2007/msg00171.html diff --git a/source/network/bind/FrugalBuild b/source/network/bind/FrugalBuild index 0e86f1e..b280fd4 100644 --- a/source/network/bind/FrugalBuild +++ b/source/network/bind/FrugalBuild @@ -4,7 +4,7 @@ pkgname=bind pkgver=9.4.1 pkgextraver=-P1 -pkgrel=2 +pkgrel=3 pkgdesc="DNS server and utilities" url="http://www.isc.org/index.pl?/sw/bind/" backup=(etc/named.conf etc/logrotate.d/named) diff --git a/source/network/bind/caching-example/named.ca b/source/network/bind/caching-example/named.ca index a20028e..e1cda09 100644 --- a/source/network/bind/caching-example/named.ca +++ b/source/network/bind/caching-example/named.ca @@ -74,7 +74,7 @@ K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 ; temporarily housed at ISI (IANA) ; . 3600000 NS L.ROOT-SERVERS.NET. -L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12 +L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 ; ; housed in Japan, operated by WIDE ; From priyank at frugalware.org Mon Nov 5 14:20:45 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:01 2007 Subject: [Frugalware-git] fun: fun-ui: config Message-ID: <20071105132045.5E82E1A68053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=baea05e8c687ba5e8cfb174530daaef833c81b4b commit baea05e8c687ba5e8cfb174530daaef833c81b4b Author: Priyank Date: Sun Nov 4 12:26:52 2007 +0530 fun-ui: config * implemented fun_restart() that restarts fun. * if the user changes the update interval, ask the user if he wants to restart fun in order for the new changes to take effect. diff --git a/src/fun-ui.c b/src/fun-ui.c index e4c3f46..d985936 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -22,6 +22,7 @@ #include #include "fun-config.h" +#include "fun-messages.h" #include "fun-tooltip.h" #include "fun-dbus.h" #include "sexy-tooltip.h" @@ -41,11 +42,11 @@ FunTooltip *tooltip = NULL; GtkWidget *stooltip; static GtkStatusIcon *fun_icon = NULL; -static GtkWidget *fun_about_dlg = NULL; -static GdkPixbuf *fun_about_pixbuf = NULL; -static GtkWidget *fun_config_dlg = NULL; -static GtkAdjustment *fun_config_upd_int_adj = NULL; -static gboolean connected = FALSE; +static GtkWidget *fun_about_dlg = NULL; +static GdkPixbuf *fun_about_pixbuf = NULL; +static GtkWidget *fun_config_dlg = NULL; +static GtkAdjustment *fun_config_upd_int_adj = NULL; +static gboolean connected = FALSE; /* credits */ static const gchar *authors[] = { \ @@ -66,6 +67,7 @@ static gboolean fun_timeout_func (void); static gboolean fun_timeout_conn (void); static void fun_config_dialog_show (void); +static void fun_restart (void); 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); @@ -235,24 +237,45 @@ cb_fun_config_dlg_close_clicked (GtkWidget *button, gpointer data) adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(data)); interval = gtk_adjustment_get_value (adj); old_interval = fun_config_get_value_int ("update_interval"); - /* if nothing is changed */ + /* if interval is changed, save the new interval value to .funrc and prompt + * the user to restart fun */ + /* TODO: implement a mechanism that automatically sets the timeout value to the + * updated interval value without requiring to restart fun */ if (old_interval != interval) { fun_config_set_value_int ("update_interval", interval); fun_config_save (); + if (fun_question("Restart Fun", "Fun needs to be restarted in order for the changes to take effect. Do you want to restart Fun now ?") == GTK_RESPONSE_YES) + { + fun_restart (); + } } gtk_widget_hide (fun_config_dlg); return; } +static void +fun_restart (void) +{ + fun_ui_cleanup (); + sleep (1); + while (gtk_events_pending()) gtk_main_iteration (); + system ("/usr/bin/fun"); + exit (0); + + return; +} + void -fun_systray_destroy (void) +fun_ui_cleanup (void) { if (icon == NULL) return; gtk_widget_destroy (GTK_WIDGET(icon)); + gtk_widget_destroy (GTK_WIDGET(fun_config_dlg)); fun_tooltip_destroy (tooltip); + g_print ("i was called\n"); icon = NULL; tooltip = NULL; diff --git a/src/fun-ui.h b/src/fun-ui.h index 5668452..a657165 100644 --- a/src/fun-ui.h +++ b/src/fun-ui.h @@ -3,4 +3,6 @@ void fun_ui_init (void); +void fun_ui_cleanup (void); + #endif diff --git a/src/fun.c b/src/fun.c index 7078500..0750b24 100644 --- a/src/fun.c +++ b/src/fun.c @@ -34,6 +34,7 @@ main (int argc, char **argv) fun_ui_init (); gtk_main (); + fun_ui_cleanup (); return 0; } From priyank at frugalware.org Mon Nov 5 14:20:45 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:02 2007 Subject: [Frugalware-git] fun: fun-messages: initial import Message-ID: <20071105132045.160B51678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=131897f7f007bc510bc00158efef4acaf56fe8f5 commit 131897f7f007bc510bc00158efef4acaf56fe8f5 Author: Priyank Date: Sun Nov 4 12:25:40 2007 +0530 fun-messages: initial import diff --git a/src/Makefile.am b/src/Makefile.am index 966da1d..00812bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,6 +12,7 @@ fun_SOURCES = wejpconfig.c \ eggtrayicon.c \ sexy-tooltip.c \ fun-tooltip.c \ + fun-messages.c \ fun-ui.c \ fun-dbus.c \ fun.c diff --git a/src/fun-messages.c b/src/fun-messages.c new file mode 100644 index 0000000..0c4d193 --- /dev/null +++ b/src/fun-messages.c @@ -0,0 +1,134 @@ +/* + * fun-messages.c for fun + * + * This code is borrowed from gnetconfig and gfpm + * gnetconfig and gfpm is Copyright (C) 2006-2007 by Priyank Gosalia + * + * 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. + */ + +#define _GNU_SOURCE +#include "fun-messages.h" + +void +fun_error (const char *message_title, const char *error_str) +{ + GtkWidget *error_dlg = NULL; + + if (!strlen(error_str)) + return; + + error_dlg = gtk_message_dialog_new (GTK_WINDOW(NULL), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + "%s", + error_str); + gtk_window_set_resizable (GTK_WINDOW(error_dlg), FALSE); + gtk_window_set_title (GTK_WINDOW(error_dlg), message_title); + gtk_dialog_run (GTK_DIALOG(error_dlg)); + gtk_widget_destroy (error_dlg); + + return; +} + +void +fun_message (const char *message_title, const char *message_str) +{ + GtkWidget *message_dlg; + + message_dlg = gtk_message_dialog_new (GTK_WINDOW(NULL), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + "%s", + message_str); + gtk_window_set_resizable (GTK_WINDOW(message_dlg), FALSE); + gtk_window_set_title (GTK_WINDOW(message_dlg), message_title); + gtk_dialog_run (GTK_DIALOG(message_dlg)); + gtk_widget_destroy (message_dlg); + + return; +} + +gint +fun_question (const char *message_title, const char *message_str) +{ + GtkWidget *dialog; + gint ret; + + dialog = gtk_message_dialog_new (GTK_WINDOW(NULL), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "%s", + message_str); + gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); + gtk_window_set_title (GTK_WINDOW(dialog), message_title); + ret = gtk_dialog_run (GTK_DIALOG(dialog)); + gtk_widget_destroy (dialog); + + return ret; +} +/* +void +gfpm_plist_message (const char *message_title, const char *main_msg, GtkMessageType type, GList *packages) +{ + GtkWidget *dialog; + GtkListStore *store; + GtkScrolledWindow *swindow; + GtkCellRenderer *r; + GtkTreeIter iter; + GtkWidget *tvw; + GList *l; + + if (packages == NULL) + return; + dialog = gtk_message_dialog_new (GTK_WINDOW(gfpm_mw), + GTK_DIALOG_DESTROY_WITH_PARENT, + type, + GTK_BUTTONS_CLOSE, + "%s", + main_msg); + swindow = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new (NULL, NULL)); + gtk_scrolled_window_set_policy (swindow, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (swindow, GTK_SHADOW_OUT); + tvw = gtk_tree_view_new (); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(tvw), FALSE); + gtk_container_add (GTK_CONTAINER(swindow), tvw); + store = gtk_list_store_new (1, G_TYPE_STRING); + r = gtk_cell_renderer_text_new (); + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(tvw), -1, _("Package"), r, "text", 0, NULL); + for (l=g_list_first(packages);l;l=g_list_next(l)) + { + char *pkgstring = (char*)l->data; + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, pkgstring, -1); + g_free (pkgstring); + } + gtk_tree_view_set_model (GTK_TREE_VIEW(tvw), GTK_TREE_MODEL(store)); + gtk_widget_set_size_request (tvw, 330, 120); + gtk_widget_show (tvw); + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(swindow), FALSE, FALSE, 0); + gtk_widget_show_all (GTK_DIALOG(dialog)->vbox); + gtk_window_set_resizable (GTK_WINDOW(dialog), TRUE); + gtk_window_set_title (GTK_WINDOW(dialog), message_title); + gtk_dialog_run (GTK_DIALOG(dialog)); + + gtk_widget_destroy (dialog); + + return; +} +*/ diff --git a/src/fun-messages.h b/src/fun-messages.h new file mode 100644 index 0000000..db44f5b --- /dev/null +++ b/src/fun-messages.h @@ -0,0 +1,18 @@ +#ifndef __FUN_MESSAGES_H__ +#define __FUN_MESSAGES_H__ + +#include +#include +#include +#include +#include +#include +#include + +void fun_error (const char *, const char *); + +void fun_message (const char *, const char *); + +gint fun_question (const char *, const char *); + +#endif From priyank at frugalware.org Mon Nov 5 14:20:45 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:02 2007 Subject: [Frugalware-git] fun: suppressed some warnings Message-ID: <20071105132045.CF7B31678013@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=06316bd582120f028e52135020b94ed7b8a6d266 commit 06316bd582120f028e52135020b94ed7b8a6d266 Author: Priyank Date: Sun Nov 4 12:33:01 2007 +0530 suppressed some warnings diff --git a/src/fun-ui.c b/src/fun-ui.c index 0fcff72..b1507b4 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -256,18 +256,6 @@ cb_fun_config_dlg_close_clicked (GtkWidget *button, gpointer data) return; } -static void -fun_restart (void) -{ - fun_ui_cleanup (); - sleep (1); - while (gtk_events_pending()) gtk_main_iteration (); - system ("/usr/bin/fun"); - exit (0); - - return; -} - void fun_ui_cleanup (void) { @@ -283,6 +271,18 @@ fun_ui_cleanup (void) } static void +fun_restart (void) +{ + fun_ui_cleanup (); + sleep (1); + while (gtk_events_pending()) gtk_main_iteration (); + system ("/usr/bin/fun"); + exit (0); + + return; +} + +static void fun_config_dialog_show (void) { if (!GTK_WIDGET_VISIBLE(fun_config_dlg)) @@ -314,7 +314,7 @@ fun_config_dialog_init (void) GtkWidget *pref_close; fun_config_dlg = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_default_size (fun_config_dlg, 350, 150); + gtk_window_set_default_size (GTK_WINDOW(fun_config_dlg), 350, 150); //gtk_window_set_resizable (fun_config_dlg, FALSE); vbox1 = gtk_vbox_new (FALSE, 5); From priyank at frugalware.org Mon Nov 5 14:20:45 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:03 2007 Subject: [Frugalware-git] fun: use values of PACKAGE and PACKAGE_VERSION from config.h instead of defining our own. Message-ID: <20071105132045.ADB0C1678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=e32d169eb0e5fe2904289dc3698dfdf50476adb5 commit e32d169eb0e5fe2904289dc3698dfdf50476adb5 Author: Priyank Date: Sun Nov 4 12:30:59 2007 +0530 use values of PACKAGE and PACKAGE_VERSION from config.h instead of defining our own. diff --git a/src/fun-ui.c b/src/fun-ui.c index d985936..0fcff72 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -28,8 +28,9 @@ #include "sexy-tooltip.h" #include "eggtrayicon.h" -#define PACKAGE "fun" -#define VERSION "1.0" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif static void fun_about_show (void); static void fun_about_hide (void); @@ -275,8 +276,6 @@ fun_ui_cleanup (void) gtk_widget_destroy (GTK_WIDGET(icon)); gtk_widget_destroy (GTK_WIDGET(fun_config_dlg)); fun_tooltip_destroy (tooltip); - g_print ("i was called\n"); - icon = NULL; tooltip = NULL; @@ -445,7 +444,7 @@ fun_about_show (void) if (!fun_about_pixbuf) fun_about_pixbuf = gdk_pixbuf_new_from_file ("/usr/share/fun/fun.png", NULL); - ver = g_strdup_printf ("%s", VERSION); + ver = g_strdup_printf ("%s", PACKAGE_VERSION); fun_about_dlg = gtk_about_dialog_new (); gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(fun_about_dlg), PACKAGE); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(fun_about_dlg), ver); From priyank at frugalware.org Mon Nov 5 14:20:46 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:03 2007 Subject: [Frugalware-git] fun: fun-ui Message-ID: <20071105132046.05A101678013@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=21dd59a5478588c17fd74985cf92bebcdfd1a8ae commit 21dd59a5478588c17fd74985cf92bebcdfd1a8ae Author: Priyank Date: Sun Nov 4 12:41:53 2007 +0530 fun-ui set proper connection status in tooltip diff --git a/src/fun-ui.c b/src/fun-ui.c index b1507b4..62e6242 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -378,6 +378,7 @@ fun_ui_init (void) if (fun_dbus_perform_service (TEST_SERVICE, NULL) == FALSE) { g_print ("Failed to connect to the fun daemon\n"); + fun_tooltip_set_text2 (tooltip, "Not connected to fun daemon", FALSE); connected = FALSE; /* start the connection retry timeout */ g_timeout_add_seconds (30, (GSourceFunc)fun_timeout_conn, NULL); @@ -405,6 +406,7 @@ fun_timeout_conn (void) { connected = TRUE; g_timeout_add_seconds (20, (GSourceFunc)fun_timeout_func, NULL); + fun_tooltip_set_text2 (tooltip, "", FALSE); return FALSE; } From priyank at frugalware.org Mon Nov 5 14:20:46 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:04 2007 Subject: [Frugalware-git] fun: small cosmetic change in --help Message-ID: <20071105132046.483781678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=75d17a9af6a5b70936c6b12c6804b5d66b59d81b commit 75d17a9af6a5b70936c6b12c6804b5d66b59d81b Author: Priyank Date: Sun Nov 4 12:56:40 2007 +0530 small cosmetic change in --help diff --git a/src/fund.c b/src/fund.c index b9f5cb0..e7e89fd 100644 --- a/src/fund.c +++ b/src/fund.c @@ -173,7 +173,7 @@ gboolean fund_test_service(FWUpdateNotifier *obj, gint *ret, GError **error) { } void usage() { - printf("Fund v" VERSION "\n"); + printf("fund (Frugalware Update Nofifier Daemon) v" VERSION "\n"); printf(" --help Display this help text\n"); printf(" --daemon Fork into the background\n"); } From priyank at frugalware.org Mon Nov 5 14:20:46 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:04 2007 Subject: [Frugalware-git] fun: renamed UPDNOTIFIERD to FUND in configure.ac and other Makefile Message-ID: <20071105132046.6E5CF1678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=31a6bec8a5ec596a448c3abdac5f64b9ff9cc725 commit 31a6bec8a5ec596a448c3abdac5f64b9ff9cc725 Author: Priyank Date: Sun Nov 4 13:00:26 2007 +0530 renamed UPDNOTIFIERD to FUND in configure.ac and other Makefile diff --git a/configure.ac b/configure.ac index b6b8240..fc4f95a 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ fi AC_SUBST(DBUS_BINDING_TOOL) -PKG_CHECK_MODULES([UPDNOTIFIERD], [dbus-glib-1 >= 0.73]) +PKG_CHECK_MODULES([FUND], [dbus-glib-1 >= 0.73]) PKG_CHECK_MODULES([FUN], [gtk+-2.0 >= 2.12.0]) AC_ARG_WITH(dbus-sys, [ --with-dbus-sys= where D-BUS system.d directory is]) diff --git a/src/Makefile.am b/src/Makefile.am index 00812bb..155302c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = @UPDNOTIFIERD_CFLAGS@ \ +INCLUDES = @FUND_CFLAGS@ \ @FUN_CFLAGS@ \ -DPREFIX=\"$(prefix)\" \ -fPIC @@ -17,8 +17,8 @@ fun_SOURCES = wejpconfig.c \ fun-dbus.c \ fun.c -fund_LDADD= @UPDNOTIFIERD_LIBS@ -lpacman -lfwutil -fun_LDADD= @FUN_LIBS@ @UPDNOTIFIERD_LIBS@ +fund_LDADD= @FUND_LIBS@ -lpacman -lfwutil +fun_LDADD= @FUN_LIBS@ @FUND_LIBS@ BUILT_SOURCES = fund-dbus-glue.h From priyank at frugalware.org Mon Nov 5 14:20:46 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:04 2007 Subject: [Frugalware-git] fun: TODO: added a task Message-ID: <20071105132046.979641678013@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=38ef82c07579ab3c1fe6d125d310a433e05053e1 commit 38ef82c07579ab3c1fe6d125d310a433e05053e1 Author: Priyank Date: Sun Nov 4 13:12:01 2007 +0530 TODO: added a task diff --git a/TODO b/TODO index d782126..61d3683 100644 --- a/TODO +++ b/TODO @@ -2,5 +2,8 @@ allow the "users" group to execute methods of org.frugalware.UpdNotifier. but this should be changed to some other group as suggested by crazy +* fun: implement a mechanism that automatically sets the timeout value + to the updated interval value as specified by the user without + requiring to restart fun - last updated: 2007 10 19 1:25 + last updated by Priyank: 2007 11 04 13:11 From priyank at frugalware.org Mon Nov 5 14:20:46 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:05 2007 Subject: [Frugalware-git] fun: fun.h: initial import Message-ID: <20071105132046.CEA671678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=b94fbf16dab797675faddb0b4284926d74e5d902 commit b94fbf16dab797675faddb0b4284926d74e5d902 Author: Priyank Date: Sun Nov 4 13:19:00 2007 +0530 fun.h: initial import diff --git a/src/fun.h b/src/fun.h new file mode 100644 index 0000000..8f73854 --- /dev/null +++ b/src/fun.h @@ -0,0 +1,14 @@ +#ifndef __FUN_H__ +#define __FUN_H__ + +#include +#include +#include +#include +#include +#include +#include + +#define _(string) gettext (string) + +#endif From priyank at frugalware.org Mon Nov 5 14:20:47 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:05 2007 Subject: [Frugalware-git] fun: autogen.sh Message-ID: <20071105132047.1334E1678013@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=51b3672542cc2f8b0c4b4922c7b8ed62a63d5b94 commit 51b3672542cc2f8b0c4b4922c7b8ed62a63d5b94 Author: Priyank Date: Sun Nov 4 13:55:55 2007 +0530 autogen.sh * added missing intltoolize and libtoolize commands diff --git a/autogen.sh b/autogen.sh index 502c2c0..7cf73b2 100644 --- a/autogen.sh +++ b/autogen.sh @@ -1,8 +1,11 @@ #!/bin/sh -e +intltoolize -c -f --automake +libtoolize -f -c aclocal --force autoheader -f autoconf -f cp -f $(dirname $(which automake))/../share/automake/mkinstalldirs ./ cp -f $(dirname $(which automake))/../share/gettext/config.rpath ./ automake -a -c --gnu --foreign + From priyank at frugalware.org Mon Nov 5 14:20:47 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:06 2007 Subject: [Frugalware-git] fun: added gettext support Message-ID: <20071105132047.4CA8B1678012@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=b2ca3f629b9dbb1cb9f5b4dbc8f50c408451d7f1 commit b2ca3f629b9dbb1cb9f5b4dbc8f50c408451d7f1 Author: Priyank Date: Sun Nov 4 13:56:32 2007 +0530 added gettext support diff --git a/configure.ac b/configure.ac index fc4f95a..1e30719 100644 --- a/configure.ac +++ b/configure.ac @@ -1,16 +1,24 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) -AC_INIT([fun], 0.1, [frugalware-devel@frugalware.org], fun) -AC_CONFIG_SRCDIR([src/fund.c]) +AC_INIT([fun], 0.1.0, [frugalware-devel@frugalware.org], fun) +AC_CONFIG_SRCDIR([src/fun.c]) AC_LANG(C) AM_CONFIG_HEADER(config.h) AC_CANONICAL_SYSTEM +AC_PROG_LIBTOOL +AC_PROG_INTLTOOL([0.21]) AM_INIT_AUTOMAKE AC_PROG_CC AC_HEADER_STDC -AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h unistd.h pacman.h libfwutil.h]) +AC_CHECK_HEADERS([locale.h stdlib.h string.h sys/ioctl.h unistd.h pacman.h libfwutil.h]) +ALL_LINGUAS="" +GETTEXT_PACKAGE=fun +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [needed for bindtextdomain() and textdomain()]) +AM_GLIB_GNU_GETTEXT +AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR) AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool, no) @@ -39,6 +47,7 @@ dnl ========================================================================== AC_OUTPUT([ src/Makefile +po/Makefile.in Makefile ]) diff --git a/po/Makefile.in.in b/po/Makefile.in.in new file mode 100644 index 0000000..b630d54 --- /dev/null +++ b/po/Makefile.in.in @@ -0,0 +1,218 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. +# +# - Modified by Owen Taylor to use GETTEXT_PACKAGE +# instead of PACKAGE and to look for po2tbl in ./ not in intl/ +# +# - Modified by jacob berkman to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize +# +# - Modified by Rodney Dawes for use with intltool +# +# We have the following line for use by intltoolize: +# INTLTOOL_MAKEFILE + +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datadir = @datadir@ +datarootdir = @datarootdir@ +libdir = @libdir@ +DATADIRNAME = @DATADIRNAME@ +itlocaledir = $(prefix)/$(DATADIRNAME)/locale +subdir = po +install_sh = @install_sh@ +# Automake >= 1.8 provides @mkdir_p@. +# Until it can be supposed, use the safe fallback: +mkdir_p = $(install_sh) -d + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ + +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +XGETTEXT = @XGETTEXT@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot + +ALL_LINGUAS = @ALL_LINGUAS@ + +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) + +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) + +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) + +POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) + +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) +EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS + +POTFILES = \ +# This comment gets stripped out + +CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) + +.SUFFIXES: +.SUFFIXES: .po .pox .gmo .mo .msg .cat + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && gencat $@ $*.msg + + +all: all-@USE_NLS@ + +all-yes: $(CATALOGS) +all-no: + +$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(GENPOT) + +install: install-data +install-data: install-data-@USE_NLS@ +install-data-no: all +install-data-yes: all + $(mkdir_p) $(DESTDIR)$(itlocaledir) + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $$dir; \ + if test -r $$lang.gmo; then \ + $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $(srcdir)/$$lang.gmo as" \ + "$$dir/$(GETTEXT_PACKAGE).mo"; \ + fi; \ + if test -r $$lang.gmo.m; then \ + $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ + else \ + if test -r $(srcdir)/$$lang.gmo.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ + $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $(srcdir)/$$lang.gmo.m as" \ + "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ + else \ + true; \ + fi; \ + fi; \ + done + +# Empty stubs to satisfy archaic automake needs +dvi info tags TAGS ID: + +# Define this as empty until I found a useful application. +install-exec installcheck: + +uninstall: + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + done + +check: all $(GETTEXT_PACKAGE).pot + rm -f missing notexist + srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m + if [ -r missing -o -r notexist ]; then \ + exit 1; \ + fi + +mostlyclean: + rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp + rm -f .intltool-merge-cache + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES stamp-it + rm -f *.mo *.msg *.cat *.cat.m *.gmo + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f Makefile.in.in + +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: $(DISTFILES) + dists="$(DISTFILES)"; \ + extra_dists="$(EXTRA_DISTFILES)"; \ + for file in $$extra_dists; do \ + test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ + done; \ + for file in $$dists; do \ + test -f $$file || file="$(srcdir)/$$file"; \ + ln $$file $(distdir) 2> /dev/null \ + || cp -p $$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + echo "$$lang:"; \ + result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ + if $$result; then \ + if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$lang.gmo failed!"; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi; \ + done + +Makefile POTFILES: stamp-it + @if test ! -f $@; then \ + rm -f stamp-it; \ + $(MAKE) stamp-it; \ + fi + +stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ + $(SHELL) ./config.status + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..ce85c8a --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1 @@ +src/fun-ui.c From priyank at frugalware.org Mon Nov 5 14:20:47 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:06 2007 Subject: [Frugalware-git] fun: fun: marked strings as translatable and setup gettext in main() Message-ID: <20071105132047.932311A68055@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=6dbafc4ba5e33124e0638142031bee8dd573738d commit 6dbafc4ba5e33124e0638142031bee8dd573738d Author: Priyank Date: Sun Nov 4 13:57:02 2007 +0530 fun: marked strings as translatable and setup gettext in main() diff --git a/src/fun-ui.c b/src/fun-ui.c index 62e6242..e844c8e 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include +#include "fun.h" #include "fun-config.h" #include "fun-messages.h" #include "fun-tooltip.h" @@ -246,7 +246,8 @@ cb_fun_config_dlg_close_clicked (GtkWidget *button, gpointer data) { fun_config_set_value_int ("update_interval", interval); fun_config_save (); - if (fun_question("Restart Fun", "Fun needs to be restarted in order for the changes to take effect. Do you want to restart Fun now ?") == GTK_RESPONSE_YES) + if (fun_question(_("Restart Fun"), + _("Fun needs to be restarted in order for the changes to take effect. Do you want to restart Fun now ?")) == GTK_RESPONSE_YES) { fun_restart (); } @@ -331,7 +332,7 @@ fun_config_dialog_init (void) gtk_box_pack_start (GTK_BOX (hbox2), image1, FALSE, TRUE, 0); gtk_misc_set_alignment (GTK_MISC (image1), 0, 0); - label2 = gtk_label_new ("Configure Frugalware Update Nofitier"); + label2 = gtk_label_new (_("Configure Frugalware Update Nofitier")); gtk_widget_show (label2); gtk_box_pack_start (GTK_BOX (hbox2), label2, TRUE, TRUE, 0); gtk_label_set_use_markup (GTK_LABEL (label2), TRUE); @@ -341,7 +342,7 @@ fun_config_dialog_init (void) gtk_widget_show (hbox1); gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0); - label1 = gtk_label_new ("Update Interval (minutes) :"); + label1 = gtk_label_new (_("Update Interval (minutes) :")); gtk_widget_show (label1); gtk_box_pack_start (GTK_BOX (hbox1), label1, TRUE, TRUE, 0); gtk_label_set_use_markup (GTK_LABEL (label1), TRUE); @@ -377,8 +378,8 @@ fun_ui_init (void) if (fun_dbus_perform_service (TEST_SERVICE, NULL) == FALSE) { - g_print ("Failed to connect to the fun daemon\n"); - fun_tooltip_set_text2 (tooltip, "Not connected to fun daemon", FALSE); + g_print (_("Failed to connect to the fun daemon\n")); + fun_tooltip_set_text2 (tooltip, _("Not connected to fun daemon"), FALSE); connected = FALSE; /* start the connection retry timeout */ g_timeout_add_seconds (30, (GSourceFunc)fun_timeout_conn, NULL); @@ -425,8 +426,8 @@ fun_timeout_func (void) { //g_print ("\nlist is\n %s", plist); //g_print ("Yeaahaaw! success\n"); - fun_tooltip_set_text1 (tooltip, "Updates are available", TRUE); - fun_tooltip_set_text2 (tooltip, "Click here to know more..", TRUE); + fun_tooltip_set_text1 (tooltip, _("Updates are available"), TRUE); + fun_tooltip_set_text2 (tooltip, _("Click here to know more.."), TRUE); fun_tooltip_show (tooltip); cb_fun_systray_enter_notify (NULL, NULL, NULL); } @@ -446,7 +447,7 @@ fun_about_show (void) if (!fun_about_pixbuf) fun_about_pixbuf = gdk_pixbuf_new_from_file ("/usr/share/fun/fun.png", NULL); - ver = g_strdup_printf ("%s", PACKAGE_VERSION); + ver = g_strdup_printf ("v%s", VERSION); fun_about_dlg = gtk_about_dialog_new (); gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(fun_about_dlg), PACKAGE); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(fun_about_dlg), ver); diff --git a/src/fun.c b/src/fun.c index 0750b24..5b0cfe8 100644 --- a/src/fun.c +++ b/src/fun.c @@ -20,17 +20,32 @@ #include #include -#include + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "fun.h" #include "fun-config.h" int main (int argc, char **argv) { + /* set locale */ + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + + /* initialize gtk library */ gtk_init (&argc, &argv); - + + /* initialize dbus and exit if init fails */ if (fun_dbus_init() == FALSE) return 1; + /* initialize fun configuration */ fun_config_init (); + /* initialize fun user interface */ fun_ui_init (); gtk_main (); From priyank at frugalware.org Mon Nov 5 14:20:47 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:07 2007 Subject: [Frugalware-git] fun: added intltool-*.in files Message-ID: <20071105132047.E5C6C1A68066@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=437cf991235581a0a4eb509ab60b6187ecd8b6be commit 437cf991235581a0a4eb509ab60b6187ecd8b6be Author: Priyank Date: Sun Nov 4 13:57:34 2007 +0530 added intltool-*.in files diff --git a/intltool-extract.in b/intltool-extract.in new file mode 100644 index 0000000..7b83435 --- /dev/null +++ b/intltool-extract.in @@ -0,0 +1,861 @@ +#!@INTLTOOL_PERL@ -w +# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + +# +# The Intltool Message Extractor +# +# Copyright (C) 2000-2001, 2003 Free Software Foundation. +# +# Intltool 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. +# +# Intltool 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. +# +# Authors: Kenneth Christiansen +# Darin Adler +# + +## Release information +my $PROGRAM = "intltool-extract"; +my $PACKAGE = "intltool"; +my $VERSION = "0.36.2"; + +## Loaded modules +use strict; +use File::Basename; +use Getopt::Long; + +## Scalars used by the option stuff +my $TYPE_ARG = "0"; +my $LOCAL_ARG = "0"; +my $HELP_ARG = "0"; +my $VERSION_ARG = "0"; +my $UPDATE_ARG = "0"; +my $QUIET_ARG = "0"; +my $SRCDIR_ARG = "."; + +my $FILE; +my $OUTFILE; + +my $gettext_type = ""; +my $input; +my %messages = (); +my %loc = (); +my %count = (); +my %comments = (); +my $strcount = 0; + +my $XMLCOMMENT = ""; + +## Use this instead of \w for XML files to handle more possible characters. +my $w = "[-A-Za-z0-9._:]"; + +## Always print first +$| = 1; + +## Handle options +GetOptions ( + "type=s" => \$TYPE_ARG, + "local|l" => \$LOCAL_ARG, + "help|h" => \$HELP_ARG, + "version|v" => \$VERSION_ARG, + "update" => \$UPDATE_ARG, + "quiet|q" => \$QUIET_ARG, + "srcdir=s" => \$SRCDIR_ARG, + ) or &error; + +&split_on_argument; + + +## Check for options. +## This section will check for the different options. + +sub split_on_argument { + + if ($VERSION_ARG) { + &version; + + } elsif ($HELP_ARG) { + &help; + + } elsif ($LOCAL_ARG) { + &place_local; + &extract; + + } elsif ($UPDATE_ARG) { + &place_normal; + &extract; + + } elsif (@ARGV > 0) { + &place_normal; + &message; + &extract; + + } else { + &help; + + } +} + +sub place_normal { + $FILE = $ARGV[0]; + $OUTFILE = "$FILE.h"; + + my $dirname = dirname ($OUTFILE); + if (! -d "$dirname" && $dirname ne "") { + system ("mkdir -p $dirname"); + } +} + +sub place_local { + $FILE = $ARGV[0]; + $OUTFILE = fileparse($FILE, ()); + if (!-e "tmp/") { + system("mkdir tmp/"); + } + $OUTFILE = "./tmp/$OUTFILE.h" +} + +sub determine_type { + if ($TYPE_ARG =~ /^gettext\/(.*)/) { + $gettext_type=$1 + } +} + +## Sub for printing release information +sub version{ + print <<_EOF_; +${PROGRAM} (${PACKAGE}) $VERSION +Copyright (C) 2000, 2003 Free Software Foundation, Inc. +Written by Kenneth Christiansen, 2000. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +_EOF_ + exit; +} + +## Sub for printing usage information +sub help { + print <<_EOF_; +Usage: ${PROGRAM} [OPTION]... [FILENAME] +Generates a header file from an XML source file. + +It grabs all strings between <_translatable_node> and its end tag in +XML files. Read manpage (man ${PROGRAM}) for more info. + + --type=TYPE Specify the file type of FILENAME. Currently supports: + "gettext/glade", "gettext/ini", "gettext/keys" + "gettext/rfc822deb", "gettext/schemas", + "gettext/scheme", "gettext/xml", "gettext/quoted" + -l, --local Writes output into current working directory + (conflicts with --update) + --update Writes output into the same directory the source file + reside (conflicts with --local) + --srcdir Root of the source tree + -v, --version Output version information and exit + -h, --help Display this help and exit + -q, --quiet Quiet mode + +Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") +or send email to . +_EOF_ + exit; +} + +## Sub for printing error messages +sub error{ + print STDERR "Try `${PROGRAM} --help' for more information.\n"; + exit; +} + +sub message { + print "Generating C format header file for translation.\n" unless $QUIET_ARG; +} + +sub extract { + &determine_type; + + &convert; + + open OUT, ">$OUTFILE"; + binmode (OUT) if $^O eq 'MSWin32'; + &msg_write; + close OUT; + + print "Wrote $OUTFILE\n" unless $QUIET_ARG; +} + +sub convert { + + ## Reading the file + { + local (*IN); + local $/; #slurp mode + open (IN, "<$SRCDIR_ARG/$FILE") || die "can't open $SRCDIR_ARG/$FILE: $!"; + $input = ; + } + + &type_ini if $gettext_type eq "ini"; + &type_keys if $gettext_type eq "keys"; + &type_xml if $gettext_type eq "xml"; + &type_glade if $gettext_type eq "glade"; + &type_scheme if $gettext_type eq "scheme"; + &type_schemas if $gettext_type eq "schemas"; + &type_rfc822deb if $gettext_type eq "rfc822deb"; + &type_quoted if $gettext_type eq "quoted"; +} + +sub entity_decode_minimal +{ + local ($_) = @_; + + s/'/'/g; # ' + s/"/"/g; # " + s/&/&/g; + + return $_; +} + +sub entity_decode +{ + local ($_) = @_; + + s/'/'/g; # ' + s/"/"/g; # " + s/<//g; + s/&/&/g; + + return $_; +} + +sub escape_char +{ + return '\"' if $_ eq '"'; + return '\n' if $_ eq "\n"; + return '\\\\' if $_ eq '\\'; + + return $_; +} + +sub escape +{ + my ($string) = @_; + return join "", map &escape_char, split //, $string; +} + +sub type_ini { + ### For generic translatable desktop files ### + while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) { + if (defined($2)) { + $comments{$3} = $2; + } + $messages{$3} = []; + } +} + +sub type_keys { + ### For generic translatable mime/keys files ### + while ($input =~ /^\s*_\w+=(.*)$/mg) { + $messages{$1} = []; + } +} + +sub type_xml { + ### For generic translatable XML files ### + my $tree = readXml($input); + parseTree(0, $tree); +} + +sub print_var { + my $var = shift; + my $vartype = ref $var; + + if ($vartype =~ /ARRAY/) { + my @arr = @{$var}; + print "[ "; + foreach my $el (@arr) { + print_var($el); + print ", "; + } + print "] "; + } elsif ($vartype =~ /HASH/) { + my %hash = %{$var}; + print "{ "; + foreach my $key (keys %hash) { + print "$key => "; + print_var($hash{$key}); + print ", "; + } + print "} "; + } else { + print $var; + } +} + +# Same syntax as getAttributeString in intltool-merge.in.in, similar logic (look for ## differences comment) +sub getAttributeString +{ + my $sub = shift; + my $do_translate = shift || 1; + my $language = shift || ""; + my $translate = shift; + my $result = ""; + foreach my $e (reverse(sort(keys %{ $sub }))) { + my $key = $e; + my $string = $sub->{$e}; + my $quote = '"'; + + $string =~ s/^[\s]+//; + $string =~ s/[\s]+$//; + + if ($string =~ /^'.*'$/) + { + $quote = "'"; + } + $string =~ s/^['"]//g; + $string =~ s/['"]$//g; + + ## differences from intltool-merge.in.in + if ($key =~ /^_/) { + $comments{entity_decode($string)} = $XMLCOMMENT if $XMLCOMMENT; + $messages{entity_decode($string)} = []; + $$translate = 2; + } + ## differences end here from intltool-merge.in.in + $result .= " $key=$quote$string$quote"; + } + return $result; +} + +# Verbatim copy from intltool-merge.in.in +sub getXMLstring +{ + my $ref = shift; + my $spacepreserve = shift || 0; + my @list = @{ $ref }; + my $result = ""; + + my $count = scalar(@list); + my $attrs = $list[0]; + my $index = 1; + + $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); + $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); + + while ($index < $count) { + my $type = $list[$index]; + my $content = $list[$index+1]; + if (! $type ) { + # We've got CDATA + if ($content) { + # lets strip the whitespace here, and *ONLY* here + $content =~ s/\s+/ /gs if (!$spacepreserve); + $result .= $content; + } + } elsif ( "$type" ne "1" ) { + # We've got another element + $result .= "<$type"; + $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements + if ($content) { + my $subresult = getXMLstring($content, $spacepreserve); + if ($subresult) { + $result .= ">".$subresult . ""; + } else { + $result .= "/>"; + } + } else { + $result .= "/>"; + } + } + $index += 2; + } + return $result; +} + +# Verbatim copy from intltool-merge.in.in, except for MULTIPLE_OUTPUT handling removed +# Translate list of nodes if necessary +sub translate_subnodes +{ + my $fh = shift; + my $content = shift; + my $language = shift || ""; + my $singlelang = shift || 0; + my $spacepreserve = shift || 0; + + my @nodes = @{ $content }; + + my $count = scalar(@nodes); + my $index = 0; + while ($index < $count) { + my $type = $nodes[$index]; + my $rest = $nodes[$index+1]; + traverse($fh, $type, $rest, $language, $spacepreserve); + $index += 2; + } +} + +# Based on traverse() in intltool-merge.in.in +sub traverse +{ + my $fh = shift; # unused, to allow us to sync code between -merge and -extract + my $nodename = shift; + my $content = shift; + my $language = shift || ""; + my $spacepreserve = shift || 0; + + if ($nodename && "$nodename" eq "1") { + $XMLCOMMENT = $content; + } elsif ($nodename) { + # element + my @all = @{ $content }; + my $attrs = shift @all; + my $translate = 0; + my $outattr = getAttributeString($attrs, 1, $language, \$translate); + + if ($nodename =~ /^_/) { + $translate = 1; + $nodename =~ s/^_//; + } + my $lookup = ''; + + $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); + $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); + + if ($translate) { + $lookup = getXMLstring($content, $spacepreserve); + if (!$spacepreserve) { + $lookup =~ s/^\s+//s; + $lookup =~ s/\s+$//s; + } + + if ($lookup && $translate != 2) { + $comments{$lookup} = $XMLCOMMENT if $XMLCOMMENT; + $messages{$lookup} = []; + } elsif ($translate == 2) { + translate_subnodes($fh, \@all, $language, 1, $spacepreserve); + } + } else { + $XMLCOMMENT = ""; + my $count = scalar(@all); + if ($count > 0) { + my $index = 0; + while ($index < $count) { + my $type = $all[$index]; + my $rest = $all[$index+1]; + traverse($fh, $type, $rest, $language, $spacepreserve); + $index += 2; + } + } + } + $XMLCOMMENT = ""; + } +} + + +# Verbatim copy from intltool-merge.in.in, $fh for compatibility +sub parseTree +{ + my $fh = shift; + my $ref = shift; + my $language = shift || ""; + + my $name = shift @{ $ref }; + my $cont = shift @{ $ref }; + + while (!$name || "$name" eq "1") { + $name = shift @{ $ref }; + $cont = shift @{ $ref }; + } + + my $spacepreserve = 0; + my $attrs = @{$cont}[0]; + $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); + + traverse($fh, $name, $cont, $language, $spacepreserve); +} + +# Verbatim copy from intltool-merge.in.in +sub intltool_tree_comment +{ + my $expat = shift; + my $data = $expat->original_string(); + my $clist = $expat->{Curlist}; + my $pos = $#$clist; + + $data =~ s/^$//s; + push @$clist, 1 => $data; +} + +# Verbatim copy from intltool-merge.in.in +sub intltool_tree_cdatastart +{ + my $expat = shift; + my $clist = $expat->{Curlist}; + my $pos = $#$clist; + + push @$clist, 0 => $expat->original_string(); +} + +# Verbatim copy from intltool-merge.in.in +sub intltool_tree_cdataend +{ + my $expat = shift; + my $clist = $expat->{Curlist}; + my $pos = $#$clist; + + $clist->[$pos] .= $expat->original_string(); +} + +# Verbatim copy from intltool-merge.in.in +sub intltool_tree_char +{ + my $expat = shift; + my $text = shift; + my $clist = $expat->{Curlist}; + my $pos = $#$clist; + + # Use original_string so that we retain escaped entities + # in CDATA sections. + # + if ($pos > 0 and $clist->[$pos - 1] eq '0') { + $clist->[$pos] .= $expat->original_string(); + } else { + push @$clist, 0 => $expat->original_string(); + } +} + +# Verbatim copy from intltool-merge.in.in +sub intltool_tree_start +{ + my $expat = shift; + my $tag = shift; + my @origlist = (); + + # Use original_string so that we retain escaped entities + # in attribute values. We must convert the string to an + # @origlist array to conform to the structure of the Tree + # Style. + # + my @original_array = split /\x/, $expat->original_string(); + my $source = $expat->original_string(); + + # Remove leading tag. + # + $source =~ s|^\s*<\s*(\S+)||s; + + # Grab attribute key/value pairs and push onto @origlist array. + # + while ($source) + { + if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/) + { + $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s; + push @origlist, $1; + push @origlist, '"' . $2 . '"'; + } + elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/) + { + $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s; + push @origlist, $1; + push @origlist, "'" . $2 . "'"; + } + else + { + last; + } + } + + my $ol = [ { @origlist } ]; + + push @{ $expat->{Lists} }, $expat->{Curlist}; + push @{ $expat->{Curlist} }, $tag => $ol; + $expat->{Curlist} = $ol; +} + +# Copied from intltool-merge.in.in and added comment handler. +sub readXml +{ + my $xmldoc = shift || return; + my $ret = eval 'require XML::Parser'; + if(!$ret) { + die "You must have XML::Parser installed to run $0\n\n"; + } + my $xp = new XML::Parser(Style => 'Tree'); + $xp->setHandlers(Char => \&intltool_tree_char); + $xp->setHandlers(Start => \&intltool_tree_start); + $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart); + $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend); + + ## differences from intltool-merge.in.in + $xp->setHandlers(Comment => \&intltool_tree_comment); + ## differences end here from intltool-merge.in.in + + my $tree = $xp->parse($xmldoc); + #print_var($tree); + +# Hello thereHowdydo +# would be: +# [foo, [{}, 1, "comment", head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar, +# [{}, 0, "Howdy", ref, [{}]], 0, "do" ] ] + + return $tree; +} + +sub type_schemas { + ### For schemas XML files ### + + # FIXME: We should handle escaped < (less than) + while ($input =~ / + \s* + (\s*(?:\s*)?(.*?)\s*<\/default>\s*)? + (\s*(?:\s*)?(.*?)\s*<\/short>\s*)? + (\s*(?:\s*)?(.*?)\s*<\/long>\s*)? + <\/locale> + /sgx) { + my @totranslate = ($3,$6,$9); + my @eachcomment = ($2,$5,$8); + foreach (@totranslate) { + my $currentcomment = shift @eachcomment; + next if !$_; + s/\s+/ /g; + $messages{entity_decode_minimal($_)} = []; + $comments{entity_decode_minimal($_)} = $currentcomment if (defined($currentcomment)); + } + } +} + +sub type_rfc822deb { + ### For rfc822-style Debian configuration files ### + + my $lineno = 1; + my $type = ''; + while ($input =~ /\G(.*?)(^|\n)(_+)([^:]+):[ \t]*(.*?)(?=\n\S|$)/sg) + { + my ($pre, $newline, $underscore, $tag, $text) = ($1, $2, $3, $4, $5); + while ($pre =~ m/\n/g) + { + $lineno ++; + } + $lineno += length($newline); + my @str_list = rfc822deb_split(length($underscore), $text); + for my $str (@str_list) + { + $strcount++; + $messages{$str} = []; + $loc{$str} = $lineno; + $count{$str} = $strcount; + my $usercomment = ''; + while($pre =~ s/(^|\n)#([^\n]*)$//s) + { + $usercomment = "\n" . $2 . $usercomment; + } + $comments{$str} = $tag . $usercomment; + } + $lineno += ($text =~ s/\n//g); + } +} + +sub rfc822deb_split { + # Debian defines a special way to deal with rfc822-style files: + # when a value contain newlines, it consists of + # 1. a short form (first line) + # 2. a long description, all lines begin with a space, + # and paragraphs are separated by a single dot on a line + # This routine returns an array of all paragraphs, and reformat + # them. + # When first argument is 2, the string is a comma separated list of + # values. + my $type = shift; + my $text = shift; + $text =~ s/^[ \t]//mg; + return (split(/, */, $text, 0)) if $type ne 1; + return ($text) if $text !~ /\n/; + + $text =~ s/([^\n]*)\n//; + my @list = ($1); + my $str = ''; + for my $line (split (/\n/, $text)) + { + chomp $line; + if ($line =~ /^\.\s*$/) + { + # New paragraph + $str =~ s/\s*$//; + push(@list, $str); + $str = ''; + } + elsif ($line =~ /^\s/) + { + # Line which must not be reformatted + $str .= "\n" if length ($str) && $str !~ /\n$/; + $line =~ s/\s+$//; + $str .= $line."\n"; + } + else + { + # Continuation line, remove newline + $str .= " " if length ($str) && $str !~ /\n$/; + $str .= $line; + } + } + $str =~ s/\s*$//; + push(@list, $str) if length ($str); + return @list; +} + +sub type_quoted { + while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { + my $message = $1; + my $before = $`; + $message =~ s/\\\"/\"/g; + $before =~ s/[^\n]//g; + $messages{$message} = []; + $loc{$message} = length ($before) + 2; + } +} + +sub type_glade { + ### For translatable Glade XML files ### + + my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message"; + + while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) { + # Glade sometimes uses tags that normally mark translatable things for + # little bits of non-translatable content. We work around this by not + # translating strings that only includes something like label4 or window1. + $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label|dialog)[0-9]+$/; + } + + while ($input =~ /(..[^<]*)<\/items>/sg) { + for my $item (split (/\n/, $1)) { + $messages{entity_decode($item)} = []; + } + } + + ## handle new glade files + while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) { + $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/; + if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) { + $comments{entity_decode($3)} = entity_decode($2) ; + } + } + while ($input =~ /]*)"\s+description="([^>]+)"\/>/sg) { + $messages{entity_decode_minimal($2)} = []; + } +} + +sub type_scheme { + my ($line, $i, $state, $str, $trcomment, $char); + for $line (split(/\n/, $input)) { + $i = 0; + $state = 0; # 0 - nothing, 1 - string, 2 - translatable string + while ($i < length($line)) { + if (substr($line,$i,1) eq "\"") { + if ($state == 2) { + $comments{$str} = $trcomment if ($trcomment); + $messages{$str} = []; + $str = ''; + $state = 0; $trcomment = ""; + } elsif ($state == 1) { + $str = ''; + $state = 0; $trcomment = ""; + } else { + $state = 1; + $str = ''; + if ($i>0 && substr($line,$i-1,1) eq '_') { + $state = 2; + } + } + } elsif (!$state) { + if (substr($line,$i,1) eq ";") { + $trcomment = substr($line,$i+1); + $trcomment =~ s/^;*\s*//; + $i = length($line); + } elsif ($trcomment && substr($line,$i,1) !~ /\s|\(|\)|_/) { + $trcomment = ""; + } + } else { + if (substr($line,$i,1) eq "\\") { + $char = substr($line,$i+1,1); + if ($char ne "\"" && $char ne "\\") { + $str = $str . "\\"; + } + $i++; + } + $str = $str . substr($line,$i,1); + } + $i++; + } + } +} + +sub msg_write { + my @msgids; + if (%count) + { + @msgids = sort { $count{$a} <=> $count{$b} } keys %count; + } + else + { + @msgids = sort keys %messages; + } + for my $message (@msgids) + { + my $offsetlines = 1; + $offsetlines++ if $message =~ /%/; + if (defined ($comments{$message})) + { + while ($comments{$message} =~ m/\n/g) + { + $offsetlines++; + } + } + print OUT "# ".($loc{$message} - $offsetlines). " \"$FILE\"\n" + if defined $loc{$message}; + print OUT "/* ".$comments{$message}." */\n" + if defined $comments{$message}; + print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/; + + my @lines = split (/\n/, $message, -1); + for (my $n = 0; $n < @lines; $n++) + { + if ($n == 0) + { + print OUT "char *s = N_(\""; + } + else + { + print OUT " \""; + } + + print OUT escape($lines[$n]); + + if ($n < @lines - 1) + { + print OUT "\\n\"\n"; + } + else + { + print OUT "\");\n"; + } + } + } +} + diff --git a/intltool-merge.in b/intltool-merge.in new file mode 100644 index 0000000..e5671d7 --- /dev/null +++ b/intltool-merge.in @@ -0,0 +1,1451 @@ +#!@INTLTOOL_PERL@ -w +# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + +# +# The Intltool Message Merger +# +# Copyright (C) 2000, 2003 Free Software Foundation. +# Copyright (C) 2000, 2001 Eazel, Inc +# +# Intltool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# version 2 published by the Free Software Foundation. +# +# Intltool 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. +# +# Authors: Maciej Stachowiak +# Kenneth Christiansen +# Darin Adler +# +# Proper XML UTF-8'ification written by Cyrille Chepelov +# + +## Release information +my $PROGRAM = "intltool-merge"; +my $PACKAGE = "intltool"; +my $VERSION = "0.36.2"; + +## Loaded modules +use strict; +use Getopt::Long; +use Text::Wrap; +use File::Basename; + +my $must_end_tag = -1; +my $last_depth = -1; +my $translation_depth = -1; +my @tag_stack = (); +my @entered_tag = (); +my @translation_strings = (); +my $leading_space = ""; + +## Scalars used by the option stuff +my $HELP_ARG = 0; +my $VERSION_ARG = 0; +my $BA_STYLE_ARG = 0; +my $XML_STYLE_ARG = 0; +my $KEYS_STYLE_ARG = 0; +my $DESKTOP_STYLE_ARG = 0; +my $SCHEMAS_STYLE_ARG = 0; +my $RFC822DEB_STYLE_ARG = 0; +my $QUOTED_STYLE_ARG = 0; +my $QUIET_ARG = 0; +my $PASS_THROUGH_ARG = 0; +my $UTF8_ARG = 0; +my $MULTIPLE_OUTPUT = 0; +my $cache_file; + +## Handle options +GetOptions +( + "help" => \$HELP_ARG, + "version" => \$VERSION_ARG, + "quiet|q" => \$QUIET_ARG, + "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility + "ba-style|b" => \$BA_STYLE_ARG, + "xml-style|x" => \$XML_STYLE_ARG, + "keys-style|k" => \$KEYS_STYLE_ARG, + "desktop-style|d" => \$DESKTOP_STYLE_ARG, + "schemas-style|s" => \$SCHEMAS_STYLE_ARG, + "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, + "quoted-style" => \$QUOTED_STYLE_ARG, + "pass-through|p" => \$PASS_THROUGH_ARG, + "utf8|u" => \$UTF8_ARG, + "multiple-output|m" => \$MULTIPLE_OUTPUT, + "cache|c=s" => \$cache_file + ) or &error; + +my $PO_DIR; +my $FILE; +my $OUTFILE; + +my %po_files_by_lang = (); +my %translations = (); +my $iconv = $ENV{"ICONV"} || "iconv"; +my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); + +sub isProgramInPath +{ + my ($file) = @_; + # If either a file exists, or when run it returns 0 exit status + return 1 if ((-x $file) or (system("$file -l >$devnull") == 0)); + return 0; +} + +if (! isProgramInPath ("$iconv")) +{ + print STDERR " *** iconv is not found on this system!\n". + " *** Without it, intltool-merge can not convert encodings.\n"; + exit; +} + +# Use this instead of \w for XML files to handle more possible characters. +my $w = "[-A-Za-z0-9._:]"; + +# XML quoted string contents +my $q = "[^\\\"]*"; + +## Check for options. + +if ($VERSION_ARG) +{ + &print_version; +} +elsif ($HELP_ARG) +{ + &print_help; +} +elsif ($BA_STYLE_ARG && @ARGV > 2) +{ + &utf8_sanity_check; + &preparation; + &print_message; + &ba_merge_translations; + &finalize; +} +elsif ($XML_STYLE_ARG && @ARGV > 2) +{ + &utf8_sanity_check; + &preparation; + &print_message; + &xml_merge_output; + &finalize; +} +elsif ($KEYS_STYLE_ARG && @ARGV > 2) +{ + &utf8_sanity_check; + &preparation; + &print_message; + &keys_merge_translations; + &finalize; +} +elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) +{ + &utf8_sanity_check; + &preparation; + &print_message; + &desktop_merge_translations; + &finalize; +} +elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) +{ + &utf8_sanity_check; + &preparation; + &print_message; + &schemas_merge_translations; + &finalize; +} +elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2) +{ + &preparation; + &print_message; + &rfc822deb_merge_translations; + &finalize; +} +elsif ($QUOTED_STYLE_ARG && @ARGV > 2) +{ + &utf8_sanity_check; + &preparation; + &print_message; + "ed_merge_translations; + &finalize; +} +else +{ + &print_help; +} + +exit; + +## Sub for printing release information +sub print_version +{ + print <<_EOF_; +${PROGRAM} (${PACKAGE}) ${VERSION} +Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen. + +Copyright (C) 2000-2003 Free Software Foundation, Inc. +Copyright (C) 2000-2001 Eazel, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +_EOF_ + exit; +} + +## Sub for printing usage information +sub print_help +{ + print <<_EOF_; +Usage: ${PROGRAM} [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE +Generates an output file that includes some localized attributes from an +untranslated source file. + +Mandatory options: (exactly one must be specified) + -b, --ba-style includes translations in the bonobo-activation style + -d, --desktop-style includes translations in the desktop style + -k, --keys-style includes translations in the keys style + -s, --schemas-style includes translations in the schemas style + -r, --rfc822deb-style includes translations in the RFC822 style + --quoted-style includes translations in the quoted string style + -x, --xml-style includes translations in the standard xml style + +Other options: + -u, --utf8 convert all strings to UTF-8 before merging + (default for everything except RFC822 style) + -p, --pass-through deprecated, does nothing and issues a warning + -m, --multiple-output output one localized file per locale, instead of + a single file containing all localized elements + -c, --cache=FILE specify cache file name + (usually \$top_builddir/po/.intltool-merge-cache) + -q, --quiet suppress most messages + --help display this help and exit + --version output version information and exit + +Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") +or send email to . +_EOF_ + exit; +} + + +## Sub for printing error messages +sub print_error +{ + print STDERR "Try `${PROGRAM} --help' for more information.\n"; + exit; +} + + +sub print_message +{ + print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG; +} + + +sub preparation +{ + $PO_DIR = $ARGV[0]; + $FILE = $ARGV[1]; + $OUTFILE = $ARGV[2]; + + &gather_po_files; + &get_translation_database; +} + +# General-purpose code for looking up translations in .po files + +sub po_file2lang +{ + my ($tmp) = @_; + $tmp =~ s/^.*\/(.*)\.po$/$1/; + return $tmp; +} + +sub gather_po_files +{ + if (my $linguas = $ENV{"LINGUAS"}) + { + for my $lang (split / /, $linguas) { + my $po_file = $PO_DIR . "/" . $lang . ".po"; + if (-e $po_file) { + $po_files_by_lang{$lang} = $po_file; + } + } + } + else + { + if (open LINGUAS_FILE, "$PO_DIR/LINGUAS") + { + while () + { + next if /^#/; + + if (/([-a-zA-Z_@.]+)\n/) + { + my $lang = $1; + + my $po_file = $PO_DIR . "/" . $lang . ".po"; + if (-e $po_file) { + $po_files_by_lang{$lang} = $po_file; + } + } + } + + close LINGUAS_FILE; + } + else + { + for my $po_file (glob "$PO_DIR/*.po") { + $po_files_by_lang{po_file2lang($po_file)} = $po_file; + } + } + } +} + +sub get_local_charset +{ + my ($encoding) = @_; + my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias"; + + # seek character encoding aliases in charset.alias (glib) + + if (open CHARSET_ALIAS, $alias_file) + { + while () + { + next if /^\#/; + return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i) + } + + close CHARSET_ALIAS; + } + + # if not found, return input string + + return $encoding; +} + +sub get_po_encoding +{ + my ($in_po_file) = @_; + my $encoding = ""; + + open IN_PO_FILE, $in_po_file or die; + while () + { + ## example: "Content-Type: text/plain; charset=ISO-8859-1\n" + if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) + { + $encoding = $1; + last; + } + } + close IN_PO_FILE; + + if (!$encoding) + { + print STDERR "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n" unless $QUIET_ARG; + $encoding = "ISO-8859-1"; + } + + system ("$iconv -f $encoding -t UTF-8 <$devnull 2>$devnull"); + if ($?) { + $encoding = get_local_charset($encoding); + } + + return $encoding +} + +sub utf8_sanity_check +{ + print STDERR "Warning: option --pass-through has been removed.\n" if $PASS_THROUGH_ARG; + $UTF8_ARG = 1; +} + +sub get_translation_database +{ + if ($cache_file) { + &get_cached_translation_database; + } else { + &create_translation_database; + } +} + +sub get_newest_po_age +{ + my $newest_age; + + foreach my $file (values %po_files_by_lang) + { + my $file_age = -M $file; + $newest_age = $file_age if !$newest_age || $file_age < $newest_age; + } + + $newest_age = 0 if !$newest_age; + + return $newest_age; +} + +sub create_cache +{ + print "Generating and caching the translation database\n" unless $QUIET_ARG; + + &create_translation_database; + + open CACHE, ">$cache_file" || die; + print CACHE join "\x01", %translations; + close CACHE; +} + +sub load_cache +{ + print "Found cached translation database\n" unless $QUIET_ARG; + + my $contents; + open CACHE, "<$cache_file" || die; + { + local $/; + $contents = ; + } + close CACHE; + %translations = split "\x01", $contents; +} + +sub get_cached_translation_database +{ + my $cache_file_age = -M $cache_file; + if (defined $cache_file_age) + { + if ($cache_file_age <= &get_newest_po_age) + { + &load_cache; + return; + } + print "Found too-old cached translation database\n" unless $QUIET_ARG; + } + + &create_cache; +} + +sub create_translation_database +{ + for my $lang (keys %po_files_by_lang) + { + my $po_file = $po_files_by_lang{$lang}; + + if ($UTF8_ARG) + { + my $encoding = get_po_encoding ($po_file); + + if (lc $encoding eq "utf-8") + { + open PO_FILE, "<$po_file"; + } + else + { + print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;; + + open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; + } + } + else + { + open PO_FILE, "<$po_file"; + } + + my $nextfuzzy = 0; + my $inmsgid = 0; + my $inmsgstr = 0; + my $msgid = ""; + my $msgstr = ""; + + while () + { + $nextfuzzy = 1 if /^#, fuzzy/; + + if (/^msgid "((\\.|[^\\]+)*)"/ ) + { + $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; + $msgid = ""; + $msgstr = ""; + + if ($nextfuzzy) { + $inmsgid = 0; + } else { + $msgid = unescape_po_string($1); + $inmsgid = 1; + } + $inmsgstr = 0; + $nextfuzzy = 0; + } + + if (/^msgstr "((\\.|[^\\]+)*)"/) + { + $msgstr = unescape_po_string($1); + $inmsgstr = 1; + $inmsgid = 0; + } + + if (/^"((\\.|[^\\]+)*)"/) + { + $msgid .= unescape_po_string($1) if $inmsgid; + $msgstr .= unescape_po_string($1) if $inmsgstr; + } + } + $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; + } +} + +sub finalize +{ +} + +sub unescape_one_sequence +{ + my ($sequence) = @_; + + return "\\" if $sequence eq "\\\\"; + return "\"" if $sequence eq "\\\""; + return "\n" if $sequence eq "\\n"; + return "\r" if $sequence eq "\\r"; + return "\t" if $sequence eq "\\t"; + return "\b" if $sequence eq "\\b"; + return "\f" if $sequence eq "\\f"; + return "\a" if $sequence eq "\\a"; + return chr(11) if $sequence eq "\\v"; # vertical tab, see ascii(7) + + return chr(hex($1)) if ($sequence =~ /\\x([0-9a-fA-F]{2})/); + return chr(oct($1)) if ($sequence =~ /\\([0-7]{3})/); + + # FIXME: Is \0 supported as well? Kenneth and Rodney don't want it, see bug #48489 + + return $sequence; +} + +sub unescape_po_string +{ + my ($string) = @_; + + $string =~ s/(\\x[0-9a-fA-F]{2}|\\[0-7]{3}|\\.)/unescape_one_sequence($1)/eg; + + return $string; +} + +sub entity_decode +{ + local ($_) = @_; + + s/'/'/g; # ' + s/"/"/g; # " + s/<//g; + s/&/&/g; + + return $_; +} + +# entity_encode: (string) +# +# Encode the given string to XML format (encode '<' etc). + +sub entity_encode +{ + my ($pre_encoded) = @_; + + my @list_of_chars = unpack ('C*', $pre_encoded); + + # with UTF-8 we only encode minimalistic + return join ('', map (&entity_encode_int_minimalist, @list_of_chars)); +} + +sub entity_encode_int_minimalist +{ + return """ if $_ == 34; + return "&" if $_ == 38; + return "'" if $_ == 39; + return "<" if $_ == 60; + return chr $_; +} + +sub entity_encoded_translation +{ + my ($lang, $string) = @_; + + my $translation = $translations{$lang, $string}; + return $string if !$translation; + return entity_encode ($translation); +} + +## XML (bonobo-activation specific) merge code + +sub ba_merge_translations +{ + my $source; + + { + local $/; # slurp mode + open INPUT, "<$FILE" or die "can't open $FILE: $!"; + $source = ; + close INPUT; + } + + open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!"; + # Binmode so that selftest works ok if using a native Win32 Perl... + binmode (OUTPUT) if $^O eq 'MSWin32'; + + while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) + { + print OUTPUT $1; + + my $node = $2 . "\n"; + + my @strings = (); + $_ = $node; + while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) { + push @strings, entity_decode($3); + } + print OUTPUT; + + my %langs; + for my $string (@strings) + { + for my $lang (keys %po_files_by_lang) + { + $langs{$lang} = 1 if $translations{$lang, $string}; + } + } + + for my $lang (sort keys %langs) + { + $_ = $node; + s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s; + s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg; + print OUTPUT; + } + } + + print OUTPUT $source; + + close OUTPUT; +} + + +## XML (non-bonobo-activation) merge code + + +# Process tag attributes +# Only parameter is a HASH containing attributes -> values mapping +sub getAttributeString +{ + my $sub = shift; + my $do_translate = shift || 0; + my $language = shift || ""; + my $result = ""; + my $translate = shift; + foreach my $e (reverse(sort(keys %{ $sub }))) { + my $key = $e; + my $string = $sub->{$e}; + my $quote = '"'; + + $string =~ s/^[\s]+//; + $string =~ s/[\s]+$//; + + if ($string =~ /^'.*'$/) + { + $quote = "'"; + } + $string =~ s/^['"]//g; + $string =~ s/['"]$//g; + + if ($do_translate && $key =~ /^_/) { + $key =~ s|^_||g; + if ($language) { + # Handle translation + my $decode_string = entity_decode($string); + my $translation = $translations{$language, $decode_string}; + if ($translation) { + $translation = entity_encode($translation); + $string = $translation; + } + $$translate = 2; + } else { + $$translate = 2 if ($translate && (!$$translate)); # watch not to "overwrite" $translate + } + } + + $result .= " $key=$quote$string$quote"; + } + return $result; +} + +# Returns a translatable string from XML node, it works on contents of every node in XML::Parser tree +sub getXMLstring +{ + my $ref = shift; + my $spacepreserve = shift || 0; + my @list = @{ $ref }; + my $result = ""; + + my $count = scalar(@list); + my $attrs = $list[0]; + my $index = 1; + + $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); + $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); + + while ($index < $count) { + my $type = $list[$index]; + my $content = $list[$index+1]; + if (! $type ) { + # We've got CDATA + if ($content) { + # lets strip the whitespace here, and *ONLY* here + $content =~ s/\s+/ /gs if (!$spacepreserve); + $result .= $content; + } + } elsif ( "$type" ne "1" ) { + # We've got another element + $result .= "<$type"; + $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements + if ($content) { + my $subresult = getXMLstring($content, $spacepreserve); + if ($subresult) { + $result .= ">".$subresult . ""; + } else { + $result .= "/>"; + } + } else { + $result .= "/>"; + } + } + $index += 2; + } + return $result; +} + +# Translate list of nodes if necessary +sub translate_subnodes +{ + my $fh = shift; + my $content = shift; + my $language = shift || ""; + my $singlelang = shift || 0; + my $spacepreserve = shift || 0; + + my @nodes = @{ $content }; + + my $count = scalar(@nodes); + my $index = 0; + while ($index < $count) { + my $type = $nodes[$index]; + my $rest = $nodes[$index+1]; + if ($singlelang) { + my $oldMO = $MULTIPLE_OUTPUT; + $MULTIPLE_OUTPUT = 1; + traverse($fh, $type, $rest, $language, $spacepreserve); + $MULTIPLE_OUTPUT = $oldMO; + } else { + traverse($fh, $type, $rest, $language, $spacepreserve); + } + $index += 2; + } +} + +sub isWellFormedXmlFragment +{ + my $ret = eval 'require XML::Parser'; + if(!$ret) { + die "You must have XML::Parser installed to run $0\n\n"; + } + + my $fragment = shift; + return 0 if (!$fragment); + + $fragment = "$fragment"; + my $xp = new XML::Parser(Style => 'Tree'); + my $tree = 0; + eval { $tree = $xp->parse($fragment); }; + return $tree; +} + +sub traverse +{ + my $fh = shift; + my $nodename = shift; + my $content = shift; + my $language = shift || ""; + my $spacepreserve = shift || 0; + + if (!$nodename) { + if ($content =~ /^[\s]*$/) { + $leading_space .= $content; + } + print $fh $content; + } else { + # element + my @all = @{ $content }; + my $attrs = shift @all; + my $translate = 0; + my $outattr = getAttributeString($attrs, 1, $language, \$translate); + + if ($nodename =~ /^_/) { + $translate = 1; + $nodename =~ s/^_//; + } + my $lookup = ''; + + $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); + $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); + + print $fh "<$nodename", $outattr; + if ($translate) { + $lookup = getXMLstring($content, $spacepreserve); + if (!$spacepreserve) { + $lookup =~ s/^\s+//s; + $lookup =~ s/\s+$//s; + } + + if ($lookup || $translate == 2) { + my $translation = $translations{$language, $lookup} if isWellFormedXmlFragment($translations{$language, $lookup}); + if ($MULTIPLE_OUTPUT && ($translation || $translate == 2)) { + $translation = $lookup if (!$translation); + print $fh " xml:lang=\"", $language, "\"" if $language; + print $fh ">"; + if ($translate == 2) { + translate_subnodes($fh, \@all, $language, 1, $spacepreserve); + } else { + print $fh $translation; + } + print $fh ""; + + return; # this means there will be no same translation with xml:lang="$language"... + # if we want them both, just remove this "return" + } else { + print $fh ">"; + if ($translate == 2) { + translate_subnodes($fh, \@all, $language, 1, $spacepreserve); + } else { + print $fh $lookup; + } + print $fh ""; + } + } else { + print $fh "/>"; + } + + for my $lang (sort keys %po_files_by_lang) { + if ($MULTIPLE_OUTPUT && $lang ne "$language") { + next; + } + if ($lang) { + # Handle translation + # + my $translate = 0; + my $localattrs = getAttributeString($attrs, 1, $lang, \$translate); + my $translation = $translations{$lang, $lookup} if isWellFormedXmlFragment($translations{$lang, $lookup}); + if ($translate && !$translation) { + $translation = $lookup; + } + + if ($translation || $translate) { + print $fh "\n"; + $leading_space =~ s/.*\n//g; + print $fh $leading_space; + print $fh "<", $nodename, " xml:lang=\"", $lang, "\"", $localattrs, ">"; + if ($translate == 2) { + translate_subnodes($fh, \@all, $lang, 1, $spacepreserve); + } else { + print $fh $translation; + } + print $fh ""; + } + } + } + + } else { + my $count = scalar(@all); + if ($count > 0) { + print $fh ">"; + my $index = 0; + while ($index < $count) { + my $type = $all[$index]; + my $rest = $all[$index+1]; + traverse($fh, $type, $rest, $language, $spacepreserve); + $index += 2; + } + print $fh ""; + } else { + print $fh "/>"; + } + } + } +} + +sub intltool_tree_comment +{ + my $expat = shift; + my $data = shift; + my $clist = $expat->{Curlist}; + my $pos = $#$clist; + + push @$clist, 1 => $data; +} + +sub intltool_tree_cdatastart +{ + my $expat = shift; + my $clist = $expat->{Curlist}; + my $pos = $#$clist; + + push @$clist, 0 => $expat->original_string(); +} + +sub intltool_tree_cdataend +{ + my $expat = shift; + my $clist = $expat->{Curlist}; + my $pos = $#$clist; + + $clist->[$pos] .= $expat->original_string(); +} + +sub intltool_tree_char +{ + my $expat = shift; + my $text = shift; + my $clist = $expat->{Curlist}; + my $pos = $#$clist; + + # Use original_string so that we retain escaped entities + # in CDATA sections. + # + if ($pos > 0 and $clist->[$pos - 1] eq '0') { + $clist->[$pos] .= $expat->original_string(); + } else { + push @$clist, 0 => $expat->original_string(); + } +} + +sub intltool_tree_start +{ + my $expat = shift; + my $tag = shift; + my @origlist = (); + + # Use original_string so that we retain escaped entities + # in attribute values. We must convert the string to an + # @origlist array to conform to the structure of the Tree + # Style. + # + my @original_array = split /\x/, $expat->original_string(); + my $source = $expat->original_string(); + + # Remove leading tag. + # + $source =~ s|^\s*<\s*(\S+)||s; + + # Grab attribute key/value pairs and push onto @origlist array. + # + while ($source) + { + if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/) + { + $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s; + push @origlist, $1; + push @origlist, '"' . $2 . '"'; + } + elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/) + { + $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s; + push @origlist, $1; + push @origlist, "'" . $2 . "'"; + } + else + { + last; + } + } + + my $ol = [ { @origlist } ]; + + push @{ $expat->{Lists} }, $expat->{Curlist}; + push @{ $expat->{Curlist} }, $tag => $ol; + $expat->{Curlist} = $ol; +} + +sub readXml +{ + my $filename = shift || return; + if(!-f $filename) { + die "ERROR Cannot find filename: $filename\n"; + } + + my $ret = eval 'require XML::Parser'; + if(!$ret) { + die "You must have XML::Parser installed to run $0\n\n"; + } + my $xp = new XML::Parser(Style => 'Tree'); + $xp->setHandlers(Char => \&intltool_tree_char); + $xp->setHandlers(Start => \&intltool_tree_start); + $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart); + $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend); + my $tree = $xp->parsefile($filename); + +# Hello thereHowdydo +# would be: +# [foo, [{}, head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar, [{}, +# 0, "Howdy", ref, [{}]], 0, "do" ] ] + + return $tree; +} + +sub print_header +{ + my $infile = shift; + my $fh = shift; + my $source; + + if(!-f $infile) { + die "ERROR Cannot find filename: $infile\n"; + } + + print $fh qq{\n}; + { + local $/; + open DOCINPUT, "<${FILE}" or die; + $source = ; + close DOCINPUT; + } + if ($source =~ /()/s) + { + print $fh "$1\n"; + } + elsif ($source =~ /(]*>)/s) + { + print $fh "$1\n"; + } +} + +sub parseTree +{ + my $fh = shift; + my $ref = shift; + my $language = shift || ""; + + my $name = shift @{ $ref }; + my $cont = shift @{ $ref }; + + while (!$name || "$name" eq "1") { + $name = shift @{ $ref }; + $cont = shift @{ $ref }; + } + + my $spacepreserve = 0; + my $attrs = @{$cont}[0]; + $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); + + traverse($fh, $name, $cont, $language, $spacepreserve); +} + +sub xml_merge_output +{ + my $source; + + if ($MULTIPLE_OUTPUT) { + for my $lang (sort keys %po_files_by_lang) { + if ( ! -d $lang ) { + mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; + } + open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + my $tree = readXml($FILE); + print_header($FILE, \*OUTPUT); + parseTree(\*OUTPUT, $tree, $lang); + 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; +} + +sub keys_merge_translations +{ + open INPUT, "<${FILE}" or die; + open OUTPUT, ">${OUTFILE}" or die; + binmode (OUTPUT) if $^O eq 'MSWin32'; + + while () + { + if (s/^(\s*)_(\w+=(.*))/$1$2/) + { + my $string = $3; + + print OUTPUT; + + my $non_translated_line = $_; + + for my $lang (sort keys %po_files_by_lang) + { + my $translation = $translations{$lang, $string}; + next if !$translation; + + $_ = $non_translated_line; + s/(\w+)=.*/[$lang]$1=$translation/; + print OUTPUT; + } + } + else + { + print OUTPUT; + } + } + + close OUTPUT; + close INPUT; +} + +sub desktop_merge_translations +{ + open INPUT, "<${FILE}" or die; + open OUTPUT, ">${OUTFILE}" or die; + binmode (OUTPUT) if $^O eq 'MSWin32'; + + while () + { + if (s/^(\s*)_(\w+=(.*))/$1$2/) + { + my $string = $3; + + print OUTPUT; + + my $non_translated_line = $_; + + for my $lang (sort keys %po_files_by_lang) + { + my $translation = $translations{$lang, $string}; + next if !$translation; + + $_ = $non_translated_line; + s/(\w+)=.*/${1}[$lang]=$translation/; + print OUTPUT; + } + } + else + { + print OUTPUT; + } + } + + close OUTPUT; + close INPUT; +} + +sub schemas_merge_translations +{ + my $source; + + { + local $/; # slurp mode + open INPUT, "<$FILE" or die "can't open $FILE: $!"; + $source = ; + close INPUT; + } + + open OUTPUT, ">$OUTFILE" or die; + binmode (OUTPUT) if $^O eq 'MSWin32'; + + # FIXME: support attribute translations + + # Empty nodes never need translation, so unmark all of them. + # For example, <_foo/> is just replaced by . + $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; + + while ($source =~ s/ + (.*?) + (\s+)((\s*) + (\s*(?:\s*)?(.*?)\s*<\/default>)?(\s*) + (\s*(?:\s*)?(.*?)\s*<\/short>)?(\s*) + (\s*(?:\s*)?(.*?)\s*<\/long>)?(\s*) + <\/locale>) + //sx) + { + print OUTPUT $1; + + my $locale_start_spaces = $2 ? $2 : ''; + my $default_spaces = $4 ? $4 : ''; + my $short_spaces = $7 ? $7 : ''; + my $long_spaces = $10 ? $10 : ''; + my $locale_end_spaces = $13 ? $13 : ''; + my $c_default_block = $3 ? $3 : ''; + my $default_string = $6 ? $6 : ''; + my $short_string = $9 ? $9 : ''; + my $long_string = $12 ? $12 : ''; + + print OUTPUT "$locale_start_spaces$c_default_block"; + + $default_string =~ s/\s+/ /g; + $default_string = entity_decode($default_string); + $short_string =~ s/\s+/ /g; + $short_string = entity_decode($short_string); + $long_string =~ s/\s+/ /g; + $long_string = entity_decode($long_string); + + for my $lang (sort keys %po_files_by_lang) + { + my $default_translation = $translations{$lang, $default_string}; + my $short_translation = $translations{$lang, $short_string}; + my $long_translation = $translations{$lang, $long_string}; + + next if (!$default_translation && !$short_translation && + !$long_translation); + + print OUTPUT "\n$locale_start_spaces"; + + print OUTPUT "$default_spaces"; + + if ($default_translation) + { + $default_translation = entity_encode($default_translation); + print OUTPUT "$default_translation"; + } + + print OUTPUT "$short_spaces"; + + if ($short_translation) + { + $short_translation = entity_encode($short_translation); + print OUTPUT "$short_translation"; + } + + print OUTPUT "$long_spaces"; + + if ($long_translation) + { + $long_translation = entity_encode($long_translation); + print OUTPUT "$long_translation"; + } + + print OUTPUT "$locale_end_spaces"; + } + } + + print OUTPUT $source; + + close OUTPUT; +} + +sub rfc822deb_merge_translations +{ + my %encodings = (); + for my $lang (keys %po_files_by_lang) { + $encodings{$lang} = ($UTF8_ARG ? 'UTF-8' : get_po_encoding($po_files_by_lang{$lang})); + } + + my $source; + + $Text::Wrap::huge = 'overflow'; + $Text::Wrap::break = qr/\n|\s(?=\S)/; + + { + local $/; # slurp mode + open INPUT, "<$FILE" or die "can't open $FILE: $!"; + $source = ; + close INPUT; + } + + open OUTPUT, ">${OUTFILE}" or die; + binmode (OUTPUT) if $^O eq 'MSWin32'; + + while ($source =~ /(^|\n+)(_*)([^:\s]+)(:[ \t]*)(.*?)(?=\n[\S\n]|$)/sg) + { + my $sep = $1; + my $non_translated_line = $3.$4; + my $string = $5; + my $underscore = length($2); + next if $underscore eq 0 && $non_translated_line =~ /^#/; + # Remove [] dummy strings + my $stripped = $string; + $stripped =~ s/\[\s[^\[\]]*\],/,/g if $underscore eq 2; + $stripped =~ s/\[\s[^\[\]]*\]$//; + $non_translated_line .= $stripped; + + print OUTPUT $sep.$non_translated_line; + + if ($underscore) + { + my @str_list = rfc822deb_split($underscore, $string); + + for my $lang (sort keys %po_files_by_lang) + { + my $is_translated = 1; + my $str_translated = ''; + my $first = 1; + + for my $str (@str_list) + { + my $translation = $translations{$lang, $str}; + + if (!$translation) + { + $is_translated = 0; + last; + } + + # $translation may also contain [] dummy + # strings, mostly to indicate an empty string + $translation =~ s/\[\s[^\[\]]*\]$//; + + if ($first) + { + if ($underscore eq 2) + { + $str_translated .= $translation; + } + else + { + $str_translated .= + Text::Tabs::expand($translation) . + "\n"; + } + } + else + { + if ($underscore eq 2) + { + $str_translated .= ', ' . $translation; + } + else + { + $str_translated .= Text::Tabs::expand( + Text::Wrap::wrap(' ', ' ', $translation)) . + "\n .\n"; + } + } + $first = 0; + + # To fix some problems with Text::Wrap::wrap + $str_translated =~ s/(\n )+\n/\n .\n/g; + } + next unless $is_translated; + + $str_translated =~ s/\n \.\n$//; + $str_translated =~ s/\s+$//; + + $_ = $non_translated_line; + s/^(\w+):\s*.*/$sep${1}-$lang.$encodings{$lang}: $str_translated/s; + print OUTPUT; + } + } + } + print OUTPUT "\n"; + + close OUTPUT; + close INPUT; +} + +sub rfc822deb_split +{ + # Debian defines a special way to deal with rfc822-style files: + # when a value contain newlines, it consists of + # 1. a short form (first line) + # 2. a long description, all lines begin with a space, + # and paragraphs are separated by a single dot on a line + # This routine returns an array of all paragraphs, and reformat + # them. + # When first argument is 2, the string is a comma separated list of + # values. + my $type = shift; + my $text = shift; + $text =~ s/^[ \t]//mg; + return (split(/, */, $text, 0)) if $type ne 1; + return ($text) if $text !~ /\n/; + + $text =~ s/([^\n]*)\n//; + my @list = ($1); + my $str = ''; + + for my $line (split (/\n/, $text)) + { + chomp $line; + if ($line =~ /^\.\s*$/) + { + # New paragraph + $str =~ s/\s*$//; + push(@list, $str); + $str = ''; + } + elsif ($line =~ /^\s/) + { + # Line which must not be reformatted + $str .= "\n" if length ($str) && $str !~ /\n$/; + $line =~ s/\s+$//; + $str .= $line."\n"; + } + else + { + # Continuation line, remove newline + $str .= " " if length ($str) && $str !~ /\n$/; + $str .= $line; + } + } + + $str =~ s/\s*$//; + push(@list, $str) if length ($str); + + return @list; +} + +sub quoted_translation +{ + my ($lang, $string) = @_; + + $string =~ s/\\\"/\"/g; + + my $translation = $translations{$lang, $string}; + $translation = $string if !$translation; + + $translation =~ s/\"/\\\"/g; + return $translation +} + +sub quoted_merge_translations +{ + if (!$MULTIPLE_OUTPUT) { + print "Quoted only supports Multiple Output.\n"; + exit(1); + } + + for my $lang (sort keys %po_files_by_lang) { + if ( ! -d $lang ) { + mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; + } + open INPUT, "<${FILE}" or die; + open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + while () + { + s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge; + print OUTPUT; + } + close OUTPUT; + close INPUT; + } +} diff --git a/intltool-update.in b/intltool-update.in new file mode 100644 index 0000000..bffd10f --- /dev/null +++ b/intltool-update.in @@ -0,0 +1,1164 @@ +#!@INTLTOOL_PERL@ -w +# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + +# +# The Intltool Message Updater +# +# Copyright (C) 2000-2003 Free Software Foundation. +# +# Intltool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# version 2 published by the Free Software Foundation. +# +# Intltool 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. +# +# Authors: Kenneth Christiansen +# Maciej Stachowiak +# Darin Adler + +## Release information +my $PROGRAM = "intltool-update"; +my $VERSION = "0.36.2"; +my $PACKAGE = "intltool"; + +## Loaded modules +use strict; +use Getopt::Long; +use Cwd; +use File::Copy; +use File::Find; + +## Scalars used by the option stuff +my $HELP_ARG = 0; +my $VERSION_ARG = 0; +my $DIST_ARG = 0; +my $POT_ARG = 0; +my $HEADERS_ARG = 0; +my $MAINTAIN_ARG = 0; +my $REPORT_ARG = 0; +my $VERBOSE = 0; +my $GETTEXT_PACKAGE = ""; +my $OUTPUT_FILE = ""; + +my @languages; +my %varhash = (); +my %po_files_by_lang = (); + +# Regular expressions to categorize file types. +# FIXME: Please check if the following is correct + +my $xml_support = +"xml(?:\\.in)*|". # http://www.w3.org/XML/ (Note: .in is not required) +"ui|". # Bonobo specific - User Interface desc. files +"lang|". # ? +"glade2?(?:\\.in)*|". # Glade specific - User Interface desc. files (Note: .in is not required) +"scm(?:\\.in)*|". # ? (Note: .in is not required) +"oaf(?:\\.in)+|". # DEPRECATED: Replaces by Bonobo .server files +"etspec|". # ? +"server(?:\\.in)+|". # Bonobo specific +"sheet(?:\\.in)+|". # ? +"schemas(?:\\.in)+|". # GConf specific +"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. +"kbd(?:\\.in)+|". # GOK specific. +"policy(?:\\.in)+"; # PolicyKit files + +my $ini_support = +"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec +"desktop(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec +"caves(?:\\.in)+|". # GNOME Games specific +"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec +"soundlist(?:\\.in)+|". # GNOME specific +"keys(?:\\.in)+|". # GNOME Mime database specific +"theme(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec +"service(?:\\.in)+"; # DBus specific + +my $buildin_gettext_support = +"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py"; + +## Always flush buffer when printing +$| = 1; + +## Sometimes the source tree will be rooted somewhere else. +my $SRCDIR = $ENV{"srcdir"} || "."; +my $POTFILES_in; + +$POTFILES_in = "<$SRCDIR/POTFILES.in"; + +my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); + +## Handle options +GetOptions +( + "help" => \$HELP_ARG, + "version" => \$VERSION_ARG, + "dist|d" => \$DIST_ARG, + "pot|p" => \$POT_ARG, + "headers|s" => \$HEADERS_ARG, + "maintain|m" => \$MAINTAIN_ARG, + "report|r" => \$REPORT_ARG, + "verbose|x" => \$VERBOSE, + "gettext-package|g=s" => \$GETTEXT_PACKAGE, + "output-file|o=s" => \$OUTPUT_FILE, + ) or &Console_WriteError_InvalidOption; + +&Console_Write_IntltoolHelp if $HELP_ARG; +&Console_Write_IntltoolVersion if $VERSION_ARG; + +my $arg_count = ($DIST_ARG > 0) + + ($POT_ARG > 0) + + ($HEADERS_ARG > 0) + + ($MAINTAIN_ARG > 0) + + ($REPORT_ARG > 0); + +&Console_Write_IntltoolHelp if $arg_count > 1; + +my $PKGNAME = FindPackageName (); + +# --version and --help don't require a module name +my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown"; + +if ($POT_ARG) +{ + &GenerateHeaders; + &GeneratePOTemplate; +} +elsif ($HEADERS_ARG) +{ + &GenerateHeaders; +} +elsif ($MAINTAIN_ARG) +{ + &FindLeftoutFiles; +} +elsif ($REPORT_ARG) +{ + &GenerateHeaders; + &GeneratePOTemplate; + &Console_Write_CoverageReport; +} +elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/) +{ + my $lang = $ARGV[0]; + + ## Report error if the language file supplied + ## to the command line is non-existent + &Console_WriteError_NotExisting("$SRCDIR/$lang.po") + if ! -s "$SRCDIR/$lang.po"; + + if (!$DIST_ARG) + { + print "Working, please wait..." if $VERBOSE; + &GenerateHeaders; + &GeneratePOTemplate; + } + &POFile_Update ($lang, $OUTPUT_FILE); + &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE); +} +else +{ + &Console_Write_IntltoolHelp; +} + +exit; + +######### + +sub Console_Write_IntltoolVersion +{ + print <<_EOF_; +${PROGRAM} (${PACKAGE}) $VERSION +Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler. + +Copyright (C) 2000-2003 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +_EOF_ + exit; +} + +sub Console_Write_IntltoolHelp +{ + print <<_EOF_; +Usage: ${PROGRAM} [OPTION]... LANGCODE +Updates PO template files and merge them with the translations. + +Mode of operation (only one is allowed): + -p, --pot generate the PO template only + -s, --headers generate the header files in POTFILES.in + -m, --maintain search for left out files from POTFILES.in + -r, --report display a status report for the module + -d, --dist merge LANGCODE.po with existing PO template + +Extra options: + -g, --gettext-package=NAME override PO template name, useful with --pot + -o, --output-file=FILE write merged translation to FILE + -x, --verbose display lots of feedback + --help display this help and exit + --version output version information and exit + +Examples of use: +${PROGRAM} --pot just create a new PO template +${PROGRAM} xy create new PO template and merge xy.po with it + +Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") +or send email to . +_EOF_ + exit; +} + +sub echo_n +{ + my $str = shift; + my $ret = `echo "$str"`; + + $ret =~ s/\n$//; # do we need the "s" flag? + + return $ret; +} + +sub POFile_DetermineType ($) +{ + my $type = $_; + my $gettext_type; + + my $xml_regex = "(?:" . $xml_support . ")"; + my $ini_regex = "(?:" . $ini_support . ")"; + my $buildin_regex = "(?:" . $buildin_gettext_support . ")"; + + if ($type =~ /\[type: gettext\/([^\]].*)]/) + { + $gettext_type=$1; + } + elsif ($type =~ /schemas(\.in)+$/) + { + $gettext_type="schemas"; + } + elsif ($type =~ /glade2?(\.in)*$/) + { + $gettext_type="glade"; + } + elsif ($type =~ /scm(\.in)*$/) + { + $gettext_type="scheme"; + } + elsif ($type =~ /keys(\.in)+$/) + { + $gettext_type="keys"; + } + + # bucket types + + elsif ($type =~ /$xml_regex$/) + { + $gettext_type="xml"; + } + elsif ($type =~ /$ini_regex$/) + { + $gettext_type="ini"; + } + elsif ($type =~ /$buildin_regex$/) + { + $gettext_type="buildin"; + } + else + { + $gettext_type="unknown"; + } + + return "gettext\/$gettext_type"; +} + +sub TextFile_DetermineEncoding ($) +{ + my $gettext_code="ASCII"; # All files are ASCII by default + my $filetype=`file $_ | cut -d ' ' -f 2`; + + if ($? eq "0") + { + if ($filetype =~ /^(ISO|UTF)/) + { + chomp ($gettext_code = $filetype); + } + elsif ($filetype =~ /^XML/) + { + $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8 + } + } + + return $gettext_code; +} + +sub isNotValidMissing +{ + my ($file) = @_; + + return if $file =~ /^\{arch\}\/.*$/; + return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/; +} + +sub FindLeftoutFiles +{ + my (@buf_i18n_plain, + @buf_i18n_xml, + @buf_i18n_xml_unmarked, + @buf_i18n_ini, + @buf_potfiles, + @buf_potfiles_ignore, + @buf_allfiles, + @buf_allfiles_sorted, + @buf_potfiles_sorted, + @buf_potfiles_ignore_sorted + ); + + ## Search and find all translatable files + find sub { + push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; + 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)+)$/; + }, ".."; + find sub { + push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; + 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/.."; + + open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; + @buf_potfiles = grep !/^(#|\s*$)/, ; + close POTFILES; + + foreach (@buf_potfiles) { + s/^\[.*]\s*//; + } + + print "Searching for missing translatable files...\n" if $VERBOSE; + + ## Check if we should ignore some found files, when + ## comparing with POTFILES.in + foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") + { + (-s "$SRCDIR/$ignore") or next; + + if ("$ignore" eq "POTFILES.ignore") + { + print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n". + "content of this file to POTFILES.skip.\n"; + } + + print "Found $ignore: Ignoring files...\n" if $VERBOSE; + open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n"; + + while () + { + push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/; + } + close FILE; + + @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore); + } + + foreach my $file (@buf_i18n_plain) + { + my $in_comment = 0; + my $in_macro = 0; + + open FILE, "<$file"; + while () + { + # Handle continued multi-line comment. + if ($in_comment) + { + next unless s-.*\*/--; + $in_comment = 0; + } + + # Handle continued macro. + if ($in_macro) + { + $in_macro = 0 unless /\\$/; + next; + } + + # Handle start of macro (or any preprocessor directive). + if (/^\s*\#/) + { + $in_macro = 1 if /^([^\\]|\\.)*\\$/; + next; + } + + # Handle comments and quoted text. + while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy + { + my $match = $1; + if ($match eq "/*") + { + if (!s-/\*.*?\*/--) + { + s-/\*.*--; + $in_comment = 1; + } + } + elsif ($match eq "//") + { + s-//.*--; + } + else # ' or " + { + if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) + { + warn "mismatched quotes at line $. in $file\n"; + s-$match.*--; + } + } + } + + if (/\w\.GetString *\(QUOTEDTEXT/) + { + if (defined isNotValidMissing (unpack("x3 A*", $file))) { + ## Remove the first 3 chars and add newline + push @buf_allfiles, unpack("x3 A*", $file) . "\n"; + } + last; + } + + ## N_ Q_ and _ are the three macros defined in gi8n.h + if (/[NQ]?_ *\(QUOTEDTEXT/) + { + if (defined isNotValidMissing (unpack("x3 A*", $file))) { + ## Remove the first 3 chars and add newline + push @buf_allfiles, unpack("x3 A*", $file) . "\n"; + } + last; + } + } + close FILE; + } + + foreach my $file (@buf_i18n_xml) + { + open FILE, "<$file"; + + while () + { + # FIXME: share the pattern matching code with intltool-extract + if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/ || /translatable=\"yes\"/) + { + if (defined isNotValidMissing (unpack("x3 A*", $file))) { + push @buf_allfiles, unpack("x3 A*", $file) . "\n"; + } + last; + } + } + close FILE; + } + + foreach my $file (@buf_i18n_ini) + { + open FILE, "<$file"; + while () + { + if (/_(.*)=/) + { + if (defined isNotValidMissing (unpack("x3 A*", $file))) { + push @buf_allfiles, unpack("x3 A*", $file) . "\n"; + } + last; + } + } + close FILE; + } + + foreach my $file (@buf_i18n_xml_unmarked) + { + if (defined isNotValidMissing (unpack("x3 A*", $file))) { + push @buf_allfiles, unpack("x3 A*", $file) . "\n"; + } + } + + + @buf_allfiles_sorted = sort (@buf_allfiles); + @buf_potfiles_sorted = sort (@buf_potfiles); + + my %in2; + foreach (@buf_potfiles_sorted) + { + s#^$SRCDIR/../##; + s#^$SRCDIR/##; + $in2{$_} = 1; + } + + foreach (@buf_potfiles_ignore_sorted) + { + s#^$SRCDIR/../##; + s#^$SRCDIR/##; + $in2{$_} = 1; + } + + my @result; + + foreach (@buf_allfiles_sorted) + { + my $dummy = $_; + my $srcdir = $SRCDIR; + + $srcdir =~ s#^../##; + $dummy =~ s#^$srcdir/../##; + $dummy =~ s#^$srcdir/##; + $dummy =~ s#_build/##; + if (!exists($in2{$dummy})) + { + push @result, $dummy + } + } + + my @buf_potfiles_notexist; + + foreach (@buf_potfiles_sorted) + { + chomp (my $dummy = $_); + if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy")) + { + push @buf_potfiles_notexist, $_; + } + } + + ## Save file with information about the files missing + ## if any, and give information about this procedure. + if (@result + @buf_potfiles_notexist > 0) + { + if (@result) + { + print "\n" if $VERBOSE; + unlink "missing"; + open OUT, ">missing"; + print OUT @result; + close OUT; + warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n". + "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n"; + print STDERR @result, "\n"; + warn "If some of these files are left out on purpose then please add them to\n". + "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n". + "of left out files has been written in the current directory.\n"; + } + if (@buf_potfiles_notexist) + { + unlink "notexist"; + open OUT, ">notexist"; + print OUT @buf_potfiles_notexist; + close OUT; + warn "\n" if ($VERBOSE or @result); + warn "\e[1mThe following files do not exist anymore:\e[0m\n\n"; + warn @buf_potfiles_notexist, "\n"; + warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n". + "containing this list of absent files has been written in the current directory.\n"; + } + } + + ## If there is nothing to complain about, notify the user + else { + print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE; + } +} + +sub Console_WriteError_InvalidOption +{ + ## Handle invalid arguments + print STDERR "Try `${PROGRAM} --help' for more information.\n"; + exit 1; +} + +sub isProgramInPath +{ + my ($file) = @_; + # If either a file exists, or when run it returns 0 exit status + return 1 if ((-x $file) or (system("$file --version >$devnull") == 0)); + return 0; +} + +sub isGNUGettextTool +{ + my ($file) = @_; + # Check that we are using GNU gettext tools + if (isProgramInPath ($file)) + { + my $version = `$file --version`; + return 1 if ($version =~ m/.*\(GNU .*\).*/); + } + return 0; +} + +sub GenerateHeaders +{ + my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract"; + + ## Generate the .h header files, so we can allow glade and + ## xml translation support + if (! isProgramInPath ("$EXTRACT")) + { + print STDERR "\n *** The intltool-extract script wasn't found!" + ."\n *** Without it, intltool-update can not generate files.\n"; + exit; + } + else + { + open (FILE, $POTFILES_in) or die "$PROGRAM: POTFILES.in not found.\n"; + + while () + { + chomp; + next if /^\[\s*encoding/; + + ## Find xml files in POTFILES.in and generate the + ## files with help from the extract script + + my $gettext_type= &POFile_DetermineType ($1); + + if (/\.($xml_support|$ini_support)$/ || /^\[/) + { + s/^\[[^\[].*]\s*//; + + my $filename = "../$_"; + + if ($VERBOSE) + { + system ($EXTRACT, "--update", "--srcdir=$SRCDIR", + "--type=$gettext_type", $filename); + } + else + { + system ($EXTRACT, "--update", "--type=$gettext_type", + "--srcdir=$SRCDIR", "--quiet", $filename); + } + } + } + close FILE; + } +} + +# +# Generate .pot file from POTFILES.in +# +sub GeneratePOTemplate +{ + my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext"; + my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; + chomp $XGETTEXT; + + if (! isGNUGettextTool ("$XGETTEXT")) + { + print STDERR " *** GNU xgettext is not found on this system!\n". + " *** Without it, intltool-update can not extract strings.\n"; + exit; + } + + print "Building $MODULE.pot...\n" if $VERBOSE; + + open INFILE, $POTFILES_in; + unlink "POTFILES.in.temp"; + open OUTFILE, ">POTFILES.in.temp" or die("Cannot open POTFILES.in.temp for writing"); + + my $gettext_support_nonascii = 0; + + # checks for GNU gettext >= 0.12 + my $dummy = `$XGETTEXT --version --from-code=UTF-8 >$devnull 2>$devnull`; + if ($? == 0) + { + $gettext_support_nonascii = 1; + } + else + { + # urge everybody to upgrade gettext + print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n". + " strings. That means you should install a version of gettext\n". + " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n". + " or have to let non-ASCII strings untranslated. (If there is any)\n"; + } + + my $encoding = "ASCII"; + my $forced_gettext_code; + my @temp_headers; + my $encoding_problem_is_reported = 0; + + while () + { + next if (/^#/ or /^\s*$/); + + chomp; + + my $gettext_code; + + if (/^\[\s*encoding:\s*(.*)\s*\]/) + { + $forced_gettext_code=$1; + } + elsif (/\.($xml_support|$ini_support)$/ || /^\[/) + { + s/^\[.*]\s*//; + print OUTFILE "../$_.h\n"; + push @temp_headers, "../$_.h"; + $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code); + } + else + { + print OUTFILE "$SRCDIR/../$_\n"; + $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code); + } + + next if (! $gettext_support_nonascii); + + if (defined $forced_gettext_code) + { + $encoding=$forced_gettext_code; + } + elsif (defined $gettext_code and "$encoding" ne "$gettext_code") + { + if ($encoding eq "ASCII") + { + $encoding=$gettext_code; + } + elsif ($gettext_code ne "ASCII") + { + # Only report once because the message is quite long + if (! $encoding_problem_is_reported) + { + print STDERR "WARNING: You should use the same file encoding for all your project files,\n". + " but $PROGRAM thinks that most of the source files are in\n". + " $encoding encoding, while \"$_\" is (likely) in\n". + " $gettext_code encoding. If you are sure that all translatable strings\n". + " are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n". + " line to POTFILES.in:\n\n". + " [encoding: UTF-8]\n\n". + " and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n". + "(such warning message will only be reported once.)\n"; + $encoding_problem_is_reported = 1; + } + } + } + } + + close OUTFILE; + close INFILE; + + unlink "$MODULE.pot"; + my @xgettext_argument=("$XGETTEXT", + "--add-comments", + "--directory\=.", + "--default-domain\=$MODULE", + "--flag\=g_strdup_printf:1:c-format", + "--flag\=g_string_printf:2:c-format", + "--flag\=g_string_append_printf:2:c-format", + "--flag\=g_error_new:3:c-format", + "--flag\=g_set_error:4:c-format", + "--flag\=g_markup_printf_escaped:1:c-format", + "--flag\=g_log:3:c-format", + "--flag\=g_print:1:c-format", + "--flag\=g_printerr:1:c-format", + "--flag\=g_printf:1:c-format", + "--flag\=g_fprintf:2:c-format", + "--flag\=g_sprintf:2:c-format", + "--flag\=g_snprintf:3:c-format", + "--flag\=g_scanner_error:2:c-format", + "--flag\=g_scanner_warn:2:c-format", + "--output\=$MODULE\.pot", + "--files-from\=\.\/POTFILES\.in\.temp"); + 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, "--from-code\=$encoding" if ($gettext_support_nonascii); + push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; + my $xgettext_command = join ' ', @xgettext_argument; + + # intercept xgettext error message + print "Running $xgettext_command\n" if $VERBOSE; + my $xgettext_error_msg = `$xgettext_command 2>\&1`; + my $command_failed = $?; + + unlink "POTFILES.in.temp"; + + print "Removing generated header (.h) files..." if $VERBOSE; + unlink foreach (@temp_headers); + print "done.\n" if $VERBOSE; + + if (! $command_failed) + { + if (! -e "$MODULE.pot") + { + print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE; + } + else + { + print "Wrote $MODULE.pot\n" if $VERBOSE; + } + } + else + { + if ($xgettext_error_msg =~ /--from-code/) + { + # replace non-ASCII error message with a more useful one. + print STDERR "ERROR: xgettext failed to generate PO template file because there is non-ASCII\n". + " string marked for translation. Please make sure that all strings marked\n". + " for translation are in uniform encoding (say UTF-8), then \e[1m*prepend*\e[0m the\n". + " following line to POTFILES.in and rerun $PROGRAM:\n\n". + " [encoding: UTF-8]\n\n"; + } + else + { + print STDERR "$xgettext_error_msg"; + if (-e "$MODULE.pot") + { + # is this possible? + print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n". + " Please consult error message above if there is any.\n"; + } + else + { + print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n". + " error message above if there is any.\n"; + } + } + exit (1); + } +} + +sub POFile_Update +{ + -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; + + my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge"; + my ($lang, $outfile) = @_; + + if (! isGNUGettextTool ("$MSGMERGE")) + { + print STDERR " *** GNU msgmerge is not found on this system!\n". + " *** Without it, intltool-update can not extract strings.\n"; + exit; + } + + print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; + + my $infile = "$SRCDIR/$lang.po"; + $outfile = "$SRCDIR/$lang.po" if ($outfile eq ""); + + # I think msgmerge won't overwrite old file if merge is not successful + system ("$MSGMERGE", "-o", $outfile, $infile, "$MODULE.pot"); +} + +sub Console_WriteError_NotExisting +{ + my ($file) = @_; + + ## Report error if supplied language file is non-existing + print STDERR "$PROGRAM: $file does not exist!\n"; + print STDERR "Try '$PROGRAM --help' for more information.\n"; + exit; +} + +sub GatherPOFiles +{ + my @po_files = glob ("./*.po"); + + @languages = map (&POFile_GetLanguage, @po_files); + + foreach my $lang (@languages) + { + $po_files_by_lang{$lang} = shift (@po_files); + } +} + +sub POFile_GetLanguage ($) +{ + s/^(.*\/)?(.+)\.po$/$2/; + return $_; +} + +sub Console_Write_TranslationStatus +{ + my ($lang, $output_file) = @_; + my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; + + if (! isGNUGettextTool ("$MSGFMT")) + { + print STDERR " *** GNU msgfmt is not found on this system!\n". + " *** Without it, intltool-update can not extract strings.\n"; + exit; + } + + $output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); + + system ("$MSGFMT", "-o", "$devnull", "--verbose", $output_file); +} + +sub Console_Write_CoverageReport +{ + my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; + + if (! isGNUGettextTool ("$MSGFMT")) + { + print STDERR " *** GNU msgfmt is not found on this system!\n". + " *** Without it, intltool-update can not extract strings.\n"; + exit; + } + + &GatherPOFiles; + + foreach my $lang (@languages) + { + print STDERR "$lang: "; + &POFile_Update ($lang, ""); + } + + print STDERR "\n\n * Current translation support in $MODULE \n\n"; + + foreach my $lang (@languages) + { + print STDERR "$lang: "; + system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po"); + } +} + +sub SubstituteVariable +{ + my ($str) = @_; + + # always need to rewind file whenever it has been accessed + seek (CONF, 0, 0); + + # cache each variable. varhash is global to we can add + # variables elsewhere. + while () + { + if (/^(\w+)=(.*)$/) + { + ($varhash{$1} = $2) =~ s/^["'](.*)["']$/$1/; + } + } + + if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; + my $sub = ""; + # Ignore recursive definitions of variables + $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; + + return SubstituteVariable ("$untouched$sub$rest"); + } + + # We're using Perl backticks ` and "echo -n" here in order to + # expand any shell escapes (such as backticks themselves) in every variable + return echo_n ($str); +} + +sub CONF_Handle_Open +{ + my $base_dirname = getcwd(); + $base_dirname =~ s@.*/@@; + + my ($conf_in, $src_dir); + + if ($base_dirname =~ /^po(-.+)?$/) + { + if (-f "Makevars") + { + my $makefile_source; + + local (*IN); + open (IN, ") + { + if (/^top_builddir[ \t]*=/) + { + $src_dir = $_; + $src_dir =~ s/^top_builddir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; + + chomp $src_dir; + if (-f "$src_dir" . "/configure.ac") { + $conf_in = "$src_dir" . "/configure.ac" . "\n"; + } else { + $conf_in = "$src_dir" . "/configure.in" . "\n"; + } + last; + } + } + close IN; + + $conf_in || die "Cannot find top_builddir in Makevars."; + } + elsif (-f "$SRCDIR/../configure.ac") + { + $conf_in = "$SRCDIR/../configure.ac"; + } + elsif (-f "$SRCDIR/../configure.in") + { + $conf_in = "$SRCDIR/../configure.in"; + } + else + { + my $makefile_source; + + local (*IN); + open (IN, ") + { + if (/^top_srcdir[ \t]*=/) + { + $src_dir = $_; + $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; + + chomp $src_dir; + $conf_in = "$src_dir" . "/configure.in" . "\n"; + + last; + } + } + close IN; + + $conf_in || die "Cannot find top_srcdir in Makefile."; + } + + open (CONF, "<$conf_in"); + } + else + { + print STDERR "$PROGRAM: Unable to proceed.\n" . + "Make sure to run this script inside the po directory.\n"; + exit; + } +} + +sub FindPackageName +{ + my $version; + my $domain = &FindMakevarsDomain; + my $name = $domain || "untitled"; + + &CONF_Handle_Open; + + my $conf_source; { + local (*IN); + open (IN, "<&CONF") || return $name; + seek (IN, 0, 0); + local $/; # slurp mode + $conf_source = ; + close IN; + } + + # priority for getting package name: + # 1. GETTEXT_PACKAGE + # 2. first argument of AC_INIT (with >= 2 arguments) + # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument) + + # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m + # the \s makes this not work, why? + if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m) + { + ($name, $version) = ($1, $2); + $name =~ s/[\[\]\s]//g; + $version =~ s/[\[\]\s]//g; + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); + $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); + $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) + { + ($name, $version) = ($1, $2); + $name =~ s/[\[\]\s]//g; + $version =~ s/[\[\]\s]//g; + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); + $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); + $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); + } + + # \s makes this not work, why? + $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m; + + # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value + # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables. + $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g; + + $name = $domain if $domain; + + $name = SubstituteVariable ($name); + $name =~ s/^["'](.*)["']$/$1/; + + return $name if $name; +} + + +sub FindPOTKeywords +{ + + my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_ --keyword\=Q\_"; + my $varname = "XGETTEXT_OPTIONS"; + my $make_source; { + local (*IN); + open (IN, "; + close IN; + } + + $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m; + + return $keywords; +} + +sub FindMakevarsDomain +{ + + my $domain = ""; + my $makevars_source; { + local (*IN); + open (IN, "; + close IN; + } + + $domain = $1 if $makevars_source =~ /^DOMAIN[ ]*=\[?([^\n\]\$]+)/m; + $domain =~ s/^\s+//; + $domain =~ s/\s+$//; + + return $domain; +} + +sub FindMakevarsBugAddress +{ + + my $address = ""; + my $makevars_source; { + local (*IN); + open (IN, "; + close IN; + } + + $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m; + $address =~ s/^\s+//; + $address =~ s/\s+$//; + + return $address; +} From priyank at frugalware.org Mon Nov 5 14:20:49 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 5 14:21:07 2007 Subject: [Frugalware-git] fun: fun-ui: small fix in version string in about dialog Message-ID: <20071105132049.68D6B1A68053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=30e373f669e970258172c93c03c680ebf1d35c77 commit 30e373f669e970258172c93c03c680ebf1d35c77 Author: Priyank Date: Sun Nov 4 19:44:18 2007 +0530 fun-ui: small fix in version string in about dialog diff --git a/src/fun-ui.c b/src/fun-ui.c index e844c8e..ea2e903 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -447,7 +447,7 @@ fun_about_show (void) if (!fun_about_pixbuf) fun_about_pixbuf = gdk_pixbuf_new_from_file ("/usr/share/fun/fun.png", NULL); - ver = g_strdup_printf ("v%s", VERSION); + ver = g_strdup_printf ("%s", VERSION); fun_about_dlg = gtk_about_dialog_new (); gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(fun_about_dlg), PACKAGE); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(fun_about_dlg), ver); From voroskoi at frugalware.org Mon Nov 5 14:40:13 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 5 14:40:16 2007 Subject: [Frugalware-git] frugalware-current: qca-2.0.0-1-i686 Message-ID: <20071105134013.547801A68053@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=27da20ff975991924b14aa5fe0c3f807f9f28bd7 commit 27da20ff975991924b14aa5fe0c3f807f9f28bd7 Author: voroskoi Date: Mon Nov 5 14:36:36 2007 +0100 qca-2.0.0-1-i686 version bump diff --git a/source/xlib-extra/qca/FrugalBuild b/source/xlib-extra/qca/FrugalBuild index 6eabaeb..106ea1a 100644 --- a/source/xlib-extra/qca/FrugalBuild +++ b/source/xlib-extra/qca/FrugalBuild @@ -1,20 +1,20 @@ -# Compiling Time: ~0.02 SBU +# Compiling Time: 1.44 SBU # Contributor: Unger Gabor # Maintainer: voroskoi pkgname=qca -pkgver=1.0 -pkgrel=2 -pkgdesc="QT Cryptography Architecture" +pkgver=2.0.0 +pkgrel=1 +pkgdesc="QCA aims to provide a straightforward and cross-platform crypto API, using Qt datatypes and conventions." url="http://delta.affinix.com/qca/" groups=('xlib-extra') archs=('i686' 'x86_64') -license="LGPL" -depends=('qt') -source=(http://delta.affinix.com/download/qca/$pkgname-$pkgver.tar.bz2) -up2date="lynx -dump http://delta.affinix.com/download/qca/ |Flasttarbz2" +license="LGPL 2.1" +depends=('qt4>=4.2') +source=(http://delta.affinix.com/download/qca/2.0/qca-$pkgver.tar.bz2) +up2date="lynx -dump http://delta.affinix.com/download/qca/2.0 |Flasttarbz2" options=('scriptlet') -sha1sums=('b4b166f9dbbe222ebaf5287582a0ba29ddbc1391') +sha1sums=('5b896647426637e1974703f2950786746408c70b') build() { Fmake From voroskoi at frugalware.org Mon Nov 5 14:55:27 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 5 14:55:31 2007 Subject: [Frugalware-git] frugalware-current: mutt-devel-1.5.17-1-i686 Message-ID: <20071105135527.A63C71A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=29674979c7190e83b95ec8e8acb16091836a44b4 commit 29674979c7190e83b95ec8e8acb16091836a44b4 Author: voroskoi Date: Mon Nov 5 14:51:58 2007 +0100 mutt-devel-1.5.17-1-i686 version bump diff --git a/source/network-extra/mutt-devel/FrugalBuild b/source/network-extra/mutt-devel/FrugalBuild index bec7462..4a2605d 100644 --- a/source/network-extra/mutt-devel/FrugalBuild +++ b/source/network-extra/mutt-devel/FrugalBuild @@ -4,7 +4,7 @@ pkgname=mutt-devel origname=mutt -pkgver=1.5.16 +pkgver=1.5.17 pkgrel=1 pkgdesc="A small but very powerful text-based mail client development release." url="http://www.mutt.org/" From voroskoi at frugalware.org Mon Nov 5 15:04:54 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 5 15:04:57 2007 Subject: [Frugalware-git] frugalware-current: gaupol-0.12.3-1-i686 Message-ID: <20071105140454.D2E8637802B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=63a94522fa09deb4ac0a451109b58cf6bd6084db commit 63a94522fa09deb4ac0a451109b58cf6bd6084db Author: voroskoi Date: Mon Nov 5 15:04:34 2007 +0100 gaupol-0.12.3-1-i686 version bump diff --git a/source/gnome-extra/gaupol/FrugalBuild b/source/gnome-extra/gaupol/FrugalBuild index f799b72..b6ef6fd 100644 --- a/source/gnome-extra/gaupol/FrugalBuild +++ b/source/gnome-extra/gaupol/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=gaupol -pkgver=0.12.2 +pkgver=0.12.3 pkgrel=1 pkgdesc="Gaupol is a subtitle editor for text-based subtitles." url="http://home.gna.org/gaupol/" @@ -14,6 +14,6 @@ archs=('i686' 'x86_64') license="GPLv3" up2date="lynx -dump $url/download.html |grep gaupol.*.tar |sed -ne 's/.*l-\(.*\).t.*/\1/;1 p'" source=(http://download.gna.org/gaupol/0.12/$pkgname-$pkgver.tar.gz) -sha1sums=('b49a3f99e24a1fedd24845f2c8456293763109b4') +sha1sums=('6e9de7c5e02dd63601ef93fb2184d2cbf60061c3') # optimization OK - noarch From vmiklos at frugalware.org Mon Nov 5 15:17:36 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 15:17:38 2007 Subject: [Frugalware-git] frugalwareutils: convert libfrugalwareutils manpage to asciidoc Message-ID: <20071105141736.49DD337803D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=4013a773520714c72a245af22c18008153642ec7 commit 4013a773520714c72a245af22c18008153642ec7 Author: Miklos Vajna Date: Mon Nov 5 15:10:38 2007 +0100 convert libfrugalwareutils manpage to asciidoc diff --git a/apidoc/Makefile b/apidoc/Makefile index 9f5482e..1d63fc4 100644 --- a/apidoc/Makefile +++ b/apidoc/Makefile @@ -19,7 +19,11 @@ -include ../Makefile.inc -include ../config.mak +ifneq ($(asciidoc),) +compile: frugalwareutils.3 +else compile: +endif ifneq ($(doxygen),) cd .. && doxygen Doxyfile rm -rf man3/_* @@ -27,12 +31,24 @@ endif install: ifneq ($(doxygen),) - for i in man3/* frugalwareutils.3; do \ + for i in man3/*; do \ $(INSTALL) -m644 $$i $(DESTDIR)$(mandir)/man3/; \ done endif +ifneq ($(asciidoc),) + $(INSTALL) -m644 frugalwareutils.3 $(DESTDIR)$(mandir)/man3/ +endif clean: rm -rf man3 + rm -f frugalwareutils.3 prepare: + +frugalwareutils.3: + asciidoc -d manpage -b docbook frugalwareutils.txt + sed -i '/. diff --git a/apidoc/frugalwareutils.txt b/apidoc/frugalwareutils.txt new file mode 100644 index 0000000..caa9515 --- /dev/null +++ b/apidoc/frugalwareutils.txt @@ -0,0 +1,27 @@ += libfrugalwareutils(3) + +== NAME + +frugalwareutils - Developer documentation for the Frugalware configuration libraries + +== SYNOPSIS + +For ease of access, the frugalwareutils manual has been split up into several sections. + +libfwutil:: Functions to make writing Frugalware configuration tools easier. +libfwdialog:: Functions to make libdialog usage easier. +libfwnetconfig:: Functions to make network configuration easier. +libfwtimeconfig:: Functions to make time configuration easier. +libfwraidconfig:: Functions to make RAID configuration easier. +libfwmouseconfig:: Functions to make mouse configuration easier. +libfwxconfig:: Functions to make X configuration easier. +libfwxwmonfig:: Functions to make XDM configuration easier. +libfwgrubonfig:: Functions to make GRUB configuration easier. + +== AUTHOR + +Written by Miklos Vajna. + +== REPORTING BUGS + +If you find any bug, then please file a bugreport at . From vmiklos at frugalware.org Mon Nov 5 15:17:36 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 15:17:39 2007 Subject: [Frugalware-git] frugalwareutils: remove xml files on make clean (generated by asciidoc for manpages) Message-ID: <20071105141736.610EF37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=d99126c70ad4345e232b6882cd18a354342afff1 commit d99126c70ad4345e232b6882cd18a354342afff1 Author: Miklos Vajna Date: Mon Nov 5 15:12:23 2007 +0100 remove xml files on make clean (generated by asciidoc for manpages) diff --git a/apidoc/Makefile b/apidoc/Makefile index 1d63fc4..f7759fd 100644 --- a/apidoc/Makefile +++ b/apidoc/Makefile @@ -40,8 +40,7 @@ ifneq ($(asciidoc),) endif clean: - rm -rf man3 - rm -f frugalwareutils.3 + rm -rf man3 frugalwareutils.3 *.xml prepare: From vmiklos at frugalware.org Mon Nov 5 16:01:09 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 16:01:23 2007 Subject: [Frugalware-git] frugalwareutils: grubconfig: added --version and --help switches Message-ID: <20071105150109.1A52F37803D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=215f65fd30966a78b9010476dd9554ea12942057 commit 215f65fd30966a78b9010476dd9554ea12942057 Author: Miklos Vajna Date: Mon Nov 5 15:27:00 2007 +0100 grubconfig: added --version and --help switches diff --git a/grubconfig/Makefile b/grubconfig/Makefile index 5b35afc..03fb6d8 100644 --- a/grubconfig/Makefile +++ b/grubconfig/Makefile @@ -17,7 +17,7 @@ # -include ../config.mak -CFLAGS = $(LIB_CFLAGS) +CFLAGS = $(LIB_CFLAGS) -DVERSION="\"$(VERSION)\"" LDFLAGS=-ldialog -lcurses -lm CFLAGS += $(shell pkg-config --cflags glib-2.0) LDFLAGS += $(shell pkg-config --libs glib-2.0) diff --git a/grubconfig/grubconfig.c b/grubconfig/grubconfig.c index 4e35ea6..0622bfe 100644 --- a/grubconfig/grubconfig.c +++ b/grubconfig/grubconfig.c @@ -72,6 +72,20 @@ int run(int argc, char **argv) int mode, needrelease; struct stat buf; + if(argc > 1) + { + if(!strcmp(argv[1], "--help")) + { + system("man grubconfig"); + return(0); + } + else if(!strcmp(argv[1], "--version")) + { + printf("%s %s\n", argv[0], VERSION); + return(0); + } + } + fwutil_i18ninit(__FILE__); init_dialog(input, dialog_state.output); fwdialog_backtitle(_("GRUB bootloader")); From vmiklos at frugalware.org Mon Nov 5 16:01:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 16:01:24 2007 Subject: [Frugalware-git] frugalwareutils: mouseconfig: added --version and --help switches Message-ID: <20071105150110.26FD937805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=da86f4bcc08bf4be7738a90572e4fd25a8d0a53d commit da86f4bcc08bf4be7738a90572e4fd25a8d0a53d Author: Miklos Vajna Date: Mon Nov 5 15:30:23 2007 +0100 mouseconfig: added --version and --help switches diff --git a/mouseconfig/Makefile b/mouseconfig/Makefile index a5e4484..add4c08 100644 --- a/mouseconfig/Makefile +++ b/mouseconfig/Makefile @@ -17,7 +17,7 @@ # -include ../config.mak -CFLAGS = $(LIB_CFLAGS) +CFLAGS = $(LIB_CFLAGS) -DVERSION="\"$(VERSION)\"" LDFLAGS=-ldialog -lcurses -lm CFLAGS += $(shell pkg-config --cflags glib-2.0) LDFLAGS += $(shell pkg-config --libs glib-2.0) diff --git a/mouseconfig/mouseconfig.c b/mouseconfig/mouseconfig.c index 8d0d7b3..e13c9d0 100644 --- a/mouseconfig/mouseconfig.c +++ b/mouseconfig/mouseconfig.c @@ -94,6 +94,20 @@ int run(int argc, char **argv) char *mouse_type=NULL, *mtype=NULL, *link=NULL; + if(argc > 1) + { + if(!strcmp(argv[1], "--help")) + { + system("man mouseconfig"); + return(0); + } + else if(!strcmp(argv[1], "--version")) + { + printf("%s %s\n", argv[0], VERSION); + return(0); + } + } + fwutil_i18ninit(__FILE__); if(argv!=NULL) init_dialog(input, dialog_state.output); From vmiklos at frugalware.org Mon Nov 5 16:01:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 16:01:24 2007 Subject: [Frugalware-git] frugalwareutils: raidconfig: added --help and --version switches Message-ID: <20071105150110.E190337803D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=2041526d682d59d40190a1d54ef2f5ac55da5876 commit 2041526d682d59d40190a1d54ef2f5ac55da5876 Author: Miklos Vajna Date: Mon Nov 5 15:48:28 2007 +0100 raidconfig: added --help and --version switches diff --git a/raidconfig/Makefile b/raidconfig/Makefile index 8a87657..fd692ad 100644 --- a/raidconfig/Makefile +++ b/raidconfig/Makefile @@ -17,7 +17,7 @@ # -include ../config.mak -CFLAGS = $(LIB_CFLAGS) +CFLAGS = $(LIB_CFLAGS) -DVERSION="\"$(VERSION)\"" LDFLAGS=-ldialog -lcurses -lm -lparted CFLAGS += $(shell pkg-config --cflags glib-2.0) LDFLAGS += $(shell pkg-config --libs glib-2.0) diff --git a/raidconfig/raidconfig.c b/raidconfig/raidconfig.c index 3848b42..20f4af9 100644 --- a/raidconfig/raidconfig.c +++ b/raidconfig/raidconfig.c @@ -115,6 +115,20 @@ int run(int argc, char **argv) int level; GList *devlist; + if(argc > 1) + { + if(!strcmp(argv[1], "--help")) + { + system("man raidconfig"); + return(0); + } + else if(!strcmp(argv[1], "--version")) + { + printf("%s %s\n", argv[0], VERSION); + return(0); + } + } + fwutil_i18ninit(__FILE__); if(argv!=NULL) init_dialog(input, dialog_state.output); From vmiklos at frugalware.org Mon Nov 5 16:01:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 16:01:26 2007 Subject: [Frugalware-git] frugalwareutils: xconfig: added --help and --version switches Message-ID: <20071105150111.284DC37803D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=1c78509dc8816e7ef310bfcb899f2806247bb268 commit 1c78509dc8816e7ef310bfcb899f2806247bb268 Author: Miklos Vajna Date: Mon Nov 5 15:56:29 2007 +0100 xconfig: added --help and --version switches diff --git a/xconfig/Makefile b/xconfig/Makefile index f71c632..a45e3ff 100644 --- a/xconfig/Makefile +++ b/xconfig/Makefile @@ -17,7 +17,7 @@ # -include ../config.mak -CFLAGS = $(LIB_CFLAGS) +CFLAGS = $(LIB_CFLAGS) -DVERSION="\"$(VERSION)\"" LDFLAGS=-ldialog -lcurses -lm CFLAGS += $(shell pkg-config --cflags glib-2.0) LDFLAGS += $(shell pkg-config --libs glib-2.0) diff --git a/xconfig/xconfig.c b/xconfig/xconfig.c index 57c623e..82eac4e 100644 --- a/xconfig/xconfig.c +++ b/xconfig/xconfig.c @@ -38,16 +38,29 @@ int run(int argc, char **argv) int needrelease, ret, silent=0; fwutil_i18ninit(__FILE__); - if(argc>1 && !strcmp(argv[1], "--live")) + if(argc > 1) { - if(argc!=4) + if(!strcmp(argv[1], "--live")) { - printf(_("usage: %s [--live \n"), argv[0]); - return(1); + if(argc!=4) + { + printf(_("usage: %s [--live \n"), argv[0]); + return(1); + } + res = argv[2]; + depth = argv[3]; + silent=1; + } + else if(!strcmp(argv[1], "--help")) + { + system("man xconfig"); + return(0); + } + else if(!strcmp(argv[1], "--version")) + { + printf("%s %s\n", argv[0], VERSION); + return(0); } - res = argv[2]; - depth = argv[3]; - silent=1; } init_dialog(input, dialog_state.output); From vmiklos at frugalware.org Mon Nov 5 16:01:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 16:01:26 2007 Subject: [Frugalware-git] frugalwareutils: timeconfig: added --help and --version switches Message-ID: <20071105150111.127123780BC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=7bc50937de1cb8192758a25551c01d03d93779c5 commit 7bc50937de1cb8192758a25551c01d03d93779c5 Author: Miklos Vajna Date: Mon Nov 5 15:52:10 2007 +0100 timeconfig: added --help and --version switches diff --git a/timeconfig/Makefile b/timeconfig/Makefile index b96704d..6c28594 100644 --- a/timeconfig/Makefile +++ b/timeconfig/Makefile @@ -17,7 +17,7 @@ # -include ../config.mak -CFLAGS = $(LIB_CFLAGS) +CFLAGS = $(LIB_CFLAGS) -DVERSION="\"$(VERSION)\"" LDFLAGS=-ldialog -lcurses -lm CFLAGS += $(shell pkg-config --cflags glib-2.0) LDFLAGS += $(shell pkg-config --libs glib-2.0) diff --git a/timeconfig/timeconfig.c b/timeconfig/timeconfig.c index 0014f1b..a3bd6e9 100644 --- a/timeconfig/timeconfig.c +++ b/timeconfig/timeconfig.c @@ -107,6 +107,20 @@ int run(int argc, char **argv) char *ptr; GList *zones; + if(argc > 1) + { + if(!strcmp(argv[1], "--help")) + { + system("man timeconfig"); + return(0); + } + else if(!strcmp(argv[1], "--version")) + { + printf("%s %s\n", argv[0], VERSION); + return(0); + } + } + fwutil_i18ninit(__FILE__); if(argv!=NULL) init_dialog(input, dialog_state.output); From vmiklos at frugalware.org Mon Nov 5 16:01:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 5 16:01:27 2007 Subject: [Frugalware-git] frugalwareutils: xwmconfig: added --version switch Message-ID: <20071105150111.5416637805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=7e32a2b1bd34f0d36e4a2bafe6690a5a84560989 commit 7e32a2b1bd34f0d36e4a2bafe6690a5a84560989 Author: Miklos Vajna Date: Mon Nov 5 16:00:29 2007 +0100 xwmconfig: added --version switch diff --git a/xwmconfig/Makefile b/xwmconfig/Makefile index 7734b4d..8a0b823 100644 --- a/xwmconfig/Makefile +++ b/xwmconfig/Makefile @@ -17,7 +17,7 @@ # -include ../config.mak -CFLAGS = $(LIB_CFLAGS) +CFLAGS = $(LIB_CFLAGS) -DVERSION="\"$(VERSION)\"" LDFLAGS=-ldialog -lcurses -lm CFLAGS += $(shell pkg-config --cflags glib-2.0) LDFLAGS += $(shell pkg-config --libs glib-2.0) diff --git a/xwmconfig/xwmconfig.c b/xwmconfig/xwmconfig.c index 9f465e8..94905ba 100644 --- a/xwmconfig/xwmconfig.c +++ b/xwmconfig/xwmconfig.c @@ -74,6 +74,7 @@ int run(int argc, char **argv) {"force", no_argument, 0, 1000}, {"help", no_argument, 0, 1001}, {"silent", no_argument, 0, 1002}, + {"version", no_argument, 0, 1003}, {0, 0, 0, 0} }; @@ -88,6 +89,7 @@ int run(int argc, char **argv) case 1000: xwm_force = 1; break; case 1001: usage(argv[0]); return(0); case 1002: xwm_silent = 1; break; + case 1003: printf("%s %s\n", argv[0], VERSION); return(0); } } From krics at linuxforum.hu Mon Nov 5 17:08:28 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Nov 5 17:08:32 2007 Subject: [Frugalware-git] frugalware-current: procmail-3.22-4-x86_64 Message-ID: <20071105160828.5E61937803D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=19b4a263de58559bf5eb3468e8020aec5146a9f3 commit 19b4a263de58559bf5eb3468e8020aec5146a9f3 Author: Christian Hamar alias krix Date: Mon Nov 5 17:08:10 2007 +0100 procmail-3.22-4-x86_64 * Release bump (Oldies cleanup) * Added some || return 1 after install stuff to avoid breaks * Use Fcd and Fmkdir diff --git a/source/network/procmail/FrugalBuild b/source/network/procmail/FrugalBuild index f974d92..be49053 100644 --- a/source/network/procmail/FrugalBuild +++ b/source/network/procmail/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 0.01 SBU +# Compiling Time: 0.19 SBU # Maintainer: VMiklos pkgname=procmail pkgver=3.22 -pkgrel=3 +pkgrel=4 pkgdesc="A mail processing and local delivery program" url="http://www.procmail.net/" depends=('glibc') @@ -14,7 +14,7 @@ source=(http://www.procmail.org/$pkgname-$pkgver.tar.gz) sha1sums=('cd4e44c15559816453fd60349e5a32289f6f2965') build() { - cd $startdir/src/$pkgname-$pkgver + Fcd for i in Makefile src/Makefile man/Makefile do sed -i "s/CFLAGS0 = -O/CFLAGS0 = -O $CFLAGS/" $i @@ -22,10 +22,12 @@ build() { yes n | make LOCKINGTEST="/tmp ." || return 1 - mkdir -p $startdir/pkg/usr/man/man{1,5} - install -D -m4755 src/procmail $startdir/pkg/usr/bin/procmail - install -m755 src/{formail,lockfile} $startdir/pkg/usr/bin/ - install -m644 man/*.1 $startdir/pkg/usr/man/man1/ - install -m644 man/*.5 $startdir/pkg/usr/man/man5/ + Fmkdir usr/share/man/man{1,5} + install -D -m4755 src/procmail $startdir/pkg/usr/bin/procmail || return 1 + install -m755 src/{formail,lockfile} $startdir/pkg/usr/bin/ || return 1 + install -m644 man/*.1 $startdir/pkg/usr/share/man/man1/ || return 1 + install -m644 man/*.5 $startdir/pkg/usr/share/man/man5/ || return 1 } + +# optimization OK From crazy at frugalware.org Mon Nov 5 17:34:53 2007 From: crazy at frugalware.org (crazy) Date: Mon Nov 5 17:35:00 2007 Subject: [Frugalware-git] frugalware-current: smpeg-0.4.4-2-x86_64 Message-ID: <20071105163453.CFEA81A68052@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9d484541469aa36124d684850704f0a4328e235c commit 9d484541469aa36124d684850704f0a4328e235c Author: crazy Date: Mon Nov 5 17:34:44 2007 +0100 smpeg-0.4.4-2-x86_64 * release bump ( in fact rewrote the whole FB ) * new m8r * man that package was really broken * added a lot patches to fix most issues * added x86_64 to arch diff --git a/source/xmultimedia-extra/smpeg/FrugalBuild b/source/xmultimedia-extra/smpeg/FrugalBuild index ec6bb7a..69cde9e 100644 --- a/source/xmultimedia-extra/smpeg/FrugalBuild +++ b/source/xmultimedia-extra/smpeg/FrugalBuild @@ -1,16 +1,57 @@ # Compiling Time: 0.20 SBU -# Maintainer: DNAku +# Maintainer: crazy pkgname=smpeg pkgver=0.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="SDL MPEG Player Library is a general purpose MPEG video/audio player" url="http://www.lokigames.com/development/smpeg.php3" -depends=('sdl') -archs=('i686') -up2date="lynx -dump http://www.lokigames.com/development/smpeg.php3 |grep latest| sed 's/.*now.//g'|sed 's/..C.*//g'" +depends=('sdl' 'libx11' 'mesa' 'libxi' 'libxext' 'freeglut') +makedepends=('gnuconfig' 'libtool') +archs=('i686' 'x86_64') +up2date="lynx -dump $url |grep latest| sed 's/.*now.//g'|sed 's/..C.*//g'" groups=('xmultimedia-extra') -source=(ftp://sunsite.dk/pub/os/linux/loki/open-source/smpeg/smpeg-$pkgver.tar.gz) -sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259') +#source=(ftp://ftp.lokigames.com/pub/open-source/$pkgname/$pkgname-$pkgver.tar.gz \ +source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/xmultimedia-extra/smpeg/smpeg-0.4.4.tar.gz \ + $pkgname-$pkgver-die-die-die.patch \ + $pkgname-$pkgver-m4.patch \ + $pkgname-$pkgver-gnu-stack.patch \ + $pkgname-$pkgver-config.patch \ + $pkgname-$pkgver-PIC.patch \ + $pkgname-$pkgver-gcc41.patch \ + $pkgname-$pkgver-mmx.patch \ + $pkgname-$pkgver-malloc.patch) +sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' \ + 'dd194199dbcf14b0896efef6519528dc46edad7e' \ + 'fdd98ffeb92a4b23913dd8c6ed0d2e22d3a154e4' \ + '6d6a1edfca83fe1fa05657899a32b05b0b07e75e' \ + '88a099bfa49f65e4c0006d7c8e2acfeb16f414f8' \ + 'ca210893cfd50554730918e572dc6d48192aa3f4' \ + '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e' \ + '23c5a0cb58952998fc8507406459703de742aac2' \ + '3c8722e389dd08af5669dcc02d61995cd752ca89') -# optimalization OK + +build() +{ + # BLAH! Weird! + export CXX=g++ CC=g++ AS=as + Fcd + Fpatchall + echo "m4_pattern_allow([AC_TYPE_SOCKLEN_T])" >>acinclude.m4 || Fdie + touch NEWS AUTHORS ChangeLog || Fdie + cat /usr/share/gnuconfig/config.guess >config.guess || Fdie + cat /usr/share/gnuconfig/config.sub >config.sub || Fdie + #libtoolize --automake -c -f || Fdie + Fautoreconf + Fmake \ + --with-x \ + --enable-opengl-player \ + --enable-debug \ + --disable-gtk-player \ + --disable-gtk-tests + Fmakeinstall + Frm usr/share/man/man1/gtv.1 +} + +# optimization OK diff --git a/source/xmultimedia-extra/smpeg/FrugalBuild~ b/source/xmultimedia-extra/smpeg/FrugalBuild~ new file mode 100644 index 0000000..24caa44 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/FrugalBuild~ @@ -0,0 +1,58 @@ +# Compiling Time: 0.20 SBU +# Maintainer: crazy +# Contribitor: DNAku + +pkgname=smpeg +pkgver=0.4.4 +pkgrel=2 +pkgdesc="SDL MPEG Player Library is a general purpose MPEG video/audio player" +url="http://www.lokigames.com/development/smpeg.php3" +depends=('sdl' 'libx11' 'mesa' 'libxi' 'libxext' 'freeglut') +makedepends=('gnuconfig' 'libtool') +archs=('i686') +up2date="lynx -dump $url |grep latest| sed 's/.*now.//g'|sed 's/..C.*//g'" +groups=('xmultimedia-extra') +#source=(ftp://ftp.lokigames.com/pub/open-source/$pkgname/$pkgname-$pkgver.tar.gz \ +source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/xmultimedia-extra/smpeg/smpeg-0.4.4.tar.gz \ + $pkgname-$pkgver-die-die-die.patch \ + $pkgname-$pkgver-m4.patch \ + $pkgname-$pkgver-gnu-stack.patch \ + $pkgname-$pkgver-config.patch \ + $pkgname-$pkgver-PIC.patch \ + $pkgname-$pkgver-gcc41.patch \ + $pkgname-$pkgver-mmx.patch \ + $pkgname-$pkgver-malloc.patch) +sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' \ + 'dd194199dbcf14b0896efef6519528dc46edad7e' \ + 'fdd98ffeb92a4b23913dd8c6ed0d2e22d3a154e4' \ + '6d6a1edfca83fe1fa05657899a32b05b0b07e75e' \ + '88a099bfa49f65e4c0006d7c8e2acfeb16f414f8' \ + 'ca210893cfd50554730918e572dc6d48192aa3f4' \ + '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e' \ + '23c5a0cb58952998fc8507406459703de742aac2' \ + '3c8722e389dd08af5669dcc02d61995cd752ca89') + + +build() +{ + # BLAH! Weird! + export CXX=g++ CC=g++ AS=as + Fcd + Fpatchall + echo "m4_pattern_allow([AC_TYPE_SOCKLEN_T])" >>acinclude.m4 || Fdie + touch NEWS AUTHORS ChangeLog || Fdie + cat /usr/share/gnuconfig/config.guess >config.guess || Fdie + cat /usr/share/gnuconfig/config.sub >config.sub || Fdie + #libtoolize --automake -c -f || Fdie + Fautoreconf + Fmake \ + --with-x \ + --enable-opengl-player \ + --enable-debug \ + --disable-gtk-player \ + --disable-gtk-tests + Fmakeinstall + Frm usr/share/man/man1/gtv.1 +} + +# optimization OK diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-PIC.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-PIC.patch new file mode 100644 index 0000000..8866301 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-PIC.patch @@ -0,0 +1,308 @@ +Fix PIC issues in mmx routines + +--- video/mmxflags_asm.S ++++ video/mmxflags_asm.S +@@ -1,11 +1,6 @@ + + #if defined(i386) && defined(USE_MMX) + +-.data +- .align 16 +- .type flags,@object +-flags: .long 0 +- + .text + .align 4 + .globl cpu_flags +@@ -40,16 +35,13 @@ cpu_flags: + xorl %ecx,%eax + je cpu_flags.L1 + +- pusha ++ pushl %ebx + + movl $1,%eax + cpuid ++ movl %edx,%eax + +- movl %edx,flags +- +- popa +- +- movl flags,%eax ++ popl %ebx + + cpu_flags.L1: + ret +--- video/mmxidct_asm.S ++++ video/mmxidct_asm.S +@@ -31,11 +31,6 @@ preSC: .short 16384,22725,21407,19266, + x0005000200010001: + .long 0x00010001,0x00050002 + .align 8 +- .type x0040000000000000,@object +- .size x0040000000000000,8 +-x0040000000000000: +- .long 0, 0x00400000 +- .align 8 + .type x5a825a825a825a82,@object + .size x5a825a825a825a82,8 + x5a825a825a825a82: +@@ -80,8 +75,21 @@ scratch7: + x0: + .long 0,0 + .align 8 ++ + .text + .align 4 ++ ++#ifdef __PIC__ ++# undef __i686 /* gcc define gets in our way */ ++# define MUNG(sym) sym ## @GOTOFF(%ebx) ++# define INIT_PIC() \ ++ call __i686.get_pc_thunk.bx ; \ ++ addl $_GLOBAL_OFFSET_TABLE_, %ebx ++#else ++# define MUNG(sym) sym ++# define INIT_PIC() ++#endif ++ + .globl IDCT_mmx + .type IDCT_mmx,@function + IDCT_mmx: +@@ -92,8 +100,9 @@ IDCT_mmx: + pushl %edx + pushl %esi + pushl %edi ++ INIT_PIC() + movl 8(%ebp),%esi /* source matrix */ +- leal preSC, %ecx ++ leal MUNG(preSC), %ecx + /* column 0: even part + * use V4, V12, V0, V8 to produce V22..V25 + */ +@@ -109,7 +118,7 @@ IDCT_mmx: + movq %mm1, %mm2 /* added 11/1/96 */ + pmulhw 8*8(%esi),%mm5 /* V8 */ + psubsw %mm0, %mm1 /* V16 */ +- pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V18 */ ++ pmulhw MUNG(x5a825a825a825a82), %mm1 /* 23170 ->V18 */ + paddsw %mm0, %mm2 /* V17 */ + movq %mm2, %mm0 /* duplicate V17 */ + psraw $1, %mm2 /* t75=t82 */ +@@ -150,7 +159,7 @@ IDCT_mmx: + paddsw %mm0, %mm3 /* V29 ; free mm0 */ + movq %mm7, %mm1 /* duplicate V26 */ + psraw $1, %mm3 /* t91=t94 */ +- pmulhw x539f539f539f539f,%mm7 /* V33 */ ++ pmulhw MUNG(x539f539f539f539f),%mm7 /* V33 */ + psraw $1, %mm1 /* t96 */ + movq %mm5, %mm0 /* duplicate V2 */ + psraw $2, %mm4 /* t85=t87 */ +@@ -158,15 +167,15 @@ IDCT_mmx: + psubsw %mm4, %mm0 /* V28 ; free mm4 */ + movq %mm0, %mm2 /* duplicate V28 */ + psraw $1, %mm5 /* t90=t93 */ +- pmulhw x4546454645464546,%mm0 /* V35 */ ++ pmulhw MUNG(x4546454645464546),%mm0 /* V35 */ + psraw $1, %mm2 /* t97 */ + movq %mm5, %mm4 /* duplicate t90=t93 */ + psubsw %mm2, %mm1 /* V32 ; free mm2 */ +- pmulhw x61f861f861f861f8,%mm1 /* V36 */ ++ pmulhw MUNG(x61f861f861f861f8),%mm1 /* V36 */ + psllw $1, %mm7 /* t107 */ + paddsw %mm3, %mm5 /* V31 */ + psubsw %mm3, %mm4 /* V30 ; free mm3 */ +- pmulhw x5a825a825a825a82,%mm4 /* V34 */ ++ pmulhw MUNG(x5a825a825a825a82),%mm4 /* V34 */ + nop + psubsw %mm1, %mm0 /* V38 */ + psubsw %mm7, %mm1 /* V37 ; free mm7 */ +@@ -233,7 +242,7 @@ IDCT_mmx: + psubsw %mm7, %mm1 /* V50 */ + pmulhw 8*9(%esi), %mm5 /* V9 */ + paddsw %mm7, %mm2 /* V51 */ +- pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V52 */ ++ pmulhw MUNG(x5a825a825a825a82), %mm1 /* 23170 ->V52 */ + movq %mm2, %mm6 /* duplicate V51 */ + psraw $1, %mm2 /* t138=t144 */ + movq %mm3, %mm4 /* duplicate V1 */ +@@ -274,11 +283,11 @@ IDCT_mmx: + * even more by doing the correction step in a later stage when the number + * is actually multiplied by 16 + */ +- paddw x0005000200010001, %mm4 ++ paddw MUNG(x0005000200010001), %mm4 + psubsw %mm6, %mm3 /* V60 ; free mm6 */ + psraw $1, %mm0 /* t154=t156 */ + movq %mm3, %mm1 /* duplicate V60 */ +- pmulhw x539f539f539f539f, %mm1 /* V67 */ ++ pmulhw MUNG(x539f539f539f539f), %mm1 /* V67 */ + movq %mm5, %mm6 /* duplicate V3 */ + psraw $2, %mm4 /* t148=t150 */ + paddsw %mm4, %mm5 /* V61 */ +@@ -287,13 +296,13 @@ IDCT_mmx: + psllw $1, %mm1 /* t169 */ + paddsw %mm0, %mm5 /* V65 -> result */ + psubsw %mm0, %mm4 /* V64 ; free mm0 */ +- pmulhw x5a825a825a825a82, %mm4 /* V68 */ ++ pmulhw MUNG(x5a825a825a825a82), %mm4 /* V68 */ + psraw $1, %mm3 /* t158 */ + psubsw %mm6, %mm3 /* V66 */ + movq %mm5, %mm2 /* duplicate V65 */ +- pmulhw x61f861f861f861f8, %mm3 /* V70 */ ++ pmulhw MUNG(x61f861f861f861f8), %mm3 /* V70 */ + psllw $1, %mm6 /* t165 */ +- pmulhw x4546454645464546, %mm6 /* V69 */ ++ pmulhw MUNG(x4546454645464546), %mm6 /* V69 */ + psraw $1, %mm2 /* t172 */ + /* moved from next block */ + movq 8*5(%esi), %mm0 /* V56 */ +@@ -418,7 +427,7 @@ IDCT_mmx: + * movq 8*13(%esi), %mm4 tmt13 + */ + psubsw %mm4, %mm3 /* V134 */ +- pmulhw x5a825a825a825a82, %mm3 /* 23170 ->V136 */ ++ pmulhw MUNG(x5a825a825a825a82), %mm3 /* 23170 ->V136 */ + movq 8*9(%esi), %mm6 /* tmt9 */ + paddsw %mm4, %mm5 /* V135 ; mm4 free */ + movq %mm0, %mm4 /* duplicate tmt1 */ +@@ -447,17 +456,17 @@ IDCT_mmx: + psubsw %mm7, %mm0 /* V144 */ + movq %mm0, %mm3 /* duplicate V144 */ + paddsw %mm7, %mm2 /* V147 ; free mm7 */ +- pmulhw x539f539f539f539f, %mm0 /* 21407-> V151 */ ++ pmulhw MUNG(x539f539f539f539f), %mm0 /* 21407-> V151 */ + movq %mm1, %mm7 /* duplicate tmt3 */ + paddsw %mm5, %mm7 /* V145 */ + psubsw %mm5, %mm1 /* V146 ; free mm5 */ + psubsw %mm1, %mm3 /* V150 */ + movq %mm7, %mm5 /* duplicate V145 */ +- pmulhw x4546454645464546, %mm1 /* 17734-> V153 */ ++ pmulhw MUNG(x4546454645464546), %mm1 /* 17734-> V153 */ + psubsw %mm2, %mm5 /* V148 */ +- pmulhw x61f861f861f861f8, %mm3 /* 25080-> V154 */ ++ pmulhw MUNG(x61f861f861f861f8), %mm3 /* 25080-> V154 */ + psllw $2, %mm0 /* t311 */ +- pmulhw x5a825a825a825a82, %mm5 /* 23170-> V152 */ ++ pmulhw MUNG(x5a825a825a825a82), %mm5 /* 23170-> V152 */ + paddsw %mm2, %mm7 /* V149 ; free mm2 */ + psllw $1, %mm1 /* t313 */ + nop /* without the nop - freeze here for one clock */ +@@ -483,7 +492,7 @@ IDCT_mmx: + paddsw %mm3, %mm6 /* V164 ; free mm3 */ + movq %mm4, %mm3 /* duplicate V142 */ + psubsw %mm5, %mm4 /* V165 ; free mm5 */ +- movq %mm2, scratch7 /* out7 */ ++ movq %mm2, MUNG(scratch7) /* out7 */ + psraw $4, %mm6 + psraw $4, %mm4 + paddsw %mm5, %mm3 /* V162 */ +@@ -494,11 +503,11 @@ IDCT_mmx: + */ + movq %mm6, 8*9(%esi) /* out9 */ + paddsw %mm1, %mm0 /* V161 */ +- movq %mm3, scratch5 /* out5 */ ++ movq %mm3, MUNG(scratch5) /* out5 */ + psubsw %mm1, %mm5 /* V166 ; free mm1 */ + movq %mm4, 8*11(%esi) /* out11 */ + psraw $4, %mm5 +- movq %mm0, scratch3 /* out3 */ ++ movq %mm0, MUNG(scratch3) /* out3 */ + movq %mm2, %mm4 /* duplicate V140 */ + movq %mm5, 8*13(%esi) /* out13 */ + paddsw %mm7, %mm2 /* V160 */ +@@ -508,7 +517,7 @@ IDCT_mmx: + /* moved from the next block */ + movq 8*3(%esi), %mm7 + psraw $4, %mm4 +- movq %mm2, scratch1 /* out1 */ ++ movq %mm2, MUNG(scratch1) /* out1 */ + /* moved from the next block */ + movq %mm0, %mm1 + movq %mm4, 8*15(%esi) /* out15 */ +@@ -565,15 +574,15 @@ IDCT_mmx: + paddsw %mm4, %mm3 /* V113 ; free mm4 */ + movq %mm0, %mm4 /* duplicate V110 */ + paddsw %mm1, %mm2 /* V111 */ +- pmulhw x539f539f539f539f, %mm0 /* 21407-> V117 */ ++ pmulhw MUNG(x539f539f539f539f), %mm0 /* 21407-> V117 */ + psubsw %mm1, %mm5 /* V112 ; free mm1 */ + psubsw %mm5, %mm4 /* V116 */ + movq %mm2, %mm1 /* duplicate V111 */ +- pmulhw x4546454645464546, %mm5 /* 17734-> V119 */ ++ pmulhw MUNG(x4546454645464546), %mm5 /* 17734-> V119 */ + psubsw %mm3, %mm2 /* V114 */ +- pmulhw x61f861f861f861f8, %mm4 /* 25080-> V120 */ ++ pmulhw MUNG(x61f861f861f861f8), %mm4 /* 25080-> V120 */ + paddsw %mm3, %mm1 /* V115 ; free mm3 */ +- pmulhw x5a825a825a825a82, %mm2 /* 23170-> V118 */ ++ pmulhw MUNG(x5a825a825a825a82), %mm2 /* 23170-> V118 */ + psllw $2, %mm0 /* t266 */ + movq %mm1, (%esi) /* save V115 */ + psllw $1, %mm5 /* t268 */ +@@ -591,7 +600,7 @@ IDCT_mmx: + movq %mm6, %mm3 /* duplicate tmt4 */ + psubsw %mm0, %mm6 /* V100 */ + paddsw %mm0, %mm3 /* V101 ; free mm0 */ +- pmulhw x5a825a825a825a82, %mm6 /* 23170 ->V102 */ ++ pmulhw MUNG(x5a825a825a825a82), %mm6 /* 23170 ->V102 */ + movq %mm7, %mm5 /* duplicate tmt0 */ + movq 8*8(%esi), %mm1 /* tmt8 */ + paddsw %mm1, %mm7 /* V103 */ +@@ -625,10 +634,10 @@ IDCT_mmx: + movq 8*2(%esi), %mm3 /* V123 */ + paddsw %mm4, %mm7 /* out0 */ + /* moved up from next block */ +- movq scratch3, %mm0 ++ movq MUNG(scratch3), %mm0 + psraw $4, %mm7 + /* moved up from next block */ +- movq scratch5, %mm6 ++ movq MUNG(scratch5), %mm6 + psubsw %mm4, %mm1 /* out14 ; free mm4 */ + paddsw %mm3, %mm5 /* out2 */ + psraw $4, %mm1 +@@ -639,7 +648,7 @@ IDCT_mmx: + movq %mm5, 8*2(%esi) /* out2 ; free mm5 */ + psraw $4, %mm2 + /* moved up to the prev block */ +- movq scratch7, %mm4 ++ movq MUNG(scratch7), %mm4 + /* moved up to the prev block */ + psraw $4, %mm0 + movq %mm2, 8*12(%esi) /* out12 ; free mm2 */ +@@ -647,13 +656,13 @@ IDCT_mmx: + psraw $4, %mm6 + /* move back the data to its correct place + * moved up to the prev block +- * movq scratch3, %mm0 +- * movq scratch5, %mm6 +- * movq scratch7, %mm4 ++ * movq MUNG(scratch3), %mm0 ++ * movq MUNG(scratch5), %mm6 ++ * movq MUNG(scratch7), %mm4 + * psraw $4, %mm0 + * psraw $4, %mm6 + */ +- movq scratch1, %mm1 ++ movq MUNG(scratch1), %mm1 + psraw $4, %mm4 + movq %mm0, 8*3(%esi) /* out3 */ + psraw $4, %mm1 +@@ -671,6 +680,15 @@ IDCT_mmx: + .Lfe1: + .size IDCT_mmx,.Lfe1-IDCT_mmx + ++#ifdef __PIC__ ++ .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits ++.globl __i686.get_pc_thunk.bx ++ .hidden __i686.get_pc_thunk.bx ++ .type __i686.get_pc_thunk.bx,@function ++ __i686.get_pc_thunk.bx: ++ movl (%esp), %ebx ++ ret ++#endif + + #endif /* i386 && USE_MMX */ + diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-automake.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-automake.patch new file mode 100644 index 0000000..e541e19 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-automake.patch @@ -0,0 +1,13 @@ +Index: smpeg-0.4.4/configure.in +=================================================================== +--- smpeg-0.4.4.orig/configure.in ++++ smpeg-0.4.4/configure.in +@@ -53,6 +53,8 @@ AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + AC_PROG_INSTALL + ++AM_PROG_AS ++ + dnl Work around the lack of certain typedefs. + AC_TYPE_SOCKLEN_T + diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-config.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-config.patch new file mode 100644 index 0000000..2175276 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-config.patch @@ -0,0 +1,18 @@ +Only dump -L/-rpath if libdir is non-standard + +--- smpeg-config.in ++++ smpeg-config.in +@@ -45,11 +45,13 @@ + echo $includes -I@includedir@/smpeg `@SDL_CONFIG@ --cflags` + ;; + --libs) ++ if [ "@libdir@" != "/usr/lib" ]; then + if [ "`uname`" = "SunOS" ]; then + libdirs="-L@libdir@ -R@libdir@" + else + libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@" + fi ++ fi + echo $libdirs -lsmpeg `@SDL_CONFIG@ --libs` + ;; + *) diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-die-die-die.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-die-die-die.patch new file mode 100644 index 0000000..a5e6c35 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-die-die-die.patch @@ -0,0 +1,201 @@ +diff -Naur smpeg-0.4.4/configure.in smpeg-0.4.4-p/configure.in +--- smpeg-0.4.4/configure.in 2001-04-24 21:25:39.000000000 +0200 ++++ smpeg-0.4.4-p/configure.in 2007-11-04 07:40:11.000000000 +0100 +@@ -1,6 +1,9 @@ + + dnl Process this file with autoconf to produce a configure script. + AC_INIT(README) ++dnl Detect the canonical host and target build environment ++AC_CANONICAL_HOST ++AC_CANONICAL_TARGET + + dnl Set various version strings - taken gratefully from the GTk sources + # +@@ -40,10 +43,6 @@ + dnl Setup for automake + AM_INIT_AUTOMAKE(smpeg, $VERSION) + +-dnl Detect the canonical host and target build environment +-AC_CANONICAL_HOST +-AC_CANONICAL_TARGET +- + dnl Check for tools + + AC_PROG_MAKE_SET +@@ -53,6 +52,8 @@ + AM_PROG_LIBTOOL + AC_PROG_INSTALL + ++AM_PROG_AS ++ + dnl Work around the lack of certain typedefs. + AC_TYPE_SOCKLEN_T + +@@ -60,7 +61,7 @@ + case "$target" in + alpha*-*-linux*) + if test x$ac_cv_prog_gcc = xyes; then +- CFLAGS="$CFLAGS -mcpu=ev4 -Wa,-mall" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -mcpu=ev4 -Wa,-mall" + fi + ;; + sparc*-*-solaris*) +@@ -102,17 +103,17 @@ + , enable_debug=yes) + if test x$enable_debug != xyes; then + if test x$ac_cv_prog_gcc = xyes; then +- CFLAGS="$CFLAGS -fexpensive-optimizations -fomit-frame-pointer" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -fexpensive-optimizations -fomit-frame-pointer" + fi + case "$target" in + i486-*-*) # Yeah right. :) + if test x$ac_cv_prog_gcc = xyes; then +- CFLAGS="$CFLAGS -march=486" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -march=486" + fi + ;; + i?86-*-*) + if test x$ac_cv_prog_gcc = xyes; then +- CFLAGS="$CFLAGS -march=pentium -mcpu=pentiumpro" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -march=pentium -mcpu=pentiumpro" + fi + ;; + esac +@@ -124,7 +125,7 @@ + :, + AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) + ) +-CFLAGS="$CFLAGS $SDL_CFLAGS" ++EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + + dnl See if we need to pass -lm for the math library +@@ -145,7 +146,7 @@ + AC_MSG_RESULT($use_mmx) + + if test x$use_mmx = xyes; then +- CFLAGS="$CFLAGS -DUSE_MMX" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_MMX" + fi + fi + +@@ -162,7 +163,7 @@ + AC_MSG_RESULT($use_ati) + + if test x$use_ati = xyes; then +- CFLAGS="$CFLAGS -DUSE_ATI" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_ATI" + fi + fi + +@@ -171,7 +172,7 @@ + [ --enable-timestamp-sync enable system timestamp sync [default=yes]], + , enable_timestamp_sync=no) + if test x$enable_timestamp_sync = xyes; then +- CFLAGS="$CFLAGS -DUSE_TIMESTAMP_SYNC" ++EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_TIMESTAMP_SYNC" + fi + + dnl Enable the use of the system thread +@@ -179,7 +180,7 @@ + [ --enable-threaded-system enable system thread [default=no]], + , enable_threaded_system=no) + if test x$enable_threaded_system = xyes; then +- CFLAGS="$CFLAGS -DUSE_SYSTEM_THREAD" ++EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_SYSTEM_THREAD" + fi + + dnl Enable threaded audio +@@ -187,22 +188,9 @@ + [ --enable-threaded-audio enable threaded audio [default=yes]], + , enable_threaded_audio=yes) + if test x$enable_threaded_audio = xyes; then +- CFLAGS="$CFLAGS -DTHREADED_AUDIO" ++EXTRA_CFLAGS="$EXTRA_CFLAGS -DTHREADED_AUDIO" + fi + +-dnl See if we can build the GTk player +-AC_ARG_ENABLE(gtk_player, +-[ --enable-gtk-player build a GTk sample SMPEG player [default=yes]], +- , enable_gtk_player=yes) +-have_gtk=no +-if test x$enable_gtk_player = xyes; then +- AM_PATH_GTK(1.2.1, have_gtk=yes) +- if test x$have_gtk = xyes; then +- CFLAGS="$CFLAGS $GTK_CFLAGS" +- fi +- AC_SUBST(GTK_LIBS) +-fi +-AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes) + + dnl See if we can build the Mesa player + AC_ARG_ENABLE(opengl_player, +@@ -224,7 +212,7 @@ + AC_PATH_X + AC_PATH_XTRA + if test x$have_x = xyes; then +- CFLAGS="$CFLAGS $X_CFLAGS" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" + SYS_GL_LIBS="$X_LIBS -lGL -lGLU" + else + SYS_GL_LIBS="-lGL -lGLU" +@@ -255,17 +243,16 @@ + [ --enable-assertions Enable consistency checks in decoding [default=no]], + , enable_assertions=no) + if test x$enable_assertions != xyes; then +- CFLAGS="$CFLAGS -DNDEBUG" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -DNDEBUG" + fi + + dnl Add the source include directories +-CFLAGS="$CFLAGS -I.. -DNOCONTROLS" +-CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/audio -I\$(top_srcdir)/video" +-CXXFLAGS="$CFLAGS" +- ++EXTRA_CFLAGS="$EXTRA_CFLAGS -I.. -DNOCONTROLS" ++EXTRA_CFLAGS="$EXTRA_CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/audio -I\$(top_srcdir)/video" ++CXXFLAGS="$EXTRA_CFLAGS $CXXFLAGS" ++CFLAGS="$EXTRA_CFLAGS $CFLAGS" + + dnl C++ flags are the same as the C flags +-CXXFLAGS="$CFLAGS" + if test x$GCC = xyes; then + # Check to see if options -fno-rtti -fno-exceptions are supported + AC_MSG_CHECKING(if $CXX supports -fno-rtti -fno-exceptions) +diff -Naur smpeg-0.4.4/Makefile.am smpeg-0.4.4-p/Makefile.am +--- smpeg-0.4.4/Makefile.am 2001-04-04 22:28:14.000000000 +0200 ++++ smpeg-0.4.4-p/Makefile.am 2007-11-04 07:34:25.000000000 +0100 +@@ -47,32 +47,23 @@ + README \ + README.SDL_mixer \ + plaympeg.1 \ +- gtv.1 \ + VisualC.zip \ + smpeg.m4 \ + autogen.sh + + # Sample MPEG players +-if HAVE_GTK +-GTK_PLAYER = gtv +-else +-GTK_PLAYER = +-endif + if HAVE_OPENGL + OPENGL_PLAYER = glmovie + else + OPENGL_PLAYER = + endif +-bin_PROGRAMS = plaympeg $(GTK_PLAYER) $(OPENGL_PLAYER) ++bin_PROGRAMS = plaympeg $(OPENGL_PLAYER) + + # Sources for plaympeg + man_MANS = plaympeg.1 gtv.1 + plaympeg_SOURCES = plaympeg.c + plaympeg_LDADD = libsmpeg.la + +-# Sources for gtv +-gtv_SOURCES = gtv.c gtv.h +-gtv_LDADD = @GTK_LIBS@ libsmpeg.la + + # Sources for glmovie + glmovie_SOURCES = glmovie-tile.c glmovie.c glmovie.h diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-gcc41.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-gcc41.patch new file mode 100644 index 0000000..4a0eeb4 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-gcc41.patch @@ -0,0 +1,41 @@ +Index: MPEGaudio.h +=================================================================== +RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v +retrieving revision 1.23 +diff -u -p -r1.23 MPEGaudio.h +--- smpeg/MPEGaudio.h 17 Jul 2001 19:52:24 -0000 1.23 ++++ smpeg/MPEGaudio.h 6 Dec 2005 06:10:43 -0000 +@@ -151,12 +151,6 @@ private: + /* The actual MPEG audio class */ + class MPEGaudio : public MPEGerror, public MPEGaudioaction { + +- friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); +- friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); +-#ifdef THREADED_AUDIO +- friend int Decode_MPEGaudio(void *udata); +-#endif +- + public: + MPEGaudio(MPEGstream *stream, bool initSDL = true); + virtual ~MPEGaudio(); +@@ -367,6 +361,20 @@ public: + #define N_TIMESTAMPS 5 + + double timestamp[N_TIMESTAMPS]; ++ ++ /* Functions which access MPEGaudio internals */ ++ friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); ++ friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); ++#ifdef THREADED_AUDIO ++ friend int Decode_MPEGaudio(void *udata); ++#endif + }; + ++/* Need to duplicate the prototypes, this is not a typo :) */ ++void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); ++int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); ++#ifdef THREADED_AUDIO ++int Decode_MPEGaudio(void *udata); ++#endif ++ + #endif /* _MPEGAUDIO_H_ */ diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-gnu-stack.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-gnu-stack.patch new file mode 100644 index 0000000..12efb07 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-gnu-stack.patch @@ -0,0 +1,32 @@ +Make sure that the asm files don't incorrectly trigger an executable +stack marking in the final shared library. That's bad, mmmkay. + +before: +$ readelf -l /usr/lib/libsmpeg.so | grep -A 1 GNU_STACK + GNU_STACK 0x0000000000000000 0x0000000000000000 0x0000000000000000 + 0x0000000000000000 0x0000000000000000 RWE 8 +after: +$ readelf -l /usr/lib/libsmpeg.so | grep -A 1 GNU_STACK + GNU_STACK 0x0000000000000000 0x0000000000000000 0x0000000000000000 + 0x0000000000000000 0x0000000000000000 RW 8 + +--- smpeg-0.4.4/video/mmxflags_asm.S ++++ smpeg-0.4.4/video/mmxflags_asm.S +@@ -57,3 +57,7 @@ + .size cpu_flags,.Lfe1-cpu_flags + + #endif /* i386 && USE_MMX */ ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",%progbits ++#endif +--- smpeg-0.4.4/video/mmxidct_asm.S ++++ smpeg-0.4.4/video/mmxidct_asm.S +@@ -673,3 +673,7 @@ + + + #endif /* i386 && USE_MMX */ ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-m4.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-m4.patch new file mode 100644 index 0000000..660ba88 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-m4.patch @@ -0,0 +1,9 @@ +Fix aclocal warning: +/usr/share/aclocal/smpeg.m4:13: warning: underquoted definition of AM_PATH_SMPEG +--- smpeg-0.4.4/smpeg.m4 ++++ smpeg-0.4.4/smpeg.m4 +@@ -12,3 +12,3 @@ + dnl +-AC_DEFUN(AM_PATH_SMPEG, ++AC_DEFUN([AM_PATH_SMPEG], + [dnl diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-malloc.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-malloc.patch new file mode 100644 index 0000000..be54e58 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-malloc.patch @@ -0,0 +1,25 @@ +Index: smpeg-0.4.4/glmovie.c +=================================================================== +--- smpeg-0.4.4.orig/glmovie.c ++++ smpeg-0.4.4/glmovie.c +@@ -6,7 +6,6 @@ + #include "smpeg.h" + #include "SDL.h" + #include +-#include + #include + #include + #include "glmovie.h" +Index: smpeg-0.4.4/glmovie-tile.c +=================================================================== +--- smpeg-0.4.4.orig/glmovie-tile.c ++++ smpeg-0.4.4/glmovie-tile.c +@@ -16,7 +16,7 @@ + */ + + #include "glmovie.h" +-#include ++#include + #include + + /* Some data is redundant at this stage. */ diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-missing-init.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-missing-init.patch new file mode 100644 index 0000000..594c554 --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-missing-init.patch @@ -0,0 +1,10 @@ +--- MPEG_old.cpp 2007-01-07 23:24:45.000000000 +0100 ++++ MPEG.cpp 2007-01-07 23:25:11.000000000 +0100 +@@ -133,6 +133,7 @@ + video = NULL; + system = NULL; + error = NULL; ++ source = NULL; + + audiostream = videostream = NULL; + audioaction = NULL; diff --git a/source/xmultimedia-extra/smpeg/smpeg-0.4.4-mmx.patch b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-mmx.patch new file mode 100644 index 0000000..71db62d --- /dev/null +++ b/source/xmultimedia-extra/smpeg/smpeg-0.4.4-mmx.patch @@ -0,0 +1,12 @@ +Index: smpeg-0.4.4/configure.in +=================================================================== +--- smpeg-0.4.4.orig/configure.in ++++ smpeg-0.4.4/configure.in +@@ -148,6 +148,7 @@ if test x$enable_mmx = xyes; then + + if test x$use_mmx = xyes; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_MMX" ++ CCASFLAGS="$CCASFLAGS -DUSE_MMX" + fi + fi + From crazy at frugalware.org Mon Nov 5 17:37:13 2007 From: crazy at frugalware.org (crazy) Date: Mon Nov 5 17:37:14 2007 Subject: [Frugalware-git] frugalware-current: smpeg-0.4.4-2-x86_64 Message-ID: <20071105163713.5E1CF37802B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7a77d7f69196b001dc4884ec9f04f51a5c6e4772 commit 7a77d7f69196b001dc4884ec9f04f51a5c6e4772 Author: crazy Date: Mon Nov 5 17:37:01 2007 +0100 smpeg-0.4.4-2-x86_64 * na we don't want backup FB's :P * removed diff --git a/source/xmultimedia-extra/smpeg/FrugalBuild~ b/source/xmultimedia-extra/smpeg/FrugalBuild~ deleted file mode 100644 index 24caa44..0000000 --- a/source/xmultimedia-extra/smpeg/FrugalBuild~ +++ /dev/null @@ -1,58 +0,0 @@ -# Compiling Time: 0.20 SBU -# Maintainer: crazy -# Contribitor: DNAku - -pkgname=smpeg -pkgver=0.4.4 -pkgrel=2 -pkgdesc="SDL MPEG Player Library is a general purpose MPEG video/audio player" -url="http://www.lokigames.com/development/smpeg.php3" -depends=('sdl' 'libx11' 'mesa' 'libxi' 'libxext' 'freeglut') -makedepends=('gnuconfig' 'libtool') -archs=('i686') -up2date="lynx -dump $url |grep latest| sed 's/.*now.//g'|sed 's/..C.*//g'" -groups=('xmultimedia-extra') -#source=(ftp://ftp.lokigames.com/pub/open-source/$pkgname/$pkgname-$pkgver.tar.gz \ -source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/xmultimedia-extra/smpeg/smpeg-0.4.4.tar.gz \ - $pkgname-$pkgver-die-die-die.patch \ - $pkgname-$pkgver-m4.patch \ - $pkgname-$pkgver-gnu-stack.patch \ - $pkgname-$pkgver-config.patch \ - $pkgname-$pkgver-PIC.patch \ - $pkgname-$pkgver-gcc41.patch \ - $pkgname-$pkgver-mmx.patch \ - $pkgname-$pkgver-malloc.patch) -sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' \ - 'dd194199dbcf14b0896efef6519528dc46edad7e' \ - 'fdd98ffeb92a4b23913dd8c6ed0d2e22d3a154e4' \ - '6d6a1edfca83fe1fa05657899a32b05b0b07e75e' \ - '88a099bfa49f65e4c0006d7c8e2acfeb16f414f8' \ - 'ca210893cfd50554730918e572dc6d48192aa3f4' \ - '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e' \ - '23c5a0cb58952998fc8507406459703de742aac2' \ - '3c8722e389dd08af5669dcc02d61995cd752ca89') - - -build() -{ - # BLAH! Weird! - export CXX=g++ CC=g++ AS=as - Fcd - Fpatchall - echo "m4_pattern_allow([AC_TYPE_SOCKLEN_T])" >>acinclude.m4 || Fdie - touch NEWS AUTHORS ChangeLog || Fdie - cat /usr/share/gnuconfig/config.guess >config.guess || Fdie - cat /usr/share/gnuconfig/config.sub >config.sub || Fdie - #libtoolize --automake -c -f || Fdie - Fautoreconf - Fmake \ - --with-x \ - --enable-opengl-player \ - --enable-debug \ - --disable-gtk-player \ - --disable-gtk-tests - Fmakeinstall - Frm usr/share/man/man1/gtv.1 -} - -# optimization OK From crazy at frugalware.org Mon Nov 5 17:52:28 2007 From: crazy at frugalware.org (crazy) Date: Mon Nov 5 17:52:29 2007 Subject: [Frugalware-git] frugalware-current: perl-sdl-2.1.3-1-x86_64 Message-ID: <20071105165228.8FEF337803D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7b17bf64c99a96001e5a022e27630243897418da commit 7b17bf64c99a96001e5a022e27630243897418da Author: crazy Date: Mon Nov 5 17:52:20 2007 +0100 perl-sdl-2.1.3-1-x86_64 * Version bump * new m8r * WTF this in old FB : * 'Frozen package - do not upgrade(you are unable)' * heh , well I am :P diff --git a/source/xlib-extra/perl-sdl/FrugalBuild b/source/xlib-extra/perl-sdl/FrugalBuild index a3c2a90..fc5ef18 100644 --- a/source/xlib-extra/perl-sdl/FrugalBuild +++ b/source/xlib-extra/perl-sdl/FrugalBuild @@ -1,34 +1,44 @@ -# Compiling Time: ~0.1 SBU -# Maintainer: Zsolt Szalai - -# Frozen package - do not upgrade(you are unable) -# do not remove +# Compiling Time: 0.1 SBU +# Maintainer: crazy +_F_perl_name=SDL_Perl +_F_perl_author=D/DG/DGOEHRIG +pkgver=2.1.3 +pkgdesc="Simple DirectMedia Layer for Perl" +depends=('sdl_mixer' 'sdl_net' 'sdlimage' 'smpeg>=0.4.4-2' 'sdl_gfx' 'sdlimage') +makedepends=('perl-module-build' 'perl-extutils-cbuilder') +Finclude perl pkgname=perl-sdl -pkgver=1.19.2 -pkgrel=1 -pkgdesc="Simple DirectMedia Layer Perl" -url="http://cpan.org/" -makedepends=('perl') -depends=('sdl_mixer' 'sdl_net' 'sdlimage' 'perl') +source=($source sdl-2.1.3.build.patch sdl-perl-2.1.3-gfxPie.patch) groups=('xlib-extra') archs=('i686' 'x86_64') -up2date=1.19.2 -source=(ftp://frugalware.org/pub/frugalware/frugalware-current/extra/source/devel/perl-sdl/SDL_perl-$pkgver.tar.gz) -sha1sums=('3c36b46bc533f62052c045724e3b98511fd825e1') +sha1sums=('9c11cd7e4356f9b254cd9e3a2f993b1751a21552' \ + '6d9a4535798eab2469527f81eb8bba0e171df9ef' \ + '80cb7ddb31c4cf455d74c15655c11fe16a94a1b9') -build() { - cd $startdir/src/SDL_perl-$pkgver - perl Makefile.PL - - make test - make || return 1 +build() +{ + Fcd $_F_perl_name-$pkgver + Fpatchall + perl Build.PL || Fdie + ./Build || Fdie + ./Build install destdir=$Fdestdir || Fdie - make install DESTDIR=$startdir/pkg - mv $startdir/pkg/usr/lib/perl5/site_perl/?.?.? \ - $startdir/pkg/usr/lib/perl5/site_perl/current - rm -rf $startdir/pkg/usr/lib/perl5/?.?.? - find $startdir/pkg/usr/lib/perl5/site_perl/current/ -name .packlist -exec rm {} \; + if [ -d $Fdestdir/usr/lib/perl5/?.?.? ]; then + Fmv '/usr/lib/perl5/?.?.?' /usr/lib/perl5/current + fi + if [ -d $Fdestdir/usr/lib/perl5 ]; then + find $Fdestdir/usr/lib/perl5 -name perllocal.pod -exec rm {} \; + find $Fdestdir/usr/lib/perl5 -name .packlist -exec rm {} \; + fi + if [ -e $Fdestdir/usr/lib/perl5/site_perl/?.?.? ]; then + Fmv '/usr/lib/perl5/site_perl/?.?.?' /usr/lib/perl5/site_perl/current + fi + if [ -d $Fdestdir/usr/lib/perl5/site_perl ]; then + find $Fdestdir/usr/lib/perl5/site_perl -name perllocal.pod -exec rm {} \; + find $Fdestdir/usr/lib/perl5/site_perl -name .packlist -exec rm {} \; + fi + } -# optimalization OK +# optimization OK diff --git a/source/xlib-extra/perl-sdl/sdl-2.1.3.build.patch b/source/xlib-extra/perl-sdl/sdl-2.1.3.build.patch new file mode 100644 index 0000000..5f20beb --- /dev/null +++ b/source/xlib-extra/perl-sdl/sdl-2.1.3.build.patch @@ -0,0 +1,67 @@ +diff -Naurp SDL_Perl-2.1.3/Build.PL SDL_Perl-2.1.3-new/Build.PL +--- SDL_Perl-2.1.3/Build.PL 2005-10-05 05:25:49.000000000 -0400 ++++ SDL_Perl-2.1.3-new/Build.PL 2006-05-25 19:00:23.000000000 -0400 +@@ -35,7 +35,7 @@ my %subsystems = + SDL => { + file => { + from => 'src/SDL.xs', +- to => 'src/SDL_perl.xs', ++ to => './SDL_perl.xs', + }, + libraries => [qw( SDL SDL_image SDL_mixer SDL_net SDL_ttf SDL_gfx + png jpeg smpeg )], +@@ -43,14 +43,14 @@ my %subsystems = + OpenGL => { + file => { + from => 'src/OpenGL.xs', +- to => 'src/SDL/OpenGL.xs', ++ to => 'SDL/OpenGL.xs', + }, + libraries => [qw( SDL GL GLU )], + }, + SFont => { + file => { + from => 'src/SFont.xs', +- to => 'src/SDL/SFont.xs', ++ to => 'SDL/SFont.xs', + }, + libraries => [qw( SDL SDL_image )], + }, +diff -Naurp SDL_Perl-2.1.3/src/OpenGL.xs SDL_Perl-2.1.3-new/src/OpenGL.xs +--- SDL_Perl-2.1.3/src/OpenGL.xs 2005-10-05 05:25:49.000000000 -0400 ++++ SDL_Perl-2.1.3-new/src/OpenGL.xs 2006-05-25 18:59:04.000000000 -0400 +@@ -23,7 +23,7 @@ + #define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFF + #endif /* GL_ALL_CLIENT_BITS */ + +-#include "../defines.h" ++#include "../src/defines.h" + + SV* sdl_perl_nurbs_error_hook; + void +diff -Naurp SDL_Perl-2.1.3/src/SDL.xs SDL_Perl-2.1.3-new/src/SDL.xs +--- SDL_Perl-2.1.3/src/SDL.xs 2005-10-05 05:25:49.000000000 -0400 ++++ SDL_Perl-2.1.3-new/src/SDL.xs 2006-05-25 19:04:00.000000000 -0400 +@@ -69,7 +69,7 @@ static int sdl_perl_use_smpeg_audio = 0; + #define HAVE_TLS_CONTEXT + #endif + +-#include "defines.h" ++#include "src/defines.h" + + Uint32 + sdl_perl_timer_callback ( Uint32 interval, void* param ) +diff -Naurp SDL_Perl-2.1.3/src/SFont.xs SDL_Perl-2.1.3-new/src/SFont.xs +--- SDL_Perl-2.1.3/src/SFont.xs 2005-10-05 05:25:49.000000000 -0400 ++++ SDL_Perl-2.1.3-new/src/SFont.xs 2006-05-25 18:59:04.000000000 -0400 +@@ -23,8 +23,8 @@ + #define HAVE_TLS_CONTEXT + #endif + +-#include "../defines.h" +-#include "../SFont.h" ++#include "../src/defines.h" ++#include "../src/SFont.h" + + #ifdef HAVE_SDL_IMAGE + #include diff --git a/source/xlib-extra/perl-sdl/sdl-perl-2.1.3-gfxPie.patch b/source/xlib-extra/perl-sdl/sdl-perl-2.1.3-gfxPie.patch new file mode 100644 index 0000000..461eccd --- /dev/null +++ b/source/xlib-extra/perl-sdl/sdl-perl-2.1.3-gfxPie.patch @@ -0,0 +1,33 @@ +--- src/SDL.xs~ 2003-03-27 12:17:23.000000000 +0200 ++++ src/SDL.xs 2005-02-25 20:32:07.353170226 +0200 +@@ -71,6 +71,7 @@ + #include + #include + #include ++#define PERL_SDL_GFXVERSION SDL_VERSIONNUM(SDL_GFXPRIMITIVES_MAJOR,SDL_GFXPRIMITIVES_MINOR,SDL_GFXPRIMITIVES_MICRO) + #endif + + #ifdef USE_THREADS +@@ -3742,7 +3743,11 @@ + Sint16 end; + Uint32 color; + CODE: ++#if PERL_SDL_GFXVERSION >= 2012 ++ RETVAL = filledPieColor( dst, x, y, rad, start, end, color ); ++#else + RETVAL = filledpieColor( dst, x, y, rad, start, end, color ); ++#endif + OUTPUT: + RETVAL + +@@ -3759,7 +3764,11 @@ + Uint8 b; + Uint8 a; + CODE: ++#if PERL_SDL_GFXVERSION >= 2012 ++ RETVAL = filledPieRGBA( dst, x, y, rad, start, end, r, g, b, a ); ++#else + RETVAL = filledpieRGBA( dst, x, y, rad, start, end, r, g, b, a ); ++#endif + OUTPUT: + RETVAL From devil505linux at gmail.com Mon Nov 5 18:03:54 2007 From: devil505linux at gmail.com (Devil505) Date: Mon Nov 5 18:03:55 2007 Subject: [Frugalware-git] frugalware-current: bomberclone-0.11.7-1-i686 Message-ID: <20071105170354.4846C37802B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d30cdc28126d0fa3955396c738e6dd674bc832f1 commit d30cdc28126d0fa3955396c738e6dd674bc832f1 Author: Devil505 Date: Mon Nov 5 17:54:54 2007 +0100 bomberclone-0.11.7-1-i686 *New Package *Closes FS#1973 diff --git a/source/games-extra/bomberclone/FrugalBuild b/source/games-extra/bomberclone/FrugalBuild new file mode 100644 index 0000000..b9a5c04 --- /dev/null +++ b/source/games-extra/bomberclone/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.09 SBU +# Maintainer: Devil505 + +pkgname=bomberclone +pkgver=0.11.7 +pkgrel=1 +pkgdesc="BomberMan clone with network game support" +depends=('sdlimage' 'glibc' 'sdl_mixer') +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://bomberclone.sourceforge.net/homepage/" +groups=('games-extra') +archs=('i686') +sha1sums=('108948667d0504cedfddaf4a55e69b221b14edbd') + +_F_desktop_name="Bomberclone" +_F_desktop_icon="/usr/share/games/bomberclone/pixmaps/$pkgname.png" +_F_desktop_categories="Game;ArcadeGame;" + +build() +{ + Fbuild + Fdesktop2 +} + +# optimization OK From voroskoi at frugalware.org Mon Nov 5 20:29:54 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 5 20:29:57 2007 Subject: [Frugalware-git] frugalware-current: qca-2.0.0-1-x86_64 Message-ID: <20071105192954.95A2B13A800F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f154c3d8adffd0d342bb3c4b9b92021f829adf34 commit f154c3d8adffd0d342bb3c4b9b92021f829adf34 Author: voroskoi Date: Mon Nov 5 20:29:45 2007 +0100 qca-2.0.0-1-x86_64 fixup qt4 build diff --git a/source/xlib-extra/qca/FrugalBuild b/source/xlib-extra/qca/FrugalBuild index 106ea1a..26b3747 100644 --- a/source/xlib-extra/qca/FrugalBuild +++ b/source/xlib-extra/qca/FrugalBuild @@ -17,6 +17,7 @@ options=('scriptlet') sha1sums=('5b896647426637e1974703f2950786746408c70b') build() { + source /etc/profile.d/qt4.sh.off || Fdie Fmake Fmakeinstall INSTALL_ROOT=$Fdestdir } From voroskoi at frugalware.org Mon Nov 5 21:03:37 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 5 21:03:40 2007 Subject: [Frugalware-git] frugalware-current: xf86-video-savage-2.1.3-1-i686 Message-ID: <20071105200337.074CF37802B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d9420a5fc957b5ddab8f4c4c7c08245bfa146aad commit d9420a5fc957b5ddab8f4c4c7c08245bfa146aad Author: voroskoi Date: Mon Nov 5 21:02:25 2007 +0100 xf86-video-savage-2.1.3-1-i686 version bump ok vmiklos@ diff --git a/source/x11/xf86-video-savage/FrugalBuild b/source/x11/xf86-video-savage/FrugalBuild index 9b4e7b6..3f46664 100644 --- a/source/x11/xf86-video-savage/FrugalBuild +++ b/source/x11/xf86-video-savage/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-savage -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="X.Org driver for S3 Savage cards" url="http://xorg.freedesktop.org" @@ -10,9 +10,8 @@ groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') depends=('xorg-server') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto' 'glproto' 'xf86driproto') -_F_xorg_nr=2 Finclude xorg -sha1sums=('e588165abfa92dcb68986120e9c949d7601c95bb') +sha1sums=('bb73843d38a8152c39311acc8b1a18d5d51603af') Fconfopts="$Fconfopts --enable-dri" # optimization OK From voroskoi at frugalware.org Mon Nov 5 21:50:49 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 5 21:50:52 2007 Subject: [Frugalware-git] frugalware-current: qca-ossl-2.0.0-1-i686 Message-ID: <20071105205049.2828E37802B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e61a0e6430503f1b27462cd0c186f598a143095 commit 4e61a0e6430503f1b27462cd0c186f598a143095 Author: voroskoi Date: Mon Nov 5 21:50:28 2007 +0100 qca-ossl-2.0.0-1-i686 new package diff --git a/source/xlib-extra/qca-ossl/FrugalBuild b/source/xlib-extra/qca-ossl/FrugalBuild new file mode 100644 index 0000000..147a8e8 --- /dev/null +++ b/source/xlib-extra/qca-ossl/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 1.44 SBU +# Maintainer: voroskoi + +pkgname=qca-ossl +pkgver=2.0.0 +pkgextraver=-beta1 +pkgrel=1 +pkgdesc="This plugin provides features based on OpenSSL for QCA2." +url="http://delta.affinix.com/qca/" +groups=('xlib-extra') +archs=('i686' 'x86_64') +license="LGPLv2.1" +depends=('qca>=2.0.0' 'openssl') +source=(http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${pkgver}${pkgextraver}.tar.bz2) +up2date="lynx -dump http://delta.affinix.com/download/qca/2.0/plugins/ |Flasttarbz2 |sed s/${pkgextraver}//" +options=('scriptlet') +sha1sums=('c326ff170023a8757c16c76f61fe44991c5f715d') + +build() { + Fcd + ./configure || Fdie + make || Fdie + Fmakeinstall INSTALL_ROOT=$Fdestdir +} + +# optimization OK From voroskoi at frugalware.org Mon Nov 5 21:51:04 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 5 21:51:06 2007 Subject: [Frugalware-git] frugalware-current: psi-0.11-1-x86_64 Message-ID: <20071105205104.84CDA37802B@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cb79294caf83150bc5e916869e2697b56c9383ed commit cb79294caf83150bc5e916869e2697b56c9383ed Author: voroskoi Date: Mon Nov 5 21:35:14 2007 +0100 psi-0.11-1-x86_64 version bump using qca2 and qt4 diff --git a/source/xapps-extra/psi/FrugalBuild b/source/xapps-extra/psi/FrugalBuild index 2ae02f6..65981c9 100644 --- a/source/xapps-extra/psi/FrugalBuild +++ b/source/xapps-extra/psi/FrugalBuild @@ -1,23 +1,24 @@ -# Compiling Time: ~2.49 SBU +# Compiling Time: 5.69 SBU # Contributor: Unger Gabor # Maintainer: voroskoi pkgname=psi -pkgver=0.10 +pkgver=0.11 pkgrel=1 -pkgdesc="Psi - Jabber client" +pkgdesc="Psi is a free instant messaging application designed for the Jabber IM network." +depends=('aspell' 'qca>=2.0.0' 'libxi') +license="GPLv2" +archs=('i686' 'x86_64') +groups=('xapps-extra') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -url="http://psi.affinix.com" -license="GPL" -groups=('xapps-extra') -archs=('i686' 'x86_64') +url="http://psi-im.org/" +up2date="lynx -dump http://psi-im.org/download | Flasttar" +sha1sums=('834fac4b51d92e2502cb08d01d40f05ffcdce4a2') options=('scriptlet') -depends=('qca') -up2date="lynx -dump http://psi-im.org/psi.affinix.com/?page=download | grep 'Download Psi' |sed 's/.*\([0-9].[0-9]..*\)/\1/'" -sha1sums=('f1687f8b93338f47cb1c8fa363e4b4f58628f167') build() { + rm -r ${Fsrcdir}/$pkgname-$pkgver/third-party || Fdie Fmake Fmakeinstall INSTALL_ROOT=$Fdestdir } From voroskoi at frugalware.org Mon Nov 5 22:15:19 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 5 22:15:19 2007 Subject: [Frugalware-git] frugalware-current: qca-gnupg-2.0.0-1-i686 Message-ID: <20071105211519.212AD37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=35a96a15ee2f1f8589bfcf947c3bc5fe7a06bd49 commit 35a96a15ee2f1f8589bfcf947c3bc5fe7a06bd49 Author: voroskoi Date: Mon Nov 5 22:14:49 2007 +0100 qca-gnupg-2.0.0-1-i686 new package diff --git a/source/xlib-extra/qca-gnupg/FrugalBuild b/source/xlib-extra/qca-gnupg/FrugalBuild new file mode 100644 index 0000000..b1dc1c8 --- /dev/null +++ b/source/xlib-extra/qca-gnupg/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.18 SBU +# Maintainer: voroskoi + +pkgname=qca-gnupg +pkgver=2.0.0 +pkgextraver=-beta1 +pkgrel=1 +pkgdesc="This plugin provides features based on GnuPG for QCA2." +url="http://delta.affinix.com/qca/" +groups=('xlib-extra') +archs=('i686' 'x86_64') +license="LGPLv2.1" +depends=('qca>=2.0.0') +rodepends=('gnupg2') +source=(http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${pkgver}${pkgextraver}.tar.bz2) +up2date="lynx -dump http://delta.affinix.com/download/qca/2.0/plugins/ |Flasttarbz2 |sed s/${pkgextraver}//" +options=('scriptlet') +sha1sums=('111a3550e073814a37a5bed9056c369bf1cf7f49') + +build() { + Fcd + ./configure || Fdie + make || Fdie + Fmakeinstall INSTALL_ROOT=$Fdestdir +} + +# optimization OK From vmiklos at frugalware.org Tue Nov 6 01:03:22 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:03:28 2007 Subject: [Frugalware-git] frugalwareutils: grubconfig: added manpage Message-ID: <20071106000322.E7FAE37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=666f13f9d5677c7473e09e1defb0e433ff09626a commit 666f13f9d5677c7473e09e1defb0e433ff09626a Author: Miklos Vajna Date: Tue Nov 6 00:36:56 2007 +0100 grubconfig: added manpage diff --git a/doc/grubconfig.txt b/doc/grubconfig.txt new file mode 100644 index 0000000..c7a998a --- /dev/null +++ b/doc/grubconfig.txt @@ -0,0 +1,26 @@ += grubconfig(1) + +== NAME + +grubconfig - configures the GRUB boot loader + +== SYNOPSIS + +grubconfig [options] + +== DESCRIPTION + +grubconfig is a front-end to grub-install. It supports installing to RAID +partitions, and it supports generating a configuration file (`menu.lst`) +automatically for you. The later will contain the list of auto-detected other +operating systems. + +NOTE: The old `menu.lst` is saved as `menu.lst.old` for you. + +== OPTIONS + +--help:: + Display this manpage. + +--version:: + Display the package version. From vmiklos at frugalware.org Tue Nov 6 01:03:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:03:29 2007 Subject: [Frugalware-git] frugalwareutils: mouseconfig: added manpage Message-ID: <20071106000323.0777D3780BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=e7675af75362e7f030d47faa712720073b32792d commit e7675af75362e7f030d47faa712720073b32792d Author: Miklos Vajna Date: Tue Nov 6 00:41:37 2007 +0100 mouseconfig: added manpage diff --git a/doc/mouseconfig.txt b/doc/mouseconfig.txt new file mode 100644 index 0000000..8be47f4 --- /dev/null +++ b/doc/mouseconfig.txt @@ -0,0 +1,21 @@ += mouseconfig(1) + +== NAME + +mouseconfig - configures your mouse settings + +== SYNOPSIS + +mouseconfig [options] + +== DESCRIPTION + +mouseconfig sets up the `/etc/sysconfig/gfpm` file to match your hardware. + +== OPTIONS + +--help:: + Display this manpage. + +--version:: + Display the package version. From vmiklos at frugalware.org Tue Nov 6 01:03:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:03:30 2007 Subject: [Frugalware-git] frugalwareutils: timeconfig: add manpage Message-ID: <20071106000323.59CAC3780BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=970c31dc797a21922c84ef98ac2134a19ef04efb commit 970c31dc797a21922c84ef98ac2134a19ef04efb Author: Miklos Vajna Date: Tue Nov 6 00:51:22 2007 +0100 timeconfig: add manpage diff --git a/doc/timeconfig.txt b/doc/timeconfig.txt new file mode 100644 index 0000000..e13f372 --- /dev/null +++ b/doc/timeconfig.txt @@ -0,0 +1,22 @@ += timeconfig(1) + +== NAME + +timeconfig - configures your time zone settings + +== SYNOPSIS + +timeconfig [options] + +== DESCRIPTION + +`timeconfig` is a menu-driven tool to set up your `/etc/hardwareclock` file and +a symbolic link, named `/etc/localtime`. + +== OPTIONS + +--help:: + Display this manpage. + +--version:: + Display the package version. From vmiklos at frugalware.org Tue Nov 6 01:03:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:03:30 2007 Subject: [Frugalware-git] frugalwareutils: xconfig: add manpage Message-ID: <20071106000323.6F8603780C0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=b3878c3284e40d2fa17a18b0da445a9cf8becab5 commit b3878c3284e40d2fa17a18b0da445a9cf8becab5 Author: Miklos Vajna Date: Tue Nov 6 00:55:03 2007 +0100 xconfig: add manpage diff --git a/doc/xconfig.txt b/doc/xconfig.txt new file mode 100644 index 0000000..d585feb --- /dev/null +++ b/doc/xconfig.txt @@ -0,0 +1,25 @@ += xconfig(1) + +== NAME + +xconfig - creates your XOrg configuration file + +== SYNOPSIS + +xconfig [options] + +== DESCRIPTION + +`xconfig` is a front-end to `X -configure`. It asks for a resolution and a +colour depth and does the rest of the configuration automatically for you. + +== OPTIONS + +--help:: + Display this manpage. + +--live :: + Non-interactive mode, used by ie. FWLive. + +--version:: + Display the package version. From vmiklos at frugalware.org Tue Nov 6 01:03:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:03:31 2007 Subject: [Frugalware-git] frugalwareutils: raidconfig: added manpage Message-ID: <20071106000323.3069F3780BE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=4e3cfa44bf6dc15c777ba03c722d5cd0d7e55e7e commit 4e3cfa44bf6dc15c777ba03c722d5cd0d7e55e7e Author: Miklos Vajna Date: Tue Nov 6 00:48:05 2007 +0100 raidconfig: added manpage diff --git a/doc/raidconfig.txt b/doc/raidconfig.txt new file mode 100644 index 0000000..b162fc7 --- /dev/null +++ b/doc/raidconfig.txt @@ -0,0 +1,21 @@ += raidconfig(1) + +== NAME + +raidconfig - a menu-driven tool to create raid arrays + +== SYNOPSIS + +raidconfig [options] + +== DESCRIPTION + +`raidconfig` is a menu-driven curses front-end to `mdadm`. + +== OPTIONS + +--help:: + Display this manpage. + +--version:: + Display the package version. From vmiklos at frugalware.org Tue Nov 6 01:03:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:03:32 2007 Subject: [Frugalware-git] frugalwareutils: xwmconfig: added manpage Message-ID: <20071106000323.CDE1F37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=04e4588563178a6e1568a031ae5408130ae54835 commit 04e4588563178a6e1568a031ae5408130ae54835 Author: Miklos Vajna Date: Tue Nov 6 00:58:58 2007 +0100 xwmconfig: added manpage diff --git a/doc/xwmconfig.txt b/doc/xwmconfig.txt new file mode 100644 index 0000000..4b7aedb --- /dev/null +++ b/doc/xwmconfig.txt @@ -0,0 +1,28 @@ += xwmconfig(1) + +== NAME + +xwmconfig - configures your system-wide default window manager + +== SYNOPSIS + +xwmconfig [options] + +== DESCRIPTION + +`xwmconfig` configures your default window manager for desktop managers like +`XDM`, where you can't do so interactively. + +== OPTIONS + +--force:: + Run this tool even if GDM or KDM are installed. + +--help:: + Display this manpage. + +--silent:: + Do not print any warning if GDM or KDM are installed. + +--version:: + Display the package version. diff --git a/xwmconfig/xwmconfig.c b/xwmconfig/xwmconfig.c index 94905ba..d862831 100644 --- a/xwmconfig/xwmconfig.c +++ b/xwmconfig/xwmconfig.c @@ -51,14 +51,6 @@ char* ask_wm(PM_DB *db) return(ptr); } -void usage(char *name) -{ - printf(_("usage: %s [options]\n"), name); - printf(_("--force Run this tool even if GDM or KDM are installed.\n")); - printf(_("--help This help.\n")); - printf(_("--silent Do not print any warning if GDM or KDM are installed.\n")); -} - int run(int argc, char **argv) { FILE *input = stdin; @@ -87,7 +79,7 @@ int run(int argc, char **argv) switch(opt) { case 1000: xwm_force = 1; break; - case 1001: usage(argv[0]); return(0); + case 1001: system("man xwmconfig"); return(0); case 1002: xwm_silent = 1; break; case 1003: printf("%s %s\n", argv[0], VERSION); return(0); } From vmiklos at frugalware.org Tue Nov 6 01:05:59 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:06:01 2007 Subject: [Frugalware-git] frugalwareutils: added a gitignore for apidoc Message-ID: <20071106000559.8937737805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=8c954eda2b1c04b987b4b79894a90b560f712963 commit 8c954eda2b1c04b987b4b79894a90b560f712963 Author: Miklos Vajna Date: Tue Nov 6 01:05:56 2007 +0100 added a gitignore for apidoc diff --git a/apidoc/.gitignore b/apidoc/.gitignore new file mode 100644 index 0000000..f95f759 --- /dev/null +++ b/apidoc/.gitignore @@ -0,0 +1,2 @@ +*.3 +*.xml From vmiklos at frugalware.org Tue Nov 6 01:09:06 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:09:07 2007 Subject: [Frugalware-git] frugalwareutils: distclean: remove gmo files, too Message-ID: <20071106000906.2248637805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=6ca769b1060732078a2bf037edb6f15c6f07274c commit 6ca769b1060732078a2bf037edb6f15c6f07274c Author: Miklos Vajna Date: Tue Nov 6 01:09:03 2007 +0100 distclean: remove gmo files, too diff --git a/Makefile b/Makefile index 9da0aae..f15bc63 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ clean: rm -rf autom4te.cache config.log config.mak config.status distclean: clean - rm -f configure install-sh aclocal.m4 + rm -f configure install-sh aclocal.m4 */po/*.gmo dist: git-archive --format=tar --prefix=frugalwareutils-$(VERSION)/ HEAD | tar xf - From vmiklos at frugalware.org Tue Nov 6 01:10:35 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:10:36 2007 Subject: [Frugalware-git] frugalwareutils: update emails in AUTHORS Message-ID: <20071106001035.8DA2C37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=169b090a1c2f7bdcbd8d0332470c7ad48442eab8 commit 169b090a1c2f7bdcbd8d0332470c7ad48442eab8 Author: Miklos Vajna Date: Tue Nov 6 01:10:27 2007 +0100 update emails in AUTHORS diff --git a/AUTHORS b/AUTHORS index 0f0dedc..2308f7a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,2 @@ -Vajna, Miklos (VMiklos) -Gosalia, Priyank (priyank) - +Priyank Gosalia +Miklos Vajna From vmiklos at frugalware.org Tue Nov 6 01:14:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:14:14 2007 Subject: [Frugalware-git] frugalwareutils: updates for 0.7.6 Message-ID: <20071106001412.AE7AD37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=9b98fa5923ad4e894c2ee4b06288a5f8419c91d4 commit 9b98fa5923ad4e894c2ee4b06288a5f8419c91d4 Author: Miklos Vajna Date: Tue Nov 6 01:13:16 2007 +0100 updates for 0.7.6 diff --git a/Makefile.inc b/Makefile.inc index caaba42..65a044a 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 0.7.5 +VERSION = 0.7.6 MAJORVER = 0 DO_RECURSIVE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit 1; done diff --git a/NEWS b/NEWS index faaee88..74fcf72 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.7.6 - added support for xorg-7.3 + - converted existing manpages to asciidoc + - added 6 new manpages 0.7.5 - fixed to work with os-prober >= 1.21 - new Danish translation 0.7.4 - grubconfig, libfrugalwareutils: spelling fixes From vmiklos at frugalware.org Tue Nov 6 01:14:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:14:14 2007 Subject: [Frugalware-git] frugalwareutils: dist: avoid duplicated tags Message-ID: <20071106001412.D70A837805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=4448ff7fb5e08aa2701defa1f35469010b4da7b3 commit 4448ff7fb5e08aa2701defa1f35469010b4da7b3 Author: Miklos Vajna Date: Tue Nov 6 01:14:05 2007 +0100 dist: avoid duplicated tags diff --git a/Makefile b/Makefile index f15bc63..73448d0 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ dist: rm -rf frugalwareutils-$(VERSION) release: - git tag $(VERSION) + git tag -l |grep -q $(VERSION) || dg tag $(VERSION) $(MAKE) dist gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" \ -ba -u 20F55619 frugalwareutils-$(VERSION).tar.gz From voroskoi at frugalware.org Tue Nov 6 01:22:30 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Nov 6 01:22:32 2007 Subject: [Frugalware-git] frugalware-current: mutt-ng-1.5.17-1-i686 Message-ID: <20071106002230.A39B037805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e2d1c34859236e410ccafb69fce0146f95abd94 commit 1e2d1c34859236e410ccafb69fce0146f95abd94 Author: voroskoi Date: Tue Nov 6 01:18:03 2007 +0100 mutt-ng-1.5.17-1-i686 version bump diff --git a/source/network-extra/mutt-ng/FrugalBuild b/source/network-extra/mutt-ng/FrugalBuild index 556e5f5..9403837 100644 --- a/source/network-extra/mutt-ng/FrugalBuild +++ b/source/network-extra/mutt-ng/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=mutt-ng -pkgver=1.5.16 -pkgrel=2 +pkgver=1.5.17 +pkgrel=1 pkgdesc="A well-known email client with a set of patches." url="www.mutt.org" groups=('network-extra') @@ -15,7 +15,7 @@ conflicts=('mutt' 'mutt-devel') backup=(etc/Muttrc) up2date="lynx -dump $url/download.html |grep tar |sed -ne 's/.*-\(.*\).t.*/\1/;2p'" source=(ftp://ftp.mutt.org/mutt/devel/mutt-$pkgver.tar.gz \ - http://ftp.frugalware.org/pub/other/sources/mutt-ng/mutt-$pkgver-patches2.tar.gz) + http://ftp.frugalware.org/pub/other/sources/mutt-ng/mutt-${pkgver}-patches.tar.gz) signatures=($source.asc '') build() From vmiklos at frugalware.org Tue Nov 6 01:32:34 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 01:32:38 2007 Subject: [Frugalware-git] frugalwareutils: Doxyfile: typo.. :) Message-ID: <20071106003234.20FCE3780BC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=cc460771307269430250e9b6aa0f6552a50d0c5b commit cc460771307269430250e9b6aa0f6552a50d0c5b Author: Miklos Vajna Date: Tue Nov 6 01:22:30 2007 +0100 Doxyfile: typo.. :) diff --git a/Doxyfile b/Doxyfile index 0cc4394..9468b74 100644 --- a/Doxyfile +++ b/Doxyfile @@ -119,7 +119,7 @@ GENERATE_RTF = NO # configuration options related to the man page output #--------------------------------------------------------------------------- GENERATE_MAN = YES -MAN_OUTPUT = doc +MAN_OUTPUT = apidoc MAN_EXTENSION = .3 MAN_LINKS = YES #--------------------------------------------------------------------------- From vmiklos at frugalware.org Tue Nov 6 02:12:32 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 02:12:33 2007 Subject: [Frugalware-git] frugalware-current: frugalwareutils-0.7.6-1-i686 Message-ID: <20071106011232.0D36E3780BC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ed9c71455e43abe0a59f2c1a64a3ff4a883a51f commit 1ed9c71455e43abe0a59f2c1a64a3ff4a883a51f Author: Miklos Vajna Date: Tue Nov 6 02:11:56 2007 +0100 frugalwareutils-0.7.6-1-i686 version bump never forget to add scriptlet to options (when using asciidoc), this time i wasted almost an hour with this.. ;) diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index 119fb31..aa1f77e 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -2,16 +2,18 @@ # Maintainer: VMiklos pkgname=frugalwareutils -pkgver=0.7.5 +pkgver=0.7.6 pkgrel=1 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils" depends=('glib2' 'ncurses' 'parted>=1.8.8' 'pacman-g2>=3.5.1') -makedepends=('dialog>=1.0_20051030-3' 'po4a' 'doxygen') +makedepends=('dialog>=1.0_20051030-3' 'doxygen' 'asciidoc' 'docbook-xsl' \ + 'docbook-xml' 'sgml-common') groups=('base') archs=('i686' 'x86_64') up2date="lynx -dump $url|Flasttar" source=($url/$pkgname-$pkgver.tar.gz) signatures=(${source[0]}.asc) +options=('scriptlet') Fconfopts="$Fconfopts --sbindir=/sbin --libdir=/lib --libexecdir=/usr/libexec" # optimization OK From voroskoi at frugalware.org Tue Nov 6 09:24:11 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Nov 6 09:24:13 2007 Subject: [Frugalware-git] frugalware-current: psi-0.11-2-x86_64 Message-ID: <20071106082411.21A9A378055@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e4ef7f47c60f5a41fac02ae9cc7234ef1938b802 commit e4ef7f47c60f5a41fac02ae9cc7234ef1938b802 Author: voroskoi Date: Tue Nov 6 09:23:37 2007 +0100 psi-0.11-2-x86_64 qca-ossl and qca-gnupg goes to rodepends() diff --git a/source/xapps-extra/psi/FrugalBuild b/source/xapps-extra/psi/FrugalBuild index 65981c9..c3acbb7 100644 --- a/source/xapps-extra/psi/FrugalBuild +++ b/source/xapps-extra/psi/FrugalBuild @@ -4,9 +4,10 @@ pkgname=psi pkgver=0.11 -pkgrel=1 +pkgrel=2 pkgdesc="Psi is a free instant messaging application designed for the Jabber IM network." depends=('aspell' 'qca>=2.0.0' 'libxi') +rodepends=('qca-ossl' 'qca-gnupg') license="GPLv2" archs=('i686' 'x86_64') groups=('xapps-extra') From hermier at frugalware.org Tue Nov 6 09:46:43 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 09:46:45 2007 Subject: [Frugalware-git] frugalware-current: fetch-1.0-1-i686 Message-ID: <20071106084643.7B6FC37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=17985741de351b83485a18b043fe7829c5c7c5f1 commit 17985741de351b83485a18b043fe7829c5c7c5f1 Author: Michel Hermier Date: Tue Nov 6 09:46:08 2007 +0100 fetch-1.0-1-i686 * Fix up2date and url. * Since the package changed name and url changed, it requires some extra love. diff --git a/source/apps-extra/fetch/FrugalBuild b/source/apps-extra/fetch/FrugalBuild index e293d95..ec675c2 100644 --- a/source/apps-extra/fetch/FrugalBuild +++ b/source/apps-extra/fetch/FrugalBuild @@ -2,14 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=fetch +_F_archive_name=http_fetcher pkgver=1.0 pkgrel=1 pkgdesc="fetch is a simple, fast, and flexible HTTP download tool built on the HTTP Fetcher library." -url="http://cs.nmu.edu/~lhanson/fetch/index.shtml" +url="http://http-fetcher.sourceforge.net" depends=('http-fetcher') groups=('apps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://cs.nmu.edu/~lhanson/fetch/index.shtml | grep tar.gz | sed 's/.*-\(.*\).t.*/\1/' | tail -n1" +up2date="lynx -dump $url/downloads.html | Flasttar" source=(http://cs.nmu.edu/~lhanson/fetch/dls/$pkgname-$pkgver.tar.gz) sha1sums=('edac1ee54b24bb9d094682743c193eaa47eb5a48') From voroskoi at frugalware.org Tue Nov 6 09:52:04 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Nov 6 09:52:08 2007 Subject: [Frugalware-git] frugalware-current: sqlite3-3.5.2-1-i686 Message-ID: <20071106085204.9B7EE37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb1025d2e80e3c1bcbd2bf619c0a00bd70ec8ae9 commit bb1025d2e80e3c1bcbd2bf619c0a00bd70ec8ae9 Author: voroskoi Date: Tue Nov 6 09:47:22 2007 +0100 sqlite3-3.5.2-1-i686 version bump with --enable-cross-thread-connections diff --git a/source/lib/sqlite3/FrugalBuild b/source/lib/sqlite3/FrugalBuild index c517317..ee32d0c 100644 --- a/source/lib/sqlite3/FrugalBuild +++ b/source/lib/sqlite3/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 0.46 SBU +# Compiling Time: 0.30 SBU # Contributor: Zsolt Szalai # Maintainer: voroskoi pkgname=sqlite3 -pkgver=3.5.1 +pkgver=3.5.2 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" url="http://www.sqlite.org/" @@ -14,19 +14,17 @@ archs=('i686' 'x86_64') _F_cd_path="sqlite-$pkgver" up2date="lynx -dump http://www.sqlite.org/download.html|grep -m1 'sqlite-3.\(.*\).tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz) +sha1sums=('e347b7040c0da586468811f78c3bc4111f33fc19') build() { Fbuild \ --enable-threadsafe \ --enable-threads-override-locks \ - --enable-tempstore=yes - ## not sure about this but is a good thing too , need to RTFM ;) - ## --enable-cross-thread-connections ## - ## ehh why this files are not installed with make install ? bug ? + --enable-tempstore=yes \ + --enable-cross-thread-connections Fexerel /usr/bin/lemon Ffilerel /usr/share/man/man1/$pkgname.1 } -sha1sums=('47de0a04d43baddf8ccb450c6e2adee74325e117') # optimization OK From hermier at frugalware.org Tue Nov 6 10:08:53 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 10:08:55 2007 Subject: [Frugalware-git] frugalware-current: rc-1.7-1-i686 Message-ID: <20071106090853.8A48E37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d06e142f73a13b3d4cff25c006d34fd19b7e7962 commit d06e142f73a13b3d4cff25c006d34fd19b7e7962 Author: Michel Hermier Date: Tue Nov 6 10:07:55 2007 +0100 rc-1.7-1-i686 * Fix url and up2date. * Package need version bump. diff --git a/source/apps-extra/rc/FrugalBuild b/source/apps-extra/rc/FrugalBuild index eb88590..6bd39be 100644 --- a/source/apps-extra/rc/FrugalBuild +++ b/source/apps-extra/rc/FrugalBuild @@ -5,13 +5,13 @@ pkgname=rc pkgver=1.7 pkgrel=1 pkgdesc="clone of plan9 shell" -url="ftp://ftp.sys.toronto.edu/pub/rc/" +url="http://www.libra-aries-books.co.uk/rc/" depends=() archs=('i686' 'x86_64') groups=('apps-extra') install=rc.install -source=(ftp://ftp.sys.toronto.edu/pub/rc/rc-$pkgver.tar.gz) -up2date="lynx -dump ftp://ftp.sys.toronto.edu/pub/rc/ |Flasttar" +source=(http://www.libra-aries-books.co.uk/rc/release/rc-$pkgver.tar.gz) +up2date="lynx -dump $url | Flasttar" sha1sums=('7a7511f7ef54f1883aa73e572b0a66e476421829') # optimalization OK From hermier at frugalware.org Tue Nov 6 10:15:48 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 10:15:49 2007 Subject: [Frugalware-git] frugalware-current: sleepd-1.3.11-1 Message-ID: <20071106091548.7FFA837805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9522ae88af22de19f1ca48893e71a22b7614e462 commit 9522ae88af22de19f1ca48893e71a22b7614e462 Author: Michel Hermier Date: Tue Nov 6 10:14:58 2007 +0100 sleepd-1.3.11-1 * Fix up2date. diff --git a/source/apps-extra/sleepd/FrugalBuild b/source/apps-extra/sleepd/FrugalBuild index eed85fb..869a609 100644 --- a/source/apps-extra/sleepd/FrugalBuild +++ b/source/apps-extra/sleepd/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=sleepd +Fpkgversep='_' pkgver=1.3.11 pkgrel=1 pkgdesc="A daemon to put a laptop to sleep if it is not being used or if the battery is low." @@ -10,8 +11,8 @@ depends=('apmd') groups=('apps-extra') archs=('i686' 'x86_64') backup=('etc/sleepd.conf') -up2date="lynx -dump -nolist http://ftp.debian.org/debian/pool/main/s/sleepd/?M=D | grep -m1 tar.gz | sed 's/.*d_\(.*\).t.*/\1/'" -source=(http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_$pkgver.tar.gz \ +up2date="lynx -dump -nolist http://ftp.debian.org/debian/pool/main/s/sleepd/ | Flasttar" +source=(http://ftp.debian.org/debian/pool/main/s/$pkgname/$pkgname$Fpkgversep$pkgver.tar.gz \ sleepd.conf rc.sleepd) sha1sums=('730a595f0db7a2528c6bdc1757445db828e824dc' \ '13f636770e35ab44a3d891431abc743b684057ab' \ From hermier at frugalware.org Tue Nov 6 10:24:05 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 10:24:07 2007 Subject: [Frugalware-git] frugalware-current: grub-theme-fwlive-0.2.2-1-i686 Message-ID: <20071106092405.F324D37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=861f636388607c993fdad072277b307a6917fd46 commit 861f636388607c993fdad072277b307a6917fd46 Author: Michel Hermier Date: Tue Nov 6 10:23:33 2007 +0100 grub-theme-fwlive-0.2.2-1-i686 * Fix up2date. * ROFL we can maintain our packages correctly at least :p diff --git a/source/base-extra/grub-theme-fwlive/FrugalBuild b/source/base-extra/grub-theme-fwlive/FrugalBuild index e27a022..eb74f87 100644 --- a/source/base-extra/grub-theme-fwlive/FrugalBuild +++ b/source/base-extra/grub-theme-fwlive/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Krisztian VASAS pkgname=grub-theme-fwlive +_F_archive_name=fwlive-grub-theme pkgver=0.2.2 pkgrel=1 pkgdesc="FwLive theme for GNU GRand Unified Bootloader" @@ -10,8 +11,8 @@ rodepends=('grub') makedepends=('gfxboot>=3.3.22' 'perl-html-parser' 'cpio') groups=('base-extra') archs=('i686' 'x86_64') -up2date="lynx -dump '${url}?C=M;O=A' | sed -ne 's/.*fwlive-grub-theme-\(.*\).tar.gz/\1/; $ p'" -source=($url/fwlive-grub-theme-$pkgver.tar.gz) +up2date="lynx -dump $url | Flasttar" +source=($url/$_F_archive_name-$pkgver.tar.gz) options=('nodocs') build() From hermier at frugalware.org Tue Nov 6 10:38:57 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 10:38:59 2007 Subject: [Frugalware-git] frugalware-current: arch-1.3.5-1-i686 Message-ID: <20071106093857.A298537805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c78797a1ce6b3ce466ead962e58d0b990013bf2c commit c78797a1ce6b3ce466ead962e58d0b990013bf2c Author: Michel Hermier Date: Tue Nov 6 10:38:35 2007 +0100 arch-1.3.5-1-i686 * Fix up2date * Moving build tree from pkg_source/src/build to pkg_source/build (build tested). diff --git a/source/devel-extra/arch/FrugalBuild b/source/devel-extra/arch/FrugalBuild index 2c78be1..1bb6d3e 100644 --- a/source/devel-extra/arch/FrugalBuild +++ b/source/devel-extra/arch/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=arch +_F_archive_name="tla" pkgver=1.3.5 pkgrel=1 pkgdesc="a modern and remarkable revision control system" @@ -9,15 +10,15 @@ url="http://www.gnu.org/software/gnu-arch/" depends=('zlib' 'expat') groups=('devel-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.atai.org/gnuarch/releases/ | grep tla | Flasttar" -source=(ftp://ftp.gnu.org/gnu/gnu-arch/tla-$pkgver.tar.gz) +up2date="lynx -dump http://www.atai.org/gnuarch/releases/ | Flasttar" +source=(ftp://ftp.gnu.org/gnu/gnu-arch/$_F_archive_name-$pkgver.tar.gz) sha1sums=('0fb3b5bfa6b2fb5eb953fdca9e0f75ac1b35b15e') build() { - Fcd tla-$pkgver/src + Fcd mkdir build cd build - ../configure $Fconfopts + ../src/configure $Fconfopts make || return 1 make prefix=$Fdestdir/usr install } From hermier at frugalware.org Tue Nov 6 11:28:42 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 11:28:46 2007 Subject: [Frugalware-git] frugalware-current: gogh-0.1.2.1-1-i686 Message-ID: <20071106102842.2038C37805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=48d9949edf7cd62151ade1acdb22a4d6880c95dd commit 48d9949edf7cd62151ade1acdb22a4d6880c95dd Author: Michel Hermier Date: Tue Nov 6 11:27:53 2007 +0100 gogh-0.1.2.1-1-i686 * Fix up2date. diff --git a/source/gnome-extra/gogh/FrugalBuild b/source/gnome-extra/gogh/FrugalBuild index 16fd567..c79814f 100644 --- a/source/gnome-extra/gogh/FrugalBuild +++ b/source/gnome-extra/gogh/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=gogh +_F_archive_name=Gogh pkgver=0.1.2.1 pkgrel=1 pkgdesc="Gogh is a GNU/Linux bitmap graphics editor." @@ -9,12 +10,11 @@ url="http://goghproject.com/" depends=('python' 'pygtk' 'gnome-python' 'pyxml') groups=('gnome-extra') archs=('i686') -up2date="lynx -dump $url/downloads.html | grep -m1 tar.gz | Flasttar" +up2date="lynx -dump $url/downloads.html | Flasttar" source=($url/Gogh-$pkgver.tar.gz $pkgname.png) _F_desktop_name="Gogh Bitmap Editor" _F_desktop_icon="gogh.png" _F_desktop_categories="Graphics;VectorGraphics;GTK;" -_F_cd_path="${pkgname/g/G}-$pkgver" Finclude python sha1sums=('cb08611d180a431c159e566095f80d15a9467303' \ 'de14ef7f2b3a1b1960dcfd3f88783c43ac85372f') From hermier at frugalware.org Tue Nov 6 11:40:28 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 11:40:32 2007 Subject: [Frugalware-git] frugalware-current: libgdome2-0.8.1-1-i686 Message-ID: <20071106104028.CB5C937805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d449bb406a53982eb3ee3a8194a263869fb188d8 commit d449bb406a53982eb3ee3a8194a263869fb188d8 Author: Michel Hermier Date: Tue Nov 6 11:39:48 2007 +0100 libgdome2-0.8.1-1-i686 * Fix up2date. diff --git a/source/gnome-extra/libgdome2/FrugalBuild b/source/gnome-extra/libgdome2/FrugalBuild index 1a0da8f..aa3dbbe 100644 --- a/source/gnome-extra/libgdome2/FrugalBuild +++ b/source/gnome-extra/libgdome2/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=libgdome2 +_F_archive_name=gdome2 pkgver=0.8.1 pkgrel=1 pkgdesc="The DOM C library for the GNOME project." @@ -10,11 +11,10 @@ depends=('libxml2' 'glib2') makedepends=('pkgconfig' 'gtk-doc') groups=('gnome-extra') archs=('i686') -up2date="lynx -dump $url/tarball | grep gdome2 | Flasttar" -source=($url/tarball/gdome2-$pkgver.tar.gz \ +up2date="lynx -dump $url | Flasttar" +source=($url/tarball/$_F_archive_name-$pkgver.tar.gz \ gdome2-0.8.1-gdome2-config.patch \ gdome2-0.8.1-docs-destdir.patch) -_F_cd_path="gdome2-$pkgver" sha1sums=('e9a3e4140c873d8232635ad10bb135ef7803c408'\ '482b8184dbc81d1f3698118bdf0ea55ebf311472'\ 'dc19ea7d9cace44ad6167865d8f03601603294a9') From hermier at frugalware.org Tue Nov 6 11:48:18 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 11:48:21 2007 Subject: [Frugalware-git] frugalware-current: nvu-1.0-1-i686 Message-ID: <20071106104818.7FFD837805A@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=da47237732ca35f43f13213b349ffc5880a1011d commit da47237732ca35f43f13213b349ffc5880a1011d Author: Michel Hermier Date: Tue Nov 6 11:47:49 2007 +0100 nvu-1.0-1-i686 * Fix url (so that it also fix up2date). diff --git a/source/gnome-extra/nvu/FrugalBuild b/source/gnome-extra/nvu/FrugalBuild index 1d1ea5e..07be693 100644 --- a/source/gnome-extra/nvu/FrugalBuild +++ b/source/gnome-extra/nvu/FrugalBuild @@ -5,7 +5,7 @@ pkgname=nvu pkgver=1.0 pkgrel=1 pkgdesc="A WYSIWG web editor for linux similiar to Dreamweaver" -url="http://www.nvu.com/" +url="http://www.nvudev.com/" depends=('libgnome' 'nss') groups=('gnome-extra') archs=('i686' 'x86_64') From hermier at frugalware.org Tue Nov 6 13:05:21 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 13:05:23 2007 Subject: [Frugalware-git] frugalware-current: xmms-arts_output-0.7.1-1-i686 Message-ID: <20071106120521.9614111901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=19ab448cd48b524202f31464503b2a4f306273c4 commit 19ab448cd48b524202f31464503b2a4f306273c4 Author: Michel Hermier Date: Tue Nov 6 11:56:05 2007 +0100 xmms-arts_output-0.7.1-1-i686 * Fix up2date. * Take advantage of _F_archive_name to simplify build script ;) (build checked) diff --git a/source/kde-extra/xmms-arts_output/FrugalBuild b/source/kde-extra/xmms-arts_output/FrugalBuild index f68eca4..4617eb5 100644 --- a/source/kde-extra/xmms-arts_output/FrugalBuild +++ b/source/kde-extra/xmms-arts_output/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=xmms-arts_output -realname=arts_output +_F_archive_name=arts_output pkgver=0.7.1 pkgrel=1 pkgdesc="aRts plugin for XMMS" @@ -10,16 +10,10 @@ url="http://havardk.xmms.org/plugins/arts_output/" depends=('arts' 'xmms') groups=('kde-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |Flasttar" -source=($url$realname-$pkgver.tar.gz) +up2date="lynx -dump $url | Flasttar" +source=($url$_F_archive_name-$pkgver.tar.gz) sha1sums=('026b7b0be459cfff75557c04e54425c4d21dacaf') -build() -{ - Fcd $realname-$pkgver - Fbuild -} - # optimalization ok # optimization OK From hermier at frugalware.org Tue Nov 6 13:05:21 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 13:05:26 2007 Subject: [Frugalware-git] frugalware-current: libsigc++12-1.2.7-4-i686 Message-ID: <20071106120521.B2F8F11901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=abed112810ee06e30df8e05e4eee66d294783ca3 commit abed112810ee06e30df8e05e4eee66d294783ca3 Author: Michel Hermier Date: Tue Nov 6 12:00:41 2007 +0100 libsigc++12-1.2.7-4-i686 * Fix up2date. * Use _F_archive_name, instead of custom realname. diff --git a/source/lib-extra/libsigc++12/FrugalBuild b/source/lib-extra/libsigc++12/FrugalBuild index ea3741d..db0ab51 100644 --- a/source/lib-extra/libsigc++12/FrugalBuild +++ b/source/lib-extra/libsigc++12/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Shrift pkgname=libsigc++12 -realname=libsigc++ +_F_archive_name=libsigc++ pkgver=1.2.7 pkgrel=4 pkgdesc="Callback Framework for C++ version $pkgver" @@ -10,9 +10,8 @@ url="http://libsigc.sourceforge.net/" groups=('lib-extra') archs=('i686' 'x86_64') depends=('libstdc++') -_F_cd_path="libsigc++-$pkgver" -up2date="lynx -dump http://ftp.gnome.org/pub/GNOME/sources/$realname/1.2/|Flasttar" -source=(http://ftp.gnome.org/pub/GNOME/sources/$realname/1.2/$realname-$pkgver.tar.bz2) +up2date="lynx -dump http://ftp.gnome.org/pub/GNOME/sources/$_F_archive_name/1.2/|Flasttar" +source=(http://ftp.gnome.org/pub/GNOME/sources/$_F_archive_name/1.2/$_F_archive_name-$pkgver.tar.bz2) sha1sums=('63cefd4a33193b5c80a9d00b269fe9791539d67b') # optimization OK From hermier at frugalware.org Tue Nov 6 13:05:21 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 13:05:27 2007 Subject: [Frugalware-git] frugalware-current: python-parted-0.11.2_5-6-i686 Message-ID: <20071106120521.CCB2811901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7648056bf09d7759bbd7149b9b8dfbabadac2d25 commit 7648056bf09d7759bbd7149b9b8dfbabadac2d25 Author: Michel Hermier Date: Tue Nov 6 12:15:19 2007 +0100 python-parted-0.11.2_5-6-i686 * Fix up2date. diff --git a/source/lib-extra/python-parted/FrugalBuild b/source/lib-extra/python-parted/FrugalBuild index 9919f01..9b748f3 100644 --- a/source/lib-extra/python-parted/FrugalBuild +++ b/source/lib-extra/python-parted/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: AlexExtreme pkgname=python-parted +Fpkgversep='_' ubunturel=5 ubuntuver=0.11.2 pkgver=${ubuntuver}_${ubunturel} @@ -11,7 +12,7 @@ url="http://www.ubuntu.com" depends=('parted>=1.8.8' 'python>=2.5') groups=('lib-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://archive.ubuntu.com/ubuntu/pool/universe/p/python-parted/ | Flasttar | sed 's/parted_//' | sed 's/ubuntu/_/'" +up2date="lynx -dump http://archive.ubuntu.com/ubuntu/pool/universe/p/python-parted/ | sed 's/ubuntu/_/' | Flasttar" source=(http://archive.ubuntu.com/ubuntu/pool/universe/p/python-parted/${pkgname}_${ubuntuver}ubuntu${ubunturel}.tar.gz \ $pkgname-0.11.2-import-fix.patch) sha1sums=('73e8b3da627e5da9744b10928a05d773ad8d2d94' \ From hermier at frugalware.org Tue Nov 6 13:05:22 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 13:05:28 2007 Subject: [Frugalware-git] frugalware-current: cmus-2.1.0-1-i686 Message-ID: <20071106120522.0912511901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c6f73e949a776dec2657313da8b4614c2b92ae9a commit c6f73e949a776dec2657313da8b4614c2b92ae9a Author: Michel Hermier Date: Tue Nov 6 13:04:51 2007 +0100 cmus-2.1.0-1-i686 * Fix up2date (package require released bump). diff --git a/source/multimedia-extra/cmus/FrugalBuild b/source/multimedia-extra/cmus/FrugalBuild index 76817eb..338562e 100644 --- a/source/multimedia-extra/cmus/FrugalBuild +++ b/source/multimedia-extra/cmus/FrugalBuild @@ -5,12 +5,12 @@ pkgname=cmus pkgver=2.1.0 pkgrel=2 pkgdesc="A very feature-rich ncurses-based music player." -url="http://onion.dynserv.net/~timo/" +url="http://cmus.sourceforge.net" depends=('ncurses' 'alsa-lib' 'libvorbis' 'libmad' 'flac>=1.1.3') groups=('multimedia-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url/cmus.html | grep Download | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=($url/files/$pkgname-$pkgver.tar.bz2) +up2date="lynx -dump $url | Flasttar" +source=(http://mirror.greaterscope.net/cmus/$pkgname-$pkgver.tar.bz2) sha1sums=('961d4bd1446c9499aeaac5a280761e5d98ca514f') build() From hermier at frugalware.org Tue Nov 6 14:11:09 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 14:11:14 2007 Subject: [Frugalware-git] frugalware-current: ajaxterm-0.10-2-i686 Message-ID: <20071106131109.D91A9119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3cc46f22d466dd39486ac27bb42d17779f50ec8 commit e3cc46f22d466dd39486ac27bb42d17779f50ec8 Author: Michel Hermier Date: Tue Nov 6 13:14:39 2007 +0100 ajaxterm-0.10-2-i686 * Fix up2date. * Removed unnessessary Fcd call when using _F_archive_name. diff --git a/source/network-extra/ajaxterm/FrugalBuild b/source/network-extra/ajaxterm/FrugalBuild index 51fe86f..d17764a 100644 --- a/source/network-extra/ajaxterm/FrugalBuild +++ b/source/network-extra/ajaxterm/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: VMiklos pkgname=ajaxterm +_F_archive_name=Ajaxterm pkgver=0.10 pkgrel=2 pkgdesc="Ajaxterm is a web based terminal." @@ -9,15 +10,14 @@ url="http://antony.lesuisse.org/qweb/trac/wiki/AjaxTerm" depends=('python') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://antony.lesuisse.org/qweb/files/|grep Ajax|Flasttar" -source=(http://antony.lesuisse.org/qweb/files/Ajaxterm-$pkgver.tar.gz \ +up2date="lynx -dump http://antony.lesuisse.org/qweb/files/ | Flasttar" +source=(http://antony.lesuisse.org/qweb/files/$_F_archive_name-$pkgver.tar.gz \ rc.ajaxterm) # TODO: after switching to upstart, we could send our initscript to upstream build() { - Fcd Ajaxterm-$pkgver Fconf Fsed '"/usr' "\"$Fdestdir/usr" Makefile Fsed '"/etc' "\"$Fdestdir/etc" Makefile From hermier at frugalware.org Tue Nov 6 14:11:09 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 14:11:16 2007 Subject: [Frugalware-git] frugalware-current: mod_security-1.9.4-1-i686 Message-ID: <20071106131109.E9F2E11901B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=efcf909ccbfb18c123a17f083265a94611359b0b commit efcf909ccbfb18c123a17f083265a94611359b0b Author: Michel Hermier Date: Tue Nov 6 13:25:15 2007 +0100 mod_security-1.9.4-1-i686 * Fix up2date (Maybe some extra greping is required). diff --git a/source/network-extra/mod_security/FrugalBuild b/source/network-extra/mod_security/FrugalBuild index b317578..6d0ab4e 100644 --- a/source/network-extra/mod_security/FrugalBuild +++ b/source/network-extra/mod_security/FrugalBuild @@ -2,6 +2,8 @@ # Maintainer: Karoly CZOVEK pkgname=mod_security +_F_archive_name=modsecurity-apache +Fpkgversep='_' pkgver=1.9.4 pkgrel=1 pkgdesc="A security filter DSO for the popular Apache httpd server" @@ -9,7 +11,7 @@ url="http://www.modsecurity.org" depends=('apache>=2.2.0') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.modsecurity.org/download/index.html|grep -m1 '.tar.gz'|sed 's/.*_\(.*\).t.*/\1/'" +up2date="lynx -dump http://www.modsecurity.org/download/direct.html | Flasttar" source=($url/download/modsecurity-apache_${pkgver}.tar.gz \ $url/download/modsecurity-rules-current.tar.gz) From hermier at frugalware.org Tue Nov 6 14:11:10 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 14:11:17 2007 Subject: [Frugalware-git] frugalware-current: wmnd-0.4.12-1-i686 Message-ID: <20071106131110.0BD4B11901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9bde1c62965b0789e83985dd95b1d9642ec0db1b commit 9bde1c62965b0789e83985dd95b1d9642ec0db1b Author: Michel Hermier Date: Tue Nov 6 14:10:48 2007 +0100 wmnd-0.4.12-1-i686 * Fix up2date and urls. diff --git a/source/x11-extra/wmnd/FrugalBuild b/source/x11-extra/wmnd/FrugalBuild index bbce6e9..3bb3dd4 100644 --- a/source/x11-extra/wmnd/FrugalBuild +++ b/source/x11-extra/wmnd/FrugalBuild @@ -5,12 +5,12 @@ pkgname=wmnd pkgver=0.4.12 pkgrel=1 pkgdesc="WMND shows a graph of the network traffic" -url="http://www.yuv.info/wmnd/" +url="http://www.thregr.org/~wavexx/software/wmnd/" depends=('windowmaker' 'libxext' 'libxpm') groups=('x11-extra' 'wmaker-dockapps') archs=('i686' 'x86_64') -up2date="lynx --dump http://www.yuv.info/wmnd | grep '\]wmnd ' | cut -d ' ' -f 8 | cut -d '(' -f 1 | head -n 1" -source=(ftp://ftp.yuv.info/pub/wmnd/releases/$pkgname-$pkgver.tar.gz) +up2date="lynx --dump $url | Flasttar" +source=(http://www.thregr.org/~wavexx/software/wmnd/releases/$pkgname-$pkgver.tar.gz) sha1sums=('61824a4159a352a6251145f86ad347381ded2035') build () From voroskoi at frugalware.org Tue Nov 6 14:35:41 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Nov 6 14:35:42 2007 Subject: [Frugalware-git] frugalware-current: slocate-3.1-3-i686 Message-ID: <20071106133541.B23E0119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2ff61490e1e64252714d5ab2a1dc764272fbc115 commit 2ff61490e1e64252714d5ab2a1dc764272fbc115 Author: voroskoi Date: Tue Nov 6 14:35:26 2007 +0100 slocate-3.1-3-i686 added conflics=('mlocate') added provides=('locate') using locate group insted of slocate, updated .install accordingly do not use locate with setgid which makes locate group useless ok vmiklos@ diff --git a/source/base/slocate/FrugalBuild b/source/base/slocate/FrugalBuild index fdc391f..ff72f5b 100644 --- a/source/base/slocate/FrugalBuild +++ b/source/base/slocate/FrugalBuild @@ -3,22 +3,29 @@ pkgname=slocate pkgver=3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Security Enhanced version of the GNU Locate" url="http://www.geekreview.org/slocate" depends=('util-linux' 'frugalware') groups=('base') archs=('i686' 'x86_64') backup=('etc/updatedb.conf') +conflicts=('mlocate') +provides=('locate') up2date="$pkgver" source=(http://ftp.frugalware.org/pub/other/sources/slocate/$pkgname-$pkgver.tar.bz2 \ slocate updatedb.conf fix-install.patch) +sha1sums=('730cd64b2b0c22576cd368666f54686a3d5b339b' \ + 'e3c1276602b0fc0b4e726a7684e5ba2c5c96cdc7' \ + 'c6b00373d0391537743f25b89b21a01042a0b6cd' \ + '6ad38f272f0b459397889e1fbcaf9ecba2259698') build() { Fcd Fpatchall # Fixup for cflags Fsed "CFLAGS=-Wall -Wshadow" "CFLAGS=${CFLAGS}" src/Makefile + Fsed '#define DB_GROUP "slocate"' '#define DB_GROUP "locate"' src/slocate.h make || return 1 Fmkdir /usr/bin Fmakeinstall @@ -36,8 +43,4 @@ build() { chgrp 21 $Fdestdir/var/lib/slocate || Fdie } -sha1sums=('730cd64b2b0c22576cd368666f54686a3d5b339b'\ - 'e3c1276602b0fc0b4e726a7684e5ba2c5c96cdc7'\ - 'c6b00373d0391537743f25b89b21a01042a0b6cd'\ - 'dffd2053a870972fdd4b902a2b23f4271abb24a5') # optimization OK diff --git a/source/base/slocate/fix-install.patch b/source/base/slocate/fix-install.patch index f0d2eb8..8352291 100644 --- a/source/base/slocate/fix-install.patch +++ b/source/base/slocate/fix-install.patch @@ -21,7 +21,7 @@ diff -Naur slocate-3.1.orig/src/Makefile slocate-3.1/src/Makefile install: - -groupadd slocate - install -m 2755 -o root -g slocate slocate /usr/local/bin/ -+ install -m 2755 -o root -g slocate slocate $(DESTDIR)/usr/bin/ ++ install -m 755 -o root -g 21 slocate $(DESTDIR)/usr/bin/ uninstall: rm -f /usr/local/bin/slocate diff --git a/source/base/slocate/slocate.install b/source/base/slocate/slocate.install index e8ab259..fda5bb8 100644 --- a/source/base/slocate/slocate.install +++ b/source/base/slocate/slocate.install @@ -1,19 +1,16 @@ # arg 1: the new package version post_install() { - sbin/ldconfig -r . &>/dev/null - usr/sbin/groupadd -g 21 slocate &>/dev/null + /sbin/ldconfig -r . &>/dev/null + if [ `/usr/bin/grep slocate /etc/group |wc -l` != 0 ]; then + /usr/sbin/groupdel slocate + fi + if [ `/usr/bin/grep locate /etc/group |wc -l` == 0 ]; then + /usr/sbin/groupadd -g 21 locate + fi } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { - echo "WARNING slocate: You need to run updatedb because 2.x and 3.x db not compatible!" - /bin/true -} - -# arg 1: the old package version -pre_remove() { - usr/sbin/groupdel slocate &>/dev/null + post_install } op=$1 From voroskoi at frugalware.org Tue Nov 6 15:04:24 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Nov 6 15:04:25 2007 Subject: [Frugalware-git] frugalware-current: shadow-4.0.18.1-9-i686 Message-ID: <20071106140424.9BADB11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d9374a09ad638cf61c41abd7bbf0eee4ec618388 commit d9374a09ad638cf61c41abd7bbf0eee4ec618388 Author: voroskoi Date: Tue Nov 6 15:02:16 2007 +0100 shadow-4.0.18.1-9-i686 add new users to locate group by default diff --git a/source/base/shadow/FrugalBuild b/source/base/shadow/FrugalBuild index a03d001..0a775e2 100644 --- a/source/base/shadow/FrugalBuild +++ b/source/base/shadow/FrugalBuild @@ -3,7 +3,7 @@ pkgname=shadow pkgver=4.0.18.1 -pkgrel=8 +pkgrel=9 pkgdesc="Shadow password file utilities" url="http://shadow.pld.org.pl" backup=(etc/{login.defs,group,passwd,shadow,adduser.conf} etc/limits) @@ -41,5 +41,5 @@ sha1sums=('1a30458e9db05560bfc82529048bd5d60b45cf9b' \ 'a3bcae5d8a4cf64c13599d047d963801962b6f4e' \ '2edf92c64691c775f8b5962ae6092aa8352ae627' \ 'c13cf8b5c566e129d4fc62ad3ac08b6c856c992e' \ - 'c98ebbc593fc21da9727724b92efc4352b6534f4') + '8464ea4fbee01302f5fb2123c8cf9dee58f57eb4') # optimization OK diff --git a/source/base/shadow/adduser.conf b/source/base/shadow/adduser.conf index e5654ab..268fbbf 100644 --- a/source/base/shadow/adduser.conf +++ b/source/base/shadow/adduser.conf @@ -16,4 +16,4 @@ defshell=/bin/bash defchmod=711 # home dir permissions - may be preferable to use 701, however. defgroup=users # If empty, then adduser will default it to the requested username # Default: users -addgroup=audio,camera,cdrom,floppy,scanner,video,uucp,storage,netdev +addgroup=audio,camera,cdrom,floppy,scanner,video,uucp,storage,netdev,locate From hermier at frugalware.org Tue Nov 6 15:05:42 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 15:05:45 2007 Subject: [Frugalware-git] frugalware-current: beaver-0.2.7-1-i386 Message-ID: <20071106140542.705B011901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=54173279754b432a325dbb5b984e781d7f712781 commit 54173279754b432a325dbb5b984e781d7f712781 Author: Michel Hermier Date: Tue Nov 6 15:04:55 2007 +0100 beaver-0.2.7-1-i386 * Fix up2date using Flasttar. diff --git a/source/xapps-extra/beaver/FrugalBuild b/source/xapps-extra/beaver/FrugalBuild index 5062278..6e198ed 100644 --- a/source/xapps-extra/beaver/FrugalBuild +++ b/source/xapps-extra/beaver/FrugalBuild @@ -10,7 +10,7 @@ license="GPL2" depends=('gtk+') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.nongnu.org/beaver/dloads/dloads.html|grep "ftp:.*beaver-0.2.*"|sort -nr|sed -n 's|.*beaver-\(.*\).tar.*|\1|;1 p'" +up2date="lynx -dump http://www.nongnu.org/beaver/dloads/dloads.html | Flasttar" source=(http://gnu.rtin.bz/ftp/savannah/files/beaver/$pkgname-$pkgver.tar.gz) sha1sums=('0c614824ac72fb88ecda15c4abcf22988003ce94') From hermier at frugalware.org Tue Nov 6 15:16:11 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 15:16:14 2007 Subject: [Frugalware-git] frugalware-current: geda-core-1.2.0-1-i686 Message-ID: <20071106141611.892CA11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7aee66a8b66c469c8978ebbe364e88ac16b6b34 commit a7aee66a8b66c469c8978ebbe364e88ac16b6b34 Author: Michel Hermier Date: Tue Nov 6 15:15:44 2007 +0100 geda-core-1.2.0-1-i686 * Fix up2date (We abuse the _F_archive_name here to do like what was doing the regexp, geda-utils is the reference for the version number). diff --git a/source/xapps-extra/geda-core/FrugalBuild b/source/xapps-extra/geda-core/FrugalBuild index b18a9e4..37dbc3e 100644 --- a/source/xapps-extra/geda-core/FrugalBuild +++ b/source/xapps-extra/geda-core/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=geda-core +_F_archive_name=geda-utils # Reference archive for package version pkgver=1.2.0 pkgrel=1 pkgdesc="Core components for gEDA - A complete electronic design and automation suite." @@ -11,7 +12,7 @@ license="GPL-2" depends=('gtk+2' 'guile' 'libgeda>=$pkgver') groups=('xapps-extra' 'geda-suite') archs=('i686') -up2date="lynx -dump $url/sources.html | grep utils | grep -m1 tar.gz | Flasttar" +up2date="lynx -dump $url/sources.html | Flasttar" source=($dlurl/geda-gattrib-$pkgver.tar.gz \ $dlurl/geda-gnetlist-$pkgver.tar.gz \ $dlurl/geda-gschem-$pkgver.tar.gz \ From voroskoi at frugalware.org Tue Nov 6 15:25:08 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Nov 6 15:25:10 2007 Subject: [Frugalware-git] frugalware-current: mlocate-0.18-1-i686 Message-ID: <20071106142508.EC18811904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bbd228bc771153b3d53d02712eb98f43017632a7 commit bbd228bc771153b3d53d02712eb98f43017632a7 Author: voroskoi Date: Tue Nov 6 15:23:04 2007 +0100 mlocate-0.18-1-i686 new package http://carolina.mff.cuni.cz/~trmac/blog/mlocate/ diff --git a/source/base-extra/mlocate/FrugalBuild b/source/base-extra/mlocate/FrugalBuild new file mode 100644 index 0000000..526c0a5 --- /dev/null +++ b/source/base-extra/mlocate/FrugalBuild @@ -0,0 +1,33 @@ +# Compiling Time: 0.09 SBU +# Maintainer: voroskoi + +pkgname=mlocate +pkgver=0.18 +pkgrel=1 +pkgdesc="mlocate (merging locate) is a locate/updatedb implementation." +url="http://people.redhat.com/mitr/mlocate/" +depends=('glibc') +groups=('base-extra') +archs=('i686' 'x86_64') +license="GPLv2" +backup=('etc/updatedb.conf') +# remove after 0.8 +conflicts=('slocate') +provides=('locate') +#replaces=('slocate') +up2date="lynx -dump ${url} |Flasttarbz2" +source=(${url}/${pkgname}-${pkgver}.tar.bz2 \ + updatedb.conf ${pkgname}.cron locate_group.diff) +sha1sums=('4cc1e6e5a673ce9b3ca3f378f4be7bf69e8288f1' \ + 'cdce60a25fb0afbbda942b4155eb5f4156106d3d' \ + 'cd938a6a2706f37f767fc2466aed9bee36c4440a' \ + 'fb2965dfa9f05da563621b71cf10929dcdb43303') + +build() { + Fbuild + + Ffile updatedb.conf /etc/updatedb.conf + Fexe ${pkgname}.cron /etc/cron.daily/updatedb +} + +# optimization OK diff --git a/source/base-extra/mlocate/locate_group.diff b/source/base-extra/mlocate/locate_group.diff new file mode 100644 index 0000000..bd5963a --- /dev/null +++ b/source/base-extra/mlocate/locate_group.diff @@ -0,0 +1,12 @@ +diff -aur mlocate-0.18/Makefile.in fw_mlocate-0.18/Makefile.in +--- mlocate-0.18/Makefile.in 2007-08-25 00:51:49.000000000 +0200 ++++ fw_mlocate-0.18/Makefile.in 2007-11-06 14:07:31.000000000 +0100 +@@ -410,7 +410,7 @@ + top_srcdir = @top_srcdir@ + dbdir = $(localstatedir)/mlocate + dbfile = $(dbdir)/mlocate.db +-groupname = mlocate ++groupname = locate + updatedb_conf = $(sysconfdir)/updatedb.conf + # autopoint puts its m4 files to the first directory + ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 diff --git a/source/base-extra/mlocate/mlocate.cron b/source/base-extra/mlocate/mlocate.cron new file mode 100644 index 0000000..4253857 --- /dev/null +++ b/source/base-extra/mlocate/mlocate.cron @@ -0,0 +1,5 @@ +#!/bin/sh + +nodevs=$(< /proc/filesystems awk '$1 == "nodev" { print $2 }') +renice +19 -p $$ >/dev/null 2>&1 +/usr/bin/updatedb -f "$nodevs" diff --git a/source/base-extra/mlocate/mlocate.install b/source/base-extra/mlocate/mlocate.install new file mode 100644 index 0000000..5e4ef87 --- /dev/null +++ b/source/base-extra/mlocate/mlocate.install @@ -0,0 +1,22 @@ +# arg 1: the new package version +pre_install() +{ + if [ `/usr/bin/grep slocate /etc/group |wc -l` != 0 ]; then + /usr/sbin/groupdel slocate + fi +} + +# arg 1: the new package version +post_install() +{ + if [ `/usr/bin/grep locate /etc/group |wc -l` == 0 ]; then + /usr/sbin/groupadd -g 21 locate + fi + echo "Creating initial mlocate db (this may take a few minutes)..." + /etc/cron.daily/updatedb + echo "Done." +} + +op=$1 +shift +$op $* diff --git a/source/base-extra/mlocate/updatedb.conf b/source/base-extra/mlocate/updatedb.conf new file mode 100644 index 0000000..6bf83d1 --- /dev/null +++ b/source/base-extra/mlocate/updatedb.conf @@ -0,0 +1,7 @@ +PRUNE_BIND_MOUNTS = "yes" + +# exclude filesystems: +PRUNEFS = "auto afs gfs gfs2 iso9660 sfs udf proc smbfs sutofs" + +# exclude sirs: +PRUNEPATHS = "/media /var/cache /var/spool /tmp /usr/tmp /var/tmp" From voroskoi at frugalware.org Tue Nov 6 15:27:54 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Nov 6 15:27:55 2007 Subject: [Frugalware-git] frugalware-current: seamonkey-1.1.6-1-i686 Message-ID: <20071106142754.E064511904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=803fab66708fb843ce3ca6c7516b540144206cc9 commit 803fab66708fb843ce3ca6c7516b540144206cc9 Author: voroskoi Date: Tue Nov 6 15:27:24 2007 +0100 seamonkey-1.1.6-1-i686 version bump diff --git a/source/xapps-extra/seamonkey/FrugalBuild b/source/xapps-extra/seamonkey/FrugalBuild index a356c14..0c2d403 100644 --- a/source/xapps-extra/seamonkey/FrugalBuild +++ b/source/xapps-extra/seamonkey/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=seamonkey -pkgver=1.1.5 +pkgver=1.1.6 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=('370980b3f3054070d1682209361077e70d9b4e0b' \ +sha1sums=('e37972ab4a30c1f12f1673916b4ab7049bee5fff' \ '0dd4777e87d70eba6834d56813f6a415fe991007' \ 'b0e0bdd676758e19cac4a0429257a92183328f0e') From hermier at frugalware.org Tue Nov 6 15:34:41 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 15:34:45 2007 Subject: [Frugalware-git] frugalware-current: tablelist-4.6-1-i686 Message-ID: <20071106143441.8966811904C0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f4627be5056d6cc468c68e27ba9381666c896390 commit f4627be5056d6cc468c68e27ba9381666c896390 Author: Michel Hermier Date: Tue Nov 6 15:34:19 2007 +0100 tablelist-4.6-1-i686 * Fix url and up2date. diff --git a/source/xapps-extra/tablelist/FrugalBuild b/source/xapps-extra/tablelist/FrugalBuild index 2e4d7a2..f9f7865 100644 --- a/source/xapps-extra/tablelist/FrugalBuild +++ b/source/xapps-extra/tablelist/FrugalBuild @@ -3,15 +3,16 @@ # Contributor: Szabo Peter (pete [at] teamlupus.hu) pkgname=tablelist +Fpkgversep="" pkgver=4.6 pkgrel=1 pkgdesc="The Multi-Column Listbox Package" -url="http://www.nemethi.privat.t-online.de/tablelist/index.html" +url="http://www.nemethi.de" depends=('tk') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.nemethi.privat.t-online.de/ | grep Tablelist|sed -n 's/.*t \(.*\)/\1/;1 p'" -source=(http://www.nemethi.privat.t-online.de/tablelist/tablelist$pkgver.tar.gz) +up2date="lynx -dump $url | Flasttar" +source=($url/tablelist/$pkgname$pkgver.tar.gz) build() { Fcd $pkgname$pkgver From hermier at frugalware.org Tue Nov 6 15:34:41 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 15:34:47 2007 Subject: [Frugalware-git] frugalware-current: mingw-devstudio-2.06-1-i686 Message-ID: <20071106143441.75A2911904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e840da2da93ffd52f9f8be098dceaac1eb29b647 commit e840da2da93ffd52f9f8be098dceaac1eb29b647 Author: Michel Hermier Date: Tue Nov 6 15:22:57 2007 +0100 mingw-devstudio-2.06-1-i686 * Fix up2date. diff --git a/source/xapps-extra/mingw-devstudio/FrugalBuild b/source/xapps-extra/mingw-devstudio/FrugalBuild index e5f600d..84ed39a 100644 --- a/source/xapps-extra/mingw-devstudio/FrugalBuild +++ b/source/xapps-extra/mingw-devstudio/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=mingw-devstudio +_F_archive_name=mingw-devstudio_linux pkgver=2.06 pkgrel=1 pkgdesc="A cross-platform IDE for the GNU C/C++ Compilers." @@ -11,8 +12,8 @@ rodepends=('gcc' 'gdb') depends=('gtk+2') groups=('xapps-extra') archs=('i686') -up2date="lynx -dump $url/download.html | grep linux | Flasttar" -source=(http://www.parinyasoft.com/download/${pkgname}_linux-$pkgver.tar.gz) +up2date="lynx -dump $url/download.html | Flasttar" +source=(http://www.parinyasoft.com/download/$_F_archive_name-$pkgver.tar.gz) sha1sums=('23459778ba0f42e73e0fcb4142776a4c519ef415') _F_desktop_name="MinGW Developer Studio" _F_desktop_file="mingwstudio.desktop" From voroskoi at frugalware.org Tue Nov 6 15:35:05 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Nov 6 15:35:13 2007 Subject: [Frugalware-git] frugalware-current: espgs_remove Message-ID: <20071106143511.39E0C11904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d122b16bf3a4c815e32a391f16b7ae547667660f commit d122b16bf3a4c815e32a391f16b7ae547667660f Author: voroskoi Date: Tue Nov 6 15:32:31 2007 +0100 espgs_remove espgs merged with GPL ghostscript, not necessary anymore diff --git a/source/apps/espgs/FrugalBuild b/source/apps/espgs/FrugalBuild deleted file mode 100644 index a230982..0000000 --- a/source/apps/espgs/FrugalBuild +++ /dev/null @@ -1,33 +0,0 @@ -# Compiling Time: 1.13 SBU -# Contributor: VMiklos -# Maintainer: voroskoi - -pkgname=espgs -pkgver=8.15.4 -pkgrel=1 -pkgdesc="A customized version of GNU Ghostscript" -url="http://www.cups.org/espgs/" -depends=('cups' 'libgcc') -rodepends=('foomatic-filters' 'urw-fonts') -groups=('apps') -archs=('i686' 'x86_64') -up2date="lynx -dump $url |grep Stable |sed -e 's/.*v//'" -source=(ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/$pkgver/$pkgname-$pkgver-source.tar.bz2) - -build() { - unset MAKEFLAGS - Fmake --enable-cups \ - --enable-dynamic \ - --enable-threads \ - --with-drivers=ALL \ - --with-omni \ - --with-ijs \ - --with-x=no \ - --datadir=/usr/share \ - --with-fontpath=/usr/share/ghostscript - # DONT replace with F* because it will broke again :) - make install_prefix="$Fdestdir" install soinstall || Fdie -} -sha1sums=('dc3b66675b988f35185e4772bfad0bcad66a7b00') - -# optimization OK From voroskoi at frugalware.org Tue Nov 6 15:37:22 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Nov 6 15:37:24 2007 Subject: [Frugalware-git] frugalware-current: xespgs_remove Message-ID: <20071106143722.B05D411904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c3da8d8ed59c5a4f7c45eb8997b95bc756e934d7 commit c3da8d8ed59c5a4f7c45eb8997b95bc756e934d7 Author: voroskoi Date: Tue Nov 6 15:37:14 2007 +0100 xespgs_remove diff --git a/source/xapps/xespgs/FrugalBuild b/source/xapps/xespgs/FrugalBuild deleted file mode 100644 index 1615ad1..0000000 --- a/source/xapps/xespgs/FrugalBuild +++ /dev/null @@ -1,35 +0,0 @@ -# Compiling Time: 1.13 SBU -# Maintainer: voroskoi - -pkgname=xespgs -pkgver=8.15.4 -pkgrel=1 -pkgdesc="A customized version of GNU Ghostscript (with X support)" -url="http://www.cups.org/espgs/" -depends=('libxext' 'libx11' 'libsm' 'libxt' 'libxcb' 'libice' 'cups' 'libgcc') -rodepends=('foomatic-filters' 'urw-fonts') -groups=('xapps') -archs=('i686' 'x86_64') -conflicts=('espgs') -provides=('espgs') -up2date="lynx -dump $url |grep Stable |sed -e 's/.*v//'" -source=(ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/$pkgver/espgs-$pkgver-source.tar.bz2) - -build() { - unset MAKEFLAGS - Fcd espgs-$pkgver - Fmake --enable-cups \ - --enable-dynamic \ - --enable-threads \ - --with-drivers=ALL \ - --with-omni \ - --with-ijs \ - --with-x \ - --datadir=/usr/share \ - --with-fontpath=/usr/share/ghostscript - # DONT replace with F* because it will broke again :) heh :S - make install_prefix="$Fdestdir" install soinstall -} -sha1sums=('dc3b66675b988f35185e4772bfad0bcad66a7b00') - -# optimization OK From hermier at frugalware.org Tue Nov 6 15:42:41 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 15:42:44 2007 Subject: [Frugalware-git] frugalware-current: texlipse-1.1.0-1-i686 Message-ID: <20071106144241.98D3D11904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4534a5f8e4ae81f1f3d35ca26bb6d9be98863953 commit 4534a5f8e4ae81f1f3d35ca26bb6d9be98863953 Author: Michel Hermier Date: Tue Nov 6 15:42:00 2007 +0100 texlipse-1.1.0-1-i686 * Fix up2date. diff --git a/source/xapps-extra/texlipse/FrugalBuild b/source/xapps-extra/texlipse/FrugalBuild index 8f2339a..ed7b27a 100644 --- a/source/xapps-extra/texlipse/FrugalBuild +++ b/source/xapps-extra/texlipse/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: Bence Nagy pkgname=texlipse +Fpkgversep='_' pkgver=1.1.0 pkgrel=1 pkgdesc="TeXlipse is a plugin that adds Latex support to the Eclipse IDE." @@ -11,7 +12,7 @@ depends=('eclipse' 'tetex') groups=('xapps-extra') archs=('i686' '!x86_64') source=(${source/$pkgname-$pkgver.tar.gz/net.sourceforge.texlipse_1.1.0_src.zip}) -up2date='lynx -dump "http://sourceforge.net/project/showfiles.php?group_id=133306" | grep texlipse.*.zip | head -n 1 | sed "s/.*texlipse_\([0-9.]\+\)_src.zip.*/\1/"' +up2date="lynx -dump $url/release.html | Flastarchive \.zip" sha1sums=('5279f8be6a969d71b77801ae188a5567013b7dd8') build() { From hermier at frugalware.org Tue Nov 6 17:42:41 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 17:42:44 2007 Subject: [Frugalware-git] frugalware-current: windowmaker-0.92.0-3-i686 Message-ID: <20071106164241.62A5111904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a5fea97442021f3da6f7c422698eb6b4894ed7b commit 5a5fea97442021f3da6f7c422698eb6b4894ed7b Author: Michel Hermier Date: Tue Nov 6 17:41:15 2007 +0100 windowmaker-0.92.0-3-i686 * Fix up2date. * Use the _F_archive_name facilities. diff --git a/source/xlib/windowmaker/FrugalBuild b/source/xlib/windowmaker/FrugalBuild index ae1b374..a0ac059 100644 --- a/source/xlib/windowmaker/FrugalBuild +++ b/source/xlib/windowmaker/FrugalBuild @@ -2,6 +2,7 @@ # Maintainer: VMiklos pkgname=windowmaker +_F_archive_name=WindowMaker pkgver=0.92.0 pkgrel=3 pkgdesc="An X11 window manager originally designed to provide integration support for the GNUstep Desktop Environment." @@ -10,8 +11,8 @@ url="http://www.windowmaker.info/" depends=('libtiff' 'libjpeg' 'libungif') groups=('xlib') archs=('i686' 'x86_64') -up2date="lynx -dump 'http://windowmaker.info/pub/source/release/?C=M;O=A'|Flasttar" -source=(ftp://ftp.windowmaker.info/pub/source/release/WindowMaker-$pkgver.tar.bz2 xinitrc.$pkgname $pkgname.desktop \ +up2date="lynx -dump http://windowmaker.info/pub/source/release/ | Flasttar" +source=(ftp://ftp.windowmaker.info/pub/source/release/$_F_archive_name-$pkgver.tar.bz2 xinitrc.$pkgname $pkgname.desktop \ windowmaker-0.92.0-x86_64-fix.patch $pkgname.sh) sha1sums=('4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c' \ '62d8e1d684057c4f40e6dc829380bd77a3b0dc6f' \ @@ -21,7 +22,7 @@ sha1sums=('4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c' \ build() { - Fcd WindowMaker-$pkgver + Fcd [ "$CARCH" == "x86_64" ] && Fpatchall [ "$CARCH" == "x86_64" ] && Fautoconfize source $Fsrcdir/$pkgname.sh || return 1 From vmiklos at frugalware.org Tue Nov 6 18:19:14 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 18:19:16 2007 Subject: [Frugalware-git] frugalware-current: fakeroot-1.8.4-1-i686 Message-ID: <20071106171914.9004111904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0e0bfb6fd38d2539c6d282d682d987886d3b9cb commit c0e0bfb6fd38d2539c6d282d682d987886d3b9cb Author: Miklos Vajna Date: Tue Nov 6 18:18:44 2007 +0100 fakeroot-1.8.4-1-i686 version bump diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild index e1e4d3e..71046d1 100644 --- a/source/devel/fakeroot/FrugalBuild +++ b/source/devel/fakeroot/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: VMiklos pkgname=fakeroot -pkgver=1.8.3 +pkgver=1.8.4 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=('59c613647d0e537767b4b61ed5c7be621932a709') +sha1sums=('00e7978f2cb3a836207beb35629215ecfc8eabaa') # optimization OK From vmiklos at frugalware.org Tue Nov 6 18:38:50 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 18:38:52 2007 Subject: [Frugalware-git] frugalware-current: psmisc-22.6-1-x86_64 Message-ID: <20071106173850.1A1E911904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a78d39a13af01d89e2ca52532682164b0d9ca5ec commit a78d39a13af01d89e2ca52532682164b0d9ca5ec Author: Miklos Vajna Date: Tue Nov 6 18:38:31 2007 +0100 psmisc-22.6-1-x86_64 version bump diff --git a/source/base/psmisc/FrugalBuild b/source/base/psmisc/FrugalBuild index faa18cb..e799bae 100644 --- a/source/base/psmisc/FrugalBuild +++ b/source/base/psmisc/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=psmisc -pkgver=22.5 +pkgver=22.6 pkgrel=1 pkgdesc="Miscellaneous procfs tools" depends=('ncurses') @@ -18,5 +18,5 @@ build() Frm /usr/{man/man1/pidof.1,bin/pidof} } -sha1sums=('0fd6c52dd0dad464a9be7baa79fb810caf43c923') +sha1sums=('cb15c23e9cfe618e9de5f066525bce7dc7b77421') # optimization OK From hermier at frugalware.org Tue Nov 6 18:42:15 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 18:42:17 2007 Subject: [Frugalware-git] frugalware-current: yaboot-1.3.13-2-i386 Message-ID: <20071106174215.961F311904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5982521a0c1b6ab99896c85a349aaf991fc7039c commit 5982521a0c1b6ab99896c85a349aaf991fc7039c Author: Michel Hermier Date: Tue Nov 6 18:41:41 2007 +0100 yaboot-1.3.13-2-i386 * Fix up2date. diff --git a/source/base/yaboot/FrugalBuild b/source/base/yaboot/FrugalBuild index 30ed09b..32915ec 100644 --- a/source/base/yaboot/FrugalBuild +++ b/source/base/yaboot/FrugalBuild @@ -9,7 +9,7 @@ url="http://penguinppc.org/bootloaders/yaboot/" groups=('base') depends=('hfsutils' 'binutils' 'bash' 'glibc' 'grep' 'ncurses' 'sed') archs=('!i686' '!x86_64' 'ppc') -up2date="lynx -dump http://penguinppc.org/bootloaders/yaboot |grep -m1 'tar.gz'|sed 's/.*ot-//g'|sed 's/.ta.*//g'" +up2date="lynx -dump http://penguinppc.org/bootloaders/yaboot | Flasttar" source=(http://penguinppc.org/bootloaders/yaboot/yaboot-$pkgver.tar.gz \ yaboot-1.3.13-fix-1.patch) sha1sums=('e2269e8dc039a0922d700de831bb185c8a787ca2' \ From hermier at frugalware.org Tue Nov 6 19:02:03 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 6 19:02:06 2007 Subject: [Frugalware-git] frugalware-current: avant-window-navigator-0.2-2-i686 Message-ID: <20071106180203.94B8E11904BF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fb0cb823ee4ecf80838ee0a66b205e6f53c07e00 commit fb0cb823ee4ecf80838ee0a66b205e6f53c07e00 Author: Michel Hermier Date: Tue Nov 6 19:01:52 2007 +0100 avant-window-navigator-0.2-2-i686 * Fix up2date. diff --git a/source/gnome-extra/avant-window-navigator/FrugalBuild b/source/gnome-extra/avant-window-navigator/FrugalBuild index be7cdb8..dbc2199 100644 --- a/source/gnome-extra/avant-window-navigator/FrugalBuild +++ b/source/gnome-extra/avant-window-navigator/FrugalBuild @@ -17,7 +17,7 @@ _F_gnome_desktop=y Finclude gnome-scriptlet options=('scriptlet') archs=('i686' 'x86_64') -up2date="elinks -dump 'https://launchpad.net/awn/+download'|grep -m1 'tar'|sed 's/.*or-\(.*\).t.*/\1/'" +up2date="links -dump 'https://launchpad.net/awn/+download' | Flasttar" source=($url/$pkgver/$pkgver/+download/$pkgname-$pkgver.tar) sha1sums=('dc3d79b133eaa22c44a2902d78af07214e066c40') From crazy at frugalware.org Tue Nov 6 19:53:01 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 6 19:53:04 2007 Subject: [Frugalware-git] frugalware-current: qt4-4.3.2-2-i686 Message-ID: <20071106185301.5DDEB11901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f12ca7a8095833b4081e02d5303f1dd9a4d2265e commit f12ca7a8095833b4081e02d5303f1dd9a4d2265e Author: crazy Date: Tue Nov 6 15:34:23 2007 +0100 qt4-4.3.2-2-i686 * release bump ( uhh an somewhat big one from one fpm make 23 :P ) * all is split off , qt4 is by now a dummy package but * it has rodepends() so nothing breaks till I correct the depends * added missing desktop files , fixed icons * re-added glib2 to depends , enabled openssl support * corrected group(s) diff --git a/source/kde-extra/qt4/CVE-2007-4137.patch b/source/kde-extra/qt4/CVE-2007-4137.patch deleted file mode 100644 index e2bbdd0..0000000 --- a/source/kde-extra/qt4/CVE-2007-4137.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/corelib/codecs/qutfcodec.cpp -+++ src/corelib/codecs/qutfcodec.cpp -@@ -140,7 +140,7 @@ void QUtf8Codec::convertToUnicode(QString *target, const char *chars, int len, C - - int originalLength = target->length(); - QString &result = *target; -- result.resize(originalLength + len); // worst case -+ result.resize(originalLength + len + 1); // worst case - QChar *qch = result.data() + originalLength; - uchar ch; - int invalid = 0; diff --git a/source/kde-extra/qt4/FrugalBuild b/source/kde-extra/qt4/FrugalBuild index 7f0a484..87943a2 100644 --- a/source/kde-extra/qt4/FrugalBuild +++ b/source/kde-extra/qt4/FrugalBuild @@ -4,48 +4,124 @@ pkgname=qt4 origname=qt pkgver=4.3.2 -pkgrel=1 +pkgrel=2 pkgmore=x11-opensource-src +## Dummy package is empty .. pkgdesc="The QT4 GUI toolkit." url="http://www.trolltech.com/products/qt" -depends=('libxrandr' 'mesa>=6.5.3' 'libxft' 'libmng' 'libjpeg' 'libxcursor' 'libxinerama' 'freetype2' \ - 'libsm' 'libpng' 'libxtst' 'fontconfig' 'dbus>=0.93') -makedepends=('mysql>=5.0.15' 'postgresql>=8.2' 'cups' 'bison' 'flex' 'unixodbc' 'imake' 'sqlite3' 'sqlite2') -rodepends=('dejavu-ttf') -groups=('kde-extra') +depends=() +makedepends=('libxrandr' 'mesa>=6.5.3' 'libxft' 'libmng' 'libjpeg' 'libxcursor' 'libxinerama' 'freetype2' \ + 'libsm' 'libpng' 'libxtst' 'fontconfig' 'dbus>=0.93' 'mysql>=5.0.15' 'postgresql>=8.2' 'cups' 'bison' \ + 'flex' 'unixodbc' 'imake' 'sqlite3' 'sqlite2' 'openssl') +## this is here till I've fixed all reverse depends so we not break all apps using qt4 by now +rodepends=("libqtcore" "libqtgui" "libqtnetwork" "libqtopengl" "libqt3support" "libqtscript" "libqtsql" \ + "libqtsvg" "libqtxml" "libqttest" "qt4-qdbus" "$pkgname-tools") +groups=('xlib-extra') archs=('i686' 'x86_64') -options=('nodocs' 'scriptlet') +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-r732042.tar.bz2 \ - assistant4.desktop designer4.desktop linguist4.desktop qt4config.desktop \ - dummy.patch qt4.sh.off Trolltech.conf apply_patches) - + assistant4.desktop \ + designer4.desktop \ + linguist4.desktop \ + qt4config.desktop \ + qdbusviewer.desktop \ + qtdemo.desktop \ + dummy.patch qt4.sh \ + Trolltech.conf \ + apply_patches) +sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \ + 'f30fcd8715ee711956ba51387b441d71eaef05dc' \ + '70413a58f1d4b7260ab407482675b8028cea4e47' \ + '957376dd30fdf1bbc2ff5545f2f808f90d44c4dc' \ + 'bc6527ee1d672cc192c667aeb49540b166e96949' \ + '1097be47724cda110a0d099c58a2f2ff6dcacc1e' \ + '2099d1e1ef2172369c2b5f51e3dcf88fd66ba38c' \ + '7c47da506d5118b87a0cae775886f99fd7de4fd9' \ + '6868adc53c2037a83b0601c92ea39dd3394a8fdf' \ + 'bafdd4d0fe8d2c0caae0720f5f6b9f193d4744e0' \ + '2468fea7b127253832148115d5aa9e85b2e0aea6' \ + '5a2341286f6d766ab943294aec90a8ad25d0ee1d') export QTDIR=$startdir/src/$origname-$pkgmore-$pkgver export PATH=${QTDIR}/bin:${PATH} export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} export YACC='yacc -d' -## corelib gui network opengl qt3support -## script sql svg tools xml +src_libs=('corelib' 'gui' 'network' 'opengl' 'qt3support' 'script' 'sql' 'svg' 'xml') + +subpkgs=("$pkgname-docs" "$pkgname-demos" "libqtcore" "libqtgui" "libqtnetwork" \ + "libqtopengl" "libqt3support" "libqtscript" "libqtsql" "libqtsvg" \ + "libqtxml" "libqttest" "$pkgname-qdbus" "$pkgname-assistant" "$pkgname-designer" \ + "$pkgname-linguist" "$pkgname-tools" "$pkgname-plugin-sqlite3" "$pkgname-plugin-sqlite2" \ + "$pkgname-plugin-mysql" "$pkgname-plugin-odbc" "$pkgname-plugin-psql") +subdescs=('Qt4 Documentation.' 'Qt4 Demo and Example Programs.' 'Qt4 Core Library' 'Qt4 Gui Library' \ + 'Qt4 Network Library' 'Qt4 OpenGL Library' 'Qt4 Qt3support Library' 'Qt4 Script Library' 'Qt4 Sql Library' \ + 'Qt4 Svg Library' 'Qt4 Xml Library' 'Qt4 Unit Testing Library' 'Qt4 DBus module' 'Qt4 Document Browser' \ + 'Qt4 Interface Designer' 'Qt4 Translation Tool' 'Qt4 Tools' 'Qt4 SQlite3 plugin' 'Qt4 SQlite2 plugin' \ + 'Qt4 MySql plugin' 'Qt4 ODBC plugin' 'Qt4 ODBC plugin') +subdepends=('' 'libqtopengl glib2 qt4-designer qt4-qdbus libqt3support libqtsvg libqttest' \ + 'libstdc++ zlib glib2' \ + 'libpng libsm libqtcore libxi libxrandr libxcursor libxinerama fontconfig' \ + 'libqtcore' 'mesa libqtgui libqtcore' \ + 'libqtsql libqtnetwork libqtxml libqtgui libqtcore' 'libqtcore' 'libqtcore' \ + 'libqtxml libqtgui libqtcore' 'libqtcore' 'libqtcore' 'dbus libqtxml libqtcore' \ + 'qt4-qdbus libqtxml libqtgui libqtnetwork libqtcore' \ + 'qt4-assistant libqtscript libqtxml libqtgui libqtnetwork libqtcore libqtsql' \ + 'libqtnetwork libqtxml libqtgui libqtcore qt4-assistant' \ + 'libqtxml libqtcore qt4-assistant libqtgui libqtnetwork libqt3support libqtsql' \ + 'sqlite3 libqtsql' 'sqlite2 libqtsql' 'libmysqlclient libqtsql' 'unixodbc libqtsql' \ + 'libpq libqtsql') +# NOTE: almost all need be moved to main .. but not yet +subgroups=('docs-extra' 'xapps-extra' 'lib-extra' 'xlib-extra' 'lib-extra' \ + 'xlib-extra' 'xlib-extra' 'lib-extra' 'lib-extra' 'xlib-extra' \ + 'lib-extra' 'lib-extra' 'lib-extra' 'xapps-extra' 'xapps-extra' \ + 'xapps-extra' 'xapps-extra' 'lib-extra' 'lib-extra' 'lib-extra' \ + 'lib-extra' 'lib-extra') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64') -subpkgs=("$pkgname-docs") -subdescs=('QT4 Documentation.') -subdepends=() -subgroups=('docs-extra kde-docs') -subarchs=('i686 x86_64') build() { + clean_junk() + { + ## TODO: GOD! , write an patch for this and send upstream ... + find $Fdestdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; + if [ -d "$Fdestdir/usr/lib/pkgconfig" ]; then + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/moc" "/usr/bin/moc" $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/uic" "/usr/bin/uic" $Fdestdir/usr/lib/pkgconfig/*.pc + fi + if ls "$Fdestdir"/usr/lib/*.la 2>/dev/null 1>/dev/null; then + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.la + fi + if ls "$Fdestdir"/usr/lib/*.prl 2>/dev/null 1>/dev/null; then + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.prl + fi + } + + do_install() + { + make -C "$1" INSTALL_ROOT=$Fdestdir install || Fdie + } + + do_split() + { + do_install "$1" + clean_junk + Fsplit "$2" /usr + } + Fcd $origname-$pkgmore-$pkgver Fpatchall Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing -Wno-deprecated" mkspecs/common/g++.conf mv $Fsrcdir/{patches-r732042,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie mv patches-r732042 patches || Fdie - #echo "0118" >> patches/DISABLED || Fdie - #echo "0176" >> patches/DISABLED || Fdie - #echo "0177" >> patches/DISABLED || Fdie chmod +x apply_patches || Fdie ./apply_patches || Fdie ./configure \ @@ -59,78 +135,196 @@ build() -demosdir /usr/share/doc/$pkgname-$pkgver/demos \ -examplesdir /usr/share/doc/$pkgname-$pkgver/examples \ -plugindir /usr/lib/$pkgname/plugins \ - -shared \ - -nis \ - -qt-gif \ - -stl \ - -pch \ - -sm \ + -shared -nis -qt-gif -stl -pch -sm \ -system-libpng \ -system-libjpeg \ -system-libmng \ -system-zlib \ -system-sqlite \ + -openssl \ -accessibility \ -fontconfig \ - -no-nas-sound \ - -no-rpath \ - -qt3support \ - -tablet \ - -xinerama \ - -xrender \ - -xkb \ - -xshape \ - -xrandr \ - -cups \ + -no-nas-sound -no-rpath \ + -qt3support -tablet \ + -xinerama -xrender \ + -xkb -xshape \ + -xrandr -cups \ -no-exceptions \ - -plugin-sql-mysql -I/usr/include/mysql/ \ + -plugin-sql-mysql -I/usr/include -I/usr/include/mysql/ \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ -plugin-sql-sqlite \ -plugin-sql-sqlite2 \ -plugin-sql-odbc \ - -qdbus \ - -no-glib \ + -qdbus -glib \ -no-separate-debug-info \ -optimized-qmake \ - -fast || return 1 - Fmkdir usr/share/applications usr/share/pixmaps usr/lib/pkgconfig - Ffile ../*.desktop /usr/share/applications/ - Fmessage "Moving needed icons to $Fdestdir/usr/share/pixmaps..." - cp -a tools/assistant/images/{linguist,designer,assistant}.png \ - $Fdestdir/usr/share/pixmaps/ || Fdie - Fmessage "Starting make.." + -fast \ + -reduce-relocations || return 1 + + ## Here we go + Fmessage "Running make.." make || Fdie - Fmessage "Installing.." - make INSTALL_ROOT=$Fdestdir install || Fdie - ## now let us fix some stuff this *piep* qmake installed THAT fine :-D gota love it - Fmessage "Removing junk from all prl,pc,la files..." - find $Fdestdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; - Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.la - Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.prl - Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/moc" "/usr/bin/moc" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/uic" "/usr/bin/uic" $Fdestdir/usr/lib/pkgconfig/*.pc - ## docs , demos etc - Fsplit $pkgname-docs usr/share/doc/$pkgname-$pkgver - Fsplit $pkgname-docs usr/bin/{assistant,qtdemo} - Fsplit $pkgname-docs usr/share/applications/assistant4.desktop - Fsplit $pkgname-docs usr/share/pixmaps/assistant.png - Fexe /etc/profile.d/qt4.sh.off - Fexe /etc/$pkgname/Trolltech.conf - ## some more fixes - cd $Fdestdir/usr/share/$pkgname/mkspecs || Fdie - rm -rf default || Fdie ## blah symlink to build dir - ln -sf linux-g++ default || Fdie + + ## -qtestlib + do_split "tools/qtestlib" libqttest + + ## -qdbus + do_install "tools/qdbus" + clean_junk + + # HACK! + Fmkdir tools + Fmv usr/bin/qdbusviewer tools/qdbusviewer + Fsplit $pkgname-qdbus /usr + + ## -assistant + do_install "tools/assistant" + do_install "tools/assistant/lib" + clean_junk + + Fmkdir usr/share/applications usr/share/pixmaps + cp -a ../assistant4.desktop $Fdestdir/usr/share/applications/ || Fdie + cp -a tools/assistant/images/assistant-128.png $Fdestdir/usr/share/pixmaps/assistant.png || Fdie + Fsplit $pkgname-assistant /usr + + ## -designer + ## TODO: Move pluings to qt3support + do_install "tools/designer" + clean_junk + + Fmkdir usr/share/applications usr/share/pixmaps + cp -a ../designer4.desktop $Fdestdir/usr/share/applications/ || Fdie + cp -a examples/widgets/icons/images/designer.png $Fdestdir/usr/share/pixmaps/ || Fdie + + Fsplit $pkgname-designer /usr + + ## -linguist + do_install "tools/linguist" + clean_junk + + Fmkdir usr/share/applications usr/share/pixmaps + cp -a ../linguist4.desktop $Fdestdir/usr/share/applications/ || Fdie + cp -a tools/linguist/linguist/images/icons/linguist-128-32.png \ + $Fdestdir/usr/share/pixmaps/linguist.png || Fdie + Fsplit $pkgname-linguist /usr + + ## -tools + for tool in qtconfig pixeltool + do + do_install "tools/$tool" + done + + Fmv tools/qdbusviewer usr/bin/qdbusviewer + Frm tools + Fmkdir usr/share/applications usr/share/pixmaps + cp -a ../{qt4config,qdbusviewer}.desktop $Fdestdir/usr/share/applications/ || Fdie + cp -a examples/opengl/framebufferobject/qt4-logo.png $Fdestdir/usr/share/pixmaps/qtconfig.png || Fdie + cp -a tools/qdbus/tools/qdbusviewer/images/qdbusviewer-128.png \ + $Fdestdir/usr/share/pixmaps/qdbusviewer.png || Fdie + Fsplit $pkgname-tools /usr + + ## -$src_libs + for lib in ${src_libs[@]} + do + libb="libqt`echo $lib|sed 's/lib//g;s/qt//g'`" + if [ "$lib" == "corelib" ]; then + + ## Core lib is always needed and while we don't do -dev packages + ## actually put that stuff here + for p in mkspecs qmake + do + make INSTALL_ROOT=$Fdestdir install_${p} || Fdie + done + + ## WTF 'tools' should have just one folder .. + for bin in moc rcc uic + do + do_install "src/tools/$bin" + done + do_install "src/plugins/codecs" + do_install "src/$lib" + + Fmkdir usr/share/$pkgname/translations etc/{$pkgname,profile.d} + cp -a translations/*.qm $Fdestdir/usr/share/$pkgname/translations || Fdie + cp -a ../qt4.sh $Fdestdir/etc/profile.d/qt4.sh || Fdie + cp -a ../Trolltech.conf $Fdestdir/etc/$pkgname/Trolltech.conf || Fdie + + ## delete things we don't want / need + Frm usr/share/$pkgname/mkspecs/{win32*,*bsd*,aix-*,hpux*,darwin*,irix-*,macx*} + Frm usr/share/$pkgname/mkspecs/{solaris*,sco*,tru64*,unixware*,hurd*,default*} + Fln linux-g++ /usr/share/$pkgname/mkspecs/default + + ## License etc + for l in *TXT changes-* *.GPL *.QPL README INSTALL + do + Fdocrel $l + done + + clean_junk + ## and finally split it =) + Fsplit $libb /usr /etc + elif [ "$lib" == "gui" ]; then + do_install "src/plugins/imageformats" + do_install "src/plugins/iconengines" + do_install "src/plugins/inputmethods" + do_install "src/plugins/accessible" + do_install "src/$lib" + clean_junk + + ## that is qt3support remove from here + Frm usr/lib/$pkgname/plugins/accessible/libqtaccessiblecompatwidgets.so + Fsplit $libb /usr + elif [ "$lib" == "qt3support" ]; then + + do_install "src/tools/uic3" + do_install "src/$lib" + do_install "src/plugins/accessible" + do_install "tools/porting" + clean_junk + + ## already in qui =) + Frm usr/lib/$pkgname/plugins/accessible/libqtaccessiblewidgets.so + Fsplit $libb /usr + else + do_split "src/$lib" $libb + fi + done + + ## -docs + Fmkdir usr/share/doc/$pkgname-$pkgver + cp -ra doc/* $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie + Fsplit $pkgname-docs /usr + + ## -demos and -examples both will qo to -demos subpkg + ## while 'qtdemos' need that. + do_install "demos" + do_install "examples" + clean_junk + + Fmkdir usr/share/applications usr/share/pixmaps + cp -a examples/opengl/framebufferobject/qt4-logo.png \ + $Fdestdir/usr/share/pixmaps/qtdemo.png || Fdie + cp -a ../qtdemo.desktop $Fdestdir/usr/share/applications/ || Fdie + + Fsplit $pkgname-demos /usr + + ## -plugins 'SQL' , all the other are already installed + do_install "src/plugins/sqldrivers" + + ## -sqlite3 + Fsplit $pkgname-plugin-sqlite3 usr/lib/$pkgname/plugins/sqldrivers/libqsqlite.so + + ## -sqlite2 + Fsplit $pkgname-plugin-sqlite2 usr/lib/$pkgname/plugins/sqldrivers/libqsqlite2.so + + ## -mysql + Fsplit $pkgname-plugin-mysql usr/lib/$pkgname/plugins/sqldrivers/libqsqlmysql.so + + ## -odbc + Fsplit $pkgname-plugin-odbc usr/lib/$pkgname/plugins/sqldrivers/libqsqlodbc.so + + ## -psql + Fsplit $pkgname-plugin-psql usr/lib/$pkgname/plugins/sqldrivers/libqsqlpsql.so } -sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \ - 'f30fcd8715ee711956ba51387b441d71eaef05dc' \ - '991ed0d2f047e0ead54efc050c652595b7bed00b' \ - '19281b54674d4071a3814200fd8a64e097ece2e8' \ - '410b18b9a496cf551f7ff6cb282c719c874bc883' \ - 'dfa7acb2259f65aeb23968241983110e509fa90c' \ - '6868adc53c2037a83b0601c92ea39dd3394a8fdf' \ - '6d2cd19e53c155dec758fda3d49b065ce2fae0b7' \ - '2468fea7b127253832148115d5aa9e85b2e0aea6' \ - '5a2341286f6d766ab943294aec90a8ad25d0ee1d') # optimization OK diff --git a/source/kde-extra/qt4/assistant4.desktop b/source/kde-extra/qt4/assistant4.desktop index a6f59c5..70a24bc 100644 --- a/source/kde-extra/qt4/assistant4.desktop +++ b/source/kde-extra/qt4/assistant4.desktop @@ -2,7 +2,7 @@ Categories=Qt;Development;Documentation Encoding=UTF-8 Exec=/usr/bin/assistant -Name=Qt 4 Assistant +Name=Qt4 Assistant GenericName=Document Browser GenericName[af]=Dokument Blaaier GenericName[az]=Sənəd SəyyahÄą @@ -72,7 +72,7 @@ GenericName[zh_CN]=文档浏览器 GenericName[zh_TW]=文件閱讀器 GenericName[zu]=Umcingi Woshicilelo X-KDE-StartupNotify=true -Icon=assistant +Icon=/usr/share/pixmaps/assistant.png Terminal=false Type=Application diff --git a/source/kde-extra/qt4/designer4.desktop b/source/kde-extra/qt4/designer4.desktop index 062be98..f54fa45 100644 --- a/source/kde-extra/qt4/designer4.desktop +++ b/source/kde-extra/qt4/designer4.desktop @@ -2,7 +2,7 @@ Categories=Qt;Development;GUIDesigner Encoding=UTF-8 Exec=/usr/bin/designer -Name=Qt 4 Designer +Name=Qt4 Designer GenericName=Interface Designer GenericName[af]=Koppelvlak Ontwerper GenericName[ar]=أدا؊ لتصميم واجهة البرامج @@ -71,7 +71,7 @@ GenericName[zh_TW]=界面設計師 GenericName[zu]=Umakhi Womxhumanisi X-KDE-StartupNotify=true MimeType=application/x-designer -Icon=designer +Icon=/usr/share/pixmaps/designer.png Terminal=false Type=Application diff --git a/source/kde-extra/qt4/linguist4.desktop b/source/kde-extra/qt4/linguist4.desktop index 5a4e829..2e25ffd 100644 --- a/source/kde-extra/qt4/linguist4.desktop +++ b/source/kde-extra/qt4/linguist4.desktop @@ -2,7 +2,7 @@ Categories=Qt;Development;Translation Encoding=UTF-8 Exec=/usr/bin/linguist -Name=Qt 4 Linguist +Name=Qt4 Linguist GenericName=Translation Tool GenericName[af]=Vertaling Program GenericName[ar]=أدا؊ للترجمة @@ -73,4 +73,4 @@ X-KDE-StartupNotify=true MimeType=application/x-linguist Terminal=false Type=Application -Icon=linguist +Icon=/usr/share/pixmaps/linguist.png diff --git a/source/kde-extra/qt4/qdbusviewer.desktop b/source/kde-extra/qt4/qdbusviewer.desktop new file mode 100644 index 0000000..d05755a --- /dev/null +++ b/source/kde-extra/qt4/qdbusviewer.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Categories=Qt;System +Encoding=UTF-8 +Exec=/usr/bin/qdbusviewer +Name=Qt4 DBUS Viewer +X-KDE-StartupNotify=true +Icon=/usr/share/pixmaps/qdbusviewer.png +Terminal=false +Type=Application + diff --git a/source/kde-extra/qt4/qt4.sh b/source/kde-extra/qt4/qt4.sh new file mode 100644 index 0000000..7a3b2fa --- /dev/null +++ b/source/kde-extra/qt4/qt4.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +export QT4DIR=/usr +export QT_XFT=true + diff --git a/source/kde-extra/qt4/qt4.sh.off b/source/kde-extra/qt4/qt4.sh.off deleted file mode 100644 index 52f23a9..0000000 --- a/source/kde-extra/qt4/qt4.sh.off +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -export QT4DIR=/usr -export PATH=$PATH:$QT4DIR/bin -export QMAKESPEC=$QT4DIR/share/qt4/mkspecs/linux-g++ -export UIC_PATH=$QT4DIR/bin/uic -export QT_XFT=true - diff --git a/source/kde-extra/qt4/qt4config.desktop b/source/kde-extra/qt4/qt4config.desktop index 9af0352..fb246dc 100644 --- a/source/kde-extra/qt4/qt4config.desktop +++ b/source/kde-extra/qt4/qt4config.desktop @@ -2,9 +2,9 @@ Categories=Qt;Settings Encoding=UTF-8 Exec=/usr/bin/qtconfig -Name=Qt 4 Settings +Name=Qt4 Settings X-KDE-StartupNotify=true -Icon=designer +Icon=/usr/share/pixmaps/qtconfig.png Terminal=false Type=Application diff --git a/source/kde-extra/qt4/qtdemo.desktop b/source/kde-extra/qt4/qtdemo.desktop new file mode 100644 index 0000000..3c0ee00 --- /dev/null +++ b/source/kde-extra/qt4/qtdemo.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Categories=Qt;Development +Encoding=UTF-8 +Exec=/usr/bin/qtdemo +Name=Qt4 Demos Viewer +X-KDE-StartupNotify=true +Icon=/usr/share/pixmaps/qtdemo.png +Terminal=false +Type=Application + From crazy at frugalware.org Tue Nov 6 19:53:01 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 6 19:53:07 2007 Subject: [Frugalware-git] frugalware-current: qt4-4.3.2-2-i686 Message-ID: <20071106185301.7629111901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fbf622b28ecd6852ded53f515c873edea5ff26bd commit fbf622b28ecd6852ded53f515c873edea5ff26bd Author: crazy Date: Tue Nov 6 17:25:01 2007 +0100 qt4-4.3.2-2-i686 * Heh Ohh forgot to move away from kde diff --git a/source/kde-extra/qt4/FrugalBuild b/source/kde-extra/qt4/FrugalBuild deleted file mode 100644 index 87943a2..0000000 --- a/source/kde-extra/qt4/FrugalBuild +++ /dev/null @@ -1,330 +0,0 @@ -# Compiling Time: 12.73 SBU -# Maintainer: crazy - -pkgname=qt4 -origname=qt -pkgver=4.3.2 -pkgrel=2 -pkgmore=x11-opensource-src -## Dummy package is empty .. -pkgdesc="The QT4 GUI toolkit." -url="http://www.trolltech.com/products/qt" -depends=() -makedepends=('libxrandr' 'mesa>=6.5.3' 'libxft' 'libmng' 'libjpeg' 'libxcursor' 'libxinerama' 'freetype2' \ - 'libsm' 'libpng' 'libxtst' 'fontconfig' 'dbus>=0.93' 'mysql>=5.0.15' 'postgresql>=8.2' 'cups' 'bison' \ - 'flex' 'unixodbc' 'imake' 'sqlite3' 'sqlite2' 'openssl') -## this is here till I've fixed all reverse depends so we not break all apps using qt4 by now -rodepends=("libqtcore" "libqtgui" "libqtnetwork" "libqtopengl" "libqt3support" "libqtscript" "libqtsql" \ - "libqtsvg" "libqtxml" "libqttest" "qt4-qdbus" "$pkgname-tools") -groups=('xlib-extra') -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-r732042.tar.bz2 \ - assistant4.desktop \ - designer4.desktop \ - linguist4.desktop \ - qt4config.desktop \ - qdbusviewer.desktop \ - qtdemo.desktop \ - dummy.patch qt4.sh \ - Trolltech.conf \ - apply_patches) -sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \ - 'f30fcd8715ee711956ba51387b441d71eaef05dc' \ - '70413a58f1d4b7260ab407482675b8028cea4e47' \ - '957376dd30fdf1bbc2ff5545f2f808f90d44c4dc' \ - 'bc6527ee1d672cc192c667aeb49540b166e96949' \ - '1097be47724cda110a0d099c58a2f2ff6dcacc1e' \ - '2099d1e1ef2172369c2b5f51e3dcf88fd66ba38c' \ - '7c47da506d5118b87a0cae775886f99fd7de4fd9' \ - '6868adc53c2037a83b0601c92ea39dd3394a8fdf' \ - 'bafdd4d0fe8d2c0caae0720f5f6b9f193d4744e0' \ - '2468fea7b127253832148115d5aa9e85b2e0aea6' \ - '5a2341286f6d766ab943294aec90a8ad25d0ee1d') - -export QTDIR=$startdir/src/$origname-$pkgmore-$pkgver -export PATH=${QTDIR}/bin:${PATH} -export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} -export YACC='yacc -d' - -src_libs=('corelib' 'gui' 'network' 'opengl' 'qt3support' 'script' 'sql' 'svg' 'xml') - -subpkgs=("$pkgname-docs" "$pkgname-demos" "libqtcore" "libqtgui" "libqtnetwork" \ - "libqtopengl" "libqt3support" "libqtscript" "libqtsql" "libqtsvg" \ - "libqtxml" "libqttest" "$pkgname-qdbus" "$pkgname-assistant" "$pkgname-designer" \ - "$pkgname-linguist" "$pkgname-tools" "$pkgname-plugin-sqlite3" "$pkgname-plugin-sqlite2" \ - "$pkgname-plugin-mysql" "$pkgname-plugin-odbc" "$pkgname-plugin-psql") -subdescs=('Qt4 Documentation.' 'Qt4 Demo and Example Programs.' 'Qt4 Core Library' 'Qt4 Gui Library' \ - 'Qt4 Network Library' 'Qt4 OpenGL Library' 'Qt4 Qt3support Library' 'Qt4 Script Library' 'Qt4 Sql Library' \ - 'Qt4 Svg Library' 'Qt4 Xml Library' 'Qt4 Unit Testing Library' 'Qt4 DBus module' 'Qt4 Document Browser' \ - 'Qt4 Interface Designer' 'Qt4 Translation Tool' 'Qt4 Tools' 'Qt4 SQlite3 plugin' 'Qt4 SQlite2 plugin' \ - 'Qt4 MySql plugin' 'Qt4 ODBC plugin' 'Qt4 ODBC plugin') -subdepends=('' 'libqtopengl glib2 qt4-designer qt4-qdbus libqt3support libqtsvg libqttest' \ - 'libstdc++ zlib glib2' \ - 'libpng libsm libqtcore libxi libxrandr libxcursor libxinerama fontconfig' \ - 'libqtcore' 'mesa libqtgui libqtcore' \ - 'libqtsql libqtnetwork libqtxml libqtgui libqtcore' 'libqtcore' 'libqtcore' \ - 'libqtxml libqtgui libqtcore' 'libqtcore' 'libqtcore' 'dbus libqtxml libqtcore' \ - 'qt4-qdbus libqtxml libqtgui libqtnetwork libqtcore' \ - 'qt4-assistant libqtscript libqtxml libqtgui libqtnetwork libqtcore libqtsql' \ - 'libqtnetwork libqtxml libqtgui libqtcore qt4-assistant' \ - 'libqtxml libqtcore qt4-assistant libqtgui libqtnetwork libqt3support libqtsql' \ - 'sqlite3 libqtsql' 'sqlite2 libqtsql' 'libmysqlclient libqtsql' 'unixodbc libqtsql' \ - 'libpq libqtsql') -# NOTE: almost all need be moved to main .. but not yet -subgroups=('docs-extra' 'xapps-extra' 'lib-extra' 'xlib-extra' 'lib-extra' \ - 'xlib-extra' 'xlib-extra' 'lib-extra' 'lib-extra' 'xlib-extra' \ - 'lib-extra' 'lib-extra' 'lib-extra' 'xapps-extra' 'xapps-extra' \ - 'xapps-extra' 'xapps-extra' 'lib-extra' 'lib-extra' 'lib-extra' \ - 'lib-extra' 'lib-extra') -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ - 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ - 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ - 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ - 'i686 x86_64' 'i686 x86_64') - -build() -{ - - clean_junk() - { - ## TODO: GOD! , write an patch for this and send upstream ... - find $Fdestdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; - if [ -d "$Fdestdir/usr/lib/pkgconfig" ]; then - Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/moc" "/usr/bin/moc" $Fdestdir/usr/lib/pkgconfig/*.pc - Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/uic" "/usr/bin/uic" $Fdestdir/usr/lib/pkgconfig/*.pc - fi - if ls "$Fdestdir"/usr/lib/*.la 2>/dev/null 1>/dev/null; then - Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.la - fi - if ls "$Fdestdir"/usr/lib/*.prl 2>/dev/null 1>/dev/null; then - Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.prl - fi - } - - do_install() - { - make -C "$1" INSTALL_ROOT=$Fdestdir install || Fdie - } - - do_split() - { - do_install "$1" - clean_junk - Fsplit "$2" /usr - } - - Fcd $origname-$pkgmore-$pkgver - Fpatchall - Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing -Wno-deprecated" mkspecs/common/g++.conf - mv $Fsrcdir/{patches-r732042,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie - mv patches-r732042 patches || Fdie - chmod +x apply_patches || Fdie - ./apply_patches || Fdie - ./configure \ - -v -confirm-license \ - -prefix /usr -L /usr/lib \ - -libdir /usr/lib \ - -docdir /usr/share/doc/$pkgname-$pkgver \ - -datadir /usr/share/$pkgname \ - -sysconfdir /etc/$pkgname \ - -translationdir /usr/share/$pkgname/translations \ - -demosdir /usr/share/doc/$pkgname-$pkgver/demos \ - -examplesdir /usr/share/doc/$pkgname-$pkgver/examples \ - -plugindir /usr/lib/$pkgname/plugins \ - -shared -nis -qt-gif -stl -pch -sm \ - -system-libpng \ - -system-libjpeg \ - -system-libmng \ - -system-zlib \ - -system-sqlite \ - -openssl \ - -accessibility \ - -fontconfig \ - -no-nas-sound -no-rpath \ - -qt3support -tablet \ - -xinerama -xrender \ - -xkb -xshape \ - -xrandr -cups \ - -no-exceptions \ - -plugin-sql-mysql -I/usr/include -I/usr/include/mysql/ \ - -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ - -plugin-sql-sqlite \ - -plugin-sql-sqlite2 \ - -plugin-sql-odbc \ - -qdbus -glib \ - -no-separate-debug-info \ - -optimized-qmake \ - -fast \ - -reduce-relocations || return 1 - - ## Here we go - Fmessage "Running make.." - make || Fdie - - ## -qtestlib - do_split "tools/qtestlib" libqttest - - ## -qdbus - do_install "tools/qdbus" - clean_junk - - # HACK! - Fmkdir tools - Fmv usr/bin/qdbusviewer tools/qdbusviewer - Fsplit $pkgname-qdbus /usr - - ## -assistant - do_install "tools/assistant" - do_install "tools/assistant/lib" - clean_junk - - Fmkdir usr/share/applications usr/share/pixmaps - cp -a ../assistant4.desktop $Fdestdir/usr/share/applications/ || Fdie - cp -a tools/assistant/images/assistant-128.png $Fdestdir/usr/share/pixmaps/assistant.png || Fdie - Fsplit $pkgname-assistant /usr - - ## -designer - ## TODO: Move pluings to qt3support - do_install "tools/designer" - clean_junk - - Fmkdir usr/share/applications usr/share/pixmaps - cp -a ../designer4.desktop $Fdestdir/usr/share/applications/ || Fdie - cp -a examples/widgets/icons/images/designer.png $Fdestdir/usr/share/pixmaps/ || Fdie - - Fsplit $pkgname-designer /usr - - ## -linguist - do_install "tools/linguist" - clean_junk - - Fmkdir usr/share/applications usr/share/pixmaps - cp -a ../linguist4.desktop $Fdestdir/usr/share/applications/ || Fdie - cp -a tools/linguist/linguist/images/icons/linguist-128-32.png \ - $Fdestdir/usr/share/pixmaps/linguist.png || Fdie - Fsplit $pkgname-linguist /usr - - ## -tools - for tool in qtconfig pixeltool - do - do_install "tools/$tool" - done - - Fmv tools/qdbusviewer usr/bin/qdbusviewer - Frm tools - Fmkdir usr/share/applications usr/share/pixmaps - cp -a ../{qt4config,qdbusviewer}.desktop $Fdestdir/usr/share/applications/ || Fdie - cp -a examples/opengl/framebufferobject/qt4-logo.png $Fdestdir/usr/share/pixmaps/qtconfig.png || Fdie - cp -a tools/qdbus/tools/qdbusviewer/images/qdbusviewer-128.png \ - $Fdestdir/usr/share/pixmaps/qdbusviewer.png || Fdie - Fsplit $pkgname-tools /usr - - ## -$src_libs - for lib in ${src_libs[@]} - do - libb="libqt`echo $lib|sed 's/lib//g;s/qt//g'`" - if [ "$lib" == "corelib" ]; then - - ## Core lib is always needed and while we don't do -dev packages - ## actually put that stuff here - for p in mkspecs qmake - do - make INSTALL_ROOT=$Fdestdir install_${p} || Fdie - done - - ## WTF 'tools' should have just one folder .. - for bin in moc rcc uic - do - do_install "src/tools/$bin" - done - do_install "src/plugins/codecs" - do_install "src/$lib" - - Fmkdir usr/share/$pkgname/translations etc/{$pkgname,profile.d} - cp -a translations/*.qm $Fdestdir/usr/share/$pkgname/translations || Fdie - cp -a ../qt4.sh $Fdestdir/etc/profile.d/qt4.sh || Fdie - cp -a ../Trolltech.conf $Fdestdir/etc/$pkgname/Trolltech.conf || Fdie - - ## delete things we don't want / need - Frm usr/share/$pkgname/mkspecs/{win32*,*bsd*,aix-*,hpux*,darwin*,irix-*,macx*} - Frm usr/share/$pkgname/mkspecs/{solaris*,sco*,tru64*,unixware*,hurd*,default*} - Fln linux-g++ /usr/share/$pkgname/mkspecs/default - - ## License etc - for l in *TXT changes-* *.GPL *.QPL README INSTALL - do - Fdocrel $l - done - - clean_junk - ## and finally split it =) - Fsplit $libb /usr /etc - elif [ "$lib" == "gui" ]; then - do_install "src/plugins/imageformats" - do_install "src/plugins/iconengines" - do_install "src/plugins/inputmethods" - do_install "src/plugins/accessible" - do_install "src/$lib" - clean_junk - - ## that is qt3support remove from here - Frm usr/lib/$pkgname/plugins/accessible/libqtaccessiblecompatwidgets.so - Fsplit $libb /usr - elif [ "$lib" == "qt3support" ]; then - - do_install "src/tools/uic3" - do_install "src/$lib" - do_install "src/plugins/accessible" - do_install "tools/porting" - clean_junk - - ## already in qui =) - Frm usr/lib/$pkgname/plugins/accessible/libqtaccessiblewidgets.so - Fsplit $libb /usr - else - do_split "src/$lib" $libb - fi - done - - ## -docs - Fmkdir usr/share/doc/$pkgname-$pkgver - cp -ra doc/* $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie - Fsplit $pkgname-docs /usr - - ## -demos and -examples both will qo to -demos subpkg - ## while 'qtdemos' need that. - do_install "demos" - do_install "examples" - clean_junk - - Fmkdir usr/share/applications usr/share/pixmaps - cp -a examples/opengl/framebufferobject/qt4-logo.png \ - $Fdestdir/usr/share/pixmaps/qtdemo.png || Fdie - cp -a ../qtdemo.desktop $Fdestdir/usr/share/applications/ || Fdie - - Fsplit $pkgname-demos /usr - - ## -plugins 'SQL' , all the other are already installed - do_install "src/plugins/sqldrivers" - - ## -sqlite3 - Fsplit $pkgname-plugin-sqlite3 usr/lib/$pkgname/plugins/sqldrivers/libqsqlite.so - - ## -sqlite2 - Fsplit $pkgname-plugin-sqlite2 usr/lib/$pkgname/plugins/sqldrivers/libqsqlite2.so - - ## -mysql - Fsplit $pkgname-plugin-mysql usr/lib/$pkgname/plugins/sqldrivers/libqsqlmysql.so - - ## -odbc - Fsplit $pkgname-plugin-odbc usr/lib/$pkgname/plugins/sqldrivers/libqsqlodbc.so - - ## -psql - Fsplit $pkgname-plugin-psql usr/lib/$pkgname/plugins/sqldrivers/libqsqlpsql.so -} - -# optimization OK diff --git a/source/kde-extra/qt4/Trolltech.conf b/source/kde-extra/qt4/Trolltech.conf deleted file mode 100644 index 204a9f9..0000000 --- a/source/kde-extra/qt4/Trolltech.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Qt] -Font%20Substitutions\akaash=dejavu sans -Font%20Substitutions\arial=helvetica -Font%20Substitutions\courier%20new=courier -Font%20Substitutions\sans%20serif=helvetica -Font%20Substitutions\times%20new%20roman=times -GUIEffects=general, animatemenu, animatecombo, animatetooltip, animatetoolbox -Palette\active=#000000, #f5f5f5, #ffffff, #fafafa, #7a7a7a, #a3a3a3, #000000, #ffffff, #000000, #ffffff, #f5f5f5, #000000, #97adc3, #030303, #0000ff, #ff00ff, #e8e8e8 -Palette\disabled=#7a7a7a, #f5f5f5, #ffffff, #fafafa, #7a7a7a, #a3a3a3, #7a7a7a, #ffffff, #7a7a7a, #ffffff, #f5f5f5, #000000, #c3c3c3, #030303, #0000ff, #ff00ff, #e8e8e8 -Palette\inactive=#000000, #f5f5f5, #ffffff, #fafafa, #7a7a7a, #a3a3a3, #000000, #ffffff, #000000, #ffffff, #f5f5f5, #000000, #97adc3, #030303, #0000ff, #ff00ff, #e8e8e8 -XIMInputStyle=On The Spot -cursorFlashTime=1000 -doubleClickInterval=400 -embedFonts=true -font="DejaVu Sans,11,-1,5,50,0,0,0,0,0" -fontPath= -globalStrut\height=0 -globalStrut\width=0 -resolveSymlinks=false -style=Plastique -useRtlExtensions=true -wheelScrollLines=3 diff --git a/source/kde-extra/qt4/apply_patches b/source/kde-extra/qt4/apply_patches deleted file mode 100644 index baf920d..0000000 --- a/source/kde-extra/qt4/apply_patches +++ /dev/null @@ -1,174 +0,0 @@ -#! /usr/bin/env bash -# Script to apply patches from qt-copy/patches/. -# See README.qt-copy for details. -# -# Lubos Lunak -# Oswald Buddenhagen -# - -if ! test -d patches; then - echo "No patches directory found." - exit 1 -fi - -revert=false reverse= -clever=false -verbose=true silent= -for i; do - case $i in - -r|-R|--reverse) revert=true; reverse=--reverse;; - -c|--clever) clever=true;; - -s|--silent|-q|--quiet) verbose=false; silent=--silent;; - *) echo "Unknown option '$i'." >&2; exit 1;; - esac -done - -b=../.${PWD##*/} - -if $clever; then - if ! $revert; then - pdir=$b.patched - odir=$b.cvs - else - pdir=$b.cvs - odir=$b.patched - fi - $verbose && echo -n "Creating temporary copy ... " - tdir=$b.temp - test -d $tdir || { rm -rf $tdir.t; cp -al . $tdir.t && mv $tdir.t $tdir; } || exit - $verbose && echo "done." -fi - -plist=.applied_patches -wlist=$plist.work -test -f $wlist -o ! -f $plist || cp $plist $wlist || exit - -case `uname -a` in - CYGWIN_*) - myos="win" - ;; - *) - myos="unix" - ;; -esac - -patches=`cd patches/ >/dev/null && ls [0-9]*-* $reverse` -applied= -already= -skipped= -prevapplied= -disabled= -for file in $patches; do - # skip files that aren't *.diff or *.patch - test "${file%.patch}" = "$file" -a "${file%.diff}" = "$file" && continue - # skip files that don't match this OS - if head -n 8 patches/$file | grep -i '^[\t ]*os[\t ]*:.*$' | grep -viq "\b$myos\b"; then - skipped="$skipped $file\n" - continue; - fi - pnum=${file%%-*} - if ! $revert || ! test -f $plist; then - # skip those having 'applied: yes' in the header, but only for a real qt-copy from svn - if test -d .svn && head -n 8 patches/$file | grep -iq '^[\t ]*applied[\t ]*:[\t ]*yes[\t ]*$'; then - already="$already $file\n" - continue; - fi - # skip disabled - if grep -q "^[\\t ]*$pnum[\\t ]*\$" patches/DISABLED; then - disabled="$disabled $file\n" - continue; - fi - fi - if test -f $plist; then - grep -q $pnum $wlist && listed=true || listed=false - if test $listed != $revert; then - prevapplied="$prevapplied $file\n" - continue; - fi - fi - $verbose && echo -e "\nApplying: $file" - if $clever; then - if ! patch -b -z .touched $silent $reverse -p0 < patches/$file; then - echo -e "\n\nPatch $file failed!" - while :; do - # detect eof as abort. - if ! read -p "[A]bort, [c]ontinue, or [r]ollback all? " sel; then - exit 1 - fi - - case $sel in - a) exit 1;; - c) continue 2;; - r) - $verbose && echo -ne "Deleting working directory ... " - rm -rf $PWD/* - rm -f $wlist - $verbose && echo -ne "done.\nSubstituting with temporary directory ... " - mv $tdir/* $PWD - rm -rf $tdir - $verbose && echo "done." - exit 2;; - esac - done - fi - else - if ! patch $silent $reverse -p0 < patches/$file; then - echo -e "\n\nPatch $file failed!" - while :; do - # detect eof as abort. - if ! read -p "[A]bort or [c]ontinue? " sel; then - exit 1 - fi - - case $sel in - a) exit 1;; - c) continue 2;; - esac - done - fi - fi - if ! $revert; then - echo $pnum >> $wlist - elif test -f $wlist; then - grep -v $pnum $wlist > $wlist.new - mv $wlist.new $wlist - fi - applied="$applied $file\n" -done -touch $wlist -mv $wlist $plist - -$verbose && echo -e "\n\n\nDone.\n -Applied patches:\n$applied -Previously applied patches:\n$prevapplied -Skipped patches:\n$skipped -Disabled patches:\n$disabled -Already merged patches:\n$already" - -if $clever; then - $verbose && echo -n "Creating backup ... " - test -f $odir/.cleanme && rm -rf $odir - for j in $(find -name \*.touched); do - rj=${j%.touched} - if ! test -f "$odir/$rj"; then - mkdir -p "$odir/${rj%/*}" || exit - ln "$tdir/$rj" "$odir/$rj" || exit - fi - rm "$j" - done - $verbose && echo -ne "done.\nDeleting temporary directory ... " - mv $tdir $tdir.t && rm -rf $tdir.t - if test -d $pdir; then - $verbose && echo -ne "done.\nRestoring previous backup ... " - for j in $(find $pdir -type f); do - rj=${j#"$pdir/"} - cmp -s "$j" "$rj" && { mv "$j" "$rj" || exit; } - done - $verbose && echo -ne "done.\nCleaning previous backup ... " - find $pdir -type d | sort -r | xargs -r rmdir 2> /dev/null - touch $pdir/.cleanme 2> /dev/null - fi - $verbose && echo "done." -fi - -exit 0 diff --git a/source/kde-extra/qt4/assistant4.desktop b/source/kde-extra/qt4/assistant4.desktop deleted file mode 100644 index 70a24bc..0000000 --- a/source/kde-extra/qt4/assistant4.desktop +++ /dev/null @@ -1,78 +0,0 @@ -[Desktop Entry] -Categories=Qt;Development;Documentation -Encoding=UTF-8 -Exec=/usr/bin/assistant -Name=Qt4 Assistant -GenericName=Document Browser -GenericName[af]=Dokument Blaaier -GenericName[az]=Sənəd SəyyahÄą -GenericName[bg]=Преглед на документи -GenericName[bn]=নথী ব্রাউজার -GenericName[br]=Furcher TeulioĂš -GenericName[bs]=Preglednik QT dokumenata -GenericName[ca]=Navegador de documents -GenericName[cs]=ProhlĂ­Ĺžeč dokumentace -GenericName[cy]=Porydd Dogfen -GenericName[da]=Dokumentfremviser -GenericName[de]=Dokumentbrowser -GenericName[el]=Προβολέας εγγράφων -GenericName[eo]=Dokumentorigardilo -GenericName[es]=Navegador de documentos -GenericName[et]=Dokumentatsiooni brauser -GenericName[eu]=Dokumentu Ikustailua -GenericName[fa]=مرورگر سند -GenericName[fi]=Asiakirjaselain -GenericName[fo]=Skjalakagari -GenericName[fr]=Explorateur de documentation Qt -GenericName[gl]=Explorador de Documentos -GenericName[he]=דפדפן מסמכים -GenericName[hi]=दस्तावेज़़ ब्राउज़र -GenericName[hr]=Preglednik dokumenata -GenericName[hu]=DokumentumbĂśngĂŠsző -GenericName[is]=Skjalavafri -GenericName[it]=Visualizzatore di documenti -GenericName[ja]=ドキュメントブラウザ -GenericName[ko]=문서 탐색기 -GenericName[lo]=ເຄື່ອງມືເລືອກເບິ່ງແຟ້ມເອກະສານ -GenericName[lt]=DokumentĹł ĹžiĹŤriklis -GenericName[lv]=Dokumentu PārlĹŤks -GenericName[mn]=Баримтын хөтөч -GenericName[ms]=Pelungsur Dokumen -GenericName[mt]=Browser ta' Dokumenti -GenericName[nb]=Dokumentleser -GenericName[nds]=Dokmentkieker -GenericName[nl]=Documentbrowser -GenericName[nn]=Dokumentlesar -GenericName[nso]=Seinyakisi sa Tokomane -GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਝਲਕ -GenericName[pl]=Przeglądarka dokumentĂłw -GenericName[pt]=Navegador de Documentos -GenericName[pt_BR]=Navegador de Documentos -GenericName[ro]=Navigator de documente -GenericName[ru]=Программа просмотра документов -GenericName[se]=Dokumeantalogan -GenericName[sk]=Prehliadač dokumentĂĄcie -GenericName[sl]=Pregledovalnik dokumentov -GenericName[sr]=Претраживач докумената -GenericName[sr@Latn]=PretraĹživač dokumenata -GenericName[ss]=Ibrawuza yelidokhumente -GenericName[sv]=Dokumentbläddrare -GenericName[ta]=ஆவண உலாவி -GenericName[tg]=Тафсири ҳуҷҷат -GenericName[th]=เครื่องมือเลือกดูแฟ้มเอกสาร -GenericName[tr]=Belge TarayÄącÄąsÄą -GenericName[uk]=Навігатор документів -GenericName[uz]=Ҳужжат браузери -GenericName[ven]=Buronza ya manwalwa -GenericName[vi]=TrĂŹnh duyệt tĂ i liệu -GenericName[wa]=Foyteu di documints -GenericName[xh]=Umkhangeli Wencwadi Zoxwebhu -GenericName[xx]=xxDocument Browserxx -GenericName[zh_CN]=文档浏览器 -GenericName[zh_TW]=文件閱讀器 -GenericName[zu]=Umcingi Woshicilelo -X-KDE-StartupNotify=true -Icon=/usr/share/pixmaps/assistant.png -Terminal=false -Type=Application - diff --git a/source/kde-extra/qt4/designer4.desktop b/source/kde-extra/qt4/designer4.desktop deleted file mode 100644 index f54fa45..0000000 --- a/source/kde-extra/qt4/designer4.desktop +++ /dev/null @@ -1,78 +0,0 @@ -[Desktop Entry] -Categories=Qt;Development;GUIDesigner -Encoding=UTF-8 -Exec=/usr/bin/designer -Name=Qt4 Designer -GenericName=Interface Designer -GenericName[af]=Koppelvlak Ontwerper -GenericName[ar]=أدا؊ لتصميم واجهة البرامج -GenericName[az]=Ara Üz Tərtibçisi -GenericName[bn]=ইন্টারফেস পরিকল্পনা -GenericName[bs]=Qt alat za dizajniranje interfejsa -GenericName[ca]=Dissenyador d'interfĂ­cies -GenericName[cs]=NĂĄvrhář rozhranĂ­ -GenericName[cy]=Dylunydd Rhyngwyneb -GenericName[da]=GrĂŚnsefladedesigner -GenericName[de]=Schnittstellen-Designer -GenericName[el]=Σχεδιαστής διασυνδέσεων -GenericName[eo]=Interfacdesegnilo -GenericName[es]=DiseĂąador de interfaces -GenericName[et]=Kasutajaliidese disainer -GenericName[eu]=Interfaze Diseinatzailea -GenericName[fa]=ءعاح عابء -GenericName[fi]=KäyttĂśliittymäsuunnittelija -GenericName[fo]=NĂ˝taramĂłtssniðari -GenericName[fr]=Concepteur d'interface -GenericName[gl]=DeseĂąador de Interfaces -GenericName[he]=מעצב ממשקים -GenericName[hi]=इंटरफेस डिज़ाइनर -GenericName[hr]=Dizajner sučelja -GenericName[hu]=FelĂźlettervező -GenericName[is]=ViðmĂłtshĂśnnun -GenericName[it]=Disegnatore di interfacce -GenericName[ja]=インターフェースデザイナー -GenericName[ko]=인터페이스 디자이너 -GenericName[lo]=ເຄື່ອງມືອອກແບບສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ -GenericName[lt]=Sąsajos redaktorius -GenericName[lv]=Starsejas Dizainers -GenericName[mn]=Гадаргуун дизайнер -GenericName[ms]=Pereka Antaramuka -GenericName[mt]=DiĹźinjatur tal-interfaċċji -GenericName[nb]=Utforming av grensesnitt -GenericName[nl]=Interface-ontwerper -GenericName[nn]=Utforming av grensesnitt -GenericName[nso]=Mohlami wa Interface -GenericName[pa]=ਸ਼ਕਲ(ਇੰਟਰਫੇਸ਼) ਨਿਰ਎ਞਤਞ -GenericName[pl]=Projektant interfejsu -GenericName[pt]=Editor de Interfaces -GenericName[pt_BR]=Interface do Designer -GenericName[ro]=Dezvoltator de interfeĹŁe -GenericName[ru]=Редактор интерфейса приложений Qt -GenericName[se]=LaktahĂĄbmejeaddji -GenericName[sk]=NĂĄvrh rozhrania -GenericName[sl]=Snovalnik vmesnikov -GenericName[sr]=Дизајнер интерфејса -GenericName[sr@Latn]=Dizajner interfejsa -GenericName[ss]=Umhleli wesichumanisi -GenericName[sv]=Gränssnittseditor -GenericName[ta]=முகப்புப் வடிவமைப்பாளர் -GenericName[tg]=Тароҳи робита -GenericName[th]=เครื่องมือออกแบบส่วนติดต่อผู้ใช้ -GenericName[tr]=ArayĂźz tasarÄąm programÄą -GenericName[uk]=Дизайн інтерфейсу -GenericName[uz]=Интерфейс дизайнери -GenericName[ven]=Muvhati wa nga Phanda -GenericName[vi]=TrĂŹnh thiáşżt káşż giao diện -GenericName[wa]=Dessineu d' eterfaces -GenericName[xh]=Umyili Wezojongongano -GenericName[xx]=xxInterface Designerxx -GenericName[zh_CN]=界面设计器 -GenericName[zh_TW]=界面設計師 -GenericName[zu]=Umakhi Womxhumanisi -X-KDE-StartupNotify=true -MimeType=application/x-designer -Icon=/usr/share/pixmaps/designer.png -Terminal=false -Type=Application - - diff --git a/source/kde-extra/qt4/dummy.patch b/source/kde-extra/qt4/dummy.patch deleted file mode 100644 index b160579..0000000 --- a/source/kde-extra/qt4/dummy.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur qt-x11-opensource-src-4.2.0/mkspecs/common/g++.conf qt-x11-opensource-src-4.2.0-p/mkspecs/common/g++.conf ---- qt-x11-opensource-src-4.2.0/mkspecs/common/g++.conf 2006-09-29 16:44:55.000000000 +0200 -+++ qt-x11-opensource-src-4.2.0-p/mkspecs/common/g++.conf 2006-10-05 15:38:30.000000000 +0200 -@@ -11,7 +11,7 @@ - QMAKE_CFLAGS_DEPS += -M - QMAKE_CFLAGS_WARN_ON += -Wall -W - QMAKE_CFLAGS_WARN_OFF += -w --QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += DUMMY - QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC -diff -Naur qt-x11-opensource-src-4.2.0/mkspecs/common/linux.conf qt-x11-opensource-src-4.2.0-p/mkspecs/common/linux.conf ---- qt-x11-opensource-src-4.2.0/mkspecs/common/linux.conf 2006-09-29 16:44:55.000000000 +0200 -+++ qt-x11-opensource-src-4.2.0-p/mkspecs/common/linux.conf 2006-10-05 15:53:38.000000000 +0200 -@@ -3,12 +3,12 @@ - - QMAKE_INCDIR = - QMAKE_LIBDIR = --QMAKE_INCDIR_X11 = /usr/X11R6/include --QMAKE_LIBDIR_X11 = /usr/X11R6/lib -+QMAKE_INCDIR_X11 = /usr/X11/include -+QMAKE_LIBDIR_X11 = /usr/X11/lib - QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] - QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] --QMAKE_INCDIR_OPENGL = /usr/X11R6/include --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+QMAKE_INCDIR_OPENGL = /usr/X11/include -+QMAKE_LIBDIR_OPENGL = /usr/X11/lib - - QMAKE_LIBS = - QMAKE_LIBS_DYNLOAD = -ldl diff --git a/source/kde-extra/qt4/linguist4.desktop b/source/kde-extra/qt4/linguist4.desktop deleted file mode 100644 index 2e25ffd..0000000 --- a/source/kde-extra/qt4/linguist4.desktop +++ /dev/null @@ -1,76 +0,0 @@ -[Desktop Entry] -Categories=Qt;Development;Translation -Encoding=UTF-8 -Exec=/usr/bin/linguist -Name=Qt4 Linguist -GenericName=Translation Tool -GenericName[af]=Vertaling Program -GenericName[ar]=أدا؊ للترجمة -GenericName[az]=TərcĂźmə Vasitəsi -GenericName[bn]=অনুবাদ টুল -GenericName[bs]=Alat za prevođenje -GenericName[ca]=Eina de traducciĂł -GenericName[cs]=PřekladatelskĂ˝ nĂĄstroj -GenericName[cy]=Erfyn Cyfieithu -GenericName[da]=OversĂŚttelsesvĂŚrktøj -GenericName[de]=Übersetzungsprogramm -GenericName[el]=Εργαλείο μεταφράσεων -GenericName[eo]=Tradukilo por Qt-programoj -GenericName[es]=Herramienta de traducciĂłn -GenericName[et]=TĂľlkimise rakendus -GenericName[eu]=Itzulpenerako Tresnak -GenericName[fa]=ابزاع ترجمه -GenericName[fi]=KäännĂśstyĂśkalu -GenericName[fo]=Umsetingaramboð -GenericName[fr]=Outil de traduction -GenericName[gl]=Ferramenta de TraducciĂłn -GenericName[he]=כלי תרגום -GenericName[hi]=अनुवाद उपकरण -GenericName[hr]=UsluĹžni program za prevođenje -GenericName[hu]=FordĂ­tĂĄssegĂ­tő -GenericName[is]=ÞýðingartĂłl -GenericName[it]=Strumento per le traduzioni -GenericName[ja]=翻訳ツール -GenericName[ko]=번역 도구 -GenericName[lo]=ເຄື່ອງມືແປພາສາ -GenericName[lt]=Vertimo ÄŻrankis -GenericName[lv]=TulkoĹĄanas RÄŤks -GenericName[mn]=Орчуулгын програм -GenericName[ms]=Perkakasan Penterjemahan -GenericName[mt]=Għodda tat-traduzzjoni -GenericName[nb]=Oversettelsesverktøy -GenericName[nl]=Vertaalprogramma -GenericName[nn]=Omsetjingsverktøy -GenericName[nso]=Sebereka sa Thlathollo -GenericName[pa]=ਅਨੁਵਾਦ ਸੰਦ -GenericName[pl]=Narzędzie dla tłumaczy -GenericName[pt]=Ferramenta de Tradução -GenericName[pt_BR]=Ferramenta de Tradução -GenericName[ro]=Utilitar de traducere -GenericName[ru]=Переводчик для Qt -GenericName[se]=Jorgalanneavvu -GenericName[sk]=PrekladacĂ­ nĂĄstroj -GenericName[sl]=Orodje za prevajanje -GenericName[sr]=Алат Са превођење -GenericName[sr@Latn]=Alat za prevođenje -GenericName[ss]=Lithulusi lekuhumusha -GenericName[sv]=Översättningsverktyg -GenericName[ta]=மொழிபெயர்ப்புக் கருவி -GenericName[tg]=Тарҷумагар барои QT -GenericName[th]=เครื่องมือแปลภาษา -GenericName[tr]=Çeviri AracÄą -GenericName[uk]=Засіб для перекладів -GenericName[uz]=Таржима қилиш воситаси -GenericName[ven]=Zwishumiswa zwau Dologa -GenericName[vi]=CĂ´ng c᝼ dịch -GenericName[wa]=Usteye di ratournaedje -GenericName[xh]=Isixhobo Soguqulelo lomsebenzi kolunye ulwimi -GenericName[xx]=xxTranslation Toolxx -GenericName[zh_CN]=翻译工具 -GenericName[zh_TW]=翻譯工具 -GenericName[zu]=Ithuluzi Lokuguqulela -X-KDE-StartupNotify=true -MimeType=application/x-linguist -Terminal=false -Type=Application -Icon=/usr/share/pixmaps/linguist.png diff --git a/source/kde-extra/qt4/qdbusviewer.desktop b/source/kde-extra/qt4/qdbusviewer.desktop deleted file mode 100644 index d05755a..0000000 --- a/source/kde-extra/qt4/qdbusviewer.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Categories=Qt;System -Encoding=UTF-8 -Exec=/usr/bin/qdbusviewer -Name=Qt4 DBUS Viewer -X-KDE-StartupNotify=true -Icon=/usr/share/pixmaps/qdbusviewer.png -Terminal=false -Type=Application - diff --git a/source/kde-extra/qt4/qt4.sh b/source/kde-extra/qt4/qt4.sh deleted file mode 100644 index 7a3b2fa..0000000 --- a/source/kde-extra/qt4/qt4.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -export QT4DIR=/usr -export QT_XFT=true - diff --git a/source/kde-extra/qt4/qt4config.desktop b/source/kde-extra/qt4/qt4config.desktop deleted file mode 100644 index fb246dc..0000000 --- a/source/kde-extra/qt4/qt4config.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Categories=Qt;Settings -Encoding=UTF-8 -Exec=/usr/bin/qtconfig -Name=Qt4 Settings -X-KDE-StartupNotify=true -Icon=/usr/share/pixmaps/qtconfig.png -Terminal=false -Type=Application - diff --git a/source/kde-extra/qt4/qtdemo.desktop b/source/kde-extra/qt4/qtdemo.desktop deleted file mode 100644 index 3c0ee00..0000000 --- a/source/kde-extra/qt4/qtdemo.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Categories=Qt;Development -Encoding=UTF-8 -Exec=/usr/bin/qtdemo -Name=Qt4 Demos Viewer -X-KDE-StartupNotify=true -Icon=/usr/share/pixmaps/qtdemo.png -Terminal=false -Type=Application - diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild new file mode 100644 index 0000000..87943a2 --- /dev/null +++ b/source/xlib-extra/qt4/FrugalBuild @@ -0,0 +1,330 @@ +# Compiling Time: 12.73 SBU +# Maintainer: crazy + +pkgname=qt4 +origname=qt +pkgver=4.3.2 +pkgrel=2 +pkgmore=x11-opensource-src +## Dummy package is empty .. +pkgdesc="The QT4 GUI toolkit." +url="http://www.trolltech.com/products/qt" +depends=() +makedepends=('libxrandr' 'mesa>=6.5.3' 'libxft' 'libmng' 'libjpeg' 'libxcursor' 'libxinerama' 'freetype2' \ + 'libsm' 'libpng' 'libxtst' 'fontconfig' 'dbus>=0.93' 'mysql>=5.0.15' 'postgresql>=8.2' 'cups' 'bison' \ + 'flex' 'unixodbc' 'imake' 'sqlite3' 'sqlite2' 'openssl') +## this is here till I've fixed all reverse depends so we not break all apps using qt4 by now +rodepends=("libqtcore" "libqtgui" "libqtnetwork" "libqtopengl" "libqt3support" "libqtscript" "libqtsql" \ + "libqtsvg" "libqtxml" "libqttest" "qt4-qdbus" "$pkgname-tools") +groups=('xlib-extra') +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-r732042.tar.bz2 \ + assistant4.desktop \ + designer4.desktop \ + linguist4.desktop \ + qt4config.desktop \ + qdbusviewer.desktop \ + qtdemo.desktop \ + dummy.patch qt4.sh \ + Trolltech.conf \ + apply_patches) +sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \ + 'f30fcd8715ee711956ba51387b441d71eaef05dc' \ + '70413a58f1d4b7260ab407482675b8028cea4e47' \ + '957376dd30fdf1bbc2ff5545f2f808f90d44c4dc' \ + 'bc6527ee1d672cc192c667aeb49540b166e96949' \ + '1097be47724cda110a0d099c58a2f2ff6dcacc1e' \ + '2099d1e1ef2172369c2b5f51e3dcf88fd66ba38c' \ + '7c47da506d5118b87a0cae775886f99fd7de4fd9' \ + '6868adc53c2037a83b0601c92ea39dd3394a8fdf' \ + 'bafdd4d0fe8d2c0caae0720f5f6b9f193d4744e0' \ + '2468fea7b127253832148115d5aa9e85b2e0aea6' \ + '5a2341286f6d766ab943294aec90a8ad25d0ee1d') + +export QTDIR=$startdir/src/$origname-$pkgmore-$pkgver +export PATH=${QTDIR}/bin:${PATH} +export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} +export YACC='yacc -d' + +src_libs=('corelib' 'gui' 'network' 'opengl' 'qt3support' 'script' 'sql' 'svg' 'xml') + +subpkgs=("$pkgname-docs" "$pkgname-demos" "libqtcore" "libqtgui" "libqtnetwork" \ + "libqtopengl" "libqt3support" "libqtscript" "libqtsql" "libqtsvg" \ + "libqtxml" "libqttest" "$pkgname-qdbus" "$pkgname-assistant" "$pkgname-designer" \ + "$pkgname-linguist" "$pkgname-tools" "$pkgname-plugin-sqlite3" "$pkgname-plugin-sqlite2" \ + "$pkgname-plugin-mysql" "$pkgname-plugin-odbc" "$pkgname-plugin-psql") +subdescs=('Qt4 Documentation.' 'Qt4 Demo and Example Programs.' 'Qt4 Core Library' 'Qt4 Gui Library' \ + 'Qt4 Network Library' 'Qt4 OpenGL Library' 'Qt4 Qt3support Library' 'Qt4 Script Library' 'Qt4 Sql Library' \ + 'Qt4 Svg Library' 'Qt4 Xml Library' 'Qt4 Unit Testing Library' 'Qt4 DBus module' 'Qt4 Document Browser' \ + 'Qt4 Interface Designer' 'Qt4 Translation Tool' 'Qt4 Tools' 'Qt4 SQlite3 plugin' 'Qt4 SQlite2 plugin' \ + 'Qt4 MySql plugin' 'Qt4 ODBC plugin' 'Qt4 ODBC plugin') +subdepends=('' 'libqtopengl glib2 qt4-designer qt4-qdbus libqt3support libqtsvg libqttest' \ + 'libstdc++ zlib glib2' \ + 'libpng libsm libqtcore libxi libxrandr libxcursor libxinerama fontconfig' \ + 'libqtcore' 'mesa libqtgui libqtcore' \ + 'libqtsql libqtnetwork libqtxml libqtgui libqtcore' 'libqtcore' 'libqtcore' \ + 'libqtxml libqtgui libqtcore' 'libqtcore' 'libqtcore' 'dbus libqtxml libqtcore' \ + 'qt4-qdbus libqtxml libqtgui libqtnetwork libqtcore' \ + 'qt4-assistant libqtscript libqtxml libqtgui libqtnetwork libqtcore libqtsql' \ + 'libqtnetwork libqtxml libqtgui libqtcore qt4-assistant' \ + 'libqtxml libqtcore qt4-assistant libqtgui libqtnetwork libqt3support libqtsql' \ + 'sqlite3 libqtsql' 'sqlite2 libqtsql' 'libmysqlclient libqtsql' 'unixodbc libqtsql' \ + 'libpq libqtsql') +# NOTE: almost all need be moved to main .. but not yet +subgroups=('docs-extra' 'xapps-extra' 'lib-extra' 'xlib-extra' 'lib-extra' \ + 'xlib-extra' 'xlib-extra' 'lib-extra' 'lib-extra' 'xlib-extra' \ + 'lib-extra' 'lib-extra' 'lib-extra' 'xapps-extra' 'xapps-extra' \ + 'xapps-extra' 'xapps-extra' 'lib-extra' 'lib-extra' 'lib-extra' \ + 'lib-extra' 'lib-extra') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64') + +build() +{ + + clean_junk() + { + ## TODO: GOD! , write an patch for this and send upstream ... + find $Fdestdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; + if [ -d "$Fdestdir/usr/lib/pkgconfig" ]; then + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/moc" "/usr/bin/moc" $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/uic" "/usr/bin/uic" $Fdestdir/usr/lib/pkgconfig/*.pc + fi + if ls "$Fdestdir"/usr/lib/*.la 2>/dev/null 1>/dev/null; then + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.la + fi + if ls "$Fdestdir"/usr/lib/*.prl 2>/dev/null 1>/dev/null; then + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.prl + fi + } + + do_install() + { + make -C "$1" INSTALL_ROOT=$Fdestdir install || Fdie + } + + do_split() + { + do_install "$1" + clean_junk + Fsplit "$2" /usr + } + + Fcd $origname-$pkgmore-$pkgver + Fpatchall + Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing -Wno-deprecated" mkspecs/common/g++.conf + mv $Fsrcdir/{patches-r732042,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie + mv patches-r732042 patches || Fdie + chmod +x apply_patches || Fdie + ./apply_patches || Fdie + ./configure \ + -v -confirm-license \ + -prefix /usr -L /usr/lib \ + -libdir /usr/lib \ + -docdir /usr/share/doc/$pkgname-$pkgver \ + -datadir /usr/share/$pkgname \ + -sysconfdir /etc/$pkgname \ + -translationdir /usr/share/$pkgname/translations \ + -demosdir /usr/share/doc/$pkgname-$pkgver/demos \ + -examplesdir /usr/share/doc/$pkgname-$pkgver/examples \ + -plugindir /usr/lib/$pkgname/plugins \ + -shared -nis -qt-gif -stl -pch -sm \ + -system-libpng \ + -system-libjpeg \ + -system-libmng \ + -system-zlib \ + -system-sqlite \ + -openssl \ + -accessibility \ + -fontconfig \ + -no-nas-sound -no-rpath \ + -qt3support -tablet \ + -xinerama -xrender \ + -xkb -xshape \ + -xrandr -cups \ + -no-exceptions \ + -plugin-sql-mysql -I/usr/include -I/usr/include/mysql/ \ + -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ + -plugin-sql-sqlite \ + -plugin-sql-sqlite2 \ + -plugin-sql-odbc \ + -qdbus -glib \ + -no-separate-debug-info \ + -optimized-qmake \ + -fast \ + -reduce-relocations || return 1 + + ## Here we go + Fmessage "Running make.." + make || Fdie + + ## -qtestlib + do_split "tools/qtestlib" libqttest + + ## -qdbus + do_install "tools/qdbus" + clean_junk + + # HACK! + Fmkdir tools + Fmv usr/bin/qdbusviewer tools/qdbusviewer + Fsplit $pkgname-qdbus /usr + + ## -assistant + do_install "tools/assistant" + do_install "tools/assistant/lib" + clean_junk + + Fmkdir usr/share/applications usr/share/pixmaps + cp -a ../assistant4.desktop $Fdestdir/usr/share/applications/ || Fdie + cp -a tools/assistant/images/assistant-128.png $Fdestdir/usr/share/pixmaps/assistant.png || Fdie + Fsplit $pkgname-assistant /usr + + ## -designer + ## TODO: Move pluings to qt3support + do_install "tools/designer" + clean_junk + + Fmkdir usr/share/applications usr/share/pixmaps + cp -a ../designer4.desktop $Fdestdir/usr/share/applications/ || Fdie + cp -a examples/widgets/icons/images/designer.png $Fdestdir/usr/share/pixmaps/ || Fdie + + Fsplit $pkgname-designer /usr + + ## -linguist + do_install "tools/linguist" + clean_junk + + Fmkdir usr/share/applications usr/share/pixmaps + cp -a ../linguist4.desktop $Fdestdir/usr/share/applications/ || Fdie + cp -a tools/linguist/linguist/images/icons/linguist-128-32.png \ + $Fdestdir/usr/share/pixmaps/linguist.png || Fdie + Fsplit $pkgname-linguist /usr + + ## -tools + for tool in qtconfig pixeltool + do + do_install "tools/$tool" + done + + Fmv tools/qdbusviewer usr/bin/qdbusviewer + Frm tools + Fmkdir usr/share/applications usr/share/pixmaps + cp -a ../{qt4config,qdbusviewer}.desktop $Fdestdir/usr/share/applications/ || Fdie + cp -a examples/opengl/framebufferobject/qt4-logo.png $Fdestdir/usr/share/pixmaps/qtconfig.png || Fdie + cp -a tools/qdbus/tools/qdbusviewer/images/qdbusviewer-128.png \ + $Fdestdir/usr/share/pixmaps/qdbusviewer.png || Fdie + Fsplit $pkgname-tools /usr + + ## -$src_libs + for lib in ${src_libs[@]} + do + libb="libqt`echo $lib|sed 's/lib//g;s/qt//g'`" + if [ "$lib" == "corelib" ]; then + + ## Core lib is always needed and while we don't do -dev packages + ## actually put that stuff here + for p in mkspecs qmake + do + make INSTALL_ROOT=$Fdestdir install_${p} || Fdie + done + + ## WTF 'tools' should have just one folder .. + for bin in moc rcc uic + do + do_install "src/tools/$bin" + done + do_install "src/plugins/codecs" + do_install "src/$lib" + + Fmkdir usr/share/$pkgname/translations etc/{$pkgname,profile.d} + cp -a translations/*.qm $Fdestdir/usr/share/$pkgname/translations || Fdie + cp -a ../qt4.sh $Fdestdir/etc/profile.d/qt4.sh || Fdie + cp -a ../Trolltech.conf $Fdestdir/etc/$pkgname/Trolltech.conf || Fdie + + ## delete things we don't want / need + Frm usr/share/$pkgname/mkspecs/{win32*,*bsd*,aix-*,hpux*,darwin*,irix-*,macx*} + Frm usr/share/$pkgname/mkspecs/{solaris*,sco*,tru64*,unixware*,hurd*,default*} + Fln linux-g++ /usr/share/$pkgname/mkspecs/default + + ## License etc + for l in *TXT changes-* *.GPL *.QPL README INSTALL + do + Fdocrel $l + done + + clean_junk + ## and finally split it =) + Fsplit $libb /usr /etc + elif [ "$lib" == "gui" ]; then + do_install "src/plugins/imageformats" + do_install "src/plugins/iconengines" + do_install "src/plugins/inputmethods" + do_install "src/plugins/accessible" + do_install "src/$lib" + clean_junk + + ## that is qt3support remove from here + Frm usr/lib/$pkgname/plugins/accessible/libqtaccessiblecompatwidgets.so + Fsplit $libb /usr + elif [ "$lib" == "qt3support" ]; then + + do_install "src/tools/uic3" + do_install "src/$lib" + do_install "src/plugins/accessible" + do_install "tools/porting" + clean_junk + + ## already in qui =) + Frm usr/lib/$pkgname/plugins/accessible/libqtaccessiblewidgets.so + Fsplit $libb /usr + else + do_split "src/$lib" $libb + fi + done + + ## -docs + Fmkdir usr/share/doc/$pkgname-$pkgver + cp -ra doc/* $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie + Fsplit $pkgname-docs /usr + + ## -demos and -examples both will qo to -demos subpkg + ## while 'qtdemos' need that. + do_install "demos" + do_install "examples" + clean_junk + + Fmkdir usr/share/applications usr/share/pixmaps + cp -a examples/opengl/framebufferobject/qt4-logo.png \ + $Fdestdir/usr/share/pixmaps/qtdemo.png || Fdie + cp -a ../qtdemo.desktop $Fdestdir/usr/share/applications/ || Fdie + + Fsplit $pkgname-demos /usr + + ## -plugins 'SQL' , all the other are already installed + do_install "src/plugins/sqldrivers" + + ## -sqlite3 + Fsplit $pkgname-plugin-sqlite3 usr/lib/$pkgname/plugins/sqldrivers/libqsqlite.so + + ## -sqlite2 + Fsplit $pkgname-plugin-sqlite2 usr/lib/$pkgname/plugins/sqldrivers/libqsqlite2.so + + ## -mysql + Fsplit $pkgname-plugin-mysql usr/lib/$pkgname/plugins/sqldrivers/libqsqlmysql.so + + ## -odbc + Fsplit $pkgname-plugin-odbc usr/lib/$pkgname/plugins/sqldrivers/libqsqlodbc.so + + ## -psql + Fsplit $pkgname-plugin-psql usr/lib/$pkgname/plugins/sqldrivers/libqsqlpsql.so +} + +# optimization OK diff --git a/source/xlib-extra/qt4/Trolltech.conf b/source/xlib-extra/qt4/Trolltech.conf new file mode 100644 index 0000000..204a9f9 --- /dev/null +++ b/source/xlib-extra/qt4/Trolltech.conf @@ -0,0 +1,22 @@ +[Qt] +Font%20Substitutions\akaash=dejavu sans +Font%20Substitutions\arial=helvetica +Font%20Substitutions\courier%20new=courier +Font%20Substitutions\sans%20serif=helvetica +Font%20Substitutions\times%20new%20roman=times +GUIEffects=general, animatemenu, animatecombo, animatetooltip, animatetoolbox +Palette\active=#000000, #f5f5f5, #ffffff, #fafafa, #7a7a7a, #a3a3a3, #000000, #ffffff, #000000, #ffffff, #f5f5f5, #000000, #97adc3, #030303, #0000ff, #ff00ff, #e8e8e8 +Palette\disabled=#7a7a7a, #f5f5f5, #ffffff, #fafafa, #7a7a7a, #a3a3a3, #7a7a7a, #ffffff, #7a7a7a, #ffffff, #f5f5f5, #000000, #c3c3c3, #030303, #0000ff, #ff00ff, #e8e8e8 +Palette\inactive=#000000, #f5f5f5, #ffffff, #fafafa, #7a7a7a, #a3a3a3, #000000, #ffffff, #000000, #ffffff, #f5f5f5, #000000, #97adc3, #030303, #0000ff, #ff00ff, #e8e8e8 +XIMInputStyle=On The Spot +cursorFlashTime=1000 +doubleClickInterval=400 +embedFonts=true +font="DejaVu Sans,11,-1,5,50,0,0,0,0,0" +fontPath= +globalStrut\height=0 +globalStrut\width=0 +resolveSymlinks=false +style=Plastique +useRtlExtensions=true +wheelScrollLines=3 diff --git a/source/xlib-extra/qt4/apply_patches b/source/xlib-extra/qt4/apply_patches new file mode 100644 index 0000000..baf920d --- /dev/null +++ b/source/xlib-extra/qt4/apply_patches @@ -0,0 +1,174 @@ +#! /usr/bin/env bash +# Script to apply patches from qt-copy/patches/. +# See README.qt-copy for details. +# +# Lubos Lunak +# Oswald Buddenhagen +# + +if ! test -d patches; then + echo "No patches directory found." + exit 1 +fi + +revert=false reverse= +clever=false +verbose=true silent= +for i; do + case $i in + -r|-R|--reverse) revert=true; reverse=--reverse;; + -c|--clever) clever=true;; + -s|--silent|-q|--quiet) verbose=false; silent=--silent;; + *) echo "Unknown option '$i'." >&2; exit 1;; + esac +done + +b=../.${PWD##*/} + +if $clever; then + if ! $revert; then + pdir=$b.patched + odir=$b.cvs + else + pdir=$b.cvs + odir=$b.patched + fi + $verbose && echo -n "Creating temporary copy ... " + tdir=$b.temp + test -d $tdir || { rm -rf $tdir.t; cp -al . $tdir.t && mv $tdir.t $tdir; } || exit + $verbose && echo "done." +fi + +plist=.applied_patches +wlist=$plist.work +test -f $wlist -o ! -f $plist || cp $plist $wlist || exit + +case `uname -a` in + CYGWIN_*) + myos="win" + ;; + *) + myos="unix" + ;; +esac + +patches=`cd patches/ >/dev/null && ls [0-9]*-* $reverse` +applied= +already= +skipped= +prevapplied= +disabled= +for file in $patches; do + # skip files that aren't *.diff or *.patch + test "${file%.patch}" = "$file" -a "${file%.diff}" = "$file" && continue + # skip files that don't match this OS + if head -n 8 patches/$file | grep -i '^[\t ]*os[\t ]*:.*$' | grep -viq "\b$myos\b"; then + skipped="$skipped $file\n" + continue; + fi + pnum=${file%%-*} + if ! $revert || ! test -f $plist; then + # skip those having 'applied: yes' in the header, but only for a real qt-copy from svn + if test -d .svn && head -n 8 patches/$file | grep -iq '^[\t ]*applied[\t ]*:[\t ]*yes[\t ]*$'; then + already="$already $file\n" + continue; + fi + # skip disabled + if grep -q "^[\\t ]*$pnum[\\t ]*\$" patches/DISABLED; then + disabled="$disabled $file\n" + continue; + fi + fi + if test -f $plist; then + grep -q $pnum $wlist && listed=true || listed=false + if test $listed != $revert; then + prevapplied="$prevapplied $file\n" + continue; + fi + fi + $verbose && echo -e "\nApplying: $file" + if $clever; then + if ! patch -b -z .touched $silent $reverse -p0 < patches/$file; then + echo -e "\n\nPatch $file failed!" + while :; do + # detect eof as abort. + if ! read -p "[A]bort, [c]ontinue, or [r]ollback all? " sel; then + exit 1 + fi + + case $sel in + a) exit 1;; + c) continue 2;; + r) + $verbose && echo -ne "Deleting working directory ... " + rm -rf $PWD/* + rm -f $wlist + $verbose && echo -ne "done.\nSubstituting with temporary directory ... " + mv $tdir/* $PWD + rm -rf $tdir + $verbose && echo "done." + exit 2;; + esac + done + fi + else + if ! patch $silent $reverse -p0 < patches/$file; then + echo -e "\n\nPatch $file failed!" + while :; do + # detect eof as abort. + if ! read -p "[A]bort or [c]ontinue? " sel; then + exit 1 + fi + + case $sel in + a) exit 1;; + c) continue 2;; + esac + done + fi + fi + if ! $revert; then + echo $pnum >> $wlist + elif test -f $wlist; then + grep -v $pnum $wlist > $wlist.new + mv $wlist.new $wlist + fi + applied="$applied $file\n" +done +touch $wlist +mv $wlist $plist + +$verbose && echo -e "\n\n\nDone.\n +Applied patches:\n$applied +Previously applied patches:\n$prevapplied +Skipped patches:\n$skipped +Disabled patches:\n$disabled +Already merged patches:\n$already" + +if $clever; then + $verbose && echo -n "Creating backup ... " + test -f $odir/.cleanme && rm -rf $odir + for j in $(find -name \*.touched); do + rj=${j%.touched} + if ! test -f "$odir/$rj"; then + mkdir -p "$odir/${rj%/*}" || exit + ln "$tdir/$rj" "$odir/$rj" || exit + fi + rm "$j" + done + $verbose && echo -ne "done.\nDeleting temporary directory ... " + mv $tdir $tdir.t && rm -rf $tdir.t + if test -d $pdir; then + $verbose && echo -ne "done.\nRestoring previous backup ... " + for j in $(find $pdir -type f); do + rj=${j#"$pdir/"} + cmp -s "$j" "$rj" && { mv "$j" "$rj" || exit; } + done + $verbose && echo -ne "done.\nCleaning previous backup ... " + find $pdir -type d | sort -r | xargs -r rmdir 2> /dev/null + touch $pdir/.cleanme 2> /dev/null + fi + $verbose && echo "done." +fi + +exit 0 diff --git a/source/xlib-extra/qt4/assistant4.desktop b/source/xlib-extra/qt4/assistant4.desktop new file mode 100644 index 0000000..70a24bc --- /dev/null +++ b/source/xlib-extra/qt4/assistant4.desktop @@ -0,0 +1,78 @@ +[Desktop Entry] +Categories=Qt;Development;Documentation +Encoding=UTF-8 +Exec=/usr/bin/assistant +Name=Qt4 Assistant +GenericName=Document Browser +GenericName[af]=Dokument Blaaier +GenericName[az]=Sənəd SəyyahÄą +GenericName[bg]=Преглед на документи +GenericName[bn]=নথী ব্রাউজার +GenericName[br]=Furcher TeulioĂš +GenericName[bs]=Preglednik QT dokumenata +GenericName[ca]=Navegador de documents +GenericName[cs]=ProhlĂ­Ĺžeč dokumentace +GenericName[cy]=Porydd Dogfen +GenericName[da]=Dokumentfremviser +GenericName[de]=Dokumentbrowser +GenericName[el]=Προβολέας εγγράφων +GenericName[eo]=Dokumentorigardilo +GenericName[es]=Navegador de documentos +GenericName[et]=Dokumentatsiooni brauser +GenericName[eu]=Dokumentu Ikustailua +GenericName[fa]=مرورگر سند +GenericName[fi]=Asiakirjaselain +GenericName[fo]=Skjalakagari +GenericName[fr]=Explorateur de documentation Qt +GenericName[gl]=Explorador de Documentos +GenericName[he]=דפדפן מסמכים +GenericName[hi]=दस्तावेज़़ ब्राउज़र +GenericName[hr]=Preglednik dokumenata +GenericName[hu]=DokumentumbĂśngĂŠsző +GenericName[is]=Skjalavafri +GenericName[it]=Visualizzatore di documenti +GenericName[ja]=ドキュメントブラウザ +GenericName[ko]=문서 탐색기 +GenericName[lo]=ເຄື່ອງມືເລືອກເບິ່ງແຟ້ມເອກະສານ +GenericName[lt]=DokumentĹł ĹžiĹŤriklis +GenericName[lv]=Dokumentu PārlĹŤks +GenericName[mn]=Баримтын хөтөч +GenericName[ms]=Pelungsur Dokumen +GenericName[mt]=Browser ta' Dokumenti +GenericName[nb]=Dokumentleser +GenericName[nds]=Dokmentkieker +GenericName[nl]=Documentbrowser +GenericName[nn]=Dokumentlesar +GenericName[nso]=Seinyakisi sa Tokomane +GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਝਲਕ +GenericName[pl]=Przeglądarka dokumentĂłw +GenericName[pt]=Navegador de Documentos +GenericName[pt_BR]=Navegador de Documentos +GenericName[ro]=Navigator de documente +GenericName[ru]=Программа просмотра документов +GenericName[se]=Dokumeantalogan +GenericName[sk]=Prehliadač dokumentĂĄcie +GenericName[sl]=Pregledovalnik dokumentov +GenericName[sr]=Претраживач докумената +GenericName[sr@Latn]=PretraĹživač dokumenata +GenericName[ss]=Ibrawuza yelidokhumente +GenericName[sv]=Dokumentbläddrare +GenericName[ta]=ஆவண உலாவி +GenericName[tg]=Тафсири ҳуҷҷат +GenericName[th]=เครื่องมือเลือกดูแฟ้มเอกสาร +GenericName[tr]=Belge TarayÄącÄąsÄą +GenericName[uk]=Навігатор документів +GenericName[uz]=Ҳужжат браузери +GenericName[ven]=Buronza ya manwalwa +GenericName[vi]=TrĂŹnh duyệt tĂ i liệu +GenericName[wa]=Foyteu di documints +GenericName[xh]=Umkhangeli Wencwadi Zoxwebhu +GenericName[xx]=xxDocument Browserxx +GenericName[zh_CN]=文档浏览器 +GenericName[zh_TW]=文件閱讀器 +GenericName[zu]=Umcingi Woshicilelo +X-KDE-StartupNotify=true +Icon=/usr/share/pixmaps/assistant.png +Terminal=false +Type=Application + diff --git a/source/xlib-extra/qt4/designer4.desktop b/source/xlib-extra/qt4/designer4.desktop new file mode 100644 index 0000000..f54fa45 --- /dev/null +++ b/source/xlib-extra/qt4/designer4.desktop @@ -0,0 +1,78 @@ +[Desktop Entry] +Categories=Qt;Development;GUIDesigner +Encoding=UTF-8 +Exec=/usr/bin/designer +Name=Qt4 Designer +GenericName=Interface Designer +GenericName[af]=Koppelvlak Ontwerper +GenericName[ar]=أدا؊ لتصميم واجهة البرامج +GenericName[az]=Ara Üz Tərtibçisi +GenericName[bn]=ইন্টারফেস পরিকল্পনা +GenericName[bs]=Qt alat za dizajniranje interfejsa +GenericName[ca]=Dissenyador d'interfĂ­cies +GenericName[cs]=NĂĄvrhář rozhranĂ­ +GenericName[cy]=Dylunydd Rhyngwyneb +GenericName[da]=GrĂŚnsefladedesigner +GenericName[de]=Schnittstellen-Designer +GenericName[el]=Σχεδιαστής διασυνδέσεων +GenericName[eo]=Interfacdesegnilo +GenericName[es]=DiseĂąador de interfaces +GenericName[et]=Kasutajaliidese disainer +GenericName[eu]=Interfaze Diseinatzailea +GenericName[fa]=ءعاح عابء +GenericName[fi]=KäyttĂśliittymäsuunnittelija +GenericName[fo]=NĂ˝taramĂłtssniðari +GenericName[fr]=Concepteur d'interface +GenericName[gl]=DeseĂąador de Interfaces +GenericName[he]=מעצב ממשקים +GenericName[hi]=इंटरफेस डिज़ाइनर +GenericName[hr]=Dizajner sučelja +GenericName[hu]=FelĂźlettervező +GenericName[is]=ViðmĂłtshĂśnnun +GenericName[it]=Disegnatore di interfacce +GenericName[ja]=インターフェースデザイナー +GenericName[ko]=인터페이스 디자이너 +GenericName[lo]=ເຄື່ອງມືອອກແບບສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ +GenericName[lt]=Sąsajos redaktorius +GenericName[lv]=Starsejas Dizainers +GenericName[mn]=Гадаргуун дизайнер +GenericName[ms]=Pereka Antaramuka +GenericName[mt]=DiĹźinjatur tal-interfaċċji +GenericName[nb]=Utforming av grensesnitt +GenericName[nl]=Interface-ontwerper +GenericName[nn]=Utforming av grensesnitt +GenericName[nso]=Mohlami wa Interface +GenericName[pa]=ਸ਼ਕਲ(ਇੰਟਰਫੇਸ਼) ਨਿਰ਎ਞਤਞ +GenericName[pl]=Projektant interfejsu +GenericName[pt]=Editor de Interfaces +GenericName[pt_BR]=Interface do Designer +GenericName[ro]=Dezvoltator de interfeĹŁe +GenericName[ru]=Редактор интерфейса приложений Qt +GenericName[se]=LaktahĂĄbmejeaddji +GenericName[sk]=NĂĄvrh rozhrania +GenericName[sl]=Snovalnik vmesnikov +GenericName[sr]=Дизајнер интерфејса +GenericName[sr@Latn]=Dizajner interfejsa +GenericName[ss]=Umhleli wesichumanisi +GenericName[sv]=Gränssnittseditor +GenericName[ta]=முகப்புப் வடிவமைப்பாளர் +GenericName[tg]=Тароҳи робита +GenericName[th]=เครื่องมือออกแบบส่วนติดต่อผู้ใช้ +GenericName[tr]=ArayĂźz tasarÄąm programÄą +GenericName[uk]=Дизайн інтерфейсу +GenericName[uz]=Интерфейс дизайнери +GenericName[ven]=Muvhati wa nga Phanda +GenericName[vi]=TrĂŹnh thiáşżt káşż giao diện +GenericName[wa]=Dessineu d' eterfaces +GenericName[xh]=Umyili Wezojongongano +GenericName[xx]=xxInterface Designerxx +GenericName[zh_CN]=界面设计器 +GenericName[zh_TW]=界面設計師 +GenericName[zu]=Umakhi Womxhumanisi +X-KDE-StartupNotify=true +MimeType=application/x-designer +Icon=/usr/share/pixmaps/designer.png +Terminal=false +Type=Application + + diff --git a/source/xlib-extra/qt4/dummy.patch b/source/xlib-extra/qt4/dummy.patch new file mode 100644 index 0000000..b160579 --- /dev/null +++ b/source/xlib-extra/qt4/dummy.patch @@ -0,0 +1,32 @@ +diff -Naur qt-x11-opensource-src-4.2.0/mkspecs/common/g++.conf qt-x11-opensource-src-4.2.0-p/mkspecs/common/g++.conf +--- qt-x11-opensource-src-4.2.0/mkspecs/common/g++.conf 2006-09-29 16:44:55.000000000 +0200 ++++ qt-x11-opensource-src-4.2.0-p/mkspecs/common/g++.conf 2006-10-05 15:38:30.000000000 +0200 +@@ -11,7 +11,7 @@ + QMAKE_CFLAGS_DEPS += -M + QMAKE_CFLAGS_WARN_ON += -Wall -W + QMAKE_CFLAGS_WARN_OFF += -w +-QMAKE_CFLAGS_RELEASE += -O2 ++QMAKE_CFLAGS_RELEASE += DUMMY + QMAKE_CFLAGS_DEBUG += -g + QMAKE_CFLAGS_SHLIB += -fPIC + QMAKE_CFLAGS_STATIC_LIB += -fPIC +diff -Naur qt-x11-opensource-src-4.2.0/mkspecs/common/linux.conf qt-x11-opensource-src-4.2.0-p/mkspecs/common/linux.conf +--- qt-x11-opensource-src-4.2.0/mkspecs/common/linux.conf 2006-09-29 16:44:55.000000000 +0200 ++++ qt-x11-opensource-src-4.2.0-p/mkspecs/common/linux.conf 2006-10-05 15:53:38.000000000 +0200 +@@ -3,12 +3,12 @@ + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = /usr/X11/include ++QMAKE_LIBDIR_X11 = /usr/X11/lib + QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] + QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_OPENGL = /usr/X11/include ++QMAKE_LIBDIR_OPENGL = /usr/X11/lib + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl diff --git a/source/xlib-extra/qt4/linguist4.desktop b/source/xlib-extra/qt4/linguist4.desktop new file mode 100644 index 0000000..2e25ffd --- /dev/null +++ b/source/xlib-extra/qt4/linguist4.desktop @@ -0,0 +1,76 @@ +[Desktop Entry] +Categories=Qt;Development;Translation +Encoding=UTF-8 +Exec=/usr/bin/linguist +Name=Qt4 Linguist +GenericName=Translation Tool +GenericName[af]=Vertaling Program +GenericName[ar]=أدا؊ للترجمة +GenericName[az]=TərcĂźmə Vasitəsi +GenericName[bn]=অনুবাদ টুল +GenericName[bs]=Alat za prevođenje +GenericName[ca]=Eina de traducciĂł +GenericName[cs]=PřekladatelskĂ˝ nĂĄstroj +GenericName[cy]=Erfyn Cyfieithu +GenericName[da]=OversĂŚttelsesvĂŚrktøj +GenericName[de]=Übersetzungsprogramm +GenericName[el]=Εργαλείο μεταφράσεων +GenericName[eo]=Tradukilo por Qt-programoj +GenericName[es]=Herramienta de traducciĂłn +GenericName[et]=TĂľlkimise rakendus +GenericName[eu]=Itzulpenerako Tresnak +GenericName[fa]=ابزاع ترجمه +GenericName[fi]=KäännĂśstyĂśkalu +GenericName[fo]=Umsetingaramboð +GenericName[fr]=Outil de traduction +GenericName[gl]=Ferramenta de TraducciĂłn +GenericName[he]=כלי תרגום +GenericName[hi]=अनुवाद उपकरण +GenericName[hr]=UsluĹžni program za prevođenje +GenericName[hu]=FordĂ­tĂĄssegĂ­tő +GenericName[is]=ÞýðingartĂłl +GenericName[it]=Strumento per le traduzioni +GenericName[ja]=翻訳ツール +GenericName[ko]=번역 도구 +GenericName[lo]=ເຄື່ອງມືແປພາສາ +GenericName[lt]=Vertimo ÄŻrankis +GenericName[lv]=TulkoĹĄanas RÄŤks +GenericName[mn]=Орчуулгын програм +GenericName[ms]=Perkakasan Penterjemahan +GenericName[mt]=Għodda tat-traduzzjoni +GenericName[nb]=Oversettelsesverktøy +GenericName[nl]=Vertaalprogramma +GenericName[nn]=Omsetjingsverktøy +GenericName[nso]=Sebereka sa Thlathollo +GenericName[pa]=ਅਨੁਵਾਦ ਸੰਦ +GenericName[pl]=Narzędzie dla tłumaczy +GenericName[pt]=Ferramenta de Tradução +GenericName[pt_BR]=Ferramenta de Tradução +GenericName[ro]=Utilitar de traducere +GenericName[ru]=Переводчик для Qt +GenericName[se]=Jorgalanneavvu +GenericName[sk]=PrekladacĂ­ nĂĄstroj +GenericName[sl]=Orodje za prevajanje +GenericName[sr]=Алат Са превођење +GenericName[sr@Latn]=Alat za prevođenje +GenericName[ss]=Lithulusi lekuhumusha +GenericName[sv]=Översättningsverktyg +GenericName[ta]=மொழிபெயர்ப்புக் கருவி +GenericName[tg]=Тарҷумагар барои QT +GenericName[th]=เครื่องมือแปลภาษา +GenericName[tr]=Çeviri AracÄą +GenericName[uk]=Засіб для перекладів +GenericName[uz]=Таржима қилиш воситаси +GenericName[ven]=Zwishumiswa zwau Dologa +GenericName[vi]=CĂ´ng c᝼ dịch +GenericName[wa]=Usteye di ratournaedje +GenericName[xh]=Isixhobo Soguqulelo lomsebenzi kolunye ulwimi +GenericName[xx]=xxTranslation Toolxx +GenericName[zh_CN]=翻译工具 +GenericName[zh_TW]=翻譯工具 +GenericName[zu]=Ithuluzi Lokuguqulela +X-KDE-StartupNotify=true +MimeType=application/x-linguist +Terminal=false +Type=Application +Icon=/usr/share/pixmaps/linguist.png diff --git a/source/xlib-extra/qt4/qdbusviewer.desktop b/source/xlib-extra/qt4/qdbusviewer.desktop new file mode 100644 index 0000000..d05755a --- /dev/null +++ b/source/xlib-extra/qt4/qdbusviewer.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Categories=Qt;System +Encoding=UTF-8 +Exec=/usr/bin/qdbusviewer +Name=Qt4 DBUS Viewer +X-KDE-StartupNotify=true +Icon=/usr/share/pixmaps/qdbusviewer.png +Terminal=false +Type=Application + diff --git a/source/xlib-extra/qt4/qt4.sh b/source/xlib-extra/qt4/qt4.sh new file mode 100644 index 0000000..7a3b2fa --- /dev/null +++ b/source/xlib-extra/qt4/qt4.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +export QT4DIR=/usr +export QT_XFT=true + diff --git a/source/xlib-extra/qt4/qt4config.desktop b/source/xlib-extra/qt4/qt4config.desktop new file mode 100644 index 0000000..fb246dc --- /dev/null +++ b/source/xlib-extra/qt4/qt4config.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Categories=Qt;Settings +Encoding=UTF-8 +Exec=/usr/bin/qtconfig +Name=Qt4 Settings +X-KDE-StartupNotify=true +Icon=/usr/share/pixmaps/qtconfig.png +Terminal=false +Type=Application + diff --git a/source/xlib-extra/qt4/qtdemo.desktop b/source/xlib-extra/qt4/qtdemo.desktop new file mode 100644 index 0000000..3c0ee00 --- /dev/null +++ b/source/xlib-extra/qt4/qtdemo.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Categories=Qt;Development +Encoding=UTF-8 +Exec=/usr/bin/qtdemo +Name=Qt4 Demos Viewer +X-KDE-StartupNotify=true +Icon=/usr/share/pixmaps/qtdemo.png +Terminal=false +Type=Application + From priyank at frugalware.org Tue Nov 6 19:58:38 2007 From: priyank at frugalware.org (Priyank) Date: Tue Nov 6 19:58:41 2007 Subject: [Frugalware-git] frugalware-current: cmus-2.2.0-1-i686 Message-ID: <20071106185838.CDCBB11901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b40b8762d672ade7ecc5bd14de37935f3fc4fff2 commit b40b8762d672ade7ecc5bd14de37935f3fc4fff2 Author: Priyank Date: Wed Nov 7 00:26:04 2007 +0530 cmus-2.2.0-1-i686 * Version bump diff --git a/source/multimedia-extra/cmus/FrugalBuild b/source/multimedia-extra/cmus/FrugalBuild index 338562e..64a4d4a 100644 --- a/source/multimedia-extra/cmus/FrugalBuild +++ b/source/multimedia-extra/cmus/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=cmus -pkgver=2.1.0 -pkgrel=2 +pkgver=2.2.0 +pkgrel=1 pkgdesc="A very feature-rich ncurses-based music player." url="http://cmus.sourceforge.net" depends=('ncurses' 'alsa-lib' 'libvorbis' 'libmad' 'flac>=1.1.3') @@ -11,7 +11,7 @@ groups=('multimedia-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | Flasttar" source=(http://mirror.greaterscope.net/cmus/$pkgname-$pkgver.tar.bz2) -sha1sums=('961d4bd1446c9499aeaac5a280761e5d98ca514f') +sha1sums=('a6472633ac55660eb3aec5d2ae0296da86903bb2') build() { From crazy at frugalware.org Tue Nov 6 20:05:08 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 6 20:05:13 2007 Subject: [Frugalware-git] frugalware-current: qt4-4.3.2-2-i686 Message-ID: <20071106190508.4839E11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9b05068dd3ac2bc4c37a02282b82df1e0bfb0d2 commit e9b05068dd3ac2bc4c37a02282b82df1e0bfb0d2 Author: crazy Date: Tue Nov 6 20:04:27 2007 +0100 qt4-4.3.2-2-i686 * fix missmerged huncks diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index 87943a2..e64e2b0 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -70,7 +70,7 @@ subdepends=('' 'libqtopengl glib2 qt4-designer qt4-qdbus libqt3support libqtsvg 'qt4-qdbus libqtxml libqtgui libqtnetwork libqtcore' \ 'qt4-assistant libqtscript libqtxml libqtgui libqtnetwork libqtcore libqtsql' \ 'libqtnetwork libqtxml libqtgui libqtcore qt4-assistant' \ - 'libqtxml libqtcore qt4-assistant libqtgui libqtnetwork libqt3support libqtsql' \ + 'qt4-qdbus libqtxml libqtcore qt4-assistant libqtgui libqtnetwork libqt3support libqtsql' \ 'sqlite3 libqtsql' 'sqlite2 libqtsql' 'libmysqlclient libqtsql' 'unixodbc libqtsql' \ 'libpq libqtsql') # NOTE: almost all need be moved to main .. but not yet @@ -93,15 +93,15 @@ build() ## TODO: GOD! , write an patch for this and send upstream ... find $Fdestdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; if [ -d "$Fdestdir/usr/lib/pkgconfig" ]; then - Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/pkgconfig/*.pc Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/moc" "/usr/bin/moc" $Fdestdir/usr/lib/pkgconfig/*.pc Fsed "$startdir/src/$origname-$pkgmore-$pkgver/bin/uic" "/usr/bin/uic" $Fdestdir/usr/lib/pkgconfig/*.pc fi if ls "$Fdestdir"/usr/lib/*.la 2>/dev/null 1>/dev/null; then - Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.la + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.la fi if ls "$Fdestdir"/usr/lib/*.prl 2>/dev/null 1>/dev/null; then - Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.prl + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/*.prl fi } From crazy at frugalware.org Tue Nov 6 20:39:22 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 6 20:39:24 2007 Subject: [Frugalware-git] frugalware-current: avahi-0.6.21-2-i686 Message-ID: <20071106193922.A630C11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00f7a9945b300efb8918007bc33141fd264c5993 commit 00f7a9945b300efb8918007bc33141fd264c5993 Author: crazy Date: Tue Nov 6 20:36:43 2007 +0100 avahi-0.6.21-2-i686 * relbump * fixed qt4 depends and qt{3,4} groups diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index b03a06c..8cd848a 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -3,13 +3,13 @@ pkgname=avahi pkgver=0.6.21 -pkgrel=1 +pkgrel=2 pkgdesc="A multicast/unicast DNS-SD framework" archs=('i686' 'x86_64') url="http://www.avahi.org" groups=('network') depends=('dbus-python>=0.80.2' 'libcap' 'nss-mdns' 'gdbm' 'libdaemon>=0.12' 'shadow>=4.0.18.1-4' 'libssp') -makedepends=('mono' 'pygtk' 'qt' 'qt4' 'gtk2-sharp') +makedepends=('mono' 'pygtk' 'qt' 'libqtcore' 'gtk2-sharp') backup=(etc/avahi/avahi-daemon.conf) conflicts=('mdnsresponder') replaces=('mdnsresponder') @@ -34,9 +34,9 @@ subdescs=('Glib bindings for Avahi' 'Mono C# bindings for Avahi' 'QT3 bindings f 'GUI GTK based tools for Avahi' 'QT4 bindings for Avahi' 'Discovers DNS servers broadcast with Avahi on a local network' \ 'User interface library for Avahi' 'Mono bindings for Avahi-UI') subdepends=("glib2 $pkgname=$pkgver" "mono $pkgname=$pkgver" "qt $pkgname=$pkgver" "python>=2.5 $pkgname=$pkgver" "$pkgname=$pkgver" \ - "avahi-python=$pkgver libglade pygtk libavahi-ui=$pkgver avahi-glib=$pkgver" "qt4 $pkgname=$pkgver" "$pkgname=$pkgver" \ + "avahi-python=$pkgver libglade pygtk libavahi-ui=$pkgver avahi-glib=$pkgver" "libqtcore $pkgname=$pkgver" "$pkgname=$pkgver" \ "gtk+2 $pkgname=$pkgver" "gtk2-sharp libavahi-ui=$pkgver") -subgroups=('network' 'gnome-extra' 'kde' 'network' 'network' 'gnome' 'kde-extra' 'network-extra' 'gnome' 'gnome-extra') +subgroups=('network' 'gnome-extra' 'xlib' 'network' 'network' 'gnome' 'lib-extra' 'network-extra' 'gnome' 'gnome-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') From crazy at frugalware.org Tue Nov 6 21:33:21 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 6 21:33:23 2007 Subject: [Frugalware-git] frugalware-current: qt4-4.3.2-2-i686 Message-ID: <20071106203321.1123E11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb53067822c1273d6a3e88a58f956a928d2d78d0 commit eb53067822c1273d6a3e88a58f956a928d2d78d0 Author: crazy Date: Tue Nov 6 21:33:10 2007 +0100 qt4-4.3.2-2-i686 * fix gui depends() diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index e64e2b0..1ab0cf0 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -63,7 +63,7 @@ subdescs=('Qt4 Documentation.' 'Qt4 Demo and Example Programs.' 'Qt4 Core Librar 'Qt4 MySql plugin' 'Qt4 ODBC plugin' 'Qt4 ODBC plugin') subdepends=('' 'libqtopengl glib2 qt4-designer qt4-qdbus libqt3support libqtsvg libqttest' \ 'libstdc++ zlib glib2' \ - 'libpng libsm libqtcore libxi libxrandr libxcursor libxinerama fontconfig' \ + 'libpng libsm libqtcore libxi libtiff libjpeg libxft libmng libxrandr libxcursor libxinerama fontconfig' \ 'libqtcore' 'mesa libqtgui libqtcore' \ 'libqtsql libqtnetwork libqtxml libqtgui libqtcore' 'libqtcore' 'libqtcore' \ 'libqtxml libqtgui libqtcore' 'libqtcore' 'libqtcore' 'dbus libqtxml libqtcore' \ From crazy at frugalware.org Tue Nov 6 21:45:55 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 6 21:45:58 2007 Subject: [Frugalware-git] frugalware-current: qtpfsgui-1.8.12-2-i686 Message-ID: <20071106204555.8234F11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ddb03fe15c03372e8b5166e499d0a31882130922 commit ddb03fe15c03372e8b5166e499d0a31882130922 Author: crazy Date: Tue Nov 6 21:45:10 2007 +0100 qtpfsgui-1.8.12-2-i686 * umg boobaa wrong FB copy & pasted ?:) * moved to xapps-extra , is not kde at all * removed kde from Finclude huh ? * removed *_ext=".tar.gz" is default heh * fixed qt4 depends() diff --git a/source/kde-extra/qtpfsgui/FrugalBuild b/source/kde-extra/qtpfsgui/FrugalBuild deleted file mode 100644 index e15dd60..0000000 --- a/source/kde-extra/qtpfsgui/FrugalBuild +++ /dev/null @@ -1,28 +0,0 @@ -# Compiling Time: 0.50 SBU -# Maintainer: CSÉCSY László - -pkgname=qtpfsgui -pkgver=1.8.12 -pkgrel=1 -pkgdesc="an open source graphical user interface application that aims to provide a workflow for HDR imaging" -depends=('qt4' 'exiv2' 'openexr' 'fftw') -groups=('kde-extra') -archs=('i686') -_F_sourceforge_ext=".tar.gz" -_F_kde_defaults=0 -Finclude sourceforge kde -up2date="lynx -dump http://qtpfsgui.sourceforge.net/ | grep -m1 'Released version' | sed 's/.*version \(.*\):.*/\1/'" -source=($source fix_it.patch) - -build() -{ - Fcd - Fpatchall - /usr/bin/qmake -o Makefile project.pro || Fdie - make || Fdie - make INSTALL_ROOT=$Fdestdir install || Fdie -} - -# optimization OK -sha1sums=('3646c3f463afae74cf19246463eb3cc8413902af' \ - 'cadb9c7196ecfba4ca07c289a404e1e7c88a4f6f') diff --git a/source/kde-extra/qtpfsgui/fix_it.patch b/source/kde-extra/qtpfsgui/fix_it.patch deleted file mode 100644 index 8c2b6f4..0000000 --- a/source/kde-extra/qtpfsgui/fix_it.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- project.pro.orig 2007-10-01 22:17:56.000000000 +0200 -+++ project.pro 2007-10-01 22:23:48.000000000 +0200 -@@ -1,8 +1,6 @@ - TEMPLATE = app - CONFIG += release qt thread - DEFINES += QT_NO_DEBUG_OUTPUT --QMAKE_CXXFLAGS += -O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe --QMAKE_CXXFLAGS_RELEASE-=-O2 - - unix { - ########################################### QT ########################################### -@@ -163,7 +161,7 @@ - - ############################## required by "make install" ######################################## - isEmpty(PREFIX) { -- PREFIX = /usr/local -+ PREFIX = /usr - } - isEmpty(I18NDIR) { - I18NDIR = $${PREFIX}/share/qtpfsgui/i18n diff --git a/source/xapps-extra/qtpfsgui/FrugalBuild b/source/xapps-extra/qtpfsgui/FrugalBuild new file mode 100644 index 0000000..5e8a819 --- /dev/null +++ b/source/xapps-extra/qtpfsgui/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.50 SBU +# Maintainer: CSÉCSY László + +pkgname=qtpfsgui +pkgver=1.8.12 +pkgrel=2 +pkgdesc="an open source graphical user interface application that aims to provide a workflow for HDR imaging" +depends=('libqtgui' 'exiv2' 'openexr' 'fftw') +groups=('xapps-extra') +archs=('i686') +Finclude sourceforge +up2date="lynx -dump http://qtpfsgui.sourceforge.net/ | grep -m1 'Released version' | sed 's/.*version \(.*\):.*/\1/'" +source=($source fix_it.patch) + +build() +{ + Fcd + Fpatchall + /usr/bin/qmake -o Makefile project.pro || Fdie + make || Fdie + make INSTALL_ROOT=$Fdestdir install || Fdie +} + +# optimization OK +sha1sums=('3646c3f463afae74cf19246463eb3cc8413902af' \ + 'cadb9c7196ecfba4ca07c289a404e1e7c88a4f6f') diff --git a/source/xapps-extra/qtpfsgui/fix_it.patch b/source/xapps-extra/qtpfsgui/fix_it.patch new file mode 100644 index 0000000..8c2b6f4 --- /dev/null +++ b/source/xapps-extra/qtpfsgui/fix_it.patch @@ -0,0 +1,20 @@ +--- project.pro.orig 2007-10-01 22:17:56.000000000 +0200 ++++ project.pro 2007-10-01 22:23:48.000000000 +0200 +@@ -1,8 +1,6 @@ + TEMPLATE = app + CONFIG += release qt thread + DEFINES += QT_NO_DEBUG_OUTPUT +-QMAKE_CXXFLAGS += -O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe +-QMAKE_CXXFLAGS_RELEASE-=-O2 + + unix { + ########################################### QT ########################################### +@@ -163,7 +161,7 @@ + + ############################## required by "make install" ######################################## + isEmpty(PREFIX) { +- PREFIX = /usr/local ++ PREFIX = /usr + } + isEmpty(I18NDIR) { + I18NDIR = $${PREFIX}/share/qtpfsgui/i18n From crazy at frugalware.org Tue Nov 6 22:34:35 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 6 22:34:37 2007 Subject: [Frugalware-git] frugalware-current: qmpdclient-1.0.8-2-i686 Message-ID: <20071106213435.0FBA211901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b621ccb91c3ca32d0470620e36cbb2b4ac340973 commit b621ccb91c3ca32d0470620e36cbb2b4ac340973 Author: crazy Date: Tue Nov 6 22:34:08 2007 +0100 qmpdclient-1.0.8-2-i686 * moved to xapps-extra * new m8r * other fixes in build() * qt4 depends() fixed diff --git a/source/kde-extra/qmpdclient/FrugalBuild b/source/kde-extra/qmpdclient/FrugalBuild deleted file mode 100644 index cd73baf..0000000 --- a/source/kde-extra/qmpdclient/FrugalBuild +++ /dev/null @@ -1,30 +0,0 @@ -# Compiling Time: 0.55 SBU -# Maintainer: detto - -pkgname=qmpdclient -pkgver=1.0.8 -pkgrel=1 -pkgdesc="An easy to use MPD client written in Qt 4." -url="http://havtknut.tihlde.org/qmpdclient" -archs=('i686') -groups=('kde-extra') -depends=('qt4' 'mpd') -up2date="lynx -dump $url | grep -m1 released | cut -d ' ' -f2" -source=($url/files/$pkgname-$pkgver.tar.gz) -sha1sums=('0711d19a117634e97ba1f568cd186a5cfaf35e3c') -_F_desktop_name="QMPDClient" -_F_desktop_icon="qmpdclient64.png" -_F_desktop_categories="AudioVideo;" - -build () { - Fcd $pkgname-$pkgver - source /etc/profile.d/qt4.sh.off - Fsed "/usr/local" "$Fdestdir/usr" qmpdclient.pro || Fdie - qmake || Fdie - Fmake - Fmakeinstall - Ficon $pkgname-$pkgver/icons/${pkgname}64.png - Fdesktop2 -} - -# optimization OK diff --git a/source/xapps-extra/qmpdclient/FrugalBuild b/source/xapps-extra/qmpdclient/FrugalBuild new file mode 100644 index 0000000..3dd6df4 --- /dev/null +++ b/source/xapps-extra/qmpdclient/FrugalBuild @@ -0,0 +1,32 @@ +# Compiling Time: 0.55 SBU +# Maintainer: crazy +# Contributor: detto + +pkgname=qmpdclient +pkgver=1.0.8 +pkgrel=2 +pkgdesc="An easy to use MPD client written in Qt 4." +url="http://havtknut.tihlde.org/qmpdclient" +archs=('i686') +groups=('xapps-extra') +depends=('qt4-qdbus' 'libqtgui') +rodepends=('mpd') +up2date="lynx -dump $url | grep -m1 released | cut -d ' ' -f2" +source=($url/files/$pkgname-$pkgver.tar.gz) +sha1sums=('0711d19a117634e97ba1f568cd186a5cfaf35e3c') +_F_desktop_name="QMPDClient" +_F_desktop_icon="qmpdclient64.png" +_F_desktop_categories="AudioVideo;" + +build () +{ + Fcd $pkgname-$pkgver + Fsed "/usr/local" "/usr" qmpdclient.pro || Fdie + /usr/bin/qmake qmpdclient.pro || Fdie + Fmake + Fexerel /usr/bin/qmpdclient + Ficon $pkgname-$pkgver/icons/${pkgname}64.png + Fdesktop2 +} + +# optimization OK From vmiklos at frugalware.org Tue Nov 6 23:20:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 23:20:14 2007 Subject: [Frugalware-git] pacman-g2: HttpGet(): fix build Message-ID: <20071106222010.5EC9911901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=9bc08c2ca57ebe91f4de2746bef16110d7dbe658 commit 9bc08c2ca57ebe91f4de2746bef16110d7dbe658 Author: Miklos Vajna Date: Tue Nov 6 23:17:58 2007 +0100 HttpGet(): fix build which was broken in 08ba88e6 diff --git a/lib/libftp/ftplib.c b/lib/libftp/ftplib.c index a3897e2..f4bd621 100644 --- a/lib/libftp/ftplib.c +++ b/lib/libftp/ftplib.c @@ -1524,7 +1524,7 @@ GLOBALREF int HttpGet(const char *host, const char *outputfile, const char *path if (offset > 0) { - snprintf(tmp, sizeof(tmp); "Range: bytes=%d-\r\n", offset); + snprintf(tmp, sizeof(tmp), "Range: bytes=%d-\r\n", offset); strncat(buf, tmp, sizeof(buf)-strlen(buf)-1); } From crazy at frugalware.org Tue Nov 6 23:24:54 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 6 23:24:55 2007 Subject: [Frugalware-git] frugalware-current: qt-3.3.8-6-i686 Message-ID: <20071106222454.4299711901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a3f136f87ddd51f931ca1732d19cf3070b8bfa91 commit a3f136f87ddd51f931ca1732d19cf3070b8bfa91 Author: crazy Date: Tue Nov 6 23:18:51 2007 +0100 qt-3.3.8-6-i686 * removed QMAKESPEC from qt.sh diff --git a/source/xlib/qt/FrugalBuild b/source/xlib/qt/FrugalBuild index 6565642..cc6b4d4 100644 --- a/source/xlib/qt/FrugalBuild +++ b/source/xlib/qt/FrugalBuild @@ -4,7 +4,7 @@ pkgname=qt pkgver=3.3.8 -pkgrel=5 +pkgrel=6 pkgmore=x11-free pkgdesc="The QT GUI toolkit." url="http://www.trolltech.com/products/qt" @@ -88,7 +88,7 @@ build() sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' \ '8fd70a87d8640915cdfff1eb26177b96fb8cb5d0' \ - '0464d40d9bd518fe8d139b1306136089349a4cdf' \ + 'e281176c76dc9ef0f06aba57f107ccb074eb317d' \ '7562323175ec47483dcb45c2857519f6276e0a51' \ '54d37e3988c4b195ae960ef2c59e678151115211' \ '0d5fcbe569723792700bad3c82abe34d5e5163c4' \ diff --git a/source/xlib/qt/qt.sh b/source/xlib/qt/qt.sh index a01f80e..c1f3297 100644 --- a/source/xlib/qt/qt.sh +++ b/source/xlib/qt/qt.sh @@ -2,7 +2,6 @@ export QTDIR=/usr/lib/qt export PATH=$PATH:$QTDIR/bin -export QMAKESPEC=$QTDIR/mkspecs/linux-g++ export UIC_PATH=$QTDIR/bin/uic export QT_XFT=true export MANPATH=$MANPATH:$QTDIR/man From vmiklos at frugalware.org Tue Nov 6 23:27:28 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 23:27:32 2007 Subject: [Frugalware-git] pacman-g2: _pacman_pkg_load(): handle the case when there are no active transactions Message-ID: <20071106222728.9942D11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=b8c58af2c8206790c4288b0332fcc4f1e25b9d95 commit b8c58af2c8206790c4288b0332fcc4f1e25b9d95 Author: Miklos Vajna Date: Tue Nov 6 23:25:12 2007 +0100 _pacman_pkg_load(): handle the case when there are no active transactions diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c index 9fac8e3..7d31a88 100644 --- a/lib/libpacman/package.c +++ b/lib/libpacman/package.c @@ -339,7 +339,7 @@ pmpkg_t *_pacman_pkg_load(char *pkgfile) close(fd); goto error; } - if(!(handle->trans->flags & PM_TRANS_FLAG_NOARCH)) { + if(handle->trans && !(handle->trans->flags & PM_TRANS_FLAG_NOARCH)) { if(!strlen(info->arch)) { _pacman_log(PM_LOG_ERROR, _("missing package architecture in %s"), pkgfile); pm_errno = PM_ERR_PKG_INVALID; From vmiklos at frugalware.org Tue Nov 6 23:37:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 23:37:14 2007 Subject: [Frugalware-git] bmf: pacman-g2-3.6.3.28.gb8c58af-1-i686 Message-ID: <20071106223711.6CF1111901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=4dda110800414d8cb09767ab16274f35811a4caa commit 4dda110800414d8cb09767ab16274f35811a4caa Author: Miklos Vajna Date: Tue Nov 6 23:36:54 2007 +0100 pacman-g2-3.6.3.28.gb8c58af-1-i686 update to newer snapshot diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 7a96a5e..e3773c6 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-"y"} pkgname=pacman-g2 pkgver=3.6.3 -Fuse $USE_DEVEL && pkgver=3.6.3.10.g5e0c759 +Fuse $USE_DEVEL && pkgver=3.6.3.28.gb8c58af 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/" @@ -22,7 +22,7 @@ if ! Fuse $USE_DEVEL; then signatures=("$source.asc") else _F_scm_type="git" - _F_scm_url="http://git.frugalware.org/repos/pacman-g2/.git/" + _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" Finclude scm fi From crazy at frugalware.org Tue Nov 6 23:47:41 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 6 23:47:43 2007 Subject: [Frugalware-git] frugalware-current: qtwine-0.3-2-i686 Message-ID: <20071106224741.B7A7811901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e623d7672f4f59fe5a61dab502fdcd4808e8b76d commit e623d7672f4f59fe5a61dab502fdcd4808e8b76d Author: crazy Date: Tue Nov 6 23:47:21 2007 +0100 qtwine-0.3-2-i686 * move away from kde-extra * fixed qt4 depends() diff --git a/source/kde-extra/qtwine/FrugalBuild b/source/kde-extra/qtwine/FrugalBuild deleted file mode 100644 index 6bbe93c..0000000 --- a/source/kde-extra/qtwine/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: 0.22 SBU -# Maintainer: crazy - -pkgname=qtwine -pkgver=0.3 -pkgrel=1 -pkgdesc="QtWine is a tool for creating and managing wine configurations." -depends=('libxi' 'qt4' 'libstdc++' 'libice' 'libxrender') -_F_sourceforge_ext="-src.tar.bz2" -_F_sourceforge_broken_up2date=1 -_F_sourceforge_dirname="$pkgname" -_F_sourceforge_name="QtWine" -Finclude sourceforge -rodepends=('wine') -options=('scriptlet') -groups=('kde-extra') -archs=('i686' '!x86_64') -sha1sums=('7a2181b685fd4c83c6cc5e20a659e7409f753a68') - -build() -{ - Fcd $pkgname-src - Ffilerel src/images/wine.png /usr/share/pixmaps/wine.png - source /etc/profile.d/qt4.sh.off - /usr/bin/qmake || Fdie - make || Fdie - Fexerel bin/QtWine.bin /usr/bin/$pkgname - Fdesktop "$pkgname" "/usr/share/pixmaps/wine.png" "Qt;Utility;" -} - -# optimization OK diff --git a/source/xapps-extra/qtwine/FrugalBuild b/source/xapps-extra/qtwine/FrugalBuild new file mode 100644 index 0000000..10e4de3 --- /dev/null +++ b/source/xapps-extra/qtwine/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 0.22 SBU +# Maintainer: crazy + +pkgname=qtwine +pkgver=0.3 +pkgrel=2 +pkgdesc="QtWine is a tool for creating and managing wine configurations." +depends=('libqtgui') +_F_sourceforge_ext="-src.tar.bz2" +_F_sourceforge_broken_up2date=1 +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_name="QtWine" +Finclude sourceforge +rodepends=('wine') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686' '!x86_64') +sha1sums=('7a2181b685fd4c83c6cc5e20a659e7409f753a68') + +build() +{ + Fcd $pkgname-src + Ffilerel src/images/wine.png /usr/share/pixmaps/wine.png + /usr/bin/qmake || Fdie + make || Fdie + Fexerel bin/QtWine.bin /usr/bin/$pkgname + Fdesktop "$pkgname" "/usr/share/pixmaps/wine.png" "Qt;Utility;" +} + +# optimization OK From vmiklos at frugalware.org Tue Nov 6 23:53:53 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 6 23:53:57 2007 Subject: [Frugalware-git] pacman-tools: repoman: support newer sudo Message-ID: <20071106225353.7F67411901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=2121d7a50a0e227de84cd1effab3b85b212bd895 commit 2121d7a50a0e227de84cd1effab3b85b212bd895 Author: Miklos Vajna Date: Tue Nov 6 23:53:47 2007 +0100 repoman: support newer sudo arch=foo sudo repoman no longer works it does not pass the arch env var to repoman, unless you use sudo -E diff --git a/repoman b/repoman index 4a7887d..b698c5a 100755 --- a/repoman +++ b/repoman @@ -80,7 +80,11 @@ delete() local i files rmopts host check_servers sudouser=$(eval "echo \$${reponame}_sudo") - [ -n "$sudouser" ] && sudo="sudo -u $sudouser" + if [ -n "$sudouser" ]; then + sudo_cmd="$sudo_env -u $sudouser" + else + sudo_cmd="" + fi # Strip leading / and any .. for i in $* do @@ -93,7 +97,7 @@ delete() do msg "Deleting file(s): $i" _set_lockname - ssh $host "cd $path; if [ ! -e $lock ]; then $sudo rm $rmopts $path/$i; else echo \"Couldn't get lock.\"; fi" + ssh $host "cd $path; if [ ! -e $lock ]; then $sudo_cmd rm $rmopts $path/$i; else echo \"Couldn't get lock.\"; fi" done } @@ -106,7 +110,11 @@ upload() fi check_servers sudouser=$(eval "echo \$${reponame}_sudo") - [ -n "$sudouser" ] && sudo="sudo -u $sudouser" + if [ -n "$sudouser" ]; then + sudo_cmd="$sudo_env -u $sudouser" + else + sudo_cmd="" + fi # Strip leading / and any .. dest=`echo ${@:$#} |sed 's|^/||;s|\.\./||g'` for src in "${@:1:$#-1}" @@ -118,7 +126,7 @@ upload() scp $src $host:$tmp if echo "`sha1sum $src|sed 's/\(.*\) .*/\1/'` $tmp" |ssh $host sha1sum -c - >/dev/null 2>&1; then msg "Copying to $dest" - ssh $host "chmod 644 $tmp; $sudo cp $tmp $path/$dest/$name && rm $tmp" + ssh $host "chmod 644 $tmp; $sudo_cmd cp $tmp $path/$dest/$name && rm $tmp" else echo "The uploaded file is corrupted :-/" ssh $host "rm $tmp" @@ -136,12 +144,16 @@ fpmmerge() fi check_servers sudouser=$(eval "echo \$${reponame}_sudo") - [ -n "$sudouser" ] && sudo="sudo -u $sudouser" + if [ -n "$sudouser" ]; then + sudo_cmd="$sudo_env -u $sudouser" + else + sudo_cmd="" + fi srcurl=$(eval "echo \$$1_servers") if [ -z "$srcurl" ]; then die "so such repo!" fi - if ! ssh $host "cd $path/frugalware-$arch && $sudo rsync -avP `echo $srcurl|sed 's/^.*@//'`/frugalware-$arch/*.fpm ./"; then + if ! ssh $host "cd $path/frugalware-$arch && $sudo_cmd rsync -avP `echo $srcurl|sed 's/^.*@//'`/frugalware-$arch/*.fpm ./"; then die "rsync failed! :/" fi # now push @@ -183,7 +195,11 @@ clean() { check_servers sudouser=$(eval "echo \$${reponame}_sudo") - [ -n "$sudouser" ] && sudo="sudo -u $sudouser" + if [ -n "$sudouser" ]; then + sudo_cmd="$sudo_env -u $sudouser" + else + sudo_cmd="" + fi fdb=$(eval "echo \$${reponame}_fdb") [ -z "$fdb" ] && fdb="$reponame.fdb" for i in $* @@ -192,7 +208,7 @@ clean() i=${i#*/} msg "Cleaning up $i" ssh $host "`declare -f _check_nobuild`; cd $path/frugalware-$arch && \ - _check_nobuild || arch=$arch $sudo updatesync del $fdb $i && \ + _check_nobuild || arch=$arch $sudo_cmd updatesync del $fdb $i && \ genchangelog --clean $i" done } @@ -203,7 +219,11 @@ changelog() split_group_pkg $1 check_servers sudouser=$(eval "echo \$${reponame}_sudo") - [ -n "$sudouser" ] && sudo="sudo -u $sudouser" + if [ -n "$sudouser" ]; then + sudo_cmd="$sudo_env -u $sudouser" + else + sudo_cmd="" + fi fdb=$(eval "echo \$${reponame}_fdb") [ -z "$fdb" ] && fdb="$reponame.fdb" if [ "$verbose" == 1 ]; then @@ -220,12 +240,12 @@ if [ ! -e $lock ]; then \ touch $lock; \ cd frugalware-$arch; \ if [ ! -e '$fdb' ]; then \ - _check_nobuild || arch=$arch $sudo gensync ../source/$group/$pkg $fdb; \ + _check_nobuild || arch=$arch $sudo_cmd gensync ../source/$group/$pkg $fdb; \ else \ - _check_nobuild || arch=$arch $sudo updatesync upd $fdb ../source/$group/$pkg/FrugalBuild; \ + _check_nobuild || arch=$arch $sudo_cmd updatesync upd $fdb ../source/$group/$pkg/FrugalBuild; \ fi; \ cd $path; rm $lock; \ - cd $path/source/$group/$pkg; arch=$arch $sudo genchangelog; \ + cd $path/source/$group/$pkg; arch=$arch $sudo_cmd genchangelog; \ $catcmd; \ else \ echo \"Couldn't get lock.\"; \ @@ -594,6 +614,7 @@ else mktemp_remote="mktemp -p $HOME" fi mktemp_local="mktemp -p $HOME" +sudo_env="sudo -E" if [ "$F_makepkg_scm" = "git" ]; then # Checking for git. From vmiklos at frugalware.org Wed Nov 7 00:04:56 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 00:05:00 2007 Subject: [Frugalware-git] frugalware-current: busybox-1.7.3-1-i686 Message-ID: <20071106230456.72C2311901C4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a238f05bdb9801dbd5d9e914697b5fcbef0f218c commit a238f05bdb9801dbd5d9e914697b5fcbef0f218c Author: Miklos Vajna Date: Wed Nov 7 00:04:33 2007 +0100 busybox-1.7.3-1-i686 version bump diff --git a/source/apps-extra/busybox/FrugalBuild b/source/apps-extra/busybox/FrugalBuild index da27ea4..a5604db 100644 --- a/source/apps-extra/busybox/FrugalBuild +++ b/source/apps-extra/busybox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=busybox -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems." url="http://www.busybox.net/" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump 'http://busybox.net/'|grep '(stable)'|sed 's/.*BusyBox \(.*\) (.*/\1/;q'" source=(http://www.busybox.net/downloads/busybox-$pkgver.tar.bz2 config) # NOTE: we can't use signatures() here as the author signes only the checksums -sha1sums=('d9c618a7b104af4e70d623b1b6f3bc454405e12b' \ +sha1sums=('e50507674baa245774b7205384b2049f06ba7998' \ '4e281c8f6ee3f89d9c51f0b28f93f2bcf1943303') build() From crazy at frugalware.org Wed Nov 7 00:24:37 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 7 00:24:45 2007 Subject: [Frugalware-git] frugalware-current: poppler-0.6.1-2-i686 Message-ID: <20071106232437.3579011901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=107a5da84c92961ce21612f744d13c1184ba02fb commit 107a5da84c92961ce21612f744d13c1184ba02fb Author: crazy Date: Wed Nov 7 00:20:25 2007 +0100 poppler-0.6.1-2-i686 * fixed qt4 depends() * fixed qt{3,4} groups diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index fb348ec..30c25d0 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -3,11 +3,11 @@ pkgname=poppler pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A PDF rendering library" url="http://poppler.freedesktop.org/" depends=('libxext' 'fontconfig' 'libstdc++' 'cairo' 'libjpeg' 'libxrender' 'libpng') -makedepends=('qt' 'gtk+2>=2.12.0' 'gtk-doc' 'qt4') +makedepends=('qt' 'gtk+2>=2.12.0' 'gtk-doc' 'libqtgui' 'libqtxml' 'libqttest') groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://poppler.freedesktop.org/releases.html|grep tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" @@ -17,8 +17,8 @@ options=('scriptlet') subpkgs=('poppler-glib' 'poppler-qt' 'poppler-pdftools' 'poppler-qt4') subdescs=('Poppler glib/GTK+ bindings' 'Poppler QT bindings' 'poppler xpdf tools' 'Poppler QT4 bindings') -subgroups=('gnome' 'kde' 'xapps' 'kde-extra') -subdepends=('poppler pango gtk+2' 'poppler qt' 'poppler' 'poppler qt4') +subgroups=('gnome' 'xlib' 'xapps' 'xlib-extra') +subdepends=('poppler pango gtk+2' 'poppler qt' 'poppler' 'poppler libqtgui libqtxml libqttest') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') build() { From vmiklos at frugalware.org Wed Nov 7 00:50:54 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 00:50:57 2007 Subject: [Frugalware-git] bmf: elinks-0.11.3.2205.g5079d5a-1-i686 Message-ID: <20071106235054.6525111901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=2fad5641340aaa3ab2f32c38d728a5f20d99ce65 commit 2fad5641340aaa3ab2f32c38d728a5f20d99ce65 Author: Miklos Vajna Date: Wed Nov 7 00:50:33 2007 +0100 elinks-0.11.3.2205.g5079d5a-1-i686 import from current + update to git snapshot there are a numer of nice new features.. well, 2000+ changes ;) diff --git a/source/network/elinks/FrugalBuild b/source/network/elinks/FrugalBuild new file mode 100644 index 0000000..8c09b56 --- /dev/null +++ b/source/network/elinks/FrugalBuild @@ -0,0 +1,37 @@ +# Compiling Time: 0.43 SBU +# Maintainer: voroskoi +# Contributor: Laszlo Dvornik + +USE_DEVEL=${USE_DEVEL:-"y"} + +pkgname=elinks +pkgver=0.11.3 +Fuse $USE_DEVEL && pkgver=0.11.3.2205.g5079d5a +pkgrel=1 +pkgdesc="An advanced and well-established feature-rich text mode web browser" +url="http://elinks.or.cz/" +depends=('openssl' 'glibc' 'gpm' 'zlib' 'bzip2' 'libidn' 'expat' 'ncurses') +#makedepends=('samba') # smb support is disabled by upstream (security reasons) +groups=('network' 'chroot-core') +archs=('i686' 'x86_64') +up2date="lynx -dump http://elinks.or.cz/download.html|grep 'Current stable'|sed 's/.*-\(.*\) .*.t.*/\1/'" + +_F_scm_type="git" +_F_scm_url="http://elinks.cz/elinks.git" +Finclude scm + +build() +{ + if Fuse $USE_DEVEL; then + Funpack_scm + sh autogen.sh + fi + Fbuild --enable-smb --without-x --enable-cgi \ + --enable-leds --enable-fastmem --without-lua \ + --exec-prefix=$Fdestdir/usr --enable-bittorrent --enable-nntp \ + --with-perl --with-bzlib --enable-html-highlight \ + --enable-256-colors --enable-finger + Frm /usr/share/locale/locale.alias +} + +# optimization OK From boobaa at frugalware.org Wed Nov 7 11:31:18 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Nov 7 11:31:26 2007 Subject: [Frugalware-git] frugalware-current: sword-1.5.10-1-i686 Message-ID: <20071107103118.F0CBC11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21ca422a050a6d5a0ed664341fe4a0ff4b333c8a commit 21ca422a050a6d5a0ed664341fe4a0ff4b333c8a Author: CSÉCSY László Date: Wed Nov 7 11:31:10 2007 +0100 sword-1.5.10-1-i686 version bump diff --git a/source/apps-extra/sword/FrugalBuild b/source/apps-extra/sword/FrugalBuild index 68aad42..b8b9c97 100644 --- a/source/apps-extra/sword/FrugalBuild +++ b/source/apps-extra/sword/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Bence Nagy pkgname=sword -pkgver=1.5.9 -pkgrel=2 +pkgver=1.5.10 +pkgrel=1 pkgdesc="CrossWire Bible Society's free Bible software project" url='http://www.crosswire.org/sword/' depends=('openssl' 'curl>=7.16.0' 'libstdc++') @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') backup=(etc/sword.conf) up2date="lynx -dump http://www.crosswire.org/sword/software/swordapi.jsp | grep 'sword-.*.tar.gz' | sed 's/.*sword-\(.*\).tar.gz.*/\1/'" source=(http://www.crosswire.org/ftpmirror/pub/sword/source/v`echo $pkgver | sed 's/\(.*\)\..*/\1/'`/$pkgname-$pkgver.tar.gz sword.sh) -sha1sums=('9ba3680c0acef5fc305487ecfb8583985047ea89' \ +sha1sums=('993c40a8db4d33e82d219254ab13f45c395f3f5a' \ 'c552669a7498177d5f4523ad5c2f5bae63d2dd4d') build() From vmiklos at frugalware.org Wed Nov 7 13:01:58 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 13:02:01 2007 Subject: [Frugalware-git] frugalware-current: tig-0.9.1-1-i686 Message-ID: <20071107120158.EAC0B11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a11839ac7e35aed51b3af965743ee3791a28f8d commit 2a11839ac7e35aed51b3af965743ee3791a28f8d Author: Miklos Vajna Date: Wed Nov 7 13:01:25 2007 +0100 tig-0.9.1-1-i686 new package diff --git a/source/devel-extra/tig/FrugalBuild b/source/devel-extra/tig/FrugalBuild new file mode 100644 index 0000000..39a2181 --- /dev/null +++ b/source/devel-extra/tig/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.02 SBU +# Maintainer: VMiklos + +pkgname=tig +pkgver=0.9.1 +pkgrel=1 +pkgdesc="A text-mode interface for git." +url="http://jonas.nitro.dk/tig/" +depends=('git' 'ncurses') +makedepends=('asciidoc') +groups=('devel-extra') +backup=(etc/tigrc) +archs=('i686') +up2date="lynx -dump http://jonas.nitro.dk/tig/releases/|Flasttar" +source=(http://jonas.nitro.dk/tig/releases/tig-$pkgver.tar.gz) +sha1sums=('15ba19a8114ad589f8b370f86bf6878b1e6d378d') + +build() +{ + Fsed '$(docdir)/tig' "\$(docdir)/tig-$pkgver" Makefile + Fmake + Fmakeinstall install-doc + Ffilerel contrib/tigrc /etc/tigrc + Ffilerel contrib/tig-completion.bash /etc/bash_completion.d/tig +} + +# optimization OK From devil505linux at gmail.com Wed Nov 7 15:21:57 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Nov 7 15:21:59 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-gnotify-0.5-1-i686 Message-ID: <20071107142157.67B2C11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4f885788b94742d7ad900f06809323324ae0d77 commit a4f885788b94742d7ad900f06809323324ae0d77 Author: Devil505 Date: Wed Nov 7 15:21:10 2007 +0100 amsn-plugin-gnotify-0.5-1-i686 *New Package *Closes hermier's request on irc channel frugalware-fr diff --git a/source/xapps-extra/amsn-plugin-gnotify/FrugalBuild b/source/xapps-extra/amsn-plugin-gnotify/FrugalBuild new file mode 100644 index 0000000..02bf860 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-gnotify/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-gnotify +_F_amsn_name="gnotify" +pkgver=0.5 +pkgrel=1 +pkgdesc="Plugin to check Gmail accounts in aMSN and notify you with the email information." +_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=('7e146cef3334d7d22a4965a331713ecaa65096e9') \ No newline at end of file From devil505linux at gmail.com Wed Nov 7 15:27:31 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Nov 7 15:27:32 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-senddraw-20060213-1-i686 Message-ID: <20071107142731.3A2F211901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aca40b9be9319a1ae0b4e48ac11b26c1acd07fcc commit aca40b9be9319a1ae0b4e48ac11b26c1acd07fcc Author: Devil505 Date: Wed Nov 7 15:26:39 2007 +0100 amsn-plugin-senddraw-20060213-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-senddraw/FrugalBuild b/source/xapps-extra/amsn-plugin-senddraw/FrugalBuild new file mode 100644 index 0000000..59ba695 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-senddraw/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-senddraw +_F_amsn_name="senddraw" +pkgver=20060213 +pkgrel=1 +pkgdesc="Allows you to send a image file as a draw to your contacts." +_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=('83e33576ceaf60e366198f462b3888c2169826b5') From devil505linux at gmail.com Wed Nov 7 15:32:00 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Nov 7 15:32:01 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-spellcheck-7-1-i686 Message-ID: <20071107143200.0876E11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2f06b56ab8c6946eb52c8ff7e128d156c95fb284 commit 2f06b56ab8c6946eb52c8ff7e128d156c95fb284 Author: Devil505 Date: Wed Nov 7 15:31:16 2007 +0100 amsn-plugin-spellcheck-7-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-spellcheck/FrugalBuild b/source/xapps-extra/amsn-plugin-spellcheck/FrugalBuild new file mode 100644 index 0000000..39cba30 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-spellcheck/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-spellcheck +_F_amsn_name="SpellCheck" +pkgver=7 +pkgrel=1 +pkgdesc="Spell Checker for the chat window." +_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=('5e145078ca06d7a7e01ea5e0aec38e27bb3f1ea1') + From priyank at frugalware.org Wed Nov 7 15:44:55 2007 From: priyank at frugalware.org (Priyank) Date: Wed Nov 7 15:44:57 2007 Subject: [Frugalware-git] frugalware-current: ristretto-0.0.11-1-i686 Message-ID: <20071107144455.22D4311901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=72a16eea7ddeaad7d76cbf3228c84b5181cb3fa6 commit 72a16eea7ddeaad7d76cbf3228c84b5181cb3fa6 Author: Priyank Date: Wed Nov 7 20:12:07 2007 +0530 ristretto-0.0.11-1-i686 * Version bump diff --git a/source/xfce4/ristretto/FrugalBuild b/source/xfce4/ristretto/FrugalBuild index 30d407e..9069127 100644 --- a/source/xfce4/ristretto/FrugalBuild +++ b/source/xfce4/ristretto/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=ristretto -pkgver=0.0.10 +pkgver=0.0.11 pkgrel=1 pkgdesc="A fast and lightweight picture viewer for Xfce." makedepends=('intltool') @@ -13,6 +13,6 @@ _F_gnome_iconcache="y" _F_xfce_goodies_ext=".tar.gz" Finclude xfce4 gnome-scriptlet url="http://goodies.xfce.org/projects/applications/ristretto" -sha1sums=('3f9b2b3fd5f91b8f6a047ed8798d090699ed995c') +sha1sums=('1f1c4e1167509aadc1d57768fbbdac6bf824c383') # optimization OK From crazy at frugalware.org Wed Nov 7 15:51:46 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 7 15:51:48 2007 Subject: [Frugalware-git] frugalware-current: sourceforge.sh Message-ID: <20071107145146.57738119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97d0e8a4ca50454bdf6d8338e8be321d6ac182eb commit 97d0e8a4ca50454bdf6d8338e8be321d6ac182eb Author: crazy Date: Wed Nov 7 15:51:09 2007 +0100 sourceforge.sh * use _F_sourceforge_prefix as 'separator' * for _F_sourceforge_broken_up2date. * such weird 'foo.BAR-1.2.3 packages name * could have then _F_sourceforge_prefix=".BAR" in FB * Based on hermier's separator idea diff --git a/source/include/sourceforge.sh b/source/include/sourceforge.sh index 7f69df7..7116e68 100644 --- a/source/include/sourceforge.sh +++ b/source/include/sourceforge.sh @@ -39,9 +39,9 @@ # * _F_sourceforge_ext (defaults to .tar.gz): extension of the source tarball # * _F_sourceforge_broken_up2date: if set, try an other method for up2date, try # this if the normal up2date does not work, maybe this will -# *_F_sourceforge_prefix (no defaults): used to correct the standard up2date -# but does not work when _F_sourceforge_broken_up2date is set. As example $pkgver -# should be 1.2.3 but you get V1.2.3 in such a case you can set _F_sourceforge_prefix="V" +# *_F_sourceforge_prefix (no defaults): used to correct the up2date output +# As example $pkgver should be 1.2.3 but you get V1.2.3 in such a case you can +# set _F_sourceforge_prefix="V" # *_F_sourceforge_sep ( defaults to - ): used for source() only right now. As example # for an "baz_1.2.3.tar.gz" tarball you should use _F_sourceforge_sep="_" ### @@ -80,6 +80,6 @@ url="http://sourceforge.net/projects/$_F_sourceforge_dirname" if [ $_F_sourceforge_broken_up2date -eq 0 ]; then up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;q')|grep -m1 'Latest \[.*\]'|sed 's/.*]$_F_sourceforge_prefix\(.*\) \[.*\].*/\1/;s/-/_/g'" else - up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;q')|grep -m1 '$_F_sourceforge_name\(.*\)$_F_sourceforge_ext'|sed 's/.*$_F_sourceforge_name\(.*\)$_F_sourceforge_ext.*/\1/;s/-/_/g;s/_//1'" + up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;q')|grep -m1 '$_F_sourceforge_name\(.*\)$_F_sourceforge_ext'|sed 's/.*$_F_sourceforge_name$_F_sourceforge_prefix\(.*\)$_F_sourceforge_ext.*/\1/;s/-/_/g;s/_//1'" fi source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/$_F_sourceforge_dirname/$_F_sourceforge_name$_F_sourceforge_sep${pkgver//_/-}$_F_sourceforge_ext) From crazy at frugalware.org Wed Nov 7 16:28:55 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 7 16:28:58 2007 Subject: [Frugalware-git] frugalware-current: audacious-1.4.0-1-i686 Message-ID: <20071107152855.71F9411901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=43dcf1221f12892a67a3533e715508f7296532a3 commit 43dcf1221f12892a67a3533e715508f7296532a3 Author: crazy Date: Wed Nov 7 16:28:12 2007 +0100 audacious-1.4.0-1-i686 * Version bump diff --git a/source/xmultimedia-extra/audacious/FrugalBuild b/source/xmultimedia-extra/audacious/FrugalBuild index 8b34108..2c8ff68 100644 --- a/source/xmultimedia-extra/audacious/FrugalBuild +++ b/source/xmultimedia-extra/audacious/FrugalBuild @@ -2,21 +2,21 @@ # Maintainer: crazy pkgname=audacious -pkgver=1.4.0_rc1 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="Audacious is a fork from BMP 0.9.7.1" url="http://audacious-media-player.org/" depends=('gtk+2>=2.12.1' 'taglib' 'libglade' 'libxml2' 'glib2>=2.14.2' 'libmcs>=0.6.0' 'dbus-glib') rodepends=('audacious-plugins') groups=('xmultimedia-extra') archs=('i686' 'x86_64') -options=('scriptlet') +options=('scriptlet' 'force') conflicts=('bmp' 'bmp-docklet' 'bmp-mac') 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=('27f8cf578a1e36cbd962af6560d6667f3931a64b') +sha1sums=('b23c0b4b648e2ba113b6a0e21ba5a1b84f01b7ee') build() { From crazy at frugalware.org Wed Nov 7 16:48:24 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 7 16:48:29 2007 Subject: [Frugalware-git] frugalware-current: audacious-plugins-1.4.0-1-i686 Message-ID: <20071107154824.36C5E11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4042374745a0b422cf31e27cc9fdd95f195846d1 commit 4042374745a0b422cf31e27cc9fdd95f195846d1 Author: crazy Date: Wed Nov 7 16:46:10 2007 +0100 audacious-plugins-1.4.0-1-i686 * Version bump diff --git a/source/xmultimedia-extra/audacious-plugins/FrugalBuild b/source/xmultimedia-extra/audacious-plugins/FrugalBuild index 5aea140..f2de81b 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.0_rc1 +pkgver=1.4.0 pkgrel=1 pkgdesc="Plugins for audacious." url="http://audacious-media-player.org/" -depends=('openssl' 'curl>=7.16.0' 'dbus-glib' 'sdl' 'audacious>=1.4.0_rc1' 'faad2' \ +depends=('openssl' 'curl>=7.16.0' 'dbus-glib' 'sdl' 'audacious>=1.4.0' '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=('adc9f3bd605b5ff2f1aed365f5fb2a7b4f0e0213') +sha1sums=('bcf74225e68d75610331d15cb8d54ea8e1547fbd') From devil505linux at gmail.com Wed Nov 7 16:59:16 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Nov 7 16:59:18 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-remind-1.2-1-i686 Message-ID: <20071107155916.5D30F11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=16010563383b2b5b00e52800dd982dca98a87ced commit 16010563383b2b5b00e52800dd982dca98a87ced Author: Devil505 Date: Wed Nov 7 16:56:53 2007 +0100 amsn-plugin-remind-1.2-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-remind/FrugalBuild b/source/xapps-extra/amsn-plugin-remind/FrugalBuild new file mode 100644 index 0000000..c33cfd3 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-remind/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-remind +_F_amsn_name="remind" +pkgver=1.2 +pkgrel=1 +pkgdesc="Shows the last sentences of the previous conversations when opening a new chat window." +_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=('ed51c447140362e1ef6ee16b5a6532f1fed03b46') From devil505linux at gmail.com Wed Nov 7 17:06:26 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Nov 7 17:06:28 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-sayit-1.4-1-i686 Message-ID: <20071107160626.53FAC11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1435cb916fcecf6c2dec5ae5381b4e2e090992b1 commit 1435cb916fcecf6c2dec5ae5381b4e2e090992b1 Author: Devil505 Date: Wed Nov 7 17:05:34 2007 +0100 amsn-plugin-sayit-1.4-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-sayit/FrugalBuild b/source/xapps-extra/amsn-plugin-sayit/FrugalBuild new file mode 100644 index 0000000..82b137c --- /dev/null +++ b/source/xapps-extra/amsn-plugin-sayit/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-sayit +_F_amsn_name="sayit" +pkgver=1.4 +pkgrel=1 +pkgdesc="Speaks the messages you receive in the background. It will use the default voice set in the system preferences." +_F_sourceforge_ext=".zip" +_F_sourceforge_dirname="amsn" +_F_sourceforge_name="$_F_amsn_name" +_F_sourceforge_broken_up2date=1 +_F_amsn_clean_files=(winsayit.dll) +Finclude sourceforge amsn +rodepends=('festival') +archs=('i686') +sha1sums=('e3b225172a1a7ac3b93f7081a43ceca9900007cb') From devil505linux at gmail.com Wed Nov 7 17:15:25 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Nov 7 17:15:26 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-changeit-1.0-1-i686 Message-ID: <20071107161525.1F76D11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b733a99214c26b3c596e37a69fb32cf66c723130 commit b733a99214c26b3c596e37a69fb32cf66c723130 Author: Devil505 Date: Wed Nov 7 17:14:30 2007 +0100 amsn-plugin-changeit-1.0-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-changeit/FrugalBuild b/source/xapps-extra/amsn-plugin-changeit/FrugalBuild new file mode 100644 index 0000000..d05464a --- /dev/null +++ b/source/xapps-extra/amsn-plugin-changeit/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-changeit +_F_amsn_name="changeit" +pkgver=1.0 +pkgrel=1 +pkgdesc="Convert sent/received messages using talkfiters." +_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=('43d20a170290d5a2dbd028c139c0f2cf3ee81ca5') \ No newline at end of file From crazy at frugalware.org Wed Nov 7 17:59:53 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 7 17:59:56 2007 Subject: [Frugalware-git] frugalware-current: qgit-2.0-1-i686 Message-ID: <20071107165953.5E2B011901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6784b4f764928c177fcfb5053d1c31fb2e8e324f commit 6784b4f764928c177fcfb5053d1c31fb2e8e324f Author: crazy Date: Wed Nov 7 17:58:36 2007 +0100 qgit-2.0-1-i686 * Version bump * using qt4 now diff --git a/source/xapps-extra/qgit/FrugalBuild b/source/xapps-extra/qgit/FrugalBuild index 136b6c9..f0322fc 100644 --- a/source/xapps-extra/qgit/FrugalBuild +++ b/source/xapps-extra/qgit/FrugalBuild @@ -2,29 +2,30 @@ # Maintainer: crazy pkgname=qgit -pkgver=1.5.7 +pkgver=2.0 pkgrel=1 pkgdesc="QGit is a git GUI viewer built on Qt/C++." -url="http://digilander.libero.it/mcostalba/" -depends=('qt>=3.3.7' 'libstdc++') +depends=('libqtgui') rodepends=('git>=1.4.2') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -source=(${source[@]} $pkgname.{desktop,png}) - +url="http://digilander.libero.it/mcostalba/" +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=139897'|grep -om1 'qgit-2\(.*\).tar.bz2'|Flasttarbz2" +sha1sums=('e4b62ece886a49587fe11bf6ea6fb3dcec39cd60') build() { - Fbuild - Ffilerel ../$pkgname.desktop /usr/share/applications/$pkgname.desktop - ## well - Ffilerel ../$pkgname.png /usr/share/$pkgname/$pkgname.png + Fcd $pkgname + Fmkdir usr/share/pixmaps + /usr/bin/qmake $pkgname.pro || Fdie + make || Fdie + Fexerel bin/$pkgname /usr/bin/$pkgname + cp -ra src/resources/$pkgname.png \ + $Fdestdir/usr/share/pixmaps + Fdesktop "$pkgname" "/usr/share/pixmaps/$pkgname.png" "Qt;Network" } -sha1sums=('4ac4ea72b9377f8719c6195a3f07501ad3cfea3a' \ - 'deb194ecaf4d099a23c091d9f32ce80ea67204ca' \ - '09f9373115c0db6bfdda3072ecd54ae588fa003d') # optimization OK diff --git a/source/xapps-extra/qgit/qgit.desktop b/source/xapps-extra/qgit/qgit.desktop deleted file mode 100644 index 1ad0638..0000000 --- a/source/xapps-extra/qgit/qgit.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=QGit -Comment=A graphical interface to git repositories -Exec=qgit -Icon=/usr/share/qgit/qgit.png -Terminal=false -Type=Application -Categories=Application;Development; -Encoding=UTF-8 diff --git a/source/xapps-extra/qgit/qgit.png b/source/xapps-extra/qgit/qgit.png deleted file mode 100644 index 4b89c46..0000000 Binary files a/source/xapps-extra/qgit/qgit.png and /dev/null differ From crazy at frugalware.org Wed Nov 7 19:06:17 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 7 19:06:20 2007 Subject: [Frugalware-git] frugalware-current: monkeystudio-2006.1.5.3-2-i686 Message-ID: <20071107180617.D166D11901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a0d231217bec308a9b09aecabda587dc6587023 commit 3a0d231217bec308a9b09aecabda587dc6587023 Author: crazy Date: Wed Nov 7 19:05:39 2007 +0100 monkeystudio-2006.1.5.3-2-i686 * moved to xapps-extra * fixed qt4 depends * fixed qt4.3 build diff --git a/source/kde-extra/monkeystudio/FrugalBuild b/source/kde-extra/monkeystudio/FrugalBuild deleted file mode 100644 index 0a20804..0000000 --- a/source/kde-extra/monkeystudio/FrugalBuild +++ /dev/null @@ -1,43 +0,0 @@ -# Compiling Time: 0.63 SBU -# Maintainer: crazy - -pkgname=monkeystudio -pkgver=2006.1.5.3 -pkgrel=1 -pkgdesc="Monkey Studio is a Free crossplatform Qt4 IDE." -_F_sourceforge_name="monkeystudio-src" -_F_sourceforge_dirname="$pkgname" -_F_sourceforge_ext=".zip" -_F_sourceforge_broken_up2date=1 -Finclude sourceforge -url="http://monkeystudio.org/" -depends=('libxi' 'qt4' 'libstdc++' 'libxcb' 'libice' 'libxrender') -rodepends=('qt4-docs') -makedepends=('unzip') -options=('scriptlet') -source=($source fix.it.patch) -groups=('kde-extra') -archs=('i686' 'x86_64') -sha1sums=('3f179931b14b1fc8126051430fb6d09718c40c81' \ - 'cbe17fec205f8a233f32873b8cbe94dc42f9cb14') - -build() -{ - ## uhh .. build system = CRAP - Fcd $pkgver - ## fix broken parts in *pro file - Fpatchall - ## fix all the broken stuff part 2 :) - find . -name ".svn" -print0|xargs -0 rm -rf || Fdie - source /etc/profile.d/qt4.sh.off - qmake || Fdie - ## WTF - make INSTALL_ROOT=$Fdestdir install || Fdie - Fexerel binary/monkey_x11 /usr/bin/monkey_x11 - Fln /usr/bin/monkey_x11 /usr/bin/$pkgname - Fmv /usr/share/monkeystudio/manuals /usr/share/monkeystudio/html - Ffilerel src/resources/Icons/logo.png /usr/share/pixmaps/$pkgname.png - Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Qt;KDE;Development;IDE;" -} - -# optimization OK diff --git a/source/kde-extra/monkeystudio/fix.it.patch b/source/kde-extra/monkeystudio/fix.it.patch deleted file mode 100644 index ff098cf..0000000 --- a/source/kde-extra/monkeystudio/fix.it.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naurp 2006.1.5.3/monkey.pro 2006.1.5.3-fix-it/monkey.pro ---- 2006.1.5.3/monkey.pro 2006-10-24 22:30:45.000000000 +0200 -+++ 2006.1.5.3-fix-it/monkey.pro 2006-12-29 14:05:18.000000000 +0100 -@@ -98,13 +98,13 @@ TRANSLATIONS = translations/qt4ds_french - - !win32 { - PROGNAME = monkeystudio -- PREFIX = /usr/local -+ PREFIX = /usr - INSTALLS += binary documentation translation - - binary.path = $$PREFIX/bin - binary.files = $$DESTDIR/$$TARGET -- documentation.path = $$PREFIX/$$PROGNAME/manuals -+ documentation.path = $$PREFIX/share/$$PROGNAME/manuals - documentation.files = docqt4ds/english/html/* -- translation.path = $$PREFIX/$$PROGNAME/translations -+ translation.path = $$PREFIX/share/$$PROGNAME/translations - translation.files = translations/*.qm - } diff --git a/source/xapps-extra/monkeystudio/FrugalBuild b/source/xapps-extra/monkeystudio/FrugalBuild new file mode 100644 index 0000000..095f752 --- /dev/null +++ b/source/xapps-extra/monkeystudio/FrugalBuild @@ -0,0 +1,41 @@ +# Compiling Time: 0.63 SBU +# Maintainer: crazy + +pkgname=monkeystudio +pkgver=2006.1.5.3 +pkgrel=2 +pkgdesc="Monkey Studio is a Free crossplatform Qt4 IDE." +_F_sourceforge_name="monkeystudio-src" +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_ext=".zip" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://monkeystudio.org/" +depends=('qt4-designer') +makedepends=('unzip') +options=('scriptlet') +source=($source fix.it.patch qt4.3-build-fix.patch) +groups=('xapps-extra') +archs=('i686' 'x86_64') +sha1sums=('3f179931b14b1fc8126051430fb6d09718c40c81' \ + 'cbe17fec205f8a233f32873b8cbe94dc42f9cb14' \ + '8eca691f99cb161aad71aa04d4bef5efee38009c') + +build() +{ + + Fcd $pkgver + ## fix broken parts in *pro file + Fpatchall + ## fix all the broken stuff part 2 :) + find . -name ".svn" -print0|xargs -0 rm -rf || Fdie + /usr/bin/qmake || Fdie + make INSTALL_ROOT=$Fdestdir install || Fdie + Fexerel binary/monkey_x11 /usr/bin/monkey_x11 + Fln /usr/bin/monkey_x11 /usr/bin/$pkgname + Fmv /usr/share/monkeystudio/manuals /usr/share/monkeystudio/html + Ffilerel src/resources/Icons/logo.png /usr/share/pixmaps/$pkgname.png + Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Qt;KDE;Development;IDE;" +} + +# optimization OK diff --git a/source/xapps-extra/monkeystudio/fix.it.patch b/source/xapps-extra/monkeystudio/fix.it.patch new file mode 100644 index 0000000..ff098cf --- /dev/null +++ b/source/xapps-extra/monkeystudio/fix.it.patch @@ -0,0 +1,20 @@ +diff -Naurp 2006.1.5.3/monkey.pro 2006.1.5.3-fix-it/monkey.pro +--- 2006.1.5.3/monkey.pro 2006-10-24 22:30:45.000000000 +0200 ++++ 2006.1.5.3-fix-it/monkey.pro 2006-12-29 14:05:18.000000000 +0100 +@@ -98,13 +98,13 @@ TRANSLATIONS = translations/qt4ds_french + + !win32 { + PROGNAME = monkeystudio +- PREFIX = /usr/local ++ PREFIX = /usr + INSTALLS += binary documentation translation + + binary.path = $$PREFIX/bin + binary.files = $$DESTDIR/$$TARGET +- documentation.path = $$PREFIX/$$PROGNAME/manuals ++ documentation.path = $$PREFIX/share/$$PROGNAME/manuals + documentation.files = docqt4ds/english/html/* +- translation.path = $$PREFIX/$$PROGNAME/translations ++ translation.path = $$PREFIX/share/$$PROGNAME/translations + translation.files = translations/*.qm + } diff --git a/source/xapps-extra/monkeystudio/qt4.3-build-fix.patch b/source/xapps-extra/monkeystudio/qt4.3-build-fix.patch new file mode 100644 index 0000000..791febe --- /dev/null +++ b/source/xapps-extra/monkeystudio/qt4.3-build-fix.patch @@ -0,0 +1,11 @@ +diff -Naur 2006.1.5.3/src/3rdparty/TextEditor/src/CppSyntaxHighlighter.h 2006.1.5.3-p/src/3rdparty/TextEditor/src/CppSyntaxHighlighter.h +--- 2006.1.5.3/src/3rdparty/TextEditor/src/CppSyntaxHighlighter.h 2006-10-20 23:40:58.000000000 +0200 ++++ 2006.1.5.3-p/src/3rdparty/TextEditor/src/CppSyntaxHighlighter.h 2007-11-07 18:24:43.000000000 +0100 +@@ -39,6 +39,7 @@ + }; + static const Keyword keywords[]; + // ++ Q_OBJECT + private: + void highlightKeyword( int, const QString& ); + // From priyank at frugalware.org Wed Nov 7 19:25:09 2007 From: priyank at frugalware.org (Priyank) Date: Wed Nov 7 19:25:11 2007 Subject: [Frugalware-git] frugalware-current: perl-anyevent-2.55-1-i686 Message-ID: <20071107182509.35D4E11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f4da5111ca31d0efcb95e6f3bfb8745170385137 commit f4da5111ca31d0efcb95e6f3bfb8745170385137 Author: Priyank Date: Wed Nov 7 23:52:19 2007 +0530 perl-anyevent-2.55-1-i686 * Version bump diff --git a/source/devel-extra/perl-anyevent/FrugalBuild b/source/devel-extra/perl-anyevent/FrugalBuild index a6e34a6..c0f4d26 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.54 +pkgver=2.55 pkgdesc="Perl framework for multiple event loops." depends=('perl-event') Finclude perl archs=('i686' 'x86_64') -sha1sums=('e8ed3d4685673cc76643ebe426cac1f73777cd84') +sha1sums=('5d9026dbcca3f830dc59ebd74f4f8ed278cb2bf1') From crazy at frugalware.org Wed Nov 7 19:42:00 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 7 19:42:06 2007 Subject: [Frugalware-git] frugalware-current: qbittorrent-0.9.3-3-i686 Message-ID: <20071107184200.DD81411901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=17c64f8d74dc30b93f42dbf8182dec86d3449c58 commit 17c64f8d74dc30b93f42dbf8182dec86d3449c58 Author: crazy Date: Wed Nov 7 19:40:44 2007 +0100 qbittorrent-0.9.3-3-i686 * fixed qt4 depends * moved to xapps-extra diff --git a/source/kde-extra/qbittorrent/FrugalBuild b/source/kde-extra/qbittorrent/FrugalBuild deleted file mode 100644 index cb55190..0000000 --- a/source/kde-extra/qbittorrent/FrugalBuild +++ /dev/null @@ -1,36 +0,0 @@ -# Compiling Time: 0.44 SBU -# Maintainer: crazy - -pkgname=qbittorrent -pkgver=0.9.3 -pkgrel=2 -pkgdesc="A Bittorrent client." -depends=('qt4>=4.2.3-2' 'rblibtorrent>=0.12-4' 'curl>=7.16.1-2' 'python>=2.5') -groups=('kde-extra') -archs=('i686' 'x86_64') -_F_sourceforge_broken_up2date=1 -Finclude sourceforge -url="http://www.qbittorrent.org/" -source=($source frugalware.patch) - - -build() -{ - Fcd - source /etc/profile.d/qt4.sh.off - Fpatchall - ./configure \ - --with-libtorrent-lib=/usr/lib/libtorrent \ - --with-libtorrent-inc=/usr/include \ - --with-libcurl-lib=/usr/lib \ - --with-libcurl-inc=/usr/include \ - --prefix=/usr \ - --qtdir=/usr \ - --verbose - make || Fdie - make INSTALL_ROOT=$Fdestdir install || Fdie -} - -sha1sums=('b8ebe28a3ce6c0d789b50faf56197e8df891191a'\ - '6c7d05d26e65fd615a3cf2a880b05b0f5c1ca958') -# optimization OK diff --git a/source/kde-extra/qbittorrent/frugalware.patch b/source/kde-extra/qbittorrent/frugalware.patch deleted file mode 100644 index c90b51a..0000000 --- a/source/kde-extra/qbittorrent/frugalware.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Naur qbittorrent-0.9.2/configure qbittorrent-0.9.2-p/configure ---- qbittorrent-0.9.2/configure 2007-04-06 02:39:58.000000000 +0200 -+++ qbittorrent-0.9.2-p/configure 2007-04-15 01:16:48.000000000 +0200 -@@ -295,8 +295,8 @@ - { - public: - qc_libtorrent(Conf *c) : ConfObj(c) {} -- QString name() const { return "libtorrent >= 0.11 (>= 0.12 ADVISED)"; } -- QString shortname() const { return "libtorrent"; } -+ QString name() const { return "rblibtorrent >= 0.11 (>= 0.12 ADVISED)"; } -+ QString shortname() const { return "rblibtorrent"; } - bool exec(){ - QString s; - s = conf->getenv("QC_WITH_LIBTORRENT_INC"); -diff -Naur qbittorrent-0.9.2/qbittorrent.qc qbittorrent-0.9.2-p/qbittorrent.qc ---- qbittorrent-0.9.2/qbittorrent.qc 2007-03-15 16:51:11.000000000 +0100 -+++ qbittorrent-0.9.2-p/qbittorrent.qc 2007-04-15 01:15:00.000000000 +0200 -@@ -5,7 +5,7 @@ - - - -- -+ - - - -diff -Naur qbittorrent-0.9.2/qcm/libtorrent.qcm qbittorrent-0.9.2-p/qcm/libtorrent.qcm ---- qbittorrent-0.9.2/qcm/libtorrent.qcm 2007-04-06 02:39:58.000000000 +0200 -+++ qbittorrent-0.9.2-p/qcm/libtorrent.qcm 2007-04-15 01:20:31.000000000 +0200 -@@ -9,8 +9,8 @@ - { - public: - qc_libtorrent(Conf *c) : ConfObj(c) {} -- QString name() const { return "libtorrent >= 0.11 (>= 0.12 ADVISED)"; } -- QString shortname() const { return "libtorrent"; } -+ QString name() const { return "rblibtorrent >= 0.11 (>= 0.12 ADVISED)"; } -+ QString shortname() const { return "rblibtorrent"; } - bool exec(){ - QString s; - s = conf->getenv("QC_WITH_LIBTORRENT_INC"); -diff -Naur qbittorrent-0.9.2/src/src.pro qbittorrent-0.9.2-p/src/src.pro ---- qbittorrent-0.9.2/src/src.pro 2007-04-10 23:02:47.000000000 +0200 -+++ qbittorrent-0.9.2-p/src/src.pro 2007-04-15 01:21:13.000000000 +0200 -@@ -29,7 +29,7 @@ - QMAKE_CXXFLAGS_DEBUG += -fwrapv - #LIBS += -lcurl - CONFIG += link_pkgconfig --PKGCONFIG += libtorrent -+PKGCONFIG += rblibtorrent - QT += network - - DEFINES += QT_NO_CAST_TO_ASCII diff --git a/source/xapps-extra/qbittorrent/FrugalBuild b/source/xapps-extra/qbittorrent/FrugalBuild new file mode 100644 index 0000000..a342b38 --- /dev/null +++ b/source/xapps-extra/qbittorrent/FrugalBuild @@ -0,0 +1,34 @@ +# Compiling Time: 0.44 SBU +# Maintainer: crazy + +pkgname=qbittorrent +pkgver=0.9.3 +pkgrel=3 +pkgdesc="A Bittorrent client." +depends=('rblibtorrent>=0.12-4' 'curl>=7.16.1-2' 'python>=2.5' 'libqtgui' 'libqtnetwork') +groups=('xapps-extra') +archs=('i686' 'x86_64') +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +url="http://www.qbittorrent.org/" +source=($source frugalware.patch) +sha1sums=('b8ebe28a3ce6c0d789b50faf56197e8df891191a' \ + '6c7d05d26e65fd615a3cf2a880b05b0f5c1ca958') + +build() +{ + Fcd + Fpatchall + ./configure \ + --with-libtorrent-lib=/usr/lib/libtorrent \ + --with-libtorrent-inc=/usr/include \ + --with-libcurl-lib=/usr/lib \ + --with-libcurl-inc=/usr/include \ + --prefix=/usr \ + --qtdir=/usr \ + --verbose || Fdie + make || Fdie + make INSTALL_ROOT=$Fdestdir install || Fdie +} + +# optimization OK diff --git a/source/xapps-extra/qbittorrent/frugalware.patch b/source/xapps-extra/qbittorrent/frugalware.patch new file mode 100644 index 0000000..c90b51a --- /dev/null +++ b/source/xapps-extra/qbittorrent/frugalware.patch @@ -0,0 +1,52 @@ +diff -Naur qbittorrent-0.9.2/configure qbittorrent-0.9.2-p/configure +--- qbittorrent-0.9.2/configure 2007-04-06 02:39:58.000000000 +0200 ++++ qbittorrent-0.9.2-p/configure 2007-04-15 01:16:48.000000000 +0200 +@@ -295,8 +295,8 @@ + { + public: + qc_libtorrent(Conf *c) : ConfObj(c) {} +- QString name() const { return "libtorrent >= 0.11 (>= 0.12 ADVISED)"; } +- QString shortname() const { return "libtorrent"; } ++ QString name() const { return "rblibtorrent >= 0.11 (>= 0.12 ADVISED)"; } ++ QString shortname() const { return "rblibtorrent"; } + bool exec(){ + QString s; + s = conf->getenv("QC_WITH_LIBTORRENT_INC"); +diff -Naur qbittorrent-0.9.2/qbittorrent.qc qbittorrent-0.9.2-p/qbittorrent.qc +--- qbittorrent-0.9.2/qbittorrent.qc 2007-03-15 16:51:11.000000000 +0100 ++++ qbittorrent-0.9.2-p/qbittorrent.qc 2007-04-15 01:15:00.000000000 +0200 +@@ -5,7 +5,7 @@ + + + +- ++ + + + +diff -Naur qbittorrent-0.9.2/qcm/libtorrent.qcm qbittorrent-0.9.2-p/qcm/libtorrent.qcm +--- qbittorrent-0.9.2/qcm/libtorrent.qcm 2007-04-06 02:39:58.000000000 +0200 ++++ qbittorrent-0.9.2-p/qcm/libtorrent.qcm 2007-04-15 01:20:31.000000000 +0200 +@@ -9,8 +9,8 @@ + { + public: + qc_libtorrent(Conf *c) : ConfObj(c) {} +- QString name() const { return "libtorrent >= 0.11 (>= 0.12 ADVISED)"; } +- QString shortname() const { return "libtorrent"; } ++ QString name() const { return "rblibtorrent >= 0.11 (>= 0.12 ADVISED)"; } ++ QString shortname() const { return "rblibtorrent"; } + bool exec(){ + QString s; + s = conf->getenv("QC_WITH_LIBTORRENT_INC"); +diff -Naur qbittorrent-0.9.2/src/src.pro qbittorrent-0.9.2-p/src/src.pro +--- qbittorrent-0.9.2/src/src.pro 2007-04-10 23:02:47.000000000 +0200 ++++ qbittorrent-0.9.2-p/src/src.pro 2007-04-15 01:21:13.000000000 +0200 +@@ -29,7 +29,7 @@ + QMAKE_CXXFLAGS_DEBUG += -fwrapv + #LIBS += -lcurl + CONFIG += link_pkgconfig +-PKGCONFIG += libtorrent ++PKGCONFIG += rblibtorrent + QT += network + + DEFINES += QT_NO_CAST_TO_ASCII From vmiklos at frugalware.org Wed Nov 7 20:10:05 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 20:10:08 2007 Subject: [Frugalware-git] pacman-tools: Makefile: cleanup, use a2x Message-ID: <20071107191005.38F5611901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=f391093375b0e28854e34699387305c4a1ff0f8a commit f391093375b0e28854e34699387305c4a1ff0f8a Author: Miklos Vajna Date: Wed Nov 7 01:26:05 2007 +0100 Makefile: cleanup, use a2x diff --git a/Makefile b/Makefile index 84f57c0..3a696c8 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,6 @@ man8dir = /usr/share/man/man8 sysconfdir = /etc docdir = /usr/share/doc/pacman-tools-$(VERSION) FINCDIR = $(shell source /usr/lib/frugalware/fwmakepkg; echo $$Fincdir) -XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2 DOCS = $(wildcard *.txt) $(wildcard syncpkgd/*.txt) $(wildcard mkiso/*.txt) MANS = $(subst .txt,.1,$(DOCS)) @@ -99,10 +98,5 @@ apidocs: %.html: %.txt asciidoc $^ -%.xml: %.txt - asciidoc -d manpage -b docbook $^ - sed -i '/ Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=0cd64fc3ae1400bb9bca6d1713c716dcab1bd635 commit 0cd64fc3ae1400bb9bca6d1713c716dcab1bd635 Author: Miklos Vajna Date: Wed Nov 7 01:29:27 2007 +0100 Makefile: cleanup, use a2x diff --git a/apidoc/Makefile b/apidoc/Makefile index f7759fd..489893b 100644 --- a/apidoc/Makefile +++ b/apidoc/Makefile @@ -44,10 +44,5 @@ clean: prepare: -frugalwareutils.3: - asciidoc -d manpage -b docbook frugalwareutils.txt - sed -i '/ Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=63ea479ac2c36bdbcc7307e187e5e403bf749053 commit 63ea479ac2c36bdbcc7307e187e5e403bf749053 Author: crazy Date: Wed Nov 7 20:18:12 2007 +0100 acetoneiso2-1.96_beta2-1-i686 * Version bump * removed old and added new patch for this DOS stuff diff --git a/source/kde-extra/acetoneiso2/FrugalBuild b/source/kde-extra/acetoneiso2/FrugalBuild index ad3a382..7d52160 100644 --- a/source/kde-extra/acetoneiso2/FrugalBuild +++ b/source/kde-extra/acetoneiso2/FrugalBuild @@ -2,27 +2,28 @@ # Maintainer: crazy pkgname=acetoneiso2 -pkgver=1.95_beta1 +pkgver=1.96_beta2 pkgrel=1 pkgdesc="A feature-rich and complete software application to manage CD/DVD images" -# lol GUI is qt4 and tools uses qt3 apps heh .. -depends=('qt4' 'libxi' 'libstdc++') +depends=('libqtxml' 'libqtgui') rodepends=('7zip' 'cdrdao' 'cdrtools' 'gpg-agent' 'gnupg' \ 'fuseiso' 'kdebase' 'pinentry-qt' 'coreutils' 'dvd+rw-tools') groups=('kde-extra') archs=('i686') replaces=('kcdemu') _F_sourceforge_sep="_" -_F_sourceforge_broken_up2date=1 Finclude sourceforge -source=($source no-DOS-that-WAY.patch) +up2date="lynx -dump 'http://www.acetoneteam.org/download.html'|grep -m1 'LATEST VERSION'|sed 's/.*].*SO2 v\(.*\)/\1/;s/ /_/'" +## yepp I know is just for this releases like this so don't touch please. +source=(http://mesh.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-v1.96-beta2.tar.gz \ + fix-DOS-again.patch) url="http://www.acetoneteam.org/central.html" -sha1sums=('5c92876aff48b22eb9e5f2e69a97dcb432c49cb4' \ - '4c413369c0957d3c759e4d8f1d19e3e14c363980') +sha1sums=('5a8aa4a63fbbd081abb6dfcce9c32f12e6f16bfe' \ + '36ac86216cb87319506efa98fe92538f99ac98cd') build() { - Fcd AcetoneISO2 + Fcd $pkgname Fpatchall find . -name ".svn" | xargs rm -rf || Fdie cd src || Fdie diff --git a/source/kde-extra/acetoneiso2/fix-DOS-again.patch b/source/kde-extra/acetoneiso2/fix-DOS-again.patch new file mode 100644 index 0000000..e6a1586 --- /dev/null +++ b/source/kde-extra/acetoneiso2/fix-DOS-again.patch @@ -0,0 +1,24 @@ +diff -Naur acetoneiso2/src/acetoneiso2.pro acetoneiso2-dos60-v2-fix/src/acetoneiso2.pro +--- acetoneiso2/src/acetoneiso2.pro 2007-11-05 15:07:36.000000000 +0100 ++++ acetoneiso2-dos60-v2-fix/src/acetoneiso2.pro 2007-11-07 20:05:06.000000000 +0100 +@@ -21,7 +21,7 @@ + menu.files = menu/* + menu.path = /usr/share/applications + dos.files = dos6.0/* +- dos.path = /opt/acetoneiso/dos6.0 ++ dos.path = /usr/share/acetoneiso/dos6.0 + dmg.files = dmg2img/dmg2img + dmg.path = /usr/bin + INSTALLS += target menuico menu dos dmg +diff -Naur acetoneiso2/src/acetoneiso.cpp acetoneiso2-dos60-v2-fix/src/acetoneiso.cpp +--- acetoneiso2/src/acetoneiso.cpp 2007-11-05 15:08:13.000000000 +0100 ++++ acetoneiso2-dos60-v2-fix/src/acetoneiso.cpp 2007-11-07 20:06:09.000000000 +0100 +@@ -885,7 +885,7 @@ + + void acetoneiso::eldos() + { +-QDir dosDir( "/opt/acetoneiso/dos6.0" ); ++QDir dosDir( "/usr/share/acetoneiso/dos6.0" ); + QString fileName = QFileDialog::getSaveFileName(this, tr("AcetoneISO2::Save ISO file"),QDir::home().path() + "/acetone_bootable" ,tr("Images (*.iso)")); + + if(!fileName.isNull() ) diff --git a/source/kde-extra/acetoneiso2/no-DOS-that-WAY.patch b/source/kde-extra/acetoneiso2/no-DOS-that-WAY.patch deleted file mode 100644 index 998ec83..0000000 --- a/source/kde-extra/acetoneiso2/no-DOS-that-WAY.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Naur AcetoneISO2/src/acetoneiso.cpp AcetoneISO2-no-dos-kthx/src/acetoneiso.cpp ---- AcetoneISO2/src/acetoneiso.cpp 2007-10-24 19:42:13.000000000 +0200 -+++ AcetoneISO2-no-dos-kthx/src/acetoneiso.cpp 2007-10-30 01:04:52.000000000 +0100 -@@ -70,7 +70,7 @@ - connect( actionAbout, SIGNAL( triggered() ), this, SLOT( about() ) ); - connect( actionGeneric_Mount, SIGNAL( triggered() ), this, SLOT( gmount() ) ); - connect( actionGeneric_Umount, SIGNAL( triggered() ), this, SLOT( gumount() ) ); -- connect( actionDOS_Boot, SIGNAL( triggered() ), this, SLOT( eldos() ) ); -+ /* connect( actionDOS_Boot, SIGNAL( triggered() ), this, SLOT( eldos() ) ); */ - connect( actionGeneric_Floppy_Emulation, SIGNAL( triggered() ), this, SLOT( elfloppy() ) ); - connect( actionGeneric_No_Emulation, SIGNAL( triggered() ), this, SLOT( eltorito() ) ); - connect( actionExtract_Boot_Image, SIGNAL( triggered() ), this, SLOT( getboot() ) ); -@@ -882,9 +882,10 @@ - } - } - ///////////////////////////////////////////// -- -+/* - void acetoneiso::eldos() - { -+ - QDir dosDir( QDir::home().path() + "/.acetoneiso/dos6.0" ); - QString fileName = QFileDialog::getSaveFileName(this, tr("AcetoneISO2::Save ISO file"),QDir::home().path() + "/acetone_bootable" ,tr("Images (*.iso)")); - -@@ -895,6 +896,9 @@ - progBarra(); - } - } -+*/ -+ -+/* guys that's broken */ - ///////////////////////////////////////////// - void acetoneiso::elfloppy() - { -diff -Naur AcetoneISO2/src/acetoneiso.h AcetoneISO2-no-dos-kthx/src/acetoneiso.h ---- AcetoneISO2/src/acetoneiso.h 2007-10-24 19:05:24.000000000 +0200 -+++ AcetoneISO2-no-dos-kthx/src/acetoneiso.h 2007-10-30 01:05:47.000000000 +0100 -@@ -41,7 +41,7 @@ - void about(); - void gmount(); - void gumount(); -- void eldos(); -+ /* void eldos(); */ - void elfloppy(); - void eltorito(); - void backupaudio(); -diff -Naur AcetoneISO2/src/acetoneiso.ui AcetoneISO2-no-dos-kthx/src/acetoneiso.ui ---- AcetoneISO2/src/acetoneiso.ui 2007-10-24 19:06:26.000000000 +0200 -+++ AcetoneISO2-no-dos-kthx/src/acetoneiso.ui 2007-10-30 01:33:25.000000000 +0100 -@@ -1509,7 +1509,6 @@ - - El Torito - -- - - - -@@ -1598,14 +1597,6 @@ - Check - - -- -- -- :/images/configure.png -- -- -- DOS Boot -- -- - - - :/images/configure.png -diff -Naur AcetoneISO2/src/acetoneiso2.pro AcetoneISO2-no-dos-kthx/src/acetoneiso2.pro ---- AcetoneISO2/src/acetoneiso2.pro 2007-10-24 18:04:35.000000000 +0200 -+++ AcetoneISO2-no-dos-kthx/src/acetoneiso2.pro 2007-10-30 01:04:52.000000000 +0100 -@@ -20,11 +20,11 @@ - menuico.path = /usr/share/pixmaps - menu.files = menu/* - menu.path = /usr/share/applications -- dos.files = dos6.0/* -- dos.path = ~/.acetoneiso/dos6.0 -+ #dos.files = dos6.0/* -+ #dos.path = ~/.acetoneiso/dos6.0 - dmg.files = dmg2img/dmg2img - dmg.path = /usr/bin -- INSTALLS += target menuico menu dos dmg -+ INSTALLS += target menuico menu dmg - - TRANSLATIONS = locale/acetoneiso_it.ts \ - locale/acetoneiso_fr.ts \ From vmiklos at frugalware.org Wed Nov 7 20:29:39 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 20:29:43 2007 Subject: [Frugalware-git] frugalware-current: docbook-xsl-1.73.0-3-i686 Message-ID: <20071107192939.79E9A11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f05814682f97765ed18149e3a4a6f224746892b commit 1f05814682f97765ed18149e3a4a6f224746892b Author: Miklos Vajna Date: Wed Nov 7 20:29:15 2007 +0100 docbook-xsl-1.73.0-3-i686 fix up enumerations in manpages diff --git a/source/apps/docbook-xsl/FrugalBuild b/source/apps/docbook-xsl/FrugalBuild index 089bed8..c25dbe0 100644 --- a/source/apps/docbook-xsl/FrugalBuild +++ b/source/apps/docbook-xsl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=docbook-xsl pkgver=1.73.0 -pkgrel=2 +pkgrel=3 pkgdesc="XML stylesheets for Docbook-xml transformations." depends=('libxml2' 'libxslt') rodepends=('sed') @@ -19,6 +19,8 @@ sha1sums=('508872e782c4ada3929d43fe10bab73d2e969866' \ build() { Fpatchall Fmkdir usr/share/xml/docbook/xsl/ + # we want * for enumerations, not ˇ + sed -i 's/\\(bu/*/' manpages/* for fn in VERSION common html xhtml javahelp fo template lib manpages highlighting do cp -a $Fsrcdir/$pkgname-$pkgver/$fn $Fdestdir/usr/share/xml/docbook/ From crazy at frugalware.org Wed Nov 7 20:41:31 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 7 20:41:33 2007 Subject: [Frugalware-git] frugalware-current: stellarium-0.9.0-2-i686 Message-ID: <20071107194131.1699E1B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=58c650cf45240457deaef48552bbaf2f0dcf5e59 commit 58c650cf45240457deaef48552bbaf2f0dcf5e59 Author: crazy Date: Wed Nov 7 20:40:23 2007 +0100 stellarium-0.9.0-2-i686 * relbump * fixed qt4 depends() diff --git a/source/xapps-extra/stellarium/FrugalBuild b/source/xapps-extra/stellarium/FrugalBuild index 15ae58e..1d1c82e 100644 --- a/source/xapps-extra/stellarium/FrugalBuild +++ b/source/xapps-extra/stellarium/FrugalBuild @@ -4,12 +4,12 @@ pkgname=stellarium pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="A free open source planetarium for your computer." _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.stellarium.org/" -depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'boost' 'libjpeg' 'qt4') +depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'boost' 'libjpeg' 'libqtopengl') license="GPL" groups=('xapps-extra') archs=('i686') From crazy at frugalware.org Wed Nov 7 21:26:33 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 7 21:26:35 2007 Subject: [Frugalware-git] frugalware-current: texmaker-1.6-3-i686 Message-ID: <20071107202633.308F51B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=148d9226fae8fe613150e7ad5338835d20ae6821 commit 148d9226fae8fe613150e7ad5338835d20ae6821 Author: crazy Date: Wed Nov 7 21:25:38 2007 +0100 texmaker-1.6-3-i686 * relbump * fixed qt4 depends() * and while at it added missing Fdie * and fixed desktop and icon location which * got installed in /usr/share/texmaker/ O_O diff --git a/source/xapps-extra/texmaker/FrugalBuild b/source/xapps-extra/texmaker/FrugalBuild index f1a59cf..e1bcaa6 100644 --- a/source/xapps-extra/texmaker/FrugalBuild +++ b/source/xapps-extra/texmaker/FrugalBuild @@ -3,10 +3,10 @@ pkgname=texmaker pkgver=1.6 -pkgrel=2 +pkgrel=3 pkgdesc="Texmaker is a free LaTeX editor." url="http://www.xm1math.net/texmaker/" -depends=('qt4>=4.3.0') +depends=('libqtgui') rodepends=('xghostscript') groups=('xapps-extra') archs=('i686' 'x86_64') @@ -16,10 +16,14 @@ sha1sums=('8da3a6370214f97b568126439408a7774b017c1d') build() { Fcd - qmake -unix PREFIX=$Fprefix texmaker.pro + Fsed "Icon=.*" "Icon=/usr/share/pixmaps/$pkgname.png" utilities/*desktop* + /usr/bin/qmake -unix PREFIX=$Fprefix texmaker.pro || Fdie Fsed '-Os' '-O2' Makefile Fmake Fmakeinstall INSTALL_ROOT=$Fdestdir + Fmkdir usr/share/{applications,pixmaps} + Fmv usr/share/texmaker/texmaker.desktop usr/share/applications + Fmv usr/share/texmaker/texmaker128x128.png usr/share/pixmaps/$pkgname.png } # optimization OK From vmiklos at frugalware.org Wed Nov 7 22:07:02 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 22:07:04 2007 Subject: [Frugalware-git] vmexam: python: add an example on how to write simple tcp clients/servers Message-ID: <20071107210702.1705C11901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=vmexam.git;a=commitdiff;h=5c4e65a58713973382d62701825227d7891ed42f commit 5c4e65a58713973382d62701825227d7891ed42f Author: Miklos Vajna Date: Wed Nov 7 22:04:52 2007 +0100 python: add an example on how to write simple tcp clients/servers diff --git a/python/server/client.py b/python/server/client.py new file mode 100644 index 0000000..727fca9 --- /dev/null +++ b/python/server/client.py @@ -0,0 +1,16 @@ +import pickle +import socket + +# Connect to the server: +client = socket.socket ( socket.AF_INET, socket.SOCK_STREAM ) +client.connect ( ( 'localhost', 2727 ) ) + +# Retrieve and unpickle the list object: +print pickle.loads ( client.recv ( 1024 ) ) + +# Send some messages: +for x in xrange ( 10 ): + client.send ( 'Hey. ' + str ( x ) + '\n' ) + +# Close the connection +client.close() diff --git a/python/server/client_multi.py b/python/server/client_multi.py new file mode 100644 index 0000000..e4fe828 --- /dev/null +++ b/python/server/client_multi.py @@ -0,0 +1,27 @@ +import pickle +import socket +import threading, time + +# Here's our thread: +class ConnectionThread ( threading.Thread ): + + def run ( self ): + + # Connect to the server: + client = socket.socket ( socket.AF_INET, socket.SOCK_STREAM ) + client.connect ( ( 'localhost', 2727 ) ) + + # Retrieve and unpickle the list object: + print pickle.loads ( client.recv ( 1024 ) ) + + # Send some messages: + for x in range ( 10 ): + client.send ( 'Hey. ' + str ( x ) + '\n' ) + + time.sleep(1) + # Close the connection + client.close() + +# Let's spawn a few threads: +for x in range ( 2 ): + ConnectionThread().start() diff --git a/python/server/server.py b/python/server/server.py new file mode 100644 index 0000000..d3e6189 --- /dev/null +++ b/python/server/server.py @@ -0,0 +1,36 @@ +import pickle +import socket +import threading + +# We'll pickle a list of numbers: +someList = [ 1, 2, 7, 9, 0 ] +pickledList = pickle.dumps ( someList ) + +# Our thread class: +class ClientThread ( threading.Thread ): + + # Override Thread's __init__ method to accept the parameters needed: + def __init__ ( self, channel, details ): + + self.channel = channel + self.details = details + threading.Thread.__init__ ( self ) + + def run ( self ): + + print 'Received connection:', self.details [ 0 ] + self.channel.send ( pickledList ) + for x in xrange ( 10 ): + print self.channel.recv ( 1024 ) + self.channel.close() + print 'Closed connection:', self.details [ 0 ] + +# Set up the server: +server = socket.socket ( socket.AF_INET, socket.SOCK_STREAM ) +server.bind ( ( '', 2727 ) ) +server.listen ( 5 ) + +# Have the server serve "forever": +while True: + channel, details = server.accept() + ClientThread ( channel, details ).start() From vmiklos at frugalware.org Wed Nov 7 22:49:31 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 22:49:41 2007 Subject: [Frugalware-git] frugalware-current: dejavu-ttf-2.21-2-i686 Message-ID: <20071107214931.21FF111901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab39d63a65ca7ca43ab0a59a606ee9df18dcf5f9 commit ab39d63a65ca7ca43ab0a59a606ee9df18dcf5f9 Author: Miklos Vajna Date: Wed Nov 7 22:49:04 2007 +0100 dejavu-ttf-2.21-2-i686 fix up dejavu-ttf.xml diff --git a/source/x11/dejavu-ttf/FrugalBuild b/source/x11/dejavu-ttf/FrugalBuild index eb4b321..f3a40cd 100644 --- a/source/x11/dejavu-ttf/FrugalBuild +++ b/source/x11/dejavu-ttf/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dejavu-ttf pkgver=2.21 -pkgrel=1 +pkgrel=2 pkgdesc="DejaVu fonts" _F_sourceforge_dirname="dejavu" _F_sourceforge_ext=".tar.bz2" @@ -14,6 +14,8 @@ makedepends=('fop-devel') groups=('x11' 'xorg-core' 'xorg-fonts') archs=('i686' 'x86_64') source=($source dejavu-ttf.xml) +sha1sums=('5f3d3362cf4e6fc269f9d429ab9d25d095e8af48' \ + 'e78cf8b8a2484540820629e93f73f794e061eeed') build() { @@ -29,6 +31,3 @@ build() Fmkdir /usr/share/fop Ffilerel *.xml /usr/share/fop } - -sha1sums=('5f3d3362cf4e6fc269f9d429ab9d25d095e8af48' \ - '3578ab6beff7c455e7575006760e5f73c3d05093') diff --git a/source/x11/dejavu-ttf/dejavu-ttf.xml b/source/x11/dejavu-ttf/dejavu-ttf.xml index 1da1fe5..4cb0a29 100644 --- a/source/x11/dejavu-ttf/dejavu-ttf.xml +++ b/source/x11/dejavu-ttf/dejavu-ttf.xml @@ -1,105 +1,104 @@ - + metrics-file='/usr/share/fop/DejaVuCondensedSans.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSans.ttf'> + - + metrics-file='/usr/share/fop/DejaVuCondensedSansBold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSansBold.ttf'> + - + metrics-file='/usr/share/fop/DejaVuCondensedSansBoldOblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSansBoldOblique.ttf'> + - + metrics-file='/usr/share/fop/DejaVuCondensedSansOblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSansOblique.ttf'> + - + metrics-file='/usr/share/fop/DejaVuCondensedSerif.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSerif.ttf'> + - + metrics-file='/usr/share/fop/DejaVuCondensedSerifBold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSerifBold.ttf'> + - + metrics-file='/usr/share/fop/DejaVuCondensedSerifBoldItalic.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSerifBoldItalic.ttf'> + - + metrics-file='/usr/share/fop/DejaVuCondensedSerifItalic.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSerifItalic.ttf'> + - + metrics-file='/usr/share/fop/DejaVuMonoSans.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuMonoSans.ttf'> + - + metrics-file='/usr/share/fop/DejaVuMonoSansBold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuMonoSansBold.ttf'> + - + metrics-file='/usr/share/fop/DejaVuMonoSansBoldOblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuMonoSansBoldOblique.ttf'> + - - + metrics-file='/usr/share/fop/DejaVuMonoSansOblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuMonoSansOblique.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSans.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSans.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansBold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansBold.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansBoldOblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansBoldOblique.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSansOblique.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansOblique.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSerif.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerif.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSerifBold.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifBold.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSerifBoldItalic.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifBoldItalic.ttf'> + - + metrics-file='/usr/share/fop/DejaVuSerifItalic.xml' + embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifItalic.ttf'> + From vmiklos at frugalware.org Wed Nov 7 22:59:29 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 22:59:32 2007 Subject: [Frugalware-git] frugalware-current: docbook-xsl-1.73.0-4-i686 Message-ID: <20071107215929.87B6D1B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=15b7e6d7d983982e363e60e5b6c264286a0d3522 commit 15b7e6d7d983982e363e60e5b6c264286a0d3522 Author: Miklos Vajna Date: Wed Nov 7 22:59:18 2007 +0100 docbook-xsl-1.73.0-4-i686 prefer dejavu in fo xsls, the default font does not support most accents diff --git a/source/apps/docbook-xsl/FrugalBuild b/source/apps/docbook-xsl/FrugalBuild index c25dbe0..d7eea81 100644 --- a/source/apps/docbook-xsl/FrugalBuild +++ b/source/apps/docbook-xsl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=docbook-xsl pkgver=1.73.0 -pkgrel=3 +pkgrel=4 pkgdesc="XML stylesheets for Docbook-xml transformations." depends=('libxml2' 'libxslt') rodepends=('sed') @@ -21,6 +21,9 @@ build() { Fmkdir usr/share/xml/docbook/xsl/ # we want * for enumerations, not ˇ sed -i 's/\\(bu/*/' manpages/* + # prefer dejavu in fo, the default font does not support most accents + sed -i 's/sans-serif/DejaVuSans/g' fo/* + sed -i 's/serif/DejaVuSerif/g' fo/* for fn in VERSION common html xhtml javahelp fo template lib manpages highlighting do cp -a $Fsrcdir/$pkgname-$pkgver/$fn $Fdestdir/usr/share/xml/docbook/ From vmiklos at frugalware.org Wed Nov 7 23:06:28 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 23:06:31 2007 Subject: [Frugalware-git] frugalware-current: fop-0.20.5-3-i686 Message-ID: <20071107220628.743421B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=266b73969ddd747fda35993724cfd2336d8d0087 commit 266b73969ddd747fda35993724cfd2336d8d0087 Author: Miklos Vajna Date: Wed Nov 7 23:06:17 2007 +0100 fop-0.20.5-3-i686 - add fop.sh symlink to fop, several external tools use that name - depend on j2re instead of java-gcj-compat, currently it does not work with gcj diff --git a/source/apps-extra/fop/FrugalBuild b/source/apps-extra/fop/FrugalBuild index 95cf837..5a48b7f 100644 --- a/source/apps-extra/fop/FrugalBuild +++ b/source/apps-extra/fop/FrugalBuild @@ -3,10 +3,10 @@ pkgname=fop pkgver=0.20.5 -pkgrel=2 +pkgrel=3 pkgdesc="Formatting Objects Processor is a print formatter driven by XSL" url="http://xmlgraphics.apache.org/fop/" -rodepends=('java-gcj-compat' 'xml-commons-external') +rodepends=('j2re' 'xml-commons-external') groups=('apps-extra') archs=('i686' 'x86_64') # it may be weird to use 'previous', but in fact it seem to be still more @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') # use fop-devel if you need that branch up2date="lynx -dump $url/compliance.html|grep '(previous)'|sed 's/.* \(.*\) (previous).*/\1/;q'" # TODO: build it from source -source=(http://www.apache.org/dist/xmlgraphics/fop/fop-$pkgver-bin.tar.gz) +source=(http://archive.apache.org/dist/xml/fop/fop-$pkgver-bin.tar.gz) signatures=($source.asc) build() @@ -22,6 +22,7 @@ build() Fsed 'build/' '' fop.sh sed '2itest "$FOP_HOME" || FOP_HOME=/usr/share/java/' fop.sh > fop Fexerel /usr/bin/fop + Fln fop /usr/bin/fop.sh Ffilerel lib/*.jar build/*.jar /usr/share/java/ Frm /usr/share/java/xml-apis.jar } From vmiklos at frugalware.org Wed Nov 7 23:20:59 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 23:21:02 2007 Subject: [Frugalware-git] frugalware-current: asciidoc-8.2.3-2-i686 Message-ID: <20071107222059.EEAE11B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f85bd3a40bb9cf4a5e0149a4aeef2acd2b7c97f commit 4f85bd3a40bb9cf4a5e0149a4aeef2acd2b7c97f Author: Miklos Vajna Date: Wed Nov 7 23:20:49 2007 +0100 asciidoc-8.2.3-2-i686 added patch to fix up a2x-generated pdf files diff --git a/source/apps-extra/asciidoc/FrugalBuild b/source/apps-extra/asciidoc/FrugalBuild index 78af5a5..858c2b3 100644 --- a/source/apps-extra/asciidoc/FrugalBuild +++ b/source/apps-extra/asciidoc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=asciidoc pkgver=8.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." url="http://www.methods.co.nz/asciidoc/index.html" depends=() @@ -13,11 +13,14 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.methods.co.nz/asciidoc/downloads.html |Flasttar" source=(http://www.methods.co.nz/asciidoc/asciidoc-$pkgver.tar.gz \ - http://ftp.frugalware.org/pub/other/sources/asciidoc/asciidoc-fonts-0.1.tar.bz2) + http://ftp.frugalware.org/pub/other/sources/asciidoc/asciidoc-fonts-0.1.tar.bz2 \ + a2x-pdf.diff) sha1sums=('c5f245e3cc98fc7785037e27b7002c7f6b071b96' \ - '717779406f876f439ac37c79878f403ecdef3467') + '717779406f876f439ac37c79878f403ecdef3467' \ + 'c235be9105a5cec42d1c19e416b8dc177127017f') build() { + Fpatchall Fmkdir $Fprefix/bin $Fprefix/share/vim Fsed 'BINDIR=/usr/local/bin' "BINDIR=$Fdestdir/$Fprefix/bin" install.sh Fsed 'MANDIR=/usr/local/man' "MANDIR=$Fdestdir/$Fprefix/man" install.sh diff --git a/source/apps-extra/asciidoc/a2x-pdf.diff b/source/apps-extra/asciidoc/a2x-pdf.diff new file mode 100644 index 0000000..cbf745a --- /dev/null +++ b/source/apps-extra/asciidoc/a2x-pdf.diff @@ -0,0 +1,21 @@ +Added 3 small hacks: +* Fix the path of the icon images +* Remove bgcolor, border-right-color and border-bottom-color attributes, they + are not handled by fop +* Handle dejavu fonts +diff -Naur asciidoc-8.2.3.orig/a2x asciidoc-8.2.3/a2x +--- asciidoc-8.2.3.orig/a2x 2007-07-18 10:09:06.000000000 +0200 ++++ asciidoc-8.2.3/a2x 2007-11-07 23:12:33.000000000 +0100 +@@ -513,8 +513,10 @@ + pdf="$DESTINATION_DIR/$SRC_NAME.pdf" + to_docbook + execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet \ +- \"$xsl\" \"$xml\" >\"$fo\"" +- execute_command_2 "fop.sh \"$fo\" \"$pdf\"" ++ \"$xsl\" \"$xml\" \ ++ | sed 's|\(src=\"./images/icons/[^\"]\+\).png\"|\1.jpg\"|g' \ ++ | sed 's/bgcolor=\"[^\"]\+\"//g;s/border-right-color=\"\"//g;s/border-bottom-color=\"\"//g' >\"$fo\"" ++ execute_command_2 "fop.sh -c /usr/share/fop/dejavu-ttf.xml \"$fo\" \"$pdf\"" + } + + function to_odt() From vmiklos at frugalware.org Wed Nov 7 23:38:34 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 7 23:38:39 2007 Subject: [Frugalware-git] frugalware-current: docs/Makefile: cleanup, use a2x Message-ID: <20071107223834.885F01B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b92b461c6dbe400fcd0427f0ce21b922b2f6ef80 commit b92b461c6dbe400fcd0427f0ce21b922b2f6ef80 Author: Miklos Vajna Date: Wed Nov 7 23:35:32 2007 +0100 docs/Makefile: cleanup, use a2x diff --git a/docs/Makefile b/docs/Makefile index a0bc282..0d4fee5 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -108,19 +108,8 @@ images: %.text: %.html lynx -dump $(basename $@).html > $@ -%.xml: %.txt - asciidoc -a toc -a numbered -a sectids -b docbook $(basename $@).txt - sed -i '/ $(basename $@).fo - sed -i 's/sans-serif,Symbol,ZapfDingbats/DejaVuSans/g' $(basename $@).fo - sed -i 's/serif,Symbol,ZapfDingbats/DejaVuSerif/g' $(basename $@).fo - sed -i 's|\(src="./images/icons/[^"]\+\).png"|\1.jpg"|g' $(basename $@).fo - sed -i 's/bgcolor="[^"]\+"//g;s/border-right-color=""//g;s/border-bottom-color=""//g' $(basename $@).fo - -%.pdf: %.fo images - fop -c /usr/share/fop/dejavu-ttf.xml $(basename $@).fo $(basename $@).pdf +%.pdf: %.txt + a2x -a toc -a numbered -a sectids -f pdf $^ %.txt: %.txt.in sed 's/@VERSION@/$(VERSION)/' $(basename $@).txt.in > $@ From vmiklos at frugalware.org Thu Nov 8 00:14:44 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 00:14:48 2007 Subject: [Frugalware-git] frugalware-current: source/include/Makefile: cleanup, use a2x Message-ID: <20071107231444.7825B11901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0bfa5c5709d022075e10a73feeab78d626c1c59 commit b0bfa5c5709d022075e10a73feeab78d626c1c59 Author: Miklos Vajna Date: Thu Nov 8 00:12:34 2007 +0100 source/include/Makefile: cleanup, use a2x diff --git a/source/include/Makefile b/source/include/Makefile index 756e00c..70a4e2e 100644 --- a/source/include/Makefile +++ b/source/include/Makefile @@ -15,8 +15,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -XML_PATH = /usr/share/sgml/docbook/dtd/xml-dtd-4.2 - all: $(subst .sh,.sh.3,$(wildcard *.sh)) fwmakepkg.3 stat: @@ -25,13 +23,8 @@ stat: %.sh.txt: %.sh sed -n 's/^#\( \|$$\)//;/^###/,/^###/p' $^|sed 's/^###//' > $@ -%.xml: %.txt - asciidoc -d manpage -b docbook $^ - sed -i '/ fwmakepkg.txt From vmiklos at frugalware.org Thu Nov 8 00:46:06 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 00:46:09 2007 Subject: [Frugalware-git] fun: updated autogen.sh for pootle usage Message-ID: <20071107234606.06C6911901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=c75113c10720678c65e0bc5c446cd7fafdb26203 commit c75113c10720678c65e0bc5c446cd7fafdb26203 Author: Miklos Vajna Date: Thu Nov 8 00:41:02 2007 +0100 updated autogen.sh for pootle usage diff --git a/autogen.sh b/autogen.sh old mode 100644 new mode 100755 index 7cf73b2..cf4427e --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,63 @@ #!/bin/sh -e +gen_pot() +{ + cd po/ + mv Makevars Makevars.tmp + cp /usr/bin/intltool-extract ./ + intltool-update --pot --gettext-package=fun + rm intltool-extract + mv Makevars.tmp Makevars + cd - >/dev/null +} + +import_pootle() +{ + po_dir=~/git/translations/po + if [ -d $po_dir ]; then + : > po/LINGUAS + for i in $(/bin/ls $po_dir/fun) + do + [ -e $po_dir/fun/$i/fun.po ] || continue + cp $po_dir/fun/$i/fun.po po/$i.po + if msgfmt -c --statistics -o po/$i.gmo po/$i.po; then + echo $i >> po/LINGUAS + else + echo "WARNING: po/$i.po will break your build!" + fi + done + else + echo "WARNING: no po files will be used" + fi +} + +cd `dirname $0` + +if [ "$1" == "--pot-only" ]; then + gen_pot + exit 0 +fi + +if [ "$1" == "--dist" ]; then + ver=`grep AC_INIT configure.ac|sed 's/.*, \([0-9\.]*\), .*/\1/'` + git-archive --format=tar --prefix=fun-$ver/ HEAD | tar xf - + git log --no-merges |git name-rev --tags --stdin > fun-$ver/ChangeLog + cd fun-$ver + ./autogen.sh --git + cd .. + tar czf fun-$ver.tar.gz fun-$ver + rm -rf fun-$ver + gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" \ + -ba -u 20F55619 fun-$ver.tar.gz + #mv gnetconfig-$ver.tar.gz.asc ../.. + exit 0 +fi + +cat /usr/share/aclocal/libtool.m4 >> aclocal.m4 + intltoolize -c -f --automake +import_pootle +gen_pot libtoolize -f -c aclocal --force autoheader -f @@ -9,3 +66,7 @@ cp -f $(dirname $(which automake))/../share/automake/mkinstalldirs ./ cp -f $(dirname $(which automake))/../share/gettext/config.rpath ./ automake -a -c --gnu --foreign +if [ "$1" == "--git" ]; then + rm -rf autom4te.cache +fi + diff --git a/po/Makefile.in.in b/po/Makefile.in.in deleted file mode 100644 index b630d54..0000000 --- a/po/Makefile.in.in +++ /dev/null @@ -1,218 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. -# -# - Modified by Owen Taylor to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -# -# - Modified by Rodney Dawes for use with intltool -# -# We have the following line for use by intltoolize: -# INTLTOOL_MAKEFILE - -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = /bin/sh - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -datarootdir = @datarootdir@ -libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale -subdir = po -install_sh = @install_sh@ -# Automake >= 1.8 provides @mkdir_p@. -# Until it can be supposed, use the safe fallback: -mkdir_p = $(install_sh) -d - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ - -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot - -ALL_LINGUAS = @ALL_LINGUAS@ - -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) - -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) - -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) - -POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) - -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS - -POTFILES = \ -# This comment gets stripped out - -CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) - -.SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) - -install: install-data -install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - $(mkdir_p) $(DESTDIR)$(itlocaledir) - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ - "$$dir/$(GETTEXT_PACKAGE).mo"; \ - fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ - $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as" \ - "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - true; \ - fi; \ - fi; \ - done - -# Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: - -# Define this as empty until I found a useful application. -install-exec installcheck: - -uninstall: - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ - done - -check: all $(GETTEXT_PACKAGE).pot - rm -f missing notexist - srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m - if [ -r missing -o -r notexist ]; then \ - exit 1; \ - fi - -mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp - rm -f .intltool-merge-cache - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES stamp-it - rm -f *.mo *.msg *.cat *.cat.m *.gmo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f Makefile.in.in - -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: $(DISTFILES) - dists="$(DISTFILES)"; \ - extra_dists="$(EXTRA_DISTFILES)"; \ - for file in $$extra_dists; do \ - test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ - done; \ - for file in $$dists; do \ - test -f $$file || file="$(srcdir)/$$file"; \ - ln $$file $(distdir) 2> /dev/null \ - || cp -p $$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot - tmpdir=`pwd`; \ - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - echo "$$lang:"; \ - result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ - if $$result; then \ - if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.gmo failed!"; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi; \ - done - -Makefile POTFILES: stamp-it - @if test ! -f $@; then \ - rm -f stamp-it; \ - $(MAKE) stamp-it; \ - fi - -stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..8167502 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,43 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = gnetconfig + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = ../ + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = \ + --keyword=_ --flag=_:1:pass-c-format \ + --keyword=N_ --flag=N_:1:pass-c-format + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Yoyodyne, Inc. + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = From vmiklos at frugalware.org Thu Nov 8 00:47:55 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 00:47:57 2007 Subject: [Frugalware-git] frugalware-current: genpkgdbs: added fun Message-ID: <20071107234755.9C72E11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a72cea5c358597d9ef14d3c4f28abb78faee9fe commit 8a72cea5c358597d9ef14d3c4f28abb78faee9fe Author: Miklos Vajna Date: Thu Nov 8 00:47:40 2007 +0100 genpkgdbs: added fun diff --git a/tools/genpkgdbs b/tools/genpkgdbs index d4cfad0..e38de7d 100755 --- a/tools/genpkgdbs +++ b/tools/genpkgdbs @@ -61,6 +61,7 @@ make -C /home/ftp/pub/other/fwlive/po pot /home/ftp/pub/other/pacman-g2/pacman-g2/autogen.sh --gettext-only --pot-only make -C /home/ftp/pub/other/frugalwareutils/frugalwareutils pot sudo -u priyank /home/ftp/pub/other/fw-control-center/fw-control-center/gnetconfig/autogen.sh --pot-only +sudo -u priyank /home/ftp/pub/other/fun/fun/autogen.sh --pot-only sudo -u priyank /home/ftp/pub/other/fw-control-center/fw-control-center/gnetconfig-mcs-plugin/autogen.sh --pot-only sudo -u priyank /home/ftp/pub/other/fw-control-center/fw-control-center/gfpm-mcs-plugin/autogen.sh --pot-only sudo -u priyank /home/ftp/pub/other/gfpm/gfpm/autogen.sh --pot-only From vmiklos at frugalware.org Thu Nov 8 00:52:59 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 00:53:00 2007 Subject: [Frugalware-git] pacman-tools: pootle-update: added fun Message-ID: <20071107235259.5AECF11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=198b5b8d46bf75aaadc9e29748c3a1a32e5671b8 commit 198b5b8d46bf75aaadc9e29748c3a1a32e5671b8 Author: Miklos Vajna Date: Thu Nov 8 00:52:46 2007 +0100 pootle-update: added fun diff --git a/pootle-update b/pootle-update index 16f6978..f22e40e 100644 --- a/pootle-update +++ b/pootle-update @@ -35,6 +35,7 @@ rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/xco rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/xwmconfig/po/xwmconfig.pot frugalwareutils/templates/xwmconfig.pot rsync rsync://rsync.frugalware.org/pub/other/fw-control-center/fw-control-center/gnetconfig/po/gnetconfig.pot fwcontrolcenter/templates/gnetconfig.pot rsync rsync://rsync.frugalware.org/pub/other/fw-control-center/fw-control-center/gnetconfig-mcs-plugin/po/gnetconfig-mcs-plugin.pot fwcontrolcenter/templates/gnetconfig-mcs-plugin.pot +rsync rsync://rsync.frugalware.org/pub/other/fun/fun/po/fun.pot fun/templates/fun.pot rsync rsync://rsync.frugalware.org/pub/other/fw-control-center/fw-control-center/gfpm-mcs-plugin/po/gfpm-mcs-plugin.pot fwcontrolcenter/templates/gfpm-mcs-plugin.pot rsync rsync://rsync.frugalware.org/pub/other/gfpm/gfpm/po/gfpm.pot gfpm/templates/gfpm.pot echo "done." From crazy at frugalware.org Thu Nov 8 00:53:19 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 00:53:21 2007 Subject: [Frugalware-git] frugalware-current: lyx-1.5.2-1-i686 Message-ID: <20071107235319.E350011901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f8a84921aa9613b22a7f386d388a60f2f1d0b5d2 commit f8a84921aa9613b22a7f386d388a60f2f1d0b5d2 Author: crazy Date: Thu Nov 8 00:49:58 2007 +0100 lyx-1.5.2-1-i686 * Version bump * added install script , we need run texhash * on install/upgrade/remove * added boost patch * use make all * fixed depends() for qt4 diff --git a/source/xapps-extra/lyx/FrugalBuild b/source/xapps-extra/lyx/FrugalBuild index a401696..8903b12 100644 --- a/source/xapps-extra/lyx/FrugalBuild +++ b/source/xapps-extra/lyx/FrugalBuild @@ -2,22 +2,33 @@ # Maintainer: Bence Nagy pkgname=lyx -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="An advanced open-source document processor based on TeX" url='http://www.lyx.org' -depends=('qt4' 'tetex' 'python' 'perl' 'imagemagick' 'libgcc' 'aspell') +depends=('tetex' 'python' 'perl' 'imagemagick' 'aspell' 'libqtgui' 'boost' 'aspell') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') -up2date="lynx -dump 'http://lyx.cybermirror.org/stable/?N=D'|grep -m1 'lyx-[0-9]'| sed 's/.*-\(.*\).t.*/\1/'" -source=(http://lyx.cybermirror.org/stable/$pkgname-$pkgver.tar.bz2) -sha1sums=('d6fab5c00afe35fdafb6104fbd74d76107438367') +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') build() { - Fbuild --with-frontend=qt4 --enable-pch --with-included-boost + Fcd + Fpatchall + Fautoreconf + Fconf \ + --with-frontend=qt4 \ + --enable-pch \ + --without-included-boost + ##--with-included-boost + make all || Fdie + Fmakeinstall Fdesktop "$pkgname" "/usr/share/lyx/images/lyx.xpm" "Application;Office;" } diff --git a/source/xapps-extra/lyx/boost.patch b/source/xapps-extra/lyx/boost.patch new file mode 100644 index 0000000..b73d630 --- /dev/null +++ b/source/xapps-extra/lyx/boost.patch @@ -0,0 +1,18 @@ +diff -Naur lyx-1.5.2/config/common.am lyx-1.5.2-p/config/common.am +--- lyx-1.5.2/config/common.am 2006-04-20 22:44:05.000000000 +0200 ++++ lyx-1.5.2-p/config/common.am 2007-11-07 23:53:12.000000000 +0100 +@@ -36,10 +36,10 @@ + BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la + else + BOOST_INCLUDES = +-BOOST_FILESYSTEM = -lboost_filesystem +-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 + endif + + LIBS = diff --git a/source/xapps-extra/lyx/lyx.install b/source/xapps-extra/lyx/lyx.install new file mode 100644 index 0000000..52e2272 --- /dev/null +++ b/source/xapps-extra/lyx/lyx.install @@ -0,0 +1,20 @@ +post_install() +{ + /usr/bin/texhash +} + +post_upgrade() +{ + post_install +} + +post_remove() +{ + post_install +} + +op=$1 +shift + +$op $* + From crazy at frugalware.org Thu Nov 8 00:59:50 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 00:59:51 2007 Subject: [Frugalware-git] frugalware-current: skype-1.4.0.118-1-i686 Message-ID: <20071107235950.3C01511901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ca9cc1c359ceae9960fd08ddd97d1a981965398 commit 6ca9cc1c359ceae9960fd08ddd97d1a981965398 Author: crazy Date: Thu Nov 8 00:59:35 2007 +0100 skype-1.4.0.118-1-i686 * *piep* *piep* * fixed qt4 depends() and not only these ... diff --git a/source/xapps-extra/skype/FrugalBuild b/source/xapps-extra/skype/FrugalBuild index 720da09..820ec87 100644 --- a/source/xapps-extra/skype/FrugalBuild +++ b/source/xapps-extra/skype/FrugalBuild @@ -6,7 +6,7 @@ pkgver=1.4.0.118 pkgrel=1 pkgdesc="Skype will let you make free calls to your friends all over the world." url="http://skype.com" -rodepends=('qt4' 'gcc' 'libstdc++5' 'libsigc++2') +rodepends=('libstdc++5' 'libsigc++2' 'qt4-qdbus' 'libqtgui' 'libqtnetwork' 'alsa-lib') groups=('xapps-extra') archs=('i686') up2date="lynx -dump http://www.skype.com/download/skype/linux/ | grep Version | sed 's/.*n \(.*\). *for.*/\1/'" From vmiklos at frugalware.org Thu Nov 8 01:18:29 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 01:18:33 2007 Subject: [Frugalware-git] fun: Makefile.am: added po to SUBDIRS Message-ID: <20071108001829.EEE5311901B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=89b6edbf4dc4b31a8cf112d0e08ae7a1d8569a17 commit 89b6edbf4dc4b31a8cf112d0e08ae7a1d8569a17 Author: Miklos Vajna Date: Thu Nov 8 01:13:08 2007 +0100 Makefile.am: added po to SUBDIRS diff --git a/Makefile.am b/Makefile.am index 007992d..07b6054 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src +SUBDIRS = src po dbusdir = $(DBUS_SYS_DIR) dbus_DATA = fund.conf From vmiklos at frugalware.org Thu Nov 8 01:19:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 01:19:26 2007 Subject: [Frugalware-git] frugalware-current: asciidoc.txt: attempt to document how to add a new project Message-ID: <20071108001924.C7CC911901B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dfca4ece33c8125f44f3f513c5db8408e9f34791 commit dfca4ece33c8125f44f3f513c5db8408e9f34791 Author: Miklos Vajna Date: Thu Nov 8 01:13:48 2007 +0100 asciidoc.txt: attempt to document how to add a new project diff --git a/docs/asciidoc.txt b/docs/asciidoc.txt index b460079..a0c0c00 100644 --- a/docs/asciidoc.txt +++ b/docs/asciidoc.txt @@ -201,3 +201,30 @@ $ asciidoc -a toc -a numbered -a sectids network.txt ---- and now you should be able to see your updated translation in the updated HTML. + +== Adding a new project to Pootle + +Well, this happens rarely, and thus a bit undocumented, but here is what +needed: + +* `autogen.sh` should support importing po files from the `translations` + repository and should have a `--pot-only` switch. `gnetconfig` is a good + example. + +* The pot file should be updated daily. Add the project's `autogen.sh` to + -current's `/tools/genpkgdbs`. + +* Run the above command manually once. + +* Add the pot file to `pootle-update` in the `pacman-tools` repository. + +* Run `pootle-update` manually once. + +* Log in to Pootle with administrator rights and create a new project. + +* Add the necessary new languages on the web interface. + +* Translate a few strings for one language and commit. + +* Pull the translations repository locally and verify that you get the expected + results. From crazy at frugalware.org Thu Nov 8 01:23:08 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 01:23:10 2007 Subject: [Frugalware-git] frugalware-current: kdebase-3.5.8-1-i686 Message-ID: <20071108002308.A23AC11901C4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ddb134cab76840f72b8dbd78559b3b44a1ba05c6 commit ddb134cab76840f72b8dbd78559b3b44a1ba05c6 Author: crazy Date: Thu Nov 8 01:20:56 2007 +0100 kdebase-3.5.8-1-i686 * forgot to remove this on bump diff --git a/source/kde/kdebase/post-3.5.7-kdebase-konqueror.diff b/source/kde/kdebase/post-3.5.7-kdebase-konqueror.diff deleted file mode 100644 index 0d6e44e..0000000 --- a/source/kde/kdebase/post-3.5.7-kdebase-konqueror.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- konqueror/konq_combo.cc -+++ konqueror/konq_combo.cc -@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", - "addToCombo(QString,QCString)", data); - } -+ // important security consideration: always display the beginning -+ // of the url rather than its end to prevent spoofing attempts. -+ lineEdit()->setCursorPosition( 0 ); - } - - void KonqCombo::setTemporary( const QString& text ) ---- konqueror/konq_mainwindow.cc -+++ konqueror/konq_mainwindow.cc -@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView * - } - else // no known serviceType, use KonqRun - { -- if ( ( view && view == m_currentView ) || -- ( !view && !req.newTab ) ) // startup with argument -+ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup with argument - { - // Show it for now in the location bar, but we'll need to store it in the view - // later on (can't do it yet since either view == 0 or updateHistoryEntry will be called). -- kdDebug(1202) << "setLocationBarURL : url = " << url << endl; -+ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url << endl; - setLocationBarURL( url ); - } - -@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s - if ( childView ) - { - enableAllActions( true ); -- -- m_pViewManager->setActivePart( childView->part() ); - m_currentView = childView; - } - } ---- konqueror/konq_viewmgr.cc -+++ konqueror/konq_viewmgr.cc -@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan - - void KonqViewManager::emitActivePartChanged() - { -+ // prevent unnecessary multiple calls to slotPartActivated: -+ m_activePartChangedTimer->stop(); - m_pMainWindow->slotPartActivated( activePart() ); - } - From crazy at frugalware.org Thu Nov 8 01:23:08 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 01:23:11 2007 Subject: [Frugalware-git] frugalware-current: qscintilla2-qt3-1.73_2.1-3-i686 Message-ID: <20071108002308.B4B8811901C5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b3e4ee143962d8532d37e9910500f0d16a4b31bd commit b3e4ee143962d8532d37e9910500f0d16a4b31bd Author: crazy Date: Thu Nov 8 01:22:12 2007 +0100 qscintilla2-qt3-1.73_2.1-3-i686 * fix qt4 depends() * added 2 missing Fdie's diff --git a/source/xlib/qscintilla2-qt3/FrugalBuild b/source/xlib/qscintilla2-qt3/FrugalBuild index b0c4908..365969a 100644 --- a/source/xlib/qscintilla2-qt3/FrugalBuild +++ b/source/xlib/qscintilla2-qt3/FrugalBuild @@ -6,7 +6,7 @@ ver1=1.73 ver2=2.1 pkgver=${ver1}_${ver2} origname=QScintilla -pkgrel=2 +pkgrel=3 pkgdesc="QScintilla2 is a port to Qt of Neil Hodgson's Scintilla C++ editor class. (Qt3)" url="http://www.riverbankcomputing.co.uk/qscintilla" license="GPL 2" @@ -15,18 +15,17 @@ source=(http://www.riverbankcomputing.com/Downloads/${origname}2/$origname-$ver1 broken-destdir.patch) groups=('xlib') archs=('i686' 'x86_64') -depends=('qt>=3.3.8-3' 'libstdc++' 'libgl' 'libxmu' 'libxi' 'libxrandr' 'libxcursor' 'libxinerama' 'libxft') -makedepends=('qt4>=4.3.0' 'libxi' 'libstdc++' 'libice' 'libxrender') +depends=('qt>=3.3.8-6' 'libstdc++' 'libgl' 'libxmu' 'libxi' 'libxrandr' 'libxcursor' 'libxinerama' 'libxft') +makedepends=('libxi' 'libstdc++' 'libice' 'libxrender' 'libqtgui') _F_cd_path="$origname-$ver1-gpl-$ver2" sha1sums=('ca9ac61cc3d537d7b53202ff5d8565365c3f8734' \ '72ad3600a69f61134ad20e763542843d938691ee') subpkgs=('qscintilla2-qt4') subdescs=("QScintilla2 is a port to Qt of Neil Hodgson's Scintilla C++ editor class. (Qt4)") -subdepends=('qt4>=4.3.0 libxi libstdc++ libice libxrender') +subdepends=('libqtgui') subgroups=('xlib-extra') subarchs=('i686 x86_64') -suboptions=('force') ## need to force this time '2007.. -> 1.73' does not work without force :/ subconflicts=('qscintilla2') subreplaces=('qscintilla2') subprovides=('qscintilla2') @@ -35,14 +34,12 @@ build() { Fpatchall ## QT4 - source /etc/profile.d/qt4.sh.off - cd Qt4 + cd Qt4 || Fdie /usr/bin/qmake qscintilla.pro || Fdie Fmakeinstall INSTALL_ROOT=$Fdestdir || Fdie Fsplit qscintilla2-qt4 /usr ## QT3 - cd ../Qt3 - source /etc/profile.d/qt.sh + cd ../Qt3 || Fdie /usr/lib/qt/bin/qmake qscintilla.pro || Fdie Fmakeinstall INSTALL_ROOT=$Fdestdir || Fdie Fmkdir usr/lib/qt/translations/qscintilla2 From crazy at frugalware.org Thu Nov 8 01:23:08 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 01:23:12 2007 Subject: [Frugalware-git] frugalware-current: kdebase-3.5.8-1-i686 Message-ID: <20071108002308.945EC11901B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cac4e9aa75f78a08601ef0cd5a330ea76ae8c235 commit cac4e9aa75f78a08601ef0cd5a330ea76ae8c235 Author: crazy Date: Thu Nov 8 01:18:25 2007 +0100 kdebase-3.5.8-1-i686 * use just bash without -ls diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild index 729c886..7b7850b 100644 --- a/source/kde/kdebase/FrugalBuild +++ b/source/kde/kdebase/FrugalBuild @@ -58,10 +58,7 @@ build() Fexe /etc/X11/xinit/xinitrc.kde Ffile /usr/share/autostart/konqy_preload.desktop Ffile /usr/bin/preloadkde - - # Konsole configuration. - Fsed 'Exec=$' 'Exec=bash -ls' $Fdestdir/usr/share/apps/konsole/shell.desktop - Fsed 'Exec=$' 'Exec=bash -ls' $Fdestdir/usr/share/apps/konsole/linux.desktop + ## this is annoying Frm usr/share/autostart/ktip.desktop # Session file. From crazy at frugalware.org Thu Nov 8 02:37:30 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 02:37:33 2007 Subject: [Frugalware-git] frugalware-current: pyqt4-4.3.1-2-i686 Message-ID: <20071108013730.D564811901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3bc303a23f4727ff06faf1140fd4a92b4e5e0cce commit 3bc303a23f4727ff06faf1140fd4a92b4e5e0cce Author: crazy Date: Thu Nov 8 02:36:13 2007 +0100 pyqt4-4.3.1-2-i686 * depends() fixed for qt4 * build() cleanup * added TODO ( package need splitting ) diff --git a/source/kde-extra/pyqt4/FrugalBuild b/source/kde-extra/pyqt4/FrugalBuild deleted file mode 100644 index 3ee5879..0000000 --- a/source/kde-extra/pyqt4/FrugalBuild +++ /dev/null @@ -1,37 +0,0 @@ -# Compiling Time: 4.96 SBU -# Maintainer: crazy - -pkgname=pyqt4 -origname=PyQt -pkgver=4.3.1 -pkgrel=1 -pkgdesc="PyQt4 is a set of Python bindings for the Qt4 toolkit." -url="http://www.riverbankcomputing.co.uk/pyqt/index.php" -depends=('qt4>=4.3.1-3' 'sip>=4.7' 'qscintilla2-qt4') -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" -#source=(http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/$origname-x11-gpl-4-snapshot-$pkgver.tar.gz) -license="GPL" -groups=('kde-extra') -archs=('i686' 'x86_64') -options=('force') - -build() -{ - - if [ ! -f /etc/profile.d/qt4.sh.off ]; then - Fmessage "Uhmm something is very wrong , cannot find qt4.sh.. abording!" - Fdie - else - source /etc/profile.d/qt4.sh.off - fi - Fcd $origname-x11-gpl-$pkgver - echo "yes" | python configure.py -q /usr/bin/qmake -j 8 || Fdie - Fmake - Fmakeinstall INSTALL_ROOT=$Fdestdir -} - -sha1sums=('089154ca3126fe0efd3003d998f18b6db29c49b9') - -# optimization OK diff --git a/source/xlib-extra/pyqt4/FrugalBuild b/source/xlib-extra/pyqt4/FrugalBuild new file mode 100644 index 0000000..4e20a3b --- /dev/null +++ b/source/xlib-extra/pyqt4/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 4.96 SBU +# Maintainer: crazy + +pkgname=pyqt4 +origname=PyQt +pkgver=4.3.1 +pkgrel=2 +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') +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" +#source=(http://www.riverbankcomputing.com/Downloads/Snapshots/PyQt4/$origname-x11-gpl-4-snapshot-$pkgver.tar.gz) +license="GPL" +groups=('xlib-extra') +archs=('i686' 'x86_64') +sha1sums=('089154ca3126fe0efd3003d998f18b6db29c49b9') + +## TODO: split it!! + +build() +{ + Fcd $origname-x11-gpl-$pkgver + echo "yes" | python configure.py -q /usr/bin/qmake -j 8 || Fdie + Fmake + Fmakeinstall INSTALL_ROOT=$Fdestdir +} + +# optimization OK From crazy at frugalware.org Thu Nov 8 03:05:06 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 03:05:10 2007 Subject: [Frugalware-git] frugalware-current: qscintilla2-qt3-1.73_2.1-4-i686 Message-ID: <20071108020506.D38E911901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f3d6967a562207d5388ef4eb4840268e35039690 commit f3d6967a562207d5388ef4eb4840268e35039690 Author: crazy Date: Thu Nov 8 03:04:08 2007 +0100 qscintilla2-qt3-1.73_2.1-4-i686 * relbump ( again ) * chroot and this weird mix of py and qt build scripts * need some hacks to get QT{3,4} right :/ diff --git a/source/xlib/qscintilla2-qt3/FrugalBuild b/source/xlib/qscintilla2-qt3/FrugalBuild index 365969a..a99590b 100644 --- a/source/xlib/qscintilla2-qt3/FrugalBuild +++ b/source/xlib/qscintilla2-qt3/FrugalBuild @@ -6,7 +6,7 @@ ver1=1.73 ver2=2.1 pkgver=${ver1}_${ver2} origname=QScintilla -pkgrel=3 +pkgrel=4 pkgdesc="QScintilla2 is a port to Qt of Neil Hodgson's Scintilla C++ editor class. (Qt3)" url="http://www.riverbankcomputing.co.uk/qscintilla" license="GPL 2" @@ -34,11 +34,15 @@ build() { Fpatchall ## QT4 + Q3="$QTDIR" + unset QTDIR + export QTDIR=/usr cd Qt4 || Fdie /usr/bin/qmake qscintilla.pro || Fdie Fmakeinstall INSTALL_ROOT=$Fdestdir || Fdie Fsplit qscintilla2-qt4 /usr ## QT3 + export QTDIR="$Q3" cd ../Qt3 || Fdie /usr/lib/qt/bin/qmake qscintilla.pro || Fdie Fmakeinstall INSTALL_ROOT=$Fdestdir || Fdie From crazy at frugalware.org Thu Nov 8 03:14:33 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 03:14:36 2007 Subject: [Frugalware-git] frugalware-current: qscintilla2-python-qt3-1.73_2.1-3-i686 Message-ID: <20071108021433.85F4311901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=27b42d003628b951999c0f6405376bffd007a836 commit 27b42d003628b951999c0f6405376bffd007a836 Author: crazy Date: Thu Nov 8 03:13:50 2007 +0100 qscintilla2-python-qt3-1.73_2.1-3-i686 * rebuild * fix depends() * build() fixes diff --git a/source/xlib-extra/qscintilla2-python-qt3/FrugalBuild b/source/xlib-extra/qscintilla2-python-qt3/FrugalBuild index f954166..8eea53d 100644 --- a/source/xlib-extra/qscintilla2-python-qt3/FrugalBuild +++ b/source/xlib-extra/qscintilla2-python-qt3/FrugalBuild @@ -6,7 +6,7 @@ ver1=1.73 ver2=2.1 pkgver=${ver1}_${ver2} origname=QScintilla -pkgrel=2 +pkgrel=3 pkgdesc="QScintilla2 python bindings for QT3" url="http://www.riverbankcomputing.co.uk/qscintilla" license="GPL 2" @@ -14,42 +14,43 @@ up2date="lynx -dump $url/download.php|grep -v "gpl-1.7"|grep -m1 'gpl-\(.*\).tar source=(http://www.riverbankcomputing.com/Downloads/${origname}2/$origname-$ver1-gpl-$ver2.tar.gz designer.patch) groups=('xlib-extra') archs=('i686' 'x86_64') -depends=("qscintilla2-qt3=$pkgver-2" 'python' 'libxext' 'libgcc' 'zlib' 'libxrender' \ +depends=("qscintilla2-qt3>=$pkgver-4" 'python' 'libxext' 'libgcc' 'zlib' 'libxrender' \ 'fontconfig' 'libxcb' 'libxxf86vm' 'libxdamage' 'libdrm' 'libxt' 'pyqt') -makedepends=("qscintilla2-qt4=$pkgver-2" 'pyqt4') +makedepends=("qscintilla2-qt4>=$pkgver-4" 'pyqt4>=4.3.1-2') _F_cd_path="$origname-$ver1-gpl-$ver2" sha1sums=('ca9ac61cc3d537d7b53202ff5d8565365c3f8734'\ '3fa781182d6a4868f134dc7931d37b346c946245') subpkgs=('qscintilla2-python-qt4' 'qscintilla2-designer-qt3-plugin' 'qscintilla2-designer-qt4-plugin') subdescs=('QScintilla2 python bindings for QT4' 'QScintilla2 designer plugin for QT3' 'QScintilla2 designer plugin for QT4') -subdepends=("qscintilla2-qt4=$pkgver-2 pyqt4" "qscintilla2-qt3=$pkgver-2" "qscintilla2-qt4=$pkgver-2") +subdepends=("qscintilla2-qt4>=$pkgver-4 pyqt4>=4.3.1-2" "qscintilla2-qt3>=$pkgver-4" "qscintilla2-qt4>=$pkgver-4") subgroups=('xlib-extra' 'xlib-extra' 'xlib-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') build() { - unset QTDIR QMAKESPEC UIC_PATH Fpatchall cp -r Python Python4 || Fdie ## QT4 - source /etc/profile.d/qt4.sh.off - cd designer-Qt4 + Q3="$QTDIR" + unset QTDIR + export QTDIR=/usr + cd designer-Qt4 || Fdie /usr/bin/qmake designer.pro || Fdie Fmakeinstall INSTALL_ROOT=$Fdestdir || Fdie Fsplit qscintilla2-designer-qt4-plugin /usr - cd ../Python4 + cd ../Python4 || Fdie python configure.py -c -j 8 -p 4 -n /usr/include -o /usr/lib || Fdie Fmake Fmakeinstall Fsplit qscintilla2-python-qt4 /usr ## QT3 - cd ../designer-Qt3 - source /etc/profile.d/qt.sh + export QTDIR="$Q3" + cd ../designer-Qt3 || Fdie /usr/lib/qt/bin/qmake designer.pro || Fdie make INSTALL_ROOT=$Fdestdir || Fdie Fsplit qscintilla2-designer-qt3-plugin /usr - cd ../Python + cd ../Python || Fdie python configure.py -c -j 8 -p 3 -n /usr/lib/qt/include -o /usr/lib/qt/lib || Fdie Fmake Fmakeinstall From vmiklos at frugalware.org Thu Nov 8 13:06:09 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 13:06:12 2007 Subject: [Frugalware-git] frugalware-current: gettext-0.17-1-i686 Message-ID: <20071108120609.4D14B11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=43139ac6c3f0981619cdc7095b21fb4cf95aecc2 commit 43139ac6c3f0981619cdc7095b21fb4cf95aecc2 Author: Miklos Vajna Date: Thu Nov 8 13:05:30 2007 +0100 gettext-0.17-1-i686 version bump diff --git a/source/base/gettext/FrugalBuild b/source/base/gettext/FrugalBuild index b69195e..0265660 100644 --- a/source/base/gettext/FrugalBuild +++ b/source/base/gettext/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=gettext -pkgver=0.16.1 +pkgver=0.17 pkgrel=1 pkgdesc="GNU internationalization library" url="http://www.gnu.org/software/gettext" @@ -10,7 +10,7 @@ depends=('glibc') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz -source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) signatures=($source.sig) Fconfopts="$Fconfopts --disable-csharp" # optimization ok From vmiklos at frugalware.org Thu Nov 8 13:18:26 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 13:18:29 2007 Subject: [Frugalware-git] frugalware-current: pciutils-2.2.9-1-i686 Message-ID: <20071108121826.E23571B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a86ea018c776d2143b44043fe00a40ece32a51b commit 8a86ea018c776d2143b44043fe00a40ece32a51b Author: Miklos Vajna Date: Thu Nov 8 13:18:20 2007 +0100 pciutils-2.2.9-1-i686 version bump diff --git a/source/base/pciutils/FrugalBuild b/source/base/pciutils/FrugalBuild index 9f13b39..b4f26d6 100644 --- a/source/base/pciutils/FrugalBuild +++ b/source/base/pciutils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=pciutils -pkgver=2.2.8 +pkgver=2.2.9 pkgrel=1 pkgdesc="PCI utilities" url="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" From vmiklos at frugalware.org Thu Nov 8 13:32:08 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 13:32:12 2007 Subject: [Frugalware-git] pacman-tools: a2x: remove unnecessary -d option Message-ID: <20071108123208.E0BFC1B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=dca1838590131b8183203b1f5ee1292f8b6b3b89 commit dca1838590131b8183203b1f5ee1292f8b6b3b89 Author: Miklos Vajna Date: Thu Nov 8 13:29:38 2007 +0100 a2x: remove unnecessary -d option diff --git a/Makefile b/Makefile index 3a696c8..1085b89 100644 --- a/Makefile +++ b/Makefile @@ -99,4 +99,4 @@ apidocs: asciidoc $^ %.1: %.txt - a2x -d manpage -f manpage $^ + a2x -f manpage $^ From vmiklos at frugalware.org Thu Nov 8 13:33:51 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 13:33:55 2007 Subject: [Frugalware-git] frugalwareutils: a2x: remove unnecessary -d option Message-ID: <20071108123351.2809E1B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=6a7befa6ea7ecdb8d68c6d8ff31504f60b4a0f68 commit 6a7befa6ea7ecdb8d68c6d8ff31504f60b4a0f68 Author: Miklos Vajna Date: Thu Nov 8 13:31:35 2007 +0100 a2x: remove unnecessary -d option diff --git a/apidoc/Makefile b/apidoc/Makefile index 489893b..b4373e7 100644 --- a/apidoc/Makefile +++ b/apidoc/Makefile @@ -45,4 +45,4 @@ clean: prepare: frugalwareutils.3: frugalwareutils.txt - a2x -d manpage -f manpage $^ + a2x -f manpage $^ diff --git a/doc/Makefile b/doc/Makefile index 281d808..77f5171 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -42,4 +42,4 @@ prepare: asciidoc $^ %.1: %.txt - a2x -d manpage -f manpage $^ + a2x -f manpage $^ From vmiklos at frugalware.org Thu Nov 8 13:36:22 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 13:36:24 2007 Subject: [Frugalware-git] frugalware-current: include/Makefile: remove a2x's unnecessary -d option Message-ID: <20071108123622.AC85F1B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e33b2cfc9924d204da12ea1dfabd8b7fc4129d6c commit e33b2cfc9924d204da12ea1dfabd8b7fc4129d6c Author: Miklos Vajna Date: Thu Nov 8 13:33:42 2007 +0100 include/Makefile: remove a2x's unnecessary -d option diff --git a/source/include/Makefile b/source/include/Makefile index 70a4e2e..6cf447e 100644 --- a/source/include/Makefile +++ b/source/include/Makefile @@ -24,7 +24,7 @@ stat: sed -n 's/^#\( \|$$\)//;/^###/,/^###/p' $^|sed 's/^###//' > $@ %.3: %.txt - a2x -d manpage -f manpage $^ + a2x -f manpage $^ fwmakepkg.txt: fwmakepkg.txt.in $(wildcard *.sh) cat fwmakepkg.txt.in > fwmakepkg.txt From crazy at frugalware.org Thu Nov 8 13:41:57 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 13:42:00 2007 Subject: [Frugalware-git] frugalware-current: sip-4.7.1-2-i686 Message-ID: <20071108124157.4CF4C1B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=067ca4dbe4acfbba6b9b873a49acd7d8395ed477 commit 067ca4dbe4acfbba6b9b873a49acd7d8395ed477 Author: crazy Date: Thu Nov 8 13:41:24 2007 +0100 sip-4.7.1-2-i686 * relbump * removed qt from depends * ok @ voroskoi diff --git a/source/xlib/sip/FrugalBuild b/source/xlib/sip/FrugalBuild index 335b063..39b95aa 100644 --- a/source/xlib/sip/FrugalBuild +++ b/source/xlib/sip/FrugalBuild @@ -3,10 +3,10 @@ pkgname=sip pkgver=4.7.1 -pkgrel=1 +pkgrel=2 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=('qt' 'python>=2.5') +depends=('python>=2.5') groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://www.riverbankcomputing.co.uk/sip/download.php |grep sip.*.tar |sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" From vmiklos at frugalware.org Thu Nov 8 13:42:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 13:42:07 2007 Subject: [Frugalware-git] frugalware-current: man-pages-fr-2.50.0-1-i686 Message-ID: <20071108124203.BEEBE1B640E1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ac252f5c1884d5b5401f16819543cff7c0a746c3 commit ac252f5c1884d5b5401f16819543cff7c0a746c3 Author: Miklos Vajna Date: Thu Nov 8 13:41:52 2007 +0100 man-pages-fr-2.50.0-1-i686 version bump diff --git a/source/locale-extra/man-pages-fr/FrugalBuild b/source/locale-extra/man-pages-fr/FrugalBuild index f59af8d..f6c1158 100644 --- a/source/locale-extra/man-pages-fr/FrugalBuild +++ b/source/locale-extra/man-pages-fr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=man-pages-fr -pkgver=2.46.0 +pkgver=2.50.0 pkgrel=1 pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" From vmiklos at frugalware.org Thu Nov 8 15:19:42 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 8 15:19:47 2007 Subject: [Frugalware-git] pacman-g2: converted libpacman manpage to asciidoc Message-ID: <20071108141942.A38211B640E0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1cc0d1ed91fd3efc8f98fa1f02c5f7cf5df1fd05 commit 1cc0d1ed91fd3efc8f98fa1f02c5f7cf5df1fd05 Author: Miklos Vajna Date: Thu Nov 8 15:17:20 2007 +0100 converted libpacman manpage to asciidoc diff --git a/doc/libpacman.3 b/doc/libpacman.3 deleted file mode 100644 index 654e033..0000000 --- a/doc/libpacman.3 +++ /dev/null @@ -1,24 +0,0 @@ -.TH libpacman 3 "6 Apr 2007" "Frugalware Developer Manual" "" -.SH NAME -libpacman \- A .tar.bz2 based package manager library with dependency support -.SH SYNOPSIS -For ease of access, the libpacman manual has been split up into several sections. - -.nf -pacman_databases Database Functions -pacman_dep Dependency Functions -pacman_groups Group Functions -pacman_interface Interface Functions -pacman_list List Functions -pacman_log Logging Functions -pacman_misc Miscellaneous Functions -pacman_options Library Options -pacman_packages Package Functions -pacman_sync Sync Functions -pacman_trans Transaction Functions -.fi - -.SH AUTHOR -.nf -See /usr/share/doc/pacman-g2-*/AUTHORS. -.fi diff --git a/doc/libpacman.txt b/doc/libpacman.txt new file mode 100644 index 0000000..13a3055 --- /dev/null +++ b/doc/libpacman.txt @@ -0,0 +1,29 @@ += libpacman(3) + +== NAME + +libpacman - A .tar.bz2 based package manager library with dependency support + +== SYNOPSIS + +For ease of access, the frugalwareutils manual has been split up into several sections. + +pacman_databases:: Database Functions +pacman_dep:: Dependency Functions +pacman_groups:: Group Functions +pacman_interface:: Interface Functions +pacman_list:: List Functions +pacman_log:: Logging Functions +pacman_misc:: Miscellaneous Functions +pacman_options:: Library Options +pacman_packages:: Package Functions +pacman_sync:: Sync Functions +pacman_trans:: Transaction Functions + +== AUTHORS + +See /usr/share/doc/pacman-g2-*/AUTHORS. + +== REPORTING BUGS + +If you find any bug, then please file a bugreport at . From devil505linux at gmail.com Thu Nov 8 17:23:24 2007 From: devil505linux at gmail.com (Devil505) Date: Thu Nov 8 17:23:26 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-bugbuddy-1.0-1-i686 Message-ID: <20071108162324.4DA7A11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6c6f21b58df3b12d597791c5215e6affddc29b98 commit 6c6f21b58df3b12d597791c5215e6affddc29b98 Author: Devil505 Date: Thu Nov 8 17:22:35 2007 +0100 amsn-plugin-bugbuddy-1.0-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-bugbuddy/FrugalBuild b/source/xapps-extra/amsn-plugin-bugbuddy/FrugalBuild new file mode 100644 index 0000000..2969e66 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-bugbuddy/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-bugbuddy +_F_amsn_name="bugbuddy" +pkgver=1.0 +pkgrel=1 +pkgdesc="A plugin for sending automatic messages to friends." +_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=('230ab8ab60afc7d5fa230f0497f010db35c70db3') \ No newline at end of file diff --git a/source/xapps-extra/amsn-plugin-remind/FrugalBuild b/source/xapps-extra/amsn-plugin-remind/FrugalBuild deleted file mode 100644 index c33cfd3..0000000 --- a/source/xapps-extra/amsn-plugin-remind/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling Time: 0.1 SBU -# Maintainer: Devil505 - -pkgname=amsn-plugin-remind -_F_amsn_name="remind" -pkgver=1.2 -pkgrel=1 -pkgdesc="Shows the last sentences of the previous conversations when opening a new chat window." -_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=('ed51c447140362e1ef6ee16b5a6532f1fed03b46') From crazy at frugalware.org Thu Nov 8 17:28:16 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 17:28:19 2007 Subject: [Frugalware-git] kernelrt: kernel-rt-2.6.23-2-i686 Message-ID: <20071108162816.A5CDF11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelrt.git;a=commitdiff;h=e0f326a2511911e6e16f61babbff44cd5f198787 commit e0f326a2511911e6e16f61babbff44cd5f198787 Author: crazy Date: Thu Nov 8 17:03:35 2007 +0100 kernel-rt-2.6.23-2-i686 * relbump to rt11 diff --git a/source/base-extra/kernel-rt/FrugalBuild b/source/base-extra/kernel-rt/FrugalBuild index 60b29f2..5f370bc 100644 --- a/source/base-extra/kernel-rt/FrugalBuild +++ b/source/base-extra/kernel-rt/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: crazy pkgver=2.6.23 -pkgrel=1 +pkgrel=2 _F_kernel_stable=1 _F_kernel_dontsedarch=1 _F_kernel_name="-rt" -_F_kernel_patches=(http://www.kernel.org/pub/linux/kernel/projects/rt/patch-2.6.23.1-rt5.bz2 \ +_F_kernel_patches=(http://www.kernel.org/pub/linux/kernel/projects/rt/patch-2.6.23.1-rt11.bz2 \ aic7xxx-suspend.patch) Finclude kernel pkgdesc="The Linux Kernel and modules (Real-Time Preempt)" diff --git a/source/base-extra/kernel-rt/config b/source/base-extra/kernel-rt/config index bf19b58..2840aab 100644 --- a/source/base-extra/kernel-rt/config +++ b/source/base-extra/kernel-rt/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.23.1-rt5 -# Sat Nov 3 15:44:04 2007 +# Linux kernel version: 2.6.23.1-rt11 +# Thu Nov 8 04:58:25 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -178,8 +178,8 @@ CONFIG_PREEMPT_HARDIRQS=y CONFIG_PREEMPT_BKL=y # CONFIG_CLASSIC_RCU is not set CONFIG_PREEMPT_RCU=y -# CONFIG_PREEMPT_RCU_BOOST is not set -# CONFIG_RCU_TRACE is not set +CONFIG_PREEMPT_RCU_BOOST=y +CONFIG_RCU_TRACE=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_MCE=y @@ -280,14 +280,8 @@ CONFIG_ACPI_POWER=y CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m -CONFIG_ACPI_SBS=m -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_ALLOW_INTS is not set -CONFIG_APM_REAL_MODE_POWER_OFF=y +# CONFIG_ACPI_SBS is not set +# CONFIG_APM is not set # # CPU Frequency scaling @@ -3312,11 +3306,8 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_NOLOCK=m -CONFIG_GFS2_FS_LOCKING_DLM=m -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y From devil505linux at gmail.com Thu Nov 8 17:37:12 2007 From: devil505linux at gmail.com (Devil505) Date: Thu Nov 8 17:37:15 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-autoreplace-1.0-1-i686 Message-ID: <20071108163712.3234611901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9189c2505d8d491a8c4ac52778c0f77d5c17a1ab commit 9189c2505d8d491a8c4ac52778c0f77d5c17a1ab Author: Devil505 Date: Thu Nov 8 17:35:48 2007 +0100 amsn-plugin-autoreplace-1.0-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-autoreplace/FrugalBuild b/source/xapps-extra/amsn-plugin-autoreplace/FrugalBuild new file mode 100644 index 0000000..345c295 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-autoreplace/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-autoreplace +_F_amsn_name="AutoReplace" +pkgver=1.0 +pkgrel=1 +pkgdesc="Automatic text replacement for the chat window." +_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=('39f4da0d5d69f0da704d563384ede627ee1c8883') From krics at linuxforum.hu Thu Nov 8 17:37:52 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 8 17:38:00 2007 Subject: [Frugalware-git] frugalware-current: perl-archive-zip-1.23-1-x86_64 Message-ID: <20071108163753.D3A5811901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=10b6886dc6e28de4cb422d818ff923f5e742c394 commit 10b6886dc6e28de4cb422d818ff923f5e742c394 Author: Christian Hamar alias krix Date: Thu Nov 8 17:37:31 2007 +0100 perl-archive-zip-1.23-1-x86_64 * Version bump * Fixed SBU diff --git a/source/devel/perl-archive-zip/FrugalBuild b/source/devel/perl-archive-zip/FrugalBuild index 49aa70c..26db1ae 100644 --- a/source/devel/perl-archive-zip/FrugalBuild +++ b/source/devel/perl-archive-zip/FrugalBuild @@ -1,7 +1,7 @@ -# Compiling Time: ~0.1 SBU +# Compiling Time: 0.04 SBU # Maintainer: Christian Hamar alias krix -pkgver=1.22 +pkgver=1.23 pkgrel=1 pkgdesc="Module allows a Perl program to create, manipulate, read, and write Zip archive files." url="http://cpan.org/" @@ -11,4 +11,4 @@ _F_perl_author="A/AD/ADAMK" Finclude perl groups=('devel') archs=('i686' 'x86_64') -sha1sums=('eced1f119518fef83ee50da93e2c809587136106') +sha1sums=('e7c88158fca8e0b043bdf129fec2ea971d2a4cc4') From krics at linuxforum.hu Thu Nov 8 17:41:14 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 8 17:41:18 2007 Subject: [Frugalware-git] frugalware-current: ntfs-3g-1.1104-1-x86_64 Message-ID: <20071108164114.B8D2811901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=387ba2935ba0764a22f72f98426243e065850a90 commit 387ba2935ba0764a22f72f98426243e065850a90 Author: Christian Hamar alias krix Date: Thu Nov 8 17:40:52 2007 +0100 ntfs-3g-1.1104-1-x86_64 * Version bump diff --git a/source/apps-extra/ntfs-3g/FrugalBuild b/source/apps-extra/ntfs-3g/FrugalBuild index 112e721..34ab1af 100644 --- a/source/apps-extra/ntfs-3g/FrugalBuild +++ b/source/apps-extra/ntfs-3g/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=ntfs-3g -pkgver=1.1030 +pkgver=1.1104 pkgrel=1 pkgdesc="Third generation Linux NTFS driver with full read-write access." url="http://www.ntfs-3g.org/" @@ -13,5 +13,5 @@ up2date="lynx -dump $url| grep -m 1 'ntfs-3g-[[:digit:]]\+\.[[:digit:]]\+\.tgz' source=($url/$pkgname-$pkgver.tgz) Fconfopts="$Fconfopts --disable-ldconfig" -sha1sums=('6ea0f88f3955ea47cfd09996c4f087b262823072') +sha1sums=('285d8caedcc535270d31d395419060962357324b') # optimization OK From devil505linux at gmail.com Thu Nov 8 17:44:00 2007 From: devil505linux at gmail.com (Devil505) Date: Thu Nov 8 17:44:02 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-fortune-1.0-1-i686 Message-ID: <20071108164400.7B1B511901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb07d9e42b89b76cc473ce9cc2b234c19fe50ac0 commit bb07d9e42b89b76cc473ce9cc2b234c19fe50ac0 Author: Devil505 Date: Thu Nov 8 17:39:59 2007 +0100 amsn-plugin-fortune-1.0-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-fortune/FrugalBuild b/source/xapps-extra/amsn-plugin-fortune/FrugalBuild new file mode 100644 index 0000000..9fc3cd2 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-fortune/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-fortune +_F_amsn_name="fortune" +pkgver=1.0 +pkgrel=1 +pkgdesc="Sends the person you are talking to a random quote. Extra arguments can be added such as -s and -o." +_F_sourceforge_ext=".zip" +_F_sourceforge_dirname="amsn" +_F_sourceforge_name="$_F_amsn_name" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge amsn +rodepends=('fortune-mod') +archs=('i686') +sha1sums=('be8b4cd849e0cd5b0bd7408ffc8c4fcff69eeb61') From crazy at frugalware.org Thu Nov 8 17:49:42 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 17:49:44 2007 Subject: [Frugalware-git] kernelrt: nvidia-96xx-rt-96.43.01-3-i686 Message-ID: <20071108164942.9D14111901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelrt.git;a=commitdiff;h=c883a368052514bbea20e67ea909329e963afa1e commit c883a368052514bbea20e67ea909329e963afa1e Author: crazy Date: Thu Nov 8 17:48:34 2007 +0100 nvidia-96xx-rt-96.43.01-3-i686 * rebuild diff --git a/source/x11-extra/nvidia-96xx-rt/FrugalBuild b/source/x11-extra/nvidia-96xx-rt/FrugalBuild index 7f030df..f0e3b8d 100644 --- a/source/x11-extra/nvidia-96xx-rt/FrugalBuild +++ b/source/x11-extra/nvidia-96xx-rt/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-96xx-rt 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" replaces=('nvidia-legacy') @@ -22,7 +22,7 @@ source=(http://us.download.nvidia.com/XFree86/Linux-$_arch/$pkgver/NVIDIA-Linux- options=('nostrip' 'nodocs') _F_kernelmod_name="-rt" _F_kernelmod_ver=2.6.23 -_F_kernelmod_rel=1 +_F_kernelmod_rel=2 Finclude kernel-module depends=(${depends[@]} 'xorg-server>=1.1.0' 'pciutils' "nvidia-96xx=96.43.01") # make it depends on nvidia-96xx and just build the kernel mod for -rt From krics at linuxforum.hu Thu Nov 8 17:52:35 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Nov 8 17:52:38 2007 Subject: [Frugalware-git] frugalware-current: glib2-2.14.3-1-x86_64 Message-ID: <20071108165235.A599F11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3e120f253db3ec5c6234dc2540238ec59a79ca11 commit 3e120f253db3ec5c6234dc2540238ec59a79ca11 Author: Christian Hamar alias krix Date: Thu Nov 8 17:51:26 2007 +0100 glib2-2.14.3-1-x86_64 * Version bump diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index 665d870..e3a91c6 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=glib2 -pkgver=2.14.2 +pkgver=2.14.3 pkgrel=1 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/" @@ -19,7 +19,7 @@ source=($source \ glib-cast.patch) _F_cd_path="glib-$pkgver" ## DON'T remove nor change the debug level or it breaks again .. -sha1sums=('0711f1e8abf6a052aa298bcb1350bcf2195da6e4' \ +sha1sums=('3aef290ceaf17379b2fe24d8fdfb5ce6755d5f25' \ '8aa98ec8c7a8aad90d27e6c81a7fee1c686914fe' \ 'a78a870e933a317148e11bffdf5d19c8fe4ac2bd') # Don't touch that From crazy at frugalware.org Thu Nov 8 17:58:36 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 17:58:39 2007 Subject: [Frugalware-git] frugalware-current: Revert "amsn-plugin-bugbuddy-1.0-1-i686" Message-ID: <20071108165836.9D6BB11901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8eccd4b49cf5bf237d70afac117af20e985fe965 commit 8eccd4b49cf5bf237d70afac117af20e985fe965 Author: crazy Date: Thu Nov 8 17:57:36 2007 +0100 Revert "amsn-plugin-bugbuddy-1.0-1-i686" * This reverts broken commit 6c6f21b58df3b12d597791c5215e6affddc29b98. diff --git a/source/xapps-extra/amsn-plugin-bugbuddy/FrugalBuild b/source/xapps-extra/amsn-plugin-bugbuddy/FrugalBuild deleted file mode 100644 index 2969e66..0000000 --- a/source/xapps-extra/amsn-plugin-bugbuddy/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling Time: 0.1 SBU -# Maintainer: Devil505 - -pkgname=amsn-plugin-bugbuddy -_F_amsn_name="bugbuddy" -pkgver=1.0 -pkgrel=1 -pkgdesc="A plugin for sending automatic messages to friends." -_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=('230ab8ab60afc7d5fa230f0497f010db35c70db3') \ No newline at end of file diff --git a/source/xapps-extra/amsn-plugin-remind/FrugalBuild b/source/xapps-extra/amsn-plugin-remind/FrugalBuild new file mode 100644 index 0000000..c33cfd3 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-remind/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-remind +_F_amsn_name="remind" +pkgver=1.2 +pkgrel=1 +pkgdesc="Shows the last sentences of the previous conversations when opening a new chat window." +_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=('ed51c447140362e1ef6ee16b5a6532f1fed03b46') From crazy at frugalware.org Thu Nov 8 18:05:46 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 18:06:00 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-remind-1.2-1-i686 Message-ID: <20071108170546.D57E911901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8d87e7f282ba0110c74e1a20e045e02fc83d155 commit b8d87e7f282ba0110c74e1a20e045e02fc83d155 Author: crazy Date: Thu Nov 8 18:04:04 2007 +0100 amsn-plugin-remind-1.2-1-i686 * removed from tree * closes #2557 diff --git a/source/xapps-extra/amsn-plugin-remind/FrugalBuild b/source/xapps-extra/amsn-plugin-remind/FrugalBuild deleted file mode 100644 index c33cfd3..0000000 --- a/source/xapps-extra/amsn-plugin-remind/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling Time: 0.1 SBU -# Maintainer: Devil505 - -pkgname=amsn-plugin-remind -_F_amsn_name="remind" -pkgver=1.2 -pkgrel=1 -pkgdesc="Shows the last sentences of the previous conversations when opening a new chat window." -_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=('ed51c447140362e1ef6ee16b5a6532f1fed03b46') From crazy at frugalware.org Thu Nov 8 18:10:30 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 18:10:34 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-bugbuddy-1.0-1-i686 Message-ID: <20071108171030.A87DE11901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff2d05b11df9bd876f067ade71ef888f0d524eaf commit ff2d05b11df9bd876f067ade71ef888f0d524eaf Author: crazy Date: Thu Nov 8 18:10:17 2007 +0100 amsn-plugin-bugbuddy-1.0-1-i686 * New package diff --git a/source/xapps-extra/amsn-plugin-bugbuddy/FrugalBuild b/source/xapps-extra/amsn-plugin-bugbuddy/FrugalBuild new file mode 100644 index 0000000..ff5d87c --- /dev/null +++ b/source/xapps-extra/amsn-plugin-bugbuddy/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-bugbuddy +_F_amsn_name="bugbuddy" +pkgver=1.0 +pkgrel=1 +pkgdesc="A plugin for sending automatic messages to friends." +_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=('230ab8ab60afc7d5fa230f0497f010db35c70db3') From crazy at frugalware.org Thu Nov 8 18:58:09 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 18:58:12 2007 Subject: [Frugalware-git] frugalware-current: qca-2.0.0-2-x86_64 Message-ID: <20071108175809.E823B11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=468a7a1e23cf927ae15d9bc0f9838a7185d24368 commit 468a7a1e23cf927ae15d9bc0f9838a7185d24368 Author: crazy Date: Thu Nov 8 18:58:01 2007 +0100 qca-2.0.0-2-x86_64 * relbump * fixed qt4 depends() * removed scriptlet option , not needed for qt4 * removed source of qt4.sh.off does not exist anymore * disabled tests these gets build but not installed * and are not needed diff --git a/source/xlib-extra/qca/FrugalBuild b/source/xlib-extra/qca/FrugalBuild index 26b3747..e750e38 100644 --- a/source/xlib-extra/qca/FrugalBuild +++ b/source/xlib-extra/qca/FrugalBuild @@ -4,21 +4,20 @@ pkgname=qca pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="QCA aims to provide a straightforward and cross-platform crypto API, using Qt datatypes and conventions." url="http://delta.affinix.com/qca/" groups=('xlib-extra') archs=('i686' 'x86_64') license="LGPL 2.1" -depends=('qt4>=4.2') +depends=('libqtcore') source=(http://delta.affinix.com/download/qca/2.0/qca-$pkgver.tar.bz2) up2date="lynx -dump http://delta.affinix.com/download/qca/2.0 |Flasttarbz2" -options=('scriptlet') sha1sums=('5b896647426637e1974703f2950786746408c70b') -build() { - source /etc/profile.d/qt4.sh.off || Fdie - Fmake +build() +{ + Fmake --disable-tests --release Fmakeinstall INSTALL_ROOT=$Fdestdir } From devil505linux at gmail.com Thu Nov 8 19:17:56 2007 From: devil505linux at gmail.com (Devil505) Date: Thu Nov 8 19:17:59 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-openwith-0.2.1-1-i686 Message-ID: <20071108181756.02BF511901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a2af2a5dc8f765711c8184937ac7ee036f52478 commit 4a2af2a5dc8f765711c8184937ac7ee036f52478 Author: Devil505 Date: Thu Nov 8 19:16:46 2007 +0100 amsn-plugin-openwith-0.2.1-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-openwith/FrugalBuild b/source/xapps-extra/amsn-plugin-openwith/FrugalBuild new file mode 100644 index 0000000..01ce99b --- /dev/null +++ b/source/xapps-extra/amsn-plugin-openwith/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-openwith +_F_amsn_name="openwith" +pkgver=0.2.1 +pkgrel=1 +pkgdesc="This adds options to the right-click menu in chatwindows so that you can use up to 5 user specified programs." +_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=('8846c3dece3fa3325a4e535e5ab1673bad7803c7') \ No newline at end of file From crazy at frugalware.org Thu Nov 8 21:59:24 2007 From: crazy at frugalware.org (crazy) Date: Thu Nov 8 21:59:29 2007 Subject: [Frugalware-git] frugalware-current: qt4-4.3.2-2-i686 Message-ID: <20071108205924.7C45211901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8b7695c451d2d25b965ee4b190b7851366b800a commit d8b7695c451d2d25b965ee4b190b7851366b800a Author: crazy Date: Thu Nov 8 21:56:49 2007 +0100 qt4-4.3.2-2-i686 * removed qt4.sh and added QTDIR and QMAKESPECS so qmake.conf * removed dummy patch and added frugalware.patch * disabled sse2 , breaks older CPU's we still support * removed more crap from /mkspecs/ folder diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index 1ab0cf0..a64a06e 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -28,7 +28,7 @@ source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.gz \ qt4config.desktop \ qdbusviewer.desktop \ qtdemo.desktop \ - dummy.patch qt4.sh \ + frugalware.patch \ Trolltech.conf \ apply_patches) sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \ @@ -39,8 +39,7 @@ sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \ '1097be47724cda110a0d099c58a2f2ff6dcacc1e' \ '2099d1e1ef2172369c2b5f51e3dcf88fd66ba38c' \ '7c47da506d5118b87a0cae775886f99fd7de4fd9' \ - '6868adc53c2037a83b0601c92ea39dd3394a8fdf' \ - 'bafdd4d0fe8d2c0caae0720f5f6b9f193d4744e0' \ + '98e3beebe7540262ed2f33d36373650aaca5cf14' \ '2468fea7b127253832148115d5aa9e85b2e0aea6' \ '5a2341286f6d766ab943294aec90a8ad25d0ee1d') @@ -159,7 +158,8 @@ build() -no-separate-debug-info \ -optimized-qmake \ -fast \ - -reduce-relocations || return 1 + -reduce-relocations \ + -no-sse2 || return 1 ## Here we go Fmessage "Running make.." @@ -244,14 +244,15 @@ build() do_install "src/plugins/codecs" do_install "src/$lib" - Fmkdir usr/share/$pkgname/translations etc/{$pkgname,profile.d} + Fmkdir usr/share/$pkgname/translations etc/$pkgname cp -a translations/*.qm $Fdestdir/usr/share/$pkgname/translations || Fdie - cp -a ../qt4.sh $Fdestdir/etc/profile.d/qt4.sh || Fdie cp -a ../Trolltech.conf $Fdestdir/etc/$pkgname/Trolltech.conf || Fdie ## delete things we don't want / need Frm usr/share/$pkgname/mkspecs/{win32*,*bsd*,aix-*,hpux*,darwin*,irix-*,macx*} Frm usr/share/$pkgname/mkspecs/{solaris*,sco*,tru64*,unixware*,hurd*,default*} + Frm usr/share/$pkgname/mkspecs/{linux-{ecc*,icc*,kcc*,lsb*,pgcc,cxx*}} + Frm usr/share/$pkgname/mkspecs/{features/{mac,win32},qws/{solaris*,freebsd*,macx*,linux-{mips*,arm*,ipaq*,zylonite*,cellon*}}} Fln linux-g++ /usr/share/$pkgname/mkspecs/default ## License etc diff --git a/source/xlib-extra/qt4/dummy.patch b/source/xlib-extra/qt4/dummy.patch deleted file mode 100644 index b160579..0000000 --- a/source/xlib-extra/qt4/dummy.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur qt-x11-opensource-src-4.2.0/mkspecs/common/g++.conf qt-x11-opensource-src-4.2.0-p/mkspecs/common/g++.conf ---- qt-x11-opensource-src-4.2.0/mkspecs/common/g++.conf 2006-09-29 16:44:55.000000000 +0200 -+++ qt-x11-opensource-src-4.2.0-p/mkspecs/common/g++.conf 2006-10-05 15:38:30.000000000 +0200 -@@ -11,7 +11,7 @@ - QMAKE_CFLAGS_DEPS += -M - QMAKE_CFLAGS_WARN_ON += -Wall -W - QMAKE_CFLAGS_WARN_OFF += -w --QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += DUMMY - QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC -diff -Naur qt-x11-opensource-src-4.2.0/mkspecs/common/linux.conf qt-x11-opensource-src-4.2.0-p/mkspecs/common/linux.conf ---- qt-x11-opensource-src-4.2.0/mkspecs/common/linux.conf 2006-09-29 16:44:55.000000000 +0200 -+++ qt-x11-opensource-src-4.2.0-p/mkspecs/common/linux.conf 2006-10-05 15:53:38.000000000 +0200 -@@ -3,12 +3,12 @@ - - QMAKE_INCDIR = - QMAKE_LIBDIR = --QMAKE_INCDIR_X11 = /usr/X11R6/include --QMAKE_LIBDIR_X11 = /usr/X11R6/lib -+QMAKE_INCDIR_X11 = /usr/X11/include -+QMAKE_LIBDIR_X11 = /usr/X11/lib - QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] - QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] --QMAKE_INCDIR_OPENGL = /usr/X11R6/include --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+QMAKE_INCDIR_OPENGL = /usr/X11/include -+QMAKE_LIBDIR_OPENGL = /usr/X11/lib - - QMAKE_LIBS = - QMAKE_LIBS_DYNLOAD = -ldl diff --git a/source/xlib-extra/qt4/frugalware.patch b/source/xlib-extra/qt4/frugalware.patch new file mode 100644 index 0000000..40a8c55 --- /dev/null +++ b/source/xlib-extra/qt4/frugalware.patch @@ -0,0 +1,44 @@ +diff -Naur qt-x11-opensource-src-4.3.2/mkspecs/common/g++.conf qt-x11-opensource-src-4.3.2-no-qt4.sh/mkspecs/common/g++.conf +--- qt-x11-opensource-src-4.3.2/mkspecs/common/g++.conf 2007-10-01 15:05:55.000000000 +0200 ++++ qt-x11-opensource-src-4.3.2-no-qt4.sh/mkspecs/common/g++.conf 2007-11-08 21:18:19.000000000 +0100 +@@ -7,7 +7,7 @@ + QMAKE_CFLAGS_DEPS += -M + QMAKE_CFLAGS_WARN_ON += -Wall -W + QMAKE_CFLAGS_WARN_OFF += -w +-QMAKE_CFLAGS_RELEASE += -O2 ++QMAKE_CFLAGS_RELEASE += DUMMY + QMAKE_CFLAGS_DEBUG += -g + QMAKE_CFLAGS_SHLIB += -fPIC + QMAKE_CFLAGS_STATIC_LIB += -fPIC +diff -Naur qt-x11-opensource-src-4.3.2/mkspecs/common/linux.conf qt-x11-opensource-src-4.3.2-no-qt4.sh/mkspecs/common/linux.conf +--- qt-x11-opensource-src-4.3.2/mkspecs/common/linux.conf 2007-10-01 15:05:55.000000000 +0200 ++++ qt-x11-opensource-src-4.3.2-no-qt4.sh/mkspecs/common/linux.conf 2007-11-08 21:18:19.000000000 +0100 +@@ -7,12 +7,12 @@ + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = /usrinclude ++QMAKE_LIBDIR_X11 = /usr/lib + QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] + QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_OPENGL = /usr/include ++QMAKE_LIBDIR_OPENGL = /usr/lib + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +diff -Naur qt-x11-opensource-src-4.3.2/mkspecs/linux-g++/qmake.conf qt-x11-opensource-src-4.3.2-no-qt4.sh/mkspecs/linux-g++/qmake.conf +--- qt-x11-opensource-src-4.3.2/mkspecs/linux-g++/qmake.conf 2007-10-01 15:05:54.000000000 +0200 ++++ qt-x11-opensource-src-4.3.2-no-qt4.sh/mkspecs/linux-g++/qmake.conf 2007-11-08 21:39:36.000000000 +0100 +@@ -7,6 +7,8 @@ + CONFIG += qt warn_on release incremental link_prl + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib ++QMAKESPEC = linux-g++ ++QTDIR = /usr + + include(../common/g++.conf) + include(../common/linux.conf) diff --git a/source/xlib-extra/qt4/qt4.sh b/source/xlib-extra/qt4/qt4.sh deleted file mode 100644 index 7a3b2fa..0000000 --- a/source/xlib-extra/qt4/qt4.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -export QT4DIR=/usr -export QT_XFT=true - From vmiklos at frugalware.org Fri Nov 9 01:59:29 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 01:59:33 2007 Subject: [Frugalware-git] pacman-g2: converted makepkg manpage to asciidoc Message-ID: <20071109005929.AD57711901B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d599f48c483109c7c606ef8d75c7fc4afb4a5cb0 commit d599f48c483109c7c606ef8d75c7fc4afb4a5cb0 Author: Miklos Vajna Date: Fri Nov 9 01:57:12 2007 +0100 converted makepkg manpage to asciidoc diff --git a/doc/makepkg.8 b/doc/makepkg.8 deleted file mode 100644 index e78773d..0000000 --- a/doc/makepkg.8 +++ /dev/null @@ -1,148 +0,0 @@ -.TH makepkg 8 "Feb 23, 2007" "Frugalware Developer Manual" "" -.SH NAME -makepkg \- package build utility -.SH SYNOPSIS -\fBmakepkg [options]\fP -.SH DESCRIPTION -\fBmakepkg\fP will build packages for you. All it needs is -a build-capable linux platform, wget, and some build scripts. The advantage -to a script-based build is that you only really do the work once. Once you -have the build script for a package, you just need to run makepkg and it -will do the rest: download and validate source files, check dependencies, -configure the buildtime settings, build the package, install the package -into a temporary root, make customizations, generate meta-info, and package -the whole thing up for \fBpacman-g2\fP to use. - -\fBmakeworld\fP can be used to rebuild an entire package group or the -entire build tree. See \fBmakeworld --help\fP for syntax. - -.SH OPTIONS -.TP -.B "\-b, \-\-builddeps" -Build missing dependencies from source. When makepkg finds missing build-time or -run-time dependencies, it will look for the dependencies' FrugalBuild files under -$fst_root (set in your /etc/repoman.conf). If it finds them it will -run another copy of makepkg to build and install the missing dependencies. -The child makepkg calls will be made with the \fB-b\fP and \fB-i\fP options. -.TP -.B "\-B, \-\-noccache" -Do not use ccache during build. -.TP -.B "\-c, \-\-clean" -Clean up leftover work files/directories after a successful build. -.TP -.B "\-C, \-\-cleancache" -Used with --chroot cleans up the chroot which means removing unnecessary -packages from it. If used twice, then it removes all source files from -the cache directory and cleans up the full compiler cache to free up diskspace. -.TP -.B "\-d, \-\-nodeps" -Do not perform any dependency checks. This will let you override/ignore any -dependencies required. There's a good chance this option will break the build -process if all of the dependencies aren't installed. -.TP -.B "\-D " -Clean up only one package's compiler cache. (Uses ccache -C.) -.TP -.B "\-e, \-\-noextract" -Do not extract source files. Instead, use whatever already exists in the -src/ directory. This is handy if you want to go into src and manually -patch/tweak code, then make a package out of the result. -.TP -.B "\-f, \-\-force" -\fBmakepkg\fP will not build a package if a \fIpkgname-pkgver-pkgrel-arch.fpm\fP -file already exists in the build directory. You can override this behaviour with -the \fB--force\fP switch. -.TP -.B "\-g, \-\-gensha1" -Download all source files (if required) and use \fIsha1sum\fP to generate sha1 hashes -for each of them. You can then redirect the output into your FrugalBuild for source -validation (makepkg -g >>FrugalBuild). -.TP -.B "\-h, \-\-help" -Output syntax and commandline options. -.TP -.B "\-i, \-\-install" -Install/Upgrade the package after a successful build. -.TP -.B "\-j " -Sets MAKEFLAGS="-j" before building the package. This is useful for overriding -the MAKEFLAGS setting in /etc/makepkg.conf. -.TP -.B "\-l " -Download the package's buildscript before starting the build. This is useful -if you do not want to do a full 'repoman upd' nor want to download manually the -buildscript. -.TP -.B "\-m, \-\-nocolor" -Disable color in output messages -.TP -.B "\-n, \-\-nostrip" -Do not strip binaries and libraries. -.TP -.B "\-o, \-\-nobuild" -Download and extract files only, do not build. -.TP -.B "\-p " -Read the package script \fI\fP instead of the default (\fIFrugalBuild\fP). -.TP -.B "\-r, \-\-rmdeps" -Upon successful build, remove any dependencies installed by makepkg/pacman-g2 during -dependency auto-resolution (using \fB-b\fP or \fB-s\fP). -.TP -.B "\-R, \-\-chroot" -Build the package in a chroot environment. This is the default except if -g or --o is used. -.TP -.B "\-H, \-\-host" -Build the package on the host system. The opposite of the -R option. -.TP -.B "\-s, \-\-syncdeps" -Install missing dependencies using pacman-g2. When makepkg finds missing build-time -or run-time dependencies, it will run pacman-g2 to try and resolve them. If successful, -pacman-g2 will download the missing packages from a package repository and -install them for you. -.TP -.B "\-t " -When building in a chroot (using -R) you may want to build packages for a -version other than the host one. Using this option, it's possible to build -packages for "stable" while the host system is "current" and vica versa. -.TP -.B "\-u, \-\-noup2date" -Do not check for newer version before starting build. Normally makepkg will -prevent you from building obsolete source by mistake. If you know what you are -doing, you can disable this feature with this switch. -.B "\-S, \-\-sudosync" -Install missing dependencies using pacman-g2 and sudo. This is the same as \fB-s\fP -except that makepkg will call pacman-g2 with sudo. This means you don't have to -build as root to use dependency auto-resolution. -.TP -.TP -.B "\-w " -Write the resulting package file to the directory \fI\fP instead of the -current working directory. -.TP -.B "\-\-noconfirm" -When calling pacman-g2 to resolve dependencies or conflicts, makepkg can pass -the \fI--noconfirm\fP option to it so it does not wait for any user -input before proceeding with operations. -.TP -.B "\-\-noprogressbar" -When calling pacman-g2, makepkg can pass the \fI--noprogressbar\fP option to it. -This is useful if one is directing makepkg's output to a non-terminal (ie, a file). - -.SH CONFIGURATION -Configuration options are stored in \fI/etc/makepkg.conf\fP. This file is parsed -as a bash script, so you can export any special compiler flags you wish -to use. This is helpful for building for different architectures, or with -different optimizations. - -\fBNOTE:\fP This does not guarantee that all package Makefiles will use -your exported variables. Some of them are flaky... -.SH "SEE ALSO" -.BR FrugalBuild (8), -.BR pacman-g2 (8) -.SH AUTHOR -.nf -See /usr/share/doc/pacman-g2-*/AUTHORS. -.fi diff --git a/doc/makepkg.txt b/doc/makepkg.txt new file mode 100644 index 0000000..88a0ee1 --- /dev/null +++ b/doc/makepkg.txt @@ -0,0 +1,153 @@ += makepkg(8) + +== NAME + +makepkg - creates pacman-g2 packages + +== SYNOPSIS + +makepkg [options] + +== DESCRIPTION + +makepkg will build packages for you. All it needs is a build-capable Linux +platform, wget, and some build scripts. The advantage to a script-based build +is that you only really do the work once. Once you have the build script for a +package, you just need to run makepkg and it will do the rest: download and +validate source files, check dependencies, configure the build-time settings, +build the package, install the package into a temporary root, make +customizations, generate meta-info, and package the whole thing up for +pacman-g2 to use. + +makeworld can be used to rebuild an entire package group or the entire build +tree. See makeworld --help for syntax. + +== OPTIONS + +-b, --builddeps:: + Build missing dependencies from source. When makepkg finds missing build-time + or run-time dependencies, it will look for the dependencies' FrugalBuild + files under $fst_root (set in your /etc/repoman.conf). If it finds them it will + run another copy of makepkg to build and install the missing dependencies. The + child makepkg calls will be made with the -b and -i options. + +-B, --noccache:: + Do not use ccache during build. + +-c, --clean:: + Clean up leftover work files/directories after a successful build. + +-C, --cleancache:: + Used with --chroot cleans up the chroot which means removing unnecessary + packages from it. If used twice, then it removes all source files from the + cache directory and cleans up the full compiler cache to free up disk space. + +-d, --nodeps:: + Do not perform any dependency checks. This will let you override/ignore any + dependencies required. There's a good chance this option will break the build + process if all of the dependencies aren't installed. + +-D :: + Clean up only one package's compiler cache. (Uses ccache -C.) + +-e, --noextract:: + Do not extract source files. Instead, use whatever already exists in the src/ + directory. This is handy if you want to go into src and manually patch/tweak + code, then make a package out of the result. + +-f, --force:: + makepkg will not build a package if a pkgname-pkgver-pkgrel-arch.fpm file + already exists in the build directory. You can override this behaviour with the + --force switch. + +-g, --gensha1:: + Download all source files (if required) and use sha1sum to generate sha1 hashes + for each of them. + +-h, --help:: + Output syntax and commandline options. + +-i, --install:: + Install/Upgrade the package after a successful build. + +-j :: + Sets MAKEFLAGS="-j" before building the package. This is useful for + overriding the MAKEFLAGS setting in /etc/makepkg.conf. + +-l :: + Download the package's buildscript before starting the build. This is useful if + you do not want to do a full 'repoman upd' nor want to download manually the + buildscript. + +-m, --nocolor:: + Disable color in output messages. + +-n, --nostrip:: + Do not strip binaries and libraries. + +-o, --nobuild:: + Download and extract files only, do not build. + +-p :: + Read the package script instead of the default (FrugalBuild). + +-r, --rmdeps:: + Upon successful build, remove any dependencies installed by makepkg/pacman-g2 + during dependency auto-resolution (using -b or -s). + +-R, --chroot:: + Build the package in a chroot environment. This is the default unless -g or -o + is used. + +-H, --host:: + Build the package on the host system. The opposite of the -R option. + +-s, --syncdeps:: + Install missing dependencies using pacman-g2. When makepkg finds missing + build-time or run-time dependencies, it will run pacman-g2 to try and resolve + them. If successful, pacman-g2 will download the missing packages from a + package repository and install them for you. + +-t :: + When building in a chroot (using -R) you may want to build packages for a + version other than the host one. Using this option, it's possible to build + packages for "stable" while the host system is "current" and vica versa. + +-u, --noup2date:: + Do not check for newer version before starting build. Normally makepkg will + prevent you from building obsolete source by mistake. If you know what you are + doing, you can disable this feature with this switch. -S, --sudosync Install + missing dependencies using pacman-g2 and sudo. This is the same as -s except + that makepkg will call pacman-g2 with sudo. This means you don't have to build + as root to use dependency auto-resolution. + +-w :: + Write the resulting package file to the directory instead of the + current working directory. + +--noconfirm:: + When calling pacman-g2 to resolve dependencies or conflicts, makepkg can pass + the --noconfirm option to it so it does not wait for any user input before + proceeding with operations. + +--noprogressbar:: + When calling pacman-g2, makepkg can pass the --noprogressbar option to it. This + is useful if one is directing makepkg's output to a non-terminal (ie, a file). + +== CONFIGURATION + +Configuration options are stored in /etc/makepkg.conf. This file is parsed as a +bash script, so you can export any special compiler flags you wish to use. This +is helpful for building for different architectures, or with different +optimizations. + +NOTE: This does not guarantee that all package Makefiles will use your exported +variables. Some of them are flaky... + +== SEE ALSO + +*FrugalBuild*(5), *pacman-g2*(8) + +== AUTHORS + +See /usr/share/doc/pacman-g2-*/AUTHORS. From janny at frugalware.org Fri Nov 9 10:43:23 2007 From: janny at frugalware.org (janny) Date: Fri Nov 9 10:43:30 2007 Subject: [Frugalware-git] frugalware-current: gputils-0.13.5-1-i686 Message-ID: <20071109094323.C35E611901B9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=89a26bd81db5066fc683264c07ea6a806d30704d commit 89a26bd81db5066fc683264c07ea6a806d30704d Author: janny Date: Fri Nov 9 10:42:58 2007 +0100 gputils-0.13.5-1-i686 version bump diff --git a/source/lib-extra/gputils/FrugalBuild b/source/lib-extra/gputils/FrugalBuild index 97f4187..9d09a14 100644 --- a/source/lib-extra/gputils/FrugalBuild +++ b/source/lib-extra/gputils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=gputils -pkgver=0.13.4 +pkgver=0.13.5 pkgrel=1 pkgdesc="GPUTILS is a collection of tools for the Microchip(TM) PIC microcontrollers." license="GPL" @@ -10,8 +10,6 @@ depends=('glibc') archs=('i686' 'x86_64') groups=('lib-extra') Finclude sourceforge -sha1sums=('eb9a6553bc9814f94d3b8e5af4b0d41565d9a788') - -# optimalization OK +sha1sums=('4276751399c44eaac3a610ed7e435674aa4437fe') # optimization OK From devil505linux at gmail.com Fri Nov 9 17:19:11 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 9 17:19:14 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-fpsstats-0.9-1-i686 Message-ID: <20071109161911.7FFE611901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bcd3731fa48fca3e3575535ab76416ac518ff5c5 commit bcd3731fa48fca3e3575535ab76416ac518ff5c5 Author: Devil505 Date: Fri Nov 9 17:17:56 2007 +0100 amsn-plugin-fpsstats-0.9-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-fpstats/FrugalBuild b/source/xapps-extra/amsn-plugin-fpstats/FrugalBuild new file mode 100644 index 0000000..f308de2 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-fpstats/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') From devil505linux at gmail.com Fri Nov 9 17:28:28 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 9 17:28:31 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-organize-received-0.4-1-i686 Message-ID: <20071109162828.E541611901AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df334f337a76d66ceefd70432cf2a9b2d018bfe2 commit df334f337a76d66ceefd70432cf2a9b2d018bfe2 Author: Devil505 Date: Fri Nov 9 17:27:30 2007 +0100 amsn-plugin-organize-received-0.4-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-organize-received/FrugalBuild b/source/xapps-extra/amsn-plugin-organize-received/FrugalBuild new file mode 100644 index 0000000..8dae42b --- /dev/null +++ b/source/xapps-extra/amsn-plugin-organize-received/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-organize-received +_F_amsn_name="organize_received" +pkgver=0.4 +pkgrel=1 +pkgdesc="Saves received files by default in a subdirectory of the sender and optionally into another subdirectory of the date." +_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=('b8e5e7e7dd62b94d47c29552f5ff0bfe43710c4e') \ No newline at end of file From devil505linux at gmail.com Fri Nov 9 17:36:13 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 9 17:36:23 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-dualdisplaypicture-0.3-1-i686 Message-ID: <20071109163613.41D2411901B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0c696581d7c479beb07a9953f9473f6e3af07bac commit 0c696581d7c479beb07a9953f9473f6e3af07bac Author: Devil505 Date: Fri Nov 9 17:35:21 2007 +0100 amsn-plugin-dualdisplaypicture-0.3-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-dualdisplaypicture/FrugalBuild b/source/xapps-extra/amsn-plugin-dualdisplaypicture/FrugalBuild new file mode 100644 index 0000000..0c6c231 --- /dev/null +++ b/source/xapps-extra/amsn-plugin-dualdisplaypicture/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-dualdisplaypicture +_F_amsn_name="DualDisplayPicture" +pkgver=0.3 +pkgrel=1 +pkgdesc="This plugin is intended to allow user to see his own DP as well as his contact's DP" +_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=('98a9c01a44049beea5a2abb0ec642c78e3aa58cc') \ No newline at end of file From devil505linux at gmail.com Fri Nov 9 17:43:17 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 9 17:43:18 2007 Subject: [Frugalware-git] frugalware-current: amsn-plugin-drae-1.0-1-i686 Message-ID: <20071109164317.2AE4211901B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=30ca8e02b6534a98b1004673cd0cc6b54bbd0f26 commit 30ca8e02b6534a98b1004673cd0cc6b54bbd0f26 Author: Devil505 Date: Fri Nov 9 17:41:39 2007 +0100 amsn-plugin-drae-1.0-1-i686 *New Package diff --git a/source/xapps-extra/amsn-plugin-drae/FrugalBuild b/source/xapps-extra/amsn-plugin-drae/FrugalBuild new file mode 100644 index 0000000..93d4d1d --- /dev/null +++ b/source/xapps-extra/amsn-plugin-drae/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.1 SBU +# Maintainer: Devil505 + +pkgname=amsn-plugin-drae +_F_amsn_name="drae" +pkgver=1.0 +pkgrel=1 +pkgdesc="Search for the description of the selected word in the Royal Spanish Academy dictionary" +_F_sourceforge_ext=".zip" +_F_sourceforge_dirname="amsn" +_F_sourceforge_name="$_F_amsn_name" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge amsn +rodepends=('lynx') +archs=('i686') +sha1sums=('8ea4929bb59366b4a35a247bbb0e729adf5df124') \ No newline at end of file From devil505linux at gmail.com Fri Nov 9 17:50:31 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 9 17:50:34 2007 Subject: [Frugalware-git] frugalware-current: extreme-tuxracer-0.35-1-i686 Message-ID: <20071109165031.5A29011901B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=28adf74ac9acb074581ca8b2c3c46ffdb0c8f1b1 commit 28adf74ac9acb074581ca8b2c3c46ffdb0c8f1b1 Author: Devil505 Date: Fri Nov 9 17:50:03 2007 +0100 extreme-tuxracer-0.35-1-i686 *New Package diff --git a/source/games-extra/extreme-tuxracer/FrugalBuild b/source/games-extra/extreme-tuxracer/FrugalBuild new file mode 100644 index 0000000..1aa3018 --- /dev/null +++ b/source/games-extra/extreme-tuxracer/FrugalBuild @@ -0,0 +1,31 @@ +# Compiling Time: 1.03 SBU +# Maintainer: Devil505 + +pkgname=extreme-tuxracer +pkgver=0.35 +pkgrel=1 +pkgdesc="High speed arctic racing game based on Tux Racer" +_F_sourceforge_dirname="extremetuxracer" +_F_sourceforge_broken_up2date="1" +Finclude sourceforge +url="http://www.extremetuxracer.com" +depends=('sdl_mixer' 'mesa' 'tcl' 'libpng' 'freetype2') +groups=('games-extra') +archs=('i686') +source=($source etracer.png) +sha1sums=('8c0ece5143915a026cefccedcb30a589dc967897' \ + 'b8a0fc353dbfcb32aa05f6a57893a2636d34fa84') + +_F_desktop_name="Extreme Tux Racer" +_F_desktop_icon="etracer.png" +_F_desktop_exec="etracer" +_F_desktop_categories="Application;Game;ArcadeGame;" + +build() +{ + Fbuild + Ficon etracer.png + Fdesktop2 +} + +# optimization OK diff --git a/source/games-extra/extreme-tuxracer/etracer.png b/source/games-extra/extreme-tuxracer/etracer.png new file mode 100644 index 0000000..6c4aec0 Binary files /dev/null and b/source/games-extra/extreme-tuxracer/etracer.png differ From vmiklos at frugalware.org Fri Nov 9 19:11:14 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 19:11:16 2007 Subject: [Frugalware-git] pacman-g2: README: improve description about what a stable api means for us Message-ID: <20071109181114.47DFB11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=9bde1c36eb10ff121f7de5bb34ade2a704f49c82 commit 9bde1c36eb10ff121f7de5bb34ade2a704f49c82 Author: Miklos Vajna Date: Fri Nov 9 19:08:57 2007 +0100 README: improve description about what a stable api means for us diff --git a/README b/README index 75bbc9c..5933875 100644 --- a/README +++ b/README @@ -29,9 +29,13 @@ Some features that pacman-g2 has over pacman: (September 2007) 2) It provides a configuration file parser (for parsing pacman.conf). 3) It provides support for subpackages, ie. creating more than one binary package using a single build script. - -Pacman-g2 has a stable library API and it has frequent releases (at least one -maintenance release in every 2 months). +4) Localized manpages. +5) Stable library API. This means that we care about keeping the API +backwards-compatible. (Changes like +http://www.archlinux.org/pipermail/pacman-dev/2007-November/009886.html[this] +are +http://www.archlinux.org/pipermail/pacman-dev/2007-November/009893.html[applied] +without any problem by the pacman developers and we don't do so.) Using patches to provide this features modify enough pacman to change its name. Additionally the maintainers of pacman asked us to do so and they have reason. From vmiklos at frugalware.org Fri Nov 9 20:24:09 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 20:24:13 2007 Subject: [Frugalware-git] pacman-g2: converted pacman-g2 manpage to asciidoc Message-ID: <20071109192409.324AD11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=190fbecbdf60c8408b9eecc96870823321b6774f commit 190fbecbdf60c8408b9eecc96870823321b6774f Author: Miklos Vajna Date: Fri Nov 9 20:19:40 2007 +0100 converted pacman-g2 manpage to asciidoc diff --git a/doc/pacman-g2.8 b/doc/pacman-g2.8 deleted file mode 100644 index 47d4f4a..0000000 --- a/doc/pacman-g2.8 +++ /dev/null @@ -1,385 +0,0 @@ -.TH pacman-g2 8 "Feb 23, 2007" "Frugalware User Manual" "" -.SH NAME -pacman-g2 \- package manager utility -.SH SYNOPSIS -\fBpacman-g2 [options] [package] ...\fP -.SH DESCRIPTION -\fBpacman-g2\fP is a \fIpackage management\fP utility that tracks installed -packages on a linux system. It has simple dependency support and the ability -to connect to a remote ftp server and automatically upgrade packages on -the local system. pacman-g2 package are \fIbzipped tar\fP format. -.SH OPERATIONS -.TP -.B "\-A, \-\-add" -Add a package to the system. Package will be uncompressed -into the installation root and the database will be updated. -.TP -.B "\-F, \-\-freshen" -This is like --upgrade except that, unlike --upgrade, this will only -upgrade packages that are already installed on your system. -.TP -.B "\-Q, \-\-query" -Query the package database. This operation allows you to -view installed packages and their files, as well as meta-info -about individual packages (dependencies, conflicts, install date, -build date, size). This can be run against the local package -database or can be used on individual .fpm packages. See -\fBQUERY OPTIONS\fP below. -.TP -.B "\-c, \-\-changelog" -View the changelog of a package. -.TP -.B "\-R, \-\-remove" -Remove a package from the system. Files belonging to the -specified package will be deleted, and the database will -be updated. Most configuration files will be saved with a -\fI.pacsave\fP extension unless the \fB--nosave\fP option was -used. -.TP -.B "\-S, \-\-sync" -Synchronize packages. With this function you can install packages -directly from the ftp servers, complete with all dependencies required -to run the packages. For example, \fBpacman-g2 -S qt\fP will download -qt and all the packages it depends on and install them. You could also use -\fBpacman-g2 -Su\fP to upgrade all packages that are out of date (see below). -.TP -.B "\-U, \-\-upgrade" -Upgrade a package. This is essentially a "remove-then-add" -process. See \fBHANDLING CONFIG FILES\fP for an explanation -on how pacman-g2 takes care of config files. -.TP -.B "\-V, \-\-version" -Display version and exit. -.TP -.B "\-h, \-\-help" -Display syntax for the given operation. If no operation was -supplied then the general syntax is shown. -.SH OPTIONS -.TP -.B "\-d, \-\-nodeps" -Skips all dependency checks. Normally, pacman-g2 will always check -a package's dependency fields to ensure that all dependencies are -installed and there are no package conflicts in the system. This -switch disables these checks. -.TP -.B "\-f, \-\-force" -Bypass file conflict checks, overwriting conflicting files. If the -package that is about to be installed contains files that are already -installed, this option will cause all those files to be overwritten. -This option should be used with care, ideally not at all. -.TP -.B "\-r, \-\-root " -Specify alternative installation root (default is "/"). This -should \fInot\fP be used as a way to install software into -e.g. /usr/local instead of /usr. Instead this should be used -if you want to install a package on a temporary mounted partition, -which is "owned" by another system. By using this option you not only -specify where the software should be installed, but you also -specify which package database to use. -.TP -.B "\-v, \-\-verbose" -Output more status and error messages. -.TP -.B "\-\-config " -Specify an alternate configuration file. -.TP -.B "\-\-noconfirm" -Bypass any and all "Are you sure?" messages. It's not a good idea to do this -unless you want to run pacman-g2 from a script. -.TP -.B "\-\-ask " -Finetune the --noconfirm switch by not answering "yes" to all libpacman -questions, but you are able to specify yes/no for all type of libpacman -questions. The types are the followings: -.nf -The given package is in IgnorePkg. (1) -Replace package foo with bar? (2) -foo conflicts with bar. Remove bar? (4) -Do you want to delete the corrupted package? (8) -Local version is newer. (16) -Local version is up to date. (32) -.fi -Select for what types do you want to answer yes, sum up the values and use the -result as a parameter to this option. -.TP -.B "\-\-noprogressbar" -Do not show a progress bar when downloading files. This can be useful for -scripts that call pacman-g2 and capture the output. -.SH SYNC OPTIONS -.TP -.B "\-c, \-\-clean" -Remove old packages from the cache. When pacman-g2 downloads packages, -it saves them in \fI/var/cache/pacman/pkg\fP. If you need to free up -diskspace, you can remove these packages by using the --clean option. -Using one --clean (or -c) switch will only remove \fIold\fP packages. -Use it twice to remove \fIall\fP packages from the cache. -.TP -.B "\-e, \-\-dependsonly" -Don't install the packages itself, only their dependencies. This can be -handy if you want to install the packages themselves with different -options or from source. -.TP -.B "\-g, \-\-groups" -Display all the members for each package group specified. If no group -names are provided, all groups will be listed. -.TP -.B "\-i, \-\-info" -Display dependency information for a given package. This will search -through all repositories for a matching package and display the -dependencies, conflicts, etc. -.TP -.B "\-l, \-\-list" -List all files in the specified repositories. Multiple repositories can -be specified on the command line. -.TP -.B "\-p, \-\-print-uris" -Print out URIs for each package that will be installed, including any -dependencies that have yet to be installed. These can be piped to a -file and downloaded at a later time, using a program like wget. -.TP -.B "\-s, \-\-search " -This will search each package in the package list for names or descriptions -that contains . -.TP -.B "\-u, \-\-sysupgrade" -Upgrades all packages that are out of date. pacman-g2 will examine every -package installed on the system, and if a newer package exists on the -server it will upgrade. pacman-g2 will present a report of all packages -it wants to upgrade and will not proceed without user confirmation. -Dependencies are automatically resolved at this level and will be -installed/upgraded if necessary. -.TP -.B "\-w, \-\-downloadonly" -Retrieve all packages from the server, but do not install/upgrade anything. -.TP -.B "\-y, \-\-refresh" -Download a fresh copy of the master package list from the ftp server -defined in \fI/etc/pacman.conf\fP. This should typically be used each -time you use \fB--sysupgrade\fP. -.TP -.B "\-\-ignore " -This option functions exactly the same as the \fBIgnorePkg\fP configuration -directive. Sometimes it can be handy to skip some package updates without -having to edit \fIpacman.conf\fP each time. -.SH REMOVE OPTIONS -.TP -.B "\-c, \-\-cascade" -Remove all target packages, as well as all packages that depend on one -or more target packages. This operation is recursive. -.TP -.B "\-k, \-\-keep" -Removes the database entry only. Leaves all files in place. -.TP -.B "\-n, \-\-nosave" -Instructs pacman-g2 to ignore file backup designations. Normally, when -a file is about to be \fIremoved\fP from the system the database is first -checked to see if the file should be renamed to a .pacsave extension. If -\fB--nosave\fP is used, these designations are ignored and the files are -removed. -.TP -.B "\-s, \-\-recursive" -For each target specified, remove it and all its dependencies, provided -that (A) they are not required by other packages; and (B) they were not -explicitly installed by the user. -This option is analagous to a backwards --sync operation. -.SH QUERY OPTIONS -.TP -.B "\-e, \-\-orphans" -List all packages that were installed as a dependency (ie, not -installed explicitly) and are not required by any other -packages. -.TP -.B "\-g, \-\-groups" -Display all groups that a specified package is part of. If no package -names are provided, all groups and members will be listed. -.TP -.B "\-i, \-\-info" -Display information on a given package. If it is used with the \fB-p\fP -option then the .PKGINFO file will be printed. -.TP -.B "\-l, \-\-list" -List all files owned by . Multiple packages can be specified on -the command line. -.TP -.B "\-m, \-\-foreign" -List all packages that were not found in the sync database(s). Typically these -are packages that were downloaded manually and installed with --add. -.TP -.B "\-o, \-\-owns " -Search for the package that owns . -.TP -.B "\-p, \-\-file" -Tells pacman-g2 that the package supplied on the command line is a -file, not an entry in the database. Pacman will decompress the -file and query it. This is useful with \fB--info\fP and \fB--list\fP. -.TP -.B "\-s, \-\-search " -This will search each locally-installed package for names or descriptions -that contains . -.TP -.B "\-t, \-\-test" -Tests the local database, by searching for missing informations. Example: - -.nf -$ pacman-g2 -Qt -:: zip-2.32-1: file list is missing -.fi - -The recommended method in this case is to remove the database entry: - -# rm -rf /var/lib/pacman/local/zip-2.32-1 - -and forcing the reinstall of the package: - -# pacman -Sf zip --noconfirm -.TP -.B "\-\-nointegrity" -Skip the SHA1 integrity check for the downloaded packages. -.SH HANDLING CONFIG FILES -pacman-g2 uses the same logic as rpm to determine action against files -that are designated to be backed up. During an upgrade, it uses 3 -md5 hashes for each backup file to determine the required action: -one for the original file installed, one for the new file that's about -to be installed, and one for the actual file existing on the filesystem. -After comparing these 3 hashes, the follow scenarios can result: -.TP -original=\fBX\fP, current=\fBX\fP, new=\fBX\fP -All three files are the same, so we win either way. Install the new file. -.TP -original=\fBX\fP, current=\fBX\fP, new=\fBY\fP -The current file is un-altered from the original but the new one is -different. Since the user did not ever modify the file, and the new -one may contain improvements/bugfixes, we install the new file. -.TP -original=\fBX\fP, current=\fBY\fP, new=\fBX\fP -Both package versions contain the exact same file, but the one -on the filesystem has been modified since. In this case, we leave -the current file in place. -.TP -original=\fBX\fP, current=\fBY\fP, new=\fBY\fP -The new one is identical to the current one. Win win. Install the new file. -.TP -original=\fBX\fP, current=\fBY\fP, new=\fBZ\fP -All three files are different, so we install the new file with a .pacnew -extension and warn the user, so she can manually move the file into place -after making any necessary customizations. -.SH CONFIGURATION -pacman-g2 will attempt to read \fI/etc/pacman.conf\fP each time it is invoked. This -configuration file is divided into sections or \fIrepositories\fP. Each section -defines a package repository that pacman-g2 can use when searching for packages in ---sync mode. The exception to this is the \fIoptions\fP section, which defines -global options. -.TP -.SH Example: -.RS -.nf -[options] -HoldPkg = pacman-g2 glibc bash coreutils -HoldPkg = chkconfig - -Include = /etc/pacman.d/frugalware-current - -[custom] -Server = file:///home/pkgs - -.fi -.RE -.SH CONFIG: OPTIONS -.TP -.B "DBPath = path/to/db/dir" -Overrides the default location of the toplevel database directory. The default is -\fIvar/lib/pacman\fP. -.TP -.B "CacheDir = path/to/cache/dir" -Overrides the default location of the package cache directory. The default is -\fIvar/cache/pacman\fP. -.TP -.B "HoldPkg = [package] ..." -If a user tries to \fB--remove\fP a package that's listed in HoldPkg, pacman-g2 -will ask for confirmation before proceeding. -.TP -.B "IgnorePkg = [package] ..." -Instructs pacman-g2 to ignore any upgrades for this package when performing a -\fB--sysupgrade\fP. -.TP -.B "UpgradeDelay = " -Upgrade only the packages that are at least days old when -performing a \fB--sysupgrade\fP. -.TP -.B "OldDelay = " -Issue a warning when you install a package, but the local sync database (which -can be upgraded using \fB-Sy\fP) haven't been updated for days. -.TP -.B "MaxTries = " -Try to download packages times. This is useful in case you have a bad -internet connection and your packages often get corrupted during the download. -.TP -.B "Include = " -Include another config file. This config file can include repositories or -general configuration options. -.TP -.B "ProxyServer = [:port]" -If set, pacman-g2 will use this proxy server for all ftp/http transfers. -.TP -.B "XferCommand = /path/to/command %u" -If set, pacman-g2 will use this external program to download all remote files. -All instances of \fB%u\fP will be replaced with the URL to be downloaded. If -present, instances of \fB%o\fP will be replaced with the local filename, plus a -".part" extension, which allows programs like wget to do file resumes properly. - -This option is useful for users who experience problems with pacman-g2's built-in http/ftp -support, or need the more advanced proxy support that comes with utilities like -wget. -.TP -.B "NoPassiveFtp" -Disables passive ftp connections when downloading packages. (aka Active Mode) -.TP -.B "NoUpgrade = [file] ..." -All files listed with a \fBNoUpgrade\fP directive will never be touched during a package -install/upgrade. \fINote:\fP do not include the leading slash when specifying files. -.TP -.B "NoExtract = [file] ..." -All files listed with a \fBNoExtract\fP directive will never be extracted from -a package into the filesystem. This can be useful when you don't want part of -a package to be installed. For example, if your httpd root uses an index.php, -then you would not want the index.html file to be extracted from the apache -package. -.TP -.B "UseSyslog" -Log action messages through syslog(). This will insert pacman-g2 log entries into your -/var/log/messages or equivalent. -.TP -.B "LogFile = /path/to/file" -Log actions directly to a file, usually /var/log/pacman-g2.log. - -.SH CONFIG: REPOSITORIES -Each repository section defines a section name and at least one location where the packages -can be found. The section name is defined by the string within square brackets (eg, the two -above are 'current' and 'custom'). Locations are defined with the \fIServer\fP directive and -follow a URL naming structure. Currently only ftp is supported for remote servers. If you -want to use a local directory, you can specify the full path with a 'file://' prefix, as -shown above. -.SH USING YOUR OWN REPOSITORY -Let's say you have a bunch of custom packages in \fI/home/pkgs\fP and their respective FrugalBuild -files are all in \fI/var/fst/local\fP. All you need to do is generate a compressed package database -in the \fI/home/pkgs\fP directory so pacman-g2 can find it when run with --refresh. - -.RS -.nf -# gensync /var/fst/local /home/pkgs/custom.fdb -.fi -.RE - -The above command will read all FrugalBuild files in /var/fst/local and generate a compressed -database called /home/pkgs/custom.fdb. Note that the database must be of the form -\fI{treename}.fdb\fP, where {treename} is the name of the section defined in the -configuration file. -That's it! Now configure your \fIcustom\fP section in the configuration file as shown in the -config example above. Pacman will now use your package repository. If you add new packages to -the repository, remember to re-generate the database and use pacman-g2's --refresh option. -.SH SEE ALSO -\fBmakepkg\fP is the package-building tool that comes with pacman-g2. -.SH AUTHOR -.nf -See /usr/share/doc/pacman-g2-*/AUTHORS. -.fi diff --git a/doc/pacman-g2.txt b/doc/pacman-g2.txt new file mode 100644 index 0000000..c1a391a --- /dev/null +++ b/doc/pacman-g2.txt @@ -0,0 +1,403 @@ += pacman-g2(8) + +== NAME + +pacman-g2 - package manager utility + +== SYNOPSIS + +pacman-g2 [options] [package] ... + +== DESCRIPTION + +pacman-g2 is a package management utility that tracks installed packages on a +linux system. It has simple dependency support and the ability to connect to a +remote ftp server and automatically upgrade packages on the local system. +pacman-g2 packages are in a bzipped tar format. + +== OPERATIONS + +-A, --add:: + Add a package to the system. Package will be uncompressed into the installation + root and the database will be updated. + +-F, --freshen:: + This is like --upgrade except that, unlike --upgrade, this will only upgrade + packages that are already installed on your system. + +-Q, --query:: + Query the package database. This operation allows you to view installed + packages and their files, as well as meta-info about individual packages + (dependencies, conflicts, install date, build date, size). This can be run + against the local package database or can be used on individual .fpm packages. + See QUERY OPTIONS below. + +-R, --remove:: + Remove a package from the system. Files belonging to the specified package will + be deleted, and the database will be updated. Most configuration files will be + saved with a .pacsave extension unless the --nosave option was used. + +-S, --sync:: + Synchronize packages. With this function you can install packages directly from + the ftp servers, complete with all dependencies required to run the packages. + For example, pacman-g2 -S qt will download qt and all the packages it depends + on and install them. You could also use pacman-g2 -Su to upgrade all packages + that are out of date (see below). + +-U, --upgrade:: + Upgrade a package. This is essentially a "remove-then-add" process. See + HANDLING CONFIG FILES for an explanation on how pacman-g2 takes care of config + files. + +-V, --version:: + Display version and exit. + +-h, --help:: + Display syntax for the given operation. If no operation was supplied then the + general syntax is shown. + +== OPTIONS + +-d, --nodeps:: + Skips all dependency checks. Normally, pacman-g2 will always check a package's + dependency fields to ensure that all dependencies are installed and there are + no package conflicts in the system. This switch disables these checks. + +-f, --force:: + Bypass file conflict checks, overwriting conflicting files. If the package that + is about to be installed contains files that are already installed, this option + will cause all those files to be overwritten. This option should be used with + care, ideally not at all. + +-r, --root :: + Specify alternative installation root (default is "/"). This should not be used + as a way to install software into e.g. /usr/local instead of /usr. Instead this + should be used if you want to install a package on a temporary mounted + partition, which is "owned" by another system. By using this option you not + only specify where the software should be installed, but you also specify which + package database to use. + +-v, --verbose:: + Output more status and error messages. + +--config :: + Specify an alternate configuration file. + +--noconfirm:: + Bypass any and all "Are you sure?" messages. It's not a good idea to do this + unless you want to run pacman-g2 from a script. + +--ask :: + Finetune the --noconfirm switch by not answering "yes" to all libpacman + questions, but you are able to specify yes/no for all type of them. The types + are the followings: + + * The given package is in IgnorePkg. (1) + * Replace package foo with bar? (2) + * foo conflicts with bar. Remove bar? (4) + * Do you want to delete the corrupted package? (8) + * Local version is newer. (16) + * Local version is up to date. (32) + + Select for what types do you want to answer yes, sum up the values and use the + result as a parameter to this option. + +--noprogressbar:: + Do not show a progress bar when downloading files. This can be useful for + scripts that call pacman-g2 and capture the output. + +== SYNC OPTIONS + +-c, --clean:: + Remove old packages from the cache. When pacman-g2 downloads packages, it saves + them in /var/cache/pacman/pkg. If you need to free up diskspace, you can remove + these packages by using the --clean option. Using one --clean (or -c) switch + will only remove old packages. Use it twice to remove all packages from the + cache. + +-e, --dependsonly:: + Don't install the packages itself, only their dependencies. This can be handy + if you want to install the packages themselves with different options or from + source. + +-g, --groups:: + Display all the members for each package group specified. If no group names are + provided, all groups will be listed. + +-i, --info:: + Display dependency information for a given package. This will search through + all repositories for a matching package and display the dependencies, + conflicts, etc. + +-l, --list:: + List all files in the specified repositories. Multiple repositories can be + specified on the command line. + +-p, --print-uris:: + Print out URIs for each package that will be installed, including any + dependencies that have yet to be installed. These can be piped to a file and + downloaded at a later time, using a program like wget. + +-s, --search :: + This will search each package in the package list for names or descriptions + that contains . + +-u, --sysupgrade:: + Upgrades all packages that are out of date. pacman-g2 will examine every + package installed on the system, and if a newer package exists on the server it + will upgrade. pacman-g2 will present a report of all packages it wants to + upgrade and will not proceed without user confirmation. Dependencies are + automatically resolved at this level and will be installed/upgraded if + necessary. + +-w, --downloadonly:: + Retrieve all packages from the server, but do not install/upgrade anything. + +-y, --refresh:: + Download a fresh copy of the master package list from the ftp server defined in + /etc/pacman.conf. This should typically be used each time you use + --sysupgrade. + +--ignore :: + This option functions exactly the same as the IgnorePkg configuration + directive. Sometimes it can be handy to skip some package updates without + having to edit pacman.conf each time. + +== REMOVE OPTIONS + +-c, --cascade:: + Remove all target packages, as well as all packages that depend on one or more + target packages. This operation is recursive. + +-k, --keep:: + Removes the database entry only. Leaves all files in place. + +-n, --nosave:: + Instructs pacman-g2 to ignore file backup designations. Normally, when a file + is about to be removed from the system the database is first checked to see if + the file should be renamed to a .pacsave extension. If --nosave is used, these + designations are ignored and the files are removed. + +-s, --recursive:: + For each target specified, remove it and all its dependencies, provided that + (A) they are not required by other packages; and (B) they were not explicitly + installed by the user. This option is analagous to a backwards --sync + operation. + +== QUERY OPTIONS + +-c, --changelog:: + View the changelog of a package. + +-e, --orphans:: + List all packages that were installed as a dependency (ie, not installed + explicitly) and are not required by any other packages. + +-g, --groups:: + Display all groups that a specified package is part of. If no package names are + provided, all groups and members will be listed. + +-i, --info:: + Display information on a given package. If it is used with the -p option then + the .PKGINFO file will be printed. + +-l, --list:: + List all files owned by . Multiple packages can be specified on the + command line. + +-m, --foreign:: + List all packages that were not found in the sync database(s). Typically these + are packages that were downloaded manually and installed with --add. + +-o, --owns :: + Search for the package that owns a given file or directory. + +-p, --file:: + Tells pacman-g2 that the package supplied on the command line is a file, not an + entry in the database. Pacman will decompress the file and query it. This is + useful with --info and --list. + +-s, --search :: + This will search each locally-installed package for names or descriptions that + contains . + +-t, --test:: + Tests the local database, by searching for missing informations. Example: + + ---- + $ pacman-g2 -Qt + :: zip-2.32-1: file list is missing + ---- + + The recommended method in this case is to remove the database entry: + + ---- + # rm -rf /var/lib/pacman/local/zip-2.32-1 + ---- + + and forcing the reinstall of the package: + + ---- + # pacman-g2 -Sf zip --noconfirm + ---- + +--nointegrity:: + Skip the SHA1 integrity check for the downloaded packages. + +== HANDLING CONFIG FILES + +pacman-g2 uses the same logic as rpm to determine action against files that are +designated to be backed up. During an upgrade, it uses 3 md5 hashes for each +backup file to determine the required action: one for the original file +installed, one for the new file that's about to be installed, and one for the +actual file existing on the filesystem. After comparing these 3 hashes, the +follow scenarios can result: + +original=X, current=X, new=X:: + All three files are the same, so we win either way. Install the new file. + +original=X, current=X, new=Y:: + The current file is un-altered from the original but the new one is different. + Since the user did not ever modify the file, and the new one may contain + improvements/bugfixes, we install the new file. + +original=X, current=Y, new=X:: + Both package versions contain the exact same file, but the one on the + filesystem has been modified since. In this case, we leave the current file in + place. + +original=X, current=Y, new=Y:: + The new one is identical to the current one. Win win. Install the new file. + +original=X, current=Y, new=Z:: + All three files are different, so we install the new file with a .pacnew + extension and warn the user, so she can manually move the file into place after + making any necessary customizations. + +== CONFIGURATION + +pacman-g2 will attempt to read /etc/pacman.conf each time it is invoked. This +configuration file is divided into sections or repositories. Each section +defines a package repository that pacman-g2 can use when searching for packages +in --sync mode. The exception to this is the options section, which defines +global options. + +Example: + +---- +[options] +HoldPkg = pacman-g2 glibc bash coreutils +HoldPkg = chkconfig + +Include = /etc/pacman.d/frugalware-current + +[custom] +Server = file:///home/pkgs +---- + +== CONFIG: OPTIONS + +DBPath = path/to/db/dir:: + Overrides the default location of the toplevel database directory. The default + is var/lib/pacman. + +CacheDir = path/to/cache/dir:: + Overrides the default location of the package cache directory. The default is + var/cache/pacman. + +HoldPkg = [package] ...:: + If a user tries to --remove a package that's listed in HoldPkg, pacman-g2 will + ask for confirmation before proceeding. + +IgnorePkg = [package] ...:: + Instructs pacman-g2 to ignore any upgrades for this package when performing a + --sysupgrade. + +UpgradeDelay = :: + Upgrade only the packages that are at least days old when performing a + --sysupgrade. + +OldDelay = :: + Issue a warning when you install a package, but the local sync database (which + can be upgraded using -Sy) haven't been updated for days. + +MaxTries = :: + Try to download packages times. This is useful in case you have a bad + internet connection and your packages often get corrupted during the download. + +Include = :: + Include another config file. This config file can include repositories or + general configuration options. + +ProxyServer = [:port]:: + If set, pacman-g2 will use this proxy server for all ftp/http transfers. + +XferCommand = /path/to/command %u:: + If set, pacman-g2 will use this external program to download all remote files. + All instances of %u will be replaced with the URL to be downloaded. If present, + instances of %o will be replaced with the local filename, plus a ".part" + extension, which allows programs like wget to do file resumes properly. + + This option is useful for users who experience problems with pacman-g2's + built-in http/ftp support, or need the more advanced proxy support that comes + with utilities like curl. + +NoPassiveFtp:: + Disables passive ftp connections when downloading packages. (aka Active Mode) + +NoUpgrade = [file] ...:: + All files listed with a NoUpgrade directive will never be touched during a + package install/upgrade. + + NOTE: Do not include the leading slash when specifying files. + +NoExtract = [file] ...:: + All files listed with a NoExtract directive will never be extracted from a + package into the filesystem. This can be useful when you don't want part of a + package to be installed. For example, if your httpd root uses an index.php, + then you would not want the index.html file to be extracted from the apache + package. + +UseSyslog:: + Log action messages through *syslog*(2). This will insert pacman-g2 log entries + into your /var/log/messages or equivalent. + +LogFile = /path/to/file:: + Log actions directly to a file, usually /var/log/pacman-g2.log. + +== CONFIG: REPOSITORIES + +Each repository section defines a section name and at least one location where +the packages can be found. The section name is defined by the string within +square brackets (eg, the two above are 'current' and 'custom'). Locations are +defined with the Server directive and follow a URL naming structure. Currently +only ftp is supported for remote servers. If you want to use a local directory, +you can specify the full path with a 'file://' prefix, as shown above. + +== USING YOUR OWN REPOSITORY + +Let's say you have a bunch of custom packages in /home/pkgs and their +respective FrugalBuild files are all in /var/fst/local. All you need to do is +generate a compressed package database in the /home/pkgs directory so pacman-g2 +can find it when run with --refresh. + +---- +# gensync /var/fst/local /home/pkgs/custom.fdb +---- + +The above command will read all FrugalBuild files in /var/fst/local and +generate a compressed database called /home/pkgs/custom.fdb. Note that the +database must be of the form {treename}.fdb, where {treename} is the name of +the section defined in the configuration file. That's it! Now configure your +custom section in the configuration file as shown in the config example above. +Pacman will now use your package repository. If you add new packages to the +repository, remember to re-generate the database and use pacman-g2's --refresh +option. + +== SEE ALSO + +*makepkg*(8) + +== AUTHORS + +See /usr/share/doc/pacman-g2-*/AUTHORS. From vmiklos at frugalware.org Fri Nov 9 20:30:16 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 20:30:20 2007 Subject: [Frugalware-git] pacman-g2: remove files obviously not needed as of asciidoc Message-ID: <20071109193016.EB974176C002@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0a520e2765415e393fd64b399c8246a494015e73 commit 0a520e2765415e393fd64b399c8246a494015e73 Author: Miklos Vajna Date: Fri Nov 9 20:28:00 2007 +0100 remove files obviously not needed as of asciidoc diff --git a/doc/addendum.8.hu b/doc/addendum.8.hu deleted file mode 100644 index 3b5ba0b..0000000 --- a/doc/addendum.8.hu +++ /dev/null @@ -1,3 +0,0 @@ -PO4A-HEADER:mode=after;position=SZERZŐ;beginboundary=.SH -.SH FORDÍTÁS -Dvornik László . diff --git a/doc/hu/Makefile.am b/doc/hu/Makefile.am deleted file mode 100644 index 53f9bff..0000000 --- a/doc/hu/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -AUTOMAKE_OPTIONS=foreign - -mandir = @mandir@/hu -if HAS_PO4A -man_MANS = pacman-g2.8 makepkg.8 FrugalBuild.8 -endif - -$(man_MANS): - -if HAS_PO4A -EXTRA_DIST = pacman-g2.8 makepkg.8 FrugalBuild.8 -endif - -distclean: - rm -f hu/*.8 From vmiklos at frugalware.org Fri Nov 9 21:41:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 21:41:44 2007 Subject: [Frugalware-git] pacman-g2: move po/pot man stuff to the translations repo Message-ID: <20071109204140.4578511901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=40368a9af745d72681da90a9effbfaed431970d4 commit 40368a9af745d72681da90a9effbfaed431970d4 Author: Miklos Vajna Date: Fri Nov 9 20:34:56 2007 +0100 move po/pot man stuff to the translations repo diff --git a/doc/po/hu.po b/doc/po/hu.po deleted file mode 100644 index ac9381b..0000000 --- a/doc/po/hu.po +++ /dev/null @@ -1,2384 +0,0 @@ -# Hungarian translation of pacman. -# Copyright (C) 2006 Free Software Foundation, Inc. -# -msgid "" -msgstr "" -"Project-Id-Version: pacman\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 12:51+0100\n" -"PO-Revision-Date: 2007-04-06 21:06+0200\n" -"Last-Translator: Hungarian \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" - -# type: TH -#: pacman.8:1 -#, no-wrap -msgid "pacman" -msgstr "" - -# type: TH -#: pacman.8:1 -#, no-wrap -msgid "January 21, 2006" -msgstr "2006. január 21." - -# type: TH -#: pacman.8:1 -#, no-wrap -msgid "Frugalware User Manual" -msgstr "Frugalware Felhasználói Kézikönyv" - -# type: SH -#: pacman.8:2 makepkg.8:2 FrugalBuild.8:2 -#, no-wrap -msgid "NAME" -msgstr "NÉV" - -# type: Plain text -#: pacman.8:4 -msgid "pacman - package manager utility" -msgstr "pacman - csomagkezelő segédeszköz" - -# type: SH -#: pacman.8:4 makepkg.8:4 -#, no-wrap -msgid "SYNOPSIS" -msgstr "ÁTTEKINTÉS" - -# type: Plain text -#: pacman.8:6 -msgid "BoperationE [options] EpackageE [package] ...>" -msgstr "BműveletE [opciók] EcsomagE [csomag] ...>" - -# type: SH -#: pacman.8:6 makepkg.8:6 FrugalBuild.8:4 -#, no-wrap -msgid "DESCRIPTION" -msgstr "LEÍRÁS" - -# type: Plain text -#: pacman.8:11 -msgid "" -"B is a I utility that tracks installed packages " -"on a linux system. It has simple dependency support and the ability to " -"connect to a remote ftp server and automatically upgrade packages on the " -"local system. pacman package are I format." -msgstr "" - -# type: SH -#: pacman.8:11 -#, no-wrap -msgid "OPERATIONS" -msgstr "MŰVELETEK" - -# type: TP -#: pacman.8:12 -#, no-wrap -msgid "B<-A, --add>" -msgstr "B<-A, --add>" - -# type: Plain text -#: pacman.8:16 -msgid "" -"Add a package to the system. Package will be uncompressed into the " -"installation root and the database will be updated." -msgstr "" - -# type: TP -#: pacman.8:16 -#, no-wrap -msgid "B<-F, --freshen>" -msgstr "B<-F, --freshen>" - -# type: Plain text -#: pacman.8:20 -msgid "" -"This is like --upgrade except that, unlike --upgrade, this will only upgrade " -"packages that are already installed on your system." -msgstr "" - -# type: TP -#: pacman.8:20 -#, no-wrap -msgid "B<-Q, --query>" -msgstr "B<-Q, --query>" - -# type: Plain text -#: pacman.8:28 -msgid "" -"Query the package database. This operation allows you to view installed " -"packages and their files, as well as meta-info about individual packages " -"(dependencies, conflicts, install date, build date, size). This can be run " -"against the local package database or can be used on individual .fpm " -"packages. See B below." -msgstr "" - -# type: TP -#: pacman.8:28 -#, no-wrap -msgid "B<-c, --changelog>" -msgstr "B<-c, --changelog>" - -# type: Plain text -#: pacman.8:31 -msgid "View the changelog of a package." -msgstr "" - -# type: TP -#: pacman.8:31 -#, no-wrap -msgid "B<-R, --remove>" -msgstr "B<-R, --remove>" - -# type: Plain text -#: pacman.8:38 -msgid "" -"Remove a package from the system. Files belonging to the specified package " -"will be deleted, and the database will be updated. Most configuration files " -"will be saved with a I<.pacsave> extension unless the B<--nosave> option was " -"used." -msgstr "" - -# type: TP -#: pacman.8:38 -#, no-wrap -msgid "B<-S, --sync>" -msgstr "B<-S, --sync>" - -# type: Plain text -#: pacman.8:45 -msgid "" -"Synchronize packages. With this function you can install packages directly " -"from the ftp servers, complete with all dependencies required to run the " -"packages. For example, B will download qt and all the " -"packages it depends on and install them. You could also use B to " -"upgrade all packages that are out of date (see below)." -msgstr "" - -# type: TP -#: pacman.8:45 -#, no-wrap -msgid "B<-U, --upgrade>" -msgstr "B<-U, --upgrade>" - -# type: Plain text -#: pacman.8:50 -msgid "" -"Upgrade a package. This is essentially a \"remove-then-add\" process. See " -"B for an explanation on how pacman takes care of " -"config files." -msgstr "" - -# type: TP -#: pacman.8:50 -#, no-wrap -msgid "B<-V, --version>" -msgstr "B<-V, --version>" - -# type: Plain text -#: pacman.8:53 -msgid "Display version and exit." -msgstr "" - -# type: TP -#: pacman.8:53 makepkg.8:61 -#, no-wrap -msgid "B<-h, --help>" -msgstr "" - -# type: Plain text -#: pacman.8:57 -msgid "" -"Display syntax for the given operation. If no operation was supplied then " -"the general syntax is shown." -msgstr "" - -# type: SH -#: pacman.8:57 makepkg.8:19 -#, no-wrap -msgid "OPTIONS" -msgstr "OPCIÓK" - -# type: TP -#: pacman.8:58 makepkg.8:38 -#, no-wrap -msgid "B<-d, --nodeps>" -msgstr "" - -# type: Plain text -#: pacman.8:64 -msgid "" -"Skips all dependency checks. Normally, pacman will always check a package's " -"dependency fields to ensure that all dependencies are installed and there " -"are no package conflicts in the system. This switch disables these checks." -msgstr "" - -# type: TP -#: pacman.8:64 makepkg.8:51 -#, no-wrap -msgid "B<-f, --force>" -msgstr "" - -# type: Plain text -#: pacman.8:70 -msgid "" -"Bypass file conflict checks, overwriting conflicting files. If the package " -"that is about to be installed contains files that are already installed, " -"this option will cause all those files to be overwritten. This option " -"should be used with care, ideally not at all." -msgstr "" - -# type: TP -#: pacman.8:70 -#, no-wrap -msgid "B<-r, --root EpathE>" -msgstr "B<-r, --root EútvonalE>" - -# type: Plain text -#: pacman.8:79 -msgid "" -"Specify alternative installation root (default is \"/\"). This should I " -"be used as a way to install software into e.g. /usr/local instead of /usr. " -"Instead this should be used if you want to install a package on a temporary " -"mounted partition, which is \"owned\" by another system. By using this " -"option you not only specify where the software should be installed, but you " -"also specify which package database to use." -msgstr "" - -# type: TP -#: pacman.8:79 -#, no-wrap -msgid "B<-v, --verbose>" -msgstr "B<-v, --verbose>" - -# type: Plain text -#: pacman.8:82 -msgid "Output more status and error messages." -msgstr "" - -# type: TP -#: pacman.8:82 -#, no-wrap -msgid "B<--config EpathE>" -msgstr "B<--config EútvonalE>" - -# type: Plain text -#: pacman.8:85 -msgid "Specify an alternate configuration file." -msgstr "" - -# type: TP -#: pacman.8:85 makepkg.8:127 -#, no-wrap -msgid "B<--noconfirm>" -msgstr "" - -# type: Plain text -#: pacman.8:89 -msgid "" -"Bypass any and all \"Are you sure?\" messages. It's not a good idea to do " -"this unless you want to run pacman from a script." -msgstr "" - -# type: TP -#: pacman.8:89 -#, no-wrap -msgid "B<--ask EnumberE>" -msgstr "B<--ask EszámE>" - -# type: Plain text -#: pacman.8:94 -msgid "" -"Finetune the --noconfirm switch by not answering \"yes\" to all libpacman " -"questions, but you are able to specify yes/no for all type of libpacman " -"questions. The types are the followings:" -msgstr "" - -# type: Plain text -#: pacman.8:101 -#, no-wrap -msgid "" -"The given package is in IgnorePkg. (1)\n" -"Replace package foo with bar? (2)\n" -"foo conflicts with bar. Remove bar? (4)\n" -"Do you want to delete the corrupted package? (8)\n" -"Local version is newer. (16)\n" -"Local version is up to date. (32)\n" -msgstr "" - -# type: Plain text -#: pacman.8:104 -msgid "" -"Select for what types do you want to answer yes, sum up the values and use " -"the result as a parameter to this option." -msgstr "" - -# type: TP -#: pacman.8:104 makepkg.8:132 -#, no-wrap -msgid "B<--noprogressbar>" -msgstr "" - -# type: Plain text -#: pacman.8:108 -msgid "" -"Do not show a progress bar when downloading files. This can be useful for " -"scripts that call pacman and capture the output." -msgstr "" - -# type: SH -#: pacman.8:108 -#, no-wrap -msgid "SYNC OPTIONS" -msgstr "" - -# type: TP -#: pacman.8:109 makepkg.8:30 -#, no-wrap -msgid "B<-c, --clean>" -msgstr "" - -# type: Plain text -#: pacman.8:116 -msgid "" -"Remove old packages from the cache. When pacman downloads packages, it " -"saves them in I. If you need to free up diskspace, " -"you can remove these packages by using the --clean option. Using one --" -"clean (or -c) switch will only remove I packages. Use it twice to " -"remove I packages from the cache." -msgstr "" - -# type: TP -#: pacman.8:116 -#, no-wrap -msgid "B<-e, --dependsonly>" -msgstr "B<-e, --dependsonly>" - -# type: Plain text -#: pacman.8:121 -msgid "" -"Don't install the packages itself, only their dependencies. This can be " -"handy if you want to install the packages themselves with different options " -"or from source." -msgstr "" - -# type: TP -#: pacman.8:121 pacman.8:191 -#, no-wrap -msgid "B<-g, --groups>" -msgstr "B<-g, --groups>" - -# type: Plain text -#: pacman.8:125 -msgid "" -"Display all the members for each package group specified. If no group names " -"are provided, all groups will be listed." -msgstr "" - -# type: TP -#: pacman.8:125 pacman.8:195 -#, no-wrap -msgid "B<-i, --info>" -msgstr "B<-i, --info>" - -# type: Plain text -#: pacman.8:130 -msgid "" -"Display dependency information for a given package. This will search " -"through all repositories for a matching package and display the " -"dependencies, conflicts, etc." -msgstr "" - -# type: TP -#: pacman.8:130 pacman.8:199 -#, no-wrap -msgid "B<-l, --list>" -msgstr "B<-l, --list>" - -# type: Plain text -#: pacman.8:134 -msgid "" -"List all files in the specified repositories. Multiple repositories can be " -"specified on the command line." -msgstr "" - -# type: TP -#: pacman.8:134 -#, no-wrap -msgid "B<-p, --print-uris>" -msgstr "B<-p, --print-uris>" - -# type: Plain text -#: pacman.8:139 -msgid "" -"Print out URIs for each package that will be installed, including any " -"dependencies that have yet to be installed. These can be piped to a file " -"and downloaded at a later time, using a program like wget." -msgstr "" - -# type: TP -#: pacman.8:139 pacman.8:215 -#, no-wrap -msgid "B<-s, --search EregexpE>" -msgstr "" - -# type: Plain text -#: pacman.8:143 -msgid "" -"This will search each package in the package list for names or descriptions " -"that contains EregexpE." -msgstr "" - -# type: TP -#: pacman.8:143 -#, no-wrap -msgid "B<-u, --sysupgrade>" -msgstr "B<-u, --sysupgrade>" - -# type: Plain text -#: pacman.8:151 -msgid "" -"Upgrades all packages that are out of date. pacman will examine every " -"package installed on the system, and if a newer package exists on the server " -"it will upgrade. pacman will present a report of all packages it wants to " -"upgrade and will not proceed without user confirmation. Dependencies are " -"automatically resolved at this level and will be installed/upgraded if " -"necessary." -msgstr "" - -# type: TP -#: pacman.8:151 -#, no-wrap -msgid "B<-w, --downloadonly>" -msgstr "B<-w, --downloadonly>" - -# type: Plain text -#: pacman.8:154 -msgid "" -"Retrieve all packages from the server, but do not install/upgrade anything." -msgstr "" - -# type: TP -#: pacman.8:154 -#, no-wrap -msgid "B<-y, --refresh>" -msgstr "B<-y, --refresh>" - -# type: Plain text -#: pacman.8:159 -msgid "" -"Download a fresh copy of the master package list from the ftp server defined " -"in I. This should typically be used each time you use B<--" -"sysupgrade>." -msgstr "" - -# type: TP -#: pacman.8:159 -#, no-wrap -msgid "B<--ignore EpkgE>" -msgstr "" - -# type: Plain text -#: pacman.8:164 -msgid "" -"This option functions exactly the same as the B configuration " -"directive. Sometimes it can be handy to skip some package updates without " -"having to edit I each time." -msgstr "" - -# type: SH -#: pacman.8:164 -#, no-wrap -msgid "REMOVE OPTIONS" -msgstr "ELTÁVOLÍTÁSI OPCIÓK" - -# type: TP -#: pacman.8:165 -#, no-wrap -msgid "B<-c, --cascade>" -msgstr "B<-c, --cascade>" - -# type: Plain text -#: pacman.8:169 -msgid "" -"Remove all target packages, as well as all packages that depend on one or " -"more target packages. This operation is recursive." -msgstr "" - -# type: TP -#: pacman.8:169 -#, no-wrap -msgid "B<-k, --keep>" -msgstr "B<-k, --keep>" - -# type: Plain text -#: pacman.8:172 -msgid "Removes the database entry only. Leaves all files in place." -msgstr "" - -# type: TP -#: pacman.8:172 -#, no-wrap -msgid "B<-n, --nosave>" -msgstr "B<-n, --nosave>" - -# type: Plain text -#: pacman.8:179 -msgid "" -"Instructs pacman to ignore file backup designations. Normally, when a file " -"is about to be I from the system the database is first checked to " -"see if the file should be renamed to a .pacsave extension. If B<--nosave> " -"is used, these designations are ignored and the files are removed." -msgstr "" - -# type: TP -#: pacman.8:179 -#, no-wrap -msgid "B<-s, --recursive>" -msgstr "B<-s, --recursive>" - -# type: Plain text -#: pacman.8:185 -msgid "" -"For each target specified, remove it and all its dependencies, provided that " -"(A) they are not required by other packages; and (B) they were not " -"explicitly installed by the user. This option is analagous to a backwards --" -"sync operation." -msgstr "" - -# type: SH -#: pacman.8:185 -#, no-wrap -msgid "QUERY OPTIONS" -msgstr "LEKÉRDEZÉSI OPCIÓK" - -# type: TP -#: pacman.8:186 -#, no-wrap -msgid "B<-e, --orphans>" -msgstr "B<-e, --orphans>" - -# type: Plain text -#: pacman.8:191 -msgid "" -"List all packages that were installed as a dependency (ie, not installed " -"explicitly) and are not required by any other packages." -msgstr "" - -# type: Plain text -#: pacman.8:195 -msgid "" -"Display all groups that a specified package is part of. If no package names " -"are provided, all groups and members will be listed." -msgstr "" - -# type: Plain text -#: pacman.8:199 -msgid "" -"Display information on a given package. If it is used with the B<-p> option " -"then the .PKGINFO file will be printed." -msgstr "" - -# type: Plain text -#: pacman.8:203 -msgid "" -"List all files owned by EpackageE. Multiple packages can be " -"specified on the command line." -msgstr "" - -# type: TP -#: pacman.8:203 -#, no-wrap -msgid "B<-m, --foreign>" -msgstr "" - -# type: Plain text -#: pacman.8:207 -msgid "" -"List all packages that were not found in the sync database(s). Typically " -"these are packages that were downloaded manually and installed with --add." -msgstr "" - -# type: TP -#: pacman.8:207 -#, no-wrap -msgid "B<-o, --owns EfileE>" -msgstr "" - -# type: Plain text -#: pacman.8:210 -msgid "Search for the package that owns EfileE." -msgstr "" - -# type: TP -#: pacman.8:210 -#, no-wrap -msgid "B<-p, --file>" -msgstr "" - -# type: Plain text -#: pacman.8:215 -msgid "" -"Tells pacman that the package supplied on the command line is a file, not an " -"entry in the database. Pacman will decompress the file and query it. This " -"is useful with B<--info> and B<--list>." -msgstr "" - -# type: Plain text -#: pacman.8:219 -msgid "" -"This will search each locally-installed package for names or descriptions " -"that contains EregexpE." -msgstr "" - -# type: SH -#: pacman.8:219 -#, no-wrap -msgid "HANDLING CONFIG FILES" -msgstr "" - -# type: Plain text -#: pacman.8:226 -msgid "" -"pacman uses the same logic as rpm to determine action against files that are " -"designated to be backed up. During an upgrade, it uses 3 md5 hashes for " -"each backup file to determine the required action: one for the original file " -"installed, one for the new file that's about to be installed, and one for " -"the actual file existing on the filesystem. After comparing these 3 hashes, " -"the follow scenarios can result:" -msgstr "" - -# type: TP -#: pacman.8:226 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:229 -msgid "" -"All three files are the same, so we win either way. Install the new file." -msgstr "" - -# type: TP -#: pacman.8:229 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:234 -msgid "" -"The current file is un-altered from the original but the new one is " -"different. Since the user did not ever modify the file, and the new one may " -"contain improvements/bugfixes, we install the new file." -msgstr "" - -# type: TP -#: pacman.8:234 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:239 -msgid "" -"Both package versions contain the exact same file, but the one on the " -"filesystem has been modified since. In this case, we leave the current file " -"in place." -msgstr "" - -# type: TP -#: pacman.8:239 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:242 -msgid "" -"The new one is identical to the current one. Win win. Install the new file." -msgstr "" - -# type: TP -#: pacman.8:242 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:247 -msgid "" -"All three files are different, so we install the new file with a .pacnew " -"extension and warn the user, so she can manually move the file into place " -"after making any necessary customizations." -msgstr "" - -# type: SH -#: pacman.8:247 makepkg.8:137 -#, no-wrap -msgid "CONFIGURATION" -msgstr "" - -# type: Plain text -#: pacman.8:253 -msgid "" -"pacman will attempt to read I each time it is invoked. " -"This configuration file is divided into sections or I. Each " -"section defines a package repository that pacman can use when searching for " -"packages in --sync mode. The exception to this is the I section, " -"which defines global options." -msgstr "" - -# type: SH -#: pacman.8:254 -#, no-wrap -msgid "Example:" -msgstr "" - -# type: Plain text -#: pacman.8:260 -#, no-wrap -msgid "" -"[options]\n" -"NoUpgrade = etc/passwd etc/group etc/shadow\n" -"NoUpgrade = etc/fstab\n" -msgstr "" - -# type: Plain text -#: pacman.8:262 -#, no-wrap -msgid "Include = /etc/pacman.d/current\n" -msgstr "" - -# type: Plain text -#: pacman.8:265 -#, no-wrap -msgid "" -"[custom]\n" -"Server = file:///home/pkgs\n" -msgstr "" - -# type: SH -#: pacman.8:268 -#, no-wrap -msgid "CONFIG: OPTIONS" -msgstr "" - -# type: TP -#: pacman.8:269 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:273 -msgid "" -"Overrides the default location of the toplevel database directory. The " -"default is I." -msgstr "" - -# type: TP -#: pacman.8:273 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:277 -msgid "" -"Overrides the default location of the package cache directory. The default " -"is I." -msgstr "" - -# type: TP -#: pacman.8:277 -#, no-wrap -msgid "BpackageE [package] ...>" -msgstr "" - -# type: Plain text -#: pacman.8:281 -msgid "" -"If a user tries to B<--remove> a package that's listed in HoldPkg, pacman " -"will ask for confirmation before proceeding." -msgstr "" - -# type: TP -#: pacman.8:281 -#, no-wrap -msgid "BpackageE [package] ...>" -msgstr "" - -# type: Plain text -#: pacman.8:285 -msgid "" -"Instructs pacman to ignore any upgrades for this package when performing a " -"B<--sysupgrade>." -msgstr "" - -# type: TP -#: pacman.8:285 -#, no-wrap -msgid "BnumberE>" -msgstr "" - -# type: Plain text -#: pacman.8:289 -msgid "" -"Upgrade only the packages that are at least EnumberE days old when " -"performing a B<--sysupgrade>." -msgstr "" - -# type: TP -#: pacman.8:289 -#, fuzzy, no-wrap -msgid "BnumberE>" -msgstr "B<--ask EszámE>" - -# type: Plain text -#: pacman.8:293 -msgid "" -"Try to download packages EnumberE times. This is useful in case you " -"have a bad internet connection and your packages often get corrupted during " -"the download." -msgstr "" - -# type: TP -#: pacman.8:293 -#, no-wrap -msgid "BpathE>" -msgstr "" - -# type: Plain text -#: pacman.8:297 -msgid "" -"Include another config file. This config file can include repositories or " -"general configuration options." -msgstr "" - -# type: TP -#: pacman.8:297 -#, no-wrap -msgid "Bhost|ipE[:port]>" -msgstr "" - -# type: Plain text -#: pacman.8:300 -msgid "If set, pacman will use this proxy server for all ftp/http transfers." -msgstr "" - -# type: TP -#: pacman.8:300 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:306 -msgid "" -"If set, pacman will use this external program to download all remote files. " -"All instances of B<%u> will be replaced with the URL to be downloaded. If " -"present, instances of B<%o> will be replaced with the local filename, plus a " -"\".part\" extension, which allows programs like wget to do file resumes " -"properly." -msgstr "" - -# type: Plain text -#: pacman.8:310 -msgid "" -"This option is useful for users who experience problems with pacman's built-" -"in http/ftp support, or need the more advanced proxy support that comes with " -"utilities like wget." -msgstr "" - -# type: TP -#: pacman.8:310 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:313 -msgid "" -"Disables passive ftp connections when downloading packages. (aka Active Mode)" -msgstr "" - -# type: TP -#: pacman.8:313 -#, no-wrap -msgid "BfileE [file] ...>" -msgstr "" - -# type: Plain text -#: pacman.8:317 -msgid "" -"All files listed with a B directive will never be touched during " -"a package install/upgrade. I do not include the leading slash when " -"specifying files." -msgstr "" - -# type: TP -#: pacman.8:317 -#, no-wrap -msgid "BfileE [file] ...>" -msgstr "" - -# type: Plain text -#: pacman.8:324 -msgid "" -"All files listed with a B directive will never be extracted from " -"a package into the filesystem. This can be useful when you don't want part " -"of a package to be installed. For example, if your httpd root uses an index." -"php, then you would not want the index.html file to be extracted from the " -"apache package." -msgstr "" - -# type: TP -#: pacman.8:324 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:328 -msgid "" -"Log action messages through syslog(). This will insert pacman log entries " -"into your /var/log/messages or equivalent." -msgstr "" - -# type: TP -#: pacman.8:328 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:331 -msgid "Log actions directly to a file, usually /var/log/pacman.log." -msgstr "" - -# type: SH -#: pacman.8:332 -#, no-wrap -msgid "CONFIG: REPOSITORIES" -msgstr "" - -# type: Plain text -#: pacman.8:339 -msgid "" -"Each repository section defines a section name and at least one location " -"where the packages can be found. The section name is defined by the string " -"within square brackets (eg, the two above are 'current' and 'custom'). " -"Locations are defined with the I directive and follow a URL naming " -"structure. Currently only ftp is supported for remote servers. If you want " -"to use a local directory, you can specify the full path with a 'file://' " -"prefix, as shown above." -msgstr "" - -# type: SH -#: pacman.8:339 -#, no-wrap -msgid "USING YOUR OWN REPOSITORY" -msgstr "" - -# type: Plain text -#: pacman.8:343 -msgid "" -"Let's say you have a bunch of custom packages in I and their " -"respective FrugalBuild files are all in I. All you need to " -"do is generate a compressed package database in the I directory " -"so pacman can find it when run with --refresh." -msgstr "" - -# type: Plain text -#: pacman.8:347 -#, no-wrap -msgid "# gensync /var/fst/local /home/pkgs/custom.fdb\n" -msgstr "" - -# type: Plain text -#: pacman.8:357 -msgid "" -"The above command will read all FrugalBuild files in /var/fst/local and " -"generate a compressed database called /home/pkgs/custom.fdb. Note that the " -"database must be of the form I<{treename}.fdb>, where {treename} is the name " -"of the section defined in the configuration file. That's it! Now configure " -"your I section in the configuration file as shown in the config " -"example above. Pacman will now use your package repository. If you add new " -"packages to the repository, remember to re-generate the database and use " -"pacman's --refresh option." -msgstr "" - -# type: SH -#: pacman.8:357 makepkg.8:145 FrugalBuild.8:457 -#, no-wrap -msgid "SEE ALSO" -msgstr "LÁSD MÉG" - -# type: Plain text -#: pacman.8:359 -msgid "B is the package-building tool that comes with pacman." -msgstr "" - -# type: SH -#: pacman.8:359 makepkg.8:148 FrugalBuild.8:460 -#, no-wrap -msgid "AUTHOR" -msgstr "SZERZŐ" - -# type: Plain text -#: pacman.8:363 makepkg.8:152 FrugalBuild.8:464 -#, no-wrap -msgid "" -"Judd Vinet Ejvinet@zeroflux.orgE\n" -"and the Frugalware developers Efrugalware-devel@frugalware.orgE\n" -msgstr "" - -# type: TH -#: makepkg.8:1 -#, no-wrap -msgid "makepkg" -msgstr "makepkg" - -# type: TH -#: makepkg.8:1 -#, no-wrap -msgid "January 30, 2006" -msgstr "2006. január 30." - -# type: TH -#: makepkg.8:1 FrugalBuild.8:1 -#, no-wrap -msgid "Frugalware Developer Manual" -msgstr "Frugalware Fejlesztői Kézikönyv" - -# type: Plain text -#: makepkg.8:4 -msgid "makepkg - package build utility" -msgstr "makepkg - csomagkészítő segédeszköz" - -# type: Plain text -#: makepkg.8:6 -msgid "B" -msgstr "B" - -# type: Plain text -#: makepkg.8:15 -msgid "" -"B will build packages for you. All it needs is a build-capable " -"linux platform, wget, and some build scripts. The advantage to a script-" -"based build is that you only really do the work once. Once you have the " -"build script for a package, you just need to run makepkg and it will do the " -"rest: download and validate source files, check dependencies, configure the " -"buildtime settings, build the package, install the package into a temporary " -"root, make customizations, generate meta-info, and package the whole thing " -"up for B to use." -msgstr "" - -# type: Plain text -#: makepkg.8:18 -msgid "" -"B can be used to rebuild an entire package group or the entire " -"build tree. See B for syntax." -msgstr "" - -# type: TP -#: makepkg.8:20 -#, no-wrap -msgid "B<-b, --builddeps>" -msgstr "" - -# type: Plain text -#: makepkg.8:27 -msgid "" -"Build missing dependencies from source. When makepkg finds missing build-" -"time or run-time dependencies, it will look for the dependencies' " -"FrugalBuild files under $fst_root (set in your /etc/repoman.conf). If it " -"finds them it will run another copy of makepkg to build and install the " -"missing dependencies. The child makepkg calls will be made with the B<-b> " -"and B<-i> options." -msgstr "" - -# type: TP -#: makepkg.8:27 -#, no-wrap -msgid "B<-B, --noccache>" -msgstr "" - -# type: Plain text -#: makepkg.8:30 -msgid "Do not use ccache during build." -msgstr "" - -# type: Plain text -#: makepkg.8:33 -msgid "Clean up leftover work files/directories after a successful build." -msgstr "" - -# type: TP -#: makepkg.8:33 -#, no-wrap -msgid "B<-C, --cleancache>" -msgstr "" - -# type: Plain text -#: makepkg.8:38 -msgid "" -"Used with --chroot cleans up the chroot which means removing unnecessary " -"packages from it. If used twice, then it removes all source files from the " -"cache directory and cleans up the full compiler cache to free up diskspace." -msgstr "" - -# type: Plain text -#: makepkg.8:43 -msgid "" -"Do not perform any dependency checks. This will let you override/ignore any " -"dependencies required. There's a good chance this option will break the " -"build process if all of the dependencies aren't installed." -msgstr "" - -# type: TP -#: makepkg.8:43 -#, no-wrap -msgid "B<-D EpkgnameE>" -msgstr "" - -# type: Plain text -#: makepkg.8:46 -msgid "Clean up only one package's compiler cache. (Uses ccache -C.)" -msgstr "" - -# type: TP -#: makepkg.8:46 -#, no-wrap -msgid "B<-e, --noextract>" -msgstr "" - -# type: Plain text -#: makepkg.8:51 -msgid "" -"Do not extract source files. Instead, use whatever already exists in the " -"src/ directory. This is handy if you want to go into src and manually patch/" -"tweak code, then make a package out of the result." -msgstr "" - -# type: Plain text -#: makepkg.8:56 -msgid "" -"B will not build a package if a I " -"file already exists in the build directory. You can override this behaviour " -"with the B<--force> switch." -msgstr "" - -# type: TP -#: makepkg.8:56 -#, no-wrap -msgid "B<-g, --gensha1>" -msgstr "" - -# type: Plain text -#: makepkg.8:61 -msgid "" -"Download all source files (if required) and use I to generate sha1 " -"hashes for each of them. You can then redirect the output into your " -"FrugalBuild for source validation (makepkg -g EEFrugalBuild)." -msgstr "" - -# type: Plain text -#: makepkg.8:64 -msgid "Output syntax and commandline options." -msgstr "" - -# type: TP -#: makepkg.8:64 -#, no-wrap -msgid "B<-i, --install>" -msgstr "" - -# type: Plain text -#: makepkg.8:67 -msgid "Install/Upgrade the package after a successful build." -msgstr "" - -# type: TP -#: makepkg.8:67 -#, no-wrap -msgid "B<-j EjobsE>" -msgstr "" - -# type: Plain text -#: makepkg.8:71 -msgid "" -"Sets MAKEFLAGS=\"-jEjobsE\" before building the package. This is " -"useful for overriding the MAKEFLAGS setting in /etc/makepkg.conf." -msgstr "" - -# type: TP -#: makepkg.8:71 -#, no-wrap -msgid "B<-k, --logging>" -msgstr "" - -# type: Plain text -#: makepkg.8:74 -msgid "Logging package build process" -msgstr "" - -# type: TP -#: makepkg.8:74 -#, no-wrap -msgid "B<-l EpkgnameE>" -msgstr "" - -# type: Plain text -#: makepkg.8:79 -msgid "" -"Download the package's buildscript before starting the build. This is " -"useful if you do not want to do a full 'repoman upd' nor want to download " -"manually the buildscript." -msgstr "" - -# type: TP -#: makepkg.8:79 -#, no-wrap -msgid "B<-m, --nocolor>" -msgstr "" - -# type: Plain text -#: makepkg.8:82 -msgid "Disable color in output messages" -msgstr "" - -# type: TP -#: makepkg.8:82 -#, no-wrap -msgid "B<-n, --nostrip>" -msgstr "" - -# type: Plain text -#: makepkg.8:85 -msgid "Do not strip binaries and libraries." -msgstr "" - -# type: TP -#: makepkg.8:85 -#, no-wrap -msgid "B<-o, --nobuild>" -msgstr "" - -# type: Plain text -#: makepkg.8:88 -msgid "Download and extract files only, do not build." -msgstr "" - -# type: TP -#: makepkg.8:88 -#, no-wrap -msgid "B<-p EbuildscriptE>" -msgstr "" - -# type: Plain text -#: makepkg.8:91 -msgid "" -"Read the package script IbuildscriptE> instead of the default " -"(I)." -msgstr "" - -# type: TP -#: makepkg.8:91 -#, no-wrap -msgid "B<-r, --rmdeps>" -msgstr "" - -# type: Plain text -#: makepkg.8:95 -msgid "" -"Upon successful build, remove any dependencies installed by makepkg/pacman " -"during dependency auto-resolution (using B<-b> or B<-s>)." -msgstr "" - -# type: TP -#: makepkg.8:95 -#, no-wrap -msgid "B<-R, --chroot>" -msgstr "" - -# type: Plain text -#: makepkg.8:99 -msgid "" -"Build the package in a chroot environment. This is the default except if -g " -"or -o is used." -msgstr "" - -# type: TP -#: makepkg.8:99 -#, fuzzy, no-wrap -msgid "B<-H, --host>" -msgstr "B<-l, --list>" - -# type: Plain text -#: makepkg.8:102 -msgid "Build the package on the host system. The opposite of the -R option." -msgstr "" - -# type: TP -#: makepkg.8:102 -#, no-wrap -msgid "B<-s, --syncdeps>" -msgstr "" - -# type: Plain text -#: makepkg.8:108 -msgid "" -"Install missing dependencies using pacman. When makepkg finds missing build-" -"time or run-time dependencies, it will run pacman to try and resolve them. " -"If successful, pacman will download the missing packages from a package " -"repository and install them for you." -msgstr "" - -# type: TP -#: makepkg.8:108 -#, no-wrap -msgid "B<-t EtreeE>" -msgstr "" - -# type: Plain text -#: makepkg.8:113 -msgid "" -"When building in a chroot (using -R) you may want to build packages for a " -"version other than the host one. Using this option, it's possible to build " -"packages for \"stable\" while the host system is \"current\" and vica versa." -msgstr "" - -# type: TP -#: makepkg.8:113 -#, no-wrap -msgid "B<-u, --noup2date>" -msgstr "" - -# type: Plain text -#: makepkg.8:122 -msgid "" -"Do not check for newer version before starting build. Normally makepkg will " -"prevent you from building obsolete source by mistake. If you know what you " -"are doing, you can disable this feature with this switch. B<-S, --sudosync> " -"Install missing dependencies using pacman and sudo. This is the same as B<-" -"s> except that makepkg will call pacman with sudo. This means you don't have " -"to build as root to use dependency auto-resolution." -msgstr "" - -# type: TP -#: makepkg.8:123 -#, no-wrap -msgid "B<-w EdestdirE>" -msgstr "" - -# type: Plain text -#: makepkg.8:127 -msgid "" -"Write the resulting package file to the directory IdestdirE> " -"instead of the current working directory." -msgstr "" - -# type: Plain text -#: makepkg.8:132 -msgid "" -"When calling pacman to resolve dependencies or conflicts, makepkg can pass " -"the I<--noconfirm> option to it so it does not wait for any user input " -"before proceeding with operations." -msgstr "" - -# type: Plain text -#: makepkg.8:136 -msgid "" -"When calling pacman, makepkg can pass the I<--noprogressbar> option to it. " -"This is useful if one is directing makepkg's output to a non-terminal (ie, a " -"file)." -msgstr "" - -# type: Plain text -#: makepkg.8:142 -msgid "" -"Configuration options are stored in I. This file is " -"parsed as a bash script, so you can export any special compiler flags you " -"wish to use. This is helpful for building for different architectures, or " -"with different optimizations." -msgstr "" - -# type: Plain text -#: makepkg.8:145 -msgid "" -"B This does not guarantee that all package Makefiles will use your " -"exported variables. Some of them are flaky..." -msgstr "" - -# type: Plain text -#: makepkg.8:148 -msgid "B(8), B(8)" -msgstr "" - -# type: SH -#: FrugalBuild.8:1 -#, fuzzy, no-wrap -msgid "FrugalBuild" -msgstr "FrugalBuild példa:" - -# type: TH -#: FrugalBuild.8:1 -#, no-wrap -msgid "June 13, 2006" -msgstr "2006. június 13." - -# type: Plain text -#: FrugalBuild.8:4 -msgid "FrugalBuild - Frugalware package builder descriptor" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:8 -msgid "" -"This manual page is meant to describe general rules about FrugalBuilds. If " -"you're interested in the package builder B itself, then see its " -"manual page, not this one." -msgstr "" - -# type: SH -#: FrugalBuild.8:11 -#, no-wrap -msgid "FrugalBuild Example:" -msgstr "FrugalBuild példa:" - -# type: Plain text -#: FrugalBuild.8:17 -#, no-wrap -msgid "" -"# Last Modified: Sun, 19 Jun 2005 15:24:32 +0000\n" -"# Compiling Time: 0.17 SBU\n" -"# Maintainer: Name Eemail@addr.essE\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:27 -#, no-wrap -msgid "" -"pkgname=dvdauthor\n" -"pkgver=0.6.11\n" -"pkgrel=3\n" -"pkgdesc=\"Will generate a DVD movie from a valid mpeg2 stream\"\n" -"depends=('imagemagick' 'libdvdread')\n" -"Finclude sourceforge\n" -"groups=('xapps')\n" -"archs=('i686' 'x86_64')\n" -"sha1sums=('a99ea7ef6e50646b77ad47a015127925053d34ea')\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:29 -#, no-wrap -msgid "# optimization OK\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:34 -msgid "" -"As you can see, the setup is fairly simple. The first line tracks the time " -"of the last update, this is automatically updated after a successful build." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:37 -msgid "" -"The next line defines its build time. Of course, it depends on your " -"hardware, so we use SBUs instead of minutes as a unit." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:42 -msgid "" -"SBU is the Static Binutils Unit, which means the time \"repoman merge " -"binutils\" takes on your machine. By default makepkg will print out how many " -"seconds the build took. After you have built binutils, you should update " -"your /etc/makepkg.conf:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:44 -msgid "SBU=\"257\"" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:48 -msgid "" -"The line above means compiling binutils on your machine took 257 seconds. " -"Starting from this point, makepkg will print out SBUs instead of seconds " -"after successful builds, and this SBU value will be equal on everyone's " -"machine." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:55 -msgid "" -"If you wish to maintain the package, write your name or nick and e-mail " -"address on the third line. If you just wrote the FrugalBuild don't plan to " -"maintain the package , then write Contributor instead of Maintainer, and " -"then someone can take it and will add his/her line later. Other lines like " -"\"Modified by\" are not allowed. Use the darcs patch comments to mention " -"others if you wish." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:63 -msgid "" -"pkgname defines the package name. It should not contain any uppercase " -"letters. The package version defines the upstream version, while the " -"package release tracks the Frugalware-specific changes. pkgrel should be an " -"integer, pkgrels like 5wanda1 are reserved for security updates. There the " -"rule is the following: If the original package's pkgrel was 4, then " -"increment it once when you add a security patch, but then use 5wanda1, " -"5wanda2 and so on. This way the user can easily upgrade to pkgrel=5 which is " -"in -current." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:66 -msgid "" -"pkgdesc is a short one-line description for the package. Usually taken from " -"the project's homepage or manpage. Try to keep the length under 80 chars." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:71 -msgid "" -"depends() is a bash array which defines the dependencies of the package. " -"depends() lists those packages required for building and using the current " -"one. If the dependency is runtime-only, then use rodepends(), if buildtime-" -"only then use makedepends()." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:80 -msgid "" -"The next line is a special Finclude command which allows you to inherit any " -"directive from a FrugalBuild scheme. They can be found in the FST, under /" -"source/include. The \"util\" scheme is always included, since its provided " -"functions are used by almost every FrugalBuild. Look at the /source/include/" -"sourceforge.sh, it provides the url, up2date and source() directives, so we " -"don't have to specify them here. After the Finclude you can overwrite the " -"inherited directives, for example define a custom up2date if the inherited " -"one is not suitable for you." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:84 -msgid "" -"The groups() array's first element is mandatory, and it should be a valid " -"\"first group\". This means it should be in a foo or foo-extra format, where " -"foo or foo-extra is a dir under /source in the FST." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:93 -msgid "" -"The archs() array defines for which architectures the given package is " -"available. If it's not available, it means that gensync will skip it when " -"generating the package databases. If you are not able to provide a binary " -"package for a given arch, don't include that in archs()! For example, no " -"matter if the package could be compiled in x86_64, if you haven't compiled " -"it yourself, don't include it. If you're sure it won't be available on a " -"given arch (for example it's written in x86 asm), then use !arch, for " -"example !x86_64." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:98 -msgid "" -"The sha1sums() array can be generated with the makepkg -g command. Its " -"purpose is to prevent compiling from corrupt sources, especially when the " -"build is automatic. Where it is available you can use signatures(), its goal " -"is that you don't have to update it manually every time." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:106 -msgid "" -"The last line will be added automatically to the end of the FrugalBuild if " -"the build() function used your $CFLAGS or $CXXFLAGS. This is handy if you " -"want to cross-compile on a faster machine for a slower architecture. If the " -"package doesn't use our $CFLAGS we can't cross-compile it, so please try to " -"avoid creating \"unoptimized\" packages. If the package doesn't contain any " -"architecture-dependent file, then you can add this line manually as makepkg " -"will not detect this." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:114 -msgid "" -"Finally we define a build() function that will build the package. If you " -"don't want to do anything special, you probably don't have to specify " -"anything, as the default build() (inherited from util.sh) will fit your " -"needs. Even if you define a custom build(), probably you can re-use parts of " -"the default build(). For the list of special functions provided by util.sh " -"and others refer to the /source/include dir. Again, util.sh is included " -"automatically, but you have to Finclude the others before using them!" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:120 -msgid "" -"Once the package is successfully installed into the package root, I " -"will prepare some documentation. It will then strip debugging info from " -"libraries and binaries and generate a meta-info file. Finally, it will " -"compress everything into a .fpm file and leave it in the directory from " -"which you ran B." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:123 -msgid "" -"At this point you should have a package file in the current directory, named " -"something like name-version-release-arch.fpm. Done!" -msgstr "" - -# type: SH -#: FrugalBuild.8:124 -#, no-wrap -msgid "Install/Upgrade/Remove Scripting" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:128 -msgid "" -"Pacman has the ability to store and execute a package-specific script when " -"it installs, removes, or upgrades a package. This allows a package to " -"\"configure itself\" after installation and do the opposite right before it " -"is removed." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:130 -msgid "The exact time the script is run varies with each operation:" -msgstr "" - -# type: TP -#: FrugalBuild.8:130 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:133 FrugalBuild.8:141 -msgid "script is run right before files are extracted." -msgstr "" - -# type: TP -#: FrugalBuild.8:134 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:137 -msgid "script is run right after files are extracted." -msgstr "" - -# type: TP -#: FrugalBuild.8:138 -#, no-wrap -msgid "B" -msgstr "" - -# type: TP -#: FrugalBuild.8:142 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:145 -msgid "script is run after files are extracted." -msgstr "" - -# type: TP -#: FrugalBuild.8:146 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:149 -msgid "script is run right before files are removed." -msgstr "" - -# type: TP -#: FrugalBuild.8:150 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:153 -msgid "script is run right after files are removed." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:157 -msgid "" -"To use this feature, just create a file (eg, pkgname.install) and put it in " -"the same directory as the FrugalBuild script. Then use the I " -"directive:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:160 -#, no-wrap -msgid "install=pkgname.install\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:166 -msgid "" -"The install script does not need to be specified in the I array. If " -"you omit the install directive then makepkg will check for the $pkgname." -"install script and will use it if it's present." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:169 -msgid "" -"You can find a scriptlet skeleton in the /docs/tech/skel/ directory, use it " -"when creating new packages." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:171 -msgid "" -"The scriptlet messages are parsed, a simple example tells you everything:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:180 -#, no-wrap -msgid "" -"post_upgrade()\n" -"{\n" -"\techo \"START this will be good\"\n" -"\techo \"DONE 0\"\n" -"\techo \"START this will fail\"\n" -"\techo \"DONE 1\"\n" -"\techo \"old message\"\n" -"}\n" -msgstr "" - -# type: SH -#: FrugalBuild.8:182 -#, no-wrap -msgid "FrugalBuild Directives" -msgstr "" - -# type: TP -#: FrugalBuild.8:183 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:187 -msgid "" -"The name of the package. This has be a unix-friendly name as it will be " -"used in the package filename." -msgstr "" - -# type: TP -#: FrugalBuild.8:188 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:191 -msgid "" -"This is the version of the software as released from the author (eg, 2.7.1)." -msgstr "" - -# type: TP -#: FrugalBuild.8:192 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:195 -msgid "This is the release number specific to Frugalware Linux packages." -msgstr "" - -# type: TP -#: FrugalBuild.8:196 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:199 -msgid "" -"This should be a brief description of the package and its functionality." -msgstr "" - -# type: TP -#: FrugalBuild.8:200 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:203 -msgid "Array of the localized package descriptions." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:206 -msgid "" -"The format is the following: pkgdesc_localized=('xx_YY foo' 'xx_YY bar')" -msgstr "" - -# type: TP -#: FrugalBuild.8:207 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:211 -msgid "" -"This field contains an optional URL that is associated with the piece of " -"software being packaged. This is typically the project's website." -msgstr "" - -# type: TP -#: FrugalBuild.8:212 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:216 -msgid "" -"Sets the license type (eg, \"GPL\", \"BSD\", \"NON-FREE\"). (B: This " -"option is still in development and may change in the future)" -msgstr "" - -# type: TP -#: FrugalBuild.8:217 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:223 -msgid "" -"Specifies a special install script that is to be included in the package. " -"This file should reside in the same directory as the FrugalBuild, and will " -"be copied into the package by makepkg. It does not need to be included in " -"the I array. (eg, install=modutils.install)" -msgstr "" - -# type: TP -#: FrugalBuild.8:224 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:229 -msgid "" -"This directive should contain a command that prints the current upstream " -"stable version of the project. This way we can check for newer version " -"without visiting manually the project's website (see above)." -msgstr "" - -# type: TP -#: FrugalBuild.8:230 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:237 -msgid "" -"The I line is an array of source files required to build the " -"package. Source files must reside in the same directory as the FrugalBuild " -"file, unless they have a fully-qualified URL. Then if the source file does " -"not already exist in /var/cache/pacman/src, the file is downloaded by wget." -msgstr "" - -# type: TP -#: FrugalBuild.8:238 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:246 -msgid "" -"If this field is present, it should contain an MD5 hash for every source " -"file specified in the I array (in the same order). makepkg will use " -"this to verify source file integrity during subsequent builds. To easily " -"generate md5sums, first build using the FrugalBuild then run BEFrugalBuild>. Then you can edit the FrugalBuild and move the " -"I line from the bottom to an appropriate location." -msgstr "" - -# type: TP -#: FrugalBuild.8:247 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:255 -msgid "" -"If this field is present, it should contain an SHA1 hash for every source " -"file specified in the I array (in the same order). makepkg will use " -"this to verify source file integrity during subsequent builds. To easily " -"generate sha1sums, first build using the FrugalBuild then run BEFrugalBuild>. Then you can edit the FrugalBuild and move the " -"I line from the bottom to an appropriate location." -msgstr "" - -# type: TP -#: FrugalBuild.8:256 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:261 -msgid "" -"If this field is present, it should contain an array of gpg signatures " -"required to validate the source files. Where there is no signature available " -"just leave it empty, like:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:263 -msgid "signatures=(${source[0]}.asc '')" -msgstr "" - -# type: TP -#: FrugalBuild.8:264 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:269 -msgid "" -"This is an array of symbolic names that represent groups of packages, " -"allowing you to install multiple packages by requesting a single target. " -"For example, one could install all KDE packages by installing the 'kde' " -"group." -msgstr "" - -# type: TP -#: FrugalBuild.8:270 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:275 -msgid "" -"This array defines on which architectures the given package is available. " -"If it's not available, that will mean that gensync will skip it when " -"generating package databases." -msgstr "" - -# type: TP -#: FrugalBuild.8:276 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:283 -msgid "" -"A space-delimited array of filenames (without a preceding slash). The " -"I line will be propagated to the package meta-info file for pacman. " -"This will designate all files listed there to be backed up if this package " -"is ever removed from a system. See B in the " -"I manpage for more information." -msgstr "" - -# type: TP -#: FrugalBuild.8:284 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:292 -msgid "" -"An array of packages that this package depends on to build and run. " -"Packages in this list should be surrounded with single quotes and contain at " -"least the package name. They can also include a version requirement of the " -"form BEversion>, where EE is one of these three " -"comparisons: B=> (greater than equal to), B=> (less than or " -"equal to), or B<=> (equal to). See the FrugalBuild example above for an " -"example of the I directive." -msgstr "" - -# type: TP -#: FrugalBuild.8:293 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:297 -msgid "" -"An array of packages that this package depends on to build (ie, not required " -"to run). Packages in this list should follow the same format as I." -msgstr "" - -# type: TP -#: FrugalBuild.8:298 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:305 -msgid "" -"An array of packages that this package depends on to run (ie, not required " -"to build). Generally I should be avoided in favour of I " -"except where this will create circular dependency chains. (For example " -"building logrotate doesn't require that dcron be installed.) Packages in " -"this list should follow the same format as I." -msgstr "" - -# type: TP -#: FrugalBuild.8:306 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:311 -msgid "" -"An array of packages that will conflict with this package (ie, they cannot " -"both be installed at the same time). This directive follows the same format " -"as I except you cannot specify versions here, only package names." -msgstr "" - -# type: TP -#: FrugalBuild.8:312 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:318 -msgid "" -"An array of \"virtual provisions\" that this package provides. This allows " -"a package to provide dependency names other than it's own package name. For " -"example, the kernel-scsi and kernel-ide packages can each provide 'kernel' " -"which allows packages to simply depend on 'kernel' rather than \"kernel-scsi " -"OR kernel-ide OR ...\"" -msgstr "" - -# type: TP -#: FrugalBuild.8:319 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:325 -msgid "" -"This is an array of packages that this package should replace, and can be " -"used to handle renamed/combined packages. For example, if the kernel " -"package gets renamed to kernel-ide, then subsequent 'pacman -Syu' calls will " -"not pick up the upgrade, due to the differing package names. I " -"handles this." -msgstr "" - -# type: TP -#: FrugalBuild.8:326 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:329 -msgid "This is an array of various boolean options. The possible values are:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:342 -#, no-wrap -msgid "" -"nodocs Don't add any documentation automatically (ie. when there'll be\n" -" a separate documentation subpackage).\n" -"nostrip Don't strip binaries/libraries.\n" -"force This is used to force the package to be upgraded by --sysupgrade,\n" -" even if its an older version.\n" -"nobuild If this directive set, gensync will ignore this package, so users\n" -" must build these packages on their machines, they will not be able\n" -" to install them with pacman -S. Useful for closed-source, but\n" -" freeware programs.\n" -"nofakeroot Don't drop privileges after chrooting. Required by some broken\n" -" packages.\n" -"scriptlet Don't skip executing scriptlets even if we're in chroot.\n" -msgstr "" - -# type: SH -#: FrugalBuild.8:344 -#, no-wrap -msgid "What is the process of chrooted build ?" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:350 -msgid "" -"First, what is chroot? We currently use fakeroot to prevent build() from " -"modifying the host system, and we use a prefix or DESTDIR directive to " -"install everything to a directory and not under to the host system. This is " -"good, but not enough." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:359 -msgid "" -"This system lacks the ability to control the list of installed packages " -"during the build on the system of a packager. Because of this, the given " -"compiled package may link itself to an extra installed library. This way we " -"can't really control the list of real dependencies. For example if " -"libquicktime is installed from source on my system, then mplayer or any " -"other program can link itself to that, and so that depends() will be " -"incorrect. Or if I have the closed source binary NVidia drivers installed, " -"some programs link to NVidia's libraries." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:362 -msgid "" -"Of course there is a solution to avoid this, to use a real chroot instead of " -"a simple fakeroot. What does this mean? The following:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:370 -msgid "" -"When starting the build, a core chroot system is installed under /var/" -"chroot. (Of course you can change this value under /etc/makepkg.conf.) The " -"core system contains ~60 packages which are must installed to build any " -"package in a chrooted environment. These packages (for example gcc, kernel-" -"headers, make) should not be mentioned in makedepends(). 'pacman -Sg core " -"chroot-core devel-core' should show you the actual list. (We try to change " -"this list rarely of course.)" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:376 -msgid "" -"When you start building with makepkg -R, pacman will install these packages " -"to /var/chroot if necessary. This will produce a fully \"clean\" Frugalware " -"system, that consists of base packages only. This /var/chroot is fully " -"separated from the host system so that this will solve the problems " -"mentioned above. (Linking to a library installed from source, etc.)" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:381 -msgid "" -"Here comes the fun part. The packages listed in depends() and makedepends() " -"are installed to this clean (/var/chroot) system. From this point, this " -"chroot is capable to build the specified package in it without any " -"unnecessary package installed, fully separated from the host system." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:385 -msgid "" -"After this the chroot should be cleaned up which means the removal of the " -"installed depends() and makedepends(). This ensures you do not have to build " -"the core chroot from scratch." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:389 -msgid "" -"This way we can prevent lots of dependency problems and it is even possible " -"to build packages for a different Frugalware version. This is quite " -"efficient when building security updates or fixing critical bugs in the -" -"stable tree." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:393 -msgid "" -"If the build fails, the working directory will not be deleted, you can find " -"it under /var/chroot/var/tmp/fst. Later if you want to clean your chroot " -"(delete the working directory and remove unnecessary packages) you can use " -"'makepkg -CR'." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:396 -msgid "" -"To activate building in a chroot, you should run makepkg as root at least " -"with the -R option." -msgstr "" - -# type: SH -#: FrugalBuild.8:397 -#, no-wrap -msgid "Package splitting" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:401 -msgid "" -"Package splitting means moving out a list of specified files to subpackages " -"(like libmysql out of mysql) and then defining the properties of subpackages." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:406 -msgid "" -"NOTE: if you create several subpackages, maintaining those packages will " -"require more and more time. Thus, unnecessary splits aren't welcome. " -"Especially, if you split out a library, then don't move the headers to the " -"package just to speed up building with a few seconds!" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:409 -msgid "" -"The B array is to define the pkgnames of the subpackages. From " -"now all the directives have a subfoo equivalent:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:425 -#, no-wrap -msgid "" -"pkgname -E subpkgs()\n" -"pkgdesc -E subdescs()\n" -"pkgdesc_localized -E subdescs_localized()\n" -"license() -E sublicense()\n" -"replaces() -E subreplaces()\n" -"groups() -E subgroups()\n" -"depends() -E subdepends()\n" -"rodepends() -E subrodepends()\n" -"removes() -E subremoves()\n" -"conflicts() -E subconflicts()\n" -"provides() -E subprovides()\n" -"backup() -E subbackup()\n" -"install -E subinstall()\n" -"options -E suboptions()\n" -"archs -E subarchs()\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:429 -msgid "" -"Also note that bash does not support two-dimensional arrays, so when " -"defining the array of arrays, then quotes are the major separators and " -"spaces are the minor ones." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:431 -msgid "Simple example:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:438 -#, no-wrap -msgid "" -"Add the followings to your bottom of your FrugalBuild\n" -"subpkgs=('foo' 'bar')\n" -"subdescs=('desc of foo' 'desc of bar')\n" -"subdepends=('foodep1 foodep2' 'bardep1 bardep2')\n" -"subgroups=('apps' 'apps')\n" -"subarchs=('i686 x86_64' 'i686 x86_64')\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:442 -msgid "" -"You may define conflicts, replaces and other directives for your " -"subpackages, but the requirement is only to define these 5 ones." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:447 -msgid "" -"The second part is to move some files to the - just defined - subpackages. " -"You should use the Fsplit command for this at the end of your build() " -"function. You can read more about Fsplit in the fwmakepkg documentation, but " -"here is a short example:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:450 -#, no-wrap -msgid "Fsplit subpkgname usr/share/\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:453 -msgid "" -"This will move the /usr/share dir of the package to the \"subpkgname\" " -"subpackage." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:456 -msgid "" -"NOTE: never use a trailing slash when defining file patterns, especially if " -"you use wildcards in it!" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:460 -msgid "B(8), B(8)" -msgstr "" - -# type: Plain text -#~ msgid "" -#~ "build() {\n" -#~ " cd $startdir/src/$pkgname-$pkgver\n" -#~ " ./configure --prefix=/usr --enable-insmod-static\n" -#~ " make || return 1\n" -#~ " make prefix=$startdir/pkg/usr install\n" -#~ " mv $startdir/pkg/usr/sbin $startdir/pkg\n" -#~ " mkdir -p $startdir/pkg/etc\n" -#~ " cp ../modules.conf $startdir/pkg/etc\n" -#~ "}\n" -#~ msgstr "" -#~ "build() {\n" -#~ " cd $startdir/src/$pkgname-$pkgver\n" -#~ " ./configure --prefix=/usr --enable-insmod-static\n" -#~ " make || return 1\n" -#~ " make prefix=$startdir/pkg/usr install\n" -#~ " mv $startdir/pkg/usr/sbin $startdir/pkg\n" -#~ " mkdir -p $startdir/pkg/etc\n" -#~ " cp ../modules.conf $startdir/pkg/etc\n" -#~ "}\n" - -# type: Plain text -#~ msgid "make DESTDIR=$startdir/pkg install\n" -#~ msgstr "make DESTDIR=$startdir/pkg install\n" - -# type: Plain text -#~ msgid "or\n" -#~ msgstr "vagy\n" - -# type: Plain text -#~ msgid "make prefix=$startdir/pkg/usr install\n" -#~ msgstr "make prefix=$startdir/pkg/usr install\n" diff --git a/doc/po/pacman-g2.pot b/doc/po/pacman-g2.pot deleted file mode 100644 index 7552d2d..0000000 --- a/doc/po/pacman-g2.pot +++ /dev/null @@ -1,2351 +0,0 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-11-21 12:51+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: ENCODING" - -# type: TH -#: pacman.8:1 -#, no-wrap -msgid "pacman" -msgstr "" - -# type: TH -#: pacman.8:1 -#, no-wrap -msgid "January 21, 2006" -msgstr "" - -# type: TH -#: pacman.8:1 -#, no-wrap -msgid "Frugalware User Manual" -msgstr "" - -# type: SH -#: pacman.8:2 makepkg.8:2 FrugalBuild.8:2 -#, no-wrap -msgid "NAME" -msgstr "" - -# type: Plain text -#: pacman.8:4 -msgid "pacman - package manager utility" -msgstr "" - -# type: SH -#: pacman.8:4 makepkg.8:4 -#, no-wrap -msgid "SYNOPSIS" -msgstr "" - -# type: Plain text -#: pacman.8:6 -msgid "BoperationE [options] EpackageE [package] ...>" -msgstr "" - -# type: SH -#: pacman.8:6 makepkg.8:6 FrugalBuild.8:4 -#, no-wrap -msgid "DESCRIPTION" -msgstr "" - -# type: Plain text -#: pacman.8:11 -msgid "" -"B is a I utility that tracks installed packages " -"on a linux system. It has simple dependency support and the ability to " -"connect to a remote ftp server and automatically upgrade packages on the " -"local system. pacman package are I format." -msgstr "" - -# type: SH -#: pacman.8:11 -#, no-wrap -msgid "OPERATIONS" -msgstr "" - -# type: TP -#: pacman.8:12 -#, no-wrap -msgid "B<-A, --add>" -msgstr "" - -# type: Plain text -#: pacman.8:16 -msgid "" -"Add a package to the system. Package will be uncompressed into the " -"installation root and the database will be updated." -msgstr "" - -# type: TP -#: pacman.8:16 -#, no-wrap -msgid "B<-F, --freshen>" -msgstr "" - -# type: Plain text -#: pacman.8:20 -msgid "" -"This is like --upgrade except that, unlike --upgrade, this will only upgrade " -"packages that are already installed on your system." -msgstr "" - -# type: TP -#: pacman.8:20 -#, no-wrap -msgid "B<-Q, --query>" -msgstr "" - -# type: Plain text -#: pacman.8:28 -msgid "" -"Query the package database. This operation allows you to view installed " -"packages and their files, as well as meta-info about individual packages " -"(dependencies, conflicts, install date, build date, size). This can be run " -"against the local package database or can be used on individual .fpm " -"packages. See B below." -msgstr "" - -# type: TP -#: pacman.8:28 -#, no-wrap -msgid "B<-c, --changelog>" -msgstr "" - -# type: Plain text -#: pacman.8:31 -msgid "View the changelog of a package." -msgstr "" - -# type: TP -#: pacman.8:31 -#, no-wrap -msgid "B<-R, --remove>" -msgstr "" - -# type: Plain text -#: pacman.8:38 -msgid "" -"Remove a package from the system. Files belonging to the specified package " -"will be deleted, and the database will be updated. Most configuration files " -"will be saved with a I<.pacsave> extension unless the B<--nosave> option was " -"used." -msgstr "" - -# type: TP -#: pacman.8:38 -#, no-wrap -msgid "B<-S, --sync>" -msgstr "" - -# type: Plain text -#: pacman.8:45 -msgid "" -"Synchronize packages. With this function you can install packages directly " -"from the ftp servers, complete with all dependencies required to run the " -"packages. For example, B will download qt and all the " -"packages it depends on and install them. You could also use B to " -"upgrade all packages that are out of date (see below)." -msgstr "" - -# type: TP -#: pacman.8:45 -#, no-wrap -msgid "B<-U, --upgrade>" -msgstr "" - -# type: Plain text -#: pacman.8:50 -msgid "" -"Upgrade a package. This is essentially a \"remove-then-add\" process. See " -"B for an explanation on how pacman takes care of " -"config files." -msgstr "" - -# type: TP -#: pacman.8:50 -#, no-wrap -msgid "B<-V, --version>" -msgstr "" - -# type: Plain text -#: pacman.8:53 -msgid "Display version and exit." -msgstr "" - -# type: TP -#: pacman.8:53 makepkg.8:61 -#, no-wrap -msgid "B<-h, --help>" -msgstr "" - -# type: Plain text -#: pacman.8:57 -msgid "" -"Display syntax for the given operation. If no operation was supplied then " -"the general syntax is shown." -msgstr "" - -# type: SH -#: pacman.8:57 makepkg.8:19 -#, no-wrap -msgid "OPTIONS" -msgstr "" - -# type: TP -#: pacman.8:58 makepkg.8:38 -#, no-wrap -msgid "B<-d, --nodeps>" -msgstr "" - -# type: Plain text -#: pacman.8:64 -msgid "" -"Skips all dependency checks. Normally, pacman will always check a package's " -"dependency fields to ensure that all dependencies are installed and there " -"are no package conflicts in the system. This switch disables these checks." -msgstr "" - -# type: TP -#: pacman.8:64 makepkg.8:51 -#, no-wrap -msgid "B<-f, --force>" -msgstr "" - -# type: Plain text -#: pacman.8:70 -msgid "" -"Bypass file conflict checks, overwriting conflicting files. If the package " -"that is about to be installed contains files that are already installed, " -"this option will cause all those files to be overwritten. This option " -"should be used with care, ideally not at all." -msgstr "" - -# type: TP -#: pacman.8:70 -#, no-wrap -msgid "B<-r, --root EpathE>" -msgstr "" - -# type: Plain text -#: pacman.8:79 -msgid "" -"Specify alternative installation root (default is \"/\"). This should I " -"be used as a way to install software into e.g. /usr/local instead of " -"/usr. Instead this should be used if you want to install a package on a " -"temporary mounted partition, which is \"owned\" by another system. By using " -"this option you not only specify where the software should be installed, but " -"you also specify which package database to use." -msgstr "" - -# type: TP -#: pacman.8:79 -#, no-wrap -msgid "B<-v, --verbose>" -msgstr "" - -# type: Plain text -#: pacman.8:82 -msgid "Output more status and error messages." -msgstr "" - -# type: TP -#: pacman.8:82 -#, no-wrap -msgid "B<--config EpathE>" -msgstr "" - -# type: Plain text -#: pacman.8:85 -msgid "Specify an alternate configuration file." -msgstr "" - -# type: TP -#: pacman.8:85 makepkg.8:127 -#, no-wrap -msgid "B<--noconfirm>" -msgstr "" - -# type: Plain text -#: pacman.8:89 -msgid "" -"Bypass any and all \"Are you sure?\" messages. It's not a good idea to do " -"this unless you want to run pacman from a script." -msgstr "" - -# type: TP -#: pacman.8:89 -#, no-wrap -msgid "B<--ask EnumberE>" -msgstr "" - -# type: Plain text -#: pacman.8:94 -msgid "" -"Finetune the --noconfirm switch by not answering \"yes\" to all libpacman " -"questions, but you are able to specify yes/no for all type of libpacman " -"questions. The types are the followings:" -msgstr "" - -# type: Plain text -#: pacman.8:101 -#, no-wrap -msgid "" -"The given package is in IgnorePkg. (1)\n" -"Replace package foo with bar? (2)\n" -"foo conflicts with bar. Remove bar? (4)\n" -"Do you want to delete the corrupted package? (8)\n" -"Local version is newer. (16)\n" -"Local version is up to date. (32)\n" -msgstr "" - -# type: Plain text -#: pacman.8:104 -msgid "" -"Select for what types do you want to answer yes, sum up the values and use " -"the result as a parameter to this option." -msgstr "" - -# type: TP -#: pacman.8:104 makepkg.8:132 -#, no-wrap -msgid "B<--noprogressbar>" -msgstr "" - -# type: Plain text -#: pacman.8:108 -msgid "" -"Do not show a progress bar when downloading files. This can be useful for " -"scripts that call pacman and capture the output." -msgstr "" - -# type: SH -#: pacman.8:108 -#, no-wrap -msgid "SYNC OPTIONS" -msgstr "" - -# type: TP -#: pacman.8:109 makepkg.8:30 -#, no-wrap -msgid "B<-c, --clean>" -msgstr "" - -# type: Plain text -#: pacman.8:116 -msgid "" -"Remove old packages from the cache. When pacman downloads packages, it " -"saves them in I. If you need to free up diskspace, " -"you can remove these packages by using the --clean option. Using one " -"--clean (or -c) switch will only remove I packages. Use it twice to " -"remove I packages from the cache." -msgstr "" - -# type: TP -#: pacman.8:116 -#, no-wrap -msgid "B<-e, --dependsonly>" -msgstr "" - -# type: Plain text -#: pacman.8:121 -msgid "" -"Don't install the packages itself, only their dependencies. This can be " -"handy if you want to install the packages themselves with different options " -"or from source." -msgstr "" - -# type: TP -#: pacman.8:121 pacman.8:191 -#, no-wrap -msgid "B<-g, --groups>" -msgstr "" - -# type: Plain text -#: pacman.8:125 -msgid "" -"Display all the members for each package group specified. If no group names " -"are provided, all groups will be listed." -msgstr "" - -# type: TP -#: pacman.8:125 pacman.8:195 -#, no-wrap -msgid "B<-i, --info>" -msgstr "" - -# type: Plain text -#: pacman.8:130 -msgid "" -"Display dependency information for a given package. This will search " -"through all repositories for a matching package and display the " -"dependencies, conflicts, etc." -msgstr "" - -# type: TP -#: pacman.8:130 pacman.8:199 -#, no-wrap -msgid "B<-l, --list>" -msgstr "" - -# type: Plain text -#: pacman.8:134 -msgid "" -"List all files in the specified repositories. Multiple repositories can be " -"specified on the command line." -msgstr "" - -# type: TP -#: pacman.8:134 -#, no-wrap -msgid "B<-p, --print-uris>" -msgstr "" - -# type: Plain text -#: pacman.8:139 -msgid "" -"Print out URIs for each package that will be installed, including any " -"dependencies that have yet to be installed. These can be piped to a file " -"and downloaded at a later time, using a program like wget." -msgstr "" - -# type: TP -#: pacman.8:139 pacman.8:215 -#, no-wrap -msgid "B<-s, --search EregexpE>" -msgstr "" - -# type: Plain text -#: pacman.8:143 -msgid "" -"This will search each package in the package list for names or descriptions " -"that contains EregexpE." -msgstr "" - -# type: TP -#: pacman.8:143 -#, no-wrap -msgid "B<-u, --sysupgrade>" -msgstr "" - -# type: Plain text -#: pacman.8:151 -msgid "" -"Upgrades all packages that are out of date. pacman will examine every " -"package installed on the system, and if a newer package exists on the server " -"it will upgrade. pacman will present a report of all packages it wants to " -"upgrade and will not proceed without user confirmation. Dependencies are " -"automatically resolved at this level and will be installed/upgraded if " -"necessary." -msgstr "" - -# type: TP -#: pacman.8:151 -#, no-wrap -msgid "B<-w, --downloadonly>" -msgstr "" - -# type: Plain text -#: pacman.8:154 -msgid "Retrieve all packages from the server, but do not install/upgrade anything." -msgstr "" - -# type: TP -#: pacman.8:154 -#, no-wrap -msgid "B<-y, --refresh>" -msgstr "" - -# type: Plain text -#: pacman.8:159 -msgid "" -"Download a fresh copy of the master package list from the ftp server defined " -"in I. This should typically be used each time you use " -"B<--sysupgrade>." -msgstr "" - -# type: TP -#: pacman.8:159 -#, no-wrap -msgid "B<--ignore EpkgE>" -msgstr "" - -# type: Plain text -#: pacman.8:164 -msgid "" -"This option functions exactly the same as the B configuration " -"directive. Sometimes it can be handy to skip some package updates without " -"having to edit I each time." -msgstr "" - -# type: SH -#: pacman.8:164 -#, no-wrap -msgid "REMOVE OPTIONS" -msgstr "" - -# type: TP -#: pacman.8:165 -#, no-wrap -msgid "B<-c, --cascade>" -msgstr "" - -# type: Plain text -#: pacman.8:169 -msgid "" -"Remove all target packages, as well as all packages that depend on one or " -"more target packages. This operation is recursive." -msgstr "" - -# type: TP -#: pacman.8:169 -#, no-wrap -msgid "B<-k, --keep>" -msgstr "" - -# type: Plain text -#: pacman.8:172 -msgid "Removes the database entry only. Leaves all files in place." -msgstr "" - -# type: TP -#: pacman.8:172 -#, no-wrap -msgid "B<-n, --nosave>" -msgstr "" - -# type: Plain text -#: pacman.8:179 -msgid "" -"Instructs pacman to ignore file backup designations. Normally, when a file " -"is about to be I from the system the database is first checked to " -"see if the file should be renamed to a .pacsave extension. If B<--nosave> " -"is used, these designations are ignored and the files are removed." -msgstr "" - -# type: TP -#: pacman.8:179 -#, no-wrap -msgid "B<-s, --recursive>" -msgstr "" - -# type: Plain text -#: pacman.8:185 -msgid "" -"For each target specified, remove it and all its dependencies, provided that " -"(A) they are not required by other packages; and (B) they were not " -"explicitly installed by the user. This option is analagous to a backwards " -"--sync operation." -msgstr "" - -# type: SH -#: pacman.8:185 -#, no-wrap -msgid "QUERY OPTIONS" -msgstr "" - -# type: TP -#: pacman.8:186 -#, no-wrap -msgid "B<-e, --orphans>" -msgstr "" - -# type: Plain text -#: pacman.8:191 -msgid "" -"List all packages that were installed as a dependency (ie, not installed " -"explicitly) and are not required by any other packages." -msgstr "" - -# type: Plain text -#: pacman.8:195 -msgid "" -"Display all groups that a specified package is part of. If no package names " -"are provided, all groups and members will be listed." -msgstr "" - -# type: Plain text -#: pacman.8:199 -msgid "" -"Display information on a given package. If it is used with the B<-p> option " -"then the .PKGINFO file will be printed." -msgstr "" - -# type: Plain text -#: pacman.8:203 -msgid "" -"List all files owned by EpackageE. Multiple packages can be " -"specified on the command line." -msgstr "" - -# type: TP -#: pacman.8:203 -#, no-wrap -msgid "B<-m, --foreign>" -msgstr "" - -# type: Plain text -#: pacman.8:207 -msgid "" -"List all packages that were not found in the sync database(s). Typically " -"these are packages that were downloaded manually and installed with --add." -msgstr "" - -# type: TP -#: pacman.8:207 -#, no-wrap -msgid "B<-o, --owns EfileE>" -msgstr "" - -# type: Plain text -#: pacman.8:210 -msgid "Search for the package that owns EfileE." -msgstr "" - -# type: TP -#: pacman.8:210 -#, no-wrap -msgid "B<-p, --file>" -msgstr "" - -# type: Plain text -#: pacman.8:215 -msgid "" -"Tells pacman that the package supplied on the command line is a file, not an " -"entry in the database. Pacman will decompress the file and query it. This " -"is useful with B<--info> and B<--list>." -msgstr "" - -# type: Plain text -#: pacman.8:219 -msgid "" -"This will search each locally-installed package for names or descriptions " -"that contains EregexpE." -msgstr "" - -# type: SH -#: pacman.8:219 -#, no-wrap -msgid "HANDLING CONFIG FILES" -msgstr "" - -# type: Plain text -#: pacman.8:226 -msgid "" -"pacman uses the same logic as rpm to determine action against files that are " -"designated to be backed up. During an upgrade, it uses 3 md5 hashes for " -"each backup file to determine the required action: one for the original file " -"installed, one for the new file that's about to be installed, and one for " -"the actual file existing on the filesystem. After comparing these 3 hashes, " -"the follow scenarios can result:" -msgstr "" - -# type: TP -#: pacman.8:226 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:229 -msgid "All three files are the same, so we win either way. Install the new file." -msgstr "" - -# type: TP -#: pacman.8:229 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:234 -msgid "" -"The current file is un-altered from the original but the new one is " -"different. Since the user did not ever modify the file, and the new one may " -"contain improvements/bugfixes, we install the new file." -msgstr "" - -# type: TP -#: pacman.8:234 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:239 -msgid "" -"Both package versions contain the exact same file, but the one on the " -"filesystem has been modified since. In this case, we leave the current file " -"in place." -msgstr "" - -# type: TP -#: pacman.8:239 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:242 -msgid "" -"The new one is identical to the current one. Win win. Install the new " -"file." -msgstr "" - -# type: TP -#: pacman.8:242 -#, no-wrap -msgid "original=B, current=B, new=B" -msgstr "" - -# type: Plain text -#: pacman.8:247 -msgid "" -"All three files are different, so we install the new file with a .pacnew " -"extension and warn the user, so she can manually move the file into place " -"after making any necessary customizations." -msgstr "" - -# type: SH -#: pacman.8:247 makepkg.8:137 -#, no-wrap -msgid "CONFIGURATION" -msgstr "" - -# type: Plain text -#: pacman.8:253 -msgid "" -"pacman will attempt to read I each time it is invoked. " -"This configuration file is divided into sections or I. Each " -"section defines a package repository that pacman can use when searching for " -"packages in --sync mode. The exception to this is the I section, " -"which defines global options." -msgstr "" - -# type: SH -#: pacman.8:254 -#, no-wrap -msgid "Example:" -msgstr "" - -# type: Plain text -#: pacman.8:260 -#, no-wrap -msgid "" -"[options]\n" -"NoUpgrade = etc/passwd etc/group etc/shadow\n" -"NoUpgrade = etc/fstab\n" -msgstr "" - -# type: Plain text -#: pacman.8:262 -#, no-wrap -msgid "Include = /etc/pacman.d/current\n" -msgstr "" - -# type: Plain text -#: pacman.8:265 -#, no-wrap -msgid "" -"[custom]\n" -"Server = file:///home/pkgs\n" -msgstr "" - -# type: SH -#: pacman.8:268 -#, no-wrap -msgid "CONFIG: OPTIONS" -msgstr "" - -# type: TP -#: pacman.8:269 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:273 -msgid "" -"Overrides the default location of the toplevel database directory. The " -"default is I." -msgstr "" - -# type: TP -#: pacman.8:273 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:277 -msgid "" -"Overrides the default location of the package cache directory. The default " -"is I." -msgstr "" - -# type: TP -#: pacman.8:277 -#, no-wrap -msgid "BpackageE [package] ...>" -msgstr "" - -# type: Plain text -#: pacman.8:281 -msgid "" -"If a user tries to B<--remove> a package that's listed in HoldPkg, pacman " -"will ask for confirmation before proceeding." -msgstr "" - -# type: TP -#: pacman.8:281 -#, no-wrap -msgid "BpackageE [package] ...>" -msgstr "" - -# type: Plain text -#: pacman.8:285 -msgid "" -"Instructs pacman to ignore any upgrades for this package when performing a " -"B<--sysupgrade>." -msgstr "" - -# type: TP -#: pacman.8:285 -#, no-wrap -msgid "BnumberE>" -msgstr "" - -# type: Plain text -#: pacman.8:289 -msgid "" -"Upgrade only the packages that are at least EnumberE days old when " -"performing a B<--sysupgrade>." -msgstr "" - -# type: TP -#: pacman.8:289 -#, no-wrap -msgid "BnumberE>" -msgstr "" - -# type: Plain text -#: pacman.8:293 -msgid "" -"Try to download packages EnumberE times. This is useful in case you " -"have a bad internet connection and your packages often get corrupted during " -"the download." -msgstr "" - -# type: TP -#: pacman.8:293 -#, no-wrap -msgid "BpathE>" -msgstr "" - -# type: Plain text -#: pacman.8:297 -msgid "" -"Include another config file. This config file can include repositories or " -"general configuration options." -msgstr "" - -# type: TP -#: pacman.8:297 -#, no-wrap -msgid "Bhost|ipE[:port]>" -msgstr "" - -# type: Plain text -#: pacman.8:300 -msgid "If set, pacman will use this proxy server for all ftp/http transfers." -msgstr "" - -# type: TP -#: pacman.8:300 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:306 -msgid "" -"If set, pacman will use this external program to download all remote files. " -"All instances of B<%u> will be replaced with the URL to be downloaded. If " -"present, instances of B<%o> will be replaced with the local filename, plus a " -"\".part\" extension, which allows programs like wget to do file resumes " -"properly." -msgstr "" - -# type: Plain text -#: pacman.8:310 -msgid "" -"This option is useful for users who experience problems with pacman's " -"built-in http/ftp support, or need the more advanced proxy support that " -"comes with utilities like wget." -msgstr "" - -# type: TP -#: pacman.8:310 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:313 -msgid "" -"Disables passive ftp connections when downloading packages. (aka Active " -"Mode)" -msgstr "" - -# type: TP -#: pacman.8:313 -#, no-wrap -msgid "BfileE [file] ...>" -msgstr "" - -# type: Plain text -#: pacman.8:317 -msgid "" -"All files listed with a B directive will never be touched during " -"a package install/upgrade. I do not include the leading slash when " -"specifying files." -msgstr "" - -# type: TP -#: pacman.8:317 -#, no-wrap -msgid "BfileE [file] ...>" -msgstr "" - -# type: Plain text -#: pacman.8:324 -msgid "" -"All files listed with a B directive will never be extracted from " -"a package into the filesystem. This can be useful when you don't want part " -"of a package to be installed. For example, if your httpd root uses an " -"index.php, then you would not want the index.html file to be extracted from " -"the apache package." -msgstr "" - -# type: TP -#: pacman.8:324 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:328 -msgid "" -"Log action messages through syslog(). This will insert pacman log entries " -"into your /var/log/messages or equivalent." -msgstr "" - -# type: TP -#: pacman.8:328 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: pacman.8:331 -msgid "Log actions directly to a file, usually /var/log/pacman.log." -msgstr "" - -# type: SH -#: pacman.8:332 -#, no-wrap -msgid "CONFIG: REPOSITORIES" -msgstr "" - -# type: Plain text -#: pacman.8:339 -msgid "" -"Each repository section defines a section name and at least one location " -"where the packages can be found. The section name is defined by the string " -"within square brackets (eg, the two above are 'current' and 'custom'). " -"Locations are defined with the I directive and follow a URL naming " -"structure. Currently only ftp is supported for remote servers. If you want " -"to use a local directory, you can specify the full path with a 'file://' " -"prefix, as shown above." -msgstr "" - -# type: SH -#: pacman.8:339 -#, no-wrap -msgid "USING YOUR OWN REPOSITORY" -msgstr "" - -# type: Plain text -#: pacman.8:343 -msgid "" -"Let's say you have a bunch of custom packages in I and their " -"respective FrugalBuild files are all in I. All you need to " -"do is generate a compressed package database in the I directory " -"so pacman can find it when run with --refresh." -msgstr "" - -# type: Plain text -#: pacman.8:347 -#, no-wrap -msgid "# gensync /var/fst/local /home/pkgs/custom.fdb\n" -msgstr "" - -# type: Plain text -#: pacman.8:357 -msgid "" -"The above command will read all FrugalBuild files in /var/fst/local and " -"generate a compressed database called /home/pkgs/custom.fdb. Note that the " -"database must be of the form I<{treename}.fdb>, where {treename} is the name " -"of the section defined in the configuration file. That's it! Now configure " -"your I section in the configuration file as shown in the config " -"example above. Pacman will now use your package repository. If you add new " -"packages to the repository, remember to re-generate the database and use " -"pacman's --refresh option." -msgstr "" - -# type: SH -#: pacman.8:357 makepkg.8:145 FrugalBuild.8:457 -#, no-wrap -msgid "SEE ALSO" -msgstr "" - -# type: Plain text -#: pacman.8:359 -msgid "B is the package-building tool that comes with pacman." -msgstr "" - -# type: SH -#: pacman.8:359 makepkg.8:148 FrugalBuild.8:460 -#, no-wrap -msgid "AUTHOR" -msgstr "" - -# type: Plain text -#: pacman.8:363 makepkg.8:152 FrugalBuild.8:464 -#, no-wrap -msgid "" -"Judd Vinet Ejvinet@zeroflux.orgE\n" -"and the Frugalware developers Efrugalware-devel@frugalware.orgE\n" -msgstr "" - -# type: TH -#: makepkg.8:1 -#, no-wrap -msgid "makepkg" -msgstr "" - -# type: TH -#: makepkg.8:1 -#, no-wrap -msgid "January 30, 2006" -msgstr "" - -# type: TH -#: makepkg.8:1 FrugalBuild.8:1 -#, no-wrap -msgid "Frugalware Developer Manual" -msgstr "" - -# type: Plain text -#: makepkg.8:4 -msgid "makepkg - package build utility" -msgstr "" - -# type: Plain text -#: makepkg.8:6 -msgid "B" -msgstr "" - -# type: Plain text -#: makepkg.8:15 -msgid "" -"B will build packages for you. All it needs is a build-capable " -"linux platform, wget, and some build scripts. The advantage to a " -"script-based build is that you only really do the work once. Once you have " -"the build script for a package, you just need to run makepkg and it will do " -"the rest: download and validate source files, check dependencies, configure " -"the buildtime settings, build the package, install the package into a " -"temporary root, make customizations, generate meta-info, and package the " -"whole thing up for B to use." -msgstr "" - -# type: Plain text -#: makepkg.8:18 -msgid "" -"B can be used to rebuild an entire package group or the entire " -"build tree. See B for syntax." -msgstr "" - -# type: TP -#: makepkg.8:20 -#, no-wrap -msgid "B<-b, --builddeps>" -msgstr "" - -# type: Plain text -#: makepkg.8:27 -msgid "" -"Build missing dependencies from source. When makepkg finds missing " -"build-time or run-time dependencies, it will look for the dependencies' " -"FrugalBuild files under $fst_root (set in your /etc/repoman.conf). If it " -"finds them it will run another copy of makepkg to build and install the " -"missing dependencies. The child makepkg calls will be made with the B<-b> " -"and B<-i> options." -msgstr "" - -# type: TP -#: makepkg.8:27 -#, no-wrap -msgid "B<-B, --noccache>" -msgstr "" - -# type: Plain text -#: makepkg.8:30 -msgid "Do not use ccache during build." -msgstr "" - -# type: Plain text -#: makepkg.8:33 -msgid "Clean up leftover work files/directories after a successful build." -msgstr "" - -# type: TP -#: makepkg.8:33 -#, no-wrap -msgid "B<-C, --cleancache>" -msgstr "" - -# type: Plain text -#: makepkg.8:38 -msgid "" -"Used with --chroot cleans up the chroot which means removing unnecessary " -"packages from it. If used twice, then it removes all source files from the " -"cache directory and cleans up the full compiler cache to free up diskspace." -msgstr "" - -# type: Plain text -#: makepkg.8:43 -msgid "" -"Do not perform any dependency checks. This will let you override/ignore any " -"dependencies required. There's a good chance this option will break the " -"build process if all of the dependencies aren't installed." -msgstr "" - -# type: TP -#: makepkg.8:43 -#, no-wrap -msgid "B<-D EpkgnameE>" -msgstr "" - -# type: Plain text -#: makepkg.8:46 -msgid "Clean up only one package's compiler cache. (Uses ccache -C.)" -msgstr "" - -# type: TP -#: makepkg.8:46 -#, no-wrap -msgid "B<-e, --noextract>" -msgstr "" - -# type: Plain text -#: makepkg.8:51 -msgid "" -"Do not extract source files. Instead, use whatever already exists in the " -"src/ directory. This is handy if you want to go into src and manually " -"patch/tweak code, then make a package out of the result." -msgstr "" - -# type: Plain text -#: makepkg.8:56 -msgid "" -"B will not build a package if a I " -"file already exists in the build directory. You can override this behaviour " -"with the B<--force> switch." -msgstr "" - -# type: TP -#: makepkg.8:56 -#, no-wrap -msgid "B<-g, --gensha1>" -msgstr "" - -# type: Plain text -#: makepkg.8:61 -msgid "" -"Download all source files (if required) and use I to generate sha1 " -"hashes for each of them. You can then redirect the output into your " -"FrugalBuild for source validation (makepkg -g EEFrugalBuild)." -msgstr "" - -# type: Plain text -#: makepkg.8:64 -msgid "Output syntax and commandline options." -msgstr "" - -# type: TP -#: makepkg.8:64 -#, no-wrap -msgid "B<-i, --install>" -msgstr "" - -# type: Plain text -#: makepkg.8:67 -msgid "Install/Upgrade the package after a successful build." -msgstr "" - -# type: TP -#: makepkg.8:67 -#, no-wrap -msgid "B<-j EjobsE>" -msgstr "" - -# type: Plain text -#: makepkg.8:71 -msgid "" -"Sets MAKEFLAGS=\"-jEjobsE\" before building the package. This is " -"useful for overriding the MAKEFLAGS setting in /etc/makepkg.conf." -msgstr "" - -# type: TP -#: makepkg.8:71 -#, no-wrap -msgid "B<-k, --logging>" -msgstr "" - -# type: Plain text -#: makepkg.8:74 -msgid "Logging package build process" -msgstr "" - -# type: TP -#: makepkg.8:74 -#, no-wrap -msgid "B<-l EpkgnameE>" -msgstr "" - -# type: Plain text -#: makepkg.8:79 -msgid "" -"Download the package's buildscript before starting the build. This is " -"useful if you do not want to do a full 'repoman upd' nor want to download " -"manually the buildscript." -msgstr "" - -# type: TP -#: makepkg.8:79 -#, no-wrap -msgid "B<-m, --nocolor>" -msgstr "" - -# type: Plain text -#: makepkg.8:82 -msgid "Disable color in output messages" -msgstr "" - -# type: TP -#: makepkg.8:82 -#, no-wrap -msgid "B<-n, --nostrip>" -msgstr "" - -# type: Plain text -#: makepkg.8:85 -msgid "Do not strip binaries and libraries." -msgstr "" - -# type: TP -#: makepkg.8:85 -#, no-wrap -msgid "B<-o, --nobuild>" -msgstr "" - -# type: Plain text -#: makepkg.8:88 -msgid "Download and extract files only, do not build." -msgstr "" - -# type: TP -#: makepkg.8:88 -#, no-wrap -msgid "B<-p EbuildscriptE>" -msgstr "" - -# type: Plain text -#: makepkg.8:91 -msgid "" -"Read the package script IbuildscriptE> instead of the default " -"(I)." -msgstr "" - -# type: TP -#: makepkg.8:91 -#, no-wrap -msgid "B<-r, --rmdeps>" -msgstr "" - -# type: Plain text -#: makepkg.8:95 -msgid "" -"Upon successful build, remove any dependencies installed by makepkg/pacman " -"during dependency auto-resolution (using B<-b> or B<-s>)." -msgstr "" - -# type: TP -#: makepkg.8:95 -#, no-wrap -msgid "B<-R, --chroot>" -msgstr "" - -# type: Plain text -#: makepkg.8:99 -msgid "" -"Build the package in a chroot environment. This is the default except if -g " -"or -o is used." -msgstr "" - -# type: TP -#: makepkg.8:99 -#, no-wrap -msgid "B<-H, --host>" -msgstr "" - -# type: Plain text -#: makepkg.8:102 -msgid "Build the package on the host system. The opposite of the -R option." -msgstr "" - -# type: TP -#: makepkg.8:102 -#, no-wrap -msgid "B<-s, --syncdeps>" -msgstr "" - -# type: Plain text -#: makepkg.8:108 -msgid "" -"Install missing dependencies using pacman. When makepkg finds missing " -"build-time or run-time dependencies, it will run pacman to try and resolve " -"them. If successful, pacman will download the missing packages from a " -"package repository and install them for you." -msgstr "" - -# type: TP -#: makepkg.8:108 -#, no-wrap -msgid "B<-t EtreeE>" -msgstr "" - -# type: Plain text -#: makepkg.8:113 -msgid "" -"When building in a chroot (using -R) you may want to build packages for a " -"version other than the host one. Using this option, it's possible to build " -"packages for \"stable\" while the host system is \"current\" and vica versa." -msgstr "" - -# type: TP -#: makepkg.8:113 -#, no-wrap -msgid "B<-u, --noup2date>" -msgstr "" - -# type: Plain text -#: makepkg.8:122 -msgid "" -"Do not check for newer version before starting build. Normally makepkg will " -"prevent you from building obsolete source by mistake. If you know what you " -"are doing, you can disable this feature with this switch. B<-S, --sudosync> " -"Install missing dependencies using pacman and sudo. This is the same as " -"B<-s> except that makepkg will call pacman with sudo. This means you don't " -"have to build as root to use dependency auto-resolution." -msgstr "" - -# type: TP -#: makepkg.8:123 -#, no-wrap -msgid "B<-w EdestdirE>" -msgstr "" - -# type: Plain text -#: makepkg.8:127 -msgid "" -"Write the resulting package file to the directory IdestdirE> " -"instead of the current working directory." -msgstr "" - -# type: Plain text -#: makepkg.8:132 -msgid "" -"When calling pacman to resolve dependencies or conflicts, makepkg can pass " -"the I<--noconfirm> option to it so it does not wait for any user input " -"before proceeding with operations." -msgstr "" - -# type: Plain text -#: makepkg.8:136 -msgid "" -"When calling pacman, makepkg can pass the I<--noprogressbar> option to it. " -"This is useful if one is directing makepkg's output to a non-terminal (ie, a " -"file)." -msgstr "" - -# type: Plain text -#: makepkg.8:142 -msgid "" -"Configuration options are stored in I. This file is " -"parsed as a bash script, so you can export any special compiler flags you " -"wish to use. This is helpful for building for different architectures, or " -"with different optimizations." -msgstr "" - -# type: Plain text -#: makepkg.8:145 -msgid "" -"B This does not guarantee that all package Makefiles will use your " -"exported variables. Some of them are flaky..." -msgstr "" - -# type: Plain text -#: makepkg.8:148 -msgid "B(8), B(8)" -msgstr "" - -# type: TH -#: FrugalBuild.8:1 -#, no-wrap -msgid "FrugalBuild" -msgstr "" - -# type: TH -#: FrugalBuild.8:1 -#, no-wrap -msgid "June 13, 2006" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:4 -msgid "FrugalBuild - Frugalware package builder descriptor" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:8 -msgid "" -"This manual page is meant to describe general rules about FrugalBuilds. If " -"you're interested in the package builder B itself, then see its " -"manual page, not this one." -msgstr "" - -# type: SH -#: FrugalBuild.8:11 -#, no-wrap -msgid "FrugalBuild Example:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:17 -#, no-wrap -msgid "" -"# Last Modified: Sun, 19 Jun 2005 15:24:32 +0000\n" -"# Compiling Time: 0.17 SBU\n" -"# Maintainer: Name Eemail@addr.essE\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:27 -#, no-wrap -msgid "" -"pkgname=dvdauthor\n" -"pkgver=0.6.11\n" -"pkgrel=3\n" -"pkgdesc=\"Will generate a DVD movie from a valid mpeg2 stream\"\n" -"depends=('imagemagick' 'libdvdread')\n" -"Finclude sourceforge\n" -"groups=('xapps')\n" -"archs=('i686' 'x86_64')\n" -"sha1sums=('a99ea7ef6e50646b77ad47a015127925053d34ea')\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:29 -#, no-wrap -msgid "# optimization OK\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:34 -msgid "" -"As you can see, the setup is fairly simple. The first line tracks the time " -"of the last update, this is automatically updated after a successful build." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:37 -msgid "" -"The next line defines its build time. Of course, it depends on your " -"hardware, so we use SBUs instead of minutes as a unit." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:42 -msgid "" -"SBU is the Static Binutils Unit, which means the time \"repoman merge " -"binutils\" takes on your machine. By default makepkg will print out how many " -"seconds the build took. After you have built binutils, you should update " -"your /etc/makepkg.conf:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:44 -msgid "SBU=\"257\"" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:48 -msgid "" -"The line above means compiling binutils on your machine took 257 seconds. " -"Starting from this point, makepkg will print out SBUs instead of seconds " -"after successful builds, and this SBU value will be equal on everyone's " -"machine." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:55 -msgid "" -"If you wish to maintain the package, write your name or nick and e-mail " -"address on the third line. If you just wrote the FrugalBuild don't plan to " -"maintain the package , then write Contributor instead of Maintainer, and " -"then someone can take it and will add his/her line later. Other lines like " -"\"Modified by\" are not allowed. Use the darcs patch comments to mention " -"others if you wish." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:63 -msgid "" -"pkgname defines the package name. It should not contain any uppercase " -"letters. The package version defines the upstream version, while the " -"package release tracks the Frugalware-specific changes. pkgrel should be an " -"integer, pkgrels like 5wanda1 are reserved for security updates. There the " -"rule is the following: If the original package's pkgrel was 4, then " -"increment it once when you add a security patch, but then use 5wanda1, " -"5wanda2 and so on. This way the user can easily upgrade to pkgrel=5 which is " -"in -current." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:66 -msgid "" -"pkgdesc is a short one-line description for the package. Usually taken from " -"the project's homepage or manpage. Try to keep the length under 80 chars." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:71 -msgid "" -"depends() is a bash array which defines the dependencies of the package. " -"depends() lists those packages required for building and using the current " -"one. If the dependency is runtime-only, then use rodepends(), if " -"buildtime-only then use makedepends()." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:80 -msgid "" -"The next line is a special Finclude command which allows you to inherit any " -"directive from a FrugalBuild scheme. They can be found in the FST, under " -"/source/include. The \"util\" scheme is always included, since its provided " -"functions are used by almost every FrugalBuild. Look at the " -"/source/include/sourceforge.sh, it provides the url, up2date and source() " -"directives, so we don't have to specify them here. After the Finclude you " -"can overwrite the inherited directives, for example define a custom up2date " -"if the inherited one is not suitable for you." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:84 -msgid "" -"The groups() array's first element is mandatory, and it should be a valid " -"\"first group\". This means it should be in a foo or foo-extra format, where " -"foo or foo-extra is a dir under /source in the FST." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:93 -msgid "" -"The archs() array defines for which architectures the given package is " -"available. If it's not available, it means that gensync will skip it when " -"generating the package databases. If you are not able to provide a binary " -"package for a given arch, don't include that in archs()! For example, no " -"matter if the package could be compiled in x86_64, if you haven't compiled " -"it yourself, don't include it. If you're sure it won't be available on a " -"given arch (for example it's written in x86 asm), then use !arch, for " -"example !x86_64." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:98 -msgid "" -"The sha1sums() array can be generated with the makepkg -g command. Its " -"purpose is to prevent compiling from corrupt sources, especially when the " -"build is automatic. Where it is available you can use signatures(), its goal " -"is that you don't have to update it manually every time." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:106 -msgid "" -"The last line will be added automatically to the end of the FrugalBuild if " -"the build() function used your $CFLAGS or $CXXFLAGS. This is handy if you " -"want to cross-compile on a faster machine for a slower architecture. If the " -"package doesn't use our $CFLAGS we can't cross-compile it, so please try to " -"avoid creating \"unoptimized\" packages. If the package doesn't contain any " -"architecture-dependent file, then you can add this line manually as makepkg " -"will not detect this." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:114 -msgid "" -"Finally we define a build() function that will build the package. If you " -"don't want to do anything special, you probably don't have to specify " -"anything, as the default build() (inherited from util.sh) will fit your " -"needs. Even if you define a custom build(), probably you can re-use parts of " -"the default build(). For the list of special functions provided by util.sh " -"and others refer to the /source/include dir. Again, util.sh is included " -"automatically, but you have to Finclude the others before using them!" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:120 -msgid "" -"Once the package is successfully installed into the package root, I " -"will prepare some documentation. It will then strip debugging info from " -"libraries and binaries and generate a meta-info file. Finally, it will " -"compress everything into a .fpm file and leave it in the directory from " -"which you ran B." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:123 -msgid "" -"At this point you should have a package file in the current directory, named " -"something like name-version-release-arch.fpm. Done!" -msgstr "" - -# type: SH -#: FrugalBuild.8:124 -#, no-wrap -msgid "Install/Upgrade/Remove Scripting" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:128 -msgid "" -"Pacman has the ability to store and execute a package-specific script when " -"it installs, removes, or upgrades a package. This allows a package to " -"\"configure itself\" after installation and do the opposite right before it " -"is removed." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:130 -msgid "The exact time the script is run varies with each operation:" -msgstr "" - -# type: TP -#: FrugalBuild.8:130 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:133 FrugalBuild.8:141 -msgid "script is run right before files are extracted." -msgstr "" - -# type: TP -#: FrugalBuild.8:134 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:137 -msgid "script is run right after files are extracted." -msgstr "" - -# type: TP -#: FrugalBuild.8:138 -#, no-wrap -msgid "B" -msgstr "" - -# type: TP -#: FrugalBuild.8:142 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:145 -msgid "script is run after files are extracted." -msgstr "" - -# type: TP -#: FrugalBuild.8:146 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:149 -msgid "script is run right before files are removed." -msgstr "" - -# type: TP -#: FrugalBuild.8:150 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:153 -msgid "script is run right after files are removed." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:157 -msgid "" -"To use this feature, just create a file (eg, pkgname.install) and put it in " -"the same directory as the FrugalBuild script. Then use the I " -"directive:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:160 -#, no-wrap -msgid "install=pkgname.install\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:166 -msgid "" -"The install script does not need to be specified in the I array. If " -"you omit the install directive then makepkg will check for the " -"$pkgname.install script and will use it if it's present." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:169 -msgid "" -"You can find a scriptlet skeleton in the /docs/tech/skel/ directory, use it " -"when creating new packages." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:171 -msgid "The scriptlet messages are parsed, a simple example tells you everything:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:180 -#, no-wrap -msgid "" -"post_upgrade()\n" -"{\n" -"\techo \"START this will be good\"\n" -"\techo \"DONE 0\"\n" -"\techo \"START this will fail\"\n" -"\techo \"DONE 1\"\n" -"\techo \"old message\"\n" -"}\n" -msgstr "" - -# type: SH -#: FrugalBuild.8:182 -#, no-wrap -msgid "FrugalBuild Directives" -msgstr "" - -# type: TP -#: FrugalBuild.8:183 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:187 -msgid "" -"The name of the package. This has be a unix-friendly name as it will be " -"used in the package filename." -msgstr "" - -# type: TP -#: FrugalBuild.8:188 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:191 -msgid "This is the version of the software as released from the author (eg, 2.7.1)." -msgstr "" - -# type: TP -#: FrugalBuild.8:192 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:195 -msgid "This is the release number specific to Frugalware Linux packages." -msgstr "" - -# type: TP -#: FrugalBuild.8:196 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:199 -msgid "This should be a brief description of the package and its functionality." -msgstr "" - -# type: TP -#: FrugalBuild.8:200 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:203 -msgid "Array of the localized package descriptions." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:206 -msgid "The format is the following: pkgdesc_localized=('xx_YY foo' 'xx_YY bar')" -msgstr "" - -# type: TP -#: FrugalBuild.8:207 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:211 -msgid "" -"This field contains an optional URL that is associated with the piece of " -"software being packaged. This is typically the project's website." -msgstr "" - -# type: TP -#: FrugalBuild.8:212 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:216 -msgid "" -"Sets the license type (eg, \"GPL\", \"BSD\", \"NON-FREE\"). (B: This " -"option is still in development and may change in the future)" -msgstr "" - -# type: TP -#: FrugalBuild.8:217 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:223 -msgid "" -"Specifies a special install script that is to be included in the package. " -"This file should reside in the same directory as the FrugalBuild, and will " -"be copied into the package by makepkg. It does not need to be included in " -"the I array. (eg, install=modutils.install)" -msgstr "" - -# type: TP -#: FrugalBuild.8:224 -#, no-wrap -msgid "B" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:229 -msgid "" -"This directive should contain a command that prints the current upstream " -"stable version of the project. This way we can check for newer version " -"without visiting manually the project's website (see above)." -msgstr "" - -# type: TP -#: FrugalBuild.8:230 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:237 -msgid "" -"The I line is an array of source files required to build the " -"package. Source files must reside in the same directory as the FrugalBuild " -"file, unless they have a fully-qualified URL. Then if the source file does " -"not already exist in /var/cache/pacman/src, the file is downloaded by wget." -msgstr "" - -# type: TP -#: FrugalBuild.8:238 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:246 -msgid "" -"If this field is present, it should contain an MD5 hash for every source " -"file specified in the I array (in the same order). makepkg will use " -"this to verify source file integrity during subsequent builds. To easily " -"generate md5sums, first build using the FrugalBuild then run BEFrugalBuild>. Then you can edit the FrugalBuild and move the " -"I line from the bottom to an appropriate location." -msgstr "" - -# type: TP -#: FrugalBuild.8:247 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:255 -msgid "" -"If this field is present, it should contain an SHA1 hash for every source " -"file specified in the I array (in the same order). makepkg will use " -"this to verify source file integrity during subsequent builds. To easily " -"generate sha1sums, first build using the FrugalBuild then run BEFrugalBuild>. Then you can edit the FrugalBuild and move the " -"I line from the bottom to an appropriate location." -msgstr "" - -# type: TP -#: FrugalBuild.8:256 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:261 -msgid "" -"If this field is present, it should contain an array of gpg signatures " -"required to validate the source files. Where there is no signature available " -"just leave it empty, like:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:263 -msgid "signatures=(${source[0]}.asc '')" -msgstr "" - -# type: TP -#: FrugalBuild.8:264 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:269 -msgid "" -"This is an array of symbolic names that represent groups of packages, " -"allowing you to install multiple packages by requesting a single target. " -"For example, one could install all KDE packages by installing the 'kde' " -"group." -msgstr "" - -# type: TP -#: FrugalBuild.8:270 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:275 -msgid "" -"This array defines on which architectures the given package is available. " -"If it's not available, that will mean that gensync will skip it when " -"generating package databases." -msgstr "" - -# type: TP -#: FrugalBuild.8:276 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:283 -msgid "" -"A space-delimited array of filenames (without a preceding slash). The " -"I line will be propagated to the package meta-info file for pacman. " -"This will designate all files listed there to be backed up if this package " -"is ever removed from a system. See B in the " -"I manpage for more information." -msgstr "" - -# type: TP -#: FrugalBuild.8:284 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:292 -msgid "" -"An array of packages that this package depends on to build and run. " -"Packages in this list should be surrounded with single quotes and contain at " -"least the package name. They can also include a version requirement of the " -"form BEversion>, where EE is one of these three " -"comparisons: B=> (greater than equal to), B=> (less than or " -"equal to), or B<=> (equal to). See the FrugalBuild example above for an " -"example of the I directive." -msgstr "" - -# type: TP -#: FrugalBuild.8:293 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:297 -msgid "" -"An array of packages that this package depends on to build (ie, not required " -"to run). Packages in this list should follow the same format as I." -msgstr "" - -# type: TP -#: FrugalBuild.8:298 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:305 -msgid "" -"An array of packages that this package depends on to run (ie, not required " -"to build). Generally I should be avoided in favour of I " -"except where this will create circular dependency chains. (For example " -"building logrotate doesn't require that dcron be installed.) Packages in " -"this list should follow the same format as I." -msgstr "" - -# type: TP -#: FrugalBuild.8:306 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:311 -msgid "" -"An array of packages that will conflict with this package (ie, they cannot " -"both be installed at the same time). This directive follows the same format " -"as I except you cannot specify versions here, only package names." -msgstr "" - -# type: TP -#: FrugalBuild.8:312 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:318 -msgid "" -"An array of \"virtual provisions\" that this package provides. This allows " -"a package to provide dependency names other than it's own package name. For " -"example, the kernel-scsi and kernel-ide packages can each provide 'kernel' " -"which allows packages to simply depend on 'kernel' rather than \"kernel-scsi " -"OR kernel-ide OR ...\"" -msgstr "" - -# type: TP -#: FrugalBuild.8:319 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:325 -msgid "" -"This is an array of packages that this package should replace, and can be " -"used to handle renamed/combined packages. For example, if the kernel " -"package gets renamed to kernel-ide, then subsequent 'pacman -Syu' calls will " -"not pick up the upgrade, due to the differing package names. I " -"handles this." -msgstr "" - -# type: TP -#: FrugalBuild.8:326 -#, no-wrap -msgid "BI<(array)>" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:329 -msgid "This is an array of various boolean options. The possible values are:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:342 -#, no-wrap -msgid "" -"nodocs Don't add any documentation automatically (ie. when there'll be\n" -" a separate documentation subpackage).\n" -"nostrip Don't strip binaries/libraries.\n" -"force This is used to force the package to be upgraded by " -"--sysupgrade,\n" -" even if its an older version.\n" -"nobuild If this directive set, gensync will ignore this package, so " -"users\n" -" must build these packages on their machines, they will not be " -"able\n" -" to install them with pacman -S. Useful for closed-source, but\n" -" freeware programs.\n" -"nofakeroot Don't drop privileges after chrooting. Required by some broken\n" -" packages.\n" -"scriptlet Don't skip executing scriptlets even if we're in chroot.\n" -msgstr "" - -# type: SH -#: FrugalBuild.8:344 -#, no-wrap -msgid "What is the process of chrooted build ?" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:350 -msgid "" -"First, what is chroot? We currently use fakeroot to prevent build() from " -"modifying the host system, and we use a prefix or DESTDIR directive to " -"install everything to a directory and not under to the host system. This is " -"good, but not enough." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:359 -msgid "" -"This system lacks the ability to control the list of installed packages " -"during the build on the system of a packager. Because of this, the given " -"compiled package may link itself to an extra installed library. This way we " -"can't really control the list of real dependencies. For example if " -"libquicktime is installed from source on my system, then mplayer or any " -"other program can link itself to that, and so that depends() will be " -"incorrect. Or if I have the closed source binary NVidia drivers installed, " -"some programs link to NVidia's libraries." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:362 -msgid "" -"Of course there is a solution to avoid this, to use a real chroot instead of " -"a simple fakeroot. What does this mean? The following:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:370 -msgid "" -"When starting the build, a core chroot system is installed under " -"/var/chroot. (Of course you can change this value under /etc/makepkg.conf.) " -"The core system contains ~60 packages which are must installed to build any " -"package in a chrooted environment. These packages (for example gcc, " -"kernel-headers, make) should not be mentioned in makedepends(). 'pacman -Sg " -"core chroot-core devel-core' should show you the actual list. (We try to " -"change this list rarely of course.)" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:376 -msgid "" -"When you start building with makepkg -R, pacman will install these packages " -"to /var/chroot if necessary. This will produce a fully \"clean\" Frugalware " -"system, that consists of base packages only. This /var/chroot is fully " -"separated from the host system so that this will solve the problems " -"mentioned above. (Linking to a library installed from source, etc.)" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:381 -msgid "" -"Here comes the fun part. The packages listed in depends() and makedepends() " -"are installed to this clean (/var/chroot) system. From this point, this " -"chroot is capable to build the specified package in it without any " -"unnecessary package installed, fully separated from the host system." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:385 -msgid "" -"After this the chroot should be cleaned up which means the removal of the " -"installed depends() and makedepends(). This ensures you do not have to build " -"the core chroot from scratch." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:389 -msgid "" -"This way we can prevent lots of dependency problems and it is even possible " -"to build packages for a different Frugalware version. This is quite " -"efficient when building security updates or fixing critical bugs in the " -"-stable tree." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:393 -msgid "" -"If the build fails, the working directory will not be deleted, you can find " -"it under /var/chroot/var/tmp/fst. Later if you want to clean your chroot " -"(delete the working directory and remove unnecessary packages) you can use " -"'makepkg -CR'." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:396 -msgid "" -"To activate building in a chroot, you should run makepkg as root at least " -"with the -R option." -msgstr "" - -# type: SH -#: FrugalBuild.8:397 -#, no-wrap -msgid "Package splitting" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:401 -msgid "" -"Package splitting means moving out a list of specified files to subpackages " -"(like libmysql out of mysql) and then defining the properties of " -"subpackages." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:406 -msgid "" -"NOTE: if you create several subpackages, maintaining those packages will " -"require more and more time. Thus, unnecessary splits aren't welcome. " -"Especially, if you split out a library, then don't move the headers to the " -"package just to speed up building with a few seconds!" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:409 -msgid "" -"The B array is to define the pkgnames of the subpackages. From " -"now all the directives have a subfoo equivalent:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:425 -#, no-wrap -msgid "" -"pkgname -E subpkgs()\n" -"pkgdesc -E subdescs()\n" -"pkgdesc_localized -E subdescs_localized()\n" -"license() -E sublicense()\n" -"replaces() -E subreplaces()\n" -"groups() -E subgroups()\n" -"depends() -E subdepends()\n" -"rodepends() -E subrodepends()\n" -"removes() -E subremoves()\n" -"conflicts() -E subconflicts()\n" -"provides() -E subprovides()\n" -"backup() -E subbackup()\n" -"install -E subinstall()\n" -"options -E suboptions()\n" -"archs -E subarchs()\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:429 -msgid "" -"Also note that bash does not support two-dimensional arrays, so when " -"defining the array of arrays, then quotes are the major separators and " -"spaces are the minor ones." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:431 -msgid "Simple example:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:438 -#, no-wrap -msgid "" -"Add the followings to your bottom of your FrugalBuild\n" -"subpkgs=('foo' 'bar')\n" -"subdescs=('desc of foo' 'desc of bar')\n" -"subdepends=('foodep1 foodep2' 'bardep1 bardep2')\n" -"subgroups=('apps' 'apps')\n" -"subarchs=('i686 x86_64' 'i686 x86_64')\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:442 -msgid "" -"You may define conflicts, replaces and other directives for your " -"subpackages, but the requirement is only to define these 5 ones." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:447 -msgid "" -"The second part is to move some files to the - just defined - " -"subpackages. You should use the Fsplit command for this at the end of your " -"build() function. You can read more about Fsplit in the fwmakepkg " -"documentation, but here is a short example:" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:450 -#, no-wrap -msgid "Fsplit subpkgname usr/share/\n" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:453 -msgid "" -"This will move the /usr/share dir of the package to the \"subpkgname\" " -"subpackage." -msgstr "" - -# type: Plain text -#: FrugalBuild.8:456 -msgid "" -"NOTE: never use a trailing slash when defining file patterns, especially if " -"you use wildcards in it!" -msgstr "" - -# type: Plain text -#: FrugalBuild.8:460 -msgid "B(8), B(8)" -msgstr "" From vmiklos at frugalware.org Fri Nov 9 21:41:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 21:41:45 2007 Subject: [Frugalware-git] pacman-g2: updated po4a.cfg for asciidoc Message-ID: <20071109204140.5604811901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=dd35b590dc2e56a2cd390f68250ddbde77d693ed commit dd35b590dc2e56a2cd390f68250ddbde77d693ed Author: Miklos Vajna Date: Fri Nov 9 20:51:50 2007 +0100 updated po4a.cfg for asciidoc diff --git a/doc/po4a.cfg b/doc/po4a.cfg index b896696..ad9cfa2 100644 --- a/doc/po4a.cfg +++ b/doc/po4a.cfg @@ -1,11 +1,17 @@ -[po4a_langs] hu -[po4a_paths] po/pacman-g2.pot $lang:po/$lang.po -[type: man] pacman-g2.8 \ - $lang:$lang/pacman-g2.8 add_$lang:addendum.8.$lang \ - opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE" -[type: man] makepkg.8 \ - $lang:$lang/makepkg.8 add_$lang:addendum.8.$lang \ - opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE" -[type: man] FrugalBuild.8 \ - $lang:$lang/FrugalBuild.8 add_$lang:addendum.8.$lang \ - opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE" +# +# Configuration file for Pacman-G2 documentation +# + +# NOTE: Here we list all the documents that are translated for at least one +# language. Feel free to add new documents, but keep in mind that it's no good +# translating developer-related documents. + +# language list +[po4a_langs] hu fr +[po4a_paths] po/mans.pot $lang:po/$lang.po +# alias +[po4a_alias: simpletext] text opt:"-o nobullets" + +[type: simpletext] FrugalBuild.txt $lang:$lang/FrugalBuild.txt +[type: simpletext] makepkg.txt $lang:$lang/makepkg.txt +[type: simpletext] pacman-g2.txt $lang:$lang/pacman-g2.txt From vmiklos at frugalware.org Fri Nov 9 21:41:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 21:41:46 2007 Subject: [Frugalware-git] pacman-g2: autogen.sh: implement --pot-only for po4a, too Message-ID: <20071109204140.B871011901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=94c30183e290c7d7a4b57ce954411aaf414739a4 commit 94c30183e290c7d7a4b57ce954411aaf414739a4 Author: Miklos Vajna Date: Fri Nov 9 21:39:20 2007 +0100 autogen.sh: implement --pot-only for po4a, too diff --git a/autogen.sh b/autogen.sh index bed1333..7b6de5e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -87,10 +87,12 @@ elif [ "$1" == "--gettext-only" ]; then mv Makevars.tmp Makevars cd - >/dev/null done - # FIXME: implement --pot-only for po4a, too - [ "$2" == "--pot-only" ] && exit 0 cd doc po4a -k 0 po4a.cfg + if [ "$2" == "--pot-only" ]; then + rm -rf po/*.po `grep '\[po4a_langs\]' po4a.cfg |sed 's/\[po4a_langs\] //'` + exit 0 + fi cd po for i in *po do From vmiklos at frugalware.org Fri Nov 9 22:03:41 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 22:03:45 2007 Subject: [Frugalware-git] pacman-tools: pootle-update: added pacman manpages Message-ID: <20071109210342.2841011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=e4377bf07a9efcc63004e01028cb179a5cc3b400 commit e4377bf07a9efcc63004e01028cb179a5cc3b400 Author: Miklos Vajna Date: Fri Nov 9 22:03:19 2007 +0100 pootle-update: added pacman manpages diff --git a/pootle-update b/pootle-update index f22e40e..4397860 100644 --- a/pootle-update +++ b/pootle-update @@ -21,6 +21,7 @@ rsync rsync://rsync.frugalware.org/pub/frugalware/frugalware-current/docs/po/doc rsync rsync://rsync.frugalware.org/pub/other/homepage-ng/frugalware/po/homepage.pot homepage/templates/homepage.pot rsync rsync://rsync.frugalware.org/pub/other/pacman-g2/pacman-g2/src/pacman-g2/po/pacman-g2.pot pacman/templates/pacman-g2.pot rsync rsync://rsync.frugalware.org/pub/other/pacman-g2/pacman-g2/lib/libpacman/po/libpacman.pot pacman/templates/libpacman.pot +rsync rsync://rsync.frugalware.org/pub/other/pacman-g2/pacman-g2/doc/po/mans.pot pacman/templates/mans.pot rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/grubconfig/po/grubconfig.pot frugalwareutils/templates/grubconfig.pot rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/libfwdialog/po/libfwdialog.pot frugalwareutils/templates/libfwdialog.pot rsync rsync://rsync.frugalware.org/pub/other/frugalwareutils/frugalwareutils/libfwnetconfig/po/libfwnetconfig.pot frugalwareutils/templates/libfwnetconfig.pot From vmiklos at frugalware.org Fri Nov 9 23:28:17 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 23:28:19 2007 Subject: [Frugalware-git] pacman-g2: removed automake references to autogenerated doc/hu Message-ID: <20071109222817.B69B611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=9a2bc1f4dd1d635057bccb5df05b4584599eb658 commit 9a2bc1f4dd1d635057bccb5df05b4584599eb658 Author: Miklos Vajna Date: Fri Nov 9 23:24:32 2007 +0100 removed automake references to autogenerated doc/hu diff --git a/Makefile.am b/Makefile.am index f47e77c..fdbeec5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib/libftp lib/libpacman src/vercmp src/versort src/pacman-g2 scripts doc doc/hu etc +SUBDIRS = lib/libftp lib/libpacman src/vercmp src/versort src/pacman-g2 scripts doc etc if HAS_PERL SUBDIRS += bindings/perl diff --git a/configure.ac b/configure.ac index 6f77386..bf4fb94 100644 --- a/configure.ac +++ b/configure.ac @@ -428,7 +428,6 @@ src/vercmp/Makefile src/versort/Makefile scripts/Makefile doc/Makefile -doc/hu/Makefile etc/Makefile etc/pacman.d/Makefile etc/pacman.d/frugalware diff --git a/doc/Makefile.am b/doc/Makefile.am index 7aacfca..7cf358f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,5 @@ all: po4a makepkg.8 FrugalBuild.8 pacman-g2.8 -SUBDIRS = hu - po4a: if HAS_PO4A @$(NORMAL_INSTALL) @@ -21,7 +19,6 @@ endif clean: rm -f html/*.html - rm -f hu/*.8 rm -f man3/*.3 man_MANS = pacman-g2.8 makepkg.8 FrugalBuild.8 libpacman.3 diff --git a/doc/po/.gitignore b/doc/po/.gitignore new file mode 100644 index 0000000..e69de29 From vmiklos at frugalware.org Fri Nov 9 23:28:17 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 23:28:23 2007 Subject: [Frugalware-git] pacman-g2: autogen.sh: import manpage translations in import_pootle() Message-ID: <20071109222817.EE11411901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=762b55a806b4576599e344bb541cd1d7822d471b commit 762b55a806b4576599e344bb541cd1d7822d471b Author: Miklos Vajna Date: Fri Nov 9 23:25:59 2007 +0100 autogen.sh: import manpage translations in import_pootle() diff --git a/autogen.sh b/autogen.sh index 7b6de5e..c0bda70 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,6 +8,7 @@ import_pootle() if [ -d $po_dir ]; then : > lib/libpacman/po/LINGUAS : > src/pacman-g2/po/LINGUAS + : > doc/po/LINGUAS for i in $(/bin/ls $po_dir/pacman) do [ "$i" = "sk" -o "$i" = "ha" -o "$i" = "ig" -o "$i" = "yo" ] && continue @@ -15,13 +16,19 @@ import_pootle() if msgfmt -c --statistics -o lib/libpacman/po/$i.gmo lib/libpacman/po/$i.po; then echo $i >> lib/libpacman/po/LINGUAS else - echo "WARNING: lib/libpacman/po/$i.po will break your build!" + echo "WARNING: lib/libpacman/po/$i.po would break your build!" fi cp $po_dir/pacman/$i/pacman-g2.po src/pacman-g2/po/$i.po if msgfmt -c --statistics -o src/pacman-g2/po/$i.gmo src/pacman-g2/po/$i.po; then echo $i >> src/pacman-g2/po/LINGUAS else - echo "WARNING: src/pacman-g2/po/$i.po will break your build!" + echo "WARNING: src/pacman-g2/po/$i.po would break your build!" + fi + cp $po_dir/pacman/$i/mans.po doc/po/$i.po + if msgfmt -c --statistics -o doc/po/$i.gmo doc/po/$i.po; then + echo $i >> doc/po/LINGUAS + else + echo "WARNING: lib/libpacman/po/$i.po would break your build!" fi done else From vmiklos at frugalware.org Fri Nov 9 23:32:29 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 23:32:32 2007 Subject: [Frugalware-git] pacman-g2: remove man2html, if we really want, then we can add asciidoc html manpages, but who needs it.. Message-ID: <20071109223229.5D09911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=63453167821620fb9b126ee0c3bf980c60b7056a commit 63453167821620fb9b126ee0c3bf980c60b7056a Author: Miklos Vajna Date: Fri Nov 9 23:30:13 2007 +0100 remove man2html, if we really want, then we can add asciidoc html manpages, but who needs it.. diff --git a/configure.ac b/configure.ac index bf4fb94..331cfe2 100644 --- a/configure.ac +++ b/configure.ac @@ -53,11 +53,6 @@ dnl Humor lowers blood pressure AC_MSG_CHECKING(your blood pressure) AC_MSG_RESULT([a bit high, but we can proceed]) -dnl Help line for man2html -AC_ARG_ENABLE(man2html, - AC_HELP_STRING([ --enable-man2html], [Build html docs via man2html]), - [wantman2html=$enableval], [wantman2html=no]) - dnl Help line for po4a AC_ARG_ENABLE(po4a, AC_HELP_STRING([ --disable-po4a], [Do not build localized manpages via po4a]), @@ -169,24 +164,6 @@ AC_ARG_ENABLE(fakeroot, AC_HELP_STRING([ --disable-fakeroot], [Disable fakeroot proof support]), [fakeroot=$enableval], [fakeroot=yes]) -dnl Check for man2html binary -AC_MSG_CHECKING(for support man2html) -if test x$wantman2html = xyes ; then - AC_CHECK_PROGS([MAN2HTML], [man2html]) - AM_CONDITIONAL(HAS_MAN2HTML, test $MAN2HTML) - if test $MAN2HTML ; then - AC_DEFINE([HAS_MAN2HTML], [TRUE], [Enabled HTML generation from man via man2html]) - AC_MSG_RESULT(yes) - else - AC_DEFINE([HAS_MAN2HTML], [FALSE], [Disabled HTML generation from man via man2html]) - AC_MSG_RESULT(no, man2html missing) - fi -else - AM_CONDITIONAL(HAS_MAN2HTML, test $MAN2HTML) - AC_DEFINE([HAS_MAN2HTML], [FALSE], [Not specified at configure line]) - AC_MSG_RESULT(not requested by configure) -fi - dnl Check for po4a binary AC_MSG_CHECKING(for support po4a) if test x$wantpo4a = xyes ; then diff --git a/doc/Makefile.am b/doc/Makefile.am index 7cf358f..ea87a74 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,19 +6,7 @@ if HAS_PO4A po4a -k 0 po4a.cfg endif -if HAS_MAN2HTML -makepkg.8: - man2html makepkg.8 > html/makepkg.8.html - -FrugalBuild.8: - man2html FrugalBuild.8 > html/FrugalBuild.8.html - -pacman-g2.8: - man2html pacman-g2.8 > html/pacman-g2.8.html -endif - clean: - rm -f html/*.html rm -f man3/*.3 man_MANS = pacman-g2.8 makepkg.8 FrugalBuild.8 libpacman.3 From vmiklos at frugalware.org Fri Nov 9 23:36:58 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 9 23:37:01 2007 Subject: [Frugalware-git] pacman-g2: configure.ac: check for asciidoc Message-ID: <20071109223658.E8D2A11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=3d995ba5cf3943eb20fd249d23157e7496a3c83b commit 3d995ba5cf3943eb20fd249d23157e7496a3c83b Author: Miklos Vajna Date: Fri Nov 9 23:33:52 2007 +0100 configure.ac: check for asciidoc diff --git a/configure.ac b/configure.ac index 331cfe2..2490d65 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,27 @@ else POSTATUS="no, disabled by configure" fi +dnl Check for asciidoc +AC_MSG_CHECKING(for support asciidoc) +if test x$wantasciidoc = xyes ; then + AC_CHECK_PROGS([ASCIIDOC], [asciidoc]) + AM_CONDITIONAL(HAS_ASCIIDOC, test $ASCIIDOC) + if test $ASCIIDOC ; then + AC_DEFINE([HAS_ASCIIDOC], [TRUE], [Enabled ASCIIDOC (needed to generate manpages)]) + AC_MSG_RESULT(yes) + ASCIISTATUS="yes, path: `which $ASCIIDOC`" + else + AC_DEFINE([HAS_ASCIIDOC], [FALSE], [Disabled ASCIIDOC (needed to generate manpages)]) + AC_MSG_RESULT(no, asciidoc binary missing) + ASCIISTATUS="no, missing asciidoc binary" + fi +else + AM_CONDITIONAL(HAS_ASCIIDOC, test $ASCIIDOC) + AC_DEFINE([HAS_ASCIIDOC], [FALSE], [Not specified at configure line]) + AC_MSG_RESULT(not requested by configure) + ASCIISTATUS="no, disabled by configure" +fi + dnl Check for doxygen support AC_MSG_CHECKING(for support Doxygen) if test x$wantdoxygen = xyes ; then From vmiklos at frugalware.org Sat Nov 10 00:00:20 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 00:00:23 2007 Subject: [Frugalware-git] pacman-tools: repoman: handle the case when we get no output from mktemp Message-ID: <20071109230020.960E711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=df01972ea0977d5f2aa17405dc1c63082ec2db4b commit df01972ea0977d5f2aa17405dc1c63082ec2db4b Author: Miklos Vajna Date: Fri Nov 9 23:59:50 2007 +0100 repoman: handle the case when we get no output from mktemp diff --git a/repoman b/repoman index b698c5a..3bc205d 100755 --- a/repoman +++ b/repoman @@ -122,6 +122,10 @@ upload() name=`basename $src` msg "Requesting a temporary file" tmp=`ssh $host $mktemp_remote 2>/dev/null` + if [ -z "$temp" ]; then + echo "Failed to get a temporary file :-/" + exit 1 + fi msg "Uploading file: $src (to $tmp)" scp $src $host:$tmp if echo "`sha1sum $src|sed 's/\(.*\) .*/\1/'` $tmp" |ssh $host sha1sum -c - >/dev/null 2>&1; then From vmiklos at frugalware.org Sat Nov 10 00:20:53 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 00:20:57 2007 Subject: [Frugalware-git] pacman-tools: repoman: typo fix in upload() Message-ID: <20071109232053.3302611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=250627fdb74cfdd483c113e42ec0c85c27531ce6 commit 250627fdb74cfdd483c113e42ec0c85c27531ce6 Author: Miklos Vajna Date: Sat Nov 10 00:20:48 2007 +0100 repoman: typo fix in upload() diff --git a/repoman b/repoman index 3bc205d..764240e 100755 --- a/repoman +++ b/repoman @@ -122,7 +122,7 @@ upload() name=`basename $src` msg "Requesting a temporary file" tmp=`ssh $host $mktemp_remote 2>/dev/null` - if [ -z "$temp" ]; then + if [ -z "$tmp" ]; then echo "Failed to get a temporary file :-/" exit 1 fi From crazy at frugalware.org Sat Nov 10 00:23:02 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 10 00:23:05 2007 Subject: [Frugalware-git] frugalware-current: qt4-4.3.2-3-i686 Message-ID: <20071109232302.D9BAB11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=15bde7d313eacb476b693bd7286b2547075fc827 commit 15bde7d313eacb476b693bd7286b2547075fc827 Author: crazy Date: Fri Nov 9 12:59:03 2007 +0100 qt4-4.3.2-3-i686 * relbump * fixed typo in frugalware.patch diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index a64a06e..3b88f2a 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -4,7 +4,7 @@ pkgname=qt4 origname=qt pkgver=4.3.2 -pkgrel=2 +pkgrel=3 pkgmore=x11-opensource-src ## Dummy package is empty .. pkgdesc="The QT4 GUI toolkit." @@ -39,7 +39,7 @@ sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \ '1097be47724cda110a0d099c58a2f2ff6dcacc1e' \ '2099d1e1ef2172369c2b5f51e3dcf88fd66ba38c' \ '7c47da506d5118b87a0cae775886f99fd7de4fd9' \ - '98e3beebe7540262ed2f33d36373650aaca5cf14' \ + '8e7005b4def3722b545bbb33e3a92287076ba62e' \ '2468fea7b127253832148115d5aa9e85b2e0aea6' \ '5a2341286f6d766ab943294aec90a8ad25d0ee1d') diff --git a/source/xlib-extra/qt4/frugalware.patch b/source/xlib-extra/qt4/frugalware.patch index 40a8c55..baf2e7a 100644 --- a/source/xlib-extra/qt4/frugalware.patch +++ b/source/xlib-extra/qt4/frugalware.patch @@ -19,7 +19,7 @@ diff -Naur qt-x11-opensource-src-4.3.2/mkspecs/common/linux.conf qt-x11-opensour QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/X11R6/include -QMAKE_LIBDIR_X11 = /usr/X11R6/lib -+QMAKE_INCDIR_X11 = /usrinclude ++QMAKE_INCDIR_X11 = /usr/include +QMAKE_LIBDIR_X11 = /usr/lib QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] From vmiklos at frugalware.org Sat Nov 10 00:47:30 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 00:47:34 2007 Subject: [Frugalware-git] pacman-g2: configure.ac: add switch to disable asciidoc Message-ID: <20071109234731.1762611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=a54583b7d1ef4494ab6b057f159cfea2e0e88bbc commit a54583b7d1ef4494ab6b057f159cfea2e0e88bbc Author: Miklos Vajna Date: Sat Nov 10 00:45:06 2007 +0100 configure.ac: add switch to disable asciidoc diff --git a/configure.ac b/configure.ac index 2490d65..527b706 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,11 @@ AC_ARG_ENABLE(po4a, AC_HELP_STRING([ --disable-po4a], [Do not build localized manpages via po4a]), [wantpo4a=$enableval], [wantpo4a=yes]) +dnl Help line for asciidoc +AC_ARG_ENABLE(asciidoc, + AC_HELP_STRING([ --disable-asciidoc], [Do not build manpages via asciidoc]), + [wantasciidoc=$enableval], [wantasciidoc=yes]) + dnl Help line for doxygen AC_ARG_ENABLE(doxygen, AC_HELP_STRING([ --disable-doxygen], [Do not build API docs via Doxygen]), @@ -453,6 +458,7 @@ pacman-g2-$VERSION: Architecture CHOST : ${CHOST} Doxygen support : ${DOXYSTATUS} + Manpages : ${ASCIISTATUS} Manpage localization : ${POSTATUS} Perl bindings : ${PERLSTATUS} Python bindings : ${PYTHONSTATUS} From vmiklos at frugalware.org Sat Nov 10 01:49:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 01:49:28 2007 Subject: [Frugalware-git] pacman-g2: doc/Makefile.am: update for asciidoc and po4a Message-ID: <20071110004924.07C7E11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7ec79191ba4b4e56f763952a618879cb596101af commit 7ec79191ba4b4e56f763952a618879cb596101af Author: Miklos Vajna Date: Sat Nov 10 01:45:04 2007 +0100 doc/Makefile.am: update for asciidoc and po4a diff --git a/doc/Makefile.am b/doc/Makefile.am index ea87a74..b542870 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,18 +1,49 @@ -all: po4a makepkg.8 FrugalBuild.8 pacman-g2.8 +man3_MANS = libpacman.3 + +man5_MANS = FrugalBuild.5 + +man8_MANS = makepkg.8 pacman-g2.8 + +localized_MANS = $(man5_MANS) $(man8_MANS) + +localized_LANGS = $(shell grep '\[po4a_langs\]' po4a.cfg |sed 's/\[po4a_langs\] //') + +man_MANS = $(localized_MANS) $(man3_MANS) + +%.3: %.txt + a2x -f manpage $^ + +%.5: %.txt + a2x -f manpage $^ + +%.8: %.txt + a2x -f manpage $^ + +all: $(man_MANS) po4a localized_mans po4a: -if HAS_PO4A - @$(NORMAL_INSTALL) po4a -k 0 po4a.cfg -endif -clean: - rm -f man3/*.3 +localized_mans: $(shell for i in $(localized_LANGS); do for j in $(localized_MANS); do echo $$i/$$j; done; done) + +install-data-local: install-man5-local install-man8-local + +install-man5-local: + for i in $(localized_LANGS); do \ + test -z "$(mandir)/$$i/man5" || $(MKDIR_P) "$(DESTDIR)$(mandir)/$$i/man5"; \ + for j in $(man5_MANS); do \ + $(INSTALL_DATA) $$j "$(DESTDIR)$(mandir)/$$i/man5/$$j"; \ + done; \ + done -man_MANS = pacman-g2.8 makepkg.8 FrugalBuild.8 libpacman.3 +install-man8-local: + for i in $(localized_LANGS); do \ + test -z "$(mandir)/$$i/man8" || $(MKDIR_P) "$(DESTDIR)$(mandir)/$$i/man8"; \ + for j in $(man8_MANS); do \ + $(INSTALL_DATA) $$j "$(DESTDIR)$(mandir)/$$i/man8/$$j"; \ + done; \ + done -if HAS_DOXYGEN -man_MANS += man3/*.3 -endif +man_MANS += man3/* EXTRA_DIST = $(man_MANS) From vmiklos at frugalware.org Sat Nov 10 01:55:19 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 01:55:23 2007 Subject: [Frugalware-git] pacman-g2: doc: added back HAS_ASCIIDOC, HAS_PO4A and HAS_DOXYGEN defines Message-ID: <20071110005519.8E50B11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=2496ba9b5acd48a87ce4ef006f53b4913083bb5b commit 2496ba9b5acd48a87ce4ef006f53b4913083bb5b Author: Miklos Vajna Date: Sat Nov 10 01:52:57 2007 +0100 doc: added back HAS_ASCIIDOC, HAS_PO4A and HAS_DOXYGEN defines diff --git a/doc/Makefile.am b/doc/Makefile.am index b542870..7bb3465 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,7 +8,11 @@ localized_MANS = $(man5_MANS) $(man8_MANS) localized_LANGS = $(shell grep '\[po4a_langs\]' po4a.cfg |sed 's/\[po4a_langs\] //') +if HAS_ASCIIDOC man_MANS = $(localized_MANS) $(man3_MANS) +else +man_MANS = +endif %.3: %.txt a2x -f manpage $^ @@ -22,11 +26,19 @@ man_MANS = $(localized_MANS) $(man3_MANS) all: $(man_MANS) po4a localized_mans po4a: +if HAS_PO4A po4a -k 0 po4a.cfg +endif +if HAS_ASCIIDOC +if HAS_PO4A localized_mans: $(shell for i in $(localized_LANGS); do for j in $(localized_MANS); do echo $$i/$$j; done; done) - install-data-local: install-man5-local install-man8-local +endif +else +localized_mans: +endif + install-man5-local: for i in $(localized_LANGS); do \ @@ -44,6 +56,8 @@ install-man8-local: done; \ done +if HAS_DOXYGEN man_MANS += man3/* +endif EXTRA_DIST = $(man_MANS) From vmiklos at frugalware.org Sat Nov 10 02:21:32 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 02:21:37 2007 Subject: [Frugalware-git] pacman-g2: doc/Makefile: convert the manpages to the proper charset for each language Message-ID: <20071110012132.CECB411901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0778de962ab1eed5b11599c709be5ecec0a059c1 commit 0778de962ab1eed5b11599c709be5ecec0a059c1 Author: Miklos Vajna Date: Sat Nov 10 02:19:12 2007 +0100 doc/Makefile: convert the manpages to the proper charset for each language diff --git a/doc/Makefile.am b/doc/Makefile.am index 7bb3465..05c98e6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,6 +8,11 @@ localized_MANS = $(man5_MANS) $(man8_MANS) localized_LANGS = $(shell grep '\[po4a_langs\]' po4a.cfg |sed 's/\[po4a_langs\] //') +convert_MAN = \ + if echo $(1)|grep -q /; then \ + iconv -t $(shell locale -a |grep "$(shell dirname $(1))_.*\."|sed -n 's/.*\.//;1 p') -f UTF8 < $(1) > tmp; mv tmp $(1); \ + fi + if HAS_ASCIIDOC man_MANS = $(localized_MANS) $(man3_MANS) else @@ -16,12 +21,15 @@ endif %.3: %.txt a2x -f manpage $^ + $(call convert_MAN,$@) %.5: %.txt a2x -f manpage $^ + $(call convert_MAN,$@) %.8: %.txt a2x -f manpage $^ + $(call convert_MAN,$@) all: $(man_MANS) po4a localized_mans From vmiklos at frugalware.org Sat Nov 10 02:44:33 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 02:44:36 2007 Subject: [Frugalware-git] pacman-g2: doc/Makefile: typo: install the localized version instead of the English one for localized manpages Message-ID: <20071110014433.B72B411901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7571051466f16d6e32c1f43374e5f07d017844be commit 7571051466f16d6e32c1f43374e5f07d017844be Author: Miklos Vajna Date: Sat Nov 10 02:42:07 2007 +0100 doc/Makefile: typo: install the localized version instead of the English one for localized manpages diff --git a/doc/Makefile.am b/doc/Makefile.am index 8e261b3..936e2ae 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -54,7 +54,7 @@ install-man5-local: for i in $(localized_LANGS); do \ test -z "$(mandir)/$$i/man5" || $(MKDIR_P) "$(DESTDIR)$(mandir)/$$i/man5"; \ for j in $(man5_MANS); do \ - $(INSTALL_DATA) $$j "$(DESTDIR)$(mandir)/$$i/man5/$$j"; \ + $(INSTALL_DATA) $$i/$$j "$(DESTDIR)$(mandir)/$$i/man5/$$j"; \ done; \ done @@ -62,7 +62,7 @@ install-man8-local: for i in $(localized_LANGS); do \ test -z "$(mandir)/$$i/man8" || $(MKDIR_P) "$(DESTDIR)$(mandir)/$$i/man8"; \ for j in $(man8_MANS); do \ - $(INSTALL_DATA) $$j "$(DESTDIR)$(mandir)/$$i/man8/$$j"; \ + $(INSTALL_DATA) $$i/$$j "$(DESTDIR)$(mandir)/$$i/man8/$$j"; \ done; \ done From vmiklos at frugalware.org Sat Nov 10 02:44:33 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 02:44:39 2007 Subject: [Frugalware-git] pacman-g2: fix build when asciidoc is not installed Message-ID: <20071110014433.A2DB311901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=acf7db2531740e4282e52e0a86b249233a611ea3 commit acf7db2531740e4282e52e0a86b249233a611ea3 Author: Miklos Vajna Date: Sat Nov 10 02:40:48 2007 +0100 fix build when asciidoc is not installed diff --git a/doc/Makefile.am b/doc/Makefile.am index 05c98e6..8e261b3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,8 +1,10 @@ +if HAS_ASCIIDOC man3_MANS = libpacman.3 man5_MANS = FrugalBuild.5 man8_MANS = makepkg.8 pacman-g2.8 +endif localized_MANS = $(man5_MANS) $(man8_MANS) @@ -19,6 +21,7 @@ else man_MANS = endif +if HAS_ASCIIDOC %.3: %.txt a2x -f manpage $^ $(call convert_MAN,$@) @@ -38,7 +41,6 @@ if HAS_PO4A po4a -k 0 po4a.cfg endif -if HAS_ASCIIDOC if HAS_PO4A localized_mans: $(shell for i in $(localized_LANGS); do for j in $(localized_MANS); do echo $$i/$$j; done; done) install-data-local: install-man5-local install-man8-local From vmiklos at frugalware.org Sat Nov 10 02:47:30 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 02:47:32 2007 Subject: [Frugalware-git] pacman-g2: README: spelling fix Message-ID: <20071110014730.649DE11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=438f2f07b16cb68ce0c1ff5f3bf39bdef6ec94e7 commit 438f2f07b16cb68ce0c1ff5f3bf39bdef6ec94e7 Author: Miklos Vajna Date: Sat Nov 10 02:45:01 2007 +0100 README: spelling fix diff --git a/README b/README index 5933875..5c251f9 100644 --- a/README +++ b/README @@ -25,8 +25,8 @@ wrappers) to this great package management tool. Some features that pacman-g2 has over pacman: (September 2007) -1) It provides bindings C#, Java, Perl and Python bindings for libpacman. -2) It provides a configuration file parser (for parsing pacman.conf). +1) It provides C#, Java, Perl and Python bindings for libpacman. +2) libpacman provides a configuration file parser (for pacman.conf). 3) It provides support for subpackages, ie. creating more than one binary package using a single build script. 4) Localized manpages. From vmiklos at frugalware.org Sat Nov 10 02:51:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 02:51:15 2007 Subject: [Frugalware-git] bmf: bmf: pacman-g2-3.6.3.48.g7571051-1-i686 Message-ID: <20071110015112.D8CC811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=e954dfebd09a4aeecc3f768c68b951f0ca0110e8 commit e954dfebd09a4aeecc3f768c68b951f0ca0110e8 Author: Miklos Vajna Date: Sat Nov 10 02:50:59 2007 +0100 bmf: pacman-g2-3.6.3.48.g7571051-1-i686 update to newer snapshot, 20 new patches! :) diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index e3773c6..65394df 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -5,13 +5,14 @@ USE_DEVEL=${USE_DEVEL:-"y"} pkgname=pacman-g2 pkgver=3.6.3 -Fuse $USE_DEVEL && pkgver=3.6.3.28.gb8c58af +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." 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') -makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono') +makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono' \ + 'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common') Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'intltool') Finclude mono groups=('base' 'chroot-core') @@ -25,10 +26,12 @@ else _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" Finclude scm fi +options=('scriptlet') build() { if Fuse $USE_DEVEL; then + (cd ~; mkdir -p git; cd git; git clone git://git.frugalware.org/pub/other/translations) Funpack_scm Fsed '\(^AC_INIT(.*, \)[0-9\.]\+\(, .*\)' "\1$pkgver\2/" configure.ac sh autogen.sh From vmiklos at frugalware.org Sat Nov 10 03:19:53 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 03:19:58 2007 Subject: [Frugalware-git] pacman-g2: autogen.sh: get rid of unnecessary doc/po/LINGUAS Message-ID: <20071110021953.DFB4911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=83f5cca75dd59a58b830151d8851aca96d3fc2e1 commit 83f5cca75dd59a58b830151d8851aca96d3fc2e1 Author: Miklos Vajna Date: Sat Nov 10 03:17:32 2007 +0100 autogen.sh: get rid of unnecessary doc/po/LINGUAS diff --git a/autogen.sh b/autogen.sh index c0bda70..9ff4b8c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,7 +8,6 @@ import_pootle() if [ -d $po_dir ]; then : > lib/libpacman/po/LINGUAS : > src/pacman-g2/po/LINGUAS - : > doc/po/LINGUAS for i in $(/bin/ls $po_dir/pacman) do [ "$i" = "sk" -o "$i" = "ha" -o "$i" = "ig" -o "$i" = "yo" ] && continue @@ -25,10 +24,8 @@ import_pootle() echo "WARNING: src/pacman-g2/po/$i.po would break your build!" fi cp $po_dir/pacman/$i/mans.po doc/po/$i.po - if msgfmt -c --statistics -o doc/po/$i.gmo doc/po/$i.po; then - echo $i >> doc/po/LINGUAS - else - echo "WARNING: lib/libpacman/po/$i.po would break your build!" + if ! msgfmt -c --statistics -o doc/po/$i.gmo doc/po/$i.po; then + echo "WARNING: doc/po/$i.po will break your build!" fi done else From vmiklos at frugalware.org Sat Nov 10 03:27:49 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 03:27:52 2007 Subject: [Frugalware-git] pacman-g2: added a few missing .gitignore files Message-ID: <20071110022749.D3B8E119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=776ade2b147c8238805734e8c847427f8332a051 commit 776ade2b147c8238805734e8c847427f8332a051 Author: Miklos Vajna Date: Sat Nov 10 03:25:19 2007 +0100 added a few missing .gitignore files diff --git a/bindings/csharp/.gitignore b/bindings/csharp/.gitignore new file mode 100644 index 0000000..3dfb97a --- /dev/null +++ b/bindings/csharp/.gitignore @@ -0,0 +1,6 @@ +*.cs +*.h +*.i +*.c +*.so +*.dll diff --git a/bindings/java/.gitignore b/bindings/java/.gitignore new file mode 100644 index 0000000..7dfd768 --- /dev/null +++ b/bindings/java/.gitignore @@ -0,0 +1,7 @@ +*.java +*.i +*.c +*.h +*.jar +*.class +*.so diff --git a/bindings/perl/.gitignore b/bindings/perl/.gitignore new file mode 100644 index 0000000..51ecd7d --- /dev/null +++ b/bindings/perl/.gitignore @@ -0,0 +1,5 @@ +*.h +*.i +*.so +*.c +*.pm diff --git a/bindings/python/.gitignore b/bindings/python/.gitignore new file mode 100644 index 0000000..46e7cb6 --- /dev/null +++ b/bindings/python/.gitignore @@ -0,0 +1,5 @@ +*.h +*.so +*.i +*.c +*.py diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000..83dee0c --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,4 @@ +*.8 +*.5 +*.3 +*.xml diff --git a/src/versort/.gitignore b/src/versort/.gitignore new file mode 100644 index 0000000..51dd4c6 --- /dev/null +++ b/src/versort/.gitignore @@ -0,0 +1 @@ +versort From voroskoi at frugalware.org Sat Nov 10 11:31:23 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 10 11:31:27 2007 Subject: [Frugalware-git] frugalware-current: libpng-1.2.23-1-i686 Message-ID: <20071110103123.A248611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46ec6474f74dfce458065e886b7a774bb1941cbb commit 46ec6474f74dfce458065e886b7a774bb1941cbb Author: voroskoi Date: Sat Nov 10 11:30:43 2007 +0100 libpng-1.2.23-1-i686 version bump diff --git a/source/lib/libpng/FrugalBuild b/source/lib/libpng/FrugalBuild index 9302ec2..2594630 100644 --- a/source/lib/libpng/FrugalBuild +++ b/source/lib/libpng/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=libpng -pkgver=1.2.22 +pkgver=1.2.23 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" url="http://www.libpng.org/" @@ -19,7 +19,7 @@ build() { ./autogen.sh || Fdie Fbuild } -sha1sums=('15134a21e606254ba0a9e37af510a975c00d7c36' \ +sha1sums=('a03e47700660c1ee8dbef0dd2817285a21794455' \ '2bb13a8eb62115998ab628948cab4f905dc5289e') # optimization OK From voroskoi at frugalware.org Sat Nov 10 12:58:36 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 10 12:58:39 2007 Subject: [Frugalware-git] frugalware-current: net-tools-1.60-24-i686 Message-ID: <20071110115836.3AADB11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab19d9343d39b7cf2323a3a3bb92500a03a52375 commit ab19d9343d39b7cf2323a3a3bb92500a03a52375 Author: voroskoi Date: Sat Nov 10 12:57:39 2007 +0100 net-tools-1.60-24-i686 fix rc.interfaces header diff --git a/source/base/net-tools/FrugalBuild b/source/base/net-tools/FrugalBuild index 64992f2..af44ed5 100644 --- a/source/base/net-tools/FrugalBuild +++ b/source/base/net-tools/FrugalBuild @@ -22,7 +22,7 @@ sha1sums=('944fb70641505d5d1139dba3aeb81ba124574b83' \ 'ff8daa4d48f867679d9feab2123cea4838684f79' \ '8dd9e07f99356870104dc4c168746055e78b03f1' \ '168330ad740abdeaf79dac58e682f73110454969' \ - '18a37e37625bf5dcac876fe8fe54c77a6db92ed1' \ + '79dcaa924189b5863b28eee0d76ecdde715a11cd' \ 'e4830a27efaab43d5c98888e2070e2d1f3c26972' \ '448f5da06b9936c0c0e7ccf38cc36aa3ca5bd9f8' \ 'fe9c2e8248920f0c8c6fb0214f19eef1f8e6e77a') diff --git a/source/base/net-tools/rc.interfaces b/source/base/net-tools/rc.interfaces index 91fc00c..927d930 100644 --- a/source/base/net-tools/rc.interfaces +++ b/source/base/net-tools/rc.interfaces @@ -1,7 +1,7 @@ #!/bin/bash # (c) 2006 Miklos Vajna -# rc.crond for Frugalware +# rc.interfaces for Frugalware # distributed under GPL License # chkconfig: 2345 07 98 From vmiklos at frugalware.org Sat Nov 10 14:46:58 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 14:47:00 2007 Subject: [Frugalware-git] frugalware-current: xpdf-3.02-4-i686 Message-ID: <20071110134658.7AC7A176C002@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=521132d49c4053ce7bf60d590ee196def217b11f commit 521132d49c4053ce7bf60d590ee196def217b11f Author: Miklos Vajna Date: Sat Nov 10 14:46:47 2007 +0100 xpdf-3.02-4-i686 bump to patchlevel pl2 closes #2558 diff --git a/source/xapps/xpdf/FrugalBuild b/source/xapps/xpdf/FrugalBuild index a4df5f3..cad58a1 100644 --- a/source/xapps/xpdf/FrugalBuild +++ b/source/xapps/xpdf/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xpdf pkgver=3.02 -pkgrel=3 +pkgrel=4 pkgdesc="PDF viewer for X" url="http://www.foolabs.com/xpdf/" backup=('etc/xpdfrc') @@ -11,11 +11,13 @@ depends=('libstdc++' 'libxp' 'openmotif' 'libxft' 'libxpm' 't1lib') backup=('etc/xpdfrc') groups=('xapps') archs=('i686' 'x86_64') -up2date="lynx -dump $url/download.html|grep released|sed 's/.*f \(.*\) w.*/\1/'" +up2date="lynx -dump $url/download.html|grep released|sed 's/.*f \(.*\) w.*/\1/;q'" source=(ftp://ftp.foolabs.com/pub/xpdf/$pkgname-$pkgver.tar.gz \ - ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch) + ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch \ + ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch) sha1sums=('f9940698840c8a8045677e8be68ab8580903e20a' \ - 'cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d') + 'cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d' \ + 'd082ebe0d36cad0c04603950216f5c52de1c2593') build() { From vmiklos at frugalware.org Sat Nov 10 15:07:58 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 15:08:03 2007 Subject: [Frugalware-git] frugalware-current: cpio-2.9-2-i686 Message-ID: <20071110140758.5A855119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f685208c5c962e43298797ddcc578a115bc0abf commit 3f685208c5c962e43298797ddcc578a115bc0abf Author: Miklos Vajna Date: Sat Nov 10 15:07:45 2007 +0100 cpio-2.9-2-i686 added cpio-2.9-safer_name_suffix.patch closes #2570 diff --git a/source/base/cpio/FrugalBuild b/source/base/cpio/FrugalBuild index e9d4e77..c39faeb 100644 --- a/source/base/cpio/FrugalBuild +++ b/source/base/cpio/FrugalBuild @@ -3,14 +3,17 @@ pkgname=cpio pkgver=2.9 -pkgrel=1 +pkgrel=2 pkgdesc="A program to manage archives of files" url="http://www.gnu.org/software/cpio" depends=('bash') groups=('base') archs=('i686' 'x86_64' 'ppc') Fup2gnubz2 -source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2) +source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 \ + cpio-2.9-safer_name_suffix.patch) +sha1sums=('ef381d0f33f1ea74475b6d813c42a74327762c4a' \ + '0c052bd7900bc8a39b74f36feab2d2358297f87b') build() { @@ -20,5 +23,3 @@ build() } # optimization ok - -sha1sums=('ef381d0f33f1ea74475b6d813c42a74327762c4a') diff --git a/source/base/cpio/cpio-2.9-safer_name_suffix.patch b/source/base/cpio/cpio-2.9-safer_name_suffix.patch new file mode 100644 index 0000000..796a999 --- /dev/null +++ b/source/base/cpio/cpio-2.9-safer_name_suffix.patch @@ -0,0 +1,89 @@ +diff -up tar-1.17/lib/paxnames.c.safer_name_suffix tar-1.17/lib/paxnames.c +--- tar-1.17/lib/paxnames.c.safer_name_suffix 2005-05-22 00:55:55.000000000 +0200 ++++ tar-1.17/lib/paxnames.c 2007-10-22 17:32:54.000000000 +0200 +@@ -36,15 +36,27 @@ hash_string_compare (void const *name1, + return strcmp (name1, name2) == 0; + } + +-/* Return zero if TABLE contains a copy of STRING; otherwise, insert a +- copy of STRING to TABLE and return 1. */ +-bool +-hash_string_insert (Hash_table **table, char const *string) ++/* Return zero if TABLE contains a LEN-character long prefix of STRING, ++ otherwise, insert a newly allocated copy of this prefix to TABLE and ++ return 1. If RETURN_PREFIX is not NULL, point it to the allocated ++ copy. */ ++static bool ++hash_string_insert_prefix (Hash_table **table, char const *string, size_t len, ++ const char **return_prefix) + { + Hash_table *t = *table; +- char *s = xstrdup (string); ++ char *s; + char *e; + ++ if (len) ++ { ++ s = xmalloc (len + 1); ++ memcpy (s, string, len); ++ s[len] = 0; ++ } ++ else ++ s = xstrdup (string); ++ + if (! ((t + || (*table = t = hash_initialize (0, 0, hash_string_hasher, + hash_string_compare, 0))) +@@ -52,7 +64,11 @@ hash_string_insert (Hash_table **table, + xalloc_die (); + + if (e == s) +- return 1; ++ { ++ if (return_prefix) ++ *return_prefix = s; ++ return 1; ++ } + else + { + free (s); +@@ -60,6 +76,14 @@ hash_string_insert (Hash_table **table, + } + } + ++/* Return zero if TABLE contains a copy of STRING; otherwise, insert a ++ copy of STRING to TABLE and return 1. */ ++bool ++hash_string_insert (Hash_table **table, char const *string) ++{ ++ return hash_string_insert_prefix (table, string, 0, NULL); ++} ++ + /* Return 1 if TABLE contains STRING. */ + bool + hash_string_lookup (Hash_table const *table, char const *string) +@@ -88,7 +112,8 @@ removed_prefixes_p (void) + If ABSOLUTE_NAMES is 0, strip filesystem prefix from the file name. */ + + char * +-safer_name_suffix (char const *file_name, bool link_target, bool absolute_names) ++safer_name_suffix (char const *file_name, bool link_target, ++ bool absolute_names) + { + char const *p; + +@@ -121,11 +146,9 @@ safer_name_suffix (char const *file_name + + if (prefix_len) + { +- char *prefix = alloca (prefix_len + 1); +- memcpy (prefix, file_name, prefix_len); +- prefix[prefix_len] = '\0'; +- +- if (hash_string_insert (&prefix_table[link_target], prefix)) ++ const char *prefix; ++ if (hash_string_insert_prefix (&prefix_table[link_target], file_name, ++ prefix_len, &prefix)) + { + static char const *const diagnostic[] = + { From vmiklos at frugalware.org Sat Nov 10 15:30:06 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 15:30:11 2007 Subject: [Frugalware-git] pacman-g2: move check_oldcache() from _pacman_sync_prepare to _pacman_trans_init Message-ID: <20071110143006.0CA90119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=2cfc68f3f08c6aff0f7d2e2e1ff98a93904a4040 commit 2cfc68f3f08c6aff0f7d2e2e1ff98a93904a4040 Author: Miklos Vajna Date: Sat Nov 10 15:24:43 2007 +0100 move check_oldcache() from _pacman_sync_prepare to _pacman_trans_init now really closes #2533 :) diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index 5cee0cb..bbcc3ff 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -401,23 +401,6 @@ static int check_olddelay() return(0); } -static int check_oldcache() -{ - pmdb_t *db = handle->db_local; - char lastupdate[16] = ""; - - if(_pacman_db_getlastupdate(db, lastupdate) == -1) { - return(-1); - } - if(strlen(db->lastupdate) && strcmp(lastupdate, db->lastupdate) != 0) { - _pacman_log(PM_LOG_DEBUG, _("cache for '%s' repo is too old"), db->treename); - _pacman_db_free_pkgcache(db); - } else { - _pacman_log(PM_LOG_DEBUG, _("cache for '%s' repo is up to date"), db->treename); - } - return(0); -} - int _pacman_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync, pmlist_t **data) { pmlist_t *deps = NULL; @@ -439,8 +422,6 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync, list = _pacman_list_add(list, sync->pkg); } - check_oldcache(); - if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { trail = _pacman_list_new(); diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c index 715ec8a..ac69a4c 100644 --- a/lib/libpacman/trans.c +++ b/lib/libpacman/trans.c @@ -39,6 +39,23 @@ #include "sync.h" #include "pacman.h" +static int check_oldcache() +{ + pmdb_t *db = handle->db_local; + char lastupdate[16] = ""; + + if(_pacman_db_getlastupdate(db, lastupdate) == -1) { + return(-1); + } + if(strlen(db->lastupdate) && strcmp(lastupdate, db->lastupdate) != 0) { + _pacman_log(PM_LOG_DEBUG, _("cache for '%s' repo is too old"), db->treename); + _pacman_db_free_pkgcache(db); + } else { + _pacman_log(PM_LOG_DEBUG, _("cache for '%s' repo is up to date"), db->treename); + } + return(0); +} + pmtrans_t *_pacman_trans_new() { pmtrans_t *trans; @@ -97,6 +114,8 @@ int _pacman_trans_init(pmtrans_t *trans, unsigned char type, unsigned int flags, trans->cb_progress = progress; trans->state = STATE_INITIALIZED; + check_oldcache(); + return(0); } From vmiklos at frugalware.org Sat Nov 10 15:30:06 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 15:30:15 2007 Subject: [Frugalware-git] pacman-tools: syncpkgcd: don't die on non-existing packages, just report the issue Message-ID: <20071110143006.F32A9119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=e76805d0660e58e778124378f8f0835323ccafd3 commit e76805d0660e58e778124378f8f0835323ccafd3 Author: Miklos Vajna Date: Sat Nov 10 15:29:51 2007 +0100 syncpkgcd: don't die on non-existing packages, just report the issue diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index c9c9eea..cc3e3fc 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -111,7 +111,9 @@ class Syncpkgcd: except OSError: self.log(pkg, "failed to get the repo") return - self.go(pkgname) + if not self.go(pkgname): + server.report_result(config.server_user, config.server_pass, pkg, 1, base64.encodestring("No such package.")) + return if scm == "git": self.system("git clean -x -d") elif scm == "darcs": @@ -167,8 +169,8 @@ class Syncpkgcd: continue if dir == pkgname: os.chdir(os.path.join(root, dir)) - return - raise Exception("can't find package '%s'") + return True + raise False def save(self): self.log("", "client shutting down") self.logsock.close() From vmiklos at frugalware.org Sat Nov 10 15:34:28 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 15:34:35 2007 Subject: [Frugalware-git] pacman-g2: syncripts/*sync: die on corrupted packages Message-ID: <20071110143428.BCBDF119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8338613bb3712d01f798e5ccf4a95f6c4ecf56dc commit 8338613bb3712d01f798e5ccf4a95f6c4ecf56dc Author: Miklos Vajna Date: Sat Nov 10 15:32:10 2007 +0100 syncripts/*sync: die on corrupted packages closes #2476 diff --git a/scripts/gensync b/scripts/gensync index 3be0abc..c63051c 100755 --- a/scripts/gensync +++ b/scripts/gensync @@ -64,6 +64,7 @@ CHROOT=1 get_sha1checksum() { if [ -f $pkgfile ]; then + bzip2 --test $pkgfile || die "corrupted package: $pkgfile" sha1line=`sha1sum $pkgfile` [ ! -z "$sha1line" ] && pkgsha1sum=${sha1line% *} echo $pkgsha1sum diff --git a/scripts/updatesync b/scripts/updatesync index b9a6952..fa79bd5 100755 --- a/scripts/updatesync +++ b/scripts/updatesync @@ -65,6 +65,7 @@ CHROOT=1 get_sha1checksum() { if [ -f $pkgfile ]; then + bzip2 --test $pkgfile || die "corrupted package: $pkgfile" sha1line=`sha1sum $pkgfile` [ ! -z "$sha1line" ] && pkgsha1sum=${sha1line% *} echo $pkgsha1sum From boobaa at frugalware.org Sat Nov 10 17:34:28 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 10 17:34:31 2007 Subject: [Frugalware-git] frugalware-current: perl-mail-dkim-0.29-1-i686 Message-ID: <20071110163428.45C9D119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9657364ed02ef929e85723e116308227c33e632b commit 9657364ed02ef929e85723e116308227c33e632b Author: CSÉCSY László Date: Sat Nov 10 17:34:11 2007 +0100 perl-mail-dkim-0.29-1-i686 version bump diff --git a/source/devel-extra/perl-mail-dkim/FrugalBuild b/source/devel-extra/perl-mail-dkim/FrugalBuild index 8d89c8e..d3b6f06 100644 --- a/source/devel-extra/perl-mail-dkim/FrugalBuild +++ b/source/devel-extra/perl-mail-dkim/FrugalBuild @@ -3,9 +3,9 @@ _F_perl_name=Mail-DKIM _F_perl_author=J/JA/JASLONG -pkgver=0.28 +pkgver=0.29 pkgdesc="Signs/verifies Internet mail with DKIM/DomainKey signatures" depends=('perl-crypt-openssl-rsa>=0.22' 'perl-digest-sha1' 'perl-digest-sha' 'perl-mailtools' 'perl-net-dns') Finclude perl archs=('i686' 'x86_64') -sha1sums=('2913dd30b5abba949e6d97ec6597d10053fbd68c') +sha1sums=('4f41b34da5c4a2164a7e8456a0d0cf68de0f205e') From crazy at frugalware.org Sat Nov 10 21:38:37 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 10 21:39:04 2007 Subject: [Frugalware-git] frugalware-current: perl-sys-syslog-0.22-1-i686 Message-ID: <20071110203837.A71EF119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=42d1d131d87c1c01dab991194584a7d1d4f5702f commit 42d1d131d87c1c01dab991194584a7d1d4f5702f Author: crazy Date: Sat Nov 10 21:38:16 2007 +0100 perl-sys-syslog-0.22-1-i686 * Version bump diff --git a/source/devel-extra/perl-sys-syslog/FrugalBuild b/source/devel-extra/perl-sys-syslog/FrugalBuild index a811ab5..93cbcbb 100644 --- a/source/devel-extra/perl-sys-syslog/FrugalBuild +++ b/source/devel-extra/perl-sys-syslog/FrugalBuild @@ -3,11 +3,11 @@ _F_perl_name=Sys-Syslog _F_perl_author=S/SA/SAPER -pkgver=0.21 +pkgver=0.22 pkgrel=1 pkgdesc="Perl interface to the UNIX syslog(3) calls" Finclude perl archs=('i686' 'x86_64') -sha1sums=('1f955ed78a0ce73fae5e1591aee77ad6fc1e03ca') +sha1sums=('bf259e1eb7b444da4ddd59f1f2150aa2615eb696') # optimization OK From crazy at frugalware.org Sat Nov 10 22:10:26 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 10 22:10:28 2007 Subject: [Frugalware-git] frugalware-current: perl-extutils-cbuilder-0.21-1-i686 Message-ID: <20071110211026.3B9FB119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=16ae76ef4e811c2088e14cefada1d2197f76007a commit 16ae76ef4e811c2088e14cefada1d2197f76007a Author: crazy Date: Sat Nov 10 22:10:04 2007 +0100 perl-extutils-cbuilder-0.21-1-i686 * Version bump diff --git a/source/devel/perl-extutils-cbuilder/FrugalBuild b/source/devel/perl-extutils-cbuilder/FrugalBuild index 6998cfb..a5ebc56 100644 --- a/source/devel/perl-extutils-cbuilder/FrugalBuild +++ b/source/devel/perl-extutils-cbuilder/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=ExtUtils-CBuilder _F_perl_author=K/KW/KWILLIAMS -pkgver=0.19 +pkgver=0.21 pkgrel=1 pkgdesc="Compile and link C code for Perl modules" Finclude perl archs=('i686' 'x86_64') -sha1sums=('5150d9d75e40d76d9277329ad383eef491deee4a') +sha1sums=('7dd599fed247fbec0e377dce6ac348786647dd0e') groups=('devel') From crazy at frugalware.org Sat Nov 10 22:21:44 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 10 22:21:46 2007 Subject: [Frugalware-git] frugalware-current: perl-mime-tools-5.424-1-i686 Message-ID: <20071110212144.108A1119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0da1a2629895a2bb7f9c6f9efb80235b94afba7 commit c0da1a2629895a2bb7f9c6f9efb80235b94afba7 Author: crazy Date: Sat Nov 10 22:20:55 2007 +0100 perl-mime-tools-5.424-1-i686 * Version bump diff --git a/source/devel-extra/perl-mime-tools/FrugalBuild b/source/devel-extra/perl-mime-tools/FrugalBuild index d5d6268..21d861d 100644 --- a/source/devel-extra/perl-mime-tools/FrugalBuild +++ b/source/devel-extra/perl-mime-tools/FrugalBuild @@ -3,9 +3,9 @@ _F_perl_name=MIME-tools _F_perl_author=D/DO/DONEILL -pkgver=5.423 +pkgver=5.424 pkgdesc="Perl modules for parsing (and creating!) MIME entities" depends=('perl-io-stringy' 'perl-mailtools') Finclude perl archs=('i686' 'x86_64') -sha1sums=('047507820fac12f124f3730577b35117d21d5c80') +sha1sums=('c967b2022f53e5790399af5efb25b8b64fbf248f') From crazy at frugalware.org Sat Nov 10 22:50:39 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 10 22:50:41 2007 Subject: [Frugalware-git] frugalware-current: lzma-4.32.3-1-i686 Message-ID: <20071110215039.69B44119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8372d3710b7c849727744d2ab7a75c040fa0e85f commit 8372d3710b7c849727744d2ab7a75c040fa0e85f Author: crazy Date: Sat Nov 10 22:50:16 2007 +0100 lzma-4.32.3-1-i686 * Version bump diff --git a/source/apps-extra/lzma/FrugalBuild b/source/apps-extra/lzma/FrugalBuild index a4011b5..e624ffb 100644 --- a/source/apps-extra/lzma/FrugalBuild +++ b/source/apps-extra/lzma/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Tuxbubling pkgname=lzma -pkgver=4.32.2 +pkgver=4.32.3 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=('48f8fea28eb93c326cb512dcb1384030f21a7b84') +sha1sums=('6d1be75ee482b1086fa231aac82d62ea7a160608') if [ "$CARCH" == "x86_64" ]; then export CFLAGS="$CFLAGS -fPIC" From vmiklos at frugalware.org Sat Nov 10 23:00:10 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 23:00:16 2007 Subject: [Frugalware-git] frugalware-current: bzr-0.92-1-i686 Message-ID: <20071110220010.408FA119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2109b6dbecd99ed0d7f623ff78cf0e2b3121826e commit 2109b6dbecd99ed0d7f623ff78cf0e2b3121826e Author: Miklos Vajna Date: Sat Nov 10 22:59:49 2007 +0100 bzr-0.92-1-i686 version bump diff --git a/source/devel-extra/bzr/FrugalBuild b/source/devel-extra/bzr/FrugalBuild index 25fbde0..5064098 100644 --- a/source/devel-extra/bzr/FrugalBuild +++ b/source/devel-extra/bzr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=bzr -pkgver=0.91 +pkgver=0.92 pkgrel=1 pkgdesc="Next generation distributed version control" url="http://bazaar-vcs.org" From vmiklos at frugalware.org Sat Nov 10 23:06:28 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Nov 10 23:06:31 2007 Subject: [Frugalware-git] frugalware-current: archivemail-0.7.2-1-i686 Message-ID: <20071110220628.44317119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1db7c6688a786292a5996900c2d097331e705caf commit 1db7c6688a786292a5996900c2d097331e705caf Author: Miklos Vajna Date: Sat Nov 10 23:06:19 2007 +0100 archivemail-0.7.2-1-i686 version bump removed -python25.patch, it's in upstream now diff --git a/source/network-extra/archivemail/FrugalBuild b/source/network-extra/archivemail/FrugalBuild index 15b18e7..1556472 100644 --- a/source/network-extra/archivemail/FrugalBuild +++ b/source/network-extra/archivemail/FrugalBuild @@ -2,13 +2,11 @@ # Maintainer: VMiklos pkgname=archivemail -pkgver=0.7.0 +pkgver=0.7.2 pkgrel=1 pkgdesc="A tool for archiving and compressing old email in mailboxes." Finclude sourceforge depends=('python') groups=('network-extra') archs=('i686') -source=($source archivemail-0.7.0-python25.patch) -sha1sums=('fcba04b7ae748d54b8ebcbecb0aad08c4f58e927' \ - '607cb3224adf67cf7d0c4d06eec586e6e6787936') +sha1sums=('0ff9b8991b04f09cf9536c45b6f9e05d2427a459') diff --git a/source/network-extra/archivemail/archivemail-0.7.0-python25.patch b/source/network-extra/archivemail/archivemail-0.7.0-python25.patch deleted file mode 100644 index 41e2f76..0000000 --- a/source/network-extra/archivemail/archivemail-0.7.0-python25.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- archivemail-0.7.0/archivemail.orig 2006-11-03 01:21:22.000000000 +0200 -+++ archivemail-0.7.0/archivemail 2007-05-10 12:04:16.000000000 +0300 -@@ -779,7 +779,10 @@ - # the headers have no valid dates -- last resort, try the file timestamp - # this will not work for mbox mailboxes - try: -- file_name = message.fp.name -+ if sys.hexversion >= 0x020500F0: -+ file_name = message.fp._file.name -+ else: -+ file_name = message.fp.name - except AttributeError: - # we are looking at a 'mbox' mailbox - argh! - # Just return the current time - this will never get archived :( -@@ -788,7 +791,7 @@ - if not os.path.isfile(file_name): - unexpected_error("mailbox file name '%s' has gone missing" % \ - file_name) -- time_message = os.path.getmtime(message.fp.name) -+ time_message = os.path.getmtime(file_name) - vprint("using valid time found from '%s' last-modification time" % \ - file_name) - return time_message -@@ -806,7 +809,11 @@ - """ - status = "" - x_status = "" -- match = re.search(":2,(.+)$", message.fp.name) -+ if sys.hexversion >= 0x020500F0: -+ fpname = message.fp._file.name -+ else: -+ fpname = message.fp.name -+ match = re.search(":2,(.+)$", fpname) - if match: - flags = match.group(1) - for flag in flags: -@@ -825,7 +832,7 @@ - - # files in the maildir 'cur' directory are no longer new, - # they are the same as messages with 'Status: O' headers in mbox -- last_dir = os.path.basename(os.path.dirname(message.fp.name)) -+ last_dir = os.path.basename(os.path.dirname(fpname)) - if last_dir == "cur": - status = status + "O" - -@@ -881,7 +888,10 @@ - return 1 - file_name = None - try: -- file_name = message.fp.name -+ if sys.hexversion >= 0x020500F0: -+ file_name = message.fp._file.name -+ else: -+ file_name = message.fp.name - except AttributeError: - pass - # maildir mailboxes use the filename suffix to indicate flagged status -@@ -901,7 +911,10 @@ - return 0 - file_name = None - try: -- file_name = message.fp.name -+ if sys.hexversion >= 0x020500F0: -+ file_name = message.fp._file.name -+ else: -+ file_name = message.fp.name - except AttributeError: - pass - # maildir mailboxes use the filename suffix to indicate read status -@@ -918,7 +931,10 @@ - file_name = None - message_size = None - try: -- file_name = message.fp.name -+ if sys.hexversion >= 0x020500F0: -+ file_name = message.fp._file.name -+ else: -+ file_name = message.fp.name - except AttributeError: - pass - if file_name: -@@ -1269,7 +1285,11 @@ - if type == "maildir": - add_status_headers(msg) - archive.write(msg) -- if not options.dry_run: delete_queue.append(msg.fp.name) -+ if sys.hexversion >= 0x020500F0: -+ fpname = msg.fp._file.name -+ else: -+ fpname = msg.fp.name -+ if not options.dry_run: delete_queue.append(fpname) - else: - vprint("decision: retain message") - msg = original.next() From crazy at frugalware.org Sat Nov 10 23:29:34 2007 From: crazy at frugalware.org (crazy) Date: Sat Nov 10 23:29:36 2007 Subject: [Frugalware-git] frugalware-current: tar-1.19-2-i686 Message-ID: <20071110222934.389A9119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=73e1a32aa7abd059ce290fe61dbc5e343c92b877 commit 73e1a32aa7abd059ce290fe61dbc5e343c92b877 Author: crazy Date: Sat Nov 10 23:28:50 2007 +0100 tar-1.19-2-i686 * updated lzma patch diff --git a/source/base/tar/FrugalBuild b/source/base/tar/FrugalBuild index c35d11c..bf99d4c 100644 --- a/source/base/tar/FrugalBuild +++ b/source/base/tar/FrugalBuild @@ -3,7 +3,7 @@ pkgname=tar pkgver=1.19 -pkgrel=1 +pkgrel=2 pkgdesc="Utility used to store, backup, and transport files" url="http://www.gnu.org/software/tar/tar.html" depends=('bash') @@ -11,7 +11,7 @@ groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz tar.1 \ - $pkgname-1.16-lzma.diff) + $pkgname-1.18-lzma.patch) signatures=($source.sig '' '') build() diff --git a/source/base/tar/tar-1.16-lzma.diff b/source/base/tar/tar-1.16-lzma.diff deleted file mode 100644 index a42f842..0000000 --- a/source/base/tar/tar-1.16-lzma.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur tar-1.16.orig/src/buffer.c tar-1.16/src/buffer.c ---- tar-1.16.orig/src/buffer.c 2006-10-16 08:33:55.000000000 +0200 -+++ tar-1.16/src/buffer.c 2006-10-22 00:52:49.000000000 +0200 -@@ -196,7 +196,8 @@ - ct_none, - ct_compress, - ct_gzip, -- ct_bzip2 -+ ct_bzip2, -+ ct_lzma - }; - - struct zip_magic -@@ -213,6 +214,7 @@ - { ct_compress, 2, "\037\235", "compress", "-Z" }, - { ct_gzip, 2, "\037\213", "gzip", "-z" }, - { ct_bzip2, 3, "BZh", "bzip2", "-j" }, -+ { ct_lzma, 6, "\xFFLZMA\x00", "lzma", "-Y" }, - }; - - #define NMAGIC (sizeof(magic)/sizeof(magic[0])) -diff -Naur tar-1.16.orig/src/tar.c tar-1.16/src/tar.c ---- tar-1.16.orig/src/tar.c 2006-10-17 10:11:31.000000000 +0200 -+++ tar-1.16/src/tar.c 2006-10-22 00:54:13.000000000 +0200 -@@ -568,6 +568,8 @@ - N_("control pax keywords"), GRID+8 }, - {"label", 'V', N_("TEXT"), 0, - N_("create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name"), GRID+8 }, -+ {"lzma", 'Y', 0, 0, -+ N_("filter the archive through lzma using 'lzmash' wrapper script"), 68 }, - {"bzip2", 'j', 0, 0, - N_("filter the archive through bzip2"), GRID+8 }, - {"gzip", 'z', 0, 0, -@@ -1423,6 +1425,10 @@ - } - break; - -+ case 'Y': -+ set_use_compress_program_option ("lzma"); -+ break; -+ - case 'z': - set_use_compress_program_option ("gzip"); - break; diff --git a/source/base/tar/tar-1.18-lzma.patch b/source/base/tar/tar-1.18-lzma.patch new file mode 100644 index 0000000..c92ab23 --- /dev/null +++ b/source/base/tar/tar-1.18-lzma.patch @@ -0,0 +1,72 @@ +# Description +# +# This patch adds `-a' and a long option equivalent `--lzma' +# to GNU tar 1.18. +# +# Changes +# +# 2007-08-10 - Updated the patch to work with GNU tar 1.18. +# +# 2007-08-10 - Use `-a' instead of of `-Y'. BusyBox already uses `-a' +# and that conflicts less with other tar implementations +# than `-Y'. +# +# 2006-08-16 - Updated magic byte detection for the new .lzma format. +# +# 2005-12-23 - Updated to use the new lzma command line tool which +# replaced the ugly lzmash wrapper script. +# +# 2005-05-06 - Initial version using lzmash wrapper script +# +# Copyright information +# +# GNU tar is copyright by Free Software Foundation, Inc. +# This patch was written by Lasse Collin . +# +# GNU tar is distributed under the GNU GPL. However, the author of +# this patch puts the changes made by him into the public domain. + +diff -ru tar-1.18.orig/src/buffer.c tar-1.18/src/buffer.c +--- tar-1.18.orig/src/buffer.c 2007-06-27 16:30:31.000000000 +0300 ++++ tar-1.18/src/buffer.c 2007-08-10 23:03:33.430394635 +0300 +@@ -205,7 +205,8 @@ + ct_none, + ct_compress, + ct_gzip, +- ct_bzip2 ++ ct_bzip2, ++ ct_lzma + }; + + struct zip_magic +@@ -222,6 +223,7 @@ + { ct_compress, 2, "\037\235", "compress", "-Z" }, + { ct_gzip, 2, "\037\213", "gzip", "-z" }, + { ct_bzip2, 3, "BZh", "bzip2", "-j" }, ++ { ct_lzma, 6, "\xFFLZMA", "lzma", "-a" }, + }; + + #define NMAGIC (sizeof(magic)/sizeof(magic[0])) +diff -ru tar-1.18.orig/src/tar.c tar-1.18/src/tar.c +--- tar-1.18.orig/src/tar.c 2007-06-27 16:30:32.000000000 +0300 ++++ tar-1.18/src/tar.c 2007-08-10 23:03:33.430394635 +0300 +@@ -574,6 +574,8 @@ + N_("control pax keywords"), GRID+8 }, + {"label", 'V', N_("TEXT"), 0, + N_("create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name"), GRID+8 }, ++ {"lzma", 'a', 0, 0, ++ N_("filter the archive through lzma"), GRID+8 }, + {"bzip2", 'j', 0, 0, + N_("filter the archive through bzip2"), GRID+8 }, + {"gzip", 'z', 0, 0, +@@ -1184,6 +1186,10 @@ + args->input_files = true; + break; + ++ case 'a': ++ set_use_compress_program_option ("lzma"); ++ break; ++ + case 'A': + set_subcommand_option (CAT_SUBCOMMAND); + break; From vmiklos at frugalware.org Sun Nov 11 00:28:39 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 11 00:28:51 2007 Subject: [Frugalware-git] frugalware-current: sendmail-8.14.2-1-i686 Message-ID: <20071110232839.71FCB119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0884c7c993c821dd8407aafd8c4c8092cbbf4b43 commit 0884c7c993c821dd8407aafd8c4c8092cbbf4b43 Author: Miklos Vajna Date: Sun Nov 11 00:28:18 2007 +0100 sendmail-8.14.2-1-i686 version bump diff --git a/source/network-extra/sendmail/FrugalBuild b/source/network-extra/sendmail/FrugalBuild index 42176a8..6accd51 100644 --- a/source/network-extra/sendmail/FrugalBuild +++ b/source/network-extra/sendmail/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=sendmail -pkgver=8.14.1 -pkgrel=2 +pkgver=8.14.2 +pkgrel=1 pkgdesc="Eric Allman's mail transfer agent" url="http://www.sendmail.org/" depends=('db>=4.6.18' 'openssl' 'procmail' 'cyrus-sasl') @@ -17,6 +17,13 @@ up2date="lynx -dump http://www.sendmail.org/|grep 'Sendmail [0-9\.]* is availabl source=(ftp://ftp.sendmail.org/pub/$pkgname/$pkgname.$pkgver.tar.gz \ site.config.m4 linux.uucp.mc sendmail-frugalware-tls.mc \ sendmail-frugalware.mc rc.sendmail cf2mc) +sha1sums=('2b92a1d439374249ef6bf024cfb8072902c5682a' \ + 'b82263c2f6f0028f67a007a1ae2e93af75528c95' \ + 'd14178882d7ba874fad63e0cf130fca947b3ef64' \ + '8d6a40159cf1691ab6b9d1e08700e0d441b82caf' \ + '4bba71804bed067dcceb49476471869c1853400e' \ + '54c424540549ecb5200da54bdb995e9fb4778e35' \ + '36c3707f6be8bf7e83da5b1e292fa47e7f86a27c') build() { @@ -96,12 +103,5 @@ build() cp -f $Fsrcdir/cf2mc cf/Build } -sha1sums=('327a77a3b5a55810f2addae7dfd6cfd95645f476'\ - 'b82263c2f6f0028f67a007a1ae2e93af75528c95'\ - 'd14178882d7ba874fad63e0cf130fca947b3ef64'\ - '8d6a40159cf1691ab6b9d1e08700e0d441b82caf'\ - '4bba71804bed067dcceb49476471869c1853400e'\ - '54c424540549ecb5200da54bdb995e9fb4778e35'\ - '36c3707f6be8bf7e83da5b1e292fa47e7f86a27c') # optimization OK From vmiklos at frugalware.org Sun Nov 11 00:42:36 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 11 00:42:43 2007 Subject: [Frugalware-git] frugalware-current: man-pages-extras-fr-0.7.8-1-i686 Message-ID: <20071110234236.F2279119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59714f6b549a92e32fd5f56cdb87b990988cd75d commit 59714f6b549a92e32fd5f56cdb87b990988cd75d Author: Miklos Vajna Date: Sun Nov 11 00:42:31 2007 +0100 man-pages-extras-fr-0.7.8-1-i686 version bump diff --git a/source/locale-extra/man-pages-extras-fr/FrugalBuild b/source/locale-extra/man-pages-extras-fr/FrugalBuild index 0041db9..e81fc91 100644 --- a/source/locale-extra/man-pages-extras-fr/FrugalBuild +++ b/source/locale-extra/man-pages-extras-fr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=man-pages-extras-fr -pkgver=0.7.3 +pkgver=0.7.8 pkgrel=1 pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" From vmiklos at frugalware.org Sun Nov 11 00:48:44 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 11 00:48:47 2007 Subject: [Frugalware-git] frugalware-current: bashburn-2.1.2-1-i686 Message-ID: <20071110234844.D1048119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8979e82a24c720af8a8f739fcb03b0ed064ea077 commit 8979e82a24c720af8a8f739fcb03b0ed064ea077 Author: Miklos Vajna Date: Sun Nov 11 00:48:29 2007 +0100 bashburn-2.1.2-1-i686 version bump diff --git a/source/multimedia/bashburn/FrugalBuild b/source/multimedia/bashburn/FrugalBuild index e3a7a0e..39e02ac 100644 --- a/source/multimedia/bashburn/FrugalBuild +++ b/source/multimedia/bashburn/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=bashburn -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="A CD burning shell script." rodepends=('bash' 'cdrtools' 'cdrdao' 'mpg321' 'lame' 'vorbis-tools' 'flac' \ @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') _F_sourceforge_dirname="bashburn" _F_sourceforge_name="BashBurn" Finclude sourceforge -sha1sums=('50f0da8cd15168a7c6bfa30b0cd262be453cf236') +sha1sums=('2487a182d0791a8c92959aae9a76f94d69a665ec') build() { From vmiklos at frugalware.org Sun Nov 11 00:59:38 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 11 00:59:40 2007 Subject: [Frugalware-git] frugalware-current: aspell5-ga-4.3r0-1-i686 Message-ID: <20071110235938.81B4D119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=324b8d6a9dd989d3f330416951b3d592af91ac47 commit 324b8d6a9dd989d3f330416951b3d592af91ac47 Author: Miklos Vajna Date: Sun Nov 11 00:59:27 2007 +0100 aspell5-ga-4.3r0-1-i686 version bump diff --git a/source/locale-extra/aspell5-ga/FrugalBuild b/source/locale-extra/aspell5-ga/FrugalBuild index fcdef90..5cab8ae 100644 --- a/source/locale-extra/aspell5-ga/FrugalBuild +++ b/source/locale-extra/aspell5-ga/FrugalBuild @@ -2,10 +2,11 @@ # Maintainer: VMiklos _F_aspell_lang=ga -pkgver=4.1r0 +pkgver=4.3r0 pkgrel=1 pkgdesc="GNU Aspell Irish Word List Package" _F_aspell_ver=5 _F_aspell_noverstrip=y Finclude aspell -sha1sums=('7ac5c05af6c46fa75a864391dfc85406d9b51413') +unset signatures +sha1sums=('8f5de6a289c01eab0a2ee7ada853c923c9a22d5c') From vmiklos at frugalware.org Sun Nov 11 01:28:56 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 11 01:28:59 2007 Subject: [Frugalware-git] frugalware-current: powertop-1.9-1-i686 Message-ID: <20071111002856.A0124119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cbe01c0d81acc69f04783f9906ecdd3392b07575 commit cbe01c0d81acc69f04783f9906ecdd3392b07575 Author: Miklos Vajna Date: Sun Nov 11 01:28:48 2007 +0100 powertop-1.9-1-i686 new package thanks to Daniel Exner in bug #2248 diff --git a/source/apps-extra/powertop/FrugalBuild b/source/apps-extra/powertop/FrugalBuild new file mode 100644 index 0000000..c8e2db7 --- /dev/null +++ b/source/apps-extra/powertop/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=powertop +pkgver=1.9 +pkgrel=1 +pkgdesc="A tool that helps you find what software is using the most power." +url="http://www.linuxpowertop.org" +depends=('ncurses') +groups=('apps-extra') +archs=('i686') +up2date="lynx -dump http://www.lesswatts.org/projects/powertop/download.php|grep -m1 tar.gz$|Flasttar" +source=(http://www.lesswatts.org/projects/powertop/download/powertop-$pkgver.tar.gz) +sha1sums=('35464952281373f38ce1694d6543aa20cbc8759d') +# optimization OK From crazy at frugalware.org Sun Nov 11 02:37:01 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 02:37:05 2007 Subject: [Frugalware-git] frugalware-current: libmng-1.0.10-1-i686 Message-ID: <20071111013701.E27AB119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c63e4e706de979e05c20ddc8dbbb680b8133899b commit c63e4e706de979e05c20ddc8dbbb680b8133899b Author: crazy Date: Sun Nov 11 02:35:20 2007 +0100 libmng-1.0.10-1-i686 * fixed up2date and url bug * new m8r diff --git a/source/lib/libmng/FrugalBuild b/source/lib/libmng/FrugalBuild index 962f7d3..6c81bfa 100644 --- a/source/lib/libmng/FrugalBuild +++ b/source/lib/libmng/FrugalBuild @@ -1,17 +1,17 @@ # Compiling Time: 0.28 SBU -# Maintainer: Zsolt Szalai +# Maintainer: crazy +# Contributor: Zsolt Szalai pkgname=libmng pkgver=1.0.10 pkgrel=1 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files" -url="http://www.libmng.com/" groups=('lib') archs=('i686' 'x86_64' 'ppc') depends=('lcms') -_F_sourceforge_prefix="$pkgname-" _F_sourceforge_broken_up2date=1 Finclude sourceforge +url="http://www.libmng.com/" sha1sums=('78ad516a1de79d00de720bf2a7c9afea2c896b09') build() From crazy at frugalware.org Sun Nov 11 02:57:30 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 02:57:32 2007 Subject: [Frugalware-git] frugalware-current: libungif-4.1.4-2-i686 Message-ID: <20071111015730.60411119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=413895c4641cfd5fd3476f4ea3e46c4a453ca983 commit 413895c4641cfd5fd3476f4ea3e46c4a453ca983 Author: crazy Date: Sun Nov 11 02:57:03 2007 +0100 libungif-4.1.4-2-i686 * died , see http://sourceforge.net/forum/forum.php?forum_id=753553 * TEMP set up2date to $pkgver till I replace it with giflib * new m8r diff --git a/source/xlib/libungif/FrugalBuild b/source/xlib/libungif/FrugalBuild index 2679073..ad45238 100644 --- a/source/xlib/libungif/FrugalBuild +++ b/source/xlib/libungif/FrugalBuild @@ -6,12 +6,14 @@ pkgname=libungif pkgver=4.1.4 pkgrel=2 pkgdesc="GIF loading and saving shared library" -url=('http://libungif.sourceforge.net/') depends=('libx11' 'libsm' 'libxt') groups=('xlib') archs=('i686' 'x86_64') -_F_sourceforge_broken_up2date=1 +_F_sourceforge_dirname="giflib" Finclude sourceforge +# DIED -> http://sourceforge.net/forum/forum.php?forum_id=753553 +up2date="$pkgver" +url="http://giflib.sourceforge.net/doc/" sha1sums=('7e7214bfe2079210edbce81a5c252d66ff292709') Fconfopts="$Fconfopts --with-x" From crazy at frugalware.org Sun Nov 11 03:51:57 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 03:52:01 2007 Subject: [Frugalware-git] frugalware-current: poppler-data-0.1.1-1-i686 Message-ID: <20071111025157.20D0A119019F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f5a00911b0f10753562ff06fa109ab7464eb09c commit 1f5a00911b0f10753562ff06fa109ab7464eb09c Author: crazy Date: Sun Nov 11 03:49:57 2007 +0100 poppler-data-0.1.1-1-i686 * New package ( for poppler ) diff --git a/source/apps/poppler-data/FrugalBuild b/source/apps/poppler-data/FrugalBuild new file mode 100644 index 0000000..dd8786f --- /dev/null +++ b/source/apps/poppler-data/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling time: 0.89 SBU +# Maintainer: crazy + +pkgname=poppler-data +pkgver=0.1.1 +pkgrel=1 +pkgdesc="Encoding files for poppler" +url="http://poppler.freedesktop.org/" +depends=() +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') + +build() +{ + Fcd + make install prefix=/usr DESTDIR=$Fdestdir || Fdie +} From crazy at frugalware.org Sun Nov 11 04:05:36 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 04:05:39 2007 Subject: [Frugalware-git] frugalware-current: poppler-0.6.2-1-i686 Message-ID: <20071111030536.BA5CB11901B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d30e88ab2c161015b9707d533f7672606a30d65 commit 5d30e88ab2c161015b9707d533f7672606a30d65 Author: crazy Date: Sun Nov 11 04:03:59 2007 +0100 poppler-0.6.2-1-i686 * [SEC] Version bump * closes #2561 in current diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index 30c25d0..29e10fe 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -2,11 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=poppler -pkgver=0.6.1 -pkgrel=2 +pkgver=0.6.2 +pkgrel=1 pkgdesc="A PDF rendering library" url="http://poppler.freedesktop.org/" -depends=('libxext' 'fontconfig' 'libstdc++' 'cairo' 'libjpeg' 'libxrender' 'libpng') +depends=('libxext' 'fontconfig' 'libstdc++' 'cairo' 'libjpeg' 'libxrender' 'libpng') +rodepends=('poppler-data') makedepends=('qt' 'gtk+2>=2.12.0' 'gtk-doc' 'libqtgui' 'libqtxml' 'libqttest') groups=('xlib') archs=('i686' 'x86_64') @@ -22,8 +23,12 @@ subdepends=('poppler pango gtk+2' 'poppler qt' 'poppler' 'poppler libqtgui libq subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') build() { - Fbuild --enable-a4-paper --enable-qt --enable-gtk-doc \ - --enable-xpdf-headers --enable-zlib + Fbuild \ + --enable-a4-paper \ + --enable-qt \ + --enable-gtk-doc \ + --enable-xpdf-headers \ + --enable-zlib Ffile 01-poppler.conf /etc/fonts/conf.avail/01-poppler.conf Fln /etc/fonts/conf.avail/01-poppler.conf /etc/fonts/conf.d/01-poppler.conf Fsplit poppler-pdftools usr/bin/* @@ -39,6 +44,6 @@ build() { Fsplit poppler-qt4 usr/include/poppler/qt4/ } -sha1sums=('f28184df94fe6312db0a11e285d7832c3cfd0797' \ +sha1sums=('3e367cab2ba110bfe42c3ab1036597410ad591da' \ 'a048348d9a8c6d545714350d3ab66dc7028e4b7f') # optimization OK From crazy at frugalware.org Sun Nov 11 05:26:59 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 05:27:01 2007 Subject: [Frugalware-git] frugalware-current: kdegraphics-3.5.8-2-i686 Message-ID: <20071111042659.0E65611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6b3341d013954125d42ff209f7cc8492f4e7a039 commit 6b3341d013954125d42ff209f7cc8492f4e7a039 Author: crazy Date: Sun Nov 11 05:22:31 2007 +0100 kdegraphics-3.5.8-2-i686 * [SEC] relbump * closes #2560 in -current diff --git a/source/kde/kdegraphics/FrugalBuild b/source/kde/kdegraphics/FrugalBuild index 5d12662..1ef9afc 100644 --- a/source/kde/kdegraphics/FrugalBuild +++ b/source/kde/kdegraphics/FrugalBuild @@ -3,16 +3,19 @@ pkgname=kdegraphics pkgver=3.5.8 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Graphics Programs" groups=('kde') archs=('i686' 'x86_64') depends=('kdebase>=3.5.8' 'imlib' 'freeglut' 'lcms' 'sane-backends' 't1lib' 'libgphoto2' \ - 'fribidi' 'poppler-qt' 'xespgs' 'xpdf>=3.02-3' 'urw-fonts' 'openexr>=1.4.0a-2') + 'fribidi' 'poppler-qt>=0.6.2' 'xghostscript' 'xpdf>=3.02-4' 'urw-fonts' 'openexr>=1.4.0a-2' \ + 'poppler-pdftools>=0.6.2') makedepends=('doxygen' 'qt-docs') rodepends=('ocrad') _F_kde_split_docs=1 Finclude kde +source=($source \ + ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.8-kdegraphics-kpdf.diff) Fconfopts="$Fconfopts --disable-kpdf-drm --with-openexr --with-gphoto2-libraries=/usr/lib \ --with-gphoto2-includes=/usr/include/gphoto2 --with-imlib-config=/usr/bin \ --with-jpeg=/usr/lib --with-tiff=/usr/lib --with-poppler" @@ -23,5 +26,6 @@ subdepends=('') subgroups=('docs-extra kde-docs') subarchs=('i686 x86_64') -sha1sums=('2f7b0aeefffd1d10128f1f1edd7e4c11e0329f35') +sha1sums=('2f7b0aeefffd1d10128f1f1edd7e4c11e0329f35' \ + 'fea08298b8f9228ed57ddf0ceffcab12755c1e80') # optimization OK From voroskoi at frugalware.org Sun Nov 11 11:54:27 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 11:54:30 2007 Subject: [Frugalware-git] frugalware-current: libixp-0.4-1-i686 Message-ID: <20071111105427.98C4111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=202b608d80ad9aa95e9e8b39abd00df362888e0a commit 202b608d80ad9aa95e9e8b39abd00df362888e0a Author: voroskoi Date: Sun Nov 11 11:52:22 2007 +0100 libixp-0.4-1-i686 version bump added destdir.diff updated build() accordingly diff --git a/source/xlib-extra/libixp/FrugalBuild b/source/xlib-extra/libixp/FrugalBuild index d33b0a2..5771568 100644 --- a/source/xlib-extra/libixp/FrugalBuild +++ b/source/xlib-extra/libixp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libixp -pkgver=0.2 +pkgver=0.4 pkgrel=1 pkgdesc="libixp is a stand-alone client/server 9P library including ixpc client." url="http://www.suckless.org/wiki/libs/libixp" @@ -10,13 +10,15 @@ depends=('glibc') groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep tar |sed 's/.*-\(.*\).t.*/\1/'" -source=(http://libs.suckless.org/download/libixp-$pkgver.tar.gz) +source=(http://libs.suckless.org/download/libixp-$pkgver.tar.gz destdir.diff) +sha1sums=('ec1adfeb4c5f502dfcb1b99fcf440841ecee2f9a' \ + '74db93510c04fb0af6b8553b40a0db57c47e08a7') build() { - Fsed 'PREFIX = /usr/local' "PREFIX = $Fprefix" config.mk - Fsed 'CFLAGS = -Os' "CFLAGS = $CFLAGS" config.mk - Fbuild + Fpatchall + Fsed '-g -Wall' "${CFLAGS} -Wall" config.mk + Fmake + Fmakeinstall DESTDIR=${Fdestdir} } -sha1sums=('14e11b5ae179415e1353df4e0d4bc6cb1b434156') # optimization OK diff --git a/source/xlib-extra/libixp/destdir.diff b/source/xlib-extra/libixp/destdir.diff new file mode 100644 index 0000000..7e21a42 --- /dev/null +++ b/source/xlib-extra/libixp/destdir.diff @@ -0,0 +1,22 @@ +diff -aur libixp-0.4/config.mk fw_libixp-0.4/config.mk +--- libixp-0.4/config.mk 2007-11-05 15:36:22.000000000 +0100 ++++ fw_libixp-0.4/config.mk 2007-11-11 11:26:46.000000000 +0100 +@@ -11,12 +11,12 @@ + TASKINC = -I${HOME}/libtask + + # paths +-PREFIX = /usr/local +-BIN = ${PREFIX}/bin +-MAN = ${PREFIX}/share/man +-ETC = ${PREFIX}/etc +-LIBDIR = ${PREFIX}/lib +-INCLUDE = ${PREFIX}/include ++PREFIX = /usr ++BIN = ${DESTDIR}/${PREFIX}/bin ++MAN = ${DESTDIR}/${PREFIX}/share/man ++ETC = ${DESTDIR}/etc ++LIBDIR = ${DESTDIR}/${PREFIX}/lib ++INCLUDE = ${DESTDIR}/${PREFIX}/include + + # Includes and libs + INCPATH = .:${ROOT}/include:${INCLUDE}:/usr/include From devil505linux at gmail.com Sun Nov 11 13:22:46 2007 From: devil505linux at gmail.com (Devil505) Date: Sun Nov 11 13:22:51 2007 Subject: [Frugalware-git] frugalware-current: stella-2.4.2-1-i686 Message-ID: <20071111122246.163AF11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=28cd02143a9e839c4ac2aa243a69590d629e175f commit 28cd02143a9e839c4ac2aa243a69590d629e175f Author: Devil505 Date: Sun Nov 11 13:20:09 2007 +0100 stella-2.4.2-1-i686 *New Package diff --git a/source/games-extra/stella/FrugalBuild b/source/games-extra/stella/FrugalBuild new file mode 100644 index 0000000..23ee357 --- /dev/null +++ b/source/games-extra/stella/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 1.48 SBU +# Maintainer: Devil505 + +pkgname=stella +pkgver=2.4.2 +pkgrel=1 +pkgdesc="A multi-platform Atari 2600 VCS emulator" +_F_sourceforge_ext="-src.tar.gz" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('sdl' 'zlib') +makedepends=('nasm' 'libgl') +groups=('games-extra') +archs=('i686') +sha1sums=('6cd80e740042a99f6370f01d3f8ba0b3eb4edf44') + +# optimization OK From voroskoi at frugalware.org Sun Nov 11 13:52:05 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 13:52:34 2007 Subject: [Frugalware-git] frugalware-current: gnutls-2.0.3-1-i686 Message-ID: <20071111125205.1ED2511901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=693b7b3446aab1e523c090b678e1200ad7134426 commit 693b7b3446aab1e523c090b678e1200ad7134426 Author: voroskoi Date: Sun Nov 11 13:51:06 2007 +0100 gnutls-2.0.3-1-i686 version bump diff --git a/source/lib/gnutls/FrugalBuild b/source/lib/gnutls/FrugalBuild index 5adf516..18b3608 100644 --- a/source/lib/gnutls/FrugalBuild +++ b/source/lib/gnutls/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=gnutls -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.3 +pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" url="http://www.gnu.org/software/gnutls/" groups=('lib') From devil505linux at gmail.com Sun Nov 11 13:54:23 2007 From: devil505linux at gmail.com (Devil505) Date: Sun Nov 11 13:54:25 2007 Subject: [Frugalware-git] frugalware-current: cwallpaper-0.3.1-1-i686 Message-ID: <20071111125424.083D011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9ea9954bf67ae3c12fe5943372bd5e1a90e420f commit e9ea9954bf67ae3c12fe5943372bd5e1a90e420f Author: Devil505 Date: Sun Nov 11 13:53:30 2007 +0100 cwallpaper-0.3.1-1-i686 *New Package diff --git a/source/xapps-extra/cwallpaper/FrugalBuild b/source/xapps-extra/cwallpaper/FrugalBuild new file mode 100644 index 0000000..93cab15 --- /dev/null +++ b/source/xapps-extra/cwallpaper/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.03 SBU +# Maintainer: Devil505 + +pkgname=cwallpaper +pkgver=0.3.1 +pkgrel="1" +pkgdesc="CWallpaper is a front end for fbsetbg, Esetroot, feh, and other wallpaper changers." +depends=('gtk+2' 'libxdamage') +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +sha1sums=('395d6cf35bf35ae38a5aa271a1be88ca46011cbf') + +# optimization OK \ No newline at end of file From vmiklos at frugalware.org Sun Nov 11 14:03:37 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 11 14:03:41 2007 Subject: [Frugalware-git] frugalware-current: acetoneiso2-1.96_beta2-1-i686 Message-ID: <20071111130337.F2519119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3ae34a4a68087c5a6e061ed704c76a7c5eed22a commit d3ae34a4a68087c5a6e061ed704c76a7c5eed22a Author: Miklos Vajna Date: Sun Nov 11 14:02:56 2007 +0100 acetoneiso2-1.96_beta2-1-i686 s/mesh/$_F_sourceforge_mirror/ diff --git a/source/kde-extra/acetoneiso2/FrugalBuild b/source/kde-extra/acetoneiso2/FrugalBuild index 7d52160..37f4984 100644 --- a/source/kde-extra/acetoneiso2/FrugalBuild +++ b/source/kde-extra/acetoneiso2/FrugalBuild @@ -15,7 +15,7 @@ _F_sourceforge_sep="_" Finclude sourceforge up2date="lynx -dump 'http://www.acetoneteam.org/download.html'|grep -m1 'LATEST VERSION'|sed 's/.*].*SO2 v\(.*\)/\1/;s/ /_/'" ## yepp I know is just for this releases like this so don't touch please. -source=(http://mesh.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-v1.96-beta2.tar.gz \ +source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-v1.96-beta2.tar.gz \ fix-DOS-again.patch) url="http://www.acetoneteam.org/central.html" sha1sums=('5a8aa4a63fbbd081abb6dfcce9c32f12e6f16bfe' \ From voroskoi at frugalware.org Sun Nov 11 14:16:29 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 14:16:32 2007 Subject: [Frugalware-git] frugalware-current: qca-gnupg-2.0.0-2-i686 Message-ID: <20071111131629.C284711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c92809013ae816fd9d55289e74bc024886209cb6 commit c92809013ae816fd9d55289e74bc024886209cb6 Author: voroskoi Date: Sun Nov 11 14:16:10 2007 +0100 qca-gnupg-2.0.0-2-i686 bump to beta2 diff --git a/source/xlib-extra/qca-gnupg/FrugalBuild b/source/xlib-extra/qca-gnupg/FrugalBuild index b1dc1c8..a46e25f 100644 --- a/source/xlib-extra/qca-gnupg/FrugalBuild +++ b/source/xlib-extra/qca-gnupg/FrugalBuild @@ -3,8 +3,8 @@ pkgname=qca-gnupg pkgver=2.0.0 -pkgextraver=-beta1 -pkgrel=1 +pkgextraver=-beta2 +pkgrel=2 pkgdesc="This plugin provides features based on GnuPG for QCA2." url="http://delta.affinix.com/qca/" groups=('xlib-extra') @@ -15,7 +15,7 @@ rodepends=('gnupg2') source=(http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${pkgver}${pkgextraver}.tar.bz2) up2date="lynx -dump http://delta.affinix.com/download/qca/2.0/plugins/ |Flasttarbz2 |sed s/${pkgextraver}//" options=('scriptlet') -sha1sums=('111a3550e073814a37a5bed9056c369bf1cf7f49') +sha1sums=('d7b7834132f40c73ad6bf589951949b878868906') build() { Fcd From voroskoi at frugalware.org Sun Nov 11 14:21:57 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 14:21:59 2007 Subject: [Frugalware-git] frugalware-current: qca-ossl-2.0.0-2-i686 Message-ID: <20071111132157.3787A11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7af11516c6db6144d9b478b6dbdc8b4426b5fb67 commit 7af11516c6db6144d9b478b6dbdc8b4426b5fb67 Author: voroskoi Date: Sun Nov 11 14:21:36 2007 +0100 qca-ossl-2.0.0-2-i686 bump to beta2 diff --git a/source/xlib-extra/qca-ossl/FrugalBuild b/source/xlib-extra/qca-ossl/FrugalBuild index 147a8e8..1b0aeed 100644 --- a/source/xlib-extra/qca-ossl/FrugalBuild +++ b/source/xlib-extra/qca-ossl/FrugalBuild @@ -3,8 +3,8 @@ pkgname=qca-ossl pkgver=2.0.0 -pkgextraver=-beta1 -pkgrel=1 +pkgextraver=-beta2 +pkgrel=2 pkgdesc="This plugin provides features based on OpenSSL for QCA2." url="http://delta.affinix.com/qca/" groups=('xlib-extra') @@ -14,7 +14,7 @@ depends=('qca>=2.0.0' 'openssl') source=(http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${pkgver}${pkgextraver}.tar.bz2) up2date="lynx -dump http://delta.affinix.com/download/qca/2.0/plugins/ |Flasttarbz2 |sed s/${pkgextraver}//" options=('scriptlet') -sha1sums=('c326ff170023a8757c16c76f61fe44991c5f715d') +sha1sums=('b2404af526aa51664dfc6c2d2ceaeaa2135bdc58') build() { Fcd From voroskoi at frugalware.org Sun Nov 11 14:47:48 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 14:47:51 2007 Subject: [Frugalware-git] frugalware-current: fxruby-1.6.13-1-i686 Message-ID: <20071111134748.A4C2811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d371cf7b0f83500474d74693f0754beb80937515 commit d371cf7b0f83500474d74693f0754beb80937515 Author: voroskoi Date: Sun Nov 11 14:47:15 2007 +0100 fxruby-1.6.13-1-i686 version bump diff --git a/source/xlib-extra/fxruby/FrugalBuild b/source/xlib-extra/fxruby/FrugalBuild index 6bd2f0d..d313393 100644 --- a/source/xlib-extra/fxruby/FrugalBuild +++ b/source/xlib-extra/fxruby/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=fxruby -pkgver=1.6.12 +pkgver=1.6.13 pkgrel=1 pkgdesc="An extension module for Ruby that provides an interface to the FOX GUI toolkit." url="http://www.fxruby.org/" @@ -13,6 +13,7 @@ groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://rubyforge.org/projects/fxruby|grep -m1 'FXRuby 1.6'|sed -e 's/.*1.6 \(.*\) /\1/' -e 's/ .*//'" source=(http://rubyforge.rubyuser.de/fxruby/FXRuby-$pkgver.tar.gz) +sha1sums=('7cf17ccc1bf3ec6fc85cfcd4278147335093ca3b') build() { @@ -21,6 +22,5 @@ build() ruby install.rb setup ruby install.rb install --prefix=$Fdestdir } -sha1sums=('71bb2b67b764a1aadc8de4a9b8dfe143868716b4') # optimization OK From voroskoi at frugalware.org Sun Nov 11 15:27:00 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 15:27:04 2007 Subject: [Frugalware-git] frugalware-current: bluefish-1.0.7-3-x86_64 Message-ID: <20071111142700.C751111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f87be9401339d83e9a8755a7682a9fd38dc0f9e commit 7f87be9401339d83e9a8755a7682a9fd38dc0f9e Author: voroskoi Date: Sun Nov 11 15:24:22 2007 +0100 bluefish-1.0.7-3-x86_64 gnome-vfs readded to depends() - recloses #319 install bluefish icon, closes #2552 use configure options instead of hacks diff --git a/source/gnome-extra/bluefish/FrugalBuild b/source/gnome-extra/bluefish/FrugalBuild index 12785c5..b7a8ad1 100644 --- a/source/gnome-extra/bluefish/FrugalBuild +++ b/source/gnome-extra/bluefish/FrugalBuild @@ -4,23 +4,25 @@ pkgname=bluefish pkgver=1.0.7 -pkgrel=2 +pkgrel=3 pkgdesc="Bluefish is a powerful editor for experienced web designers and programmers." url="http://bluefish.openoffice.nl/" -depends=('aspell>=0.50' 'gtk+2' 'atk' 'libxcb' 'freetype2' 'pango' 'cairo' 'pcre>=3.0' 'glib2') +# gnome-vfs: #319 +depends=('gnome-vfs' 'pcre' 'aspell' 'libxdamage') groups=('gnome-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html |grep latest |sed -e 's/.*h \(.*\). T.*/\1/'" source=(http://www.bennewitz.com/bluefish/stable/source/$pkgname-$pkgver.tar.bz2) +sha1sums=('c61d6271c49e9fa8c728724e6aadde33a227bdea') build() { - Fmake --disable-splash-screen - Fmkdir /usr/share/pixmaps /usr/share/applications /usr/share/application-registry - Fsed '/usr/bin/update-desktop-database' '/bin/true' data/Makefile - Fsed '/usr/bin/update-mime-database' '/bin/true' data/Makefile - Fmakeinstall + unset MAKEFLAGS + Fbuild --with-freedesktop_org-menu=/usr/share/applications \ + --with-freedesktop_org-mime=/usr/share/mime \ + --disable-update-databases \ + --with-icon-path=/usr/share/pixmap \ + --without-libgnomeui } -sha1sums=('c61d6271c49e9fa8c728724e6aadde33a227bdea') # optimization OK From crazy at frugalware.org Sun Nov 11 16:24:12 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 16:24:14 2007 Subject: [Frugalware-git] frugalware-current: cairo-1.4.10-1-i686 Message-ID: <20071111152412.96D66119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ae257501f325139b4b1a9f2e2b292213ae13ffd commit 5ae257501f325139b4b1a9f2e2b292213ae13ffd Author: crazy Date: Sun Nov 11 16:24:02 2007 +0100 cairo-1.4.10-1-i686 * up2date fix diff --git a/source/xlib/cairo/FrugalBuild b/source/xlib/cairo/FrugalBuild index c7fca4d..1bcd99f 100644 --- a/source/xlib/cairo/FrugalBuild +++ b/source/xlib/cairo/FrugalBuild @@ -10,7 +10,7 @@ depends=('glitz' 'libxrender' 'fontconfig' 'libpng') makedepends=('gtk-doc' 'poppler-glib' 'librsvg') groups=('xlib') archs=('x86_64' 'i686') -up2date="lynx -dump http://cairographics.org/|grep -m1 'release '|sed 's/.*ro \(.*\) .*re.*/\1/'" +up2date="lynx -dump 'http://cairographics.org/releases/?C=D;O=A'|grep '/cairo-\(.*\).tar.gz$'|Flasttar" source=($url/releases/$pkgname-$pkgver.tar.gz) options=('scriptlet') Fconfopts="$Fconfopts --enable-glitz --enable-gtk-doc --enable-pdf --enable-ps" From voroskoi at frugalware.org Sun Nov 11 16:28:52 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 16:28:53 2007 Subject: [Frugalware-git] frugalware-current: xemacs-21.4.21-1-i686 Message-ID: <20071111152852.48BB311901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=98aead796511ab42706dbc92ad088f609f5bbad8 commit 98aead796511ab42706dbc92ad088f609f5bbad8 Author: voroskoi Date: Sun Nov 11 16:28:11 2007 +0100 xemacs-21.4.21-1-i686 version bump use Fdesktop2 to create desktop file sha1->signatures diff --git a/source/apps-extra/xemacs/FrugalBuild b/source/apps-extra/xemacs/FrugalBuild index 07d109d..24062c7 100644 --- a/source/apps-extra/xemacs/FrugalBuild +++ b/source/apps-extra/xemacs/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: voroskoi pkgname=xemacs -pkgver=21.4.20 -pkgrel=2 +pkgver=21.4.21 +pkgrel=1 pkgdesc="XEmacs is a highly customizable open source text editor and application development system." url="http://www.xemacs.org/" makedepends=('libxaw' 'xbitmaps') @@ -13,7 +13,8 @@ conflicts=('emacs') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/Releases/index.html |grep http.*Releases/[0-9] |sed -ne 's:.*s/\(.*\).h.*:\1:;2 p'" -source=(ftp://ftp.be.xemacs.org/xemacs/xemacs-21.4/$pkgname-$pkgver.tar.gz $pkgname.desktop) +source=(ftp://ftp.be.xemacs.org/xemacs/xemacs-21.4/$pkgname-$pkgver.tar.bz2) +signatures=($source.asc) build() { Fcd @@ -28,9 +29,10 @@ build() { --with-ldap=no make || Fdie Fmakeinstall - Ffile /usr/share/applications/$pkgname.desktop + _F_desktop_name="XEmacs Editor" + _F_desktop_icon="xemacs.png" + _F_desktop_categories="GTK;Application;Development;" + Fdesktop2 } -sha1sums=('651e8c2fcf680c577375a6d623bb9228a56f3a0d' \ - 'bd8a0dfd732e41546abb27e467d9d52c7b9b9297') # optimization OK diff --git a/source/apps-extra/xemacs/xemacs.desktop b/source/apps-extra/xemacs/xemacs.desktop deleted file mode 100644 index 03db2cf..0000000 --- a/source/apps-extra/xemacs/xemacs.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=XEmacs -Comment= -Exec=xemacs -Icon=/usr/share/icons/crystalsvg/48x48/apps/emacs.png -Terminal=false -Categories=GNOME;Application;Development; -Type=Application From voroskoi at frugalware.org Sun Nov 11 16:34:47 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 16:34:51 2007 Subject: [Frugalware-git] frugalware-current: nerolinux-3.0.2.1-1-x86_64 Message-ID: <20071111153447.E680C11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=646e88572a911caac758ec3447c9d082c740f6a2 commit 646e88572a911caac758ec3447c9d082c740f6a2 Author: voroskoi Date: Sun Nov 11 16:34:24 2007 +0100 nerolinux-3.0.2.1-1-x86_64 version bump up2date fix diff --git a/source/xapps-extra/nerolinux/FrugalBuild b/source/xapps-extra/nerolinux/FrugalBuild index 8e86892..86188b3 100644 --- a/source/xapps-extra/nerolinux/FrugalBuild +++ b/source/xapps-extra/nerolinux/FrugalBuild @@ -3,26 +3,26 @@ # Maintainer: voroskoi pkgname=nerolinux -pkgver=3.0.1.3 +pkgver=3.0.2.1 pkgextraver= pkgrel=1 pkgdesc="Nero for Linux" url="http://www.nero.com" license="Nero EULA" -up2date="lynx -dump $url/eng/nerolinux-prog.php?pak=15 |grep rpm |sed -ne 's/.*x-\(.*\)-x.*/\1/;1p' -e s/$pkgextraver//" +up2date="lynx -dump http://www.nero.com/eng/downloads-linux3-trial.php |grep Version -A1 |sed -ne 's/.*3\(.*\)/3\1/;$ p' -e s/$pkgextraver//" groups=('xapps-extra') archs=('i686' 'x86_64') backup=('etc/nero/config') rodepends=('gtk+' 'libxcb' 'libx11') makedepends=('cpio' 'rpm') if [ "$CARCH" == "x86_64" ] ; then - source=(ftp://ftp4.de.nero.com/PUB/09effd763d19548b550ac13f53b6641b/nerolinux-3.0.1.3-x86_64.rpm) - sha1sums=('ed26e65c4b734b0c683f336dfef81249ce165c51') + source=(ftp://ftp5.usw.nero.com/PUB/1abf55c9a46f8de4f4ea60358b674710/nerolinux-3.0.2.1-x86_64.rpm) + sha1sums=('a89350da6b3be836363093eccdb3c951a54e34a7') suffix=x86_64 fi if [ "$CARCH" != "x86_64" ] ; then - source=(ftp://ftp2.usw.nero.com/PUB/09effd763d19548b550ac13f53b6641b/nerolinux-3.0.1.3-x86.rpm) - sha1sums=('849d8558cbfcc964cd8a20e0955aa114b7ab02a3') + source=(ftp://ftp2.usw.nero.com/PUB/09effd763d19548b550ac13f53b6641b/nerolinux-3.0.2.1-x86.rpm) + sha1sums=('42c4292c50eaf80c2348f7504e73a5782461a13b') suffix=x86 fi options=('nobuild' 'nodocs') From crazy at frugalware.org Sun Nov 11 16:37:57 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 16:37:58 2007 Subject: [Frugalware-git] frugalware-current: cvs-1.11.22-1-i686 Message-ID: <20071111153757.2466011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c509208b3d12eb8198bab8b0f134e2b373a1602f commit c509208b3d12eb8198bab8b0f134e2b373a1602f Author: crazy Date: Sun Nov 11 16:37:13 2007 +0100 cvs-1.11.22-1-i686 * url , up2date fix diff --git a/source/devel/cvs/FrugalBuild b/source/devel/cvs/FrugalBuild index 396f670..fa8ff9b 100644 --- a/source/devel/cvs/FrugalBuild +++ b/source/devel/cvs/FrugalBuild @@ -5,12 +5,12 @@ pkgname=cvs pkgver=1.11.22 pkgrel=1 pkgdesc="Concurrent Version System - a version control system" -url="http://ximbiot.com/cvs/wiki/index.php?title=Main_Page" +url="http://ximbiot.com/cvs/" depends=('zlib') makedepends=('vim') groups=('devel') archs=('i686' 'x86_64') -up2date="lynx -dump 'http://ximbiot.com/cvs/wiki/index.php?title=Current_events'|grep Stable|sed 's/.* \([0-9\.]*\) .*/\1/;q'" +up2date="lynx -dump 'http://ftp.gnu.org/non-gnu/cvs/source/stable/?C=D;O=A'|grep 'stable/[0-9]'|sort -n -r|head -n1|sed 's/.*le\///;s/\///'" source=(http://ftp.gnu.org/non-gnu/$pkgname/source/stable/$pkgver/$pkgname-$pkgver.tar.bz2 \ cvs-1.11.20-extzlib.patch) sha1sums=('5dfa11da84a890d7d61516fd450c001dc24bcc0d' \ From voroskoi at frugalware.org Sun Nov 11 16:43:40 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 16:43:42 2007 Subject: [Frugalware-git] frugalware-current: asciidoc-8.2.4-1-x86_64 Message-ID: <20071111154340.A13BB11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07619dd0f3b84c6bd63e559baeb15ff7847d5ea3 commit 07619dd0f3b84c6bd63e559baeb15ff7847d5ea3 Author: voroskoi Date: Sun Nov 11 16:42:53 2007 +0100 asciidoc-8.2.4-1-x86_64 version bump diff --git a/source/apps-extra/asciidoc/FrugalBuild b/source/apps-extra/asciidoc/FrugalBuild index 858c2b3..72e8802 100644 --- a/source/apps-extra/asciidoc/FrugalBuild +++ b/source/apps-extra/asciidoc/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: voroskoi pkgname=asciidoc -pkgver=8.2.3 -pkgrel=2 +pkgver=8.2.4 +pkgrel=1 pkgdesc="AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." url="http://www.methods.co.nz/asciidoc/index.html" depends=() @@ -15,7 +15,7 @@ up2date="lynx -dump http://www.methods.co.nz/asciidoc/downloads.html |Flasttar" source=(http://www.methods.co.nz/asciidoc/asciidoc-$pkgver.tar.gz \ http://ftp.frugalware.org/pub/other/sources/asciidoc/asciidoc-fonts-0.1.tar.bz2 \ a2x-pdf.diff) -sha1sums=('c5f245e3cc98fc7785037e27b7002c7f6b071b96' \ +sha1sums=('4c403a98528102f65d78ac07deae2c8a4807186c' \ '717779406f876f439ac37c79878f403ecdef3467' \ 'c235be9105a5cec42d1c19e416b8dc177127017f') From voroskoi at frugalware.org Sun Nov 11 16:50:44 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 16:50:47 2007 Subject: [Frugalware-git] frugalware-current: nginx-0.5.33-1-x86_64 Message-ID: <20071111155044.4E2AA11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=11a1a39866b74cc8eb8093fbbea8683cfa11cfbb commit 11a1a39866b74cc8eb8093fbbea8683cfa11cfbb Author: voroskoi Date: Sun Nov 11 16:49:53 2007 +0100 nginx-0.5.33-1-x86_64 version bump diff --git a/source/network-extra/nginx/FrugalBuild b/source/network-extra/nginx/FrugalBuild index b4844ee..1083362 100644 --- a/source/network-extra/nginx/FrugalBuild +++ b/source/network-extra/nginx/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=nginx -pkgver=0.5.32 +pkgver=0.5.33 pkgrel=1 pkgdesc="[engine x] is a HTTP server and mail proxy server." url="http://nginx.net/" @@ -49,7 +49,7 @@ build() { Fmv $Fsysconfdir/$pkgname/html $Flocalstatedir/www/$pkgname Fln $Flocalstatedir/www/$pkgname $Fsysconfdir/$pkgname/html } -sha1sums=('3cb4bc097675e5c1a90e59bf51f4a24b985a6dfa' \ +sha1sums=('d8c321126c57d3a5cf06914541465bf44a6f3904' \ 'e8cc09710ba365eb932d1710f4aac629e49452ff' \ 'da58d8a74dbb081c3dfb69317999e10f1ebf991e' \ '3a4cc4564ce610400e012d7c391107f33a258f1e') From voroskoi at frugalware.org Sun Nov 11 16:56:04 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 16:56:06 2007 Subject: [Frugalware-git] frugalware-current: lftp-3.6.1-1-i686 Message-ID: <20071111155604.D0E1B11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b42c8ff7476ab0ff596092f5aa81d57e2f273426 commit b42c8ff7476ab0ff596092f5aa81d57e2f273426 Author: voroskoi Date: Sun Nov 11 16:52:13 2007 +0100 lftp-3.6.1-1-i686 version bump diff --git a/source/network-extra/lftp/FrugalBuild b/source/network-extra/lftp/FrugalBuild index 4c91a3d..6874869 100644 --- a/source/network-extra/lftp/FrugalBuild +++ b/source/network-extra/lftp/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=lftp -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="A sophisticated ftp/http client, file transfer program" url="http://lftp.yar.ru/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') backup=('etc/lftp.conf') up2date="lynx -dump $url |grep released|sed -ne 's/.*p-\(.*\) r.*/\1/' -e '1 p'" source=(http://ftp.yars.free.net/pub/source/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('6fbc979ac5a8fe677446229f867a58144096ac13') +sha1sums=('1763aecddf353e8f3cea618609c0948d95da9d17') # optimization OK From voroskoi at frugalware.org Sun Nov 11 17:01:01 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 17:01:03 2007 Subject: [Frugalware-git] frugalware-current: libssh2-0.18-1-x86_64 Message-ID: <20071111160101.221BA11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9412b04deec1a34c83cd3d9269f3967fc0a75876 commit 9412b04deec1a34c83cd3d9269f3967fc0a75876 Author: voroskoi Date: Sun Nov 11 16:59:14 2007 +0100 libssh2-0.18-1-x86_64 version bump diff --git a/source/lib/libssh2/FrugalBuild b/source/lib/libssh2/FrugalBuild index ead9028..e89417d 100644 --- a/source/lib/libssh2/FrugalBuild +++ b/source/lib/libssh2/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: 0.01 SBU +# Compiling Time: 0.21 SBU # Maintainer: voroskoi pkgname=libssh2 -pkgver=0.17 +pkgver=0.18 pkgrel=1 pkgdesc="libssh2 is a library implementing the SSH2 protocol as defined by Internet Drafts." url="http://www.libssh2.org/wiki/index.php/Main_Page" @@ -10,6 +10,6 @@ groups=('lib') archs=('i686' 'x86_64') depends=('openssl' 'zlib') Finclude sourceforge -sha1sums=('21ab04c457c9e163b1413d8afeb277f3a9025592') +sha1sums=('9bc6148869fca08350e27ea2c9fc44917ac027ff') # optimization OK From voroskoi at frugalware.org Sun Nov 11 17:08:44 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 17:08:46 2007 Subject: [Frugalware-git] frugalware-current: imap-2006k-1-i686 Message-ID: <20071111160844.A3A5E11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=746953335a29bce4467062dc34ef31dea3339cdb commit 746953335a29bce4467062dc34ef31dea3339cdb Author: voroskoi Date: Sun Nov 11 17:08:16 2007 +0100 imap-2006k-1-i686 version bump diff --git a/source/network-extra/imap/FrugalBuild b/source/network-extra/imap/FrugalBuild index 64d6f65..f5ba10f 100644 --- a/source/network-extra/imap/FrugalBuild +++ b/source/network-extra/imap/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=imap -pkgver=2006j2 +pkgver=2006k pkgrel=1 extrapkgver= pkgdesc="An IMAP/POP server" @@ -15,7 +15,7 @@ up2date="lynx -dump 'http://ftp.ntua.gr/pub/net/mail/imap/?M=D'|grep imap-[0-9a- source=(ftp://ftp.cac.washington.edu/imap/$pkgname-$pkgver$extrapkgver.tar.Z $pkgname-2006j1-big.patch) build() { - Fcd imap-2006j + Fcd imap-${pkgver} Fpatchall Fsed 'CFLAGS=-g' "CFLAGS=$CFLAGS" src/osdep/unix/Makefile make slx SPECIALS="SSLINCLUDE=/usr/include/openssl \ @@ -63,7 +63,7 @@ EOF umask 022 done } -sha1sums=('41fc3f8cf11f1931a9c046240bc04ceb9f1416c0' \ +sha1sums=('4b64e74d5928857a1c802ba6c9ab575205b342ce' \ 'c38171e2295e9ddba15f5e91b7327020ae191fcf') # optimization OK From voroskoi at frugalware.org Sun Nov 11 17:18:41 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 17:18:47 2007 Subject: [Frugalware-git] frugalware-current: chicken-2.732-1-x86_64 Message-ID: <20071111161841.AF5A411901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d055acafca5f2b827e3d90d55f46f961db142e9 commit 5d055acafca5f2b827e3d90d55f46f961db142e9 Author: voroskoi Date: Sun Nov 11 17:16:14 2007 +0100 chicken-2.732-1-x86_64 version bump diff --git a/source/devel-extra/chicken/FrugalBuild b/source/devel-extra/chicken/FrugalBuild index 1ace61b..aea0836 100644 --- a/source/devel-extra/chicken/FrugalBuild +++ b/source/devel-extra/chicken/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=chicken -pkgver=2.726 +pkgver=2.732 pkgrel=1 pkgdesc="A compiler for Scheme, which produces portable, efficient C." url="http://www.call-with-current-continuation.org/" @@ -12,7 +12,7 @@ groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://chicken.wiki.br/dev-snapshots/current/ |Flasttar" source=(http://chicken.wiki.br/dev-snapshots/current/$pkgname-$pkgver.tar.gz) -sha1sums=('647ac1c57722672da05bb24112479ae8bb119a92') +sha1sums=('cd74a1dcc011e5c5f2efd1b374a66e6b4883a3d5') build() { unset MAKEFLAGS From voroskoi at frugalware.org Sun Nov 11 17:20:52 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 17:20:56 2007 Subject: [Frugalware-git] frugalware-0.7: xpdf-3.02-4sayshell1-i686 Message-ID: <20071111162052.B174D11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=60f59ae1e55cd9c70b00a749b742252e367f5e6d commit 60f59ae1e55cd9c70b00a749b742252e367f5e6d Author: voroskoi Date: Sun Nov 11 17:20:15 2007 +0100 xpdf-3.02-4sayshell1-i686 secfix relbump, closes #2558 diff --git a/source/xapps/xpdf/FrugalBuild b/source/xapps/xpdf/FrugalBuild index a4df5f3..ffe9b2f 100644 --- a/source/xapps/xpdf/FrugalBuild +++ b/source/xapps/xpdf/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xpdf pkgver=3.02 -pkgrel=3 +pkgrel=4sayshell1 pkgdesc="PDF viewer for X" url="http://www.foolabs.com/xpdf/" backup=('etc/xpdfrc') @@ -13,9 +13,11 @@ groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep released|sed 's/.*f \(.*\) w.*/\1/'" source=(ftp://ftp.foolabs.com/pub/xpdf/$pkgname-$pkgver.tar.gz \ - ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch) + ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch \ + ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch) sha1sums=('f9940698840c8a8045677e8be68ab8580903e20a' \ - 'cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d') + 'cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d' \ + 'd082ebe0d36cad0c04603950216f5c52de1c2593') build() { From priyank at frugalware.org Sun Nov 11 17:26:01 2007 From: priyank at frugalware.org (Priyank) Date: Sun Nov 11 17:26:04 2007 Subject: [Frugalware-git] frugalware-current: ripoff-0.8.3-1-i686 Message-ID: <20071111162601.B7F9011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e1044d1deae4153cb458a60880bbec080fab1d76 commit e1044d1deae4153cb458a60880bbec080fab1d76 Author: Priyank Date: Sun Nov 11 21:52:57 2007 +0530 ripoff-0.8.3-1-i686 * Version bump diff --git a/source/xapps-extra/ripoff/FrugalBuild b/source/xapps-extra/ripoff/FrugalBuild index bbbc87b..fc008fe 100644 --- a/source/xapps-extra/ripoff/FrugalBuild +++ b/source/xapps-extra/ripoff/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: 0.10 SBU +# Compiling Time: 0.07 SBU # Maintainer: Priyank Gosalia pkgname=ripoff -pkgver=0.8.2 +pkgver=0.8.3 pkgrel=1 pkgdesc="RipOff is a modular, intuitive, GTK+ based CD Ripper." _F_sourceforge_dirname="ripoffc" @@ -12,6 +12,6 @@ depends=('gtk+2' 'cdparanoia' 'libcddb' 'libcdio' 'flac>=1.1.3' 'lame' 'libvorbi groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://ripoffc.sourceforge.net/ | grep -m1 release | sed 's/.* \(.*\) r.*/\1/'" -sha1sums=('07a8d0c0f2e6d14bdb066b0ce26d071163183503') +sha1sums=('35216c79cec700c2465eb6a7fcb9df35cc16b9cc') # optimization OK From krics at linuxforum.hu Sun Nov 11 17:36:17 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Nov 11 17:36:21 2007 Subject: [Frugalware-git] frugalware-current: pngnq-0.5-1-x86_64 Message-ID: <20071111163617.C3A9B11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ce905b7187b08ed77deb9523c6e856ed61574ae0 commit ce905b7187b08ed77deb9523c6e856ed61574ae0 Author: Christian Hamar alias krix Date: Sun Nov 11 17:36:04 2007 +0100 pngnq-0.5-1-x86_64 * Version bump * Updated patch for new upstream diff --git a/source/apps-extra/pngnq/FrugalBuild b/source/apps-extra/pngnq/FrugalBuild index 015334f..31fcb2f 100644 --- a/source/apps-extra/pngnq/FrugalBuild +++ b/source/apps-extra/pngnq/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=pngnq -pkgver=0.4.1 +pkgver=0.5 pkgrel=1 pkgdesc="A PNG compression utility" url="http://www.cybertherial.com/pngnq/pngnq.html" @@ -11,12 +11,12 @@ groups=('apps-extra') archs=('x86_64' 'i686') up2date="lynx -dump http://www.cybertherial.com/pngnq/pngnq.html|grep 'Current Version'|tr -s ' '|cut -d ' ' -f 5 | sed -e 's/pngnq-//g'" source=(http://www.cybertherial.com/pngnq/$pkgname-$pkgver-src.tar.gz pngnq-makefile-corrections.patch) -sha1sums=('bd34f8fffb67ef98c6ec328643ba9e8c827bb256' \ - '520caed1c569ced6c4828cc2f7b17b7928d28d73') +sha1sums=('1ce194a99d0d8abeeffb26e84e07cbb4035910f0' \ + '41cd5fbff2c3f075a27e2e447697615becf4bcf1') -build() -{ - Fcd $pkgname/$pkgver +build() { + # lol ? + Fcd $pkgver Fmkdir usr/bin Fbuild } diff --git a/source/apps-extra/pngnq/pngnq-makefile-corrections.patch b/source/apps-extra/pngnq/pngnq-makefile-corrections.patch index ee07f95..997f828 100644 --- a/source/apps-extra/pngnq/pngnq-makefile-corrections.patch +++ b/source/apps-extra/pngnq/pngnq-makefile-corrections.patch @@ -1,9 +1,9 @@ -diff -Naur pngnq-0.4.orig/Makefile pngnq-0.4/Makefile ---- pngnq-0.4.orig/Makefile 2006-06-14 21:37:53.659892960 +0200 -+++ pngnq-0.4/Makefile 2006-06-14 21:39:18.708963536 +0200 -@@ -2,13 +2,13 @@ +diff -Naur 0.5.orig/Makefile 0.5/Makefile +--- 0.5.orig/Makefile 2007-11-11 17:33:55.000000000 +0100 ++++ 0.5/Makefile 2007-11-11 17:35:04.000000000 +0100 +@@ -5,13 +5,13 @@ - CC=gcc + DISTFILES = LICENSE README pngnq.1 pngnq pngcomp -PNGINC = ../libpng +PNGINC = /usr/include @@ -14,15 +14,14 @@ diff -Naur pngnq-0.4.orig/Makefile pngnq-0.4/Makefile +ZINC = /usr/include +ZLIB = /usr/lib --CFLAGS = -O3 -g -Wall -pedantic -I. -I$(PNGINC) -I$(ZINC) -funroll-loops -fomit-frame-pointer -+CFLAGS += -Wall -pedantic -I. -I$(PNGINC) -I$(ZINC) -funroll-loops -fomit-frame-pointer +-CFLAGS = -O3 -g -Wall -pedantic -I. -I$(PNGINC) -I$(ZINC) -funroll-loops -fomit-frame-pointer -std=c99 ++CFLAGS += -Wall -pedantic -I. -I$(PNGINC) -I$(ZINC) -funroll-loops -fomit-frame-pointer -std=c99 LDFLAGS = -L$(PNGLIB) -lpng -L$(ZLIB) -lz -lm #LDFLAGS = $(PNGLIB)/libpng.a -L$(ZLIB) -lz -lm -@@ -26,3 +26,6 @@ +@@ -41,3 +41,5 @@ + bindist: all + tar -cz -f ../pngnq-$(VERSION)-$(ARCH).tar.gz $(DISTFILES) - clean: - rm -f pngnq pngcomp *.o -+ +install: + /usr/bin/install -c -g root -o root -m 755 pngnq $(DESTDIR)/usr/bin From priyank at frugalware.org Sun Nov 11 17:36:18 2007 From: priyank at frugalware.org (Priyank) Date: Sun Nov 11 17:36:25 2007 Subject: [Frugalware-git] gfpm: modified splash a bit Message-ID: <20071111163618.0DB4D11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=e665af3912b31e4bb7e1696806105edef92ec24d commit e665af3912b31e4bb7e1696806105edef92ec24d Author: Priyank Date: Fri Nov 2 11:23:20 2007 +0530 modified splash a bit diff --git a/data/splash.png b/data/splash.png index eb75115..f17b914 100644 Binary files a/data/splash.png and b/data/splash.png differ From priyank at frugalware.org Sun Nov 11 17:36:18 2007 From: priyank at frugalware.org (Priyank) Date: Sun Nov 11 17:36:27 2007 Subject: [Frugalware-git] gfpm: fixed warnings (sorry krix! this took me dayys to fix :D) Message-ID: <20071111163618.5D6BF11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=56d26a7f12c78aab27c798f5cbe313001ab63929 commit 56d26a7f12c78aab27c798f5cbe313001ab63929 Author: Priyank Date: Sun Nov 11 22:05:21 2007 +0530 fixed warnings (sorry krix! this took me dayys to fix :D) diff --git a/src/gfpm-icmonitor.c b/src/gfpm-icmonitor.c index 360f7ca..a2ba02a 100644 --- a/src/gfpm-icmonitor.c +++ b/src/gfpm-icmonitor.c @@ -30,7 +30,7 @@ static gboolean inited; static gboolean stop = FALSE; struct inotify_event *event; -static gboolean gfpm_icmonitor (void); +//static gboolean gfpm_icmonitor (void); int gfpm_icmonitor_init (void) diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c index 1287312..747418d 100644 --- a/src/gfpm-interface.c +++ b/src/gfpm-interface.c @@ -94,7 +94,7 @@ static void cb_gfpm_mark_for_reinstall (GtkButton *button, gpointer data); static void cb_gfpm_mark_for_removal (GtkButton *button, gpointer data); static void cb_gfpm_mark_for_upgrade (GtkButton *button, gpointer data); static gint gfpm_trans_prepare (PM_LIST *list); -static gint gfpm_trans_commit (PM_LIST *list); +static gint gfpm_trans_commit (PM_LIST **list); static void gfpm_populate_repos_combobox (GtkComboBox *combo) @@ -1082,9 +1082,9 @@ gfpm_trans_prepare (PM_LIST *list) static gint -gfpm_trans_commit (PM_LIST *list) +gfpm_trans_commit (PM_LIST **list) { - if (pacman_trans_commit(&list) == -1) + if (pacman_trans_commit(list) == -1) { PM_LIST *i; GList *pkgs = NULL; @@ -1097,7 +1097,7 @@ gfpm_trans_commit (PM_LIST *list) { case PM_ERR_FILE_CONFLICTS: { - for (i=pacman_list_first(list);i;i=pacman_list_next(i)) + for (i=pacman_list_first(*list);i;i=pacman_list_next(i)) { PM_CONFLICT *cnf = pacman_list_getdata (i); switch ((long)pacman_conflict_getinfo(cnf,PM_CONFLICT_TYPE)) @@ -1118,7 +1118,7 @@ gfpm_trans_commit (PM_LIST *list) } case PM_ERR_PKG_CORRUPTED: { - for (i=pacman_list_first(list);i;i=pacman_list_next(i)) + for (i=pacman_list_first(*list);i;i=pacman_list_next(i)) pkgs = g_list_append (pkgs, g_strdup (pacman_list_getdata(i))); gfpm_plist_message (_("Corrupted package(s)"), _("The package(s) you're trying to install are corrupted"), diff --git a/src/gfpm-optimizedb.c b/src/gfpm-optimizedb.c index 4fb427f..188f351 100644 --- a/src/gfpm-optimizedb.c +++ b/src/gfpm-optimizedb.c @@ -42,7 +42,7 @@ static GtkWidget *gfpm_optimize_db_closebtn; static GtkWidget *gfpm_optimize_db_label; static void gfpm_optimize_db_set_progress_status (const char *text); static void gfpm_optimize_db_optimize_btn_clicked (GtkWidget *widget, gpointer data); -static void gfpm_optimize_db_dlg_show (void); +//static void gfpm_optimize_db_dlg_show (void); static void gfpm_optimize_db_dlg_hide (void); static void gfpm_optimize_db (void); @@ -82,7 +82,7 @@ gfpm_optimize_db_optimize_btn_clicked (GtkWidget *widget, gpointer data) return; } - +/* static void gfpm_optimize_db_dlg_show (void) { @@ -92,7 +92,7 @@ gfpm_optimize_db_dlg_show (void) return; } - +*/ static void gfpm_optimize_db_dlg_hide (void) { From priyank at frugalware.org Sun Nov 11 17:43:49 2007 From: priyank at frugalware.org (Priyank) Date: Sun Nov 11 17:43:52 2007 Subject: [Frugalware-git] frugalware-current: up2date,source,url fix Message-ID: <20071111164349.6B1EB11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ee95b23fee0cc91a25867bb5fc7f000d0cb9950 commit 3ee95b23fee0cc91a25867bb5fc7f000d0cb9950 Author: Priyank Date: Sun Nov 11 22:12:34 2007 +0530 up2date,source,url fix diff --git a/source/apps-extra/fetch/FrugalBuild b/source/apps-extra/fetch/FrugalBuild index ec675c2..6ef8aa8 100644 --- a/source/apps-extra/fetch/FrugalBuild +++ b/source/apps-extra/fetch/FrugalBuild @@ -2,16 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=fetch -_F_archive_name=http_fetcher pkgver=1.0 pkgrel=1 pkgdesc="fetch is a simple, fast, and flexible HTTP download tool built on the HTTP Fetcher library." -url="http://http-fetcher.sourceforge.net" +Finclude sourceforge depends=('http-fetcher') groups=('apps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url/downloads.html | Flasttar" -source=(http://cs.nmu.edu/~lhanson/fetch/dls/$pkgname-$pkgver.tar.gz) sha1sums=('edac1ee54b24bb9d094682743c193eaa47eb5a48') # optimization OK From iron at frugalware.org Sun Nov 11 17:46:58 2007 From: iron at frugalware.org (Krisztian VASAS) Date: Sun Nov 11 17:47:00 2007 Subject: [Frugalware-git] frugalware-current: firefox-2.0.0.9-2-i686 Message-ID: <20071111164658.0B1C711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f41ee4b7af8a8da0e7b6cd333a80644912507fd commit 3f41ee4b7af8a8da0e7b6cd333a80644912507fd Author: Krisztian VASAS Date: Sun Nov 11 17:46:03 2007 +0100 firefox-2.0.0.9-2-i686 - added --enable-svg options to the config diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index fd47151..5c10e4a 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -4,7 +4,7 @@ pkgname=firefox pkgver=2.0.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/" depends=('gtk+2' 'libidl' 'desktop-file-utils' 'nss>=3.11.3-2' 'glibc>=2.6') diff --git a/source/xapps/firefox/config b/source/xapps/firefox/config index 50a0b9b..83b6abf 100644 --- a/source/xapps/firefox/config +++ b/source/xapps/firefox/config @@ -4,6 +4,7 @@ ac_add_options --with-default-mozilla-five-home=/usr ac_add_options --enable-crypto ac_add_options --enable-optimize="-march=i686 -O2 -pipe" ac_add_options --enable-official-branding +ac_add_options --enable-svg ac_add_options --disable-debug ac_add_options --disable-tests ac_add_options --disable-logging From krics at linuxforum.hu Sun Nov 11 17:47:14 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Nov 11 17:47:19 2007 Subject: [Frugalware-git] frugalware-current: gnome-schedule-1.2.0-1-x86_64 Message-ID: <20071111164714.6325011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=adc5d2daf4694173fbedefec611f943346c4f1e8 commit adc5d2daf4694173fbedefec611f943346c4f1e8 Author: Christian Hamar alias krix Date: Sun Nov 11 17:44:02 2007 +0100 gnome-schedule-1.2.0-1-x86_64 * Version bump * Dropped 1.1.0 patch (fixed in upstream) diff --git a/source/gnome-extra/gnome-schedule/FrugalBuild b/source/gnome-extra/gnome-schedule/FrugalBuild index a1a0bd8..7479cc8 100644 --- a/source/gnome-extra/gnome-schedule/FrugalBuild +++ b/source/gnome-extra/gnome-schedule/FrugalBuild @@ -4,7 +4,7 @@ # Contributor: BMH1980 pkgname=gnome-schedule -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="Gnome-schedule is a GNOME GUI for configuring a users crontab." groups=('gnome-extra') @@ -15,11 +15,9 @@ 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') -source=(${source[@]} $pkgname-1.1.0-fix-help-build.patch) -sha1sums=('5d2aa2f31494fc67d21ac640dfa0269df037755b' \ - '0c64772d6de0150396657c2d809d2e48f1c08f7d') +sha1sums=('2e1ca70fad39dccf0c487246839f65533f72d48a') -build(){ +build() { Fcd sed -i '/crontab/,/fi/d' configure.ac Fautoreconf diff --git a/source/gnome-extra/gnome-schedule/gnome-schedule-1.1.0-fix-help-build.patch b/source/gnome-extra/gnome-schedule/gnome-schedule-1.1.0-fix-help-build.patch deleted file mode 100644 index a33da1f..0000000 --- a/source/gnome-extra/gnome-schedule/gnome-schedule-1.1.0-fix-help-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN gnome-schedule-1.1.0.orig/help/C/gnome-schedule.xml gnome-schedule-1.1.0/help/C/gnome-schedule.xml ---- gnome-schedule-1.1.0.orig/help/C/gnome-schedule.xml 2007-02-18 15:50:49.000000000 +0000 -+++ gnome-schedule-1.1.0/help/C/gnome-schedule.xml 2007-02-18 15:51:26.000000000 +0000 -@@ -85,15 +85,15 @@ - - - -- -+ - - - From priyank at frugalware.org Sun Nov 11 17:48:57 2007 From: priyank at frugalware.org (Priyank) Date: Sun Nov 11 17:48:59 2007 Subject: [Frugalware-git] frugalware-current: sleepd-1.3.13-1-i686 Message-ID: <20071111164857.EC91C11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ea26245e36da6dd9a3d11538014beacfa12b780 commit 8ea26245e36da6dd9a3d11538014beacfa12b780 Author: Priyank Date: Sun Nov 11 22:15:32 2007 +0530 sleepd-1.3.13-1-i686 * Version bump diff --git a/source/apps-extra/sleepd/FrugalBuild b/source/apps-extra/sleepd/FrugalBuild index 869a609..d290c4d 100644 --- a/source/apps-extra/sleepd/FrugalBuild +++ b/source/apps-extra/sleepd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=sleepd Fpkgversep='_' -pkgver=1.3.11 +pkgver=1.3.13 pkgrel=1 pkgdesc="A daemon to put a laptop to sleep if it is not being used or if the battery is low." url="http://kitenet.net/~joey/code/sleepd.html" @@ -14,7 +14,7 @@ backup=('etc/sleepd.conf') up2date="lynx -dump -nolist http://ftp.debian.org/debian/pool/main/s/sleepd/ | Flasttar" source=(http://ftp.debian.org/debian/pool/main/s/$pkgname/$pkgname$Fpkgversep$pkgver.tar.gz \ sleepd.conf rc.sleepd) -sha1sums=('730a595f0db7a2528c6bdc1757445db828e824dc' \ +sha1sums=('a649864fc1dd3651f9f26a71918d23a6ccaaf2f4' \ '13f636770e35ab44a3d891431abc743b684057ab' \ '417e5397a1daf5ee0b0b7bbf6ed1c3377c081257') From krics at linuxforum.hu Sun Nov 11 18:05:36 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Nov 11 18:05:40 2007 Subject: [Frugalware-git] frugalware-current: goffice-0.5.2-1-x86_64 Message-ID: <20071111170536.E2A4511901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3b77f442bcd6950a7b969bca86dd99798dea165a commit 3b77f442bcd6950a7b969bca86dd99798dea165a Author: Christian Hamar alias krix Date: Sun Nov 11 18:04:46 2007 +0100 goffice-0.5.2-1-x86_64 * Version bump diff --git a/source/gnome-extra/goffice/FrugalBuild b/source/gnome-extra/goffice/FrugalBuild index ea7ebbe..d888d4d 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.1 +pkgver=0.5.2 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=('e518301a6cb416b791a0b745c3e49056774126bf') +sha1sums=('ffee8b8cfe33dc35d4b50f696a75ca2b005d39c1') # optimization OK From vmiklos at frugalware.org Sun Nov 11 18:33:17 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 11 18:33:20 2007 Subject: [Frugalware-git] pacman-tools: updates for 1.0.3 Message-ID: <20071111173317.14C4911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=d89f8866245bfdbb47d5ab8dd1817b16f4c8fef4 commit d89f8866245bfdbb47d5ab8dd1817b16f4c8fef4 Author: Miklos Vajna Date: Sun Nov 11 18:33:02 2007 +0100 updates for 1.0.3 diff --git a/Makefile b/Makefile index 1085b89..2ef9a37 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 1.0.2 +VERSION = 1.0.3 CFLAGS ?= -Wall -Werror -g -O2 -pipe CFLAGS += $(shell pkg-config --cflags libxml-2.0) diff --git a/NEWS b/NEWS index 2142c93..0872a93 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,13 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +1.0.3 - repoman handles again the case when you have different HOME + path on localost/server + - genchangelog: file renames are now detected in changelogs + - repoman: support for newer sudo version (where -E is needed to + inherit env vars) + - syncpkgd no longer dies if it tries to build a not existing + package or it's not possible to report the result of a build + - dg allows pulling to a dirty working directory 1.0.2 - fblint now requires at least an empty depends() array - dg: fixes and speedups for record, unrecord and pull - repoman push now gives more usable error messages From krics at linuxforum.hu Sun Nov 11 18:40:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Nov 11 18:40:51 2007 Subject: [Frugalware-git] frugalware-current: gnumeric-1.7.14-1-x86_64 Message-ID: <20071111174049.9F58111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fddada1e61c3ee0e0814a162c9a62f23497aa5a commit 5fddada1e61c3ee0e0814a162c9a62f23497aa5a Author: Christian Hamar alias krix Date: Sun Nov 11 18:36:41 2007 +0100 gnumeric-1.7.14-1-x86_64 * Version bump diff --git a/source/gnome-extra/gnumeric/FrugalBuild b/source/gnome-extra/gnumeric/FrugalBuild index febeb23..00e0a21 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.13 +pkgver=1.7.14 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.1') +depends=('libgnomedb>=2.99.5' 'libgda>=2.99.5' 'libgsf-gnome' 'desktop-file-utils' 'goffice>=0.5.2') makedepends=('intltool' 'pygtk') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -19,11 +19,7 @@ _F_gnome_devel="y" Finclude gnome gnome-scriptlet build() { -# Fpatchall Fcd -# Fsed "libgda-2.0" "libgda-3.0" configure.in -# Fsed "libgnomedb-2.0" "libgnomedb-3.0" configure.in -# Fautoreconf Fbuild_slice_scrollkeeper Fmake --enable-ssindex --disable-schemas-install --disable-scrollkeeper Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 @@ -31,5 +27,5 @@ build() { Frm /usr/share/mc/ } -sha1sums=('d5f5f20fa7389735752f016ab0207c07ea476831') +sha1sums=('f8781a2d1691fcb6b6b2c9fa5174e26ad3df5d91') # optimization OK From vmiklos at frugalware.org Sun Nov 11 18:44:08 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 11 18:44:11 2007 Subject: [Frugalware-git] frugalware-current: util.sh: add _F_archive_nosort to get back the good old Flasttar (no sorting) Message-ID: <20071111174408.F0CC011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34ea613f0bfaabdfc91f34677d91a5d36747881d commit 34ea613f0bfaabdfc91f34677d91a5d36747881d Author: Miklos Vajna Date: Sun Nov 11 18:43:20 2007 +0100 util.sh: add _F_archive_nosort to get back the good old Flasttar (no sorting) diff --git a/source/include/util.sh b/source/include/util.sh index b926679..73f2220 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -24,6 +24,7 @@ # # == OPTIONS # * _F_archive_name (defaults to $pkgname) +# * _F_archive_nosort (defaults to no, so sorting is enabled by default) # * _F_cd_path (defaults to $_F_archive_name$Fpkgversep$pkgver$pkgextraver) # * _F_conf_configure (defaults to ./configure) # * _F_conf_perl_pipefrom: if set, pipe the output of this command in Fconf() @@ -806,7 +807,11 @@ Flastarchive() { if [ -z "$_F_archive_name" ]; then _F_archive_name="$pkgname" fi - sed -n "s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" | Fsort | tail -n1 + if [ -z "$_F_archive_nosort" ]; then + sed -n "s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" | Fsort | tail -n1 + else + sed -n "s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" | tail -n1 + fi } ### From crazy at frugalware.org Sun Nov 11 19:08:50 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 19:08:53 2007 Subject: [Frugalware-git] frugalware-current: koffice-1.6.3-3-i686 Message-ID: <20071111180850.302AA11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9fe00b2bf1d94ef673de534f748ca87885668627 commit 9fe00b2bf1d94ef673de534f748ca87885668627 Author: crazy Date: Sun Nov 11 18:40:28 2007 +0100 koffice-1.6.3-3-i686 * [SEC] relbump * closes #2559 in -current diff --git a/source/kde-extra/koffice/FrugalBuild b/source/kde-extra/koffice/FrugalBuild index d97f3e2..017a484 100644 --- a/source/kde-extra/koffice/FrugalBuild +++ b/source/kde-extra/koffice/FrugalBuild @@ -4,12 +4,12 @@ pkgname=koffice pkgver=1.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="An integrated Office suite for KDE" url="http://www.koffice.org" -depends=('libkexif' 'kdebase>=3.5.7' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ - 'python>=2.5' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt' 'graphicsmagick>=1.1.8' 'readline') -makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings>=3.5.7' 'mysql' 'pkgconfig' 'postgresql') +depends=('libkexif' 'kdebase>=3.5.8' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ + 'python>=2.5' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt>=0.6.2' 'graphicsmagick>=1.1.8' 'readline') +makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings>=3.5.8' 'mysql' 'pkgconfig' 'postgresql') groups=('kde-extra') archs=('i686' 'x86_64') _F_kde_split_docs=1 @@ -19,7 +19,8 @@ url="http://www.koffice.org" up2date="lynx -dump http://ftp.gwdg.de/pub/x11/kde/stable/$pkgname-latest/src/|Flasttar" source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-latest/src/$pkgname-$pkgver.tar.bz2 \ desktop-files.patch \ - ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff) + ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff \ + ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) subpkgs=("$pkgname-docs") subdescs=('Koffice Documentation.') @@ -31,5 +32,6 @@ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" sha1sums=('de84214dec913eac1d47dab04dd93f3d81729fd3' \ 'a5efbe2b1effecde988ef55cf65eebb5d8c95a4a' \ - 'bff4f540389a77320bc87e2dedece50b82932e59') + 'bff4f540389a77320bc87e2dedece50b82932e59' \ + 'a3d1d85567ccf729a2237f4aa837f7e025ce00ae') # optimization OK From voroskoi at frugalware.org Sun Nov 11 19:18:27 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 19:18:30 2007 Subject: [Frugalware-git] frugalware-0.7: poppler-0.6-2sayshell1-x86_64 Message-ID: <20071111181827.CE65D11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=03b42985ef78e70bbca3ee96bbb758e745a6c509 commit 03b42985ef78e70bbca3ee96bbb758e745a6c509 Author: voroskoi Date: Sun Nov 11 19:15:34 2007 +0100 poppler-0.6-2sayshell1-x86_64 secfix relbump removed old MOAB patch SA27553.diff fixes #2561 added crash_fix.diff from upstream which fixes a crash with some pdfs diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index c72e608..e5504aa 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -3,7 +3,7 @@ pkgname=poppler pkgver=0.6 -pkgrel=1 +pkgrel=2sayshell1 pkgdesc="A PDF rendering library" url="http://poppler.freedesktop.org/" depends=('libxext' 'fontconfig' 'libstdc++' 'cairo' 'libjpeg' 'libxrender' 'libpng') @@ -12,7 +12,7 @@ groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://poppler.freedesktop.org/releases.html|grep tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(http://poppler.freedesktop.org/$pkgname-$pkgver.tar.gz \ - 01-poppler.conf) + 01-poppler.conf SA27553.diff crash_fix.diff) options=('scriptlet') subpkgs=('poppler-glib' 'poppler-qt' 'poppler-pdftools' 'poppler-qt4') @@ -38,7 +38,9 @@ build() { Fsplit poppler-qt4 usr/lib/pkgconfig/poppler-qt4.* Fsplit poppler-qt4 usr/include/poppler/qt4/ } - sha1sums=('a40abb17b912d6ecd0e4ece609b74647b8d04279' \ - 'a048348d9a8c6d545714350d3ab66dc7028e4b7f') + 'a048348d9a8c6d545714350d3ab66dc7028e4b7f' \ + 'b35c086f95b2af31b344d76070bffe35537b1df9' \ + 'bc36fc906a8842483cc0f9be207958c2d71486c0') + # optimization OK diff --git a/source/xlib/poppler/MOAB-06-01-2007.diff b/source/xlib/poppler/MOAB-06-01-2007.diff deleted file mode 100644 index 5ac9d8f..0000000 --- a/source/xlib/poppler/MOAB-06-01-2007.diff +++ /dev/null @@ -1,63 +0,0 @@ -diff -Naur poppler-0.5.4.orig/poppler/Catalog.cc poppler-0.5.4/poppler/Catalog.cc ---- poppler-0.5.4.orig/poppler/Catalog.cc 2006-09-13 17:10:52.000000000 +0200 -+++ poppler-0.5.4/poppler/Catalog.cc 2007-01-19 18:56:23.000000000 +0100 -@@ -26,6 +26,12 @@ - #include "UGooString.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -75,7 +81,7 @@ - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -217,7 +223,7 @@ - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -262,9 +268,13 @@ - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); -diff -Naur poppler-0.5.4.orig/poppler/Catalog.h poppler-0.5.4/poppler/Catalog.h ---- poppler-0.5.4.orig/poppler/Catalog.h 2006-01-23 15:43:36.000000000 +0100 -+++ poppler-0.5.4/poppler/Catalog.h 2007-01-19 18:56:43.000000000 +0100 -@@ -193,7 +193,7 @@ - PageMode pageMode; // page mode - PageLayout pageLayout; // page layout - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GooString *name, Object *obj); - }; - diff --git a/source/xlib/poppler/SA27553.diff b/source/xlib/poppler/SA27553.diff new file mode 100644 index 0000000..9c84caf --- /dev/null +++ b/source/xlib/poppler/SA27553.diff @@ -0,0 +1,643 @@ +diff --git a/poppler/Stream.cc b/poppler/Stream.cc +index ed46586..85d46bf 100644 +--- a/poppler/Stream.cc ++++ b/poppler/Stream.cc +@@ -1251,23 +1251,26 @@ CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA, + columns = columnsA; + if (columns < 1) { + columns = 1; +- } +- if (columns + 4 <= 0) { +- columns = INT_MAX - 4; ++ } else if (columns > INT_MAX - 2) { ++ columns = INT_MAX - 2; + } + rows = rowsA; + endOfBlock = endOfBlockA; + black = blackA; +- refLine = (short *)gmallocn(columns + 3, sizeof(short)); +- codingLine = (short *)gmallocn(columns + 2, sizeof(short)); ++ // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns ++ // ---> max codingLine size = columns + 1 ++ // refLine has one extra guard entry at the end ++ // ---> max refLine size = columns + 2 ++ codingLine = (int *)gmallocn(columns + 1, sizeof(int)); ++ refLine = (int *)gmallocn(columns + 2, sizeof(int)); + + eof = gFalse; + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +- codingLine[0] = 0; +- codingLine[1] = refLine[2] = columns; +- a0 = 1; ++ codingLine[0] = columns; ++ a0i = 0; ++ outputBits = 0; + + buf = EOF; + } +@@ -1286,9 +1289,9 @@ void CCITTFaxStream::reset() { + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +- codingLine[0] = 0; +- codingLine[1] = columns; +- a0 = 1; ++ codingLine[0] = columns; ++ a0i = 0; ++ outputBits = 0; + buf = EOF; + + // skip any initial zero bits and end-of-line marker, and get the 2D +@@ -1305,211 +1308,230 @@ void CCITTFaxStream::reset() { + } + } + ++inline void CCITTFaxStream::addPixels(int a1, int blackPixels) { ++ if (a1 > codingLine[a0i]) { ++ if (a1 > columns) { ++ error(getPos(), "CCITTFax row is wrong length (%d)", a1); ++ err = gTrue; ++ a1 = columns; ++ } ++ if ((a0i & 1) ^ blackPixels) { ++ ++a0i; ++ } ++ codingLine[a0i] = a1; ++ } ++} ++ ++inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) { ++ if (a1 > codingLine[a0i]) { ++ if (a1 > columns) { ++ error(getPos(), "CCITTFax row is wrong length (%d)", a1); ++ err = gTrue; ++ a1 = columns; ++ } ++ if ((a0i & 1) ^ blackPixels) { ++ ++a0i; ++ } ++ codingLine[a0i] = a1; ++ } else if (a1 < codingLine[a0i]) { ++ if (a1 < 0) { ++ error(getPos(), "Invalid CCITTFax code"); ++ err = gTrue; ++ a1 = 0; ++ } ++ while (a0i > 0 && a1 <= codingLine[a0i - 1]) { ++ --a0i; ++ } ++ codingLine[a0i] = a1; ++ } ++} ++ + int CCITTFaxStream::lookChar() { + short code1, code2, code3; +- int a0New; +- GBool err, gotEOL; +- int ret; +- int bits, i; ++ int b1i, blackPixels, i, bits; ++ GBool gotEOL; + +- // if at eof just return EOF +- if (eof && codingLine[a0] >= columns) { +- return EOF; ++ if (buf != EOF) { ++ return buf; + } + + // read the next row +- err = gFalse; +- if (codingLine[a0] >= columns) { ++ if (outputBits == 0) { ++ ++ // if at eof just return EOF ++ if (eof) { ++ return EOF; ++ } ++ ++ err = gFalse; + + // 2-D encoding + if (nextLine2D) { +- // state: +- // a0New = current position in coding line (0 <= a0New <= columns) +- // codingLine[a0] = last change in coding line +- // (black-to-white if a0 is even, +- // white-to-black if a0 is odd) +- // refLine[b1] = next change in reference line of opposite color +- // to a0 +- // invariants: +- // 0 <= codingLine[a0] <= a0New +- // <= refLine[b1] <= refLine[b1+1] <= columns +- // 0 <= a0 <= columns+1 +- // refLine[0] = 0 +- // refLine[n] = refLine[n+1] = columns +- // -- for some 1 <= n <= columns+1 +- // end condition: +- // 0 = codingLine[0] <= codingLine[1] < codingLine[2] < ... +- // < codingLine[n-1] < codingLine[n] = columns +- // -- where 1 <= n <= columns+1 + for (i = 0; codingLine[i] < columns; ++i) { + refLine[i] = codingLine[i]; + } +- refLine[i] = refLine[i + 1] = columns; +- b1 = 1; +- a0New = codingLine[a0 = 0] = 0; +- do { ++ refLine[i++] = columns; ++ refLine[i] = columns; ++ codingLine[0] = 0; ++ a0i = 0; ++ b1i = 0; ++ blackPixels = 0; ++ // invariant: ++ // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] ++ // <= columns ++ // exception at left edge: ++ // codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible ++ // exception at right edge: ++ // refLine[b1i] = refLine[b1i+1] = columns is possible ++ while (codingLine[a0i] < columns) { + code1 = getTwoDimCode(); + switch (code1) { + case twoDimPass: +- if (refLine[b1] < columns) { +- a0New = refLine[b1 + 1]; +- b1 += 2; ++ addPixels(refLine[b1i + 1], blackPixels); ++ if (refLine[b1i + 1] < columns) { ++ b1i += 2; + } + break; + case twoDimHoriz: +- if ((a0 & 1) == 0) { +- code1 = code2 = 0; ++ code1 = code2 = 0; ++ if (blackPixels) { + do { +- code1 += code3 = getWhiteCode(); ++ code1 += code3 = getBlackCode(); + } while (code3 >= 64); + do { +- code2 += code3 = getBlackCode(); ++ code2 += code3 = getWhiteCode(); + } while (code3 >= 64); + } else { +- code1 = code2 = 0; + do { +- code1 += code3 = getBlackCode(); ++ code1 += code3 = getWhiteCode(); + } while (code3 >= 64); + do { +- code2 += code3 = getWhiteCode(); ++ code2 += code3 = getBlackCode(); + } while (code3 >= 64); + } +- if (code1 > 0 || code2 > 0) { +- if (a0New + code1 <= columns) { +- codingLine[a0 + 1] = a0New + code1; +- } else { +- codingLine[a0 + 1] = columns; +- } +- ++a0; +- if (codingLine[a0] + code2 <= columns) { +- codingLine[a0 + 1] = codingLine[a0] + code2; +- } else { +- codingLine[a0 + 1] = columns; +- } +- ++a0; +- a0New = codingLine[a0]; +- while (refLine[b1] <= a0New && refLine[b1] < columns) { +- b1 += 2; ++ addPixels(codingLine[a0i] + code1, blackPixels); ++ if (codingLine[a0i] < columns) { ++ addPixels(codingLine[a0i] + code2, blackPixels ^ 1); ++ } ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; ++ } ++ break; ++ case twoDimVertR3: ++ addPixels(refLine[b1i] + 3, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ ++b1i; ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; + } + } + break; +- case twoDimVert0: +- if (refLine[b1] < columns) { +- a0New = codingLine[++a0] = refLine[b1]; +- ++b1; +- while (refLine[b1] <= a0New && refLine[b1] < columns) { +- b1 += 2; ++ case twoDimVertR2: ++ addPixels(refLine[b1i] + 2, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ ++b1i; ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; + case twoDimVertR1: +- if (refLine[b1] + 1 < columns) { +- a0New = codingLine[++a0] = refLine[b1] + 1; +- ++b1; +- while (refLine[b1] <= a0New && refLine[b1] < columns) { +- b1 += 2; ++ addPixels(refLine[b1i] + 1, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ ++b1i; ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; +- case twoDimVertL1: +- if (refLine[b1] - 1 > a0New || (a0 == 0 && refLine[b1] == 1)) { +- a0New = codingLine[++a0] = refLine[b1] - 1; +- --b1; +- while (refLine[b1] <= a0New && refLine[b1] < columns) { +- b1 += 2; ++ case twoDimVert0: ++ addPixels(refLine[b1i], blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ ++b1i; ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; + } + } + break; +- case twoDimVertR2: +- if (refLine[b1] + 2 < columns) { +- a0New = codingLine[++a0] = refLine[b1] + 2; +- ++b1; +- while (refLine[b1] <= a0New && refLine[b1] < columns) { +- b1 += 2; ++ case twoDimVertL3: ++ addPixelsNeg(refLine[b1i] - 3, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ if (b1i > 0) { ++ --b1i; ++ } else { ++ ++b1i; ++ } ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; + case twoDimVertL2: +- if (refLine[b1] - 2 > a0New || (a0 == 0 && refLine[b1] == 2)) { +- a0New = codingLine[++a0] = refLine[b1] - 2; +- --b1; +- while (refLine[b1] <= a0New && refLine[b1] < columns) { +- b1 += 2; ++ addPixelsNeg(refLine[b1i] - 2, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ if (b1i > 0) { ++ --b1i; ++ } else { ++ ++b1i; + } +- } +- break; +- case twoDimVertR3: +- if (refLine[b1] + 3 < columns) { +- a0New = codingLine[++a0] = refLine[b1] + 3; +- ++b1; +- while (refLine[b1] <= a0New && refLine[b1] < columns) { +- b1 += 2; ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; +- case twoDimVertL3: +- if (refLine[b1] - 3 > a0New || (a0 == 0 && refLine[b1] == 3)) { +- a0New = codingLine[++a0] = refLine[b1] - 3; +- --b1; +- while (refLine[b1] <= a0New && refLine[b1] < columns) { +- b1 += 2; ++ case twoDimVertL1: ++ addPixelsNeg(refLine[b1i] - 1, blackPixels); ++ blackPixels ^= 1; ++ if (codingLine[a0i] < columns) { ++ if (b1i > 0) { ++ --b1i; ++ } else { ++ ++b1i; ++ } ++ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { ++ b1i += 2; + } + } + break; + case EOF: ++ addPixels(columns, 0); + eof = gTrue; +- codingLine[a0 = 0] = columns; +- return EOF; ++ break; + default: + error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1); ++ addPixels(columns, 0); + err = gTrue; + break; + } +- } while (codingLine[a0] < columns); ++ } + + // 1-D encoding + } else { +- codingLine[a0 = 0] = 0; +- while (1) { ++ codingLine[0] = 0; ++ a0i = 0; ++ blackPixels = 0; ++ while (codingLine[a0i] < columns) { + code1 = 0; +- do { +- code1 += code3 = getWhiteCode(); +- } while (code3 >= 64); +- codingLine[a0+1] = codingLine[a0] + code1; +- ++a0; +- if (codingLine[a0] >= columns) { +- break; +- } +- code2 = 0; +- do { +- code2 += code3 = getBlackCode(); +- } while (code3 >= 64); +- codingLine[a0+1] = codingLine[a0] + code2; +- ++a0; +- if (codingLine[a0] >= columns) { +- break; ++ if (blackPixels) { ++ do { ++ code1 += code3 = getBlackCode(); ++ } while (code3 >= 64); ++ } else { ++ do { ++ code1 += code3 = getWhiteCode(); ++ } while (code3 >= 64); + } ++ addPixels(codingLine[a0i] + code1, blackPixels); ++ blackPixels ^= 1; + } + } + +- if (codingLine[a0] != columns) { +- error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]); +- // force the row to be the correct length +- while (codingLine[a0] > columns) { +- --a0; +- } +- codingLine[++a0] = columns; +- err = gTrue; +- } +- + // byte-align the row + if (byteAlign) { + inputBits &= ~7; +@@ -1568,14 +1590,17 @@ int CCITTFaxStream::lookChar() { + // this if we know the stream contains end-of-line markers because + // the "just plow on" technique tends to work better otherwise + } else if (err && endOfLine) { +- do { ++ while (1) { ++ code1 = lookBits(13); + if (code1 == EOF) { + eof = gTrue; + return EOF; + } ++ if ((code1 >> 1) == 0x001) { ++ break; ++ } + eatBits(1); +- code1 = lookBits(13); +- } while ((code1 >> 1) != 0x001); ++ } + eatBits(12); + if (encoding > 0) { + eatBits(1); +@@ -1583,11 +1608,11 @@ int CCITTFaxStream::lookChar() { + } + } + +- a0 = 0; +- outputBits = codingLine[1] - codingLine[0]; +- if (outputBits == 0) { +- a0 = 1; +- outputBits = codingLine[2] - codingLine[1]; ++ // set up for output ++ if (codingLine[0] > 0) { ++ outputBits = codingLine[a0i = 0]; ++ } else { ++ outputBits = codingLine[a0i = 1]; + } + + ++row; +@@ -1595,39 +1620,43 @@ int CCITTFaxStream::lookChar() { + + // get a byte + if (outputBits >= 8) { +- ret = ((a0 & 1) == 0) ? 0xff : 0x00; +- if ((outputBits -= 8) == 0) { +- ++a0; +- if (codingLine[a0] < columns) { +- outputBits = codingLine[a0 + 1] - codingLine[a0]; +- } ++ buf = (a0i & 1) ? 0x00 : 0xff; ++ outputBits -= 8; ++ if (outputBits == 0 && codingLine[a0i] < columns) { ++ ++a0i; ++ outputBits = codingLine[a0i] - codingLine[a0i - 1]; + } + } else { + bits = 8; +- ret = 0; ++ buf = 0; + do { + if (outputBits > bits) { +- i = bits; +- bits = 0; +- if ((a0 & 1) == 0) { +- ret |= 0xff >> (8 - i); ++ buf <<= bits; ++ if (!(a0i & 1)) { ++ buf |= 0xff >> (8 - bits); + } +- outputBits -= i; ++ outputBits -= bits; ++ bits = 0; + } else { +- i = outputBits; +- bits -= outputBits; +- if ((a0 & 1) == 0) { +- ret |= (0xff >> (8 - i)) << bits; ++ buf <<= outputBits; ++ if (!(a0i & 1)) { ++ buf |= 0xff >> (8 - outputBits); + } ++ bits -= outputBits; + outputBits = 0; +- ++a0; +- if (codingLine[a0] < columns) { +- outputBits = codingLine[a0 + 1] - codingLine[a0]; ++ if (codingLine[a0i] < columns) { ++ ++a0i; ++ outputBits = codingLine[a0i] - codingLine[a0i - 1]; ++ } else if (bits > 0) { ++ buf <<= bits; ++ bits = 0; + } + } +- } while (bits > 0 && codingLine[a0] < columns); ++ } while (bits); ++ } ++ if (black) { ++ buf ^= 0xff; + } +- buf = black ? (ret ^ 0xff) : ret; + return buf; + } + +@@ -1669,6 +1698,9 @@ short CCITTFaxStream::getWhiteCode() { + code = 0; // make gcc happy + if (endOfBlock) { + code = lookBits(12); ++ if (code == EOF) { ++ return 1; ++ } + if ((code >> 5) == 0) { + p = &whiteTab1[code]; + } else { +@@ -1681,6 +1713,9 @@ short CCITTFaxStream::getWhiteCode() { + } else { + for (n = 1; n <= 9; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 9) { + code <<= 9 - n; + } +@@ -1692,6 +1727,9 @@ short CCITTFaxStream::getWhiteCode() { + } + for (n = 11; n <= 12; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 12) { + code <<= 12 - n; + } +@@ -1717,6 +1755,9 @@ short CCITTFaxStream::getBlackCode() { + code = 0; // make gcc happy + if (endOfBlock) { + code = lookBits(13); ++ if (code == EOF) { ++ return 1; ++ } + if ((code >> 7) == 0) { + p = &blackTab1[code]; + } else if ((code >> 9) == 0 && (code >> 7) != 0) { +@@ -1731,6 +1772,9 @@ short CCITTFaxStream::getBlackCode() { + } else { + for (n = 2; n <= 6; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 6) { + code <<= 6 - n; + } +@@ -1742,6 +1786,9 @@ short CCITTFaxStream::getBlackCode() { + } + for (n = 7; n <= 12; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 12) { + code <<= 12 - n; + } +@@ -1755,6 +1802,9 @@ short CCITTFaxStream::getBlackCode() { + } + for (n = 10; n <= 13; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 13) { + code <<= 13 - n; + } +@@ -1971,6 +2021,12 @@ void DCTStream::reset() { + // allocate a buffer for the whole image + bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth; + bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight; ++ if (bufWidth <= 0 || bufHeight <= 0 || ++ bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) { ++ error(getPos(), "Invalid image size in DCT stream"); ++ y = height; ++ return; ++ } + for (i = 0; i < numComps; ++i) { + frameBuf[i] = (int *)gmallocn(bufWidth * bufHeight, sizeof(int)); + memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int)); +@@ -3041,6 +3097,11 @@ GBool DCTStream::readScanInfo() { + } + scanInfo.firstCoeff = str->getChar(); + scanInfo.lastCoeff = str->getChar(); ++ if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 || ++ scanInfo.firstCoeff > scanInfo.lastCoeff) { ++ error(getPos(), "Bad DCT coefficient numbers in scan info block"); ++ return gFalse; ++ } + c = str->getChar(); + scanInfo.ah = (c >> 4) & 0x0f; + scanInfo.al = c & 0x0f; +diff --git a/poppler/Stream.h b/poppler/Stream.h +index 647057f..5b176f8 100644 +--- a/poppler/Stream.h ++++ b/poppler/Stream.h +@@ -526,13 +526,15 @@ private: + int row; // current row + int inputBuf; // input buffer + int inputBits; // number of bits in input buffer +- short *refLine; // reference line changing elements +- int b1; // index into refLine +- short *codingLine; // coding line changing elements +- int a0; // index into codingLine ++ int *codingLine; // coding line changing elements ++ int *refLine; // reference line changing elements ++ int a0i; // index into codingLine ++ GBool err; // error on current line + int outputBits; // remaining ouput bits + int buf; // character buffer + ++ void addPixels(int a1, int black); ++ void addPixelsNeg(int a1, int black); + short getTwoDimCode(); + short getWhiteCode(); + short getBlackCode(); diff --git a/source/xlib/poppler/crash_fix.diff b/source/xlib/poppler/crash_fix.diff new file mode 100644 index 0000000..6061232 --- /dev/null +++ b/source/xlib/poppler/crash_fix.diff @@ -0,0 +1,91 @@ +diff --git a/poppler/Stream.cc b/poppler/Stream.cc +index 85d46bf..3e44e27 100644 +--- a/poppler/Stream.cc ++++ b/poppler/Stream.cc +@@ -1261,14 +1261,18 @@ CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA, + // ---> max codingLine size = columns + 1 + // refLine has one extra guard entry at the end + // ---> max refLine size = columns + 2 +- codingLine = (int *)gmallocn(columns + 1, sizeof(int)); +- refLine = (int *)gmallocn(columns + 2, sizeof(int)); ++ codingLine = (int *)gmallocn_checkoverflow(columns + 1, sizeof(int)); ++ refLine = (int *)gmallocn_checkoverflow(columns + 2, sizeof(int)); + +- eof = gFalse; ++ if (codingLine != NULL && refLine != NULL) { ++ eof = gFalse; ++ codingLine[0] = columns; ++ } else { ++ eof = gTrue; ++ } + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +- codingLine[0] = columns; + a0i = 0; + outputBits = 0; + +@@ -1285,11 +1289,16 @@ void CCITTFaxStream::reset() { + short code1; + + str->reset(); +- eof = gFalse; ++ ++ if (codingLine != NULL && refLine != NULL) { ++ eof = gFalse; ++ codingLine[0] = columns; ++ } else { ++ eof = gTrue; ++ } + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +- codingLine[0] = columns; + a0i = 0; + outputBits = 0; + buf = EOF; +diff --git a/goo/gmem.cc b/goo/gmem.cc +index f1f8f5f..3dce8ea 100644 +--- a/goo/gmem.cc ++++ b/goo/gmem.cc +@@ -172,6 +172,24 @@ void *gmallocn(int nObjs, int objSize) GMEM_EXCEP { + return gmalloc(n); + } + ++void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP { ++ int n; ++ ++ if (nObjs == 0) { ++ return NULL; ++ } ++ n = nObjs * objSize; ++ if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { ++#if USE_EXCEPTIONS ++ throw GMemException(); ++#else ++ fprintf(stderr, "Bogus memory allocation size\n"); ++ return NULL; ++#endif ++ } ++ return gmalloc(n); ++} ++ + void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP { + int n; + +diff --git a/goo/gmem.h b/goo/gmem.h +index ebe1455..39c2334 100644 +--- a/goo/gmem.h ++++ b/goo/gmem.h +@@ -49,8 +49,11 @@ extern void *grealloc(void *p, size_t size) GMEM_EXCEP; + * and size. The result is similar to allocating nObjs * objSize + * bytes, but there is an additional error check that the total size + * doesn't overflow an int. ++ * The gmallocn_checkoverflow variant returns NULL instead of exiting ++ * the application if a overflow is detected + */ + extern void *gmallocn(int nObjs, int objSize) GMEM_EXCEP; ++extern void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP; + extern void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP; + + /* From vmiklos at frugalware.org Sun Nov 11 19:20:03 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Nov 11 19:20:06 2007 Subject: [Frugalware-git] frugalware-current: pacman-tools-1.0.3-1-i686 Message-ID: <20071111182003.E9C4C11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=42d9a5911f9792b3526dfd37799a72c84bc21394 commit 42d9a5911f9792b3526dfd37799a72c84bc21394 Author: Miklos Vajna Date: Sun Nov 11 19:19:00 2007 +0100 pacman-tools-1.0.3-1-i686 version bump diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild index 3eeffc7..1be5213 100644 --- a/source/devel/pacman-tools/FrugalBuild +++ b/source/devel/pacman-tools/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=pacman-tools -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="Tools for developers for managing packages" url="http://ftp.frugalware.org/pub/other/pacman-tools" @@ -11,6 +11,7 @@ makedepends=('asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common') groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') backup=(etc/{genchangelog,repoman}.conf etc/syncpkg{cd/c,d/d,d/ctl}config.py) +_F_archive_nosort=y up2date="lynx -dump $url|Flasttar" source=($url/$pkgname-$pkgver.tar.gz) options=('scriptlet') From voroskoi at frugalware.org Sun Nov 11 19:53:17 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 19:53:20 2007 Subject: [Frugalware-git] frugalware-current: emacs-22.1-2-x86_64 Message-ID: <20071111185317.957EB119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b6fe49b1d1f37fc0ad59136c0848de17cb2384fa commit b6fe49b1d1f37fc0ad59136c0848de17cb2384fa Author: voroskoi Date: Sun Nov 11 19:51:34 2007 +0100 emacs-22.1-2-x86_64 secfix relbump, closes #2566 diff --git a/source/xapps/emacs/FrugalBuild b/source/xapps/emacs/FrugalBuild index 82c7e9d..2bb2820 100644 --- a/source/xapps/emacs/FrugalBuild +++ b/source/xapps/emacs/FrugalBuild @@ -5,7 +5,7 @@ pkgname=emacs pkgver=22.1 pkgextraver= -pkgrel=1 +pkgrel=2 pkgdesc="An extensible, customizable, self-documenting real-time display editor" url="http://www.gnu.org/software/emacs/" Finclude texinfo @@ -14,14 +14,15 @@ depends=('xaw3d' 'libtiff' 'libjpeg' 'libpng' 'libungif' 'ncurses') groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep stable|sed 's/.*: \([0-9\.]*\) .*/\1/'" -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz emacs-21.4-amd64.patch) -signatures=($source.sig '') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz emacs-21.4-amd64.patch CVE-2007-5795.diff) +signatures=($source.sig '' '') build() { # LDFLAGS="-Wl,--hash-style=both" does not compile LDFLAGS="" Fcd $pkgname-$pkgver - [[ "$CARCH" == "x86_64" ]] && Fpatchall + [[ "$CARCH" == "x86_64" ]] && Fpatch emacs-21.4-amd64.patch + Fpatch CVE-2007-5795.diff Fmake --with-x11 --with-x-toolkit --with-pop Fmakeinstall [ -e $Fdestdir/usr/info/dir.old ] && Frm /usr/info/dir.old From voroskoi at frugalware.org Sun Nov 11 19:57:18 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 19:57:20 2007 Subject: [Frugalware-git] frugalware-current: emacs-22.1-2-x86_64 Message-ID: <20071111185718.4A2A811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f2ccf4a8dfe876dcb0048045c31ec9e4fe5ed239 commit f2ccf4a8dfe876dcb0048045c31ec9e4fe5ed239 Author: voroskoi Date: Sun Nov 11 19:57:08 2007 +0100 emacs-22.1-2-x86_64 forgot to add the patch diff --git a/source/xapps/emacs/CVE-2007-5795.diff b/source/xapps/emacs/CVE-2007-5795.diff new file mode 100644 index 0000000..20908d9 --- /dev/null +++ b/source/xapps/emacs/CVE-2007-5795.diff @@ -0,0 +1,13 @@ +--- emacs/lisp/files.el 2007/10/13 14:09:56 1.896.2.28 ++++ emacs/lisp/files.el 2007/11/02 11:02:12 1.896.2.29 +@@ -2764,8 +2764,8 @@ + ;; If caller wants only the safe variables, + ;; install only them. + (dolist (elt result) +- (unless (or (memq (car elt) unsafe-vars) +- (memq (car elt) risky-vars)) ++ (unless (or (member elt unsafe-vars) ++ (member elt risky-vars)) + (hack-one-local-variable (car elt) (cdr elt)))) + ;; Query, except in the case where all are known safe + ;; if the user wants no quuery in that case. From crazy at frugalware.org Sun Nov 11 20:05:12 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 20:05:14 2007 Subject: [Frugalware-git] frugalware-current: perl-xml-twig-3.31-1-i686 Message-ID: <20071111190512.F3F7311901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0c5e5f026624d9369d670932802ea6531227f963 commit 0c5e5f026624d9369d670932802ea6531227f963 Author: crazy Date: Sun Nov 11 20:04:45 2007 +0100 perl-xml-twig-3.31-1-i686 * Version bump diff --git a/source/devel/perl-xml-twig/FrugalBuild b/source/devel/perl-xml-twig/FrugalBuild index 7b92690..beebc6f 100644 --- a/source/devel/perl-xml-twig/FrugalBuild +++ b/source/devel/perl-xml-twig/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=XML-Twig _F_perl_author=M/MI/MIROD -pkgver=3.29 +pkgver=3.31 pkgrel=1 pkgdesc="A perl module for processing huge XML documents in tree mode." depends=('perl-xml') @@ -11,5 +11,5 @@ _F_conf_perl_pipefrom="echo y" Finclude perl archs=('i686' 'x86_64') groups=('devel') -sha1sums=('649afe3513177f9ec34d7d04ca9e0755f9530942') +sha1sums=('66a9756e3493d949c93396d6ec216e48e17614a4') From voroskoi at frugalware.org Sun Nov 11 20:12:53 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 20:13:03 2007 Subject: [Frugalware-git] frugalware-0.7: emacs-22.1-2sayshell1-x86_64 Message-ID: <20071111191253.6220611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=20218605c083d22def47a60bc9543f871ee46c73 commit 20218605c083d22def47a60bc9543f871ee46c73 Author: voroskoi Date: Sun Nov 11 20:10:54 2007 +0100 emacs-22.1-2sayshell1-x86_64 secfix relbump, closes #2566 diff --git a/source/xapps/emacs/CVE-2007-5795.diff b/source/xapps/emacs/CVE-2007-5795.diff new file mode 100644 index 0000000..20908d9 --- /dev/null +++ b/source/xapps/emacs/CVE-2007-5795.diff @@ -0,0 +1,13 @@ +--- emacs/lisp/files.el 2007/10/13 14:09:56 1.896.2.28 ++++ emacs/lisp/files.el 2007/11/02 11:02:12 1.896.2.29 +@@ -2764,8 +2764,8 @@ + ;; If caller wants only the safe variables, + ;; install only them. + (dolist (elt result) +- (unless (or (memq (car elt) unsafe-vars) +- (memq (car elt) risky-vars)) ++ (unless (or (member elt unsafe-vars) ++ (member elt risky-vars)) + (hack-one-local-variable (car elt) (cdr elt)))) + ;; Query, except in the case where all are known safe + ;; if the user wants no quuery in that case. diff --git a/source/xapps/emacs/FrugalBuild b/source/xapps/emacs/FrugalBuild index 82c7e9d..1492e07 100644 --- a/source/xapps/emacs/FrugalBuild +++ b/source/xapps/emacs/FrugalBuild @@ -5,7 +5,7 @@ pkgname=emacs pkgver=22.1 pkgextraver= -pkgrel=1 +pkgrel=2sayshell1 pkgdesc="An extensible, customizable, self-documenting real-time display editor" url="http://www.gnu.org/software/emacs/" Finclude texinfo @@ -14,14 +14,15 @@ depends=('xaw3d' 'libtiff' 'libjpeg' 'libpng' 'libungif' 'ncurses') groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep stable|sed 's/.*: \([0-9\.]*\) .*/\1/'" -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz emacs-21.4-amd64.patch) -signatures=($source.sig '') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz emacs-21.4-amd64.patch CVE-2007-5795.diff) +signatures=($source.sig '' '') build() { # LDFLAGS="-Wl,--hash-style=both" does not compile LDFLAGS="" Fcd $pkgname-$pkgver - [[ "$CARCH" == "x86_64" ]] && Fpatchall + [[ "$CARCH" == "x86_64" ]] && Fpatch emacs-21.4-amd64.patch + Fpatch CVE-2007-5795.diff Fmake --with-x11 --with-x-toolkit --with-pop Fmakeinstall [ -e $Fdestdir/usr/info/dir.old ] && Frm /usr/info/dir.old From crazy at frugalware.org Sun Nov 11 20:27:00 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 20:27:04 2007 Subject: [Frugalware-git] frugalware-current: mcrypt-2.6.7-1-i686 Message-ID: <20071111192700.AB6C411901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ea9c2afc86b18aa2c30f58174a5c09f321eb00ce commit ea9c2afc86b18aa2c30f58174a5c09f321eb00ce Author: crazy Date: Sun Nov 11 20:26:31 2007 +0100 mcrypt-2.6.7-1-i686 * Version bump diff --git a/source/apps-extra/mcrypt/FrugalBuild b/source/apps-extra/mcrypt/FrugalBuild index 00dd201..e326474 100644 --- a/source/apps-extra/mcrypt/FrugalBuild +++ b/source/apps-extra/mcrypt/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=mcrypt -pkgver=2.6.6 +pkgver=2.6.7 pkgrel=1 pkgdesc="replacement of the old unix crypt(1)" depends=('libmcrypt>=2.5.8' 'mhash>=0.9.8' 'zlib') @@ -10,6 +10,6 @@ groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=87941|grep mcrypt|grep -v libmcrypt|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" -sha1sums=('0ca349d77f67c0a4881bb187af3705cc3c60717a') +sha1sums=('7ee1c07efef2a4489b9777ae4aede94dedececd2') # optimization OK From crazy at frugalware.org Sun Nov 11 20:54:14 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 20:54:17 2007 Subject: [Frugalware-git] frugalware-current: php-5.2.5-1-i686 Message-ID: <20071111195414.D05F511901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f52271fc4afdeac3977a9dffb5d8aa05c7184b42 commit f52271fc4afdeac3977a9dffb5d8aa05c7184b42 Author: crazy Date: Sun Nov 11 20:51:01 2007 +0100 php-5.2.5-1-i686 * Version bump diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index 615e137..b2e809b 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=php -pkgver=5.2.4 -pkgrel=2 +pkgver=5.2.5 +pkgrel=1 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net" backup=(etc/{php.ini,httpd/conf/modules.d/$pkgname.conf}) @@ -129,7 +129,7 @@ build() Ffile /etc/php.ini Fln /etc/php.ini /usr/lib/php.ini } -sha1sums=('20e9c6cd9766eca78f04d4166703d26ee24815e8' \ +sha1sums=('35799e24f1de2a69b944ffd522a989c8528299ba' \ '9ba6e9430bdba5f6ab2bad15e7cc354d0ea3fd58' \ '0850ef23512a02e8460dc36f08f453d148dcd9df' \ '40ae88f0721e02a2c75de76be342c51c85bf734d') From crazy at frugalware.org Sun Nov 11 21:07:37 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 21:07:39 2007 Subject: [Frugalware-git] frugalware-current: eaccelerator-0.9.5.2-2-i686 Message-ID: <20071111200737.6925611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ec722850749d21b7300c2d9e7984b76a41e40c00 commit ec722850749d21b7300c2d9e7984b76a41e40c00 Author: crazy Date: Sun Nov 11 21:07:15 2007 +0100 eaccelerator-0.9.5.2-2-i686 * rebuild with php diff --git a/source/devel-extra/eaccelerator/FrugalBuild b/source/devel-extra/eaccelerator/FrugalBuild index 2e392e4..b444784 100644 --- a/source/devel-extra/eaccelerator/FrugalBuild +++ b/source/devel-extra/eaccelerator/FrugalBuild @@ -3,7 +3,7 @@ pkgname=eaccelerator pkgver=0.9.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="PHP accelerator and encoder" license="GPL2" _F_sourceforge_ext=".tar.bz2" @@ -14,7 +14,7 @@ source=(http://bart.$pkgname.net/source/$pkgver/$pkgname-$pkgver.tar.bz2 README signatures=(http://bart.$pkgname.net/source/$pkgver/$pkgname-$pkgver.tar.bz2.asc '') groups=('devel-extra') archs=('i686' 'x86_64') -depends=('php>=5.2.4') +depends=('php>=5.2.5') build() { From voroskoi at frugalware.org Sun Nov 11 21:17:11 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Nov 11 21:17:14 2007 Subject: [Frugalware-git] frugalware-current: perl-5.8.8-5-x86_64 Message-ID: <20071111201711.B614C11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b027e41f2f159a293f8ae0fe630b3065601f4a70 commit b027e41f2f159a293f8ae0fe630b3065601f4a70 Author: voroskoi Date: Sun Nov 11 21:16:11 2007 +0100 perl-5.8.8-5-x86_64 secfix relbump, closes #2568 cleanups in build() diff --git a/source/base/perl/CVE-2007-5116.diff b/source/base/perl/CVE-2007-5116.diff new file mode 100644 index 0000000..82ce340 --- /dev/null +++ b/source/base/perl/CVE-2007-5116.diff @@ -0,0 +1,56 @@ +--- regcomp.c 2006-01-08 12:59:27.000000000 -0800 ++++ regcomp.c 2007-10-05 12:07:55.000000000 -0700 +@@ -135,7 +135,8 @@ + I32 extralen; + I32 seen_zerolen; + I32 seen_evals; +- I32 utf8; ++ I32 utf8; /* pattern is utf8 or not */ ++ I32 orig_utf8; /* pattern was originally utf8 */ + #if ADD_TO_REGEXEC + char *starttry; /* -Dr: where regtry was called. */ + #define RExC_starttry (pRExC_state->starttry) +@@ -161,6 +162,7 @@ + #define RExC_seen_zerolen (pRExC_state->seen_zerolen) + #define RExC_seen_evals (pRExC_state->seen_evals) + #define RExC_utf8 (pRExC_state->utf8) ++#define RExC_orig_utf8 (pRExC_state->orig_utf8) + + #define ISMULT1(c) ((c) == '*' || (c) == '+' || (c) == '?') + #define ISMULT2(s) ((*s) == '*' || (*s) == '+' || (*s) == '?' || \ +@@ -1749,15 +1751,17 @@ + if (exp == NULL) + FAIL("NULL regexp argument"); + +- RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8; ++ RExC_orig_utf8 = RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8; + +- RExC_precomp = exp; + DEBUG_r({ + if (!PL_colorset) reginitcolors(); + PerlIO_printf(Perl_debug_log, "%sCompiling REx%s `%s%*s%s'\n", + PL_colors[4],PL_colors[5],PL_colors[0], +- (int)(xend - exp), RExC_precomp, PL_colors[1]); ++ (int)(xend - exp), exp, PL_colors[1]); + }); ++ ++redo_first_pass: ++ RExC_precomp = exp; + RExC_flags = pm->op_pmflags; + RExC_sawback = 0; + +@@ -1783,6 +1787,17 @@ + RExC_precomp = Nullch; + return(NULL); + } ++ if (RExC_utf8 && !RExC_orig_utf8) { ++ STRLEN len = xend-exp; ++ DEBUG_r(PerlIO_printf(Perl_debug_log, ++ "UTF8 mismatch! Converting to utf8 for resizing and compile\n")); ++ exp = (char*)Perl_bytes_to_utf8(aTHX_ (U8*)exp, &len); ++ xend = exp + len; ++ RExC_orig_utf8 = RExC_utf8; ++ SAVEFREEPV(exp); ++ goto redo_first_pass; ++ } ++ diff --git a/source/base/perl/FrugalBuild b/source/base/perl/FrugalBuild index e92c797..517cf85 100644 --- a/source/base/perl/FrugalBuild +++ b/source/base/perl/FrugalBuild @@ -4,8 +4,8 @@ pkgname=perl pkgver=5.8.8 -pkgrel=4 -pkgdesc="Practical Extraction and Report Language" +pkgrel=5 +pkgdesc="Practical Extraction and Report Language." url="http://www.perl.org/" depends=('gdbm' 'db>=4.6.18') rodepends=('udev') @@ -14,33 +14,34 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.cpan.org/src/README.html|grep stable|sed -n 's/.*s \(.*\)\. T.*/\1/;1 p'" source=(http://www.cpan.org/src/5.0/$pkgname-$pkgver.tar.bz2 \ $pkgname.install libnet.cfg perl-5.8.6-picdl.patch0 \ - perl-5.8.8-gcc-4.2.patch) + perl-5.8.8-gcc-4.2.patch CVE-2007-5116.diff) sha1sums=('4aab490040727ca4419098720eca2ba4367df539' \ '384b7620e9758245db64190138011fc5e9f51956' \ '92179e28215bf7b802ded72e0ca6e473a21f5003' \ '3000bd0130ed20e0ff5d9fb0147240e3909473a7' \ - '41aa378ab49869a4964acea882f47a3a8b826357') + '41aa378ab49869a4964acea882f47a3a8b826357' \ + '1673fa5c8747cb31ebeadb60237348a641f74236') build() { unset MAKEFLAGS - cd $startdir/src/$pkgname-$pkgver - Fpatch $pkgname-$pkgver-gcc-4.2.patch || return 1 + Fpatch $pkgname-$pkgver-gcc-4.2.patch + Fpatch CVE-2007-5116.diff # Fpatch $pkgname-$pkgver.patch || return 1 - [ "$CARCH" == "x86_64" ] && (Fpatch perl-5.8.6-picdl.patch0 || return 1) - ./Configure -de -Dprefix=/usr -Dinstallprefix=$startdir/pkg/usr \ + [ "$CARCH" == "x86_64" ] && (Fpatch perl-5.8.6-picdl.patch0) + ./Configure -de -Dprefix=/usr -Dinstallprefix=${Fdestdir}/usr \ -Dman1dir=/usr/man/man1 -Dman3dir=/usr/man/man3 \ -Dcccdlflags='-fPIC' -Doptimize="$CFLAGS" -Dusethreads - make || return 1 + make || Fdie make install - (cd $startdir/pkg/usr/bin; mv perl$pkgver perl; ln -sf c2ph pstruct) - (cd $startdir/pkg/usr/bin; ln -sf s2p psed) - (cd $startdir/pkg/usr/lib/perl5; mv $pkgver current) - (cd $startdir/pkg/usr/lib/perl5/site_perl; mv $pkgver current) - find $startdir/pkg -type f | xargs grep -l "$startdir/pkg" | \ - xargs -n1 perl -i -p -e "s|$startdir/pkg||g;" - cp $startdir/src/libnet.cfg $startdir/pkg/usr/lib/perl5/current/Net/ + (cd ${Fdestdir}/usr/bin; mv perl$pkgver perl; ln -sf c2ph pstruct) + (cd ${Fdestdir}/usr/bin; ln -sf s2p psed) + (cd ${Fdestdir}/usr/lib/perl5; mv $pkgver current) + (cd ${Fdestdir}/usr/lib/perl5/site_perl; mv $pkgver current) + find ${Fdestdir} -type f | xargs grep -l "${Fdestdir}" | \ + xargs -n1 perl -i -p -e "s|${Fdestdir}||g;" + cp ${Fsrcdir}/libnet.cfg ${Fdestdir}/usr/lib/perl5/current/Net/ } # optimization OK From crazy at frugalware.org Sun Nov 11 22:12:53 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 22:12:55 2007 Subject: [Frugalware-git] frugalware-current: mono-1.2.5.2-1-i686 Message-ID: <20071111211253.DC52711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=37728b10813e19f214f7f9320986483841461474 commit 37728b10813e19f214f7f9320986483841461474 Author: crazy Date: Sun Nov 11 22:02:08 2007 +0100 mono-1.2.5.2-1-i686 * [SEC] Version bump * closes #2564 in -current diff --git a/source/devel/mono/FrugalBuild b/source/devel/mono/FrugalBuild index 7b2b9aa..28de8cc 100644 --- a/source/devel/mono/FrugalBuild +++ b/source/devel/mono/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=mono -pkgver=1.2.5.1 +pkgver=1.2.5.2 pkgrel=1 pkgdesc="Mono runtime and class libraries, a C# compiler/interpreter" url="http://www.mono-project.com/" @@ -15,7 +15,7 @@ Finclude mono up2date="lynx -dump http://www.go-mono.com/sources-stable/|grep -m1 'mono-'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2 rc.mono rc.mono-hu.po) Fconfopts="$Fconfopts --with-tls=__thread --with-libgdiplus=installed" -sha1sums=('c5f843cfdbb1d0114059c7d2d9ba2477529d22a8' \ +sha1sums=('006a9e2e6a5abc09a01a9eb65af4b39a1f683701' \ '143399121fac3d5dc47fb07e8dec4ded182a14bd' \ '6c19f98462d7bb1ecba79a3ad284ea02a1eac2ec') From crazy at frugalware.org Sun Nov 11 22:42:31 2007 From: crazy at frugalware.org (crazy) Date: Sun Nov 11 22:42:33 2007 Subject: [Frugalware-git] frugalware-current: monodevelop-0.17-1-i686 Message-ID: <20071111214231.A5E6211901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46be4d83452d284181e0755cbcc9b5daff99bac5 commit 46be4d83452d284181e0755cbcc9b5daff99bac5 Author: crazy Date: Sun Nov 11 22:40:39 2007 +0100 monodevelop-0.17-1-i686 * Version bump diff --git a/source/gnome-extra/monodevelop/FrugalBuild b/source/gnome-extra/monodevelop/FrugalBuild index e075708..52257fd 100644 --- a/source/gnome-extra/monodevelop/FrugalBuild +++ b/source/gnome-extra/monodevelop/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: AlexExtreme pkgname=monodevelop -pkgver=0.16 -pkgrel=3 +pkgver=0.17 +pkgrel=1 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.9' 'ikvm' 'boo' 'gnome-sharp') + 'mono-tools>=1.2.4-2' 'firefox=2.0.0.9' 'ikvm' 'boo' 'gnome-sharp' 'mono>=1.2.5.2') makedepends=('intltool') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('scriptlet' 'force') _F_gnome_desktop=y _F_gnome_mime=y Finclude gnome-scriptlet mono -sha1sums=('d1fffaa28c68f566517c3ed9b882ebc23ffa72c6' \ +sha1sums=('012fb18ed4b7cb2ffdf743b7a734a1a4381de976' \ '719b456cee8e5e2b4cf3778915464c191f246d98' \ '7e138cb136265162cdaf86520c4781b6ff2b9192' \ 'db0fe450ef76f83853179bd0fd557f408175c3ee') From vmiklos at frugalware.org Mon Nov 12 01:35:51 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 01:35:56 2007 Subject: [Frugalware-git] pacman-g2: libpacman/trans.c: add one missing include Message-ID: <20071112003551.67A3211901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4640aa07d4722495996b9ae9cc3b2b36e264e59d commit 4640aa07d4722495996b9ae9cc3b2b36e264e59d Author: Miklos Vajna Date: Mon Nov 12 01:22:45 2007 +0100 libpacman/trans.c: add one missing include diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c index ac69a4c..105a045 100644 --- a/lib/libpacman/trans.c +++ b/lib/libpacman/trans.c @@ -37,6 +37,7 @@ #include "add.h" #include "remove.h" #include "sync.h" +#include "cache.h" #include "pacman.h" static int check_oldcache() From vmiklos at frugalware.org Mon Nov 12 01:35:51 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 01:35:58 2007 Subject: [Frugalware-git] pacman-g2: develconf: disable asciidoc, too Message-ID: <20071112003551.A447E11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=6a810e571d9fc6a78132f5503a31923c7a54a500 commit 6a810e571d9fc6a78132f5503a31923c7a54a500 Author: Miklos Vajna Date: Mon Nov 12 01:22:55 2007 +0100 develconf: disable asciidoc, too diff --git a/develconf b/develconf index 3e86c08..920f45a 100644 --- a/develconf +++ b/develconf @@ -2,4 +2,4 @@ ./configure --enable-werror --enable-debug --disable-doxygen --disable-fakeroot \ --disable-po4a --disable-python --disable-perl --disable-java --disable-csharp \ - --prefix=/usr + --prefix=/usr --disable-asciidoc From vmiklos at frugalware.org Mon Nov 12 01:35:51 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 01:35:58 2007 Subject: [Frugalware-git] pacman-g2: _pacman_sortbydeps(): use topological sort Message-ID: <20071112003551.E33F311901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0700a6a31bfb119778cc71ffad5d123b1f37be95 commit 0700a6a31bfb119778cc71ffad5d123b1f37be95 Author: Miklos Vajna Date: Mon Nov 12 01:25:24 2007 +0100 _pacman_sortbydeps(): use topological sort - this is a port of commit 544bcbe6641bb94a429a9c149893bc0b07fd2619 of pacman.git - original author: Nagy Gabor - note that his commit uses less memory than the original one diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c index 443c9ae..46c94d3 100644 --- a/lib/libpacman/deps.c +++ b/lib/libpacman/deps.c @@ -45,6 +45,22 @@ extern pmhandle_t *handle; +static pmgraph_t *_pacman_graph_new(void) +{ + pmgraph_t *graph = NULL; + + graph = (pmgraph_t *)malloc(sizeof(pmgraph_t)); + memset(graph, 0, sizeof(pmgraph_t)); + return(graph); +} + +static void _pacman_graph_free(void *data) +{ + pmgraph_t *graph = data; + FREELISTPTR(graph->children); + FREE(graph); +} + pmdepmissing_t *_pacman_depmiss_new(const char *target, unsigned char type, unsigned char depmod, const char *depname, const char *depversion) { @@ -102,69 +118,76 @@ int _pacman_depmiss_isin(pmdepmissing_t *needle, pmlist_t *haystack) pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode) { pmlist_t *newtargs = NULL; - pmlist_t *i, *j, *k, *l; - int change = 1; - int numscans = 0; - int numtargs = 0; + pmlist_t *i, *j, *k; + pmlist_t *vertices = NULL; + pmlist_t *vptr; + pmgraph_t *vertex; if(targets == NULL) { return(NULL); } + _pacman_log(PM_LOG_DEBUG, _("started sorting dependencies")); + + /* We create the vertices */ for(i = targets; i; i = i->next) { - newtargs = _pacman_list_add(newtargs, i->data); - numtargs++; + pmgraph_t *vertex = _pacman_graph_new(); + vertex->data = (void *)i->data; + vertices = _pacman_list_add(vertices, vertex); } - _pacman_log(PM_LOG_DEBUG, _("started sorting dependencies")); - while(change) { - pmlist_t *tmptargs = NULL; - change = 0; - if(numscans > sqrt(numtargs)) { - _pacman_log(PM_LOG_DEBUG, _("possible dependency cycle detected")); - continue; + /* We compute the edges */ + for(i = vertices; i; i = i->next) { + pmgraph_t *vertex_i = i->data; + pmpkg_t *p_i = vertex_i->data; + /* TODO this should be somehow combined with _pacman_checkdeps */ + for(j = vertices; j; j = j->next) { + pmgraph_t *vertex_j = j->data; + pmpkg_t *p_j = vertex_j->data; + int child = 0; + for(k = _pacman_pkg_getinfo(p_i, PM_PKG_DEPENDS); k && !child; k = k->next) { + pmdepend_t depend; + _pacman_splitdep(k->data, &depend); + child = _pacman_depcmp(p_j, &depend); + } + if(child) { + vertex_i->children = _pacman_list_add(vertex_i->children, vertex_j); + } } - numscans++; - /* run thru targets, moving up packages as necessary */ - for(i = newtargs; i; i = i->next) { - pmpkg_t *p = (pmpkg_t*)i->data; - for(j = _pacman_pkg_getinfo(p, PM_PKG_DEPENDS); j; j = j->next) { - pmdepend_t dep; - pmpkg_t *q = NULL; - if(_pacman_splitdep(j->data, &dep)) { - continue; - } - /* look for dep.name -- if it's farther down in the list, then - * move it up above p - */ - for(k = i->next; k; k = k->next) { - q = (pmpkg_t *)k->data; - if(!strcmp(dep.name, q->name)) { - if(!_pacman_pkg_isin(q->name, tmptargs)) { - change = 1; - tmptargs = _pacman_list_add(tmptargs, q); - } - break; - } - if(!change) { - for(l = _pacman_pkg_getinfo(q, PM_PKG_PROVIDES); l; l = l->next) { - if(!strcmp(dep.name, (char*)l->data)) { - if(!_pacman_pkg_isin((char*)l->data, tmptargs)) { - change = 1; - tmptargs = _pacman_list_add(tmptargs, q); - } - break; - } - } - } - } + vertex_i->childptr = vertex_i->children; + } + + vptr = vertices; + vertex = vertices->data; + while(vptr) { + /* mark that we touched the vertex */ + vertex->state = -1; + int found = 0; + while(vertex->childptr && !found) { + pmgraph_t *nextchild = (vertex->childptr)->data; + vertex->childptr = (vertex->childptr)->next; + if (nextchild->state == 0) { + found = 1; + nextchild->parent = vertex; + vertex = nextchild; + } else if(nextchild->state == -1) { + _pacman_log(PM_LOG_DEBUG, _("dependency cycle detected")); } - if(!_pacman_pkg_isin(p->name, tmptargs)) { - tmptargs = _pacman_list_add(tmptargs, p); + } + if(!found) { + newtargs = _pacman_list_add(newtargs, vertex->data); + /* mark that we've left this vertex */ + vertex->state = 1; + vertex = vertex->parent; + if(!vertex) { + vptr = vptr->next; + while(vptr) { + vertex = vptr->data; + if (vertex->state == 0) break; + vptr = vptr->next; + } } } - FREELISTPTR(newtargs); - newtargs = tmptargs; } _pacman_log(PM_LOG_DEBUG, _("sorting dependencies finished")); @@ -176,6 +199,8 @@ pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode) newtargs = tmptargs; } + _FREELIST(vertices, _pacman_graph_free); + return(newtargs); } diff --git a/lib/libpacman/deps.h b/lib/libpacman/deps.h index 7b483dd..9af72bc 100644 --- a/lib/libpacman/deps.h +++ b/lib/libpacman/deps.h @@ -38,6 +38,14 @@ typedef struct __pmdepmissing_t { pmdepend_t depend; } pmdepmissing_t; +typedef struct __pmgraph_t { + int state; /* 0: untouched, -1: entered, other: leaving time */ + void *data; + struct __pmgraph_t *parent; /* where did we come from? */ + pmlist_t *children; + pmlist_t *childptr; /* points to a child in children list */ +} pmgraph_t; + pmdepmissing_t *_pacman_depmiss_new(const char *target, unsigned char type, unsigned char depmod, const char *depname, const char *depversion); int _pacman_depmiss_isin(pmdepmissing_t *needle, pmlist_t *haystack); From vmiklos at frugalware.org Mon Nov 12 01:35:52 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 01:35:59 2007 Subject: [Frugalware-git] pacman-g2: get rid of math.h in libpacman/deps.c Message-ID: <20071112003552.017A011901C4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4bb7ba1ceaf0e7eb0805938eceb5c596b409ddb6 commit 4bb7ba1ceaf0e7eb0805938eceb5c596b409ddb6 Author: Miklos Vajna Date: Mon Nov 12 01:26:03 2007 +0100 get rid of math.h in libpacman/deps.c diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c index 46c94d3..0012e8a 100644 --- a/lib/libpacman/deps.c +++ b/lib/libpacman/deps.c @@ -28,7 +28,6 @@ #include #endif #include -#include /* pacman-g2 */ #include "config.h" #include "util.h" From vmiklos at frugalware.org Mon Nov 12 01:40:13 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 01:40:14 2007 Subject: [Frugalware-git] frugalware-0.7: kernel-2.6.22-7sayshell2-i686 Message-ID: <20071112004013.4CE7611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=185628b91ff7c17febba018f9e21e22c40034799 commit 185628b91ff7c17febba018f9e21e22c40034799 Author: Miklos Vajna Date: Mon Nov 12 01:39:40 2007 +0100 kernel-2.6.22-7sayshell2-i686 update to patchlevel '12' closes #2562 diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index b092b29..a73b29c 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -7,4 +7,4 @@ _F_kernel_patches=(aacraid.diff pxa27x.diff CVE-2007-3843.diff \ Finclude kernel # you can safely bump this. on the first bump you MUST rebuild all the external # kernel modules so that they will have >=-styled deps instead of the = ones -pkgrel=7sayshell1 +pkgrel=7sayshell2 diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 1a6cb47..e872c55 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -18,4 +18,4 @@ # don't touch these! _F_kernelver_ver=2.6.22 _F_kernelver_rel=6 -_F_kernelver_stable=10 +_F_kernelver_stable=12 From priyank at frugalware.org Mon Nov 12 07:27:26 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 12 07:27:28 2007 Subject: [Frugalware-git] gfpm: gfpm.glade: fixed a bug where the name of the repo was displayed twice in the repo combobox Message-ID: <20071112062726.49C7E11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=2ad7c641899a4ee9c2726142a99f8a0e78b24aa1 commit 2ad7c641899a4ee9c2726142a99f8a0e78b24aa1 Author: Priyank Date: Mon Nov 12 11:57:12 2007 +0530 gfpm.glade: fixed a bug where the name of the repo was displayed twice in the repo combobox diff --git a/data/gfpm.glade b/data/gfpm.glade index 1384a52..a1eddbe 100644 --- a/data/gfpm.glade +++ b/data/gfpm.glade @@ -284,7 +284,7 @@ True - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False From vmiklos at frugalware.org Mon Nov 12 10:33:23 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 10:33:26 2007 Subject: [Frugalware-git] homepage-ng: FSA315-kernel Message-ID: <20071112093323.4C9E811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=a642e1a593a8b1d9c075b9a0d54768a02d8156ea commit a642e1a593a8b1d9c075b9a0d54768a02d8156ea Author: Miklos Vajna Date: Mon Nov 12 10:33:18 2007 +0100 FSA315-kernel diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index d6d3487..272ecb7 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,18 @@ + 315 + 2007-11-12 + vmiklos + kernel + 2.6.22-7sayshell1 + 2.6.22-7sayshell2 + http://bugs.frugalware.org/task/2562 + CVE-2007-4997 + A vulnerability has been reported in the Linux Kernel, which can be exploited by malicious people to cause a DoS (Denial of Service). + The vulnerability is caused due to an off-by-two error within the function "ieee80211_rx()" in net/ieee80211/ieee80211_rx.c. This can be exploited to cause a kernel panic by sending a specially crafted ieee80211 frame with the IEEE80211_STYPE_QOS_DATA flag set to an affected system. + + 314 2007-11-02 voroskoi From vmiklos at frugalware.org Mon Nov 12 11:54:12 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 11:54:18 2007 Subject: [Frugalware-git] frugalware-current: kvm-51-1-i686 Message-ID: <20071112105412.68F4911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34607cccfb1754472271e117bfd71041c3b68258 commit 34607cccfb1754472271e117bfd71041c3b68258 Author: Miklos Vajna Date: Mon Nov 12 11:42:43 2007 +0100 kvm-51-1-i686 version bump, we no longer have to use an ancient version because of 2.6.22 diff --git a/source/xapps-extra/kvm/FrugalBuild b/source/xapps-extra/kvm/FrugalBuild index 680a8a9..15f1d23 100644 --- a/source/xapps-extra/kvm/FrugalBuild +++ b/source/xapps-extra/kvm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=kvm -pkgver=35 +pkgver=51 pkgrel=1 pkgdesc="KVM is a kernel based virtual machine" url="http://kvm.sourceforge.net" @@ -11,15 +11,13 @@ archs=('i686') Finclude sourceforge kernel-version depends=("kernel>=$_F_kernelver_ver" 'sdl' 'zlib') makedepends=("kernel-source>=$_F_kernelver_ver" 'gcc-3.3') -sha1sums=('5e20b856915091c2eb9da2adf47ef95cf6346e8b') +sha1sums=('25423f8ade5203d9b3b63ae72dd7ecd30dfe597a') Fconfopts="--prefix=$Fprefix" # no changelog in the tarball, you can reach it here: # http://kvm.qumranet.com/kvmwiki/ChangeLog build() { - # i?86 is i386, NOT x86_64.. - Fsed 'echo x86_64' 'echo i386' configure Fsed 'datadir="$prefix/share/qemu"' 'datadir="$prefix/share/qemu-kvm"' \ qemu/configure Fconf --with-patched-kernel --qemu-cc="/usr/bin/gcc-3.3" @@ -29,6 +27,9 @@ build() { Fmakeinstall KERNELDIR=/usr/src/linux Frm /usr/include/linux - Fmv /usr/bin/qemu /usr/bin/qemu-kvm + # this hardwired x86_64 is so misleading.. + Fmv /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm Fmv /usr/bin/qemu-img /usr/bin/qemu-img-kvm } + +# optimization OK From vmiklos at frugalware.org Mon Nov 12 11:54:57 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 11:54:59 2007 Subject: [Frugalware-git] pacman-tools: dg: use return instead of exit in push/pull in several cases Message-ID: <20071112105457.D945E11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=8c612809d16b54723e99255a0924e27e8cbba1ba commit 8c612809d16b54723e99255a0924e27e8cbba1ba Author: Miklos Vajna Date: Mon Nov 12 11:51:36 2007 +0100 dg: use return instead of exit in push/pull in several cases this allows us to call these functions within dg diff --git a/darcs-git.py b/darcs-git.py index 54a925f..868ece9 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -573,11 +573,11 @@ Options: if ret == "y": break if ret in ("n", "q"): - sys.exit(0) + return(0) print "Invalid response, try again!" ret = os.system("git push %s" % options.gitopts) if ret: - sys.exit(1) + return(1) else: os.system("git push --tags") @@ -630,18 +630,18 @@ Options: if ret == "y": break if ret in ("n", "q"): - sys.exit(0) + return(0) print "Invalid response, try again!" if os.system("git diff-index --quiet --cached HEAD && git diff-files --quiet") != 0: changes = True if os.system("git stash") != 0: - sys.exit(1) + return(1) else: changes = False if os.system("git rebase %s" % options.gitopts) != 0: - sys.exit(1) + return(1) if changes and os.system("git stash apply --index && sed -i '$d' `git rev-parse --show-cdup`.git/logs/refs/stash") != 0: - sys.exit(1) + return(1) def get(argv): def usage(ret): @@ -805,35 +805,38 @@ PURPOSE.""" % __version__ if sys.argv[1][:4] != "chan": os.environ['GIT_PAGER'] = 'cat' if sys.argv[1][:3] == "rec": - record(argv[1:]) + return record(argv[1:]) elif sys.argv[1][:3] == "rev": - revert(argv[1:]) + return revert(argv[1:]) elif sys.argv[1][:4] == "what": - whatsnew(argv[1:]) + return whatsnew(argv[1:]) elif sys.argv[1][:4] == "chan": - changes(argv[1:]) + return changes(argv[1:]) elif sys.argv[1] == "push": - push(argv[1:]) + return push(argv[1:]) elif sys.argv[1] == "pull": - pull(argv[1:]) + return pull(argv[1:]) elif sys.argv[1] == "get": - get(argv[1:]) + return get(argv[1:]) elif sys.argv[1] == "tag": - tag(argv[1:]) + return tag(argv[1:]) elif sys.argv[1][:4] == "roll": - rollback(argv[1:]) + return rollback(argv[1:]) elif sys.argv[1][:5] == "unrec": - unrecord(argv[1:]) + return unrecord(argv[1:]) elif sys.argv[1] == "unpull": - unpull(argv[1:]) + return unpull(argv[1:]) elif sys.argv[1][:3] == "opt": - optimize(argv[1:]) + return optimize(argv[1:]) elif sys.argv[1] == "check": - check(argv[1:]) + return check(argv[1:]) elif sys.argv[1][:5] == "track": - trackdown(argv[1:]) + return trackdown(argv[1:]) else: - os.system("git %s" % " ".join(argv)) + return os.system("git %s" % " ".join(argv)) if __name__ == "__main__": - main(sys.argv[1:]) + if main(sys.argv[1:]) != 0: + sys.exit(1) + else: + sys.exit(0) From vmiklos at frugalware.org Mon Nov 12 11:54:57 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 11:55:00 2007 Subject: [Frugalware-git] pacman-tools: dg push: try to automatically pull() if push() failed Message-ID: <20071112105457.F067011901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=2dd3fea0bc2814a1412d619836f2e5b6963b36a5 commit 2dd3fea0bc2814a1412d619836f2e5b6963b36a5 Author: Miklos Vajna Date: Mon Nov 12 11:54:42 2007 +0100 dg push: try to automatically pull() if push() failed diff --git a/darcs-git.py b/darcs-git.py index 868ece9..3a0056b 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -577,9 +577,12 @@ Options: print "Invalid response, try again!" ret = os.system("git push %s" % options.gitopts) if ret: - return(1) - else: - os.system("git push --tags") + ret = pull(['-a']) + if not ret: + ret = os.system("git push %s" % options.gitopts) + if ret: + return(1) + os.system("git push --tags") def pull(argv): def usage(ret): From vmiklos at frugalware.org Mon Nov 12 12:04:20 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 12:04:23 2007 Subject: [Frugalware-git] frugalware-current: findutils-4.3.9-1-i686 Message-ID: <20071112110420.9C06E11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b71d36108e97fa6bcd39578ad63b4deb2707c14 commit 2b71d36108e97fa6bcd39578ad63b4deb2707c14 Author: Miklos Vajna Date: Mon Nov 12 12:04:11 2007 +0100 findutils-4.3.9-1-i686 version bump diff --git a/source/base/findutils/FrugalBuild b/source/base/findutils/FrugalBuild index 65247ea..159ed12 100644 --- a/source/base/findutils/FrugalBuild +++ b/source/base/findutils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=findutils -pkgver=4.3.8 +pkgver=4.3.9 pkgrel=1 pkgdesc="Basic directory searching utilities" url="http://www.gnu.org/software/findutils" From vmiklos at frugalware.org Mon Nov 12 12:36:43 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 12:36:47 2007 Subject: [Frugalware-git] frugalware-current: agraph-2.2.4-1-i686 Message-ID: <20071112113643.203F911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b91c6b13ee9167b36f88e44695c82ead6d14d0a1 commit b91c6b13ee9167b36f88e44695c82ead6d14d0a1 Author: Miklos Vajna Date: Mon Nov 12 12:36:30 2007 +0100 agraph-2.2.4-1-i686 version bump diff --git a/source/apps-extra/agraph/FrugalBuild b/source/apps-extra/agraph/FrugalBuild index e60f38d..dbfee5c 100644 --- a/source/apps-extra/agraph/FrugalBuild +++ b/source/apps-extra/agraph/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=agraph -pkgver=2.2 +pkgver=2.2.4 pkgrel=1 pkgdesc="AllegroGraph Free Java Edition" url="http://www.franz.com/products/allegrograph/index.lhtml" @@ -10,9 +10,9 @@ rodepends=('j2re') makedepends=('rpm' 'cpio') groups=('apps-extra') archs=('i686') -up2date="lynx -dump $url|grep ' V'|sed 's/.* V\(.*\) .*/\1/;q'" +up2date="lynx -dump http://franz.com/products/allegrograph/download/dist/download|grep -2 'Change Log'|sed -n 's/.* \([0-9.]\+\) .*/\1/;$ p'" source=(http://www.franz.com/products/allegrograph/download/dist-sa/linux86.1/agraph-$pkgver-$pkgrel.i386.rpm) -sha1sums=('a0fc2b23ed2efa66d21659e52b1246fe78ad37ae') +sha1sums=('8fa5a77cadd615ac6b3200eeef555346dbe4f99c') options=('nobuild') build() From vmiklos at frugalware.org Mon Nov 12 12:45:34 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 12:45:37 2007 Subject: [Frugalware-git] pacman-tools: dg: if there are no changes to pull/push, that's not an error Message-ID: <20071112114534.CC03711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=5176b4b51669e9f308828f2cba5c4c7475e23465 commit 5176b4b51669e9f308828f2cba5c4c7475e23465 Author: Miklos Vajna Date: Mon Nov 12 12:42:06 2007 +0100 dg: if there are no changes to pull/push, that's not an error diff --git a/darcs-git.py b/darcs-git.py index 3a0056b..f186f3e 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -565,7 +565,7 @@ Options: ret = sock.close() if not len(lines): print "No recorded local changes to push!" - return + return 0 print "".join(lines) if not options.all: while True: @@ -625,7 +625,7 @@ Options: ret = sock.close() if not len(lines): print "No remote changes to pull!" - return + return 0 print "".join(lines) if not options.all: while True: From vmiklos at frugalware.org Mon Nov 12 13:01:00 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 13:01:04 2007 Subject: [Frugalware-git] pacman-tools: repoman: less error handling, now dg detects conflicts on push/pull Message-ID: <20071112120100.281D011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=f631c1734657f30c0423d724e8a2948408b76410 commit f631c1734657f30c0423d724e8a2948408b76410 Author: Miklos Vajna Date: Mon Nov 12 13:00:53 2007 +0100 repoman: less error handling, now dg detects conflicts on push/pull diff --git a/repoman b/repoman index 764240e..bcc2f30 100755 --- a/repoman +++ b/repoman @@ -161,8 +161,6 @@ fpmmerge() die "rsync failed! :/" fi # now push - dg pull -a || die 'dg pull failed' - git diff|grep -q -- 'diff --cc' && die 'detected conflicts' dg push -a # finally run repoman cl for each for i in `$0 -t $1 ls /frugalware-$arch/ 2>/dev/null|sed 's/-[^-]\+-[^-]\+-[^-]\+$//'` @@ -425,7 +423,7 @@ sync() opts="" fi if [ "$F_makepkg_scm" = "git" ]; then - cmd="dg pull $opts || (git diff|grep -q -- 'diff --cc' && echo 'detected conflicts'; die 'dg pull failed'); dg push $opts" + cmd="dg push $opts" else cmd="darcs push --match 'name $modpkgname' $opts" fi From vmiklos at frugalware.org Mon Nov 12 13:11:49 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Nov 12 13:11:50 2007 Subject: [Frugalware-git] frugalware-current: gnokii-0.6.21-1-i686 Message-ID: <20071112121149.44DE711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=923ab0ffb1a91749a8c5cdfe04e0118b6ce81d6f commit 923ab0ffb1a91749a8c5cdfe04e0118b6ce81d6f Author: Miklos Vajna Date: Mon Nov 12 13:11:43 2007 +0100 gnokii-0.6.21-1-i686 version bump diff --git a/source/xapps/gnokii/FrugalBuild b/source/xapps/gnokii/FrugalBuild index 441409f..d30f95c 100644 --- a/source/xapps/gnokii/FrugalBuild +++ b/source/xapps/gnokii/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=gnokii -pkgver=0.6.20 -pkgrel=2 +pkgver=0.6.21 +pkgrel=1 pkgdesc="Tools and user space driver for use with mobile phones" url="http://www.gnokii.org/" backup=(etc/gnokiirc) @@ -13,7 +13,7 @@ groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump $url/download/gnokii/ | grep ]gnokii | sed -n -e 's/.*gnokii-\(.*\)\.tar\.bz2.*/\1/' -e '1 p'" source=(http://gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2) -sha1sums=('6c51477d7e1358020ff52274f78a6dc595429d22') +sha1sums=('01d2c3e2f554088227ed62af97eaa3bceb7bb838') subpkgs=($pkgname-{mysql,pq}) subdescs=('MySQL support for gnokii.' 'PostgreSQL support for gnokii.') From priyank at frugalware.org Mon Nov 12 14:23:41 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 12 14:23:43 2007 Subject: [Frugalware-git] gfpm: Version bump to 1.0.4 Message-ID: <20071112132341.A266B11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=320c4a225f99749c76c9319201bcef99a3bda9f8 commit 320c4a225f99749c76c9319201bcef99a3bda9f8 Author: Priyank Date: Mon Nov 12 18:53:30 2007 +0530 Version bump to 1.0.4 diff --git a/configure.ac b/configure.ac index d9465bf..16831c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) -AC_INIT([Gfpm], 1.0.3, [priyankmg@gmail.com], gfpm) +AC_INIT([Gfpm], 1.0.4, [priyankmg@gmail.com], gfpm) AC_DEFINE_UNQUOTED([GFPM_RELEASE_NAME], ["Triton"], [Release codenames]) AC_CONFIG_SRCDIR([src/gfpm.c]) AC_LANG(C) From priyank at frugalware.org Mon Nov 12 14:24:03 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 12 14:24:04 2007 Subject: [Frugalware-git] gfpm: updates for 1.0.4 Message-ID: <20071112132403.2ACB911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=cbaef5bc7c3aa2c131185ad7a97d2a8da5954740 commit cbaef5bc7c3aa2c131185ad7a97d2a8da5954740 Author: Priyank Date: Mon Nov 12 18:53:54 2007 +0530 updates for 1.0.4 diff --git a/NEWS b/NEWS index 774cff0..928b895 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,18 @@ VERSION DESCRIPTION --------------------------------------------------------------------------------------------------------- +1.0.4 - New splash screen + - Added some operations to a package's right click popup menu like + Mark for Removal (for installed packages) + Mark for Installation (for packages not installed) + Reinstall package (for installed packages) + - Implemented hicolor iconcache directory monitor that updates the + hicolor iconcache automatically when a package installs some icons + in hicolor iconcache directory. This fixes the problem of missing + icons in some apps after installing a package. + - If a commit fails due to corrupted file(s), display the list of file(s) + - Fixed a crash when searching in installed packages + - Reorganized code + - Minor UI tweaks 1.0.3 - Added a quick pane to enable user to quickly install/remove/ upgrade packages quickly - Package info now also displays the Changelog of the packages From priyank at frugalware.org Mon Nov 12 14:24:26 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 12 14:24:28 2007 Subject: [Frugalware-git] gfpm: TAG 1.0.4 Message-ID: <20071112132426.C6F0F11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=b13e1409adb84e47170fce98b33c42d58438c1c5 commit b13e1409adb84e47170fce98b33c42d58438c1c5 Author: Priyank Date: Mon Nov 12 18:54:14 2007 +0530 TAG 1.0.4 From priyank at frugalware.org Mon Nov 12 14:46:29 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 12 14:46:33 2007 Subject: [Frugalware-git] frugalware-current: gfpm-1.0.4-1-i686 Message-ID: <20071112134629.DB50211901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0c2715270bb74309f1ad8f3af3ba273a1a4a19d commit f0c2715270bb74309f1ad8f3af3ba273a1a4a19d Author: Priyank Date: Mon Nov 12 19:15:24 2007 +0530 gfpm-1.0.4-1-i686 * Version bump * Removed gfpm-1.0.3-crashfix.diff (Fixed in upstream) diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild index 6f5ba2a..77377f9 100644 --- a/source/xapps/gfpm/FrugalBuild +++ b/source/xapps/gfpm/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=gfpm -pkgver=1.0.3 -pkgrel=2 +pkgver=1.0.4 +pkgrel=1 pkgdesc="Graphical Frugalware Package Manager" url="http://ftp.frugalware.org/pub/other/gfpm" -depends=('glib2' 'gtk+2' 'libglade' 'pacman-g2') +depends=('glib2' 'gtk+2' 'libglade' 'pacman-g2' 'inotify-tools') makedepends=('pkgconfig' 'intltool') groups=('xapps') replaces=('frugalpkg') @@ -14,8 +14,8 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet up2date="lynx -dump $url | Flasttar" -source=($url/$pkgname-$pkgver.tar.gz $pkgname-$pkgver-crashfix.diff) -signatures=(${source[0]}.asc '') +source=($url/$pkgname-$pkgver.tar.gz) +signatures=(${source[0]}.asc) build() { diff --git a/source/xapps/gfpm/gfpm-1.0.3-crashfix.diff b/source/xapps/gfpm/gfpm-1.0.3-crashfix.diff deleted file mode 100644 index 0b48187..0000000 --- a/source/xapps/gfpm/gfpm-1.0.3-crashfix.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gfpm-1.0.3/src/gfpm-interface.c gfpm-1.0.3.new/src/gfpm-interface.c ---- gfpm-1.0.3/src/gfpm-interface.c 2007-10-02 22:29:50.000000000 +0530 -+++ gfpm-1.0.3.new/src/gfpm-interface.c 2007-10-08 19:03:29.000000000 +0530 -@@ -1401,8 +1401,6 @@ - -1); - pacman_pkg_free (pm_lpkg); - pacman_pkg_free (pm_spkg); -- g_free (v1); -- g_free (v2); - } - while (gtk_events_pending()) - gtk_main_iteration (); From priyank at frugalware.org Mon Nov 12 15:41:23 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 12 15:41:25 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig: added --enable-debug switch to configure Message-ID: <20071112144123.F257011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=cedab0fce450892bc382c945b18bd1895f7b9198 commit cedab0fce450892bc382c945b18bd1895f7b9198 Author: Priyank Date: Mon Nov 12 20:11:12 2007 +0530 gnetconfig: added --enable-debug switch to configure diff --git a/gnetconfig/configure.ac b/gnetconfig/configure.ac index 1b8dae6..b96b4d0 100644 --- a/gnetconfig/configure.ac +++ b/gnetconfig/configure.ac @@ -14,6 +14,9 @@ AC_PROG_CC AC_HEADER_STDC AC_CHECK_HEADERS([locale.h stdlib.h string.h sys/ioctl.h unistd.h libfwnetconfig.h libfwutil.h]) +AC_ARG_ENABLE(debug, + AC_HELP_STRING([ --enable-debug], [Enable debugging support]), [debug="yes"]) + if test "${GCC}" = "yes" then CFLAGS="${CFLAGS} -pipe -Wall" @@ -26,6 +29,20 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [needed for bindtextdoma AM_GLIB_GNU_GETTEXT AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR) +dnl Check for debug enabled or not +AC_MSG_CHECKING(for debug request) +if test "x$debug" = "xyes" ; then + AC_DEFINE(GFPM_DEBUG, 1, [Debug support: enabled]) + CFLAGS="${CFLAGS} -ggdb3 -Wall -DGNETCONFIG_DEBUG" + debug=yes + AC_MSG_RESULT(yes) +else + AC_DEFINE(GFPM_DEBUG, 0, [Debug support: disabled]) + CFLAGS="${CFLAGS} -Wall" + debug=no + AC_MSG_RESULT(no) +fi + pkg_modules="gtk+-2.0 >= 2.6.0 \ libglade-2.0 >= 2.6.0" PKG_CHECK_MODULES([GNETCONFIG], [$pkg_modules]) From voroskoi at frugalware.org Mon Nov 12 16:17:19 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 12 16:17:24 2007 Subject: [Frugalware-git] frugalware-0.7: kdegraphics-3.5.7-3sayshell1-i686 Message-ID: <20071112151719.9CD3A11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=83f5d89c3e2779672a45865a899b7af1e8a62f3c commit 83f5d89c3e2779672a45865a899b7af1e8a62f3c Author: voroskoi Date: Mon Nov 12 16:14:59 2007 +0100 kdegraphics-3.5.7-3sayshell1-i686 secfix relbump, closes #2560 diff --git a/source/kde/kdegraphics/FrugalBuild b/source/kde/kdegraphics/FrugalBuild index c6cca24..e9f7972 100644 --- a/source/kde/kdegraphics/FrugalBuild +++ b/source/kde/kdegraphics/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kdegraphics pkgver=3.5.7 -pkgrel=2 +pkgrel=3sayshell1 pkgdesc="KDE Graphics Programs" groups=('kde') archs=('i686' 'x86_64') @@ -14,7 +14,8 @@ rodepends=('ocrad') _F_kde_split_docs=1 Finclude kde source=($source \ - ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdegraphics-CVE-2007-3387.diff) + ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdegraphics-CVE-2007-3387.diff \ + ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.8-kdegraphics-kpdf.diff) Fconfopts="$Fconfopts --disable-kpdf-drm --with-openexr --with-gphoto2-libraries=/usr/lib \ --with-gphoto2-includes=/usr/include/gphoto2 --with-imlib-config=/usr/bin \ --with-jpeg=/usr/lib --with-tiff=/usr/lib --with-poppler" @@ -26,5 +27,7 @@ subgroups=('kde-extra kde-docs') subarchs=('i686 x86_64') sha1sums=('2b6ca2c27f565b5ca4a40d461db7b4038658b5f3' \ - '64b9823af4c8f975011862e3fb15ef724a6253df') + '64b9823af4c8f975011862e3fb15ef724a6253df' \ + 'fea08298b8f9228ed57ddf0ceffcab12755c1e80') + # optimization OK From priyank at frugalware.org Mon Nov 12 16:21:19 2007 From: priyank at frugalware.org (Priyank) Date: Mon Nov 12 16:21:25 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig-interface: fixed a segfault Message-ID: <20071112152119.9F59011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=bd62d9ba858bdda824993c47fc96a1361dadebf0 commit bd62d9ba858bdda824993c47fc96a1361dadebf0 Author: Priyank Date: Mon Nov 12 20:51:06 2007 +0530 gnetconfig-interface: fixed a segfault * gnetconfig gets the last used profile name from fwnet_parseprofile() and uses strcmp() to compare it with the list of currently available profiles. But, fwnet_parseprofile() might return NULL in case when no profile was used. This might cause gnetconfig to crash on a NULL comparsion. It's better to check the value returned by fwnet_parseprofile() before performing a comparison. diff --git a/gnetconfig/src/gnetconfig-interface.c b/gnetconfig/src/gnetconfig-interface.c index adbe696..5dfc4bd 100644 --- a/gnetconfig/src/gnetconfig-interface.c +++ b/gnetconfig/src/gnetconfig-interface.c @@ -407,6 +407,7 @@ gnetconfig_populate_interface_list (fwnet_profile_t *profile) GdkPixbuf *wired_pixbuf; GdkPixbuf *wireless_pixbuf; gchar *ptr = NULL; + gchar *old_profile = NULL; gboolean flag = FALSE; n_ifs = g_list_length (profile->interfaces); @@ -426,8 +427,10 @@ gnetconfig_populate_interface_list (fwnet_profile_t *profile) wireless_pixbuf = gdk_pixbuf_new_from_file_at_size (ptr, 26, 26, NULL); g_free (ptr); - if ((strcmp(profile->name, fwnet_lastprofile())) == 0) - flag = TRUE; + old_profile = fwnet_lastprofile (); + if (old_profile!=NULL) + if ((strcmp(profile->name, old_profile)) == 0) + flag = TRUE; for (i=0;i Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=a45892d78100f5c332efe72ea0b3635a1167bfe1 commit a45892d78100f5c332efe72ea0b3635a1167bfe1 Author: voroskoi Date: Mon Nov 12 16:24:50 2007 +0100 koffice-1.6.3-3sayshell1-x86_64 secfix relbump, closes #2559 diff --git a/source/kde-extra/koffice/FrugalBuild b/source/kde-extra/koffice/FrugalBuild index 8b7fa9b..365c972 100644 --- a/source/kde-extra/koffice/FrugalBuild +++ b/source/kde-extra/koffice/FrugalBuild @@ -4,7 +4,7 @@ pkgname=koffice pkgver=1.6.3 -pkgrel=2 +pkgrel=3sayshell1 pkgdesc="An integrated Office suite for KDE" url="http://www.koffice.org" depends=('libkexif' 'kdebase>=3.5.7' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ @@ -19,7 +19,8 @@ url="http://www.koffice.org" up2date="lynx -dump http://ftp.gwdg.de/pub/x11/kde/stable|grep 'koffice-'|grep -v latest|sort -n -r|head -n 1|sed -e 's/.*-\(.*\)/\1/' -e 's|/||g'" source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-$pkgver/src/$pkgname-$pkgver.tar.bz2 \ desktop-files.patch \ - ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff) + ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff \ + ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) subpkgs=("$pkgname-docs") subdescs=('Koffice Documentation.') @@ -31,5 +32,6 @@ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" sha1sums=('de84214dec913eac1d47dab04dd93f3d81729fd3' \ 'a5efbe2b1effecde988ef55cf65eebb5d8c95a4a' \ - 'bff4f540389a77320bc87e2dedece50b82932e59') + 'bff4f540389a77320bc87e2dedece50b82932e59' \ + 'a3d1d85567ccf729a2237f4aa837f7e025ce00ae') # optimization OK From voroskoi at frugalware.org Mon Nov 12 17:30:03 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 12 17:30:04 2007 Subject: [Frugalware-git] frugalware-current: seamonkey-1.1.6-1-i686 Message-ID: <20071112163003.0939D11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1a6fc25930983b3984760575364d4b4476572f52 commit 1a6fc25930983b3984760575364d4b4476572f52 Author: voroskoi Date: Mon Nov 12 17:10:09 2007 +0100 seamonkey-1.1.6-1-i686 fix up2date diff --git a/source/xapps-extra/seamonkey/FrugalBuild b/source/xapps-extra/seamonkey/FrugalBuild index 0c2d403..ea51ba1 100644 --- a/source/xapps-extra/seamonkey/FrugalBuild +++ b/source/xapps-extra/seamonkey/FrugalBuild @@ -11,7 +11,7 @@ makedepends=('zip') replaces=('mozilla') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |grep SeaMonkey |sed -ne 's/.*Monkey \(.*\)/\1/;1p'" +up2date="lynx -dump $url |grep SeaMonkey -m4 |sed -ne 's/.*Monkey \(.*\)/\1/;$ p'" source=(http://ftp.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/$pkgname-$pkgver.source.tar.bz2 \ config $pkgname.desktop) From voroskoi at frugalware.org Mon Nov 12 17:43:16 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 12 17:43:18 2007 Subject: [Frugalware-git] frugalware-current: ruby-bdb-0.6.2-1-i686 Message-ID: <20071112164316.11AAB11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24fdfa2cafee4f631d5a0c8a6559b66c85edf249 commit 24fdfa2cafee4f631d5a0c8a6559b66c85edf249 Author: voroskoi Date: Mon Nov 12 17:37:32 2007 +0100 ruby-bdb-0.6.2-1-i686 version bump using new url/source fixed up2date use _F_cd_path instead of build() diff --git a/source/devel-extra/ruby-bdb/FrugalBuild b/source/devel-extra/ruby-bdb/FrugalBuild index fa35ac1..82f64af 100644 --- a/source/devel-extra/ruby-bdb/FrugalBuild +++ b/source/devel-extra/ruby-bdb/FrugalBuild @@ -2,20 +2,18 @@ # Maintainer: voroskoi pkgname=ruby-bdb -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="This is an interface to Berkeley DB for Ruby." -url="http://raa.ruby-lang.org/list.rhtml?name=bdb" +url="http://moulon.inra.fr/ruby/bdb.html" depends=('ruby') groups=('devel-extra') archs=('i686' 'x86_64') -source=(ftp://moulon.inra.fr/pub/ruby/bdb.tar.gz) -up2date="lynx -dump http://raa.ruby-lang.org/list.rhtml?name=bdb |grep version |sed -ne 's/.*n=//;1p'" -sha1sums=('a164997388e06cea0c67621ad138cef05c0df552') - -build() { - Fcd bdb-$pkgver - Fbuild -} +_F_archive_name="bdb" +_F_archive_nosort=1 +up2date="lynx -dump ftp://moulon.inra.fr/pub/ruby/ |Flasttar" +source=(ftp://moulon.inra.fr/pub/ruby/bdb-${pkgver}.tar.gz) +sha1sums=('7be3dfbc5d8769780f6c7a405819d189317c855e') +_F_cd_path="bdb-${pkgver}" # optimization OK From voroskoi at frugalware.org Mon Nov 12 17:59:52 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Nov 12 17:59:55 2007 Subject: [Frugalware-git] frugalware-current: scribus-1.3.4-3-x86_64 Message-ID: <20071112165952.42B9A11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=469a09120943ae279a001e4d11194c89a3c312d1 commit 469a09120943ae279a001e4d11194c89a3c312d1 Author: voroskoi Date: Mon Nov 12 17:55:34 2007 +0100 scribus-1.3.4-3-x86_64 rebuild, s/xespgs/xghostscript/ diff --git a/source/xapps-extra/scribus/FrugalBuild b/source/xapps-extra/scribus/FrugalBuild index 198d232..7d91e1e 100644 --- a/source/xapps-extra/scribus/FrugalBuild +++ b/source/xapps-extra/scribus/FrugalBuild @@ -4,13 +4,13 @@ pkgname=scribus pkgver=1.3.4 -pkgrel=2 +pkgrel=3 pkgdesc="A professional desktop publishing application" url="http://www.scribus.org.uk" depends=('cairo' 'qt' 'cups' 'freetype2>=2.3.5' 'lcms' 'libxml2' 'libstdc++' \ 'libgcc' 'libxau' 'libxdmcp' 'libxcb' 'libgl' 'libxmu' 'libxi' \ 'libice' 'libxxf86vm' 'libdrm' 'libxt' 'libxfixes' 'python>=2.5' \ - 'xespgs' 'libart_lgpl>=2.3.19-2') + 'xghostscript' 'libart_lgpl>=2.3.19-2') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') From crazy at frugalware.org Mon Nov 12 18:23:34 2007 From: crazy at frugalware.org (crazy) Date: Mon Nov 12 18:23:39 2007 Subject: [Frugalware-git] frugalware-current: kpogre-1.5.8-1-i686 Message-ID: <20071112172334.C5CF911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94d21e94aca167c96256b6c637fb4e0dca01559a commit 94d21e94aca167c96256b6c637fb4e0dca01559a Author: crazy Date: Mon Nov 12 18:20:49 2007 +0100 kpogre-1.5.8-1-i686 * Version bump * removed old API patches , both in upstream * added an new patch to get it to compile diff --git a/source/kde-extra/kpogre/FrugalBuild b/source/kde-extra/kpogre/FrugalBuild index 7639a75..352c48a 100644 --- a/source/kde-extra/kpogre/FrugalBuild +++ b/source/kde-extra/kpogre/FrugalBuild @@ -2,18 +2,17 @@ # Maintainer: crazy pkgname=kpogre -pkgver=1.5.4 -pkgrel=4 +pkgver=1.5.8 +pkgrel=1 pkgdesc="A grafical client for PostgreSQL database system for KDE." depends=('kdelibs>=3.5.6' 'libpqxx=2.6.9') groups=('kde-extra') archs=('i686' 'x86_64') _F_kde_defaults=0 Finclude sourceforge kde -source=(${source[@]} desktop_file.patch libpqxx-2.6.9-API.patch libpqxx-2.6.9-headers.patch) -sha1sums=('91579425c21be6e95d037a3e8bf443b89e8168cf'\ - '7e714b084a7a1db28c9935070a0d5c8d7ccb95e3'\ - '5d6226b750d782ced6029953a3e794b3eb477f2b'\ - 'c9e29ae4474bf42baa2118c8ac1a392a6523351a') +source=(${source[@]} desktop_file.patch compile-fix.patch) +sha1sums=('5c6d17d27952dd56cd0954fa699e274a46a119f4' \ + '7e714b084a7a1db28c9935070a0d5c8d7ccb95e3' \ + '554e5ae24736bb11de25714d2bfd36888544a628') # optimization OK diff --git a/source/kde-extra/kpogre/compile-fix.patch b/source/kde-extra/kpogre/compile-fix.patch new file mode 100644 index 0000000..cf3ecd5 --- /dev/null +++ b/source/kde-extra/kpogre/compile-fix.patch @@ -0,0 +1,11 @@ +diff -Naur kpogre-1.5.8/kpogre/DbObjects/kpgtreeitem.h kpogre-1.5.8-p/kpogre/DbObjects/kpgtreeitem.h +--- kpogre-1.5.8/kpogre/DbObjects/kpgtreeitem.h 2007-10-25 14:25:43.000000000 +0200 ++++ kpogre-1.5.8-p/kpogre/DbObjects/kpgtreeitem.h 2007-11-11 23:37:00.000000000 +0100 +@@ -22,6 +22,7 @@ + #define QT_NO_ASCII_CAST + + #include ++#include + + // include files for libpgxx + #include diff --git a/source/kde-extra/kpogre/libpqxx-2.6.9-API.patch b/source/kde-extra/kpogre/libpqxx-2.6.9-API.patch deleted file mode 100644 index 34ef7a7..0000000 --- a/source/kde-extra/kpogre/libpqxx-2.6.9-API.patch +++ /dev/null @@ -1,552 +0,0 @@ -diff -Naur kpogre-1.5.4/kpogre/DataTable/kpgdatatable.cpp kpogre-1.5.4-p/kpogre/DataTable/kpgdatatable.cpp ---- kpogre-1.5.4/kpogre/DataTable/kpgdatatable.cpp 2006-12-15 13:47:44.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DataTable/kpgdatatable.cpp 2007-02-02 05:19:15.000000000 +0100 -@@ -894,7 +894,7 @@ - - try - { -- pqxx::result pqxxResult = pqxxXaction.Exec((std::string) strSql); -+ pqxx::result pqxxResult = pqxxXaction.exec((std::string) strSql); - - if(pqxxResult.size() != 1) - { -@@ -934,7 +934,7 @@ - - try - { -- pqxx::result pqxxResult = pqxxXaction.Exec((std::string) strSql); -+ pqxx::result pqxxResult = pqxxXaction.exec((std::string) strSql); - - if(pqxxResult.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgaggregatesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgaggregatesfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgaggregatesfolder.cpp 2006-12-27 21:35:12.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgaggregatesfolder.cpp 2007-02-02 05:19:15.000000000 +0100 -@@ -61,7 +61,7 @@ - - try - { -- m_pqxxResultAggregates = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultAggregates = pqxxXaction.exec(strQuery.latin1()); - - KPGAggregate *pAggregate = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgcastsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgcastsfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgcastsfolder.cpp 2006-12-27 21:35:12.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgcastsfolder.cpp 2007-02-02 05:19:15.000000000 +0100 -@@ -53,7 +53,7 @@ - - try - { -- m_pqxxResultCasts = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultCasts = pqxxXaction.exec(strQuery.latin1()); - - KPGCast *pCast = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgconnection.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgconnection.cpp 2006-09-12 14:07:52.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.cpp 2007-02-02 05:18:25.000000000 +0100 -@@ -91,11 +91,14 @@ - // Run SQL statement, make conversion regard connection encoding - pqxx::result KPGConnection::runQuery(const QString& strQuery, eTransType transType) - { -+ QCString cstrDecodedQuery(m_pTextCodec->fromUnicode(strQuery)); -+ QString strDecodedQuery(cstrDecodedQuery); -+ - // run query - if(transType == eTransNormal) - { - work pqxxXaction(*this, "runQuery"); -- result R(pqxxXaction.exec(m_pTextCodec->fromUnicode(strQuery))); -+ result R(pqxxXaction.exec(strDecodedQuery)); - pqxxXaction.commit(); - return R; - } -@@ -104,14 +107,14 @@ - if(transType == eTransNone) - { - pqxx::nontransaction pqxxXaction(*this, "runQuery"); -- result R(pqxxXaction.exec(m_pTextCodec->fromUnicode(strQuery))); -+ result R(pqxxXaction.exec(strDecodedQuery)); - return R; - } - } - - // eTransRobust: - pqxx::robusttransaction<> pqxxXaction(*this, "runQuery"); -- result R(pqxxXaction.exec(m_pTextCodec->fromUnicode(strQuery))); -+ result R(pqxxXaction.exec(strDecodedQuery)); - pqxxXaction.commit(); - return R; - } -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgconversionsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgconversionsfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgconversionsfolder.cpp 2006-12-27 21:35:12.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgconversionsfolder.cpp 2007-02-02 05:19:15.000000000 +0100 -@@ -52,7 +52,7 @@ - - try - { -- m_pqxxResultConversions = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultConversions = pqxxXaction.exec(strQuery.latin1()); - - KPGConversion *pConversion = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgdatabase.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgdatabase.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgdatabase.cpp 2006-12-28 11:39:51.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgdatabase.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -202,7 +202,7 @@ - { - work pqxxXaction(*m_pDbConnection, "refreshSchemasList"); - -- m_pqxxResultSchemas = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultSchemas = pqxxXaction.exec(strQuery.latin1()); - KPGSchema *pSchema = 0; - - for (result::size_type i = 0; i != m_pqxxResultSchemas.size(); ++i) -@@ -301,7 +301,7 @@ - - try - { -- pqxx::result pqxxResultDatabases = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultDatabases = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultDatabases.size() != 1) - { -@@ -529,7 +529,7 @@ - { - work pqxxXaction(*m_pDbConnection, "statistics"); - -- result pqxxResult = pqxxXaction.Exec(strQuery.latin1()); -+ result pqxxResult = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResult.size() == 1) - { -@@ -742,7 +742,7 @@ - try - { - pqxx::work pqxxXaction(*m_pDbConnection, "displayExtendedStatistics"); -- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); - - // fill properties table with result data - int nTableCols = fillPropertiesTable(pqxxResultStatistics, pTableStatistics, false); -@@ -806,7 +806,7 @@ - try - { - pqxx::work pqxxXaction(*m_pDbConnection, "displayDiskUsage"); -- pqxx::result pqxxResult = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResult = pqxxXaction.exec(strQuery.latin1()); - - // fill properties table with result data - int nTableCols = fillPropertiesTable(pqxxResult, pTableDiskUsage, false); -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgdomainsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgdomainsfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgdomainsfolder.cpp 2006-12-27 21:35:12.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgdomainsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -52,7 +52,7 @@ - - try - { -- m_pqxxResultDomains = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultDomains = pqxxXaction.exec(strQuery.latin1()); - - KPGDomain *pDomain = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgfunction.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgfunction.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgfunction.cpp 2006-12-27 22:11:20.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgfunction.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -148,7 +148,7 @@ - - try - { -- pqxx::result pqxxResult = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResult = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResult.size() != 1) - { -@@ -340,7 +340,7 @@ - - try - { -- pqxx::result pqxxResult = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResult = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResult.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgfunctionsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgfunctionsfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgfunctionsfolder.cpp 2006-12-27 22:11:20.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgfunctionsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -70,7 +70,7 @@ - - try - { -- m_pqxxResultFunctions = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultFunctions = pqxxXaction.exec(strQuery.latin1()); - - KPGFunction *pFunction = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpggroupsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpggroupsfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpggroupsfolder.cpp 2006-12-27 22:11:21.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpggroupsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -46,7 +46,7 @@ - - try - { -- m_pqxxResultGroups = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultGroups = pqxxXaction.exec(strQuery.latin1()); - - KPGGroup *pGroup = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpglanguage.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpglanguage.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpglanguage.cpp 2006-12-27 22:11:21.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpglanguage.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -130,7 +130,7 @@ - - try - { -- pqxx::result pqxxResultLanguages = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultLanguages = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultLanguages.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpglanguagesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpglanguagesfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpglanguagesfolder.cpp 2006-12-27 22:11:21.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpglanguagesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -50,7 +50,7 @@ - - try - { -- m_pqxxResultLanguages = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultLanguages = pqxxXaction.exec(strQuery.latin1()); - - KPGLanguage *pLanguage = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgoperatorclassesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgoperatorclassesfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgoperatorclassesfolder.cpp 2006-12-28 10:33:28.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgoperatorclassesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -54,7 +54,7 @@ - - try - { -- m_pqxxResultOperatorClasses = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultOperatorClasses = pqxxXaction.exec(strQuery.latin1()); - - KPGOperatorClass *pOperatorClass = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgoperatorsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgoperatorsfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgoperatorsfolder.cpp 2006-12-28 10:33:28.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgoperatorsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -64,7 +64,7 @@ - - try - { -- m_pqxxResultOperators = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultOperators = pqxxXaction.exec(strQuery.latin1()); - - KPGOperator *pOperator = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgrule.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgrule.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgrule.cpp 2006-12-28 11:39:51.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgrule.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -61,7 +61,7 @@ - - try - { -- pqxx::result pqxxResultRules = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultRules = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultRules.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgschema.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgschema.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgschema.cpp 2006-12-28 11:39:51.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgschema.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -171,7 +171,7 @@ - { - work pqxxXaction(*pDatabase->connection(), "refreshItem"); - -- pqxx::result pqxxResultSchemas = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultSchemas = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultSchemas.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgsequence.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgsequence.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgsequence.cpp 2006-12-28 11:39:51.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgsequence.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -192,7 +192,7 @@ - { - KPGConnection *pDbConnection = connection(); - pqxx::work pqxxXaction(*pDbConnection, "refresh sequence statistics"); -- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultStatistics.size() != 1) - { -@@ -257,7 +257,7 @@ - - try - { -- pqxx::result pqxxResultSequences = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultSequences = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultSequences.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgsequencesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgsequencesfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgsequencesfolder.cpp 2006-12-28 11:39:51.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgsequencesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -67,7 +67,7 @@ - - try - { -- m_pqxxResultSequences = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultSequences = pqxxXaction.exec(strQuery.latin1()); - - KPGSequence *pSequence = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgserver.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgserver.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgserver.cpp 2006-12-22 00:28:48.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgserver.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -147,7 +147,7 @@ - pqxx::result pqxxResult; - try - { -- pqxxResult = pqxxXaction.Exec(strQuery.latin1()); -+ pqxxResult = pqxxXaction.exec(strQuery.latin1()); - } - catch (const std::exception &e) - { -@@ -214,7 +214,7 @@ - pqxx::result pqxxResult; - try - { -- pqxxResult = pqxxXaction.Exec(strQuery.latin1()); -+ pqxxResult = pqxxXaction.exec(strQuery.latin1()); - } - catch (const std::exception &e) - { -@@ -242,7 +242,7 @@ - pqxx::result pqxxResult; - try - { -- pqxxResult = pqxxXaction.Exec(strQuery.latin1()); -+ pqxxResult = pqxxXaction.exec(strQuery.latin1()); - } - catch (const std::exception &e) - { -@@ -270,7 +270,7 @@ - pqxx::result pqxxResult; - try - { -- pqxxResult = pqxxXaction.Exec(strQuery.latin1()); -+ pqxxResult = pqxxXaction.exec(strQuery.latin1()); - } - catch (const std::exception &e) - { -@@ -336,7 +336,7 @@ - - try - { -- m_pqxxResultDatabases = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultDatabases = pqxxXaction.exec(strQuery.latin1()); - } - catch (const std::exception &e) - { -@@ -515,7 +515,7 @@ - try - { - pqxx::work pqxxXaction(*m_pDbConnection, "refresh server activity"); -- pqxx::result pqxxResultActivity = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultActivity = pqxxXaction.exec(strQuery.latin1()); - - // fill properties table with result data - int nTableCols = fillPropertiesTable(pqxxResultActivity, pTableActivity); -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtablecolumn.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtablecolumn.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtablecolumn.cpp 2006-12-28 11:39:51.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtablecolumn.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -75,7 +75,7 @@ - - try - { -- pqxx::result pqxxResultColumns = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultColumns = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultColumns.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtableconstraint.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtableconstraint.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtableconstraint.cpp 2006-12-28 15:03:30.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtableconstraint.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -58,7 +58,7 @@ - - try - { -- pqxx::result pqxxResultConstraints = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultConstraints = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultConstraints.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtable.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtable.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtable.cpp 2006-12-28 19:51:34.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtable.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -171,7 +171,7 @@ - - try - { -- pqxx::result pqxxResultTables = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultTables = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultTables.size() != 1) - { -@@ -564,7 +564,7 @@ - { - KPGConnection *pDbConnection = connection(); - pqxx::work pqxxXaction(*pDbConnection, "refresh table statistics"); -- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultStatistics.size() != 1) - { -@@ -654,7 +654,7 @@ - { - KPGConnection *pDbConnection = connection(); - pqxx::work pqxxXaction(*pDbConnection, "refresh table statistics"); -- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultStatistics.size() != 1) // querying pq_xactloct return no rows... Why ? - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtableindex.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtableindex.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtableindex.cpp 2006-12-22 20:27:08.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtableindex.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -95,7 +95,7 @@ - - try - { -- pqxx::result pqxxResultIndexes = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultIndexes = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultIndexes.size() != 1) - { -@@ -203,7 +203,7 @@ - { - KPGConnection *pDbConnection = connection(); - pqxx::work pqxxXaction(*pDbConnection, "refresh table statistics"); -- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultStatistics.size() != 1) - { -@@ -264,7 +264,7 @@ - { - KPGConnection *pDbConnection = connection(); - pqxx::work pqxxXaction(*pDbConnection, "refresh table statistics"); -- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultStatistics.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtablesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtablesfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtablesfolder.cpp 2006-12-28 19:51:34.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtablesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -95,7 +95,7 @@ - - try - { -- m_pqxxResultTables = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultTables = pqxxXaction.exec(strQuery.latin1()); - - KPGTable *pTable = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtablespace.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtablespace.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtablespace.cpp 2006-12-21 22:36:14.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtablespace.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -167,7 +167,7 @@ - - try - { -- pqxx::result pqxxResultTablespaces = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultTablespaces = pqxxXaction.exec(strQuery.latin1()); - - setProperties(pqxxResultTablespaces[0], bVersion81_OrNewer); - } -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtablespacesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtablespacesfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtablespacesfolder.cpp 2006-12-22 20:27:08.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtablespacesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -57,7 +57,7 @@ - - try - { -- m_pqxxResultTablespaces = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultTablespaces = pqxxXaction.exec(strQuery.latin1()); - - KPGTablespace *pTablespace = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtrigger.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtrigger.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtrigger.cpp 2006-12-28 15:03:30.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtrigger.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -64,7 +64,7 @@ - - try - { -- pqxx::result pqxxResultTriggers = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultTriggers = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultTriggers.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtype.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtype.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtype.cpp 2006-12-28 15:03:30.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtype.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -240,7 +240,7 @@ - - try - { -- pqxx::result pqxxResultTypes = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultTypes = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultTypes.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtypesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtypesfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgtypesfolder.cpp 2006-12-28 15:03:30.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtypesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -52,7 +52,7 @@ - - try - { -- m_pqxxResultTypes = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultTypes = pqxxXaction.exec(strQuery.latin1()); - - KPGType *pType = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgusersfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgusersfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgusersfolder.cpp 2006-12-28 15:03:30.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgusersfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -48,7 +48,7 @@ - - try - { -- m_pqxxResultUsers = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultUsers = pqxxXaction.exec(strQuery.latin1()); - - KPGUser *pUser = 0; - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgview.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgview.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgview.cpp 2006-08-20 14:18:28.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgview.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -127,7 +127,7 @@ - - try - { -- pqxx::result pqxxResultViews = pqxxXaction.Exec(strQuery.latin1()); -+ pqxx::result pqxxResultViews = pqxxXaction.exec(strQuery.latin1()); - - if(pqxxResultViews.size() != 1) - { -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgviewsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgviewsfolder.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgviewsfolder.cpp 2006-08-20 14:18:28.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgviewsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 -@@ -57,7 +57,7 @@ - - try - { -- m_pqxxResultViews = pqxxXaction.Exec(strQuery.latin1()); -+ m_pqxxResultViews = pqxxXaction.exec(strQuery.latin1()); - - KPGView *pgView = 0; - diff --git a/source/kde-extra/kpogre/libpqxx-2.6.9-headers.patch b/source/kde-extra/kpogre/libpqxx-2.6.9-headers.patch deleted file mode 100644 index 35172f1..0000000 --- a/source/kde-extra/kpogre/libpqxx-2.6.9-headers.patch +++ /dev/null @@ -1,426 +0,0 @@ -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgconnection.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.cpp ---- kpogre-1.5.4/kpogre/DbObjects/kpgconnection.cpp 2006-09-12 14:07:52.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.cpp 2007-02-02 04:16:58.000000000 +0100 -@@ -19,8 +19,8 @@ - - - // include files for libpgxx --#include --#include -+#include -+#include - - // include files for Qt - #include -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgconnection.h kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.h ---- kpogre-1.5.4/kpogre/DbObjects/kpgconnection.h 2006-09-22 12:10:05.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.h 2007-02-02 04:16:58.000000000 +0100 -@@ -22,7 +22,7 @@ - #define QT_NO_ASCII_CAST - - // include files for libpgxx --#include -+#include - - #include "kpgfunction.h" - -diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtreeitem.h kpogre-1.5.4-p/kpogre/DbObjects/kpgtreeitem.h ---- kpogre-1.5.4/kpogre/DbObjects/kpgtreeitem.h 2006-12-28 16:11:29.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtreeitem.h 2007-02-02 04:16:58.000000000 +0100 -@@ -24,8 +24,8 @@ - #include - - // include files for libpgxx --#include --#include -+#include -+#include - - class KPGConnection; - class QTable; -diff -Naur kpogre-1.5.4/kpogre/kpglinklabel.h kpogre-1.5.4-p/kpogre/kpglinklabel.h ---- kpogre-1.5.4/kpogre/kpglinklabel.h 2006-09-15 14:44:09.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/kpglinklabel.h 2007-02-02 04:16:58.000000000 +0100 -@@ -13,7 +13,7 @@ - #define KPGLINKLABEL_H - - // include files for libpgxx --#include -+#include - - #include - //#include -diff -Naur kpogre-1.5.4/kpogre/kpogreview.cpp kpogre-1.5.4-p/kpogre/kpogreview.cpp ---- kpogre-1.5.4/kpogre/kpogreview.cpp 2006-12-28 20:27:31.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/kpogreview.cpp 2007-02-02 04:16:58.000000000 +0100 -@@ -15,7 +15,7 @@ - * * - ***************************************************************************/ - --#include -+#include - - // include files for Qt - #include -diff -Naur kpogre-1.5.4/kpogre/kpogreview.h kpogre-1.5.4-p/kpogre/kpogreview.h ---- kpogre-1.5.4/kpogre/kpogreview.h 2006-12-14 10:31:58.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/kpogreview.h 2007-02-02 04:16:58.000000000 +0100 -@@ -23,7 +23,7 @@ - #endif - - // include files for libpgxx --#include -+#include - - // include files for Qt - #include -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgaggregateproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgaggregateproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgaggregateproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgaggregateproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Aggregate properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgcastproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgcastproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgcastproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgcastproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Cast properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgcheckconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgcheckconstrproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgcheckconstrproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgcheckconstrproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Check Constraint properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgconversionproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgconversionproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgconversionproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgconversionproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Conversion properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgdatabaseproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgdatabaseproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgdatabaseproppage.h 2006-12-26 23:06:48.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgdatabaseproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -19,7 +19,7 @@ - - #include "kpgdatabaseproppagebase.h" - --#include -+#include - - // application specific includes - #include "kpgabstractpropertypage.h" -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgdomainconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgdomainconstrproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgdomainconstrproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgdomainconstrproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Domain check constraint properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgdomainproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgdomainproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgdomainproppage.h 2006-09-18 14:03:22.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgdomainproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Domain properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgforeignkeyconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgforeignkeyconstrproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgforeignkeyconstrproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgforeignkeyconstrproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Foreign Key Constraint properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgfunctionproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgfunctionproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgfunctionproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgfunctionproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -15,7 +15,7 @@ - #include "kpgfunctionproppagebase.h" - - // include files for libpgxx --#include -+#include - - // application specific includes - #include "kpgabstractpropertypage.h" -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpggroupproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpggroupproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpggroupproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpggroupproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - User properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgindexproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgindexproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgindexproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgindexproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - class KPGSyntaxHighlighter; - class KPGIndex; -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpglanguageproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpglanguageproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpglanguageproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpglanguageproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -15,7 +15,7 @@ - #include "kpglanguageproppagebase.h" - - // include files for libpgxx --#include -+#include - - // application specific includes - #include "kpgabstractpropertypage.h" -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgoperatorclassproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgoperatorclassproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgoperatorclassproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgoperatorclassproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Operator Class properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgoperatorproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgoperatorproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgoperatorproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgoperatorproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Operator properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgprimarykeyconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgprimarykeyconstrproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgprimarykeyconstrproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgprimarykeyconstrproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Primary Key Constraint properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgprimarykeyproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgprimarykeyproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgprimarykeyproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgprimarykeyproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - class KPGSyntaxHighlighter; - class KPGPrimaryKey; -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgpropertypage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgpropertypage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgpropertypage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgpropertypage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - - /** -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgschemaproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgschemaproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgschemaproppage.h 2006-09-15 14:44:09.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgschemaproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -15,7 +15,7 @@ - #include "kpgschemaproppagebase.h" - - // include files for libpgxx --#include -+#include - - // application specific includes - #include "kpgabstractpropertypage.h" -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgsequenceproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgsequenceproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgsequenceproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgsequenceproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -15,7 +15,7 @@ - #include "kpgsequenceproppagebase.h" - - // include files for libpgxx --#include -+#include - - // application specific includes - #include "kpgabstractpropertypage.h" -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgserverproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgserverproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgserverproppage.h 2006-12-21 10:47:27.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgserverproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -23,7 +23,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - class KPGServer; - -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtablecolumnproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtablecolumnproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgtablecolumnproppage.h 2006-09-15 13:24:30.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtablecolumnproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -23,7 +23,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Table column property page -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtableproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtableproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgtableproppage.h 2006-09-15 14:44:09.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtableproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -20,7 +20,7 @@ - #include "kpgtableproppagebase.h" - - // include files for libpgxx --#include -+#include - - // application specific includes - #include "kpgabstractpropertypage.h" -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtablespaceproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtablespaceproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgtablespaceproppage.h 2006-09-15 13:24:31.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtablespaceproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -15,7 +15,7 @@ - #include "kpgtablespaceproppagebase.h" - - // include files for libpgxx --#include -+#include - - // application specific includes - #include "kpgabstractpropertypage.h" -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtriggerproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtriggerproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgtriggerproppage.h 2006-09-15 13:24:31.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtriggerproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Table trigger property page -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtypeproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtypeproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgtypeproppage.h 2006-09-15 13:24:31.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtypeproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Data type properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpguniqueconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpguniqueconstrproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpguniqueconstrproppage.h 2006-09-15 13:24:31.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpguniqueconstrproppage.h 2007-02-02 04:16:59.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - Unique Constraint properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpguserproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpguserproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpguserproppage.h 2006-09-15 13:24:31.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpguserproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -18,7 +18,7 @@ - #include "kpgabstractpropertypage.h" - - // include files for libpgxx --#include -+#include - - /** - User properties -diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgviewproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgviewproppage.h ---- kpogre-1.5.4/kpogre/PropertyPages/kpgviewproppage.h 2006-09-15 13:24:31.000000000 +0200 -+++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgviewproppage.h 2007-02-02 04:16:58.000000000 +0100 -@@ -15,7 +15,7 @@ - #include "kpgviewproppagebase.h" - - // include files for libpgxx --#include -+#include - - // application specific includes - #include "kpgabstractpropertypage.h" -diff -Naur kpogre-1.5.4/kpogre/Wizards/kpgmodifyviewwidget1.h kpogre-1.5.4-p/kpogre/Wizards/kpgmodifyviewwidget1.h ---- kpogre-1.5.4/kpogre/Wizards/kpgmodifyviewwidget1.h 2004-12-19 22:01:11.000000000 +0100 -+++ kpogre-1.5.4-p/kpogre/Wizards/kpgmodifyviewwidget1.h 2007-02-02 04:16:59.000000000 +0100 -@@ -15,8 +15,8 @@ - #include "kpgmodifyviewwidget1base.h" - - // include files for libpgxx --#include --#include -+#include -+#include - - class KPGDatabase; - class KPGSyntaxHighlighter; From krics at linuxforum.hu Mon Nov 12 18:27:39 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Mon Nov 12 18:27:49 2007 Subject: [Frugalware-git] frugalware-current: imagemagick-6.3.6_9-1-x86_64 Message-ID: <20071112172741.11C3911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cada5b5a25099b80ee32bc527f82be1f4b643c53 commit cada5b5a25099b80ee32bc527f82be1f4b643c53 Author: Christian Hamar alias krix Date: Mon Nov 12 18:25:13 2007 +0100 imagemagick-6.3.6_9-1-x86_64 * Version bump diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild index 3b349eb..d59f74f 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.6_5 +pkgver=6.3.6_9 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=('507f2a39bc68de0211152313b23e6a9b1d965362' \ +sha1sums=('c1b066b9211fdcdeff4802771d1863abbea1e0f1' \ 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') build() { From crazy at frugalware.org Tue Nov 13 00:46:04 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 13 00:46:06 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-good-0.10.6-4-i686 Message-ID: <20071112234604.46F7811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=560714fea1c4272bebeeb8294b1bda763f3ffd90 commit 560714fea1c4272bebeeb8294b1bda763f3ffd90 Author: crazy Date: Tue Nov 13 00:42:49 2007 +0100 gst-plugins-good-0.10.6-4-i686 * fix groups , gconf is gnome diff --git a/source/xmultimedia/gst-plugins-good/FrugalBuild b/source/xmultimedia/gst-plugins-good/FrugalBuild index 094621d..e18514d 100644 --- a/source/xmultimedia/gst-plugins-good/FrugalBuild +++ b/source/xmultimedia/gst-plugins-good/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gst-plugins-good pkgver=0.10.6 -pkgrel=3 +pkgrel=4 pkgdesc="Plugins for GStreamer (Good)" url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base>=0.10.13' 'gstreamer>=0.10.13' 'zlib') @@ -42,7 +42,7 @@ Finclude gnome-scriptlet unset install subreplaces=('' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' 'gst-plugins-bad-video4linux2' '' '' 'gst-plugins-bad-wavpack' '') subinstall=("src/gnome-scriptlet.install" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') -subgroups=('xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' \ +subgroups=('gnome' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' \ 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia-extra' \ 'docs-extra' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ From crazy at frugalware.org Tue Nov 13 01:15:32 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 13 01:15:35 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-base-0.10.14-2-i686 Message-ID: <20071113001532.62B2311901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6de244124b58798e2d7761c3c6524208f2d97e73 commit 6de244124b58798e2d7761c3c6524208f2d97e73 Author: crazy Date: Tue Nov 13 01:13:00 2007 +0100 gst-plugins-base-0.10.14-2-i686 * fix gnome groups diff --git a/source/xmultimedia/gst-plugins-base/FrugalBuild b/source/xmultimedia/gst-plugins-base/FrugalBuild index bb784c0..986f570 100644 --- a/source/xmultimedia/gst-plugins-base/FrugalBuild +++ b/source/xmultimedia/gst-plugins-base/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gst-plugins-base pkgver=0.10.14 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for GStreamer" url="http://gstreamer.freedesktop.org/" depends=('libxv' 'libsm' 'gstreamer>=0.10.14') @@ -31,7 +31,7 @@ subdepends=("gnome-vfs>=2.16.0-2 $pkgname=$pkgver dbus-glib>=0.71 avahi-glib>=0. "pango fontconfig $pkgname=$pkgver" "alsa-lib $pkgname=$pkgver" "libtheora $pkgname=$pkgver" \ "liboil>=0.3.10 $pkgname=$pkgver" "libvisual-plugins $pkgname=$pkgver" "libogg $pkgname=$pkgver" \ "libvorbis $pkgname=$pkgver" '') -subgroups=('xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' \ +subgroups=('gnome' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' \ 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'docs-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') From crazy at frugalware.org Tue Nov 13 01:33:09 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 13 01:33:15 2007 Subject: [Frugalware-git] frugalware-current: gcompris-8.4.2-2-i686 Message-ID: <20071113003309.A099311901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f57218924d75ce1516fdc253d6556fc0b0a9f41 commit 4f57218924d75ce1516fdc253d6556fc0b0a9f41 Author: crazy Date: Tue Nov 13 01:32:43 2007 +0100 gcompris-8.4.2-2-i686 * depends fix diff --git a/source/games-extra/gcompris/FrugalBuild b/source/games-extra/gcompris/FrugalBuild index 19e3b75..675b535 100644 --- a/source/games-extra/gcompris/FrugalBuild +++ b/source/games-extra/gcompris/FrugalBuild @@ -3,13 +3,12 @@ pkgname=gcompris pkgver=8.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Educational application for children" depends=('pygtk' 'gnet' 'python' 'gnucap' 'gstreamer' 'sdl_mixer' 'gnuchess' \ 'pysqlite2' 'libxml2' 'sdl' 'gtk+2' 'libxxf86vm' 'libxdamage' 'sqlite3' \ - 'tuxpaint' 'pyxml') -## need to figure gst-* -rodepends=('gst-plugins-base-alsa' 'gst-plugins-base-ogg') + 'tuxpaint' 'pyxml' 'librsvg') +rodepends=('gst-plugins-base-alsa' 'gst-plugins-base-ogg' 'gst-plugins-base-oil') makedepends=('perl-xml' 'intltool' 'texi2html' 'gettext' 'libgnomecanvas' 'subversion') # lol groups=('games-extra') archs=('i686') From priyank at frugalware.org Tue Nov 13 05:07:56 2007 From: priyank at frugalware.org (Priyank) Date: Tue Nov 13 05:07:58 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig-interface Message-ID: <20071113040756.9D65A11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=77a3fd64b73a4494e6a8d1e953019f0a43086a52 commit 77a3fd64b73a4494e6a8d1e953019f0a43086a52 Author: Priyank Date: Tue Nov 13 09:37:41 2007 +0530 gnetconfig-interface * Fixed another possibility of a segfault. Never use fwnet_lastprofile() directly in a strcmp() as it may return NULL. Thanks to melodie_ diff --git a/gnetconfig/src/gnetconfig-interface.c b/gnetconfig/src/gnetconfig-interface.c index 5dfc4bd..10fda96 100644 --- a/gnetconfig/src/gnetconfig-interface.c +++ b/gnetconfig/src/gnetconfig-interface.c @@ -765,16 +765,20 @@ cb_gn_interface_start (GtkButton *button, gpointer data) gboolean found = FALSE; fwnet_interface_t* inte = NULL; gint ret; + gchar *old_profile = NULL; gtk_combo_box_get_active_iter (GTK_COMBO_BOX(gn_profile_combo), &iter); model = gtk_combo_box_get_model (GTK_COMBO_BOX(gn_profile_combo)); - gtk_tree_model_get (model, &iter, 1, &profile, -1); - if (strcmp(profile,fwnet_lastprofile())!=0) + gtk_tree_model_get (model, &iter, 1, &profile, -1); + old_profile = fwnet_lastprofile (); + if (old_profile!=NULL) { - gn_error (_("This interface cannot be activated. It belongs to an inactive profile.")); - return; + if (strcmp(profile,old_profile)!=0) + { + gn_error (_("This interface cannot be activated. It belongs to an inactive profile.")); + return; + } } - model = gtk_tree_view_get_model (GTK_TREE_VIEW(gn_interface_treeview)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gn_interface_treeview)); if ( FALSE == gtk_tree_selection_get_selected (selection, &model, &iter) ) From priyank at frugalware.org Tue Nov 13 05:12:25 2007 From: priyank at frugalware.org (Priyank) Date: Tue Nov 13 05:12:27 2007 Subject: [Frugalware-git] fw-control-center: gnetconfig.glade: increased the width of the main window a bit Message-ID: <20071113041225.AA3E311901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=59a5638024d8bbd20e6b7873aac01b79423cab1e commit 59a5638024d8bbd20e6b7873aac01b79423cab1e Author: Priyank Date: Tue Nov 13 09:42:14 2007 +0530 gnetconfig.glade: increased the width of the main window a bit diff --git a/gnetconfig/glade/gnetconfig.glade b/gnetconfig/glade/gnetconfig.glade index 42bd468..949c50f 100644 --- a/gnetconfig/glade/gnetconfig.glade +++ b/gnetconfig/glade/gnetconfig.glade @@ -1,9 +1,9 @@ - + - 500 + 550 500 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -561,9 +561,6 @@ Graphical network configuration tool for Frugalware linux. - - False - @@ -573,7 +570,6 @@ Graphical network configuration tool for Frugalware linux. tab - False False @@ -639,7 +635,6 @@ The full hostname is needed, such as: 1 - False @@ -651,7 +646,6 @@ The full hostname is needed, such as: tab 1 - False False @@ -750,7 +744,6 @@ If you don't have a name server on your network, just leave this blank. 2 - False @@ -762,7 +755,6 @@ If you don't have a name server on your network, just leave this blank. tab 2 - False False @@ -821,60 +813,60 @@ If you don't have a name server on your network, just leave this blank. 2 10 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - 0 - <b>Interface: </b> True - GTK_FILL - + 1 + 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Connection Type: </b> - True + DHCP +Static IP +lo + + 1 + 2 1 2 - GTK_FILL - GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - DHCP -Static IP -lo - + 0 + <b>Connection Type: </b> + True - 1 - 2 1 2 + GTK_FILL + GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 + 0 + <b>Interface: </b> True - 1 - 2 + GTK_FILL + @@ -892,50 +884,38 @@ lo 2 4 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Key:</b> - True - PANGO_ELLIPSIZE_START + Ad-Hoc +Managed +Master +Monitor +Repeater +Secondary +Auto + - 2 - 3 + 1 + 2 GTK_FILL - + GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>ESSID:</b> - True + 1 + 2 1 2 GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Mode:</b> - True - - - GTK_FILL - + GTK_FILL @@ -953,38 +933,50 @@ lo - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>Mode:</b> + True + + + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>ESSID:</b> + True - 1 - 2 1 2 GTK_FILL - GTK_FILL + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Ad-Hoc -Managed -Master -Monitor -Repeater -Secondary -Auto - + 0 + 0 + <b>Key:</b> + True + PANGO_ELLIPSIZE_START - 1 - 2 + 2 + 3 GTK_FILL - GTK_FILL + @@ -1001,33 +993,49 @@ Auto 2 6 - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 15 + 0 + 0 + <b>Gateway address: </b> + True - 1 - 2 + 2 + 3 GTK_FILL - GTK_FILL + - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 15 + 0 + 0 + <b>Subnet mask :</b> + True - 1 - 2 1 2 GTK_FILL - GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>IP Address: </b> + True + + + GTK_FILL + @@ -1046,49 +1054,33 @@ Auto - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>IP Address: </b> - True - - - GTK_FILL - - - - - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Subnet mask :</b> - True + 15 + 1 + 2 1 2 GTK_FILL - + GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Gateway address: </b> - True + 15 - 2 - 3 + 1 + 2 GTK_FILL - + GTK_FILL @@ -1106,14 +1098,32 @@ Auto 2 5 - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + dhcpcd (default) +dhclient + + + 1 + 2 + 1 + 2 + GTK_FILL + 4 + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>DHCP Hostname:</b> + <b>DHCP Client: </b> True + 1 + 2 GTK_FILL GTK_FILL @@ -1152,36 +1162,18 @@ Auto - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>DHCP Client: </b> + <b>DHCP Hostname:</b> True - 1 - 2 GTK_FILL GTK_FILL - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - dhcpcd (default) -dhclient - - - 1 - 2 - 1 - 2 - GTK_FILL - 4 - - False @@ -1214,85 +1206,85 @@ dhclient 2 4 - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Confirm password:</b> + True - 1 - 2 + 2 + 3 + GTK_FILL + GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + 0 + <b>PPPoE password:</b> + True - 1 - 2 1 2 + GTK_FILL + GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + 0 + <b>PPPoE username:</b> + True - 1 - 2 - 2 - 3 + GTK_FILL + GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>PPPoE username:</b> - True + False - GTK_FILL - GTK_FILL + 1 + 2 + 2 + 3 - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>PPPoE password:</b> - True + False + 1 + 2 1 2 - GTK_FILL - GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Confirm password:</b> - True - 2 - 3 - GTK_FILL - GTK_FILL + 1 + 2 @@ -1302,9 +1294,6 @@ dhclient - - False - @@ -1331,7 +1320,6 @@ dhclient tab - False False @@ -1675,7 +1663,6 @@ dhclient 1 - False @@ -1704,7 +1691,6 @@ dhclient tab 1 - False False @@ -1887,33 +1873,49 @@ lo 2 6 - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 15 + 0 + 0 + <b>Gateway address: </b> + True - 1 - 2 + 2 + 3 GTK_FILL - GTK_FILL + - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 15 + 0 + 0 + <b>Subnet mask :</b> + True - 1 - 2 1 2 GTK_FILL - GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>IP Address: </b> + True + + + GTK_FILL + @@ -1932,49 +1934,33 @@ lo - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>IP Address: </b> - True - - - GTK_FILL - - - - - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Subnet mask :</b> - True + 15 + 1 + 2 1 2 GTK_FILL - + GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Gateway address: </b> - True + 15 - 2 - 3 + 1 + 2 GTK_FILL - + GTK_FILL @@ -1990,34 +1976,16 @@ lo 2 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>DHCP Client: </b> + <b>DHCP Hostname:</b> True - 1 - 2 GTK_FILL - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - dhcpcd (default) -dhclient - - - 1 - 2 - 1 - 2 - GTK_FILL - 4 + @@ -2056,16 +2024,34 @@ dhclient - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + dhcpcd (default) +dhclient + + + 1 + 2 + 1 + 2 + GTK_FILL + 4 + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>DHCP Hostname:</b> + <b>DHCP Client: </b> True + 1 + 2 GTK_FILL - + GTK_FILL @@ -2080,52 +2066,36 @@ dhclient 2 4 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Ad-Hoc -Managed -Master -Monitor -Repeater -Secondary -Auto - + 0 + 0 + <b>Key:</b> + True + PANGO_ELLIPSIZE_START - 1 - 2 + 2 + 3 GTK_FILL - GTK_FILL + - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + <b>ESSID:</b> + True - 1 - 2 1 2 GTK_FILL - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 2 - 3 - GTK_FILL + @@ -2143,36 +2113,52 @@ Auto - + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>ESSID:</b> - True + 1 + 2 1 2 GTK_FILL - + GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - <b>Key:</b> - True - PANGO_ELLIPSIZE_START + Ad-Hoc +Managed +Master +Monitor +Repeater +Secondary +Auto + - 2 - 3 + 1 + 2 GTK_FILL - + GTK_FILL @@ -2207,46 +2193,28 @@ Auto 2 4 - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Confirm password:</b> - True - 2 - 3 - GTK_FILL - GTK_FILL + 1 + 2 - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>PPPoE password:</b> - True + False + 1 + 2 1 2 - GTK_FILL - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>PPPoE username:</b> - True - - - GTK_FILL - GTK_FILL @@ -2264,28 +2232,46 @@ Auto - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + 0 + <b>PPPoE username:</b> + True + + + GTK_FILL + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>PPPoE password:</b> + True - 1 - 2 1 2 + GTK_FILL + GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Confirm password:</b> + True - 1 - 2 + 2 + 3 + GTK_FILL + GTK_FILL From vmiklos at frugalware.org Tue Nov 13 09:36:04 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 09:36:07 2007 Subject: [Frugalware-git] frugalware-current: knb-0.2.2-1-i686 Message-ID: <20071113083604.DCB2111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9fe7556b1333f8d78bf0ed9274565d3306cf5069 commit 9fe7556b1333f8d78bf0ed9274565d3306cf5069 Author: Miklos Vajna Date: Tue Nov 13 09:31:23 2007 +0100 knb-0.2.2-1-i686 new package diff --git a/source/network-extra/knb/FrugalBuild b/source/network-extra/knb/FrugalBuild new file mode 100644 index 0000000..5cad604 --- /dev/null +++ b/source/network-extra/knb/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling Time: 0.05 SBU +# Maintainer: VMiklos + +pkgname=knb +pkgver=0.2.2 +pkgrel=1 +pkgdesc="An IRC bot to keep your nick on networks where there are no services." +url="http://www.beer.one.pl/~esio/c/" +depends=('glibc') +groups=('network-extra') +archs=('i686') +up2date="lynx -dump $url |Flastarchive '-src.tar.gz\$'" +source=(http://www.beer.one.pl/~esio/c/knb-$pkgver-src.tar.gz \ + http://www.beer.one.pl/~esio/c/HELP.txt \ + README.Frugalware) +sha1sums=('3bba023275edbdb0e8056332d72fdd43de4b2b68' \ + '8490ce44c17a9f45cc6efd050708020caa081b5a' \ + '45bc711515881ca9405f298f66920af3f8d9ce94') + +build() +{ + Fcd $pkgname/src + ./configure || return 1 + make dynamic || return 1 + cd .. + Fexerel /usr/bin/knb + Fdocrel cfg-examples scripts README + Fdoc README.Frugalware HELP.txt +} diff --git a/source/network-extra/knb/README.Frugalware b/source/network-extra/knb/README.Frugalware new file mode 100644 index 0000000..cd6b8be --- /dev/null +++ b/source/network-extra/knb/README.Frugalware @@ -0,0 +1,33 @@ +To use knb, you need a config file like this: + +---- +nick idlenick +realname Knb +nicks keepnick +server irc.server.com 6667 +channel #channel +---- + +where `idlenick` is used till `keepnick` is used by someone else. The bot fill +join to `#channel` on `irc.server.com`. + +You need to register that you're the owner for the first time. To do this, join +`#channel` and + +---- +!new nick!ident@host +---- + +to give access someone to the bot. + +Once `keepnick` is no longer used and knb switched to that nick, you can use + +---- +!n -yes idlenick +---- + +to change knb's nick back to `idlenick`, so that you can change your nick back +to `keepnick`. + +See the `scripts` directory on how to re-start your knb from cron +automatically. From vmiklos at frugalware.org Tue Nov 13 09:42:14 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 09:42:16 2007 Subject: [Frugalware-git] frugalware-current: skype4py-0.9.28.5-1-i686 Message-ID: <20071113084214.EBC1D11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=15529ccc866a579de700eec0e3209f49070e0a50 commit 15529ccc866a579de700eec0e3209f49070e0a50 Author: Miklos Vajna Date: Tue Nov 13 09:42:07 2007 +0100 skype4py-0.9.28.5-1-i686 version bump diff --git a/source/devel-extra/skype4py/FrugalBuild b/source/devel-extra/skype4py/FrugalBuild index 16a49de..8065c7c 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.4 +pkgver=0.9.28.5 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=('449b8ea23c9ae874aa24878411a7fed36d7a0cba') +sha1sums=('9b7b1453e8747e9731dc726602e1e6a94f353d82') _F_cd_path="Skype4Py-$pkgver" From vmiklos at frugalware.org Tue Nov 13 09:48:41 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 09:48:43 2007 Subject: [Frugalware-git] frugalware-current: acerhk-0.5.35-1-i686 Message-ID: <20071113084841.9983711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e344ec933117168acad19d62980e7f7d952cd24 commit 5e344ec933117168acad19d62980e7f7d952cd24 Author: Miklos Vajna Date: Tue Nov 13 09:48:19 2007 +0100 acerhk-0.5.35-1-i686 version bump diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 7b74faa..4f49e6a 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: VMiklos pkgname=acerhk -pkgver=0.5.34 -pkgrel=7 +pkgver=0.5.35 +pkgrel=1 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' '!x86_64') up2date="lynx -dump $url |grep tgz$|sed 's/.*-\(.*\)\.t.*/\1/'" source=($url/archives/$pkgname-$pkgver.tgz) -sha1sums=('652e4054934789c29cb7f1d4366b512d11f87fed') +sha1sums=('cf977b2bee3487a401b9c92f04fe8b2ac77f2db2') build() { From vmiklos at frugalware.org Tue Nov 13 09:49:58 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 09:50:02 2007 Subject: [Frugalware-git] pacman-tools: dg: if no tags to push, that's not an error Message-ID: <20071113084958.C904F11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=9e85258372724f133a324ca2c5c37f14b962ad6b commit 9e85258372724f133a324ca2c5c37f14b962ad6b Author: Miklos Vajna Date: Tue Nov 13 09:49:53 2007 +0100 dg: if no tags to push, that's not an error diff --git a/darcs-git.py b/darcs-git.py index f186f3e..2682c6f 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -583,6 +583,7 @@ Options: if ret: return(1) os.system("git push --tags") + return(0) def pull(argv): def usage(ret): From vmiklos at frugalware.org Tue Nov 13 09:55:38 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 09:55:40 2007 Subject: [Frugalware-git] frugalware-current: busybox-1.8.1-1-i686 Message-ID: <20071113085538.2E73011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=702c6b05400252a44383a098eb5d44679a796a4a commit 702c6b05400252a44383a098eb5d44679a796a4a Author: Miklos Vajna Date: Tue Nov 13 09:55:29 2007 +0100 busybox-1.8.1-1-i686 version bump diff --git a/source/apps-extra/busybox/FrugalBuild b/source/apps-extra/busybox/FrugalBuild index a5604db..e6694f4 100644 --- a/source/apps-extra/busybox/FrugalBuild +++ b/source/apps-extra/busybox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=busybox -pkgver=1.7.3 +pkgver=1.8.1 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems." url="http://www.busybox.net/" @@ -12,8 +12,8 @@ archs=('i686' 'x86_64') up2date="lynx -dump 'http://busybox.net/'|grep '(stable)'|sed 's/.*BusyBox \(.*\) (.*/\1/;q'" source=(http://www.busybox.net/downloads/busybox-$pkgver.tar.bz2 config) # NOTE: we can't use signatures() here as the author signes only the checksums -sha1sums=('e50507674baa245774b7205384b2049f06ba7998' \ - '4e281c8f6ee3f89d9c51f0b28f93f2bcf1943303') +sha1sums=('bc6670ef52d272b08df9f4f83c3d84e430739bd7' \ + '82c5fd2b6d345b6676a42c196756918a58cb2376') build() { diff --git a/source/apps-extra/busybox/config b/source/apps-extra/busybox/config index 12c39f0..3f46df3 100644 --- a/source/apps-extra/busybox/config +++ b/source/apps-extra/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.7.1 -# Mon Sep 17 12:36:33 2007 +# Busybox version: 1.8.1 +# Tue Nov 13 09:51:46 2007 # CONFIG_HAVE_DOT_CONFIG=y @@ -40,10 +40,9 @@ CONFIG_FEATURE_HAVE_RPC=y # # CONFIG_STATIC is not set # CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y -# CONFIG_BUILD_AT_ONCE is not set # # Debugging Options @@ -61,7 +60,11 @@ CONFIG_INCLUDE_SUSv2=y # CONFIG_INSTALL_NO_USR is not set CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set # CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set CONFIG_PREFIX="./_install" # @@ -93,6 +96,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set CONFIG_BUNZIP2=y +# CONFIG_BZIP2 is not set # CONFIG_CPIO is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set @@ -264,6 +268,7 @@ CONFIG_CHVT=y CONFIG_CLEAR=y CONFIG_DEALLOCVT=y # CONFIG_DUMPKMAP is not set +# CONFIG_KBD_MODE is not set # CONFIG_LOADFONT is not set # CONFIG_LOADKMAP is not set CONFIG_OPENVT=y @@ -460,6 +465,7 @@ CONFIG_MKSWAP=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y CONFIG_MOUNT=y +# CONFIG_FEATURE_MOUNT_HELPERS is not set # CONFIG_FEATURE_MOUNT_NFS is not set # CONFIG_FEATURE_MOUNT_CIFS is not set CONFIG_FEATURE_MOUNT_FLAGS=y @@ -514,6 +520,7 @@ CONFIG_FEATURE_LESS_MAXLINES= # CONFIG_MAKEDEVS is not set # CONFIG_FEATURE_MAKEDEVS_LEAF is not set # CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MICROCOM is not set # CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set @@ -543,6 +550,7 @@ CONFIG_TIME=y # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y # CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set # CONFIG_FEATURE_HTTPD_SETUID is not set @@ -554,6 +562,7 @@ CONFIG_HOSTNAME=y # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -561,7 +570,7 @@ CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_HW is not set # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set # CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_IFUPDOWN_IP is not set # CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set @@ -583,6 +592,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" # CONFIG_FEATURE_IP_TUNNEL is not set # CONFIG_FEATURE_IP_RULE is not set # CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set @@ -641,9 +651,11 @@ CONFIG_KILL=y CONFIG_KILLALL=y # CONFIG_KILLALL5 is not set # CONFIG_NMETER is not set +# CONFIG_PGREP is not set CONFIG_PIDOF=y # CONFIG_FEATURE_PIDOF_SINGLE is not set # CONFIG_FEATURE_PIDOF_OMIT is not set +# CONFIG_PKILL is not set CONFIG_PS=y # CONFIG_FEATURE_PS_WIDE is not set # CONFIG_RENICE is not set @@ -652,6 +664,7 @@ CONFIG_PS=y # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set # CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set # CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOPMEM is not set CONFIG_UPTIME=y # CONFIG_WATCH is not set @@ -737,6 +750,7 @@ CONFIG_LOGGER=y # CONFIG_SETENFORCE is not set # CONFIG_SETFILES is not set # CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set # # ipsvd utilities From vmiklos at frugalware.org Tue Nov 13 09:58:39 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 09:58:40 2007 Subject: [Frugalware-git] frugalware-current: mod_fastcgi-2.4.4-1-i686 Message-ID: <20071113085839.34B7E11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e06a2efa6865678cff5274d96d79cc0bdcf5ba4e commit e06a2efa6865678cff5274d96d79cc0bdcf5ba4e Author: Miklos Vajna Date: Tue Nov 13 09:58:36 2007 +0100 mod_fastcgi-2.4.4-1-i686 version bump, -apache22.diff is now in upstream diff --git a/source/network-extra/mod_fastcgi/FrugalBuild b/source/network-extra/mod_fastcgi/FrugalBuild index fafab34..2c35b7d 100644 --- a/source/network-extra/mod_fastcgi/FrugalBuild +++ b/source/network-extra/mod_fastcgi/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=mod_fastcgi -pkgver=2.4.2 -pkgrel=2 +pkgver=2.4.4 +pkgrel=1 pkgdesc="A language independent extension to CGI that provides high performance" url="http://www.fastcgi.com/" depends=('apache>=2.2.0') @@ -11,11 +11,9 @@ groups=('network-extra') archs=('i686' 'x86_64') backup=(etc/httpd/conf/$pkgname.conf) up2date="lynx -dump 'http://www.fastcgi.com/dist/?m=D'|grep mod_fastcgi-[0-9\.]*\.tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://www.fastcgi.com/dist/$pkgname-$pkgver.tar.gz $pkgname.conf \ - $pkgname-$pkgver-apache22.diff) -sha1sums=('a56be62a3f08262ae187989f5dacb3464a030e2e' \ - '2cf6e51e2c58e24c162f0d0fd9336967fe3561a9' \ - '68cae1d9bd82099000a89e2a6abdad9846ef4211') +source=(http://www.fastcgi.com/dist/$pkgname-$pkgver.tar.gz $pkgname.conf) +sha1sums=('87d408388fc0349e0831e6a6b50dc686dcdb5104' \ + '2cf6e51e2c58e24c162f0d0fd9336967fe3561a9') build() { @@ -29,4 +27,4 @@ build() Ffile /etc/httpd/conf/modules.d/$pkgname.conf } -# optimalization ok +# optimization ok diff --git a/source/network-extra/mod_fastcgi/mod_fastcgi-2.4.2-apache22.diff b/source/network-extra/mod_fastcgi/mod_fastcgi-2.4.2-apache22.diff deleted file mode 100644 index 66276d8..0000000 --- a/source/network-extra/mod_fastcgi/mod_fastcgi-2.4.2-apache22.diff +++ /dev/null @@ -1,52 +0,0 @@ -diff -ruN mod_fastcgi-2.4.2/fcgi.h mod_fastcgi-2.4.2-ap22/fcgi.h ---- mod_fastcgi-2.4.2/fcgi.h 2003-02-04 00:07:37.000000000 +0100 -+++ mod_fastcgi-2.4.2-ap22/fcgi.h 2005-12-07 21:05:55.000000000 +0100 -@@ -73,6 +73,36 @@ - #define ap_reset_timeout(a) - #define ap_unblock_alarms() - -+/* starting with apache 2.2 the backward-compatibility defines for -+ * 1.3 APIs are not available anymore. Define them ourselves here. -+ */ -+#ifndef ap_copy_table -+ -+#define ap_copy_table apr_table_copy -+#define ap_cpystrn apr_cpystrn -+#define ap_destroy_pool apr_pool_destroy -+#define ap_isspace apr_isspace -+#define ap_make_array apr_array_make -+#define ap_make_table apr_table_make -+#define ap_null_cleanup apr_pool_cleanup_null -+#define ap_palloc apr_palloc -+#define ap_pcalloc apr_pcalloc -+#define ap_psprintf apr_psprintf -+#define ap_pstrcat apr_pstrcat -+#define ap_pstrdup apr_pstrdup -+#define ap_pstrndup apr_pstrndup -+#define ap_push_array apr_array_push -+#define ap_register_cleanup apr_pool_cleanup_register -+#define ap_snprintf apr_snprintf -+#define ap_table_add apr_table_add -+#define ap_table_do apr_table_do -+#define ap_table_get apr_table_get -+#define ap_table_set apr_table_set -+#define ap_table_setn apr_table_setn -+#define ap_table_unset apr_table_unset -+ -+#endif /* defined(ap_copy_table) */ -+ - #if (defined(HAVE_WRITEV) && !HAVE_WRITEV && !defined(NO_WRITEV)) || defined WIN32 - #define NO_WRITEV - #endif -diff -ruN mod_fastcgi-2.4.2/Makefile.AP2 mod_fastcgi-2.4.2-ap22/Makefile.AP2 ---- mod_fastcgi-2.4.2/Makefile.AP2 2002-07-29 03:36:34.000000000 +0200 -+++ mod_fastcgi-2.4.2-ap22/Makefile.AP2 2005-12-07 20:27:50.000000000 +0100 -@@ -20,8 +20,6 @@ - - all: local-shared-build - --install: install-modules -- - clean: - -rm -f *.o *.lo *.slo *.la - From priyank at frugalware.org Tue Nov 13 13:49:56 2007 From: priyank at frugalware.org (Priyank) Date: Tue Nov 13 13:49:58 2007 Subject: [Frugalware-git] frugalware-current: pybluez-0.14-1-i686 Message-ID: <20071113124956.3EE8311901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51a7459dc4c4a2b11cadd14479c8d1f654f965fc commit 51a7459dc4c4a2b11cadd14479c8d1f654f965fc Author: Priyank Date: Tue Nov 13 18:18:26 2007 +0530 pybluez-0.14-1-i686 * Version bump diff --git a/source/lib-extra/pybluez/FrugalBuild b/source/lib-extra/pybluez/FrugalBuild index d404120..d205caa 100644 --- a/source/lib-extra/pybluez/FrugalBuild +++ b/source/lib-extra/pybluez/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: cs-cam pkgname=pybluez -pkgver=0.13 -pkgrel=4 +pkgver=0.14 +pkgrel=1 pkgdesc="Python wrapper for bluez-libs" url="http://org.csail.mit.edu/pybluez" depends=('bluez-libs>=3.22' 'python') @@ -13,6 +13,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://org.csail.mit.edu/pybluez/download.html | grep -o -m 1 'pybluez-src-[0-9\.]\+[0-9]' | sed 's/pybluez-src-//g'" source=($url/release/pybluez-src-$pkgver.tar.gz) -sha1sums=('d1ae6e3e8e44f2d456215b980e668c336c991c9e') +sha1sums=('5c05f0c4429565c3d54e8e943fed320f88cb195a') # optimization OK From priyank at frugalware.org Tue Nov 13 14:02:38 2007 From: priyank at frugalware.org (Priyank) Date: Tue Nov 13 14:02:40 2007 Subject: [Frugalware-git] frugalware-current: tea-17.4.1-1-i686 Message-ID: <20071113130238.7324511901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a621586454aef8611697f763a2cc6cfa8c836867 commit a621586454aef8611697f763a2cc6cfa8c836867 Author: Priyank Date: Tue Nov 13 18:30:47 2007 +0530 tea-17.4.1-1-i686 * Version bump diff --git a/source/gnome-extra/tea/FrugalBuild b/source/gnome-extra/tea/FrugalBuild index ff40141..1154c5a 100644 --- a/source/gnome-extra/tea/FrugalBuild +++ b/source/gnome-extra/tea/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=tea -pkgver=17.3.5 +pkgver=17.4.1 pkgrel=1 pkgdesc="TEA is a GTK2-based text editor for Linux and *BSD." _F_sourceforge_name="tea" @@ -20,7 +20,7 @@ _F_desktop_name=Tea _F_desktop_icon=tea.png _F_desktop_categories="Utility;Editor;" _F_cd_path="$pkgname-$pkgver" -sha1sums=('ddb205eebd8f51c7a4437c8d534dc486a1effe14') +sha1sums=('13e703239555378e507bdcaf601e73415d001f23') build() { From vmiklos at frugalware.org Tue Nov 13 14:49:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 14:49:27 2007 Subject: [Frugalware-git] frugalware-current: irssistats-0.75-1-i686 Message-ID: <20071113134925.0502611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c8bb7c9cbf8cf9cf05122dd414f3f1f627501591 commit c8bb7c9cbf8cf9cf05122dd414f3f1f627501591 Author: Miklos Vajna Date: Tue Nov 13 14:48:43 2007 +0100 irssistats-0.75-1-i686 version bump diff --git a/source/network-extra/irssistats/FrugalBuild b/source/network-extra/irssistats/FrugalBuild index f7dbf42..519634b 100644 --- a/source/network-extra/irssistats/FrugalBuild +++ b/source/network-extra/irssistats/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=irssistats -pkgver=0.74 +pkgver=0.75 pkgrel=1 pkgdesc="Generates HTML IRC stats based on irssi logs." url="http://royale.zerezo.com/irssistats/" @@ -11,7 +11,7 @@ groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('4fbdc4ad4480ac5239c6d662a70fba71d4d3f440') +sha1sums=('c66acaf1abce99b7ec9186263dbe445f3d742384') build() { From vmiklos at frugalware.org Tue Nov 13 15:00:41 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 15:00:43 2007 Subject: [Frugalware-git] frugalware-current: man-pages-fr-2.51.0-1-i686 Message-ID: <20071113140041.4FA2911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b57284b453e622b3ec500155d638ebaa204c2c10 commit b57284b453e622b3ec500155d638ebaa204c2c10 Author: Miklos Vajna Date: Tue Nov 13 15:00:11 2007 +0100 man-pages-fr-2.51.0-1-i686 version bump diff --git a/source/locale-extra/man-pages-fr/FrugalBuild b/source/locale-extra/man-pages-fr/FrugalBuild index f6c1158..facb54f 100644 --- a/source/locale-extra/man-pages-fr/FrugalBuild +++ b/source/locale-extra/man-pages-fr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=man-pages-fr -pkgver=2.50.0 +pkgver=2.51.0 pkgrel=1 pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" From crazy at frugalware.org Tue Nov 13 15:03:42 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 13 15:03:43 2007 Subject: [Frugalware-git] frugalware-current: arts-1.5.8-2-i686 Message-ID: <20071113140342.19B2611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78c8e7b04dc903a576f6532ba4129109c91608a0 commit 78c8e7b04dc903a576f6532ba4129109c91608a0 Author: crazy Date: Tue Nov 13 15:02:26 2007 +0100 arts-1.5.8-2-i686 * rebuild with latest glib2 * fix CXXFLAGS * make the BACKEND look for .so and not .la files diff --git a/source/xmultimedia/arts/FrugalBuild b/source/xmultimedia/arts/FrugalBuild index 03491e6..d3d38e7 100644 --- a/source/xmultimedia/arts/FrugalBuild +++ b/source/xmultimedia/arts/FrugalBuild @@ -4,14 +4,22 @@ pkgname=arts pkgver=1.5.8 -pkgrel=1 +pkgrel=2 pkgdesc="Analog realtime synthesizer" groups=('xmultimedia') archs=('i686' 'x86_64') depends=('libstdc++' 'qt>=3.3.8-3' 'libvorbis' 'libmad' 'glib2' 'jack' 'alsa-lib' 'audiofile') +_F_kde_reconf=1 Finclude kde -Fconfopts="$Fconfopts --with-alsa --without-esd --with-jack --with-audiofile" -sha1sums=('190162c2075ee4ebaac569c61b161147c3505690') +source=($source avoid_la_files.diff) +Fconfopts="$Fconfopts --with-alsa --without-esd \ + --with-jack --enable-threading \ + --disable-rpath" +sha1sums=('190162c2075ee4ebaac569c61b161147c3505690' \ + '2ac2a82d06057e8c3dbca12a4ffa41d2bd3fcde0') +# lol +export CXXFLAGS="$CXXFLAGS -DNDEBUG" +export CFLAGS="$CXXFLAGS" # optimization OK diff --git a/source/xmultimedia/arts/avoid_la_files.diff b/source/xmultimedia/arts/avoid_la_files.diff new file mode 100644 index 0000000..7c592d6 --- /dev/null +++ b/source/xmultimedia/arts/avoid_la_files.diff @@ -0,0 +1,26 @@ +--- artsc/Makefile.am ++++ artsc/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -DARTSC_BACKEND='"$(libdir)/libartscbackend.la"' ++AM_CFLAGS = -DARTSC_BACKEND='"$(libdir)/libartscbackend.so"' + AM_CPPFLAGS = -DCOMPILING_ARTSC + lib_LTLIBRARIES = libartsc.la libartscbackend.la libartsdsp.la libartsdsp_st.la + FLOWLIBS = $(top_builddir)/flow/libartsflow.la +--- mcop/extensionloader.cc ++++ mcop/extensionloader.cc +@@ -56,7 +56,14 @@ + /* this will catch all startup classes here */ + StartupManager::setExtensionLoader(this); + +- lt_dlinit(); ++ lt_dlinit(); ++ ++ string::size_type len = dlfilename.length(); ++ if (len > 0 && dlfilename[len-1] == 'a' && dlfilename[len-2] == 'l') { ++ dlfilename[len-1] = 'o'; ++ dlfilename[len-2] = 's'; ++ } ++ + handle = lt_dlopen(dlfilename.c_str()); + + StartupManager::setExtensionLoader(0); From vmiklos at frugalware.org Tue Nov 13 15:11:36 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 15:11:38 2007 Subject: [Frugalware-git] pacman-g2: updates for 3.6.4 Message-ID: <20071113141136.E4D8F11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f838db9f81db9a1f0634b4e0692266c1994d2e70 commit f838db9f81db9a1f0634b4e0692266c1994d2e70 Author: Miklos Vajna Date: Tue Nov 13 15:11:20 2007 +0100 updates for 3.6.4 diff --git a/NEWS b/NEWS index 5007adf..30e994c 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.6.4 - speeded up sorting dependencies (this especially affects mkiso) + - converted documentation to asciidoc + - *sync now dies if the fpm is corrupted + - new utility: versort to sort versions from commandline + - new --noarch option to disable arch check 3.6.3 - documentation update (README) - if a package is installed as a dependency, then -S package will update its reason to "installed explicitly" diff --git a/configure.ac b/configure.ac index 527b706..c7a266f 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.3, [frugalware-devel@frugalware.org], pacman-g2) +AC_INIT([pacman-g2 package manager], 3.6.4, [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=.3 +PM_MICRO_VERSION_SUFFIX=.4 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 boobaa at frugalware.org Tue Nov 13 15:14:11 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Nov 13 15:14:13 2007 Subject: [Frugalware-git] frugalware-current: phpmyadmin-2.11.2.1-1-i686 Message-ID: <20071113141411.071C111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e22f1116d4f73b1a1f7397e712d1b59a0cc84df commit 4e22f1116d4f73b1a1f7397e712d1b59a0cc84df Author: CSÉCSY László Date: Tue Nov 13 15:14:02 2007 +0100 phpmyadmin-2.11.2.1-1-i686 version bump closes #2578 in -current diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild index dfd4ac6..d401dc5 100644 --- a/source/network-extra/phpmyadmin/FrugalBuild +++ b/source/network-extra/phpmyadmin/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSÉCSY László pkgname=phpmyadmin -pkgver=2.11.2 +pkgver=2.11.2.1 pkgrel=1 pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW." _F_sourceforge_ext="-all-languages.tar.bz2" @@ -29,4 +29,4 @@ build() Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2 } -sha1sums=('fc9bfd14f64af71084ba884d371461eea18ce5bc') +sha1sums=('a73e5438f041233838e2e940fce14b5b4230133e') From vmiklos at frugalware.org Tue Nov 13 15:41:38 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 15:41:41 2007 Subject: [Frugalware-git] frugalware-current: pacman-g2-3.6.4-1-i686 Message-ID: <20071113144138.2F5F911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06d2cc94343e8c9bea7da39e53cadf6608c36221 commit 06d2cc94343e8c9bea7da39e53cadf6608c36221 Author: Miklos Vajna Date: Tue Nov 13 15:40:43 2007 +0100 pacman-g2-3.6.4-1-i686 - version bump - new makedepend: asciidoc diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 5cd9bf4..1621e7b 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -4,32 +4,35 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=pacman-g2 -pkgver=3.6.3 -Fuse $USE_DEVEL && pkgver=3.6.2.10.g928a3ae -pkgrel=2 +pkgver=3.6.4 +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." 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') -makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono') +makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono' \ + 'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common') Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'intltool') Finclude mono groups=('base' 'chroot-core') 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 \ - http://git.frugalware.org/patches/pacman-g2/5e0c759d50e2eb629a08ebc1944ebfe6b452c9c5.patch) - signatures=("$source.asc" '') + source=($url/releases/$pkgname-$pkgver.tar.gz) + signatures=("$source.asc") else _F_scm_type="git" - _F_scm_url="http://git.frugalware.org/repos/pacman-g2/.git/" + _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" Finclude scm fi +options=('scriptlet') build() { if Fuse $USE_DEVEL; then + (cd ~; mkdir -p git; cd git; git clone git://git.frugalware.org/pub/other/translations) Funpack_scm Fsed '\(^AC_INIT(.*, \)[0-9\.]\+\(, .*\)' "\1$pkgver\2/" configure.ac sh autogen.sh From crazy at frugalware.org Tue Nov 13 16:12:20 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 13 16:12:22 2007 Subject: [Frugalware-git] frugalware-current: lmms-0.3.1-1-i686 Message-ID: <20071113151220.1CA9811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1fd72aee1bccfe9339c6a07abdda18a06797552b commit 1fd72aee1bccfe9339c6a07abdda18a06797552b Author: crazy Date: Tue Nov 13 16:08:41 2007 +0100 lmms-0.3.1-1-i686 * Version bump * moved to xmultimedia-extra * fix for translation detection diff --git a/source/kde-extra/lmms/FrugalBuild b/source/kde-extra/lmms/FrugalBuild deleted file mode 100644 index 7353c05..0000000 --- a/source/kde-extra/lmms/FrugalBuild +++ /dev/null @@ -1,19 +0,0 @@ -# Compiling Time: 0.96 SBU -# Maintainer: crazy - -pkgname=lmms -pkgver=0.3.0 -pkgrel=1 -pkgdesc="Linux MultiMedia Studio." -depends=('sdl_sound' 'jack' 'libsamplerate' 'qt') -makedepends=('ladspa_sdk') -options=('scriptlet') -groups=('kde-extra' 'xmultimedia-extra') -archs=('i686' 'x86_64') -_F_sourceforge_ext=".tar.bz2" -Finclude sourceforge -Fconfopts="$Fconfopts --with-linux --without-singerbot" -sha1sums=('26730f4ee83173467c26c710f70aadc4855395e3') - - -# optimization OK diff --git a/source/xmultimedia-extra/lmms/FrugalBuild b/source/xmultimedia-extra/lmms/FrugalBuild new file mode 100644 index 0000000..e87bff1 --- /dev/null +++ b/source/xmultimedia-extra/lmms/FrugalBuild @@ -0,0 +1,33 @@ +# Compiling Time: 0.96 SBU +# Maintainer: crazy + +pkgname=lmms +pkgver=0.3.1 +pkgrel=1 +pkgdesc="Linux MultiMedia Studio." +depends=('sdl_sound' 'jack' 'libsamplerate' 'qt') +makedepends=('ladspa_sdk') +options=('scriptlet') +groups=('xmultimedia-extra') +archs=('i686' 'x86_64') +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge +source=($source fix-transaltion-detection.patch) +sha1sums=('e0418ea00367e4382721725021f3dceca7c8bb6b' \ + '8cc26dcf2ba498a5902e6b9b7a7dcd78d98ed55b') + +build() +{ + Fcd + mkdir m4 || Fdie + Fpatchall + Fautoreconf + Fmake \ + --with-linux \ + --without-singerbot \ + --without-vst \ + --enable-hqsinc + Fmakeinstall +} + +# optimization OK diff --git a/source/xmultimedia-extra/lmms/fix-transaltion-detection.patch b/source/xmultimedia-extra/lmms/fix-transaltion-detection.patch new file mode 100644 index 0000000..c713eeb --- /dev/null +++ b/source/xmultimedia-extra/lmms/fix-transaltion-detection.patch @@ -0,0 +1,16 @@ +diff -Naur lmms-0.3.1/acinclude.m4 lmms-0.3.1-p/acinclude.m4 +--- lmms-0.3.1/acinclude.m4 2007-08-23 22:52:38.000000000 +0200 ++++ lmms-0.3.1-p/acinclude.m4 2007-11-13 15:27:43.000000000 +0100 +@@ -65,10 +65,10 @@ + AC_MSG_CHECKING([Qt translations]) + case "${QT_VER}" in + 3*) +- QT_TRANSLATIONS_SEARCH="/usr/share/qt3 /usr/local/qt3 /usr/local/qt31 /usr/local/qt32 /usr/local/qt33 /usr/local/qt" ++ QT_TRANSLATIONS_SEARCH="$QTDIR /usr/share/qt3 /usr/local/qt3 /usr/local/qt31 /usr/local/qt32 /usr/local/qt33 /usr/local/qt" + ;; + 4*) +- QT_TRANSLATIONS_SEARCH="/usr/share/qt4 /usr/local/qt /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.1.0" ++ QT_TRANSLATIONS_SEARCH="$QTDIR /usr/share/qt4 /usr/local/qt /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.1.0" + ;; + esac + for i in $QT_TRANSLATIONS_SEARCH ; do From vmiklos at frugalware.org Tue Nov 13 16:25:06 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 16:25:09 2007 Subject: [Frugalware-git] pacman-tools: mkiso: be less verbose in prepare() Message-ID: <20071113152506.6829211901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=c58b1b66937229970742af6b728d4bbff1fb7cb4 commit c58b1b66937229970742af6b728d4bbff1fb7cb4 Author: Miklos Vajna Date: Tue Nov 13 16:24:49 2007 +0100 mkiso: be less verbose in prepare() diff --git a/mkiso/mkiso.c b/mkiso/mkiso.c index b7da1a0..4f7e797 100644 --- a/mkiso/mkiso.c +++ b/mkiso/mkiso.c @@ -428,7 +428,7 @@ int prepare(volume_t *volume, char *tmproot, int countonly, int stable) if(pacman_initialize(tmproot) == -1) fprintf(stderr, "failed to initilize pacman library (%s)\n", pacman_strerror(pm_errno)); pacman_set_option(PM_OPT_LOGCB, (long)cb_log); - pacman_set_option(PM_OPT_LOGMASK, (long)-1); + pacman_set_option(PM_OPT_LOGMASK, (long)PM_LOG_WARNING); if((db_local = pacman_db_register("local"))==NULL) fprintf(stderr, "could not register 'local' database (%s)\n", pacman_strerror(pm_errno)); if(stable) From vmiklos at frugalware.org Tue Nov 13 16:38:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 16:38:44 2007 Subject: [Frugalware-git] pacman-tools: mkiso: we no longer receive debug messages, so add some output about what do we do Message-ID: <20071113153841.027EE11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=d04fc35150ea7a4be24dc1a47ccc2702ed64e7a2 commit d04fc35150ea7a4be24dc1a47ccc2702ed64e7a2 Author: Miklos Vajna Date: Tue Nov 13 16:38:35 2007 +0100 mkiso: we no longer receive debug messages, so add some output about what do we do diff --git a/mkiso/mkiso.c b/mkiso/mkiso.c index 4f7e797..f8fe139 100644 --- a/mkiso/mkiso.c +++ b/mkiso/mkiso.c @@ -359,6 +359,7 @@ PM_DB *db_register(volume_t *volume, char *treename) PM_DB *db; char *ptr; + PRINTF("registering database %s...", treename); if(!(db = pacman_db_register(treename))) { fprintf(stderr, "could not register '%s' database (%s)\n", treename, pacman_strerror(pm_errno)); @@ -372,6 +373,7 @@ PM_DB *db_register(volume_t *volume, char *treename) fprintf(stderr, "failed to update %s (%s)\n", treename, pacman_strerror(pm_errno)); return(NULL); } + PRINTF(" done.\n"); return(db); } @@ -460,6 +462,7 @@ int prepare(volume_t *volume, char *tmproot, int countonly, int stable) isopkgs = g_list_sort(isopkgs, sort_isopkgs); add_targets(); + PRINTF("preparing the transaction..."); if(pacman_trans_prepare(&junk) == -1) { fprintf(stderr, "failed to prepare transaction (%s)\n", pacman_strerror(pm_errno)); @@ -482,6 +485,7 @@ int prepare(volume_t *volume, char *tmproot, int countonly, int stable) pacman_trans_release(); return(1); } + PRINTF(" done.\n"); mkiso(volume, countonly, stable); pacman_trans_release(); @@ -554,7 +558,9 @@ int main(int argc, char **argv) if(prepare(g_list_nth_data(volumes, i), tmproot, countonly, stable)) break; + PRINTF("cleaning up..."); rmrf(tmproot); + PRINTF(" done.\n"); free(fst_root); free(fst_ver); free(fst_codename); diff --git a/mkiso/mkiso.h b/mkiso/mkiso.h index 7cccf5a..182149a 100644 --- a/mkiso/mkiso.h +++ b/mkiso/mkiso.h @@ -22,6 +22,11 @@ #define CD_SIZE 655360 #define DVD_SIZE 4360350 +#define PRINTF(fmt, args...) do { \ + printf(fmt, ##args); \ + fflush(stdout); \ +} while(0) + typedef struct __volume_t { char *arch; From vmiklos at frugalware.org Tue Nov 13 16:47:58 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 16:48:01 2007 Subject: [Frugalware-git] frugalware-current: docbook-xsl-1.73.2-1-i686 Message-ID: <20071113154758.BD6F811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f6fef8438037717c51969fc4b7b21cdc16c9e1d commit 5f6fef8438037717c51969fc4b7b21cdc16c9e1d Author: Miklos Vajna Date: Tue Nov 13 16:47:36 2007 +0100 docbook-xsl-1.73.2-1-i686 version bump diff --git a/source/apps/docbook-xsl/FrugalBuild b/source/apps/docbook-xsl/FrugalBuild index d7eea81..b288587 100644 --- a/source/apps/docbook-xsl/FrugalBuild +++ b/source/apps/docbook-xsl/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=docbook-xsl -pkgver=1.73.0 -pkgrel=4 +pkgver=1.73.2 +pkgrel=1 pkgdesc="XML stylesheets for Docbook-xml transformations." depends=('libxml2' 'libxslt') rodepends=('sed') @@ -13,7 +13,7 @@ _F_sourceforge_dirname="docbook" Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=21935'|grep -m1 'docbook-xsl-\(.*\).tar.gz'|sed 's/.*xsl-\(.*\).t.*/\1/'" source=($source docbook-xsl-manpages-charmap.patch) -sha1sums=('508872e782c4ada3929d43fe10bab73d2e969866' \ +sha1sums=('373120dd94f468e455d022e17ce20c087f929832' \ 'c2848edfd21b171b936e471410ed98485fb15a25') build() { From crazy at frugalware.org Tue Nov 13 16:55:59 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 13 16:56:01 2007 Subject: [Frugalware-git] frugalware-current: wine-0.9.49-1-i686 Message-ID: <20071113155559.B0D0511901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0243eed388d00cf4e819b165e27902f41429c4d8 commit 0243eed388d00cf4e819b165e27902f41429c4d8 Author: crazy Date: Tue Nov 13 16:50:39 2007 +0100 wine-0.9.49-1-i686 * Version bump diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild index 93f5f84..c5be566 100644 --- a/source/xapps/wine/FrugalBuild +++ b/source/xapps/wine/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=wine -pkgver=0.9.48 +pkgver=0.9.49 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=('6b230d2767eb7f47b9c249160edd6238b525b0b6' \ +sha1sums=('ddee8ff8229ec0df45a5254820acd3adaffecc94' \ 'a9c70a49cef90cf60c2e90e63753858387f7117a' \ 'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \ '8b0f7b52885c8d78ba3096a16e9caff60ffe624f') From krics at linuxforum.hu Tue Nov 13 17:15:47 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Nov 13 17:15:50 2007 Subject: [Frugalware-git] frugalware-current: gnome-vfs-2.20.1-1-x86_64 Message-ID: <20071113161547.7AA9C11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79c1cbd5a7c13380088aa42e8c6cd567e9f58876 commit 79c1cbd5a7c13380088aa42e8c6cd567e9f58876 Author: Christian Hamar alias krix Date: Tue Nov 13 17:14:51 2007 +0100 gnome-vfs-2.20.1-1-x86_64 * Version bump diff --git a/source/gnome/gnome-vfs/FrugalBuild b/source/gnome/gnome-vfs/FrugalBuild index c90f34e..255d0f4 100644 --- a/source/gnome/gnome-vfs/FrugalBuild +++ b/source/gnome/gnome-vfs/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=gnome-vfs -pkgver=2.20.0 +pkgver=2.20.1 pkgrel=1 pkgdesc="GNOME Virtual File System" url="http://www.gnome.org/" @@ -25,7 +25,7 @@ source=(${source[@]} 00-default-browser.patch \ resolve_fstab_symlinks.patch \ gnome-vfs-2.8.2-schema_about_for_upstream.patch \ gnome-vfs-2.9.90-modules-conf.patch) -sha1sums=('3ce1959b820f420f67e18e6f9da7bc9a87dd4349' \ +sha1sums=('03afa10e84425f7f38e05f0db0ecf55ae5fb7b15' \ 'c83d61988a083c3906b0ce806bb41beb7b628af2' \ '6570dfb9cb50c8f4ca03a7bcf6c4cf8b0e523214' \ 'e94438c68532a1c36a7b5f0c305ab065695d626a' \ From vmiklos at frugalware.org Tue Nov 13 17:28:25 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 17:28:27 2007 Subject: [Frugalware-git] frugalware-current: kvm-52-1-i686 Message-ID: <20071113162825.518CC11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2664fe97c9db231d54526659e483d2136e93d688 commit 2664fe97c9db231d54526659e483d2136e93d688 Author: Miklos Vajna Date: Tue Nov 13 17:27:50 2007 +0100 kvm-52-1-i686 - version bump - change m8r to me diff --git a/source/xapps-extra/kvm/FrugalBuild b/source/xapps-extra/kvm/FrugalBuild index 15f1d23..f4a8c22 100644 --- a/source/xapps-extra/kvm/FrugalBuild +++ b/source/xapps-extra/kvm/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.08 SBU -# Maintainer: AlexExtreme +# Maintainer: VMiklos +# Contributor: AlexExtreme pkgname=kvm -pkgver=51 +pkgver=52 pkgrel=1 pkgdesc="KVM is a kernel based virtual machine" url="http://kvm.sourceforge.net" @@ -11,12 +12,15 @@ archs=('i686') Finclude sourceforge kernel-version depends=("kernel>=$_F_kernelver_ver" 'sdl' 'zlib') makedepends=("kernel-source>=$_F_kernelver_ver" 'gcc-3.3') -sha1sums=('25423f8ade5203d9b3b63ae72dd7ecd30dfe597a') +sha1sums=('8dadaf64564f30148245bf2fdb78709f57536bcf') Fconfopts="--prefix=$Fprefix" # no changelog in the tarball, you can reach it here: # http://kvm.qumranet.com/kvmwiki/ChangeLog +# i took this package as i maintain qemu, too but i don't have a kvm-able +# machine, so if you want to take this package, feel free to contact me + build() { Fsed 'datadir="$prefix/share/qemu"' 'datadir="$prefix/share/qemu-kvm"' \ qemu/configure From krics at linuxforum.hu Tue Nov 13 17:35:48 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Nov 13 17:35:51 2007 Subject: [Frugalware-git] frugalware-current: xscreensaver-5.04-1-x86_64 Message-ID: <20071113163548.88D0411901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a726ab076af8d689c0234366b51bcf43bb25fe72 commit a726ab076af8d689c0234366b51bcf43bb25fe72 Author: Christian Hamar alias krix Date: Tue Nov 13 17:33:27 2007 +0100 xscreensaver-5.04-1-x86_64 * Version bump * Dropped useless patch diff --git a/source/xlib/xscreensaver/FrugalBuild b/source/xlib/xscreensaver/FrugalBuild index b101221..d76779f 100644 --- a/source/xlib/xscreensaver/FrugalBuild +++ b/source/xlib/xscreensaver/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=xscreensaver -pkgver=5.03 -pkgrel=3 +pkgver=5.04 +pkgrel=1 pkgdesc="A screen saver and locker for the X Window System." url="http://www.jwz.org/xscreensaver" rodepends=('xscreensaver-data') @@ -13,7 +13,7 @@ makedepends=('bc') groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html |grep ]$pkgname|sed -ne 's/.*r-\(.*\)\.t.*/\1/;1 p'" -source=($url/$pkgname-$pkgver.tar.gz $pkgname-4.22-head.diff) +source=($url/$pkgname-$pkgver.tar.gz) subpkgs=('xscreensaver-data') subdescs=('Screensavers for Xscreensaver') @@ -23,7 +23,6 @@ subarchs=('i686 x86_64') build() { - Fpatchall Fmake --with-shadow --with-jpeg --with-gl --without-pam make install_prefix=$Fdestdir install || Fdie Frm usr/share/man/man6/barcode.6 @@ -34,6 +33,6 @@ build() Fsplit xscreensaver-data /usr/share/xscreensaver/config } -sha1sums=('e283a52faf6148273a82a9e5c9ed70c5722cdcb8' \ - 'aff9f153023249c8c82bfaf35f1552610747de78') +sha1sums=('1733ba7ee46b758453ef9ded0fc4ee084b7420a9') + # optimization OK diff --git a/source/xlib/xscreensaver/xscreensaver-4.22-head.diff b/source/xlib/xscreensaver/xscreensaver-4.22-head.diff deleted file mode 100644 index 728581d..0000000 --- a/source/xlib/xscreensaver/xscreensaver-4.22-head.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur xscreensaver-4.21.orig/Makefile.in xscreensaver-4.21/Makefile.in ---- xscreensaver-4.21.orig/Makefile.in 2005-03-02 11:31:07.000000000 +0100 -+++ xscreensaver-4.21/Makefile.in 2005-03-22 15:40:52.000000000 +0100 -@@ -282,7 +282,7 @@ - diff -U0 download.html $$TMP ; \ - echo '' ; \ - \ -- OLDEST=`ls xscreensaver*.tar.gz | head -1` ; \ -+ OLDEST=`ls xscreensaver*.tar.gz | head -n 1` ; \ - echo -n "Delete $$DEST/$$OLDEST? "; \ - read line; \ - if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then \ -diff -Naur xscreensaver-4.21.orig/configure xscreensaver-4.21/configure ---- xscreensaver-4.21.orig/configure 2005-03-21 08:18:18.000000000 +0100 -+++ xscreensaver-4.21/configure 2005-03-22 15:41:15.000000000 +0100 -@@ -21259,7 +21259,7 @@ - - rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ - sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ -- head -1` -+ head -n 1` - - - if test \! -z "$rpmv" ; then -diff -Naur xscreensaver-4.21.orig/configure.in xscreensaver-4.21/configure.in ---- xscreensaver-4.21.orig/configure.in 2005-03-21 07:43:24.000000000 +0100 -+++ xscreensaver-4.21/configure.in 2005-03-22 15:41:26.000000000 +0100 -@@ -3710,7 +3710,7 @@ - changequote(X,Y) - rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ - sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ -- head -1` -+ head -n 1` - changequote([,]) - - if test \! -z "$rpmv" ; then From hermier at frugalware.org Tue Nov 13 17:52:36 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 13 17:52:38 2007 Subject: [Frugalware-git] frugalware-current: utils.sh Message-ID: <20071113165236.4CDF511901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=641d6c1590e7fddf008a3128585a9bd15418050b commit 641d6c1590e7fddf008a3128585a9bd15418050b Author: Michel Hermier Date: Tue Nov 13 17:51:55 2007 +0100 utils.sh * Fsort now use versort when available. diff --git a/source/include/util.sh b/source/include/util.sh index 73f2220..b05e3c8 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -676,9 +676,15 @@ Facu() { ### # * Fsort(): Similar to sort, but handles versions (i.e. 1.9 vs 1.10 vs 2.0) -# correctly. Uses vercmp from pacman. Reads the version list from stdin. +# correctly. Uses versort from pacman. Reads the version list from stdin. +# Uses vercmp from pacman when versort is not found. ### Fsort() { + if [ -x /usr/bin/versort ]; then + /usr/bin/versort + else + + # Deprecated method of sorting, it's too much slow local i= items= left=0 items=( `cat|tr '\n' ' '` ) while [[ ${left} -lt ${#items[@]} ]] ; do @@ -695,6 +701,8 @@ Fsort() { left=$(( ${left} + 1 )) done echo ${items[@]}|sed 's/ /\n/g' + + fi } ### From vmiklos at frugalware.org Tue Nov 13 18:18:39 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 18:18:42 2007 Subject: [Frugalware-git] frugalware-current: perl-glib-1.162-1-i686 Message-ID: <20071113171839.862D211901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c399b02f8fb2832a946223583b466de7f37467d6 commit c399b02f8fb2832a946223583b466de7f37467d6 Author: Miklos Vajna Date: Tue Nov 13 18:18:10 2007 +0100 perl-glib-1.162-1-i686 version bump diff --git a/source/devel-extra/perl-glib/FrugalBuild b/source/devel-extra/perl-glib/FrugalBuild index fc378b8..83e94bf 100644 --- a/source/devel-extra/perl-glib/FrugalBuild +++ b/source/devel-extra/perl-glib/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Zsolt Szalai pkgname=perl-glib -pkgver=1.161 +pkgver=1.162 pkgrel=1 pkgdesc="Perl wrappers for the GLib utility and Object libraries" url="http://search.cpan.org/search?query=Glib&mode=all" @@ -14,5 +14,5 @@ up2date="lynx -dump 'http://search.cpan.org/search?query=Glib&mode=all'|grep \"G source=(http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Glib-$pkgver.tar.gz) _F_cd_path="Glib-$pkgver" -sha1sums=('cf014ff24e3b827e10016f1245811ee91139f4d3') +sha1sums=('72c246c51102e3a62a7ffcd934ebdf0f433800f1') # optimization OK From hermier at frugalware.org Tue Nov 13 18:20:07 2007 From: hermier at frugalware.org (Michel Hermier) Date: Tue Nov 13 18:20:10 2007 Subject: [Frugalware-git] frugalware-current: makepkg.txt Message-ID: <20071113172007.8E84111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bcd96815dc59168c0eef108aebbc780e482c9112 commit bcd96815dc59168c0eef108aebbc780e482c9112 Author: Michel Hermier Date: Tue Nov 13 18:19:01 2007 +0100 makepkg.txt * Change the value fst_root so that it is the same as getting involved. Also added a note saying that it can also be any user repository. diff --git a/docs/makepkg.txt b/docs/makepkg.txt index bd289b3..31f68c3 100644 --- a/docs/makepkg.txt +++ b/docs/makepkg.txt @@ -93,9 +93,11 @@ writable as a user, of course). The '~/.repoman.conf' file should look like: + ----------------------------- -fst_root=/user/root/directory +fst_root=~/git ----------------------------- + +Thought fst_root can point to any directory writeable by the user. ++ And finally to get the FST, issue: + ------------- From vmiklos at frugalware.org Tue Nov 13 18:26:50 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 18:26:54 2007 Subject: [Frugalware-git] frugalware-current: perl-encode-hanextra-0.23-1-i686 Message-ID: <20071113172650.B217D11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8b841a7adf2cdc1fd189267521c62705bedcbbe2 commit 8b841a7adf2cdc1fd189267521c62705bedcbbe2 Author: Miklos Vajna Date: Tue Nov 13 18:26:38 2007 +0100 perl-encode-hanextra-0.23-1-i686 version bump diff --git a/source/devel-extra/perl-encode-hanextra/FrugalBuild b/source/devel-extra/perl-encode-hanextra/FrugalBuild index 44fd56e..55dee31 100644 --- a/source/devel-extra/perl-encode-hanextra/FrugalBuild +++ b/source/devel-extra/perl-encode-hanextra/FrugalBuild @@ -3,10 +3,9 @@ _F_perl_name=Encode-HanExtra _F_perl_author=A/AU/AUDREYT -pkgver=0.21 +pkgver=0.23 pkgdesc="Extra sets of Chinese encodings" Finclude perl archs=('i686' 'x86_64') -sha1sums=('8b4c3fbee0b224048daa56d60f4b22773af0c16a') - +sha1sums=('52d64ecaf29f38d9b04957caeb5da3ef62590336') # optimization OK From vmiklos at frugalware.org Tue Nov 13 18:43:37 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 13 18:43:41 2007 Subject: [Frugalware-git] frugalware-current: ccal-0.6-1-i686 Message-ID: <20071113174337.E711811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd28eb49d4e92683ddfa8819d767052d63b12f8f commit bd28eb49d4e92683ddfa8819d767052d63b12f8f Author: Miklos Vajna Date: Tue Nov 13 18:43:27 2007 +0100 ccal-0.6-1-i686 new package diff --git a/source/apps-extra/ccal/FrugalBuild b/source/apps-extra/ccal/FrugalBuild new file mode 100644 index 0000000..187e361 --- /dev/null +++ b/source/apps-extra/ccal/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0 SBU +# Maintainer: VMiklos + +pkgname=ccal +pkgver=0.6 +pkgrel=1 +pkgdesc="Curses calendar / diary / journal & todo list application." +url="http://www.jamiehillman.co.uk/ccal/" +depends=('python') +groups=('apps-extra') +archs=('i686') +up2date="lynx -dump http://ftp.frugalware.org/pub/other/sources/ccal/|Flastarchive .py" +source=(http://ftp.frugalware.org/pub/other/sources/ccal/ccal-$pkgver.py \ + http://ftp.frugalware.org/pub/other/sources/ccal/instructions.htm) +sha1sums=('6969e66fdecb9149d8d853d813fc467a7c8c9cd9' \ + '640fc7e9aff038cb7e0ffe224be7db78ad10b8ff') + +build() +{ + Fexe ccal-$pkgver.py /usr/bin/ccal + Fdoc instructions.htm +} From krics at linuxforum.hu Tue Nov 13 20:07:28 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Nov 13 20:07:30 2007 Subject: [Frugalware-git] frugalware-current: roxterm-1.8.0-1-x86_64 Message-ID: <20071113190728.248E011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eaec12d3d26a49558655fe8ec3dcde8a16ef7379 commit eaec12d3d26a49558655fe8ec3dcde8a16ef7379 Author: Christian Hamar alias krix Date: Tue Nov 13 20:06:50 2007 +0100 roxterm-1.8.0-1-x86_64 * Version bump diff --git a/source/gnome-extra/roxterm/FrugalBuild b/source/gnome-extra/roxterm/FrugalBuild index f78498b..32d1823 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.7.4 +pkgver=1.8.0 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=('4d5d540c8ba70607d5592352218750e2f1256cef') +sha1sums=('ff033784bcc2fa6e566afe7039849052432cbd92') # optimization OK From krics at linuxforum.hu Tue Nov 13 20:11:51 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Nov 13 20:11:52 2007 Subject: [Frugalware-git] frugalware-current: notecase-1.7.2-1-x86_64 Message-ID: <20071113191151.5B85711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2cce1b00562282d069ebd9751378248fe1c1eb78 commit 2cce1b00562282d069ebd9751378248fe1c1eb78 Author: Christian Hamar alias krix Date: Tue Nov 13 20:11:15 2007 +0100 notecase-1.7.2-1-x86_64 * Version bump diff --git a/source/gnome-extra/notecase/FrugalBuild b/source/gnome-extra/notecase/FrugalBuild index fdda781..9b17807 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.6.9 +pkgver=1.7.2 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=('81c73d1d1f885942e67342ac0f7251e3c7b905b1') +sha1sums=('79c47e719a4785de82386bfa81fb6e7d367ee970') # optimization OK From crazy at frugalware.org Wed Nov 14 01:15:34 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 14 01:15:37 2007 Subject: [Frugalware-git] frugalware-current: gpicview-0.1.7-1-i686 Message-ID: <20071114001534.56A3211901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cdc38800a82b228b3517130f7269823bf9c9072d commit cdc38800a82b228b3517130f7269823bf9c9072d Author: crazy Date: Wed Nov 14 01:14:39 2007 +0100 gpicview-0.1.7-1-i686 * Version bump diff --git a/source/xapps-extra/gpicview/FrugalBuild b/source/xapps-extra/gpicview/FrugalBuild index 2b9878e..6941460 100644 --- a/source/xapps-extra/gpicview/FrugalBuild +++ b/source/xapps-extra/gpicview/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Devil505 pkgname=gpicview -pkgver=0.1.5 +pkgver=0.1.7 pkgrel=1 pkgdesc="A simple and fast image viewer for X, from the LXDE project" depends=('gtk+2' 'libxdamage') @@ -13,7 +13,7 @@ Finclude sourceforge options=('scriptlet') groups=('xapps-extra') archs=('i686') -sha1sums=('4e5d73885c6f829aa6e51668402e1bc98a58394b') +sha1sums=('888b80a00f5dc43de39f935b754eb0e132ce2a75') # optimization OK From devil505linux at gmail.com Wed Nov 14 09:50:06 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Nov 14 09:50:30 2007 Subject: [Frugalware-git] frugalware-current: gnome-specimen-0.3.1-1-i686 Message-ID: <20071114085006.DE5D311901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=357a3ba6f0b4d7ff6b781b1006738a5d68b71960 commit 357a3ba6f0b4d7ff6b781b1006738a5d68b71960 Author: Devil505 Date: Wed Nov 14 09:48:07 2007 +0100 gnome-specimen-0.3.1-1-i686 *New Package diff --git a/source/gnome-extra/gnome-specimen/FrugalBuild b/source/gnome-extra/gnome-specimen/FrugalBuild new file mode 100644 index 0000000..81de93b --- /dev/null +++ b/source/gnome-extra/gnome-specimen/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=gnome-specimen +pkgver=0.3.1 +pkgrel=1 +pkgdesc="A simple tool to view and compare fonts installed on your system" +url="http://uwstopia.nl" +depends=('pygtk' 'gnome-python' 'glade' 'gconf') +makedepends=('perl-xml') +_F_gnome_desktop="y" +_F_gnome_iconcache="y" +Finclude gnome-scriptlet +options=('scriptlet') +groups=('gnome-extra') +archs=('i686') +up2date="lynx -dump $url/geek/projects/gnome-specimen/releases/ | Flasttar" +source=($url/geek/projects/gnome-specimen/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('374c2063b75319b1654fdabdc4e9923f94891f53') + + + + + + + From devil505linux at gmail.com Wed Nov 14 10:06:20 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Nov 14 10:06:22 2007 Subject: [Frugalware-git] frugalware-current: gnome-mastermind-0.3-1-i686 Message-ID: <20071114090620.08F2C11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94a251219046a604a9e8482ea442a0cbac56ab1c commit 94a251219046a604a9e8482ea442a0cbac56ab1c Author: Devil505 Date: Wed Nov 14 10:04:55 2007 +0100 gnome-mastermind-0.3-1-i686 *New Package diff --git a/source/gnome-extra/gnome-mastermind/FrugalBuild b/source/gnome-extra/gnome-mastermind/FrugalBuild new file mode 100644 index 0000000..b7c3c68 --- /dev/null +++ b/source/gnome-extra/gnome-mastermind/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling Time: 0.16 SBU +# Maintainer: Devil505 + +pkgname=gnome-mastermind +pkgver=0.3 +pkgrel=1 +pkgdesc="A Mastermind clone for GNOME Desktop" +url="http://www5.autistici.org/gnome-mastermind/" +depends=('gconf' 'libxdamage') +makedepends=('perl-xml' 'gnome-doc-utils') +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +Finclude gnome-scriptlet +options=('scriptlet') +groups=('gnome-extra') +archs=('i686') +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') + +# optimization OK From priyank at frugalware.org Wed Nov 14 14:33:48 2007 From: priyank at frugalware.org (Priyank) Date: Wed Nov 14 14:33:51 2007 Subject: [Frugalware-git] frugalware-current: transmission-0.93-1-i686 Message-ID: <20071114133348.2D31611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=860edf4611addabb339d585627fc47f9b283e1ab commit 860edf4611addabb339d585627fc47f9b283e1ab Author: Priyank Date: Wed Nov 14 19:01:44 2007 +0530 transmission-0.93-1-i686 * Version bump * up2date fix * Fix build() diff --git a/source/xapps-extra/transmission/FrugalBuild b/source/xapps-extra/transmission/FrugalBuild index d10017a..98cebbe 100644 --- a/source/xapps-extra/transmission/FrugalBuild +++ b/source/xapps-extra/transmission/FrugalBuild @@ -2,34 +2,34 @@ # Maintainer: Priyank Gosalia pkgname=transmission -pkgver=0.82 +pkgver=0.93 pkgrel=1 pkgdesc="A free, lightweight BitTorrent Client." url="http://transmission.m0k.org/" depends=('gtk+2' 'gettext' 'openssl') groups=('xapps-extra') archs=('i686') -up2date="lynx -dump -nolist http://download.m0k.org/transmission/files/ | sort -r | grep -m1 tar.gz | sed 's/.*n-\(.*\).t.*/\1/'" -source=(http://download.m0k.org/transmission/files/$pkgname-$pkgver.tar.gz) -sha1sums=('05c4c7b0cf7b1dd6ea504f9ea0c6d84746c9b317') +up2date="lynx -dump -nolist http://download.m0k.org/transmission/files/ | Flasttarbz2" +source=(http://download.m0k.org/transmission/files/$pkgname-$pkgver.tar.bz2) +sha1sums=('5c5e85f1706f37051232a71918a83d441ace7fae') build() { - cd $Fsrcdir - sh configure $Fconfopts + Fcd + Fconf make || Fdie # Install binaries and manpages cd cli - Fexerel /usr/bin/transmissioncli + Fexerel /usr/bin/transmission-cli Fmanrel transmissioncli.1 cd ../gtk - Fexerel /usr/bin/transmission-gtk - Fmanrel transmission-gtk.1 + Fexerel /usr/bin/transmission + Fmanrel transmission.1 # Desktop entry Fmkdir /usr/share/{applications,pixmaps} - Ffilerel transmission-gtk.desktop /usr/share/applications/ + Ffilerel transmission.desktop /usr/share/applications/ Ffilerel transmission.png /usr/share/pixmaps } From devil505linux at gmail.com Wed Nov 14 19:19:04 2007 From: devil505linux at gmail.com (Devil505) Date: Wed Nov 14 19:19:06 2007 Subject: [Frugalware-git] frugalware-current: amoebax-0.2.0-1-i686 Message-ID: <20071114181904.50CA111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9cbd63cdd4cd975a88c062a1d815afc255f1eee commit b9cbd63cdd4cd975a88c062a1d815afc255f1eee Author: Devil505 Date: Wed Nov 14 19:18:38 2007 +0100 amoebax-0.2.0-1-i686 *New Package diff --git a/source/games-extra/amoebax/FrugalBuild b/source/games-extra/amoebax/FrugalBuild new file mode 100644 index 0000000..43aff32 --- /dev/null +++ b/source/games-extra/amoebax/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.07 SBU +# Maintainer: Devil505 + +pkgname=amoebax +pkgver=0.2.0 +pkgrel=1 +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') +up2date="lynx -dump $url/download.html | Flasttarbz2" +source=(http://www.emma-soft.com/games/amoebax/download/$pkgname-$pkgver.tar.bz2) +sha1sums=('84f45f0363782c4ea7040315cbd0a43f143a5b8a') + +build() +{ + Fcd + Fconf + Fmake + echo "Categories=Application;Game;ArcadeGame" >> $Fdestdir/$pkgname-$pkgver/data/$pkgname.desktop + Fmakeinstall +} + +# optimization OK From vmiklos at frugalware.org Wed Nov 14 21:55:39 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 21:55:42 2007 Subject: [Frugalware-git] frugalware-current: mod_fastcgi-2.4.6-1-i686 Message-ID: <20071114205539.7646B11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0def374d4afdc0b5335f08d8cfc127fdc6d9d4cb commit 0def374d4afdc0b5335f08d8cfc127fdc6d9d4cb Author: Miklos Vajna Date: Wed Nov 14 21:55:12 2007 +0100 mod_fastcgi-2.4.6-1-i686 version bump diff --git a/source/network-extra/mod_fastcgi/FrugalBuild b/source/network-extra/mod_fastcgi/FrugalBuild index 2c35b7d..ed5c5fb 100644 --- a/source/network-extra/mod_fastcgi/FrugalBuild +++ b/source/network-extra/mod_fastcgi/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=mod_fastcgi -pkgver=2.4.4 +pkgver=2.4.6 pkgrel=1 pkgdesc="A language independent extension to CGI that provides high performance" url="http://www.fastcgi.com/" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') backup=(etc/httpd/conf/$pkgname.conf) up2date="lynx -dump 'http://www.fastcgi.com/dist/?m=D'|grep mod_fastcgi-[0-9\.]*\.tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=(http://www.fastcgi.com/dist/$pkgname-$pkgver.tar.gz $pkgname.conf) -sha1sums=('87d408388fc0349e0831e6a6b50dc686dcdb5104' \ +sha1sums=('69c56548bf97040a61903b32679fe3e3b7d3c2d4' \ '2cf6e51e2c58e24c162f0d0fd9336967fe3561a9') build() From vmiklos at frugalware.org Wed Nov 14 22:02:02 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:02:09 2007 Subject: [Frugalware-git] frugalware-current: udev-117-1-i686 Message-ID: <20071114210202.A417011901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=afd07b299495d3f98e85940283f7138aa4aa59c4 commit afd07b299495d3f98e85940283f7138aa4aa59c4 Author: Miklos Vajna Date: Wed Nov 14 22:00:57 2007 +0100 udev-117-1-i686 version bump diff --git a/source/base/udev/2.6.23.patch b/source/base/udev/2.6.23.patch deleted file mode 100644 index 17f0a1a..0000000 --- a/source/base/udev/2.6.23.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cb4e4ac106d47b2b3f47e7d5505cbf499b3ca80 Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -Date: Thu, 25 Oct 2007 23:21:32 +0200 -Subject: [PATCH] Update Frugalware rules for Linux 2.6.23 - ---- - etc/udev/frugalware/50-udev-default.rules | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/etc/udev/frugalware/50-udev-default.rules b/etc/udev/frugalware/50-udev-default.rules -index 89ffd7b..9c88682 100644 ---- a/etc/udev/frugalware/50-udev-default.rules -+++ b/etc/udev/frugalware/50-udev-default.rules -@@ -16,6 +16,7 @@ KERNEL=="auer*", NAME="usb/%k" - KERNEL=="legousbtower*", NAME="usb/%k" - KERNEL=="dabusb*", NAME="usb/%k" - SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k", GROUP="lp" -+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644" - - # CAPI devices - KERNEL=="capi", NAME="capi20", SYMLINK="isdn/capi20" --- -1.5.3.4 - diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index 0b1f773..2563216 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=udev -pkgver=116 -pkgrel=2 +pkgver=117 +pkgrel=1 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} \ @@ -17,9 +17,8 @@ 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 \ - 2.6.23.patch) -signatures=("${source[0]}.sign" '' '' '' '' '' '') + README.Frugalware) +signatures=("${source[0]}.sign" '' '' '' '' '') # if you update this package, you MUST test it carefully, # including the rules. run 'udevtest -h' for the later @@ -43,7 +42,6 @@ build() done # alsa one is broke on frugalware it kills the sound # all the other not needed we don't have these archs - # TODO: fix our rules and send upstream , that what we do is just broken - crazy - Frm etc/udev/rules.d/40-{alsa,ppc,s390,ia64}.rules Fexe /etc/rc.d/rc.udev Frcd2 hotplug From vmiklos at frugalware.org Wed Nov 14 22:07:32 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:07:34 2007 Subject: [Frugalware-git] frugalware-current: vde2-2.1.6-1-i686 Message-ID: <20071114210732.1BE0711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f9823bbdc512457b4bca45e57443df2e00472a38 commit f9823bbdc512457b4bca45e57443df2e00472a38 Author: Miklos Vajna Date: Wed Nov 14 22:07:27 2007 +0100 vde2-2.1.6-1-i686 up2date fix diff --git a/source/network-extra/vde2/FrugalBuild b/source/network-extra/vde2/FrugalBuild index a2dc72d..7fc6bdf 100644 --- a/source/network-extra/vde2/FrugalBuild +++ b/source/network-extra/vde2/FrugalBuild @@ -12,7 +12,7 @@ groups=('network-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="vde" -_F_sourceforge_broken_up2date=1 Finclude sourceforge +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=95403&package_id=169680'|grep 'vde2-[0-9.]\+.t.*_mirror'|sed 's/.*-\(.*\)\.t.*/\1/;q'" sha1sums=('4eb7966e03490b5f9367e7fb08fbfbd7ada98e6e') # optimization OK From vmiklos at frugalware.org Wed Nov 14 22:13:35 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:13:39 2007 Subject: [Frugalware-git] frugalware-current: acetoneiso2-1.96_beta2-1-x86_64 Message-ID: <20071114211335.4211811901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3e090c6a0dd00675e983bf779b5b122b22e02063 commit 3e090c6a0dd00675e983bf779b5b122b22e02063 Author: Miklos Vajna Date: Wed Nov 14 22:13:30 2007 +0100 acetoneiso2-1.96_beta2-1-x86_64 added x86_64 to archs() diff --git a/source/kde-extra/acetoneiso2/FrugalBuild b/source/kde-extra/acetoneiso2/FrugalBuild index 37f4984..77d0094 100644 --- a/source/kde-extra/acetoneiso2/FrugalBuild +++ b/source/kde-extra/acetoneiso2/FrugalBuild @@ -9,7 +9,7 @@ depends=('libqtxml' 'libqtgui') rodepends=('7zip' 'cdrdao' 'cdrtools' 'gpg-agent' 'gnupg' \ 'fuseiso' 'kdebase' 'pinentry-qt' 'coreutils' 'dvd+rw-tools') groups=('kde-extra') -archs=('i686') +archs=('i686' 'x86_64') replaces=('kcdemu') _F_sourceforge_sep="_" Finclude sourceforge From vmiklos at frugalware.org Wed Nov 14 22:21:14 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:21:17 2007 Subject: [Frugalware-git] frugalware-current: mlt-plus-plus-0.2.2-4-x86_64 Message-ID: <20071114212115.0578711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=979bb6979719e1da08165f6ae54d90b951494d0b commit 979bb6979719e1da08165f6ae54d90b951494d0b Author: Miklos Vajna Date: Wed Nov 14 22:21:06 2007 +0100 mlt-plus-plus-0.2.2-4-x86_64 added x86_64 to archs() diff --git a/source/xmultimedia-extra/mlt-plus-plus/FrugalBuild b/source/xmultimedia-extra/mlt-plus-plus/FrugalBuild index 703bf2c..2460413 100644 --- a/source/xmultimedia-extra/mlt-plus-plus/FrugalBuild +++ b/source/xmultimedia-extra/mlt-plus-plus/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Bindings for MLT." # TODO: add swig bindings once they are marked 'stable' depends=('mlt>=0.2.4' 'libstdc++>=4.2.1-3') groups=('xmultimedia-extra') -archs=('i686') +archs=('i686' 'x86_64') options=('scriptlet') _F_sourceforge_dirname="mlt" _F_sourceforge_name="mlt++" From vmiklos at frugalware.org Wed Nov 14 22:25:07 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:25:09 2007 Subject: [Frugalware-git] frugalware-current: afuse-0.1.1-1-x86_64 Message-ID: <20071114212507.C847111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba894083b52cfd098077fe900e4857d5cb28013b commit ba894083b52cfd098077fe900e4857d5cb28013b Author: Miklos Vajna Date: Wed Nov 14 22:24:58 2007 +0100 afuse-0.1.1-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/afuse/FrugalBuild b/source/network-extra/afuse/FrugalBuild index 0e1e4af..9c03a2b 100644 --- a/source/network-extra/afuse/FrugalBuild +++ b/source/network-extra/afuse/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Implements filesystem automounting functionality similar to autofs." Finclude sourceforge depends=('fuse') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('b4132e40f3c885d02b692f502702b23dabb8b4e9') # optimization OK From vmiklos at frugalware.org Wed Nov 14 22:27:36 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:27:38 2007 Subject: [Frugalware-git] frugalware-current: archivemail-0.7.2-1-x86_64 Message-ID: <20071114212736.CAC3611901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eae7326a9c6708a8ab635b94af3c3b0b22a0fb43 commit eae7326a9c6708a8ab635b94af3c3b0b22a0fb43 Author: Miklos Vajna Date: Wed Nov 14 22:27:08 2007 +0100 archivemail-0.7.2-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/archivemail/FrugalBuild b/source/network-extra/archivemail/FrugalBuild index 1556472..4e89cf0 100644 --- a/source/network-extra/archivemail/FrugalBuild +++ b/source/network-extra/archivemail/FrugalBuild @@ -8,5 +8,5 @@ pkgdesc="A tool for archiving and compressing old email in mailboxes." Finclude sourceforge depends=('python') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('0ff9b8991b04f09cf9536c45b6f9e05d2427a459') From vmiklos at frugalware.org Wed Nov 14 22:36:40 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:36:42 2007 Subject: [Frugalware-git] frugalware-current: horde-webmail-1.0.3-1-x86_64 Message-ID: <20071114213640.A63B911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8f4ed0ae5425eaec95da8abddd133716c179edf commit d8f4ed0ae5425eaec95da8abddd133716c179edf Author: Miklos Vajna Date: Wed Nov 14 22:36:34 2007 +0100 horde-webmail-1.0.3-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/horde-webmail/FrugalBuild b/source/network-extra/horde-webmail/FrugalBuild index da1507d..78cc0fd 100644 --- a/source/network-extra/horde-webmail/FrugalBuild +++ b/source/network-extra/horde-webmail/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="a free, enterprise ready, browser based communication suite" url="http://horde.org/webmail/" rodepends=('php>=4.3.0') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://www.horde.org/download/app/?app=webmail | grep \.tar\.gz | sed 's/.*-\(.*\)\.t.*/\1/'" source=(ftp://ftp.horde.org/pub/$pkgname/$pkgname-$pkgver.tar.gz README.Frugalware) backup=(var/www/$pkgname/config/{conf,hooks,mime_drivers,motd,nls,prefs,registry}.php \ From crazy at frugalware.org Wed Nov 14 22:39:06 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 14 22:39:08 2007 Subject: [Frugalware-git] frugalware-current: tsocks-1.8beta5-1-i686 Message-ID: <20071114213906.C1E1B11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ff4654b23c7f588b3776bfbc4cc201a33f3bd26 commit 0ff4654b23c7f588b3776bfbc4cc201a33f3bd26 Author: crazy Date: Wed Nov 14 22:31:01 2007 +0100 tsocks-1.8beta5-1-i686 * url fix * removed custom up2date diff --git a/source/network-extra/tsocks/FrugalBuild b/source/network-extra/tsocks/FrugalBuild index 6a04b9f..889b75b 100644 --- a/source/network-extra/tsocks/FrugalBuild +++ b/source/network-extra/tsocks/FrugalBuild @@ -5,13 +5,12 @@ pkgname=tsocks pkgver=1.8beta5 pkgrel=1 pkgdesc="Transparent SOCKS v4 proxying library." -url="http://tsocks.sourceforge.net/" depends=('glibc') backup=('etc/socks/tsocks.conf') groups=('network-extra') archs=('i686' 'x86_64') +_F_sourceforge_broken_up2date=1 Finclude sourceforge -up2date="lynx -dump http://tsocks.sourceforge.net/download.php|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=(${source[@]} http://www.totalinfosecurity.com/patches/tor-tsocks/tsocks-1.8b5-tordns1.diff.gz) sha1sums=('489f88c5df999ba21b27cdaa7836d9426d062aec' \ 'dd3c4ee6846a7be9dca4ac5fa4f9e3b09e3618c3') From crazy at frugalware.org Wed Nov 14 22:39:06 2007 From: crazy at frugalware.org (crazy) Date: Wed Nov 14 22:39:09 2007 Subject: [Frugalware-git] frugalware-current: pspvc-0.3-2-i686 Message-ID: <20071114213906.CC14E11901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=348c38b39638922e0e49bce229f552eec97a5f87 commit 348c38b39638922e0e49bce229f552eec97a5f87 Author: crazy Date: Wed Nov 14 22:38:41 2007 +0100 pspvc-0.3-2-i686 * url fix * removed custom up2date diff --git a/source/xapps-extra/pspvc/FrugalBuild b/source/xapps-extra/pspvc/FrugalBuild index 2932a47..a2db30c 100644 --- a/source/xapps-extra/pspvc/FrugalBuild +++ b/source/xapps-extra/pspvc/FrugalBuild @@ -5,13 +5,12 @@ pkgname=pspvc pkgver=0.3 pkgrel=2 pkgdesc="PlayStation Portable Video Converter." +_F_sourceforge_prefix="$pkgname-install-" Finclude sourceforge -url="http://pspvc.sourceforge.net/" depends=('gtk+2' 'atk' 'pango' 'ffmpeg>=20070422' 'nasm') options=('scriptlet') groups=('xapps-extra') archs=('i686') -up2date="lynx -dump http://pspvc.sourceforge.net/#download|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=(${source/$pkgname-/$pkgname-install-}) build() From vmiklos at frugalware.org Wed Nov 14 22:41:19 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:41:20 2007 Subject: [Frugalware-git] frugalware-current: irssi-python-svn4430-1-x86_64 Message-ID: <20071114214119.7619911901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4cad9923d276f8ae33f93dd9de74d613fc12d352 commit 4cad9923d276f8ae33f93dd9de74d613fc12d352 Author: Miklos Vajna Date: Wed Nov 14 22:41:02 2007 +0100 irssi-python-svn4430-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/irssi-python/FrugalBuild b/source/network-extra/irssi-python/FrugalBuild index 25882c9..b6e563b 100644 --- a/source/network-extra/irssi-python/FrugalBuild +++ b/source/network-extra/irssi-python/FrugalBuild @@ -11,7 +11,7 @@ pkgurl="http://ftp.frugalware.org/pub/other/sources/irssi-python/" depends=('irssi' 'python') makedepends=('autoconf-archive') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $pkgurl |Flasttarbz2" source=($pkgurl/$pkgname-$pkgver.tar.bz2 \ http://irssi.org/files/irssi-$irssiver.tar.bz2 \ From vmiklos at frugalware.org Wed Nov 14 22:47:54 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:47:56 2007 Subject: [Frugalware-git] frugalware-current: knb-0.2.2-1-x86_64 Message-ID: <20071114214754.CC19B11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2fb5a0e464168021abfcb8450f98cfdc148949da commit 2fb5a0e464168021abfcb8450f98cfdc148949da Author: Miklos Vajna Date: Wed Nov 14 22:47:52 2007 +0100 knb-0.2.2-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/knb/FrugalBuild b/source/network-extra/knb/FrugalBuild index 5cad604..9613d60 100644 --- a/source/network-extra/knb/FrugalBuild +++ b/source/network-extra/knb/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="An IRC bot to keep your nick on networks where there are no services." url="http://www.beer.one.pl/~esio/c/" depends=('glibc') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url |Flastarchive '-src.tar.gz\$'" source=(http://www.beer.one.pl/~esio/c/knb-$pkgver-src.tar.gz \ http://www.beer.one.pl/~esio/c/HELP.txt \ @@ -20,6 +20,10 @@ sha1sums=('3bba023275edbdb0e8056332d72fdd43de4b2b68' \ build() { Fcd $pkgname/src + if [ "$CARCH" == "x86_64" ]; then + Fsed amd64 x86_64 configure.sh + Fsed athlon-xp k8 configure.sh + fi ./configure || return 1 make dynamic || return 1 cd .. From vmiklos at frugalware.org Wed Nov 14 22:48:38 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:48:39 2007 Subject: [Frugalware-git] frugalware-current: magpierss-0.72-3-x86_64 Message-ID: <20071114214839.0151511901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1db7b1f3c92448d67463af47bacb9f2e82346a7d commit 1db7b1f3c92448d67463af47bacb9f2e82346a7d Author: Miklos Vajna Date: Wed Nov 14 22:48:36 2007 +0100 magpierss-0.72-3-x86_64 added x86_64 to archs() diff --git a/source/network-extra/magpierss/FrugalBuild b/source/network-extra/magpierss/FrugalBuild index 39cee2f..54e5703 100644 --- a/source/network-extra/magpierss/FrugalBuild +++ b/source/network-extra/magpierss/FrugalBuild @@ -9,7 +9,7 @@ _F_sourceforge_prefix="magpierss-" Finclude sourceforge rodepends=('php') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') source=($source magpierss-0.72-warning_fix.diff \ magpierss-0.72-description_fix.diff) sha1sums=('0d23b5a2aa3f58ad791593f2ab1b6e9ca0857793' \ From vmiklos at frugalware.org Wed Nov 14 22:49:04 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:49:05 2007 Subject: [Frugalware-git] frugalware-current: t-prot-2.5-1-x86_64 Message-ID: <20071114214904.43C5B11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=370d278246e20ecd1bd24f530aa1975adbf5b86c commit 370d278246e20ecd1bd24f530aa1975adbf5b86c Author: Miklos Vajna Date: Wed Nov 14 22:48:56 2007 +0100 t-prot-2.5-1-x86_64 added x86_64 to archs() diff --git a/source/network-extra/t-prot/FrugalBuild b/source/network-extra/t-prot/FrugalBuild index 9e2607f..cfa43ac 100644 --- a/source/network-extra/t-prot/FrugalBuild +++ b/source/network-extra/t-prot/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A TOFU protection script." url="http://www.escape.de/~tolot/mutt/t-prot" rodepends=('perl-getopt-mixed') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads/|Flasttar" source=(http://www.escape.de/~tolot/mutt/t-prot/downloads/t-prot-$pkgver.tar.gz) signatures=($source.asc) From vmiklos at frugalware.org Wed Nov 14 22:51:36 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Nov 14 22:51:40 2007 Subject: [Frugalware-git] frugalware-current: trickle-1.07-3-x86_64 Message-ID: <20071114215136.CD81111901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d901ddb8cb7cf6d0606aed981b272fd2ca389f7d commit d901ddb8cb7cf6d0606aed981b272fd2ca389f7d Author: Miklos Vajna Date: Wed Nov 14 22:51:33 2007 +0100 trickle-1.07-3-x86_64 added x86_64 to archs() diff --git a/source/network-extra/trickle/FrugalBuild b/source/network-extra/trickle/FrugalBuild index 3cdd65c..d761b2f 100644 --- a/source/network-extra/trickle/FrugalBuild +++ b/source/network-extra/trickle/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="a portable lightweight userspace bandwidth shaper" url="http://monkey.org/~marius/pages/?page=trickle" depends=('libevent>=1.3-6' 'grep') groups=('network-extra') -archs=('i686') +archs=('i686' 'x86_64') #up2date="lynx -dump http://monkey.org/~marius/pages/?page=trickle | grep -m1 'http.*tar.gz' | sed 's/.*trickle-\(.*\)\.tar.*/\1/'" up2date=$pkgver source=(http://monkey.org/~marius/$pkgname/$pkgname-$pkgver.tar.gz allow_autoreconf.patch headers.patch) From vmiklos at frugalware.org Thu Nov 15 15:12:35 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 15 15:12:39 2007 Subject: [Frugalware-git] frugalware-current: mingw-binutils-2.17.50_20070129_1-2-i686 Message-ID: <20071115141235.8C41211901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f76b72cc3a8d2add24ff8b9e5e47155d032a5d7b commit f76b72cc3a8d2add24ff8b9e5e47155d032a5d7b Author: Miklos Vajna Date: Thu Nov 15 15:12:01 2007 +0100 mingw-binutils-2.17.50_20070129_1-2-i686 - add patch to make it work with newer texinfo - original patch author: crazy diff --git a/source/devel-extra/mingw-binutils/FrugalBuild b/source/devel-extra/mingw-binutils/FrugalBuild index d17be2f..696095c 100644 --- a/source/devel-extra/mingw-binutils/FrugalBuild +++ b/source/devel-extra/mingw-binutils/FrugalBuild @@ -4,7 +4,7 @@ pkgname=mingw-binutils pkgver=2.17.50_20070129_1 origver=${pkgver//_/-} -pkgrel=1 +pkgrel=2 pkgdesc="Tools necessary to build Win32 programs" _F_sourceforge_dirname="mingw" Finclude sourceforge @@ -12,17 +12,18 @@ url="http://sources.redhat.com/binutils/" depends=('bash') groups=('devel-extra') archs=('i686' 'x86_64') -# recently they removed the 2.17.50_20070129_1 tarballs, while it works fine -# for us, so why reverting.. -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2435|grep 'binutils-.*-src.tar.gz$'|sed 's/.*binutils-\(.*\)-src.*/\1/;s/-/_/g;s/2.17.50_20060824_1/2.17.50_20070129_1/;q'" -source=(${source/mingw-binutils-$origver/binutils-$origver-src}) -sha1sums=('a55f2e1c2f9640f259d9a6de0d5e5c7620f6e94f') +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') build() { Fcd binutils-$origver-src - Fbuild --prefix=/usr/lib/mingw --target=i386-mingw32msvc - Frm /usr/{info,lib,share/locale} + Fpatchall + autoconf || return 1 + Fmake --prefix=/usr/lib/mingw --target=i386-mingw32msvc + Fmakeinstall } # optimization OK diff --git a/source/devel-extra/mingw-binutils/makeinfo.patch b/source/devel-extra/mingw-binutils/makeinfo.patch new file mode 100644 index 0000000..17b3c53 --- /dev/null +++ b/source/devel-extra/mingw-binutils/makeinfo.patch @@ -0,0 +1,12 @@ +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 Thu Nov 15 22:52:30 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 15 22:52:32 2007 Subject: [Frugalware-git] frugalware-current: mingw-w32api-headers-3.8-1-i686 Message-ID: <20071115215230.86C6B119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6cf9ee6f5aa4f9bf6306861a56de3a17443a36ce commit 6cf9ee6f5aa4f9bf6306861a56de3a17443a36ce Author: Miklos Vajna Date: Thu Nov 15 22:52:19 2007 +0100 mingw-w32api-headers-3.8-1-i686 version bump diff --git a/source/devel-extra/mingw-w32api-headers/FrugalBuild b/source/devel-extra/mingw-w32api-headers/FrugalBuild index 6b819f1..f7209a6 100644 --- a/source/devel-extra/mingw-w32api-headers/FrugalBuild +++ b/source/devel-extra/mingw-w32api-headers/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=mingw-w32api-headers -pkgver=3.7 +pkgver=3.8 pkgrel=1 pkgdesc="Free headers for the Win32 API" _F_sourceforge_dirname="mingw" @@ -13,9 +13,8 @@ url="http://www.mingw.org" depends=() groups=('devel-extra') archs=('i686' 'x86_64') -# 3.7 already released, works fine and now there is no 3.7 -# s/3.6/3.7/ can be removed on the next bump -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2435|grep w32api-|sed -n 's/.*-\(.*\)\.t.*/\1/;s/3.6/3.7/;$ p'" +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2435|grep w32api-|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" +sha1sums=('a2be2b4085be4a71e9f29b88e78c927475ff5dad') build() { @@ -23,5 +22,3 @@ build() Fmkdir /usr/lib/mingw/i386-mingw32msvc/ cp -r include $Fdestdir/usr/lib/mingw/i386-mingw32msvc/include } - -sha1sums=('b63ef3cd0690ba211ddee560ddb5c8444587c6cb') From vmiklos at frugalware.org Thu Nov 15 22:57:38 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Nov 15 22:57:40 2007 Subject: [Frugalware-git] frugalware-current: mingw-w32api-3.8-1-i686 Message-ID: <20071115215738.557A5119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7194744caca7c65d2e0c2b9b7231ba694120e4c commit d7194744caca7c65d2e0c2b9b7231ba694120e4c Author: Miklos Vajna Date: Thu Nov 15 22:57:10 2007 +0100 mingw-w32api-3.8-1-i686 version bump duh, i wasted ~4 hours figuring out that new makedepend.. :) diff --git a/source/devel-extra/mingw-w32api/FrugalBuild b/source/devel-extra/mingw-w32api/FrugalBuild index 6216755..dbe3b28 100644 --- a/source/devel-extra/mingw-w32api/FrugalBuild +++ b/source/devel-extra/mingw-w32api/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=mingw-w32api -pkgver=3.7 +pkgver=3.8 pkgrel=1 pkgdesc="Free libraries for the Win32 API" _F_sourceforge_dirname="mingw" @@ -12,10 +12,10 @@ Finclude sourceforge url="http://www.mingw.org" depends=('mingw-gcc') groups=('devel-extra') +makedepends=('mingw-runtime') archs=('i686' 'x86_64') -# 3.7 already released, works fine and now there is no 3.7 -# s/3.6/3.7/ can be removed on the next bump -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2435|grep w32api-|sed -n 's/.*-\(.*\)\.t.*/\1/;s/3.6/3.7/;$ p'" +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2435|grep w32api-|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" +sha1sums=('a2be2b4085be4a71e9f29b88e78c927475ff5dad') build() { @@ -33,5 +33,4 @@ build() Frm /usr/lib/mingw/i386-mingw32msvc/include } -# optimalization OK -sha1sums=('b63ef3cd0690ba211ddee560ddb5c8444587c6cb') +# optimization OK From vmiklos at frugalware.org Fri Nov 16 00:14:00 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 00:14:03 2007 Subject: [Frugalware-git] frugalware-current: libcnbj-2.2-1-1-x86_64 Message-ID: <20071115231400.C311F119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=92692e85c33809071792019badb1a8de3750785d commit 92692e85c33809071792019badb1a8de3750785d Author: Miklos Vajna Date: Fri Nov 16 00:13:52 2007 +0100 libcnbj-2.2-1-1-x86_64 added x86_64 to archs() diff --git a/source/lib-extra/libcnbj-2.2/FrugalBuild b/source/lib-extra/libcnbj-2.2/FrugalBuild index 90558aa..462b360 100644 --- a/source/lib-extra/libcnbj-2.2/FrugalBuild +++ b/source/lib-extra/libcnbj-2.2/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Requried libraries for Canon bjfilter." url="http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/" depends=('glibc') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/ |grep libcnbj-2.2 |Flasttar" source=(http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/libcnbj-2.2_0-1.tar.gz) sha1sums=('59bb79eb8ee3a67360cdd68f1de01ace12e34082') From vmiklos at frugalware.org Fri Nov 16 00:33:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 00:33:26 2007 Subject: [Frugalware-git] frugalware-current: libcnbj-2.2-1-1-x86_64 Message-ID: <20071115233324.88D91119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0d451a1cbb5fdf7d917f8bb1466708f936f4856 commit b0d451a1cbb5fdf7d917f8bb1466708f936f4856 Author: Miklos Vajna Date: Fri Nov 16 00:33:14 2007 +0100 libcnbj-2.2-1-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/bjfilter-2.2/FrugalBuild b/source/apps-extra/bjfilter-2.2/FrugalBuild index 2c4dbe9..2f11f67 100644 --- a/source/apps-extra/bjfilter-2.2/FrugalBuild +++ b/source/apps-extra/bjfilter-2.2/FrugalBuild @@ -9,7 +9,7 @@ url="http://mambo.kuhp.kyoto-u.ac.jp/~takushi/" depends=('libtiff' 'libpng' 'libcnbj-2.2') rodepends=('pstocanonbj') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/ |grep $pkgname |Flasttar" source=(http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/bjfilter-2.2_1-1.tar.gz bjfilter-2.2_compile_fix.diff) From vmiklos at frugalware.org Fri Nov 16 00:42:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 00:42:26 2007 Subject: [Frugalware-git] frugalware-current: revert "libcnbj-2.2-1-1-x86_64" Message-ID: <20071115234224.2B5DC119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3fc778af738c855a17263c45d5e37e1a953a2a81 commit 3fc778af738c855a17263c45d5e37e1a953a2a81 Author: Miklos Vajna Date: Fri Nov 16 00:42:10 2007 +0100 revert "libcnbj-2.2-1-1-x86_64" - this reverts commit b0d451a1cbb5fdf7d917f8bb1466708f936f4856 - i pushed this by accident, it's not yet ready diff --git a/source/apps-extra/bjfilter-2.2/FrugalBuild b/source/apps-extra/bjfilter-2.2/FrugalBuild index 2f11f67..2c4dbe9 100644 --- a/source/apps-extra/bjfilter-2.2/FrugalBuild +++ b/source/apps-extra/bjfilter-2.2/FrugalBuild @@ -9,7 +9,7 @@ url="http://mambo.kuhp.kyoto-u.ac.jp/~takushi/" depends=('libtiff' 'libpng' 'libcnbj-2.2') rodepends=('pstocanonbj') groups=('apps-extra') -archs=('i686' 'x86_64') +archs=('i686') up2date="lynx -dump http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/ |grep $pkgname |Flasttar" source=(http://mambo.kuhp.kyoto-u.ac.jp/~takushi/debian/bjfilter-2.2_1-1.tar.gz bjfilter-2.2_compile_fix.diff) From vmiklos at frugalware.org Fri Nov 16 00:44:32 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 00:44:32 2007 Subject: [Frugalware-git] frugalware-current: vim-script-po-1.2-1-x86_64 Message-ID: <20071115234432.2CC2C119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d688daed9bfe7b27416bfb7fe2366f7ca76c14bf commit d688daed9bfe7b27416bfb7fe2366f7ca76c14bf Author: Miklos Vajna Date: Fri Nov 16 00:44:25 2007 +0100 vim-script-po-1.2-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/vim-script-po/FrugalBuild b/source/devel-extra/vim-script-po/FrugalBuild index 628d1c4..d7a3114 100644 --- a/source/devel-extra/vim-script-po/FrugalBuild +++ b/source/devel-extra/vim-script-po/FrugalBuild @@ -9,7 +9,7 @@ url="http://vim.sourceforge.net/scripts/script.php?script_id=695" depends=() rodepends=('vim') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://vim.sourceforge.net/scripts/script.php?script_id=695|grep 'po.vim [0-9]'|sed 's/.*po.vim \([0-9.]\+\) .*/\1/;q'" source=(http://vim.sourceforge.net/scripts/download_script.php?src_id=4159) sha1sums=('ef0ca59b52c8d074586ab5459f81fbdc1fc27409') From vmiklos at frugalware.org Fri Nov 16 00:52:47 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 00:52:48 2007 Subject: [Frugalware-git] frugalware-current: tig-0.9.1-1-x86_64 Message-ID: <20071115235247.B9697119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8421eeeda22cb42ebcf496802f4a9c50cf024585 commit 8421eeeda22cb42ebcf496802f4a9c50cf024585 Author: Miklos Vajna Date: Fri Nov 16 00:52:40 2007 +0100 tig-0.9.1-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/tig/FrugalBuild b/source/devel-extra/tig/FrugalBuild index 39a2181..137ca13 100644 --- a/source/devel-extra/tig/FrugalBuild +++ b/source/devel-extra/tig/FrugalBuild @@ -10,7 +10,7 @@ depends=('git' 'ncurses') makedepends=('asciidoc') groups=('devel-extra') backup=(etc/tigrc) -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://jonas.nitro.dk/tig/releases/|Flasttar" source=(http://jonas.nitro.dk/tig/releases/tig-$pkgver.tar.gz) sha1sums=('15ba19a8114ad589f8b370f86bf6878b1e6d378d') From vmiklos at frugalware.org Fri Nov 16 00:56:24 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 00:56:26 2007 Subject: [Frugalware-git] frugalware-current: syck-0.55-1-x86_64 Message-ID: <20071115235624.38013119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=699fd979755ebd3e573dd765e83c8ddfcb4c590e commit 699fd979755ebd3e573dd765e83c8ddfcb4c590e Author: Miklos Vajna Date: Fri Nov 16 00:56:00 2007 +0100 syck-0.55-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/syck/FrugalBuild b/source/devel-extra/syck/FrugalBuild index 8723ee7..cd7a69c 100644 --- a/source/devel-extra/syck/FrugalBuild +++ b/source/devel-extra/syck/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Syck is an extension for reading and writing YAML" url="http://whytheluckystiff.net/syck/" depends=() groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://whytheluckystiff.net/syck/|grep -om1 'syck-\(.*\).tar.gz'|Flasttar" source=(http://rubyforge.org/frs/download.php/4492/$pkgname-$pkgver.tar.gz \ $pkgname-$pkgver.patch) From vmiklos at frugalware.org Fri Nov 16 01:05:42 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 01:05:44 2007 Subject: [Frugalware-git] frugalware-current: syck-0.55-2-x86_64 Message-ID: <20071116000542.DDBA3119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0694eb3d29ee390b56384284b2307f4a0b2ea14 commit c0694eb3d29ee390b56384284b2307f4a0b2ea14 Author: Miklos Vajna Date: Fri Nov 16 01:05:19 2007 +0100 syck-0.55-2-x86_64 umm and we need fPIC for the lib diff --git a/source/devel-extra/syck/FrugalBuild b/source/devel-extra/syck/FrugalBuild index cd7a69c..1afa365 100644 --- a/source/devel-extra/syck/FrugalBuild +++ b/source/devel-extra/syck/FrugalBuild @@ -3,7 +3,7 @@ pkgname=syck pkgver=0.55 -pkgrel=1 +pkgrel=2 pkgdesc="Syck is an extension for reading and writing YAML" url="http://whytheluckystiff.net/syck/" depends=() @@ -12,6 +12,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://whytheluckystiff.net/syck/|grep -om1 'syck-\(.*\).tar.gz'|Flasttar" source=(http://rubyforge.org/frs/download.php/4492/$pkgname-$pkgver.tar.gz \ $pkgname-$pkgver.patch) +[ "$CARCH" = "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" sha1sums=('acb0aea04a6a0e82220223ffaf889ad6587402eb' \ '5afb00e9d6746d049d5778e4a4535fc0bfac3dac') From vmiklos at frugalware.org Fri Nov 16 01:08:49 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 01:08:51 2007 Subject: [Frugalware-git] frugalware-current: php-pecl-syck-0.55-1-x86_64 Message-ID: <20071116000849.69624119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c54b711ab95de53e30ca646a58abdd51f2bb90d commit 7c54b711ab95de53e30ca646a58abdd51f2bb90d Author: Miklos Vajna Date: Fri Nov 16 01:08:46 2007 +0100 php-pecl-syck-0.55-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/php-pecl-syck/FrugalBuild b/source/devel-extra/php-pecl-syck/FrugalBuild index c2c959d..f0e0ac6 100644 --- a/source/devel-extra/php-pecl-syck/FrugalBuild +++ b/source/devel-extra/php-pecl-syck/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="Syck extension for PHP" url="http://whytheluckystiff.net/syck/" depends=('php' 're2c' "syck=$pkgver") groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://whytheluckystiff.net/syck/|Flasttar" source=(http://rubyforge.org/frs/download.php/4492/$_F_archive_name-$pkgver.tar.gz) sha1sums=('acb0aea04a6a0e82220223ffaf889ad6587402eb') From vmiklos at frugalware.org Fri Nov 16 01:09:42 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 01:09:44 2007 Subject: [Frugalware-git] frugalware-current: glut-manpages-3.7-1-x86_64 Message-ID: <20071116000942.BBFF1119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ef7bbc7bca36af89a81eaafa5b24625a911d0fbd commit ef7bbc7bca36af89a81eaafa5b24625a911d0fbd Author: Miklos Vajna Date: Fri Nov 16 01:09:41 2007 +0100 glut-manpages-3.7-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/glut-manpages/FrugalBuild b/source/devel-extra/glut-manpages/FrugalBuild index 4e93988..da0f97b 100644 --- a/source/devel-extra/glut-manpages/FrugalBuild +++ b/source/devel-extra/glut-manpages/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Man pages for GLUT." url="http://www.opengl.org/resources/libraries/glut/" depends=('man') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url |grep 'current source'|sed 's/.* \(.*\)\.$/\1/'" source=(http://www.opengl.org/resources/libraries/glut/glut-$pkgver.tar.gz) sha1sums=('4d88591992c15547001c30d5b6d840f672720a5a') From vmiklos at frugalware.org Fri Nov 16 01:10:22 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 01:10:24 2007 Subject: [Frugalware-git] frugalware-current: gl-manpages-1.0.1-1-x86_64 Message-ID: <20071116001022.08068119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3a03d5d03765691344b7daa6241e854762dc499 commit e3a03d5d03765691344b7daa6241e854762dc499 Author: Miklos Vajna Date: Fri Nov 16 01:10:20 2007 +0100 gl-manpages-1.0.1-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/gl-manpages/FrugalBuild b/source/devel-extra/gl-manpages/FrugalBuild index 672f48b..fd9ba88 100644 --- a/source/devel-extra/gl-manpages/FrugalBuild +++ b/source/devel-extra/gl-manpages/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Mesa's man pages" url="http://mesa3d.sourceforge.net/" depends=('man') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/repodata/filelists.xml.gz |gzip -d|grep gl-manpages|sed 's/.*-\(.*\)\.t.*/\1/'" source=(http://ftp.frugalware.org/pub/other/sources/gl-manpages/gl-manpages-$pkgver.tar.bz2) sha1sums=('dc94176431df6ba06e94bca12b4c7b4a833b853c') From vmiklos at frugalware.org Fri Nov 16 01:16:22 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 01:16:24 2007 Subject: [Frugalware-git] frugalware-current: powertop-1.9-1-x86_64 Message-ID: <20071116001622.7C663119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=578369ecb211dce5cc3bb6c344cd0339f53a4b8c commit 578369ecb211dce5cc3bb6c344cd0339f53a4b8c Author: Miklos Vajna Date: Fri Nov 16 01:16:18 2007 +0100 powertop-1.9-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/powertop/FrugalBuild b/source/apps-extra/powertop/FrugalBuild index c8e2db7..6602941 100644 --- a/source/apps-extra/powertop/FrugalBuild +++ b/source/apps-extra/powertop/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A tool that helps you find what software is using the most power." url="http://www.linuxpowertop.org" depends=('ncurses') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://www.lesswatts.org/projects/powertop/download.php|grep -m1 tar.gz$|Flasttar" source=(http://www.lesswatts.org/projects/powertop/download/powertop-$pkgver.tar.gz) sha1sums=('35464952281373f38ce1694d6543aa20cbc8759d') From vmiklos at frugalware.org Fri Nov 16 01:22:15 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 01:22:18 2007 Subject: [Frugalware-git] frugalware-current: linuxtv-dvb-apps-1.1.1.20070114-1-x86_64 Message-ID: <20071116002215.6FF71119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=71441676a645feae65730cb2d4017b2039ee9fd0 commit 71441676a645feae65730cb2d4017b2039ee9fd0 Author: Miklos Vajna Date: Fri Nov 16 01:22:04 2007 +0100 linuxtv-dvb-apps-1.1.1.20070114-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/linuxtv-dvb-apps/FrugalBuild b/source/apps-extra/linuxtv-dvb-apps/FrugalBuild index 66f15c9..57b9822 100644 --- a/source/apps-extra/linuxtv-dvb-apps/FrugalBuild +++ b/source/apps-extra/linuxtv-dvb-apps/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="Utilities for DVB cards" url="http://www.linuxtv.org" depends=('glibc') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://www.linuxtv.org/download/dvb | grep $pkgname | Flasttarbz2 | sed 's/1\.1\.1/$pkgver/'" #source=(http://www.linuxtv.org/download/dvb/$pkgname-$pkgver.tar.bz2) source=(http://gentoo.osuosl.org/distfiles/$pkgname-$basever.tar.bz2) From vmiklos at frugalware.org Fri Nov 16 01:35:48 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 01:35:51 2007 Subject: [Frugalware-git] frugalware-current: gnucap-0.35-1-x86_64 Message-ID: <20071116003548.C89BB119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01f12cf90135fe1600040aa157c95c1d127d5434 commit 01f12cf90135fe1600040aa157c95c1d127d5434 Author: Miklos Vajna Date: Fri Nov 16 01:35:35 2007 +0100 gnucap-0.35-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/gnucap/FrugalBuild b/source/apps-extra/gnucap/FrugalBuild index 51a6184..760f450 100644 --- a/source/apps-extra/gnucap/FrugalBuild +++ b/source/apps-extra/gnucap/FrugalBuild @@ -10,7 +10,7 @@ depends=('readline' 'termcap' 'libstdc++') makedepends=('tetex') groups=('apps-extra') options=('scriptlet') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url/dist|Flasttar" source=($url/dist/$pkgname-$pkgver.tar.gz) sha1sums=('fa4da0ca4a36ca509d00b7c7286ffb8a008ceaaf') From vmiklos at frugalware.org Fri Nov 16 01:37:53 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 01:37:54 2007 Subject: [Frugalware-git] frugalware-current: ccal-0.6-1-x86_64 Message-ID: <20071116003753.EFD98119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c44e1abf5ccf53f4bc2ed5b52e8e85b116acc1e4 commit c44e1abf5ccf53f4bc2ed5b52e8e85b116acc1e4 Author: Miklos Vajna Date: Fri Nov 16 01:37:40 2007 +0100 ccal-0.6-1-x86_64 added x86_64 to archs() diff --git a/source/apps-extra/ccal/FrugalBuild b/source/apps-extra/ccal/FrugalBuild index 187e361..4db64ac 100644 --- a/source/apps-extra/ccal/FrugalBuild +++ b/source/apps-extra/ccal/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Curses calendar / diary / journal & todo list application." url="http://www.jamiehillman.co.uk/ccal/" depends=('python') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://ftp.frugalware.org/pub/other/sources/ccal/|Flastarchive .py" source=(http://ftp.frugalware.org/pub/other/sources/ccal/ccal-$pkgver.py \ http://ftp.frugalware.org/pub/other/sources/ccal/instructions.htm) From vmiklos at frugalware.org Fri Nov 16 03:35:18 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 03:35:20 2007 Subject: [Frugalware-git] frugalware-current: gprename-2.5-1-i686 Message-ID: <20071116023518.A3024119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fb063a63429bbd88474adcacc21e096797831ce6 commit fb063a63429bbd88474adcacc21e096797831ce6 Author: Miklos Vajna Date: Fri Nov 16 03:34:54 2007 +0100 gprename-2.5-1-i686 version bump diff --git a/source/xapps-extra/gprename/FrugalBuild b/source/xapps-extra/gprename/FrugalBuild index 0b2da98..ae72738 100644 --- a/source/xapps-extra/gprename/FrugalBuild +++ b/source/xapps-extra/gprename/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: detto pkgname=gprename -pkgver=2.4 +pkgver=2.5 pkgrel=1 pkgdesc="Batch renamer for files and directories" groups=('xapps-extra') @@ -10,7 +10,7 @@ archs=('i686') rodepends=('perl-gtk2') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('b80480da81f7eb7c7b29f1ea65ac292a0aa1794b') +sha1sums=('9739dbba3d11f8403223f0206691c028aceb76f2') build () { From vmiklos at frugalware.org Fri Nov 16 03:40:37 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 03:40:42 2007 Subject: [Frugalware-git] frugalware-current: catfish-0.3-1-i686 Message-ID: <20071116024037.2C36C119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=40a4a206156155b5272cf6af9b9a9f4c02a469c8 commit 40a4a206156155b5272cf6af9b9a9f4c02a469c8 Author: Miklos Vajna Date: Fri Nov 16 03:40:30 2007 +0100 catfish-0.3-1-i686 version bump diff --git a/source/gnome-extra/catfish/FrugalBuild b/source/gnome-extra/catfish/FrugalBuild index ce9de68..ca31f42 100644 --- a/source/gnome-extra/catfish/FrugalBuild +++ b/source/gnome-extra/catfish/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: detto pkgname=catfish -pkgver=0.2.4 -pkgrel=2 +pkgver=0.3 +pkgrel=1 pkgdesc="A handy file searching tool that can use find, slocate or tracker as backend." url="http://software.twotoasts.de/?page=catfish" archs=('i686' 'x86_64') @@ -11,4 +11,4 @@ groups=('gnome-extra') depends=('gtk+2' 'pygtk' 'libglade' 'findutils' 'slocate' 'tracker') up2date="lynx -dump $url | grep "Stable" | cut -d ' ' -f6 | sed -n 's|v||p'" source=(http://software.twotoasts.de/media/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('cb69959d90b55a33cc28e2f432e7da4f76e7516c') +sha1sums=('5818f29e200b5a871a38bd261272f3968f9ab771') From vmiklos at frugalware.org Fri Nov 16 11:33:44 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 11:33:47 2007 Subject: [Frugalware-git] frugalware-current: less-415-1-i686 Message-ID: <20071116103344.F3A77119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bc5185cae8b56abc4779e6a35b43f7b5fb06b976 commit bc5185cae8b56abc4779e6a35b43f7b5fb06b976 Author: Miklos Vajna Date: Fri Nov 16 11:33:26 2007 +0100 less-415-1-i686 version bump diff --git a/source/base/less/FrugalBuild b/source/base/less/FrugalBuild index b427432..d7b00ed 100644 --- a/source/base/less/FrugalBuild +++ b/source/base/less/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=less -pkgver=409 +pkgver=415 pkgrel=1 pkgdesc="A paginator similar to more" url="http://www.greenwoodsoftware.com/less" @@ -11,7 +11,7 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.greenwoodsoftware.com/less/download.html |grep -m 1 .tar.gz | Flasttar" source=($url/$pkgname-$pkgver.tar.gz lesspipe.sh) -sha1sums=('6c554f520b635d783e16f19bfb3d7d00176a8a2d' \ +sha1sums=('49fb7f3c2105c98c4a7c062cddadb20f21e39ffd' \ '3e7e305a7eec7d3a52fd994f93c6065a71319086') build() From vmiklos at frugalware.org Fri Nov 16 12:06:07 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Nov 16 12:06:12 2007 Subject: [Frugalware-git] frugalware-current: bzflag-2.0.10-1-i686 Message-ID: <20071116110607.2C64F119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6de9fbfde0d3e8383d242c9a568d41963ba28087 commit 6de9fbfde0d3e8383d242c9a568d41963ba28087 Author: Miklos Vajna Date: Fri Nov 16 12:05:58 2007 +0100 bzflag-2.0.10-1-i686 version bump diff --git a/source/games-extra/bzflag/FrugalBuild b/source/games-extra/bzflag/FrugalBuild index 5982171..ed97ae1 100644 --- a/source/games-extra/bzflag/FrugalBuild +++ b/source/games-extra/bzflag/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Tibor Baksa pkgname=bzflag -pkgver=2.0.8 -pkgrel=2 +pkgver=2.0.10 +pkgrel=1 pkgdesc="BZFlag is a free multiplayer multiplatform 3D tank battle game." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_broken_up2date=1 @@ -12,7 +12,7 @@ url="http://www.bzflag.org/" depends=('glibc' 'glew' 'ncurses' 'libsm' 'libxt' 'openssl' 'curl' 'libdrm' 'libxcb' 'libxmu' 'sdlimage' 'libgcc' 'c-ares') groups=('games-extra') archs=('i686' 'x86_64') -sha1sums=('de4fb0c55c106711d1c213b50edeeedcbbea9da0') +sha1sums=('794ccba6ed8be5005cda8ced36ed8683cdabe2d7') export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" # optimization OK From krics at linuxforum.hu Fri Nov 16 15:43:59 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 16 15:44:01 2007 Subject: [Frugalware-git] frugalware-current: cairomm-1.4.6-1-x86_64 Message-ID: <20071116144359.715DC119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4b81ac4746a59c6deee1d7ad3a15818f16751e93 commit 4b81ac4746a59c6deee1d7ad3a15818f16751e93 Author: Christian Hamar alias krix Date: Fri Nov 16 15:43:31 2007 +0100 cairomm-1.4.6-1-x86_64 * Version bump diff --git a/source/xlib/cairomm/FrugalBuild b/source/xlib/cairomm/FrugalBuild index ad5f6e6..526c441 100644 --- a/source/xlib/cairomm/FrugalBuild +++ b/source/xlib/cairomm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=cairomm -pkgver=1.4.4 +pkgver=1.4.6 pkgrel=1 pkgdesc="C++ bindings for cairo" url="http://cairographics.org" @@ -13,5 +13,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/releases/ |grep ]LATEST-cairomm|sed 's/.*mm-\([^ ]*\) .*/\1/'" source=($url/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('5e0411a67d8f427a7fb514f27b8d15298f6dffe6') +sha1sums=('9d5880921d73827962c0ce268943963642ff5a1a') # optimization OK From krics at linuxforum.hu Fri Nov 16 15:57:56 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Nov 16 15:57:58 2007 Subject: [Frugalware-git] frugalware-current: gtkmm-2.12.3-1-x86_64 Message-ID: <20071116145756.186BC119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7788d55d447636b13219fb656c47eaf9ec26959b commit 7788d55d447636b13219fb656c47eaf9ec26959b Author: Christian Hamar alias krix Date: Fri Nov 16 15:53:24 2007 +0100 gtkmm-2.12.3-1-x86_64 * Version bump diff --git a/source/xlib/gtkmm/FrugalBuild b/source/xlib/gtkmm/FrugalBuild index 5650a87..3dad294 100644 --- a/source/xlib/gtkmm/FrugalBuild +++ b/source/xlib/gtkmm/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=gtkmm -pkgver=2.12.1 -pkgrel=3 +pkgver=2.12.3 +pkgrel=1 pkgdesc="C++ interface for GTK+2" -depends=('glibmm>=2.14.1-2' 'gtk+2>=2.12.1' 'cairomm>=1.4.2') +depends=('glibmm>=2.14.1-2' 'gtk+2>=2.12.1' 'cairomm>=1.4.6') groups=('xlib') archs=('i686' 'x86_64') Finclude gnome Fconfopts="$Fconfopts --disable-examples --disable-demos" -sha1sums=('9f20a32b2e0a3c43efb5732a0917db69ac9493a9') +sha1sums=('6583cab0ced0e745e996d8606fca614cefc6c9f6') export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" From crazy at frugalware.org Fri Nov 16 18:31:01 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 16 18:31:06 2007 Subject: [Frugalware-git] frugalware-current: psi-0.11-3-i686 Message-ID: <20071116173101.46F3F119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a17d0597bd626d8fc25e604c356e2c4ed12f43b5 commit a17d0597bd626d8fc25e604c356e2c4ed12f43b5 Author: crazy Date: Fri Nov 16 18:29:19 2007 +0100 psi-0.11-3-i686 * fix new qt4 depends() * ( well add qt4 depends :/ is why I never noticed this package need fixing ) * added an comment about libqt3support * closes #2582 diff --git a/source/xapps-extra/psi/FrugalBuild b/source/xapps-extra/psi/FrugalBuild index c3acbb7..1974a59 100644 --- a/source/xapps-extra/psi/FrugalBuild +++ b/source/xapps-extra/psi/FrugalBuild @@ -4,9 +4,12 @@ pkgname=psi pkgver=0.11 -pkgrel=2 +pkgrel=3 pkgdesc="Psi is a free instant messaging application designed for the Jabber IM network." -depends=('aspell' 'qca>=2.0.0' 'libxi') +# NOTE: please check depends again on future releases qt3support is almost there in the +# porting time from qt3 to qt4 and once the GUI is fully ported the depends will +# probably change to just libqtgui and libqtopengl or so. - crazy - +depends=('aspell' 'qca>=2.0.0' 'libxi' 'libqt3support' 'libxscrnsaver') rodepends=('qca-ossl' 'qca-gnupg') license="GPLv2" archs=('i686' 'x86_64') From devil505linux at gmail.com Fri Nov 16 18:57:42 2007 From: devil505linux at gmail.com (Devil505) Date: Fri Nov 16 18:57:45 2007 Subject: [Frugalware-git] frugalware-current: jargoninformatique-1.3.6-1-i686 Message-ID: <20071116175742.9D60D119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8b3791828aff5ab324676a6814ffcf4b95155ba commit b8b3791828aff5ab324676a6814ffcf4b95155ba Author: Devil505 Date: Fri Nov 16 18:46:50 2007 +0100 jargoninformatique-1.3.6-1-i686 *New Package diff --git a/source/xapps-extra/jargoninformatique/FrugalBuild b/source/xapps-extra/jargoninformatique/FrugalBuild new file mode 100755 index 0000000..4879f65 --- /dev/null +++ b/source/xapps-extra/jargoninformatique/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=jargoninformatique +pkgver=1.3.6 +pkgrel=1 +pkgdesc="French computering dictionary." +url="http://jargon.tuxfamily.org" +depends=('fltk' 'libxpm' 'libstdc++') +archs=('i686') +groups=('xapps-extra') +up2date="lynx -dump $url/download.php | grep -m3 tar.gz | Flasttar" +source="http://jargon.tuxfamily.org/$pkgname-$pkgver.tar.gz" +sha1sums=('adeade5bb37e22aa50b88612256dd86918bf4bdb') + +build() +{ + Fcd + Fconf + Fmake + make install PREFIX=$Fdestdir/usr || Fdie +} + +# optimization OK From crazy at frugalware.org Fri Nov 16 19:08:43 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 16 19:08:46 2007 Subject: [Frugalware-git] frugalware-current: ri-li-2.0.1-1-i686 Message-ID: <20071116180843.DA8AB119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1cc3d91292f48eb647b0f6aaa24b3241971c9aa1 commit 1cc3d91292f48eb647b0f6aaa24b3241971c9aa1 Author: crazy Date: Fri Nov 16 19:02:57 2007 +0100 ri-li-2.0.1-1-i686 * Version bump * we need autoreconf now , broken auto* * ok @ Daniel diff --git a/source/games-extra/ri-li/FrugalBuild b/source/games-extra/ri-li/FrugalBuild index 6a6cf78..aebecfc 100644 --- a/source/games-extra/ri-li/FrugalBuild +++ b/source/games-extra/ri-li/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: pizux pkgname=ri-li -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="Drive an toy wood train and collect coaches to win this 2d arcade game" _F_sourceforge_ext=".tar.bz2" @@ -15,7 +15,7 @@ depends=('sdl_mixer') groups=('games-extra') archs=('i686') _F_cd_path="$_F_sourceforge_name-$pkgver" -sha1sums=('e8122350c7f45a97fd2e627e4a34219a6cdcf902') +sha1sums=('33c1cd7c7a757decf813f5065a1bd88bba9520f3') _F_desktop_name="$_F_sourceforge_name" _F_desktop_icon="/usr/share/Ri-li/Ri-li-icon-48x48.png" @@ -24,6 +24,8 @@ _F_desktop_categories="Game;ArcadeGame;" build() { + Fcd + Fautoreconf Fbuild Frm usr/share/Ri-li/*.ebuild Fdesktop2 From crazy at frugalware.org Fri Nov 16 19:40:22 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 16 19:40:28 2007 Subject: [Frugalware-git] frugalware-current: libfame-0.9.1-3-i686 Message-ID: <20071116184022.EE26C119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f3683819a7aa296953dab6c9290126fb52191f09 commit f3683819a7aa296953dab6c9290126fb52191f09 Author: crazy Date: Fri Nov 16 19:39:33 2007 +0100 libfame-0.9.1-3-i686 * fixed m4 warnings from libfame * 'warning: underquoted definition of AM_PATH_LIBFAME' diff --git a/source/lib-extra/libfame/FrugalBuild b/source/lib-extra/libfame/FrugalBuild index 8c4cd17..02ecf4d 100644 --- a/source/lib-extra/libfame/FrugalBuild +++ b/source/lib-extra/libfame/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libfame pkgver=0.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="libFAME is a library for fast (real-time) MPEG video encoding, written in C and assembly." makedepends=('automake') depends=('glibc') @@ -14,16 +14,19 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://fame.sourceforge.net/" source=($source libfame-0.9.1-gentoopatchset.patch \ - libfame-0.9.1-x86_64_fmallocfix.patch) + libfame-0.9.1-x86_64_fmallocfix.patch \ + libfame-0.9.1-m4.patch) license="GPL2" sha1sums=('2b3c04f8be5ab715cda2bb6aef847e7d2d4709ee' \ '42f35c021c8a0b771bdc465b2498fb2b32a556eb' \ - '83fe9ac5d566f13bc5d594a944efbf3288ea05e6') + '83fe9ac5d566f13bc5d594a944efbf3288ea05e6' \ + '7cdb3d5c4d05fc2114e955782d309801dd2a2e59') [ "$CARCH" == "x86_64" ] && sse=" --enable-sse" build () { Fcd Fpatch libfame-0.9.1-gentoopatchset.patch || return 1 + Fpatch libfame-0.9.1-m4.patch [ "$CARCH" == "x86_64" ] && Fpatch libfame-0.9.1-x86_64_fmallocfix.patch Fsed "-march=i[345]86 " "" configure Facu @@ -31,6 +34,4 @@ build () { Fmakeinstall } -# optimalization ok - # optimization OK diff --git a/source/lib-extra/libfame/libfame-0.9.1-m4.patch b/source/lib-extra/libfame/libfame-0.9.1-m4.patch new file mode 100644 index 0000000..9994a55 --- /dev/null +++ b/source/lib-extra/libfame/libfame-0.9.1-m4.patch @@ -0,0 +1,11 @@ +--- libfame-0.9.1/libfame.m4.in 2001-11-20 12:56:37.000000000 +0100 ++++ libfame-0.9.1-autoconf/libfame.m4.in 2005-08-01 14:29:01.033003392 +0200 +@@ -3,7 +3,7 @@ + dnl Vivien Chappelier 12/11/00 + dnl stolen from ORBit autoconf + dnl +-AC_DEFUN(AM_PATH_LIBFAME, ++AC_DEFUN([AM_PATH_LIBFAME], + [dnl + dnl Get the cflags and libraries from the libfame-config script + dnl From crazy at frugalware.org Fri Nov 16 20:01:21 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 16 20:01:23 2007 Subject: [Frugalware-git] frugalware-current: kiwi-1.9.19-1-i686 Message-ID: <20071116190121.9C7B8119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=176dce88e2a5d599f595d8ebd7fa40259c16e9b9 commit 176dce88e2a5d599f595d8ebd7fa40259c16e9b9 Author: crazy Date: Fri Nov 16 20:00:53 2007 +0100 kiwi-1.9.19-1-i686 * Version bump diff --git a/source/xlib-extra/kiwi/FrugalBuild b/source/xlib-extra/kiwi/FrugalBuild index 0554ada..b1e5c69 100644 --- a/source/xlib-extra/kiwi/FrugalBuild +++ b/source/xlib-extra/kiwi/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 pkgname=kiwi -pkgver=1.9.18 +pkgver=1.9.19 pkgrel=1 pkgdesc="A framework for Python applications with graphical user interfaces" url="http://www.async.com.br/projects/kiwi/" @@ -13,4 +13,4 @@ up2date="lynx -dump http://www.async.com.br/projects/kiwi/getit.html|grep -m1 'k groups=('xlib-extra') archs=('i686' 'x86_64') depends=('pygtk') -sha1sums=('c1b61fc762e671447997173e115d1f7091220dca') +sha1sums=('09640cf8bf66100a007f5bfbf7c8406cb5e315d3') From crazy at frugalware.org Fri Nov 16 20:06:54 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 16 20:06:57 2007 Subject: [Frugalware-git] frugalware-current: perl-xml-twig-3.32-1-i686 Message-ID: <20071116190654.2683D119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=93fd5b26ced56c0dfb5b47a05c58cf80b0113079 commit 93fd5b26ced56c0dfb5b47a05c58cf80b0113079 Author: crazy Date: Fri Nov 16 20:06:31 2007 +0100 perl-xml-twig-3.32-1-i686 * Version bump diff --git a/source/devel/perl-xml-twig/FrugalBuild b/source/devel/perl-xml-twig/FrugalBuild index beebc6f..58ca5a0 100644 --- a/source/devel/perl-xml-twig/FrugalBuild +++ b/source/devel/perl-xml-twig/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=XML-Twig _F_perl_author=M/MI/MIROD -pkgver=3.31 +pkgver=3.32 pkgrel=1 pkgdesc="A perl module for processing huge XML documents in tree mode." depends=('perl-xml') @@ -11,5 +11,5 @@ _F_conf_perl_pipefrom="echo y" Finclude perl archs=('i686' 'x86_64') groups=('devel') -sha1sums=('66a9756e3493d949c93396d6ec216e48e17614a4') +sha1sums=('f8fb38e0e088f2c56c7eb4d804d943872e6ddf98') From crazy at frugalware.org Fri Nov 16 20:10:06 2007 From: crazy at frugalware.org (crazy) Date: Fri Nov 16 20:10:09 2007 Subject: [Frugalware-git] frugalware-current: perl-sys-syslog-0.23-1-i686 Message-ID: <20071116191006.45094119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e30b3702859fc1f5ce8ddf8f4f16f59db5021c0 commit 9e30b3702859fc1f5ce8ddf8f4f16f59db5021c0 Author: crazy Date: Fri Nov 16 20:09:31 2007 +0100 perl-sys-syslog-0.23-1-i686 * Version bump diff --git a/source/devel-extra/perl-sys-syslog/FrugalBuild b/source/devel-extra/perl-sys-syslog/FrugalBuild index 93cbcbb..ffa75ec 100644 --- a/source/devel-extra/perl-sys-syslog/FrugalBuild +++ b/source/devel-extra/perl-sys-syslog/FrugalBuild @@ -3,11 +3,11 @@ _F_perl_name=Sys-Syslog _F_perl_author=S/SA/SAPER -pkgver=0.22 +pkgver=0.23 pkgrel=1 pkgdesc="Perl interface to the UNIX syslog(3) calls" Finclude perl archs=('i686' 'x86_64') -sha1sums=('bf259e1eb7b444da4ddd59f1f2150aa2615eb696') +sha1sums=('e6f1d251085cce0f26bc88badfa59dbca242a339') # optimization OK From boobaa at frugalware.org Fri Nov 16 22:14:24 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Nov 16 22:14:28 2007 Subject: [Frugalware-git] drupal: drupal-image-5.x_1.6-1-i686 Message-ID: <20071116211424.01EEF119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=47cafc8ca88f2521363e2e362e044d6560bb92f7 commit 47cafc8ca88f2521363e2e362e044d6560bb92f7 Author: CSÉCSY László Date: Fri Nov 16 22:13:59 2007 +0100 drupal-image-5.x_1.6-1-i686 new package / initial import first birdie for/with drupal.sh ;) diff --git a/source/network-extra/drupal-image/FrugalBuild b/source/network-extra/drupal-image/FrugalBuild new file mode 100644 index 0000000..fcdedc5 --- /dev/null +++ b/source/network-extra/drupal-image/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=image +pkgver=5.x_1.6 +pkgrel=1 +pkgdesc="Allow users with proper permissions to upload images into Drupal" +Finclude drupal +sha1sums=('7ee3232930abdf07e130ee0a4eb66bb8fb025dc1') From boobaa at frugalware.org Sat Nov 17 00:01:00 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 00:01:02 2007 Subject: [Frugalware-git] drupal: drupal.sh: I dislike that empty usr/share Message-ID: <20071116230100.7EC0C119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=05026e0060182a13a78c131f7b89bc125650231a commit 05026e0060182a13a78c131f7b89bc125650231a Author: CSÉCSY László Date: Sat Nov 17 00:00:52 2007 +0100 drupal.sh: I dislike that empty usr/share thanks crazy for that 'nodocs' option ;9 diff --git a/source/include/drupal.sh b/source/include/drupal.sh index e3857c6..8b704b8 100644 --- a/source/include/drupal.sh +++ b/source/include/drupal.sh @@ -56,7 +56,7 @@ else filever=${pkgver//_dev*/_dev} source=(http://ftp.drupal.org/files/projects/$_F_drupal_module-${filever//_/-}.tar.gz) fi -options=('stick') +options=('stick' 'nodocs') ### # == PROVIDED FUNCTIONS From boobaa at frugalware.org Sat Nov 17 00:23:26 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 00:23:29 2007 Subject: [Frugalware-git] frugalware-current: perl-gtk2-1.162-1-i686 Message-ID: <20071116232326.9ECDF119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d5ab591a1e497c8cee34cf9d1449429de265687 commit 1d5ab591a1e497c8cee34cf9d1449429de265687 Author: CSÉCSY László Date: Sat Nov 17 00:23:19 2007 +0100 perl-gtk2-1.162-1-i686 version bump diff --git a/source/xlib-extra/perl-gtk2/FrugalBuild b/source/xlib-extra/perl-gtk2/FrugalBuild index 192546e..99c20af 100644 --- a/source/xlib-extra/perl-gtk2/FrugalBuild +++ b/source/xlib-extra/perl-gtk2/FrugalBuild @@ -5,7 +5,7 @@ pkgname=perl-gtk2 _F_perl_name=Gtk2 _F_perl_author=T/TS/TSCH -pkgver=1.161 +pkgver=1.162 pkgdesc="Perl interface to the 2.x series of the Gimp Toolkit library" depends=('gtk+2>=2.10.3' 'perl-glib>=1.160' 'perl-cairo') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') @@ -13,6 +13,6 @@ Finclude perl groups=('xlib-extra') archs=('i686' 'x86_64') options=('scriptlet') -sha1sums=('552128eb103343582e203d15fa61120896634bc2') +sha1sums=('979b74bda00a1164ba5234e9d0e7dfa5b604265d') # optimization OK From voroskoi at frugalware.org Sat Nov 17 07:23:39 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 17 07:23:41 2007 Subject: [Frugalware-git] frugalware-current: samba-3.0.27-1-x86_64 Message-ID: <20071117062339.27C96119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2bf0b8a452cd12c6085a9f9bd37302bfd04e6a32 commit 2bf0b8a452cd12c6085a9f9bd37302bfd04e6a32 Author: voroskoi Date: Sat Nov 17 07:22:34 2007 +0100 samba-3.0.27-1-x86_64 version bump diff --git a/source/network/samba/FrugalBuild b/source/network/samba/FrugalBuild index 2653a8e..58a5d96 100644 --- a/source/network/samba/FrugalBuild +++ b/source/network/samba/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=samba -pkgver=3.0.26 -pkgextraver=a +pkgver=3.0.27 +pkgextraver= pkgrel=1 pkgdesc="SMB file and print server." url="http://www.samba.org" @@ -86,7 +86,7 @@ build() Fsplit samba-swat usr/sbin/swat Fsplit samba-swat usr/share/swat } -sha1sums=('1625ac3f1c2a57600a9141a2b4bbe59fe8c4d6d2' \ +sha1sums=('d1157992adbab1f5d5aff54f370d1797fcf8927e' \ '13fd371189bfe637f3f13c62d44d9e761268119e' \ '0e407642fe6aa0c032df38aac3815eb08f07e35b') From boobaa at frugalware.org Sat Nov 17 09:19:10 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:19:13 2007 Subject: [Frugalware-git] drupal: drupal-image-5.x_1.6-2-i686 Message-ID: <20071117081910.C58A1119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=86182ec6572ac04c03f600ac43cd2c026301f4a7 commit 86182ec6572ac04c03f600ac43cd2c026301f4a7 Author: CSÉCSY László Date: Sat Nov 17 09:19:02 2007 +0100 drupal-image-5.x_1.6-2-i686 rebuilt with correct options diff --git a/source/network-extra/drupal-image/FrugalBuild b/source/network-extra/drupal-image/FrugalBuild index fcdedc5..845aa71 100644 --- a/source/network-extra/drupal-image/FrugalBuild +++ b/source/network-extra/drupal-image/FrugalBuild @@ -3,7 +3,7 @@ _F_drupal_module=image pkgver=5.x_1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Allow users with proper permissions to upload images into Drupal" Finclude drupal sha1sums=('7ee3232930abdf07e130ee0a4eb66bb8fb025dc1') From boobaa at frugalware.org Sat Nov 17 09:22:32 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:22:37 2007 Subject: [Frugalware-git] drupal: drupal-textfield_autocomplete-5.x_1.x_dev20070901-1-i686 Message-ID: <20071117082232.737A5119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=a235cb6ce9fc10263d5905f6596d9e971f056829 commit a235cb6ce9fc10263d5905f6596d9e971f056829 Author: CSÉCSY László Date: Sat Nov 17 09:22:28 2007 +0100 drupal-textfield_autocomplete-5.x_1.x_dev20070901-1-i686 new package / initial import example for _F_drupal_dev=1 diff --git a/source/network-extra/drupal-textfield_autocomplete/FrugalBuild b/source/network-extra/drupal-textfield_autocomplete/FrugalBuild new file mode 100644 index 0000000..2c75791 --- /dev/null +++ b/source/network-extra/drupal-textfield_autocomplete/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=textfield_autocomplete +_F_drupal_dev=1 +pkgver=5.x_1.x_dev20070901 +pkgrel=1 +pkgdesc="A new cck widget, for the textfield: Textfield with autocomplete for Drupal" +Finclude drupal +sha1sums=('6b5f5907b706eedce6dedddb633d841b5ba4be5a') From boobaa at frugalware.org Sat Nov 17 09:27:21 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:27:23 2007 Subject: [Frugalware-git] drupal: Tiny improvement in drupal.sh Message-ID: <20071117082721.8B964119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=e9d9f4e92e2b6e4f69e8dfbc274b4ad351cc37ef commit e9d9f4e92e2b6e4f69e8dfbc274b4ad351cc37ef Author: CSÉCSY László Date: Sat Nov 17 09:27:09 2007 +0100 Tiny improvement in drupal.sh now it can handle versions like 5.x-1.0-1 in official releases diff --git a/source/include/drupal.sh b/source/include/drupal.sh index 8b704b8..b78f0a1 100644 --- a/source/include/drupal.sh +++ b/source/include/drupal.sh @@ -48,7 +48,7 @@ rodepends=('drupal>=5.0' ${rodepends[@]}) groups=('network-extra') archs=('i686' 'x86_64') if [ $_F_drupal_dev == 0 ]; then - up2date="lynx -dump http://drupal.org/project/$_F_drupal_module | grep 'http://.*$_F_drupal_ver.*[^v]\.tar\.gz' | sed 's/.*$_F_drupal_module-\(.*\)\.tar.*/\1/;s/-/_/'" + up2date="lynx -dump http://drupal.org/project/$_F_drupal_module | grep 'http://.*$_F_drupal_ver.*[^v]\.tar\.gz' | sed 's/.*$_F_drupal_module-\(.*\)\.tar.*/\1/;y/-/_/'" source=(http://ftp.drupal.org/files/projects/$_F_drupal_module-${pkgver//_/-}.tar.gz) else # up2date="lynx -dump http://drupal.org/project/$_F_drupal_module | grep '$_F_drupal_ver.*-dev[0-9][0-9]\]Download' | sed 's/.*$_F_drupal_module-\(.*\)\.tar.*/\1/;s/-/_/'" From boobaa at frugalware.org Sat Nov 17 09:28:13 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:28:14 2007 Subject: [Frugalware-git] drupal: drupal-profile_privacy-5.x_1.0_1-1-i686 Message-ID: <20071117082813.05FAD119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=0de71df93a6f73468e48941a76b5e10d8d739016 commit 0de71df93a6f73468e48941a76b5e10d8d739016 Author: CSÉCSY László Date: Sat Nov 17 09:28:08 2007 +0100 drupal-profile_privacy-5.x_1.0_1-1-i686 new package / initial import diff --git a/source/network-extra/drupal-profile_privacy/FrugalBuild b/source/network-extra/drupal-profile_privacy/FrugalBuild new file mode 100644 index 0000000..5b77671 --- /dev/null +++ b/source/network-extra/drupal-profile_privacy/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=profile_privacy +pkgver=5.x_1.0_1 +pkgrel=1 +pkgdesc="Allow users to set privacy options for their profile in Drupal" +Finclude drupal +sha1sums=('2cb36f4341692a67c0a4d1d71fd453f841d1e649') From boobaa at frugalware.org Sat Nov 17 09:30:11 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:30:14 2007 Subject: [Frugalware-git] drupal: drupal-vocabulary_list_nodes-5.x_1.0-1-i686 Message-ID: <20071117083011.5ED5F119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=7b0042053d605786228819e724ed0cc55551c0c1 commit 7b0042053d605786228819e724ed0cc55551c0c1 Author: CSÉCSY László Date: Sat Nov 17 09:30:06 2007 +0100 drupal-vocabulary_list_nodes-5.x_1.0-1-i686 new package / initial import diff --git a/source/network-extra/drupal-vocabulary_list_nodes/FrugalBuild b/source/network-extra/drupal-vocabulary_list_nodes/FrugalBuild new file mode 100644 index 0000000..06bc725 --- /dev/null +++ b/source/network-extra/drupal-vocabulary_list_nodes/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=vocabulary_list_nodes +pkgver=5.x_1.0 +pkgrel=1 +pkgdesc="Provides nodes listing by vocabulary with standard pager in Drupal" +Finclude drupal +sha1sums=('2e0cb8c14edb5ce5a2c3524a44a3240fe3cdafc2') From boobaa at frugalware.org Sat Nov 17 09:32:36 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:32:38 2007 Subject: [Frugalware-git] drupal: drupal-taxonomy_list-5.x_1.1-1-i686 Message-ID: <20071117083236.9F27C119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=733f589637d0b237458f5bc3e1b3414e0cca3dd5 commit 733f589637d0b237458f5bc3e1b3414e0cca3dd5 Author: CSÉCSY László Date: Sat Nov 17 09:32:13 2007 +0100 drupal-taxonomy_list-5.x_1.1-1-i686 new package / initial import diff --git a/source/network-extra/drupal-taxonomy_list/FrugalBuild b/source/network-extra/drupal-taxonomy_list/FrugalBuild new file mode 100644 index 0000000..93d14b5 --- /dev/null +++ b/source/network-extra/drupal-taxonomy_list/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=taxonomy_list +pkgver=5.x_1.1 +pkgrel=1 +pkgdesc="Displays the terms under categories with image and description in Drupal" +Finclude drupal +sha1sums=('efaa39c5792537bab77cd78d0a784f86e3656b2c') From boobaa at frugalware.org Sat Nov 17 09:34:40 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:34:42 2007 Subject: [Frugalware-git] drupal: drupal-commentrss-5.x_1.x_dev20070716-1-i686 Message-ID: <20071117083440.EFAD7119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=6a83021df0c13989b186a77f6a406abd02ed15db commit 6a83021df0c13989b186a77f6a406abd02ed15db Author: CSÉCSY László Date: Sat Nov 17 09:34:35 2007 +0100 drupal-commentrss-5.x_1.x_dev20070716-1-i686 new package / initial import diff --git a/source/network-extra/drupal-commentrss/FrugalBuild b/source/network-extra/drupal-commentrss/FrugalBuild new file mode 100644 index 0000000..f321567 --- /dev/null +++ b/source/network-extra/drupal-commentrss/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=commentrss +_F_drupal_dev=1 +pkgver=5.x_1.x_dev20070716 +pkgrel=1 +pkgdesc="Provides RSS feeds for comments in Drupal" +Finclude drupal +sha1sums=('91ed99b701dd42dd8a2fc78f4437d9b5f7c9a0c8') From boobaa at frugalware.org Sat Nov 17 09:36:18 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:36:20 2007 Subject: [Frugalware-git] drupal: drupal-nice_menus-5.x_1.0-1-i686 Message-ID: <20071117083618.C5838119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=dcf0276b1017a63057855888dc0e798334f46d1f commit dcf0276b1017a63057855888dc0e798334f46d1f Author: CSÉCSY László Date: Sat Nov 17 09:36:12 2007 +0100 drupal-nice_menus-5.x_1.0-1-i686 new package / initial import diff --git a/source/network-extra/drupal-nice_menus/FrugalBuild b/source/network-extra/drupal-nice_menus/FrugalBuild new file mode 100644 index 0000000..1be711f --- /dev/null +++ b/source/network-extra/drupal-nice_menus/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=nice_menus +pkgver=5.x_1.0 +pkgrel=1 +pkgdesc="Enables drop-down/right/left expandable menus in Drupal" +Finclude drupal +sha1sums=('461c467df5ee79662283ee1209399e26703ffa72') From boobaa at frugalware.org Sat Nov 17 09:38:28 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:38:30 2007 Subject: [Frugalware-git] drupal: drupal-guestbook-5.x_1.0-1-i686 Message-ID: <20071117083828.90DFC119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=125e6dadbfa326b5f9a1263c5914d65318a2a99c commit 125e6dadbfa326b5f9a1263c5914d65318a2a99c Author: CSÉCSY László Date: Sat Nov 17 09:38:16 2007 +0100 drupal-guestbook-5.x_1.0-1-i686 new package / initial import diff --git a/source/network-extra/drupal-guestbook/FrugalBuild b/source/network-extra/drupal-guestbook/FrugalBuild new file mode 100644 index 0000000..5c2e6ba --- /dev/null +++ b/source/network-extra/drupal-guestbook/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=guestbook +pkgver=5.x_1.0 +pkgrel=1 +pkgdesc="Provides a site guestbook and individual user guestbooks for Drupal" +Finclude drupal +sha1sums=('d6acef93d4051f3225a28e1aa71b19db80fea2e5') From boobaa at frugalware.org Sat Nov 17 09:40:34 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:40:40 2007 Subject: [Frugalware-git] drupal: drupal-captcha-5.x_3.0-1-i686 Message-ID: <20071117084034.A1ADB119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=37cc0ecf9fa010969b3365adb00cc5c55e706035 commit 37cc0ecf9fa010969b3365adb00cc5c55e706035 Author: CSÉCSY László Date: Sat Nov 17 09:40:29 2007 +0100 drupal-captcha-5.x_3.0-1-i686 new package / initial import diff --git a/source/network-extra/drupal-captcha/FrugalBuild b/source/network-extra/drupal-captcha/FrugalBuild new file mode 100644 index 0000000..d910939 --- /dev/null +++ b/source/network-extra/drupal-captcha/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=captcha +pkgver=5.x_3.0 +pkgrel=1 +pkgdesc="Provides CAPTCHA feature to virtually any user facing web form in Drupal" +Finclude drupal +sha1sums=('30a2ed557345e05f76dbde207bba47f785a8fb31') From boobaa at frugalware.org Sat Nov 17 09:42:10 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:42:14 2007 Subject: [Frugalware-git] drupal: drupal-masquerade-5.x_1.1-1-i686 Message-ID: <20071117084210.32754119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=83788b73e604b5cba60076a5798e128a0ace84f7 commit 83788b73e604b5cba60076a5798e128a0ace84f7 Author: CSÉCSY László Date: Sat Nov 17 09:42:05 2007 +0100 drupal-masquerade-5.x_1.1-1-i686 new package / initial import diff --git a/source/network-extra/drupal-masquerade/FrugalBuild b/source/network-extra/drupal-masquerade/FrugalBuild new file mode 100644 index 0000000..afd39c1 --- /dev/null +++ b/source/network-extra/drupal-masquerade/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=masquerade +pkgver=5.x_1.1 +pkgrel=1 +pkgdesc="Allows a user with the right permissions to switch users in Drupal" +Finclude drupal +sha1sums=('f72eafe4e1f48f4f75e59c491f3213957518017d') From boobaa at frugalware.org Sat Nov 17 09:44:25 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:44:27 2007 Subject: [Frugalware-git] drupal: drupal-nodeaccess-5.x_1.x_dev20070608-1-i686 Message-ID: <20071117084425.9C3E5119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=be1a41ab24e1cb0ccb329731450b70a25e8e9bf1 commit be1a41ab24e1cb0ccb329731450b70a25e8e9bf1 Author: CSÉCSY László Date: Sat Nov 17 09:44:21 2007 +0100 drupal-nodeaccess-5.x_1.x_dev20070608-1-i686 new package / initial import diff --git a/source/network-extra/drupal-nodeaccess/FrugalBuild b/source/network-extra/drupal-nodeaccess/FrugalBuild new file mode 100644 index 0000000..ed10bd7 --- /dev/null +++ b/source/network-extra/drupal-nodeaccess/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=nodeaccess +_F_drupal_dev=1 +pkgver=5.x_1.x_dev20070608 +pkgrel=1 +pkgdesc="Provides per node access control for Drupal" +Finclude drupal +sha1sums=('d5dd7d511f29bcb48c9280466d7b6054839e1724') From boobaa at frugalware.org Sat Nov 17 09:46:38 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:46:39 2007 Subject: [Frugalware-git] drupal: drupal-cck-5.x_1.6_1-1-i686 Message-ID: <20071117084638.7FF8A119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=e824b990dfb2036492db9be8ad1b12812b0a0e8a commit e824b990dfb2036492db9be8ad1b12812b0a0e8a Author: CSÉCSY László Date: Sat Nov 17 09:46:33 2007 +0100 drupal-cck-5.x_1.6_1-1-i686 new package / initial import diff --git a/source/network-extra/drupal-cck/FrugalBuild b/source/network-extra/drupal-cck/FrugalBuild new file mode 100644 index 0000000..7e7d47a --- /dev/null +++ b/source/network-extra/drupal-cck/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=cck +pkgver=5.x_1.6_1 +pkgrel=1 +pkgdesc="Allows you create and customize fields using a web browser in Drupal" +Finclude drupal +sha1sums=('4e275a174b7458b15de11b1b1fd3318f27b1fd4f') From boobaa at frugalware.org Sat Nov 17 09:48:54 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:48:55 2007 Subject: [Frugalware-git] drupal: drupal-textfield_autocomplete-5.x_1.x_dev20070901-2-i686 Message-ID: <20071117084854.4E965119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=acd1ec5b87cae58e34baaccb6d529870d94f2d2a commit acd1ec5b87cae58e34baaccb6d529870d94f2d2a Author: CSÉCSY László Date: Sat Nov 17 09:48:47 2007 +0100 drupal-textfield_autocomplete-5.x_1.x_dev20070901-2-i686 grr, forgot to add correct (ro)depends previously diff --git a/source/network-extra/drupal-textfield_autocomplete/FrugalBuild b/source/network-extra/drupal-textfield_autocomplete/FrugalBuild index 2c75791..e8ac060 100644 --- a/source/network-extra/drupal-textfield_autocomplete/FrugalBuild +++ b/source/network-extra/drupal-textfield_autocomplete/FrugalBuild @@ -4,7 +4,8 @@ _F_drupal_module=textfield_autocomplete _F_drupal_dev=1 pkgver=5.x_1.x_dev20070901 -pkgrel=1 +pkgrel=2 pkgdesc="A new cck widget, for the textfield: Textfield with autocomplete for Drupal" +rodepends=('drupal-cck') Finclude drupal sha1sums=('6b5f5907b706eedce6dedddb633d841b5ba4be5a') From boobaa at frugalware.org Sat Nov 17 09:52:02 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:52:03 2007 Subject: [Frugalware-git] drupal: drupal-date-5.x_1.7-1-i686 Message-ID: <20071117085202.10424119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=ce8ef12b0bce82271a0d8789f8163318f48a2ec1 commit ce8ef12b0bce82271a0d8789f8163318f48a2ec1 Author: CSÉCSY László Date: Sat Nov 17 09:51:55 2007 +0100 drupal-date-5.x_1.7-1-i686 new package / initial import diff --git a/source/network-extra/drupal-date/FrugalBuild b/source/network-extra/drupal-date/FrugalBuild new file mode 100644 index 0000000..9e8b4a6 --- /dev/null +++ b/source/network-extra/drupal-date/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=date +pkgver=5.x_1.7 +pkgrel=1 +pkgdesc="The Date module and a Date API module for Drupal" +rodepends=('drupal-cck') +Finclude drupal +sha1sums=('febdbcc0f03972f0c4cee257888c99fbcd03aa24') From boobaa at frugalware.org Sat Nov 17 09:54:44 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Nov 17 09:54:45 2007 Subject: [Frugalware-git] drupal: drupal-imagefield-5.x_1.1-1-i686 Message-ID: <20071117085444.DFBAC119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=drupal.git;a=commitdiff;h=39935300db403aa20fdbe9bb3637e81a502d4a79 commit 39935300db403aa20fdbe9bb3637e81a502d4a79 Author: CSÉCSY László Date: Sat Nov 17 09:54:39 2007 +0100 drupal-imagefield-5.x_1.1-1-i686 new package / initial import diff --git a/source/network-extra/drupal-imagefield/FrugalBuild b/source/network-extra/drupal-imagefield/FrugalBuild new file mode 100644 index 0000000..bca966e --- /dev/null +++ b/source/network-extra/drupal-imagefield/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=imagefield +pkgver=5.x_1.1 +pkgrel=1 +pkgdesc="Provides a basic image field for CCK in Drupal" +rodepends=('drupal-cck') +Finclude drupal +sha1sums=('7c3d1a341440c5c299e376db845843f526bf1e9d') From devil505linux at gmail.com Sat Nov 17 09:56:22 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 17 09:56:24 2007 Subject: [Frugalware-git] frugalware-current: galculator-1.3.1-1-i686 Message-ID: <20071117085622.4CFB6119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3918c585651ea7534a26572bb068aad43d821454 commit 3918c585651ea7534a26572bb068aad43d821454 Author: Devil505 Date: Sat Nov 17 09:54:00 2007 +0100 galculator-1.3.1-1-i686 *New Package diff --git a/source/xapps-extra/galculator/FrugalBuild b/source/xapps-extra/galculator/FrugalBuild new file mode 100644 index 0000000..ac5dff3 --- /dev/null +++ b/source/xapps-extra/galculator/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.14 SBU +# Maintainer: devil505 + +pkgname=galculator +pkgver=1.3.1 +pkgrel=1 +pkgdesc="galculator is a GTK 2 based scientific calculator supporting algebraic mode as well as RPN." +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('libglade' 'libxdamage') +makedepends=('pkgconfig') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +sha1sums=('095765206cab968d6f00c1ae58b1bd8425c454d6') + +# optimization OK From devil505linux at gmail.com Sat Nov 17 10:11:52 2007 From: devil505linux at gmail.com (Devil505) Date: Sat Nov 17 10:11:53 2007 Subject: [Frugalware-git] frugalware-current: osmo-0.1.1-1-i686 Message-ID: <20071117091152.140D6119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3b080322a6ca43c4d1d7bae3baf734247ed5af6c commit 3b080322a6ca43c4d1d7bae3baf734247ed5af6c Author: Devil505 Date: Sat Nov 17 10:08:22 2007 +0100 osmo-0.1.1-1-i686 *New Package diff --git a/source/xapps-extra/osmo/FrugalBuild b/source/xapps-extra/osmo/FrugalBuild new file mode 100644 index 0000000..22014ac --- /dev/null +++ b/source/xapps-extra/osmo/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.13 SBU +# Maintainer: Devil505 + +pkgname=osmo +pkgver=0.1.1 +pkgrel=1 +pkgdesc="A handy personal organizer which includes calendar, tasks manager and address book modules." +url="http://clay.ll.pl/osmo/" +depends=('gtk+2' 'libxdamage' 'libxml2') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +up2date="lynx -dump $url | grep tar.gz | Flasttar" +source=(http://clay.ll.pl/osmo/$pkgname-$pkgver.tar.gz) +sha1sums=('53baff2148b63ab682272b9a542f34fe7009a5e2') + + + From priyank at frugalware.org Sat Nov 17 14:21:14 2007 From: priyank at frugalware.org (Priyank) Date: Sat Nov 17 14:21:16 2007 Subject: [Frugalware-git] fun: configure.ac: Added libglade-2.0 check Message-ID: <20071117132114.9A79B119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=e554150536e460da3c9712654d509b74e00fc2fe commit e554150536e460da3c9712654d509b74e00fc2fe Author: Priyank Date: Sat Nov 17 18:47:59 2007 +0530 configure.ac: Added libglade-2.0 check diff --git a/configure.ac b/configure.ac index 1e30719..197ee8a 100644 --- a/configure.ac +++ b/configure.ac @@ -27,9 +27,9 @@ 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" PKG_CHECK_MODULES([FUND], [dbus-glib-1 >= 0.73]) -PKG_CHECK_MODULES([FUN], [gtk+-2.0 >= 2.12.0]) +PKG_CHECK_MODULES([FUN], [$ui_modules]) AC_ARG_WITH(dbus-sys, [ --with-dbus-sys= where D-BUS system.d directory is]) From voroskoi at frugalware.org Sat Nov 17 16:34:29 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 17 16:34:31 2007 Subject: [Frugalware-git] frugalware-current: opencdk-0.6.6-1-x86_64 Message-ID: <20071117153429.3882D119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2aa44a4c6a371c796422f1b02930d7c152aa2fa3 commit 2aa44a4c6a371c796422f1b02930d7c152aa2fa3 Author: voroskoi Date: Sat Nov 17 16:17:34 2007 +0100 opencdk-0.6.6-1-x86_64 version bump diff --git a/source/lib/opencdk/FrugalBuild b/source/lib/opencdk/FrugalBuild index 0910088..f1ea9c7 100644 --- a/source/lib/opencdk/FrugalBuild +++ b/source/lib/opencdk/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik pkgname=opencdk -pkgver=0.6.5 +pkgver=0.6.6 pkgrel=1 pkgdesc="The Open Crypto Development Kit provides basic parts of the OpenPGP message format" url="http://www.gnu.org/software/gnutls/" From voroskoi at frugalware.org Sat Nov 17 16:44:25 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 17 16:44:28 2007 Subject: [Frugalware-git] homepage-ng: FSA316-xpdf Message-ID: <20071117154425.CF99D119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=7924e6acae8ffc04b5143fbac19fa4ab0f32448a commit 7924e6acae8ffc04b5143fbac19fa4ab0f32448a Author: voroskoi Date: Sat Nov 17 16:44:15 2007 +0100 FSA316-xpdf diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 272ecb7..0833ff5 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,23 @@ + 316 + 2007-11-17 + voroskoi + xpdf + 3.02-3 + 3.02-4sayshell1 + http://bugs.frugalware.org/task/2558 + 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 + Secunia Research has discovered some vulnerabilities in Xpdf, which can be exploited by malicious people to compromise a user's system. + 1) An array indexing error within the "DCTStream::readProgressiveDataUnit()" method in xpdf/Stream.cc can be exploited to corrupt memory via a specially crafted PDF file. + 2) An integer overflow error within the "DCTStream::reset()" method in xpdf/Stream.cc can be exploited to cause a heap-based buffer overflow via a specially crafted PDF file. + 3) A boundary error within the "CCITTFaxStream::lookChar()" method in xpdf/Stream.cc can be exploited to cause a heap-based buffer overflow by tricking a user into opening a PDF file containing a specially crafted "CCITTFaxDecode" filter. + Successful exploitation allows execution of arbitrary code. + + 315 2007-11-12 vmiklos From voroskoi at frugalware.org Sat Nov 17 16:49:38 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 17 16:49:39 2007 Subject: [Frugalware-git] frugalware-current: gnutls-2.0.4-1-x86_64 Message-ID: <20071117154938.2CBD0119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e50c14df6ae2c46c3e37efff5023a3f7efc665f2 commit e50c14df6ae2c46c3e37efff5023a3f7efc665f2 Author: voroskoi Date: Sat Nov 17 16:49:02 2007 +0100 gnutls-2.0.4-1-x86_64 version bump diff --git a/source/lib/gnutls/FrugalBuild b/source/lib/gnutls/FrugalBuild index 18b3608..7e3eb5f 100644 --- a/source/lib/gnutls/FrugalBuild +++ b/source/lib/gnutls/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=gnutls -pkgver=2.0.3 +pkgver=2.0.4 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" url="http://www.gnu.org/software/gnutls/" From voroskoi at frugalware.org Sat Nov 17 16:59:31 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 17 16:59:34 2007 Subject: [Frugalware-git] homepage-ng: FSA317-koffice Message-ID: <20071117155931.5CEBA119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=43bc27ddc57786ba270b97450cb6c7fd79b55034 commit 43bc27ddc57786ba270b97450cb6c7fd79b55034 Author: voroskoi Date: Sat Nov 17 16:59:16 2007 +0100 FSA317-koffice diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 0833ff5..e50a945 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 317 + 2007-11-17 + voroskoi + koffice + 1.6.3-2 + 1.6.3-3sayshell1 + http://bugs.frugalware.org/task/2559 + 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 KOffice, which can be exploited by malicious people to compromise a user's system. The vulnerabilities are caused due to the use of vulnerable Xpdf code. For more information: FSA-316 + + 316 2007-11-17 voroskoi From krics at linuxforum.hu Sat Nov 17 17:00:22 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Nov 17 17:00:24 2007 Subject: [Frugalware-git] frugalware-current: xmms-1.2.11-1-x86_64 Message-ID: <20071117160022.2AC6C119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d6b950806b0d363fff9d96c22389655d6255c13 commit 1d6b950806b0d363fff9d96c22389655d6255c13 Author: Christian Hamar alias krix Date: Sat Nov 17 16:59:30 2007 +0100 xmms-1.2.11-1-x86_64 * Version bump * Drop CVS backport fix * Not need to do autoreconf diff --git a/source/xapps-extra/xmms/FrugalBuild b/source/xapps-extra/xmms/FrugalBuild index 3c4564e..7f15528 100644 --- a/source/xapps-extra/xmms/FrugalBuild +++ b/source/xapps-extra/xmms/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=xmms -pkgver=1.2.10 -pkgrel=13 +pkgver=1.2.11 +pkgrel=1 pkgdesc="The X MultiMedia System" url="http://www.xmms.org" depends=('gtk+' 'libvorbis' 'alsa-lib' 'libmikmod') @@ -12,25 +12,24 @@ groups=('xapps-extra') archs=('i686' 'x86_64') provides=('songplayer') up2date="lynx -dump http://www.xmms.org/download.php|grep ^XMMS|cut -d ' ' -f 2" +# SA23986 still needed :) source=(http://www.xmms.org/files/1.2.x/$pkgname-$pkgver.tar.bz2 \ $pkgname.desktop \ - http://ftp.frugalware.org/pub/other/sources/xmms/xmms-cvs-20070427-backport.patch.bz2 \ xmms-1.2.10-cvs-fw.patch SA23986.diff) [ "$CARCH" == "x86_64" ] && confopts=--disable-simd [ "$CARCH" != "x86_64" ] && confopts=--enable-simd build() { Fpatchall - chmod +x $Fsrcdir/$pkgname-$pkgver/po/update.pl || Fdie - sh autogen.sh || Fdie +# chmod +x $Fsrcdir/$pkgname-$pkgver/po/update.pl || Fdie +# sh autogen.sh || Fdie Fmake $confopts Fmakeinstall Ffile /usr/share/applnk/Multimedia/xmms.desktop } -sha1sums=('a3c3d3756d5263183c27b3c50a7f5404cba8bfaf'\ - 'af83776c2704f950957b161b1f408d4e17130c69'\ - '8fb12ff8b74c8dbc6222f2e13e21b2bb8542cd1b'\ - '7d5c91904c0c93bc058ead66aac36d955652683b'\ +sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' \ + 'af83776c2704f950957b161b1f408d4e17130c69' \ + '7d5c91904c0c93bc058ead66aac36d955652683b' \ 'b1d3a803950ce4d83090a43d5b076afd48c135b5') # optimization OK From voroskoi at frugalware.org Sat Nov 17 17:07:40 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Nov 17 17:07:43 2007 Subject: [Frugalware-git] homepage-ng: FSA318-kdegraphics Message-ID: <20071117160740.12C8B119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=a9e1420b40fe22698a9ed776d03e5bfb90c9a1f2 commit a9e1420b40fe22698a9ed776d03e5bfb90c9a1f2 Author: voroskoi Date: Sat Nov 17 17:07:25 2007 +0100 FSA318-kdegraphics diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index e50a945..f29bcdc 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -27,6 +27,19 @@ + 318 + 2007-11-17 + voroskoi + kdegraphics + 3.5.7-2 + 3.5.7-3sayshell1 + http://bugs.frugalware.org/task/2560 + 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 KOffice, which can be exploited by malicious people to compromise a user's system. The vulnerabilities are caused due to the use of vulnerable Xpdf code. For more information: FSA-316 + + 317 2007-11-17 voroskoi From crazy at frugalware.org Tue Nov 20 03:02:08 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:02:14 2007 Subject: [Frugalware-git] frugalware-current: telepathy-stream-engine-0.3.25-1-i686 Message-ID: <20071120020208.B972E119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9637cd79ebe6bdb8d8924a780c583e207ba0cce1 commit 9637cd79ebe6bdb8d8924a780c583e207ba0cce1 Author: crazy Date: Tue Nov 20 02:48:35 2007 +0100 telepathy-stream-engine-0.3.25-1-i686 * new m8r diff --git a/source/xapps-extra/telepathy-stream-engine/FrugalBuild b/source/xapps-extra/telepathy-stream-engine/FrugalBuild index a69d68a..7447ea8 100644 --- a/source/xapps-extra/telepathy-stream-engine/FrugalBuild +++ b/source/xapps-extra/telepathy-stream-engine/FrugalBuild @@ -1,5 +1,6 @@ # Compiling Time: 0.11 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Contributor: AlexExtreme pkgname=telepathy-stream-engine pkgver=0.3.25 From crazy at frugalware.org Tue Nov 20 03:02:08 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:02:16 2007 Subject: [Frugalware-git] frugalware-current: telepathy-gabble-0.5.14-1-i686 Message-ID: <20071120020208.D193811901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=527811d819547d0a865c5167abb0f63b888af0e4 commit 527811d819547d0a865c5167abb0f63b888af0e4 Author: crazy Date: Tue Nov 20 02:49:56 2007 +0100 telepathy-gabble-0.5.14-1-i686 * new m8r diff --git a/source/lib-extra/telepathy-gabble/FrugalBuild b/source/lib-extra/telepathy-gabble/FrugalBuild index b14b2d3..a399ef5 100644 --- a/source/lib-extra/telepathy-gabble/FrugalBuild +++ b/source/lib-extra/telepathy-gabble/FrugalBuild @@ -1,5 +1,6 @@ # Compiling Time: 0.20 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Conreibutor: AlexExtreme pkgname=telepathy-gabble pkgver=0.5.14 From crazy at frugalware.org Tue Nov 20 03:02:08 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:02:17 2007 Subject: [Frugalware-git] frugalware-current: sofia-sip-1.12.6-1-i686 Message-ID: <20071120020208.DBD4C11901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cd3dc2a308e8eb573657fac83a40ffa815f4a66c commit cd3dc2a308e8eb573657fac83a40ffa815f4a66c Author: crazy Date: Tue Nov 20 02:51:47 2007 +0100 sofia-sip-1.12.6-1-i686 * new m8r diff --git a/source/lib-extra/sofia-sip/FrugalBuild b/source/lib-extra/sofia-sip/FrugalBuild index 8102ee9..6da9478 100644 --- a/source/lib-extra/sofia-sip/FrugalBuild +++ b/source/lib-extra/sofia-sip/FrugalBuild @@ -1,11 +1,11 @@ # Compiling Time: 1.03 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Contributor: AlexExtreme pkgname=sofia-sip pkgver=1.12.6 pkgrel=1 pkgdesc="Sofia-SIP is an open-source SIP User-Agent library" -url="http://sofia-sip.sourceforge.net/" depends=('glib2' 'openssl') groups=('lib-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Tue Nov 20 03:02:08 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:02:19 2007 Subject: [Frugalware-git] frugalware-current: libtelepathy-0.0.57-1-i686 Message-ID: <20071120020208.E519611901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b8911946d6216b1d9f9f8b0502e8a9f99ea87a7 commit 9b8911946d6216b1d9f9f8b0502e8a9f99ea87a7 Author: crazy Date: Tue Nov 20 02:53:28 2007 +0100 libtelepathy-0.0.57-1-i686 * new m8r diff --git a/source/lib-extra/libtelepathy/FrugalBuild b/source/lib-extra/libtelepathy/FrugalBuild index 86e550b..027fb81 100644 --- a/source/lib-extra/libtelepathy/FrugalBuild +++ b/source/lib-extra/libtelepathy/FrugalBuild @@ -1,5 +1,6 @@ # Compiling Time: 0.11 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Contributor: AlexExtreme pkgname=libtelepathy pkgver=0.0.57 From crazy at frugalware.org Tue Nov 20 03:02:08 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:02:21 2007 Subject: [Frugalware-git] frugalware-current: telepathy-glib-0.5.14-1-i686 Message-ID: <20071120020208.EEDDE11901C3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7c9b2a0a18e4a1649f7a1aa7b398e93b6eb7083 commit d7c9b2a0a18e4a1649f7a1aa7b398e93b6eb7083 Author: crazy Date: Tue Nov 20 02:55:06 2007 +0100 telepathy-glib-0.5.14-1-i686 * new m8r diff --git a/source/lib-extra/telepathy-glib/FrugalBuild b/source/lib-extra/telepathy-glib/FrugalBuild index 33f0657..93d8542 100644 --- a/source/lib-extra/telepathy-glib/FrugalBuild +++ b/source/lib-extra/telepathy-glib/FrugalBuild @@ -1,5 +1,6 @@ # Compiling Time: 0.11 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Contributor: AlexExtreme pkgname=telepathy-glib pkgver=0.5.14 From crazy at frugalware.org Tue Nov 20 03:02:09 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:02:23 2007 Subject: [Frugalware-git] frugalware-current: libjingle-tapioca-0.3.11-1-i686 Message-ID: <20071120020209.07E8D11901C4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95327da8d01a808f585ca333421afa5959e6e439 commit 95327da8d01a808f585ca333421afa5959e6e439 Author: crazy Date: Tue Nov 20 02:58:36 2007 +0100 libjingle-tapioca-0.3.11-1-i686 * new m8r diff --git a/source/lib-extra/libjingle-tapioca/FrugalBuild b/source/lib-extra/libjingle-tapioca/FrugalBuild index afb4dad..c165824 100644 --- a/source/lib-extra/libjingle-tapioca/FrugalBuild +++ b/source/lib-extra/libjingle-tapioca/FrugalBuild @@ -1,5 +1,6 @@ # Compiling Time: 0.52 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Contributor: AlexExtreme pkgname=libjingle-tapioca pkgver=0.3.11 From crazy at frugalware.org Tue Nov 20 03:02:09 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:02:24 2007 Subject: [Frugalware-git] frugalware-current: farsight-0.1.25-1-i686 Message-ID: <20071120020209.16DAF11901C5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1816b08dbb0ba99c458ebdbcf27662ec7c04bd7d commit 1816b08dbb0ba99c458ebdbcf27662ec7c04bd7d Author: crazy Date: Tue Nov 20 03:00:16 2007 +0100 farsight-0.1.25-1-i686 * new m8r diff --git a/source/xlib-extra/farsight/FrugalBuild b/source/xlib-extra/farsight/FrugalBuild index 9c5ea10..a9079a2 100644 --- a/source/xlib-extra/farsight/FrugalBuild +++ b/source/xlib-extra/farsight/FrugalBuild @@ -1,5 +1,6 @@ # Compiling Time: 0.20 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Contributor: AlexExtreme pkgname=farsight pkgver=0.1.25 From crazy at frugalware.org Tue Nov 20 03:02:09 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:02:25 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-farsight-0.12.5-1-i686 Message-ID: <20071120020209.24B9C11901CF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08e91baa9defa9dab5825f94e18700f0cad0f6a2 commit 08e91baa9defa9dab5825f94e18700f0cad0f6a2 Author: crazy Date: Tue Nov 20 03:01:48 2007 +0100 gst-plugins-farsight-0.12.5-1-i686 * new m8r diff --git a/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild b/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild index c8c0598..1bd42b6 100644 --- a/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild +++ b/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild @@ -1,5 +1,6 @@ # Compiling Time: 0.16 SBU -# Maintainer: AlexExtreme +# Maintainer: crazy +# Contributor: AlexExtreme pkgname=gst-plugins-farsight pkgver=0.12.5 From crazy at frugalware.org Tue Nov 20 03:21:32 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:21:34 2007 Subject: [Frugalware-git] frugalware-current: gstreamer-0.10.15-1-i686 Message-ID: <20071120022132.AB97A119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0881d24fd1fe5d4103f244ae51ee2803ac1c596e commit 0881d24fd1fe5d4103f244ae51ee2803ac1c596e Author: crazy Date: Tue Nov 20 03:20:37 2007 +0100 gstreamer-0.10.15-1-i686 * Version bump diff --git a/source/xmultimedia/gstreamer/FrugalBuild b/source/xmultimedia/gstreamer/FrugalBuild index 011788f..374d69c 100644 --- a/source/xmultimedia/gstreamer/FrugalBuild +++ b/source/xmultimedia/gstreamer/FrugalBuild @@ -1,9 +1,9 @@ # Compiling time: 1.25 SBU -# Maintainer: Christian Hamar alias krix -# Contributor: Laszlo Dvornik +# Maintainer: crazy +# Contributor: Christian Hamar alias krix pkgname=gstreamer -pkgver=0.10.14 +pkgver=0.10.15 pkgrel=1 pkgdesc="Open Source Multimedia Framework" url="http://gstreamer.freedesktop.org/" @@ -39,6 +39,6 @@ build() Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('29e02be4dbf50272086e436f3fab2dcfadaaff2b' \ +sha1sums=('fec69cb10e23e230061ea53cc347a24a9dc2db80' \ 'b1a04cc8052418384e2f3a5de925abaeac8110ae') # optimization OK From crazy at frugalware.org Tue Nov 20 03:57:35 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 03:57:37 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-base-0.10.15-1-i686 Message-ID: <20071120025735.48B89119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ac1417127f1258039df55c4b793aadc8a04ab71a commit ac1417127f1258039df55c4b793aadc8a04ab71a Author: crazy Date: Tue Nov 20 03:55:34 2007 +0100 gst-plugins-base-0.10.15-1-i686 * Version bump * changed m8r back to me diff --git a/source/xmultimedia/gst-plugins-base/FrugalBuild b/source/xmultimedia/gst-plugins-base/FrugalBuild index 986f570..2de0750 100644 --- a/source/xmultimedia/gst-plugins-base/FrugalBuild +++ b/source/xmultimedia/gst-plugins-base/FrugalBuild @@ -1,13 +1,13 @@ # Compiling time: 2.09 SBU -# Maintainer: Christian Hamar alias krix -# Contributor: crazy +# Contributor: Christian Hamar alias krix +# Maintainer: crazy pkgname=gst-plugins-base -pkgver=0.10.14 -pkgrel=2 +pkgver=0.10.15 +pkgrel=1 pkgdesc="Plugins for GStreamer" url="http://gstreamer.freedesktop.org/" -depends=('libxv' 'libsm' 'gstreamer>=0.10.14') +depends=('libxv' 'libsm' 'gstreamer>=0.10.15') rodepends=('libmms' 'hermes' 'ortp') makedepends=('gtk-doc' 'pyxml' 'gnome-vfs>=2.16.0-2' 'cdparanoia' 'pango' 'liboil>=0.3.10' \ 'alsa-lib' 'libtheora' 'fontconfig' 'dbus-glib>=0.71' 'avahi-glib>=0.6.14-2' \ @@ -18,7 +18,7 @@ options=('scriptlet') replaces=('gst-plugins') up2date="lynx -dump $url/src/$pkgname/|grep '.tar.bz2$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('54e7b2d482f6eef4dbbe7d4b5f59ada033e447ab') +sha1sums=('9d42a245f9ed337586ef0fed5b3d3b1fe4b1fda0') subpkgs=("$pkgname-gnomevfs" "$pkgname-cdparanoia" "$pkgname-pango" "$pkgname-alsa" \ "$pkgname-theora" "$pkgname-oil" "$pkgname-libvisual" "$pkgname-ogg" "$pkgname-vorbis" \ @@ -63,3 +63,4 @@ build() { } # optimization OK + From crazy at frugalware.org Tue Nov 20 05:05:16 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 05:05:19 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-good-0.10.6-5-i686 Message-ID: <20071120040516.CCD56119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7dc674d516a95ddbda6d32e3755aacf477f89c9 commit c7dc674d516a95ddbda6d32e3755aacf477f89c9 Author: crazy Date: Tue Nov 20 05:02:12 2007 +0100 gst-plugins-good-0.10.6-5-i686 * rebuild * fixed taglib plugin diff --git a/source/xmultimedia/gst-plugins-good/FrugalBuild b/source/xmultimedia/gst-plugins-good/FrugalBuild index e18514d..2f3ba87 100644 --- a/source/xmultimedia/gst-plugins-good/FrugalBuild +++ b/source/xmultimedia/gst-plugins-good/FrugalBuild @@ -4,10 +4,10 @@ pkgname=gst-plugins-good pkgver=0.10.6 -pkgrel=4 +pkgrel=5 pkgdesc="Plugins for GStreamer (Good)" url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base>=0.10.13' 'gstreamer>=0.10.13' 'zlib') +depends=('gst-plugins-base>=0.10.15' 'gstreamer>=0.10.15' 'zlib') makedepends=('gtk-doc' 'pyxml' 'gconf' 'esd' 'ladspa_sdk' 'speex' 'libshout' 'aalib' \ 'libjpeg' 'flac>=1.1.3' 'libavc1394' 'libpng' 'libcdio' 'libdv' 'cairo' \ 'liboil>=0.3.10' 'taglib' 'hal>=0.5.7.1-3' 'libiec61883' 'libcaca' \ @@ -17,7 +17,7 @@ groups=('xmultimedia') archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump $url/src/$pkgname/|grep '.tar.bz2$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" -source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2) +source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2 taglib-compile.patch) subpkgs=("$pkgname-gconf" "$pkgname-esd" "$pkgname-speex" "$pkgname-aalib" "$pkgname-shout" "$pkgname-jpeg" \ "$pkgname-flac" "$pkgname-avc1394" "$pkgname-png" "$pkgname-cdio" "$pkgname-dv" "$pkgname-cairo" \ @@ -53,7 +53,7 @@ build() { if [ "$CARCH" == "x86_64" ]; then export CFLAGS="$CFLAGS -fPIC" fi - #Fpatchall + Fpatchall #autoreconf || Fdie Fmake \ --enable-gtk-doc \ @@ -91,5 +91,6 @@ build() { } -sha1sums=('eb918b6876e90f4ac803d209a14b32c1b3e26695') +sha1sums=('eb918b6876e90f4ac803d209a14b32c1b3e26695' \ + '3e7e7c926843cfb68de82feb1b56bb3f15a0e834') # optimization OK diff --git a/source/xmultimedia/gst-plugins-good/taglib-compile.patch b/source/xmultimedia/gst-plugins-good/taglib-compile.patch new file mode 100644 index 0000000..7004dee --- /dev/null +++ b/source/xmultimedia/gst-plugins-good/taglib-compile.patch @@ -0,0 +1,164 @@ +diff -Naur gst-plugins-good-0.10.6/ext/taglib/gstapev2mux.cc gst-plugins-good-0.10.6-p/ext/taglib/gstapev2mux.cc +--- gst-plugins-good-0.10.6/ext/taglib/gstapev2mux.cc 2006-05-30 16:35:17.000000000 +0200 ++++ gst-plugins-good-0.10.6-p/ext/taglib/gstapev2mux.cc 2007-11-20 04:44:40.000000000 +0100 +@@ -90,7 +90,10 @@ + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&src_template)); + +- gst_element_class_set_details (element_class, &gst_apev2_mux_details); ++ gst_element_class_set_details_simple (element_class, ++ "TagLib-based APEv2 Muxer", "Formatter/Metadata", ++ "Adds an APEv2 header to the beginning of files using taglib", ++ "Sebastian DrÜge "); + + GST_DEBUG_CATEGORY_INIT (gst_apev2_mux_debug, "apev2mux", 0, + "taglib-based APEv2 tag muxer"); +@@ -145,6 +148,16 @@ + apev2tag->setArtist (String::String (artist, String::UTF8)); + } + g_free (artist); ++ } else if (strcmp (tag, GST_TAG_COMPOSER) == 0) { ++ char *composer; ++ ++ result = gst_tag_list_get_string_index (list, tag, 0, &composer); ++ if (result != FALSE) { ++ GST_DEBUG ("Setting composer to %s", composer); ++ apev2tag->addValue (String::String ("COMPOSER", String::UTF8), ++ String::String (composer, String::UTF8)); ++ } ++ g_free (composer); + } else if (strcmp (tag, GST_TAG_GENRE) == 0) { + char *genre; + +diff -Naur gst-plugins-good-0.10.6/ext/taglib/gstid3v2mux.cc gst-plugins-good-0.10.6-p/ext/taglib/gstid3v2mux.cc +--- gst-plugins-good-0.10.6/ext/taglib/gstid3v2mux.cc 2007-06-13 11:21:10.000000000 +0200 ++++ gst-plugins-good-0.10.6-p/ext/taglib/gstid3v2mux.cc 2007-11-20 04:44:13.000000000 +0100 +@@ -61,6 +61,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + +@@ -69,12 +71,6 @@ + GST_DEBUG_CATEGORY_STATIC (gst_id3v2_mux_debug); + #define GST_CAT_DEFAULT gst_id3v2_mux_debug + +-static const GstElementDetails gst_id3v2_mux_details = +-GST_ELEMENT_DETAILS ("TagLib-based ID3v2 Muxer", +- "Formatter/Metadata", +- "Adds an ID3v2 header to the beginning of MP3 files using taglib", +- "Christophe Fergeau "); +- + static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, +@@ -95,7 +91,10 @@ + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&src_template)); + +- gst_element_class_set_details (element_class, &gst_id3v2_mux_details); ++ gst_element_class_set_details_simple (element_class, ++ "TagLib-based ID3v2 Muxer", "Formatter/Metadata", ++ "Adds an ID3v2 header to the beginning of MP3 files using taglib", ++ "Christophe Fergeau "); + + GST_DEBUG_CATEGORY_INIT (gst_id3v2_mux_debug, "id3v2mux", 0, + "taglib-based ID3v2 tag muxer"); +@@ -322,7 +321,14 @@ + GST_TAG_MUSICBRAINZ_ALBUMID, "MusicBrainz Album Id", "musicbrainz_albumid"}, { + GST_TAG_MUSICBRAINZ_ALBUMARTISTID, "MusicBrainz Album Artist Id", + "musicbrainz_albumartistid"}, { +- GST_TAG_MUSICBRAINZ_TRMID, "MusicBrainz TRM Id", "musicbrainz_trmid"} ++ GST_TAG_MUSICBRAINZ_TRMID, "MusicBrainz TRM Id", "musicbrainz_trmid"}, { ++ GST_TAG_CDDA_MUSICBRAINZ_DISCID, "MusicBrainz DiscID", ++ "musicbrainz_discid"}, { ++ /* the following one is more or less made up, there seems to be little ++ * evidence that any popular application is actually putting this info ++ * into TXXX frames; the first one comes from a musicbrainz wiki 'proposed ++ * tags' page, the second one is analogue to the vorbis/ape/flac tag. */ ++ GST_TAG_CDDA_CDDB_DISCID, "CDDB DiscID", "discid"} + }; + guint i, idx; + +@@ -518,6 +524,47 @@ + } + } + ++static void ++add_uri_tag (ID3v2::Tag * id3v2tag, const GstTagList * list, ++ const gchar * tag, guint num_tags, const gchar * frame_id) ++{ ++ gchar *url = NULL; ++ ++ g_assert (frame_id != NULL); ++ ++ /* URI tags are limited to one of each per taglist */ ++ if (gst_tag_list_get_string_index (list, tag, 0, &url) && url != NULL) { ++ guint url_len; ++ ++ url_len = strlen (url); ++ if (url_len > 0 && gst_uri_is_valid (url)) { ++ ID3v2::FrameFactory * factory = ID3v2::FrameFactory::instance (); ++ ID3v2::Frame * frame; ++ char *data; ++ ++ data = g_new0 (char, 10 + url_len); ++ ++ memcpy (data, frame_id, 4); ++ memcpy (data + 4, ID3v2::SynchData::fromUInt (url_len).data (), 4); ++ memcpy (data + 10, url, url_len); ++ ByteVector bytes (data, 10 + url_len); ++ ++ g_free (data); ++ ++ frame = factory->createFrame (bytes, (TagLib::uint) 4); ++ if (frame) { ++ id3v2tag->addFrame (frame); ++ ++ GST_LOG ("%s: %s = '%s'", frame_id, tag, url); ++ } ++ } else { ++ GST_WARNING ("Tag %s does not contain a valid URI (%s)", tag, url); ++ } ++ ++ g_free (url); ++ } ++} ++ + /* id3demux produces these for frames it cannot parse */ + #define GST_ID3_DEMUX_TAG_ID3V2_FRAME "private-id3v2-frame" + +@@ -532,6 +579,7 @@ + GST_TAG_TITLE, add_text_tag, "TIT2"}, { + GST_TAG_ALBUM, add_text_tag, "TALB"}, { + GST_TAG_COPYRIGHT, add_text_tag, "TCOP"}, { ++ GST_TAG_COMPOSER, add_text_tag, "TCOM"}, { + GST_TAG_GENRE, add_text_tag, "TCON"}, { + GST_TAG_COMMENT, add_comment_tag, ""}, { + GST_TAG_EXTENDED_COMMENT, add_comment_tag, ""}, { +@@ -543,14 +591,20 @@ + GST_TAG_MUSICBRAINZ_ALBUMID, add_musicbrainz_tag, "\001"}, { + GST_TAG_MUSICBRAINZ_ALBUMARTISTID, add_musicbrainz_tag, "\002"}, { + GST_TAG_MUSICBRAINZ_TRMID, add_musicbrainz_tag, "\003"}, { ++ GST_TAG_CDDA_MUSICBRAINZ_DISCID, add_musicbrainz_tag, "\004"}, { ++ GST_TAG_CDDA_CDDB_DISCID, add_musicbrainz_tag, "\005"}, { + GST_TAG_MUSICBRAINZ_TRACKID, add_unique_file_id_tag, ""}, { +- GST_TAG_MUSICBRAINZ_SORTNAME, add_text_tag, "TSOP"}, { ++ GST_TAG_ARTIST_SORTNAME, add_text_tag, "TSOP"}, { ++ GST_TAG_ALBUM_SORTNAME, add_text_tag, "TSOA"}, { ++ GST_TAG_TITLE_SORTNAME, add_text_tag, "TSOT"}, { + GST_TAG_TRACK_NUMBER, add_count_or_num_tag, "TRCK"}, { + GST_TAG_TRACK_COUNT, add_count_or_num_tag, "TRCK"}, { + GST_TAG_ALBUM_VOLUME_NUMBER, add_count_or_num_tag, "TPOS"}, { + GST_TAG_ALBUM_VOLUME_COUNT, add_count_or_num_tag, "TPOS"}, { + GST_TAG_ENCODER, add_encoder_tag, ""}, { +- GST_TAG_ENCODER_VERSION, add_encoder_tag, ""} ++ GST_TAG_ENCODER_VERSION, add_encoder_tag, ""}, { ++ GST_TAG_COPYRIGHT_URI, add_uri_tag, "WCOP"}, { ++ GST_TAG_LICENSE_URI, add_uri_tag, "WCOP"} + }; + + From crazy at frugalware.org Tue Nov 20 05:19:58 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 05:20:01 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-ugly-0.10.6-2-i686 Message-ID: <20071120041958.97A40119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=deb99e23df30a4ad8212a0a14cfe25e3564c66a8 commit deb99e23df30a4ad8212a0a14cfe25e3564c66a8 Author: crazy Date: Tue Nov 20 05:18:24 2007 +0100 gst-plugins-ugly-0.10.6-2-i686 * rebuild diff --git a/source/xmultimedia/gst-plugins-ugly/FrugalBuild b/source/xmultimedia/gst-plugins-ugly/FrugalBuild index a57317f..e04620d 100644 --- a/source/xmultimedia/gst-plugins-ugly/FrugalBuild +++ b/source/xmultimedia/gst-plugins-ugly/FrugalBuild @@ -4,10 +4,10 @@ pkgname=gst-plugins-ugly pkgver=0.10.6 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for GStreamer (Ugly)" url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base>=0.10.13' 'gstreamer>=0.10.13') +depends=('gst-plugins-base>=0.10.15' 'gstreamer>=0.10.15') makedepends=('gtk-doc' 'pyxml' 'a52dec' 'liboil>=0.3.10' 'lame' 'libmad' 'libdvdread' 'libid3tag' 'mpeg2dec' 'libsidplay') groups=('xmultimedia') archs=('i686' 'x86_64') From crazy at frugalware.org Tue Nov 20 05:51:13 2007 From: crazy at frugalware.org (crazy) Date: Tue Nov 20 05:51:16 2007 Subject: [Frugalware-git] frugalware-current: gst-plugins-bad-0.10.5-4-i686 Message-ID: <20071120045113.52215119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=453ba71d174ee7b5359f12e7c88b4613093ddb20 commit 453ba71d174ee7b5359f12e7c88b4613093ddb20 Author: crazy Date: Tue Nov 20 05:48:28 2007 +0100 gst-plugins-bad-0.10.5-4-i686 * rebuild diff --git a/source/xmultimedia/gst-plugins-bad/FrugalBuild b/source/xmultimedia/gst-plugins-bad/FrugalBuild index 200f8da..91ada85 100644 --- a/source/xmultimedia/gst-plugins-bad/FrugalBuild +++ b/source/xmultimedia/gst-plugins-bad/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gst-plugins-bad pkgver=0.10.5 -pkgrel=3 +pkgrel=4 pkgdesc="Plugins for GStreamer (Bad)" url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base>=0.10.13' 'libstdc++' 'zlib') -makedepends=('soundtouch' 'directfb>=1.0.0' 'gstreamer>=>=0.10.13' 'xvidcore' 'wavpack' 'libmpcdec' 'faac' 'neon>=0.26.1' \ +depends=('gst-plugins-base>=0.10.15' 'libstdc++' 'zlib') +makedepends=('soundtouch' 'directfb>=1.0.0' 'gstreamer>=>=0.10.15' 'xvidcore' 'wavpack' 'libmpcdec' 'faac' 'neon>=0.26.1' \ 'libmusicbrainz' 'cairo' 'bzip2' 'libdca>=0.0.5' 'liboil>=0.3.10' 'libmms' 'faad2' 'libcdaudio' 'alsa-lib' \ 'jack' 'ladspa_sdk' 'libtimidity' 'wildmidi' 'nas' 'x264' 'libsndfile' 'libsm' 'libice' 'libx11' 'libgl' \ 'libxcb' 'libxau' 'libxdmcp' 'libxext' 'libxxf86vm' 'libxdamage' 'libxfixes' 'libdrm' 'heimdal>=1.0.1') From vmiklos at frugalware.org Tue Nov 20 10:58:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 10:58:13 2007 Subject: [Frugalware-git] bitlbee-skype: fixes for the recent upstream API changes Message-ID: <20071120095811.ADAD511901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=ab84dab50cbb8d5bd5b1cebb26f34edc50e36cb3 commit ab84dab50cbb8d5bd5b1cebb26f34edc50e36cb3 Author: Miklos Vajna Date: Tue Nov 20 10:47:43 2007 +0100 fixes for the recent upstream API changes diff --git a/skype.c b/skype.c index b80a256..739e001 100644 --- a/skype.c +++ b/skype.c @@ -182,7 +182,7 @@ struct groupchat *skype_chat_by_name( struct im_connection *ic, char *name ) { struct groupchat *ret; - for( ret = ic->conversations; ret; ret = ret->next ) + for( ret = ic->groupchats; ret; ret = ret->next ) { if(strcmp(name, ret->title ) == 0 ) break; @@ -346,7 +346,7 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c else if(!strcmp(sd->type, "SETTOPIC")) { if(gc) - imcb_chat_topic(gc, sd->handle, body); + imcb_chat_topic(gc, sd->handle, body, 0); } else if(!strcmp(sd->type, "LEFT")) { @@ -647,11 +647,12 @@ static void skype_set_away( struct im_connection *ic, char *state_txt, char *mes static GList *skype_away_states( struct im_connection *ic ) { - GList *l = NULL; + static GList *l = NULL; int i; - for( i = 0; skype_away_state_list[i].full_name; i ++ ) - l = g_list_append( l, (void*) skype_away_state_list[i].full_name ); + if( l == NULL ) + for( i = 0; skype_away_state_list[i].full_name; i ++ ) + l = g_list_append( l, (void*) skype_away_state_list[i].full_name ); return l; } From vmiklos at frugalware.org Tue Nov 20 10:58:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 10:58:16 2007 Subject: [Frugalware-git] bitlbee-skype: if you change the topic then wait for skype to confirm that it was really changed Message-ID: <20071120095811.9E91B119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=b4da07866a7bd6ea320e7bd45b234ba108bf4656 commit b4da07866a7bd6ea320e7bd45b234ba108bf4656 Author: Miklos Vajna Date: Tue Nov 20 10:46:35 2007 +0100 if you change the topic then wait for skype to confirm that it was really changed - ie if you don't have enough permissions, you won't see a fake topic - suggested by wilmer diff --git a/skype.c b/skype.c index 33f591a..b80a256 100644 --- a/skype.c +++ b/skype.c @@ -78,6 +78,8 @@ struct skype_data char* groupchat_with; /* The user who invited us to the chat. */ char* adder; + /* If we are waiting for a confirmation about we changed the topic. */ + int topic_wait; }; struct skype_away_state @@ -488,9 +490,14 @@ static gboolean skype_read_callback( gpointer data, gint fd, b_input_condition c { info += 6; struct groupchat *gc = skype_chat_by_name(ic, id); - if(gc && sd->adder) + if(gc && (sd->adder || sd->topic_wait)) { - imcb_chat_topic(gc, sd->adder, info); + if(sd->topic_wait) + { + sd->adder = g_strdup(sd->username); + sd->topic_wait = 0; + } + imcb_chat_topic(gc, sd->adder, info, 0); g_free(sd->adder); sd->adder = NULL; } @@ -711,10 +718,12 @@ void skype_chat_invite(struct groupchat *gc, char *who, char *message) void skype_chat_topic(struct groupchat *gc, char *message) { struct im_connection *ic = gc->ic; + struct skype_data *sd = ic->proto_data; char *buf; buf = g_strdup_printf("ALTER CHAT %s SETTOPIC %s\n", gc->title, message); skype_write( ic, buf, strlen( buf ) ); g_free(buf); + sd->topic_wait = 1; } struct groupchat *skype_chat_with(struct im_connection *ic, char *who) From vmiklos at frugalware.org Tue Nov 20 10:58:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 10:58:17 2007 Subject: [Frugalware-git] bitlbee-skype: doc update: no patching needed again, but a recent snapshot Message-ID: <20071120095811.C0A9711901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=6b7b527939c4bb1456dc2dc1576a8dbca833b8a5 commit 6b7b527939c4bb1456dc2dc1576a8dbca833b8a5 Author: Miklos Vajna Date: Tue Nov 20 10:54:22 2007 +0100 doc update: no patching needed again, but a recent snapshot diff --git a/README b/README index 0678fe0..a26a5c3 100644 --- a/README +++ b/README @@ -23,7 +23,7 @@ not..) == Requirements * Skype >= 1.4.0.99. (1.4.0.74 did not work for me, 1.4.0.118 seems to be OK.) -* bitlbee-dev >= rev256. (This is the latest version I've tested, probably +* bitlbee-dev >= rev264. (This is the latest version I've tested, probably newer versions probably will work, too.) * Skype4Py >= 0.9.28.1. Previous versions uses `DBus` by default. The latest version I've tested is 0.9.28.3. * Python 2.5. Skype4Py does not work with 2.4. @@ -53,15 +53,7 @@ automatically reconnect if you restart Skype.) bzr branch http://code.bitlbee.org/bitlbee/ ---- -//NOTE: You no longer need additional patches, as of revision 245. -- Apply a not yet merged patch: - ----- -cd bitlbee -wget http://frugalware.org/~vmiklos/patches/bitlbee-topic-write.patch -patch -p0 < bitlbee-topic-write.patch ----- - +NOTE: You no longer need additional patches, as of revision 264. - Now compile and install it: From vmiklos at frugalware.org Tue Nov 20 10:58:11 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 10:58:19 2007 Subject: [Frugalware-git] bitlbee-skype: updates for 0.2.2 Message-ID: <20071120095811.D4C9811901BD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bitlbee-skype.git;a=commitdiff;h=f10712f77c5bcd9567dddc2440065a0237038686 commit f10712f77c5bcd9567dddc2440065a0237038686 Author: Miklos Vajna Date: Tue Nov 20 10:55:35 2007 +0100 updates for 0.2.2 diff --git a/Makefile b/Makefile index 23569e9..8cf2f63 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -include config.mak -VERSION = 0.2.1 +VERSION = 0.2.2 skype.so: skype.c config.mak $(CC) $(CFLAGS) -shared -o skype.so skype.c $(LDFLAGS) diff --git a/NEWS b/NEWS index 24eca75..6b5b3bc 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.2.2 - don't change the topic if skype does not report a successful + topic change + - fixed for the recent bitlbee API changes 0.2.1 - topic support in group chats - bugfixes for multiline messages - this version should be again as stable as 0.1.4 was From vmiklos at frugalware.org Tue Nov 20 10:59:30 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 10:59:32 2007 Subject: [Frugalware-git] bmf: bitlbee-1.1bzr264-1-i686 Message-ID: <20071120095931.02178119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=41345bd5d5824336249e282f29f76ec09f284a06 commit 41345bd5d5824336249e282f29f76ec09f284a06 Author: Miklos Vajna Date: Tue Nov 20 10:59:19 2007 +0100 bitlbee-1.1bzr264-1-i686 update to newer snapshot diff --git a/source/network-extra/bitlbee/FrugalBuild b/source/network-extra/bitlbee/FrugalBuild index d92f505..9a9aa92 100644 --- a/source/network-extra/bitlbee/FrugalBuild +++ b/source/network-extra/bitlbee/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=bitlbee -pkgver=1.1bzr256 +pkgver=1.1bzr264 pkgrel=1 pkgdesc="An IRC to other chat networks gateway." url="http://www.bitlbee.org/main.php/news.html" @@ -18,8 +18,6 @@ install=$pkgname.install _F_scm_type="bzr" _F_scm_url="http://code.bitlbee.org/bitlbee/" Finclude scm -source=(http://frugalware.org/~vmiklos/patches/bitlbee-topic-write.patch) -sha1sums=('1489e626acd1df9987e7bc6d8026c8834eb20fc4') options=('scriptlet') build() { From vmiklos at frugalware.org Tue Nov 20 11:11:34 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 11:11:35 2007 Subject: [Frugalware-git] bmf: bitlbee-skype-0.2.2-1-i686 Message-ID: <20071120101134.CE3DB119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=75e30a8fe4992cd7242ac43e20bf6b6461909dcd commit 75e30a8fe4992cd7242ac43e20bf6b6461909dcd Author: Miklos Vajna Date: Tue Nov 20 11:11:11 2007 +0100 bitlbee-skype-0.2.2-1-i686 version bump diff --git a/source/network-extra/bitlbee-skype/FrugalBuild b/source/network-extra/bitlbee-skype/FrugalBuild index 5b842f5..20a3826 100644 --- a/source/network-extra/bitlbee-skype/FrugalBuild +++ b/source/network-extra/bitlbee-skype/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: VMiklos pkgname=bitlbee-skype -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="A Skype plugin for BitlBee" url="http://ftp.frugalware.org/pub/other/people/vmiklos/bitlbee-skype/" -depends=('bitlbee>=1.1bzr256') +depends=('bitlbee>=1.1bzr264') groups=('network-extra') archs=('i686') up2date="lynx -dump $url|Flasttar" From vmiklos at frugalware.org Tue Nov 20 12:43:52 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 12:43:54 2007 Subject: [Frugalware-git] frugalware-current: kernel-2.6.23-2-i686 Message-ID: <20071120114352.40BBF119019C@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e126482f90252f9f020b780e2c56d0767ddc9d4 commit 8e126482f90252f9f020b780e2c56d0767ddc9d4 Author: Miklos Vajna Date: Sun Nov 18 18:17:37 2007 +0100 kernel-2.6.23-2-i686 bump to patchlevel '8' diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 1921b0d..7b331b5 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=1 -_F_kernelver_stable=1 +_F_kernelver_rel=2 +_F_kernelver_stable=8 From vmiklos at frugalware.org Tue Nov 20 12:43:52 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 12:43:59 2007 Subject: [Frugalware-git] frugalware-current: asciidoc-8.2.5-1-i686 Message-ID: <20071120114352.509EC11901B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dcf88f48c9e93dd0ad56fd38997f7e3ec7e478f5 commit dcf88f48c9e93dd0ad56fd38997f7e3ec7e478f5 Author: Miklos Vajna Date: Sun Nov 18 19:22:03 2007 +0100 asciidoc-8.2.5-1-i686 - version bump - prefer dejavu in fo.xsl, the default font does not support most accents diff --git a/source/apps-extra/asciidoc/FrugalBuild b/source/apps-extra/asciidoc/FrugalBuild index 72e8802..150aaca 100644 --- a/source/apps-extra/asciidoc/FrugalBuild +++ b/source/apps-extra/asciidoc/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=asciidoc -pkgver=8.2.4 +pkgver=8.2.5 pkgrel=1 pkgdesc="AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." url="http://www.methods.co.nz/asciidoc/index.html" @@ -15,7 +15,7 @@ up2date="lynx -dump http://www.methods.co.nz/asciidoc/downloads.html |Flasttar" source=(http://www.methods.co.nz/asciidoc/asciidoc-$pkgver.tar.gz \ http://ftp.frugalware.org/pub/other/sources/asciidoc/asciidoc-fonts-0.1.tar.bz2 \ a2x-pdf.diff) -sha1sums=('4c403a98528102f65d78ac07deae2c8a4807186c' \ +sha1sums=('792bc45a17a0b54f8744214251fb08989e178d25' \ '717779406f876f439ac37c79878f403ecdef3467' \ 'c235be9105a5cec42d1c19e416b8dc177127017f') @@ -26,7 +26,10 @@ build() { Fsed 'MANDIR=/usr/local/man' "MANDIR=$Fdestdir/$Fprefix/man" install.sh Fsed 'CONFDIR=/etc/asciidoc' "CONFDIR=$Fdestdir/$Fsysconfdir/asciidoc" install.sh Fsed 'VIM_CONFDIR=/etc/vim' "VIM_CONFDIR=$Fdestdir/$Fprefix/share/vim" install.sh + # enable offline build Fsed 'http://www.oasis-open.org/docbook/xml/' 'file:///usr/share/sgml/docbook/dtd/xml-dtd-' docbook.conf + # prefer dejavu in fo, the default font does not support most accents + Fsed 'serif' 'DejaVuSerif' docbook-xsl/fo.xsl sh install.sh # provive the images in jpg format, too. this is necessary as fop can't # use png images without license problems for pdfs From vmiklos at frugalware.org Tue Nov 20 12:43:52 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 12:44:02 2007 Subject: [Frugalware-git] frugalware-current: docbook-xsl-1.73.2-2-i686 Message-ID: <20071120114352.7060211901BB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b3d6ca759c41d70a1e1fde8c2bb09876ea353581 commit b3d6ca759c41d70a1e1fde8c2bb09876ea353581 Author: Miklos Vajna Date: Mon Nov 19 11:22:55 2007 +0100 docbook-xsl-1.73.2-2-i686 forgot to remove a no longer necessary patch diff --git a/source/apps/docbook-xsl/FrugalBuild b/source/apps/docbook-xsl/FrugalBuild index b288587..667e194 100644 --- a/source/apps/docbook-xsl/FrugalBuild +++ b/source/apps/docbook-xsl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=docbook-xsl pkgver=1.73.2 -pkgrel=1 +pkgrel=2 pkgdesc="XML stylesheets for Docbook-xml transformations." depends=('libxml2' 'libxslt') rodepends=('sed') @@ -12,12 +12,10 @@ archs=('i686' 'x86_64') _F_sourceforge_dirname="docbook" Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=21935'|grep -m1 'docbook-xsl-\(.*\).tar.gz'|sed 's/.*xsl-\(.*\).t.*/\1/'" -source=($source docbook-xsl-manpages-charmap.patch) -sha1sums=('373120dd94f468e455d022e17ce20c087f929832' \ - 'c2848edfd21b171b936e471410ed98485fb15a25') +sha1sums=('373120dd94f468e455d022e17ce20c087f929832') build() { - Fpatchall + Fcd Fmkdir usr/share/xml/docbook/xsl/ # we want * for enumerations, not ˇ sed -i 's/\\(bu/*/' manpages/* diff --git a/source/apps/docbook-xsl/docbook-xsl-manpages-charmap.patch b/source/apps/docbook-xsl/docbook-xsl-manpages-charmap.patch deleted file mode 100644 index 3906810..0000000 --- a/source/apps/docbook-xsl/docbook-xsl-manpages-charmap.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- docbook-xsl-1.73.0/manpages/docbook.xsl.manpages-charmap 2007-07-23 16:24:23.000000000 +0100 -+++ docbook-xsl-1.73.0/manpages/docbook.xsl 2007-07-23 16:25:16.000000000 +0100 -@@ -37,6 +37,7 @@ - - - -+ - - - From vmiklos at frugalware.org Tue Nov 20 12:43:52 2007 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Nov 20 12:44:05 2007 Subject: [Frugalware-git] frugalware-current: wpa_supplicant-0.5.8-2-i686 Message-ID: <20071120114352.771FE11901BD@genesis.frugalware.org>