[arch-commits] Commit in cinnamon-settings-daemon/repos (10 files)
Balló György
bgyorgy at nymeria.archlinux.org
Sat Apr 19 02:39:22 UTC 2014
Date: Saturday, April 19, 2014 @ 04:39:22
Author: bgyorgy
Revision: 109807
archrelease: copy trunk to community-i686, community-x86_64
Added:
cinnamon-settings-daemon/repos/community-i686/PKGBUILD
(from rev 109806, cinnamon-settings-daemon/trunk/PKGBUILD)
cinnamon-settings-daemon/repos/community-i686/cinnamon-settings-daemon.install
(from rev 109806, cinnamon-settings-daemon/trunk/cinnamon-settings-daemon.install)
cinnamon-settings-daemon/repos/community-i686/upower_lid.patch
(from rev 109806, cinnamon-settings-daemon/trunk/upower_lid.patch)
cinnamon-settings-daemon/repos/community-x86_64/PKGBUILD
(from rev 109806, cinnamon-settings-daemon/trunk/PKGBUILD)
cinnamon-settings-daemon/repos/community-x86_64/cinnamon-settings-daemon.install
(from rev 109806, cinnamon-settings-daemon/trunk/cinnamon-settings-daemon.install)
cinnamon-settings-daemon/repos/community-x86_64/upower_lid.patch
(from rev 109806, cinnamon-settings-daemon/trunk/upower_lid.patch)
Deleted:
cinnamon-settings-daemon/repos/community-i686/PKGBUILD
cinnamon-settings-daemon/repos/community-i686/cinnamon-settings-daemon.install
cinnamon-settings-daemon/repos/community-x86_64/PKGBUILD
cinnamon-settings-daemon/repos/community-x86_64/cinnamon-settings-daemon.install
---------------------------------------------------+
/PKGBUILD | 88 ++++++++++++++++++++
/cinnamon-settings-daemon.install | 24 +++++
community-i686/PKGBUILD | 35 -------
community-i686/cinnamon-settings-daemon.install | 12 --
community-i686/upower_lid.patch | 28 ++++++
community-x86_64/PKGBUILD | 35 -------
community-x86_64/cinnamon-settings-daemon.install | 12 --
community-x86_64/upower_lid.patch | 28 ++++++
8 files changed, 168 insertions(+), 94 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-04-19 02:38:55 UTC (rev 109806)
+++ community-i686/PKGBUILD 2014-04-19 02:39:22 UTC (rev 109807)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira at antergos.com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=cinnamon-settings-daemon
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="The Cinnamon Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('cinnamon-desktop' 'libibus' 'libcanberra-pulse' 'librsvg' 'nss'
- 'pulseaudio-alsa' 'upower' 'libnotify' 'libgnomekbd')
-makedepends=('intltool' 'docbook-xsl' 'gnome-common')
-options=('!emptydirs')
-install=cinnamon-settings-daemon.install
-url="https://github.com/linuxmint/cinnamon-settings-daemon"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
-sha256sums=('89798977ad44fa4cfaff26d93e21b29f1a9a6a68a1c57c30e5414ad2159a849e')
-
-build() {
- cd $pkgname-$pkgver
-
- ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static --enable-systemd
-
- #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-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: cinnamon-settings-daemon/repos/community-i686/PKGBUILD (from rev 109806, cinnamon-settings-daemon/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-04-19 02:39:22 UTC (rev 109807)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira at antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=cinnamon-settings-daemon
+pkgver=2.2.1
+pkgrel=2
+pkgdesc="The Cinnamon Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('cinnamon-desktop' 'libibus' 'libcanberra-pulse' 'librsvg' 'nss'
+ 'pulseaudio-alsa' 'upower' 'libnotify' 'libgnomekbd' 'libwacom')
+makedepends=('intltool' 'docbook-xsl' 'gnome-common' 'xf86-input-wacom')
+options=('!emptydirs')
+install=cinnamon-settings-daemon.install
+url="https://github.com/linuxmint/cinnamon-settings-daemon"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
+ "upower_lid.patch")
+sha256sums=('89798977ad44fa4cfaff26d93e21b29f1a9a6a68a1c57c30e5414ad2159a849e'
+ '4a94ab880a903c88929ecbfc465cb46aadf30ee14930274fa0eefb7a12f4e3b8')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix close lid action with upower 0.99
+ patch -Np1 -i ../upower_lid.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname --disable-static --enable-systemd
+
+ #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-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-i686/cinnamon-settings-daemon.install
===================================================================
--- community-i686/cinnamon-settings-daemon.install 2014-04-19 02:38:55 UTC (rev 109806)
+++ community-i686/cinnamon-settings-daemon.install 2014-04-19 02:39:22 UTC (rev 109807)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cinnamon-settings-daemon/repos/community-i686/cinnamon-settings-daemon.install (from rev 109806, cinnamon-settings-daemon/trunk/cinnamon-settings-daemon.install)
===================================================================
--- community-i686/cinnamon-settings-daemon.install (rev 0)
+++ community-i686/cinnamon-settings-daemon.install 2014-04-19 02:39:22 UTC (rev 109807)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: cinnamon-settings-daemon/repos/community-i686/upower_lid.patch (from rev 109806, cinnamon-settings-daemon/trunk/upower_lid.patch)
===================================================================
--- community-i686/upower_lid.patch (rev 0)
+++ community-i686/upower_lid.patch 2014-04-19 02:39:22 UTC (rev 109807)
@@ -0,0 +1,28 @@
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -2215,7 +2215,11 @@ do_lid_closed_action (CsdPowerManager *m
+
+
+ static void
++#if UP_CHECK_VERSION(0,99,0)
++lid_state_changed_cb (UpClient *client, GParamSpec *pspec, CsdPowerManager *manager)
++#else
+ up_client_changed_cb (UpClient *client, CsdPowerManager *manager)
++#endif
+ {
+ gboolean tmp;
+
+@@ -3967,8 +3971,13 @@ csd_power_manager_start (CsdPowerManager
+ G_CALLBACK (engine_device_removed_cb), manager);
+ g_signal_connect (manager->priv->up_client, "device-changed",
+ G_CALLBACK (engine_device_changed_cb), manager);
++#if UP_CHECK_VERSION(0,99,0)
++ g_signal_connect_after (manager->priv->up_client, "notify::lid-is-closed",
++ G_CALLBACK (lid_state_changed_cb), manager);
++#else
+ g_signal_connect_after (manager->priv->up_client, "changed",
+ G_CALLBACK (up_client_changed_cb), manager);
++#endif
+
+ /* use the fallback name from gnome-power-manager so the shell
+ * blocks this, and uses the power extension instead */
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-04-19 02:38:55 UTC (rev 109806)
+++ community-x86_64/PKGBUILD 2014-04-19 02:39:22 UTC (rev 109807)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira at antergos.com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=cinnamon-settings-daemon
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="The Cinnamon Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('cinnamon-desktop' 'libibus' 'libcanberra-pulse' 'librsvg' 'nss'
- 'pulseaudio-alsa' 'upower' 'libnotify' 'libgnomekbd')
-makedepends=('intltool' 'docbook-xsl' 'gnome-common')
-options=('!emptydirs')
-install=cinnamon-settings-daemon.install
-url="https://github.com/linuxmint/cinnamon-settings-daemon"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
-sha256sums=('89798977ad44fa4cfaff26d93e21b29f1a9a6a68a1c57c30e5414ad2159a849e')
-
-build() {
- cd $pkgname-$pkgver
-
- ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static --enable-systemd
-
- #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-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: cinnamon-settings-daemon/repos/community-x86_64/PKGBUILD (from rev 109806, cinnamon-settings-daemon/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-04-19 02:39:22 UTC (rev 109807)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira at antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=cinnamon-settings-daemon
+pkgver=2.2.1
+pkgrel=2
+pkgdesc="The Cinnamon Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('cinnamon-desktop' 'libibus' 'libcanberra-pulse' 'librsvg' 'nss'
+ 'pulseaudio-alsa' 'upower' 'libnotify' 'libgnomekbd' 'libwacom')
+makedepends=('intltool' 'docbook-xsl' 'gnome-common' 'xf86-input-wacom')
+options=('!emptydirs')
+install=cinnamon-settings-daemon.install
+url="https://github.com/linuxmint/cinnamon-settings-daemon"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
+ "upower_lid.patch")
+sha256sums=('89798977ad44fa4cfaff26d93e21b29f1a9a6a68a1c57c30e5414ad2159a849e'
+ '4a94ab880a903c88929ecbfc465cb46aadf30ee14930274fa0eefb7a12f4e3b8')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix close lid action with upower 0.99
+ patch -Np1 -i ../upower_lid.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname --disable-static --enable-systemd
+
+ #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-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-x86_64/cinnamon-settings-daemon.install
===================================================================
--- community-x86_64/cinnamon-settings-daemon.install 2014-04-19 02:38:55 UTC (rev 109806)
+++ community-x86_64/cinnamon-settings-daemon.install 2014-04-19 02:39:22 UTC (rev 109807)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cinnamon-settings-daemon/repos/community-x86_64/cinnamon-settings-daemon.install (from rev 109806, cinnamon-settings-daemon/trunk/cinnamon-settings-daemon.install)
===================================================================
--- community-x86_64/cinnamon-settings-daemon.install (rev 0)
+++ community-x86_64/cinnamon-settings-daemon.install 2014-04-19 02:39:22 UTC (rev 109807)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: cinnamon-settings-daemon/repos/community-x86_64/upower_lid.patch (from rev 109806, cinnamon-settings-daemon/trunk/upower_lid.patch)
===================================================================
--- community-x86_64/upower_lid.patch (rev 0)
+++ community-x86_64/upower_lid.patch 2014-04-19 02:39:22 UTC (rev 109807)
@@ -0,0 +1,28 @@
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -2215,7 +2215,11 @@ do_lid_closed_action (CsdPowerManager *m
+
+
+ static void
++#if UP_CHECK_VERSION(0,99,0)
++lid_state_changed_cb (UpClient *client, GParamSpec *pspec, CsdPowerManager *manager)
++#else
+ up_client_changed_cb (UpClient *client, CsdPowerManager *manager)
++#endif
+ {
+ gboolean tmp;
+
+@@ -3967,8 +3971,13 @@ csd_power_manager_start (CsdPowerManager
+ G_CALLBACK (engine_device_removed_cb), manager);
+ g_signal_connect (manager->priv->up_client, "device-changed",
+ G_CALLBACK (engine_device_changed_cb), manager);
++#if UP_CHECK_VERSION(0,99,0)
++ g_signal_connect_after (manager->priv->up_client, "notify::lid-is-closed",
++ G_CALLBACK (lid_state_changed_cb), manager);
++#else
+ g_signal_connect_after (manager->priv->up_client, "changed",
+ G_CALLBACK (up_client_changed_cb), manager);
++#endif
+
+ /* use the fallback name from gnome-power-manager so the shell
+ * blocks this, and uses the power extension instead */
More information about the arch-commits
mailing list