[arch-commits] Commit in pidgin-xmpp-receipts/trunk (PKGBUILD makefile.patch)

[Levente Polyak]

    Date: Tuesday, December 15, 2015 @ 00:32:17
  Author: anthraxx
Revision: 153329

upgpkg: pidgin-xmpp-receipts 0.6-3

upgpkg: pidgin-xmpp-receipts 0.6-3

Added:
  pidgin-xmpp-receipts/trunk/makefile.patch
Modified:
  pidgin-xmpp-receipts/trunk/PKGBUILD

----------------+
 PKGBUILD       |   13 +++++++------
 makefile.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-14 23:21:40 UTC (rev 153328)
+++ PKGBUILD	2015-12-14 23:32:17 UTC (rev 153329)
@@ -3,19 +3,20 @@
 
 pkgname=pidgin-xmpp-receipts
 pkgver=0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="This pidgin-plugin implements xmpp message delivery receipts (XEP-0184)"
 url="http://devel.kondorgulasch.de/pidgin-xmpp-receipts/"
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('pidgin' 'libpurple')
-source=(http://devel.kondorgulasch.de/pidgin-xmpp-receipts/files/pidgin-xmpp-receipts-${pkgver}.tar.gz);
-sha512sums=('160270206d0d6394bddaa15ca59896756ab3a546f7c74cc9e3d4ec634f70b829ae3b013ee6086a5d4a5376b7d2b81341c44c3ef0ecab2a66d612b96fd37dfeff')
+source=(http://devel.kondorgulasch.de/pidgin-xmpp-receipts/files/pidgin-xmpp-receipts-${pkgver}.tar.gz
+        makefile.patch)
+sha512sums=('160270206d0d6394bddaa15ca59896756ab3a546f7c74cc9e3d4ec634f70b829ae3b013ee6086a5d4a5376b7d2b81341c44c3ef0ecab2a66d612b96fd37dfeff'
+            '4dbc5dede45446339357908395ec8447c407c1c18af514cf67cb2b7cca372c95937c2a9c8edd032e20e8ab1cf5e74493f4f12c11af417d1b9af1aee4aae05859')
 
 prepare() {
 	cd ${pkgname}-${pkgver}
-  sed -r 's|(CFLAGS)=|\1+=|g' -i Makefile
-  sed -r 's|(LDFLAGS)=|\1+=|g' -i Makefile
+  patch -p1 < "${srcdir}/makefile.patch"
 }
 
 build() {
@@ -25,7 +26,7 @@
 
 package() {
   cd ${pkgname}-${pkgver}
-  install -Dm 755 xmpp-receipts.so -t "${pkgdir}/usr/lib/pidgin"
+  make DESTDIR="${pkgdir}" PLUGINDIR="/usr/lib/pidgin" install
 }
 
 # vim: ts=2 sw=2 et:

Added: makefile.patch
===================================================================
--- makefile.patch	                        (rev 0)
+++ makefile.patch	2015-12-14 23:32:17 UTC (rev 153329)
@@ -0,0 +1,45 @@
+From fbea49705cbac8554d4cdc99ef04a1c9288e7033 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente at leventepolyak.net>
+Date: Mon, 14 Dec 2015 23:43:29 +0100
+Subject: [PATCH] improve Makefile with adaptive and overridable variables
+
+---
+ Makefile | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1581be4..92dbeaa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,20 +1,22 @@
+ GTK_PIDGIN_INCLUDES= `pkg-config --cflags gtk+-2.0 pidgin`
+ 
+-CFLAGS= -O2 -Wall -fpic -g
+-LDFLAGS= -shared
++CC ?= gcc
++CFLAGS += -O2 -Wall -fpic
++LDFLAGS += -shared
++DESTDIR =
++PLUGINDIR = ~/.purple/plugins/
+ 
+ INCLUDES = \
+       $(GTK_PIDGIN_INCLUDES)
+ 
+ xmpp-receipts.so: xmpp-receipts.c
+-	gcc xmpp-receipts.c $(CFLAGS) $(INCLUDES) $(LDFLAGS) -o xmpp-receipts.so
++	$(CC) xmpp-receipts.c $(CFLAGS) $(INCLUDES) $(LDFLAGS) -o xmpp-receipts.so
+ 
+ install: xmpp-receipts.so
+-	mkdir -p ~/.purple/plugins
+-	cp xmpp-receipts.so ~/.purple/plugins/
++	install -Dm755 xmpp-receipts.so -t $(DESTDIR)$(PLUGINDIR)
+ 
+ uninstall:
+-	rm -f ~/.purple/plugins/xmpp-receipts.so
++	rm -f $(DESTDIR)$(PLUGINDIR)/xmpp-receipts.so
+ 
+ clean:
+ 	rm -f xmpp-receipts.so
+-- 
+2.6.4
+