Remove old cruft. Add version bump from upstream, support for CAIRO 0.9.2 in new version. Update metadata

Package-Manager: portage-2.0.51.22-r2

7 files changed, 175 insertions, 91 deletions

diff --git a/dev-java/swt/files/build-3.1.xml b/dev-java/swt/files/build-3.1.xml
deleted file mode 100644
index ce887a77850c..000000000000
--- a/dev-java/swt/files/build-3.1.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-   <property name="src" location="."/>
-   <property name="build" location="build"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}"/>
-   </target>
-
-   <target name="jar" depends="compile">
-      <jar destfile="swt.jar" basedir="${build}"/>
-   </target>
-</project>
diff --git a/dev-java/swt/files/build-3.1_pre7.xml b/dev-java/swt/files/build-3.1_pre7.xml
deleted file mode 100644
index ce887a77850c..000000000000
--- a/dev-java/swt/files/build-3.1_pre7.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-   <property name="src" location="."/>
-   <property name="build" location="build"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}"/>
-   </target>
-
-   <target name="jar" depends="compile">
-      <jar destfile="swt.jar" basedir="${build}"/>
-   </target>
-</project>
diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml
index 54cb6ec7e00c..ce887a77850c 100644
--- a/dev-java/swt/files/build.xml
+++ b/dev-java/swt/files/build.xml
@@ -1,4 +1,4 @@
-<project name="SWT" default="jar_all" basedir=".">
+<project name="SWT" default="jar" basedir=".">
    <property name="src" location="."/>
    <property name="build" location="build"/>
 
@@ -11,48 +11,7 @@
       <javac srcdir="${src}" destdir="${build}"/>
    </target>
 
-   <target name="jar_cairo" depends="compile">
-      <jar destfile="swt-cairo.jar" basedir="${build}">
-         <fileset dir="${build}/org/eclipse/swt/internal/cairo"/>
-      </jar>
+   <target name="jar" depends="compile">
+      <jar destfile="swt.jar" basedir="${build}"/>
    </target>
-
-   <target name="jar_mozilla" depends="compile">
-      <jar destfile="swt-mozilla.jar" basedir="${build}">
-         <fileset dir="${build}/org/eclipse/swt/internal/mozilla"/>
-      </jar>
-   </target>
-   
-   <target name="jar_swt-pi" depends="compile">
-      <jar destfile="swt-pi.jar" basedir="${build}">
-         <fileset dir="${build}/org/eclipse/swt/internal">
-            <include name="Library.class"/>
-            <include name="Lock.class"/>
-            <include name="Platform.class"/>
-         </fileset>
-         <fileset dir="${build}/org/eclipse/swt/internal/accessibility"/>
-         <fileset dir="${build}/org/eclipse/swt/internal/cde"/>
-         <fileset dir="${build}/org/eclipse/swt/internal/gnome"/>
-         <fileset dir="${build}/org/eclipse/swt/internal/gtk"/>
-         <fileset dir="${build}/org/eclipse/swt/internal/kde"/>
-      </jar>
-   </target>
-   
-   <target name="jar_swt" depends="compile">
-      <jar destfile="swt.jar" basedir="${build}">
-         <fileset dir="${build}/org/eclipse/swt/internal">
-            <exclude name="Library.class"/>
-            <exclude name="Lock.class"/>
-            <exclude name="Platform.class"/>
-            <exclude name="accessibility/**/*"/>
-            <exclude name="cairo/**/*"/>
-            <exclude name="cde/**/*"/>
-            <exclude name="gnome/**/*"/>
-            <exclude name="gtk/**/*"/>
-            <exclude name="kde/**/*"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="jar_all" depends="jar_cairo,jar_mozilla,jar_swt-pi,jar_swt"/>
 </project>
diff --git a/dev-java/swt/files/cairo.patch b/dev-java/swt/files/cairo.patch
deleted file mode 100644
index d6fbc25b027f..000000000000
--- a/dev-java/swt/files/cairo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cairo.c.org	2005-02-14 16:57:48.000000000 -0600
-+++ cairo.c	      2005-03-26 00:20:17.000000000 -0600
-@@ -22,6 +22,7 @@
- #include "swt.h"
- #include "cairo_structs.h"
- #include "cairo_stats.h"
-+#include "cairo-xlib.h"
- 
- #define Cairo_NATIVE(func) Java_org_eclipse_swt_internal_cairo_Cairo_##func
- 
diff --git a/dev-java/swt/files/digest-swt-3.1 b/dev-java/swt/files/digest-swt-3.1
deleted file mode 100644
index 21e67436fa42..000000000000
--- a/dev-java/swt/files/digest-swt-3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a7d5f5f593e423f9aec7713c548f3817 swt-3.1-gtk-linux-x86.zip 2643472
-MD5 37907f265059d9853911fc9538743280 swt-3.1-gtk-linux-x86_64.zip 2702033
-MD5 6fa2922701a0e360e0035fd0363fcae8 swt-3.1-gtk-linux-ppc.zip 2525054
diff --git a/dev-java/swt/files/digest-swt-3.2_pre1 b/dev-java/swt/files/digest-swt-3.2_pre1
new file mode 100644
index 000000000000..458056a3b0c8
--- /dev/null
+++ b/dev-java/swt/files/digest-swt-3.2_pre1
@@ -0,0 +1,3 @@
+MD5 907ad3012ec32beaa9662fcafb5aa669 swt-3.2M1-gtk-linux-x86.zip 2666543
+MD5 3c3cde2a01d3b59d57165b9fe0e6ed73 swt-3.2M1-gtk-linux-x86_64.zip 2725513
+MD5 c2d0daa2a480d2276e1f406ba28e57ed swt-3.2M1-gtk-linux-ppc.zip 2542441
diff --git a/dev-java/swt/files/swt-cairo-0.9.2.patch b/dev-java/swt/files/swt-cairo-0.9.2.patch
new file mode 100644
index 000000000000..ca202d94af64
--- /dev/null
+++ b/dev-java/swt/files/swt-cairo-0.9.2.patch
@@ -0,0 +1,169 @@
+===================================================================
+RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- cairo.c	2005/07/11 21:28:17	1.4
++++ cairo.c	2005/08/15 20:22:55	1.5
+@@ -254,6 +254,62 @@
+ }
+ #endif
+ 
++#ifndef NO_cairo_1font_1options_1create
++JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1options_1create)
++	(JNIEnv *env, jclass that)
++{
++	jint rc = 0;
++	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1create_FUNC);
++	rc = (jint)cairo_font_options_create();
++	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1create_FUNC);
++	return rc;
++}
++#endif
++
++#ifndef NO_cairo_1font_1options_1destroy
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1destroy)
++	(JNIEnv *env, jclass that, jint arg0)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1destroy_FUNC);
++	cairo_font_options_destroy((cairo_font_options_t *)arg0);
++	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1destroy_FUNC);
++}
++#endif
++
++#ifndef NO_cairo_1font_1options_1get_1antialias
++JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1options_1get_1antialias)
++	(JNIEnv *env, jclass that, jint arg0)
++{
++	jint rc = 0;
++	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1get_1antialias_FUNC);
++	rc = (jint)cairo_font_options_get_antialias((cairo_font_options_t *)arg0);
++	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1get_1antialias_FUNC);
++	return rc;
++}
++#endif
++
++#ifndef NO_cairo_1font_1options_1set_1antialias
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1set_1antialias)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1set_1antialias_FUNC);
++	cairo_font_options_set_antialias((cairo_font_options_t *)arg0, arg1);
++	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1set_1antialias_FUNC);
++}
++#endif
++
++#ifndef NO_cairo_1get_1antialias
++JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1antialias)
++	(JNIEnv *env, jclass that, jint arg0)
++{
++	jint rc = 0;
++	Cairo_NATIVE_ENTER(env, that, cairo_1get_1antialias_FUNC);
++	rc = (jint)cairo_get_antialias((cairo_t *)arg0);
++	Cairo_NATIVE_EXIT(env, that, cairo_1get_1antialias_FUNC);
++	return rc;
++}
++#endif
++
+ #ifndef NO_cairo_1get_1current_1point
+ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1current_1point)
+ 	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+@@ -309,6 +365,16 @@
+ }
+ #endif
+ 
++#ifndef NO_cairo_1get_1font_1options
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1font_1options)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1get_1font_1options_FUNC);
++	cairo_get_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
++	Cairo_NATIVE_EXIT(env, that, cairo_1get_1font_1options_FUNC);
++}
++#endif
++
+ #ifndef NO_cairo_1get_1line_1cap
+ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1line_1cap)
+ 	(JNIEnv *env, jclass that, jint arg0)
+@@ -972,12 +1038,14 @@
+ #endif
+ 
+ #ifndef NO_cairo_1reference
+-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1reference)
++JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1reference)
+ 	(JNIEnv *env, jclass that, jint arg0)
+ {
++	jint rc = 0;
+ 	Cairo_NATIVE_ENTER(env, that, cairo_1reference_FUNC);
+-	cairo_reference((cairo_t *)arg0);
++	rc = (jint)cairo_reference((cairo_t *)arg0);
+ 	Cairo_NATIVE_EXIT(env, that, cairo_1reference_FUNC);
++	return rc;
+ }
+ #endif
+ 
+@@ -1075,6 +1143,16 @@
+ }
+ #endif
+ 
++#ifndef NO_cairo_1set_1antialias
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1antialias)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1set_1antialias_FUNC);
++	cairo_set_antialias((cairo_t *)arg0, arg1);
++	Cairo_NATIVE_EXIT(env, that, cairo_1set_1antialias_FUNC);
++}
++#endif
++
+ #ifndef NO_cairo_1set_1dash
+ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1dash)
+ 	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jint arg2, jdouble arg3)
+@@ -1123,6 +1201,16 @@
+ }
+ #endif
+ 
++#ifndef NO_cairo_1set_1font_1options
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1options)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_1options_FUNC);
++	cairo_set_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
++	Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_1options_FUNC);
++}
++#endif
++
+ #ifndef NO_cairo_1set_1font_1size
+ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1size)
+ 	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+@@ -1371,14 +1459,12 @@
+ #endif
+ 
+ #ifndef NO_cairo_1surface_1finish
+-JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1finish)
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1surface_1finish)
+ 	(JNIEnv *env, jclass that, jint arg0)
+ {
+-	jint rc = 0;
+ 	Cairo_NATIVE_ENTER(env, that, cairo_1surface_1finish_FUNC);
+-	rc = (jint)cairo_surface_finish((cairo_surface_t *)arg0);
++	cairo_surface_finish((cairo_surface_t *)arg0);
+ 	Cairo_NATIVE_EXIT(env, that, cairo_1surface_1finish_FUNC);
+-	return rc;
+ }
+ #endif
+ 
+@@ -1526,11 +1612,11 @@
+ 
+ #ifndef NO_cairo_1xlib_1surface_1create_1for_1bitmap
+ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1xlib_1surface_1create_1for_1bitmap)
+-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ {
+ 	jint rc = 0;
+ 	Cairo_NATIVE_ENTER(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
+-	rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, arg2, arg3);
++	rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
+ 	Cairo_NATIVE_EXIT(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
+ 	return rc;
+ }