diff options
| -rw-r--r-- | misc/xfce4-weather-plugin/Makefile | 3 | ||||
| -rw-r--r-- | misc/xfce4-weather-plugin/distinfo | 9 | ||||
| -rw-r--r-- | misc/xfce4-weather-plugin/files/patch-panel-plugin_weather-http.c | 69 | ||||
| -rw-r--r-- | misc/xfce4-weather-plugin/pkg-plist | 15 |
4 files changed, 17 insertions, 79 deletions
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile index fa772eeda18d..f82415c4d6ce 100644 --- a/misc/xfce4-weather-plugin/Makefile +++ b/misc/xfce4-weather-plugin/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfce4-weather-plugin -PORTVERSION= 0.6.0 -PORTREVISION= 3 +PORTVERSION= 0.6.2 CATEGORIES= misc xfce geography MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/ DIST_SUBDIR= xfce4 diff --git a/misc/xfce4-weather-plugin/distinfo b/misc/xfce4-weather-plugin/distinfo index e2f4a7f413fb..b48b818c84a1 100644 --- a/misc/xfce4-weather-plugin/distinfo +++ b/misc/xfce4-weather-plugin/distinfo @@ -1,6 +1,3 @@ -MD5 (xfce4/xfce4-weather-plugin-0.6.0.tar.bz2) = 6d7ed190950b2cc99c70b9481169f9fa -SHA256 (xfce4/xfce4-weather-plugin-0.6.0.tar.bz2) = 6dc0f306773273f98ee592e29c366ee9cb37830608d81c60d8ebf5f4b10c6f45 -SIZE (xfce4/xfce4-weather-plugin-0.6.0.tar.bz2) = 537194 -MD5 (xfce4/gcc295-xfce4-weather-plugin-2.patch) = 491a8e97c5fcce7e1e76e7febd346383 -SHA256 (xfce4/gcc295-xfce4-weather-plugin-2.patch) = 82b0cd11de9c5ae9e0ec6c9d7c1bff9dc2073f25face888c427a550d27dfbbc4 -SIZE (xfce4/gcc295-xfce4-weather-plugin-2.patch) = 1186 +MD5 (xfce4/xfce4-weather-plugin-0.6.2.tar.bz2) = ba89c4f384d3a32afd0b33acad021af0 +SHA256 (xfce4/xfce4-weather-plugin-0.6.2.tar.bz2) = 279e78f2efa97baec74ade294143dbc1f3f4bb5e3f457724e9dbbeac1c269605 +SIZE (xfce4/xfce4-weather-plugin-0.6.2.tar.bz2) = 555001 diff --git a/misc/xfce4-weather-plugin/files/patch-panel-plugin_weather-http.c b/misc/xfce4-weather-plugin/files/patch-panel-plugin_weather-http.c deleted file mode 100644 index f8be3fdeedf2..000000000000 --- a/misc/xfce4-weather-plugin/files/patch-panel-plugin_weather-http.c +++ /dev/null @@ -1,69 +0,0 @@ ---- panel-plugin/weather-http.c.orig Wed Jan 17 19:02:39 2007 -+++ panel-plugin/weather-http.c Mon May 14 17:04:58 2007 -@@ -83,14 +83,61 @@ http_connect (gchar *hostname, - fcntl (fd, F_SETFL, O_NONBLOCK); - - if ((connect (fd, (struct sockaddr *) &dest_host, sizeof (struct sockaddr)) -- == -1) && errno != EINPROGRESS) -+ == -1)) - { -- perror ("http_connect()"); -- return -1; -+ gboolean failed = TRUE; -+ -+ if(errno == EWOULDBLOCK || errno == EINPROGRESS || errno == EALREADY) -+ { -+ gint iters_left; -+ for(iters_left = 5; iters_left >= 0; iters_left--) { -+ fd_set wfd; -+ struct timeval tv = { 2, 0 }; -+ int sock_err = 0; -+ socklen_t sock_err_len = sizeof(int); -+ -+ FD_ZERO(&wfd); -+ FD_SET(fd, &wfd); -+ -+ DBG("checking for a connection..."); -+ -+ /* wait until the connect attempt finishes */ -+ if(select(FD_SETSIZE, NULL, &wfd, NULL, &tv) < 0) -+ break; -+ -+ /* check to see if it finished, and, if so, if there was an -+ * error, or if it completed successfully */ -+ if(FD_ISSET(fd, &wfd)) { -+ if(!getsockopt(fd, SOL_SOCKET, SO_ERROR, -+ &sock_err, &sock_err_len) -+ && !sock_err) -+ { -+ DBG(" connection succeeded"); -+ failed = FALSE; -+ } else { -+ g_warning(" connection failed"); -+ DBG(" connection failed: sock_err is %d", sock_err); -+ } -+ break; -+ } -+ } -+ } -+ -+ if(failed) -+ { -+ DBG("failed to connect"); -+ close(fd); -+ fd = -1; -+ perror ("http_connect()"); -+ return -1; -+ } - } -- else -- return fd; -+ -+ if(fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~(O_NONBLOCK))) { -+ g_warning("Unable to return socket to blocking mode."); -+ } - -+ return fd; - } - - diff --git a/misc/xfce4-weather-plugin/pkg-plist b/misc/xfce4-weather-plugin/pkg-plist index 2894d1f08517..4f7422954909 100644 --- a/misc/xfce4-weather-plugin/pkg-plist +++ b/misc/xfce4-weather-plugin/pkg-plist @@ -3,15 +3,23 @@ share/icons/hicolor/48x48/apps/xfce4-weather.png share/locale/ca/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/de/LC_MESSAGES/xfce4-weather-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/fi/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/gl/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/lt/LC_MESSAGES/xfce4-weather-plugin.mo +share/locale/nb_NO/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/nl/LC_MESSAGES/xfce4-weather-plugin.mo +share/locale/pa/LC_MESSAGES/xfce4-weather-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-weather-plugin.mo +share/locale/pt_PT/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/sk/LC_MESSAGES/xfce4-weather-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-weather-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-weather-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-weather-plugin.mo +share/xfce4/panel-plugins/weather.desktop share/xfce4/weather/icons/liquid/0.png share/xfce4/weather/icons/liquid/1.png share/xfce4/weather/icons/liquid/10.png @@ -61,11 +69,14 @@ share/xfce4/weather/icons/liquid/7.png share/xfce4/weather/icons/liquid/8.png share/xfce4/weather/icons/liquid/9.png share/xfce4/weather/icons/liquid/99.png -share/xfce4/panel-plugins/weather.desktop -@dirrmtry share/xfce4/panel-plugins @dirrm share/xfce4/weather/icons/liquid @dirrm share/xfce4/weather/icons @dirrm share/xfce4/weather +@dirrmtry share/xfce4/panel-plugins @dirrmtry share/xfce4 +@dirrmtry share/locale/ur/LC_MESSAGES +@dirrmtry share/locale/ur +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO @dirrmtry libexec/xfce4/panel-plugins @dirrmtry libexec/xfce4 |