Attachment 81603 Details for Bug 116845 – swt-3.3.patch

[patch] swt-3.3.patch

swt-3.3.patch (text/plain), 13.14 KB, created by Robert Noland on 2007-10-03 01:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Noland

Created: 2007-10-03 01:20:01 UTC

Size: 13.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/x11-toolkits/swt/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- Makefile	19 May 2007 20:32:02 -0000	1.4
>+++ Makefile	3 Oct 2007 00:09:51 -0000
>@@ -1,4 +1,4 @@
>-# New ports collection makefile for:	swt32
>+# New ports collection makefile for:	swt
> # Date created:				2006-11-16
> # Whom:					Robert C. Noland III <rnoland@2hip.net>
> #
>@@ -6,12 +6,12 @@
> #
> 
> PORTNAME=	swt
>-PORTVERSION=	3.2.2
>-PORTREVISION=	1
>+DISTVERSION=	3.3
>+#PORTREVISION=	1
> CATEGORIES=	x11-toolkits devel java
> MASTER_SITES=	${MASTER_SITE_ECLIPSE}
>-MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200702121330
>-DISTNAME=	swt-${PORTVERSION}-${DIST_EXT}
>+MASTER_SITE_SUBDIR=	R-${DISTVERSION}-200706251500
>+DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
> 
> MAINTAINER=	rnoland@2hip.net
> COMMENT=	Standard Widget Toolkit for Java
>@@ -20,7 +20,9 @@
> 
> CONFLICTS=	swt-3.1*
> 
>-SWT_VERSION=	3236
>+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-${ARCH}-os.c
>+
>+SWT_VERSION=	3346
> OUTPUT_JAR=	swt.jar
> 
> USE_ZIP=	yes
>@@ -41,7 +43,7 @@
> 		lib/libswt-glx-gtk-%%BUILD%%.so \
> 		lib/libswt-pi-gtk-%%BUILD%%.so
> 
>-WRKSRC=		${WRKDIR}/swt-M20070212-1330-${DIST_EXT}
>+NO_WRKSUBDIR=	yes
> 
> OPTIONS=	CAIRO "Cairo Support" on \
> 		GNOMEVFS "Gnome VFS Support" on \
>@@ -66,11 +68,7 @@
> 
> .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
> 
>-PLIST_FILES+=	lib/libswt-${GECKO}-gtk-%%BUILD%%.so \
>-		lib/libswt-${GECKO}14-profile-gtk-%%BUILD%%.so \
>-		lib/libswt-${GECKO}17-profile-gtk-%%BUILD%%.so \
>-		lib/libswt-${GECKO}18-profile-gtk-%%BUILD%%.so
>-
>+PLIST_FILES+=	lib/libswt-mozilla-gtk-%%BUILD%%.so
> MAKE_MOZILLA=	make_mozilla
> .endif
> 
>@@ -87,13 +85,10 @@
> post-extract:
> 	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
> 	@${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
>-	@${CP} ${WRKSRC}/make_linux.mak ${WRKSRC}/make_freebsd.mak
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \
> 		${WRKSRC}/build.sh
>-	@${REINPLACE_CMD} -e 's|swt-mozilla|swt-${GECKO}|' \
>-		${WRKSRC}/make_freebsd.mak
> 
> do-install:
> 	${MKDIR} ${JAVAJARDIR}
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/x11-toolkits/swt/distinfo,v
>retrieving revision 1.3
>diff -u -r1.3 distinfo
>--- distinfo	6 Mar 2007 02:52:04 -0000	1.3
>+++ distinfo	3 Oct 2007 00:09:51 -0000
>@@ -1,6 +1,6 @@
>-MD5 (swt-3.2.2-gtk-linux-x86.zip) = e1340b6c7cf9b617145667b15b02fd49
>-SHA256 (swt-3.2.2-gtk-linux-x86.zip) = aae02ccab6ba97d984533c834ca854a649c3a91ad129fb4a61f7e89c55c41f28
>-SIZE (swt-3.2.2-gtk-linux-x86.zip) = 3117432
>-MD5 (swt-3.2.2-gtk-linux-x86_64.zip) = d678cedc336a58b0147081b56de6a1f3
>-SHA256 (swt-3.2.2-gtk-linux-x86_64.zip) = a60902420ca5e540d949613a5eba352a92043cf3c8d20e8a8214fb0c44699e56
>-SIZE (swt-3.2.2-gtk-linux-x86_64.zip) = 2996317
>+MD5 (swt-3.3-gtk-linux-x86.zip) = 7398cdf9340cb131b76ed98495239520
>+SHA256 (swt-3.3-gtk-linux-x86.zip) = 08a3b6329c878c99025e9c9b530b65c4315a37ce52e796e89ae6dc62269df163
>+SIZE (swt-3.3-gtk-linux-x86.zip) = 4448296
>+MD5 (swt-3.3-gtk-linux-x86_64.zip) = b0a4b3442e61d2968acecfa18cdd3aa9
>+SHA256 (swt-3.3-gtk-linux-x86_64.zip) = f4357ed778da7f0b91b08b0ed67fe2bc907a2c6a1b5808442f6390f56fa85b50
>+SIZE (swt-3.3-gtk-linux-x86_64.zip) = 4622274
>Index: files/extra-patch-amd64-os.c
>===================================================================
>RCS file: files/extra-patch-amd64-os.c
>diff -N files/extra-patch-amd64-os.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/extra-patch-amd64-os.c	3 Oct 2007 00:09:51 -0000
>@@ -0,0 +1,20 @@
>+--- 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;
>+ }
>Index: files/extra-patch-i386-os.c
>===================================================================
>RCS file: files/extra-patch-i386-os.c
>diff -N files/extra-patch-i386-os.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/extra-patch-i386-os.c	3 Oct 2007 00:09:51 -0000
>@@ -0,0 +1,20 @@
>+--- 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_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 = (jint)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;
>+ }
>Index: files/patch-build.sh
>===================================================================
>RCS file: /home/ncvs/ports/x11-toolkits/swt/files/patch-build.sh,v
>retrieving revision 1.1
>diff -u -r1.1 patch-build.sh
>--- files/patch-build.sh	2 Dec 2006 01:10:28 -0000	1.1
>+++ files/patch-build.sh	3 Oct 2007 00:09:51 -0000
>@@ -1,26 +1,17 @@
>---- build.sh.orig	Mon Nov 21 23:48:16 2005
>-+++ build.sh	Fri Dec  1 16:34:03 2006
>-@@ -31,6 +31,10 @@
>- 		SWT_OS=solaris
>- 		MAKEFILE=make_solaris.mak
>- 		;;
>-+	"FreeBSD")
>-+		SWT_OS=freebsd
>-+		MAKEFILE=make_freebsd.mak
>-+		;;
>- 	*)
>- 		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
>- 		MAKEFILE=make_linux.mak
>-@@ -61,7 +65,7 @@
>+--- build.sh.orig	Thu May 31 18:04:22 2007
>++++ build.sh	Mon Jun 11 18:25:04 2007
>+@@ -65,15 +65,16 @@
>  esac
>  
>  # For 64-bit CPUs, we have a switch
>--if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' ]; then
>-+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'amd64' ]; then
>+-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
>  	export SWT_PTR_CFLAGS
>  	if [ -d /lib64 ]; then
>-@@ -70,6 +74,7 @@
>+-		XLIB64=-L/usr/X11R6/lib64
>++		XLIB64=-L${X11BASE}/lib64
>+ 		export XLIB64
>  	fi
>  fi
>  
>@@ -28,7 +19,7 @@
>  if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
>  	echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
>  	MAKE_GNOME=make_gnome
>-@@ -77,7 +82,9 @@
>+@@ -81,7 +82,9 @@
>  	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
>  	echo "    *** SWT Program support for GNOME will not be compiled."
>  fi
>@@ -38,28 +29,21 @@
>  if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
>  	echo "Cairo found, compiling SWT support for the cairo graphics library."
>  	MAKE_CAIRO=make_cairo
>-@@ -85,7 +92,9 @@
>+@@ -89,7 +92,9 @@
>  	echo "Cairo not found:"
>  	echo "    *** Advanced graphics support using cairo will not be compiled."
>  fi
> +fi
>  
> +if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then
>- if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
>+ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
>  	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
>- 		GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
>-@@ -98,6 +107,7 @@
>+ 		MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
>+@@ -107,6 +112,7 @@
>+ 		echo "Mozilla/XPCOM or Firefox/XPCOM libraries not found:"
>  		echo "    *** Mozilla embedding support will not be compiled."
>  	fi
>- fi
> +fi
>+ fi
>  
>  # Find AWT if available
>- if [ -z "${AWT_LIB_PATH}" ]; then
>-@@ -126,5 +136,5 @@
>- if [ "x${1}" = "xclean" ]; then
>- 	make -f $MAKEFILE clean
>- else
>--	make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
>-+	make -f $MAKEFILE all ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
>- fi
>Index: files/patch-make_freebsd.mak
>===================================================================
>RCS file: /home/ncvs/ports/x11-toolkits/swt/files/patch-make_freebsd.mak,v
>retrieving revision 1.2
>diff -u -r1.2 patch-make_freebsd.mak
>--- files/patch-make_freebsd.mak	12 Dec 2006 06:41:03 -0000	1.2
>+++ files/patch-make_freebsd.mak	3 Oct 2007 00:09:51 -0000
>@@ -1,5 +1,5 @@
>---- make_freebsd.mak.orig	Tue Dec 12 11:49:31 2006
>-+++ make_freebsd.mak	Tue Dec 12 11:50:20 2006
>+--- make_freebsd.mak.orig	Thu Jan 25 12:05:38 2007
>++++ make_freebsd.mak	Sat Mar  3 00:48:48 2007
> @@ -9,7 +9,7 @@
>  #     IBM Corporation - initial API and implementation
>  #*******************************************************************************
>@@ -9,7 +9,7 @@
>  
>  include make_common.mak
>  
>-@@ -48,7 +48,7 @@
>+@@ -46,7 +46,7 @@
>  
>  # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
>  GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
>@@ -18,7 +18,7 @@
>  
>  CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
>  
>-@@ -61,7 +61,7 @@
>+@@ -59,7 +59,7 @@
>  GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
>  
>  GLXCFLAGS = 
>@@ -27,69 +27,25 @@
>  
>  # Uncomment for Native Stats tool
>  #NATIVE_STATS = -DNATIVE_STATS
>-@@ -78,7 +78,7 @@
>- 	-fPIC \
>- 	-I. \
>- 	-I$(JAVA_HOME)/include \
>--	-I$(JAVA_HOME)/include/linux \
>-+	-I$(JAVA_HOME)/include/freebsd \
>- 	${SWT_PTR_CFLAGS}
>- MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic
>- 	
>-@@ -98,15 +98,16 @@
>- CFLAGS = -O -Wall \
>- 		-DSWT_VERSION=$(SWT_VERSION) \
>- 		$(NATIVE_STATS) \
>--		-DLINUX -DGTK \
>-+		-DFREEBSD -DGTK \
>+@@ -97,15 +97,16 @@
>+ 		-DFREEBSD -DGTK \
>  		-I$(JAVA_HOME)/include \
>--		-I$(JAVA_HOME)/include/linux \
>--		-fPIC \
>-+		-I$(JAVA_HOME)/include/freebsd \
>-+                -fpic -fPIC \
>-+                -I$(X11BASE)/include \
>+ 		-I$(JAVA_HOME)/include/freebsd \
>++		-I$(X11BASE)/include \
>+ 		-fPIC \
>  		${SWT_PTR_CFLAGS}
>--LIBS = -shared -fPIC -s
>-+LIBS = -shared -fPIC -fpic -s
>+ LIBS = -shared -fPIC
>  
>+-ifndef NO_STRIP
>+-	AWT_LIBS := $(AWT_LIBS) -s
>+-	MOZILLALIBS := $(MOZILLALIBS) -s
>+-	LIBS := $(LIBS) -s
>+-endif
>++.ifndef NO_STRIP
>++AWT_LIBS := $(AWT_LIBS) -s
>++MOZILLALIBS := $(MOZILLALIBS) -s
>++LIBS := $(LIBS) -s
>++.endif
>  
>--all: make_swt make_atk make_gnome make_glx
>-+all: make_swt make_atk $(MAKE_GNOME) make_awt $(MAKE_MOZILLA) $(MAKE_CAIRO) make_glx
>+ all: make_swt make_atk make_gnome make_glx
>  
>- #
>- # SWT libs
>-@@ -220,22 +221,22 @@
>- 	$(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp	
>- 
>- $(PROFILE14_OBJECTS): xpcom_profile.cpp
>--	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp	
>-+	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${GECKO_INCLUDES} ${PROFILE14_INCLUDES} -c xpcom_profile.cpp	
>- 
>- $(PROFILE17_OBJECTS): xpcom_profile.cpp
>--	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp	
>-+	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${GECKO_INCLUDES} ${PROFILE17_INCLUDES} -c xpcom_profile.cpp	
>- 
>- $(PROFILE18_OBJECTS): xpcom_profile.cpp
>--	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp	
>-+	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${GECKO_INCLUDES} ${PROFILE18_INCLUDES} -c xpcom_profile.cpp	
>- 
>- $(PROFILE14_LIB): $(PROFILE14_OBJECTS)
>--	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS}
>-+	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} ${PROFILE14_LIBS}
>- 
>- $(PROFILE17_LIB): $(PROFILE17_OBJECTS)
>--	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS}
>-+	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} ${PROFILE17_LIBS}
>- 
>- $(PROFILE18_LIB): $(PROFILE18_OBJECTS)
>--	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS}
>-+	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} ${PROFILE18_LIBS}
>- 
>- #
>- # GLX lib
>-@@ -264,4 +265,4 @@
>- # Clean
>- #
>- clean:
>--	rm -f *.o *.so
>-+	rm -f *.o *.so *.jar
>Index: files/patch-xpcom_profile.h
>===================================================================
>RCS file: files/patch-xpcom_profile.h
>diff -N files/patch-xpcom_profile.h
>--- files/patch-xpcom_profile.h	2 Dec 2006 01:10:28 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- xpcom_profile.h.orig	Wed Nov 15 17:47:13 2006
>-+++ xpcom_profile.h	Wed Nov 15 17:41:25 2006
>-@@ -32,7 +32,7 @@
>- #define NDEBUG
>- 
>- #include "nsCOMPtr.h"
>--#include "nsProfileDirServiceProvider.h"
>-+#include "profdirserviceprovider/nsProfileDirServiceProvider.h"
>- #include "xpcom_stats.h"
>- 
>- #endif /* INC_xpcom_profile_H */

Actions: View | Diff

Attachments on bug 116845: 81603