turbovnc: fix vncviewer on 32bit

This commit is contained in:
classabbyamp 2024-05-12 16:11:02 -04:00
parent c3adc7de8b
commit d57df3e479
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
2 changed files with 22 additions and 1 deletions

View file

@ -0,0 +1,21 @@
linux jdk doesn't support -d32
"All other platforms (Windows and Linux) contain separate 32 and 64-bit
installation packages. If both packages are installed on a system, you select
one or the other by adding the appropriate "bin" directory to your path. For
consistency, the Java implementations on Linux accept the -d64 option."
https://www.oracle.com/java/technologies/hotspotfaq.html#64bit_layering
--- a/unix/vncviewer/vncviewer.in
+++ b/unix/vncviewer/vncviewer.in
@@ -53,8 +53,4 @@
LD_LIBRARY_PATH=$JAWT_PATH:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
fi
-if [ "@BITS@" = "32" ]; then
- exec $JAVA -server -d@BITS@ -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"}
-else
- exec $JAVA -server -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"}
-fi
+exec $JAVA -server -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"}

View file

@ -1,7 +1,7 @@
# Template file for 'turbovnc'
pkgname=turbovnc
version=3.0.2
revision=1
revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_JAVADIR=/usr/lib/turbovnc
-DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so