r38503 - in /desktop/experimental/gnome-panel/debian: ./ patches/

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Sun Jun 9 03:08:59 UTC 2013 

Author: jbicha-guest
Date: Sun Jun  9 03:08:58 2013
New Revision: 38503

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38503
Log:
* Backport several other fixes:
  - 90-remove_artifact_on_icon_animation.patch
  - 91-fix_panels_in_separate_screens.patch
  - 92-fix_sunrise-times.patch

Added:
    desktop/experimental/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch
    desktop/experimental/gnome-panel/debian/patches/91-fix_panels_in_separate_screens.patch
    desktop/experimental/gnome-panel/debian/patches/92-fix_sunrise-times.patch
Modified:
    desktop/experimental/gnome-panel/debian/changelog
    desktop/experimental/gnome-panel/debian/gnome-panel-data.install
    desktop/experimental/gnome-panel/debian/gnome-session-fallback.install
    desktop/experimental/gnome-panel/debian/patches/series
    desktop/experimental/gnome-panel/debian/rules

Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=38503&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog [utf-8] Sun Jun  9 03:08:58 2013
@@ -21,6 +21,10 @@
     - Fix build with gnome-desktop3 3.8
   * debian/patches/drop-gweather-xml-include.patch:
     - Fix build with libgweather 3.8
+  * Backport several other fixes:
+    - 90-remove_artifact_on_icon_animation.patch
+    - 91-fix_panels_in_separate_screens.patch
+    - 92-fix_sunrise-times.patch
   * Dropped patches applied in new version
     - 15_avoid_applet_loading_failures.patch
     - 16_remove_online_accounts_from_user_menu.patch

Modified: desktop/experimental/gnome-panel/debian/gnome-panel-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/gnome-panel-data.install?rev=38503&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/gnome-panel-data.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/gnome-panel-data.install [utf-8] Sun Jun  9 03:08:58 2013
@@ -1,7 +1,5 @@
-etc/gconf
 usr/share/glib-2.0
 usr/share/gnome-panel
-usr/share/gnome
+usr/share/help
 usr/share/icons
 usr/share/locale
-usr/share/omf

Modified: desktop/experimental/gnome-panel/debian/gnome-session-fallback.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/gnome-session-fallback.install?rev=38503&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/gnome-session-fallback.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/gnome-session-fallback.install [utf-8] Sun Jun  9 03:08:58 2013
@@ -1,6 +1,6 @@
 debian/scripts/gnome-session-fallback /usr/bin
 debian/scripts/gnome-wm /usr/bin
 debian/gnome-wm.desktop /usr/share/applications
-usr/share/xsessions/gnome-fallback.desktop
-usr/share/gnome-session/sessions/gnome-fallback.session
+usr/share/xsessions/gnome-flashback.desktop
+usr/share/gnome-session/sessions/gnome-flashback.session
 

Added: desktop/experimental/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch?rev=38503&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch [utf-8] Sun Jun  9 03:08:58 2013
@@ -1,0 +1,16 @@
+# Description: Remove black frame artifact on launcher icon zoom animation
+# Origin/Author:  Yannick GICQUEL
+# Bug: https://bugzilla.gnome.org/show_bug.cgi?id=688618
+Index: gnome-panel/gnome-panel/xstuff.c
+===================================================================
+--- gnome-panel.orig/gnome-panel/xstuff.c	2012-11-18 16:22:36.108284000 +0100
++++ gnome-panel/gnome-panel/xstuff.c	2012-11-18 16:42:40.961891555 +0100
+@@ -326,6 +326,8 @@
+ 			g_source_remove (zoom->timeout_id);
+ 		zoom->timeout_id = 0;
+ 
++		gtk_widget_hide (widget);
++
+ 		g_object_unref (zoom->pixbuf);
+ 		zoom->pixbuf = NULL;
+ 

Added: desktop/experimental/gnome-panel/debian/patches/91-fix_panels_in_separate_screens.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/91-fix_panels_in_separate_screens.patch?rev=38503&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/91-fix_panels_in_separate_screens.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/91-fix_panels_in_separate_screens.patch [utf-8] Sun Jun  9 03:08:58 2013
@@ -1,0 +1,37 @@
+From 3bee9c86f8c31ba0048ac52fefad2222b9ea53c2 Mon Sep 17 00:00:00 2001
+From: Alberts Muktupavels <alberts.muktupavels at gmail.com>
+Date: Mon, 20 May 2013 14:55:56 +0000
+Subject: Fix panels in separate x screens
+
+1) Don't set screen to default screen when it exist.
+2) Set screen for menu, otherwise menu always appears on first screen.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=689610
+---
+diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
+index 6a11fc3..8cf91c7 100644
+--- a/gnome-panel/panel-toplevel.c
++++ b/gnome-panel/panel-toplevel.c
+@@ -4455,7 +4455,7 @@ panel_toplevel_settings_bind_set_screen (const GValue       *value,
+ {
+ 	GdkScreen *screen = g_value_get_object (value);
+ 
+-	if (!screen || GDK_IS_SCREEN (screen))
++	if (!screen || !GDK_IS_SCREEN (screen))
+ 		screen = gdk_screen_get_default ();
+ 
+ 	return g_variant_new ("i", gdk_screen_get_number (screen));
+diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c
+index cee436c..806d427 100644
+--- a/libpanel-applet/panel-applet.c
++++ b/libpanel-applet/panel-applet.c
+@@ -1141,6 +1141,8 @@ panel_applet_position_menu (GtkMenu   *menu,
+ 	applet = PANEL_APPLET (widget);
+ 
+ 	screen = gtk_widget_get_screen (widget);
++	
++	gtk_menu_set_screen(menu, screen);
+ 
+ 	gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
+ 	gdk_window_get_origin (gtk_widget_get_window (widget),
+

Added: desktop/experimental/gnome-panel/debian/patches/92-fix_sunrise-times.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/92-fix_sunrise-times.patch?rev=38503&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/92-fix_sunrise-times.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/92-fix_sunrise-times.patch [utf-8] Sun Jun  9 03:08:58 2013
@@ -1,0 +1,23 @@
+From be59b44d0fd3dc93e1b240b18a0706aa6e0cc19f Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Mon, 20 May 2013 14:24:02 +0000
+Subject: Display sunrise/sunset times in local time not UTC
+
+Thanks Jethro Beekman for the report and the fix
+
+https://bugzilla.gnome.org/show_bug.cgi?id=695814
+---
+diff --git a/applets/clock/clock-location-tile.c b/applets/clock/clock-location-tile.c
+index 2134486..c52df71 100644
+--- a/applets/clock/clock-location-tile.c
++++ b/applets/clock/clock-location-tile.c
+@@ -632,7 +632,7 @@ weather_info_setup_tooltip (GWeatherInfo *info, ClockLocation *location, GtkTool
+ 	else
+ 		line3 = g_strdup ("");
+ 
+-	timezone = clock_location_get_timezone (location);
++	timezone = clock_location_get_tzname (location);
+ 	if (gweather_info_get_value_sunrise (info, &sunrise_time))
+ 		sunrise_str = convert_time_to_str (sunrise_time, clock_format, timezone);
+ 	else
+

Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=38503&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/series [utf-8] Sun Jun  9 03:08:58 2013
@@ -7,6 +7,9 @@
 11_compat_options.patch
 14_revert_timedate_change.patch
 18_fix_force_quit_applet.patch
+90-remove_artifact_on_icon_animation.patch
+91-fix_panels_in_separate_screens.patch
+92-fix_sunrise-times.patch
 drop-gweather-xml-include.patch
 git-build-with-gnome-desktop38-part1.patch
 git-build-with-gnome-desktop38-part2.patch

Modified: desktop/experimental/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/rules?rev=38503&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/rules [utf-8] Sun Jun  9 03:08:58 2013
@@ -11,7 +11,6 @@
 LDFLAGS += -Wl,-z,defs -Wl,-O1
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
-			--disable-scrollkeeper \
 			--with-in-process-applets=all \
 			--enable-telepathy-glib
 ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu)

More information about the pkg-gnome-commits mailing list