From 886aba80c6661586359bde33887301b1aaa394c0 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Oct 08 2009 14:15:01 +0000 Subject: - update to 1.0.0 release - tigervnc10-rh508998.patch merged - tigervnc10-xorg-rh514528.patch merged - tigervnc10-rh495457.patch merged - improve -LowColorSwitch documentation and handling (#510185) - honor dotWhenNoCursor option (and it's changes) every time (#524340) --- diff --git a/.cvsignore b/.cvsignore index 3922325..d7ea14d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tigervnc-0.0.91.tar.gz +tigervnc-1.0.0.tar.gz diff --git a/sources b/sources index a93bf02..905e589 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9aff0c8b573f040aeca4560636fa6886 tigervnc-0.0.91.tar.gz +622c6689a66651419b5431efdee99d5a tigervnc-1.0.0.tar.gz diff --git a/tigervnc.spec b/tigervnc.spec index 90bdb09..b519561 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,6 +1,6 @@ Name: tigervnc -Version: 0.0.91 -Release: 0.12%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -38,9 +38,8 @@ Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 Patch0: tigervnc-102434.patch Patch4: tigervnc-cookie.patch Patch8: tigervnc-viewer-reparent.patch -Patch9: tigervnc10-rh495457.patch -Patch10: tigervnc10-xorg-rh514528.patch -Patch11: tigervnc10-rh508998.patch +Patch11: tigervnc10-rh510185.patch +Patch12: tigervnc10-rh524340.patch %description Virtual Network Computing (VNC) is a remote display system which @@ -88,22 +87,20 @@ to access the desktop on your machine. %prep %setup -q -n %{name}-%{version} -%patch11 -p1 -b .rh508998 - cp -r %{_datadir}/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 < ../xserver16.patch -%patch10 -p1 -b .rh514528 popd %patch0 -p1 -b .102434 %patch4 -p1 -b .cookie %patch8 -p1 -b .viewer-reparent -%patch9 -p0 -b .rh495457 +%patch11 -p0 -b .rh510185 +%patch12 -p0 -b .rh524340 # Use newer gettext sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \ @@ -249,6 +246,14 @@ fi %endif %changelog +* Thu Oct 08 2009 Adam Tkac 1.0.0-1 +- update to 1.0.0 release + - tigervnc10-rh508998.patch merged + - tigervnc10-xorg-rh514528.patch merged + - tigervnc10-rh495457.patch merged +- improve -LowColorSwitch documentation and handling (#510185) +- honor dotWhenNoCursor option (and it's changes) every time (#524340) + * Fri Aug 14 2009 Adam Tkac 0.0.91-12 - don't segfault due unitialized Activate/DeactivateGrab (#514528) - fix random cursor disappearing (#508998) diff --git a/tigervnc10-rh495457.patch b/tigervnc10-rh495457.patch deleted file mode 100644 index 35713ba..0000000 --- a/tigervnc10-rh495457.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: unix/vncviewer/DesktopWindow.cxx -=================================================================== ---- unix/vncviewer/DesktopWindow.cxx (revision 3832) -+++ unix/vncviewer/DesktopWindow.cxx (working copy) -@@ -216,6 +216,7 @@ - if (cursorVisible) { - cursorVisible = false; - im->imageRect(cursorBackingRect, cursorBacking.data); -+ damageRect(cursorBackingRect); - } - } - -@@ -237,6 +238,7 @@ - im->getImage(cursorBacking.data, cursorBackingRect); - - im->maskRect(cursorRect, cursor.data, cursor.mask.buf); -+ damageRect(cursorBackingRect); - } - } - -@@ -355,6 +357,7 @@ - cursorPos = pos; - showLocalCursor(); - } -+ updateWindow(); - } - } - } diff --git a/tigervnc10-rh508998.patch b/tigervnc10-rh508998.patch deleted file mode 100644 index 7d58ea2..0000000 --- a/tigervnc10-rh508998.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -up tigervnc-0.0.91/unix/xserver16.patch.rh508998 tigervnc-0.0.91/unix/xserver16.patch ---- tigervnc-0.0.91/unix/xserver16.patch.rh508998 2009-08-14 15:26:44.829138415 +0200 -+++ tigervnc-0.0.91/unix/xserver16.patch 2009-08-14 15:28:55.017134974 +0200 -@@ -1,13 +1,13 @@ - diff -up xserver/configure.ac.vnc xserver/configure.ac ----- xserver/configure.ac.vnc 2009-04-27 14:35:51.116084095 +0200 --+++ xserver/configure.ac 2009-04-27 14:36:20.012084519 +0200 -+--- xserver/configure.ac.vnc 2009-08-14 15:25:23.879137863 +0200 -++++ xserver/configure.ac 2009-08-14 15:25:24.381142987 +0200 - @@ -29,7 +29,6 @@ AC_PREREQ(2.57) -- AC_INIT([xorg-server], 1.6.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -+ AC_INIT([xorg-server], 1.6.1.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) - AC_CONFIG_SRCDIR([Makefile.am]) - AM_INIT_AUTOMAKE([dist-bzip2 foreign]) - -AM_MAINTAINER_MODE - -- RELEASE_DATE="2009-4-14" -+ RELEASE_DATE="2009-5-8" - - @@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD - AC_CONFIG_HEADERS(include/kdrive-config.h) -@@ -17,7 +17,7 @@ diff -up xserver/configure.ac.vnc xserve - AM_PROG_AS - AC_PROG_INSTALL - AC_PROG_LN_S --@@ -995,7 +995,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten -+@@ -994,7 +994,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten - - AC_DEFINE(XKB, 1, [Build XKB]) - AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) -@@ -26,7 +26,7 @@ diff -up xserver/configure.ac.vnc xserve - REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" - XKB_LIB='$(top_builddir)/xkb/libxkb.la' - XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' --@@ -1199,6 +1199,9 @@ if test "x$XVFB" = xyes; then -+@@ -1207,6 +1207,9 @@ if test "x$XVFB" = xyes; then - AC_SUBST([XVFB_SYS_LIBS]) - fi - -@@ -36,7 +36,7 @@ diff -up xserver/configure.ac.vnc xserve - - dnl Xnest DDX - --@@ -1234,6 +1237,8 @@ xorg_bus_linuxpci=no -+@@ -1242,6 +1245,8 @@ xorg_bus_linuxpci=no - xorg_bus_bsdpci=no - xorg_bus_sparc=no - -@@ -45,7 +45,7 @@ diff -up xserver/configure.ac.vnc xserve - 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' --@@ -1421,7 +1426,6 @@ if test "x$XORG" = xyes; then -+@@ -1427,7 +1432,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]) -@@ -53,7 +53,7 @@ diff -up xserver/configure.ac.vnc xserve - 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]) --@@ -1875,6 +1879,7 @@ hw/dmx/input/Makefile -+@@ -1881,6 +1885,7 @@ hw/dmx/input/Makefile - hw/dmx/glxProxy/Makefile - hw/dmx/Makefile - hw/vfb/Makefile -@@ -62,8 +62,8 @@ diff -up xserver/configure.ac.vnc xserve - hw/xwin/Makefile - hw/xquartz/Makefile - diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am ----- xserver/hw/Makefile.am.vnc 2009-04-27 14:35:51.244085095 +0200 --+++ xserver/hw/Makefile.am 2009-04-27 14:36:07.676108196 +0200 -+--- xserver/hw/Makefile.am.vnc 2009-08-14 15:25:23.987137653 +0200 -++++ xserver/hw/Makefile.am 2009-08-14 15:25:24.382139759 +0200 - @@ -33,7 +33,8 @@ SUBDIRS = \ - $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ -@@ -75,8 +75,8 @@ diff -up xserver/hw/Makefile.am.vnc xser - 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 2009-04-27 14:35:51.252085110 +0200 --+++ xserver/mi/miinitext.c 2009-04-27 14:36:07.676108196 +0200 -+--- xserver/mi/miinitext.c.vnc 2009-08-14 15:25:23.998137343 +0200 -++++ xserver/mi/miinitext.c 2009-08-14 15:26:19.857206094 +0200 - @@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS - extern void CompositeExtensionInit(INITARGS); - #endif -@@ -85,11 +85,11 @@ diff -up xserver/mi/miinitext.c.vnc xser - - /* The following is only a small first step towards run-time - * configurable extensions. --@@ -477,6 +478,7 @@ InitExtensions(int argc, char *argv[]) -- GlxPushProvider(&__glXDRISWRastProvider); -- if (!noGlxExtension) GlxExtensionInit(); -+@@ -438,6 +439,7 @@ InitExtensions(int argc, char *argv[]) -+ #ifdef XF86BIGFONT -+ if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); - #endif - + vncExtensionInit(); -- } -- -- #else /* XFree86LOADER */ -+ #if !defined(NO_HW_ONLY_EXTS) -+ #if defined(XF86VIDMODE) -+ if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); diff --git a/tigervnc10-rh510185.patch b/tigervnc10-rh510185.patch new file mode 100644 index 0000000..eea1b3e --- /dev/null +++ b/tigervnc10-rh510185.patch @@ -0,0 +1,32 @@ +unchanged: +--- unix/vncviewer/vncviewer.man (revision 3902) ++++ unix/vncviewer/vncviewer.man (working copy) +@@ -156,7 +156,9 @@ + .B \-LowColorLevel, \-LowColourLevel \fIlevel\fP + Selects the reduced color level to use on slow links. \fIlevel\fP can range + from 0 to 2, 0 meaning 8 colors, 1 meaning 64 colors (the default), 2 meaning +-256 colors. ++256 colors. Note that decision if reduced color level is used is made by ++vncviewer. If you would like to force vncviewer to use reduced color level ++use \fB-AutoSelect=0\fP parameter. + + .TP + .B \-PreferredEncoding \fIencoding\fP +only in patch2: +unchanged: +--- unix/vncviewer/vncviewer.cxx (revision 3902) ++++ unix/vncviewer/vncviewer.cxx (working copy) +@@ -337,6 +337,13 @@ + && !::fullColour.hasBeenSet() + && !::fullColourAlias.hasBeenSet()); + } ++ if (!::fullColour.hasBeenSet() && !::fullColourAlias.hasBeenSet()) { ++ // Default to FullColor=0 if AutoSelect=0 && LowColorLevel is set ++ if (!::autoSelect && (::lowColourLevel.hasBeenSet() || ++ ::lowColourLevelAlias.hasBeenSet())) { ++ ::fullColour.setParam(false); ++ } ++ } + if (!::customCompressLevel.hasBeenSet()) { + // Default to CustomCompressLevel=1 if CompressLevel is used. + ::customCompressLevel.setParam(::compressLevel.hasBeenSet()); diff --git a/tigervnc10-rh524340.patch b/tigervnc10-rh524340.patch new file mode 100644 index 0000000..9c93949 --- /dev/null +++ b/tigervnc10-rh524340.patch @@ -0,0 +1,83 @@ +Index: unix/vncviewer/DesktopWindow.h +=================================================================== +--- unix/vncviewer/DesktopWindow.h (revision 3903) ++++ unix/vncviewer/DesktopWindow.h (working copy) +@@ -29,6 +29,7 @@ + #include "TXWindow.h" + #include "TXViewport.h" + #include "TXImage.h" ++#include "parameters.h" + + class CConn; + +@@ -54,6 +55,12 @@ + // resetLocalCursor() stops the rendering of the local cursor + void resetLocalCursor(); + ++ // setNoCursor() sets what to display when no cursor is defined - if dot or ++ // nothing. ++ inline void setNoCursor() { ++ XDefineCursor(dpy, win(), dotWhenNoCursor ? dotCursor : noCursor); ++ } ++ + // Methods forwarded from CConn + void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs); + void serverCutText(const char* str, rdr::U32 len); +Index: unix/vncviewer/CConn.cxx +=================================================================== +--- unix/vncviewer/CConn.cxx (revision 3903) ++++ unix/vncviewer/CConn.cxx (working copy) +@@ -684,6 +684,7 @@ + desktop->resetLocalCursor(); + } + dotWhenNoCursor.setParam(options.dotWhenNoCursor.checked()); ++ desktop->setNoCursor(); + checkEncodings(); + } + +Index: unix/vncviewer/DesktopWindow.cxx +=================================================================== +--- unix/vncviewer/DesktopWindow.cxx (revision 3903) ++++ unix/vncviewer/DesktopWindow.cxx (working copy) +@@ -79,7 +79,7 @@ + PointerMotionMask | KeyPressMask | KeyReleaseMask | + EnterWindowMask | LeaveWindowMask); + createXCursors(); +- XDefineCursor(dpy, win(), dotCursor); ++ setNoCursor(); + im = new TXImage(dpy, width(), height()); + if (!serverPF.trueColour) + im->setPF(serverPF); +@@ -139,12 +139,9 @@ + if (((rdr::U8*)mask)[i]) break; + + if (i == mask_len) { +- if (dotWhenNoCursor) { ++ if (dotWhenNoCursor) + vlog.debug("cursor is empty - using dot"); +- XDefineCursor(dpy, win(), dotCursor); +- } else { +- XDefineCursor(dpy, win(), noCursor); +- } ++ setNoCursor(); + cursorAvailable = false; + return; + } +@@ -206,7 +203,7 @@ + void DesktopWindow::resetLocalCursor() + { + hideLocalCursor(); +- XDefineCursor(dpy, win(), dotCursor); ++ setNoCursor(); + cursorAvailable = false; + } + +@@ -226,7 +223,7 @@ + if (!getPF().equal(cursor.getPF()) || + cursor.getRect().is_empty()) { + vlog.error("attempting to render invalid local cursor"); +- XDefineCursor(dpy, win(), dotCursor); ++ setNoCursor(); + cursorAvailable = false; + return; + } diff --git a/tigervnc10-xorg-rh514528.patch b/tigervnc10-xorg-rh514528.patch deleted file mode 100644 index 93731d2..0000000 --- a/tigervnc10-xorg-rh514528.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dix/devices.c b/dix/devices.c -index 0858f20..3b8d544 100644 ---- a/dix/devices.c -+++ b/dix/devices.c -@@ -216,6 +216,8 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart) - - /* device grab defaults */ - dev->deviceGrab.grabTime = currentTime; -+ dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab; -+ dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab; - - dev->coreEvents = TRUE; -