From 9017ed01c5feb84fd79512da040e6f1f5bc0fb9d Mon Sep 17 00:00:00 2001 From: Sami Wagiaalla Date: Aug 26 2014 17:40:32 +0000 Subject: Build agianst webkitgtk4. --- diff --git a/eclipse-webkit2-support.patch b/eclipse-webkit2-support.patch index 68081b6..f2ee28b 100644 --- a/eclipse-webkit2-support.patch +++ b/eclipse-webkit2-support.patch @@ -125,7 +125,7 @@ index 780a82c..c3bedd0 100644 + } diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak -index 6bce587..051c806 100644 +index 6bce587..fea2a5b 100644 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak @@ -48,6 +48,7 @@ XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so @@ -150,7 +150,7 @@ index 6bce587..051c806 100644 $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o +webkit_extension.o: webkit_extension.c webkit_extension.h -+ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkit_extension.c -o webkit_extension.o `pkg-config --cflags --libs webkit2gtk-3.0` ++ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkit_extension.c -o webkit_extension.o `pkg-config --cflags --libs webkit2gtk-4.0` + +$(WEBKIT_EXTENSION): webkit_extension.o + $(CC) -g -shared -Wl,-no-undefined,-soname,$(WEBKIT_EXTENSION) \ @@ -716,6 +716,20 @@ index 15b7761..3994f37 100644 #ifndef NO__1webkit_1web_1view_1get_1progress JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) (JNIEnv *env, jclass that, jintLong arg0) +diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h +index f54feb4..0598b9f 100644 +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h +@@ -31,6 +31,9 @@ + char *webkit2 = getenv("SWT_WEBKIT2"); \ + if (webkit2 != NULL && strcmp(webkit2, "1") == 0) { \ + handle = dlopen("libwebkit2gtk-3.0.so.25", LOAD_FLAGS); /* webkit2 */ \ ++ if (!handle) { \ ++ handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \ ++ } \ + } else { \ + handle = dlopen("libwebkitgtk-3.0.so.0", LOAD_FLAGS); /* webkitgtk >= 3.x lib */ \ + } \ diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c index c3cf9ee..b0e6650 100644 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c diff --git a/eclipse.spec b/eclipse.spec index 3365b22..4d1ebaa 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -38,7 +38,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 13%{?dist} +Release: 14%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -131,8 +131,8 @@ BuildRequires: desktop-file-utils BuildRequires: java-1.8.0-openjdk-devel BuildRequires: libXt-devel BuildRequires: webkitgtk-devel -BuildRequires: webkitgtk3 -BuildRequires: webkitgtk3-devel +BuildRequires: webkitgtk4 +BuildRequires: webkitgtk4-devel BuildRequires: geronimo-annotation >= 1.0-7 BuildRequires: %{?scl_prefix}icu4j-eclipse >= 1:52.1 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net @@ -1013,6 +1013,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Tue Aug 26 2014 Sami Wagiaalla - 1:4.4.0-14 +- Build agianst webkitgtk4. + * Tue Aug 19 2014 Mat Booth - 1:4.4.0-13 - Rebuild against new ECF