rpm/tigervnc
SHA256
1
0
Fork 0
forked from pool/tigervnc
Code Pull Requests Activity

Accepting request 1066027 from home:jtorres:branches:X11:XOrg

Browse Source 
- A little cleanup of specfile
- Update to tigervnc 1.13.0
  * The servers and native viewer now support RealVNC's RSA-AES authentication methods and encryption
  * The native viewer is now translated to Romanian and Georgian
  * The native viewer now (optionally) supports PiKVM's H.264 encoding
  * The display settings for the native viewer have been overhauled to make them easier to understand
  * The native viewer now supports adding exceptions for expired certificates
  * Resolved an issue where full-screen mode didn't work in the native viewer on macOS 13
  * Lock key synchronization has been re-enabled in the native viewer after being accidentally disabled in 1.11.0
  * Xvnc/libvnc.so can now be built with Xorg 1.21
  * x0vncserver is a bit better at handling differing server and client keyboard layout
  * x0vncserver now correctly handles zaphod mode
- Removed patches (no longer needed):
  * tigervnc-newfbsize.patch (https://github.com/TigerVNC/tigervnc/pull/13)
  * n_utilize-system-crypto-policies.patch (https://github.com/TigerVNC/tigervnc/pull/1262)
  * xserver211.patch & u_tigervnc-211.patch (https://github.com/TigerVNC/tigervnc/pull/1383)
- Refreshed patches:
  * n_tigervnc-date-time.patch
  * n_vncserver.patch
  * u_change-button-layout-in-ServerDialog.patch

OBS-URL: https://build.opensuse.org/request/show/1066027
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=241
This commit is contained in:
Joan Torres 2023-02-15 17:41:53 +00:00 committed by Git OBS Bridge
parent 4cf5ee11d5
commit 8996db4473
11 changed files with 95 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
n_tigervnc-date-time.patch
View File

@ -1,48 +1,48 @@
Index: tigervnc-1.12.0/unix/xserver/hw/vnc/buildtime.c
Index: tigervnc-1.13.0/unix/xserver/hw/vnc/buildtime.c
===================================================================
--- tigervnc-1.12.0.orig/unix/xserver/hw/vnc/buildtime.c
+++ tigervnc-1.12.0/unix/xserver/hw/vnc/buildtime.c
--- tigervnc-1.13.0.orig/unix/xserver/hw/vnc/buildtime.c
+++ tigervnc-1.13.0/unix/xserver/hw/vnc/buildtime.c
@@ -15,4 +15,4 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-char buildtime[] = __DATE__ " " __TIME__;
+char buildtime[] = "??? ?? ???? ??:??:??";
Index: tigervnc-1.12.0/unix/vncconfig/buildtime.c
Index: tigervnc-1.13.0/unix/vncconfig/buildtime.c
===================================================================
--- tigervnc-1.12.0.orig/unix/vncconfig/buildtime.c
+++ tigervnc-1.12.0/unix/vncconfig/buildtime.c
--- tigervnc-1.13.0.orig/unix/vncconfig/buildtime.c
+++ tigervnc-1.13.0/unix/vncconfig/buildtime.c
@@ -15,4 +15,4 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-char buildtime[] = __DATE__ " " __TIME__;
+char buildtime[] = "??? ?? ???? ??:??:??";
Index: tigervnc-1.12.0/unix/x0vncserver/buildtime.c
Index: tigervnc-1.13.0/unix/x0vncserver/buildtime.c
===================================================================
--- tigervnc-1.12.0.orig/unix/x0vncserver/buildtime.c
+++ tigervnc-1.12.0/unix/x0vncserver/buildtime.c
--- tigervnc-1.13.0.orig/unix/x0vncserver/buildtime.c
+++ tigervnc-1.13.0/unix/x0vncserver/buildtime.c
@@ -15,4 +15,4 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-char buildtime[] = __DATE__ " " __TIME__;
+char buildtime[] = "??? ?? ???? ??:??:??";
Index: tigervnc-1.12.0/win/winvnc/buildTime.cxx
Index: tigervnc-1.13.0/win/winvnc/buildTime.cxx
===================================================================
--- tigervnc-1.12.0.orig/win/winvnc/buildTime.cxx
+++ tigervnc-1.12.0/win/winvnc/buildTime.cxx
--- tigervnc-1.13.0.orig/win/winvnc/buildTime.cxx
+++ tigervnc-1.13.0/win/winvnc/buildTime.cxx
@@ -15,4 +15,4 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-const char* buildTime = "Built on " __DATE__ " at " __TIME__;
+const char* buildTime = "Built on ??? ?? ???? at ??:??:??";
Index: tigervnc-1.12.0/CMakeLists.txt
Index: tigervnc-1.13.0/CMakeLists.txt
===================================================================
--- tigervnc-1.12.0.orig/CMakeLists.txt
+++ tigervnc-1.12.0/CMakeLists.txt
@@ -44,10 +44,6 @@ if(MSVC)
--- tigervnc-1.13.0.orig/CMakeLists.txt
+++ tigervnc-1.13.0/CMakeLists.txt
@@ -40,10 +40,6 @@ if(MSVC)
message(FATAL_ERROR "TigerVNC cannot be built with Visual Studio. Please use MinGW")
endif()
@ -53,20 +53,19 @@ Index: tigervnc-1.12.0/CMakeLists.txt
# Default to optimised builds instead of debug ones. Our code has no bugs ;)
# (CMake makes it fairly easy to toggle this back to Debug if needed)
if(NOT CMAKE_BUILD_TYPE)
Index: tigervnc-1.12.0/vncviewer/vncviewer.cxx
Index: tigervnc-1.13.0/vncviewer/vncviewer.cxx
===================================================================
--- tigervnc-1.12.0.orig/vncviewer/vncviewer.cxx
+++ tigervnc-1.12.0/vncviewer/vncviewer.cxx
@@ -104,11 +104,9 @@ static const char *about_text()
--- tigervnc-1.13.0.orig/vncviewer/vncviewer.cxx
+++ tigervnc-1.13.0/vncviewer/vncviewer.cxx
@@ -105,10 +105,9 @@ static const char *about_text()
// time.
snprintf(buffer, sizeof(buffer),
_("TigerVNC Viewer %d-bit v%s\n"
_("TigerVNC Viewer v%s\n"
- "Built on: %s\n"
"Copyright (C) 1999-%d TigerVNC Team and many others (see README.rst)\n"
"See https://www.tigervnc.org for information on TigerVNC."),
- (int)sizeof(size_t)*8, PACKAGE_VERSION,
- BUILD_TIMESTAMP, 2021);
+ (int)sizeof(size_t)*8, PACKAGE_VERSION, 2021);
- PACKAGE_VERSION, BUILD_TIMESTAMP, 2022);
+ PACKAGE_VERSION, 2022);
return buffer;
}

13
n_utilize-system-crypto-policies.patch
View File

@ -1,13 +0,0 @@
Index: tigervnc-1.12.0/common/rfb/Security.cxx
===================================================================
--- tigervnc-1.12.0.orig/common/rfb/Security.cxx
+++ tigervnc-1.12.0/common/rfb/Security.cxx
@@ -52,7 +52,7 @@ static LogWriter vlog("Security");
#ifdef HAVE_GNUTLS
StringParameter Security::GnuTLSPriority("GnuTLSPriority",
"GnuTLS priority string that controls the TLS session’s handshake algorithms",
- "");
+ "@SYSTEM");
#endif
Security::Security()

14
n_vncserver.patch
View File

@ -1,6 +1,14 @@
--- unix/vncserver/vncserver.in.orig 2022-02-17 15:06:23.333514000 +0100
+++ unix/vncserver/vncserver.in 2022-02-17 15:07:43.597755000 +0100
@@ -437,7 +437,7 @@
Index: unix/vncserver/vncserver.in
===================================================================
--- unix/vncserver/vncserver.in.orig
+++ unix/vncserver/vncserver.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
#
# Copyright (C) 2015-2019 Pierre Ossman for Cendio AB
# Copyright (C) 2009-2010 D. R. Commander. All Rights Reserved.
@@ -439,7 +439,7 @@ sub SanityCheck
die "$prog: couldn't find \"$cmd\" on your PATH.\n";
}

3
tigervnc-1.12.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ff3f3948f2a4e8cc06ee598ee4b1096beb62094c13e0b1462bff78587bed789
size 1561898

3
tigervnc-1.13.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:770e272f5fcd265a7c518f9a38b3bece1cf91e0f4e5e8d01f095b5e58c6f9c40
size 1986759

13
tigervnc-newfbsize.patch
View File

@ -1,13 +0,0 @@
Index: tigervnc-1.12.0/vncviewer/CConn.cxx
===================================================================
--- tigervnc-1.12.0.orig/vncviewer/CConn.cxx
+++ tigervnc-1.12.0/vncviewer/CConn.cxx
@@ -416,6 +416,8 @@ bool CConn::dataRect(const Rect& r, int
if (encoding != encodingCopyRect)
lastServerEncoding = encoding;
+ if (encoding == pseudoEncodingDesktopSize)
+ setDesktopSize( r.width(), r.height() );
ret = CConnection::dataRect(r, encoding);

28
tigervnc.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Wed Feb 15 16:41:57 UTC 2023 - Joan Torres <joan.torres@suse.com>
- A little cleanup of specfile
-------------------------------------------------------------------
Wed Feb 15 15:01:13 UTC 2023 - Joan Torres <joan.torres@suse.com>
- Update to tigervnc 1.13.0
* The servers and native viewer now support RealVNC's RSA-AES authentication methods and encryption
* The native viewer is now translated to Romanian and Georgian
* The native viewer now (optionally) supports PiKVM's H.264 encoding
* The display settings for the native viewer have been overhauled to make them easier to understand
* The native viewer now supports adding exceptions for expired certificates
* Resolved an issue where full-screen mode didn't work in the native viewer on macOS 13
* Lock key synchronization has been re-enabled in the native viewer after being accidentally disabled in 1.11.0
* Xvnc/libvnc.so can now be built with Xorg 1.21
* x0vncserver is a bit better at handling differing server and client keyboard layout
* x0vncserver now correctly handles zaphod mode
- Removed patches (no longer needed):
* tigervnc-newfbsize.patch (https://github.com/TigerVNC/tigervnc/pull/13)
* n_utilize-system-crypto-policies.patch (https://github.com/TigerVNC/tigervnc/pull/1262)
* xserver211.patch & u_tigervnc-211.patch (https://github.com/TigerVNC/tigervnc/pull/1383)
- Refreshed patches:
* n_tigervnc-date-time.patch
* n_vncserver.patch
* u_change-button-layout-in-ServerDialog.patch
-------------------------------------------------------------------
Wed Jan 4 09:32:50 UTC 2023 - Stefan Schubert <schubi@suse.com>

53
tigervnc.spec
View File

@ -29,7 +29,7 @@
%define _pam_vendordir %{_sysconfdir}/pam.d
%endif
Name: tigervnc
Version: 1.12.0
Version: 1.13.0
Release: 0
Summary: An implementation of VNC
License: GPL-2.0-only AND MIT
@ -53,17 +53,13 @@ Source18: tigervnc-https.firewalld
Source19: xvnc.target
Source21: xvnc-novnc.service.in
Source22: vnc.sysusers
Patch1: tigervnc-newfbsize.patch
Patch3: u_tigervnc-ignore-epipe-on-write.patch
Patch4: n_tigervnc-date-time.patch
Patch5: u_build_libXvnc_as_separate_library.patch
Patch6: u_tigervnc-add-autoaccept-parameter.patch
Patch7: u_change-button-layout-in-ServerDialog.patch
Patch8: n_correct_path_in_desktop_file.patch
Patch9: n_utilize-system-crypto-policies.patch
Patch10: u_tigervnc-211.patch
Patch11: xserver211.patch
Patch12: n_vncserver.patch
Patch1: u_tigervnc-ignore-epipe-on-write.patch
Patch2: u_build_libXvnc_as_separate_library.patch
Patch3: u_tigervnc-add-autoaccept-parameter.patch
Patch4: u_change-button-layout-in-ServerDialog.patch
Patch5: n_tigervnc-date-time.patch
Patch6: n_correct_path_in_desktop_file.patch
Patch7: n_vncserver.patch
Provides: tightvnc = 1.5.0
Obsoletes: tightvnc < 1.5.0
Provides: vnc
@ -72,7 +68,6 @@ BuildRequires: automake
BuildRequires: cmake
BuildRequires: fltk-devel >= 1.3.3
BuildRequires: gcc-c++
BuildRequires: gcc-c++
BuildRequires: java-devel >= 1.8.0
BuildRequires: jpackage-utils
BuildRequires: libjpeg-devel
@ -133,6 +128,7 @@ BuildRequires: pkgconfig(xkbfile)
BuildRequires: pkgconfig(xorg-macros) >= 1.14
BuildRequires: pkgconfig(xproto) >= 7.0.17
BuildRequires: pkgconfig(xtrans) >= 1.2.2
BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} >= 1315
Requires(post): update-alternatives
Requires(postun):update-alternatives
@ -238,22 +234,17 @@ It maps common x11vnc arguments to x0vncserver arguments.
%prep
%setup -T -b1 -q -n tigervnc-%{version}
%patch1 -p1
%patch3 -p0
%patch1 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
%patch9 -p1
%endif
%patch10 -p0
%patch12 -p0
%patch7 -p0
cp -r %{_prefix}/src/xserver/* unix/xserver/
pushd unix/xserver
%patch11 -p1
patch -p1 < ../xserver21.1.1.patch
popd
%build
@ -273,7 +264,7 @@ cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
pushd unix/xserver
autoreconf -fi
%configure \
--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
--disable-xorg --disable-xnest --disable-xvfb \
--disable-xwin --disable-xephyr --disable-kdrive \
--disable-static --disable-xinerama \
--with-xkb-path="%{_datadir}/X11/xkb" \
@ -282,7 +273,6 @@ autoreconf -fi
%ifnarch s390 s390x
--enable-dri2 \
%endif
--disable-config-dbus \
--disable-config-hal \
--disable-config-udev \
--without-dtrace \
@ -378,7 +368,7 @@ fi
%endif
%pre -n xorg-x11-Xvnc -f xorg-x11-Xvnc.pre
%service_add_pre xvnc.socket
%service_add_pre xvnc.socket xvnc.target
%if 0%{?suse_version} >= 1550
# Prepare for migration to /usr/lib; save any old .rpmsave
for i in pam.d/vnc pam.d/tigervnc ; do
@ -393,7 +383,7 @@ done
%endif
%post -n xorg-x11-Xvnc
%service_add_post xvnc.socket
%service_add_post xvnc.socket xvnc.target
%if %{use_firewalld}
%{firewalld_reload}
@ -414,10 +404,10 @@ then
fi
%preun -n xorg-x11-Xvnc
%service_del_preun xvnc.socket
%service_del_preun xvnc.socket xvnc.target
%postun -n xorg-x11-Xvnc
%service_del_postun xvnc.socket
%service_del_postun xvnc.socket xvnc.target
%pre -n xorg-x11-Xvnc-novnc
%service_add_pre xvnc-novnc.service xvnc-novnc.socket
@ -456,6 +446,10 @@ fi
%dir %{_datadir}/icons/hicolor/32x32/apps
%dir %{_datadir}/icons/hicolor/48x48
%dir %{_datadir}/icons/hicolor/48x48/apps
%dir %{_datadir}/icons/hicolor/64x64
%dir %{_datadir}/icons/hicolor/64x64/apps
%dir %{_datadir}/icons/hicolor/128x128
%dir %{_datadir}/icons/hicolor/128x128/apps
%dir %{_datadir}/icons/hicolor/scalable
%dir %{_datadir}/icons/hicolor/scalable/apps
@ -463,6 +457,7 @@ fi
%{_datadir}/icons/hicolor/scalable/apps/tigervnc.svg
%{_datadir}/applications/vncviewer.desktop
%{_datadir}/metainfo/org.tigervnc.vncviewer.metainfo.xml
%files -n xorg-x11-Xvnc
%license LICENCE.TXT

12
u_change-button-layout-in-ServerDialog.patch
View File

@ -8,20 +8,20 @@ To fit strings in languages with longer words...
vncviewer/ServerDialog.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: tigervnc-1.12.0/vncviewer/ServerDialog.cxx
Index: tigervnc-1.13.0/vncviewer/ServerDialog.cxx
===================================================================
--- tigervnc-1.12.0.orig/vncviewer/ServerDialog.cxx
+++ tigervnc-1.12.0/vncviewer/ServerDialog.cxx
@@ -68,7 +68,7 @@ ServerDialog::ServerDialog()
--- tigervnc-1.13.0.orig/vncviewer/ServerDialog.cxx
+++ tigervnc-1.13.0/vncviewer/ServerDialog.cxx
@@ -70,7 +70,7 @@ ServerDialog::ServerDialog()
serverName = new Fl_Input_Choice(x, y, w() - margin*2 - server_label_width, INPUT_HEIGHT, _("VNC server:"));
usedDir = NULL;
- int adjust = (w() - 20) / 4;
+ int adjust = (w() - 20) / 3;
int button_width = adjust - margin/2;
x = margin;
@@ -91,6 +91,8 @@ ServerDialog::ServerDialog()
@@ -93,6 +93,8 @@ ServerDialog::ServerDialog()
x = 0;
y += margin/2 + BUTTON_HEIGHT;

13
u_tigervnc-211.patch
View File

@ -1,13 +0,0 @@
Index: unix/xserver/hw/vnc/xorg-version.h
===================================================================
--- unix/xserver/hw/vnc/xorg-version.h.orig
+++ unix/xserver/hw/vnc/xorg-version.h
@@ -33,7 +33,7 @@
#error "X.Org older than 1.16 is not supported"
#endif
-#if XORG_AT_LEAST(1, 21, 0)
+#if XORG_AT_LEAST(1, 22, 0)
#error "X.Org newer than 1.20 is not supported"
#endif

106
xserver211.patch
View File

@ -1,106 +0,0 @@
Index: xserver/configure.ac
===================================================================
--- xserver.orig/configure.ac
+++ xserver/configure.ac
@@ -72,6 +72,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])
@@ -1713,6 +1714,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
@@ -1748,6 +1753,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
PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT)
@@ -1956,7 +1963,6 @@ if test "x$XORG" = xyes; then
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
@@ -2339,6 +2345,7 @@ hw/xfree86/utils/man/Makefile
hw/xfree86/utils/gtf/Makefile
hw/vfb/Makefile
hw/vfb/man/Makefile
+hw/vnc/Makefile
hw/xnest/Makefile
hw/xnest/man/Makefile
hw/xwin/Makefile
Index: xserver/hw/Makefile.am
===================================================================
--- xserver.orig/hw/Makefile.am
+++ xserver/hw/Makefile.am
@@ -28,7 +28,8 @@ SUBDIRS = \
$(XVFB_SUBDIRS) \
$(XNEST_SUBDIRS) \
$(KDRIVE_SUBDIRS) \
- $(XQUARTZ_SUBDIRS)
+ $(XQUARTZ_SUBDIRS) \
+ vnc
DIST_SUBDIRS = xfree86 vfb xnest xwin xquartz kdrive
Index: xserver/mi/miinitext.c
===================================================================
--- xserver.orig/mi/miinitext.c
+++ xserver/mi/miinitext.c
@@ -106,8 +106,15 @@ SOFTWARE.
#include "miinitext.h"
+#ifdef TIGERVNC
+extern void vncExtensionInit(void);
+#endif
+
/* List of built-in (statically linked) extensions */
static const ExtensionModule staticExtensions[] = {
+#ifdef TIGERVNC
+ {vncExtensionInit, "VNC-EXTENSION", NULL},
+#endif
{GEExtensionInit, "Generic Event Extension", &noGEExtension},
{ShapeExtensionInit, "SHAPE", NULL},
#ifdef MITSHM
Index: xserver/hw/vnc/xvnc.c
===================================================================
--- xserver.orig/hw/vnc/xvnc.c
+++ xserver/hw/vnc/xvnc.c
@@ -69,7 +69,18 @@ extern char buildtime[];
#undef VENDOR_RELEASE
#undef VENDOR_STRING
#include "version-config.h"
-#include "site.h"
+
+#ifndef VENDOR_STRING
+#define VENDOR_STRING "The X.Org Foundation"
+#endif
+
+/* Default logging parameters. */
+#ifndef DEFAULT_LOG_VERBOSITY
+#define DEFAULT_LOG_VERBOSITY 0
+#endif
+#ifndef DEFAULT_LOG_FILE_VERBOSITY
+#define DEFAULT_LOG_FILE_VERBOSITY 3
+#endif
#define XVNCVERSION "TigerVNC 1.12.0"
#define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others (see README.rst)\n" \