Add gtk-2.6 compat patch. thanks to Fyodor Kupchick and Felix Riemann (#79204)

Package-Manager: portage-2.0.51.22-r1

5 files changed, 187 insertions, 6 deletions

diff --git a/net-misc/d4x/ChangeLog b/net-misc/d4x/ChangeLog
index c22dc896c96d..8c3013f1fef5 100644
--- a/net-misc/d4x/ChangeLog
+++ b/net-misc/d4x/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/d4x
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.26 2005/01/13 15:28:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.27 2005/06/24 14:00:51 liquidx Exp $
+
+*d4x-2.5.0-r1 (24 Jun 2005)
+
+  24 Jun 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/d4x-2.5.0-fix-compile-gtk26.patch, +d4x-2.5.0-r1.ebuild:
+  Add gtk-2.6 compat patch. thanks to Fyodor Kupchick and Felix Riemann
+  (#79204)
 
   13 Jan 2005; Alastair Tse <liquidx@gentoo.org> d4x-2.5.0.ebuild:
   add flags to enable downloads of greater than 2G (#73784)
diff --git a/net-misc/d4x/Manifest b/net-misc/d4x/Manifest
index 007be13bdf95..b9d815860f4a 100644
--- a/net-misc/d4x/Manifest
+++ b/net-misc/d4x/Manifest
@@ -1,13 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8e272c8363c151916b4ad547160cdf11 ChangeLog 4519
+MD5 6906382b2012ebe03f07d03f62c1b1c7 ChangeLog 4747
 MD5 f6b308640a90e3999b99273857f5cea7 d4x-2.03.ebuild 1508
 MD5 c1d99567166886bdb3e9f215fca712c0 d4x-2.4.1-r1.ebuild 1982
 MD5 e05e1950df1ce9a17eb6d72c5b542863 d4x-2.5.0_rc2.ebuild 1806
 MD5 cbf5c5aaf2b961fa27a574a0ada32761 d4x-2.5.0_rc4.ebuild 1877
 MD5 5d41ee33c5ff557bad7627cbc67c3b6f metadata.xml 224
 MD5 36d22c70e92c701495997f556665eefd d4x-2.5.0.ebuild 1818
+MD5 586f2c8f75ea8e139ab09d52358ec269 d4x-2.5.0-r1.ebuild 1870
 MD5 07dde74dfe302bab95327f285a5a16ba files/d4x-2.4.1-fix-statusbar-crash.patch 772
 MD5 5b49dbe10d588970e6f766cfdb310e67 files/d4x-2.5.0_rc2-gtk24.patch 279
 MD5 7025e0ce352893c55b23ffeea8f87d1c files/d4x-2.5.0_rc4-fix-cast.patch 317
@@ -17,10 +18,12 @@ MD5 3e8783cc051415a9ee4f756fcc45c925 files/digest-d4x-2.4.1-r1 62
 MD5 fc389107a8b5d040a989fe1d220beb3e files/digest-d4x-2.5.0_rc2 65
 MD5 145551a0dbe79421f8b102a726996ea7 files/digest-d4x-2.5.0_rc4 65
 MD5 4f038da47df5648c8799469e62ec03b6 files/digest-d4x-2.5.0 67
+MD5 4f038da47df5648c8799469e62ec03b6 files/digest-d4x-2.5.0-r1 67
+MD5 512e25cdcccd73401a82518c6e49ae8c files/d4x-2.5.0-fix-compile-gtk26.patch 2957
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFB5pVnRkyva5PS18kRAghVAJ94j3IlRDlatUnQ5a7kY7N3zLvbcACfeCEZ
-S7ZYUSAECdatH3PQ6getOVk=
-=174Z
+iD8DBQFCvBIwTM53OX+9xmMRAussAJ9pvHyf1FVas9rw6R4yyIyEoUuZdACgj/QC
+R3099Lh1pr3s1yIG7YlC1Sc=
+=wwSl
 -----END PGP SIGNATURE-----
diff --git a/net-misc/d4x/d4x-2.5.0-r1.ebuild b/net-misc/d4x/d4x-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..2a2b375ee891
--- /dev/null
+++ b/net-misc/d4x/d4x-2.5.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.0-r1.ebuild,v 1.1 2005/06/24 14:00:51 liquidx Exp $
+
+IUSE="nls esd gnome oss kde"
+
+inherit eutils flag-o-matic
+
+S="${WORKDIR}/${P}final"
+DESCRIPTION="GTK based download manager for X."
+SRC_URI="http://www.krasu.ru/soft/chuchelo/files/${P}final.tar.gz"
+HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="Artistic"
+
+DEPEND=">=x11-libs/gtk+-2.6.0
+	>=dev-libs/glib-2.6.0
+	>=sys-devel/gettext-0.11.2
+	esd? ( >=media-sound/esound-0.2.7 )"
+
+src_unpack() {
+	unpack ${A}
+
+	# Use our own $CXXFLAGS
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-compile-gtk26.patch
+	cp configure configure.orig
+	sed -e "s:CXXFLAGS=\"-O2\":CXXFLAGS=\"${CXXFLAGS}\":g;s:OPTFLAGS=\"-O2\":OPTFLAGS=\"\":g" \
+		configure.orig >configure
+}
+
+src_compile() {
+
+	myconf=""
+	append-flags -D_FILE_OFFSET_BITS=64
+
+	use nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+
+	use esd \
+		&& myconf="${myconf} --enable-esd" \
+		|| myconf="${myconf} --disable-esd"
+
+	use oss \
+		&& myconf="${myconf} --enable-oss" \
+		|| myconf="${myconf} --disable-oss"
+
+	econf --enable-release \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install () {
+
+	dodir /usr/bin
+	dodir /usr/share/d4x
+
+	einstall || die
+
+	insinto /usr/share/pixmaps
+	doins share/*.png share/*.xpm
+
+	if use kde
+	then
+		insinto /usr/share/applnk/Internet
+		newins share/nt.desktop d4x.desktop
+	fi
+
+	if use gnome
+	then
+		echo "Categories=Application;Network;" >> ${S}/share/nt.desktop
+		insinto /usr/share/applications
+		newins share/nt.desktop d4x.desktop
+	fi
+
+	rm -rf ${D}/usr/share/d4x/{FAQ*,INSTALL*,README*,LICENSE,NAMES,TROUBLES}
+	dodoc AUTHORS COPYING ChangeLog* NEWS PLANS TODO \
+		DOC/{FAQ*,LICENSE,NAMES,README*,TROUBLES,THANKS}
+}
diff --git a/net-misc/d4x/files/d4x-2.5.0-fix-compile-gtk26.patch b/net-misc/d4x/files/d4x-2.5.0-fix-compile-gtk26.patch
new file mode 100644
index 000000000000..0d30860fdfb0
--- /dev/null
+++ b/net-misc/d4x/files/d4x-2.5.0-fix-compile-gtk26.patch
@@ -0,0 +1,87 @@
+--- main/face/lod.cc.orig	2005-01-26 17:36:46.380944672 +0100
++++ main/face/lod.cc	2005-01-26 17:36:52.208058816 +0100
+@@ -127,20 +127,20 @@
+ 
+ /***************************************************************/
+ 
+-struct GtkCellRendererProgress{
++struct GtkCellRendererProgressd4x{
+ 	GtkCellRenderer parent;
+ 	gfloat percent;
+ 	tDownload *dwn;
+ };
+ 
+-struct GtkCellRendererProgressClass{
++struct GtkCellRendererProgressd4xClass{
+ 	GtkCellRendererClass parent_class;
+ };
+ 
+-GtkType          gtk_cell_renderer_progress_get_type (void);
++//GtkType          gtk_cell_renderer_progress_get_type (void);
+-GtkCellRenderer *gtk_cell_renderer_progress_new      (void);
++//GtkCellRenderer *gtk_cell_renderer_progress_new      (void);
+ 
+-static void gtk_cell_renderer_progress_init (GtkCellRendererProgress *cellpixbuf){
++static void gtk_cell_renderer_progress_init (GtkCellRendererProgressd4x *cellpixbuf){
+ };
+ 
+ static void
+@@ -172,7 +172,7 @@
+ 					 guint         param_id,
+ 					 const GValue *value,
+ 					 GParamSpec   *pspec){
+-	GtkCellRendererProgress *renderer = (GtkCellRendererProgress *)object;
++	GtkCellRendererProgressd4x *renderer = (GtkCellRendererProgressd4x *)object;
+ 	switch (param_id){
+ 	case 1:
+ 		renderer->percent=g_value_get_float(value);
+@@ -195,7 +195,7 @@
+ 				   GdkRectangle       *expose_area,
+ 				   GtkCellRendererState flags){
+ 	char tmpc[100];
+-	float p=((GtkCellRendererProgress*)cell)->percent;
++	float p=((GtkCellRendererProgressd4x*)cell)->percent;
+ 
+ 	if (p>99.0 && p<100.0)
+ 		sprintf(tmpc,"%.1f",p);
+@@ -223,7 +223,7 @@
+ 	switch (CFG.PROGRESS_MODE){
+ 	case 2:{
+ 		if (p<=0) break;
+-		tDownload *temp=((GtkCellRendererProgress*)cell)->dwn;;
++		tDownload *temp=((GtkCellRendererProgressd4x*)cell)->dwn;;
+ 		if (temp && temp->segments && temp->finfo.size>0){
+ 			temp->segments->lock_public();
+ 			tSegment *tmp=temp->segments->get_first();
+@@ -271,7 +271,7 @@
+ };
+ 
+ 
+-static void gtk_cell_renderer_progress_class_init (GtkCellRendererProgressClass *klass){
++static void gtk_cell_renderer_progress_class_init (GtkCellRendererProgressd4xClass *klass){
+ 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ 	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
+ 
+@@ -300,19 +300,19 @@
+ 	{
+ 		static const GTypeInfo cell_progress_info =
+ 		{
+-			sizeof (GtkCellRendererProgressClass),
++			sizeof (GtkCellRendererProgressd4xClass),
+ 			NULL,		/* base_init */
+ 			NULL,		/* base_finalize */
+ 			(GClassInitFunc) gtk_cell_renderer_progress_class_init,
+ 			NULL,		/* class_finalize */
+ 			NULL,		/* class_data */
+-			sizeof (GtkCellRendererProgress),
++			sizeof (GtkCellRendererProgressd4x),
+ 			0,              /* n_preallocs */
+ 			(GInstanceInitFunc) gtk_cell_renderer_progress_init,
+ 		};
+ 
+ 		cell_progress_type = g_type_register_static (GTK_TYPE_CELL_RENDERER,
+-							     "GtkCellRendererProgress",
++							     "GtkCellRendererProgressd4x",
+ 							     &cell_progress_info,
+ 							     GTypeFlags(0));
+ 	}
diff --git a/net-misc/d4x/files/digest-d4x-2.5.0-r1 b/net-misc/d4x/files/digest-d4x-2.5.0-r1
new file mode 100644
index 000000000000..3361a17ec683
--- /dev/null
+++ b/net-misc/d4x/files/digest-d4x-2.5.0-r1
@@ -0,0 +1 @@
+MD5 c2b2f5571c2028dd845563e69a1d55c3 d4x-2.5.0final.tar.gz 1766770