Fix compilation against glib-2.32 and make desktop file follow spec.

(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 63 insertions, 2 deletions

diff --git a/www-client/downman/ChangeLog b/www-client/downman/ChangeLog
index 63d6d693ac5e..af62ad60eb83 100644
--- a/www-client/downman/ChangeLog
+++ b/www-client/downman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/downman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/downman/ChangeLog,v 1.10 2012/05/03 06:01:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/downman/ChangeLog,v 1.11 2012/10/23 18:04:25 pacho Exp $
+
+  23 Oct 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/downman-0.0.5-fix-desktop.patch,
+  +files/downman-0.0.5-glib-single-includes.patch:
+  Fix compilation against glib-2.32 and make desktop file follow spec.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> downman-0.0.5-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -73,4 +78,3 @@
   28 Oct 2003; Seemant Kulleen <seemant@gentoo.org> downman-0.0.4.ebuild:
   download manager -- initial import. Ebuild thanks to: suka <suka@t0.or.at> in
   bug #26199
-
diff --git a/www-client/downman/files/downman-0.0.5-fix-desktop.patch b/www-client/downman/files/downman-0.0.5-fix-desktop.patch
new file mode 100644
index 000000000000..5779f91b99e9
--- /dev/null
+++ b/www-client/downman/files/downman-0.0.5-fix-desktop.patch
@@ -0,0 +1,30 @@
+--- clients/gnome/gdownman/gdownman.desktop.in~	2003-06-25 23:28:38.000000000 +0200
++++ clients/gnome/gdownman/gdownman.desktop.in	2012-10-23 19:59:48.261671840 +0200
+@@ -2,10 +2,9 @@
+ _Name=Gnome Download Manager
+ _GenericName=Download Manager
+ _Comment=Handle downloads
+-Categories=GNOME;Application;Network;
+-Encoding=UTF-8
++Categories=Network;
+ Exec=gdownman
+-Icon=gdownman.png
++Icon=gdownman
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+--- clients/gnome/gdownman/gdownman.desktop~	2003-06-25 23:49:58.000000000 +0200
++++ clients/gnome/gdownman/gdownman.desktop	2012-10-23 20:01:55.074878546 +0200
+@@ -2,10 +2,9 @@
+ Name=Gnome Download Manager
+ GenericName=Download Manager
+ Comment=Handle downloads
+-Categories=GNOME;Application;Network;
+-Encoding=UTF-8
++Categories=Network;
+ Exec=gdownman
+-Icon=gdownman.png
++Icon=gdownman
+ StartupNotify=true
+ Terminal=false
+ Type=Application
diff --git a/www-client/downman/files/downman-0.0.5-glib-single-includes.patch b/www-client/downman/files/downman-0.0.5-glib-single-includes.patch
new file mode 100644
index 000000000000..e85269118731
--- /dev/null
+++ b/www-client/downman/files/downman-0.0.5-glib-single-includes.patch
@@ -0,0 +1,27 @@
+Index: downman-0.0.5/utillib/commands.c
+===================================================================
+--- downman-0.0.5.orig/utillib/commands.c
++++ downman-0.0.5/utillib/commands.c
+@@ -1,7 +1,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #include "commands.h"
+ 
+Index: downman-0.0.5/utillib/sockets.c
+===================================================================
+--- downman-0.0.5.orig/utillib/sockets.c
++++ downman-0.0.5/utillib/sockets.c
+@@ -6,8 +6,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ 
+-#include <glib/gstring.h>
+-#include <glib/gspawn.h>
++#include <glib.h>
+ 
+ #include "commands.h"
+ #include "sockets.h"