Fri Jul 5 01:40:49 PDT 2013

2 files changed, 25 insertions, 29 deletions

diff --git a/community/gwget/PKGBUILD b/community/gwget/PKGBUILD
index d51d4d328..68d4d72f5 100644
--- a/community/gwget/PKGBUILD
+++ b/community/gwget/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93450 2013-07-03 13:33:10Z bgyorgy $
+# $Id: PKGBUILD 93470 2013-07-04 00:59:01Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=gwget
 pkgver=1.0.4
-pkgrel=6
+pkgrel=7
 pkgdesc="Download manager for GNOME"
 arch=('i686' 'x86_64')
 url="http://projects.gnome.org/gwget/"
@@ -22,7 +22,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 sha256sums=('a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f'
             '84efbbea9c2a91c60288edb67264bbdb4ec2c579cf95b3baa8282040a1b65c76'
             '319c4795d0034c4adacf302db697d966ca228fc1bbe9778af9dadcfb0c2531c8'
-            '465216f441271fffdd4530bc07829e733e0d3476fdc34f1f028da82cfc05373d')
+            'e95bc7d60bdd98c81d0b44c0d62122889536ee5bc0013d2daaa74244252d0c53')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gwget/drop-libgnomeui.patch b/community/gwget/drop-libgnomeui.patch
index 7f1f551a6..d88bac58b 100644
--- a/community/gwget/drop-libgnomeui.patch
+++ b/community/gwget/drop-libgnomeui.patch
@@ -1,6 +1,6 @@
 diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
---- gwget-1.0.4.orig/configure.ac	2013-07-03 14:43:02.845220000 +0200
-+++ gwget-1.0.4/configure.ac	2013-07-03 14:43:57.003180469 +0200
+--- gwget-1.0.4.orig/configure.ac	2013-07-04 02:34:53.853338000 +0200
++++ gwget-1.0.4/configure.ac	2013-07-04 02:35:57.021516447 +0200
 @@ -14,15 +14,13 @@
  
  AM_GCONF_SOURCE_2
@@ -21,7 +21,7 @@ diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac
  			
 diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/src/custom-cell-renderer-progressbar.c
 --- gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c	2009-06-16 19:58:06.000000000 +0200
-+++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c	2013-07-04 02:35:57.024849860 +0200
 @@ -21,8 +21,8 @@
  
  #include <config.h>
@@ -35,7 +35,7 @@ diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/s
  
 diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-application.c
 --- gwget-1.0.4.orig/src/gwget-application.c	2009-06-20 10:12:37.000000000 +0200
-+++ gwget-1.0.4/src/gwget-application.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/gwget-application.c	2013-07-04 02:35:57.024849860 +0200
 @@ -21,8 +21,6 @@
  #include "gwget-application.h"
  
@@ -95,7 +95,7 @@ diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-applic
  
 diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c
 --- gwget-1.0.4.orig/src/main.c	2009-06-20 10:12:37.000000000 +0200
-+++ gwget-1.0.4/src/main.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/main.c	2013-07-04 02:35:57.024849860 +0200
 @@ -17,11 +17,13 @@
  
  #include <config.h>
@@ -146,7 +146,7 @@ diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c
  }
 diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c
 --- gwget-1.0.4.orig/src/main_window.c	2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/main_window.c	2013-07-03 14:46:01.992833090 +0200
++++ gwget-1.0.4/src/main_window.c	2013-07-04 02:35:57.024849860 +0200
 @@ -15,7 +15,9 @@
   */
   
@@ -197,7 +197,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c
  	/* Listen to changes to the key. */
 diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb.c
 --- gwget-1.0.4.orig/src/main_window_cb.c	2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/main_window_cb.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/main_window_cb.c	2013-07-04 02:45:43.468873631 +0200
 @@ -15,7 +15,9 @@
   */
   
@@ -209,40 +209,36 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb.
  #include <gconf/gconf-client.h>
  #include <signal.h>
  
-@@ -217,7 +219,10 @@
+@@ -217,6 +219,9 @@
  	gchar *size;
  	int width = 16, height = 16;
  	gdouble perc;
--	
-+	GThemedIcon *icon;
-+       const gchar *const *icon_names;
++	GIcon *icon;
++	const gchar *const *icon_names;
 +	gint i;
-+
+ 	
  	gtk_list_store_append (GTK_LIST_STORE(model), &iter); 
  	size = g_strdup_printf ("%d kB", (guint32)(gwgetdata->cur_size + 512) / 1024);
- 	gtk_list_store_set (GTK_LIST_STORE(model), &iter,URL_COLUMN,gwgetdata->url,
-@@ -243,10 +248,15 @@
+@@ -243,8 +248,14 @@
  	theme = gtk_icon_theme_get_default ();
  	if (!gwgetdata->recursive) {
  		content_type = g_content_type_guess (gwgetdata->local_filename, NULL, 0, NULL);
 -		gwgetdata->icon_name = gnome_icon_lookup (theme, NULL, NULL, NULL, NULL,
 -	 							content_type, GNOME_ICON_LOOKUP_FLAGS_NONE, NULL);
--	} else {
- 		gwgetdata->icon_name = g_strdup("gtk-refresh");
-+		icon = (GThemedIcon*) g_content_type_get_icon (content_type);
-+		icon_names = g_themed_icon_get_names (icon);
-+		for (i=0; i<sizeof(icon_names)-1; i++) {
++		icon = g_content_type_get_icon (content_type);
++		icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
++		for (i=0; i < g_strv_length ((gchar **)icon_names); i++) {
 +			if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), icon_names[i])) {
 +	 			gwgetdata->icon_name = icon_names[i];
 +				break;
 +			}
 +		}
+ 	} else {
+ 		gwgetdata->icon_name = g_strdup("gtk-refresh");
  	}
- 	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
- 	width *= 2;
 diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c
 --- gwget-1.0.4.orig/src/new_window.c	2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/new_window.c	2013-07-03 14:43:57.003180469 +0200
++++ gwget-1.0.4/src/new_window.c	2013-07-04 02:35:57.028183273 +0200
 @@ -24,7 +24,8 @@
  */
  
@@ -254,8 +250,8 @@ diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c
  #include "new_window.h"
  #include "main_window.h"
 diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c
---- gwget-1.0.4.orig/src/systray.c	2013-07-03 14:43:02.845220000 +0200
-+++ gwget-1.0.4/src/systray.c	2013-07-03 14:43:57.006513881 +0200
+--- gwget-1.0.4.orig/src/systray.c	2013-07-04 02:34:53.920006000 +0200
++++ gwget-1.0.4/src/systray.c	2013-07-04 02:35:57.028183273 +0200
 @@ -1,6 +1,7 @@
  
  #include <config.h>
@@ -267,7 +263,7 @@ diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c
  #include "systray.h"
 diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c
 --- gwget-1.0.4.orig/src/utils.c	2009-08-14 19:19:51.000000000 +0200
-+++ gwget-1.0.4/src/utils.c	2013-07-03 14:43:57.006513881 +0200
++++ gwget-1.0.4/src/utils.c	2013-07-04 02:35:57.028183273 +0200
 @@ -14,7 +14,8 @@
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -280,7 +276,7 @@ diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c
  #include "gwget_data.h"
 diff -Naur gwget-1.0.4.orig/src/wget-log.c gwget-1.0.4/src/wget-log.c
 --- gwget-1.0.4.orig/src/wget-log.c	2009-10-04 20:29:35.000000000 +0200
-+++ gwget-1.0.4/src/wget-log.c	2013-07-03 14:43:57.006513881 +0200
++++ gwget-1.0.4/src/wget-log.c	2013-07-04 02:35:57.028183273 +0200
 @@ -25,7 +25,9 @@
  #define _FILE_OFFSET_BITS 64