Hello community, here is the log from the commit of package eclipse checked in at Wed Jul 5 19:57:48 CEST 2006. -------- --- arch/i386/eclipse/eclipse.changes 2006-03-10 20:00:44.000000000 +0100 +++ eclipse/eclipse.changes 2006-07-05 18:32:30.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 5 18:32:10 CEST 2006 - dbornkessel@suse.de + +- enabled x86_64 and ia64 builds + +------------------------------------------------------------------- New: ---- eclipse-3.1.1-ia64-libjawt-location.patch eclipse-NULL-terminate-autogenerated.diff eclipse-build.xml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse.spec ++++++ --- /var/tmp/diff_new_pack.WcTt7H/_old 2006-07-05 19:56:47.000000000 +0200 +++ /var/tmp/diff_new_pack.WcTt7H/_new 2006-07-05 19:56:47.000000000 +0200 @@ -12,7 +12,14 @@ # icecream 0 Name: eclipse -BuildRequires: ant-junit gcc-c++ gnutls-devel jakarta-commons-logging java2-devel-packages libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel openmotif regexp servletapi5 update-desktop-files xml-commons-apis xorg-x11 zip +BuildRequires: ant-junit gcc-c++ gnutls-devel jakarta-commons-logging libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel openmotif regexp servletapi5 update-desktop-files xml-commons-apis xorg-x11 zip +%ifarch x86_64 +BuildRequires: java-1_4_2-ibm-devel +%else +BuildRequires: java2-devel-packages +%endif +# ... install all packages needed to start and install eclipse in the chroot as well (for testing purposes) +#BuildRequires: ant regexp xml-commons-apis jakarta-commons-logging servlet23 update-alternatives %define pkg_summary An open extensible IDE %define section free %define swt_version 3063 @@ -23,7 +30,7 @@ %define eclipse_micro 1 %define libname libswt3 # we'll enable additional platforms later (skh) -ExclusiveArch: %{ix86} ppc +ExclusiveArch: %{ix86} ppc ia64 x86_64 %ifarch %{ix86} %define eclipse_arch x86 %define java_arch i386 @@ -60,7 +67,7 @@ %endif Summary: Eclipse Platform and Java IDE Version: 3.1.1 -Release: 5 +Release: 14 License: Other License(s), see package Group: Development/Tools/IDE URL: http://www.eclipse.org @@ -78,10 +85,14 @@ #Source17: %{name}-tools-build.xml #Source21: %{name}-copy-platform.sh Source22: README.subpacks +Source23: %{name}-NULL-terminate-autogenerated.diff Patch0: %{name}-%{version}-build.diff Patch1: %{name}-NULL-terminate.diff Patch2: %{name}-build.sh.diff Patch3: %{name}-make-linux.patch +Patch4: %{name}-%{version}-ia64-libjawt-location.patch +Patch5: %{name}-build.xml.patch +#Patch5: %{name}-%{version}-compiler-warnings.patch #Patch1: %{name}-make-core.patch #Patch2: %{name}-make-gtk2.patch #Patch9: %{name}-org.eclipse.core.resources-Makefile.patch @@ -95,7 +106,7 @@ #Patch21: %{name}-org.eclipse.help.appserver-host.patch #Patch22: %{name}-welcome-screen.patch #Patch23: %{name}-gtk.patch -#Patch24: eclipse-NULL-terminate.diff +Patch24: eclipse-NULL-terminate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-gtk2 @@ -256,10 +267,15 @@ %setup -q -c # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # %patch0 -p1 +%ifarch x86_64 ia64 +%patch5 -p0 +%endif pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" %patch1 -p0 %patch2 -p0 +%patch4 -p0 popd +cp %{SOURCE23} . #pushd "plugins/org.eclipse.swt.tools" #cp %{SOURCE17} build.xml #popd @@ -300,7 +316,7 @@ mv ./plugins/org.eclipse.swt/Eclipse_SWT_PI ./plugins/org.eclipse.swt/Eclipse\ SWT\ PI %build -export JAVA_HOME=%{java_home} +export JAVA_HOME=%{_libdir}/jvm/java/ export AWT_LIB_PATH=%{java_home}/jre/lib/%{java_arch} export ANT_OPTS=-Xmx256m ./build -os linux -ws gtk -arch %{eclipse_arch} -compilelibs @@ -414,6 +430,8 @@ %config(noreplace) %{_sysconfdir}/eclipse.conf %changelog -n eclipse +* Wed Jul 05 2006 - dbornkessel@suse.de +- enabled x86_64 and ia64 builds * Fri Mar 10 2006 - dbornkessel@suse.de - enabled ppc build * Wed Jan 25 2006 - mls@suse.de ++++++ eclipse-3.1.1-ia64-libjawt-location.patch ++++++ Index: build.sh =================================================================== --- build.sh +++ build.sh @@ -91,7 +91,7 @@ case $OS in if [ "${JAVA_HOME}" = "" ]; then echo "JAVA_HOME is missing. Build will probably fail." fi - AWT_LIB_PATH=$JAVA_HOME/jre/lib/ia64 + AWT_LIB_PATH=/usr/lib/jvm/java/jre/bin XTEST_LIB_PATH=/usr/X11R6/lib SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 OUTPUT_DIR=../../../org.eclipse.swt.gtk.linux.ia64 ++++++ eclipse-NULL-terminate-autogenerated.diff ++++++ Index: swttmp/os.c.orig =================================================================== --- swttmp.orig/os.c.orig +++ swttmp/os.c.orig @@ -1988,7 +1988,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1ob OS_NATIVE_ENTER(env, that, _1g_1object_1get_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, arg3); + g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, arg3, NULL); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); @@ -2039,7 +2039,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1ob jbyte *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BFJ_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3); + g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3, NULL); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BFJ_FUNC); @@ -2053,7 +2053,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1ob jbyte *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BIJ_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3); + g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3,NULL); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BIJ_FUNC); @@ -2067,7 +2067,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1ob jbyte *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BJJ_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3); + g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3,NULL); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BJJ_FUNC); @@ -2081,7 +2081,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1ob jbyte *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BZJ_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3); + g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3,NULL); fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BZJ_FUNC); @@ -4860,7 +4860,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_ { jlong rc = 0; OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC); - rc = (jlong)gdk_x11_screen_get_window_manager_name(arg0); + rc = (jlong)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0); OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC); return rc; } @@ -10545,7 +10545,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1 OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3); + gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3,NULL); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -10562,7 +10562,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1 OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3); + gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3,NULL); fail: if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); ++++++ eclipse-build.xml.patch ++++++ Index: build.xml =================================================================== --- build.xml +++ build.xml @@ -50,6 +50,9 @@ <include name="org.eclipse.swt.${installWs}.${installOs}.${installArch}_*/*.zip" /> </fileset> </unzip> + <exec dir="${swtlibs}/" executable="patch"> + <arg line="os.c ../eclipse-NULL-terminate-autogenerated.diff"/> + </exec> <exec dir="${swtlibs}/" executable="sh" failonerror="true"> <arg line="build.sh" /> </exec> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org