PKGBUILD: precompile *.ppd files at build time, do not install *.xmls and decouple from foomatic-db.

5 files changed, 56 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d16357578cb..ed8b546901df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 20 01:07:35 UTC 2016
+# Mon Oct  3 21:14:32 UTC 2016
 pkgbase = foo2zjs
 	pkgdesc = foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
 	pkgver = 20160902
-	pkgrel = 1
+	pkgrel = 2
 	url = http://foo2zjs.rkkda.com/
 	install = foo2zjs.install
 	arch = i686
@@ -13,12 +13,10 @@ pkgbase = foo2zjs
 	makedepends = unzip
 	makedepends = bc
 	makedepends = wget
+	makedepends = foomatic-db-engine
 	depends = psutils
 	depends = cups
-	depends = foomatic-db-engine
-	depends = foomatic-db-foo2zjs
 	optdepends = tix: required by hplj10xx_gui.tcl
-	provides = foo2zjs
 	conflicts = foo2zjs-testing
 	options = !emptydirs
 	options = !ccache
@@ -27,11 +25,15 @@ pkgbase = foo2zjs
 	source = gen-fixes-20140329-1.patch
 	source = firmware-loader-20130602-1.patch
 	source = udev-firmware-loading-ruleset-20130601-1.patch
+	source = skip-foomatic-db-20161003-1.patch
+	source = make-ppd-20161003-2.patch
 	sha256sums = 0e04ecf67c38538dd463a1b635d43339dbdbe018af96fe6d2828668852d5c6e7
 	sha256sums = 6fe2abe505305c627e35123ffdf80279b0e6e065b34a1967674fe56f09380f6a
 	sha256sums = 2a104b8f93d8cb4bd0a10156043f9cf47eddaa728f6317d235bc6d9843312f05
 	sha256sums = 5fe072326173d5008741ffed2e122053f821eabc0d3369ef64a2e346e4e327d1
 	sha256sums = 32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d
+	sha256sums = ade69e3dc9d1081879be9c5bd41202ca43e48a3cc6bf123254d7ea84d8f4e801
+	sha256sums = bc7a75a0e827bb47cb9a1c86cef2b55746c865a5682803d4b36d00bc6f8b1407
 
 pkgname = foo2zjs
 
diff --git a/PKGBUILD b/PKGBUILD
index cfbe953d8429..0c28b06a52b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,13 @@
 
 pkgname=foo2zjs
 pkgver=20160902
-pkgrel=1
+pkgrel=2
 pkgdesc="foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers."
 url="http://foo2zjs.rkkda.com/"
 license=('GPL' 'custom')
-depends=('psutils' 'cups' 'foomatic-db-engine' 'foomatic-db-foo2zjs')
+depends=('psutils' 'cups')
 conflicts=('foo2zjs-testing')
-provides=('foo2zjs')
-makedepends=('unzip' 'bc' 'wget')
+makedepends=('unzip' 'bc' 'wget' 'foomatic-db-engine')
 optdepends=('tix: required by hplj10xx_gui.tcl')
 arch=('i686' 'x86_64')
 options=('!emptydirs' '!ccache')
@@ -21,13 +20,17 @@ source=('http://foo2zjs.rkkda.com/foo2zjs.tar.gz'
         'destdir-support-20140329-1.patch'
         'gen-fixes-20140329-1.patch'
         'firmware-loader-20130602-1.patch'
-        'udev-firmware-loading-ruleset-20130601-1.patch')
+        'udev-firmware-loading-ruleset-20130601-1.patch'
+        'skip-foomatic-db-20161003-1.patch'
+        'make-ppd-20161003-2.patch')
 
 sha256sums=('0e04ecf67c38538dd463a1b635d43339dbdbe018af96fe6d2828668852d5c6e7'
             '6fe2abe505305c627e35123ffdf80279b0e6e065b34a1967674fe56f09380f6a'
             '2a104b8f93d8cb4bd0a10156043f9cf47eddaa728f6317d235bc6d9843312f05'
             '5fe072326173d5008741ffed2e122053f821eabc0d3369ef64a2e346e4e327d1'
-            '32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d')
+            '32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d'
+            'ade69e3dc9d1081879be9c5bd41202ca43e48a3cc6bf123254d7ea84d8f4e801'
+            'bc7a75a0e827bb47cb9a1c86cef2b55746c865a5682803d4b36d00bc6f8b1407')
 
 prepare() {
   cd "${pkgname}"
@@ -52,7 +55,6 @@ package() {
   cd "${pkgname}"
 
   install -d "${pkgdir}"/usr/share/{applications,pixmaps,cups/model}
-  install -d "${pkgdir}"/usr/share/foomatic/db/source/{driver,opt,printer}
 
   make DESTDIR="${pkgdir}" install install-hotplug-prog
 
diff --git a/foo2zjs.install b/foo2zjs.install
index 0e1650e332cf..c6976641e78f 100644
--- a/foo2zjs.install
+++ b/foo2zjs.install
@@ -1,50 +1,22 @@
+restart_cups() {
+	echo "> Now restarting CUPS..."
+	systemctl try-restart org.cups.cupsd
+}
+
 post_install() {
-  echo
-  echo
-  echo "-----------------------------------------------------------"
-  echo "-                                                         -"
-  echo "-               Please restart CUPS!!!                    -"
-  echo "-                                                         -"
-  echo "-        You need to add your user to the lp group.       -"
-  echo "-                                                         -"
-  echo "-                                                         -"
-  echo "- Please refer to the table at http://foo2zjs.rkkda.com/  -"
-  echo "-                                                         -"
-  echo "-   to choose the appropriate driver for your printer.    -"
-  echo "-                                                         -"
-  echo "-  You can support us by Paypal http://foo2zjs.rkkda.com  -"
-  echo "-                                                         -"
-  echo "-----------------------------------------------------------"
-  echo
+	restart_cups
+
+	echo ""
+	echo "> You need to add your user to the lp group."
+	echo ""
+	echo "> Please refer to the table at http://foo2zjs.rkkda.com"
+	echo "> to choose the appropriate driver for your printer."
 }
 
 post_upgrade() {
-  echo
-  echo
-  echo "-----------------------------------------------------------"
-  echo "-                                                         -"
-  echo "-               Please restart CUPS!!!                    -"
-  echo "-                                                         -"
-  echo "-Remember to check for foomatic-db-foo2zjs updates as well-"
-  echo "-                                                         -"
-  echo "-  You can support us by Paypal http://foo2zjs.rkkda.com  -"
-  echo "-                                                         -"
-  echo "-----------------------------------------------------------"
-  echo
+	restart_cups
 }
 
 post_remove() {
-  echo
-  echo
-  echo "-----------------------------------------------------------"
-  echo "-                                                         -"
-  echo "-               Please restart CUPS!!!                    -"
-  echo "-                                                         -"
-  echo "-      Remember to replace foomatic-db-foo2zjs  with      -"
-  echo "-                foomatic-db from [extra].                -"
-  echo "-                                                         -"
-  echo "-  You can support us by Paypal http://foo2zjs.rkkda.com  -"
-  echo "-                                                         -"
-  echo "-----------------------------------------------------------"
-  echo
+	restart_cups
 }
diff --git a/make-ppd-20161003-2.patch b/make-ppd-20161003-2.patch
new file mode 100644
index 000000000000..ed70230383af
--- /dev/null
+++ b/make-ppd-20161003-2.patch
@@ -0,0 +1,15 @@
+--- a/Makefile	2016-10-03 16:57:22.842911250 +0300
++++ b/Makefile	2016-10-03 16:59:11.368922611 +0300
+@@ -1389,10 +1389,8 @@
+ 	    *)                  driver=foo2zjs;; \
+ 	    esac; \
+ 	    echo $$driver - $$printer; \
+-	    ENGINE=../foomatic/foomatic-db-engine; \
+-	    PERL5LIB=$$ENGINE/lib \
+-		FOOMATICDB=foomatic-db \
+-		$$ENGINE/foomatic-ppdfile \
++	    FOOMATICDB=foomatic-db \
++		foomatic-ppdfile \
+ 		-d $$driver -p $$printer \
+ 		> PPD/$$printer.ppd; \
+ 	done
diff --git a/skip-foomatic-db-20161003-1.patch b/skip-foomatic-db-20161003-1.patch
new file mode 100644
index 000000000000..d8d6ca9e99ba
--- /dev/null
+++ b/skip-foomatic-db-20161003-1.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2016-10-03 16:56:19.036462531 +0300
++++ b/Makefile	2016-10-03 16:56:30.413366038 +0300
+@@ -606,7 +606,7 @@
+ # Installation rules
+ #
+ install: all install-test install-prog install-icc2ps install-osx-hotplug \
+-	    install-extra install-crd install-foo install-ppd \
++	    install-extra install-crd install-ppd \
+ 	    install-gui install-desktop install-filter \
+ 	    install-man install-doc
+ 	#