From 4c7bfc851a6cc10b03f30741276d8c7c6230bd07 Mon Sep 17 00:00:00 2001
From: Krzysztof Daniel <kdaniel@redhat.com>
Date: Thu, 8 Nov 2012 11:03:10 +0100
Subject: [PATCH] Added debug symbols to SWT. Restored the debug package.
 Removed the debug flag from the build.

---
 eclipse-debug-symbols.patch | 35 +++++++++++++++++++++++++++++++++++
 eclipse.spec                | 16 ++++++++++------
 2 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 eclipse-debug-symbols.patch

diff --git a/eclipse-debug-symbols.patch b/eclipse-debug-symbols.patch
new file mode 100644
index 0000000..9eaef20
--- /dev/null
+++ b/eclipse-debug-symbols.patch
@@ -0,0 +1,35 @@
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.bak	2012-10-01 11:32:20.000000000 +0200
++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	2012-11-08 08:23:51.329134354 +0100
+@@ -106,7 +106,7 @@
+ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
++CFLAGS = -g -O -Wall \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DLINUX -DGTK \
+@@ -116,12 +116,6 @@
+ 		${SWT_PTR_CFLAGS}
+ LFLAGS = -shared -fPIC ${SWT_LFLAGS}
+ 
+-ifndef NO_STRIP
+-	AWT_LFLAGS := $(AWT_LFLAGS) -s
+-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
+-	LFLAGS := $(LFLAGS) -s
+-endif
+-
+ all: make_swt make_atk make_glx make_webkit
+ 
+ #
+--- rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak.bak	2012-10-01 11:54:47.000000000 +0200
++++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak	2012-11-08 08:27:37.562861710 +0100
+@@ -45,7 +45,7 @@
+ LIBS = -lpthread -ldl
+ GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
+ LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
+-CFLAGS = ${M_ARCH} -g -s -Wall\
++CFLAGS = ${M_ARCH} -g -Wall\
+ 	-fpic \
+ 	-DLINUX \
+ 	-DMOZILLA_FIX \
diff --git a/eclipse.spec b/eclipse.spec
index 81edfd6..2d63309 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,9 +1,5 @@
 Epoch:                  1
 
-# had to disable debug package
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=389862
-%define debug_package %{nil}
-
 %global eclipse_major   4
 %global eclipse_minor   2
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
@@ -69,7 +65,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -201,6 +197,8 @@ Patch35:        %{name}-secondary-arches.patch
 
 Patch36:        %{name}-improve-core-net-makefile.patch
 
+Patch37:        %{name}-debug-symbols.patch
+
 BuildRequires: ant >= 1.8.3
 BuildRequires: rsync
 BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@@ -423,6 +421,7 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch34
 %patch35
 %patch36
+%patch37
 
 #p2.inf should be qualified (asked in the newsgroup and waiting for an answer)
 #http://dev.eclipse.org/mhonarc/lists/cbi-dev/msg00777.html
@@ -618,7 +617,7 @@ popd
 
 mvn-rpmbuild -o clean install \
    -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
-   -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) -Dmaven.local.debug
+   -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1))
 
 
 pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}
@@ -1330,6 +1329,11 @@ rm -rf %{_bindir}/efj/
 %{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Thu Nov 8 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-16
+- Added debug symbols to SWT.
+- Restored the debug package.
+- Removed the debug flag from the build.
+
 * Wed Nov 7 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-15
 - Simplify initial repo creation.