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

- u_tigervnc-211.patch, xserver211.patch

Browse Source 
* fixes build against xorg-server 21.1 sources

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=216
This commit is contained in:
Stefan Dirsch 2021-10-28 12:37:45 +00:00 committed by Git OBS Bridge
parent b5009eeb88
commit 2dbf2c023a
4 changed files with 124 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tigervnc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Oct 28 12:03:58 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- u_tigervnc-211.patch, xserver211.patch
* fixes build against xorg-server 21.1 sources
-------------------------------------------------------------------
Thu Oct 21 10:16:38 UTC 2021 - Joan Torres <joan.torres@suse.com>

6
tigervnc.spec
View File

@ -75,6 +75,8 @@ Patch21: U_0001-Properly-store-certificate-exceptions.patch
Patch22: U_0002-Properly-store-certificate-exceptions-in-Java-viewer.patch
Patch23: n_utilize-system-crypto-policies.patch
Patch24: tigervnc-FIPS-use-RFC7919.patch
Patch25: u_tigervnc-211.patch
Patch26: xserver211.patch
Provides: tightvnc = 1.3.9
Obsoletes: tightvnc < 1.3.9
Provides: vnc
@ -269,10 +271,12 @@ It maps common x11vnc arguments to x0vncserver arguments.
%patch23 -p1
%endif
%patch24 -p1
%patch25 -p0
cp -r %{_prefix}/src/xserver/* unix/xserver/
pushd unix/xserver
patch -p1 < ../xserver120.patch
#patch -p1 < ../xserver120.patch
%patch26 -p1
popd
%build

11
u_tigervnc-211.patch Normal file
View File

@ -0,0 +1,11 @@
--- ./unix/xserver/hw/vnc/xorg-version.h.orig 2021-10-28 13:58:20.309981257 +0200
+++ ./unix/xserver/hw/vnc/xorg-version.h 2021-10-28 13:59:33.179368585 +0200
@@ -54,6 +54,8 @@
#define XORG 119
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000))
#define XORG 120
+#elif XORG_VERSION_CURRENT < ((21 * 10000000) + (1 * 100000) + (99 * 1000))
+#define XORG 211
#else
#error "X.Org newer than 1.20 is not supported"
#endif

102
xserver211.patch Normal file
View File

@ -0,0 +1,102 @@
diff -u -r xserver.orig/configure.ac xserver/configure.ac
--- xserver.orig/configure.ac 2021-10-28 11:39:43.200727345 +0000
+++ xserver/configure.ac 2021-10-28 11:39:57.993008591 +0000
@@ -72,6 +72,7 @@
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 @@
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 @@
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 @@
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/gtf/Makefile
hw/vfb/Makefile
hw/vfb/man/Makefile
+hw/vnc/Makefile
hw/xnest/Makefile
hw/xnest/man/Makefile
hw/xwin/Makefile
diff -u -r xserver.orig/hw/Makefile.am xserver/hw/Makefile.am
--- xserver.orig/hw/Makefile.am 2021-10-28 11:39:43.156726511 +0000
+++ xserver/hw/Makefile.am 2021-10-28 11:41:02.890242547 +0000
@@ -28,7 +28,8 @@
$(XVFB_SUBDIRS) \
$(XNEST_SUBDIRS) \
$(KDRIVE_SUBDIRS) \
- $(XQUARTZ_SUBDIRS)
+ $(XQUARTZ_SUBDIRS) \
+ vnc
DIST_SUBDIRS = xfree86 vfb xnest xwin xquartz kdrive
diff -u -r xserver.orig/mi/miinitext.c xserver/mi/miinitext.c
--- xserver.orig/mi/miinitext.c 2021-10-28 11:39:43.232727953 +0000
+++ xserver/mi/miinitext.c 2021-10-28 11:39:57.993008591 +0000
@@ -106,8 +106,15 @@
#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
diff -u -r xserver.old/hw/vnc/xvnc.c xserver/hw/vnc/xvnc.c
--- xserver.old/hw/vnc/xvnc.c 2021-10-28 12:14:39.360628791 +0000
+++ xserver/hw/vnc/xvnc.c 2021-10-28 12:30:56.599310018 +0000
@@ -85,7 +85,18 @@
#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.10.0"
#define XVNCCOPYRIGHT ("Copyright (C) 1999-2019 TigerVNC Team and many others (see README.rst)\n" \