Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bcbd52197ce77fc02f601a55fa4347431d5f5ab4
commit bcbd52197ce77fc02f601a55fa4347431d5f5ab4 Author: DeX77 <[email protected]> Date: Sat Nov 25 22:45:47 2017 +0100 hplip-3.17.11-1-x86_64 * version bump diff --git a/source/apps-extra/hplip/FrugalBuild b/source/apps-extra/hplip/FrugalBuild index a5f29ff..6615d35 100644 --- a/source/apps-extra/hplip/FrugalBuild +++ b/source/apps-extra/hplip/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: DeX77 <[email protected]> pkgname=hplip -pkgver=3.17.10 -pkgrel=2 +pkgver=3.17.11 +pkgrel=1 _F_sourceforge_ext=.tar.gz Finclude sourceforge pkgdesc="HPLIP is an HP developed solution for printing, scanning, and faxing with HP inkjet and laser based printers in Linux." @@ -13,9 +13,11 @@ depends=('libcups>=2.2' 'sane-backends>=1.0.25-2' 'libusb>=0.1.5-4' 'reportlab' makedepends=('cups>=2.2') groups=('apps-extra') archs=('x86_64') -source+=(0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) -sha1sums=('6d75e754a518f2377d8582aaea0504e61ed15aff' \ - '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5') +source+=(0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch \ + fix_boolean.patch) +sha1sums=('72705f45157227907a79e326da6524317c1aaff6' \ + '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5' \ + 'e46ed54afe800a26c5d0e3a92a49c052d428dc49') options=('nodocs') subpkgs=('hplip-driver') @@ -43,7 +45,7 @@ build() # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip # The hpcups driver does not use foomatic-rip local i - for i in ppd/hpijs/*.ppd.gz ; do + for i in ppd/hpcups/*.ppd.gz ; do rm -f ${i}.temp gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ gzip > ${i}.temp || return 1 diff --git a/source/apps-extra/hplip/fix_boolean.patch b/source/apps-extra/hplip/fix_boolean.patch new file mode 100644 index 0000000..ac8a1ce --- /dev/null +++ b/source/apps-extra/hplip/fix_boolean.patch @@ -0,0 +1,30 @@ +diff -Naur hplip-3.17.11/prnt/hpcups/genPCLm.cpp hplip-3.17.11.new/prnt/hpcups/genPCLm.cpp +--- hplip-3.17.11/prnt/hpcups/genPCLm.cpp 2017-11-23 13:10:22.000000000 +0100 ++++ hplip-3.17.11.new/prnt/hpcups/genPCLm.cpp 2017-11-25 22:39:17.397873474 +0100 +@@ -350,7 +350,7 @@ + static int fileCntr=0; + + if(1) +- return true; ++ return (boolean)true; + snprintf(outFileName,sizeof(outFileName),"%s/hp_%s_cups_outfile_%04d",CUPS_TMP_DIR, user_name, fileCntr); + + fileCntr++; +@@ -364,7 +364,7 @@ + } + fwrite(ptr,numBytes,1,outputFile); + fclose(outputFile); +- return(true); ++ return((boolean)true); + } + + void PCLmGenerator::initOutBuff(char *buff, sint32 size) +@@ -1110,7 +1110,7 @@ + } + } + //origTail++; +- return(true); ++ return((boolean)true); + } + + char* PCLmGenerator::getInputBinString(jobInputBin bin) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
