libpng 1.2.5 fix

3 files changed, 106 insertions, 1 deletions

diff --git a/gnome-base/gnome-core/ChangeLog b/gnome-base/gnome-core/ChangeLog
index f22ded0ee00d..7e63e4b74a6b 100644
--- a/gnome-base/gnome-core/ChangeLog
+++ b/gnome-base/gnome-core/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for gnome-base/gnome-core
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/ChangeLog,v 1.14 2002/10/24 19:19:57 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/ChangeLog,v 1.15 2002/10/31 12:22:21 foser Exp $
 
+*gnome-core-1.4.2-r1 (29 Oct 2002)
+
+  29 Oct 2002; foser <foser@gentoo.org> gnome-core-1.4.2-r1.ebuild :
+  libpng 1.2.5 fix (bug #9792)
 
 *gnome-core-1.4.2 (23 Oct 2002)
   
diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.2-r1 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.2-r1
new file mode 100644
index 000000000000..c50aa28900f8
--- /dev/null
+++ b/gnome-base/gnome-core/files/digest-gnome-core-1.4.2-r1
@@ -0,0 +1 @@
+MD5 d2caf2e71afcc946d5bceaec1b7ba1d3 gnome-core-1.4.2.tar.bz2 6276384
diff --git a/gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild b/gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..ff8758309151
--- /dev/null
+++ b/gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild,v 1.1 2002/10/31 12:22:21 foser Exp $
+
+IUSE="kde nls cups"
+
+inherit libtool gnome.org
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Core components of the GNOME desktop environment"
+HOMEPAGE="http://www.gnome.org/"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="=gnome-base/control-center-1.4*
+	 =gnome-base/libglade-0.17*
+	 >=gnome-base/gnome-libs-1.4.1.2-r1
+	 >=media-libs/gdk-pixbuf-0.16.0-r1
+	 cups? ( >=gnome-base/gnome-print-0.35 )
+	 !gnome-base/gnome-session
+	 !x11-terms/gnome-terminal
+	 !gnome-base/gnome-desktop"
+# This should not be installed if the user is using Gnome2, as it
+# overwrite files from those packages.  If some app needs gnome-core
+# for the panel-applet, please fix it to use:
+#
+# DEPEND="<gnome-base/gnome-panel-1.90"
+#
+# instead.  Also, please check with Spider before you change this next time.
+
+DEPEND="${RDEPEND}
+        >=sys-apps/tcp-wrappers-7.6
+        >=app-text/scrollkeeper-0.2
+        nls? ( sys-devel/gettext
+		>=dev-util/intltool-0.11 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+        # libpng-1.2.5 fix
+        cp configure.in configure.in.old
+        sed -e "s:-lz:\`libpng-config --libs\`:" configure.in.old \
+                > configure.in
+
+	# Libtoolize
+	elibtoolize
+	aclocal -I macros
+	automake --add-missing
+	autoconf
+}
+
+src_compile() {
+	local myconf=""
+	local myldflags=""
+	
+	use nls || myconf="${myconf} --disable-nls"
+
+	if [ "`use kde`" ]
+	then
+		myconf="${myconf} --with-kde-datadir=/usr/share"
+	fi
+
+	# Fix build against gdk-pixbuf-0.12 and later
+	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
+
+	./configure --host=${CHOST} \
+		    --prefix=/usr \
+		    --mandir=/usr/share/man \
+		    --sysconfdir=/etc \
+		    --localstatedir=/var/lib \
+		    ${myconf} || die
+
+	cd panel
+	cp gnome-panel-screenshot.c gnome-panel-screenshot.c.orig
+	cat gnome-panel-screenshot.c.orig | \
+		sed 's:\(^#include <errno.h>\):\1\n#include <locale.h>:' \
+		> gnome-panel-screenshot.c
+	
+	cd ${S}
+
+	emake || die
+}
+
+src_install() {
+	make prefix=${D}/usr \
+	     mandir=${D}/usr/share/man \
+	     sysconfdir=${D}/etc \
+  	     localstatedir=${D}/var/lib \
+	     install || die
+
+	# Support for new X session management scheme
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/Gnome
+
+	dodoc AUTHORS COPYING* ChangeLog README NEWS
+}
+