Hello community, here is the log from the commit of package mate-panel for openSUSE:Factory checked in at 2015-10-28 17:31:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-panel (Old) and /work/SRC/openSUSE:Factory/.mate-panel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-panel" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-panel/mate-panel.changes 2015-10-06 13:25:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mate-panel.new/mate-panel.changes 2015-10-28 17:31:11.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 27 11:21:31 UTC 2015 - sor.ale...@meowr.ru + +- Add mate-panel-no-locked-applet-position-change.patch. + +------------------------------------------------------------------- New: ---- mate-panel-no-locked-applet-position-change.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-panel.spec ++++++ --- /var/tmp/diff_new_pack.ZXyr0r/_old 2015-10-28 17:31:12.000000000 +0100 +++ /var/tmp/diff_new_pack.ZXyr0r/_new 2015-10-28 17:31:12.000000000 +0100 @@ -28,8 +28,10 @@ Url: http://mate-desktop.org/ Source0: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz Source1: %{name}-branding.gschema.override.in +# PATCH-FIX-UPSTREAM mate-panel-no-locked-applet-position-change.patch -- Don't change position/right-stick of locked applets (commit d952904). +Patch0: %{name}-no-locked-applet-position-change.patch # PATCH-FIX-OPENSUSE mate-panel-layouts-suse.patch sor.ale...@meowr.ru -- Correct missing elements. -Patch0: %{name}-layouts-suse.patch +Patch1: %{name}-layouts-suse.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: intltool @@ -53,7 +55,7 @@ BuildRequires: pkgconfig(mate-desktop-2.0) >= 1.9.2 BuildRequires: pkgconfig(mateweather) >= 1.9.0 BuildRequires: pkgconfig(sm) -Requires: %{name}-branding = %{version} +Requires: %{name}-branding >= %{version} Requires: NetworkManager-gnome Requires: gsettings-backend-dconf Requires: gvfs-backends @@ -64,7 +66,7 @@ %description This package contains MATE Desktop Panel. The panel is an easy-to-use and functional interface to manage your desktop, start -programs, and organize access to your data. +programs, and organise access to your data. %package branding-upstream Summary: The MATE Desktop Panel -- Upstream default layout @@ -84,7 +86,7 @@ %description branding-upstream This package contains the MATE Desktop Panel. The panel is an easy-to-use and functional interface to manage your desktop, start -programs, and organize access to your data. +programs, and organise access to your data. This package contains the upstream default layout for MATE Panel. @@ -96,7 +98,7 @@ %description -n %{lname} This package contains MATE Desktop Panel. The panel is an easy-to-use and functional interface to manage your desktop, start -programs, and organize access to your data. +programs, and organise access to your data. %package -n %{typelib} Summary: MATE Panel Applet Library typelib @@ -106,7 +108,7 @@ %description -n %{typelib} This package contains MATE Desktop Panel. The panel is an easy-to-use and functional interface to manage your desktop, start -programs, and organize access to your data. +programs, and organise access to your data. %package devel Summary: MATE Panel Applet Library -- Development Files @@ -118,13 +120,14 @@ %description devel This package contains the MATE Desktop Panel. The panel is an easy-to-use and functional interface to manage your desktop, start -programs, and organize access to your data. +programs, and organise access to your data. %lang_package %prep %setup -q %patch0 -p1 +%patch1 -p1 cp -a %{SOURCE1} zz-mate-panel-upream-branding.gschema.override # Switch to mate-menu in openSUSE branding. sed -i 's/GNOMEMainMenuFactory::GNOMEMainMenu/MateMenuAppletFactory::MateMenuApplet/' data/opensuse.layout ++++++ mate-panel-no-locked-applet-position-change.patch ++++++ --- a/mate-panel/applet.c +++ b/mate-panel/applet.c @@ -1186,6 +1186,17 @@ mate_panel_applet_save_position (AppletI "position" properties of an applet that may in fact be locked down. So check if these are writable before attempting to write them */ + locked = panel_widget_get_applet_locked (panel_widget, applet_info->widget) ? 1 : 0; + if (g_settings_get_boolean (applet_info->settings, PANEL_OBJECT_LOCKED_KEY) ? 1 : 0 != locked) + g_settings_set_boolean (applet_info->settings, PANEL_OBJECT_LOCKED_KEY, locked); + + if (locked) { + // Until position calculations are refactored to fix the issue of the panel applets + // getting reordered on resolution changes... + // .. don't save position/right-stick on locked applets + return; + } + right_stick = panel_is_applet_right_stick (applet_info->widget) ? 1 : 0; if (g_settings_is_writable (applet_info->settings, PANEL_OBJECT_PANEL_RIGHT_STICK_KEY) && (g_settings_get_boolean (applet_info->settings, PANEL_OBJECT_PANEL_RIGHT_STICK_KEY) ? 1 : 0) != right_stick) @@ -1198,10 +1209,6 @@ mate_panel_applet_save_position (AppletI if (g_settings_is_writable (applet_info->settings, PANEL_OBJECT_POSITION_KEY) && g_settings_get_int (applet_info->settings, PANEL_OBJECT_POSITION_KEY) != position) g_settings_set_int (applet_info->settings, PANEL_OBJECT_POSITION_KEY, position); - - locked = panel_widget_get_applet_locked (panel_widget, applet_info->widget) ? 1 : 0; - if (g_settings_get_boolean (applet_info->settings, PANEL_OBJECT_LOCKED_KEY) ? 1 : 0 != locked) - g_settings_set_boolean (applet_info->settings, PANEL_OBJECT_LOCKED_KEY, locked); } const char *
