Bläddra i källkod

upd to gnome 47.4

Noah Vogt 3 månader sedan
förälder
incheckning
bc872d2cb2
5 ändrade filer med 110 tillägg och 94 borttagningar
  1. 33 26
      .SRCINFO
  2. 52 46
      PKGBUILD
  3. 4 4
      change-screenshot-filenaming.patch
  4. 15 14
      disable-screenshot-notification.patch
  5. 6 4
      disable-screenshot-sound.patch

+ 33 - 26
.SRCINFO

@@ -1,23 +1,21 @@
 pkgbase = gnome-shell-no-screenshot-notification
 	pkgdesc = Next generation desktop shell - without the screenshot notification
-	pkgver = 46.1
+	pkgver = 47.4
 	pkgrel = 1
 	epoch = 1
-	url = https://wiki.gnome.org/Projects/GnomeShell
+	url = https://gitlab.gnome.org/GNOME/gnome-shell
 	arch = x86_64
-	groups = gnome
 	license = GPL-3.0-or-later
-	checkdepends = appstream-glib
-	checkdepends = python-dbusmock
-	checkdepends = xorg-server-xvfb
 	makedepends = asciidoc
 	makedepends = bash-completion
 	makedepends = evolution-data-server
+	makedepends = gi-docgen
 	makedepends = git
-	makedepends = gnome-control-center
+	makedepends = glib2-devel
+	makedepends = gnome-keybindings
 	makedepends = gobject-introspection
-	makedepends = gtk-doc
 	makedepends = meson
+	makedepends = python-docutils
 	makedepends = sassc
 	depends = accountsservice
 	depends = at-spi2-core
@@ -62,30 +60,21 @@ pkgbase = gnome-shell-no-screenshot-notification
 	depends = unzip
 	depends = upower
 	depends = webkitgtk-6.0
-	optdepends = evolution-data-server: Evolution calendar integration
-	optdepends = gnome-bluetooth-3.0: Bluetooth support
-	optdepends = gnome-control-center: System settings
-	optdepends = gnome-disk-utility: Mount with keyfiles
-	optdepends = gst-plugin-pipewire: Screen recording
-	optdepends = gst-plugins-good: Screen recording
-	optdepends = power-profiles-daemon: Power profile switching
-	optdepends = python-gobject: gnome-shell-test-tool performance tester
-	optdepends = python-simplejson: gnome-shell-test-tool performance tester
-	optdepends = switcheroo-control: Multi-GPU support
 	provides = gnome-shell
 	conflicts = gnome-shell
-	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 = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#tag=47.4
+	source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git#commit=5f9768a2eac29c1ed56f1fbb449a77a3523683b6
 	source = disable-screenshot-notification.patch
 	source = disable-screenshot-sound.patch
 	source = change-screenshot-filenaming.patch
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = a726caac6ec6dea7f7c8d122cedf30ad0a44921321ed763e2b4422e6f455edf2a93f6d9de72ac8c10560f69bb987a37acf6de2580b36464345afc08ab439d86e
-	b2sums = aca63da0703e44401fa987660d9542d92df7e89da66d93dbf0cd75bc25868b75d9502fb73c6981d964ebbb3b6a719c9b1d84629560dafbfedf3781a6fab7769a
-	b2sums = e3d93ff6565a4e2db845fe95bfd965d39a042beb47a89a91aea5f7c21b7c4d52d377470b9803082d33924780cb5a82b06159cd6ace14e1ae4249ba08eda71dac
+	b2sums = d8e8653f0e2a645390b95e16b45efd80501ce829ada0671b7c1cd597575ea64d2f650ee4771cbe60d41175bc7823eabe8dde1f58ba3c6b2cee6166b6f5c1f45a
+	b2sums = e31ae379039dfc345e8032f7b9803a59ded075fc52457ba1553276d3031e7025d9304a7f2167a01be2d54c5e121bae00a2824a9c5ccbf926865d0b24520bb053
+	b2sums = f05b5daf8194566769ac5123b29e06caaf93add8d398c4545a4690e9558dafd85fabbe27301aaedf9c69d45499907c7b2d9d8ae16e4c989a6cfb846c91c3adf6
+	b2sums = 26702aa16b023c049521d7af391e21533bdbf065ad3c316949dade33651347cca7998e9e4fabe5fa913426cd45ad5720b0f80c5ad10f98ed517d46aeea497332
+	b2sums = 06b1ae01d08bfaf3c2d3a55e00985ae76120204afa002f65465c61bf0d034046ed926ae10a7262c0838cabf8d5f26eb469fbdfe610469f831678c31de8a64a20
 
 pkgname = gnome-shell-no-screenshot-notification
+	groups = gnome
 	depends = accountsservice
 	depends = at-spi2-core
 	depends = bash
@@ -129,4 +118,22 @@ pkgname = gnome-shell-no-screenshot-notification
 	depends = unzip
 	depends = upower
 	depends = webkitgtk-6.0
-	depends = libmutter-13.so
+	depends = libmutter-15.so
+	optdepends = evolution-data-server: Evolution calendar integration
+	optdepends = gnome-bluetooth-3.0: Bluetooth support
+	optdepends = gnome-control-center: System settings
+	optdepends = gnome-disk-utility: Mount with keyfiles
+	optdepends = gst-plugin-pipewire: Screen recording
+	optdepends = gst-plugins-good: Screen recording
+	optdepends = power-profiles-daemon: Power profile switching
+	optdepends = python-gobject: gnome-shell-test-tool performance tester
+	optdepends = python-simplejson: gnome-shell-test-tool performance tester
+	optdepends = switcheroo-control: Multi-GPU support
+	provides = gnome-shell
+	conflicts = gnome-shell
+
+pkgname = gnome-shell-no-screenshot-notification-docs
+	pkgdesc = Next generation desktop shell - without the screenshot notification (API documentation)
+	depends = 
+	provides = gnome-shell-docs
+	conflicts = gnome-shell-docs

+ 52 - 46
PKGBUILD

@@ -5,12 +5,16 @@
 # Contributor: Flamelab <panosfilip@gmail.com
 
 _base_name=gnome-shell
-pkgname=gnome-shell-no-screenshot-notification
-pkgver=46.1
+pkgbase=$_base_name-no-screenshot-notification
+pkgname=(
+  $pkgbase
+  $pkgbase-docs
+)
+pkgver=47.4
 pkgrel=1
 epoch=1
 pkgdesc="Next generation desktop shell - without the screenshot notification"
-url="https://wiki.gnome.org/Projects/GnomeShell"
+url="https://gitlab.gnome.org/GNOME/gnome-shell"
 arch=(x86_64)
 license=(GPL-3.0-or-later)
 depends=(
@@ -62,88 +66,90 @@ makedepends=(
   asciidoc
   bash-completion
   evolution-data-server
+  gi-docgen
   git
-  gnome-control-center
+  glib2-devel
+  gnome-keybindings
   gobject-introspection
-  gtk-doc
   meson
+  python-docutils
   sassc
 )
-checkdepends=(
-  appstream-glib
-  python-dbusmock
-  xorg-server-xvfb
-)
-optdepends=(
-  'evolution-data-server: Evolution calendar integration'
-  'gnome-bluetooth-3.0: Bluetooth support'
-  'gnome-control-center: System settings'
-  'gnome-disk-utility: Mount with keyfiles'
-  'gst-plugin-pipewire: Screen recording'
-  'gst-plugins-good: Screen recording'
-  'power-profiles-daemon: Power profile switching'
-  'python-gobject: gnome-shell-test-tool performance tester'
-  'python-simplejson: gnome-shell-test-tool performance tester'
-  'switcheroo-control: Multi-GPU support'
-)
 conflicts=(gnome-shell)
 provides=(gnome-shell)
-groups=(gnome)
+# GNOME Shell tags use SSH signatures which makepkg doesn't understand
 source=(
-    # 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"
+  "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git#commit=5f9768a2eac29c1ed56f1fbb449a77a3523683b6"
   "disable-screenshot-notification.patch"
   "disable-screenshot-sound.patch"
   "change-screenshot-filenaming.patch"
 )
-b2sums=('SKIP'
-        'SKIP'
-        'a726caac6ec6dea7f7c8d122cedf30ad0a44921321ed763e2b4422e6f455edf2a93f6d9de72ac8c10560f69bb987a37acf6de2580b36464345afc08ab439d86e'
-        'aca63da0703e44401fa987660d9542d92df7e89da66d93dbf0cd75bc25868b75d9502fb73c6981d964ebbb3b6a719c9b1d84629560dafbfedf3781a6fab7769a'
-        'e3d93ff6565a4e2db845fe95bfd965d39a042beb47a89a91aea5f7c21b7c4d52d377470b9803082d33924780cb5a82b06159cd6ace14e1ae4249ba08eda71dac')
+b2sums=('d8e8653f0e2a645390b95e16b45efd80501ce829ada0671b7c1cd597575ea64d2f650ee4771cbe60d41175bc7823eabe8dde1f58ba3c6b2cee6166b6f5c1f45a'
+        'e31ae379039dfc345e8032f7b9803a59ded075fc52457ba1553276d3031e7025d9304a7f2167a01be2d54c5e121bae00a2824a9c5ccbf926865d0b24520bb053'
+        'f05b5daf8194566769ac5123b29e06caaf93add8d398c4545a4690e9558dafd85fabbe27301aaedf9c69d45499907c7b2d9d8ae16e4c989a6cfb846c91c3adf6'
+        '26702aa16b023c049521d7af391e21533bdbf065ad3c316949dade33651347cca7998e9e4fabe5fa913426cd45ad5720b0f80c5ad10f98ed517d46aeea497332'
+        '06b1ae01d08bfaf3c2d3a55e00985ae76120204afa002f65465c61bf0d034046ed926ae10a7262c0838cabf8d5f26eb469fbdfe610469f831678c31de8a64a20')
 
 prepare() {
+  # Inject gvc
+  ln -s libgnome-volume-control gvc
+
   cd $_base_name
 
   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 -c protocol.allow=never submodule update
 }
 
 build() {
   local meson_options=(
     -D gtk_doc=true
+    -D tests=false
   )
 
   CFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition"
   LDFLAGS+=" -Wl,-Bsymbolic-functions"
 
+  # Inject gvc
+  export MESON_PACKAGE_CACHE_DIR="$srcdir"
+
   arch-meson $_base_name build "${meson_options[@]}"
   meson compile -C build
 }
 
-_check() (
-  export XDG_RUNTIME_DIR="$PWD/rdir"
-  mkdir -p -m 700 "$XDG_RUNTIME_DIR"
 
-  export NO_AT_BRIDGE=1 GTK_A11Y=none
+package_gnome-shell-no-screenshot-notification() {
+  depends+=(libmutter-15.so)
+  conflicts=($_base_name)
+  provides=($_base_name)
+  optdepends=(
+    'evolution-data-server: Evolution calendar integration'
+    'gnome-bluetooth-3.0: Bluetooth support'
+    'gnome-control-center: System settings'
+    'gnome-disk-utility: Mount with keyfiles'
+    'gst-plugin-pipewire: Screen recording'
+    'gst-plugins-good: Screen recording'
+    'power-profiles-daemon: Power profile switching'
+    'python-gobject: gnome-shell-test-tool performance tester'
+    'python-simplejson: gnome-shell-test-tool performance tester'
+    'switcheroo-control: Multi-GPU support'
+  )
+  groups=(gnome)
 
-  # meson test -C build --print-errorlogs -t 3
-)
+  meson install -C build --destdir "$pkgdir"
 
-check() {
-  dbus-run-session xvfb-run -s '-nolisten local +iglx -noreset' \
-    bash -c "$(declare -f _check); _check"
+  mkdir -p doc/usr/share
+  mv {"$pkgdir",doc}/usr/share/doc
 }
 
-package() {
-  depends+=(libmutter-13.so)
-  meson install -C build --destdir "$pkgdir"
+package_gnome-shell-no-screenshot-notification-docs() {
+  pkgdesc+=" (API documentation)"
+  depends=()
+  conflicts=($_base_name-docs)
+  provides=($_base_name-docs)
+
+  mv doc/* "$pkgdir"
 }
 
 # vim:set sw=2 sts=-1 et:

+ 4 - 4
change-screenshot-filenaming.patch

@@ -1,15 +1,15 @@
 --- a/js/ui/screenshot.js
 +++ b/js/ui/screenshot.js
-@@ -2155,10 +2155,10 @@ function _storeScreenshot(bytes, pixbuf) {
+@@ -2279,10 +2279,10 @@ function _storeScreenshot(bytes, pixbuf) {
                  throw e;
          }
 
 -        const timestamp = time.format('%Y-%m-%d %H-%M-%S');
-+        const timestamp = time.format('%Y%m%d-%H%M%S_%N');
++        const timestamp = time.format('%Y%m%d-%H%M%S');
          // Translators: this is the name of the file that the screenshot is
          // saved to. The placeholder is a timestamp, e.g. "2017-05-21 12-24-03".
--        const name = _('Screenshot from %s').format(timestamp);
-+        const name = _('Screenshot_%s').format(timestamp);
+-        const name = _('Screenshot From %s').format(timestamp);
++        const name = _('Screenshot_%s_gnome').format(timestamp);
 
          // If the target file already exists, try appending a suffix with an
          // increasing number to it.

+ 15 - 14
disable-screenshot-notification.patch

@@ -1,23 +1,25 @@
 --- a/js/ui/screenshot.js
 +++ b/js/ui/screenshot.js
-@@ -2195,48 +2195,7 @@ function _storeScreenshot(bytes, pixbuf) {
+@@ -2319,49 +2319,7 @@ function _storeScreenshot(bytes, pixbuf) {
          pixbuf.rowstride
      );
 
 -    // Show a notification.
--    const source = new MessageTray.Source(
+-    const source = new MessageTray.Source({
 -        // Translators: notification source name.
--        _('Screenshot'),
--        'screenshot-recorded-symbolic'
--    );
--    const notification = new MessageTray.Notification(
+-        title: _('Screenshot'),
+-        iconName: 'screenshot-recorded-symbolic',
+-    });
+-    const notification = new MessageTray.Notification({
 -        source,
 -        // Translators: notification title.
--        _('Screenshot captured'),
+-        title: _('Screenshot captured'),
 -        // Translators: notification body when a screenshot was captured.
--        _('You can paste the image from the clipboard.'),
--        {datetime: time, gicon: content}
--    );
+-        body: _('You can paste the image from the clipboard.'),
+-        datetime: time,
+-        gicon: content,
+-        isTransient: true,
+-    });
 -
 -    if (!disableSaveToDisk) {
 -        // Translators: button on the screenshot notification.
@@ -43,10 +45,9 @@
 -        });
 -    }
 -
--    notification.setTransient(true);
 -    Main.messageTray.add(source);
--    source.showNotification(notification);
+-    source.addNotification(notification);
 +    // patched: do not show a notification after taking a screenshot
- }
 
- /**
+     return file;
+ }

+ 6 - 4
disable-screenshot-sound.patch

@@ -1,6 +1,6 @@
 --- a/js/ui/screenshot.js
 +++ b/js/ui/screenshot.js
-@@ -2258,8 +2258,7 @@ export async function captureScreenshot(texture, geometry, scale, cursor) {
+@@ -2385,8 +2343,7 @@ export async function captureScreenshot(texture, geometry, scale, cursor) {
      if (cursor === null)
          cursor = {texture: null, x: 0, y: 0, scale: 1};
 
@@ -10,13 +10,15 @@
 
      const pixbuf = await Shell.Screenshot.composite_to_stream(
          texture,
-@@ -2422,8 +2421,7 @@ export class ScreenshotService {
+@@ -2548,9 +2505,7 @@ export class ScreenshotService {
+             shooter.connect('screenshot_taken', (s, area) => {
                  const flashspot = new Flashspot(area);
                  flashspot.fire(resolve);
-
+-
 -                global.display.get_sound_player().play_from_theme(
 -                    'screen-capture', _('Screenshot taken'), null);
-+                    // patched: do not play a sound when taking a screenshot
++                // patched: do not play a sound when taking a screenshot
              });
          });
      }
+    }