diff options
Diffstat (limited to 'community/cinnamon-control-center')
5 files changed, 5 insertions, 105 deletions
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index c066ea4b3..74b724004 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 85563 2013-03-03 05:46:41Z bgyorgy $ +# $Id: PKGBUILD 86850 2013-03-22 21:27:24Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Jan de Groot <jgc@archlinux.org> pkgname=cinnamon-control-center -pkgver=1.7.1 -pkgrel=3 +pkgver=1.7.2 +pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') depends=('cinnamon' 'cheese' 'libgtop' 'network-manager-applet') @@ -17,34 +17,12 @@ 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') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") +sha256sums=('09af52ae7417b611b91ca9fdafbde08c68356f2b66241780b513ad2249a831c1') 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 - - # Use freedesktop as default sound theme instead of ubuntu (otherwise the Sound panel craches) - patch -RNp1 -i debian/patches/98_default_sound_theme.patch - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/community/cinnamon-control-center/fix-audio-input-icons.patch b/community/cinnamon-control-center/fix-audio-input-icons.patch deleted file mode 100644 index 77c9b3c5b..000000000 --- a/community/cinnamon-control-center/fix-audio-input-icons.patch +++ /dev/null @@ -1,15 +0,0 @@ -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) { diff --git a/community/cinnamon-control-center/fix-faces-location.patch b/community/cinnamon-control-center/fix-faces-location.patch deleted file mode 100644 index 1af65fa99..000000000 --- a/community/cinnamon-control-center/fix-faces-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -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); diff --git a/community/cinnamon-control-center/pulse3.0.patch b/community/cinnamon-control-center/pulse3.0.patch deleted file mode 100644 index 9341b788e..000000000 --- a/community/cinnamon-control-center/pulse3.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001 -From: David Henningsson <david.henningsson@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 diff --git a/community/cinnamon-control-center/sound-nua-rename.patch b/community/cinnamon-control-center/sound-nua-rename.patch deleted file mode 100644 index fb25b9f42..000000000 --- a/community/cinnamon-control-center/sound-nua-rename.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 */ |