mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
turbovnc: fix vncviewer on 32bit
This commit is contained in:
parent
c3adc7de8b
commit
d57df3e479
2 changed files with 22 additions and 1 deletions
21
srcpkgs/turbovnc/patches/viewer-32bit.patch
Normal file
21
srcpkgs/turbovnc/patches/viewer-32bit.patch
Normal 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+"$@"}
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'turbovnc'
|
# Template file for 'turbovnc'
|
||||||
pkgname=turbovnc
|
pkgname=turbovnc
|
||||||
version=3.0.2
|
version=3.0.2
|
||||||
revision=1
|
revision=2
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DCMAKE_INSTALL_JAVADIR=/usr/lib/turbovnc
|
configure_args="-DCMAKE_INSTALL_JAVADIR=/usr/lib/turbovnc
|
||||||
-DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so
|
-DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so
|
||||||
|
|
Loading…
Add table
Reference in a new issue