[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: f00c4ea34c388669ef509f46dfcc6b635bb6af40 Author: Viorel Munteanu gmail com> AuthorDate: Tue Feb 1 20:14:38 2022 + Commit: Sam James gentoo org> CommitDate: Fri Feb 18 01:12:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f00c4ea3 net-misc/turbovnc: fix java-vm dependency Closes: https://bugs.gentoo.org/832223 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Viorel Munteanu gmail.com> Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild | 107 + 1 file changed, 107 insertions(+) diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild new file mode 100644 index ..b57e81831f74 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop java-pkg-opt-2 + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="gnutls +ssl" + +DEPEND=" + app-arch/bzip2 + media-libs/freetype + >=media-libs/libjpeg-turbo-2.0.0:=[java?] + sys-libs/zlib + >=virtual/jdk-1.8:* + virtual/opengl + x11-libs/libfontenc + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfont2 + x11-libs/libxkbfile + x11-libs/pixman + ssl? ( + !gnutls? ( dev-libs/openssl:= ) + gnutls? ( net-libs/gnutls:= ) + ) + !net-misc/tigervnc +" +RDEPEND=" + ${DEPEND} + x11-apps/xkbcomp +" + +# net-misc/turbovnc does not build this file, it merely copies it +# from media-libs/libjpeg-turbo +QA_PREBUILT="usr/share/turbovnc/classes/libturbojpeg.so" + +src_prepare() { + use java && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_SYSTEMX11=ON + -DTVNC_SYSTEMLIBS=ON + -DTVNC_BUILDJAVA=$(usex java) + -DTVNC_BUILDNATIVE=ON + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + + if use ssl ; then + # We prefer OpenSSL, so default to that if SSL is enabled + if use gnutls ; then + mycmakeargs+=( -DTVNC_USETLS=GnuTLS ) + else + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + fi + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + + if use java ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + + mycmakeargs+=( + -DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar" + -DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use java ; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + fi + + # Don't install incompatible init script + rm -rf "${ED}"/etc/init.d/ || die + rm -rf "${ED}"/etc/sysconfig/ || die + + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die + + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: dcb29846303c160f397ddd5aefe57a15943c21a4 Author: Viorel Munteanu gmail com> AuthorDate: Tue Feb 1 20:16:24 2022 + Commit: Sam James gentoo org> CommitDate: Fri Feb 18 01:12:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb29846 net-misc/turbovnc: drop 2.2.7 Signed-off-by: Viorel Munteanu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24045 Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.7.ebuild | 103 1 file changed, 103 deletions(-) diff --git a/net-misc/turbovnc/turbovnc-2.2.7.ebuild b/net-misc/turbovnc/turbovnc-2.2.7.ebuild deleted file mode 100644 index c7db05f8cba5.. --- a/net-misc/turbovnc/turbovnc-2.2.7.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop cmake java-pkg-opt-2 - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/"; -SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="gnutls +ssl" - -DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0[java?] - sys-libs/zlib - virtual/jdk:1.8 - virtual/opengl - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - ssl? ( - !gnutls? ( dev-libs/openssl:= ) - gnutls? ( net-libs/gnutls:= ) - ) - !net-misc/tigervnc -" -RDEPEND=" - ${DEPEND} - x11-apps/xkbcomp -" - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDJAVA=$(usex java) - -DTVNC_BUILDNATIVE=ON - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - - if use ssl ; then - # We prefer OpenSSL, so default to that if SSL is enabled - if use gnutls ; then - mycmakeargs+=( -DTVNC_USETLS=GnuTLS ) - else - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS=OpenSSL - -DTVNC_DLOPENSSL=OFF - ) - fi - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - if use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - - mycmakeargs+=( - -DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar" - -DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so" - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use java ; then - java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png - fi - - # Don't install incompatible init script - rm -rf "${ED}"/etc/init.d/ || die - rm -rf "${ED}"/etc/sysconfig/ || die - - find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -print0 | xargs -0 rm || die - - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: e34e4dd79ca842b3701fcafaf16dd04a14b0f048 Author: Sam James gentoo org> AuthorDate: Wed Dec 22 04:29:43 2021 + Commit: Sam James gentoo org> CommitDate: Wed Dec 22 04:29:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34e4dd7 net-misc/turbovnc: add 2.2.7 Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/Manifest | 1 + net-misc/turbovnc/turbovnc-2.2.7.ebuild | 103 2 files changed, 104 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 79f84d7ca892..8b9eb2ffc41e 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1 +1,2 @@ DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7 +DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 diff --git a/net-misc/turbovnc/turbovnc-2.2.7.ebuild b/net-misc/turbovnc/turbovnc-2.2.7.ebuild new file mode 100644 index ..c7db05f8cba5 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-2.2.7.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop cmake java-pkg-opt-2 + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="gnutls +ssl" + +DEPEND=" + app-arch/bzip2 + media-libs/freetype + >=media-libs/libjpeg-turbo-2.0.0[java?] + sys-libs/zlib + virtual/jdk:1.8 + virtual/opengl + x11-libs/libfontenc + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfont2 + x11-libs/libxkbfile + x11-libs/pixman + ssl? ( + !gnutls? ( dev-libs/openssl:= ) + gnutls? ( net-libs/gnutls:= ) + ) + !net-misc/tigervnc +" +RDEPEND=" + ${DEPEND} + x11-apps/xkbcomp +" + +src_prepare() { + use java && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_SYSTEMX11=ON + -DTVNC_SYSTEMLIBS=ON + -DTVNC_BUILDJAVA=$(usex java) + -DTVNC_BUILDNATIVE=ON + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + + if use ssl ; then + # We prefer OpenSSL, so default to that if SSL is enabled + if use gnutls ; then + mycmakeargs+=( -DTVNC_USETLS=GnuTLS ) + else + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + fi + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + + if use java ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + + mycmakeargs+=( + -DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar" + -DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use java ; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + fi + + # Don't install incompatible init script + rm -rf "${ED}"/etc/init.d/ || die + rm -rf "${ED}"/etc/sysconfig/ || die + + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -print0 | xargs -0 rm || die + + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 73badd7510328afa2a52a4aa5c54b56cb24c625c Author: Sam James gentoo org> AuthorDate: Sun Feb 20 05:46:53 2022 + Commit: Sam James gentoo org> CommitDate: Sun Feb 20 05:46:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73badd75 net-misc/turbovnc: drop 2.2.6 Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/Manifest | 1 - net-misc/turbovnc/turbovnc-2.2.6.ebuild | 102 2 files changed, 103 deletions(-) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 8b9eb2ffc41e..1e90b89a91ba 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,2 +1 @@ -DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7 DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild deleted file mode 100644 index a8390bb0b57c.. --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop cmake java-pkg-opt-2 - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/"; -SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+ssl gnutls" - -DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0[java?] - sys-libs/zlib - virtual/jdk:1.8 - virtual/opengl - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - ssl? ( - !gnutls? ( dev-libs/openssl:= ) - gnutls? ( net-libs/gnutls:= ) - ) - !net-misc/tigervnc -" -RDEPEND=" - ${DEPEND} - x11-apps/xkbcomp -" - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDJAVA=$(usex java) - -DTVNC_BUILDNATIVE=ON - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - - if use ssl ; then - # We prefer OpenSSL, so default to that if SSL is enabled - if use gnutls ; then - mycmakeargs+=( -DTVNC_USETLS="GnuTLS" ) - else - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS="OpenSSL" - -DTVNC_DLOPENSSL=OFF - ) - fi - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - if use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - - mycmakeargs+=( - -DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar" - -DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so" - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use java ; then - java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png - fi - - # Don't install incompatible init script - rm -rf "${ED}"/etc/init.d/ || die - rm -rf "${ED}"/etc/sysconfig/ || die - - find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: ead3e37592f29f619d9bc33ae447fa71d15345ef Author: Viorel Munteanu gmail com> AuthorDate: Sat Feb 26 09:10:12 2022 + Commit: Sam James gentoo org> CommitDate: Sun Feb 27 00:19:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead3e375 net-misc/turbovnc: do not build vncviewer if !java Closes: https://bugs.gentoo.org/833509 Signed-off-by: Viorel Munteanu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24355 Signed-off-by: Sam James gentoo.org> ...bovnc-2.2.7-r1.ebuild => turbovnc-2.2.7-r2.ebuild} | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild similarity index 84% rename from net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild rename to net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild index b57e81831f74..5b1a5561d896 100644 --- a/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake desktop java-pkg-opt-2 @@ -18,8 +18,8 @@ DEPEND=" app-arch/bzip2 media-libs/freetype >=media-libs/libjpeg-turbo-2.0.0:=[java?] + sys-libs/pam sys-libs/zlib - >=virtual/jdk-1.8:* virtual/opengl x11-libs/libfontenc x11-libs/libX11 @@ -29,6 +29,10 @@ DEPEND=" x11-libs/libXfont2 x11-libs/libxkbfile x11-libs/pixman + java? ( + >=virtual/jdk-1.8:* + x11-libs/libXi + ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) @@ -40,10 +44,6 @@ RDEPEND=" x11-apps/xkbcomp " -# net-misc/turbovnc does not build this file, it merely copies it -# from media-libs/libjpeg-turbo -QA_PREBUILT="usr/share/turbovnc/classes/libturbojpeg.so" - src_prepare() { use java && java-pkg-opt-2_src_prepare cmake_src_prepare @@ -54,7 +54,7 @@ src_configure() { -DTVNC_SYSTEMX11=ON -DTVNC_SYSTEMLIBS=ON -DTVNC_BUILDJAVA=$(usex java) - -DTVNC_BUILDNATIVE=ON + -DTVNC_BUILDNATIVE=$(usex java) -DXKB_BIN_DIRECTORY=/usr/bin -DXKB_DFLT_RULES=base ) @@ -95,6 +95,11 @@ src_install() { if use java ; then java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + + # turbovnc does not build this file, it merely copies it from media-libs/libjpeg-turbo + # so let's replace it by a symlink + rm "${ED}/"usr/share/turbovnc/classes/libturbojpeg.so || die + dosym -r "/usr/$(get_libdir)/libturbojpeg.so" /usr/share/turbovnc/classes/libturbojpeg.so fi # Don't install incompatible init script
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 065ba52559742551b56b84542c6a8a74448c75b6 Author: Joonas Niilola gentoo org> AuthorDate: Mon Apr 18 07:23:25 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Apr 18 07:27:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065ba525 net-misc/turbovnc: add a missing dep Signed-off-by: Joonas Niilola gentoo.org> net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild index 89f5f2da2cce..1764dc4c265b 100644 --- a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="gnutls +ssl" -DEPEND=" +COMMON_DEPEND=" app-arch/bzip2 media-libs/freetype >=media-libs/libjpeg-turbo-2.0.0:=[java?] @@ -40,9 +40,13 @@ DEPEND=" !net-misc/tigervnc " RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} x11-apps/xkbcomp " +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans +" PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch )
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 7ea7882a472767a675b5ce14c6aacc813f5d6792 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 14:03:50 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 15:26:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea7882a net-misc/turbovnc: linewrap longdescription Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/metadata.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index e5bd5bb6550..f8d6dda9452 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -10,7 +10,8 @@ Proxy Maintainers - TurboVNC is a derivative of VNC (Virtual Network Computing) that is tuned to provide peak performance for 3D and video workloads. By The VirtualGL Project. + TurboVNC is a derivative of VNC (Virtual Network Computing) that is tuned to provide peak performance for 3D and video workloads. + By The VirtualGL Project. TurboVNC/turbovnc
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 248f884d5a9f81a33f2e317aff99d9049bb2ad3d Author: Sam James gentoo org> AuthorDate: Mon Mar 1 15:24:45 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 15:26:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248f884d net-misc/turbovnc: add desktop menu entry for Viewer Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index 741bb109f45..93c2f6b76e2 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake java-pkg-opt-2 +inherit desktop cmake java-pkg-opt-2 DESCRIPTION="A fast replacement for TigerVNC" HOMEPAGE="https://www.turbovnc.org/"; @@ -55,6 +55,7 @@ src_install() { if use java ; then java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/turbovnc.png fi find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 419f1d1686c5b12ad033c84e3a7b5972aaa3f6fa Author: Viorel Munteanu gmail com> AuthorDate: Sun Feb 28 07:10:47 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 15:26:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419f1d16 net-misc/turbovnc: new package (2.2.6) Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Viorel Munteanu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19682 Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/Manifest | 1 + net-misc/turbovnc/metadata.xml | 18 + net-misc/turbovnc/turbovnc-2.2.6.ebuild | 36 + 3 files changed, 55 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest new file mode 100644 index 000..79f84d7ca89 --- /dev/null +++ b/net-misc/turbovnc/Manifest @@ -0,0 +1 @@ +DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7 diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml new file mode 100644 index 000..e5bd5bb6550 --- /dev/null +++ b/net-misc/turbovnc/metadata.xml @@ -0,0 +1,18 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + ceamac.para...@gmail.com + Viorel Munteanu + + + proxy-ma...@gentoo.org + Proxy Maintainers + + + TurboVNC is a derivative of VNC (Virtual Network Computing) that is tuned to provide peak performance for 3D and video workloads. By The VirtualGL Project. + + + TurboVNC/turbovnc + + diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild new file mode 100644 index 000..f854799ddce --- /dev/null +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="virtual/jdk:1.8 + >=media-libs/libjpeg-turbo-2.0.0[java] + !net-misc/tigervnc" +RDEPEND="${DEPEND} + x11-apps/xkbcomp" + +src_configure() { + local mycmakeargs=( + -DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar" + -DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so" + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: cd037a4aa37f7f53c9dbad535ba60db1c2a09c7f Author: Sam James gentoo org> AuthorDate: Mon Mar 1 15:07:51 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 15:26:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd037a4a net-misc/turbovnc: make Java support optional, use system libraries Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 40 +++-- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index f854799ddce..741bb109f45 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake +inherit cmake java-pkg-opt-2 DESCRIPTION="A fast replacement for TigerVNC" HOMEPAGE="https://www.turbovnc.org/"; @@ -13,24 +13,50 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -DEPEND="virtual/jdk:1.8 +DEPEND=" >=media-libs/libjpeg-turbo-2.0.0[java] - !net-misc/tigervnc" -RDEPEND="${DEPEND} - x11-apps/xkbcomp" + virtual/jdk:1.8 + !net-misc/tigervnc +" +RDEPEND=" + ${DEPEND} + x11-apps/xkbcomp +" + +src_prepare() { + use java && java-pkg-opt-2_src_prepare + cmake_src_prepare +} src_configure() { local mycmakeargs=( - -DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar" - -DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so" + -DTVNC_SYSTEMX11=ON + -DTVNC_SYSTEMLIBS=ON + -DTVNC_BUILDJAVA=$(usex java) -DXKB_BIN_DIRECTORY=/usr/bin -DXKB_DFLT_RULES=base ) + + if use java ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + + mycmakeargs+=( + -DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar" + -DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so" + ) + fi + cmake_src_configure } src_install() { cmake_src_install + + if use java ; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + fi + find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die einstalldocs }
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 11eca6186d3a5d3cda1777d54e2b46731be70123 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 15:28:38 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 15:28:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11eca618 net-misc/turbovnc: add myself as co-maintainer Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index f8d6dda9452..f4404f5503c 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -5,6 +5,10 @@ ceamac.para...@gmail.com Viorel Munteanu + + s...@gentoo.org + Sam James + proxy-ma...@gentoo.org Proxy Maintainers
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: d3fd9870abb2900afecfba186b84aed46a2882d6 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 15:41:45 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 15:41:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3fd9870 net-misc/turbovnc: drop incompatible init scripts Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index 93c2f6b76e2..99bf327613f 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -58,6 +58,10 @@ src_install() { make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/turbovnc.png fi + # Don't install incompatible init script + rm -rf "${ED}"/etc/init.d/ || die + rm -rf "${ED}"/etc/sysconfig/ || die + find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die einstalldocs }
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: f0b350027c4ec7f84d899d3fcf3258571274adb3 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 15:43:16 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 15:43:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b35002 net-misc/turbovnc: minor style Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index 99bf327613f..070f97e0ca3 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -55,7 +55,7 @@ src_install() { if use java ; then java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/turbovnc.png + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png fi # Don't install incompatible init script
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 4c149bed416196a953d0c21cdbc854bff705a943 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 15:54:08 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 15:54:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c149bed net-misc/turbovnc: explicitly enable native client too Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index 53dcdf8067b..b4ee76048aa 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -33,6 +33,7 @@ src_configure() { -DTVNC_SYSTEMX11=ON -DTVNC_SYSTEMLIBS=ON -DTVNC_BUILDJAVA=$(usex java) + -DTVNC_BUILDNATIVE=ON -DXKB_BIN_DIRECTORY=/usr/bin -DXKB_DFLT_RULES=base )
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 3e2bfa1e2845bf5593d8146d8d47575ab31b0fbc Author: Sam James gentoo org> AuthorDate: Mon Mar 1 15:44:17 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 15:54:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2bfa1e net-misc/turbovnc: use java optionally on libjpeg-turbo Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index 070f97e0ca3..53dcdf8067b 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" - >=media-libs/libjpeg-turbo-2.0.0[java] + >=media-libs/libjpeg-turbo-2.0.0[java?] virtual/jdk:1.8 !net-misc/tigervnc "
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: bee10b04b6f7eaaaf0396f9f44b2c262f8726295 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 16:07:53 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 16:08:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee10b04 net-misc/turbovnc: make SSL optional (openssl or gnutls) OpenSSL is preferred. Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 22 ++ 1 file changed, 22 insertions(+) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index c6879d50e22..9c47e973cb1 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -12,6 +12,7 @@ SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/downl LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" +IUSE="+ssl gnutls" DEPEND=" app-arch/bzip2 @@ -22,6 +23,10 @@ DEPEND=" virtual/opengl x11-libs/libX11 x11-libs/libXext + ssl? ( + !gnutls? ( dev-libs/openssl:= ) + gnutls? ( net-libs/gnutls:= ) + ) !net-misc/tigervnc " RDEPEND=" @@ -44,6 +49,23 @@ src_configure() { -DXKB_DFLT_RULES=base ) + if use ssl ; then + # We prefer OpenSSL, so default to that if SSL is enabled + if use gnutls ; then + mycmakeargs+=( -DTVNC_USETLS="GnuTLS" ) + else + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=ON + -DTVNC_DLOPENSSL=0 + ) + fi + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + if use java ; then export JAVACFLAGS="$(java-pkg_javac-args)" export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: b8b93d4e0b8ebdafe36a2074b837497af983b8db Author: Sam James gentoo org> AuthorDate: Mon Mar 1 15:59:07 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 16:08:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8b93d4e net-misc/turbovnc: add opengl dep Closes: https://bugs.gentoo.org/773595 Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index b4ee76048aa..41ce71085ba 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -16,6 +16,7 @@ KEYWORDS="~amd64" DEPEND=" >=media-libs/libjpeg-turbo-2.0.0[java?] virtual/jdk:1.8 + virtual/opengl !net-misc/tigervnc " RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 46446a5b4be1e4f85d98660270d6169733c20750 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 16:00:54 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 16:08:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46446a5b net-misc/turbovnc: add various unbundled deps to *DEPEND Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 5 + 1 file changed, 5 insertions(+) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index 41ce71085ba..c6879d50e22 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -14,9 +14,14 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" + app-arch/bzip2 + media-libs/freetype >=media-libs/libjpeg-turbo-2.0.0[java?] + sys-libs/zlib virtual/jdk:1.8 virtual/opengl + x11-libs/libX11 + x11-libs/libXext !net-misc/tigervnc " RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: c20946aa306d632e6dc9ea9fe0fc04b9081fd8d1 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 16:42:14 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 16:42:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20946aa net-misc/turbovnc: add slew of extra X11 deps In the standard configuration, these are all bundled. Closes: https://bugs.gentoo.org/773601 Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 5 + 1 file changed, 5 insertions(+) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index 65fa11ed308..a8390bb0b57 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -21,9 +21,14 @@ DEPEND=" sys-libs/zlib virtual/jdk:1.8 virtual/opengl + x11-libs/libfontenc x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfont2 + x11-libs/libxkbfile + x11-libs/pixman ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= )
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: f9bd9d29d48e45b98a34bf5be996e50b594473de Author: Sam James gentoo org> AuthorDate: Mon Mar 1 16:40:30 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 16:42:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9bd9d29 net-misc/turbovnc: add XFont2 dep Closes: https://bugs.gentoo.org/773601 Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index f7efb7cae7f..65fa11ed308 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -23,6 +23,7 @@ DEPEND=" virtual/opengl x11-libs/libX11 x11-libs/libXext + x11-libs/libXfont2 ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= )
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: c036209f5cab50905b59404163dd64852b378361 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 16:39:34 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 16:42:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c036209f net-misc/turbovnc: properly specify if we want OpenSSL Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index 9c47e973cb1..f7efb7cae7f 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -58,8 +58,8 @@ src_configure() { # we catch e.g. ABI change # (i.e. don't dlopen it) mycmakeargs+=( - -DTVNC_USETLS=ON - -DTVNC_DLOPENSSL=0 + -DTVNC_USETLS="OpenSSL" + -DTVNC_DLOPENSSL=OFF ) fi else
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 3f13ace2b6ddd8681e8aed1e24ebef92d9fc4f5d Author: Viorel Munteanu gmail com> AuthorDate: Sun Aug 21 17:40:26 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Sep 5 12:37:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f13ace2 net-misc/turbovnc: add 3.0.1 Bug: https://bugs.gentoo.org/864809 Closes: https://bugs.gentoo.org/865919 Signed-off-by: Viorel Munteanu gmail.com> Signed-off-by: Joonas Niilola gentoo.org> net-misc/turbovnc/Manifest | 1 + net-misc/turbovnc/turbovnc-3.0.1.ebuild | 103 2 files changed, 104 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index faae4b9ed0f4..f4dc586966f7 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,2 +1,3 @@ DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 +DIST turbovnc-3.0.1.tar.gz 8685384 BLAKE2B 388657bac29ccd570b0a5e03ca49cb5b868907390743241599f84d900707ffc685d021702167e7f615004eafd545120de3dbd4c61e0e206ce2d4227ff54ea86a SHA512 1d205db7fa23730e32752b0bc449a4cd2920ce7d065184bc84e49041dcd8db0e057fd7923635b74b09ab7957568d34f70dc1dd96b77b0905e80b4a5f1d8f28db DIST turbovnc-3.0.tar.gz 8665757 BLAKE2B 98600dc1f4fd91b30c8c48f2e465aa4cb9c53190c08611374ed6e1ef59be585f1694a1c6827939dec9cf259bd0e9a8fbdea9194653f5a3c66eb97cca1e12b09b SHA512 baa5f62fa1d76a09dc16262d853598b9d9ba8a12f3804c27df6af4983700b4dc1ad7f981ea02e2dc4d36c29b0cd7a1d7a7a8c98b7ae971cbc688ca30fd5c19ec diff --git a/net-misc/turbovnc/turbovnc-3.0.1.ebuild b/net-misc/turbovnc/turbovnc-3.0.1.ebuild new file mode 100644 index ..c8982a2ba230 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.0.1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop java-pkg-opt-2 + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+ssl" + +COMMON_DEPEND=" + app-arch/bzip2 + media-libs/freetype + >=media-libs/libjpeg-turbo-2.0.0:=[java?] + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-apps/xauth + x11-libs/libfontenc + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfont2 + x11-libs/libxkbfile + x11-libs/pixman + x11-misc/xkeyboard-config + java? ( + >=virtual/jdk-1.8:* + x11-libs/libXi + !net-misc/tigervnc + ) + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] +" +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp +" +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans +" + +PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) + +src_prepare() { + use java && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_SYSTEMX11=ON + -DTVNC_SYSTEMLIBS=ON + -DTVNC_BUILDVIEWER=$(usex java) + -DTVNC_BUILDHELPER=$(usex java) + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + + if use ssl ; then + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + + if use java ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use java ; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + fi + + # Don't install incompatible init script + rm -rf "${ED}"/etc/init.d/ || die + rm -rf "${ED}"/etc/sysconfig/ || die + + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die + + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 9317cfaa70c4288e00ee4c86800b47dc66214b2a Author: Viorel Munteanu gmail com> AuthorDate: Sun Aug 21 17:41:50 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Sep 5 12:37:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9317cfaa net-misc/turbovnc: drop 3.0 Signed-off-by: Viorel Munteanu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/26948 Signed-off-by: Joonas Niilola gentoo.org> net-misc/turbovnc/Manifest| 1 - net-misc/turbovnc/turbovnc-3.0.ebuild | 102 -- 2 files changed, 103 deletions(-) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index f4dc586966f7..6ce870f1f726 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,3 +1,2 @@ DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 DIST turbovnc-3.0.1.tar.gz 8685384 BLAKE2B 388657bac29ccd570b0a5e03ca49cb5b868907390743241599f84d900707ffc685d021702167e7f615004eafd545120de3dbd4c61e0e206ce2d4227ff54ea86a SHA512 1d205db7fa23730e32752b0bc449a4cd2920ce7d065184bc84e49041dcd8db0e057fd7923635b74b09ab7957568d34f70dc1dd96b77b0905e80b4a5f1d8f28db -DIST turbovnc-3.0.tar.gz 8665757 BLAKE2B 98600dc1f4fd91b30c8c48f2e465aa4cb9c53190c08611374ed6e1ef59be585f1694a1c6827939dec9cf259bd0e9a8fbdea9194653f5a3c66eb97cca1e12b09b SHA512 baa5f62fa1d76a09dc16262d853598b9d9ba8a12f3804c27df6af4983700b4dc1ad7f981ea02e2dc4d36c29b0cd7a1d7a7a8c98b7ae971cbc688ca30fd5c19ec diff --git a/net-misc/turbovnc/turbovnc-3.0.ebuild b/net-misc/turbovnc/turbovnc-3.0.ebuild deleted file mode 100644 index 26c0c3cbe94e.. --- a/net-misc/turbovnc/turbovnc-3.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop java-pkg-opt-2 - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/"; -SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+ssl" - -COMMON_DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0:=[java?] - sys-libs/pam - sys-libs/zlib - virtual/opengl - x11-apps/xauth - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - x11-misc/xkeyboard-config - java? ( - >=virtual/jdk-1.8:* - x11-libs/libXi - ) - ssl? ( dev-libs/openssl:= ) - !net-misc/tigervnc -" -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp -" -DEPEND=" - ${COMMON_DEPEND} - x11-libs/xtrans -" - -PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch ) - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDVIEWER=$(usex java) - -DTVNC_BUILDHELPER=$(usex java) - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - - if use ssl ; then - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS=OpenSSL - -DTVNC_DLOPENSSL=OFF - ) - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - if use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use java ; then - java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png - fi - - # Don't install incompatible init script - rm -rf "${ED}"/etc/init.d/ || die - rm -rf "${ED}"/etc/sysconfig/ || die - - find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die - - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 425283e14b5019356b2058d121add082b3ca020b Author: Viorel Munteanu gentoo org> AuthorDate: Fri Aug 9 06:40:09 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Fri Aug 9 07:14:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=425283e1 net-misc/turbovnc: add 3.1.2 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 2 + net-misc/turbovnc/turbovnc-3.1.2.ebuild | 146 2 files changed, 148 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index debe294b7e46..c849c6b776e1 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -2,5 +2,7 @@ DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a564 DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 DIST turbovnc-3.1.1.tar.gz 9032635 BLAKE2B 84b6d656bcadf310368f4c59e03c25d2997e8264141bf54dc670e76c1f52e4ea63a71670f134643018f9cae76aa20d51d15a4a9f919a25d21abac80fbc0b43db SHA512 d855b5f6aca9db73474d6a63868212a847c472ae01e4d26ea877bccb911d910730409e13183928426ce07a401da38a55fbcb39e411530f993d758e8dbf244cd1 DIST turbovnc-3.1.1.tar.gz.sig 543 BLAKE2B 2563db72dbca74781b0c2d76867298c400db61bff120e8bd4167c90347c94a26824f7aa252a2ac9fc1b0c101d56caeaceec74155ae5593428ad23a36373e998a SHA512 0dd0bde26bba3fe7ebbbe3c1a0af5f7e223026f140f031ae29405a47dd5d62183f22ea9fd6e1902b23016887503d80b65f77c48759e540ae8969a17046e41c60 +DIST turbovnc-3.1.2.tar.gz 9037445 BLAKE2B 0a645c510ce9caf7b0a8cbbf74debf1d1c6a159a46798176d7c6103f18b81b1191c5f82e365fa6eadb8e128a6a4f5060b6d456cda858f4d87361a5ca4bf7d842 SHA512 ab66ac516c1d8cbadeb205c3a46233d25893bf415eeb1004825c613997f9b17c858e823d7264a92459a82e24e9c9b372298b7bcec7c413a4b9206dadcc99e29c +DIST turbovnc-3.1.2.tar.gz.sig 543 BLAKE2B 2cb7ea20a246cbf4fc6209c2e23ebf05a47638a9c926009c97b61a2d8d696b069429069f8822b18212b6efea69bfd10da0a53df1efa545b44b689cecf03ec7b9 SHA512 c1619b2f9e4babb3b0bcde1bb6294d8fdb15d35e0c04f69a8cf73c8a93966dd2bc39e2223f2bd2e57086deb11e04fc8034e5ca3ba0cdeb5a3270cddb82497d2a DIST turbovnc-3.1.tar.gz 9031021 BLAKE2B 08a349bec517b36a505145a572905da64055e39c8cdc40a0609aa5976604aa4cb43196584c4bf078ea68094c87818fd611589b3b12d2f81085ed40ea4db0d4bd SHA512 ebcfd2c542542fd266eedf23bd7ce246acc2257b195dd204d474ca658e9ef2dab8bb8731a7ae4d30bf3845b9015c318e19c3b68a1ad6b658287fddbcb4db509b DIST turbovnc-3.1.tar.gz.sig 543 BLAKE2B 6e6d13e611913abacaedb9251554263713f04f26aaff6a1526b796091f84260b10c156ee302156aac12ad519d9d9a55f059460b13df4fe02a237be37307acf7e SHA512 753a9f77ed851b999a49d22787ee992cae74340afb78a30db25d5cc36d95facce437df0474bf4ef92317ebcfa41e2cb145f3841df39fbb6b3b191ec57fcc0100 diff --git a/net-misc/turbovnc/turbovnc-3.1.2.ebuild b/net-misc/turbovnc/turbovnc-3.1.2.ebuild new file mode 100644 index ..a60e961b75ed --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.1.2.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 optfeature verify-sig + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI=" + https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz + verify-sig? ( https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + viewer? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" +
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: df2e3cecfc6ab3a6f83747f0eadf988949ffb953 Author: Viorel Munteanu gentoo org> AuthorDate: Fri Aug 9 06:45:41 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Fri Aug 9 07:14:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2e3cec net-misc/turbovnc: drop 3.1 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest| 2 - net-misc/turbovnc/turbovnc-3.1.ebuild | 142 -- 2 files changed, 144 deletions(-) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 9948242a24cb..64b4f680c2c2 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -2,5 +2,3 @@ DIST turbovnc-3.1.1.tar.gz 9032635 BLAKE2B 84b6d656bcadf310368f4c59e03c25d2997e8 DIST turbovnc-3.1.1.tar.gz.sig 543 BLAKE2B 2563db72dbca74781b0c2d76867298c400db61bff120e8bd4167c90347c94a26824f7aa252a2ac9fc1b0c101d56caeaceec74155ae5593428ad23a36373e998a SHA512 0dd0bde26bba3fe7ebbbe3c1a0af5f7e223026f140f031ae29405a47dd5d62183f22ea9fd6e1902b23016887503d80b65f77c48759e540ae8969a17046e41c60 DIST turbovnc-3.1.2.tar.gz 9037445 BLAKE2B 0a645c510ce9caf7b0a8cbbf74debf1d1c6a159a46798176d7c6103f18b81b1191c5f82e365fa6eadb8e128a6a4f5060b6d456cda858f4d87361a5ca4bf7d842 SHA512 ab66ac516c1d8cbadeb205c3a46233d25893bf415eeb1004825c613997f9b17c858e823d7264a92459a82e24e9c9b372298b7bcec7c413a4b9206dadcc99e29c DIST turbovnc-3.1.2.tar.gz.sig 543 BLAKE2B 2cb7ea20a246cbf4fc6209c2e23ebf05a47638a9c926009c97b61a2d8d696b069429069f8822b18212b6efea69bfd10da0a53df1efa545b44b689cecf03ec7b9 SHA512 c1619b2f9e4babb3b0bcde1bb6294d8fdb15d35e0c04f69a8cf73c8a93966dd2bc39e2223f2bd2e57086deb11e04fc8034e5ca3ba0cdeb5a3270cddb82497d2a -DIST turbovnc-3.1.tar.gz 9031021 BLAKE2B 08a349bec517b36a505145a572905da64055e39c8cdc40a0609aa5976604aa4cb43196584c4bf078ea68094c87818fd611589b3b12d2f81085ed40ea4db0d4bd SHA512 ebcfd2c542542fd266eedf23bd7ce246acc2257b195dd204d474ca658e9ef2dab8bb8731a7ae4d30bf3845b9015c318e19c3b68a1ad6b658287fddbcb4db509b -DIST turbovnc-3.1.tar.gz.sig 543 BLAKE2B 6e6d13e611913abacaedb9251554263713f04f26aaff6a1526b796091f84260b10c156ee302156aac12ad519d9d9a55f059460b13df4fe02a237be37307acf7e SHA512 753a9f77ed851b999a49d22787ee992cae74340afb78a30db25d5cc36d95facce437df0474bf4ef92317ebcfa41e2cb145f3841df39fbb6b3b191ec57fcc0100 diff --git a/net-misc/turbovnc/turbovnc-3.1.ebuild b/net-misc/turbovnc/turbovnc-3.1.ebuild deleted file mode 100644 index 8046e0e11fb8.. --- a/net-misc/turbovnc/turbovnc-3.1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_OPT_USE=viewer -inherit cmake desktop java-pkg-opt-2 verify-sig - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/"; -SRC_URI=" - https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz - verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+server +ssl +viewer" -REQUIRED_USE="|| ( server viewer )" - -COMMON_DEPEND=" - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-misc/xkeyboard-config - server? ( - media-libs/libjpeg-turbo:= - sys-libs/pam - sys-libs/zlib - virtual/opengl - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXfont2 - x11-libs/pixman - ssl? ( dev-libs/openssl:= ) - !net-misc/tigervnc[server] - ) - viewer? ( - media-libs/libjpeg-turbo:=[java] - x11-libs/libXi - !net-misc/tigervnc[viewer(+)] - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp - viewer? ( >=virtual/jre-1.8:* ) -" - -# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 -# but cmake will look for them, so add them here -DEPEND=" - ${COMMON_DEPEND} - x11-libs/xtrans - viewer? ( >=virtual/jdk-1.8:* ) - server? ( - app-arch/bzip2 - media-libs/freetype - x11-libs/libfontenc - ) -" - -BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) -" - -PATCHES=( - "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch -) - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc - -#879797 - BSD functions -QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) - -pkg_pretend() { - if use ssl && ! use server; then - einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" - fi -} - -src_prepare() { - use viewer && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 4c4c9ee031b04ee3dc6cc629bcd1eaba0592a174 Author: Viorel Munteanu gentoo org> AuthorDate: Fri Aug 18 16:47:11 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Fri Aug 18 16:47:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c4c9ee0 net-misc/turbovnc: add 3.0.91, drop 3.0.90 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 4 ++-- net-misc/turbovnc/{turbovnc-3.0.90.ebuild => turbovnc-3.0.91.ebuild} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 607fd79cb7ce..e2224660913b 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,4 +1,4 @@ DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 -DIST turbovnc-3.0.90.tar.gz 9028660 BLAKE2B 3c4b67894a3cc1f855018932c2b03ea3efbcb38af8eaeed86f95bdb21605e64c87ff6d51652bfedd1520b89040e97a11e3bf2f117bc78f9225fb56f4f7687795 SHA512 f3eff5109bd33fc8ded1ed5eab4df5537ea56c71c7fcf7fb471f9ac4e77a04fcde588423885cf781f2bbd2be4f25b2959e20b71df1d0de465d26910018ccd899 -DIST turbovnc-3.0.90.tar.gz.sig 543 BLAKE2B 60cd24db3b5338230bba0ead18f1f0e784fcd6bc9eef10a01edd17a9c3cee2a611f77db46f9e3b3bb1f70cb25a3ed829d0dae0a568dd68ec514cd6c954eda4f3 SHA512 1fe886fb5118d5a1cfbba1a9cbb7960a08b3dfcb5ec3bd36a10c4c0f0dd5acf47dba8a83fb9cb8db07c8b91a046077c23b67e85115c91cdf55283beb457d38d9 +DIST turbovnc-3.0.91.tar.gz 9026159 BLAKE2B 9601979d81a69ee8a0e8b2039a09bfc2226f870162254b49592a0f5224eba24fc22ddbb1ec16c02217b8bf4a61eaa72a81f4a791559eb0d843f07310b7a1b211 SHA512 5abc3fb5f71cc957d1c9ee390f2e3bb9a41fccf5b20f06c0452a659aaea15bc6a01a74c57ecf04866ea427edc0f49355b70f3d83cb6827e5fc1de5437c8ab0fc +DIST turbovnc-3.0.91.tar.gz.sig 543 BLAKE2B 3892123d5e8cfe6a3e33b1887dd9a853b735ea9e653787d19147f26975d22ef3e4af846e3be0fb376b846c3a98c5288fa8d63bf6457b80503de60121376b569a SHA512 0bc1e78d928a88d2e363aaf8b024092fa6356ab66336f218e8dbbec3985f51220d37007342cf2bf9923134c2e6b020fd6511d897be1d4392f97930edbc438fa3 diff --git a/net-misc/turbovnc/turbovnc-3.0.90.ebuild b/net-misc/turbovnc/turbovnc-3.0.91.ebuild similarity index 98% rename from net-misc/turbovnc/turbovnc-3.0.90.ebuild rename to net-misc/turbovnc/turbovnc-3.0.91.ebuild index 81c62a2918f2..78b797e4455f 100644 --- a/net-misc/turbovnc/turbovnc-3.0.90.ebuild +++ b/net-misc/turbovnc/turbovnc-3.0.91.ebuild @@ -6,7 +6,7 @@ EAPI=8 JAVA_PKG_OPT_USE=viewer inherit cmake desktop java-pkg-opt-2 verify-sig -MY_PV="3.0.90%20%283.1%20beta1%29" +MY_PV="3.0.91%20%283.1%20beta2%29" DESCRIPTION="A fast replacement for TigerVNC" HOMEPAGE="https://www.turbovnc.org/";
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 53725d901735d2030b4cb4d42827c33bcdde1846 Author: Viorel Munteanu gentoo org> AuthorDate: Sun Jan 28 07:21:39 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Jan 28 07:38:08 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53725d90 net-misc/turbovnc: add 3.1.1 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 2 + net-misc/turbovnc/turbovnc-3.1.1.ebuild | 146 2 files changed, 148 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 1be657b5e12f..debe294b7e46 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,4 +1,6 @@ DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 +DIST turbovnc-3.1.1.tar.gz 9032635 BLAKE2B 84b6d656bcadf310368f4c59e03c25d2997e8264141bf54dc670e76c1f52e4ea63a71670f134643018f9cae76aa20d51d15a4a9f919a25d21abac80fbc0b43db SHA512 d855b5f6aca9db73474d6a63868212a847c472ae01e4d26ea877bccb911d910730409e13183928426ce07a401da38a55fbcb39e411530f993d758e8dbf244cd1 +DIST turbovnc-3.1.1.tar.gz.sig 543 BLAKE2B 2563db72dbca74781b0c2d76867298c400db61bff120e8bd4167c90347c94a26824f7aa252a2ac9fc1b0c101d56caeaceec74155ae5593428ad23a36373e998a SHA512 0dd0bde26bba3fe7ebbbe3c1a0af5f7e223026f140f031ae29405a47dd5d62183f22ea9fd6e1902b23016887503d80b65f77c48759e540ae8969a17046e41c60 DIST turbovnc-3.1.tar.gz 9031021 BLAKE2B 08a349bec517b36a505145a572905da64055e39c8cdc40a0609aa5976604aa4cb43196584c4bf078ea68094c87818fd611589b3b12d2f81085ed40ea4db0d4bd SHA512 ebcfd2c542542fd266eedf23bd7ce246acc2257b195dd204d474ca658e9ef2dab8bb8731a7ae4d30bf3845b9015c318e19c3b68a1ad6b658287fddbcb4db509b DIST turbovnc-3.1.tar.gz.sig 543 BLAKE2B 6e6d13e611913abacaedb9251554263713f04f26aaff6a1526b796091f84260b10c156ee302156aac12ad519d9d9a55f059460b13df4fe02a237be37307acf7e SHA512 753a9f77ed851b999a49d22787ee992cae74340afb78a30db25d5cc36d95facce437df0474bf4ef92317ebcfa41e2cb145f3841df39fbb6b3b191ec57fcc0100 diff --git a/net-misc/turbovnc/turbovnc-3.1.1.ebuild b/net-misc/turbovnc/turbovnc-3.1.1.ebuild new file mode 100644 index ..a60e961b75ed --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.1.1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 optfeature verify-sig + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI=" + https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz + verify-sig? ( https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + viewer? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( + "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc + +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but U
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: c7990f469b616e97dca2740ef9f1c4fba21c50ad Author: Sam James gentoo org> AuthorDate: Sat Oct 29 21:25:06 2022 + Commit: Sam James gentoo org> CommitDate: Sat Oct 29 21:25:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7990f46 net-misc/turbovnc: add sourceforge upstream metadata Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index b00420add601..0170fa1cc8b5 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -18,6 +18,7 @@ By The VirtualGL Project. + turbovnc TurboVNC/turbovnc
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 386e5b621807c064ebb05982305643b46979d6d6 Author: Viorel Munteanu gentoo org> AuthorDate: Wed Nov 2 10:38:12 2022 + Commit: Viorel Munteanu gentoo org> CommitDate: Wed Nov 2 16:17:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386e5b62 net-misc/turbovnc: add myself as a maintainer Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/metadata.xml | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index 0170fa1cc8b5..06bf263dec96 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -1,18 +1,14 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - ceamac.para...@gmail.com + + cea...@gentoo.org Viorel Munteanu s...@gentoo.org Sam James - - proxy-ma...@gentoo.org - Proxy Maintainers - TurboVNC is a derivative of VNC (Virtual Network Computing) that is tuned to provide peak performance for 3D and video workloads. By The VirtualGL Project.
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: a05eb623a0e4247c256e9dd5a239090141fd7378 Author: Viorel Munteanu gentoo org> AuthorDate: Sat Jan 14 18:55:21 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Jan 15 08:39:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05eb623 net-misc/turbovnc: rename USE client-> viewer `viewer` makes more sense than `client`. It also matches the USE flag in tigervnc. Closes: https://bugs.gentoo.org/864809 Closes: https://github.com/gentoo/gentoo/pull/29105 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/metadata.xml | 2 +- net-misc/turbovnc/turbovnc-3.0.2.ebuild | 32 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index 97cad453f15c..5c1cfb86ec9a 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -14,8 +14,8 @@ By The VirtualGL Project. - Build the client (vncviewer) Build the server (vncserver, Xvnc) + Build the viewer (vncviewer) turbovnc diff --git a/net-misc/turbovnc/turbovnc-3.0.2.ebuild b/net-misc/turbovnc/turbovnc-3.0.2.ebuild index 3471a1f73bd5..abebac6c9c50 100644 --- a/net-misc/turbovnc/turbovnc-3.0.2.ebuild +++ b/net-misc/turbovnc/turbovnc-3.0.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -JAVA_PKG_OPT_USE=client +JAVA_PKG_OPT_USE=viewer inherit cmake desktop java-pkg-opt-2 verify-sig DESCRIPTION="A fast replacement for TigerVNC" @@ -16,19 +16,14 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="+server +ssl" -REQUIRED_USE="|| ( client server )" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" COMMON_DEPEND=" x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-config - client? ( - media-libs/libjpeg-turbo:=[java] - x11-libs/libXi - !net-misc/tigervnc - ) server? ( media-libs/libjpeg-turbo:= sys-libs/pam @@ -41,12 +36,17 @@ COMMON_DEPEND=" ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc[server] ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) " RDEPEND=" ${COMMON_DEPEND} x11-apps/xkbcomp - client? ( >=virtual/jre-1.8:* ) + viewer? ( >=virtual/jre-1.8:* ) " # libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 @@ -54,7 +54,7 @@ RDEPEND=" DEPEND=" ${COMMON_DEPEND} x11-libs/xtrans - client? ( >=virtual/jdk-1.8:* ) + viewer? ( >=virtual/jdk-1.8:* ) server? ( app-arch/bzip2 media-libs/freetype @@ -77,14 +77,14 @@ pkg_pretend() { } src_prepare() { - use client && java-pkg-opt-2_src_prepare + use viewer && java-pkg-opt-2_src_prepare cmake_src_prepare } src_configure() { local mycmakeargs=( - -DTVNC_BUILDVIEWER=$(usex client) - -DTVNC_BUILDHELPER=$(usex client) + -DTVNC_BUILDVIEWER=$(usex viewer) + -DTVNC_BUILDHELPER=$(usex viewer) -DTVNC_BUILDSERVER=$(usex server) -DTVNC_BUILDWEBSERVER=$(usex server) ) @@ -109,7 +109,7 @@ src_configure() { fi fi - if use client ; then + if use viewer ; then export JAVACFLAGS="$(java-pkg_javac-args)" export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" fi @@ -120,7 +120,7 @@ src_configure() { src_install() { cmake_src_install - if use client ; then + if use viewer ; then java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png fi
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 6aa1d6080508f1909fffb013d063383fea92527b Author: Viorel Munteanu gentoo org> AuthorDate: Sun Nov 19 07:41:17 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Nov 19 07:41:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa1d608 net-misc/turbovnc: drop 3.0.91 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 2 - net-misc/turbovnc/turbovnc-3.0.91.ebuild | 141 --- 2 files changed, 143 deletions(-) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 79877eeaa844..1be657b5e12f 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,6 +1,4 @@ DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 -DIST turbovnc-3.0.91.tar.gz 9026159 BLAKE2B 9601979d81a69ee8a0e8b2039a09bfc2226f870162254b49592a0f5224eba24fc22ddbb1ec16c02217b8bf4a61eaa72a81f4a791559eb0d843f07310b7a1b211 SHA512 5abc3fb5f71cc957d1c9ee390f2e3bb9a41fccf5b20f06c0452a659aaea15bc6a01a74c57ecf04866ea427edc0f49355b70f3d83cb6827e5fc1de5437c8ab0fc -DIST turbovnc-3.0.91.tar.gz.sig 543 BLAKE2B 3892123d5e8cfe6a3e33b1887dd9a853b735ea9e653787d19147f26975d22ef3e4af846e3be0fb376b846c3a98c5288fa8d63bf6457b80503de60121376b569a SHA512 0bc1e78d928a88d2e363aaf8b024092fa6356ab66336f218e8dbbec3985f51220d37007342cf2bf9923134c2e6b020fd6511d897be1d4392f97930edbc438fa3 DIST turbovnc-3.1.tar.gz 9031021 BLAKE2B 08a349bec517b36a505145a572905da64055e39c8cdc40a0609aa5976604aa4cb43196584c4bf078ea68094c87818fd611589b3b12d2f81085ed40ea4db0d4bd SHA512 ebcfd2c542542fd266eedf23bd7ce246acc2257b195dd204d474ca658e9ef2dab8bb8731a7ae4d30bf3845b9015c318e19c3b68a1ad6b658287fddbcb4db509b DIST turbovnc-3.1.tar.gz.sig 543 BLAKE2B 6e6d13e611913abacaedb9251554263713f04f26aaff6a1526b796091f84260b10c156ee302156aac12ad519d9d9a55f059460b13df4fe02a237be37307acf7e SHA512 753a9f77ed851b999a49d22787ee992cae74340afb78a30db25d5cc36d95facce437df0474bf4ef92317ebcfa41e2cb145f3841df39fbb6b3b191ec57fcc0100 diff --git a/net-misc/turbovnc/turbovnc-3.0.91.ebuild b/net-misc/turbovnc/turbovnc-3.0.91.ebuild deleted file mode 100644 index e87f86dd3a53.. --- a/net-misc/turbovnc/turbovnc-3.0.91.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_OPT_USE=viewer -inherit cmake desktop java-pkg-opt-2 verify-sig - -MY_PV="3.0.91%20%283.1%20beta2%29" - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/"; -SRC_URI=" - https://sourceforge.net/projects/turbovnc/files/${MY_PV}/${P}.tar.gz/download -> ${P}.tar.gz - verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${MY_PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) -" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+server +ssl +viewer" -REQUIRED_USE="|| ( server viewer )" - -COMMON_DEPEND=" - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-misc/xkeyboard-config - server? ( - media-libs/libjpeg-turbo:= - sys-libs/pam - sys-libs/zlib - virtual/opengl - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXfont2 - x11-libs/pixman - ssl? ( dev-libs/openssl:= ) - !net-misc/tigervnc[server] - ) - viewer? ( - media-libs/libjpeg-turbo:=[java] - x11-libs/libXi - !net-misc/tigervnc[viewer(+)] - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp - viewer? ( >=virtual/jre-1.8:* ) -" - -# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 -# but cmake will look for them, so add them here -DEPEND=" - ${COMMON_DEPEND} - x11-libs/xtrans - viewer? ( >=virtual/jdk-1.8:* ) - server? ( - app-arch/bzip2 - media-libs/freetype - x11-libs/libfontenc - ) -" - -BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) -" - -PATCHES=( - "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch -) - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc - -#879797 - BSD functions -QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) - -pkg_pretend() { - if use ssl && ! use server; then -
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: a3878bfd90e5fdbd66bd200bf1ba478b1a5cf552 Author: Viorel Munteanu gentoo org> AuthorDate: Sun Nov 19 07:41:01 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Nov 19 07:41:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3878bfd net-misc/turbovnc: add 3.1 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest| 2 + net-misc/turbovnc/turbovnc-3.1.ebuild | 140 ++ 2 files changed, 142 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index e2224660913b..79877eeaa844 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -2,3 +2,5 @@ DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a564 DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 DIST turbovnc-3.0.91.tar.gz 9026159 BLAKE2B 9601979d81a69ee8a0e8b2039a09bfc2226f870162254b49592a0f5224eba24fc22ddbb1ec16c02217b8bf4a61eaa72a81f4a791559eb0d843f07310b7a1b211 SHA512 5abc3fb5f71cc957d1c9ee390f2e3bb9a41fccf5b20f06c0452a659aaea15bc6a01a74c57ecf04866ea427edc0f49355b70f3d83cb6827e5fc1de5437c8ab0fc DIST turbovnc-3.0.91.tar.gz.sig 543 BLAKE2B 3892123d5e8cfe6a3e33b1887dd9a853b735ea9e653787d19147f26975d22ef3e4af846e3be0fb376b846c3a98c5288fa8d63bf6457b80503de60121376b569a SHA512 0bc1e78d928a88d2e363aaf8b024092fa6356ab66336f218e8dbbec3985f51220d37007342cf2bf9923134c2e6b020fd6511d897be1d4392f97930edbc438fa3 +DIST turbovnc-3.1.tar.gz 9031021 BLAKE2B 08a349bec517b36a505145a572905da64055e39c8cdc40a0609aa5976604aa4cb43196584c4bf078ea68094c87818fd611589b3b12d2f81085ed40ea4db0d4bd SHA512 ebcfd2c542542fd266eedf23bd7ce246acc2257b195dd204d474ca658e9ef2dab8bb8731a7ae4d30bf3845b9015c318e19c3b68a1ad6b658287fddbcb4db509b +DIST turbovnc-3.1.tar.gz.sig 543 BLAKE2B 6e6d13e611913abacaedb9251554263713f04f26aaff6a1526b796091f84260b10c156ee302156aac12ad519d9d9a55f059460b13df4fe02a237be37307acf7e SHA512 753a9f77ed851b999a49d22787ee992cae74340afb78a30db25d5cc36d95facce437df0474bf4ef92317ebcfa41e2cb145f3841df39fbb6b3b191ec57fcc0100 diff --git a/net-misc/turbovnc/turbovnc-3.1.ebuild b/net-misc/turbovnc/turbovnc-3.1.ebuild new file mode 100644 index ..424b4426e084 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.1.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 verify-sig + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI=" + https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz + verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + viewer? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( + "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc + +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" + fi +} + +src_prepare() { + use viewer && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DT
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 0683e3ed0a66aeff80570d6f5539629648b2608e Author: Viorel Munteanu gentoo org> AuthorDate: Wed Nov 29 22:08:31 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Wed Nov 29 22:09:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0683e3ed net-misc/turbovnc: fix install with USE=-server Closes: https://bugs.gentoo.org/918632 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/turbovnc-3.1.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net-misc/turbovnc/turbovnc-3.1.ebuild b/net-misc/turbovnc/turbovnc-3.1.ebuild index 424b4426e084..8046e0e11fb8 100644 --- a/net-misc/turbovnc/turbovnc-3.1.ebuild +++ b/net-misc/turbovnc/turbovnc-3.1.ebuild @@ -130,8 +130,10 @@ src_install() { fi # Don't install incompatible init script - rm -r "${ED}"/etc/init.d/ || die - rm -r "${ED}"/etc/sysconfig/ || die + if use server; then + rm -r "${ED}"/etc/init.d/ || die + rm -r "${ED}"/etc/sysconfig/ || die + fi # Conflicts with x11-base/xorg-server find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 451b63134cb93070d625b9b279c23334f84ef3d5 Author: Viorel Munteanu gentoo org> AuthorDate: Thu Dec 29 10:02:50 2022 + Commit: Viorel Munteanu gentoo org> CommitDate: Fri Dec 30 09:18:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451b6313 net-misc/turbovnc: drop 2.2.7-r2 Closes: https://github.com/gentoo/gentoo/pull/28886 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 1 - net-misc/turbovnc/metadata.xml | 1 - net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild | 119 - 3 files changed, 121 deletions(-) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 0f3313ea52fb..989e229b1c93 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,3 +1,2 @@ -DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11 DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index 91034aafab24..97cad453f15c 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -14,7 +14,6 @@ By The VirtualGL Project. - Build the client (vncviewer) Build the client (vncviewer) Build the server (vncserver, Xvnc) diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild deleted file mode 100644 index 1764dc4c265b.. --- a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop java-pkg-opt-2 - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/"; -SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="gnutls +ssl" - -COMMON_DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0:=[java?] - sys-libs/pam - sys-libs/zlib - virtual/opengl - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - java? ( - >=virtual/jdk-1.8:* - x11-libs/libXi - ) - ssl? ( - !gnutls? ( dev-libs/openssl:= ) - gnutls? ( net-libs/gnutls:= ) - ) - !net-misc/tigervnc -" -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp -" -DEPEND=" - ${COMMON_DEPEND} - x11-libs/xtrans -" - -PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch ) - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDJAVA=$(usex java) - -DTVNC_BUILDNATIVE=$(usex java) - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - -DBUILDING_ON_MUSL=$(usex elibc_musl) # bug #836723 - ) - - if use ssl ; then - # We prefer OpenSSL, so default to that if SSL is enabled - if use gnutls ; then - mycmakeargs+=( -DTVNC_USETLS=GnuTLS ) - else - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS=OpenSSL - -DTVNC_DLOPENSSL=OFF - ) - fi - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - if use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - - mycmakeargs+=( -
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 5ec9011ad7fa1011d6febc5d8ec884769b504899 Author: Viorel Munteanu gentoo org> AuthorDate: Thu Dec 29 10:02:23 2022 + Commit: Viorel Munteanu gentoo org> CommitDate: Fri Dec 30 09:14:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec9011a net-misc/turbovnc: add 3.0.2 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 2 + net-misc/turbovnc/metadata.xml | 5 ++ net-misc/turbovnc/turbovnc-3.0.2.ebuild | 136 3 files changed, 143 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 6ce870f1f726..184184f4be7f 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,2 +1,4 @@ DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 DIST turbovnc-3.0.1.tar.gz 8685384 BLAKE2B 388657bac29ccd570b0a5e03ca49cb5b868907390743241599f84d900707ffc685d021702167e7f615004eafd545120de3dbd4c61e0e206ce2d4227ff54ea86a SHA512 1d205db7fa23730e32752b0bc449a4cd2920ce7d065184bc84e49041dcd8db0e057fd7923635b74b09ab7957568d34f70dc1dd96b77b0905e80b4a5f1d8f28db +DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11 +DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index 06bf263dec96..91034aafab24 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -13,6 +13,11 @@ TurboVNC is a derivative of VNC (Virtual Network Computing) that is tuned to provide peak performance for 3D and video workloads. By The VirtualGL Project. + + Build the client (vncviewer) + Build the client (vncviewer) + Build the server (vncserver, Xvnc) + turbovnc TurboVNC/turbovnc diff --git a/net-misc/turbovnc/turbovnc-3.0.2.ebuild b/net-misc/turbovnc/turbovnc-3.0.2.ebuild new file mode 100644 index ..3471a1f73bd5 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.0.2.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=client +inherit cmake desktop java-pkg-opt-2 verify-sig + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI=" + https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz + verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+server +ssl" +REQUIRED_USE="|| ( client server )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + client? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc + ) + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + client? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + client? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but USE=\"server\" is not. Th
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 932a01a6e77b7adaeb9f78616e2c7f6a9c8d6a0c Author: Viorel Munteanu gentoo org> AuthorDate: Thu Dec 29 10:02:43 2022 + Commit: Viorel Munteanu gentoo org> CommitDate: Fri Dec 30 09:14:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932a01a6 net-misc/turbovnc: drop 3.0.1 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 1 - net-misc/turbovnc/turbovnc-3.0.1.ebuild | 103 2 files changed, 104 deletions(-) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 184184f4be7f..0f3313ea52fb 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,4 +1,3 @@ DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 -DIST turbovnc-3.0.1.tar.gz 8685384 BLAKE2B 388657bac29ccd570b0a5e03ca49cb5b868907390743241599f84d900707ffc685d021702167e7f615004eafd545120de3dbd4c61e0e206ce2d4227ff54ea86a SHA512 1d205db7fa23730e32752b0bc449a4cd2920ce7d065184bc84e49041dcd8db0e057fd7923635b74b09ab7957568d34f70dc1dd96b77b0905e80b4a5f1d8f28db DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11 DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c diff --git a/net-misc/turbovnc/turbovnc-3.0.1.ebuild b/net-misc/turbovnc/turbovnc-3.0.1.ebuild deleted file mode 100644 index c8982a2ba230.. --- a/net-misc/turbovnc/turbovnc-3.0.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop java-pkg-opt-2 - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/"; -SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+ssl" - -COMMON_DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0:=[java?] - sys-libs/pam - sys-libs/zlib - virtual/opengl - x11-apps/xauth - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - x11-misc/xkeyboard-config - java? ( - >=virtual/jdk-1.8:* - x11-libs/libXi - !net-misc/tigervnc - ) - ssl? ( dev-libs/openssl:= ) - !net-misc/tigervnc[server] -" -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp -" -DEPEND=" - ${COMMON_DEPEND} - x11-libs/xtrans -" - -PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDVIEWER=$(usex java) - -DTVNC_BUILDHELPER=$(usex java) - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - - if use ssl ; then - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS=OpenSSL - -DTVNC_DLOPENSSL=OFF - ) - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - if use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use java ; then - java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png - fi - - # Don't install incompatible init script - rm -rf "${ED}"/etc/init.d/ || die - rm -rf "${ED}"/etc/sysconfig/ || die - - find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die - - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: e2f32286fc5ccb685e718932e1301421c4f469e3 Author: Viorel Munteanu gentoo org> AuthorDate: Wed May 10 07:55:04 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Fri May 12 04:34:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f32286 net-misc/turbovnc: drop 3.0.2 Closes: https://github.com/gentoo/gentoo/pull/30965 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 2 - net-misc/turbovnc/turbovnc-3.0.2.ebuild | 136 2 files changed, 138 deletions(-) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index f463d4c1c313..cba3cdb710ad 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,4 +1,2 @@ -DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11 -DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 diff --git a/net-misc/turbovnc/turbovnc-3.0.2.ebuild b/net-misc/turbovnc/turbovnc-3.0.2.ebuild deleted file mode 100644 index abebac6c9c50.. --- a/net-misc/turbovnc/turbovnc-3.0.2.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_OPT_USE=viewer -inherit cmake desktop java-pkg-opt-2 verify-sig - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/"; -SRC_URI=" - https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz - verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+server +ssl +viewer" -REQUIRED_USE="|| ( server viewer )" - -COMMON_DEPEND=" - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-misc/xkeyboard-config - server? ( - media-libs/libjpeg-turbo:= - sys-libs/pam - sys-libs/zlib - virtual/opengl - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXfont2 - x11-libs/pixman - ssl? ( dev-libs/openssl:= ) - !net-misc/tigervnc[server] - ) - viewer? ( - media-libs/libjpeg-turbo:=[java] - x11-libs/libXi - !net-misc/tigervnc[viewer(+)] - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp - viewer? ( >=virtual/jre-1.8:* ) -" - -# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 -# but cmake will look for them, so add them here -DEPEND=" - ${COMMON_DEPEND} - x11-libs/xtrans - viewer? ( >=virtual/jdk-1.8:* ) - server? ( - app-arch/bzip2 - media-libs/freetype - x11-libs/libfontenc - ) -" - -BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) -" - -PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc - -pkg_pretend() { - if use ssl && ! use server; then - einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" - fi -} - -src_prepare() { - use viewer && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_BUILDVIEWER=$(usex viewer) - -DTVNC_BUILDHELPER=$(usex viewer) - -DTVNC_BUILDSERVER=$(usex server) - -DTVNC_BUILDWEBSERVER=$(usex server) - ) - - if use server ; then - mycmakeargs+=( - -DTVNC_SYSTEMLIBS=ON - -DTVNC_SYSTEMX11=ON - -DXKB_BIN_DIRECTORY=/usr/bin -
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: de291e9ee855a904ec9f56d1339d0be7a464a2a2 Author: Viorel Munteanu gentoo org> AuthorDate: Wed May 10 07:53:21 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Fri May 12 04:34:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de291e9e net-misc/turbovnc: fix clang-16 warning QA check Ignore BSD-only functions. Closes: https://bugs.gentoo.org/879797 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/turbovnc-3.0.3.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-misc/turbovnc/turbovnc-3.0.3.ebuild b/net-misc/turbovnc/turbovnc-3.0.3.ebuild index abebac6c9c50..7cd8e44d220b 100644 --- a/net-misc/turbovnc/turbovnc-3.0.3.ebuild +++ b/net-misc/turbovnc/turbovnc-3.0.3.ebuild @@ -70,6 +70,9 @@ PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + pkg_pretend() { if use ssl && ! use server; then einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused"
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
commit: 669c7da47185ba7a84acc876e2c93fbc3a5fe151 Author: Viorel Munteanu gentoo org> AuthorDate: Tue Feb 28 05:41:49 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Tue Feb 28 05:42:34 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669c7da4 net-misc/turbovnc: add 3.0.3 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 2 + net-misc/turbovnc/turbovnc-3.0.3.ebuild | 136 2 files changed, 138 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 989e229b1c93..f463d4c1c313 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,2 +1,4 @@ DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11 DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c +DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de +DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 diff --git a/net-misc/turbovnc/turbovnc-3.0.3.ebuild b/net-misc/turbovnc/turbovnc-3.0.3.ebuild new file mode 100644 index ..abebac6c9c50 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.0.3.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 verify-sig + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI=" + https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz + verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + viewer? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" + fi +} + +src_prepare() { + use viewer && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_BUILDVIEWER=$(usex viewer) + -DTVNC_BUILDHELPER=$(usex viewer) + -DTVNC_BUILDSERVER=$(usex server) + -DTVNC_BUILDWEBSERVER=$(usex server) + ) + + if use server ; then + mycmakeargs+=( + -DTVNC_SYSTEMLIBS=ON + -DTVNC_SYSTEMX11=ON + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + )
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/
commit: 520d7e6c78bef4d3d1fc769574eb29141525272b Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jan 10 16:29:47 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Wed Jan 11 05:51:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520d7e6c net-misc/turbovnc: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29047 Signed-off-by: Viorel Munteanu gentoo.org> .../turbovnc-2.2.7-fix-musl-compilation.patch | 51 -- 1 file changed, 51 deletions(-) diff --git a/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch deleted file mode 100644 index c9f5f0397b4c.. --- a/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch +++ /dev/null @@ -1,51 +0,0 @@ -See bug https://bugs.gentoo.org/836723 - -There are 2 compilation errors: - -/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds': -/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known - 1178 | struct ucred peercred; - | ^~~~ - -/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c:48:10: fatal error: asm/page.h: No such file or directory - 48 | #include - | ^~~~ - - a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,6 +69,8 @@ - boolean_number(TVNC_BUILDSERVER) - report_option(TVNC_BUILDSERVER "TurboVNC Server") - -+option(BUILDING_ON_MUSL "Define GNU macros on musl" 0) -+ - if(TVNC_BUILDNATIVE OR TVNC_BUILDSERVER) - set(USEC 1) - endif() a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt -+++ b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt -@@ -13,6 +13,10 @@ - add_definitions(-DBSD44SOCKETS) - endif() - -+if(BUILDING_ON_MUSL) -+ add_definitions(-D_GNU_SOURCE) -+endif() -+ - set(EXTRASRCS "") - if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") - add_definitions(-DSECURE_RPC) a/unix/Xvnc/programs/Xserver/Xext/CMakeLists.txt -+++ b/unix/Xvnc/programs/Xserver/Xext/CMakeLists.txt -@@ -8,6 +8,10 @@ - endif() - endforeach() - -+if(BUILDING_ON_MUSL) -+ add_definitions(-D__GNU_LIBRARY__=2) -+endif() -+ - disable_compiler_warnings() - handle_type_puns() -
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/, net-misc/turbovnc/files/
commit: 60d0914cd8746831795a75d052a3e1126229460c Author: Viorel Munteanu gmail com> AuthorDate: Sun Apr 10 19:04:10 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Apr 18 07:27:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d0914c net-misc/turbovnc: Fix compilation on musl Closes: https://bugs.gentoo.org/836723 Signed-off-by: Viorel Munteanu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24981 Signed-off-by: Joonas Niilola gentoo.org> .../turbovnc-2.2.7-fix-musl-compilation.patch | 51 ++ net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild | 3 ++ 2 files changed, 54 insertions(+) diff --git a/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch new file mode 100644 index ..c9f5f0397b4c --- /dev/null +++ b/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch @@ -0,0 +1,51 @@ +See bug https://bugs.gentoo.org/836723 + +There are 2 compilation errors: + +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds': +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known + 1178 | struct ucred peercred; + | ^~~~ + +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c:48:10: fatal error: asm/page.h: No such file or directory + 48 | #include + | ^~~~ + + +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -69,6 +69,8 @@ + boolean_number(TVNC_BUILDSERVER) + report_option(TVNC_BUILDSERVER "TurboVNC Server") + ++option(BUILDING_ON_MUSL "Define GNU macros on musl" 0) ++ + if(TVNC_BUILDNATIVE OR TVNC_BUILDSERVER) + set(USEC 1) + endif() +--- a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt +@@ -13,6 +13,10 @@ + add_definitions(-DBSD44SOCKETS) + endif() + ++if(BUILDING_ON_MUSL) ++ add_definitions(-D_GNU_SOURCE) ++endif() ++ + set(EXTRASRCS "") + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") + add_definitions(-DSECURE_RPC) +--- a/unix/Xvnc/programs/Xserver/Xext/CMakeLists.txt b/unix/Xvnc/programs/Xserver/Xext/CMakeLists.txt +@@ -8,6 +8,10 @@ + endif() + endforeach() + ++if(BUILDING_ON_MUSL) ++ add_definitions(-D__GNU_LIBRARY__=2) ++endif() ++ + disable_compiler_warnings() + handle_type_puns() + diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild index 5b1a5561d896..89f5f2da2cce 100644 --- a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild @@ -44,6 +44,8 @@ RDEPEND=" x11-apps/xkbcomp " +PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch ) + src_prepare() { use java && java-pkg-opt-2_src_prepare cmake_src_prepare @@ -57,6 +59,7 @@ src_configure() { -DTVNC_BUILDNATIVE=$(usex java) -DXKB_BIN_DIRECTORY=/usr/bin -DXKB_DFLT_RULES=base + -DBUILDING_ON_MUSL=$(usex elibc_musl) # bug #836723 ) if use ssl ; then
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/
commit: c55b548846bee43e4bfc56e7499109ed4738b72e Author: Viorel Munteanu gmail com> AuthorDate: Sun Jun 12 13:59:48 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 15 21:07:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c55b5488 net-misc/turbovnc: add 3.0 Signed-off-by: Viorel Munteanu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/25864 Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/Manifest | 1 + .../files/turbovnc-3.0-fix-musl-compilation.patch | 20 net-misc/turbovnc/turbovnc-3.0.ebuild | 102 + 3 files changed, 123 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 1e90b89a91ba..faae4b9ed0f4 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1 +1,2 @@ DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 +DIST turbovnc-3.0.tar.gz 8665757 BLAKE2B 98600dc1f4fd91b30c8c48f2e465aa4cb9c53190c08611374ed6e1ef59be585f1694a1c6827939dec9cf259bd0e9a8fbdea9194653f5a3c66eb97cca1e12b09b SHA512 baa5f62fa1d76a09dc16262d853598b9d9ba8a12f3804c27df6af4983700b4dc1ad7f981ea02e2dc4d36c29b0cd7a1d7a7a8c98b7ae971cbc688ca30fd5c19ec diff --git a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch new file mode 100644 index ..d96b7bc1ca28 --- /dev/null +++ b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch @@ -0,0 +1,20 @@ +See bug https://bugs.gentoo.org/836723 + +The error is this: + +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds': +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known + 1178 | struct ucred peercred; + | ^~~~ + +--- ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt~2022-06-12 15:41:05.980270914 +0300 ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt 2022-06-12 15:43:14.113823213 +0300 +@@ -1,7 +1,7 @@ + include_directories(../render ../../../lib/libsha1) + + add_definitions(-DUNIXCONN -DTCPCONN -DHASXDMAUTH ${ServerOSDefines} -DXDMCP +- -DHAVE_SHA1_IN_LIBSHA1) ++ -DHAVE_SHA1_IN_LIBSHA1 -D_GNU_SOURCE) + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") + add_definitions(-DLOCALCONN) + elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/net-misc/turbovnc/turbovnc-3.0.ebuild b/net-misc/turbovnc/turbovnc-3.0.ebuild new file mode 100644 index ..26c0c3cbe94e --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop java-pkg-opt-2 + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+ssl" + +COMMON_DEPEND=" + app-arch/bzip2 + media-libs/freetype + >=media-libs/libjpeg-turbo-2.0.0:=[java?] + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-apps/xauth + x11-libs/libfontenc + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfont2 + x11-libs/libxkbfile + x11-libs/pixman + x11-misc/xkeyboard-config + java? ( + >=virtual/jdk-1.8:* + x11-libs/libXi + ) + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc +" +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp +" +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans +" + +PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch ) + +src_prepare() { + use java && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_SYSTEMX11=ON + -DTVNC_SYSTEMLIBS=ON + -DTVNC_BUILDVIEWER=$(usex java) + -DTVNC_BUILDHELPER=$(usex java) + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + + if use ssl ; then + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) +
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/
commit: a7c041d54bb662f41837c438b4ee6bb24fe5c60e Author: Viorel Munteanu gentoo org> AuthorDate: Fri Aug 9 06:45:28 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Fri Aug 9 07:14:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c041d5 net-misc/turbovnc: drop 3.0.3 Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 2 - .../files/turbovnc-3.0-fix-musl-compilation.patch | 20 --- .../turbovnc-3.0.3-java-launcher-32-bit.patch | 15 --- net-misc/turbovnc/turbovnc-3.0.3.ebuild| 142 - 4 files changed, 179 deletions(-) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index c849c6b776e1..9948242a24cb 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,5 +1,3 @@ -DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de -DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 DIST turbovnc-3.1.1.tar.gz 9032635 BLAKE2B 84b6d656bcadf310368f4c59e03c25d2997e8264141bf54dc670e76c1f52e4ea63a71670f134643018f9cae76aa20d51d15a4a9f919a25d21abac80fbc0b43db SHA512 d855b5f6aca9db73474d6a63868212a847c472ae01e4d26ea877bccb911d910730409e13183928426ce07a401da38a55fbcb39e411530f993d758e8dbf244cd1 DIST turbovnc-3.1.1.tar.gz.sig 543 BLAKE2B 2563db72dbca74781b0c2d76867298c400db61bff120e8bd4167c90347c94a26824f7aa252a2ac9fc1b0c101d56caeaceec74155ae5593428ad23a36373e998a SHA512 0dd0bde26bba3fe7ebbbe3c1a0af5f7e223026f140f031ae29405a47dd5d62183f22ea9fd6e1902b23016887503d80b65f77c48759e540ae8969a17046e41c60 DIST turbovnc-3.1.2.tar.gz 9037445 BLAKE2B 0a645c510ce9caf7b0a8cbbf74debf1d1c6a159a46798176d7c6103f18b81b1191c5f82e365fa6eadb8e128a6a4f5060b6d456cda858f4d87361a5ca4bf7d842 SHA512 ab66ac516c1d8cbadeb205c3a46233d25893bf415eeb1004825c613997f9b17c858e823d7264a92459a82e24e9c9b372298b7bcec7c413a4b9206dadcc99e29c diff --git a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch deleted file mode 100644 index 0769f00ffa56.. --- a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch +++ /dev/null @@ -1,20 +0,0 @@ -See bug https://bugs.gentoo.org/836723 - -The error is this: - -/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds': -/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known - 1178 | struct ucred peercred; - | ^~~~ - a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt -+++ b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt -@@ -1,7 +1,7 @@ - include_directories(../render ../../../lib/libsha1) - - add_definitions(-DUNIXCONN -DTCPCONN -DHASXDMAUTH ${ServerOSDefines} -DXDMCP -- -DHAVE_SHA1_IN_LIBSHA1) -+ -DHAVE_SHA1_IN_LIBSHA1 -D_GNU_SOURCE) - if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") - add_definitions(-DLOCALCONN) - elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch b/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch deleted file mode 100644 index a94c76ddfd24.. --- a/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch +++ /dev/null @@ -1,15 +0,0 @@ -Jdk 8 does not need -d32 -Jdk 11+ doesn't recognize it at all, so the viewer doesn't start on x86 - 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/net-misc/turbovnc/turbovnc-3.0.3.ebuild b/net-misc/turbovnc/turbovnc-3.0.3.ebuild deleted file mode 100644 index 8bc1560582eb.. --- a/net-misc/turbovnc/turbovnc-3.0.3.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_OPT_USE=viewer -inherit cmake desktop java-pkg-opt-2 verify-
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/
commit: 943649c2a1b2f0cb06d0e521710b29a82b4d8aab Author: Viorel Munteanu gentoo org> AuthorDate: Wed Aug 2 17:03:53 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Wed Aug 2 17:07:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943649c2 net-misc/turbovnc: add 3.0.90 This is a prerelease, sourceforge 3.0.90 is git 3.1 beta1. Commit unkeyworded. Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 2 + .../turbovnc-3.0.90-fix-musl-compilation.patch | 20 +++ net-misc/turbovnc/turbovnc-3.0.90.ebuild | 141 + 3 files changed, 163 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index cba3cdb710ad..607fd79cb7ce 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,2 +1,4 @@ DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 +DIST turbovnc-3.0.90.tar.gz 9028660 BLAKE2B 3c4b67894a3cc1f855018932c2b03ea3efbcb38af8eaeed86f95bdb21605e64c87ff6d51652bfedd1520b89040e97a11e3bf2f117bc78f9225fb56f4f7687795 SHA512 f3eff5109bd33fc8ded1ed5eab4df5537ea56c71c7fcf7fb471f9ac4e77a04fcde588423885cf781f2bbd2be4f25b2959e20b71df1d0de465d26910018ccd899 +DIST turbovnc-3.0.90.tar.gz.sig 543 BLAKE2B 60cd24db3b5338230bba0ead18f1f0e784fcd6bc9eef10a01edd17a9c3cee2a611f77db46f9e3b3bb1f70cb25a3ed829d0dae0a568dd68ec514cd6c954eda4f3 SHA512 1fe886fb5118d5a1cfbba1a9cbb7960a08b3dfcb5ec3bd36a10c4c0f0dd5acf47dba8a83fb9cb8db07c8b91a046077c23b67e85115c91cdf55283beb457d38d9 diff --git a/net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch new file mode 100644 index ..2ad9db5117ae --- /dev/null +++ b/net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch @@ -0,0 +1,20 @@ +See bug https://bugs.gentoo.org/836723 + +The error is this: + +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds': +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known + 1178 | struct ucred peercred; + | ^~~~ + +--- a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt +@@ -1,7 +1,7 @@ + include_directories(../render ../../../lib/libsha1) + + add_definitions(-DUNIXCONN -DTCPCONN -DHASXDMAUTH ${ServerOSDefines} -DXDMCP +- -DHAVE_SHA1_IN_LIBSHA1) ++ -DHAVE_SHA1_IN_LIBSHA1 -D_GNU_SOURCE) + if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") + # This is already defined for Linux + add_definitions(-DHAVE_ABSTRACT_SOCKETS) diff --git a/net-misc/turbovnc/turbovnc-3.0.90.ebuild b/net-misc/turbovnc/turbovnc-3.0.90.ebuild new file mode 100644 index ..81c62a2918f2 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.0.90.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 verify-sig + +MY_PV="3.0.90%20%283.1%20beta1%29" + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/"; +SRC_URI=" + https://sourceforge.net/projects/turbovnc/files/${MY_PV}/${P}.tar.gz/download -> ${P}.tar.gz + verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${MY_PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jr
[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/
commit: 69d36da667d64f0e868818104b9e7a72c0e39ff7 Author: Viorel Munteanu gentoo org> AuthorDate: Sat Jul 1 04:07:12 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sat Jul 1 04:08:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d36da6 net-misc/turbovnc: keyword 3.0.3 for ~x86 Signed-off-by: Viorel Munteanu gentoo.org> .../files/turbovnc-3.0-fix-musl-compilation.patch | 4 ++-- .../files/turbovnc-3.0.3-java-launcher-32-bit.patch | 15 +++ net-misc/turbovnc/turbovnc-3.0.3.ebuild | 7 +-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch index d96b7bc1ca28..0769f00ffa56 100644 --- a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch +++ b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch @@ -7,8 +7,8 @@ The error is this: 1178 | struct ucred peercred; | ^~~~ ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt~2022-06-12 15:41:05.980270914 +0300 -+++ ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt 2022-06-12 15:43:14.113823213 +0300 +--- a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(../render ../../../lib/libsha1) diff --git a/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch b/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch new file mode 100644 index ..a94c76ddfd24 --- /dev/null +++ b/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch @@ -0,0 +1,15 @@ +Jdk 8 does not need -d32 +Jdk 11+ doesn't recognize it at all, so the viewer doesn't start on x86 + +--- 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/net-misc/turbovnc/turbovnc-3.0.3.ebuild b/net-misc/turbovnc/turbovnc-3.0.3.ebuild index 7cd8e44d220b..2175f83cbc8c 100644 --- a/net-misc/turbovnc/turbovnc-3.0.3.ebuild +++ b/net-misc/turbovnc/turbovnc-3.0.3.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="+server +ssl +viewer" REQUIRED_USE="|| ( server viewer )" @@ -66,7 +66,10 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) " -PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) +PATCHES=( + "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch + "${FILESDIR}"/"${PN}"-3.0.3-java-launcher-32-bit.patch +) VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc