fix miscompile

6 files changed, 67 insertions, 22 deletions

diff --git a/net-misc/d4x/ChangeLog b/net-misc/d4x/ChangeLog
index f24a329bc8ab..c017728e61e0 100644
--- a/net-misc/d4x/ChangeLog
+++ b/net-misc/d4x/ChangeLog
@@ -1,13 +1,19 @@
 # ChangeLog for net-misc/d4x
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.8 2003/03/09 16:25:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.9 2003/03/30 17:46:30 azarah Exp $
+
+*d4x-2.4.1-r1 (30 Mar 2003)
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> d4x-2.4.1-r1.ebuild :
+  Fix a miscompile for me with gcc-3.2.2 and CFLAGS="-O2".  Fix indentation
+  of KDE menu stuff.
 
 *d4x-2.4.1 (08 Mar 2003)
 
-  09 Mar 2003; Alastair Tse <liquidx@gentoo.org> d4x-2.4.1.ebuild:
+  09 Mar 2003; Alastair Tse <liquidx@gentoo.org> d4x-2.4.1.ebuild :
   Installs KDE menu entry. Cleaned deps.
 
-  08 Mar 2003; Alastair Tse <liquidx@gentoo.org> d4x-2.4.1.ebuild:
+  08 Mar 2003; Alastair Tse <liquidx@gentoo.org> d4x-2.4.1.ebuild :
   Version Bump. Marked as unstable. Fixes #17023.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
diff --git a/net-misc/d4x/d4x-2.4_beta.ebuild b/net-misc/d4x/d4x-2.4.1-r1.ebuild
index 7f6951cabdbd..c006a18ae797 100644
--- a/net-misc/d4x/d4x-2.4_beta.ebuild
+++ b/net-misc/d4x/d4x-2.4.1-r1.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.4_beta.ebuild,v 1.4 2003/02/28 16:55:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.4.1-r1.ebuild,v 1.1 2003/03/30 17:46:30 azarah Exp $
 
-IUSE="nls esd gnome oss"
+IUSE="nls esd gnome oss kde"
+
+inherit eutils
 
 S="${WORKDIR}/${P/_}"
 DESCRIPTION="GTK based download manager for X."
 SRC_URI="http://www.krasu.ru/soft/chuchelo/files/${P/_}.tar.gz"
 HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
 
-# Currently seems to be pretty borked
-KEYWORDS="-x86 -ppc -sparc  -alpha"
+KEYWORDS="~x86"
 SLOT="0"
 LICENSE="Artistic"
 
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
+DEPEND=">=x11-libs/gtk+-2.0.6
+	>=dev-libs/glib-2.0.6
+	>=sys-devel/gettext-0.11.2    
 	esd? ( >=media-sound/esound-0.2.7 )"
 
-
 src_unpack() {
 
 	unpack ${A}
@@ -26,8 +27,12 @@ src_unpack() {
 	# Use our own $CXXFLAGS
 	cd ${S}
 	cp configure configure.orig
-	sed -e "s:CXXFLAGS=\"-O2\":CXXFLAGS=\"${CXXFLAGS}\":g" \
+	sed -e "s:CXXFLAGS=\"-O2\":CXXFLAGS=\"${CXXFLAGS}\":g;s:OPTFLAGS=\"-O2\":OPTFLAGS=\"\":g" \
 		configure.orig >configure
+
+	# Fix a miscompile with gcc-3.2.2 and CFLAGS="-O2"
+	# <azarah@gentoo.org> (30 Mar 2003)
+	epatch ${FILESDIR}/${P}-fix-statusbar-crash.patch
 }
 
 src_compile() {
@@ -60,12 +65,19 @@ src_install () {
 	einstall || die
 
 	insinto /usr/share/pixmaps
-	doins *.png *.xpm
+	doins share/*.png share/*.xpm
+
+	if [ -n "`use kde`" ]
+	then
+		insinto /usr/share/applnk/Internet
+		newins share/nt.desktop d4x.desktop
+	fi
 
 	if [ -n "`use gnome`" ]
 	then
-		insinto /usr/share/gnome/apps/Internet
-		newins nt.desktop d4x.desktop
+        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}
diff --git a/net-misc/d4x/d4x-2.4.1.ebuild b/net-misc/d4x/d4x-2.4.1.ebuild
index 1d3fa14b7675..c7bb6b583caf 100644
--- a/net-misc/d4x/d4x-2.4.1.ebuild
+++ b/net-misc/d4x/d4x-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.4.1.ebuild,v 1.3 2003/03/09 17:20:28 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.4.1.ebuild,v 1.4 2003/03/30 17:46:30 azarah Exp $
 
 IUSE="nls esd gnome oss kde"
 
@@ -15,7 +15,7 @@ LICENSE="Artistic"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
 	>=dev-libs/glib-2.0.6
-    >=sys-devel/gettext-0.11.2    
+	>=sys-devel/gettext-0.11.2    
 	esd? ( >=media-sound/esound-0.2.7 )"
 
 src_unpack() {
@@ -61,11 +61,11 @@ src_install () {
 	insinto /usr/share/pixmaps
 	doins share/*.png share/*.xpm
 
-    if [ -n "`use kde`" ]
-    then
-       insinto /usr/share/applnk/Internet
-       newins share/nt.desktop d4x.desktop
-    fi
+	if [ -n "`use kde`" ]
+	then
+		insinto /usr/share/applnk/Internet
+		newins share/nt.desktop d4x.desktop
+	fi
 
 	if [ -n "`use gnome`" ]
 	then
diff --git a/net-misc/d4x/files/d4x-2.4.1-fix-statusbar-crash.patch b/net-misc/d4x/files/d4x-2.4.1-fix-statusbar-crash.patch
new file mode 100644
index 000000000000..de92f1505abb
--- /dev/null
+++ b/net-misc/d4x/files/d4x-2.4.1-fix-statusbar-crash.patch
@@ -0,0 +1,27 @@
+--- d4x-2.4.1/main/face/lod.cc.orig	2003-03-23 21:53:23.000000000 +0200
++++ d4x-2.4.1/main/face/lod.cc	2003-03-23 22:27:08.000000000 +0200
+@@ -196,6 +196,7 @@
+ 				   GtkCellRendererState flags){
+ 	char tmpc[100];
+ 	float p=((GtkCellRendererProgress*)cell)->percent;
++	unsigned int pwidth;
+ 
+ 	if (p>99.0 && p<100.0)
+ 		sprintf(tmpc,"%.1f",p);
+@@ -246,13 +247,15 @@
+ 	};
+ 	case 1:
+ 		if (p<=0) break;
++		pwidth = (unsigned int)((cell_area->width*p)/100);
++		if (pwidth<=0) break;
+ 		gtk_paint_box(style,window,
+ 			      GTK_STATE_PRELIGHT,GTK_SHADOW_OUT,
+ 			      cell_area,
+ 			      widget,
+ 			      "bar",
+ 			      cell_area->x,cell_area->y,
+-			      int((cell_area->width*p)/100),cell_area->height);
++			      pwidth,cell_area->height);
+ 	default:
+ 		break;
+ 	};
diff --git a/net-misc/d4x/files/digest-d4x-2.4.1-r1 b/net-misc/d4x/files/digest-d4x-2.4.1-r1
new file mode 100644
index 000000000000..e611f2b3faa4
--- /dev/null
+++ b/net-misc/d4x/files/digest-d4x-2.4.1-r1
@@ -0,0 +1 @@
+MD5 9ff1521a6c7ecedb6d71f1e1a6a6696a d4x-2.4.1.tar.gz 1390726
diff --git a/net-misc/d4x/files/digest-d4x-2.4_beta b/net-misc/d4x/files/digest-d4x-2.4_beta
deleted file mode 100644
index c2bee7dd705f..000000000000
--- a/net-misc/d4x/files/digest-d4x-2.4_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66093d5dba093bfe285855ae84a00185 d4x-2.4beta.tar.gz 1267851