[Pkg-xfce-commits] r9797 - in /desktop/branches/experimental/xfce4-panel/debian: changelog patches/01_support-non-multiarch-modules.patch patches/02_pager-size-for-viewport.patch patches/03_fix-spelling-error-in-binary.patch

Yves-Alexis Perez corsac at moszumanska.debian.org
Fri May 26 20:58:33 UTC 2017 

Author: corsac
Date: Fri May 26 20:58:33 2017
New Revision: 9797

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9797
Log:
debian/patches refreshed for new upstrema release.

Modified:
    desktop/branches/experimental/xfce4-panel/debian/changelog
    desktop/branches/experimental/xfce4-panel/debian/patches/01_support-non-multiarch-modules.patch
    desktop/branches/experimental/xfce4-panel/debian/patches/02_pager-size-for-viewport.patch
    desktop/branches/experimental/xfce4-panel/debian/patches/03_fix-spelling-error-in-binary.patch

Modified: desktop/branches/experimental/xfce4-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/changelog?rev=9797&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/changelog	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/changelog	Fri May 26 20:58:33 2017
@@ -1,6 +1,7 @@
 xfce4-panel (4.13.0-1) UNRELEASED; urgency=medium
 
   * New upstream development release.
+  * debian/patches refreshed for new upstrema release.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 26 May 2017 22:46:12 +0200
 

Modified: desktop/branches/experimental/xfce4-panel/debian/patches/01_support-non-multiarch-modules.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/patches/01_support-non-multiarch-modules.patch?rev=9797&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/01_support-non-multiarch-modules.patch	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/01_support-non-multiarch-modules.patch	Fri May 26 20:58:33 2017
@@ -11,11 +11,9 @@
  panel/panel-module.c |   11 +++++++++--
  1 files changed, 9 insertions(+), 2 deletions(-)
 
-diff --git a/panel/panel-module.c b/panel/panel-module.c
-index ba39320..de4c52e 100644
 --- a/panel/panel-module.c
 +++ b/panel/panel-module.c
-@@ -38,6 +38,12 @@
+@@ -37,6 +37,12 @@
  #define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
  #define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins")
  
@@ -28,15 +26,15 @@
  
  typedef enum _PanelModuleRunMode PanelModuleRunMode;
  typedef enum _PanelModuleUnique  PanelModuleUnique;
-@@ -303,6 +309,7 @@ panel_module_new_from_desktop_file (const gchar *filename,
+@@ -309,6 +315,7 @@ panel_module_new_from_desktop_file (cons
    const gchar *module_exec;
    const gchar *module_unique;
    gboolean     found;
 +  gsize        i;
  
-   panel_return_val_if_fail (!exo_str_is_empty (filename), NULL);
-   panel_return_val_if_fail (!exo_str_is_empty (name), NULL);
-@@ -343,11 +350,11 @@ panel_module_new_from_desktop_file (const gchar *filename,
+   panel_return_val_if_fail (!panel_str_is_empty (filename), NULL);
+   panel_return_val_if_fail (!panel_str_is_empty (name), NULL);
+@@ -349,11 +356,11 @@ panel_module_new_from_desktop_file (cons
        path = g_module_build_path (PANEL_PLUGINS_LIB_DIR, module_name);
        found = g_file_test (path, G_FILE_TEST_EXISTS);
  
@@ -50,6 +48,3 @@
            found = g_file_test (path, G_FILE_TEST_EXISTS);
          }
  
--- 
-1.7.6.3
-

Modified: desktop/branches/experimental/xfce4-panel/debian/patches/02_pager-size-for-viewport.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/patches/02_pager-size-for-viewport.patch?rev=9797&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/02_pager-size-for-viewport.patch	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/02_pager-size-for-viewport.patch	Fri May 26 20:58:33 2017
@@ -4,9 +4,9 @@
 
 --- a/plugins/pager/pager.c
 +++ b/plugins/pager/pager.c
-@@ -593,6 +593,18 @@ pager_plugin_size_request (GtkWidget
+@@ -662,6 +662,18 @@ pager_plugin_get_preferred_width (GtkWid
+   else if (plugin->miniature_view)
      {
-       mode   = xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin));
        n_workspaces = wnck_screen_get_workspace_count (plugin->wnck_screen);
 +      if (n_workspaces == 1)
 +        {
@@ -21,5 +21,5 @@
 +             }
 +        }
        n_cols = MAX (1, (n_workspaces + plugin->rows - 1) / plugin->rows);
-       if (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
-         {
+       min_width = nat_width = (gint) (xfce_panel_plugin_get_size (XFCE_PANEL_PLUGIN (plugin)) / plugin->rows * plugin->ratio * n_cols);
+     }

Modified: desktop/branches/experimental/xfce4-panel/debian/patches/03_fix-spelling-error-in-binary.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/patches/03_fix-spelling-error-in-binary.patch?rev=9797&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/03_fix-spelling-error-in-binary.patch	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/03_fix-spelling-error-in-binary.patch	Fri May 26 20:58:33 2017
@@ -4,7 +4,7 @@
 
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -13274,7 +13274,7 @@ Date:   Fri Nov 26 23:24:13 2010 +0100
+@@ -15985,7 +15985,7 @@ Date:   Fri Nov 26 23:24:13 2010 +0100
  
      Improve session management signals a bit.
      
@@ -13,7 +13,7 @@
      the main loop during session quit.
  
  commit 1caf1aaa65f8f0c057ab50544550097eeea201f9
-@@ -15062,7 +15062,7 @@ Date:   Sun Jun 13 14:08:41 2010 +0200
+@@ -17773,7 +17773,7 @@ Date:   Sun Jun 13 14:08:41 2010 +0200
      Add logout to plugin menu and drop quit and restart.
      
      In 4.6 the quit action also showed the logout dialog, instead of
@@ -24,7 +24,7 @@
      session, if you want that, run xfce4-panel -q (normal quit).
 --- a/common/panel-utils.c
 +++ b/common/panel-utils.c
-@@ -97,7 +97,7 @@ panel_utils_builder_new (XfcePanelPlugin
+@@ -96,7 +96,7 @@ panel_utils_builder_new (XfcePanelPlugin
          }
      }
  
@@ -63,7 +63,7 @@
  
 --- a/plugins/tasklist/tasklist-widget.c
 +++ b/plugins/tasklist/tasklist-widget.c
-@@ -502,7 +502,7 @@ xfce_tasklist_class_init (XfceTasklistCl
+@@ -505,7 +505,7 @@ xfce_tasklist_class_init (XfceTasklistCl
    gtk_widget_class_install_style_property (gtkwidget_class,
                                             g_param_spec_int ("min-button-length",
                                                               NULL,
@@ -71,4 +71,4 @@
 +                                                             "The minimum length of a window button",
                                                               1, G_MAXINT,
                                                               DEFAULT_MIN_BUTTON_LENGTH,
-                                                              EXO_PARAM_READABLE));
+                                                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));

More information about the Pkg-xfce-commits mailing list