diff options
Diffstat (limited to 'community/cinnamon-control-center')
4 files changed, 88 insertions, 11 deletions
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index f5b764b2e..1aba7553d 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84767 2013-02-24 13:00:25Z faidoc $ +# $Id: PKGBUILD 85223 2013-02-27 18:49:20Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> @@ -6,35 +6,47 @@ pkgname=cinnamon-control-center pkgver=1.7.1 -pkgrel=1 +pkgrel=2 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') +depends=('cinnamon' 'cheese' 'libgnomekbd' 'libgtop' 'network-manager-applet') optdepends=('mesa-demos: provides glxinfo for graphics information' 'gnome-color-manager: for color management tasks') -makedepends=('gnome-doc-utils' 'intltool' 'gnome-common' 'docbook-xsl') +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") + "pulse3.0.patch" + "sound-nua-rename.patch" + "fix-audio-input-icons.patch" + "fix-faces-location.patch") sha256sums=('eab36af1accfce7b4d5eaf07a865d7290add07b875ed5e52072c1ad2e8570c1e' - 'ddf7c99a1d45a7be54e69e90f194e33f3e56a7f294aa369bfb2e541d8241156e') + '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 --with-libsocialweb \ + --enable-systemd \ --disable-update-mimedb #https://bugzilla.gnome.org/show_bug.cgi?id=656229 @@ -47,7 +59,19 @@ package() { 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" -}
\ No newline at end of file +} diff --git a/community/cinnamon-control-center/fix-audio-input-icons.patch b/community/cinnamon-control-center/fix-audio-input-icons.patch new file mode 100644 index 000000000..77c9b3c5b --- /dev/null +++ b/community/cinnamon-control-center/fix-audio-input-icons.patch @@ -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) { diff --git a/community/cinnamon-control-center/fix-faces-location.patch b/community/cinnamon-control-center/fix-faces-location.patch new file mode 100644 index 000000000..1af65fa99 --- /dev/null +++ b/community/cinnamon-control-center/fix-faces-location.patch @@ -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); diff --git a/community/cinnamon-control-center/sound-nua-rename.patch b/community/cinnamon-control-center/sound-nua-rename.patch new file mode 100644 index 000000000..fb25b9f42 --- /dev/null +++ b/community/cinnamon-control-center/sound-nua-rename.patch @@ -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 */ |