[arch-commits] Commit in cinnamon-settings-daemon/repos/community-x86_64 (3 files)

[Christian Hesse]

    Date: Friday, December 13, 2019 @ 12:24:30
  Author: eworm
Revision: 537515

archrelease: copy trunk to community-x86_64

Added:
  cinnamon-settings-daemon/repos/community-x86_64/0001-dbus-sys-dir.patch
    (from rev 537514, cinnamon-settings-daemon/trunk/0001-dbus-sys-dir.patch)
  cinnamon-settings-daemon/repos/community-x86_64/PKGBUILD
    (from rev 537514, cinnamon-settings-daemon/trunk/PKGBUILD)
Deleted:
  cinnamon-settings-daemon/repos/community-x86_64/PKGBUILD

-------------------------+
 0001-dbus-sys-dir.patch |   13 +++++
 PKGBUILD                |  102 ++++++++++++++++++++++++----------------------
 2 files changed, 67 insertions(+), 48 deletions(-)

Copied: cinnamon-settings-daemon/repos/community-x86_64/0001-dbus-sys-dir.patch (from rev 537514, cinnamon-settings-daemon/trunk/0001-dbus-sys-dir.patch)
===================================================================
--- 0001-dbus-sys-dir.patch	                        (rev 0)
+++ 0001-dbus-sys-dir.patch	2019-12-13 12:24:30 UTC (rev 537515)
@@ -0,0 +1,13 @@
+diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
+index f3f49f6..f59d2b8 100644
+--- a/plugins/datetime/Makefile.am
++++ b/plugins/datetime/Makefile.am
+@@ -1,7 +1,7 @@
+ plugin_name = datetime
+ 
+ dbus_servicesdir = $(datadir)/dbus-1/system-services
+-dbus_confdir = $(sysconfdir)/dbus-1/system.d
++dbus_confdir = $(DBUS_SYS_DIR)
+ polkitdir = $(datadir)/polkit-1/actions
+ 
+ dbus_services_in_files = org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-13 12:24:22 UTC (rev 537514)
+++ PKGBUILD	2019-12-13 12:24:30 UTC (rev 537515)
@@ -1,48 +0,0 @@
-# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: Alexandre Filgueira (faidoc) <alexfilgueira at antergos.com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=cinnamon-settings-daemon
-pkgver=4.4.0
-pkgrel=1
-pkgdesc="The Cinnamon Settings daemon"
-arch=('x86_64')
-url="https://github.com/linuxmint/${pkgname}"
-license=('GPL')
-depends=('cinnamon-desktop' 'colord' 'dbus-glib' 'libcanberra-pulse' 'libcups'
-         'libgnomekbd' 'libgudev' 'libnotify' 'librsvg' 'libwacom' 'nss' 'polkit'
-         'pulseaudio-alsa' 'upower')
-optdepends=('cinnamon-translations: i18n')
-makedepends=('autoconf-archive' 'intltool' 'python' 'xf86-input-wacom')
-options=('!emptydirs')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
-sha256sums=('6797a0bb73ea2345580a43fe8c75c70f48634b82b0a3518f48cc603f084bf012')
-b2sums=('ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224')
-
-prepare() {
-    cd "${srcdir}"/${pkgname}-${pkgver}
-
-    autoreconf -fi
-}
-
-build() {
-    cd "${srcdir}"/${pkgname}-${pkgver}
-
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --localstatedir=/var \
-                --libexecdir="/usr/lib/${pkgname}" \
-                --enable-systemd \
-                --enable-polkit
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
-}
-
-package() {
-    cd "${srcdir}"/${pkgname}-${pkgver}
-
-    make DESTDIR="$pkgdir" install
-}

Copied: cinnamon-settings-daemon/repos/community-x86_64/PKGBUILD (from rev 537514, cinnamon-settings-daemon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-13 12:24:30 UTC (rev 537515)
@@ -0,0 +1,54 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira (faidoc) <alexfilgueira at antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=cinnamon-settings-daemon
+pkgver=4.4.0
+pkgrel=2
+pkgdesc="The Cinnamon Settings daemon"
+arch=('x86_64')
+url="https://github.com/linuxmint/${pkgname}"
+license=('GPL')
+depends=('cinnamon-desktop' 'colord' 'dbus-glib' 'libcanberra-pulse' 'libcups'
+         'libgnomekbd' 'libgudev' 'libnotify' 'librsvg' 'libwacom' 'nss' 'polkit'
+         'pulseaudio-alsa' 'upower')
+optdepends=('cinnamon-translations: i18n')
+makedepends=('autoconf-archive' 'intltool' 'python' 'xf86-input-wacom')
+options=('!emptydirs')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
+        '0001-dbus-sys-dir.patch')
+sha256sums=('6797a0bb73ea2345580a43fe8c75c70f48634b82b0a3518f48cc603f084bf012'
+            'a075aa599f1b0a4718723fcd5ee550da9e7a8d980efc31a8261240956fc8cdd5')
+b2sums=('ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224'
+        'ce13cf885dda6ed3839c4e33770144abb482b49dc991a71276a097695ed3184e1a1a4559d73e9f2ba464f9ccfe1bfbcf33e64fa3b128dfa0a4c5a69b93a604d1')
+
+prepare() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+
+    patch -Np1 < ../0001-dbus-sys-dir.patch
+
+    autoreconf -fi
+}
+
+build() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+
+    ./configure --prefix=/usr \
+                --sysconfdir=/etc \
+                --localstatedir=/var \
+                --libexecdir="/usr/lib/${pkgname}" \
+                --with-dbus-sys="/usr/share/dbus-1/system.d" \
+                --enable-systemd \
+                --enable-polkit
+
+    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+    make
+}
+
+package() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+
+    make DESTDIR="$pkgdir" install
+}