V6.1.0

Meson build

2 files changed, 21 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86c02e4e7423..9f60c4ef939a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,19 @@
 pkgbase = pamac-aur
 	pkgdesc = A Gtk3 frontend for libalpm
-	pkgver = 6.0.3
-	pkgrel = 3
+	pkgver = 6.1.0
+	pkgrel = 1
 	url = https://github.com/manjaro/pamac
 	install = pamac.install
-	arch = any
+	arch = i686
+	arch = x86_64
+	arch = armv6h
+	arch = armv7
 	license = GPL3
 	makedepends = gettext
 	makedepends = itstool
 	makedepends = vala>=0.36
+	makedepends = meson
+	makedepends = ninja
 	depends = glib2>=2.42
 	depends = json-glib
 	depends = libsoup
@@ -29,12 +34,8 @@ pkgbase = pamac-aur
 	conflicts = pamac
 	options = !emptydirs
 	backup = etc/pamac.conf
-	source = pamac-6.0.3-3.tar.gz::https://github.com/manjaro/pamac/archive/v6.0.3.tar.gz
-	source = 01-fix-auto-update.patch::https://github.com/manjaro/pamac/commit/d53e98603a340becd33c05db09410447d4b73d93.patch
-	source = 02-fix-auto-update.patch::https://github.com/manjaro/pamac/commit/78b82572dc5bcbace11f637b3a185afbdc052730.patch
-	sha256sums = 312aa6c932c90e2fc54aedbf88f6cc889007ff40c3e45654ec584687d6b7eac4
-	sha256sums = 9a8b868fc5184f2e7c92aa0788c9d4629f4cf9fa3ef218f2efb85de5144bf6d9
-	sha256sums = f94d1ee1b13819e77e890ed2d9410d2dc01f5b11a32a3e06231925b9fb0512c8
+	source = pamac-6.1.0-1.tar.gz::https://github.com/manjaro/pamac/archive/V6.1.0.tar.gz
+	sha256sums = 8ca5bb0542f2dc26b637421072eae795d0dbcec3b30f2bdc362af117eea4c679
 
 pkgname = pamac-aur
 
diff --git a/PKGBUILD b/PKGBUILD
index 52815c2f1a0c..fc79f4eb93f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Contributor: Zeph <zeph33@gmail.com>
 # Maintainer: Zeph <zeph33@gmail.com>
 pkgname=pamac-aur
-_pkgver=6.0.3
+_pkgver=6.1.0
 pkgver=$_pkgver
-pkgrel=3
+pkgrel=1
 pkgdesc="A Gtk3 frontend for libalpm"
-arch=('any')
+arch=('i686' 'x86_64' 'armv6h' 'armv7')
 url="https://github.com/manjaro/pamac"
 license=('GPL3')
 depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' 'gtk3>=3.22'
@@ -15,25 +15,19 @@ depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' '
   optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome'
               'lxsession: needed for authentification in Xfce, LXDE etc.'
               'pamac-tray-appindicator: tray icon for KDE')
-makedepends=('gettext' 'itstool' 'vala>=0.36')
+makedepends=('gettext' 'itstool' 'vala>=0.36' 'meson' 'ninja')
 backup=('etc/pamac.conf')
 conflicts=('pamac')
 provides=('pamac')
 options=(!emptydirs)
 install=pamac.install
 
-source=("pamac-$pkgver-$pkgrel.tar.gz::$url/archive/v$_pkgver.tar.gz"
-        "01-fix-auto-update.patch::https://github.com/manjaro/pamac/commit/d53e98603a340becd33c05db09410447d4b73d93.patch"
-        "02-fix-auto-update.patch::https://github.com/manjaro/pamac/commit/78b82572dc5bcbace11f637b3a185afbdc052730.patch")
-sha256sums=('312aa6c932c90e2fc54aedbf88f6cc889007ff40c3e45654ec584687d6b7eac4'
-            '9a8b868fc5184f2e7c92aa0788c9d4629f4cf9fa3ef218f2efb85de5144bf6d9'
-            'f94d1ee1b13819e77e890ed2d9410d2dc01f5b11a32a3e06231925b9fb0512c8')
+source=("pamac-$pkgver-$pkgrel.tar.gz::$url/archive/V$_pkgver.tar.gz")
+sha256sums=('8ca5bb0542f2dc26b637421072eae795d0dbcec3b30f2bdc362af117eea4c679')
 
 prepare() {
   cd "$srcdir/pamac-$_pkgver"
   # patches here
-  patch -p1 -i "$srcdir/01-fix-auto-update.patch"
-  patch -p1 -i "$srcdir/02-fix-auto-update.patch"
 
   # adjust version string
   sed -i -e "s|\"$_pkgver\"|\"$pkgver-$pkgrel\"|g" src/manager_window.vala
@@ -43,13 +37,13 @@ build() {
   cd "$srcdir/pamac-$_pkgver"
 
   # build
-  make all
+  mkdir builddir  
+  meson --prefix="$pkgdir"/usr --sysconfdir="$pkgdir"/etc ./ ./builddir/
 }
 
 package() {
-  cd "$srcdir/pamac-$_pkgver"
-  make prefix="$pkgdir"/usr sysconfdir="$pkgdir"/etc install
-  # delete timer no pamac-mirror for Arch Linux 
-  rm "$pkgdir"/etc/systemd/system/multi-user.target.wants/pamac-mirrorlist.timer
+  cd "$srcdir/pamac-$_pkgver/builddir"
+  ninja
+  ninja install
 }
 # vim:set ts=2 sw=2 et: