Date: Tuesday, March 14, 2023 @ 19:23:41
  Author: heftig
Revision: 470891

archrelease: copy trunk to extra-x86_64

Added:
  gnome-control-center/repos/extra-x86_64/PKGBUILD
    (from rev 470890, gnome-control-center/trunk/PKGBUILD)
  gnome-control-center/repos/extra-x86_64/pixmaps-dir.diff
    (from rev 470890, gnome-control-center/trunk/pixmaps-dir.diff)
Deleted:
  gnome-control-center/repos/extra-x86_64/PKGBUILD
  gnome-control-center/repos/extra-x86_64/pixmaps-dir.diff

------------------+
 PKGBUILD         |  220 ++++++++++++++++++++++++++---------------------------
 pixmaps-dir.diff |   26 +++---
 2 files changed, 125 insertions(+), 121 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2023-03-14 19:23:05 UTC (rev 470890)
+++ PKGBUILD    2023-03-14 19:23:41 UTC (rev 470891)
@@ -1,108 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Contributor: Jan de Groot <[email protected]>
-
-pkgname=gnome-control-center
-pkgver=43.4.1
-pkgrel=2
-pkgdesc="GNOME's main interface to configure various aspects of the desktop"
-url="https://gitlab.gnome.org/GNOME/gnome-control-center";
-license=(GPL3)
-arch=(x86_64)
-depends=(
-  accountsservice
-  bolt
-  colord-gtk4
-  cups-pk-helper
-  gcr
-  gnome-bluetooth-3.0
-  gnome-color-manager
-  gnome-desktop-4
-  gnome-online-accounts
-  gnome-settings-daemon
-  gsettings-desktop-schemas
-  gsound
-  gtk4
-  libadwaita
-  libgnomekbd
-  libgtop
-  libgudev
-  libibus
-  libmalcontent
-  libmm-glib
-  libnma-gtk4
-  libpwquality
-  smbclient
-  sound-theme-freedesktop
-  udisks2
-  upower
-)
-makedepends=(
-  docbook-xsl
-  git
-  meson
-  modemmanager
-  python
-)
-checkdepends=(
-  python-dbusmock
-  python-gobject
-  xorg-server-xvfb
-)
-optdepends=(
-  'fwupd: device security panel'
-  'gnome-remote-desktop: screen sharing'
-  'gnome-user-share: WebDAV file sharing'
-  'malcontent: application permission control'
-  'openssh: remote login'
-  'power-profiles-daemon: power profiles'
-  'rygel: media sharing'
-  'system-config-printer: printer settings'
-)
-groups=(gnome)
-_commit=5aa7d28b00da4a24a6977b4e3c92096ee5ac096d  # tags/43.4.1^0
-source=(
-  "git+https://gitlab.gnome.org/GNOME/gnome-control-center.git#commit=$_commit";
-  "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git";
-  pixmaps-dir.diff
-)
-sha256sums=('SKIP'
-            'SKIP'
-            'd3d97995f9e4d5bed2e81b196c1e086777fc33dd6b6f6b08bcc931944569ea4a')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # Install bare logos into pixmaps, not icons
-  git apply -3 ../pixmaps-dir.diff
-
-  git submodule init subprojects/gvc
-  git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
-  git -c protocol.file.allow=always submodule update
-}
-
-
-build() {
-  local meson_options=(
-    -D documentation=true
-    -D malcontent=true
-  )
-
-  arch-meson $pkgname build "${meson_options[@]}"
-  meson compile -C build
-}
-
-check() {
-  GTK_A11Y=none meson test -C build --print-errorlogs
-}
-
-package() {
-  meson install -C build --destdir "$pkgdir"
-  install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
-}
-
-# vim:set sw=2 sts=-1 et:

Copied: gnome-control-center/repos/extra-x86_64/PKGBUILD (from rev 470890, 
gnome-control-center/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2023-03-14 19:23:41 UTC (rev 470891)
@@ -0,0 +1,112 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Jan de Groot <[email protected]>
+
+pkgname=gnome-control-center
+pkgver=43.4.1
+pkgrel=3
+pkgdesc="GNOME's main interface to configure various aspects of the desktop"
+url="https://gitlab.gnome.org/GNOME/gnome-control-center";
+license=(GPL3)
+arch=(x86_64)
+depends=(
+  accountsservice
+  bolt
+  colord-gtk4
+  cups-pk-helper
+  gcr
+  gnome-bluetooth-3.0
+  gnome-color-manager
+  gnome-desktop-4
+  gnome-online-accounts
+  gnome-settings-daemon
+  gsettings-desktop-schemas
+  gsound
+  gtk4
+  libadwaita
+  libgnomekbd
+  libgtop
+  libgudev
+  libibus
+  libmalcontent
+  libmm-glib
+  libnma-gtk4
+  libpwquality
+  smbclient
+  sound-theme-freedesktop
+  udisks2
+  upower
+)
+makedepends=(
+  docbook-xsl
+  git
+  meson
+  modemmanager
+  python
+)
+checkdepends=(
+  python-dbusmock
+  python-gobject
+  xorg-server-xvfb
+)
+optdepends=(
+  'fwupd: device security panel'
+  'gnome-remote-desktop: screen sharing'
+  'gnome-user-share: WebDAV file sharing'
+  'malcontent: application permission control'
+  'openssh: remote login'
+  'power-profiles-daemon: power profiles'
+  'rygel: media sharing'
+  'system-config-printer: printer settings'
+)
+groups=(gnome)
+_commit=5aa7d28b00da4a24a6977b4e3c92096ee5ac096d  # tags/43.4.1^0
+source=(
+  "git+https://gitlab.gnome.org/GNOME/gnome-control-center.git#commit=$_commit";
+  "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git";
+  pixmaps-dir.diff
+)
+sha256sums=('SKIP'
+            'SKIP'
+            'd3d97995f9e4d5bed2e81b196c1e086777fc33dd6b6f6b08bcc931944569ea4a')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Fixes to Users panel
+  git cherry-pick -n d1e64d0f13629bf08da0ae9fab11c97209ec6729 \
+                     8a98497fb0eb8bc1f4447c14830b5757de4e1d3b
+
+  # Install bare logos into pixmaps, not icons
+  git apply -3 ../pixmaps-dir.diff
+
+  git submodule init subprojects/gvc
+  git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
+  git -c protocol.file.allow=always submodule update
+}
+
+
+build() {
+  local meson_options=(
+    -D documentation=true
+    -D malcontent=true
+  )
+
+  arch-meson $pkgname build "${meson_options[@]}"
+  meson compile -C build
+}
+
+check() {
+  GTK_A11Y=none meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+  install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+}
+
+# vim:set sw=2 sts=-1 et:

Deleted: pixmaps-dir.diff
===================================================================
--- pixmaps-dir.diff    2023-03-14 19:23:05 UTC (rev 470890)
+++ pixmaps-dir.diff    2023-03-14 19:23:41 UTC (rev 470891)
@@ -1,13 +0,0 @@
-diff --git i/panels/info-overview/meson.build 
w/panels/info-overview/meson.build
-index 45251ab26..4fe2f613e 100644
---- i/panels/info-overview/meson.build
-+++ w/panels/info-overview/meson.build
-@@ -70,7 +70,7 @@ executable(
- 
- install_data(
-   [ 'gnome-logo-text.svg', 'gnome-logo-text-dark.svg' ],
--  install_dir: join_paths(control_center_datadir, 'icons')
-+  install_dir: join_paths(control_center_datadir, 'pixmaps')
- )
- 
- subdir('icons')

Copied: gnome-control-center/repos/extra-x86_64/pixmaps-dir.diff (from rev 
470890, gnome-control-center/trunk/pixmaps-dir.diff)
===================================================================
--- pixmaps-dir.diff                            (rev 0)
+++ pixmaps-dir.diff    2023-03-14 19:23:41 UTC (rev 470891)
@@ -0,0 +1,13 @@
+diff --git i/panels/info-overview/meson.build 
w/panels/info-overview/meson.build
+index 45251ab26..4fe2f613e 100644
+--- i/panels/info-overview/meson.build
++++ w/panels/info-overview/meson.build
+@@ -70,7 +70,7 @@ executable(
+ 
+ install_data(
+   [ 'gnome-logo-text.svg', 'gnome-logo-text-dark.svg' ],
+-  install_dir: join_paths(control_center_datadir, 'icons')
++  install_dir: join_paths(control_center_datadir, 'pixmaps')
+ )
+ 
+ subdir('icons')

Reply via email to