From 73dff245403b38b45b1d9282398c145db78c702efa8c6504b3ee4e28188fe7c3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 8 Sep 2008 15:06:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=12 --- gnome-control-center-2.23.6.tar.bz2 | 3 - gnome-control-center-2.23.90.tar.bz2 | 3 + gnome-control-center-monitor-labeling.diff | 79 ---------------------- gnome-control-center.changes | 28 ++++++++ gnome-control-center.spec | 44 ++++++++++-- 5 files changed, 68 insertions(+), 89 deletions(-) delete mode 100644 gnome-control-center-2.23.6.tar.bz2 create mode 100644 gnome-control-center-2.23.90.tar.bz2 delete mode 100644 gnome-control-center-monitor-labeling.diff diff --git a/gnome-control-center-2.23.6.tar.bz2 b/gnome-control-center-2.23.6.tar.bz2 deleted file mode 100644 index d93357e..0000000 --- a/gnome-control-center-2.23.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc561d9cbf0390a729c0140c17802661754a76bde346d582406d562cf7026828 -size 2137024 diff --git a/gnome-control-center-2.23.90.tar.bz2 b/gnome-control-center-2.23.90.tar.bz2 new file mode 100644 index 0000000..dc645b6 --- /dev/null +++ b/gnome-control-center-2.23.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c922186bb58b5cf08b4d7e09334674131a6509ec5750f1db0f31d5ba0fc95370 +size 2147811 diff --git a/gnome-control-center-monitor-labeling.diff b/gnome-control-center-monitor-labeling.diff deleted file mode 100644 index c9e9f16..0000000 --- a/gnome-control-center-monitor-labeling.diff +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c -index c6d1237..91d4d2e 100644 ---- a/capplets/display/xrandr-capplet.c -+++ b/capplets/display/xrandr-capplet.c -@@ -28,6 +28,7 @@ - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include - #include -+#include - #include - #include - #include -@@ -40,8 +41,9 @@ struct App - { - GnomeRRScreen *screen; - GnomeRRConfig *current_configuration; -+ GnomeRRLabeler *labeler; - GnomeOutputInfo *current_output; -- -+ - GtkWidget *dialog; - GtkListStore *resolution_store; - GtkWidget *resolution_combo; -@@ -139,6 +141,13 @@ on_screen_changed (GnomeRRScreen *scr, - qsort (app->current_configuration->outputs, i, sizeof (GnomeOutputInfo *), - compare_outputs); - -+ if (app->labeler) { -+ gnome_rr_labeler_hide (app->labeler); -+ g_object_unref (app->labeler); -+ } -+ -+ app->labeler = gnome_rr_labeler_new (app->current_configuration); -+ - #if 0 - for (i = 0; app->current_configuration->outputs[i] != NULL; ++i) - { -@@ -1351,9 +1360,11 @@ paint_output (App *app, cairo_t *cr, int i) - PangoRectangle extent; - GdkRectangle viewport; - double angle; -+ GdkColor output_color; -+ double r, g, b; - - cairo_save (cr); -- -+ - foo_scroll_area_get_viewport (FOO_SCROLL_AREA (app->area), &viewport); - - get_geometry (output, &w, &h); -@@ -1419,12 +1430,22 @@ paint_output (App *app, cairo_t *cr, int i) - - cairo_rectangle (cr, x, y, w * scale + 0.5, h * scale + 0.5); - cairo_clip_preserve (cr); -- -- if (output->on) -- cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0); -- else -- cairo_set_source_rgba (cr, 0.2, 0.2, 0.2, 1.0); -- -+ -+ gnome_rr_labeler_get_color_for_output (app->labeler, output, &output_color); -+ r = output_color.red / 65535.0; -+ g = output_color.green / 65535.0; -+ b = output_color.blue / 65535.0; -+ -+ if (!output->on) -+ { -+ /* If the output is turned off, just darken the selected color */ -+ r *= 0.2; -+ g *= 0.2; -+ b *= 0.2; -+ } -+ -+ cairo_set_source_rgba (cr, r, g, b, 1.0); -+ - foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (app->area), - cr, on_output_event, output); - cairo_fill (cr); diff --git a/gnome-control-center.changes b/gnome-control-center.changes index a8e0841..31ed1f1 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Sep 04 14:27:42 CEST 2008 - mboman@novell.com + +- Update to version 2.23.90: + + Appearance: + * Use default icon for unknown themes + * Remove help button + + Common: + * Make sure we have a notification theme before trying to save it + (bgo#547448) + * Keep track of hidden themes (bgo#547301) + * Require gnome-desktop 2.23.90 + + Display: + * Draw rotated outputs rotated + * Don't leak the application or the GladeXML + * Replace all uses of g_print with g_debug + * Fail gracefully if we cannot get a screen + * Add sexy labels to identify monitors + + Shell: + * Remove eel dependency from libslab + + Sound: + * Fix warning due to left-over developer code (bgo#546583) + * HIG fixes and improved wording (bgo#545219) + * Make the event sound preview button listen to "activate" signal so it + becomes accessible via keyboard (bgo#547808) + + Translation updates +- Remove gnome-control-center-monitor-labeling.diff. Fixed upstream + ------------------------------------------------------------------- Thu Aug 28 14:27:42 CEST 2008 - ro@suse.de diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 06c487e..bdf9fb5 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-control-center (Version 2.23.6) +# spec file for package gnome-control-center (Version 2.23.90) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,13 +20,21 @@ Name: gnome-control-center %define _name control-center -BuildRequires: desktop-file-utils docbook-xsl-stylesheets eel-devel evolution-data-server-devel fdupes gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnome-panel-devel gnome-patch-translation gnome-settings-daemon-devel gstreamer010-plugins-base-devel intltool libglade2-devel libgnomekbd-devel libidl librsvg-devel libxklavier-devel metacity-devel nautilus-devel pam-devel perl-XML-Parser scrollkeeper sgml-skel update-desktop-files xorg-x11 +BuildRequires: desktop-file-utils docbook-xsl-stylesheets eel-devel +BuildRequires: evolution-data-server-devel fdupes gnome-common +BuildRequires: gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel +BuildRequires: gnome-panel-devel gnome-patch-translation +BuildRequires: gnome-settings-daemon-devel gstreamer010-plugins-base-devel +BuildRequires: intltool libglade2-devel libgnomekbd-devel libidl +BuildRequires: librsvg-devel libxklavier-devel metacity-devel +BuildRequires: nautilus-devel pam-devel perl-XML-Parser scrollkeeper +BuildRequires: sgml-skel update-desktop-files xorg-x11 License: GPL v2 or later Group: System/GUI/GNOME Obsoletes: fontilus themus acme Provides: fontilus themus acme -Version: 2.23.6 -Release: 5 +Version: 2.23.90 +Release: 1 Summary: The GNOME Control Center Source: gnome-%{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -51,8 +59,6 @@ Requires: gnome-icon-theme Patch28: gnome-control-center-use-preferences-menu.patch # PATCH-FIX-OPENSUSE gnome-control-center-bnc373197-layout-switch-keybinding.patch bnc373197 vuntz@novell.com -- this is a temporary hack to change the default layout switching keybinding Patch30: gnome-control-center-bnc373197-layout-switch-keybinding.patch -# PATCH-FEATURE-UPSTREAM gnome-control-center-monitor-labeling.diff fate304764 federico@novell.com - Label physical monitors while setting their RANDR properites -Patch31: gnome-control-center-monitor-labeling.diff Url: http://www.gnome.org Requires: nautilus gnome-settings-daemon gnome-menus Requires: %{name}-lang = %{version} @@ -112,7 +118,6 @@ gnome-patch-translation-prepare cp %{S:3} capplets/passwd/change-password.png %patch28 %patch30 -p1 -%patch31 -p1 gnome-patch-translation-update %build @@ -238,6 +243,31 @@ fi %{_datadir}/pkgconfig/*.pc %changelog +* Thu Sep 04 2008 mboman@novell.com +- Update to version 2.23.90: + + Appearance: + * Use default icon for unknown themes + * Remove help button + + Common: + * Make sure we have a notification theme before trying to save it + (bgo#547448) + * Keep track of hidden themes (bgo#547301) + * Require gnome-desktop 2.23.90 + + Display: + * Draw rotated outputs rotated + * Don't leak the application or the GladeXML + * Replace all uses of g_print with g_debug + * Fail gracefully if we cannot get a screen + * Add sexy labels to identify monitors + + Shell: + * Remove eel dependency from libslab + + Sound: + * Fix warning due to left-over developer code (bgo#546583) + * HIG fixes and improved wording (bgo#545219) + * Make the event sound preview button listen to "activate" signal so it + becomes accessible via keyboard (bgo#547808) + + Translation updates +- Remove gnome-control-center-monitor-labeling.diff. Fixed upstream * Thu Aug 28 2008 ro@suse.de - fix build: sound settings are not being built at the moment (configure does not find CANBERRA)