[arch-commits] Commit in networkmanager-openvpn/trunk (PKGBUILD buildfix.patch)

[Jan Steffens]

    Date: Monday, October 3, 2016 @ 16:39:13
  Author: heftig
Revision: 277580

1.2.6-1

Modified:
  networkmanager-openvpn/trunk/PKGBUILD
Deleted:
  networkmanager-openvpn/trunk/buildfix.patch

----------------+
 PKGBUILD       |   28 ++++++++++++++++------------
 buildfix.patch |   18 ------------------
 2 files changed, 16 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-03 16:38:05 UTC (rev 277579)
+++ PKGBUILD	2016-10-03 16:39:13 UTC (rev 277580)
@@ -3,36 +3,40 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=1.2.4
+pkgver=1.2.6
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 url="https://wiki.gnome.org/Projects/NetworkManager"
 arch=(i686 x86_64)
 license=(GPL)
-depends=(libnm-gtk libsecret openvpn)
-makedepends=(intltool python)
+depends=(libnm-glib libsecret openvpn)
+makedepends=(libnm-gtk intltool python git)
 install=networkmanager-openvpn.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/${pkgver::3}/NetworkManager-openvpn-${pkgver}.tar.xz
-        buildfix.patch)
-sha256sums=('db6b4d5bc49c68990703c90f2cfbdc6a94e16f702b0740085017d5c06d3e5b9d'
-            'd300dde598151646554a610256282fc12d098c3bcd19c44e3768efdaa66cea32')
+_commit=41d2ad56b6436e6e6fa5c41609fd64fb60e33b48  # tags/1.2.7-dev~1
+source=("git://git.gnome.org/network-manager-openvpn#commit=$_commit")
+sha256sums=('SKIP')
 
+pkgver() {
+  cd network-manager-openvpn
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd NetworkManager-openvpn-$pkgver
-  patch -Np1 -i ../buildfix.patch
-  autoreconf -fvi
+  cd network-manager-openvpn
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd NetworkManager-openvpn-$pkgver
+  cd network-manager-openvpn
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib/networkmanager \
     --enable-more-warnings=yes \
     --disable-static
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
-  cd NetworkManager-openvpn-$pkgver
+  cd network-manager-openvpn
   make DESTDIR="$pkgdir" install
 }

Deleted: buildfix.patch
===================================================================
--- buildfix.patch	2016-10-03 16:38:05 UTC (rev 277579)
+++ buildfix.patch	2016-10-03 16:39:13 UTC (rev 277580)
@@ -1,18 +0,0 @@
-diff -u -r NetworkManager-openvpn-1.2.4/properties/tests/Makefile.am NetworkManager-openvpn-1.2.4-buildfix/properties/tests/Makefile.am
---- NetworkManager-openvpn-1.2.4/properties/tests/Makefile.am	2016-07-02 11:28:03.000000000 +0200
-+++ NetworkManager-openvpn-1.2.4-buildfix/properties/tests/Makefile.am	2016-07-10 20:45:57.976832915 +0200
-@@ -23,12 +23,12 @@
- 	$(LIBNMA_CFLAGS)
- 
- test_import_export_LDADD = \
-+	$(top_builddir)/properties/libnm-vpn-plugin-openvpn-test.la \
- 	$(GTHREAD_LIBS) \
- 	$(GTK_LIBS) \
- 	$(LIBNM_LIBS) \
- 	$(LIBNMA_LIBS) \
--	-ldl \
--	$(top_builddir)/properties/libnm-vpn-plugin-openvpn-test.la
-+	-ldl
- 
- 
- test_import_export_glib_SOURCES = \