From d57df3e4790c45f2c7e415f97c5969851cbe7998 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 12 May 2024 16:11:02 -0400 Subject: [PATCH] turbovnc: fix vncviewer on 32bit --- srcpkgs/turbovnc/patches/viewer-32bit.patch | 21 +++++++++++++++++++++ srcpkgs/turbovnc/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/turbovnc/patches/viewer-32bit.patch diff --git a/srcpkgs/turbovnc/patches/viewer-32bit.patch b/srcpkgs/turbovnc/patches/viewer-32bit.patch new file mode 100644 index 00000000000..933b9b9153b --- /dev/null +++ b/srcpkgs/turbovnc/patches/viewer-32bit.patch @@ -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+"$@"} diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template index 9dd794662b8..6ae3aad0544 100644 --- a/srcpkgs/turbovnc/template +++ b/srcpkgs/turbovnc/template @@ -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