Fix build with new Glassfish EL packages
- Patch to prefer x11 until wayland support improves
This commit is contained in:
Mat Booth
parent
a211b2929a
commit
646e9715ea
24
eclipse.spec
24
eclipse.spec
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
Epoch: 1
|
||||
|
||||
%global eb_commit 4e8087f81be00857cd9cdce549392db2a985155a
|
||||
%global eb_commit d5db901519674ad1dd5823a62bb6cec7a0f73fa3
|
||||
%global eclipse_tag S4_6_1_RC4
|
||||
|
||||
%if 0%{?fedora} >= 25
|
||||
|
|
@ -16,16 +16,11 @@ Epoch: 1
|
|||
%global _jetty_version 9.3.7
|
||||
%global _lucene_version 5.5.0
|
||||
%else
|
||||
%if 0%{?fedora} >= 23
|
||||
%global _jetty_version 9.3.0
|
||||
%global _lucene_version 5.3.0
|
||||
%else
|
||||
# Used on RHEL
|
||||
%global _jetty_version 9.0.3
|
||||
%global _lucene_version 5.4.1
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%ifarch %{ix86}
|
||||
%global eclipse_arch x86
|
||||
|
|
@ -48,7 +43,7 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: 4.6.1
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: EPL
|
||||
URL: http://www.eclipse.org/
|
||||
|
||||
|
|
@ -127,6 +122,9 @@ Patch25: eclipse-popupdialog-color.patch
|
|||
Patch26: eclipse-make-droplets-runnable.patch
|
||||
Patch27: eclipse-disable-droplets-in-dropins.patch
|
||||
|
||||
# Temporary measure until wayland improves
|
||||
Patch28: prefer_x11_backend.patch
|
||||
|
||||
BuildRequires: tycho >= 0.25.0
|
||||
BuildRequires: tycho-extras >= 0.25.0
|
||||
BuildRequires: cbi-plugins
|
||||
|
|
@ -190,6 +188,8 @@ BuildRequires: eclipse-filesystem
|
|||
BuildRequires: eclipse-ecf-core >= 3.13.2-1
|
||||
BuildRequires: eclipse-emf-core >= 1:2.12.0-1
|
||||
BuildRequires: eclipse-license
|
||||
BuildRequires: glassfish-el-api
|
||||
BuildRequires: glassfish-el
|
||||
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
||||
BuildRequires: glassfish-jsp >= 2.2.5
|
||||
BuildRequires: glassfish-servlet-api >= 3.1.0
|
||||
|
|
@ -378,6 +378,7 @@ tar --strip-components=1 -xf %{SOURCE1}
|
|||
%patch25
|
||||
%patch26
|
||||
%patch27
|
||||
%patch28
|
||||
|
||||
# Use ecj when bootstrapping
|
||||
%if %{bootstrap}
|
||||
|
|
@ -571,9 +572,11 @@ done
|
|||
sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
|
||||
|
||||
# Use com.sun.el.java.el (Glassfish) instead of javax.el (Tomcat)
|
||||
sed -i 's/javax\.el/com\.sun\.el\.javax\.el/' \
|
||||
sed -i 's/javax\.el/javax\.el-api/' \
|
||||
eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml \
|
||||
eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
|
||||
sed -i '/javax\.el-api/a<import plugin="com.sun.el.javax.el" \/>' \
|
||||
eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
|
||||
|
||||
# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat)
|
||||
find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|'
|
||||
|
|
@ -924,6 +927,7 @@ fi
|
|||
%{_libdir}/%{name}/plugins/javax.servlet-api_*
|
||||
%{_libdir}/%{name}/plugins/javax.servlet.jsp_*
|
||||
%{_libdir}/%{name}/plugins/javax.xml_*
|
||||
%{_libdir}/%{name}/plugins/javax.el-api_*
|
||||
%{_libdir}/%{name}/plugins/com.sun.el.javax.el_*
|
||||
%{_libdir}/%{name}/plugins/javax.inject_*.jar
|
||||
%{_libdir}/%{name}/plugins/org.apache.*
|
||||
|
|
@ -1107,6 +1111,10 @@ fi
|
|||
%{_libdir}/eclipse/plugins/org.eclipse.osgi.compatibility.state_*
|
||||
|
||||
%changelog
|
||||
* Thu Oct 13 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-5
|
||||
- Fix build with new Glassfish EL packages
|
||||
- Patch to prefer x11 until wayland support improves
|
||||
|
||||
* Thu Sep 29 2016 Alexander Kurtakov <akurtako@redhat.com> 1:4.6.1-4
|
||||
- Bump for rebuild.
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c.orig 2016-10-13 16:53:39.092748697 +0100
|
||||
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c 2016-10-13 17:01:12.350231281 +0100
|
||||
@@ -122,6 +122,11 @@
|
||||
setenv("OXYGEN_DISABLE_INNER_SHADOWS_HACK", "1", 0);
|
||||
}
|
||||
|
||||
+ char *gdkBackend = getenv("GDK_BACKEND");
|
||||
+ if (gdkBackend == NULL) {
|
||||
+ setenv("GDK_BACKEND", "x11", 0);
|
||||
+ }
|
||||
+
|
||||
/* Disable GTK scaling*/
|
||||
setenv("GDK_SCALE", "1", 1);
|
||||
|
||||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
b302f16c7fd7301a05960745c17eed89 R4_platform-aggregator-S4_6_1_RC4.tar.xz
|
||||
e03ce6ced9cf27fccc8d0fc5a68e28e0 org.eclipse.linuxtools.eclipse-build-4e8087f81be00857cd9cdce549392db2a985155a.tar.xz
|
||||
c5160620b3d6d8f453870ac85ba05c11 org.eclipse.linuxtools.eclipse-build-d5db901519674ad1dd5823a62bb6cec7a0f73fa3.tar.xz
|
||||
|
|
|
|||
Loading…
Reference in New Issue