[arch-commits] Commit in cinnamon-control-center/trunk (3 files)
Date: Wednesday, October 9, 2013 @ 04:39:10 Author: bgyorgy Revision: 98357 upgpkg: cinnamon-control-center 2.0.1-2 Remove unused deps, apply patches from Fedora Added: cinnamon-control-center/trunk/fix_nm_undefined.patch cinnamon-control-center/trunk/region.patch Modified: cinnamon-control-center/trunk/PKGBUILD + PKGBUILD | 27 fix_nm_undefined.patch | 98 region.patch | 5313 +++ 3 files changed, 5432 insertions(+), 6 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 98356:98357 to see the changes.
[arch-commits] Commit in cinnamon-control-center/trunk (3 files)
Date: Sunday, October 6, 2013 @ 02:34:56 Author: faidoc Revision: 98103 upgpkg: cinnamon-control-center 2.0.1-1 Deleted: cinnamon-control-center/trunk/gnomerrlabeler.patch cinnamon-control-center/trunk/idle-delay.patch cinnamon-control-center/trunk/remove_obex.patch --+ gnomerrlabeler.patch | 766 - idle-delay.patch | 150 - remove_obex.patch| 106 -- 3 files changed, 1022 deletions(-) Deleted: gnomerrlabeler.patch === --- gnomerrlabeler.patch2013-10-06 00:33:43 UTC (rev 98102) +++ gnomerrlabeler.patch2013-10-06 00:34:56 UTC (rev 98103) @@ -1,766 +0,0 @@ -diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c 2013-04-15 16:04:38.0 +0200 -+++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c 2013-04-22 03:46:53.499944701 +0200 -@@ -31,12 +31,13 @@ - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include libgnome-desktop/gnome-rr.h - #include libgnome-desktop/gnome-rr-config.h --#include libgnome-desktop/gnome-rr-labeler.h - #include gdk/gdkx.h - #include X11/Xlib.h - #include glib/gi18n-lib.h - #include gdesktop-enums.h - -+#include cc-rr-labeler.h -+ - CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel) - - #define DISPLAY_PANEL_PRIVATE(o) \ -@@ -75,7 +76,7 @@ - { - GnomeRRScreen *screen; - GnomeRRConfig *current_configuration; -- GnomeRRLabeler *labeler; -+ CcRRLabeler *labeler; - GnomeRROutputInfo *current_output; - - GSettings *clock_settings; -@@ -200,7 +201,7 @@ - g_signal_handler_disconnect (GTK_WIDGET (self), self-priv-focus_id_hide); - } - -- gnome_rr_labeler_hide (self-priv-labeler); -+ cc_rr_labeler_hide (self-priv-labeler); - g_object_unref (self-priv-labeler); - - G_OBJECT_CLASS (cc_display_panel_parent_class)-finalize (object); -@@ -293,16 +294,16 @@ - self-priv-current_output = NULL; - - if (self-priv-labeler) { --gnome_rr_labeler_hide (self-priv-labeler); -+cc_rr_labeler_hide (self-priv-labeler); - g_object_unref (self-priv-labeler); - } - -- self-priv-labeler = gnome_rr_labeler_new (self-priv-current_configuration); -+ self-priv-labeler = cc_rr_labeler_new (self-priv-current_configuration); - - if (cc_panel_get_shell (CC_PANEL (self)) == NULL) --gnome_rr_labeler_hide (self-priv-labeler); -+cc_rr_labeler_hide (self-priv-labeler); - else --gnome_rr_labeler_show (self-priv-labeler); -+cc_rr_labeler_show (self-priv-labeler); - - select_current_output_from_dialog_position (self); - -@@ -2594,9 +2595,9 @@ - if (self-priv-labeler == NULL) - return; - if (gtk_window_has_toplevel_focus (window)) --gnome_rr_labeler_show (self-priv-labeler); -+cc_rr_labeler_show (self-priv-labeler); - else --gnome_rr_labeler_hide (self-priv-labeler); -+cc_rr_labeler_hide (self-priv-labeler); - } - - static void -@@ -2606,9 +2607,9 @@ - if (CC_DISPLAY_PANEL(widget)-priv-labeler == NULL) - return; - if (gtk_widget_get_visible (widget)) { --gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)-priv-labeler); -+cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)-priv-labeler); - } else { --gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)-priv-labeler); -+cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)-priv-labeler); - } - } - -diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c 1970-01-01 01:00:00.0 +0100 -+++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c 2013-04-22 03:42:12.379900127 +0200 -@@ -0,0 +1,601 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- -+ * -+ * cc-rr-labeler.c - Utility to label monitors to identify them -+ * while they are being configured. -+ * -+ * Copyright 2008, Novell, Inc. -+ * -+ * This file is part of the Gnome Library. -+ * -+ * The Gnome Library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * The Gnome Library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with the Gnome Library; see the file COPYING.LIB. If not, -+ * write to the Free
[arch-commits] Commit in cinnamon-control-center/trunk (3 files)
Date: Wednesday, August 14, 2013 @ 23:07:16 Author: bgyorgy Revision: 95588 upgpkg: cinnamon-control-center 1.8.2-2 * Remove Browse Files... option as it's gone from gnome-bluetooth 3.8 * Improve idle-delay.patch Added: cinnamon-control-center/trunk/remove_obex.patch Modified: cinnamon-control-center/trunk/PKGBUILD cinnamon-control-center/trunk/idle-delay.patch ---+ PKGBUILD | 11 +++-- idle-delay.patch | 107 +--- remove_obex.patch | 106 +++ 3 files changed, 207 insertions(+), 17 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-08-14 20:19:05 UTC (rev 95587) +++ PKGBUILD2013-08-14 21:07:16 UTC (rev 95588) @@ -6,7 +6,7 @@ pkgname=cinnamon-control-center pkgver=1.8.2 -pkgrel=1 +pkgrel=2 pkgdesc=The Control Center for Cinnamon arch=('i686' 'x86_64') depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet') @@ -18,10 +18,12 @@ options=('!libtool' '!emptydirs') source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz; gnomerrlabeler.patch -idle-delay.patch) +idle-delay.patch +remove_obex.patch) sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f' 'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db' -'42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') +'98227484162071744b5a336a5b3915c211f5eb1559034b3d40e4a9d790fe0e31' +'3df65b1f5e691d4a4634c05698da6df79cb23a0ebf71b201f23c48742b75b6e4') build() { cd $pkgname-$pkgver @@ -32,6 +34,9 @@ # Runtime fix for GNOME 3.8 patch -Np1 -i $srcdir/idle-delay.patch + # Remove Browse Files... option as it's gone from gnome-bluetooth 3.8 + patch -Np1 -i $srcdir/remove_obex.patch + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ Modified: idle-delay.patch === --- idle-delay.patch2013-08-14 20:19:05 UTC (rev 95587) +++ idle-delay.patch2013-08-14 21:07:16 UTC (rev 95588) @@ -1,10 +1,21 @@ -diff -Naur cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c 2013-04-15 16:04:38.0 +0200 -+++ cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c 2013-04-22 05:04:26.466092668 +0200 -@@ -1068,26 +1068,6 @@ +diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c +--- cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c 2013-08-14 22:10:57.491152667 +0200 cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c 2013-08-14 21:58:36.533247961 +0200 +@@ -978,9 +978,6 @@ + has_lid = up_client_get_lid_is_present (self-priv-up_client); + + out: +- gtk_widget_set_visible (WID (priv-builder, combobox_lid_ac), has_lid); +- gtk_widget_set_visible (WID (priv-builder, label_lid_action), has_lid); +- gtk_widget_set_visible (WID (priv-builder, combobox_lid_battery), has_batteries has_lid); + gtk_widget_set_visible (WID (priv-builder, label_header_battery), has_batteries); + gtk_widget_set_visible (WID (priv-builder, label_header_ac), has_batteries); + gtk_widget_set_visible (WID (priv-builder, combobox_sleep_battery), has_batteries); +@@ -1067,26 +1064,6 @@ + g_signal_connect (widget, changed, G_CALLBACK (combo_enum_changed_cb), self); - +- - value = g_settings_get_enum (self-priv-gsd_settings, lid-close-ac-action); - widget = GTK_WIDGET (gtk_builder_get_object (self-priv-builder, - combobox_lid_ac)); @@ -24,14 +35,82 @@ - g_signal_connect (widget, changed, -G_CALLBACK (combo_enum_changed_cb), -self); -- + widget = WID (self-priv-builder, vbox_power); gtk_widget_reparent (widget, (GtkWidget *) self); - -diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c 2013-04-15 16:04:38.0 +0200 -+++ cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c 2013-04-22 14:15:28.440488342 +0200 -@@ -351,10 +351,6 @@ +diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/power.ui cinnamon-control-center-1.8.2/panels/power/power.ui +--- cinnamon-control-center-1.8.2.orig/panels/power/power.ui 2013-05-22 18:25:19.0 +0200 cinnamon-control-center-1.8.2/panels/power/power.ui2013-08-14 21:57:54.872240364 +0200 +@@ -222,50 +222,6 @@ +
[arch-commits] Commit in cinnamon-control-center/trunk (3 files)
Date: Monday, April 22, 2013 @ 05:37:28 Author: bgyorgy Revision: 88723 upgpkg: cinnamon-control-center 1.7.3-2 Rebuild for GNOME 3.8, add some compatibility fixes Added: cinnamon-control-center/trunk/gnomerrlabeler.patch cinnamon-control-center/trunk/idle-delay.patch Modified: cinnamon-control-center/trunk/PKGBUILD --+ PKGBUILD | 23 - gnomerrlabeler.patch | 766 + idle-delay.patch | 63 3 files changed, 844 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-04-22 01:27:44 UTC (rev 88722) +++ PKGBUILD2013-04-22 03:37:28 UTC (rev 88723) @@ -6,23 +6,33 @@ pkgname=cinnamon-control-center pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc=The Control Center for Cinnamon arch=('i686' 'x86_64') -depends=('cinnamon' 'cheese' 'libgtop' 'network-manager-applet') +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' 'libgnomekbd') +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;) -sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be') +source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz; +gnomerrlabeler.patch +idle-delay.patch) +sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be' +'826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6' +'9ca1a56b19413cc86dfce10558e1f696d63b93134afc76c0cb467944a9ea10f5') build() { cd $pkgname-$pkgver + # Build fix for GNOME 3.8 + patch -Np1 -i $srcdir/gnomerrlabeler.patch + + # Runtime fix for GNOME 3.8 + patch -Np1 -i $srcdir/idle-delay.patch + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ @@ -48,9 +58,6 @@ make -C shell DESTDIR=$pkgdir uninstall make -C shell DESTDIR=$pkgdir install-libLTLIBRARIES - # Remove Region panel, because it's not compatible with gnome-settings-daemon 3.6 - make -C panels/region DESTDIR=$pkgdir uninstall - # Remove broken desktop files rm -R $pkgdir/usr/share/applications rm -R $pkgdir/etc Added: gnomerrlabeler.patch === --- gnomerrlabeler.patch(rev 0) +++ gnomerrlabeler.patch2013-04-22 03:37:28 UTC (rev 88723) @@ -0,0 +1,766 @@ +diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c +--- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c 2013-04-15 16:04:38.0 +0200 cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c 2013-04-22 03:46:53.499944701 +0200 +@@ -31,12 +31,13 @@ + #define GNOME_DESKTOP_USE_UNSTABLE_API + #include libgnome-desktop/gnome-rr.h + #include libgnome-desktop/gnome-rr-config.h +-#include libgnome-desktop/gnome-rr-labeler.h + #include gdk/gdkx.h + #include X11/Xlib.h + #include glib/gi18n.h + #include gdesktop-enums.h + ++#include cc-rr-labeler.h ++ + CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel) + + #define DISPLAY_PANEL_PRIVATE(o) \ +@@ -75,7 +76,7 @@ + { + GnomeRRScreen *screen; + GnomeRRConfig *current_configuration; +- GnomeRRLabeler *labeler; ++ CcRRLabeler *labeler; + GnomeRROutputInfo *current_output; + + GSettings *clock_settings; +@@ -200,7 +201,7 @@ + g_signal_handler_disconnect (GTK_WIDGET (self), self-priv-focus_id_hide); + } + +- gnome_rr_labeler_hide (self-priv-labeler); ++ cc_rr_labeler_hide (self-priv-labeler); + g_object_unref (self-priv-labeler); + + G_OBJECT_CLASS (cc_display_panel_parent_class)-finalize (object); +@@ -293,16 +294,16 @@ + self-priv-current_output = NULL; + + if (self-priv-labeler) { +-gnome_rr_labeler_hide (self-priv-labeler); ++cc_rr_labeler_hide (self-priv-labeler); + g_object_unref (self-priv-labeler); + } + +- self-priv-labeler = gnome_rr_labeler_new (self-priv-current_configuration); ++ self-priv-labeler = cc_rr_labeler_new (self-priv-current_configuration); + + if (cc_panel_get_shell (CC_PANEL (self)) == NULL) +-gnome_rr_labeler_hide (self-priv-labeler); ++cc_rr_labeler_hide (self-priv-labeler); + else +-gnome_rr_labeler_show (self-priv-labeler); ++cc_rr_labeler_show (self-priv-labeler); + + select_current_output_from_dialog_position (self); + +@@ -2594,9 +2595,9 @@ + if (self-priv-labeler