summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2021-04-08 08:30:02 +0200
committerFrederic Bezies2021-04-08 08:30:02 +0200
commit3a8b469d92ff7a34e79ddd2721bf5d3cce79f5d9 (patch)
tree784a321869620378fff055f32520ba6a8413cdb1
parent96a5b65f2e9f05588cd4e951ef5e9ec461c74b35 (diff)
downloadaur-3a8b469d92ff7a34e79ddd2721bf5d3cce79f5d9.tar.gz
adding Gnome 40 tray icon patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--gnome-40.patch14
3 files changed, 24 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c65fcefadaa..66d72e9587cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = pamac-all
pkgdesc = A Gtk3 frontend for libalpm (everything in one package - snap, flatpak, appindicator)
pkgver = 10.0.5
- pkgrel = 2
+ pkgrel = 3
url = https://gitlab.manjaro.org/applications/pamac
install = pamac.install
arch = i686
@@ -58,8 +58,10 @@ pkgbase = pamac-all
backup = etc/pamac.conf
source = pamac-10.0.5.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/v10.0.5/pamac-v10.0.5.tar.gz
source = build.patch
+ source = gnome-40.patch
sha256sums = 3650d0a2d9633d27ee465ecaaaf33fa1255b4d44d1034433b2a2f16d963521b0
sha256sums = bcb9c3cafac802342cb597dadbe6d0384a3c8b2e462bbc46464fbf9c4c7497c7
+ sha256sums = 7246c8a0424c08870acb448c57d0a90ca5f675dc8e15e118ee8c13930ba584e1
pkgname = pamac-all
diff --git a/PKGBUILD b/PKGBUILD
index a216d91952f6..92d302597322 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ ENABLE_GNOME=0
pkgname=pamac-all
pkgver=10.0.5
-pkgrel=2
+pkgrel=3
_pkgfixver=$pkgver
pkgdesc="A Gtk3 frontend for libalpm (everything in one package - snap, flatpak, appindicator)"
@@ -25,12 +25,12 @@ conflicts=('pamac' 'pamac-gtk' 'pamac-cli' 'pamac-common' 'pamac-aur' 'pamac-aur
provides=("pamac" "pamac-aur" "pamac-aur-git")
options=(!emptydirs)
install=pamac.install
-source=(
- "pamac-$pkgver.tar.gz::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.gz"
+source=("pamac-$pkgver.tar.gz::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.gz"
"build.patch"
- )
+ "gnome-40.patch")
sha256sums=('3650d0a2d9633d27ee465ecaaaf33fa1255b4d44d1034433b2a2f16d963521b0'
- 'bcb9c3cafac802342cb597dadbe6d0384a3c8b2e462bbc46464fbf9c4c7497c7')
+ 'bcb9c3cafac802342cb597dadbe6d0384a3c8b2e462bbc46464fbf9c4c7497c7'
+ '7246c8a0424c08870acb448c57d0a90ca5f675dc8e15e118ee8c13930ba584e1')
define_meson=''
if [ "${ENABLE_FLATPAK}" = 1 ]; then
depends+=('flatpak')
@@ -63,7 +63,8 @@ prepare() {
cd "$srcdir/pamac-v$pkgver"
# adjust version string
sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" src/version.vala
- patch -Np1 < ../build.patch
+ patch -Np1 -i ../gnome-40.patch
+ patch -Np1 -i ../build.patch
}
build() {
diff --git a/gnome-40.patch b/gnome-40.patch
new file mode 100644
index 000000000000..1634b01011f8
--- /dev/null
+++ b/gnome-40.patch
@@ -0,0 +1,14 @@
+diff --git a/data/gnome-shell/pamac-updates@manjaro.org/metadata.json b/data/gnome-shell/pamac-updates@manjaro.org/metadata.json
+index 29365446db6a4eec43e23c72dbf4dcaf8d039289..a96521c4a7512e2b3191f924057c71686e9f58cc 100644
+--- a/data/gnome-shell/pamac-updates@manjaro.org/metadata.json
++++ b/data/gnome-shell/pamac-updates@manjaro.org/metadata.json
+@@ -2,7 +2,8 @@
+ "description": "GNOME Shell Updates indicator for Pamac.",
+ "name": "Pamac Updates Indicator",
+ "shell-version": [
+- "3.36"
++ "3.36",
++ "40"
+ ],
+ "url": "https://gitlab.manjaro.org/applications/pamac",
+ "uuid": "pamac-updates@manjaro.org",