updated to version 11.6.0 and fixed additional options as well

4 files changed, 85 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ead60975f0da..abebb997ab50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = pamac-nosnap
-	pkgdesc = A Gtk3 frontend from Manjaro Linux for libalpm with AUR, flatpak, and appindicator support.
-	pkgver = 10.5.1
+	pkgdesc = A Gtk3 frontend, Package Manager based on libalpm with AUR and Appstream support
+	pkgver = 11.6.0
 	pkgrel = 1
 	url = https://gitlab.manjaro.org/applications/pamac
-	install = pamac.install
 	arch = i686
 	arch = x86_64
 	arch = arm
@@ -11,36 +10,38 @@ pkgbase = pamac-nosnap
 	arch = armv7h
 	arch = aarch64
 	license = GPL3
+	makedepends = asciidoc
 	makedepends = gettext
+	makedepends = git
+	makedepends = gobject-introspection
 	makedepends = itstool
-	makedepends = vala>=0.45
 	makedepends = meson
-	makedepends = gobject-introspection
+	makedepends = ninja
+	makedepends = vala
 	makedepends = xorgproto
-	makedepends = asciidoc
-	depends = libnotify
-	depends = libpamac-nosnap>=11.5.0
+	depends = desktop-file-utils
+	depends = git
+	depends = gnutls
+	depends = gtk4
+	depends = libadwaita
 	depends = libhandy
-	depends = appstream-glib
-	optdepends = polkit-gnome: needed for authentification in Cinnamon, GNOME
-	optdepends = fwupd: support firmware updates
-	optdepends = git: use git repositories as package sources
-	optdepends = svn: use svn repositories as package sources
-	optdepends = mercurial: use mercurial (hg) repositories as package sources
-	provides = pamac=10.5.1-1
+	depends = libnotify
+	depends = libpamac-nosnap
+	optdepends = lxsession: needed for authentification in Xfce, LXDE etc.
+	optdepends = polkit-gnome: needed for authentification in Cinnamon, Gnome
+	optdepends = plymouth: offline upgrades
+	provides = pamac
+	conflicts = gnome-software
 	conflicts = pamac
+	conflicts = pamac-aur
 	conflicts = pamac-all
-	conflicts = pamac-gtk
 	conflicts = pamac-cli
-	conflicts = pamac-common
-	conflicts = pamac-aur
-	conflicts = pamac-aur-git
 	conflicts = pamac-flatpak
 	conflicts = pamac-flatpak-gnome
-	conflicts = gnome-software
-	conflicts = gnome-software-git
 	options = !emptydirs
-	source = pamac-10.5.1.tar.bz2::https://gitlab.manjaro.org/applications/pamac/-/archive/v10.5.1/pamac-v10.5.1.tar.bz2
-	sha512sums = b010a0051c888e14cd8b92f9a9848dcdf80241d0744d72a0f0ab99611cc3d0699d0cf734730b6ea79cc8f25918cc35ba3205304263205c222bbc4e92fc22e8d0
+	source = https://gitlab.manjaro.org/applications/pamac/-/archive/11.6.0/pamac-11.6.0.tar.gz
+	source = https://gitlab.manjaro.org/applications/pamac/-/commit/b6d4815b051d4048f00fa05a57959a5681a031b5.patch
+	sha256sums = e50d4b0f4e2acaf76c50ef2d88e0913f966de5d34adfdf33d07d244ab03dda73
+	sha256sums = ab0c4e94002b5ceb4987298a070c54d12b35f56e7e54fd2d93567e4e5e797795
 
 pkgname = pamac-nosnap
diff --git a/PKGBUILD b/PKGBUILD
index 43523525bfbf..99cd6ec8511c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,77 @@
-# Maintainer: Cassandra Watergate (saltedcoffii) <cassandrajwatergate@gmail.com>
+# Maintainer: Sam Burgos <santiago.burgos1089@gmail.com>
+# Contributer: Cassandra Watergate (saltedcoffii) <cassandrajwatergate@gmail.com>
 # Contributer: LSUtigers3131
 
 _pkgname=pamac
-pkgname=$_pkgname-nosnap
-pkgver=10.5.1
+pkgname=${_pkgname}-nosnap
+pkgver=11.6.0
 pkgrel=1
-pkgdesc="A Gtk3 frontend from Manjaro Linux for libalpm with AUR, flatpak, and appindicator support."
+_srcdir="$_pkgname-$pkgver"
+pkgdesc="A Gtk3 frontend, Package Manager based on libalpm with AUR and Appstream support"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url="https://gitlab.manjaro.org/applications/pamac"
+url="https://gitlab.manjaro.org/applications/$_pkgname"
 license=('GPL3')
-depends=('libnotify' 'libpamac-nosnap>=11.5.0' 'libhandy' 'appstream-glib')
-optdepends=('polkit-gnome: needed for authentification in Cinnamon, GNOME'
-            'fwupd: support firmware updates'
-            'git: use git repositories as package sources'
-            'svn: use svn repositories as package sources'
-            'mercurial: use mercurial (hg) repositories as package sources')
-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' 'gnome-software' 'gnome-software-git')
-provides=("${_pkgname}=${pkgver}-${pkgrel}")
+depends=(
+    'desktop-file-utils'
+    'git'
+    'gnutls'
+    'gtk4'
+    'libadwaita'
+    'libhandy'
+    'libnotify'
+    'libpamac-nosnap' 
+)
+optdepends=(
+    'lxsession: needed for authentification in Xfce, LXDE etc.'
+    'polkit-gnome: needed for authentification in Cinnamon, Gnome'
+    'plymouth: offline upgrades'
+)
+makedepends=(
+    'asciidoc'
+    'gettext'
+    'git'
+    'gobject-introspection'
+    'itstool'
+    'meson'
+    'ninja'
+    'vala'
+    'xorgproto'
+)
+provides=(pamac)
+conflicts=(
+    'gnome-software'
+    'pamac'
+    'pamac-aur'
+    'pamac-all'
+    'pamac-cli'
+    'pamac-flatpak'
+    'pamac-flatpak-gnome'
+)
 options=(!emptydirs)
-install=pamac.install
-source=("$_pkgname-$pkgver.tar.bz2::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.bz2")
-sha512sums=('b010a0051c888e14cd8b92f9a9848dcdf80241d0744d72a0f0ab99611cc3d0699d0cf734730b6ea79cc8f25918cc35ba3205304263205c222bbc4e92fc22e8d0')
+source=(
+    "$url/-/archive/$pkgver/pamac-$pkgver.tar.gz"
+    "$url/-/commit/b6d4815b051d4048f00fa05a57959a5681a031b5.patch"
+)
+sha256sums=(
+    'e50d4b0f4e2acaf76c50ef2d88e0913f966de5d34adfdf33d07d244ab03dda73'
+    'ab0c4e94002b5ceb4987298a070c54d12b35f56e7e54fd2d93567e4e5e797795'
+)
+
+_srcdir="$_pkgname-$pkgver"
 
 prepare() {
-  # adjust version string
-  sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" $srcdir/pamac-v$pkgver/src/version.vala
+	cd "$_srcdir"
+	patch -Np1 -i "${srcdir}/b6d4815b051d4048f00fa05a57959a5681a031b5.patch"
+	# adjust version string
+	sed -i -e "s|\"$pkgver\"|\"$pkgver-$pkgrel\"|g" 'src/version.vala'
 }
 
 build() {
-  arch-meson -Denable-fake-gnome-software=true $srcdir/pamac-v$pkgver build
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
+	arch-meson "$_srcdir" 'build' -Denable-fake-gnome-software=false
+	meson compile -C 'build'
 }
 
 package() {
-  meson install -C build --destdir "$pkgdir"
+	meson install -C 'build' --destdir "$pkgdir"
+	install -Dm644 "$_srcdir/COPYING" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
diff --git a/pamac-10.5.1.tar.bz2 b/pamac-10.5.1.tar.bz2
deleted file mode 100644
index 06d9549f9549..000000000000
--- a/pamac-10.5.1.tar.bz2
+++ /dev/null
diff --git a/pamac.install b/pamac.install
deleted file mode 100644
index a727fa6b9d9d..000000000000
--- a/pamac.install
+++ /dev/null
@@ -1,43 +0,0 @@
-post_install() {
-  # 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 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'
-  printf '    have an authentication agent already.\n'
-  printf '    See https://wiki.archlinux.org/index.php/Polkit#Authentication_agents\n'
-  printf '    for other desktop environments.\n'
-}
-
-post_upgrade() {
-   # 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 is-active snapd.socket >/dev/null || systemctl enable snapd.socket
- #fi
-
-}
-
-post_remove() {
-  # disable systemd timers
-  #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
-}