Update to 10.4.2

Signed-off-by: Tommy <contact@tommytran.io>

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = pamac-flatpak-gnome
 	pkgdesc = A Gtk3 frontend for libalpm (with AUR, Flatpak,AppIndicator support, and GNOME integration)
-	pkgver = 10.2.0
+	pkgver = 10.4.2
 	pkgrel = 1
 	url = https://gitlab.manjaro.org/applications/pamac
 	install = pamac.install
@@ -15,19 +15,18 @@ pkgbase = pamac-flatpak-gnome
 	makedepends = itstool
 	makedepends = vala>=0.45
 	makedepends = meson
-	makedepends = ninja
 	makedepends = gobject-introspection
 	makedepends = xorgproto
 	makedepends = asciidoc
 	depends = libnotify
-	depends = libpamac-flatpak
+	depends = libpamac-flatpak>=10.3.0
 	depends = libhandy
-	depends = libappindicator-gtk3
 	depends = git
 	depends = fakeroot
 	depends = pkgconf
+	depends = polkit-gnome
+	optdepends = fwupd: support firmware updates
 	provides = pamac
-	provides = gnome-software
 	conflicts = pamac
 	conflicts = pamac-cli
 	conflicts = pamac-gtk
@@ -37,11 +36,10 @@ pkgbase = pamac-flatpak-gnome
 	conflicts = pamac-aur-git
 	conflicts = pamac-all
 	conflicts = pamac-all-git
-	conflicts = pamac-flatpak
+	conflicts = pamac-flatpak-gnome
-	conflicts = gnome-software
+	conflicts = pamac-nosnap
-	conflicts = pamac-tray-appindicator
 	options = !emptydirs
-	source = pamac-10.2.0.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/v10.2.0/pamac-v10.2.0.tar.gz
+	source = pamac-10.4.2.tar.bz2::https://gitlab.manjaro.org/applications/pamac/-/archive/v10.4.2/pamac-v10.4.2.tar.bz2
-	sha256sums = d553ead69b27b94f039816e7faca462b01883778db39a55cc6cd579bd22a7b4b
+	sha512sums = 8b5b2298e16bcfc6fbdfbf2e2cd77cb9cd769d9faa503dd8fec35c18f37b52589ffda670dc9299a8f4962f039ba870007b4601a2610ac0fc298f64a4f8e67eeb
 
 pkgname = pamac-flatpak-gnome

PKGBUILD

@@ -1,8 +1,8 @@
-# Maintainer: TommyTran732
+# Maintainer: TommyTran732 <contact@tommytran.io>
-# https://gitlab.manjaro.org/packages/extra/pamac
+# Contributor: Frederic Bezies <fredbezies@gmail.com>, Cassandra Watergate (saltedcoffii) <cassandrajwatergate@gmail.com>, LSUtigers3131
 
 pkgname=pamac-flatpak-gnome
-pkgver=10.2.0
+pkgver=10.4.2
 pkgrel=1
 _pkgfixver=$pkgver
 
@@ -10,30 +10,30 @@ pkgdesc="A Gtk3 frontend for libalpm (with AUR, Flatpak, AppIndicator support, a
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://gitlab.manjaro.org/applications/pamac"
 license=('GPL3')
-depends=('libnotify' 'libpamac-flatpak' 'libhandy' 'libappindicator-gtk3' 'git' 'fakeroot' 'pkgconf')
+depends=('libnotify' 'libpamac-flatpak>=10.3.0' 'libhandy' 'git' 'fakeroot' 'pkgconf' 'polkit-gnome')
-makedepends=('gettext' 'itstool' 'vala>=0.45' 'meson' 'ninja' 'gobject-introspection' 'xorgproto' 'asciidoc')
+optdepends=('fwupd: support firmware updates')
-conflicts=('pamac' 'pamac-cli' 'pamac-gtk' 'pamac-qt' 'pamac-classic' 'pamac-aur' 'pamac-aur-git' 'pamac-all' 'pamac-all-git' 'pamac-flatpak' 'gnome-software' 'pamac-tray-appindicator')
+makedepends=('gettext' 'itstool' 'vala>=0.45' 'meson' 'gobject-introspection' 'xorgproto' 'asciidoc')
-provides=('pamac' 'gnome-software')
+conflicts=('pamac' 'pamac-cli' 'pamac-gtk' 'pamac-qt' 'pamac-classic' 'pamac-aur' 'pamac-aur-git' 'pamac-all' 'pamac-all-git' 'pamac-flatpak-gnome' 'pacmac-nosnap')
+provides=('pamac')
 options=(!emptydirs)
 install=pamac.install
 source=("pamac-$pkgver.tar.gz::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.gz") 
-sha256sums=('d553ead69b27b94f039816e7faca462b01883778db39a55cc6cd579bd22a7b4b')
+sha512sums=('8b5b2298e16bcfc6fbdfbf2e2cd77cb9cd769d9faa503dd8fec35c18f37b52589ffda670dc9299a8f4962f039ba870007b4601a2610ac0fc298f64a4f8e67eeb')
 
 prepare() {
-  cd "$srcdir/pamac-v$pkgver"
   # adjust version string
-  sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" src/version.vala
+  sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" $srcdir/pamac-v$pkgver/src/version.vala
 }
 
 build() {
-  cd "$srcdir/pamac-v$pkgver"
+  arch-meson --buildtype=release -Denable-fake-gnome-software=true $srcdir/pamac-v$pkgver build
-  mkdir -p builddir
+  meson compile -C build
-  cd builddir
+}
-  meson --prefix=/usr --sysconfdir=/etc -Denable-flatpak=true -Denable-appindicator=true -Denable-fake-gnome-software=true --buildtype=release
+
-  ninja
+check() {
+  meson test -C build --print-errorlogs
 }
 
 package() {
-  cd "$srcdir/pamac-v$pkgver/builddir"
+  meson install -C build --destdir "$pkgdir"
-  DESTDIR="$pkgdir" ninja install
 }

pamac.install

@@ -5,8 +5,8 @@ post_install() {
     flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
   fi   
   # enable systemd timers
-  ln -sf /usr/lib/systemd/system/pamac-cleancache.timer /etc/systemd/system/multi-user.target.wants
+  systemctl enable --now pamac-cleancache.timer
-  #ln -sf /usr/lib/systemd/system/pamac-mirrorlist.timer /etc/systemd/system/multi-user.target.wants
+  #systemctl enable --now pamac-mirrorlist.timer
   # polkit agent
   printf '==> An authentication agent is required\n'
   printf '    Cinnamon, Deepin, GNOME, GNOME Flashback, KDE, LXDE, LXQt, MATE and Xfce\n'
@@ -17,6 +17,6 @@ post_install() {
 
 post_remove() {
   # disable systemd timers
-  rm -f /etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer
+  systemctl disable --now pamac-cleancache.timer
-  #rm -f /etc/systemd/system/multi-user.target.wants/pamac-mirrorlist.timer
+  #systemctl disable --now pamac-mirrorlist.timer
 }