V9.4.1

2 files changed, 27 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa0153b8f969..63b0eb85bcc9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pamac-aur
 	pkgdesc = A Gtk3 frontend for libalpm
-	pkgver = 9.4.0
-	pkgrel = 6
+	pkgver = 9.4.1
+	pkgrel = 1
 	url = https://gitlab.manjaro.org/applications/pamac
 	install = pamac.install
 	arch = i686
@@ -35,12 +35,12 @@ pkgbase = pamac-aur
 	optdepends = polkit-gnome: needed for authentification in Cinnamon, Gnome
 	optdepends = lxsession: needed for authentification in Xfce, LXDE etc.
 	optdepends = pamac-tray-appindicator: tray icon for KDE
-	provides = pamac=9.4.0-6
+	provides = pamac=9.4.1-1
 	conflicts = pamac
 	options = !emptydirs
 	backup = etc/pamac.conf
-	source = pamac-9.4.0-6.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/712e0e22958f41c311afe1fc21ef478729fcbe59/pamac-712e0e22958f41c311afe1fc21ef478729fcbe59.tar.gz
-	sha256sums = cca8e5665256870b122ae1398d92b0278d72eb9f4ac31a014cd8176035e0c733
+	source = pamac-9.4.1-1.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/641dd802e2b483f6d42d0aa194944cad0c3bd20f/pamac-641dd802e2b483f6d42d0aa194944cad0c3bd20f.tar.gz
+	sha256sums = 098f6134414bbfd9afcdc9d3b31d40e1c38dca653cf4641f481605346ce269ee
 
 pkgname = pamac-aur
 
diff --git a/PKGBUILD b/PKGBUILD
index e675ea82b069..43ce4cf1dc48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,16 @@
 # Contributor: Zeph <zeph33@gmail.com>
 # Maintainer: Zeph <zeph33@gmail.com>
 # https://gitlab.manjaro.org/packages/extra/pamac
+ENABLE_FLATPAK=0
+ENABLE_SNAPD=0
+
 pkgname=pamac-aur
-pkgver=9.4.0
-pkgrel=6
+pkgver=9.4.1
+pkgrel=1
 _pkgfixver=$pkgver
 
-_pkgvercommit=v$pkgver
-_pkgvercommit='712e0e22958f41c311afe1fc21ef478729fcbe59'
-sha256sums=('cca8e5665256870b122ae1398d92b0278d72eb9f4ac31a014cd8176035e0c733')
+_commit='641dd802e2b483f6d42d0aa194944cad0c3bd20f'
+sha256sums=('098f6134414bbfd9afcdc9d3b31d40e1c38dca653cf4641f481605346ce269ee')
 
 pkgdesc="A Gtk3 frontend for libalpm"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -18,7 +20,7 @@ depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' '
          'libnotify' 'desktop-file-utils' 'pacman>=5.2' 'gnutls>=3.4' 'git'
          'appstream-glib' 'archlinux-appstream-data')
 
-  optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome'
+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.45' 'meson' 'ninja' 'gobject-introspection' 'xorgproto')
@@ -27,35 +29,37 @@ conflicts=('pamac')
 provides=("pamac=$pkgver-$pkgrel")
 options=(!emptydirs)
 install=pamac.install
+source=("pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/$_commit/pamac-$_commit.tar.gz")
+define_meson=''
+if [ "${ENABLE_FLATPAK}" = 1 ]; then
+  depends+=('flatpak')
+  define_meson+=' -Denable-flatpak=true'
+fi
 
-source=("pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/$_pkgvercommit/pamac-$_pkgvercommit.tar.gz")
+if [ "${ENABLE_SNAPD}" = 1 ]; then
+  depends+=('snapd' 'snapd-glib')
+  define_meson+=' -Denable-snap=true'
+fi
 
 prepare() {
-  cd "$srcdir/pamac-$_pkgvercommit"
-
+  cd "$srcdir/pamac-$_commit"
   # adjust version string
   sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" src/version.vala
-#   sed -i -e "s|libpamac = | \
-# gmodule = dependency('gmodule-2.0')\n \
-# libpamac_dependencies += gmodule\n \
-# common_vala_args += '--define=ENABLE_FLATPAK'\n \
-# libpamac_sources += 'plugin_loader.vala'\n \
-# libpamac = |g" src/meson.build
 }
 
 build() {
-  cd "$srcdir/pamac-$_pkgvercommit"
+  cd "$srcdir/pamac-$_commit"
   mkdir -p builddir
   cd builddir
   meson --buildtype=release \
         --prefix=/usr \
-        --sysconfdir=/etc \
+        --sysconfdir=/etc $define_meson
   # build
   ninja
 }
 
 package() {
-  cd "$srcdir/pamac-$_pkgvercommit/builddir"
+  cd "$srcdir/pamac-$_commit/builddir"
 
   DESTDIR="$pkgdir" ninja install
 }