[arch-commits] Commit in mate-settings-daemon/repos (10 files)
Martin Wimpress
flexiondotorg at archlinux.org
Thu Oct 23 11:30:47 UTC 2014
Date: Thursday, October 23, 2014 @ 13:30:47
Author: flexiondotorg
Revision: 121286
archrelease: copy trunk to community-i686, community-x86_64
Added:
mate-settings-daemon/repos/community-i686/PKGBUILD
(from rev 121285, mate-settings-daemon/trunk/PKGBUILD)
mate-settings-daemon/repos/community-i686/mate-settings-daemon.install
(from rev 121285, mate-settings-daemon/trunk/mate-settings-daemon.install)
mate-settings-daemon/repos/community-i686/use_galculator_first.diff
(from rev 121285, mate-settings-daemon/trunk/use_galculator_first.diff)
mate-settings-daemon/repos/community-x86_64/PKGBUILD
(from rev 121285, mate-settings-daemon/trunk/PKGBUILD)
mate-settings-daemon/repos/community-x86_64/mate-settings-daemon.install
(from rev 121285, mate-settings-daemon/trunk/mate-settings-daemon.install)
mate-settings-daemon/repos/community-x86_64/use_galculator_first.diff
(from rev 121285, mate-settings-daemon/trunk/use_galculator_first.diff)
Deleted:
mate-settings-daemon/repos/community-i686/PKGBUILD
mate-settings-daemon/repos/community-i686/mate-settings-daemon.install
mate-settings-daemon/repos/community-x86_64/PKGBUILD
mate-settings-daemon/repos/community-x86_64/mate-settings-daemon.install
-----------------------------------------------+
/PKGBUILD | 156 ++++++++++++++++++++++++
/mate-settings-daemon.install | 24 +++
community-i686/PKGBUILD | 70 ----------
community-i686/mate-settings-daemon.install | 12 -
community-i686/use_galculator_first.diff | 15 ++
community-x86_64/PKGBUILD | 70 ----------
community-x86_64/mate-settings-daemon.install | 12 -
community-x86_64/use_galculator_first.diff | 15 ++
8 files changed, 210 insertions(+), 164 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-10-23 11:30:27 UTC (rev 121285)
+++ community-i686/PKGBUILD 2014-10-23 11:30:47 UTC (rev 121286)
@@ -1,70 +0,0 @@
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-pkgbase=mate-settings-daemon
-pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer")
-pkgver=1.8.2
-pkgrel=1
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
- 'libcanberra-pulse' 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop'
- 'nss' 'polkit' 'pulseaudio-alsa')
-makedepends=('mate-common')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('e465eb33b79394150514ad0af201bf32f07fd520')
-install=${pkgbase}.install
-
-build() {
- cd "${srcdir}"
- cp -a ${pkgbase}-${pkgver}{,-gstreamer}
-
- # build for pulseaudio
- cd "${srcdir}/${pkgbase}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/${pkgbase} \
- --sysconfdir=/etc \
- --with-gtk=2.0 \
- --enable-polkit \
- --enable-pulse \
- --disable-gstreamer \
- --disable-static
- make
-
- # build for gstreamer
- cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/${pkgbase} \
- --sysconfdir=/etc \
- --with-gtk=2.0 \
- --enable-polkit \
- --enable-gstreamer \
- --disable-pulse \
- --disable-static
- make
-}
-
-package_mate-settings-daemon-pulseaudio() {
- groups=('mate')
- pkgdesc="The MATE Settings daemon (pulseaudio)"
- depends=('dbus-glib' 'dconf' 'fontconfig' 'gtk2' 'libcanberra-pulse'
- 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit'
- 'pulseaudio-alsa')
- conflicts=("${pkgbase}-gstreamer" 'mate-media-gstreamer')
- provides=("${pkgbase}")
- replaces=("${pkgbase}")
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
-
-package_mate-settings-daemon-gstreamer() {
- pkgdesc="The MATE Settings daemon (GStreamer)"
- depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
- 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit')
- conflicts=("${pkgbase}-pulseaudio" 'mate-media-pulseaudio')
- provides=("${pkgbase}")
- cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
- make DESTDIR="${pkgdir}" install
-}
Copied: mate-settings-daemon/repos/community-i686/PKGBUILD (from rev 121285, mate-settings-daemon/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-10-23 11:30:47 UTC (rev 121286)
@@ -0,0 +1,78 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgbase=mate-settings-daemon
+pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer")
+pkgver=1.8.2
+pkgrel=2
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
+ 'libcanberra-pulse' 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop'
+ 'nss' 'polkit' 'pulseaudio-alsa')
+makedepends=('mate-common')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgbase}-${pkgver}.tar.xz"
+ 'use_galculator_first.diff')
+sha1sums=('e465eb33b79394150514ad0af201bf32f07fd520'
+ '916dc6519a7778e97cd8dd18c46363e6c36d389a')
+install=${pkgbase}.install
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ # https://github.com/mate-desktop/mate-settings-daemon/commit/163f01a8b527c1ed801f68681fc7d82a54d42b1c
+ patch -Np1 -i "${srcdir}/use_galculator_first.diff"
+}
+
+build() {
+ cd "${srcdir}"
+ cp -a ${pkgbase}-${pkgver}{,-gstreamer}
+
+ # build for pulseaudio
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgbase} \
+ --sysconfdir=/etc \
+ --with-gtk=2.0 \
+ --enable-polkit \
+ --enable-pulse \
+ --disable-gstreamer \
+ --disable-static
+ make
+
+ # build for gstreamer
+ cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgbase} \
+ --sysconfdir=/etc \
+ --with-gtk=2.0 \
+ --enable-polkit \
+ --enable-gstreamer \
+ --disable-pulse \
+ --disable-static
+ make
+}
+
+package_mate-settings-daemon-pulseaudio() {
+ groups=('mate')
+ pkgdesc="The MATE Settings daemon (pulseaudio)"
+ depends=('dbus-glib' 'dconf' 'fontconfig' 'gtk2' 'libcanberra-pulse'
+ 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit'
+ 'pulseaudio-alsa')
+ conflicts=("${pkgbase}-gstreamer" 'mate-media-gstreamer')
+ provides=("${pkgbase}")
+ replaces=("${pkgbase}")
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
+
+package_mate-settings-daemon-gstreamer() {
+ pkgdesc="The MATE Settings daemon (GStreamer)"
+ depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
+ 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit')
+ conflicts=("${pkgbase}-pulseaudio" 'mate-media-pulseaudio')
+ provides=("${pkgbase}")
+ cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/mate-settings-daemon.install
===================================================================
--- community-i686/mate-settings-daemon.install 2014-10-23 11:30:27 UTC (rev 121285)
+++ community-i686/mate-settings-daemon.install 2014-10-23 11:30:47 UTC (rev 121286)
@@ -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/mate
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mate-settings-daemon/repos/community-i686/mate-settings-daemon.install (from rev 121285, mate-settings-daemon/trunk/mate-settings-daemon.install)
===================================================================
--- community-i686/mate-settings-daemon.install (rev 0)
+++ community-i686/mate-settings-daemon.install 2014-10-23 11:30:47 UTC (rev 121286)
@@ -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/mate
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: mate-settings-daemon/repos/community-i686/use_galculator_first.diff (from rev 121285, mate-settings-daemon/trunk/use_galculator_first.diff)
===================================================================
--- community-i686/use_galculator_first.diff (rev 0)
+++ community-i686/use_galculator_first.diff 2014-10-23 11:30:47 UTC (rev 121286)
@@ -0,0 +1,15 @@
+diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c
+index ad7665d..cc819c5 100644
+--- a/plugins/media-keys/msd-media-keys-manager.c
++++ b/plugins/media-keys/msd-media-keys-manager.c
+@@ -999,7 +999,9 @@ do_action (MsdMediaKeysManager *manager,
+ do_media_action (manager);
+ break;
+ case CALCULATOR_KEY:
+- if ((cmd = g_find_program_in_path ("mate-calc"))) {
++ if ((cmd = g_find_program_in_path ("galculator"))) {
++ execute (manager, "galculator", FALSE, FALSE);
++ } else if ((cmd = g_find_program_in_path ("mate-calc"))) {
+ execute (manager, "mate-calc", FALSE, FALSE);
+ } else {
+ execute (manager, "gcalctool", FALSE, FALSE);
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-10-23 11:30:27 UTC (rev 121285)
+++ community-x86_64/PKGBUILD 2014-10-23 11:30:47 UTC (rev 121286)
@@ -1,70 +0,0 @@
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-pkgbase=mate-settings-daemon
-pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer")
-pkgver=1.8.2
-pkgrel=1
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
- 'libcanberra-pulse' 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop'
- 'nss' 'polkit' 'pulseaudio-alsa')
-makedepends=('mate-common')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('e465eb33b79394150514ad0af201bf32f07fd520')
-install=${pkgbase}.install
-
-build() {
- cd "${srcdir}"
- cp -a ${pkgbase}-${pkgver}{,-gstreamer}
-
- # build for pulseaudio
- cd "${srcdir}/${pkgbase}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/${pkgbase} \
- --sysconfdir=/etc \
- --with-gtk=2.0 \
- --enable-polkit \
- --enable-pulse \
- --disable-gstreamer \
- --disable-static
- make
-
- # build for gstreamer
- cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/${pkgbase} \
- --sysconfdir=/etc \
- --with-gtk=2.0 \
- --enable-polkit \
- --enable-gstreamer \
- --disable-pulse \
- --disable-static
- make
-}
-
-package_mate-settings-daemon-pulseaudio() {
- groups=('mate')
- pkgdesc="The MATE Settings daemon (pulseaudio)"
- depends=('dbus-glib' 'dconf' 'fontconfig' 'gtk2' 'libcanberra-pulse'
- 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit'
- 'pulseaudio-alsa')
- conflicts=("${pkgbase}-gstreamer" 'mate-media-gstreamer')
- provides=("${pkgbase}")
- replaces=("${pkgbase}")
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
-
-package_mate-settings-daemon-gstreamer() {
- pkgdesc="The MATE Settings daemon (GStreamer)"
- depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
- 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit')
- conflicts=("${pkgbase}-pulseaudio" 'mate-media-pulseaudio')
- provides=("${pkgbase}")
- cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
- make DESTDIR="${pkgdir}" install
-}
Copied: mate-settings-daemon/repos/community-x86_64/PKGBUILD (from rev 121285, mate-settings-daemon/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-10-23 11:30:47 UTC (rev 121286)
@@ -0,0 +1,78 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgbase=mate-settings-daemon
+pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer")
+pkgver=1.8.2
+pkgrel=2
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
+ 'libcanberra-pulse' 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop'
+ 'nss' 'polkit' 'pulseaudio-alsa')
+makedepends=('mate-common')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgbase}-${pkgver}.tar.xz"
+ 'use_galculator_first.diff')
+sha1sums=('e465eb33b79394150514ad0af201bf32f07fd520'
+ '916dc6519a7778e97cd8dd18c46363e6c36d389a')
+install=${pkgbase}.install
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ # https://github.com/mate-desktop/mate-settings-daemon/commit/163f01a8b527c1ed801f68681fc7d82a54d42b1c
+ patch -Np1 -i "${srcdir}/use_galculator_first.diff"
+}
+
+build() {
+ cd "${srcdir}"
+ cp -a ${pkgbase}-${pkgver}{,-gstreamer}
+
+ # build for pulseaudio
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgbase} \
+ --sysconfdir=/etc \
+ --with-gtk=2.0 \
+ --enable-polkit \
+ --enable-pulse \
+ --disable-gstreamer \
+ --disable-static
+ make
+
+ # build for gstreamer
+ cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgbase} \
+ --sysconfdir=/etc \
+ --with-gtk=2.0 \
+ --enable-polkit \
+ --enable-gstreamer \
+ --disable-pulse \
+ --disable-static
+ make
+}
+
+package_mate-settings-daemon-pulseaudio() {
+ groups=('mate')
+ pkgdesc="The MATE Settings daemon (pulseaudio)"
+ depends=('dbus-glib' 'dconf' 'fontconfig' 'gtk2' 'libcanberra-pulse'
+ 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit'
+ 'pulseaudio-alsa')
+ conflicts=("${pkgbase}-gstreamer" 'mate-media-gstreamer')
+ provides=("${pkgbase}")
+ replaces=("${pkgbase}")
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
+
+package_mate-settings-daemon-gstreamer() {
+ pkgdesc="The MATE Settings daemon (GStreamer)"
+ depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
+ 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit')
+ conflicts=("${pkgbase}-pulseaudio" 'mate-media-pulseaudio')
+ provides=("${pkgbase}")
+ cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/mate-settings-daemon.install
===================================================================
--- community-x86_64/mate-settings-daemon.install 2014-10-23 11:30:27 UTC (rev 121285)
+++ community-x86_64/mate-settings-daemon.install 2014-10-23 11:30:47 UTC (rev 121286)
@@ -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/mate
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mate-settings-daemon/repos/community-x86_64/mate-settings-daemon.install (from rev 121285, mate-settings-daemon/trunk/mate-settings-daemon.install)
===================================================================
--- community-x86_64/mate-settings-daemon.install (rev 0)
+++ community-x86_64/mate-settings-daemon.install 2014-10-23 11:30:47 UTC (rev 121286)
@@ -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/mate
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: mate-settings-daemon/repos/community-x86_64/use_galculator_first.diff (from rev 121285, mate-settings-daemon/trunk/use_galculator_first.diff)
===================================================================
--- community-x86_64/use_galculator_first.diff (rev 0)
+++ community-x86_64/use_galculator_first.diff 2014-10-23 11:30:47 UTC (rev 121286)
@@ -0,0 +1,15 @@
+diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c
+index ad7665d..cc819c5 100644
+--- a/plugins/media-keys/msd-media-keys-manager.c
++++ b/plugins/media-keys/msd-media-keys-manager.c
+@@ -999,7 +999,9 @@ do_action (MsdMediaKeysManager *manager,
+ do_media_action (manager);
+ break;
+ case CALCULATOR_KEY:
+- if ((cmd = g_find_program_in_path ("mate-calc"))) {
++ if ((cmd = g_find_program_in_path ("galculator"))) {
++ execute (manager, "galculator", FALSE, FALSE);
++ } else if ((cmd = g_find_program_in_path ("mate-calc"))) {
+ execute (manager, "mate-calc", FALSE, FALSE);
+ } else {
+ execute (manager, "gcalctool", FALSE, FALSE);
More information about the arch-commits
mailing list