[arch-commits] Commit in hpoj/trunk (PKGBUILD hpoj.install hpoj_gcc43.diff)

[Eric Bélanger]

    Date: Tuesday, March 24, 2009 @ 00:05:56
  Author: eric
Revision: 31030

upgpkg: hpoj 0.91-13
    Added license, Replaced post-install message by optdepends, Added patch to fix build issue

Added:
  hpoj/trunk/hpoj_gcc43.diff
Modified:
  hpoj/trunk/PKGBUILD
  hpoj/trunk/hpoj.install

-----------------+
 PKGBUILD        |   29 ++++++++++++++++-------------
 hpoj.install    |    9 ---------
 hpoj_gcc43.diff |   20 ++++++++++++++++++++
 3 files changed, 36 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-24 04:01:36 UTC (rev 31029)
+++ PKGBUILD	2009-03-24 04:05:56 UTC (rev 31030)
@@ -4,15 +4,22 @@
 
 pkgname=hpoj
 pkgver=0.91
-pkgrel=12
+pkgrel=13
 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' 'net-snmp>=5.4' 'hplip>=1.7.2')
 makedepends=('qt3')
-depends=('perl' 'libusb' 'net-snmp>=5.4' 'hplip>=1.7.2')
+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 snmp_api.h net-snmp-header-fix.patch)
-install=hpoj.install
+	hpoj-gcc4.patch hpoj-kernel26.patch hpoj-pack.patch snmp_api.h \
+        hpoj_gcc43.diff net-snmp-header-fix.patch)
+md5sums=('0e083aeab9b00495aa433fa9465456e0' '347bb155c5dde443a93d92d8e64579a2'\
+         '18481d3dcf6e9cadf0a3d196ee164e37' '1c3b99f1a2178675d56ece29daba0fd7'\
+         'a3c23abaee2c5aafcc33b3944dcb1b72' '42bb57791cacf83e4d339e3653ad003e'\
+         'e78f16dc75b95dabc0c845526aa6d87b')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -20,27 +27,23 @@
    patch -Np1 -i ../hpoj-gcc4.patch || return 1
    patch -Np1 -i ../hpoj-kernel26.patch || return 1
    patch -Np1 -i ../hpoj-pack.patch  || return 1
+   patch -Np1 -i ../hpoj_gcc43.diff || return 1
   cp $startdir/src/snmp_api.h $startdir/src/$pkgname-$pkgver/lib/ptal/
    cd $startdir/src/$pkgname-$pkgver/lib/ptal
    patch -Np0 -i ../../../net-snmp-header-fix.patch || return 1
   cd $startdir/src/$pkgname-$pkgver/
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr || return 1
    make || return 1
-   make prefix=$startdir/pkg/usr/ user_install
+   make prefix=$startdir/pkg/usr/ user_install || return 1
    mkdir -p $startdir/pkg/etc/rc.d
    mkdir -p $startdir/pkg/usr/lib/sane
    mkdir -p $startdir/pkg/usr/lib/cups/backend
    install -m 644 lib/sane/libsane-hpoj.so.1.0 $startdir/pkg/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 $startdir/pkg/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 $startdir/pkg/etc/rc.d
    ln -s /usr/sbin/ptal-cups $startdir/pkg/usr/lib/cups/backend/ptal
  }
-
-md5sums=('0e083aeab9b00495aa433fa9465456e0'
-         '347bb155c5dde443a93d92d8e64579a2'
-         '18481d3dcf6e9cadf0a3d196ee164e37'
-         '1c3b99f1a2178675d56ece29daba0fd7'
-         'a3c23abaee2c5aafcc33b3944dcb1b72'
-         'e78f16dc75b95dabc0c845526aa6d87b')

Modified: hpoj.install
===================================================================
--- hpoj.install	2009-03-24 04:01:36 UTC (rev 31029)
+++ hpoj.install	2009-03-24 04:05:56 UTC (rev 31030)
@@ -1,20 +1,11 @@
-  # arg 1:  the new package version
 post_install() {
 cat << EOF
 ==> To get the HP-Officejet working run as root: ptal-init setup
 ==> Add ptal-init to /etc/rc.conf daemon list and place it before cups is started!
 ==> To access scanner enable in /etc/sane.d/dll.conf hpoj line.
-==> If you want to use xojpanel please install qt and a X-Server.
 EOF
-
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
  post_install $1
 }
-
-op=$1
-shift
-$op $*

Added: hpoj_gcc43.diff
===================================================================
--- hpoj_gcc43.diff	                        (rev 0)
+++ hpoj_gcc43.diff	2009-03-24 04:05:56 UTC (rev 31030)
@@ -0,0 +1,20 @@
+diff -Nru --exclude changelog hpoj-0.91/mlcd/transport/ExMlcTransport.h hpoj-0.91/mlcd/transport/ExMlcTransport.h
+--- hpoj-0.91/mlcd/transport/ExMlcTransport.h	2003-11-04 06:33:19.000000000 +0530
++++ hpoj-0.91/mlcd/transport/ExMlcTransport.h	2008-03-20 10:14:02.000000000 +0530
+@@ -888,14 +888,14 @@
+ 	void remsockReset(void);
+     public:
+ 	STATUS remsockLookup(int socketID,int *pState,
+-	    int *pMaxForwardPacketSize,int *pMaxForwardPacketSize);
++	    int *pMaxForwardPacketSize,int *pMaxForwardPacketSize2);
+ 	STATUS remsockAdd(int socketID);
+ 	void handleConfigSocketReply(int result,int socketID,
+ 	    int maxPriToSecPacketSize,int maxSecToPriPacketSize,
+ 	    int statusLevel);
+     protected:
+ 	STATUS remsockUpdate(int socketID,
+-	    int maxForwardPacketSize,int maxForwardPacketSize);
++	    int maxForwardPacketSize,int maxForwardPacketSize2);
+ 	STATUS remsockDelete(int socketID);
+ 
+ 	// Peripheral-initiated opens (not supported):