[arch-commits] Commit in ipp-usb/repos/extra-x86_64 (3 files)

[Andreas Radke]

    Date: Saturday, August 22, 2020 @ 20:07:05
  Author: andyrtr
Revision: 394577

archrelease: copy trunk to extra-x86_64

Added:
  ipp-usb/repos/extra-x86_64/PKGBUILD
    (from rev 394576, ipp-usb/trunk/PKGBUILD)
  ipp-usb/repos/extra-x86_64/systemd-service.patch
    (from rev 394576, ipp-usb/trunk/systemd-service.patch)
Deleted:
  ipp-usb/repos/extra-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |  100 ++++++++++++++++++++++++------------------------
 systemd-service.patch |   17 ++++++++
 2 files changed, 69 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-22 20:06:55 UTC (rev 394576)
+++ PKGBUILD	2020-08-22 20:07:05 UTC (rev 394577)
@@ -1,48 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=ipp-usb
-pkgver=0.9.11
-pkgrel=1
-pkgdesc="allows using the IPP protocol, normally designed for network printers, to be used with USB printers as well"
-arch=('x86_64')
-url="https://github.com/OpenPrinting/ipp-usb"
-license=('custom: BSD')
-# ToDo: package goipp ?
-depends=('avahi' 'libusb')
-makedepends=('go')
-source=("$pkgname-$pkgver.tar.gz"::https://github.com/OpenPrinting/ipp-usb/archive/$pkgver.tar.gz)
-sha256sums=('71dc5205f0e2ec61229b0a45d4d19bec43c922cd178f93a6c044344c0c29066f')
-
-prepare() {
-        cd "$pkgname-$pkgver"
-	# fix Makefile
-	sed -i "s/sbin/bin/g" Makefile
-}
-
-build() {
-	cd "$pkgname-$pkgver"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-
-	#go build -o "$pkgname" .
-	make
-}
-
-package() {
-	cd "$pkgname-$pkgver"
-	# https://github.com/OpenPrinting/ipp-usb/blob/master/Makefile
-	# DESTDIR and PREFIX are fully f... up so do it our own
-	#make DESTDIR="${pkgdir}" install
-
-	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
-	install -Dm644 ipp-usb.conf "$pkgdir"/etc/ipp-usb/ipp-usb.conf
-	install -Dm644 systemd-udev/71-ipp-usb.rules "$pkgdir"/usr/lib/udev/rules.d/71-ipp-usb.rules
-	install -Dm644 systemd-udev/ipp-usb.service "$pkgdir"/usr/lib/systemd/system/ipp-usb.service
-	install -Dm644 ipp-usb.8 "$pkgdir"/usr/share/man/man8/ipp-usb.8
-
-	
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: ipp-usb/repos/extra-x86_64/PKGBUILD (from rev 394576, ipp-usb/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-08-22 20:07:05 UTC (rev 394577)
@@ -0,0 +1,52 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=ipp-usb
+pkgver=0.9.11
+pkgrel=2
+pkgdesc="allows using the IPP protocol, normally designed for network printers, to be used with USB printers as well"
+arch=('x86_64')
+url="https://github.com/OpenPrinting/ipp-usb"
+license=('custom: BSD')
+# ToDo: package goipp ?
+depends=('avahi' 'libusb')
+makedepends=('go')
+source=("$pkgname-$pkgver.tar.gz"::https://github.com/OpenPrinting/ipp-usb/archive/$pkgver.tar.gz
+        systemd-service.patch)
+sha256sums=('71dc5205f0e2ec61229b0a45d4d19bec43c922cd178f93a6c044344c0c29066f'
+            '41f236fda5c0176b3b9c49be652e922397b8c39b1cb04f80c374d2d608a005b6')
+
+prepare() {
+        cd "$pkgname-$pkgver"
+        # fix systemd service file; FS#67526
+        patch -Np1 -i ../systemd-service.patch
+	# fix Makefile
+	sed -i "s/sbin/bin/g" Makefile
+}
+
+build() {
+	cd "$pkgname-$pkgver"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+
+	#go build -o "$pkgname" .
+	make
+}
+
+package() {
+	cd "$pkgname-$pkgver"
+	# https://github.com/OpenPrinting/ipp-usb/blob/master/Makefile
+	# DESTDIR and PREFIX are fully f... up so do it our own
+	#make DESTDIR="${pkgdir}" install
+
+	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
+	install -Dm644 ipp-usb.conf "$pkgdir"/etc/ipp-usb/ipp-usb.conf
+	install -Dm644 systemd-udev/71-ipp-usb.rules "$pkgdir"/usr/lib/udev/rules.d/71-ipp-usb.rules
+	install -Dm644 systemd-udev/ipp-usb.service "$pkgdir"/usr/lib/systemd/system/ipp-usb.service
+	install -Dm644 ipp-usb.8 "$pkgdir"/usr/share/man/man8/ipp-usb.8
+
+	
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: ipp-usb/repos/extra-x86_64/systemd-service.patch (from rev 394576, ipp-usb/trunk/systemd-service.patch)
===================================================================
--- systemd-service.patch	                        (rev 0)
+++ systemd-service.patch	2020-08-22 20:07:05 UTC (rev 394577)
@@ -0,0 +1,17 @@
+--- ipp-usb-0.9.11/systemd-udev/ipp-usb.service	2020-08-21 00:52:44.000000000 +0200
++++ ipp-usb-0.9.11/systemd-udev/ipp-usb.service.new	2020-08-22 22:02:38.798950382 +0200
+@@ -1,9 +1,12 @@
+ [Unit]
+ Description=Daemon for IPP over USB printer support
+ Documentation=man:ipp-usb(8)
+-After=cups.service avahi-daemon.service
++After=org.cups.cupsd.service avahi-daemon.service
+ Wants=avahi-daemon.service
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=/sbin/ipp-usb udev
++ExecStart=/usr/bin/ipp-usb udev
++
++[Install]
++WantedBy=multi-user.target