[Pkg-xfce-commits] r9890 - in /desktop/branches/experimental/xfce4-panel/debian: ./ patches/

Yves-Alexis Perez corsac at moszumanska.debian.org
Fri Jun 23 11:22:31 UTC 2017


Author: corsac
Date: Fri Jun 23 11:22:31 2017
New Revision: 9890

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9890
Log:
* debian/patches refreshed for new upstream release.
* debian/control:
  - update garcon build-dep to 0.5.0 and add garcon-gtk3.
  - update libxfce4ui build-dep to 4.13. 
  - update libwnck build-dep to libwnck3. 
  - update exo-1 build-dep to exo-2 0.11.2

Added:
    desktop/branches/experimental/xfce4-panel/debian/patches/0001-Fix-datarootdir-declaration-in-.pc-files-Bug-13589.patch
    desktop/branches/experimental/xfce4-panel/debian/patches/0001-Moved-new-property-OPACITY-to-end-make-wrapper-accep.patch
Modified:
    desktop/branches/experimental/xfce4-panel/debian/changelog
    desktop/branches/experimental/xfce4-panel/debian/control
    desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-4.symbols
    desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-dev.install
    desktop/branches/experimental/xfce4-panel/debian/patches/series
    desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install
    desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs

Modified: desktop/branches/experimental/xfce4-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/changelog?rev=9890&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/changelog	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/changelog	Fri Jun 23 11:22:31 2017
@@ -1,8 +1,13 @@
 xfce4-panel (4.13.0-1) UNRELEASED; urgency=medium
 
   * New upstream development release.
-  * debian/patches refreshed for new upstrema release.
+  * debian/patches refreshed for new upstream release.
   * Run wrap-and-sort.
+  * debian/control:
+    - update garcon build-dep to 0.5.0 and add garcon-gtk3.
+    - update libxfce4ui build-dep to 4.13. 
+    - update libwnck build-dep to libwnck3. 
+    - update exo-1 build-dep to exo-2 0.11.2
 
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 26 May 2017 22:46:12 +0200
 

Modified: desktop/branches/experimental/xfce4-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/control?rev=9890&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/control	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/control	Fri Jun 23 11:22:31 2017
@@ -8,13 +8,14 @@
                intltool,
                libcairo2-dev (>= 1.0.0),
                libdbus-glib-1-dev (>= 0.73),
-               libexo-1-dev (>= 0.8.0),
-               libgarcon-1-0-dev (>= 0.3.0),
+               libexo-2-dev (>= 0.11.2),
+               libgarcon-1-dev (>= 0.5.0),
+               libgarcon-gtk3-1-dev (>= 0.5.0),
                libglib2.0-dev (>= 2.18.0),
                libgtk-3-dev,
                libgtk2.0-dev (>= 2.14.0),
-               libwnck-dev (>= 2.22),
-               libxfce4ui-1-dev (>= 4.11.0),
+               libwnck-3-dev (>= 3.0),
+               libxfce4ui-2-dev (>= 4.13.0),
                libxfce4util-dev (>= 4.10.0),
                libxfconf-0-dev (>= 4.10.0),
                libxml-parser-perl

Modified: desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-4.symbols
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-4.symbols?rev=9890&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-4.symbols	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-4.symbols	Fri Jun 23 11:22:31 2017
@@ -32,6 +32,7 @@
  xfce_panel_plugin_get_comment at Base 4.11.0
  xfce_panel_plugin_get_display_name at Base 4.11.0
  xfce_panel_plugin_get_expand at Base 4.11.0
+ xfce_panel_plugin_get_icon_size at Base 4.13.0
  xfce_panel_plugin_get_locked at Base 4.11.0
  xfce_panel_plugin_get_mode at Base 4.11.0
  xfce_panel_plugin_get_name at Base 4.11.0

Modified: desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-dev.install?rev=9890&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-dev.install	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-2.0-dev.install	Fri Jun 23 11:22:31 2017
@@ -1,3 +1,4 @@
 usr/include/xfce4/libxfce4panel-2.0
 usr/lib/*/libxfce4panel-2.0.so
 usr/lib/*/pkgconfig/libxfce4panel-2.0.pc
+usr/share/gtk-doc/html/libxfce4panel-2.0

Added: desktop/branches/experimental/xfce4-panel/debian/patches/0001-Fix-datarootdir-declaration-in-.pc-files-Bug-13589.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/patches/0001-Fix-datarootdir-declaration-in-.pc-files-Bug-13589.patch?rev=9890&op=file
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/0001-Fix-datarootdir-declaration-in-.pc-files-Bug-13589.patch	(added)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/0001-Fix-datarootdir-declaration-in-.pc-files-Bug-13589.patch	Fri Jun 23 11:22:31 2017
@@ -0,0 +1,43 @@
+From 01df3bf6de1ec648a6821d29e1fdb3333b6d5184 Mon Sep 17 00:00:00 2001
+From: Romain B <skunnyk at alteroot.org>
+Date: Thu, 25 May 2017 10:42:12 +0200
+Subject: [PATCH] Fix datarootdir declaration in .pc files (Bug #13589)
+
+datarootdir needs to be defined before using it.
+Bug introduced by 0b83659b7085b62528cce4596d3ad3f97fd5f1ed
+---
+ libxfce4panel/libxfce4panel-1.0.pc.in | 2 +-
+ libxfce4panel/libxfce4panel-2.0.pc.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libxfce4panel/libxfce4panel-1.0.pc.in b/libxfce4panel/libxfce4panel-1.0.pc.in
+index c0cdc884..9d90ee1d 100644
+--- a/libxfce4panel/libxfce4panel-1.0.pc.in
++++ b/libxfce4panel/libxfce4panel-1.0.pc.in
+@@ -2,8 +2,8 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-localedir=@localedir@
+ datarootdir=@datarootdir@
++localedir=@localedir@
+ api=1.0
+ 
+ Name: libxfce4panel
+diff --git a/libxfce4panel/libxfce4panel-2.0.pc.in b/libxfce4panel/libxfce4panel-2.0.pc.in
+index 6644f7b8..5ff8c96b 100644
+--- a/libxfce4panel/libxfce4panel-2.0.pc.in
++++ b/libxfce4panel/libxfce4panel-2.0.pc.in
+@@ -2,8 +2,8 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-localedir=@localedir@
+ datarootdir=@datarootdir@
++localedir=@localedir@
+ api=@LIBXFCE4PANEL_VERSION_API@
+ 
+ Name: libxfce4panel
+-- 
+2.11.0
+

Added: desktop/branches/experimental/xfce4-panel/debian/patches/0001-Moved-new-property-OPACITY-to-end-make-wrapper-accep.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/patches/0001-Moved-new-property-OPACITY-to-end-make-wrapper-accep.patch?rev=9890&op=file
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/0001-Moved-new-property-OPACITY-to-end-make-wrapper-accep.patch	(added)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/0001-Moved-new-property-OPACITY-to-end-make-wrapper-accep.patch	Fri Jun 23 11:22:31 2017
@@ -0,0 +1,67 @@
+From 5b1b3ef2b070807547f3793512eb1598689c264b Mon Sep 17 00:00:00 2001
+From: Peter de Ridder <peter at xfce.org>
+Date: Mon, 19 Jun 2017 21:06:35 +0200
+Subject: [PATCH] Moved new property OPACITY to end, make wrapper accept
+ unknown properties
+
+---
+ libxfce4panel/xfce-panel-plugin-provider.h | 4 ++--
+ panel/panel-plugin-external-46.c           | 4 ----
+ wrapper/main.c                             | 4 +++-
+ 3 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/libxfce4panel/xfce-panel-plugin-provider.h b/libxfce4panel/xfce-panel-plugin-provider.h
+index d568e8ad..8d173c94 100644
+--- a/libxfce4panel/xfce-panel-plugin-provider.h
++++ b/libxfce4panel/xfce-panel-plugin-provider.h
+@@ -107,7 +107,6 @@ typedef enum /*< skip >*/
+   PROVIDER_PROP_TYPE_SET_NROWS,               /* gint */
+   PROVIDER_PROP_TYPE_SET_LOCKED,              /* gboolean */
+   PROVIDER_PROP_TYPE_SET_SENSITIVE,           /* gboolean */
+-  PROVIDER_PROP_TYPE_SET_OPACITY,             /* gdouble */
+   PROVIDER_PROP_TYPE_SET_BACKGROUND_COLOR,    /* string, wrapper only */
+   PROVIDER_PROP_TYPE_SET_BACKGROUND_IMAGE,    /* string, wrapper only */
+   PROVIDER_PROP_TYPE_ACTION_REMOVED,          /* none */
+@@ -117,7 +116,8 @@ typedef enum /*< skip >*/
+   PROVIDER_PROP_TYPE_ACTION_BACKGROUND_UNSET, /* none */
+   PROVIDER_PROP_TYPE_ACTION_SHOW_CONFIGURE,   /* none */
+   PROVIDER_PROP_TYPE_ACTION_SHOW_ABOUT,       /* none */
+-  PROVIDER_PROP_TYPE_ACTION_ASK_REMOVE        /* none */
++  PROVIDER_PROP_TYPE_ACTION_ASK_REMOVE,       /* none */
++  PROVIDER_PROP_TYPE_SET_OPACITY              /* gdouble */
+ }
+ XfcePanelPluginProviderPropType;
+ 
+diff --git a/panel/panel-plugin-external-46.c b/panel/panel-plugin-external-46.c
+index c115486d..9ccf313b 100644
+--- a/panel/panel-plugin-external-46.c
++++ b/panel/panel-plugin-external-46.c
+@@ -290,10 +290,6 @@ panel_plugin_external_46_set_properties (PanelPluginExternal *external,
+           event.xclient.data.s[1] = g_value_get_int (&property->value);
+           break;
+ 
+-        case PROVIDER_PROP_TYPE_SET_BACKGROUND_ALPHA:
+-          event.xclient.data.s[1] = g_value_get_double (&property->value) * 100.00;
+-          break;
+-
+         case PROVIDER_PROP_TYPE_SET_LOCKED:
+         case PROVIDER_PROP_TYPE_SET_SENSITIVE:
+           event.xclient.data.s[1] = g_value_get_boolean (&property->value);
+diff --git a/wrapper/main.c b/wrapper/main.c
+index cdf7d687..d46eed78 100644
+--- a/wrapper/main.c
++++ b/wrapper/main.c
+@@ -156,7 +156,9 @@ wrapper_gproxy_set (DBusGProxy              *dbus_gproxy,
+           break;
+ 
+         default:
+-          panel_assert_not_reached ();
++          g_critical ("Received unknown plugin property %u for %s-%d",
++                      type, xfce_panel_plugin_provider_get_name (provider),
++                      xfce_panel_plugin_provider_get_unique_id (provider));
+           break;
+         }
+ 
+-- 
+2.11.0
+

Modified: desktop/branches/experimental/xfce4-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/patches/series?rev=9890&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/series	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/series	Fri Jun 23 11:22:31 2017
@@ -1,3 +1,5 @@
 01_support-non-multiarch-modules.patch
 02_pager-size-for-viewport.patch
 03_fix-spelling-error-in-binary.patch
+0001-Fix-datarootdir-declaration-in-.pc-files-Bug-13589.patch
+0001-Moved-new-property-OPACITY-to-end-make-wrapper-accep.patch

Modified: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install?rev=9890&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install	Fri Jun 23 11:22:31 2017
@@ -1,4 +1,3 @@
 usr/include/xfce4/libxfce4panel-1.0
 usr/lib/*/libxfce4panel-1.0.so
 usr/lib/*/pkgconfig/libxfce4panel-1.0.pc
-usr/share/gtk-doc/html/libxfce4panel-1.0

Modified: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs?rev=9890&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs	(original)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs	Fri Jun 23 11:22:31 2017
@@ -1 +1 @@
-libxfce4panel-1.0 4 xfce4-panel (>= 4.11), xfce4-panel (<< 4.13)
+libxfce4panel-1.0 4 xfce4-panel (>= 4.13), xfce4-panel (<< 4.15)




More information about the Pkg-xfce-commits mailing list