[arch-commits] Commit in hpoj/repos (9 files)
Date: Friday, September 30, 2011 @ 05:12:17 Author: eric Revision: 139142 db-move: moved hpoj from [staging] to [testing] (i686) Added: hpoj/repos/testing-i686/ hpoj/repos/testing-i686/PKGBUILD (from rev 139137, hpoj/repos/staging-i686/PKGBUILD) hpoj/repos/testing-i686/hpoj-gcc4.patch (from rev 139137, hpoj/repos/staging-i686/hpoj-gcc4.patch) hpoj/repos/testing-i686/hpoj-kernel26.patch (from rev 139137, hpoj/repos/staging-i686/hpoj-kernel26.patch) hpoj/repos/testing-i686/hpoj-pack.patch (from rev 139137, hpoj/repos/staging-i686/hpoj-pack.patch) hpoj/repos/testing-i686/hpoj.install (from rev 139137, hpoj/repos/staging-i686/hpoj.install) hpoj/repos/testing-i686/hpoj0.91-snmp5.5.patch (from rev 139137, hpoj/repos/staging-i686/hpoj0.91-snmp5.5.patch) hpoj/repos/testing-i686/hpoj_gcc43.diff (from rev 139137, hpoj/repos/staging-i686/hpoj_gcc43.diff) Deleted: hpoj/repos/staging-i686/ + PKGBUILD | 52 hpoj-gcc4.patch| 194 +++ hpoj-kernel26.patch| 86 hpoj-pack.patch| 59 ++ hpoj.install |7 + hpoj0.91-snmp5.5.patch | 11 ++ hpoj_gcc43.diff| 20 7 files changed, 429 insertions(+) Copied: hpoj/repos/testing-i686/PKGBUILD (from rev 139137, hpoj/repos/staging-i686/PKGBUILD) === --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2011-09-30 09:12:17 UTC (rev 139142) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer : Tobias Powalowski + + +pkgname=hpoj +pkgver=0.91 +pkgrel=17 +pkgdesc="Hewlett-Packard OfficeJet, PSC, LaserJet, and PhotoSmart printer multi-function peripherals (MFPs) drivers" +arch=('i686' 'x86_64') +url="http://hpoj.sourceforge.net"; +license=('GPL' 'custom') +depends=('perl' 'libusb-compat' 'net-snmp' 'hplip>=1.7.2') +makedepends=('qt3') +optdepends=('qt3: for using xojpanel') +install=hpoj.install +source=(http://downloads.sourceforge.net/sourceforge/hpoj/$pkgname-$pkgver.tgz \ + hpoj-gcc4.patch hpoj-kernel26.patch hpoj-pack.patch \ +hpoj_gcc43.diff hpoj0.91-snmp5.5.patch) +md5sums=('0e083aeab9b00495aa433fa9465456e0' '347bb155c5dde443a93d92d8e64579a2'\ + '18481d3dcf6e9cadf0a3d196ee164e37' '1c3b99f1a2178675d56ece29daba0fd7'\ + '42bb57791cacf83e4d339e3653ad003e' 'af1cf13e95ff2654b84e470d0e18f537') +sha1sums=('36785cf1a925f569ed3983b8c068620e2c9b4456' 'cd2d37c2620e29b92b96fe779d10a6635c7f31b7'\ + 'fe3328fd7a43ec83d76d0d7fb7be6c41027cddb3' '80258e3190ffb514c20386e8a7cf70ee18df95a5'\ + '22409b96d7bc67a10384a88c6b710981c0b90078' '4827cfa319bcd74ff8956e1bc69360f319a26c6a') + +build() { + cd "$srcdir"/$pkgname-$pkgver + # adding various patches + patch -Np1 -i ../hpoj-gcc4.patch + patch -Np1 -i ../hpoj-kernel26.patch + patch -Np1 -i ../hpoj-pack.patch + patch -Np1 -i ../hpoj_gcc43.diff + patch -Np1 -i ../hpoj0.91-snmp5.5.patch + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make prefix="$pkgdir"/usr/ user_install + mkdir -p "$pkgdir"/etc/rc.d + mkdir -p "$pkgdir"/usr/lib/sane + mkdir -p "$pkgdir"/usr/lib/cups/backend + install -m 644 lib/sane/libsane-hpoj.so.1.0 "$pkgdir"/usr/lib/sane + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -D -m644 LICENSE.OpenSSL $pkgdir/usr/share/licenses/$pkgname/LICENSE.OpenSSL + cd "$pkgdir"/usr/lib/sane + ln -s libsane-hpoj.so.1.0 libsane-hpoj.so + ln -s libsane-hpoj.so.1.0 libsane-hpoj.so.1 + ln -s /usr/sbin/ptal-init "$pkgdir"/etc/rc.d + ln -s /usr/sbin/ptal-cups "$pkgdir"/usr/lib/cups/backend/ptal + } Copied: hpoj/repos/testing-i686/hpoj-gcc4.patch (from rev 139137, hpoj/repos/staging-i686/hpoj-gcc4.patch) === --- testing-i686/hpoj-gcc4.patch(rev 0) +++ testing-i686/hpoj-gcc4.patch2011-09-30 09:12:17 UTC (rev 139142) @@ -0,0 +1,194 @@ +--- hpoj-0.91/lib/hpojip/xjpg_fix.c.gcc4 2002-07-25 11:01:24.0 +0200 hpoj-0.91/lib/hpojip/xjpg_fix.c2005-03-01 23:05:52.905482223 +0100 +@@ -389,7 +389,7 @@ + \*/ + + +-#define MYLOCATE(p) (void *)(p)=(g->headerBuffer+lenAddedHeader) ++#define MYLOCATE(p) (p)=(typeof(p))(g->headerBuffer+lenAddedHeader) + #define MYWRITE(p) lenAddedHeader+=sizeof(*(p)) + #define MYWRITEBUF(data,datalen) \ + do { \ +--- hpoj-0.91/mlcd/ExMgr.h.gcc42003-11-04 02:03:18.0 +0100 hpoj-0.91/mlcd/ExMgr.h 2005-03-01 23:38:34.297977986 +0100 +@@ -127,8 +127,8 @@ + QueueEntry(): prev(0),next(0) { } + #ifdef JD_DEBUGLITE + void dump(void) { +- printf("QueueEntry(0x%8.8X): prev=0x%8.8X, next=0x%8.8X\n", +-
[arch-commits] Commit in hpoj/repos (9 files)
Date: Friday, September 30, 2011 @ 05:12:18 Author: eric Revision: 139143 db-move: moved hpoj from [staging] to [testing] (x86_64) Added: hpoj/repos/testing-x86_64/ hpoj/repos/testing-x86_64/PKGBUILD (from rev 139137, hpoj/repos/staging-x86_64/PKGBUILD) hpoj/repos/testing-x86_64/hpoj-gcc4.patch (from rev 139137, hpoj/repos/staging-x86_64/hpoj-gcc4.patch) hpoj/repos/testing-x86_64/hpoj-kernel26.patch (from rev 139137, hpoj/repos/staging-x86_64/hpoj-kernel26.patch) hpoj/repos/testing-x86_64/hpoj-pack.patch (from rev 139137, hpoj/repos/staging-x86_64/hpoj-pack.patch) hpoj/repos/testing-x86_64/hpoj.install (from rev 139137, hpoj/repos/staging-x86_64/hpoj.install) hpoj/repos/testing-x86_64/hpoj0.91-snmp5.5.patch (from rev 139137, hpoj/repos/staging-x86_64/hpoj0.91-snmp5.5.patch) hpoj/repos/testing-x86_64/hpoj_gcc43.diff (from rev 139137, hpoj/repos/staging-x86_64/hpoj_gcc43.diff) Deleted: hpoj/repos/staging-x86_64/ + PKGBUILD | 52 hpoj-gcc4.patch| 194 +++ hpoj-kernel26.patch| 86 hpoj-pack.patch| 59 ++ hpoj.install |7 + hpoj0.91-snmp5.5.patch | 11 ++ hpoj_gcc43.diff| 20 7 files changed, 429 insertions(+) Copied: hpoj/repos/testing-x86_64/PKGBUILD (from rev 139137, hpoj/repos/staging-x86_64/PKGBUILD) === --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2011-09-30 09:12:18 UTC (rev 139143) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer : Tobias Powalowski + + +pkgname=hpoj +pkgver=0.91 +pkgrel=17 +pkgdesc="Hewlett-Packard OfficeJet, PSC, LaserJet, and PhotoSmart printer multi-function peripherals (MFPs) drivers" +arch=('i686' 'x86_64') +url="http://hpoj.sourceforge.net"; +license=('GPL' 'custom') +depends=('perl' 'libusb-compat' 'net-snmp' 'hplip>=1.7.2') +makedepends=('qt3') +optdepends=('qt3: for using xojpanel') +install=hpoj.install +source=(http://downloads.sourceforge.net/sourceforge/hpoj/$pkgname-$pkgver.tgz \ + hpoj-gcc4.patch hpoj-kernel26.patch hpoj-pack.patch \ +hpoj_gcc43.diff hpoj0.91-snmp5.5.patch) +md5sums=('0e083aeab9b00495aa433fa9465456e0' '347bb155c5dde443a93d92d8e64579a2'\ + '18481d3dcf6e9cadf0a3d196ee164e37' '1c3b99f1a2178675d56ece29daba0fd7'\ + '42bb57791cacf83e4d339e3653ad003e' 'af1cf13e95ff2654b84e470d0e18f537') +sha1sums=('36785cf1a925f569ed3983b8c068620e2c9b4456' 'cd2d37c2620e29b92b96fe779d10a6635c7f31b7'\ + 'fe3328fd7a43ec83d76d0d7fb7be6c41027cddb3' '80258e3190ffb514c20386e8a7cf70ee18df95a5'\ + '22409b96d7bc67a10384a88c6b710981c0b90078' '4827cfa319bcd74ff8956e1bc69360f319a26c6a') + +build() { + cd "$srcdir"/$pkgname-$pkgver + # adding various patches + patch -Np1 -i ../hpoj-gcc4.patch + patch -Np1 -i ../hpoj-kernel26.patch + patch -Np1 -i ../hpoj-pack.patch + patch -Np1 -i ../hpoj_gcc43.diff + patch -Np1 -i ../hpoj0.91-snmp5.5.patch + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make prefix="$pkgdir"/usr/ user_install + mkdir -p "$pkgdir"/etc/rc.d + mkdir -p "$pkgdir"/usr/lib/sane + mkdir -p "$pkgdir"/usr/lib/cups/backend + install -m 644 lib/sane/libsane-hpoj.so.1.0 "$pkgdir"/usr/lib/sane + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -D -m644 LICENSE.OpenSSL $pkgdir/usr/share/licenses/$pkgname/LICENSE.OpenSSL + cd "$pkgdir"/usr/lib/sane + ln -s libsane-hpoj.so.1.0 libsane-hpoj.so + ln -s libsane-hpoj.so.1.0 libsane-hpoj.so.1 + ln -s /usr/sbin/ptal-init "$pkgdir"/etc/rc.d + ln -s /usr/sbin/ptal-cups "$pkgdir"/usr/lib/cups/backend/ptal + } Copied: hpoj/repos/testing-x86_64/hpoj-gcc4.patch (from rev 139137, hpoj/repos/staging-x86_64/hpoj-gcc4.patch) === --- testing-x86_64/hpoj-gcc4.patch (rev 0) +++ testing-x86_64/hpoj-gcc4.patch 2011-09-30 09:12:18 UTC (rev 139143) @@ -0,0 +1,194 @@ +--- hpoj-0.91/lib/hpojip/xjpg_fix.c.gcc4 2002-07-25 11:01:24.0 +0200 hpoj-0.91/lib/hpojip/xjpg_fix.c2005-03-01 23:05:52.905482223 +0100 +@@ -389,7 +389,7 @@ + \*/ + + +-#define MYLOCATE(p) (void *)(p)=(g->headerBuffer+lenAddedHeader) ++#define MYLOCATE(p) (p)=(typeof(p))(g->headerBuffer+lenAddedHeader) + #define MYWRITE(p) lenAddedHeader+=sizeof(*(p)) + #define MYWRITEBUF(data,datalen) \ + do { \ +--- hpoj-0.91/mlcd/ExMgr.h.gcc42003-11-04 02:03:18.0 +0100 hpoj-0.91/mlcd/ExMgr.h 2005-03-01 23:38:34.297977986 +0100 +@@ -127,8 +127,8 @@ + QueueEntry(): prev(0),next(0) { } + #ifdef JD_DEBUGLITE + void dump(void) { +- printf("QueueEntry(0x%8.8X):