rpms/tigervnc/F-11 tigervnc10-rh510185.patch, NONE, 1.1 tigervnc10-rh524340.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tigervnc.spec, 1.13, 1.14 tigervnc10-rh495457.patch, 1.1, NONE tigervnc10-rh508998.patch, 1.1, NONE tigervnc10-xorg-rh514528.patch, 1.1, NONE
Adam Tkac
atkac at fedoraproject.org
Thu Oct 8 14:15:01 UTC 2009
Author: atkac
Update of /cvs/pkgs/rpms/tigervnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30399
Modified Files:
.cvsignore sources tigervnc.spec
Added Files:
tigervnc10-rh510185.patch tigervnc10-rh524340.patch
Removed Files:
tigervnc10-rh495457.patch tigervnc10-rh508998.patch
tigervnc10-xorg-rh514528.patch
Log Message:
- 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)
tigervnc10-rh510185.patch:
vncviewer.cxx | 7 +++++++
vncviewer.man | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE tigervnc10-rh510185.patch ---
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());
tigervnc10-rh524340.patch:
CConn.cxx | 1 +
DesktopWindow.cxx | 13 +++++--------
DesktopWindow.h | 7 +++++++
3 files changed, 13 insertions(+), 8 deletions(-)
--- NEW FILE tigervnc10-rh524340.patch ---
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;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 22 Jun 2009 12:14:51 -0000 1.6
+++ .cvsignore 8 Oct 2009 14:15:01 -0000 1.7
@@ -1 +1 @@
-tigervnc-0.0.91.tar.gz
+tigervnc-1.0.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 22 Jun 2009 12:14:51 -0000 1.6
+++ sources 8 Oct 2009 14:15:01 -0000 1.7
@@ -1 +1 @@
-9aff0c8b573f040aeca4560636fa6886 tigervnc-0.0.91.tar.gz
+622c6689a66651419b5431efdee99d5a tigervnc-1.0.0.tar.gz
Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/tigervnc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tigervnc.spec 14 Aug 2009 13:47:08 -0000 1.13
+++ tigervnc.spec 8 Oct 2009 14:15:01 -0000 1.14
@@ -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.2009020
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 <atkac redhat com> 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 <atkac redhat com> 0.0.91-12
- don't segfault due unitialized Activate/DeactivateGrab (#514528)
- fix random cursor disappearing (#508998)
--- tigervnc10-rh495457.patch DELETED ---
--- tigervnc10-rh508998.patch DELETED ---
--- tigervnc10-xorg-rh514528.patch DELETED ---
More information about the fedora-extras-commits
mailing list