cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnome-control-center-3.2.1.

Browse Source
This commit is contained in:
ajacoutot 2011-10-17 15:33:28 +00:00
parent 33cb9fa5a3
commit 25c58b2b06
6 changed files with 29 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/gnome/controlcenter/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2011/10/11 09:35:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.44 2011/10/17 15:33:28 ajacoutot Exp $
# XXX Binary files patch-panels_info_hostnames-test_txt and
# patch-panels_info_hostnames-test_txt.new differ
@ -9,8 +9,7 @@ SHARED_ONLY= Yes
COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 3.2.0
REVISION= 3
GNOME_VERSION= 3.2.1
SHARED_LIBS += gnome-control-center 0.0 # 1.0
@ -22,9 +21,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL ICE ORBit-2 SM X11 X11-xcb Xau Xcomposite Xcursor
WANTLIB += GL ICE ORBit-2 SM X11 Xau Xcomposite Xcursor
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += Xt Xtst Xxf86vm asn1 atk-1.0 c cairo cairo-gobject
WANTLIB += Xt Xxf86vm asn1 atk-1.0 c cairo cairo-gobject
WANTLIB += canberra canberra-gtk3 crypto cups dbus-1 dbus-glib-1
WANTLIB += drm enchant execinfo expat ffi fontconfig freetype
WANTLIB += gailutil-3 gconf-2 gcrypt gdbm gdk-3 gdk_pixbuf-2.0
@ -38,7 +37,7 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png polkit-gobject-1
WANTLIB += pthread pthread-stubs pulse pulse-mainloop-glib rest-0.7
WANTLIB += sndfile soup-2.4 soup-gnome-2.4 sqlite3 ssl stdc++
WANTLIB += vorbis vorbisfile webkitgtk-3.0 xcb xcb-render xcb-shm
WANTLIB += xkbfile xklavier xml2 xslt z
WANTLIB += xkbfile xklavier xml2 xslt z javascriptcoregtk-3.0 json
MODULES= devel/gettext \
x11/gnome

10
x11/gnome/controlcenter/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gnome-control-center-3.2.0.tar.xz) = oXpSqPjo5S0NyG55GrapBw==
RMD160 (gnome/gnome-control-center-3.2.0.tar.xz) = /eF4riMLSfGSI8NCgFN1cttGg6I=
SHA1 (gnome/gnome-control-center-3.2.0.tar.xz) = LHBGrVthefyHxbwsYkD2vyoQ2TY=
SHA256 (gnome/gnome-control-center-3.2.0.tar.xz) = Bskn3L7iv2PklgRBzLm+pV0SqoMHjl1x6YMtUv0ZZqo=
SIZE (gnome/gnome-control-center-3.2.0.tar.xz) = 4233912
MD5 (gnome/gnome-control-center-3.2.1.tar.xz) = uAyEhcIQwbCoi6PAA1Tn9g==
RMD160 (gnome/gnome-control-center-3.2.1.tar.xz) = AFQuMPoSd112g9CcLhLW2fphI0M=
SHA1 (gnome/gnome-control-center-3.2.1.tar.xz) = eUy/+Uuvh26A/nPH5kb0aM9bw5g=
SHA256 (gnome/gnome-control-center-3.2.1.tar.xz) = vzVOoJbudQHL31PEI4Y1XxmXW0IGmV5hEMGA58t0oIg=
SIZE (gnome/gnome-control-center-3.2.1.tar.xz) = 4252172

20
x11/gnome/controlcenter/patches/patch-panels_info_cc-info-panel_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-panels_info_cc-info-panel_c,v 1.2 2011/09/27 12:15:23 ajacoutot Exp $
$OpenBSD: patch-panels_info_cc-info-panel_c,v 1.3 2011/10/17 15:33:28 ajacoutot Exp $
No PackageKit on OpenBSD.
--- panels/info/cc-info-panel.c.orig Mon Sep 26 18:04:02 2011
+++ panels/info/cc-info-panel.c Tue Sep 27 11:36:10 2011
--- panels/info/cc-info-panel.c.orig Thu Oct 13 13:13:42 2011
+++ panels/info/cc-info-panel.c Mon Oct 17 17:07:22 2011
@@ -23,7 +23,12 @@
#include "cc-info-panel.h"
@ -17,7 +17,7 @@ No PackageKit on OpenBSD.
#include <polkit/polkit.h>
#include <glib.h>
@@ -1296,6 +1301,7 @@ on_pk_get_updates_ready (GObject *source,
@@ -1281,6 +1286,7 @@ on_pk_get_updates_ready (GObject *source,
GAsyncResult *res,
CcInfoPanel *self)
{
@ -25,7 +25,7 @@ No PackageKit on OpenBSD.
GError *error;
GVariant *result;
@@ -1307,6 +1313,9 @@ on_pk_get_updates_ready (GObject *source,
@@ -1292,6 +1298,9 @@ on_pk_get_updates_ready (GObject *source,
g_error_free (error);
return;
}
@ -35,7 +35,7 @@ No PackageKit on OpenBSD.
}
static void
@@ -1314,6 +1323,7 @@ on_pk_get_tid_ready (GObject *source,
@@ -1299,6 +1308,7 @@ on_pk_get_tid_ready (GObject *source,
GAsyncResult *res,
CcInfoPanel *self)
{
@ -43,7 +43,7 @@ No PackageKit on OpenBSD.
GError *error;
GVariant *result;
char *tid;
@@ -1360,6 +1370,9 @@ on_pk_get_tid_ready (GObject *source,
@@ -1345,6 +1355,9 @@ on_pk_get_tid_ready (GObject *source,
NULL,
(GAsyncReadyCallback) on_pk_get_updates_ready,
self);
@ -53,7 +53,7 @@ No PackageKit on OpenBSD.
}
static void
@@ -1422,6 +1435,7 @@ cc_info_panel_init (CcInfoPanel *self)
@@ -1407,6 +1420,7 @@ cc_info_panel_init (CcInfoPanel *self)
g_assert (self->priv->session_bus);
@ -61,7 +61,7 @@ No PackageKit on OpenBSD.
self->priv->pk_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_NONE,
NULL,
@@ -1443,6 +1457,7 @@ cc_info_panel_init (CcInfoPanel *self)
@@ -1428,6 +1442,7 @@ cc_info_panel_init (CcInfoPanel *self)
self);
refresh_updates (self);
}
@ -69,7 +69,7 @@ No PackageKit on OpenBSD.
gtk_builder_add_from_file (self->priv->builder,
GNOMECC_UI_DIR "/info.ui",
@@ -1457,8 +1472,10 @@ cc_info_panel_init (CcInfoPanel *self)
@@ -1442,8 +1457,10 @@ cc_info_panel_init (CcInfoPanel *self)
self->priv->graphics_data = get_graphics_data ();

8
x11/gnome/controlcenter/patches/patch-panels_printers_cc-printers-panel_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-panels_printers_cc-printers-panel_c,v 1.2 2011/09/27 12:15:23 ajacoutot Exp $
--- panels/printers/cc-printers-panel.c.orig Wed Jul 27 13:15:40 2011
+++ panels/printers/cc-printers-panel.c Mon Sep 26 14:01:06 2011
@@ -2138,7 +2138,7 @@ test_page_cb (GtkButton *button,
$OpenBSD: patch-panels_printers_cc-printers-panel_c,v 1.3 2011/10/17 15:33:28 ajacoutot Exp $
--- panels/printers/cc-printers-panel.c.orig Mon Oct 17 16:24:20 2011
+++ panels/printers/cc-printers-panel.c Mon Oct 17 17:07:22 2011
@@ -2151,7 +2151,7 @@ test_page_cb (GtkButton *button,
if (printer_name)
{
const gchar *const dirs[] = { "/usr/share/cups",

144
x11/gnome/controlcenter/patches/patch-panels_printers_pp-new-printer-dialog_c
View File

@ -1,15 +1,10 @@
$OpenBSD: patch-panels_printers_pp-new-printer-dialog_c,v 1.5 2011/10/03 12:11:30 ajacoutot Exp $
$OpenBSD: patch-panels_printers_pp-new-printer-dialog_c,v 1.6 2011/10/17 15:33:28 ajacoutot Exp $
No PackageKit on OpenBSD.
From 0e119e480af5f80989211ccb2f32b8b8eeb9b189 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 03 Oct 2011 11:26:08 +0000
Subject: printers: Fix build on systems without LC_PAPER
--- panels/printers/pp-new-printer-dialog.c.orig Mon Sep 26 18:04:02 2011
+++ panels/printers/pp-new-printer-dialog.c Mon Oct 3 14:02:57 2011
@@ -1514,6 +1514,7 @@ new_printer_add_button_cb (GtkButton *button,
--- panels/printers/pp-new-printer-dialog.c.orig Mon Oct 17 16:24:20 2011
+++ panels/printers/pp-new-printer-dialog.c Mon Oct 17 17:07:22 2011
@@ -1554,6 +1554,7 @@ new_printer_add_button_cb (GtkButton *button,
pp->devices[device_id].device_make_and_model,
pp->devices[device_id].device_uri);
@ -17,7 +12,7 @@ Subject: printers: Fix build on systems without LC_PAPER
if (ppd_name == NULL || ppd_name->ppd_match_level < PPD_EXACT_MATCH)
{
/* Try PackageKit to install printer driver */
@@ -1568,6 +1569,7 @@ new_printer_add_button_cb (GtkButton *button,
@@ -1608,6 +1609,7 @@ new_printer_add_button_cb (GtkButton *button,
g_free (device_ids);
}
}
@ -25,132 +20,3 @@ Subject: printers: Fix build on systems without LC_PAPER
/* Add the new printer */
if (ppd_name && ppd_name->ppd_name)
@@ -1626,7 +1628,9 @@ new_printer_add_button_cb (GtkButton *button,
DBusGProxy *proxy;
GError *error = NULL;
char *ret_error = NULL;
- char *locale = NULL;
+ ppd_file_t *ppd_file = NULL;
+ gchar **value = NULL;
+ const gchar *paper_size;
ppd_file_name = cupsGetPPD (pp->devices[device_id].display_name);
@@ -1665,75 +1669,60 @@ new_printer_add_button_cb (GtkButton *button,
/* Set default PaperSize according to the locale */
- locale = setlocale (LC_PAPER, NULL);
- if (locale == NULL)
- locale = setlocale (LC_MESSAGES, NULL);
+ paper_size = gtk_paper_size_get_default ();
+ if (g_str_equal (paper_size, GTK_PAPER_NAME_LETTER))
+ paper_size = "Letter";
+ else
+ paper_size = "A4";
- if (locale)
+ if (ppd_file_name)
{
- ppd_file_t *ppd_file = NULL;
- gchar **value = NULL;
- gchar *paper_size;
-
- /* CLDR 2.0 alpha
- * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/territory_language_information.html
- */
- if (g_regex_match_simple ("[^_.@]{2,3}_(BZ|CA|CL|CO|CR|GT|MX|NI|PA|PH|PR|SV|US|VE)",
- locale, G_REGEX_ANCHORED, G_REGEX_MATCH_ANCHORED))
- paper_size = g_strdup ("Letter");
- else
- paper_size = g_strdup ("A4");
-
- if (ppd_file_name)
+ ppd_file = ppdOpenFile (ppd_file_name);
+ if (ppd_file)
{
- ppd_file = ppdOpenFile (ppd_file_name);
- if (ppd_file)
- {
- ppdMarkDefaults (ppd_file);
- for (i = 0; i < ppd_file->num_groups; i++)
- for (j = 0; j < ppd_file->groups[i].num_options; j++)
- if (g_strcmp0 ("PageSize", ppd_file->groups[i].options[j].keyword) == 0)
+ ppdMarkDefaults (ppd_file);
+ for (i = 0; i < ppd_file->num_groups; i++)
+ for (j = 0; j < ppd_file->groups[i].num_options; j++)
+ if (g_strcmp0 ("PageSize", ppd_file->groups[i].options[j].keyword) == 0)
+ {
+ for (k = 0; k < ppd_file->groups[i].options[j].num_choices; k++)
{
- for (k = 0; k < ppd_file->groups[i].options[j].num_choices; k++)
+ if (g_ascii_strncasecmp (paper_size,
+ ppd_file->groups[i].options[j].choices[k].choice,
+ strlen (paper_size)) == 0 &&
+ !ppd_file->groups[i].options[j].choices[k].marked)
{
- if (g_ascii_strncasecmp (paper_size,
- ppd_file->groups[i].options[j].choices[k].choice,
- strlen (paper_size)) == 0 &&
- !ppd_file->groups[i].options[j].choices[k].marked)
- {
- value = g_new0 (gchar *, 2);
- value[0] = g_strdup (ppd_file->groups[i].options[j].choices[k].choice);
- break;
- }
+ value = g_new0 (gchar *, 2);
+ value[0] = g_strdup (ppd_file->groups[i].options[j].choices[k].choice);
+ break;
}
- break;
}
- ppdClose (ppd_file);
- }
+ break;
+ }
+ ppdClose (ppd_file);
}
+ }
- if (value)
+ if (value)
+ {
+ dbus_g_proxy_call (proxy, "PrinterAddOptionDefault", &error,
+ G_TYPE_STRING, pp->devices[device_id].display_name,
+ G_TYPE_STRING, "PageSize-default",
+ G_TYPE_STRV, value,
+ G_TYPE_INVALID,
+ G_TYPE_STRING, &ret_error,
+ G_TYPE_INVALID);
+
+ if (error)
{
- dbus_g_proxy_call (proxy, "PrinterAddOptionDefault", &error,
- G_TYPE_STRING, pp->devices[device_id].display_name,
- G_TYPE_STRING, "PageSize-default",
- G_TYPE_STRV, value,
- G_TYPE_INVALID,
- G_TYPE_STRING, &ret_error,
- G_TYPE_INVALID);
+ g_warning ("%s", error->message);
+ g_clear_error (&error);
+ }
- if (error)
- {
- g_warning ("%s", error->message);
- g_clear_error (&error);
- }
+ if (ret_error && ret_error[0] != '\0')
+ g_warning ("%s", ret_error);
- if (ret_error && ret_error[0] != '\0')
- g_warning ("%s", ret_error);
-
- g_strfreev (value);
- }
- g_free (paper_size);
+ g_strfreev (value);
}
g_object_unref (proxy);
}

38
x11/gnome/controlcenter/patches/patch-panels_region_gnome-region-panel-formats_c
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-panels_region_gnome-region-panel-formats_c,v 1.4 2011/10/03 13:49:32 ajacoutot Exp $
From 8a0c2e1b27171968974c51ee449b5d6119eb271a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 03 Oct 2011 13:32:23 +0000
Subject: region: Align the example dates
From 7b8b773cf33c638af3ccd3ec365c5f84487afa88 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Mon, 03 Oct 2011 13:15:15 +0000
Subject: region: Fix build on systems without LC_MEASUREMENT
--- panels/region/gnome-region-panel-formats.c.orig Tue Aug 23 10:23:42 2011
+++ panels/region/gnome-region-panel-formats.c Mon Oct 3 15:36:20 2011
@@ -38,6 +38,7 @@ display_date (GtkLabel *label, GDateTime *dt, const gc
gchar *s;
s = g_date_time_format (dt, format);
+ s = g_strstrip (s);
gtk_label_set_text (label, s);
g_free (s);
}
@@ -132,6 +133,7 @@ update_examples_cb (GtkTreeSelection *selection, gpoin
g_free (locale);
/* Display measurement */
+#ifdef LC_MEASUREMENT
locale = g_strdup (setlocale (LC_MEASUREMENT, NULL));
setlocale (LC_MEASUREMENT, active_id);
@@ -143,6 +145,7 @@ update_examples_cb (GtkTreeSelection *selection, gpoin
setlocale (LC_MEASUREMENT, locale);
g_free (locale);
+#endif
g_free (active_id);
}