[arch-commits] Commit in cinnamon-control-center/repos (18 files)
Balló György
bgyorgy at nymeria.archlinux.org
Wed Feb 27 18:49:21 UTC 2013
Date: Wednesday, February 27, 2013 @ 19:49:20
Author: bgyorgy
Revision: 85223
archrelease: copy trunk to community-i686, community-x86_64
Added:
cinnamon-control-center/repos/community-i686/PKGBUILD
(from rev 85222, cinnamon-control-center/trunk/PKGBUILD)
cinnamon-control-center/repos/community-i686/cinnamon-control-center.install
(from rev 85222, cinnamon-control-center/trunk/cinnamon-control-center.install)
cinnamon-control-center/repos/community-i686/fix-audio-input-icons.patch
(from rev 85222, cinnamon-control-center/trunk/fix-audio-input-icons.patch)
cinnamon-control-center/repos/community-i686/fix-faces-location.patch
(from rev 85222, cinnamon-control-center/trunk/fix-faces-location.patch)
cinnamon-control-center/repos/community-i686/pulse3.0.patch
(from rev 85222, cinnamon-control-center/trunk/pulse3.0.patch)
cinnamon-control-center/repos/community-i686/sound-nua-rename.patch
(from rev 85222, cinnamon-control-center/trunk/sound-nua-rename.patch)
cinnamon-control-center/repos/community-x86_64/PKGBUILD
(from rev 85222, cinnamon-control-center/trunk/PKGBUILD)
cinnamon-control-center/repos/community-x86_64/cinnamon-control-center.install
(from rev 85222, cinnamon-control-center/trunk/cinnamon-control-center.install)
cinnamon-control-center/repos/community-x86_64/fix-audio-input-icons.patch
(from rev 85222, cinnamon-control-center/trunk/fix-audio-input-icons.patch)
cinnamon-control-center/repos/community-x86_64/fix-faces-location.patch
(from rev 85222, cinnamon-control-center/trunk/fix-faces-location.patch)
cinnamon-control-center/repos/community-x86_64/pulse3.0.patch
(from rev 85222, cinnamon-control-center/trunk/pulse3.0.patch)
cinnamon-control-center/repos/community-x86_64/sound-nua-rename.patch
(from rev 85222, cinnamon-control-center/trunk/sound-nua-rename.patch)
Deleted:
cinnamon-control-center/repos/community-i686/PKGBUILD
cinnamon-control-center/repos/community-i686/cinnamon-control-center.install
cinnamon-control-center/repos/community-i686/pulse3.0.patch
cinnamon-control-center/repos/community-x86_64/PKGBUILD
cinnamon-control-center/repos/community-x86_64/cinnamon-control-center.install
cinnamon-control-center/repos/community-x86_64/pulse3.0.patch
--------------------------------------------------+
community-i686/PKGBUILD | 130 ++++++++++++---------
community-i686/cinnamon-control-center.install | 22 +--
community-i686/fix-audio-input-icons.patch | 15 ++
community-i686/fix-faces-location.patch | 12 +
community-i686/pulse3.0.patch | 50 ++++----
community-i686/sound-nua-rename.patch | 26 ++++
community-x86_64/PKGBUILD | 130 ++++++++++++---------
community-x86_64/cinnamon-control-center.install | 22 +--
community-x86_64/fix-audio-input-icons.patch | 15 ++
community-x86_64/fix-faces-location.patch | 12 +
community-x86_64/pulse3.0.patch | 50 ++++----
community-x86_64/sound-nua-rename.patch | 26 ++++
12 files changed, 332 insertions(+), 178 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-02-27 18:49:06 UTC (rev 85222)
+++ community-i686/PKGBUILD 2013-02-27 18:49:20 UTC (rev 85223)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com
-# Based on gnome-control-center:
-# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Jan de Groot <jgc at archlinux.org>
-
-pkgname=cinnamon-control-center
-pkgver=1.7.1
-pkgrel=1
-pkgdesc="The Control Center for Cinnamon"
-arch=('i686' 'x86_64')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
- 'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
- 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower'
- 'libpwquality' 'libsystemd' 'libgnomekbd' 'cheese' 'cinnamon')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
- 'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-common' 'docbook-xsl')
-url="https://github.com/linuxmint/cinnamon-control-center"
-install=cinnamon-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
- "pulse3.0.patch")
-sha256sums=('eab36af1accfce7b4d5eaf07a865d7290add07b875ed5e52072c1ad2e8570c1e'
- 'ddf7c99a1d45a7be54e69e90f194e33f3e56a7f294aa369bfb2e541d8241156e')
-
-build() {
- cd $pkgname-$pkgver
-
- patch -Np1 -i ../pulse3.0.patch
-
- autoreconf -fi
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-systemd --with-libsocialweb \
- --disable-update-mimedb
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- # Fix a warning
- chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
- chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-i686/PKGBUILD (from rev 85222, cinnamon-control-center/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com
+# Based on gnome-control-center:
+# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Jan de Groot <jgc at archlinux.org>
+
+pkgname=cinnamon-control-center
+pkgver=1.7.1
+pkgrel=2
+pkgdesc="The Control Center for Cinnamon"
+arch=('i686' 'x86_64')
+depends=('cinnamon' 'cheese' 'libgnomekbd' 'libgtop' 'network-manager-applet')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+ 'gnome-color-manager: for color management tasks')
+makedepends=('intltool' 'gnome-common')
+url="https://github.com/linuxmint/cinnamon-control-center"
+install=cinnamon-control-center.install
+license=('GPL')
+options=('!libtool' '!emptydirs')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
+ "pulse3.0.patch"
+ "sound-nua-rename.patch"
+ "fix-audio-input-icons.patch"
+ "fix-faces-location.patch")
+sha256sums=('eab36af1accfce7b4d5eaf07a865d7290add07b875ed5e52072c1ad2e8570c1e'
+ 'ddf7c99a1d45a7be54e69e90f194e33f3e56a7f294aa369bfb2e541d8241156e'
+ '2f49543e4ccabf5c8ce1cd9e4c37e5b291c23cff494eaa671857b2dcf7af4c5b'
+ '2cefa2764db206c9c6258e3f374988056907dda0c5bbeedbc249fc7c058a0d6b'
+ '7360f3e018765e80a7afc5a469c1d54ec3fdeb7e58c867596ef26773fb8e7a8a')
+
+build() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../pulse3.0.patch
+
+ # Upstream patch: Change sound module registered name from sound-nua to 'sound'
+ patch -Np1 -i ../sound-nua-rename.patch
+
+ # Fix icons on Sound preferences dialog
+ patch -Np1 -i ../fix-audio-input-icons.patch
+
+ # Fix faces location on User accounts dialog
+ patch -Np1 -i ../fix-faces-location.patch
+
+ autoreconf -fi
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-systemd \
+ --disable-update-mimedb
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # Remove unused stuff
+ make -C panels/datetime DESTDIR="$pkgdir" uninstall
+ make -C panels/printers DESTDIR="$pkgdir" uninstall
+ make -C panels/sound DESTDIR="$pkgdir" uninstall
+ make -C panels/sound/data DESTDIR="$pkgdir" install
+ make -C shell DESTDIR="$pkgdir" uninstall
+ make -C shell DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+ # Remove broken desktop files
+ rm -R "$pkgdir/usr/share/applications"
+ rm -R "$pkgdir/etc"
+
+ # Fix a warning
+ chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+ chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+}
Deleted: community-i686/cinnamon-control-center.install
===================================================================
--- community-i686/cinnamon-control-center.install 2013-02-27 18:49:06 UTC (rev 85222)
+++ community-i686/cinnamon-control-center.install 2013-02-27 18:49:20 UTC (rev 85223)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-i686/cinnamon-control-center.install (from rev 85222, cinnamon-control-center/trunk/cinnamon-control-center.install)
===================================================================
--- community-i686/cinnamon-control-center.install (rev 0)
+++ community-i686/cinnamon-control-center.install 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-i686/fix-audio-input-icons.patch (from rev 85222, cinnamon-control-center/trunk/fix-audio-input-icons.patch)
===================================================================
--- community-i686/fix-audio-input-icons.patch (rev 0)
+++ community-i686/fix-audio-input-icons.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,15 @@
+diff -Naur cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c
+--- cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c 2013-02-19 17:37:17.000000000 +0100
++++ cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c 2013-02-26 23:12:37.192399508 +0100
+@@ -1929,9 +1929,9 @@
+ gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->input_bar),
+ _("_Input volume:"));
+ gvc_channel_bar_set_low_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar),
+- "audio-input-microphone-low-symbolic");
++ "cin-audio-input-microphone-low-symbolic");
+ gvc_channel_bar_set_high_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar),
+- "audio-input-microphone-high-symbolic");
++ "cin-audio-input-microphone-high-symbolic");
+ gtk_widget_set_sensitive (self->priv->input_bar, FALSE);
+
+ if (self->priv->size_group != NULL) {
Copied: cinnamon-control-center/repos/community-i686/fix-faces-location.patch (from rev 85222, cinnamon-control-center/trunk/fix-faces-location.patch)
===================================================================
--- community-i686/fix-faces-location.patch (rev 0)
+++ community-i686/fix-faces-location.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,12 @@
+diff -Naur cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c
+--- cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c 2013-02-19 17:37:17.000000000 +0100
++++ cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c 2013-02-27 19:17:18.249329833 +0100
+@@ -406,7 +406,7 @@
+ for (i = 0; dirs[i] != NULL; i++) {
+ char *path;
+
+- path = g_build_filename (dirs[i], "pixmaps", "faces", NULL);
++ path = g_build_filename (dirs[i], "pixmaps", "cinnamon", "faces", NULL);
+ dir = g_dir_open (path, 0, NULL);
+ if (dir == NULL) {
+ g_free (path);
Deleted: community-i686/pulse3.0.patch
===================================================================
--- community-i686/pulse3.0.patch 2013-02-27 18:49:06 UTC (rev 85222)
+++ community-i686/pulse3.0.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -1,25 +0,0 @@
-From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson at canonical.com>
-Date: Fri, 07 Dec 2012 10:52:09 +0000
-Subject: sound: Fix port handling for the unknown availability case
-
-The current code assumes that port availability transitions will be
-between YES and NO, and doesn't account for the fact that it may also be
-UNKNOWN. This causes spurious entries if the port availability
-transitions between YES and UNKNOWN.
----
-diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
-index 34ddc0c..2f6cf34 100644
---- a/panels/sound/gvc-mixer-control.c
-+++ b/panels/sound/gvc-mixer-control.c
-@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control,
- else {
- for (i = 0; i < info->n_ports; i++) {
- if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
-- if (card_port->available != info->ports[i]->available) {
-+ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
- card_port->available = info->ports[i]->available;
- g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
- gvc_mixer_card_get_index (card),
---
-cgit v0.9.0.2
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-i686/pulse3.0.patch (from rev 85222, cinnamon-control-center/trunk/pulse3.0.patch)
===================================================================
--- community-i686/pulse3.0.patch (rev 0)
+++ community-i686/pulse3.0.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,25 @@
+From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Fri, 07 Dec 2012 10:52:09 +0000
+Subject: sound: Fix port handling for the unknown availability case
+
+The current code assumes that port availability transitions will be
+between YES and NO, and doesn't account for the fact that it may also be
+UNKNOWN. This causes spurious entries if the port availability
+transitions between YES and UNKNOWN.
+---
+diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
+index 34ddc0c..2f6cf34 100644
+--- a/panels/sound/gvc-mixer-control.c
++++ b/panels/sound/gvc-mixer-control.c
+@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control,
+ else {
+ for (i = 0; i < info->n_ports; i++) {
+ if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
+- if (card_port->available != info->ports[i]->available) {
++ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
+ card_port->available = info->ports[i]->available;
+ g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
+ gvc_mixer_card_get_index (card),
+--
+cgit v0.9.0.2
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-i686/sound-nua-rename.patch (from rev 85222, cinnamon-control-center/trunk/sound-nua-rename.patch)
===================================================================
--- community-i686/sound-nua-rename.patch (rev 0)
+++ community-i686/sound-nua-rename.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,26 @@
+diff --git a/panels/sound-nua/cc-sound-panel.c b/panels/sound-nua/cc-sound-panel.c
+index 1c115f0..092f319 100644
+--- a/panels/sound-nua/cc-sound-panel.c
++++ b/panels/sound-nua/cc-sound-panel.c
+@@ -120,7 +120,7 @@ enum {
+ cc_sound_panel_register_type (G_TYPE_MODULE (module));
+ g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
+ CC_TYPE_SOUND_PANEL,
+- "sound-nua", 0);
++ "sound", 0);
+ }
+
+ /* GIO extension stuff */
+diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c
+index 2f69c0f..3b78ce2 100644
+--- a/panels/sound/cc-sound-panel.c
++++ b/panels/sound/cc-sound-panel.c
+@@ -127,7 +127,7 @@ enum {
+ cc_sound_panel_register_type (G_TYPE_MODULE (module));
+ g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
+ CC_TYPE_SOUND_PANEL,
+- "sound", 0);
++ "gnome-sound", 0);
+ }
+
+ /* GIO extension stuff */
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-02-27 18:49:06 UTC (rev 85222)
+++ community-x86_64/PKGBUILD 2013-02-27 18:49:20 UTC (rev 85223)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com
-# Based on gnome-control-center:
-# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Jan de Groot <jgc at archlinux.org>
-
-pkgname=cinnamon-control-center
-pkgver=1.7.1
-pkgrel=1
-pkgdesc="The Control Center for Cinnamon"
-arch=('i686' 'x86_64')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
- 'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
- 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower'
- 'libpwquality' 'libsystemd' 'libgnomekbd' 'cheese' 'cinnamon')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
- 'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-common' 'docbook-xsl')
-url="https://github.com/linuxmint/cinnamon-control-center"
-install=cinnamon-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
- "pulse3.0.patch")
-sha256sums=('eab36af1accfce7b4d5eaf07a865d7290add07b875ed5e52072c1ad2e8570c1e'
- 'ddf7c99a1d45a7be54e69e90f194e33f3e56a7f294aa369bfb2e541d8241156e')
-
-build() {
- cd $pkgname-$pkgver
-
- patch -Np1 -i ../pulse3.0.patch
-
- autoreconf -fi
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-systemd --with-libsocialweb \
- --disable-update-mimedb
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- # Fix a warning
- chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
- chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-x86_64/PKGBUILD (from rev 85222, cinnamon-control-center/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com
+# Based on gnome-control-center:
+# Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Jan de Groot <jgc at archlinux.org>
+
+pkgname=cinnamon-control-center
+pkgver=1.7.1
+pkgrel=2
+pkgdesc="The Control Center for Cinnamon"
+arch=('i686' 'x86_64')
+depends=('cinnamon' 'cheese' 'libgnomekbd' 'libgtop' 'network-manager-applet')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+ 'gnome-color-manager: for color management tasks')
+makedepends=('intltool' 'gnome-common')
+url="https://github.com/linuxmint/cinnamon-control-center"
+install=cinnamon-control-center.install
+license=('GPL')
+options=('!libtool' '!emptydirs')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
+ "pulse3.0.patch"
+ "sound-nua-rename.patch"
+ "fix-audio-input-icons.patch"
+ "fix-faces-location.patch")
+sha256sums=('eab36af1accfce7b4d5eaf07a865d7290add07b875ed5e52072c1ad2e8570c1e'
+ 'ddf7c99a1d45a7be54e69e90f194e33f3e56a7f294aa369bfb2e541d8241156e'
+ '2f49543e4ccabf5c8ce1cd9e4c37e5b291c23cff494eaa671857b2dcf7af4c5b'
+ '2cefa2764db206c9c6258e3f374988056907dda0c5bbeedbc249fc7c058a0d6b'
+ '7360f3e018765e80a7afc5a469c1d54ec3fdeb7e58c867596ef26773fb8e7a8a')
+
+build() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../pulse3.0.patch
+
+ # Upstream patch: Change sound module registered name from sound-nua to 'sound'
+ patch -Np1 -i ../sound-nua-rename.patch
+
+ # Fix icons on Sound preferences dialog
+ patch -Np1 -i ../fix-audio-input-icons.patch
+
+ # Fix faces location on User accounts dialog
+ patch -Np1 -i ../fix-faces-location.patch
+
+ autoreconf -fi
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-systemd \
+ --disable-update-mimedb
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # Remove unused stuff
+ make -C panels/datetime DESTDIR="$pkgdir" uninstall
+ make -C panels/printers DESTDIR="$pkgdir" uninstall
+ make -C panels/sound DESTDIR="$pkgdir" uninstall
+ make -C panels/sound/data DESTDIR="$pkgdir" install
+ make -C shell DESTDIR="$pkgdir" uninstall
+ make -C shell DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+ # Remove broken desktop files
+ rm -R "$pkgdir/usr/share/applications"
+ rm -R "$pkgdir/etc"
+
+ # Fix a warning
+ chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+ chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+}
Deleted: community-x86_64/cinnamon-control-center.install
===================================================================
--- community-x86_64/cinnamon-control-center.install 2013-02-27 18:49:06 UTC (rev 85222)
+++ community-x86_64/cinnamon-control-center.install 2013-02-27 18:49:20 UTC (rev 85223)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-x86_64/cinnamon-control-center.install (from rev 85222, cinnamon-control-center/trunk/cinnamon-control-center.install)
===================================================================
--- community-x86_64/cinnamon-control-center.install (rev 0)
+++ community-x86_64/cinnamon-control-center.install 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-x86_64/fix-audio-input-icons.patch (from rev 85222, cinnamon-control-center/trunk/fix-audio-input-icons.patch)
===================================================================
--- community-x86_64/fix-audio-input-icons.patch (rev 0)
+++ community-x86_64/fix-audio-input-icons.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,15 @@
+diff -Naur cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c
+--- cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c 2013-02-19 17:37:17.000000000 +0100
++++ cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c 2013-02-26 23:12:37.192399508 +0100
+@@ -1929,9 +1929,9 @@
+ gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->input_bar),
+ _("_Input volume:"));
+ gvc_channel_bar_set_low_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar),
+- "audio-input-microphone-low-symbolic");
++ "cin-audio-input-microphone-low-symbolic");
+ gvc_channel_bar_set_high_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar),
+- "audio-input-microphone-high-symbolic");
++ "cin-audio-input-microphone-high-symbolic");
+ gtk_widget_set_sensitive (self->priv->input_bar, FALSE);
+
+ if (self->priv->size_group != NULL) {
Copied: cinnamon-control-center/repos/community-x86_64/fix-faces-location.patch (from rev 85222, cinnamon-control-center/trunk/fix-faces-location.patch)
===================================================================
--- community-x86_64/fix-faces-location.patch (rev 0)
+++ community-x86_64/fix-faces-location.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,12 @@
+diff -Naur cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c
+--- cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c 2013-02-19 17:37:17.000000000 +0100
++++ cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c 2013-02-27 19:17:18.249329833 +0100
+@@ -406,7 +406,7 @@
+ for (i = 0; dirs[i] != NULL; i++) {
+ char *path;
+
+- path = g_build_filename (dirs[i], "pixmaps", "faces", NULL);
++ path = g_build_filename (dirs[i], "pixmaps", "cinnamon", "faces", NULL);
+ dir = g_dir_open (path, 0, NULL);
+ if (dir == NULL) {
+ g_free (path);
Deleted: community-x86_64/pulse3.0.patch
===================================================================
--- community-x86_64/pulse3.0.patch 2013-02-27 18:49:06 UTC (rev 85222)
+++ community-x86_64/pulse3.0.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -1,25 +0,0 @@
-From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson at canonical.com>
-Date: Fri, 07 Dec 2012 10:52:09 +0000
-Subject: sound: Fix port handling for the unknown availability case
-
-The current code assumes that port availability transitions will be
-between YES and NO, and doesn't account for the fact that it may also be
-UNKNOWN. This causes spurious entries if the port availability
-transitions between YES and UNKNOWN.
----
-diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
-index 34ddc0c..2f6cf34 100644
---- a/panels/sound/gvc-mixer-control.c
-+++ b/panels/sound/gvc-mixer-control.c
-@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control,
- else {
- for (i = 0; i < info->n_ports; i++) {
- if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
-- if (card_port->available != info->ports[i]->available) {
-+ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
- card_port->available = info->ports[i]->available;
- g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
- gvc_mixer_card_get_index (card),
---
-cgit v0.9.0.2
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-x86_64/pulse3.0.patch (from rev 85222, cinnamon-control-center/trunk/pulse3.0.patch)
===================================================================
--- community-x86_64/pulse3.0.patch (rev 0)
+++ community-x86_64/pulse3.0.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,25 @@
+From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Fri, 07 Dec 2012 10:52:09 +0000
+Subject: sound: Fix port handling for the unknown availability case
+
+The current code assumes that port availability transitions will be
+between YES and NO, and doesn't account for the fact that it may also be
+UNKNOWN. This causes spurious entries if the port availability
+transitions between YES and UNKNOWN.
+---
+diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
+index 34ddc0c..2f6cf34 100644
+--- a/panels/sound/gvc-mixer-control.c
++++ b/panels/sound/gvc-mixer-control.c
+@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control,
+ else {
+ for (i = 0; i < info->n_ports; i++) {
+ if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
+- if (card_port->available != info->ports[i]->available) {
++ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
+ card_port->available = info->ports[i]->available;
+ g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
+ gvc_mixer_card_get_index (card),
+--
+cgit v0.9.0.2
\ No newline at end of file
Copied: cinnamon-control-center/repos/community-x86_64/sound-nua-rename.patch (from rev 85222, cinnamon-control-center/trunk/sound-nua-rename.patch)
===================================================================
--- community-x86_64/sound-nua-rename.patch (rev 0)
+++ community-x86_64/sound-nua-rename.patch 2013-02-27 18:49:20 UTC (rev 85223)
@@ -0,0 +1,26 @@
+diff --git a/panels/sound-nua/cc-sound-panel.c b/panels/sound-nua/cc-sound-panel.c
+index 1c115f0..092f319 100644
+--- a/panels/sound-nua/cc-sound-panel.c
++++ b/panels/sound-nua/cc-sound-panel.c
+@@ -120,7 +120,7 @@ enum {
+ cc_sound_panel_register_type (G_TYPE_MODULE (module));
+ g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
+ CC_TYPE_SOUND_PANEL,
+- "sound-nua", 0);
++ "sound", 0);
+ }
+
+ /* GIO extension stuff */
+diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c
+index 2f69c0f..3b78ce2 100644
+--- a/panels/sound/cc-sound-panel.c
++++ b/panels/sound/cc-sound-panel.c
+@@ -127,7 +127,7 @@ enum {
+ cc_sound_panel_register_type (G_TYPE_MODULE (module));
+ g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
+ CC_TYPE_SOUND_PANEL,
+- "sound", 0);
++ "gnome-sound", 0);
+ }
+
+ /* GIO extension stuff */
More information about the arch-commits
mailing list