diff options
| author | Zeph | 2020-03-31 22:19:43 +0200 |
|---|---|---|
| committer | Zeph | 2020-03-31 22:19:43 +0200 |
| commit | 8bd6d374b7044f4552c928291e91a258d5ac507d (patch) | |
| tree | 6dc2206a7301caa0c17e40f70af9a58e9c5b1448 | |
| parent | cec1032770aa02af34b97797f68f213d6337b5e8 (diff) | |
| download | aur-8bd6d374b7044f4552c928291e91a258d5ac507d.tar.gz | |
No force use flatpak
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | pamac.install | 8 |
3 files changed, 11 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = pamac-aur pkgdesc = A Gtk3 frontend for libalpm pkgver = 9.4.0 - pkgrel = 4 + pkgrel = 5 url = https://gitlab.manjaro.org/applications/pamac install = pamac.install arch = i686 @@ -40,7 +40,7 @@ pkgbase = pamac-aur conflicts = pamac options = !emptydirs backup = etc/pamac.conf - source = pamac-9.4.0-4.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/712e0e22958f41c311afe1fc21ef478729fcbe59/pamac-712e0e22958f41c311afe1fc21ef478729fcbe59.tar.gz + source = pamac-9.4.0-5.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/712e0e22958f41c311afe1fc21ef478729fcbe59/pamac-712e0e22958f41c311afe1fc21ef478729fcbe59.tar.gz sha256sums = cca8e5665256870b122ae1398d92b0278d72eb9f4ac31a014cd8176035e0c733 pkgname = pamac-aur @@ -3,7 +3,7 @@ # https://gitlab.manjaro.org/packages/extra/pamac pkgname=pamac-aur pkgver=9.4.0 -pkgrel=4 +pkgrel=5 _pkgfixver=$pkgver _pkgvercommit=v$pkgver @@ -16,6 +16,7 @@ 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.2' 'gnutls>=3.4' 'git' +# 'flatpak' 'appstream-glib' 'archlinux-appstream-data' 'flatpak') optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome' @@ -43,10 +44,7 @@ build() { cd builddir meson --buildtype=release \ --prefix=/usr \ - --sysconfdir=/etc \ - -Denable-flatpak=true -# -Denable-snap=true - + --sysconfdir=/etc # -Denable-flatpak=true # build ninja } diff --git a/pamac.install b/pamac.install index 8d81c8967f3e..fb3df4aa94ef 100644 --- a/pamac.install +++ b/pamac.install @@ -1,6 +1,8 @@ post_install() { # enable flatpak repo - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + if [ -f /usr/bin/flatpak ]; then + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + 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-mirrorlist.timer /etc/systemd/system/multi-user.target.wants @@ -14,7 +16,9 @@ post_install() { post_upgrade() { # enable flatpak repo - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + if [ -f /usr/bin/flatpak ]; then + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + fi } post_remove() { |