From 75d982efa2603cb9be6e130777c4f2f8a9e3e014 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Tue, 12 Feb 2013 15:23:49 +0100 Subject: [PATCH] Build support for GTK2 and GTK3 together. --- eclipse.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index a2d9e07..940b2ee 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -55,7 +55,7 @@ fi; Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 0.11.git201301281400%{?dist} +Release: 0.12.git201301281400%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -487,7 +487,7 @@ done %build #This is the lowest value where the build succeeds. 512m is not enough. export MAVEN_OPTS="-Xmx700m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState" -export GTK_VERSION=3.0 + mvn-rpmbuild -f eclipse-parent/pom.xml \ clean install \ -Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck @@ -500,8 +500,15 @@ mvn-rpmbuild -f maven-cbi-plugin/pom.xml \ pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/ export JAVA_HOME=%{java_home} ant -popd +popd +pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch} + mvn-rpmbuild clean install \ + -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \ + -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) -Pno-bree-libs +popd + +export GTK_VERSION=3.0 mvn-rpmbuild clean install \ -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \ -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) -Pno-bree-libs @@ -1010,6 +1017,9 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{ %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Feb 12 2013 Krzysztof Daniel 1:4.3.0-0.12.git201301281400 +- Build support for GTK2 and GTK3 together. + * Tue Feb 12 2013 Krzysztof Daniel 1:4.3.0-0.11.git201301281400 - Ability to use sclized icu4j.