summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO45
-rw-r--r--PKGBUILD80
-rw-r--r--pamac.install24
3 files changed, 83 insertions, 66 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bea62537c29c..67ef17d75a9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = pamac-aur
- pkgdesc = A Gtk3 frontend for libalpm
- pkgver = 7.3.4
- pkgrel = 2
+ pkgdesc = A Gtk frontend, Package Manager based on libalpm with AUR and Appstream support
+ pkgver = 11.7.1
+ pkgrel = 4
url = https://gitlab.manjaro.org/applications/pamac
install = pamac.install
arch = i686
@@ -10,36 +10,37 @@ pkgbase = pamac-aur
arch = armv6h
arch = armv7h
arch = aarch64
- license = GPL3
+ license = GPL-3.0-or-later
makedepends = gettext
makedepends = itstool
- makedepends = vala>=0.36.6
+ makedepends = vala
makedepends = meson
makedepends = ninja
- makedepends = git
makedepends = gobject-introspection
- depends = glib2>=2.42
- depends = json-glib
- depends = libsoup
- depends = dbus-glib
- depends = polkit
- depends = vte3>=0.38
- depends = gtk3>=3.22
+ makedepends = xorgproto
+ makedepends = asciidoc
+ makedepends = git
+ makedepends = systemd
depends = libnotify
+ depends = libhandy
+ depends = libadwaita
+ depends = gtk4
depends = desktop-file-utils
- depends = pacman>=5.1
+ depends = libpamac-aur>=11.6
depends = gnutls>=3.4
- depends = appstream-glib
- depends = archlinux-appstream-data
+ depends = git
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
+ provides = pamac=11.7.1-4
+ provides = pamac-cli=11.6.0-5
conflicts = pamac
+ conflicts = pamac-tray-appindicator
+ conflicts = pamac-cli
options = !emptydirs
- backup = etc/pamac.conf
- source = pamac-7.3.4-2.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/71fc9ae24a09f025a0bf0e6b1d66544a7e65b7e0/pamac-71fc9ae24a09f025a0bf0e6b1d66544a7e65b7e0.tar.gz
- sha256sums = 0bea57f1561ffcea36268a8b96be13a531d02b8320f9c5af5a3a4551d0fe600c
+ options = !strip
+ source = pamac-11.7.1-4.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/61b7570aace3def9b048668fa23a52f08423ecf1/pamac-61b7570aace3def9b048668fa23a52f08423ecf1.tar.gz
+ source = pamac-cli-11.6.0-5.tar.gz::https://gitlab.manjaro.org/applications/pamac-cli/-/archive/3985c4d7e95312f79bb2a7f33766912c329f4697/pamac-cli-3985c4d7e95312f79bb2a7f33766912c329f4697.tar.gz
+ sha256sums = 5202a72287aaaf83530448cacd13940d779e3fe12c0a2dd62eaada9721de9ed0
+ sha256sums = 95b192d8bc71764e50f73394b068e78159d2b1d976a2ae22f943c51cfdd7b9ca
pkgname = pamac-aur
-
diff --git a/PKGBUILD b/PKGBUILD
index 01c68953f93c..892121b3114e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,75 @@
# Contributor: Zeph <zeph33@gmail.com>
# Maintainer: Zeph <zeph33@gmail.com>
# https://gitlab.manjaro.org/packages/extra/pamac
+ENABLE_FAKE_GNOME_SOFTWARE=0
+
pkgname=pamac-aur
-pkgver=7.3.4
-pkgrel=2
+pkgver=11.7.1
+pkgrel=4
_pkgfixver=$pkgver
+_pkgfixvercli=11.6.0
+_pkgrelcli=5
-_pkgvercommit=v$pkgver
-_pkgvercommit=71fc9ae24a09f025a0bf0e6b1d66544a7e65b7e0
-sha256sums=('0bea57f1561ffcea36268a8b96be13a531d02b8320f9c5af5a3a4551d0fe600c')
+_commit='61b7570aace3def9b048668fa23a52f08423ecf1'
+_commitcli='3985c4d7e95312f79bb2a7f33766912c329f4697'
+sha256sums=('5202a72287aaaf83530448cacd13940d779e3fe12c0a2dd62eaada9721de9ed0'
+ '95b192d8bc71764e50f73394b068e78159d2b1d976a2ae22f943c51cfdd7b9ca')
-pkgdesc="A Gtk3 frontend for libalpm"
+pkgdesc="A Gtk 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"
-license=('GPL3')
-depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' 'gtk3>=3.22'
- 'libnotify' 'desktop-file-utils' 'pacman>=5.1' 'gnutls>=3.4'
- 'appstream-glib' 'archlinux-appstream-data')
-
- 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.6' 'meson' 'ninja' 'git' 'gobject-introspection')
-backup=('etc/pamac.conf')
-conflicts=('pamac')
-provides=('pamac')
-options=(!emptydirs)
+license=('GPL-3.0-or-later')
+depends=('libnotify' 'libhandy' 'libadwaita' 'gtk4' 'desktop-file-utils' 'libpamac-aur>=11.6' 'gnutls>=3.4' 'git')
+
+optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome'
+ 'lxsession: needed for authentification in Xfce, LXDE etc.')
+makedepends=('gettext' 'itstool' 'vala' 'meson' 'ninja' 'gobject-introspection' 'xorgproto' 'asciidoc' 'git' 'systemd')
+conflicts=('pamac' 'pamac-tray-appindicator' 'pamac-cli')
+provides=("pamac=$_pkgfixver-$pkgrel" "pamac-cli=$_pkgfixvercli-$_pkgrelcli")
+options=(!emptydirs !strip)
install=pamac.install
+source=("pamac-$_pkgfixver-$pkgrel.tar.gz::$url/-/archive/$_commit/pamac-$_commit.tar.gz"
+ "pamac-cli-$_pkgfixvercli-$_pkgrelcli.tar.gz::$url-cli/-/archive/$_commitcli/pamac-cli-$_commitcli.tar.gz")
-source=("pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/$_pkgvercommit/pamac-$_pkgvercommit.tar.gz")
+define_meson=''
+if [ "${ENABLE_FAKE_GNOME_SOFTWARE}" = 1 ]; then
+ conflicts+=('pamac-gnome-integration' 'pamac-gnome-integration-dev' 'gnome-software')
+ define_meson+=' -Denable-fake-gnome-software=true'
+fi
-prepare() {
- cd "$srcdir/pamac-$_pkgvercommit"
+_srcdir="pamac-$_commit"
+_srcdircli="pamac-cli-$_commitcli"
+prepare() {
+ cd "${srcdir}/${_srcdir}"
# adjust version string
sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" src/version.vala
+ cd "${srcdir}/${_srcdircli}"
+ # adjust version string
+ sed -i -e "s|\"$_pkgfixvercli\"|\"$_pkgfixvercli-$_pkgrelcli\"|g" src/version.vala
}
build() {
- cd "$srcdir/pamac-$_pkgvercommit"
- mkdir -p builddir
- cd builddir
- meson --prefix=/usr --sysconfdir=/etc
-
- # build
+ cd "${srcdir}/${_srcdir}"
+ mkdir -p builddir && cd builddir
+ meson --buildtype=release \
+ --prefix=/usr \
+ --sysconfdir=/etc $define_meson
ninja
+
+ cd "${srcdir}/${_srcdircli}"
+ mkdir -p builddir && cd builddir
+ meson setup --prefix=/usr --sysconfdir=/etc --buildtype=release
+ meson compile
}
package() {
- cd "$srcdir/pamac-$_pkgvercommit/builddir"
-
+ cd "${srcdir}/${_srcdir}/builddir"
DESTDIR="$pkgdir" ninja install
+ cp -r "$srcdir/pamac-$_commit/data/gnome-shell/pamac-updates@manjaro.org" "$pkgdir/usr/share/gnome-shell/extensions"
+ cd "${srcdir}/${_srcdircli}/builddir"
+ meson install --destdir "$pkgdir"
+
+ install -Dm644 "${srcdir}/${_srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
# vim:set ts=2 sw=2 et:
diff --git a/pamac.install b/pamac.install
index 8437f7321391..811374827e2a 100644
--- a/pamac.install
+++ b/pamac.install
@@ -1,17 +1,13 @@
post_install() {
- # 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-mirrorlist.timer /etc/systemd/system/multi-user.target.wants
- # 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'
+ # enable pamac extension
+ printf '==> Enable Pamac Updates Indicator via\n'
+ printf ' Extensions\n'
}
-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
-} \ No newline at end of file
+post_upgrade() {
+ if [[ ! "gsettings get org.gnome.shell enabled-extensions | grep 'pamac-updates'" ]]; then
+ # enable pamac extension
+ printf '==> Enable Pamac Updates Indicator via\n'
+ printf ' Extensions\n'
+ fi
+}