Browse Source

uppkg -> 1:46.1-1

Noah Vogt 1 năm trước cách đây
mục cha
commit
f08611f759
2 tập tin đã thay đổi với 8 bổ sung21 xóa
  1. 3 5
      .SRCINFO
  2. 5 16
      PKGBUILD

+ 3 - 5
.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = gnome-shell-no-screenshot-notification
 	pkgdesc = Next generation desktop shell - without the screenshot notification
-	pkgver = 45.4
-	pkgrel = 2
+	pkgver = 46.1
+	pkgrel = 1
 	epoch = 1
 	url = https://wiki.gnome.org/Projects/GnomeShell
 	arch = x86_64
@@ -74,15 +74,13 @@ pkgbase = gnome-shell-no-screenshot-notification
 	optdepends = switcheroo-control: Multi-GPU support
 	provides = gnome-shell
 	conflicts = gnome-shell
-	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=58522920b5ae96d2b95dad0371ce13eb4bd955ce
+	source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#tag=46.1
 	source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
-	source = 0001-subprojects-gvc-Bump-gvc-submodule-to-newest-commit.patch
 	source = disable-screenshot-notification.patch
 	source = disable-screenshot-sound.patch
 	source = change-screenshot-filenaming.patch
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = ee7b40aefdf751feaa661de6d0aed28efcd282250f41b25b6c0413bd75503bb2cd5413fce96d33336206448a777be04b701a4465e38c799e91328fb4197d011b
 	b2sums = a726caac6ec6dea7f7c8d122cedf30ad0a44921321ed763e2b4422e6f455edf2a93f6d9de72ac8c10560f69bb987a37acf6de2580b36464345afc08ab439d86e
 	b2sums = aca63da0703e44401fa987660d9542d92df7e89da66d93dbf0cd75bc25868b75d9502fb73c6981d964ebbb3b6a719c9b1d84629560dafbfedf3781a6fab7769a
 	b2sums = e3d93ff6565a4e2db845fe95bfd965d39a042beb47a89a91aea5f7c21b7c4d52d377470b9803082d33924780cb5a82b06159cd6ace14e1ae4249ba08eda71dac

+ 5 - 16
PKGBUILD

@@ -6,8 +6,8 @@
 
 _base_name=gnome-shell
 pkgname=gnome-shell-no-screenshot-notification
-pkgver=45.4
-pkgrel=2
+pkgver=46.1
+pkgrel=1
 epoch=1
 pkgdesc="Next generation desktop shell - without the screenshot notification"
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -89,41 +89,30 @@ optdepends=(
 conflicts=(gnome-shell)
 provides=(gnome-shell)
 groups=(gnome)
-_commit=58522920b5ae96d2b95dad0371ce13eb4bd955ce  # tags/45.4^0
 source=(
-  "git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
+    # GNOME Shell tags use SSH signatures which makepkg doesn't understand
+  "git+https://gitlab.gnome.org/GNOME/gnome-shell.git#tag=${pkgver/[a-z]/.&}"
   "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-  "0001-subprojects-gvc-Bump-gvc-submodule-to-newest-commit.patch"
   "disable-screenshot-notification.patch"
   "disable-screenshot-sound.patch"
   "change-screenshot-filenaming.patch"
 )
 b2sums=('SKIP'
         'SKIP'
-        'ee7b40aefdf751feaa661de6d0aed28efcd282250f41b25b6c0413bd75503bb2cd5413fce96d33336206448a777be04b701a4465e38c799e91328fb4197d011b'
         'a726caac6ec6dea7f7c8d122cedf30ad0a44921321ed763e2b4422e6f455edf2a93f6d9de72ac8c10560f69bb987a37acf6de2580b36464345afc08ab439d86e'
         'aca63da0703e44401fa987660d9542d92df7e89da66d93dbf0cd75bc25868b75d9502fb73c6981d964ebbb3b6a719c9b1d84629560dafbfedf3781a6fab7769a'
         'e3d93ff6565a4e2db845fe95bfd965d39a042beb47a89a91aea5f7c21b7c4d52d377470b9803082d33924780cb5a82b06159cd6ace14e1ae4249ba08eda71dac')
 
-pkgver() {
-  cd $_base_name
-  git describe --tags | sed -r 's/\.([a-z])/\1/;s/([a-z])\./\1/;s/[^-]*-g/r&/;s/-/+/g'
-}
-
 prepare() {
   cd $_base_name
 
-  # Update libgnome-volume-control
-  # https://gitlab.archlinux.org/archlinux/packaging/packages/gnome-shell/-/issues/3
-  git apply -3 ../0001-subprojects-gvc-Bump-gvc-submodule-to-newest-commit.patch
-
   patch -p1 -i "$srcdir/disable-screenshot-notification.patch"
   patch -p1 -i "$srcdir/disable-screenshot-sound.patch"
   patch -p1 -i "$srcdir/change-screenshot-filenaming.patch"
 
   git submodule init
   git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
-  git -c protocol.file.allow=always submodule update
+  git -c protocol.file.allow=always -c protocol.allow=never submodule update
 }
 
 build() {