rpms/tigervnc
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to 0.0.91 (1.0.0 RC1)

Browse Source 
- patches merged
- tigervnc10-rh499401.patch
- tigervnc10-rh497592.patch
- tigervnc10-rh501832.patch
- after discusion in upstream drop tigervnc-bounds.patch
- configure flags cleanup
This commit is contained in:
Adam Tkac 2009-06-18 11:26:50 +00:00
parent cbbf499832
commit d169aee818
7 changed files with 17 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
tigervnc-0.0.90.tar.gz
tigervnc-0.0.91.tar.gz

2
sources
View File

@ -1 +1 @@
c80b043daae0c723134dbea9d1c06468 tigervnc-0.0.90.tar.gz
9aff0c8b573f040aeca4560636fa6886 tigervnc-0.0.91.tar.gz

55
tigervnc-bounds.patch
View File

@ -1,55 +0,0 @@
diff -up tightvnc-1.5.0-20081015svn3022/unix/xserver/hw/vnc/XserverDesktop.cc.bounds tightvnc-1.5.0-20081015svn3022/unix/xserver/hw/vnc/XserverDesktop.cc
--- tightvnc-1.5.0-20081015svn3022/unix/xserver/hw/vnc/XserverDesktop.cc.bounds 2008-10-15 15:23:24.000000000 +0200
+++ tightvnc-1.5.0-20081015svn3022/unix/xserver/hw/vnc/XserverDesktop.cc 2008-10-23 12:46:31.000000000 +0200
@@ -500,32 +500,36 @@ void XserverDesktop::add_changed(RegionP
{
if (ignoreHooks_) return;
if (grabbing) return;
+
+ BoxRec screenbox;
+ RegionPtr newreg = REGION_CREATE(pScreen, 0, 0);
+
+ screenbox.x1 = screenbox.y1 = 0;
+ screenbox.x2 = pScreen->width;
+ screenbox.y2 = pScreen->height;
+
+ RegionPtr screenreg = REGION_CREATE(pScreen, &screenbox, 0);
+ REGION_INTERSECT(pScreen, newreg, reg, screenreg);
+ REGION_DESTROY (pScreen, screenreg);
+
try {
rfb::Region rfbReg;
- rfbReg.setExtentsAndOrderedRects((ShortRect*)REGION_EXTENTS(pScreen, reg),
- REGION_NUM_RECTS(reg),
- (ShortRect*)REGION_RECTS(reg));
+ rfbReg.setExtentsAndOrderedRects((ShortRect*)REGION_EXTENTS(pScreen, newreg),
+ REGION_NUM_RECTS(newreg),
+ (ShortRect*)REGION_RECTS(newreg));
server->add_changed(rfbReg);
deferUpdate();
} catch (rdr::Exception& e) {
vlog.error("XserverDesktop::add_changed: %s",e.str());
}
+ REGION_DESTROY (pScreen, newreg);
}
void XserverDesktop::add_copied(RegionPtr dst, int dx, int dy)
{
- if (ignoreHooks_) return;
- if (grabbing) return;
- try {
- rfb::Region rfbReg;
- rfbReg.setExtentsAndOrderedRects((ShortRect*)REGION_EXTENTS(pScreen, dst),
- REGION_NUM_RECTS(dst),
- (ShortRect*)REGION_RECTS(dst));
- server->add_copied(rfbReg, rfb::Point(dx, dy));
- deferUpdate();
- } catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::add_copied: %s",e.str());
- }
+ add_changed (dst);
+ REGION_TRANSLATE (pScreen, dst, -dx, -dy);
+ add_changed (dst);
}
void XserverDesktop::positionCursor()

33
tigervnc.spec
View File

@ -1,6 +1,6 @@
Name: tigervnc
Version: 0.0.90
Release: 0.10%{?dist}
Version: 0.0.91
Release: 0.11%{?dist}
Summary: A TigerVNC remote display system
Group: User Interface/Desktops
@ -36,12 +36,8 @@ Provides: tightvnc = 1.5.0-0.15.20090204svn3586
Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586
Patch0: tigervnc-102434.patch
Patch1: tigervnc-bounds.patch
Patch4: tigervnc-cookie.patch
Patch8: tigervnc-viewer-reparent.patch
Patch9: tigervnc10-rh499401.patch
Patch10: tigervnc10-rh497592.patch
Patch11: tigervnc10-rh501832.patch
%description
Virtual Network Computing (VNC) is a remote display system which
@ -97,12 +93,8 @@ popd
%patch0 -p1 -b .102434
%patch1 -p1 -b .bounds
%patch4 -p1 -b .cookie
%patch8 -p1 -b .viewer-reparent
%patch9 -p0 -b .rh499401
%patch10 -p1 -b .rh497592
%patch11 -p1 -b .rh501832
# Use newer gettext
sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@ -125,16 +117,12 @@ autoreconf -fiv
%configure \
--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
--disable-xorgcfg --disable-xprint --disable-static \
--disable-composite --disable-xtrap \
--disable-{a,c,m}fb \
--disable-static \
--disable-composite \
--with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
--with-fontdir=%{_datadir}/X11/fonts \
--with-os-name="Fedora" \
--with-os-vendor="Red Hat, Inc." \
--with-xkb-output=%{_localstatedir}/lib/xkb \
--enable-install-libxf86config \
--disable-xevie \
--disable-dri2 \
--enable-glx \
--disable-config-dbus \
@ -242,11 +230,20 @@ fi
%{_libdir}/xorg/modules/extensions/libvnc.so
%changelog
* Thu May 21 2009 Adam Tkac <atkac redhat com> 0.0.90-10
* Thu Jun 18 2009 Adam Tkac <atkac redhat com> 0.0.91-0.11
- update to 0.0.91 (1.0.0 RC1)
- patches merged
- tigervnc10-rh499401.patch
- tigervnc10-rh497592.patch
- tigervnc10-rh501832.patch
- after discusion in upstream drop tigervnc-bounds.patch
- configure flags cleanup
* Thu May 21 2009 Adam Tkac <atkac redhat com> 0.0.90-0.10
- rebuild against 1.6.1.901 X server (#497835)
- disable i18n, vncviewer is not UTF-8 compatible (#501832)
* Mon May 18 2009 Adam Tkac <atkac redhat com> 0.0.90-9
* Mon May 18 2009 Adam Tkac <atkac redhat com> 0.0.90-0.9
- fix vncpasswd crash on long passwords (#499401)
- start session dbus daemon correctly (#497592)

11
tigervnc10-rh497592.patch
View File

@ -1,11 +0,0 @@
diff -up tigervnc-0.0.90/unix/vncserver.rh497592 tigervnc-0.0.90/unix/vncserver
--- tigervnc-0.0.90/unix/vncserver.rh497592 2009-05-18 15:49:33.000000000 +0200
+++ tigervnc-0.0.90/unix/vncserver 2009-05-18 15:50:26.000000000 +0200
@@ -57,6 +57,7 @@ $defaultXStartup
= ("#!/bin/sh\n\n".
"vncconfig -iconic &\n".
"unset SESSION_MANAGER\n".
+ "unset DBUS_SESSION_BUS_ADDRESS\n".
"OS=`uname -s`\n".
"if [ \$OS = 'Linux' ]; then\n".
" case \"\$WINDOWMANAGER\" in\n".

26
tigervnc10-rh499401.patch
View File

@ -1,26 +0,0 @@
Index: common/rfb/Password.cxx
===================================================================
--- common/rfb/Password.cxx (revision 3810)
+++ common/rfb/Password.cxx (revision 3812)
@@ -38,6 +38,9 @@
PlainPasswd::PlainPasswd(char* pwd) : CharArray(pwd) {
}
+PlainPasswd::PlainPasswd(int len) : CharArray(len) {
+}
+
PlainPasswd::PlainPasswd(const ObfuscatedPasswd& obfPwd) : CharArray(9) {
if (obfPwd.length < 8)
throw rdr::Exception("bad obfuscated password length");
Index: common/rfb/Password.h
===================================================================
--- common/rfb/Password.h (revision 3810)
+++ common/rfb/Password.h (revision 3812)
@@ -28,6 +28,7 @@
public:
PlainPasswd();
PlainPasswd(char* pwd);
+ PlainPasswd(int len);
PlainPasswd(const ObfuscatedPasswd& obfPwd);
~PlainPasswd();
void replaceBuf(char* b);

28
tigervnc10-rh501832.patch
View File

@ -1,28 +0,0 @@
diff -up tigervnc-0.0.90/unix/vncviewer/AboutDialog.h.rh501832 tigervnc-0.0.90/unix/vncviewer/AboutDialog.h
--- tigervnc-0.0.90/unix/vncviewer/AboutDialog.h.rh501832 2009-05-21 14:16:20.173820756 +0200
+++ tigervnc-0.0.90/unix/vncviewer/AboutDialog.h 2009-05-21 14:16:39.129309405 +0200
@@ -26,6 +26,10 @@
#include "parameters.h"
#include "gettext.h"
+
+/* Disable I18N - RH bug #501832 */
+#define gettext(arg) (arg)
+
#define _(String) gettext (String)
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
diff -up tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx.rh501832 tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx
--- tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx.rh501832 2009-05-21 14:15:51.810818893 +0200
+++ tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx 2009-05-21 14:16:09.614303459 +0200
@@ -39,6 +39,10 @@
#include "CConn.h"
#include "gettext.h"
+
+/* Disable I18N - RH bug #501832 */
+#define gettext(arg) (arg)
+
#define _(String) gettext (String)
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)