From dd823834ac03448728153be0a953e168e2858c09 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 22 Mar 2011 10:59:46 +0100 Subject: [PATCH] Update to 1.0.90. Signed-off-by: Adam Tkac --- tigervnc.spec | 16 ++++--- tigervnc11-gethomedir.patch | 8 ++-- tigervnc11-glx.patch | 12 +++++ xserver110.patch | 91 +++++++++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 10 deletions(-) create mode 100644 tigervnc11-glx.patch create mode 100644 xserver110.patch diff --git a/tigervnc.spec b/tigervnc.spec index 68ca9ce..ad9536b 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,18 +1,17 @@ -%define snap 20110117svn4237 - Name: tigervnc Version: 1.0.90 -Release: 0.32.%{snap}%{?dist} +Release: 1%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops License: GPLv2+ URL: http://www.tigervnc.com -Source0: %{name}-%{version}-%{snap}.tar.bz2 +Source0: %{name}-%{version}.tar.gz Source1: vncserver.init Source2: vncserver.sysconfig Source6: vncviewer.desktop +Source7: xserver110.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel, automake, autoconf, libtool, gettext, gettext-autopoint @@ -44,6 +43,7 @@ Patch4: tigervnc-cookie.patch Patch8: tigervnc-viewer-reparent.patch Patch10: tigervnc11-ldnow.patch Patch11: tigervnc11-gethomedir.patch +Patch12: tigervnc11-glx.patch %description Virtual Network Computing (VNC) is a remote display system which @@ -123,20 +123,21 @@ BuildArch: noarch This package contains license of the TigerVNC suite %prep -%setup -q -n %{name}-%{version}-%{snap} +%setup -q -n %{name}-%{version} %patch0 -p1 -b .102434 %patch4 -p1 -b .cookie %patch8 -p1 -b .viewer-reparent %patch10 -p1 -b .ldnow %patch11 -p1 -b .gethomedir +%patch12 -p1 -b .glx cp -r /usr/share/xorg-x11-server-source/* unix/xserver pushd unix/xserver for all in `find . -type f -perm -001`; do chmod -x "$all" done -patch -p1 -b --suffix .vnc < ../xserver110.patch +patch -p1 -b --suffix .vnc < %{SOURCE7} popd # Use newer gettext @@ -299,6 +300,9 @@ fi %doc LICENCE.TXT %changelog +* Tue Mar 22 2011 Adam Tkac - 1.0.90-1 +- update to 1.0.90 + * Wed Feb 09 2011 Fedora Release Engineering - 1.0.90-0.32.20110117svn4237 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/tigervnc11-gethomedir.patch b/tigervnc11-gethomedir.patch index 4fadc05..fd07be3 100644 --- a/tigervnc11-gethomedir.patch +++ b/tigervnc11-gethomedir.patch @@ -1,8 +1,8 @@ -diff -up tigervnc-1.0.90-20110117svn4237/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0.90-20110117svn4237/unix/xserver/hw/vnc/Makefile.am ---- tigervnc-1.0.90-20110117svn4237/unix/xserver/hw/vnc/Makefile.am.gethomedir 2011-01-17 13:04:31.006562632 +0100 -+++ tigervnc-1.0.90-20110117svn4237/unix/xserver/hw/vnc/Makefile.am 2011-01-17 13:05:40.226028354 +0100 +diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am +--- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir 2011-03-22 10:53:05.206429397 +0100 ++++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am 2011-03-22 10:53:30.550388457 +0100 @@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la - RDR_LIB=$(LIB_DIR)/rdr/librdr.la + RDR_LIB=$(LIB_DIR)/rdr/librdr.la $(GNUTLS_LDFLAGS) NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la +OS_LIB=$(LIB_DIR)/os/libos.la diff --git a/tigervnc11-glx.patch b/tigervnc11-glx.patch new file mode 100644 index 0000000..2da764e --- /dev/null +++ b/tigervnc11-glx.patch @@ -0,0 +1,12 @@ +diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.glx tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am +--- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.glx 2011-03-22 10:32:08.555474741 +0100 ++++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am 2011-03-22 10:34:09.331283632 +0100 +@@ -35,7 +35,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW + -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir) + + Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ +- $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 ++ $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 + + Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) + diff --git a/xserver110.patch b/xserver110.patch new file mode 100644 index 0000000..ddf450f --- /dev/null +++ b/xserver110.patch @@ -0,0 +1,91 @@ +diff -up xserver/configure.ac.vnc xserver/configure.ac +--- xserver/configure.ac.vnc 2011-03-22 10:41:05.508614018 +0100 ++++ xserver/configure.ac 2011-03-22 10:47:01.592023995 +0100 +@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.10.0, [https:// + RELEASE_DATE="2011-2-25" + AC_CONFIG_SRCDIR([Makefile.am]) + AM_INIT_AUTOMAKE([foreign dist-bzip2]) +-AM_MAINTAINER_MODE + + # Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS + m4_ifndef([XORG_MACROS_VERSION], +@@ -65,6 +64,7 @@ dnl forcing an entire recompile.x + AC_CONFIG_HEADERS(include/version-config.h) + + AM_PROG_AS ++AC_PROG_CXX + AC_PROG_LN_S + AC_LIBTOOL_WIN32_DLL + AC_DISABLE_STATIC +@@ -1510,6 +1510,14 @@ if test "x$XVFB" = xyes; then + AC_SUBST([XVFB_SYS_LIBS]) + fi + ++dnl Xvnc DDX ++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) ++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_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 This is necessary to allow Xvnc to statically link with GnuTLS ++AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls]) ++AC_SUBST(GNUTLS_LDFLAGS) + + dnl Xnest DDX + +@@ -1548,6 +1556,8 @@ xorg_bus_linuxpci=no + xorg_bus_bsdpci=no + xorg_bus_sparc=no + ++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 -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' +@@ -1792,7 +1802,6 @@ if test "x$XORG" = xyes; then + AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) + AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) + AC_DEFINE(XFree86LOADER, 1, [Building loadable 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]) +@@ -2254,6 +2263,7 @@ hw/dmx/Makefile + hw/dmx/man/Makefile + hw/vfb/Makefile + hw/vfb/man/Makefile ++hw/vnc/Makefile + hw/xnest/Makefile + hw/xnest/man/Makefile + hw/xwin/Makefile +diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am +--- xserver/hw/Makefile.am.vnc 2011-03-22 10:41:05.528613984 +0100 ++++ xserver/hw/Makefile.am 2011-03-22 10:41:05.630613813 +0100 +@@ -33,7 +33,8 @@ SUBDIRS = \ + $(XNEST_SUBDIRS) \ + $(DMX_SUBDIRS) \ + $(KDRIVE_SUBDIRS) \ +- $(XQUARTZ_SUBDIRS) ++ $(XQUARTZ_SUBDIRS) \ ++ vnc + + DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive + +diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c +--- xserver/mi/miinitext.c.vnc 2011-03-22 10:41:05.591613878 +0100 ++++ xserver/mi/miinitext.c 2011-03-22 10:41:05.630613813 +0100 +@@ -263,6 +263,7 @@ extern void DamageExtensionInit(INITARGS + extern void CompositeExtensionInit(INITARGS); + #endif + extern void GEExtensionInit(INITARGS); ++extern void vncExtensionInit(INITARGS); + + /* The following is only a small first step towards run-time + * configurable extensions. +@@ -433,6 +434,7 @@ InitExtensions(int argc, char *argv[]) + #ifdef XF86BIGFONT + if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); + #endif ++ vncExtensionInit(); + #if !defined(NO_HW_ONLY_EXTS) + #if defined(XF86VIDMODE) + if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();