Building fix

1 files changed, 7 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3fefc9f6202e..0301ead7bcda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,10 @@
 # Contributor: Zeph <zeph33@gmail.com>
 # Maintainer: Librewish <librewish@gmail.com>
 # https://gitlab.manjaro.org/packages/extra/pamac
-ENABLE_FLATPAK=1
-ENABLE_SNAPD=1
-#Set this flag to 0 if you want to use pamac-tray-icon-plasma
-ENABLE_APPINDICATOR=1
-ENABLE_GNOME=0
 
 pkgname=pamac-all
 pkgver=10.2.2
-pkgrel=1
+pkgrel=2
 _pkgfixver=$pkgver
 
 pkgdesc="A Gtk3 frontend for libalpm (everything in one package - snap, flatpak, appindicator)"
@@ -25,31 +20,6 @@ options=(!emptydirs)
 install=pamac.install
 source=("pamac-$pkgver.tar.gz::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.gz") 
 sha256sums=('bbd5e6590a9760e6ff828c32704e3b81c8f800b3a9d22d9b2f6fa94c7794806d')
-define_meson=''
-if [ "${ENABLE_FLATPAK}" = 1 ]; then
-  define_meson+=' -Denable-flatpak=true'
-  provides+=('pamac-flatpak-plugin')
-  conflicts+=('pamac-flatpak-plugin')
-fi
-
-if [ "${ENABLE_SNAPD}" = 1 ]; then
-  define_meson+=' -Denable-snap=true'
-  provides+=('pamac-snap-plugin')
-  conflicts+=('pamac-snap-plugin')
-fi
-
-if [ "${ENABLE_APPINDICATOR}" = 1 ]; then
-  depends+=('libappindicator-gtk3')
-  define_meson+=' -Denable-appindicator=true'
-  provides+=('pamac-tray-appindicator' )
-  conflicts+=('pamac-tray-appindicator' 'pamac-aur-tray-appindicator-git')
-fi
-
-if [ "${ENABLE_GNOME}" = 1 ]; then
-  define_meson+=' -Denable-fake-gnome-software=true'
-  provides+=("pamac-gnome-integration" 'gnome-software')
-  conflicts+=("pamac-gnome-integration" 'gnome-software')
-fi
 
 prepare() {
   cd "$srcdir/pamac-v$pkgver"
@@ -61,7 +31,7 @@ build() {
   cd "$srcdir/pamac-v$pkgver"
   mkdir -p builddir
   cd builddir
-  meson --prefix=/usr --sysconfdir=/etc --buildtype=release $define_meson
+  meson --prefix=/usr --sysconfdir=/etc --buildtype=release -Denable-fake-gnome-software=true
   # build
   ninja
 }
@@ -70,5 +40,10 @@ package() {
   cd "$srcdir/pamac-v$pkgver/builddir"
 
   DESTDIR="$pkgdir" ninja install
+  # 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: