[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2023-08-03 Thread Viorel Munteanu 
commit: 711be43f5a8d4ad3aa3b20f0734cd74c1b0b4251
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Thu Aug  3 05:59:40 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Aug  3 05:59:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711be43f

net-misc/tigervnc: drop 1.13.1-r2

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/files/tigervnc-1.12.0.confd |  15 --
 net-misc/tigervnc/files/tigervnc-1.12.0.initd |  72 
 net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild   | 228 --
 3 files changed, 315 deletions(-)

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.confd 
b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
deleted file mode 100644
index d03da01660be..
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Config file for /etc/init.d/tigervnc
-
-# Specify the user(s) Xvnc(1) should be run for. The syntax is: 
"username:display".
-# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by 
space.
-# DISPLAYS="myuser:1"
-# Do not forget to add them to /etc/tigervnc/vncserver.users too
-
-# Optionally override the default Xsession file
-# TIGERVNC_XSESSION_FILE="/usr/share/sddm/scripts/Xsession"
-# TIGERVNC_XSESSION_FILE="/etc/gdm/Xsession"
-# TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession"
-# TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession"
-
-# vncsession no longer supports VNC_OPTS
-# Use /etc/tigervnc/vncserver-config-defaults or $HOME/.vnc/config instead

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.initd 
b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
deleted file mode 100644
index 187b3c7296b4..
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.initd
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-# shellcheck shell=sh
-
-depend() {
-   need net
-}
-
-checkconfig() {
-   if [ -n "${DISPLAYS}" ]; then
-   if [ "$1" = "start" ]; then
-   for user in $DISPLAYS; do
-   # bug #690046
-   if ! runuser -l "${user%%:*}" -c "[ -f 
~/.vnc/passwd ]"; then
-   eerror "There are no passwords defined 
for user ${user%%:*}."
-   return 1
-   elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
-   eerror "Display :${user##*:} appears to 
be already in use because of /tmp/.X11-unix/X${user##*:}"
-   eerror "Remove this file if there is no 
X server for :${user##*:}"
-   return 1
-   elif [ -e "/tmp/.X${user##*:}-lock" ]; then
-   eerror "Display :${user##*:} appears to 
be already in use because of /tmp/.X${user##*:}-lock"
-   eerror "Remove this file if there is no 
X server for :${user##*:}"
-   return 1
-   elif ! grep -E "^[^#]*:${user##*:}=${user%%:*}" 
/etc/tigervnc/vncserver.users > /dev/null 2>&1; then
-   eerror "User ${user%%:*} is not defined 
for display :${user##*:} in /etc/tigervnc/vncserver.users"
-   return 1
-   fi
-   done
-   fi
-   return 0
-   else
-   # here it is intended for $DISPLAYS to not expand
-   # shellcheck disable=SC2016
-   eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc'
-   return 1
-   fi
-}
-
-start() {
-   checkconfig start || return 1
-   ebegin "Starting TigerVNC server"
-   for user in $DISPLAYS; do
-   [ -n "${TIGERVNC_XSESSION_FILE}" ] && export 
TIGERVNC_XSESSION_FILE
-   /usr/libexec/vncsession-start ":${user##*:}" >/dev/null 2>&1
-   done
-   eend $?
-}
-
-stop() {
-   checkconfig stop || return 2
-   ebegin "Stopping TigerVNC server"
-   for user in $DISPLAYS; do
-   # vncserver no longer provides a `-kill` option
-   # killing vncsession does not work, we have to kill Xvnc
-   # run pstree to see exactly what's going on
-   sessionpid=$(cat /run/vncsession-:"${user##*:}".pid)
-   serverpid=$(pstree -p "$sessionpid" | grep Xvnc | sed -e 
's/^.*Xvnc(//
-   s/).*$//')
-   kill "$serverpid" >/dev/null 2>&1
-   done
-   # Do not fail if a server is missing
-   /bin/true
-   eend $?
-}
-
-restart() {
-svc_stop
-svc_start
-}

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild
deleted file

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2023-06-24 Thread Viorel Munteanu 
commit: 8c9e7c2263068ab5d074c7652431e7952ccf7eba
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Jun  2 17:09:34 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sat Jun 24 09:02:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c9e7c22

net-misc/tigervnc: one service per display

Change configuration for openrc users.

Currently, it has 3 drawbacks:
- the sessions must be defined in 2 places
- if a display crashes, it cannot be restarted without stopping all of
  them
- openrc only keeps track of the last display started, so if any other
  display crashes, it will not show as crashed.

The first issue is solved by no longer using DISPLAYS fron conf.d, and
parsing /etc/tigervnc/vncserver.users directly.

The other two by switching to a one service per display model.

Closes: https://github.com/gentoo/gentoo/pull/31277
Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/files/tigervnc-1.13.1.confd  | 13 
 net-misc/tigervnc/files/tigervnc-1.13.1.initd  | 88 ++
 ...ervnc-.ebuild => tigervnc-1.13.1-r3.ebuild} | 14 ++--
 net-misc/tigervnc/tigervnc-.ebuild | 11 ++-
 4 files changed, 114 insertions(+), 12 deletions(-)

diff --git a/net-misc/tigervnc/files/tigervnc-1.13.1.confd 
b/net-misc/tigervnc/files/tigervnc-1.13.1.confd
new file mode 100644
index ..bb6dae7df032
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.13.1.confd
@@ -0,0 +1,13 @@
+# Config file for /etc/init.d/tigervnc
+
+# Add the user(s) Xvnc(1) should be run for to /etc/tigervnc/vncserver.users
+# DISPLAYS is no loger used.
+
+# Optionally override the default Xsession file
+# TIGERVNC_XSESSION_FILE="/usr/share/sddm/scripts/Xsession"
+# TIGERVNC_XSESSION_FILE="/etc/gdm/Xsession"
+# TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession"
+# TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession"
+
+# vncsession no longer supports VNC_OPTS
+# Use /etc/tigervnc/vncserver-config-defaults or $HOME/.vnc/config instead

diff --git a/net-misc/tigervnc/files/tigervnc-1.13.1.initd 
b/net-misc/tigervnc/files/tigervnc-1.13.1.initd
new file mode 100644
index ..f7e72fa84c07
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.13.1.initd
@@ -0,0 +1,88 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+# shellcheck shell=sh
+
+# Create symlinks for all displays.
+# For example for display :1, run `ln -s tigervnc /etc/init.d/tigervnc.1`
+# Then `rc-update add tigervnc.1 default`
+# For compatibility, /etc/init.d/tigervnc will start all displays.
+
+DISPLAYS=${SVCNAME#*.}
+if [ "$DISPLAYS" = "tigervnc" ]; then
+   should_warn=1
+   DISPLAYS=$(grep -v "^#" /etc/tigervnc/vncserver.users | sed -e 
's/=.*//' -e 's/^://')
+fi
+
+depend() {
+   need net
+}
+
+checkconfig() {
+   if [ -n "${DISPLAYS}" ]; then
+   if [ "$1" = "start" ]; then
+   for display in $DISPLAYS; do
+   user="$(grep "^:${display}" 
/etc/tigervnc/vncserver.users)"
+   user=${user#*=}
+   # bug #690046
+   if [ -z "${user}" ]; then
+   eerror "User is not defined for display 
:${display} in /etc/tigervnc/vncserver.users"
+   return 1
+   elif ! runuser -l "${user}" -c "[ -f 
~/.vnc/passwd ]"; then
+   eerror "There are no passwords defined 
for user ${user}."
+   return 1
+   elif [ -e "/tmp/.X11-unix/X${display}" ]; then
+   eerror "Display :${display} appears to 
be already in use because of /tmp/.X11-unix/X${display}"
+   eerror "Remove this file if there is no 
X server for :${display}"
+   return 1
+   elif [ -e "/tmp/.X${display}-lock" ]; then
+   eerror "Display :${display} appears to 
be already in use because of /tmp/.X${display}-lock"
+   eerror "Remove this file if there is no 
X server for :${display}"
+   return 1
+   fi
+   FREEDISPLAYS="${FREEDISPLAYS} ${display}"
+   done
+   fi
+   return 0
+   else
+   eerror 'There are no displays configured in 
/etc/tigervnc/vncserver.users'
+   return 1
+   fi
+}
+
+checkwarn() {
+   if [ "${should_warn}" = "1" ]; then
+   ewarn 'Running /etc/init.d/tigervnc in compatibility mode'
+   ewarn 'Please migrate to one service per display as detailed 
here:'
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2023-05-03 Thread Viorel Munteanu 
commit: 394d4037791c1c6f62cd84a0a01794295c645948
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed May  3 17:04:33 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed May  3 17:04:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394d4037

net-misc/tigervnc: sync live

Signed-off-by: Viorel Munteanu  gentoo.org>

 .../files/tigervnc-1.13.80-depend-po-files.patch   | 36 --
 net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild|  1 -
 net-misc/tigervnc/tigervnc-.ebuild |  9 +++---
 3 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch 
b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
deleted file mode 100644
index d611ece53fb1..
--- a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Currently the live version does not build because of this dependency.  Remove 
it for now
-
 a/vncviewer/CMakeLists.txt
-+++ b/vncviewer/CMakeLists.txt
-@@ -81,7 +81,6 @@
- --desktop --template vncviewer.desktop.in
- -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
--  ${CMAKE_SOURCE_DIR}/po/*.po
- )
-   elseif(INTLTOOL_MERGE_EXECUTABLE)
- add_custom_command(OUTPUT vncviewer.desktop
-@@ -93,7 +92,6 @@
- -d ${CMAKE_SOURCE_DIR}/po
- vncviewer.desktop.intl vncviewer.desktop
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
--  ${CMAKE_SOURCE_DIR}/po/*.po
- )
-   else()
- add_custom_command(OUTPUT vncviewer.desktop
-@@ -110,7 +108,6 @@
- --xml --template 
${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
- -d ${CMAKE_SOURCE_DIR}/po -o 
org.tigervnc.vncviewer.metainfo.xml
-   DEPENDS 
${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
--  ${CMAKE_SOURCE_DIR}/po/*.po
- )
-   elseif(INTLTOOL_MERGE_EXECUTABLE)
- add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
-@@ -123,7 +120,6 @@
- -x ${CMAKE_SOURCE_DIR}/po
- org.tigervnc.vncviewer.metainfo.xml.intl 
org.tigervnc.vncviewer.metainfo.xml
-   DEPENDS 
${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
--  ${CMAKE_SOURCE_DIR}/po/*.po
- )
-   else()
- add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index 7c3dbedebb53..891ae952cf7e 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -103,7 +103,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
-[[ ${PV} == * ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
 
 src_unpack() {
if [[ ${PV} == * ]]; then

diff --git a/net-misc/tigervnc/tigervnc-.ebuild 
b/net-misc/tigervnc/tigervnc-.ebuild
index fc6cb7d77a07..891ae952cf7e 100644
--- a/net-misc/tigervnc/tigervnc-.ebuild
+++ b/net-misc/tigervnc/tigervnc-.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 CMAKE_IN_SOURCE_BUILD=1
 inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 
-XSERVER_VERSION="21.1.1"
+XSERVER_VERSION="21.1.8"
+XSERVER_PATCH_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="https://tigervnc.org;
@@ -71,13 +72,14 @@ COMMON_DEPEND="
)
 "
 RDEPEND="${COMMON_DEPEND}
-   java? ( virtual/jre:1.8 )
+   java? ( >=virtual/jre-1.8:* )
server? (
dev-lang/perl
sys-process/psmisc
)
 "
 DEPEND="${COMMON_DEPEND}
+   java? ( >=virtual/jdk-1.8:* )
drm? ( x11-libs/libdrm )
server? (
media-fonts/font-util
@@ -101,7 +103,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
-[[ ${PV} == * ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
 
 src_unpack() {
if [[ ${PV} == * ]]; then
@@ -121,7 +122,7 @@ src_prepare() {
 
if use server; then
cd unix/xserver || die
-   eapply ../xserver${XSERVER_VERSION}.patch
+   eapply ../xserver${XSERVER_PATCH_VERSION}.patch
eautoreconf
sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
sed -i '/strcmp.*-fakescreenfps/,/^\}/d' os/utils.c || 
die

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2023-03-31 Thread Viorel Munteanu 
commit: ba963608f5e3c998e78040fb92c793341244a697
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Mar 31 07:02:38 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Mar 31 07:03:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba963608

net-misc/tigervnc: drop 1.12.0-r7

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/Manifest |   2 -
 .../tigervnc-1.12.0-disable-server-and-pam.patch   |  57 --
 .../tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch |  55 --
 net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild| 199 -
 4 files changed, 313 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 3d98f06d8bf5..9527ec8e616e 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,5 +1,3 @@
-DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 
690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92
 SHA512 
8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
-DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 
891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad
 SHA512 
a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 
675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d
 SHA512 
55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd986b8d4ac5fc3389c6f9319df16b90be8
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 
3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a
 SHA512 
9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B 
fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79
 SHA512 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git 
a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch 
b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
deleted file mode 100644
index 5ae07007d467..
--- a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-See https://bugs.gentoo.org/852830
-
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -234,6 +234,7 @@
-   add_subdirectory(java)
- endif()
- 
-+option(BUILD_SERVER "Build TigerVNC server" ON)
- option(BUILD_VIEWER "Build TigerVNC viewer" ON)
- if(BUILD_VIEWER)
-   # Check for FLTK
-@@ -276,7 +277,7 @@
- endif()
- 
- # Check for PAM library
--if(UNIX AND NOT APPLE)
-+if(BUILD_SERVER AND UNIX AND NOT APPLE)
-   check_include_files(security/pam_appl.h HAVE_PAM_H)
-   set(CMAKE_REQUIRED_LIBRARIES -lpam)
-   check_function_exists(pam_start HAVE_PAM_START)
-@@ -315,9 +316,6 @@
-   add_subdirectory(media)
- endif()
- 
--add_subdirectory(tests)
--
--
- if(BUILD_VIEWER)
-   add_subdirectory(release)
- endif()
 a/common/rfb/CMakeLists.txt
-+++ b/common/rfb/CMakeLists.txt
-@@ -75,7 +75,7 @@
- 
- set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY} os rdr)
- 
--if(UNIX AND NOT APPLE)
-+if(BUILD_SERVER AND UNIX AND NOT APPLE)
-   set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx
- UnixPasswordValidator.h pam.c pam.h)
-   set(RFB_LIBRARIES ${RFB_LIBRARIES} ${PAM_LIBS})
 a/unix/CMakeLists.txt
-+++ b/unix/CMakeLists.txt
-@@ -1,6 +1,8 @@
- add_subdirectory(tx)
- add_subdirectory(common)
--add_subdirectory(vncconfig)
--add_subdirectory(vncpasswd)
--add_subdirectory(vncserver)
--add_subdirectory(x0vncserver)
-+if(BUILD_SERVER)
-+  add_subdirectory(vncconfig)
-+  add_subdirectory(vncpasswd)
-+  add_subdirectory(vncserver)
-+  add_subdirectory(x0vncserver)
-+endif()

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch 
b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
deleted file mode 100644
index c3e003d328a6..
--- a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://github.com/TigerVNC/tigervnc/commit/736b50d04e1ba965696cd15d456dc2b7fc123150.patch
-https://github.com/TigerVNC/tigervnc/commit/f2577107f7f55382c524d8c738a777e5cdd80f60.patch
-
-From: Joakim Tjernlund 
-Date: Wed, 24 Nov 2021 21:09:36 +0100
-Subject: [PATCH] xorg-version.h: Increase supported Xorg version to 1.21
-
 a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -33,8 +33,8 @@
- #error

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2022-05-13 Thread Sam James 
commit: aabb6b116e78b4e93773e599018811120e5c4ca5
Author: Viorel Munteanu  gmail  com>
AuthorDate: Mon May  9 16:10:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 13 20:03:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabb6b11

net-misc/tigervnc: drop 1.9.0-r2

Bug: https://bugs.gentoo.org/700464
Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25403
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/Manifest |   2 -
 .../files/tigervnc-1.9.0-030_manpages.patch|  55 --
 .../files/tigervnc-1.9.0-055_xstartup.patch|  33 
 net-misc/tigervnc/files/tigervnc.confd |   9 -
 net-misc/tigervnc/files/tigervnc.initd |  72 
 .../files/xserver120-drmfourcc-header.patch|  36 
 net-misc/tigervnc/files/xserver120.patch   |  91 --
 net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 185 -
 8 files changed, 483 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 69a6995f580f..272e2edc7499 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,5 +1,3 @@
 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 
690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92
 SHA512 
8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 
891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad
 SHA512 
a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
-DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 
292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a
 SHA512 
333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
-DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 
34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046
 SHA512 
1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B 
fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79
 SHA512 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch 
b/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
deleted file mode 100644
index 8a30f18d7d92..
--- a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/unix/vncserver b/unix/vncserver
-index 9e7a6ac5..139f9601 100755
 a/unix/vncserver
-+++ b/unix/vncserver
-@@ -684,6 +684,7 @@ sub Usage
-   " [-geometry x]\n".
-   " [-pixelformat rgbNNN|bgrNNN]\n".
-   " [-fp ]\n".
-+  " [-cc ]\n".
-   " [-fg]\n".
-   " [-autokill]\n".
-   " [-noxstartup]\n".
-diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
-index f076565f..05669a42 100644
 a/vncviewer/vncviewer.cxx
-+++ b/vncviewer/vncviewer.cxx
-@@ -352,6 +352,11 @@ static void usage(const char *programName)
-   "   %s [parameters] -listen [port] [parameters]\n"
-   "   %s [parameters] [.tigervnc file]\n",
-   programName, programName, programName);
-+  fprintf(stderr,"\n"
-+"Options:\n\n"
-+"  -display Xdisplay - Specifies the X display for the viewer 
window\n"
-+"  -geometry geometry - Standard X position and sizing 
specification.\n");
-+
-   fprintf(stderr,"\n"
-   "Parameters can be turned on with - or off with -=0\n"
-   "Parameters which take a value can be specified as "
-diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man
-index 729c01d6..07dc58f1 100644
 a/vncviewer/vncviewer.man
-+++ b/vncviewer/vncviewer.man
-@@ -240,6 +240,10 @@ This option specifies the preferred encoding to use from 
one of "Tight", "ZRLE",
- Disable lossy JPEG compression in Tight encoding. Default is off.
- .
- .TP
-+.B \-ImprovedHextile
-+Try harder to compress data (default).
-+.
-+.TP
- .B \-QualityLevel \fIlevel\fP
- JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if
- \fB-AutoSelect\fP is turned on. Default is 8.
-@@ -296,6 +300,11 @@ respectively.
- .B \-AlertOnFatalError
- Display a dialog with

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2022-03-22 Thread Sam James 
commit: f94f6f15314c9a4b161efacb57042744346bc234
Author: Viorel Munteanu  gmail  com>
AuthorDate: Tue Mar 22 07:27:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 22 18:01:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94f6f15

net-misc/tigervnc: Fix the init script

Remove $VNC_OPTS from conf.d
Make init script POSIX compliant

Closes: https://bugs.gentoo.org/835730
Closes: https://bugs.gentoo.org/506522
Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24703
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/files/tigervnc-1.12.0.confd  |  4 ++--
 net-misc/tigervnc/files/tigervnc-1.12.0.initd  | 28 ++
 ...-1.12.0-r2.ebuild => tigervnc-1.12.0-r3.ebuild} |  0
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.confd 
b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
index a65c991eabcc..d03da01660be 100644
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.confd
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
@@ -11,5 +11,5 @@
 # TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession"
 # TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession"
 
-# Specify any of vncserver(1) and Xvnc(1) options. See the respective man 
pages for more information.
-# VNC_OPTS=""
+# vncsession no longer supports VNC_OPTS
+# Use /etc/tigervnc/vncserver-config-defaults or $HOME/.vnc/config instead

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.initd 
b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
index 59da61eed5f7..c27d9c01bd7e 100644
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.initd
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
@@ -2,25 +2,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2 or later
 
+# shellcheck shell=sh
+
 depend() {
need net
 }
 
 checkconfig() {
if [ -n "${DISPLAYS}" ]; then
-   if [ $1 = "start" ]; then
-   local user
+   if [ "$1" = "start" ]; then
for user in $DISPLAYS; do
if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; 
then
eerror "There are no passwords defined 
for user ${user%%:*}."
return 1
elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
eerror "Display :${user##*:} appears to 
be already in use because of /tmp/.X11-unix/X${user##*:}"
-   eerror "Remove this file if there is no 
X server $HOSTNAME:${user##*:}"
+   eerror "Remove this file if there is no 
X server for :${user##*:}"
return 1
elif [ -e "/tmp/.X${user##*:}-lock" ]; then
eerror "Display :${user##*:} appears to 
be already in use because of /tmp/.X${user##*:}-lock"
-   eerror "Remove this file if there is no 
X server $HOSTNAME:${user##*:}"
+   eerror "Remove this file if there is no 
X server for :${user##*:}"
return 1
elif ! grep -E "^[^#]*:${user##*:}=${user%%:*}" 
/etc/tigervnc/vncserver.users > /dev/null 2>&1; then
eerror "User ${user%%:*} is not defined 
for display :${user##*:} in /etc/tigervnc/vncserver.users"
@@ -30,6 +31,8 @@ checkconfig() {
fi
return 0
else
+   # here it is intended for $DISPLAYS to not expand
+   # shellcheck disable=SC2016
eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc'
return 1
fi
@@ -39,15 +42,8 @@ start() {
checkconfig start || return 1
ebegin "Starting TigerVNC server"
for user in $DISPLAYS; do
-   usrname=${user%%:*}
-   usropts=VNC_OPTS_${usrname}
-   usrdisp=${user##*:}
-   usrvar=$usropts"["$usrdisp"]"
-   [ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar}
-
[ -n "${TIGERVNC_XSESSION_FILE}" ] && export 
TIGERVNC_XSESSION_FILE
-
-   /usr/libexec/vncsession-start :${user##*:} $vnc_opts &>/dev/null
+   /usr/libexec/vncsession-start ":${user##*:}" >/dev/null 2>&1
done
eend $?
 }
@@ -59,10 +55,10 @@ stop() {
# vncserver no longer provides a `-kill` option
# killing vncsession does not work, we have to kill Xvnc
# run pstree to see exactly what's going on
-   sessionpid=`cat /run/vncsession-\:${user##*:}.pid`
-   serverpid=`pstree -p $sessionpid | grep Xvnc | sed -e 
's/^.*Xvnc(//
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2021-12-07 Thread Sam James 
commit: 14e8c0f75ccd89f10dca5f83b3991c3bab5c7523
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  7 23:44:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  7 23:45:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e8c0f7

net-misc/tigervnc: fix 1.12.0 for xorg 1.21.1

Add additional patches and apply the right one in the source tree too.

Bug: https://bugs.gentoo.org/746227
Thanks-to: Joakim Tjernlund  infinera.com>
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/Manifest |  1 +
 .../tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch | 55 ++
 ...vnc-1.12.0.ebuild => tigervnc-1.12.0-r1.ebuild} | 15 +++---
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index d58cbabda1a3..004231b045fb 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 
4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac
 SHA512 
262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
+DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 
690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92
 SHA512 
8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 
891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad
 SHA512 
a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 
292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a
 SHA512 
333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 
34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046
 SHA512 
1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch 
b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
new file mode 100644
index ..c3e003d328a6
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
@@ -0,0 +1,55 @@
+https://github.com/TigerVNC/tigervnc/commit/736b50d04e1ba965696cd15d456dc2b7fc123150.patch
+https://github.com/TigerVNC/tigervnc/commit/f2577107f7f55382c524d8c738a777e5cdd80f60.patch
+
+From: Joakim Tjernlund 
+Date: Wed, 24 Nov 2021 21:09:36 +0100
+Subject: [PATCH] xorg-version.h: Increase supported Xorg version to 1.21
+
+--- a/unix/xserver/hw/vnc/xorg-version.h
 b/unix/xserver/hw/vnc/xorg-version.h
+@@ -33,8 +33,8 @@
+ #error "X.Org older than 1.16 is not supported"
+ #endif
+ 
+-#if XORG_AT_LEAST(1, 21, 0)
+-#error "X.Org newer than 1.20 is not supported"
++#if XORG_AT_LEAST(1, 22, 0)
++#error "X.Org newer than 1.21 is not supported"
+ #endif
+ 
+ #endif
+
+From: Joakim Tjernlund 
+Date: Wed, 24 Nov 2021 21:10:56 +0100
+Subject: [PATCH] xvnc: adapt for 1.21
+
+VENDOR_STRING is gone as is DEFAULT_LOG_VERBOSITY
+site.h has been removed and is not needed.
+--- a/unix/xserver/hw/vnc/xvnc.c
 b/unix/xserver/hw/vnc/xvnc.c
+@@ -69,7 +69,6 @@ extern char buildtime[];
+ #undef VENDOR_RELEASE
+ #undef VENDOR_STRING
+ #include "version-config.h"
+-#include "site.h"
+ 
+ #define XVNCVERSION "TigerVNC 1.12.80"
+ #define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others 
(see README.rst)\n" \
+@@ -111,14 +110,13 @@ static Bool Render = TRUE;
+ static Bool displaySpecified = FALSE;
+ static char displayNumStr[16];
+ 
+-static int vncVerbose = DEFAULT_LOG_VERBOSITY;
++static int vncVerbose = 0;
+ 
+ static void
+ vncPrintBanner(void)
+ {
+ ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
+-ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
+-   VENDOR_STRING);
++ErrorF("Underlying X server release %d\n\n", VENDOR_RELEASE);
+ }
+ 
+ static void
+

diff --git a/net-misc/tigervnc/tigervnc-1.12.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
similarity index 88%
rename from net-misc/tigervnc/tigervnc-1.12.0.ebuild
rename to net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
index 3fc099abd296..a00c4d13860f 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
@@ -11,7 +11,10 @@ XSERVER_VERSION="21.1.1"

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2021-09-16 Thread Sam James 
commit: 5b32857aad326b3f495f80c1e529f940ffb4cff0
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 17 02:14:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 17 02:14:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b32857a

net-misc/tigervnc: restore Java viewer in 1.11.x

Thanks-to: Erik Wallin  sizeit.se>
Closes: https://bugs.gentoo.org/769794
Signed-off-by: Sam James  gentoo.org>

 .../tigervnc-1.11.0-install-java-viewer.patch  | 26 ++
 ...-1.11.0-r3.ebuild => tigervnc-1.11.0-r4.ebuild} |  5 +
 2 files changed, 31 insertions(+)

diff --git a/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch 
b/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch
new file mode 100644
index 000..3afaf82d002
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch
@@ -0,0 +1,26 @@
+See bug for rationale, gist is that this is still useful.
+
+Patch from Erik Wallin 
+https://bugs.gentoo.org/769794
+--- a/java/CMakeLists.txt
 b/java/CMakeLists.txt
+@@ -7,6 +7,8 @@
+ 
+ find_package(Java)
+ 
++set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
++
+ set(DEFAULT_JAVACFLAGS "-source 8 -target 8 -encoding UTF-8 
-Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
+ set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING
+   "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})")
+@@ -172,3 +174,10 @@
+ -P ${SRCDIR}/cmake/SignJar.cmake)
+ 
+ add_custom_target(java ALL DEPENDS VncViewer.jar)
++
++if(NOT WIN32)
++  install(FILES
++${BINDIR}/VncViewer.jar
++${SRCDIR}/${CLASSPATH}/README
++DESTINATION ${DATA_DIR}/vnc/classes)
++endif()

diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild 
b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
similarity index 97%
rename from net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild
rename to net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
index 576dcb604f1..34e7e078e37 100644
--- a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
@@ -74,6 +74,11 @@ DEPEND="${CDEPEND}
opengl? ( >=media-libs/mesa-10.3.4-r1 )
)"
 
+PATCHES=(
+   # Restore Java viewer
+   "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+)
+
 src_prepare() {
if use server; then
cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2018-12-15 Thread Matt Turner 
commit: 42c710dc277259d522460ad6d20e153377fd699e
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Dec 15 19:09:14 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Dec 15 19:10:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c710dc

net-misc/tigervnc: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 net-misc/tigervnc/Manifest |   3 -
 net-misc/tigervnc/files/java-utf8.patch|  11 --
 net-misc/tigervnc/files/xserver119.patch   |  95 --
 net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild | 188 ---
 net-misc/tigervnc/tigervnc-1.9.0.ebuild| 196 -
 5 files changed, 493 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 3df4fac3055..255751cae3e 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,5 +1,2 @@
-DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 
5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037
 SHA512 
86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
-DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B 
bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796
 SHA512 
c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 
292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a
 SHA512 
333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
-DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 
34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046
 SHA512 
1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde

diff --git a/net-misc/tigervnc/files/java-utf8.patch 
b/net-misc/tigervnc/files/java-utf8.patch
deleted file mode 100644
index 71bd4503b77..000
--- a/net-misc/tigervnc/files/java-utf8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/java/CMakeLists.txt  2017-10-25 22:26:12.920787580 +0900
-+++ b/java/CMakeLists.txt  2017-10-25 22:27:21.423007891 +0900
-@@ -9,7 +9,7 @@ find_package(Java)
-
- set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
-
--set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 
-Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
-+set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 -encoding UTF-8 
-Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
- set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING
-   "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})")
- message(STATUS "Java compiler flags = ${JAVACFLAGS}")

diff --git a/net-misc/tigervnc/files/xserver119.patch 
b/net-misc/tigervnc/files/xserver119.patch
deleted file mode 100644
index 614f104a4d4..000
--- a/net-misc/tigervnc/files/xserver119.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -up xserver/configure.ac.xserver116-rebased xserver/configure.ac
 xserver/configure.ac.xserver116-rebased2016-09-29 13:14:45.595441590 
+0200
-+++ xserver/configure.ac   2016-09-29 13:14:45.631442006 +0200
-@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
- AC_CONFIG_HEADERS(include/version-config.h)
- 
- AM_PROG_AS
-+AC_PROG_CXX
- AC_PROG_LN_S
- LT_PREREQ([2.2])
- LT_INIT([disable-static win32-dll])
-@@ -1863,6 +1864,10 @@ if test "x$XVFB" = xyes; then
-   AC_SUBST([XVFB_SYS_LIBS])
- fi
- 
-+dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB 
$RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB 
$MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB 
$XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
- 
- dnl Xnest DDX
- 
-@@ -1898,6 +1903,8 @@ if test "x$XORG" = xauto; then
- fi
- AC_MSG_RESULT([$XORG])
- 
-+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg 
version])
-+
- if test "x$XORG" = xyes; then
-   XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 
-I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
-   XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2018-07-23 Thread Tony Vroon 
commit: da4a46a43b19ab5483c93d45b20b9f0384d3cbc7
Author: Tact Yoshida  gmail  com>
AuthorDate: Thu Jul 19 03:13:11 2018 +
Commit: Tony Vroon  gentoo  org>
CommitDate: Mon Jul 23 08:46:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4a46a4

net-misc/tigervnc: Version bump to 1.9.0

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9275

 net-misc/tigervnc/Manifest |   2 +
 .../files/tigervnc-1.9.0-030_manpages.patch|  55 ++
 .../files/tigervnc-1.9.0-055_xstartup.patch|  33 
 .../files/xserver120-drmfourcc-header.patch|  36 
 net-misc/tigervnc/files/xserver120.patch   |  91 ++
 net-misc/tigervnc/metadata.xml |  20 +--
 net-misc/tigervnc/tigervnc-1.9.0.ebuild| 196 +
 7 files changed, 423 insertions(+), 10 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 95da57ad284..3df4fac3055 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,3 +1,5 @@
 DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 
5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037
 SHA512 
86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
 DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B 
bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796
 SHA512 
c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
+DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 
292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a
 SHA512 
333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
+DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 
34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046
 SHA512 
1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde

diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch 
b/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
new file mode 100644
index 000..8a30f18d7d9
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
@@ -0,0 +1,55 @@
+diff --git a/unix/vncserver b/unix/vncserver
+index 9e7a6ac5..139f9601 100755
+--- a/unix/vncserver
 b/unix/vncserver
+@@ -684,6 +684,7 @@ sub Usage
+   " [-geometry x]\n".
+   " [-pixelformat rgbNNN|bgrNNN]\n".
+   " [-fp ]\n".
++  " [-cc ]\n".
+   " [-fg]\n".
+   " [-autokill]\n".
+   " [-noxstartup]\n".
+diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
+index f076565f..05669a42 100644
+--- a/vncviewer/vncviewer.cxx
 b/vncviewer/vncviewer.cxx
+@@ -352,6 +352,11 @@ static void usage(const char *programName)
+   "   %s [parameters] -listen [port] [parameters]\n"
+   "   %s [parameters] [.tigervnc file]\n",
+   programName, programName, programName);
++  fprintf(stderr,"\n"
++"Options:\n\n"
++"  -display Xdisplay - Specifies the X display for the viewer 
window\n"
++"  -geometry geometry - Standard X position and sizing 
specification.\n");
++
+   fprintf(stderr,"\n"
+   "Parameters can be turned on with - or off with -=0\n"
+   "Parameters which take a value can be specified as "
+diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man
+index 729c01d6..07dc58f1 100644
+--- a/vncviewer/vncviewer.man
 b/vncviewer/vncviewer.man
+@@ -240,6 +240,10 @@ This option specifies the preferred encoding to use from 
one of "Tight", "ZRLE",
+ Disable lossy JPEG compression in Tight encoding. Default is off.
+ .
+ .TP
++.B \-ImprovedHextile
++Try harder to compress data (default).
++.
++.TP
+ .B \-QualityLevel \fIlevel\fP
+ JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if
+ \fB-AutoSelect\fP is turned on. Default is 8.
+@@ -296,6 +300,11 @@ respectively.
+ .B \-AlertOnFatalError
+ Display a dialog with any fatal error before exiting. Default is on.
+ 
++.
++.TP
++.B \-ZlibLevel
++Zlib compression level.
++
+ .SH FILES
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2017-11-27 Thread Alice Ferrazzi 
commit: 9bd3d07890af7ef0cb3ca1a6e9f952e4bd865fd7
Author: Takuto Yoshida  gmail  com>
AuthorDate: Mon Nov 27 13:57:48 2017 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Mon Nov 27 15:56:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd3d078

net-misc/tigervnc: remove 1.7.1

Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6316

 net-misc/tigervnc/Manifest |   6 +-
 .../files/tigervnc-1.7.1-xserver119-compat.patch   | 446 -
 net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild | 189 -
 net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild | 192 -
 4 files changed, 2 insertions(+), 831 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index d6166e3e13d..b2eb9321a90 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,5 +1,3 @@
-DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 
21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 
86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
 WHIRLPOOL 
97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
-DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 
3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc SHA512 
babdc362b28d7af80c7efbb3a1aadf158d7f29621afe36d785748af45e515e2718cf1011359db7b39c218770b3f3ee2767e08abc58091f018c08ba9739a3e68d
 WHIRLPOOL 
178d6b3fb7569cfb2de5dd144031b441b02a865574928d20f1589fd6f933b9276477292182cde56e948ab75d2fc0bea4d79f71bcddb33f6057970a7caa08b2cc
-DIST tigervnc-1.8.0.tar.gz 1433830 SHA256 
9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8 SHA512 
c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 WHIRLPOOL 
4001182ec2da3551b0eb2d6ee863c225340b474dc6d32cbe4c0941e421852a10913ee80706009b1a59043b6983ac2bc42f070d1a5aa97eefe1cff3c97497b2f0
-DIST tigervnc.png 4958 SHA256 
e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 
97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b
 WHIRLPOOL 
bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
+DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 
5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037
 SHA512 
86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
+DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B 
bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796
 SHA512 
c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 
1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c
 SHA512 
37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7

diff --git a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch 
b/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
deleted file mode 100644
index 192344257a5..000
--- a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
+++ /dev/null
@@ -1,446 +0,0 @@
-From 3fed95eda27dfbeee6535f987f5d14a66f64749b Mon Sep 17 00:00:00 2001
-From: Hans de Goede 
-Date: Wed, 5 Oct 2016 11:15:27 +0200
-Subject: [PATCH] Add xorg-xserver 1.19 support
-

- unix/xserver/hw/vnc/XserverDesktop.cc | 183 ++
- unix/xserver/hw/vnc/XserverDesktop.h  |   7 ++
- unix/xserver/hw/vnc/vncBlockHandler.c |  19 
- unix/xserver/hw/vnc/vncExtInit.cc |  13 +++
- unix/xserver/hw/vnc/vncExtInit.h  |   5 +
- unix/xserver/hw/vnc/vncHooks.c|  21 +++-
- unix/xserver/hw/vnc/xorg-version.h|   4 +-
- unix/xserver119.patch |  95 ++
- 8 files changed, 343 insertions(+), 4 deletions(-)
- create mode 100644 unix/xserver119.patch
-
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc 
b/unix/xserver/hw/vnc/XserverDesktop.cc
-index 4f82a54..8cc0b0b 100644
 a/unix/xserver/hw/vnc/XserverDesktop.cc
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
-@@ -90,6 +90,30 @@ class FileHTTPServer : public rfb::HTTPServer {
-   XserverDesktop* desktop;
- };
- 
-+#if XORG >= 119
-+extern "C" {
-+/*
-+ * xserver NotifyFd callbacks. Note we also expect write notifies to work,
-+ * which only works with xserver >= 1.19.
-+ */
-+#include "os.h"
-+

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2017-03-02 Thread Michael Palimaka 
commit: 5d6997c802d49ff00baf4b191b9e1b9e7f06660f
Author: Bruno Henc  protonmail  ch>
AuthorDate: Sun Feb 19 22:11:55 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Mar  2 11:12:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d6997c8

net-misc/tigervnc: add xorg-server-1.19 support

The latest release of tigervnc (1.7.1) doesn't
support xorg-server-1.19. Backporting a patch
and commit from the main trunk allows one to
build tigervnc-1.7.1 with the server use flag
for xorg-server-1.19.

The ebuild is tested to be building and performing
correctly with LXDE and GNOME on a localhost.
However, I recommend backporting other changes as
well to fix possible issues with xorg-server-1.19.

Since TigerVNC releases aren't as frequent,
backporting might be worth the effort.

Gentoo-bug: 603424

 net-misc/tigervnc/Manifest |   1 +
 .../files/tigervnc-1.7.1-xserver119-compat.patch   | 446 +
 net-misc/tigervnc/files/xserver119.patch   |  95 +
 net-misc/tigervnc/tigervnc-1.7.1-r1.ebuild | 188 +
 4 files changed, 730 insertions(+)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index f6a0feedd6c..06e4ed53d1f 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -2,3 +2,4 @@ DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 
21c77708d303192108ffeef02acc
 DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 
3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc SHA512 
babdc362b28d7af80c7efbb3a1aadf158d7f29621afe36d785748af45e515e2718cf1011359db7b39c218770b3f3ee2767e08abc58091f018c08ba9739a3e68d
 WHIRLPOOL 
178d6b3fb7569cfb2de5dd144031b441b02a865574928d20f1589fd6f933b9276477292182cde56e948ab75d2fc0bea4d79f71bcddb33f6057970a7caa08b2cc
 DIST tigervnc.png 4958 SHA256 
e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 
97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b
 WHIRLPOOL 
bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
 DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 
278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 
2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 WHIRLPOOL 
f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
+DIST xorg-server-1.19.1.tar.bz2 6041792 SHA256 
79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb SHA512 
37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
 WHIRLPOOL 
9fab4118e866e11a7742ba63d7f681490d43718a329416fb742e268fdf56f348bc9f1f2b5229fbaac98ce78f41fc1e9e5aa7587ee120fcccaba752ff4bac1555

diff --git a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch 
b/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
new file mode 100644
index 000..192344257a5
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
@@ -0,0 +1,446 @@
+From 3fed95eda27dfbeee6535f987f5d14a66f64749b Mon Sep 17 00:00:00 2001
+From: Hans de Goede 
+Date: Wed, 5 Oct 2016 11:15:27 +0200
+Subject: [PATCH] Add xorg-xserver 1.19 support
+
+---
+ unix/xserver/hw/vnc/XserverDesktop.cc | 183 ++
+ unix/xserver/hw/vnc/XserverDesktop.h  |   7 ++
+ unix/xserver/hw/vnc/vncBlockHandler.c |  19 
+ unix/xserver/hw/vnc/vncExtInit.cc |  13 +++
+ unix/xserver/hw/vnc/vncExtInit.h  |   5 +
+ unix/xserver/hw/vnc/vncHooks.c|  21 +++-
+ unix/xserver/hw/vnc/xorg-version.h|   4 +-
+ unix/xserver119.patch |  95 ++
+ 8 files changed, 343 insertions(+), 4 deletions(-)
+ create mode 100644 unix/xserver119.patch
+
+diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc 
b/unix/xserver/hw/vnc/XserverDesktop.cc
+index 4f82a54..8cc0b0b 100644
+--- a/unix/xserver/hw/vnc/XserverDesktop.cc
 b/unix/xserver/hw/vnc/XserverDesktop.cc
+@@ -90,6 +90,30 @@ class FileHTTPServer : public rfb::HTTPServer {
+   XserverDesktop* desktop;
+ };
+ 
++#if XORG >= 119
++extern "C" {
++/*
++ * xserver NotifyFd callbacks. Note we also expect write notifies to work,
++ * which only works with xserver >= 1.19.
++ */
++#include "os.h"
++
++static void HandleListenFd(int fd, int xevents, void *data)
++{
++  XserverDesktop *desktop = (XserverDesktop *)data;
++
++  desktop->handleListenFd(fd);
++}
++
++static void HandleSocketFd(int fd, int xevents, void *data)
++{
++  XserverDesktop *desktop = (XserverDesktop *)data;
++
++  desktop->handleSocketFd(fd, xevents);
++}
++
++}
++#endif
+ 
+ XserverDesktop::XserverDesktop(int screenIndex_,
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2017-01-26 Thread Michael Palimaka 
commit: d0902b3203b95700277805ddd8d18d7fd718b7f4
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jan 26 10:25:42 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jan 26 10:25:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0902b32

net-misc/tigervnc: remove 1.4.2-r2

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/tigervnc/Manifest |   2 -
 .../tigervnc/files/tigervnc-1.4.2-byteorder.patch  |  21 ---
 net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild | 201 -
 3 files changed, 224 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 0e5a2ce..5e456b5 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,7 +1,5 @@
 DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 
21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 
86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
 WHIRLPOOL 
97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
-DIST tigervnc-1.4.2.tar.gz 1370453 SHA256 
6cfb33cb2a123dee96ca29d61523391f73c9d49b6cd2fb6522312d01da98866f SHA512 
dcd9b223d0d6646a85b2f28abdf36491d6d735b0738cce0b179d745ca124d8430edd883a7ac7342bf882cf62a02ce8d7058ff9101f17c4310dbbe6bad50cc90f
 WHIRLPOOL 
420dd1f72e1ba0de1796133acf0c35ac1e79bc1533610b927c01993af57eb293a886f57739cca7cf0f1985a269a2ed3cf2345896f59696c8e8dfc68a4b9013e5
 DIST tigervnc-1.6.0.tar.gz 1291089 SHA256 
98ffe98fcfe883e6c35aec579295b53d73d2ccf62e0f6e53a73ecad993b096ca SHA512 
b4f1f5116ad5fe27a168764dd746400474e973d2edb85fbbe67a2459824a7267f2c63d1a2b2fdd2811017216c24a7168712df3afece56f404780d386ad24e135
 WHIRLPOOL 
a848148646f6961ea3131cfef773d6108330a1caaa870921d7acd1759dfbe92569a00c385c0f3a35a939b4a2a0215da825cb72b9c820972cc4bf6ada3b29fbec
 DIST tigervnc-1.7.0.tar.gz 1405952 SHA256 
4aa704747b4f8f1d59768b663c488fa937e6783db2a46ae407cd2a599cfbf8b1 SHA512 
2e673603065ef5cef33fd0e1ab916f5758d29e75ab5fdb18d1cbfacc61f59b85a00c64699d09a91e81de51ccf4006921516d5ea863319bd557fbd378c17ba004
 WHIRLPOOL 
63565060f42e68d6089f4851b56ff121630d63b14db6a82aac0be3e98aea48d33e35732867a57eb64c212fa3d704e35f3005ea4b0165f003c9be9d187556b668
 DIST tigervnc.png 4958 SHA256 
e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 
97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b
 WHIRLPOOL 
bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
-DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 
2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 
195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de2802076844aec552c4f
 WHIRLPOOL 
a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776
 DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 
278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 
2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 WHIRLPOOL 
f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f

diff --git a/net-misc/tigervnc/files/tigervnc-1.4.2-byteorder.patch 
b/net-misc/tigervnc/files/tigervnc-1.4.2-byteorder.patch
deleted file mode 100644
index bd2dc51..
--- a/net-misc/tigervnc/files/tigervnc-1.4.2-byteorder.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 a/include/dix-config.h.in
-+++ b/include/dix-config.h.in
-@@ -3,6 +3,14 @@
- #ifndef _DIX_CONFIG_H_
- #define _DIX_CONFIG_H_
- 
-+#ifndef X_BIG_ENDIAN
-+#  define X_BIG_ENDIAN 4321
-+#endif
-+
-+#ifndef X_LITTLE_ENDIAN
-+#  define X_LITTLE_ENDIAN 1234
-+#endif
-+
- /* Support BigRequests extension */
- #undef BIGREQS
- 
--- 
-2.3.5
-
-

diff --git a/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild 
b/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild
deleted file mode 100644
index 76e4ff2..
--- a/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.17.1"
-OPENGL_DIR="xorg-x11"
-#MY_P="${PN}-1.2.80-20130314svn5065"
-#S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org;
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   mirror://gentoo/${PN}.png
-   mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2017-01-25 Thread Matt Turner 
commit: 05604b3b28504cf0bbb91d95c7d7d2441e2fcd40
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jan 25 06:14:30 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jan 25 18:04:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05604b3b

net-misc/tigervnc: Drop old.

 net-misc/tigervnc/Manifest|   4 -
 net-misc/tigervnc/files/1.3.1-CVE-2014-8240.patch |  78 -
 net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild| 201 --
 net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild| 180 ---
 4 files changed, 463 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 94796da..0e5a2ce 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,11 +1,7 @@
-DIST tigervnc-1.3.1-patches-0.1.tar.bz2 16016 SHA256 
5bcaabd8993274a5ce1718efc15fdaf22041003a49a94293eeea9b5b72d3b822 SHA512 
f7afc3e7062976b704802e58bb654e46ded5f9dcf8e089d1633e82ce8f5383b60885158319142ac8a58d4d0cf0c8fb51134124bb2dd00dc38fb441bc079b31d4
 WHIRLPOOL 
33c149415633fe4b0c08cd96c9208c70728acc4b2935835bad1c39037af5aec70c54ad9b98503f6ca93441608e3eef82bc3b17dfcdda97f95ae5dbc41cfcd4a4
-DIST tigervnc-1.3.1.tar.gz 6888105 SHA256 
628622316eefa5d4f348f00a280a513569bfae3eae6a20d72e2990654d12274e SHA512 
28fe61287c4c96b3703055701cb74f7f4cb17392af5201b93fafe5187555710ab4becf110266ea161d26568064435626e85ab7570e1f7f6df2348f1a34d56e8d
 WHIRLPOOL 
35875b230cd4face9a24ae9ff5682c122d7db7a43fe475d9216d30ca9c55409a16788bc6af5e0a2efde3457295f00a3a8f5e29b540477e806be5b0fc30408b99
 DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 
21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 
86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
 WHIRLPOOL 
97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
 DIST tigervnc-1.4.2.tar.gz 1370453 SHA256 
6cfb33cb2a123dee96ca29d61523391f73c9d49b6cd2fb6522312d01da98866f SHA512 
dcd9b223d0d6646a85b2f28abdf36491d6d735b0738cce0b179d745ca124d8430edd883a7ac7342bf882cf62a02ce8d7058ff9101f17c4310dbbe6bad50cc90f
 WHIRLPOOL 
420dd1f72e1ba0de1796133acf0c35ac1e79bc1533610b927c01993af57eb293a886f57739cca7cf0f1985a269a2ed3cf2345896f59696c8e8dfc68a4b9013e5
 DIST tigervnc-1.6.0.tar.gz 1291089 SHA256 
98ffe98fcfe883e6c35aec579295b53d73d2ccf62e0f6e53a73ecad993b096ca SHA512 
b4f1f5116ad5fe27a168764dd746400474e973d2edb85fbbe67a2459824a7267f2c63d1a2b2fdd2811017216c24a7168712df3afece56f404780d386ad24e135
 WHIRLPOOL 
a848148646f6961ea3131cfef773d6108330a1caaa870921d7acd1759dfbe92569a00c385c0f3a35a939b4a2a0215da825cb72b9c820972cc4bf6ada3b29fbec
 DIST tigervnc-1.7.0.tar.gz 1405952 SHA256 
4aa704747b4f8f1d59768b663c488fa937e6783db2a46ae407cd2a599cfbf8b1 SHA512 
2e673603065ef5cef33fd0e1ab916f5758d29e75ab5fdb18d1cbfacc61f59b85a00c64699d09a91e81de51ccf4006921516d5ea863319bd557fbd378c17ba004
 WHIRLPOOL 
63565060f42e68d6089f4851b56ff121630d63b14db6a82aac0be3e98aea48d33e35732867a57eb64c212fa3d704e35f3005ea4b0165f003c9be9d187556b668
 DIST tigervnc.png 4958 SHA256 
e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 
97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b
 WHIRLPOOL 
bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
-DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 
38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 
eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662
 WHIRLPOOL 
bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56
 DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 
2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 
195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de2802076844aec552c4f
 WHIRLPOOL 
a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776
-DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 
195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 
c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768
 WHIRLPOOL 
439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9
 DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 
278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 
2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 WHIRLPOOL

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2016-01-29 Thread Michał Górny 
commit: b3fb052ef05dc1f25302999ae739b188cf0f70a0
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jan 29 15:53:28 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan 29 15:55:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3fb052e

net-misc/tigervnc: Support xorg-server-1.18.0

Support xorg-1.18.0 thanks to LFS patch. Found by Jan Psota.

 net-misc/tigervnc/Manifest |  2 +-
 .../tigervnc/files/tigervnc-1.6.0-xorg118-1.patch  | 38 ++
 ...ervnc-1.6.0.ebuild => tigervnc-1.6.0-r1.ebuild} |  5 +--
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 7f4e2f9..c0c900e 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -9,4 +9,4 @@ DIST xorg-server-1.15.0.tar.bz2 5546579 SHA256 
613b2f2e7ee2a06d2f8e862c836dc70d3
 DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 
38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 
eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662
 WHIRLPOOL 
bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56
 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 
abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 
f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74
 WHIRLPOOL 
63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
 DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 
2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 
195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de2802076844aec552c4f
 WHIRLPOOL 
a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776
-DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 
0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 
4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376
 WHIRLPOOL 
c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab
+DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 
195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 
c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768
 WHIRLPOOL 
439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9

diff --git a/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch 
b/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch
new file mode 100644
index 000..ac92e54
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch
@@ -0,0 +1,38 @@
+Submitted By:Fernando de Oliveira 
+Date:2015-12-25
+Initial Package Version: xorg-server-1.18.0 (for tigervnc-1.6.0)
+Upstream Status: Not Submitted
+Origin:  ArchLinux
+Description: Allow using Xorg-server-1.18.0
+
+
+
+
+
+diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c 
tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c
+--- tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c 2015-07-11 16:00:36.0 
+0300
 tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c   2015-11-25 
19:04:24.278747038 +0300
+@@ -300,6 +300,8 @@
+ #if XORG < 111
+   n = GetKeyboardEvents(eventq, dev, action, kc);
+   enqueueEvents(dev, n);
++#elif XORG > 117
++  QueueKeyboardEvents(dev, action, kc);
+ #else
+   QueueKeyboardEvents(dev, action, kc, NULL);
+ #endif
+diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h 
tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h  2015-07-11 
16:00:36.0 +0300
 tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h2015-11-25 
19:02:47.688751421 +0300
+@@ -48,8 +48,10 @@
+ #define XORG 116
+ #elif XORG_VERSION_CURRENT < ((1 * 1000) + (17 * 10) + (99 * 1000))
+ #define XORG 117
++#elif XORG_VERSION_CURRENT < ((1 * 1000) + (18 * 10) + (99 * 1000))
++#define XORG 118
+ #else
+-#error "X.Org newer than 1.17 is not supported"
++#error "X.Org newer than 1.18 is not supported"
+ #endif
+ 
+ #endif

diff --git a/net-misc/tigervnc/tigervnc-1.6.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild
similarity index 97%
rename from net-misc/tigervnc/tigervnc-1.6.0.ebuild
rename to

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

2016-01-09 Thread Jeroen Roovers 
commit: a07cc68a64452e90916ced64870b11455a898a76
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jan  9 11:44:03 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jan  9 11:44:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07cc68a

net-misc/tigervnc: Fix byte order issues (bug #567568).

Package-Manager: portage-2.2.26

 .../tigervnc/files/tigervnc-1.4.2-byteorder.patch   | 21 +
 net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild  |  1 +
 2 files changed, 22 insertions(+)

diff --git a/net-misc/tigervnc/files/tigervnc-1.4.2-byteorder.patch 
b/net-misc/tigervnc/files/tigervnc-1.4.2-byteorder.patch
new file mode 100644
index 000..bd2dc51
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.4.2-byteorder.patch
@@ -0,0 +1,21 @@
+--- a/include/dix-config.h.in
 b/include/dix-config.h.in
+@@ -3,6 +3,14 @@
+ #ifndef _DIX_CONFIG_H_
+ #define _DIX_CONFIG_H_
+ 
++#ifndef X_BIG_ENDIAN
++#  define X_BIG_ENDIAN 4321
++#endif
++
++#ifndef X_LITTLE_ENDIAN
++#  define X_LITTLE_ENDIAN 1234
++#endif
++
+ /* Support BigRequests extension */
+ #undef BIGREQS
+ 
+-- 
+2.3.5
+
+

diff --git a/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild 
b/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild
index b2a56d1..13675ae 100644
--- a/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild
@@ -114,6 +114,7 @@ src_prepare() {
cd unix/xserver
epatch 
"${WORKDIR}"/patches/1000_server_xserver-1.16-rebased.patch
epatch "${WORKDIR}"/patches/1005_server_xserver-1.17.patch
+   epatch "${FILESDIR}"/tigervnc-1.4.2-byteorder.patch
eautoreconf
fi
 }