diff options
| author | Thomas Hebb | 2016-01-02 22:05:49 -0500 |
|---|---|---|
| committer | Thomas Hebb | 2016-01-02 22:05:49 -0500 |
| commit | 0fd0fcb749853b5d1fcb9abc9f8fc44533f5301c (patch) | |
| tree | 38c5a287cd8abfcbccefee9fdee97a36eccee3c8 | |
| parent | f1fbd116ca0626e0e32d1bdff84ba7eab68d2e41 (diff) | |
| download | aur-0fd0fcb749853b5d1fcb9abc9f8fc44533f5301c.tar.gz | |
Pull in PKGBUILD changes from gutenprint package
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | m4extra.patch | 11 | ||||
| -rw-r--r-- | usr_sbin.patch | 15 |
3 files changed, 27 insertions, 11 deletions
@@ -16,18 +16,20 @@ makedepends=('cvs' 'gimp' 'gtk2' 'cups' 'foomatic-db-engine' 'ghostscript') optdepends=('cups: to use cups printer spooler(recommended)' 'foomatic-db-engine: to use foomatic spooler' 'ghostscript: adds postscript support for ijsgutenprint' - 'gimp: adds gutenprint plugin to gimp') + 'gimp: adds gutenprint plugin to gimp' + 'libusb: required for drivers that depend on gutenprint52usb backend') source=("http://downloads.sourceforge.net/gimp-print/${_docname}-${_docver}.tar.bz2" - 'configure_ac.patch' 'usr_sbin.patch') + 'configure_ac.patch' 'usr_sbin.patch' 'm4extra.patch') url='http://gimp-print.sourceforge.net/' provides=('gutenprint') conflicts=('gutenprint') replaces=('gimp-print') -options=('!libtool' '!emptydirs') +options=('!emptydirs') noextract=("${_docname}-${_docver}.tar.bz2") sha256sums=('431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59' '041690da1d414e82297fc9bb8a1395cf133e198123c73572c69d932173343768' - 'a232a39e30986426dc34c39092a4c15ede5bac653765801ccf76b2532136171a') + '05e551713e2a0853535bee30dce71e384ece26ae69faffc61859089192cbddf2' + '0761ab979e0e352cd2702db36af4cbb19dc0553031023874c13f37c6d0ea82c0') _cvsroot=':pserver:anonymous:@gimp-print.cvs.sourceforge.net:/cvsroot/gimp-print' _cvsmod='gimp-print' @@ -53,6 +55,8 @@ prepare() { patch -Np1 -i "${srcdir}/configure_ac.patch" patch -Np1 -i "${srcdir}/usr_sbin.patch" + patch -Np1 -i "${srcdir}/m4extra.patch" + # We extract the precompiled documentation from the latest release because there is currently no easy way to run db2html on Arch. tar -xjf "${srcdir}/${_docname}-${_docver}.tar.bz2" --strip-components 1 "${_docname}-${_docver}/doc/developer" } diff --git a/m4extra.patch b/m4extra.patch new file mode 100644 index 000000000000..154b051272a9 --- /dev/null +++ b/m4extra.patch @@ -0,0 +1,11 @@ +--- gimp-print.old/Makefile.am 2016-01-02 21:53:29.059194071 -0500 ++++ gimp-print.new/Makefile.am 2016-01-02 21:49:17.889471286 -0500 +@@ -20,7 +20,7 @@ + + @SET_MAKE@ + +-ACLOCAL_AMFLAGS = -I m4 -I m4local ++ACLOCAL_AMFLAGS = -I m4 -I m4extra + + include $(top_srcdir)/scripts/global.mk + diff --git a/usr_sbin.patch b/usr_sbin.patch index b46cd3ba50b2..05d36bbacd96 100644 --- a/usr_sbin.patch +++ b/usr_sbin.patch @@ -1,13 +1,14 @@ -diff -ru gimp-print/m4/stp_cups.m4 gimp-print.new/m4/stp_cups.m4 ---- gimp-print/m4/stp_cups.m4 2008-08-13 03:35:51.000000000 -0400 -+++ gimp-print.new/m4/stp_cups.m4 2013-06-05 00:22:09.029774489 -0400 -@@ -146,7 +146,7 @@ +--- gimp-print.old/m4/stp_cups.m4 2016-01-02 21:53:29.059194071 -0500 ++++ gimp-print.new/m4/stp_cups.m4 2016-01-02 21:49:13.249592361 -0500 +@@ -144,9 +144,9 @@ + fi + # Fix "sbindir" variable if it hasn't been specified... if test "${sbindir}" = "\${prefix}/sbin" -a "${cups_prefix}" = "/" ; then - cups_sbindir="/usr/sbin" +- cups_sbindir="/usr/sbin" ++ cups_sbindir="/usr/bin" else - cups_sbindir="${cups_prefix}/sbin" -+ cups_sbindir="/usr/bin" ++ cups_sbindir="${cups_prefix}/bin" fi # Get explicit CUPS directories if possible -Only in gimp-print.new/m4: stp_cups.m4~ |