diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2010-03-05 17:22:59 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2010-03-05 17:22:59 +0000 |
| commit | b719ea1545b8d0f324f53a3bc13fd9023511a0c2 (patch) | |
| tree | 259b790f08a4a8e4993d3ba78d4e6a2753050828 /dev-util/eclipse-sdk/files | |
| parent | dev-util/monotone: Remove (renamed to dev-vcs/monotone) (diff) | |
| download | gentoo-2-b719ea1545b8d0f324f53a3bc13fd9023511a0c2.tar.gz gentoo-2-b719ea1545b8d0f324f53a3bc13fd9023511a0c2.tar.bz2 gentoo-2-b719ea1545b8d0f324f53a3bc13fd9023511a0c2.zip | |
Revbump
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/eclipse-sdk/files')
| -rw-r--r-- | dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch | 39 | ||||
| -rw-r--r-- | dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch | 11 |
2 files changed, 50 insertions, 0 deletions
diff --git a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch new file mode 100644 index 000000000000..6c1e68420505 --- /dev/null +++ b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch @@ -0,0 +1,39 @@ +--- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak 2010-03-06 01:16:49.000000000 +1300 ++++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak 2010-03-06 01:31:15.000000000 +1300 +@@ -27,14 +27,14 @@ + PROGRAM_OUTPUT=eclipse + endif + +-PROGRAM_LIBRARY=$(PROGRAM_OUTPUT)_$(LIB_VERSION).so ++PROGRAM_SONAME=$(PROGRAM_OUTPUT)_$(LIB_VERSION) ++PROGRAM_LIBRARY=$(PROGRAM_SONAME).so + + ifeq ($(DEFAULT_JAVA),) + DEFAULT_JAVA=DEFAULT_JAVA_JNI + endif + + # Define the object modules to be compiled and flags. +-CC=gcc + MAIN_OBJS = eclipseMain.o + COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseGtkCommon.o eclipseGtkInit.o + DLL_OBJS = eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o eclipseShm.o eclipseNix.o +@@ -44,8 +44,8 @@ + #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl + LIBS = -lpthread -ldl + GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" +-LFLAGS = -shared -fpic -Wl,--export-dynamic +-CFLAGS = -g -s -Wall\ ++LFLAGS = -shared -Wl,-soname=$(PROGRAM_SONAME) -fpic -Wl,--export-dynamic ++CFLAGS += -Wall\ + -fpic \ + -DLINUX \ + -DMOZILLA_FIX \ +@@ -98,7 +98,7 @@ + $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) + + $(DLL): $(DLL_OBJS) $(COMMON_OBJS) +- $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) + + install: all + cp $(EXEC) $(OUTPUT_DIR) diff --git a/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch b/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch new file mode 100644 index 000000000000..f76f540b9b5e --- /dev/null +++ b/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch @@ -0,0 +1,11 @@ +--- ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java.old 2010-03-04 07:29:04.000000000 +1300 ++++ ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java 2010-03-04 07:29:28.000000000 +1300 +@@ -139,7 +139,7 @@ + "org.junit4", new VersionRange("[4.5.0,5.0.0)"), "junit.jar", "org.junit4.source", "junitsrc.zip", JUnitPreferencesConstants.JUNIT4_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + private static final JUnitPluginDescription HAMCREST_CORE_PLUGIN= new JUnitPluginDescription( +- "org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), null, "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ++ "org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), "hamcrest-core.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + /** + * @return the JUnit3 classpath container |