* [PR PATCH] turbovnc: update to 3.0.2.
@ 2022-12-22 15:26 unspecd
2022-12-22 15:39 ` [PR PATCH] [Updated] " unspecd
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: unspecd @ 2022-12-22 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]
There is a new pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/turbovnc
https://github.com/void-linux/void-packages/pull/41238
turbovnc: update to 3.0.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- ppc64le-musl
- x86_64
A patch file from https://github.com/void-linux/void-packages/pull/41238.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/turbovnc-41238.patch --]
[-- Type: text/x-diff, Size: 3769 bytes --]
From de93b5280a75745d0e5520d144f90f8ef2fe4f1f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 21 Dec 2022 03:07:48 +1100
Subject: [PATCH] turbovnc: update to 3.0.2.
---
srcpkgs/turbovnc-viewer | 1 +
srcpkgs/turbovnc/patches/musl-asm_page.patch | 13 --------
srcpkgs/turbovnc/template | 34 ++++++++++++++------
3 files changed, 26 insertions(+), 22 deletions(-)
create mode 120000 srcpkgs/turbovnc-viewer
delete mode 100644 srcpkgs/turbovnc/patches/musl-asm_page.patch
diff --git a/srcpkgs/turbovnc-viewer b/srcpkgs/turbovnc-viewer
new file mode 120000
index 000000000000..c47d5b709064
--- /dev/null
+++ b/srcpkgs/turbovnc-viewer
@@ -0,0 +1 @@
+turbovnc
\ No newline at end of file
diff --git a/srcpkgs/turbovnc/patches/musl-asm_page.patch b/srcpkgs/turbovnc/patches/musl-asm_page.patch
deleted file mode 100644
index a1360275e83e..000000000000
--- a/srcpkgs/turbovnc/patches/musl-asm_page.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Try to include <asm/page.h> only if __GLIBC__ is defined also.
-
---- a/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2014-07-20 02:45:59.000000000 +0200
-+++ b/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2015-09-01 10:28:30.171432632 +0200
-@@ -40,7 +40,7 @@
-
- #include <sys/types.h>
- #ifdef HAS_SHM
--#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
-+#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2) && defined(__GLIBC__)
- /* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
- /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
- Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index 3a9876a44a22..78712d72d536 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -1,30 +1,46 @@
# Template file for 'turbovnc'
pkgname=turbovnc
-version=2.2.7
+version=3.0.2
revision=1
build_style=cmake
-configure_args="-DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
- -DTVNC_SYSTEMLIBS=ON"
-hostmakedepends="rsync"
-makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel openssl-devel"
+configure_args="-DCMAKE_INSTALL_JAVADIR=/usr/lib/turbovnc
+ -DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so
+ -DTVNC_SYSTEMLIBS=ON -DTVNC_BUILDWEBSERVER=OFF"
+hostmakedepends="openjdk17"
+makedepends="bzip2-devel freetype-devel libjpeg-turbo-devel libX11-devel
+ libXext-devel libXi-devel openssl-devel pam-devel zlib-devel"
depends="perl"
short_desc="Optimized version of TightVNC VNC client and server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://turbovnc.org"
distfiles="${SOURCEFORGE_SITE}/turbovnc/${pkgname}-${version}.tar.gz"
-checksum=8a9a86c5028b70f8d6bc8a5317bba1e3010a72242b1b5b18d958272b5249b8cd
-
+checksum=616dc72ce52351b70a239c2f464c83136e6143a23c7d316e3b29f68ea71c9949
conf_files="/etc/*.conf"
-archs="i686* x86_64* ppc64*"
conflicts="tigervnc>=0"
# Need this to make <sys/socket.h> define struct ucred with musl
CFLAGS="-D_GNU_SOURCE"
+pre_configure() {
+ . /etc/profile.d/openjdk.sh
+}
+
post_install() {
rm -rf ${DESTDIR}/etc/sysconfig
rm -rf ${DESTDIR}/etc/init.d
rm ${DESTDIR}/usr/share/man/man1/Xserver.1
+ mv ${DESTDIR}/usr/lib/turbovnc/README.md \
+ ${DESTDIR}/usr/share/doc/TurboVNC/README-vncviewer.md
+}
+
+turbovnc-viewer_package() {
+ short_desc+=" - viewer"
+ depends="openjdk17"
+ pkg_install() {
+ vmove usr/bin/vncviewer
+ vmove usr/lib
+ vmove usr/share/doc/TurboVNC/README-vncviewer.md
+ vmove usr/share/man/man1/vncviewer.1
+ }
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] turbovnc: update to 3.0.2.
2022-12-22 15:26 [PR PATCH] turbovnc: update to 3.0.2 unspecd
@ 2022-12-22 15:39 ` unspecd
2022-12-22 15:42 ` unspecd
2023-01-22 1:53 ` [PR PATCH] [Merged]: " Vaelatern
2 siblings, 0 replies; 4+ messages in thread
From: unspecd @ 2022-12-22 15:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/turbovnc
https://github.com/void-linux/void-packages/pull/41238
turbovnc: update to 3.0.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- ppc64le-musl
- x86_64
A patch file from https://github.com/void-linux/void-packages/pull/41238.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/turbovnc-41238.patch --]
[-- Type: text/x-diff, Size: 3795 bytes --]
From 9922f5c156213cc16767aa42ae63d71e47c5824e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 21 Dec 2022 03:07:48 +1100
Subject: [PATCH] turbovnc: update to 3.0.2.
---
srcpkgs/turbovnc-viewer | 1 +
srcpkgs/turbovnc/patches/musl-asm_page.patch | 13 --------
srcpkgs/turbovnc/template | 35 +++++++++++++++-----
3 files changed, 27 insertions(+), 22 deletions(-)
create mode 120000 srcpkgs/turbovnc-viewer
delete mode 100644 srcpkgs/turbovnc/patches/musl-asm_page.patch
diff --git a/srcpkgs/turbovnc-viewer b/srcpkgs/turbovnc-viewer
new file mode 120000
index 000000000000..c47d5b709064
--- /dev/null
+++ b/srcpkgs/turbovnc-viewer
@@ -0,0 +1 @@
+turbovnc
\ No newline at end of file
diff --git a/srcpkgs/turbovnc/patches/musl-asm_page.patch b/srcpkgs/turbovnc/patches/musl-asm_page.patch
deleted file mode 100644
index a1360275e83e..000000000000
--- a/srcpkgs/turbovnc/patches/musl-asm_page.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Try to include <asm/page.h> only if __GLIBC__ is defined also.
-
---- a/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2014-07-20 02:45:59.000000000 +0200
-+++ b/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2015-09-01 10:28:30.171432632 +0200
-@@ -40,7 +40,7 @@
-
- #include <sys/types.h>
- #ifdef HAS_SHM
--#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
-+#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2) && defined(__GLIBC__)
- /* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
- /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
- Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index 3a9876a44a22..8198b51ab364 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -1,30 +1,47 @@
# Template file for 'turbovnc'
pkgname=turbovnc
-version=2.2.7
+version=3.0.2
revision=1
build_style=cmake
-configure_args="-DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
- -DTVNC_SYSTEMLIBS=ON"
-hostmakedepends="rsync"
-makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel openssl-devel"
+configure_args="-DCMAKE_INSTALL_JAVADIR=/usr/lib/turbovnc
+ -DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so
+ -DTVNC_SYSTEMLIBS=ON -DTVNC_BUILDWEBSERVER=OFF"
+hostmakedepends="openjdk17"
+makedepends="bzip2-devel freetype-devel libjpeg-turbo-devel libX11-devel
+ libXext-devel libXi-devel openssl-devel pam-devel zlib-devel"
depends="perl"
short_desc="Optimized version of TightVNC VNC client and server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://turbovnc.org"
distfiles="${SOURCEFORGE_SITE}/turbovnc/${pkgname}-${version}.tar.gz"
-checksum=8a9a86c5028b70f8d6bc8a5317bba1e3010a72242b1b5b18d958272b5249b8cd
-
+checksum=616dc72ce52351b70a239c2f464c83136e6143a23c7d316e3b29f68ea71c9949
conf_files="/etc/*.conf"
-archs="i686* x86_64* ppc64*"
conflicts="tigervnc>=0"
# Need this to make <sys/socket.h> define struct ucred with musl
CFLAGS="-D_GNU_SOURCE"
+pre_configure() {
+ . /etc/profile.d/openjdk.sh
+}
+
post_install() {
rm -rf ${DESTDIR}/etc/sysconfig
rm -rf ${DESTDIR}/etc/init.d
rm ${DESTDIR}/usr/share/man/man1/Xserver.1
+ mv ${DESTDIR}/usr/lib/turbovnc/README.md \
+ ${DESTDIR}/usr/share/doc/TurboVNC/README-vncviewer.md
+}
+
+turbovnc-viewer_package() {
+ short_desc+=" - viewer"
+ depends="openjdk17"
+ conflicts="tigervnc>=0"
+ pkg_install() {
+ vmove usr/bin/vncviewer
+ vmove usr/lib
+ vmove usr/share/doc/TurboVNC/README-vncviewer.md
+ vmove usr/share/man/man1/vncviewer.1
+ }
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] turbovnc: update to 3.0.2.
2022-12-22 15:26 [PR PATCH] turbovnc: update to 3.0.2 unspecd
2022-12-22 15:39 ` [PR PATCH] [Updated] " unspecd
@ 2022-12-22 15:42 ` unspecd
2023-01-22 1:53 ` [PR PATCH] [Merged]: " Vaelatern
2 siblings, 0 replies; 4+ messages in thread
From: unspecd @ 2022-12-22 15:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/turbovnc
https://github.com/void-linux/void-packages/pull/41238
turbovnc: update to 3.0.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- ppc64le-musl
- x86_64
A patch file from https://github.com/void-linux/void-packages/pull/41238.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/turbovnc-41238.patch --]
[-- Type: text/x-diff, Size: 3857 bytes --]
From 62ff805a68d992577ceca1f9b05441f18e4b02aa Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 21 Dec 2022 03:07:48 +1100
Subject: [PATCH] turbovnc: update to 3.0.2.
---
srcpkgs/turbovnc-viewer | 1 +
srcpkgs/turbovnc/patches/musl-asm_page.patch | 13 -------
srcpkgs/turbovnc/template | 39 +++++++++++++++-----
3 files changed, 31 insertions(+), 22 deletions(-)
create mode 120000 srcpkgs/turbovnc-viewer
delete mode 100644 srcpkgs/turbovnc/patches/musl-asm_page.patch
diff --git a/srcpkgs/turbovnc-viewer b/srcpkgs/turbovnc-viewer
new file mode 120000
index 000000000000..c47d5b709064
--- /dev/null
+++ b/srcpkgs/turbovnc-viewer
@@ -0,0 +1 @@
+turbovnc
\ No newline at end of file
diff --git a/srcpkgs/turbovnc/patches/musl-asm_page.patch b/srcpkgs/turbovnc/patches/musl-asm_page.patch
deleted file mode 100644
index a1360275e83e..000000000000
--- a/srcpkgs/turbovnc/patches/musl-asm_page.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Try to include <asm/page.h> only if __GLIBC__ is defined also.
-
---- a/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2014-07-20 02:45:59.000000000 +0200
-+++ b/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2015-09-01 10:28:30.171432632 +0200
-@@ -40,7 +40,7 @@
-
- #include <sys/types.h>
- #ifdef HAS_SHM
--#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
-+#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2) && defined(__GLIBC__)
- /* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
- /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
- Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index 3a9876a44a22..287754ef9daa 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -1,30 +1,51 @@
# Template file for 'turbovnc'
pkgname=turbovnc
-version=2.2.7
+version=3.0.2
revision=1
build_style=cmake
-configure_args="-DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
- -DTVNC_SYSTEMLIBS=ON"
-hostmakedepends="rsync"
-makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel openssl-devel"
+configure_args="-DCMAKE_INSTALL_JAVADIR=/usr/lib/turbovnc
+ -DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so
+ -DTVNC_SYSTEMLIBS=ON -DTVNC_BUILDWEBSERVER=OFF"
+hostmakedepends="openjdk17"
+makedepends="bzip2-devel freetype-devel libjpeg-turbo-devel libX11-devel
+ libXext-devel libXi-devel openssl-devel pam-devel zlib-devel"
depends="perl"
short_desc="Optimized version of TightVNC VNC client and server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://turbovnc.org"
distfiles="${SOURCEFORGE_SITE}/turbovnc/${pkgname}-${version}.tar.gz"
-checksum=8a9a86c5028b70f8d6bc8a5317bba1e3010a72242b1b5b18d958272b5249b8cd
-
+checksum=616dc72ce52351b70a239c2f464c83136e6143a23c7d316e3b29f68ea71c9949
conf_files="/etc/*.conf"
-archs="i686* x86_64* ppc64*"
conflicts="tigervnc>=0"
# Need this to make <sys/socket.h> define struct ucred with musl
CFLAGS="-D_GNU_SOURCE"
+if [ "$CROSS_BUILD" ]; then
+ makedepends+=" openjdk17"
+fi
+
+pre_configure() {
+ . /etc/profile.d/openjdk.sh
+}
+
post_install() {
rm -rf ${DESTDIR}/etc/sysconfig
rm -rf ${DESTDIR}/etc/init.d
rm ${DESTDIR}/usr/share/man/man1/Xserver.1
+ mv ${DESTDIR}/usr/lib/turbovnc/README.md \
+ ${DESTDIR}/usr/share/doc/TurboVNC/README-vncviewer.md
+}
+
+turbovnc-viewer_package() {
+ short_desc+=" - viewer"
+ depends="openjdk17"
+ conflicts="tigervnc>=0"
+ pkg_install() {
+ vmove usr/bin/vncviewer
+ vmove usr/lib
+ vmove usr/share/doc/TurboVNC/README-vncviewer.md
+ vmove usr/share/man/man1/vncviewer.1
+ }
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: turbovnc: update to 3.0.2.
2022-12-22 15:26 [PR PATCH] turbovnc: update to 3.0.2 unspecd
2022-12-22 15:39 ` [PR PATCH] [Updated] " unspecd
2022-12-22 15:42 ` unspecd
@ 2023-01-22 1:53 ` Vaelatern
2 siblings, 0 replies; 4+ messages in thread
From: Vaelatern @ 2023-01-22 1:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]
There's a merged pull request on the void-packages repository
turbovnc: update to 3.0.2.
https://github.com/void-linux/void-packages/pull/41238
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- ppc64le-musl
- x86_64
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-22 1:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-22 15:26 [PR PATCH] turbovnc: update to 3.0.2 unspecd
2022-12-22 15:39 ` [PR PATCH] [Updated] " unspecd
2022-12-22 15:42 ` unspecd
2023-01-22 1:53 ` [PR PATCH] [Merged]: " Vaelatern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).