rpms/eclipse/F-11 eclipse-swt-buildagainstxulrunner.patch, 1.1, 1.2 eclipse.spec, 1.627, 1.628

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11904

Modified Files:
	eclipse-swt-buildagainstxulrunner.patch eclipse.spec 
Log Message:
* Mon Apr 6 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-9
- Re-add patch to build libswt-xulrunner instead of libswt-mozilla.
- RHBZ#484453
- Eclipse.org BZ#226356

eclipse-swt-buildagainstxulrunner.patch:

Index: eclipse-swt-buildagainstxulrunner.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse-swt-buildagainstxulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-swt-buildagainstxulrunner.patch	16 Mar 2009 18:14:14 -0000	1.1
+++ eclipse-swt-buildagainstxulrunner.patch	6 Apr 2009 21:26:05 -0000	1.2
@@ -3,13 +3,23 @@
 Index: Eclipse SWT PI/gtk/library/build.sh
 ===================================================================
 RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh,v
-retrieving revision 1.50
-diff -u -r1.50 build.sh
---- Eclipse SWT PI/gtk/library/build.sh	23 Jan 2009 23:22:21 -0000	1.50
-+++ Eclipse SWT PI/gtk/library/build.sh	5 Mar 2009 20:41:43 -0000
-@@ -107,11 +107,11 @@
+retrieving revision 1.48
+diff -u -r1.48 build.sh
+--- Eclipse SWT PI/gtk/library/build.sh	5 Jun 2008 17:31:51 -0000	1.48
++++ Eclipse SWT PI/gtk/library/build.sh	6 Apr 2009 21:11:22 -0000
+@@ -96,19 +96,19 @@
+ 		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
+ 		export MOZILLA_INCLUDES
  		export MOZILLA_LIBS
- 		MAKE_MOZILLA=make_mozilla
+-		MAKE_MOZILLA=make_mozilla
++		MAKE_MOZILLA="make_mozilla make_xpcominit"
+ 	elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
+ 		MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
+ 		MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
+ 		export MOZILLA_INCLUDES
+ 		export MOZILLA_LIBS
+-		MAKE_MOZILLA=make_mozilla
++		MAKE_MOZILLA="make_mozilla make_xpcominit"
  	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
 -		MOZILLA_INCLUDES=`pkg-config --cflags libxul`
 -		MOZILLA_LIBS=`pkg-config --libs libxul`
@@ -17,10 +27,10 @@
 -		export MOZILLA_LIBS
 -		MAKE_MOZILLA=make_mozilla
 +		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
-+		XULRUNNER_LIBS=`pkg-config --libs libxul`
++		XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
 +		export XULRUNNER_INCLUDES
 +		export XULRUNNER_LIBS
-+		MAKE_MOZILLA=make_xulrunner
++		MAKE_MOZILLA="make_xulrunner make_xpcominit"
  	else
  		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
  		echo "    *** Mozilla embedding support will not be compiled."


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- eclipse.spec	6 Apr 2009 18:31:46 -0000	1.627
+++ eclipse.spec	6 Apr 2009 21:26:05 -0000	1.628
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -149,7 +149,11 @@
 
 # Since we're building against XULRunner, build using XR flags
 # https://bugs.eclipse.org/226356
-# https://bugzilla.redhat.com/show_bug.cgi?id=484453
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=131059
+# At present, libxul.pc contains -lxpcomglue_s.  Chris Aillon and myself think
+# it should perhaps be -lxpcomglue.  This patch uses that instead but will
+# be replaced with the former when libxul.pc is fixed.
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
 Patch45:        %{name}-swt-buildagainstxulrunner.patch
 # Work with changed interface in XULRunner 1.9.1
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651
@@ -356,9 +360,9 @@
 #%patch40
 #popd
 
-#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-#%patch45 -p3
-#popd
+pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+%patch45 -p3
+popd
 pushd plugins/org.eclipse.swt
 %patch46
 popd
@@ -1487,6 +1491,11 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 6 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-9
+- Re-add patch to build libswt-xulrunner instead of libswt-mozilla.
+- RHBZ#484453
+- Eclipse.org BZ#226356
+
 * Mon Apr 6 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-8
 - Fix jdt owning dropins/jdt folder.