[arch-commits] Commit in netplan/trunk (PKGBUILD make-fixes.patch)

[Christian Rebischke]

    Date: Friday, May 1, 2020 @ 12:49:10
  Author: shibumi
Revision: 623819

upgpkg: netplan 0.99-1

Modified:
  netplan/trunk/PKGBUILD
Deleted:
  netplan/trunk/make-fixes.patch

------------------+
 PKGBUILD         |   16 +++-------------
 make-fixes.patch |   17 -----------------
 2 files changed, 3 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-01 12:46:12 UTC (rev 623818)
+++ PKGBUILD	2020-05-01 12:49:10 UTC (rev 623819)
@@ -2,7 +2,7 @@
 # Contributor:  Conrad Hoffmann <ch at bitfehler.net>
 
 pkgname=netplan
-pkgver=0.98
+pkgver=0.99
 pkgrel=1
 pkgdesc="Network configuration abstraction renderer"
 arch=('x86_64')
@@ -21,22 +21,12 @@
 )
 source=(
   "https://github.com/CanonicalLtd/${pkgname}/archive/${pkgver}.tar.gz"
-  'make-fixes.patch'
 )
-sha256sums=(
-  '2cc5511eb1675950f37c361e3056fcb17ca213998db7911cbe34511362641d92'
-  '7c4f0ca9fa822a5493a3d7dbad2c374cfc489699d4aa105784519617a841deb8'
-)
+sha256sums=('6ed7e12c88f972361f794a715dbd80cb85b822d2dc8c4ca9c7605aebbc008cb3')
 
-prepare(){
+build() {
   cd "${pkgname}-${pkgver}"
-  patch -Np1 -i "$srcdir/make-fixes.patch"
   env
-}
-
-build(){
-  cd "${pkgname}-${pkgver}"
-  env
   make
 }
 

Deleted: make-fixes.patch
===================================================================
--- make-fixes.patch	2020-05-01 12:46:12 UTC (rev 623818)
+++ make-fixes.patch	2020-05-01 12:49:10 UTC (rev 623819)
@@ -1,17 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d89eb26..546a37f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -33,10 +33,10 @@ generate: src/generate.[hc] src/parse.[hc] src/util.[hc] src/networkd.[hc] src/n
- 	$(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.c, $^) `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid`
- 
- netplan-dbus: src/dbus.c src/_features.h
--	$(CC) $(BUILDFLAGS) $(CFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0`
-+	$(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0`
- 
- src/_features.h: src/[^_]*.[hc]
--	echo "#include <stddef.h>\nstatic const char *feature_flags[] __attribute__((__unused__)) = {" > $@
-+	printf "#include <stddef.h>\nstatic const char *feature_flags[] __attribute__((__unused__)) = {" > $@
- 	awk 'match ($$0, /netplan-feature:.*/ ) { $$0=substr($$0, RSTART, RLENGTH); print "\""$$2"\"," }' $^ >> $@
- 	echo "NULL, };" >> $@
-