upgrade to 11.4.0

3 files changed, 47 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a344cab9158..80f774be8ce4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pamac-nosnap
-	pkgdesc = A Gtk3 frontend for libalpm (with AUR, flatpak, appindicator)
-	pkgver = 10.3.0
-	pkgrel = 2
+	pkgdesc = A Gtk3 frontend from Manjaro Linux for libalpm with AUR, flatpak, and appindicator support.
+	pkgver = 10.4.0
+	pkgrel = 1
 	url = https://gitlab.manjaro.org/applications/pamac
 	install = pamac.install
 	arch = i686
@@ -15,14 +15,14 @@ pkgbase = pamac-nosnap
 	makedepends = itstool
 	makedepends = vala>=0.45
 	makedepends = meson
-	makedepends = ninja
 	makedepends = gobject-introspection
 	makedepends = xorgproto
 	makedepends = asciidoc
 	depends = libnotify
-	depends = libpamac-nosnap
+	depends = libpamac-nosnap>=10.3.0
 	depends = libhandy
 	optdepends = polkit-gnome: needed for authentification in Cinnamon, Gnome
+	optdepends = fwupd: support firmware updates
 	provides = pamac
 	conflicts = pamac
 	conflicts = pamac-all
@@ -34,7 +34,7 @@ pkgbase = pamac-nosnap
 	conflicts = pamac-flatpak
 	conflicts = pamac-flatpak-gnome
 	options = !emptydirs
-	source = pamac-10.3.0.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/v10.3.0/pamac-v10.3.0.tar.gz
-	sha256sums = aa9f2760cf6a08df658067e5c61f62aecb01db3fd32efd8b3a9c268ecad40fdc
+	source = pamac-10.4.0.tar.bz2::https://gitlab.manjaro.org/applications/pamac/-/archive/v10.4.0/pamac-v10.4.0.tar.bz2
+	sha512sums = 0fccf34ab3eee721ab26a572dc80edd04b71a7d39e8e3896592e4cbff671d496eecc96692eb907271e96294b4097f250d1346b45d372e3f3b2e49c412756a0ad
 
 pkgname = pamac-nosnap
diff --git a/PKGBUILD b/PKGBUILD
index 742435dea40c..f21285e3ed48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,45 @@
-# Maintainer: LSUtigers3131
-# https://gitlab.manjaro.org/packages/extra/pamac
+# Maintainer: Cassandra Watergate (saltedcoffii) <cassandrawatergate@outlook.com>
+# Contributer: LSUtigers3131
 
-pkgname=pamac-nosnap
-pkgver=10.3.0
-pkgrel=2
-_pkgfixver=$pkgver
+_pkgname=pamac
+pkgname=$_pkgname-nosnap
+pkgver=10.4.0
+pkgrel=1
 
-pkgdesc="A Gtk3 frontend for libalpm (with AUR, flatpak, appindicator)"
+pkgdesc="A Gtk3 frontend from Manjaro Linux for libalpm with AUR, flatpak, and appindicator support."
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://gitlab.manjaro.org/applications/pamac"
 license=('GPL3')
-depends=('libnotify' 'libpamac-nosnap' 'libhandy')
-optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome')
-makedepends=('gettext' 'itstool' 'vala>=0.45' 'meson' 'ninja' 'gobject-introspection' 'xorgproto' 'asciidoc')
+depends=('libnotify' 'libpamac-nosnap>=10.3.0' 'libhandy')
+optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome'
+            'fwupd: support firmware updates')
+makedepends=('gettext' 'itstool' 'vala>=0.45' 'meson' 'gobject-introspection' 'xorgproto' 'asciidoc')
 conflicts=('pamac' 'pamac-all' 'pamac-gtk' 'pamac-cli' 'pamac-common' 'pamac-aur' 'pamac-aur-git' 'pamac-flatpak' 'pamac-flatpak-gnome')
 provides=('pamac')
 options=(!emptydirs)
 install=pamac.install
-source=("pamac-$pkgver.tar.gz::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.gz") 
-sha256sums=('aa9f2760cf6a08df658067e5c61f62aecb01db3fd32efd8b3a9c268ecad40fdc')
+source=("$_pkgname-$pkgver.tar.bz2::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.bz2")
+sha512sums=('0fccf34ab3eee721ab26a572dc80edd04b71a7d39e8e3896592e4cbff671d496eecc96692eb907271e96294b4097f250d1346b45d372e3f3b2e49c412756a0ad')
 
 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"
-  mkdir -p builddir
-  cd builddir
-  meson --prefix=/usr --sysconfdir=/etc --buildtype=release -Denable-fake-gnome-software=true
-  # build
-  ninja
+  arch-meson --buildtype=release -Denable-fake-gnome-software=true $srcdir/pamac-v$pkgver build
+  meson compile -C build
 }
 
-package() {
-  cd "$srcdir/pamac-v$pkgver/builddir"
+check() {
+  meson test -C build --print-errorlogs
+}
 
-  DESTDIR="$pkgdir" ninja install
+package() {
+  meson install -C build --destdir "$pkgdir"
   # remove pamac-gnome-integration
   rm "$pkgdir/usr/bin/gnome-software"
   rm "$pkgdir/usr/share/applications/org.gnome.Software.desktop"
   rm "$pkgdir/usr/share/dbus-1/services/org.gnome.Software.service"
 
 }
-# vim:set ts=2 sw=2 et:
diff --git a/pamac.install b/pamac.install
index f3e89676fd66..a727fa6b9d9d 100644
--- a/pamac.install
+++ b/pamac.install
@@ -1,16 +1,18 @@
 post_install() {
-   # enable flatpak repo
-  if [ -f /usr/bin/flatpak ]; then
+  # enable flatpak repo
+  if pacman -Q flatpak &> /dev/null ; then
     flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  fi   
- # enable classic snap support
-  if [ -f /usr/bin/snap ]; then
- #   ln -s /var/lib/snapd/snap /snap
-    systemctl enable snapd.socket
   fi
+  # enable classic snap support
+  #if [ -f /usr/bin/snap ]; then
+  #   ln -s /var/lib/snapd/snap /snap
+  #  systemctl enable snapd.socket
+  #fi
   # enable systemd timers
-  ln -sf /usr/lib/systemd/system/pamac-cleancache.timer /etc/systemd/system/multi-user.target.wants
+  #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'
@@ -21,19 +23,21 @@ post_install() {
 
 post_upgrade() {
    # enable flatpak repo
-  if [ -f /usr/bin/flatpak ]; then
+  if pacman -Q flatpak &> /dev/null; then
     flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  fi  
+  fi
  # enable classic snap support
-  if [ -f /usr/bin/snap ]; then
+ #if [ -f /usr/bin/snap ]; then
  #   ln -s /var/lib/snapd/snap /snap
-    systemctl is-active snapd.socket >/dev/null || systemctl enable snapd.socket
-  fi
+ #  systemctl is-active snapd.socket >/dev/null || systemctl enable snapd.socket
+ #fi
 
 }
 
 post_remove() {
   # disable systemd timers
-  rm -f /etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer
-  #rm -f /etc/systemd/system/multi-user.target.wants/pamac-mirrorlist.timer
+  #unlink /etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer
+  systemctl disable --now pamac-cleancache.timer
+  #unlink /etc/systemd/system/multi-user.target.wants/pamac-mirrorlist.timer
+  #systemctl disable --now pamac-mirrorlist.timer
 }