patch Makefile

3 files changed, 59 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11d98fdd7bdc..f8a747c8b9b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Dec  3 22:21:01 UTC 2017
 pkgbase = ukopp
 	pkgdesc = A backup program for USB devices
-	pkgver = 6.3
+	pkgver = 6.5
 	pkgrel = 1
 	url = http://www.kornelix.com/ukopp
 	arch = i686
@@ -8,8 +10,10 @@ pkgbase = ukopp
 	license = GPL3
 	depends = gtk3
 	options = !emptydirs
-	source = http://www.kornelix.net/downloads/tarballs/ukopp-6.3.tar.gz
-	sha256sums = 601ec3a2611242f310db0624452a09e4e0f3f873057ddfbcdeaf792bfe9ca55a
+	source = http://www.kornelix.net/downloads/tarballs/ukopp-6.5.tar.gz
+	source = makefile_no_images.patch
+	sha256sums = fdfbe90983f2edf29433da5e2fd10781935f3b68c1ce7b20426ad7d803481beb
+	sha256sums = 81f83802bc70da441f7e45da1e50507e014ac8b351562950f1dc085d9c2d6414
 
 pkgname = ukopp
 
diff --git a/PKGBUILD b/PKGBUILD
index 189c89761564..1d2c9924a705 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,29 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=ukopp
-pkgver=6.3
+pkgver=6.5
 pkgrel=1
 pkgdesc="A backup program for USB devices"
 url="http://www.kornelix.com/ukopp"
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('gtk3')
-source=("http://www.kornelix.net/downloads/tarballs/$pkgname-$pkgver.tar.gz")
-sha256sums=('601ec3a2611242f310db0624452a09e4e0f3f873057ddfbcdeaf792bfe9ca55a')
+source=("http://www.kornelix.net/downloads/tarballs/$pkgname-$pkgver.tar.gz" makefile_no_images.patch)
+sha256sums=('fdfbe90983f2edf29433da5e2fd10781935f3b68c1ce7b20426ad7d803481beb'
+            '81f83802bc70da441f7e45da1e50507e014ac8b351562950f1dc085d9c2d6414')
 options=('!emptydirs')
 
+prepare() {
+  cd ${srcdir}/$pkgname-$pkgver
+  patch -Np1 < "$srcdir"/makefile_no_images.patch
+}
+
 build() {
   cd ${srcdir}/$pkgname-$pkgver
   export PREFIX=/usr
-  sed -i 's+xdg-deskto+#xdg-deskto+' Makefile
-  make LDFLAGS="-lpthread" 
+  make LDFLAGS="-lpthread"
 }
+
 package() {
   cd $srcdir/$pkgname-$pkgver
   install -d $pkgdir/usr/share/icons
diff --git a/makefile_no_images.patch b/makefile_no_images.patch
new file mode 100644
index 000000000000..a8473a003db1
--- /dev/null
+++ b/makefile_no_images.patch
@@ -0,0 +1,41 @@
+diff -Naur ukopp-6.5.orig/Makefile ukopp-6.5.new/Makefile
+--- ukopp-6.5.orig/Makefile	2017-12-03 23:13:05.419742767 +0100
++++ ukopp-6.5.new/Makefile	2017-12-03 23:19:23.434628772 +0100
+@@ -33,26 +33,21 @@
+ 	$(CXX) $(CFLAGS) zfuncs.cc    \
+           -D PREFIX=\"$(PREFIX)\" -D DOCDIR=\"$(DOCDIR)\"
+ 
+-install: $(PROGRAM) uninstall
+-	mkdir -p  $(DESTDIR)$(BINDIR)
+-	mkdir -p  $(DESTDIR)$(DATADIR)
+-	mkdir -p  $(DESTDIR)$(ICONDIR)
+-	mkdir -p  $(DESTDIR)$(IMAGEDIR)
+-	mkdir -p  $(DESTDIR)$(LOCALESDIR)
+-	mkdir -p  $(DESTDIR)$(DOCDIR)
+-	mkdir -p  $(DESTDIR)$(MANDIR)
+-	mkdir -p  $(DESTDIR)$(PREFIX)/share/applications
+-	mkdir -p  $(DESTDIR)$(APPDATADIR)
+-	cp -f     $(PROGRAM) $(DESTDIR)$(BINDIR)
++install: $(PROGRAM)
++	install -d  $(DESTDIR)$(BINDIR)
++	install -d  $(DESTDIR)$(DATADIR)
++	install -d  $(DESTDIR)$(ICONDIR)
++	install -d  $(DESTDIR)$(LOCALESDIR)
++	install -d  $(DESTDIR)$(DOCDIR)
++	install -d  $(DESTDIR)$(MANDIR)
++	install -d  $(DESTDIR)$(PREFIX)/share/applications
++	install -d  $(DESTDIR)$(APPDATADIR)
++	install -m755 $(PROGRAM) $(DESTDIR)$(BINDIR)
+ 	cp -f -R  data/* $(DESTDIR)$(DATADIR)
+-	cp -f -R  images/* $(DESTDIR)$(IMAGEDIR)
+ 	cp -f -R  doc/* $(DESTDIR)$(DOCDIR)
+ 	gzip -f -9 $(DESTDIR)$(DOCDIR)/changelog
+ 	# man page
+-	cp -f doc/$(PROGRAM).man $(PROGRAM).1
+-	gzip -f -9 $(PROGRAM).1
+-	cp $(PROGRAM).1.gz $(DESTDIR)$(MANDIR)
+-	rm -f $(PROGRAM).1.gz
++	install -Dm644 doc/$(PROGRAM).man $(DESTDIR)$(MANDIR)/$(PROGRAM).1
+ 	# menu (desktop) file
+ 	cp -f $(PROGRAM).desktop $(DESTDIR)$(MENUFILE)
+ 	cp -f $(PROGRAM).png $(DESTDIR)$(ICONDIR)