Merged some mdk patches.

(Portage version: 2.1-r1)

7 files changed, 200 insertions, 1 deletions

diff --git a/dev-libs/newt/ChangeLog b/dev-libs/newt/ChangeLog
index c0bad8aefed6..8b9bed62f3f9 100644
--- a/dev-libs/newt/ChangeLog
+++ b/dev-libs/newt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/newt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.28 2006/09/09 20:20:41 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.29 2006/10/14 15:48:55 xmerlin Exp $
+
+*newt-0.51.6-r2 (14 Oct 2006)
+
+  14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/newt-0.51.6-assorted-fixes.patch,
+  +files/newt-0.51.6-do-not-ignore-EARLY-events-in-listbox--and-allow-textbo
+  x-to-take-focus.patch, +newt-0.51.6-r2.ebuild:
+  Merged some mdk patches.
 
 *newt-0.52.2 (09 Sep 2006)
 
diff --git a/dev-libs/newt/files/digest-newt-0.51.6 b/dev-libs/newt/files/digest-newt-0.51.6
index 898bb73bd7b9..9a5463fb111f 100644
--- a/dev-libs/newt/files/digest-newt-0.51.6
+++ b/dev-libs/newt/files/digest-newt-0.51.6
@@ -1 +1,3 @@
 MD5 76ebfb749d3bbe9a0d55915faef4ac5e newt-0.51.6.tar.gz 155739
+RMD160 88832ca74fa06ef30739c33e5c75b232b2b149e2 newt-0.51.6.tar.gz 155739
+SHA256 b80f265cd204e03fe9f793ab5750269eec71caf9253d2df04792425d22a49375 newt-0.51.6.tar.gz 155739
diff --git a/dev-libs/newt/files/digest-newt-0.51.6-r1 b/dev-libs/newt/files/digest-newt-0.51.6-r1
index 898bb73bd7b9..9a5463fb111f 100644
--- a/dev-libs/newt/files/digest-newt-0.51.6-r1
+++ b/dev-libs/newt/files/digest-newt-0.51.6-r1
@@ -1 +1,3 @@
 MD5 76ebfb749d3bbe9a0d55915faef4ac5e newt-0.51.6.tar.gz 155739
+RMD160 88832ca74fa06ef30739c33e5c75b232b2b149e2 newt-0.51.6.tar.gz 155739
+SHA256 b80f265cd204e03fe9f793ab5750269eec71caf9253d2df04792425d22a49375 newt-0.51.6.tar.gz 155739
diff --git a/dev-libs/newt/files/digest-newt-0.51.6-r2 b/dev-libs/newt/files/digest-newt-0.51.6-r2
new file mode 100644
index 000000000000..9a5463fb111f
--- /dev/null
+++ b/dev-libs/newt/files/digest-newt-0.51.6-r2
@@ -0,0 +1,3 @@
+MD5 76ebfb749d3bbe9a0d55915faef4ac5e newt-0.51.6.tar.gz 155739
+RMD160 88832ca74fa06ef30739c33e5c75b232b2b149e2 newt-0.51.6.tar.gz 155739
+SHA256 b80f265cd204e03fe9f793ab5750269eec71caf9253d2df04792425d22a49375 newt-0.51.6.tar.gz 155739
diff --git a/dev-libs/newt/files/newt-0.51.6-assorted-fixes.patch b/dev-libs/newt/files/newt-0.51.6-assorted-fixes.patch
new file mode 100644
index 000000000000..8f1cd2d4711f
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.51.6-assorted-fixes.patch
@@ -0,0 +1,93 @@
+2005-12-12  Gwenole Beauchesne  <gbeauchesne@mandriva.com>
+
+	* checkboxtree.c (newtCheckboxTreeAddItem): Remove va_start()
+	duplicates.
+
+	* grid.c (newtGridHCloseStacked): Use va_end() when we have
+	processed the varargs.
+	(newtGridVCloseStacked): Likewise.
+	(newtGridVStacked): Likewise.
+	(newtGridHStacked): Likewise.
+
+	* form.c (formOps): Make it local to the DSO.
+	* grid.c (formOps): Fix declaration.
+
+--- newt-0.51.6/grid.c.assorted-fixes	2002-08-15 16:13:40.000000000 -0400
++++ newt-0.51.6/grid.c	2005-12-12 09:18:23.000000000 -0500
+@@ -26,8 +26,8 @@ struct grid_s {
+     struct gridField ** fields;
+ };
+ 
+-/* this is a bit of a hack */
+-extern struct componentOps formOps[];
++/* make it local to the dso */
++extern struct componentOps formOps __attribute__ ((visibility ("hidden")));
+ 
+ newtGrid newtCreateGrid(int cols, int rows) {
+     newtGrid grid;
+@@ -108,7 +108,7 @@ static void shuffleGrid(newtGrid grid, i
+ 		    shuffleGrid(field->u.grid, left, top, 0);
+ 		j = field->u.grid->width;
+ 	    } else if (field->type == NEWT_GRID_COMPONENT) {
+-		if (field->u.co->ops == formOps)
++		if (field->u.co->ops == &formOps)
+ 		    newtFormSetSize(field->u.co);
+ 		j = field->u.co->width;
+ 	    } else 
+@@ -319,7 +319,7 @@ newtGrid newtGridHCloseStacked(enum newt
+ 
+     grid = stackem(0, type1, what1, args, 1);
+ 
+-    va_start(args, what1);
++    va_end(args);
+ 
+     return grid;
+ }
+@@ -332,7 +332,7 @@ newtGrid newtGridVCloseStacked(enum newt
+ 
+     grid = stackem(1, type1, what1, args, 1);
+ 
+-    va_start(args, what1);
++    va_end(args);
+ 
+     return grid;
+ }
+@@ -345,7 +345,7 @@ newtGrid newtGridVStacked(enum newtGridE
+ 
+     grid = stackem(1, type1, what1, args, 0);
+ 
+-    va_start(args, what1);
++    va_end(args);
+ 
+     return grid;
+ }
+@@ -358,7 +358,7 @@ newtGrid newtGridHStacked(enum newtGridE
+ 
+     grid = stackem(0, type1, what1, args, 0);
+ 
+-    va_start(args, what1);
++    va_end(args);
+ 
+     return grid;
+ }
+--- newt-0.51.6/checkboxtree.c.assorted-fixes	2003-01-03 15:54:45.000000000 -0500
++++ newt-0.51.6/checkboxtree.c	2005-12-12 09:15:56.000000000 -0500
+@@ -115,7 +115,6 @@ int newtCheckboxTreeAddItem(newtComponen
+     va_start(argList, index);
+     numIndexes = 0;
+     i = index;
+-    va_start(argList, index);
+     while (i != NEWT_ARG_LAST) {
+ 	indexes[numIndexes++] = i;
+ 	i = va_arg(argList, int);
+--- newt-0.51.6/form.c.assorted-fixes	2005-12-12 09:13:21.000000000 -0500
++++ newt-0.51.6/form.c	2005-12-12 09:19:26.000000000 -0500
+@@ -415,7 +415,7 @@ static void formPlace(newtComponent co, 
+ static newtCallback helpCallback;
+ 
+ /* this isn't static as grid.c tests against it to find forms */
+-struct componentOps formOps = {
++struct componentOps formOps __attribute__ ((visibility ("hidden"))) = {
+     newtDrawForm,
+     formEvent,
+     newtFormDestroy,
diff --git a/dev-libs/newt/files/newt-0.51.6-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch b/dev-libs/newt/files/newt-0.51.6-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch
new file mode 100644
index 000000000000..da65cb65d86c
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.51.6-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch
@@ -0,0 +1,22 @@
+--- newt-0.51.6/textbox.c.pix	2003-01-03 21:54:45.000000000 +0100
++++ newt-0.51.6/textbox.c	2005-04-26 16:33:18.336138737 +0200
+@@ -96,7 +96,7 @@
+     co->height = height;
+     co->top = top;
+     co->left = left;
+-    co->takesFocus = 0;
++    co->takesFocus = flags & NEWT_FLAG_SCROLL;
+     co->width = width;
+ 
+     tb->doWrap = flags & NEWT_FLAG_WRAP;
+--- newt-0.51.6/listbox.c.pix	2003-08-19 22:12:22.000000000 +0200
++++ newt-0.51.6/listbox.c	2005-04-26 16:34:20.817788173 +0200
+@@ -542,7 +542,7 @@
+     
+     er.result = ER_IGNORED;
+ 
+-    if(ev.when == EV_EARLY || ev.when == EV_LATE) {
++    if(ev.when == EV_LATE) {
+ 	return er;
+     }
+ 
diff --git a/dev-libs/newt/newt-0.51.6-r2.ebuild b/dev-libs/newt/newt-0.51.6-r2.ebuild
new file mode 100644
index 000000000000..2e24b7f18ec3
--- /dev/null
+++ b/dev-libs/newt/newt-0.51.6-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.51.6-r2.ebuild,v 1.1 2006/10/14 15:48:55 xmerlin Exp $
+
+inherit python toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="Redhat's Newt windowing toolkit development files"
+HOMEPAGE="http://www.redhat.com/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	http://dev.gentoo.org/~xmerlin/misc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gpm"
+
+DEPEND="=sys-libs/slang-1*
+	>=dev-libs/popt-1.6
+	dev-lang/python
+	elibc_uclibc? ( sys-libs/ncurses )
+	gpm? ( sys-libs/gpm )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/newt-gpm-fix.diff || die
+	epatch ${FILESDIR}/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch || die
+	epatch ${FILESDIR}/${P}-newttextbox-memoryleak.patch || die
+	epatch ${FILESDIR}/${P}-assorted-fixes.patch || die
+	epatch ${FILESDIR}/${P}-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch || die
+
+	# bug 73850 
+	if use elibc_uclibc; then
+		sed -i -e 's:-lslang:-lslang -lncurses:g' ${S}/Makefile.in
+	fi
+
+	# use the correct compiler...
+	sed -i \
+		-e 's:gcc:$(CC):g' \
+		-e "s:\(libdir =\).*:\1 \$(prefix)/$(get_libdir):g" \
+		${S}/Makefile.in || die "sed failed"
+
+	# avoid make cleaning up some intermediate files
+	# as it would rebuild them during install :-(
+	echo >>${S}/Makefile.in
+	echo '$(LIBNEWT): $(LIBOBJS)' >>${S}/Makefile.in
+}
+
+src_compile() {
+	python_version
+
+	econf \
+		$(use_with gpm gpm-support) \
+		|| die
+
+	# not parallel safe
+	emake -j1 PYTHONVERS="python${PYVER}" RPM_OPT_FLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "make failure"
+}
+
+src_install () {
+	python_version
+	# the RPM_OPT_FLAGS="ERROR" is there to catch a build error
+	# if it fails, that means something in src_compile() didn't build properly
+	# not parallel safe
+	emake -j1 prefix="${D}/usr" PYTHONVERS="python${PYVER}" RPM_OPT_FLAGS="ERROR" install || die "make install failed"
+	dodoc CHANGES COPYING peanuts.py popcorn.py tutorial.sgml
+	dosym libnewt.so.${PV} /usr/$(get_libdir)/libnewt.so.0.51
+}