mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00
Code Issues Releases Activity

Update to 3.5M3

Browse Source 
Approved by:	garga (mentor, implicit)
This commit is contained in:
Robert Noland 2008-12-31 21:42:56 +00:00
parent f09fefbfe7
commit 8f4c9e96a1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=225076
5 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11-toolkits/swt-devel/Makefile
View File

@ -6,12 +6,12 @@
#
PORTNAME= swt-devel
DISTVERSION= 3.5M1
DISTVERSION= 3.5M3
#PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits devel java
MASTER_SITES= ${MASTER_SITE_ECLIPSE}
MASTER_SITE_SUBDIR= S-${DISTVERSION}-200808071402
MASTER_SITE_SUBDIR= S-${DISTVERSION}-200810301917
DISTNAME= swt-${DISTVERSION}-${DIST_EXT}
MAINTAINER= rnoland@FreeBSD.org
@ -19,9 +19,7 @@ COMMENT= Standard Widget Toolkit for Java
ONLY_FOR_ARCHS= i386 amd64
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-${ARCH}-os.c
SWT_VERSION= 3504
SWT_VERSION= 3514
OUTPUT_JAR= swt-devel.jar
USE_ZIP= yes

12
x11-toolkits/swt-devel/distinfo
View File

@ -1,6 +1,6 @@
MD5 (swt-3.5M1-gtk-linux-x86.zip) = 2767c21248510ee46efd24a2faacc0a2
SHA256 (swt-3.5M1-gtk-linux-x86.zip) = 85426ecea55d91b1e7aebaac9c5d04b70860530dc5df7f3753b7b3f967debbf0
SIZE (swt-3.5M1-gtk-linux-x86.zip) = 4558110
MD5 (swt-3.5M1-gtk-linux-x86_64.zip) = 4a540f5b8c9e2774d383eeb7a3d7d39b
SHA256 (swt-3.5M1-gtk-linux-x86_64.zip) = 1fd1be9bb40f3db9b344e99076344d861c7e73f1dcf483311fb7ffb8ee557f1d
SIZE (swt-3.5M1-gtk-linux-x86_64.zip) = 4740612
MD5 (swt-3.5M3-gtk-linux-x86.zip) = 49b43087cd4052b9ef5c5cc6e29c749a
SHA256 (swt-3.5M3-gtk-linux-x86.zip) = 651d949ad1060b013c836981336f3d4f3d0ed85ece877c266bb9995c11ecb12b
SIZE (swt-3.5M3-gtk-linux-x86.zip) = 4620437
MD5 (swt-3.5M3-gtk-linux-x86_64.zip) = 60ae756f20e607a001ba7d34ab308a46
SHA256 (swt-3.5M3-gtk-linux-x86_64.zip) = c71be6c5587c87c38a50ee2e36fbb6dc9db0d47c43d16a82967f464a5cbe6131
SIZE (swt-3.5M3-gtk-linux-x86_64.zip) = 4799940

20
x11-toolkits/swt-devel/files/extra-patch-amd64-os.c
View File

@ -1,20 +0,0 @@
--- os.c.orig 2007-06-25 16:06:14.000000000 -0400
+++ os.c 2007-08-10 11:54:37.000000000 -0400
@@ -17397,11 +17397,16 @@
jlong rc = 0;
OS_NATIVE_ENTER(env, that, realpath_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) {
+ if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ } else
+ lparg1 = malloc(PATH_MAX);
rc = (jlong)realpath((const char *)lparg0, (char *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+ if (!arg1 && lparg1 && rc == 0)
+ free(lparg1);
OS_NATIVE_EXIT(env, that, realpath_FUNC);
return rc;
}

2
x11-toolkits/swt-devel/files/patch-build.sh
View File

@ -6,7 +6,7 @@
# For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'amd64' ]; then
SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
SWT_PTR_CFLAGS=-DJNI64
export SWT_PTR_CFLAGS
if [ -d /lib64 ]; then
- XLIB64=-L/usr/X11R6/lib64

10
x11-toolkits/swt-devel/files/extra-patch-i386-os.c → x11-toolkits/swt-devel/files/patch-os.c
View File

@ -1,7 +1,7 @@
--- os.c.orig 2007-04-26 14:03:00.000000000 -0400
+++ os.c 2007-08-10 11:56:22.000000000 -0400
@@ -17397,11 +17397,16 @@
jint rc = 0;
--- os.c.orig 2008-12-31 16:16:39.000000000 -0500
+++ os.c 2008-12-31 16:20:29.000000000 -0500
@@ -18036,11 +18036,16 @@
jintLong rc = 0;
OS_NATIVE_ENTER(env, that, realpath_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
@ -9,7 +9,7 @@
+ if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ } else
+ lparg1 = malloc(PATH_MAX);
rc = (jint)realpath((const char *)lparg0, (char *)lparg1);
rc = (jintLong)realpath((const char *)lparg0, (char *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);