Date: Wednesday, October 9, 2013 @ 18:42:39 Author: faidoc Revision: 98402
upgpkg: cinnamon-control-center 2.0.2-1 Modified: cinnamon-control-center/trunk/PKGBUILD Deleted: cinnamon-control-center/trunk/fix_nm_undefined.patch ------------------------+ PKGBUILD | 15 ++----- fix_nm_undefined.patch | 98 ----------------------------------------------- 2 files changed, 5 insertions(+), 108 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-09 16:41:57 UTC (rev 98401) +++ PKGBUILD 2013-10-09 16:42:39 UTC (rev 98402) @@ -5,8 +5,8 @@ # Jan de Groot <[email protected]> pkgname=cinnamon-control-center -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') depends=('cinnamon' 'network-manager-applet') @@ -17,11 +17,9 @@ license=('GPL') options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"; - region.patch - fix_nm_undefined.patch) -sha256sums=('2a8ea5c17e515afd47d0f76127dbc5172281ef2b6aaf8a5c800ff7079d6d80f2' - '077cb8d6814c32a4df85f71c2b8fa84da25e5260263a6e0536c6e1626051f022' - '3f6cfb2d520e5270174406a633c2bd320bd012edc163b994be3094dd4bd2d105') + region.patch) +sha256sums=('28318423297dd27a51a0a84d0f4b28453aca5c16ca362f7f4b56bd8e1b67b594' + '077cb8d6814c32a4df85f71c2b8fa84da25e5260263a6e0536c6e1626051f022') prepare() { cd $pkgname-$pkgver @@ -29,9 +27,6 @@ # Fix region panel patch -Np1 -i ../region.patch - # Fix compatibility with newer networkmanager - patch -Np1 -i ../fix_nm_undefined.patch - chmod +x autogen.sh } Deleted: fix_nm_undefined.patch =================================================================== --- fix_nm_undefined.patch 2013-10-09 16:41:57 UTC (rev 98401) +++ fix_nm_undefined.patch 2013-10-09 16:42:39 UTC (rev 98402) @@ -1,98 +0,0 @@ ---- a/panels/network/network-dialogs.c -+++ b/panels/network/network-dialogs.c -@@ -30,7 +30,7 @@ - #include <nm-device-wifi.h> - - #include "network-dialogs.h" --#include "nm-wireless-dialog.h" -+#include "nm-wifi-dialog.h" - #include "nm-mobile-wizard.h" - - typedef struct { -@@ -108,10 +108,10 @@ nag_dialog_response_cb (GtkDialog *nag_d - gint response, - gpointer user_data) - { -- NMAWirelessDialog *wireless_dialog = NMA_WIRELESS_DIALOG (user_data); -+ NMAWifiDialog *wireless_dialog = NMA_WIFI_DIALOG (user_data); - - if (response == GTK_RESPONSE_NO) { /* user opted not to correct the warning */ -- nma_wireless_dialog_set_nag_ignored (wireless_dialog, TRUE); -+ nma_wifi_dialog_set_nag_ignored (wireless_dialog, TRUE); - gtk_dialog_response (GTK_DIALOG (wireless_dialog), GTK_RESPONSE_OK); - } - } -@@ -121,7 +121,7 @@ wireless_dialog_response_cb (GtkDialog * - gint response, - gpointer user_data) - { -- NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo); -+ NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo); - WirelessDialogClosure *closure = user_data; - NMConnection *connection, *fuzzy_match = NULL; - NMDevice *device; -@@ -131,13 +131,13 @@ wireless_dialog_response_cb (GtkDialog * - if (response != GTK_RESPONSE_OK) - goto done; - -- if (!nma_wireless_dialog_get_nag_ignored (dialog)) { -+ if (!nma_wifi_dialog_get_nag_ignored (dialog)) { - GtkWidget *nag_dialog; - - /* Nag the user about certificates or whatever. Only destroy the dialog - * if no nagging was done. - */ -- nag_dialog = nma_wireless_dialog_nag_user (dialog); -+ nag_dialog = nma_wifi_dialog_nag_user (dialog); - if (nag_dialog) { - gtk_window_set_transient_for (GTK_WINDOW (nag_dialog), GTK_WINDOW (dialog)); - g_signal_connect (nag_dialog, "response", -@@ -147,10 +147,10 @@ wireless_dialog_response_cb (GtkDialog * - } - } - -- /* nma_wireless_dialog_get_connection() returns a connection with the -+ /* nma_wifi_dialog_get_connection() returns a connection with the - * refcount incremented, so the caller must remember to unref it. - */ -- connection = nma_wireless_dialog_get_connection (dialog, &device, &ap); -+ connection = nma_wifi_dialog_get_connection (dialog, &device, &ap); - g_assert (connection); - g_assert (device); - -@@ -201,7 +201,7 @@ wireless_dialog_response_cb (GtkDialog * - NULL); - } - -- /* Balance nma_wireless_dialog_get_connection() */ -+ /* Balance nma_wifi_dialog_get_connection() */ - g_object_unref (connection); - - done: -@@ -237,7 +237,7 @@ cc_network_panel_create_wifi_network (Cc - { - if (wifi_can_create_wifi_network (client)) { - show_wireless_dialog (panel, client, settings, -- nma_wireless_dialog_new_for_create (client, settings)); -+ nma_wifi_dialog_new_for_create (client, settings)); - } - } - -@@ -248,7 +248,7 @@ cc_network_panel_connect_to_hidden_netwo - { - g_debug ("connect to hidden wifi"); - show_wireless_dialog (panel, client, settings, -- nma_wireless_dialog_new_for_other (client, settings)); -+ nma_wifi_dialog_new_for_other (client, settings)); - } - - void -@@ -312,7 +312,7 @@ cc_network_panel_connect_to_8021x_networ - g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, "mschapv2", NULL); - nm_connection_add_setting (connection, NM_SETTING (s_8021x)); - -- dialog = nma_wireless_dialog_new (client, settings, connection, device, ap, FALSE); -+ dialog = nma_wifi_dialog_new (client, settings, connection, device, ap, FALSE); - show_wireless_dialog (panel, client, settings, dialog); - } -
