Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=1e631ee46f355df594460ef3e0dc6ac41a23778a
commit 1e631ee46f355df594460ef3e0dc6ac41a23778a Author: Marius Cirsta <[email protected]> Date: Sun Jul 1 01:42:20 2012 +0000 swt-3.7.2-4-x86_64 * fix swt for x64 diff --git a/source/xlib-extra/swt/FrugalBuild b/source/xlib-extra/swt/FrugalBuild index d08cfcd..3b5bf93 100644 --- a/source/xlib-extra/swt/FrugalBuild +++ b/source/xlib-extra/swt/FrugalBuild @@ -5,7 +5,7 @@ pkgname=swt pkgver=3.7.2 date=201202080800 -pkgrel=3 +pkgrel=4 pkgdesc="SWT is an open source widget toolkit for Java designed to provide efficient, portable access to the user-interface." url="http://www.eclipse.org/swt"; Finclude openjava @@ -16,8 +16,7 @@ up2date="lynx -dump http://www.eclipse.org/swt/ |grep linux.*zip |sed -ne 's/.*t source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/swt-$pkgver-gtk-linux-x86.zip \ build.xml) sha1sums=('1664a5d5b8121c2459ea78026cf58d986cd17f16' \ - '3d5befea18ba4c5bc20da80ed067488a16be6585') -Finclude openjava + '3305b8b293472591d7fb881f9084495249b929ad') build() { @@ -30,14 +29,16 @@ build() mkdir src mv org src Fsed '^CFLAGS = .*' 'CFLAGS += \\' make_linux.mak + #64 bit needs this to work + [ "$CARCH" == "x86_64" ] && Fant replace.32.to.64 for i in awt swt atk glx cairo do make -f make_linux.mak make_$i || return 1 done - ant compile || return 1 + Fant compile cp version.txt build/version.txt cp src/org/eclipse/swt/internal/SWTMessages.properties build/org/eclipse/swt/internal/ - ant jar || return 1 + Fant jar Ffilerel /usr/share/java/swt.jar Fexerel *.so /usr/lib/ Fdocrel about.html about_files diff --git a/source/xlib-extra/swt/build.xml b/source/xlib-extra/swt/build.xml index ea77587..11c3a23 100644 --- a/source/xlib-extra/swt/build.xml +++ b/source/xlib-extra/swt/build.xml @@ -14,4 +14,14 @@ <target name="jar"> <jar destfile="swt.jar" basedir="${build}"/> </target> + <!-- Convert SWT 32 bit java and C source to 64 bit --> + <target name="replace.32.to.64"> + <property name="replace_dir" value="."/> + <echo>Converting java files to 64 bit in ${replace_dir} project</echo> + <replace dir="${replace_dir}" includes="**/*.java" token="int /*long*/" value="long /*int*/"/> + <replace dir="${replace_dir}" includes="**/*.java" token="int[] /*long[]*/" value="long[] /*int[]*/"/> + <replace dir="${replace_dir}" includes="**/*.java" token="float /*double*/" value="double /*float*/"/> + <replace dir="${replace_dir}" includes="**/*.java" token="float[] /*double[]*/" value="double[] /*float[]*/"/> + + </target> </project> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
