xfce4-weather-plugin: updated to 0.8.0

4 files changed, 40 insertions, 74 deletions

diff --git a/xfce4-weather-plugin/.footprint b/xfce4-weather-plugin/.footprint
index 659c182..cc28b9d 100644
--- a/xfce4-weather-plugin/.footprint
+++ b/xfce4-weather-plugin/.footprint
@@ -1,8 +1,9 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/xfce4/
-drwxr-xr-x	root/root	usr/lib/xfce4/panel-plugins/
--rwxr-xr-x	root/root	usr/lib/xfce4/panel-plugins/xfce4-weather-plugin
+drwxr-xr-x	root/root	usr/lib/xfce4/panel/
+drwxr-xr-x	root/root	usr/lib/xfce4/panel/plugins/
+-rwxr-xr-x	root/root	usr/lib/xfce4/panel/plugins/xfce4-weather-plugin
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
@@ -10,57 +11,36 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/xfce4-weather.png
 drwxr-xr-x	root/root	usr/share/xfce4/
-drwxr-xr-x	root/root	usr/share/xfce4/panel-plugins/
--rw-r--r--	root/root	usr/share/xfce4/panel-plugins/weather.desktop
+drwxr-xr-x	root/root	usr/share/xfce4/panel/
+drwxr-xr-x	root/root	usr/share/xfce4/panel/plugins/
+-rw-r--r--	root/root	usr/share/xfce4/panel/plugins/weather.desktop
 drwxr-xr-x	root/root	usr/share/xfce4/weather/
 drwxr-xr-x	root/root	usr/share/xfce4/weather/icons/
 drwxr-xr-x	root/root	usr/share/xfce4/weather/icons/liquid/
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/0.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/1.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/10.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/11.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/12.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/13.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/14.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/15.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/16.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/17.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/18.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/19.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/2.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/20.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/21.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/22.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/23.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/24.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/25.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/26.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/27.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/28.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/29.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/3.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/30.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/31.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/32.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/33.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/34.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/35.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/36.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/37.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/38.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/39.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/4.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/40.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/41.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/42.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/43.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/44.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/45.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/46.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/47.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/5.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/6.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/7.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/8.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/9.png
--rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/99.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/CLOUD-night.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/CLOUD.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/FOG.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/LIGHTCLOUD-night.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/LIGHTCLOUD.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/LIGHTRAIN.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/LIGHTRAINSUN-night.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/LIGHTRAINSUN.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/LIGHTRAINTHUNDER.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/LIGHTRAINTHUNDERSUN-night.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/LIGHTRAINTHUNDERSUN.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/NODATA.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/PARTLYCLOUD-night.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/PARTLYCLOUD.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/RAIN.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/RAINTHUNDER.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SLEET.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SLEETSUN.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SLEETSUNTHUNDER.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SLEETTHUNDER.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SNOW.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SNOWSUN-night.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SNOWSUN.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SNOWSUNTHUNDER.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SNOWTHUNDER.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SUN-night.png
+-rw-r--r--	root/root	usr/share/xfce4/weather/icons/liquid/SUN.png
diff --git a/xfce4-weather-plugin/.md5sum b/xfce4-weather-plugin/.md5sum
index 64cdea1..9c193db 100644
--- a/xfce4-weather-plugin/.md5sum
+++ b/xfce4-weather-plugin/.md5sum
@@ -1,2 +1 @@
-9574b129a295571b23588a55a1c2e4ae  weathercom.diff
-03c972d13eba5cd226432ff66e3ff282  xfce4-weather-plugin-0.7.4.tar.bz2
+77d23df416f21d3a4cd8253509b5f0cb  xfce4-weather-plugin-0.8.0.tar.bz2
diff --git a/xfce4-weather-plugin/Pkgfile b/xfce4-weather-plugin/Pkgfile
index d3cb48f..35dabad 100644
--- a/xfce4-weather-plugin/Pkgfile
+++ b/xfce4-weather-plugin/Pkgfile
@@ -6,14 +6,15 @@
 # Group: xfce4
 
 name=xfce4-weather-plugin
-version=0.7.4
+version=0.8.0
 release=1
-source=(http://archive.xfce.org/src/panel-plugins/$name/${version%.*}/$name-$version.tar.bz2
-        weathercom.diff)
+source=(http://archive.xfce.org/src/panel-plugins/$name/${version%.*}/$name-$version.tar.bz2)
+
 build() {
   cd $name-$version
 
-  patch -p1 -i $SRC/weathercom.diff
+  sed -i panel-plugin/* -e 's|panel-plugins|panel/plugins|g'
+
   ./configure --prefix=/usr \
               --libexecdir=/usr/lib \
               --disable-debug
@@ -22,6 +23,6 @@ build() {
   make DESTDIR=$PKG install
 
   rm -rf $PKG/usr/share/locale
-  find $PKG/usr/share/xfce4/panel-plugins -type f -name '*.desktop' \
+  find $PKG/usr/share/xfce4/panel/plugins -type f -name '*.desktop' \
     -exec sed -r '/\[.+\]=/d' -i {} \;
 }
diff --git a/xfce4-weather-plugin/weathercom.diff b/xfce4-weather-plugin/weathercom.diff
deleted file mode 100644
index 89b9707..0000000
--- a/xfce4-weather-plugin/weathercom.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur xfce4-weather-plugin-0.7.4/panel-plugin/weather.h xfce4-weather-plugin-0.7.4.new/panel-plugin/weather.h
---- xfce4-weather-plugin-0.7.4/panel-plugin/weather.h   2011-02-02 21:31:29.000000000 +0100
-+++ xfce4-weather-plugin-0.7.4.new/panel-plugin/weather.h       2011-11-13 09:03:17.756311979 +0100
-@@ -21,8 +21,8 @@
- #include <libxfce4panel/libxfce4panel.h>
- #include <libxfce4util/libxfce4util.h>
- #define PLUGIN_WEBSITE   "http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
--#define PARTNER_ID       "1121946239"
--#define LICENSE_KEY      "3c4cd39ee5dec84f"
-+#define PARTNER_ID       "1287722164"
-+#define LICENSE_KEY      "e11ec82daa20d876"
-
- G_BEGIN_DECLS
-