From ef39c8beda9c8deaf818ed90d84bd2efac264ec4 Mon Sep 17 00:00:00 2001 From: Sopot Cela Date: Jul 02 2015 12:20:32 +0000 Subject: Patch to make dark theme work in rawhide --- diff --git a/eclipse-javaxannotation-import.patch b/eclipse-javaxannotation-import.patch new file mode 100644 index 0000000..8156db5 --- /dev/null +++ b/eclipse-javaxannotation-import.patch @@ -0,0 +1,12 @@ +diff --git a/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF +index b0d5c82..6ace64c 100644 +--- a/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF ++++ b/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF +@@ -8,5 +8,6 @@ + Bundle-Localization: fragment-gtk + Bundle-Vendor: %providerName + Eclipse-PlatformFilter: (osgi.ws=gtk) +-Import-Package: org.eclipse.e4.core.services.events, ++Import-Package: javax.annotation;version="1.1.0", ++ org.eclipse.e4.core.services.events, + org.osgi.service.event;version="1.3.1" diff --git a/eclipse.spec b/eclipse.spec index 4d7138e..0c7ef86 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -37,7 +37,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 2%{?dist} +Release: 3%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -117,6 +117,8 @@ Patch21: disable-non-linux.patch #Lucene 5.1 porting patch Patch22: e9b5adb1.diff +Patch23: %{pkg_name}-javaxannotation-import.patch + BuildRequires: rsync BuildRequires: make, gcc BuildRequires: glib2-devel @@ -363,6 +365,10 @@ pushd eclipse.platform.ua %patch22 -p1 popd +pushd eclipse.platform.ui +%patch23 -p1 +popd + # Disable as many things as possible to make the build faster. We care only for Eclipse. %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder %pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder @@ -1087,6 +1093,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Thu Jul 02 2015 Sopot Cela 1:4.5.0-3 +- Patch dark theme patch to work on rawhide + * Wed Jul 01 2015 Mat Booth - 1:4.5.0-2 - Organise BR/Rs and drop ancient provides/obsoletes on rcp package