summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2004-06-17 15:24:32 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2004-06-17 15:24:32 +0000
commitb6c49874dc6d4b6e5920bf6943d0ec11651ebe97 (patch)
tree47cfd18b4fc21795a434b87bca3714ef51c90e9d
parentfix i2c integer overflow vulnerability during the allocation of memory. bug #... (diff)
downloadgentoo-2-b6c49874dc6d4b6e5920bf6943d0ec11651ebe97.tar.gz
gentoo-2-b6c49874dc6d4b6e5920bf6943d0ec11651ebe97.tar.bz2
gentoo-2-b6c49874dc6d4b6e5920bf6943d0ec11651ebe97.zip
Fixes #53906.
-rw-r--r--dev-util/eclipse-sdk/ChangeLog6
-rw-r--r--dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r3.ebuild14
-rw-r--r--dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild4
3 files changed, 14 insertions, 10 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 59d551ddd309..46ece9165b95 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/eclipse-sdk
# Copyright 2003-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.37 2004/06/12 10:35:00 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.38 2004/06/17 15:24:31 karltk Exp $
+
+ 17 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+ eclipse-sdk-2.1.3-r3.ebuild: Added back gtk+ 2.4 workaround, fixes
+ #53906.
12 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
eclipse-sdk-3.0.0_rc1.ebuild: Added dep for libgnomeui, fixes #53690.
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r3.ebuild
index 77f80ff3f267..0c8288fb9d7d 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r3.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r3.ebuild,v 1.10 2004/06/12 10:35:00 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r3.ebuild,v 1.11 2004/06/17 15:24:32 karltk Exp $
inherit eutils
@@ -106,12 +106,12 @@ src_unpack() {
# Extra patching if the gtk+ installed is 2.4 or newer
# for users with the 2.3 series, they should upgrade, dunno which 2.3.x all this
# stuff broke in anyway.
-# if pkg-config --atleast-version 2.4 gtk+-2.0 ; then
-# einfo "Applying gtk+-2.4 patches"
-# sed -r \
-# -e "s:#define GTK_DISABLE_DEPRECATED::g" \
-# -i swt.c
-# fi
+ if pkg-config --atleast-version 2.4 gtk+-2.0 ; then
+ einfo "Applying gtk+-2.4 patches"
+ sed -r \
+ -e "s:#define GTK_DISABLE_DEPRECATED::g" \
+ -i swt.c
+ fi
# Some fixups for the motif compilation
cd ${S}/"${motif_swt_src_dir}"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild
index 91df60e116bc..a74e7ab2d205 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild,v 1.2 2004/06/12 10:35:00 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild,v 1.3 2004/06/17 15:24:32 karltk Exp $
inherit eutils
@@ -272,7 +272,7 @@ src_install() {
unzip -o -q result/linux-gtk-${ARCH}-sdk.zip -d ${D}/usr/lib
fi
if use motif ; then
- [ -f result/linux-gtk-${ARCH}-sdk.zip ] || die "motif zip bundle was not build properly!"
+ [ -f result/linux-motif-${ARCH}-sdk.zip ] || die "motif zip bundle was not build properly!"
unzip -o -q result/linux-motif-${ARCH}-sdk.zip -d ${D}/usr/lib
fi