Author: mkoch
Date: 2006-05-21 15:49:44 +0000 (Sun, 21 May 2006)
New Revision: 2131
Added:
trunk/eclipse/debian/patches/eclipse-libswt-xulrunner.dpatch
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/rules
Log:
* debian/rules: Added support to build with xulrunner. Made it the default.
Closes: #352184.
* debian/patches/eclipse-libswt-xulrunner.dpatch: New file.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-05-21 09:18:10 UTC (rev 2130)
+++ trunk/eclipse/debian/changelog 2006-05-21 15:49:44 UTC (rev 2131)
@@ -1,8 +1,10 @@
eclipse (3.1.2-3) UNRELEASED; urgency=low
- * No changes yet.
+ * debian/rules: Added support to build with xulrunner. Made it the default.
+ Closes: #352184.
+ * debian/patches/eclipse-libswt-xulrunner.dpatch: New file.
- -- Michael Koch <[EMAIL PROTECTED]> Wed, 17 May 2006 12:49:28 +0000
+ -- Michael Koch <[EMAIL PROTECTED]> Sun, 21 May 2006 15:47:27 +0000
eclipse (3.1.2-2) unstable; urgency=low
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2006-05-21 09:18:10 UTC (rev 2130)
+++ trunk/eclipse/debian/control 2006-05-21 15:49:44 UTC (rev 2131)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>,
Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.54), ecj-bootstrap, liblucene-java (>=
1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>=
0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>=
2.6), libgnomeui-dev (>= 2.6), libxtst-dev, classpath-doc, pkg-config,
libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, mozilla-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.54), ecj-bootstrap, liblucene-java (>=
1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>=
0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>=
2.6), libgnomeui-dev (>= 2.6), libxtst-dev, classpath-doc, pkg-config,
libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, libxul-dev
Standards-Version: 3.7.2
Package: eclipse-rcp
Added: trunk/eclipse/debian/patches/eclipse-libswt-xulrunner.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-xulrunner.dpatch
2006-05-21 09:18:10 UTC (rev 2130)
+++ trunk/eclipse/debian/patches/eclipse-libswt-xulrunner.dpatch
2006-05-21 15:49:44 UTC (rev 2131)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+##
+## DP: Debian specific patch, converted from eclipse-libswt-mozilla.patch
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p0 < $0;;
+ -unpatch)
+ patch $patch_opts -p0 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+exit 0
+
[EMAIL PROTECTED]@
+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 @@
+
+ case $OS in
+ "Linux")
++ GECKO_INCLUDES=`pkg-config --cflags xulrunner-gtkmozembed`
++ GECKO_LIBS=`pkg-config --libs xulrunner-gtkmozembed`
++ # Set this to something to override the presets
++ GECKO_SDK="_"
+ case $MODEL in
+ "x86_64")
+ CC=gcc
Property changes on:
trunk/eclipse/debian/patches/eclipse-libswt-xulrunner.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-05-21 09:18:10 UTC (rev 2130)
+++ trunk/eclipse/debian/rules 2006-05-21 15:49:44 UTC (rev 2131)
@@ -104,7 +104,8 @@
BUILD_DEPS += , libtomcat5-java
endif
-with_browser := mozilla
+with_browser := xulrunner
+#with_browser := mozilla
#with_browser := firefox
with_dpatch = yes
@@ -151,6 +152,15 @@
eclipse-disable-tomcat
endif
+ifeq ($(with_browser),xulrunner)
+ eclipse_patches += \
+ eclipse-libswt-xulrunner
+
+ BUILD_DEPS += , libxul-dev
+ MOZILLA_DEP = ${shlibs:depends}
+ MOZILLA_HOME = /usr/lib/mozilla
+endif
+
ifeq ($(with_browser),mozilla)
eclipse_patches += \
eclipse-libswt-mozilla
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
