summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQue Quotion2017-03-14 00:19:50 +0900
committerQue Quotion2017-03-14 00:19:50 +0900
commit3378f6d315819524f4f1b5634d825e8f518a8af0 (patch)
tree5d798cefae355cc7e34f60240e6f27c98f03f257
downloadaur-3378f6d315819524f4f1b5634d825e8f518a8af0.tar.gz
gnome-settings-daemon with ubuntu and elementary patches
-rw-r--r--.SRCINFO51
-rw-r--r--PKGBUILD94
-rw-r--r--manage-dpms.patch80
3 files changed, 225 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 00000000000..1ac24a3dcda
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,51 @@
+# Generated by mksrcinfo v8
+# Sun Mar 5 21:28:16 UTC 2017
+pkgbase = gnome-settings-daemon-elementary
+ pkgdesc = GNOME Settings Daemon (with ElementaryOS patches)
+ pkgver = 3.22.1
+ pkgrel = 1
+ url = https://git.gnome.org/browse/gnome-settings-daemon
+ arch = i686
+ arch = x86_64
+ groups = gnome
+ groups = unity
+ license = GPL
+ makedepends = docbook-xsl
+ makedepends = git
+ makedepends = gnome-common
+ makedepends = intltool
+ makedepends = libxslt
+ makedepends = python
+ makedepends = xf86-input-wacom
+ depends = dconf
+ depends = geoclue2
+ depends = geocode-glib
+ depends = gnome-desktop
+ depends = gsettings-desktop-schemas-ubuntu
+ depends = gtk3-print-backends
+ depends = libcanberra-pulse
+ depends = libgudev
+ depends = libgweather
+ depends = libnotify
+ depends = librsvg
+ depends = libsystemd
+ depends = libwacom
+ depends = nss
+ depends = pulseaudio
+ depends = pulseaudio-alsa
+ depends = upower
+ provides = gnome-settings-daemon=3.22.1
+ provides = gnome-settings-daemon-ubuntu=3.22.1
+ conflicts = gnome-settings-daemon
+ conflicts = gnome-settings-daemon-ubuntu
+ source = git://git.gnome.org/gnome-settings-daemon#commit=3ee42193f8772b5eb39b0b5a4d175b00abce033d
+ source = git://git.gnome.org/libgnome-volume-control
+ source = manage-dpms.patch
+ source = https://launchpad.net/ubuntu/+archive/primary/+files/gnome-settings-daemon_3.22.1-0ubuntu2.debian.tar.xz
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = 60e1442552907ba6b5bf561b349a651676ff98aa54d6a80556311311b4e33bb2ab11214b198ad021d6a6c05de8f52037a44fadd7e91870ba6cea556e65b40db2
+ sha512sums = c1e270e5a1eb89d929d7a5d6b5e538bee3798c64e66ad31b722dd857e80ea288095f6d74867c64708366e151a64ed1607c2584d75c578491cafcc1bf6c170e28
+
+pkgname = gnome-settings-daemon-elementary
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 00000000000..d53851deaba
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,94 @@
+# Maintainer: Que Quotion <quequotion@bugmenot.com>
+# Contributor: Michael Healy <horsemanoffaith@gmail.com>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: thn81 <root@scrat>
+
+# vercheck-pkgbuild: auto
+# vercheck-ubuntu: name=${pkgname%-*}, repo=yakkety
+# vercheck-archlinux: name=${pkgname%-*}, repo=extra, arch=x86_64
+# vercheck-gnome: name=${pkgname%-*}, majorver=3.22
+# vercheck-ppa: name=${pkgname%-*}, url=ppa:gnome3-team/gnome3-staging
+
+pkgname=gnome-settings-daemon-elementary
+_use_ppa=false
+#_ppa_rel=2ubuntu1~ubuntu16.04.1
+#_ppa_ver=3.20.1
+_ubuntu_rel=0ubuntu2
+#_ubuntu_ver=3.22.1
+pkgver=3.22.1
+pkgrel=1
+pkgdesc="GNOME Settings Daemon (with ElementaryOS patches)"
+url="https://git.gnome.org/browse/gnome-settings-daemon"
+arch=(i686 x86_64)
+groups=('pantheon-qq')
+license=(GPL)
+depends=(dconf geoclue2 geocode-glib gnome-desktop gsettings-desktop-schemas-ubuntu
+ gtk3-print-backends libcanberra-pulse libgudev libgweather libnotify librsvg
+ libsystemd libwacom nss pulseaudio pulseaudio-alsa upower)
+makedepends=(docbook-xsl git gnome-common intltool libxslt python xf86-input-wacom)
+groups=(gnome unity)
+provides=(gnome-settings-daemon{,-ubuntu}="${pkgver}")
+conflicts=(gnome-settings-daemon{,-ubuntu})
+_commit=3ee42193f8772b5eb39b0b5a4d175b00abce033d # tags/GNOME_SETTINGS_DAEMON_3_22_1^0
+source=("git://git.gnome.org/gnome-settings-daemon#commit=${_commit}"
+ "git://git.gnome.org/libgnome-volume-control"
+ '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
+
+sha512sums=('SKIP'
+ 'SKIP'
+ '60e1442552907ba6b5bf561b349a651676ff98aa54d6a80556311311b4e33bb2ab11214b198ad021d6a6c05de8f52037a44fadd7e91870ba6cea556e65b40db2'
+ 'c1e270e5a1eb89d929d7a5d6b5e538bee3798c64e66ad31b722dd857e80ea288095f6d74867c64708366e151a64ed1607c2584d75c578491cafcc1bf6c170e28')
+
+pkgver() {
+ cd "${pkgname%-*}"
+ git describe --tags | sed 's/^GNOME_SETTINGS_DAEMON_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+ cd "${pkgname%-*}"
+
+ git submodule init
+ git config --local submodule."panels/media-keys/gvc".url "${srcdir}/libgnome-volume-control"
+ git submodule update
+
+ # Apply Ubuntu's patches
+ for i in $(grep -v '#' "$srcdir/debian/patches/series" | sort); do
+ [[ "${i}" =~ ^# || -z "${i}" || "${i}" == *git* ]] && continue # Skip comments, newlines, and git patches
+ [[ "${i}" == 53_sync_input_sources_to_accountsservice.patch ]] && continue
+ msg2 "Applying $i ..."
+ patch -Np1 < "$srcdir/debian/patches/$i"
+ done
+
+ # Apply Elementary's patches
+ patch -Np0 < ../manage-dpms.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd "${pkgname%-*}"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/gnome-settings-daemon \
+ --disable-static
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd "${pkgname%-*}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/manage-dpms.patch b/manage-dpms.patch
new file mode 100644
index 00000000000..2a834e90df6
--- /dev/null
+++ b/manage-dpms.patch
@@ -0,0 +1,80 @@
+=== modified file 'data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in'
+--- data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in 2016-05-13 19:33:51 +0000
++++ data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.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 gnome-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="priority" type="i">
+ <default>0</default>
+ <_summary>Priority to use for this plugin</_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,
+