[oe-commits] : swt-gtk: Clean up and removal of obsolete versions
OE GIT Trial
gittrial at amethyst.openembedded.net
Tue Oct 7 23:57:38 UTC 2008
Module: org.openembedded.dev.git
Branch: org.openembedded.dev
Commit: f4f3f9c2e37f6f8a524553bbd4570e93fc0f5ab4
URL: http://gitweb.openembedded.net/?p=org.openembedded.dev.git&a=commit;h=f4f3f9c2e37f6f8a524553bbd4570e93fc0f5ab4
Author: <thebohemian at openembedded.org>
Date: Tue Oct 7 23:42:46 2008 +0000
swt-gtk: Clean up and removal of obsolete versions
* use fastjar instead of gjar
* delete pre-releases 3.4M3 and 3.4M5
* added 3.4
* updated refreshed hildon patch
---
packages/swt/files/Makefile | 4 +-
packages/swt/files/swt-hildon.patch | 50 ++++++++++----------
packages/swt/swt-gtk.inc | 2 +-
packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb | 7 ---
...ildon_3.3+3.4M3.bb => swt3.4-gtk-hildon_3.4.bb} | 4 +-
packages/swt/swt3.4-gtk_3.3+3.4M3.bb | 15 ------
.../{swt3.4-gtk_3.3+3.4M5.bb => swt3.4-gtk_3.4.bb} | 6 +-
7 files changed, 33 insertions(+), 55 deletions(-)
diff --git a/packages/swt/files/Makefile b/packages/swt/files/Makefile
index 2eb3557..4835f14 100644
--- a/packages/swt/files/Makefile
+++ b/packages/swt/files/Makefile
@@ -5,8 +5,8 @@ CLEANFILES=*.files *.jar *.so* *-stamp
RELEASE=OE_SWT_RELEASE
SONAME_VERSION=OE_SWT_API_VERSION
-GCJ=gcj
-JAR=gjar
+GCJ=false
+JAR=fastjar
JAVAC=javac -classpath .
LDCONFIG=/sbin/ldconfig
LN_S=ln -s
diff --git a/packages/swt/files/swt-hildon.patch b/packages/swt/files/swt-hildon.patch
index 5f095e0..90ceb1e 100644
--- a/packages/swt/files/swt-hildon.patch
+++ b/packages/swt/files/swt-hildon.patch
@@ -1,7 +1,7 @@
-Index: swt/swt-source/make_linux.mak
+Index: swt-source/make_linux.mak
===================================================================
---- swt.orig/swt-source/make_linux.mak 2007-06-20 12:01:22.000000000 +0200
-+++ swt/swt-source/make_linux.mak 2008-02-14 11:32:49.000000000 +0100
+--- swt-source.orig/make_linux.mak 2007-06-20 12:01:22.000000000 +0200
++++ swt-source/make_linux.mak 2008-10-08 01:36:56.000000000 +0200
@@ -45,8 +45,8 @@
CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
@@ -31,10 +31,10 @@ Index: swt/swt-source/make_linux.mak
-fPIC \
${SWT_PTR_CFLAGS}
LIBS = -shared -fPIC
-Index: swt/swt-source/os.c
+Index: swt-source/os.c
===================================================================
---- swt.orig/swt-source/os.c 2007-10-30 16:24:28.000000000 +0100
-+++ swt/swt-source/os.c 2008-02-14 09:32:49.000000000 +0100
+--- swt-source.orig/os.c 2008-06-05 13:31:52.000000000 +0200
++++ swt-source/os.c 2008-10-08 01:36:56.000000000 +0200
@@ -17,6 +17,9 @@
#include "os_structs.h"
#include "os_stats.h"
@@ -45,7 +45,7 @@ Index: swt/swt-source/os.c
#define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func
#ifndef NO_Call
-@@ -7015,9 +7018,18 @@
+@@ -7133,9 +7136,18 @@
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
(JNIEnv *env, jclass that, jint arg0, jint arg1)
{
@@ -66,7 +66,7 @@ Index: swt/swt-source/os.c
}
#endif
-@@ -9121,9 +9133,12 @@
+@@ -9375,9 +9387,12 @@
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
(JNIEnv *env, jclass that)
{
@@ -80,7 +80,7 @@ Index: swt/swt-source/os.c
OS_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC);
return rc;
}
-@@ -15464,8 +15479,23 @@
+@@ -15849,8 +15864,23 @@
(JNIEnv *env, jclass that, jint arg0)
{
jint rc = 0;
@@ -105,11 +105,11 @@ Index: swt/swt-source/os.c
OS_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC);
return rc;
}
-Index: swt/swt-source/org/eclipse/swt/widgets/Menu.java
+Index: swt-source/org/eclipse/swt/widgets/Menu.java
===================================================================
---- swt.orig/swt-source/org/eclipse/swt/widgets/Menu.java 2007-05-31 18:03:50.000000000 +0200
-+++ swt/swt-source/org/eclipse/swt/widgets/Menu.java 2008-02-14 09:05:04.000000000 +0100
-@@ -259,9 +259,17 @@
+--- swt-source.orig/org/eclipse/swt/widgets/Menu.java 2008-06-05 13:31:08.000000000 +0200
++++ swt-source/org/eclipse/swt/widgets/Menu.java 2008-10-08 01:36:56.000000000 +0200
+@@ -287,9 +287,17 @@
if ((style & SWT.BAR) != 0) {
handle = OS.gtk_menu_bar_new ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -127,11 +127,11 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Menu.java
} else {
handle = OS.gtk_menu_new ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-Index: swt/swt-source/org/eclipse/swt/internal/gtk/OS.java
+Index: swt-source/org/eclipse/swt/internal/gtk/OS.java
===================================================================
---- swt.orig/swt-source/org/eclipse/swt/internal/gtk/OS.java 2007-10-30 16:06:36.000000000 +0100
-+++ swt/swt-source/org/eclipse/swt/internal/gtk/OS.java 2008-02-14 09:05:04.000000000 +0100
-@@ -471,6 +471,11 @@
+--- swt-source.orig/org/eclipse/swt/internal/gtk/OS.java 2008-06-05 13:32:08.000000000 +0200
++++ swt-source/org/eclipse/swt/internal/gtk/OS.java 2008-10-08 01:36:56.000000000 +0200
+@@ -473,6 +473,11 @@
public static final byte[] window_state_event = ascii("window-state-event");
/** Properties */
@@ -143,11 +143,11 @@ Index: swt/swt-source/org/eclipse/swt/internal/gtk/OS.java
public static final byte[] active = ascii("active");
public static final byte[] background_gdk = ascii("background-gdk");
public static final byte[] button_relief = ascii("button-relief");
-Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java
+Index: swt-source/org/eclipse/swt/widgets/Shell.java
===================================================================
---- swt.orig/swt-source/org/eclipse/swt/widgets/Shell.java 2007-11-01 11:31:12.000000000 +0100
-+++ swt/swt-source/org/eclipse/swt/widgets/Shell.java 2008-02-14 10:51:37.000000000 +0100
-@@ -1028,6 +1028,14 @@
+--- swt-source.orig/org/eclipse/swt/widgets/Shell.java 2008-06-05 13:31:10.000000000 +0200
++++ swt-source/org/eclipse/swt/widgets/Shell.java 2008-10-08 01:36:56.000000000 +0200
+@@ -1067,6 +1067,14 @@
int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
int width = OS.GTK_WIDGET_WIDTH (shellHandle);
int height = OS.GTK_WIDGET_HEIGHT (shellHandle);
@@ -162,7 +162,7 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java
if (!resized || oldWidth != width || oldHeight != height) {
oldWidth = width;
oldHeight = height;
-@@ -1384,14 +1392,53 @@
+@@ -1472,14 +1480,53 @@
if ((state & FOREIGN_HANDLE) != 0) return;
Monitor monitor = getMonitor ();
Rectangle rect = monitor.getClientArea ();
@@ -216,10 +216,10 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java
public void setMaximized (boolean maximized) {
checkWidget();
super.setMaximized (maximized);
-Index: swt/swt-source/os_custom.c
+Index: swt-source/os_custom.c
===================================================================
---- swt.orig/swt-source/os_custom.c 2007-05-31 18:04:22.000000000 +0200
-+++ swt/swt-source/os_custom.c 2008-02-14 13:55:49.000000000 +0100
+--- swt-source.orig/os_custom.c 2008-06-05 13:31:50.000000000 +0200
++++ swt-source/os_custom.c 2008-10-08 01:36:56.000000000 +0200
@@ -13,6 +13,8 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc
index 0bdaaab..a5e62b7 100644
--- a/packages/swt/swt-gtk.inc
+++ b/packages/swt/swt-gtk.inc
@@ -3,7 +3,7 @@ LICENSE = "CPL MPL LGPL"
inherit java-library
-DEPENDS = "classpath-tools-native cairo gtk+ atk libxtst"
+DEPENDS = "fastjar-native cairo gtk+ atk libxtst"
S = "${WORKDIR}/swt-source"
diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
deleted file mode 100644
index 9a74844..0000000
--- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require swt3.4-gtk_${PV}.bb
-
-PR = "r1"
-
-DEPENDS += "libhildon libhildonfm"
-
-SRC_URI += "file://swt-hildon.patch;patch=1;pnum=2"
diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk-hildon_3.4.bb
similarity index 51%
rename from packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
rename to packages/swt/swt3.4-gtk-hildon_3.4.bb
index 7033d0c..667e516 100644
--- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
+++ b/packages/swt/swt3.4-gtk-hildon_3.4.bb
@@ -1,7 +1,7 @@
require swt3.4-gtk_${PV}.bb
-PR = "r3"
+PR = "r0"
DEPENDS += "libhildon libhildonfm"
-SRC_URI += "file://swt-hildon.patch;patch=1;pnum=2"
+SRC_URI += "file://swt-hildon.patch;patch=1"
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
deleted file mode 100644
index eda136b..0000000
--- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require swt-gtk.inc
-
-PR = "r1"
-
-SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \
- file://Makefile \
- file://make_linux-fix.patch;patch=1"
-
-# A number which is used by SWT to mark the shared libraries.
-SWTVERSION = "3416"
-SWT_API_VERSION = "3.4"
-
-PROVIDES = "swt3.4-gtk"
-
-RCONFLICTS = "libswt3.3-gtk-java"
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk_3.4.bb
similarity index 72%
rename from packages/swt/swt3.4-gtk_3.3+3.4M5.bb
rename to packages/swt/swt3.4-gtk_3.4.bb
index 4cdd7c0..b6eafca 100644
--- a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb
+++ b/packages/swt/swt3.4-gtk_3.4.bb
@@ -1,12 +1,12 @@
require swt-gtk.inc
-PR = "r1"
+PR = "r0"
-SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/swt-3.4M5-gtk-linux-x86.zip \
+SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip \
file://Makefile"
# A number which is used by SWT to mark the shared libraries.
-SWTVERSION = "3428"
+SWTVERSION = "3448"
SWT_API_VERSION = "3.4"
PROVIDES = "swt3.4-gtk"
More information about the Openembedded-commits
mailing list