diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 80 | ||||
| -rw-r--r-- | manage-dpms.patch | 80 |
3 files changed, 19 insertions, 157 deletions
@@ -1,7 +1,7 @@ pkgbase = gnome-settings-daemon-elementary - pkgdesc = GNOME Settings Daemon (with elementary OS patch) - pkgver = 3.28.0 - pkgrel = 4 + pkgdesc = GNOME Settings Daemon (with elementary OS patches) + pkgver = 3.28.1+0ubuntu1+r3.6975d1c25 + pkgrel = 1 url = https://gitlab.gnome.org/GNOME/gnome-settings-daemon arch = i686 arch = x86_64 @@ -35,18 +35,14 @@ pkgbase = gnome-settings-daemon-elementary depends = pulseaudio depends = pulseaudio-alsa depends = upower - provides = gnome-settings-daemon=3.28.0 - provides = gnome-settings-daemon-ubuntu=3.28.0 + provides = gnome-settings-daemon=3.28.1+0ubuntu1+r3.6975d1c25 + provides = gnome-settings-daemon-ubuntu=3.28.1+0ubuntu1+r3.6975d1c25 conflicts = gnome-settings-daemon conflicts = gnome-settings-daemon-ubuntu - source = git+https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git/#commit=5ac1a8240fb784cc92e2b394156153e34e21dab9 + source = git+https://github.com/elementary/os-patches.git#branch=gnome-settings-daemon-bionic-patched source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git/ - source = manage-dpms.patch - source = https://launchpad.net/ubuntu/+archive/primary/+files/gnome-settings-daemon_3.28.0-0ubuntu1.debian.tar.xz sha512sums = SKIP sha512sums = SKIP - sha512sums = 08b95b9892ed004c3da1506e272ea895885c47d70632f26edd8e5101bcb5936494b6419f4ea8a56f18964e89918401603188fd1f376795b42b2a1c7107706f2a - sha512sums = fdbeef6092a78e56cfa939abc1f107c0ff3aa496e7a0bd8b0b80eb3c5d39f364cbdb145b146f29b9ce5d4e5e4c80c045751e1950932399020ff64fda35560f8c pkgname = gnome-settings-daemon-elementary @@ -4,29 +4,13 @@ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: thn81 <root@scrat> -# vercheck-pkgbuild: auto -# vercheck-ubuntu: name=${pkgname%-*}, repo=xenial -# vercheck-archlinux: name=${pkgname%-*}, repo=extra, arch=x86_64 -# vercheck-gnome: name=${pkgname%-*}, majorver=3.24 -# vercheck-ppa: name=${pkgname%-*}, url=ppa:gnome3-team/gnome3-staging - pkgname=gnome-settings-daemon-elementary -_use_ppa=false -_ppa_rel=0ubuntu0~bionic1 -_ppa_ver=3.27.91 -_ubuntu_rel=0ubuntu1 -_ubuntu_ver=3.28.0 -if [[ "${_use_ppa}" == "true" ]]; then - _commit=08c416c68f7becc75ea43723fc956436d4976e79 # tags/GNOME_SETTINGS_DAEMON_3_27_91^0 -else - _commit=5ac1a8240fb784cc92e2b394156153e34e21dab9 # tags/GNOME_SETTINGS_DAEMON_3_28_0^0 -fi -pkgver=3.28.0 -pkgrel=4 -pkgdesc="GNOME Settings Daemon (with elementary OS patch)" +pkgver=3.28.1+0ubuntu1+r3.6975d1c25 +pkgrel=1 +pkgdesc="GNOME Settings Daemon (with elementary OS patches)" url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" -arch=(i686 x86_64) -license=(GPL) +arch=('i686' 'x86_64') +license=('GPL') depends=(dconf geoclue2 geocode-glib gnome-desktop 'gsettings-desktop-schemas-ubuntu>=3.24.0' gtk3-print-backends libcanberra-pulse libgudev libgweather libnotify librsvg libsystemd libwacom nss pulseaudio pulseaudio-alsa upower) @@ -34,52 +18,26 @@ makedepends=(docbook-xsl git gnome-common intltool libxslt libnm python xf86-inp groups=(gnome unity pantheon-qq) provides=(gnome-settings-daemon{,-ubuntu}="${pkgver}") conflicts=(gnome-settings-daemon{,-ubuntu}) -source=("git+https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git/#commit=${_commit}" - "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git/" - 'manage-dpms.patch') - -if [[ "${_use_ppa}" == "true" ]]; then - source+=("http://ppa.launchpad.net/gnome3-team/gnome3-staging/ubuntu/pool/main/g/gnome-settings-daemon/gnome-settings-daemon_${_ppa_ver:-${pkgver}}-${_ppa_rel}.debian.tar.xz") -else - source+=("https://launchpad.net/ubuntu/+archive/primary/+files/gnome-settings-daemon_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.debian.tar.xz") -fi - +source=("git+https://github.com/elementary/os-patches.git#branch=gnome-settings-daemon-bionic-patched" + "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git/") sha512sums=('SKIP' - 'SKIP' - '08b95b9892ed004c3da1506e272ea895885c47d70632f26edd8e5101bcb5936494b6419f4ea8a56f18964e89918401603188fd1f376795b42b2a1c7107706f2a') -if [[ "${_use_ppa}" == "true" ]]; then - sha512sums+=('9203c13a2b8526dec82e838e46c62919cd2dd38224a8aca942bc3821cc662cee2dcc459241f363f047475dc7c4800616078201eb1a5e1e4ac6d003a0f3231fe3') -else - sha512sums+=('fdbeef6092a78e56cfa939abc1f107c0ff3aa496e7a0bd8b0b80eb3c5d39f364cbdb145b146f29b9ce5d4e5e4c80c045751e1950932399020ff64fda35560f8c') -fi + 'SKIP') pkgver() { - cd "${pkgname%-*}" - git describe --tags | sed 's/^GNOME_SETTINGS_DAEMON_//;s/_/./g;s/-/+/g' + cd "os-patches" + printf "3.28.1+0ubuntu1+r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd "${pkgname%-*}" + cd "os-patches" git submodule init git config --local submodule."subprojects/gvc".url "${srcdir}/libgnome-volume-control" git submodule update - - # Apply Ubuntu's patches - for i in $(grep -v '#' "$srcdir/debian/patches/series"); do - [[ "${i}" =~ ^# || -z "${i}" || "${i}" == *git* ]] && continue # Skip comments, newlines, and git patches - [[ "${i}" == 53_sync_input_sources_to_accountsservice.patch ]] && continue #Cannot build with this patch; don't ask me how Canonical makes it work - msg2 "Applying $i ..." - patch -Np1 < "$srcdir/debian/patches/$i" - done - - # Apply Elementary's patches - msg2 "Applying manage-dpms.patch ..." - patch -Np0 < ../manage-dpms.patch } build() { - cd "${pkgname%-*}" + cd "os-patches" meson \ --prefix=/usr \ @@ -90,22 +48,10 @@ build() { builddir ninja -C builddir - - #"-Dstatic-false=true" - #According to the GNOME initiative the format should be -Dstatic-false - #meson says it needs to be followed by =bool - #Rediculous, utterly rediculous and probably wrong. } package() { - cd "${pkgname%-*}" + cd "os-patches" DESTDIR="${pkgdir}" ninja -C builddir install - # Elementary is shipping these with pantheon-session-git; not sure how good an idea that is (upstream gsd could change before they can react) - #cd "${pkgdir}" - #for i in $(grep -Rl OnlyShowIn etc/xdg/autostart/); do - # cp "${i%.*}"{,-pantheon}.desktop - # sed -i 's|OnlyShowIn=GNOME;|OnlyShowIn=Pantheon;|g' "${i%.*}"-pantheon.desktop - #done - } diff --git a/manage-dpms.patch b/manage-dpms.patch deleted file mode 100644 index be2a7342789b..000000000000 --- a/manage-dpms.patch +++ /dev/null @@ -1,80 +0,0 @@ -=== modified file 'data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in' ---- data/org.gnome.settings-daemon.plugins.power.gschema.xml.in 2016-05-13 19:33:51 +0000 -+++ data/org.gnome.settings-daemon.plugins.power.gschema.xml.in 2016-05-13 19:57:07 +0000 -@@ -5,6 +5,11 @@ - <_summary>Activation of this plugin</_summary> - <_description>Whether this plugin would be activated by unity-settings-daemon or not</_description> - </key> -+ <key name="manage-dpms-defaults" type="b"> -+ <default>false</default> -+ <summary>Reset X DPMS values</summary> -+ <description>Whether DPMS values will be adjusted by gnome-settings-daemon</description> -+ </key> - <key name="idle-brightness" type="i"> - <default>30</default> - <summary>The brightness of the screen when idle</summary> - -=== modified file 'plugins/power/gpm-common.c' ---- plugins/power/gpm-common.c 2016-05-13 19:33:51 +0000 -+++ plugins/power/gpm-common.c 2016-05-13 19:57:07 +0000 -@@ -283,6 +283,14 @@ - return TRUE; - } - -+gboolean -+manage_dpms (void) -+{ -+ GSettings *settings; -+ settings = g_settings_new ("org.gnome.settings-daemon.plugins.power"); -+ return g_settings_get_boolean (settings, "manage-dpms-defaults"); -+} -+ - guint - gsd_power_enable_screensaver_watchdog (void) - { -@@ -293,7 +301,7 @@ - * way. The defaults are now applied in Fedora 20 from - * being "0" by default to being "600" by default */ - gdk_error_trap_push (); -- if (DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) -+ if (manage_dpms () && DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) - DPMSSetTimeouts (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, 0); - gdk_error_trap_pop_ignored (); - id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT, - -=== modified file 'plugins/power/gpm-common.h' ---- plugins/power/gpm-common.h 2016-05-13 19:33:51 +0000 -+++ plugins/power/gpm-common.h 2016-05-13 19:57:07 +0000 -@@ -35,6 +35,7 @@ - gboolean gsd_power_is_hardware_a_tablet (void); - guint gsd_power_enable_screensaver_watchdog (void); - void reset_idletime (void); -+gboolean manage_dpms (void); - - /* Backlight helpers */ - - -=== modified file 'plugins/power/gsd-power-manager.c' ---- plugins/power/gsd-power-manager.c 2016-05-13 19:33:51 +0000 -+++ plugins/power/gsd-power-manager.c 2016-05-13 19:57:07 +0000 -@@ -1015,6 +1015,9 @@ - gboolean ret; - GError *error = NULL; - -+ if (!(manage_dpms ())) -+ return; -+ - iio_proxy_claim_light (manager, TRUE); - ret = gnome_rr_screen_set_dpms_mode (manager->priv->rr_screen, - GNOME_RR_DPMS_ON, -@@ -1036,6 +1039,9 @@ - gboolean ret; - GError *error = NULL; - -+ if (!(manage_dpms ())) -+ return; -+ - iio_proxy_claim_light (manager, FALSE); - ret = gnome_rr_screen_set_dpms_mode (manager->priv->rr_screen, - GNOME_RR_DPMS_OFF, - |