summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Shapovalov2016-10-23 04:04:19 +0300
committerIvan Shapovalov2016-10-23 04:04:19 +0300
commitcc6d59e67e284fdc277cdc003d9c74320b33d0ac (patch)
treed8a33fee45701b1d1048a0270142b7959a3d5e2f
parent60dfa70211159bb1ac22957e5b6f43c6ae609274 (diff)
downloadaur-cc6d59e67e284fdc277cdc003d9c74320b33d0ac.tar.gz
Fix a few more things
-rw-r--r--.SRCINFO12
-rw-r--r--0003-Rework-firmware-loading.patch6
-rw-r--r--0004-Makefile-skip-installing-Foomatic-files.patch4
-rw-r--r--0005-Makefile-fix-generating-.ppd-in-place.patch4
-rw-r--r--0006-Makefile-leverage-default-rules-as-much-as-possible-.patch4
-rw-r--r--PKGBUILD10
6 files changed, 20 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5629349b5b41..6011de9c70cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Oct 23 00:16:49 UTC 2016
+# Sun Oct 23 01:04:18 UTC 2016
pkgbase = foo2zjs
pkgdesc = foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
pkgver = 20161021
- pkgrel = 2
+ pkgrel = 3
url = http://foo2zjs.rkkda.com/
install = foo2zjs.install
arch = i686
@@ -30,10 +30,10 @@ pkgbase = foo2zjs
sha256sums = 55604f4580fb21534739c294df64e041b6ea96ef45d8a0ff4cdcf516eff243a3
sha256sums = 2c0e40294c3f77a33e242280e280a98ed834a16584072b2d0f5fa95d0c44503f
sha256sums = b3fdf0702404bf2e4e5e47588d4c1440b95fb301abe0a03c58cf27aedefcadeb
- sha256sums = b7afd4a21fc8efbaa1e5c7cd35d13dba4c2a8f9e691afb9239012a179adaaaea
- sha256sums = 88106cc9134ee66b17b0d12045123f5832362dcdb9a9cb4d85e3f33d69b84166
- sha256sums = 87931e428f34c50cd8440c1dd335465d7fb45e06854c088cccc825f4fb1a3e49
- sha256sums = 08cad4ca882cf79e8ebfe9e89e05c814187dd957c1f0f43aebfc410cc1d50795
+ sha256sums = 2cc5c9c51f240218106713e36682fd69caca05e04cfe3ee5b857a9bb55959977
+ sha256sums = 81abc3714cf1a6a1f46d5eefe4a6d554e66017befcca66a1d6891ab26f2a014d
+ sha256sums = 537db87a3d7e81c154d6a6b4b6d3b67f893aa4cede6046bf7658e414e9a5f825
+ sha256sums = 90a78899436021695246b884e717cd0f7fb6b4ec8e16e6aac029e0b348c4be50
pkgname = foo2zjs
diff --git a/0003-Rework-firmware-loading.patch b/0003-Rework-firmware-loading.patch
index bdbfd7640ddb..41d024e1294c 100644
--- a/0003-Rework-firmware-loading.patch
+++ b/0003-Rework-firmware-loading.patch
@@ -1,4 +1,4 @@
-From bfe4733b4c74cfd6d3d0f28c92642f9c448e180d Mon Sep 17 00:00:00 2001
+From 10d612accdc7f43e1517907b0664ed7d2df15755 Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Sun, 23 Oct 2016 00:59:32 +0300
Subject: [PATCH 3/6] Rework firmware loading
@@ -13,7 +13,7 @@ Subject: [PATCH 3/6] Rework firmware loading
create mode 100644 usblp.conf
diff --git a/Makefile b/Makefile
-index 4c83e4e..c04c46b 100644
+index 4c83e4e..6ddcf96 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,7 @@ FILES = \
@@ -135,7 +135,7 @@ index 4c83e4e..c04c46b 100644
+ $(INSTALL) -c -m 644 $(RULES) $(PREFIX)$(LIBUDEVDIR)/70-$(RULES)
+ $(INSTALL) -d -m 755 $(BIN)
+ $(INSTALL) -c -m 755 foo2zjs-loadfw $(BIN)
-+ $(INSTALL) -d -m 755 $(PREFIX)$(MODPROBEDIR)
++ $(INSTALL) -d -m 755 $(PREFIX)$(LIBMODPROBEDIR)
+ $(INSTALL) -c -m 644 $(USBLP) $(PREFIX)$(LIBMODPROBEDIR)
install-hotplug-osx:
diff --git a/0004-Makefile-skip-installing-Foomatic-files.patch b/0004-Makefile-skip-installing-Foomatic-files.patch
index 0c455cce12db..a3427e39e562 100644
--- a/0004-Makefile-skip-installing-Foomatic-files.patch
+++ b/0004-Makefile-skip-installing-Foomatic-files.patch
@@ -1,4 +1,4 @@
-From 705cea7f36bb5c12651c396df14178ed3df58f51 Mon Sep 17 00:00:00 2001
+From d5b02fc59c140eb2d53cef5a90df9fbe7265e17d Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Sun, 23 Oct 2016 01:00:36 +0300
Subject: [PATCH 4/6] Makefile: skip installing Foomatic files
@@ -8,7 +8,7 @@ Subject: [PATCH 4/6] Makefile: skip installing Foomatic files
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index c04c46b..c5eec44 100644
+index 6ddcf96..d5ab384 100644
--- a/Makefile
+++ b/Makefile
@@ -607,7 +607,7 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
diff --git a/0005-Makefile-fix-generating-.ppd-in-place.patch b/0005-Makefile-fix-generating-.ppd-in-place.patch
index 5d2f3a0af5bb..576af558604a 100644
--- a/0005-Makefile-fix-generating-.ppd-in-place.patch
+++ b/0005-Makefile-fix-generating-.ppd-in-place.patch
@@ -1,4 +1,4 @@
-From 7931a5f1b2687207188dfdd516127c0b0255374b Mon Sep 17 00:00:00 2001
+From 3271b56e3c33cdbe69f1d03747091fa092c23791 Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Sun, 23 Oct 2016 01:01:17 +0300
Subject: [PATCH 5/6] Makefile: fix generating *.ppd in-place
@@ -8,7 +8,7 @@ Subject: [PATCH 5/6] Makefile: fix generating *.ppd in-place
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index c5eec44..97a699f 100644
+index d5ab384..176fdfe 100644
--- a/Makefile
+++ b/Makefile
@@ -1386,10 +1386,8 @@ ppd:
diff --git a/0006-Makefile-leverage-default-rules-as-much-as-possible-.patch b/0006-Makefile-leverage-default-rules-as-much-as-possible-.patch
index 8087a5b2bf36..352d2a7b2236 100644
--- a/0006-Makefile-leverage-default-rules-as-much-as-possible-.patch
+++ b/0006-Makefile-leverage-default-rules-as-much-as-possible-.patch
@@ -1,4 +1,4 @@
-From 67ad9c49924bda575894fded4816d3abdd9c6b35 Mon Sep 17 00:00:00 2001
+From 359f64c508a34e977b2a36af322b139a7c3ee49e Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Sun, 23 Oct 2016 01:01:59 +0300
Subject: [PATCH 6/6] Makefile: leverage default rules as much as possible to
@@ -10,7 +10,7 @@ Subject: [PATCH 6/6] Makefile: leverage default rules as much as possible to
2 files changed, 30 insertions(+), 75 deletions(-)
diff --git a/Makefile b/Makefile
-index 97a699f..5e6de72 100644
+index 176fdfe..ac48605 100644
--- a/Makefile
+++ b/Makefile
@@ -455,33 +455,15 @@ all-done:
diff --git a/PKGBUILD b/PKGBUILD
index 0790f3b3832e..64b3d416f5d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=foo2zjs
pkgver=20161021
-pkgrel=2
+pkgrel=3
pkgdesc="foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers."
url="http://foo2zjs.rkkda.com/"
license=('GPL' 'custom')
@@ -27,10 +27,10 @@ source=("foo2zjs-$pkgver.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz"
sha256sums=('55604f4580fb21534739c294df64e041b6ea96ef45d8a0ff4cdcf516eff243a3'
'2c0e40294c3f77a33e242280e280a98ed834a16584072b2d0f5fa95d0c44503f'
'b3fdf0702404bf2e4e5e47588d4c1440b95fb301abe0a03c58cf27aedefcadeb'
- 'b7afd4a21fc8efbaa1e5c7cd35d13dba4c2a8f9e691afb9239012a179adaaaea'
- '88106cc9134ee66b17b0d12045123f5832362dcdb9a9cb4d85e3f33d69b84166'
- '87931e428f34c50cd8440c1dd335465d7fb45e06854c088cccc825f4fb1a3e49'
- '08cad4ca882cf79e8ebfe9e89e05c814187dd957c1f0f43aebfc410cc1d50795')
+ '2cc5c9c51f240218106713e36682fd69caca05e04cfe3ee5b857a9bb55959977'
+ '81abc3714cf1a6a1f46d5eefe4a6d554e66017befcca66a1d6891ab26f2a014d'
+ '537db87a3d7e81c154d6a6b4b6d3b67f893aa4cede6046bf7658e414e9a5f825'
+ '90a78899436021695246b884e717cd0f7fb6b4ec8e16e6aac029e0b348c4be50')
prepare() {
cd "${pkgname}"