[pkg-java] r2550 - in trunk/eclipse/debian: . patches

[Matthias Klose]

Author: doko
Date: 2006-10-04 11:32:34 +0000 (Wed, 04 Oct 2006)
New Revision: 2550

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch
Log:
* debian/patches/eclipse-libswt-mozilla.dpatch: Update.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-10-04 10:41:07 UTC (rev 2549)
+++ trunk/eclipse/debian/changelog	2006-10-04 11:32:34 UTC (rev 2550)
@@ -48,6 +48,7 @@
   * Don't build the eclipse-ecj and eclipse-ecj-gcj packages anymore.
   * Use java-gcj-compat-dev to compile the jar files to native code
     and register them.
+  * debian/patches/eclipse-libswt-mozilla.dpatch: Update.
 
  -- Michael Koch <konqueror at gmx.de>  Tue,  3 Oct 2006 17:22:09 +0000
 

Modified: trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch	2006-10-04 10:41:07 UTC (rev 2549)
+++ trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch	2006-10-04 11:32:34 UTC (rev 2550)
@@ -21,17 +21,23 @@
 exit 0
 
 @DPATCH@
-diff -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
---- source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2006-01-28 18:46:37.000000000 +0100
-+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2006-01-28 18:50:18.000000000 +0100
-@@ -23,6 +23,10 @@
+--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh~	2006-10-04 13:11:51.242766750 +0200
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2006-10-04 13:20:38.643727250 +0200
+@@ -60,6 +60,17 @@
+ 		;;
+ esac
  
- case $OS in
- 	"Linux")
++case $OS in
++	"Linux")
 +		GECKO_INCLUDES="`pkg-config --cflags mozilla-gtkmozembed`"
 +		GECKO_LIBS="`pkg-config --libs mozilla-gtkmozembed`"
 +		# Set this to something to override the presets
 +		GECKO_SDK="_"
- 		case $MODEL in
- 			"x86_64")
- 				CC=gcc
++		export GECKO_INCLUDES
++		export GECKO_LIBS
++		MAKE_MOZILLA=make_mozilla
++esac
++
+ # For 64-bit CPUs, we have a switch
+ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' ]; then
+ 	SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64