rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'f21' into eclipse-luna

Browse Source
This commit is contained in:
Mat Booth 2014-07-17 13:27:25 +01:00
commit f0edd6dfa6
4 changed files with 140 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
eclipse-bug-438992.patch Normal file
View File

@ -0,0 +1,96 @@
From faa3866df482c0e42ac5b308a5551882f833a3aa Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov
Date: Thu, 10 Jul 2014 09:06:28 +0300
Subject: Bug 438992 - Combo dropdown has empty space at top
Setting wrap_width also trims the empty whitespace on top for combo
popup.
Change-Id: I073d1ccef913de8f1ccfa0ff1eb09538606f8f74
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index 89185b9..813f451 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -9970,6 +9970,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
}
#endif
+#ifndef NO__1gtk_1combo_1box_1set_1wrap_1width
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1wrap_1width)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
+ gtk_combo_box_set_wrap_width((GtkComboBox *)arg0, (gint)arg1);
+ OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1combo_1box_1text_1insert
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1insert)
(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
index fefc07e..16d6664 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
@@ -723,6 +723,7 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1combo_1box_1remove_1text",
"_1gtk_1combo_1box_1set_1active",
"_1gtk_1combo_1box_1set_1focus_1on_1click",
+ "_1gtk_1combo_1box_1set_1wrap_1width",
"_1gtk_1combo_1box_1text_1insert",
"_1gtk_1combo_1box_1text_1new",
"_1gtk_1combo_1box_1text_1new_1with_1entry",
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
index aa408c5..78460d0 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
@@ -733,6 +733,7 @@ typedef enum {
_1gtk_1combo_1box_1remove_1text_FUNC,
_1gtk_1combo_1box_1set_1active_FUNC,
_1gtk_1combo_1box_1set_1focus_1on_1click_FUNC,
+ _1gtk_1combo_1box_1set_1wrap_1width_FUNC,
_1gtk_1combo_1box_1text_1insert_FUNC,
_1gtk_1combo_1box_1text_1new_FUNC,
_1gtk_1combo_1box_1text_1new_1with_1entry_FUNC,
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index b531bf9..ab42819 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -7135,6 +7135,19 @@ public static final void gtk_combo_box_set_active(long /*int*/ combo_box, int in
lock.unlock();
}
}
+/**
+ * @param combo_box cast=(GtkComboBox *)
+ * @param width cast=(gint)
+ */
+public static final native void _gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width);
+public static final void gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width) {
+ lock.lock();
+ try {
+ _gtk_combo_box_set_wrap_width(combo_box, width);
+ } finally {
+ lock.unlock();
+ }
+}
/** @method flags=dynamic */
public static final native int _gtk_combo_box_get_active(long /*int*/ combo_box);
public static final int gtk_combo_box_get_active(long /*int*/ combo_box) {
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
index ea5a93e..6589c9e 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
@@ -455,6 +455,8 @@ void createHandle (int index) {
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
cellHandle = OS.gtk_bin_get_child (handle);
if (cellHandle == 0) error (SWT.ERROR_NO_HANDLES);
+ // Setting wrap width has the side effect of removing the whitespace on top in popup bug#438992
+ OS.gtk_combo_box_set_wrap_width(handle, 1);
} else {
if (OS.GTK3) {
handle = OS.gtk_combo_box_text_new_with_entry();
--
cgit v0.10.1-9-gd18e

2
eclipse-no-source-for-dependencies.patch
View File

@ -33,7 +33,7 @@
</goals>
+ <configuration>
+ <excludes>
+ <plugin id="javax.servlet" /><plugin id="javax.el" /><plugin id="com.sun.el.javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />
+ <plugin id="javax.servlet-api" /><plugin id="javax.el" /><plugin id="com.sun.el.javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />
+ <plugin id="javax.servlet.jsp" /><plugin id="org.apache.lucene.analysis" /><plugin id="org.apache.lucene.core" />
+ <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
+ <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />

74
eclipse.spec
View File

@ -13,7 +13,7 @@ Epoch: 1
%global eclipse_major 4
%global eclipse_minor 4
%global eclipse_micro 0
%global eb_commit b95311b1c90288893e23fdd8d13373aba80a8e6b
%global eb_commit db6b9cd54787feb7cf7c7a28c80e740340213bd3
%global eclipse_tag R4_4
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
%global _jetty_version 9.0.5
@ -23,7 +23,7 @@ Epoch: 1
%endif
%ifarch %{arm}
%define eclipse_arch arm
%endif
%endif
%ifarch ppc64 ppc64p7
%define eclipse_arch ppc64
%endif
@ -39,7 +39,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 5.2%{?dist}
Release: 8%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -112,6 +112,9 @@ Patch21: %{pkg_name}-mockito.patch
Patch22: %{pkg_name}-policy-comparators.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=438992
Patch23: %{pkg_name}-bug-438992.patch
BuildRequires: rsync
BuildRequires: make, gcc
BuildRequires: gtk2-devel
@ -151,7 +154,7 @@ BuildRequires: %{?scl_prefix}lucene-analysis >= 4.8.1-3
BuildRequires: junit >= 4.10-5
BuildRequires: hamcrest >= 0:1.1-11
BuildRequires: sat4j >= 2.3.5-1
BuildRequires: %{?scl_prefix}objectweb-asm >= 5.0.1-1
BuildRequires: %{?scl_prefix}objectweb-asm >= 5.0.2-2
BuildRequires: zip
BuildRequires: sac >= 1.3-12
BuildRequires: %{?scl_prefix}batik >= 1.8
@ -224,8 +227,8 @@ Requires: %{?scl_prefix}lucene-core >= 4.8.1-3
Requires: %{?scl_prefix}lucene-analysis >= 4.8.1-3
Requires: sat4j >= 2.3.5-1
Requires: sac >= 1.3-12
Requires: xml-commons-apis >= 1.4.01-12
Requires: %{?scl_prefix}batik >= 1.8
Requires: xml-commons-apis >= 1.4.01-12
Requires: atinject >= 1-6
Requires: geronimo-annotation >= 1.0-7
Requires: %{?scl_prefix}eclipse-ecf-core >= 3.8.1-1
@ -264,7 +267,7 @@ Group: Development/Tools
Provides: %{name} = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release}
Requires: %{?scl_prefix}objectweb-asm >= 5.0.1-1
Requires: %{?scl_prefix}objectweb-asm >= 5.0.2-2
# For PDE Build wrapper script + creating jars
Requires: zip
Requires: bash
@ -289,7 +292,7 @@ installer UIs.
Summary: Eclipse Tests
Group: Development/Tools
Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release}
Requires: %{?scl_prefix}easymock3
Requires: easymock3
Requires: mockito
%description tests
@ -323,6 +326,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch20
%patch21
%patch22
%patch23 -p1
#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
@ -472,6 +476,9 @@ sed -i '/javax.servlet/ s/2\.4\.0/3\.1\.0/' eclipse.platform.ua/org.eclipse.help
sed -i 's/com\.sun\.el\.javax\.el/javax\.el/' dependencies/replace_platform_plugins_with_symlinks.sh
sed -i 's/glassfish-el\.jar/tomcat-el-api\.jar/' dependencies/replace_platform_plugins_with_symlinks.sh
# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat)
find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|'
# Bump javax.servlet Import-Package statements
sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
@ -501,12 +508,9 @@ xmvn -o clean verify \
-Declipse.javadoc=/usr/bin/javadoc \
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
-Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."` \
-Dtargets=install
-Dtargets=install -Ddirector.running.env.only=true
%{?scl:EOF}
#symlink necessary plugins (that are provided by other packages)
dependencies/replace_platform_plugins_with_symlinks.sh \
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse %{_javadir}
#ant again
dependencies/fake_ant_dependency.sh \
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins/org.apache.ant_* \
@ -519,27 +523,12 @@ utils/move_JDT_PDE_to_dropins.sh \
`pwd`/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \
"jdt cvs equinox.p2.discovery.feature sdk"
# Symlink necessary plugins that are provided by other packages
dependencies/replace_platform_plugins_with_symlinks.sh \
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse %{_javadir}
pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse
# This is a temporary hack
# We offer javax.servlet and javax.servlet-api as the same bundle
# References to javax.servlet should be renamed
pushd plugins
f=`ls | grep -e "^javax.servlet-api_"`
rm -f $f
ln -s %{_javadir}/glassfish-servlet-api.jar $f
popd
#in jdt
pushd dropins/jdt/plugins
f=`ls | grep -e "^org.hamcrest.core_"`
rm -rf $f
ln -s %{_javadir}/hamcrest/core.jar ${f%.jar}.jar
f=`ls | grep -e "^org.junit_4"`
rm -rf $f
ln -s %{_javadir}/junit.jar ${f%.jar}.jar
popd
#clean up
rm -rf configuration/org.eclipse.core.runtime
rm -rf configuration/org.eclipse.equinox.app
@ -559,7 +548,13 @@ popd
sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini
sed -i "s|-Xmx384m|-Xmx512m|g" eclipse.ini
sed -i '1i-protect\nmaster' eclipse.ini
# Use GTK3 by default on F22 or newer
%if 0%{?fedora} >= 22
sed -i '5i--launcher.GTK_version\n3' eclipse.ini
%else
sed -i '5i--launcher.GTK_version\n2' eclipse.ini
%endif
# Temporary fix until https://bugs.eclipse.org/294877 is resolved
cat >> eclipse.ini <<EOF
@ -604,6 +599,8 @@ ln -s /usr/share/icons/hicolor/256x256/apps/%{?scl_prefix}eclipse.png \
%{?scl: sed -i -e 's/Name=Eclipse/Name=%{app_name}/g' desktopintegration/eclipse.desktop}
install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
install -D desktopintegration/eclipse.appdata.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml
install -D desktopintegration/eclipse-jdt.metainfo.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse-jdt.metainfo.xml
install -D desktopintegration/eclipse-pde.metainfo.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse-pde.metainfo.xml
desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
#################################
@ -807,11 +804,9 @@ fi
%{_libdir}/%{pkg_name}/features/org.eclipse.emf.common_*
%{_libdir}/%{pkg_name}/features/org.eclipse.emf.ecore_*
%{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
%{_libdir}/%{pkg_name}/plugins/asm*
%{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
%{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_*
%{_libdir}/%{pkg_name}/plugins/javax.servlet-api_*
%{_libdir}/%{pkg_name}/plugins/javax.servlet_*
%{_libdir}/%{pkg_name}/plugins/javax.servlet.jsp_*
%{_libdir}/%{pkg_name}/plugins/javax.xml_*
%{_libdir}/%{pkg_name}/plugins/javax.el_*
@ -1003,10 +998,12 @@ fi
%files jdt
%{_bindir}/efj
/usr/share/appdata/%{?scl_prefix}eclipse-jdt.metainfo.xml
%{_libdir}/%{pkg_name}/dropins/jdt
%files pde
%{_bindir}/%{pkg_name}-pdebuild
/usr/share/appdata/%{?scl_prefix}eclipse-pde.metainfo.xml
%{_libdir}/%{pkg_name}/buildscripts
%{_libdir}/%{pkg_name}/dropins/sdk
%{_libdir}/%{pkg_name}/dropins/cvs
@ -1027,6 +1024,19 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Wed Jul 16 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-8
- Update eclipse-build snapshot
- Tighten up deps on asm
* Tue Jul 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-7
- Add appstream addon metadata for JDT and PDE plugins
- Only use GTK3 by default on F22 or newer, rhbz1118317
* Tue Jul 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-6
- Backport fix for eclipse bz438992
- Only assemble products for current running target environment
- Tidy up some unnecessary SCL bits
* Fri Jul 11 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-5.2
- Non-bootstrap build
- Re-enable Java 8 bundles

2
sources
View File

@ -1,2 +1,2 @@
d1e37d9af6848edbdd54d5988c77fa58 R4_platform-aggregator-R4_4.tar.xz
7c474d620e8cad433ea871b4b6239d3e org.eclipse.linuxtools.eclipse-build-b95311b1c90288893e23fdd8d13373aba80a8e6b.tar.bz2
b5c946f8de3fb487cf9f385a0ae707e2 org.eclipse.linuxtools.eclipse-build-db6b9cd54787feb7cf7c7a28c80e740340213bd3.tar.bz2