Hi Ola, Am 30.06.19 um 19:04 schrieb Ola Lundqvist: > Hi > > It is too late for buster. Deadline has passed more than a week ago. If I had > been faster maybe it had been possible. > > Maybe we can get it to a point release. Do you know how much changes there > are between 1.9.0+dfsg-3 and the one you mentioned? > It seems to fall in the criteria to fix regression against current stable. should fit. Debdiff attached. There are three minor bugs fixed 929410, 932264, and 905905. Only code change is a different WM_CLASS for xtigervncviewer. Moreover, xrandr libraries are now enabled. Thus, additional code will be active in x0tigervncserver.
Best, Joachim
diff -Nru tigervnc-1.9.0+dfsg/debian/changelog tigervnc-1.9.0+dfsg/debian/changelog
--- tigervnc-1.9.0+dfsg/debian/changelog 2018-12-01 22:51:29.000000000 +0100
+++ tigervnc-1.9.0+dfsg/debian/changelog 2019-07-18 17:59:04.000000000 +0200
@@ -1,3 +1,16 @@
+tigervnc (1.9.0+dfsg-4~RC3) UNRELEASED; urgency=medium
+
+ [ Joachim Falk ]
+ * Fix gnome shell integration of xtigervncviewer by updating
+ xtigervncviewer.desktop and WM_CLASS of xtigervncviewer. (Closes: #905905)
+ * Added missing dependencies to enable RANDR support in x0tigervncserver,
+ i.e., tigervnc-scraping-server. Also ensure that dropping these
+ dependencies will lead to a fatal build error in the future. (Closes: #929410)
+ * Bumped version number in Debian provided man pages to TigerVNC 1.9
+ (Closes: #932264).
+
+ -- Joachim Falk <joachim.f...@gmx.de> Thu, 18 Jul 2019 17:57:33 +0200
+
tigervnc (1.9.0+dfsg-3) unstable; urgency=medium
[ Joachim Falk ]
diff -Nru tigervnc-1.9.0+dfsg/debian/control tigervnc-1.9.0+dfsg/debian/control
--- tigervnc-1.9.0+dfsg/debian/control 2018-12-01 22:51:29.000000000 +0100
+++ tigervnc-1.9.0+dfsg/debian/control 2019-06-15 20:50:33.000000000 +0200
@@ -24,6 +24,7 @@
libpam0g-dev,
libxft-dev,
libxcursor-dev,
+ libxrandr-dev,
libwrap0-dev,
libfltk1.3-dev (>= 1.3.3),
xorg-server-source (>= 2:1.20),
diff -Nru tigervnc-1.9.0+dfsg/debian/helpers/usr/share/man/man1/tigervncserver.1 tigervnc-1.9.0+dfsg/debian/helpers/usr/share/man/man1/tigervncserver.1
--- tigervnc-1.9.0+dfsg/debian/helpers/usr/share/man/man1/tigervncserver.1 2018-12-01 22:50:28.000000000 +0100
+++ tigervnc-1.9.0+dfsg/debian/helpers/usr/share/man/man1/tigervncserver.1 2019-07-18 17:53:14.000000000 +0200
@@ -1,4 +1,4 @@
-.TH tigervncserver 1 "Jan 5th, 2017" "TigerVNC 1.7" "Virtual Network Computing"
+.TH tigervncserver 1 "Jul 18th, 2019" "TigerVNC 1.9" "Virtual Network Computing"
.SH NAME
tigervncserver \- start or stop a TigerVNC server
.SH SYNOPSIS
diff -Nru tigervnc-1.9.0+dfsg/debian/helpers/usr/share/man/man5/vnc.conf.5x tigervnc-1.9.0+dfsg/debian/helpers/usr/share/man/man5/vnc.conf.5x
--- tigervnc-1.9.0+dfsg/debian/helpers/usr/share/man/man5/vnc.conf.5x 2018-12-01 22:50:28.000000000 +0100
+++ tigervnc-1.9.0+dfsg/debian/helpers/usr/share/man/man5/vnc.conf.5x 2019-07-18 17:52:52.000000000 +0200
@@ -9,7 +9,7 @@
.\" License as specified in the file COPYING that comes with the
.\" Debian GNU/Linux distribution.
.\"
-.TH vnc.conf 5x "Jan 5th, 2017" "TigerVNC 1.7" "Virtual Network Computing"
+.TH vnc.conf 5x "Jul 18th, 2019" "TigerVNC 1.9" "Virtual Network Computing"
.SH NAME
vnc.conf \- configuration file for Virtual Network Computing
.SH SYNOPSIS
diff -Nru tigervnc-1.9.0+dfsg/debian/patches/0175-xtigervncviewer-WM_CLASS.patch tigervnc-1.9.0+dfsg/debian/patches/0175-xtigervncviewer-WM_CLASS.patch
--- tigervnc-1.9.0+dfsg/debian/patches/0175-xtigervncviewer-WM_CLASS.patch 1970-01-01 01:00:00.000000000 +0100
+++ tigervnc-1.9.0+dfsg/debian/patches/0175-xtigervncviewer-WM_CLASS.patch 2019-06-15 14:11:27.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Update WM_CLASS to correspond to the one given in the xtigervncviewer.desktop file
+Author: Joachim Falk
+
+Index: pkg-tigervnc/vncviewer/vncviewer.cxx
+===================================================================
+--- pkg-tigervnc.orig/vncviewer/vncviewer.cxx
++++ pkg-tigervnc/vncviewer/vncviewer.cxx
+@@ -197,7 +197,7 @@ static void init_fltk()
+
+ // Proper Gnome Shell integration requires that we set a sensible
+ // WM_CLASS for the window.
+- Fl_Window::default_xclass("vncviewer");
++ Fl_Window::default_xclass("TigerVNC Viewer");
+
+ // Set the default icon for all windows.
+ #ifdef WIN32
diff -Nru tigervnc-1.9.0+dfsg/debian/patches/series tigervnc-1.9.0+dfsg/debian/patches/series
--- tigervnc-1.9.0+dfsg/debian/patches/series 2018-12-01 22:51:29.000000000 +0100
+++ tigervnc-1.9.0+dfsg/debian/patches/series 2019-06-15 14:11:27.000000000 +0200
@@ -1,5 +1,6 @@
0102-fix-spelling-error-in-manpages-to-shutup-lintian.patch
0151-make-cmake-enable-options-mandatory-if-turned-on.patch
+0175-xtigervncviewer-WM_CLASS.patch
# rework/0200-add-tcpwrappers-support.patch # This patch is still not ported
# These patches are lifted from RedHat
@@ -16,6 +17,7 @@
#rh/dustbin/tigervnc-xserver119.patch # buster has xserver120 and TigerVNC 1.9 comes with official support for it
find-fltk-libs.diff
+x0vncserver-build-make-missing-libraries-fatal-errors.diff
fix-linking.diff
#dustbin/tigervnc11-gethomedir.patch does not apply cleanly and no longer needed for TigerVNC 1.8
diff -Nru tigervnc-1.9.0+dfsg/debian/patches/x0vncserver-build-make-missing-libraries-fatal-errors.diff tigervnc-1.9.0+dfsg/debian/patches/x0vncserver-build-make-missing-libraries-fatal-errors.diff
--- tigervnc-1.9.0+dfsg/debian/patches/x0vncserver-build-make-missing-libraries-fatal-errors.diff 1970-01-01 01:00:00.000000000 +0100
+++ tigervnc-1.9.0+dfsg/debian/patches/x0vncserver-build-make-missing-libraries-fatal-errors.diff 2019-06-15 14:11:27.000000000 +0200
@@ -0,0 +1,40 @@
+Description: Ensure that missing optional libraries for the build of x0vncserver are now fatal build errors.
+Author: Joachim Falk <joachim.f...@gmx.de>
+
+Index: pkg-tigervnc/unix/x0vncserver/CMakeLists.txt
+===================================================================
+--- pkg-tigervnc/unix/x0vncserver/CMakeLists.txt.orig 2019-06-15 13:15:24.325682003 +0200
++++ pkg-tigervnc/unix/x0vncserver/CMakeLists.txt 2019-06-15 13:16:03.301580417 +0200
+@@ -26,28 +26,28 @@
+ add_definitions(-DHAVE_XTEST)
+ target_link_libraries(x0vncserver ${X11_XTest_LIB})
+ else()
+- message(WARNING "No XTest extension. x0vncserver will be view-only.")
++ message(FATAL_ERROR "No XTest extension. x0vncserver will be view-only.")
+ endif()
+
+ if(X11_FOUND AND X11_Xdamage_LIB)
+ add_definitions(-DHAVE_XDAMAGE)
+ target_link_libraries(x0vncserver ${X11_Xdamage_LIB})
+ else()
+- message(WARNING "No DAMAGE extension. x0vncserver will have to use the slower polling method.")
++ message(FATAL_ERROR "No DAMAGE extension. x0vncserver will have to use the slower polling method.")
+ endif()
+
+ if(X11_FOUND AND X11_Xfixes_LIB)
+ add_definitions(-DHAVE_XFIXES)
+ target_link_libraries(x0vncserver ${X11_Xfixes_LIB})
+ else()
+- message(WARNING "No XFIXES extension. x0vncserver will not be able to show cursors.")
++ message(FATAL_ERROR "No XFIXES extension. x0vncserver will not be able to show cursors.")
+ endif()
+
+ if(X11_FOUND AND X11_Xrandr_LIB)
+ add_definitions(-DHAVE_XRANDR)
+ target_link_libraries(x0vncserver ${X11_Xrandr_LIB})
+ else()
+- message(WARNING "No Xrandr extension. x0vncserver will not be able to resize session.")
++ message(FATAL_ERROR "No Xrandr extension. x0vncserver will not be able to resize session.")
+ endif()
+
+ target_link_libraries(x0vncserver ${X11_LIBRARIES})
diff -Nru tigervnc-1.9.0+dfsg/debian/xtigervncviewer.desktop tigervnc-1.9.0+dfsg/debian/xtigervncviewer.desktop
--- tigervnc-1.9.0+dfsg/debian/xtigervncviewer.desktop 2018-12-01 22:50:28.000000000 +0100
+++ tigervnc-1.9.0+dfsg/debian/xtigervncviewer.desktop 2019-06-15 14:11:27.000000000 +0200
@@ -2,10 +2,11 @@
Version=1.0
Name=TigerVNC Viewer
GenericName=Remote Desktop Client
-Comment=Connect to a remote VNC desktop
+Comment=Connect to VNC server and display remote desktop
Keywords=remote desktop;vnc;
-Categories=Network;
Exec=/usr/bin/xtigervncviewer
Icon=tigervnc
-Terminal=false
Type=Application
+StartupWMClass=TigerVNC Viewer
+Categories=Network;RemoteAccess;
+Terminal=false
signature.asc
Description: OpenPGP digital signature
