[Pkg-xfce-commits] r7324 - in goodies/branches/experimental/xfce4-weather-plugin/debian: . patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sun Mar 3 10:02:38 UTC 2013 

Author: mrpouit-guest
Date: 2013-03-03 22:02:38 +0000 (Sun, 03 Mar 2013)
New Revision: 7324

Added:
   goodies/branches/experimental/xfce4-weather-plugin/debian/patches/01_link-libm.patch
   goodies/branches/experimental/xfce4-weather-plugin/debian/patches/02_fix-color-parsing.patch
   goodies/branches/experimental/xfce4-weather-plugin/debian/patches/03_fix-panel-icon-size.patch
   goodies/branches/experimental/xfce4-weather-plugin/debian/patches/series
Modified:
   goodies/branches/experimental/xfce4-weather-plugin/debian/changelog
   goodies/branches/experimental/xfce4-weather-plugin/debian/control
   goodies/branches/experimental/xfce4-weather-plugin/debian/rules
Log:
* debian/patches:
  - 01_link-libm.patch: added, fix build
  - 02_fix-color-parsing.patch: added, load the saved color from the config
  - 03_fix-panel-icon-size.patch: added, fix cut off panel icon.
* debian/control: add b-deps on xfce4-dev-tools, automake, autoconf and libtool, needed by
  xdt-autogen.
* debian/rules: run xdt-autogen and clean up afterwards due to the libm build
  fix.

Modified: goodies/branches/experimental/xfce4-weather-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/changelog	2013-03-03 16:17:44 UTC (rev 7323)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/changelog	2013-03-03 22:02:38 UTC (rev 7324)
@@ -1,11 +1,22 @@
 xfce4-weather-plugin (0.8.3-1) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * New upstream release.
   * debian/rules:
     - enable all hardening rules.
   * debian/control:
     - add build-dep on libsoup2.4-dev.
 
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 01_link-libm.patch: added, fix build
+    - 02_fix-color-parsing.patch: added, load the saved color from the config
+    - 03_fix-panel-icon-size.patch: added, fix cut off panel icon.
+  * debian/control: add b-deps on xfce4-dev-tools, automake, autoconf and libtool, needed by
+    xdt-autogen.
+  * debian/rules: run xdt-autogen and clean up afterwards due to the libm build
+    fix.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 18 Feb 2013 22:06:05 +0100
 
 xfce4-weather-plugin (0.8.2-1) experimental; urgency=low

Modified: goodies/branches/experimental/xfce4-weather-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/control	2013-03-03 16:17:44 UTC (rev 7323)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/control	2013-03-03 22:02:38 UTC (rev 7324)
@@ -6,7 +6,7 @@
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: autotools-dev, debhelper (>= 9), dpkg-dev (>= 1.16.1),
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl, intltool, 
- libxfce4ui-1-dev, libsoup2.4-dev
+ libxfce4ui-1-dev, libsoup2.4-dev, xfce4-dev-tools, automake, autoconf, libtool
 Standards-Version: 3.9.3
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-weather-plugin/

Added: goodies/branches/experimental/xfce4-weather-plugin/debian/patches/01_link-libm.patch
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/patches/01_link-libm.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/patches/01_link-libm.patch	2013-03-03 22:02:38 UTC (rev 7324)
@@ -0,0 +1,50 @@
+From 69842d364cc2dc453445926e4cdf036ab245b871 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt at gmx.at>
+Date: Wed, 20 Feb 2013 14:08:08 +0000
+Subject: Link to libmath and clean up AC_CHECK_HEADERS.
+
+(Patch slightly altered to patch configure.ac instead of configure.ac.in, not
+present in release tarballs)
+
+Origin: upstream, http://git.xfce.org/panel-plugins/xfce4-weather-plugin/commit/?id=69842d364cc2dc453445926e4cdf036ab245b871
+
+---
+diff --git a/configure.ac b/configure.ac
+index 6b3492b..d95bab0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,9 +45,9 @@ dnl **********************************
+ dnl *** Check for standard headers ***
+ dnl **********************************
+ AC_HEADER_STDC()
+-AC_CHECK_HEADERS([string.h fcntl.h errno.h sys/socket.h netdb.h \
+-                  netinet/in.h sys/types.h time.h unistd.h stdio.h \
+-                  sys/stat.h stddef.h stdlib.h netinet/in.h])
++AC_CHECK_HEADERS([math.h stdarg.h stddef.h stdlib.h string.h sys/stat.h time.h])
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
+ 
+ dnl ******************************
+ dnl *** Check for i18n support ***
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 901197e..3c63d2d 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -41,13 +41,13 @@ libweather_la_CFLAGS =						\
+ 	$(LIBXML_CFLAGS)
+ 
+ libweather_la_LIBADD =						\
++	$(LIBM)                                 \
+ 	$(LIBXFCE4PANEL_LIBS)						\
+ 	$(LIBXFCE4UTIL_LIBS)						\
+ 	$(LIBXFCE4UI_LIBS)						\
+ 	$(GTK_LIBS)							\
+ 	$(LIBXML_LIBS)							\
+-	$(SOUP_LIBS)						\
+-	$(LIBRESOLV)
++	$(SOUP_LIBS)
+ 
+ libweather_la_LDFLAGS = \
+ 	-avoid-version \
+--
+cgit v0.9.0.3

Added: goodies/branches/experimental/xfce4-weather-plugin/debian/patches/02_fix-color-parsing.patch
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/patches/02_fix-color-parsing.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/patches/02_fix-color-parsing.patch	2013-03-03 22:02:38 UTC (rev 7324)
@@ -0,0 +1,25 @@
+From 462e85dfd54e9a3bdf6c330c602a6545bccce585 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt at gmx.at>
+Date: Wed, 20 Feb 2013 14:25:09 +0000
+Subject: Fix color parsing when reading config file.
+
+This turned out to be a stupid copy & paste mistake.
+
+Origin: upstream, http://git.xfce.org/panel-plugins/xfce4-weather-plugin/commit/?id=462e85dfd54e9a3bdf6c330c602a6545bccce585
+
+---
+diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
+index 710c33c..4a2e3c3 100644
+--- a/panel-plugin/weather.c
++++ b/panel-plugin/weather.c
+@@ -884,7 +884,7 @@ xfceweather_read_config(XfcePanelPlugin *plugin,
+ 
+     value = xfce_rc_read_entry(rc, "scrollbox_color", NULL);
+     if (value)
+-        gdk_color_parse("#rrrrggggbbbb", &(data->scrollbox_color));
++        gdk_color_parse(value, &(data->scrollbox_color));
+ 
+     data->scrollbox_use_color =
+         xfce_rc_read_bool_entry(rc, "scrollbox_use_color", FALSE);
+--
+cgit v0.9.0.3

Added: goodies/branches/experimental/xfce4-weather-plugin/debian/patches/03_fix-panel-icon-size.patch
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/patches/03_fix-panel-icon-size.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/patches/03_fix-panel-icon-size.patch	2013-03-03 22:02:38 UTC (rev 7324)
@@ -0,0 +1,27 @@
+From d1f9e9ab06231f876a1d6b607660d36d8a0fb902 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt at gmx.at>
+Date: Mon, 25 Feb 2013 21:52:08 +0000
+Subject: Fix panel icon size.
+
+Since the toggle button has been added, or maybe even before that,
+the icon is cut off at the borders. Fix this by subtracting two pixels
+from the icon size.
+
+Origin: upstream, http://git.xfce.org/panel-plugins/xfce4-weather-plugin/commit/?id=d1f9e9ab06231f876a1d6b607660d36d8a0fb902
+
+---
+diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
+index 4a2e3c3..2e15565 100644
+--- a/panel-plugin/weather.c
++++ b/panel-plugin/weather.c
+@@ -295,6 +295,8 @@ update_icon(plugin_data *data)
+         data->size != data->panel_size)
+         size *= 2;
+ #endif
++    /* take into account the border of the toggle button */
++    size -= 2;
+ 
+     /* set panel icon according to current weather conditions */
+     conditions = get_current_conditions(data->weatherdata);
+--
+cgit v0.9.0.3

Added: goodies/branches/experimental/xfce4-weather-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/patches/series	                        (rev 0)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/patches/series	2013-03-03 22:02:38 UTC (rev 7324)
@@ -0,0 +1,3 @@
+01_link-libm.patch
+02_fix-color-parsing.patch
+03_fix-panel-icon-size.patch

Modified: goodies/branches/experimental/xfce4-weather-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/rules	2013-03-03 16:17:44 UTC (rev 7323)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/rules	2013-03-03 22:02:38 UTC (rev 7324)
@@ -10,3 +10,13 @@
 	-rm -rf debian/`dh_listpackages`/usr/lib/*/xfce4/panel/plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/*/xfce4/panel/plugins/*.la
 	dh_install
+
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f $$(find -name 'Makefile.in*')
+	rm -f INSTALL aclocal.m4 config.guess config.sub configure
+	rm -f depcomp install-sh ltmain.sh missing mkinstalldirs

More information about the Pkg-xfce-commits mailing list