[arch-commits] Commit in budgie-desktop/repos/community-x86_64 (5 files)

Balló György bgyorgy at archlinux.org
Tue Apr 13 17:33:54 UTC 2021


    Date: Tuesday, April 13, 2021 @ 17:33:54
  Author: bgyorgy
Revision: 917469

archrelease: copy trunk to community-x86_64

Added:
  budgie-desktop/repos/community-x86_64/0001-Add-launcher-for-gnome-screensaver.patch
    (from rev 917468, budgie-desktop/trunk/0001-Add-launcher-for-gnome-screensaver.patch)
  budgie-desktop/repos/community-x86_64/0001-Override-settings-only-for-Budgie.patch
    (from rev 917468, budgie-desktop/trunk/0001-Override-settings-only-for-Budgie.patch)
  budgie-desktop/repos/community-x86_64/PKGBUILD
    (from rev 917468, budgie-desktop/trunk/PKGBUILD)
Deleted:
  budgie-desktop/repos/community-x86_64/PKGBUILD
  budgie-desktop/repos/community-x86_64/desktop-override.patch

-----------------------------------------------+
 0001-Add-launcher-for-gnome-screensaver.patch |   52 +++++++++++
 0001-Override-settings-only-for-Budgie.patch  |   30 ++++++
 PKGBUILD                                      |  105 +++++++++++++-----------
 desktop-override.patch                        |   17 ---
 4 files changed, 139 insertions(+), 65 deletions(-)

Copied: budgie-desktop/repos/community-x86_64/0001-Add-launcher-for-gnome-screensaver.patch (from rev 917468, budgie-desktop/trunk/0001-Add-launcher-for-gnome-screensaver.patch)
===================================================================
--- 0001-Add-launcher-for-gnome-screensaver.patch	                        (rev 0)
+++ 0001-Add-launcher-for-gnome-screensaver.patch	2021-04-13 17:33:54 UTC (rev 917469)
@@ -0,0 +1,52 @@
+From 8b52a1fbde2d9ef0b2d96017aea952dfae60b2a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Tue, 13 Apr 2021 18:45:11 +0200
+Subject: [PATCH] Add launcher for gnome-screensaver
+
+Since GNOME 40 provides a DBus service activation file, usually the DBus path is allocated by gnome-shell before gnome-screensaver runs. This change kills gnome-shell before starting gnome-screensaver, so it can run without problems.
+---
+ src/session/budgie-desktop-screensaver            | 3 +++
+ src/session/budgie-desktop-screensaver.desktop.in | 2 +-
+ src/session/meson.build                           | 6 ++++++
+ 3 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100755 src/session/budgie-desktop-screensaver
+
+diff --git a/src/session/budgie-desktop-screensaver b/src/session/budgie-desktop-screensaver
+new file mode 100755
+index 00000000..4dc801a7
+--- /dev/null
++++ b/src/session/budgie-desktop-screensaver
+@@ -0,0 +1,3 @@
++#!/bin/sh
++pkill -f '/usr/bin/gjs /usr/share/gnome-shell/org.gnome.ScreenSaver'
++gnome-screensaver &
+diff --git a/src/session/budgie-desktop-screensaver.desktop.in b/src/session/budgie-desktop-screensaver.desktop.in
+index 490f97d8..6c8d866c 100644
+--- a/src/session/budgie-desktop-screensaver.desktop.in
++++ b/src/session/budgie-desktop-screensaver.desktop.in
+@@ -3,7 +3,7 @@ Type=Application
+ Name=Screensaver (Budgie Desktop)
+ Comment=Launch screensaver and locker program
+ Icon=preferences-desktop-screensaver
+-Exec=gnome-screensaver
++Exec=budgie-desktop-screensaver
+ TryExec=gnome-screensaver
+ OnlyShowIn=Budgie;
+ NoDisplay=true
+diff --git a/src/session/meson.build b/src/session/meson.build
+index e2330c77..b6e26859 100644
+--- a/src/session/meson.build
++++ b/src/session/meson.build
+@@ -129,3 +129,9 @@ custom_target('desktop-file-screensaver',
+     install : true,
+     install_dir : xdg_appdir,
+ )
++
++# Install screensaver launcher
++install_data(
++    'budgie-desktop-screensaver',
++    install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++)
+-- 
+2.31.1
+

Copied: budgie-desktop/repos/community-x86_64/0001-Override-settings-only-for-Budgie.patch (from rev 917468, budgie-desktop/trunk/0001-Override-settings-only-for-Budgie.patch)
===================================================================
--- 0001-Override-settings-only-for-Budgie.patch	                        (rev 0)
+++ 0001-Override-settings-only-for-Budgie.patch	2021-04-13 17:33:54 UTC (rev 917469)
@@ -0,0 +1,30 @@
+From 93e7b8399e1dfe4d6645184efab1c70fa4268203 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Tue, 13 Apr 2021 19:06:59 +0200
+Subject: [PATCH] Override settings only for Budgie
+
+This left the default settings for GNOME, and override them only for the Budgie session. Also add override for the desktop background, because the default one is animated, which is not supported by Budgie background renderer.
+---
+ src/wm/20_solus-project.budgie.wm.gschema.override | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/wm/20_solus-project.budgie.wm.gschema.override b/src/wm/20_solus-project.budgie.wm.gschema.override
+index f568a2c7..c2ad61cb 100644
+--- a/src/wm/20_solus-project.budgie.wm.gschema.override
++++ b/src/wm/20_solus-project.budgie.wm.gschema.override
+@@ -1,7 +1,10 @@
+-[org.gnome.mutter]
++[org.gnome.mutter:Budgie]
+ edge-tiling = true
+ attach-modal-dialogs = true
+ 
+-[org.gnome.desktop.wm.preferences]
++[org.gnome.desktop.background:Budgie]
++picture-uri='file:///usr/share/backgrounds/gnome/adwaita-day.png'
++
++[org.gnome.desktop.wm.preferences:Budgie]
+ button-layout = 'appmenu:minimize,maximize,close'
+ 
+-- 
+2.31.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-13 17:33:46 UTC (rev 917468)
+++ PKGBUILD	2021-04-13 17:33:54 UTC (rev 917469)
@@ -1,48 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=budgie-desktop
-pkgver=10.5.2+15+gc0939ab6
-pkgrel=1
-pkgdesc="Modern desktop environment from the Solus Project"
-arch=('x86_64')
-url="https://github.com/solus-project/budgie-desktop"
-license=('GPL' 'LGPL')
-depends=('accountsservice' 'gnome-bluetooth' 'gnome-menus' 'gnome-session' 'gnome-themes-standard' 'libibus' 'libpeas' 'libwnck3' 'mutter' 'graphene')
-makedepends=('autoconf-archive' 'git' 'gobject-introspection' 'intltool' 'meson' 'sassc' 'vala')
-optdepends=('gnome-backgrounds: Default background'
-            'gnome-control-center: System settings'
-            'gnome-screensaver: Lock screen'
-            'network-manager-applet: Network management')
-_commit=c0939ab629c0719370da25ce2b63e7c1aebb92d7  # master
-source=("git+https://github.com/budgie-desktop/budgie-desktop.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-        "desktop-override.patch")
-validpgpkeys=('8876CC8EDAEC52CEAB7742E778E2387015C1205F') # Ikey Doherty (Solus Project Founder)
-sha256sums=('SKIP'
-            'SKIP'
-            'baffb1d64715c20c1ae444a5b8ea0f8e9bf69cccf30e5e2c6729fe6d0c7491d2')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # Override settings only for Budgie
-  patch -Np1 -i ../desktop-override.patch
-
-  git submodule init
-  git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
-  git submodule update
-}
-
-build() {
-  arch-meson $pkgname build -D with-desktop-icons=none
-  meson compile -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}

Copied: budgie-desktop/repos/community-x86_64/PKGBUILD (from rev 917468, budgie-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-04-13 17:33:54 UTC (rev 917469)
@@ -0,0 +1,57 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=budgie-desktop
+pkgver=10.5.2+24+g7a5dcfda
+pkgrel=1
+pkgdesc="Modern desktop environment from the Solus Project"
+arch=('x86_64')
+url="https://github.com/solus-project/budgie-desktop"
+license=('GPL' 'LGPL')
+depends=('accountsservice' 'gnome-bluetooth' 'gnome-menus' 'gnome-session' 'gnome-themes-standard' 'graphene' 'libibus' 'libpeas' 'libwnck3' 'mutter')
+makedepends=('autoconf-archive' 'git' 'gobject-introspection' 'intltool' 'meson' 'sassc' 'vala')
+optdepends=('budgie-desktop-view: Desktop icons'
+            'gnome-backgrounds: Default background'
+            'gnome-control-center: System settings'
+            'gnome-screensaver: Lock screen'
+            'network-manager-applet: Network management')
+_commit=7a5dcfdaa25e887432e7edb3f8aee060992ee1c1  # master
+source=("git+https://github.com/solus-project/budgie-desktop.git#commit=$_commit"
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
+        "git+https://github.com/getsolus/budgie-translations.git"
+        "0001-Add-launcher-for-gnome-screensaver.patch"
+        "0001-Override-settings-only-for-Budgie.patch")
+validpgpkeys=('8876CC8EDAEC52CEAB7742E778E2387015C1205F') # Ikey Doherty (Solus Project Founder)
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            '9d33293b7f98eaecff87f52e772502938cf9bb945ab7a375623e429cc92e6ec9'
+            '0708ac986f378d54fb6f171abb7511e38c3f68abc3a65b1e5bd1122137c92931')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Add launcher for gnome-screensaver
+  patch -Np1 -i ../0001-Add-launcher-for-gnome-screensaver.patch
+
+  # Override settings only for Budgie
+  patch -Np1 -i ../0001-Override-settings-only-for-Budgie.patch
+
+  git submodule init
+  git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
+  git submodule set-url subprojects/translations "$srcdir/budgie-translations"
+  git submodule update
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}

Deleted: desktop-override.patch
===================================================================
--- desktop-override.patch	2021-04-13 17:33:46 UTC (rev 917468)
+++ desktop-override.patch	2021-04-13 17:33:54 UTC (rev 917469)
@@ -1,17 +0,0 @@
-diff --git a/src/wm/20_solus-project.budgie.wm.gschema.override b/src/wm/20_solus-project.budgie.wm.gschema.override
-index f568a2c7..8b91bf65 100644
---- a/src/wm/20_solus-project.budgie.wm.gschema.override
-+++ b/src/wm/20_solus-project.budgie.wm.gschema.override
-@@ -1,7 +1,10 @@
--[org.gnome.mutter]
-+[org.gnome.mutter:Budgie]
- edge-tiling = true
- attach-modal-dialogs = true
- 
--[org.gnome.desktop.wm.preferences]
-+[org.gnome.desktop.background:Budgie]
-+picture-uri='file:///usr/share/backgrounds/gnome/adwaita-day.jpg'
-+
-+[org.gnome.desktop.wm.preferences:Budgie]
- button-layout = 'appmenu:minimize,maximize,close'
- 



More information about the arch-commits mailing list