packages: tigervnc/tigervnc-as-needed.patch, tigervnc/tigervnc-rh102434.pat...

baggins baggins at pld-linux.org
Sat Mar 24 00:07:13 CET 2012


Author: baggins                      Date: Fri Mar 23 23:07:13 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.0
- build fixes for xserver 1.12
- disabled viewer-reparent.patch, too many things changed for it

---- Files affected:
packages/tigervnc:
   tigervnc-as-needed.patch (1.5 -> 1.6) , tigervnc-rh102434.patch (1.1 -> 1.2) , tigervnc-viewer-reparent.patch (1.1 -> 1.2) , tigervnc.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: packages/tigervnc/tigervnc-as-needed.patch
diff -u packages/tigervnc/tigervnc-as-needed.patch:1.5 packages/tigervnc/tigervnc-as-needed.patch:1.6
--- packages/tigervnc/tigervnc-as-needed.patch:1.5	Wed Aug 24 14:20:33 2011
+++ packages/tigervnc/tigervnc-as-needed.patch	Sat Mar 24 00:07:08 2012
@@ -4,9 +4,9 @@
  TIGERVNC_SRCDIR=${top_srcdir}/../..
  LIB_DIR=${top_builddir}/../../common
  
-+OS_LIB=$(LIB_DIR)/os/libos.la
++OS_LIB=$(LIB_DIR)/os/libos.a
  RFB_LIB=$(LIB_DIR)/rfb/librfb.la
- RDR_LIB=$(LIB_DIR)/rdr/librdr.la $(GNUTLS_LDFLAGS)
+ RDR_LIB=$(LIB_DIR)/rdr/librdr.la
  NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
  XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
 -COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
@@ -14,3 +14,14 @@
  
  noinst_LTLIBRARIES = libvnccommon.la
  
+--- tigervnc-1.2.0/CMakeLists.txt~	2012-03-09 21:34:29.000000000 +0100
++++ tigervnc-1.2.0/CMakeLists.txt	2012-03-23 13:47:57.895270032 +0100
+@@ -316,7 +316,7 @@
+   if(APPLE)
+     set(FLTK_LIBRARIES "-framework Carbon -framework Cocoa -framework ApplicationServices")
+   elseif(NOT WIN32)
+-    set(FLTK_LIBRARIES "-ldl")
++    set(FLTK_LIBRARIES "-ldl -lfontconfig")
+   endif()
+   message(STATUS "Using included FLTK library")
+ endif()

================================================================
Index: packages/tigervnc/tigervnc-rh102434.patch
diff -u packages/tigervnc/tigervnc-rh102434.patch:1.1 packages/tigervnc/tigervnc-rh102434.patch:1.2
--- packages/tigervnc/tigervnc-rh102434.patch:1.1	Sun Oct 10 20:22:44 2010
+++ packages/tigervnc/tigervnc-rh102434.patch	Sat Mar 24 00:07:08 2012
@@ -1,10 +1,10 @@
-diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx
---- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx.102434	2010-07-20 17:07:44.000000000 +0200
-+++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx	2010-07-21 17:02:09.900085594 +0200
+diff -up tigervnc-1.0.90-20100721svn4113/vncviewer/UserDialog.cxx.102434 tigervnc-1.0.90-20100721svn4113/vncviewer/UserDialog.cxx
+--- tigervnc-1.0.90-20100721svn4113/vncviewer/UserDialog.cxx.102434	2010-07-20 17:07:44.000000000 +0200
++++ tigervnc-1.0.90-20100721svn4113/vncviewer/UserDialog.cxx	2010-07-21 17:02:09.900085594 +0200
 @@ -40,6 +40,8 @@
- #include "ServerDialog.h"
- #include "PasswdDialog.h"
+ #include "fltk_layout.h"
  #include "parameters.h"
+ #include "UserDialog.h"
 +#include <string>
 +#include <iostream>
  
@@ -23,12 +23,12 @@
 +     return;
 +  }
 +
-   const char* secType = secTypeName(csecurity->getType());
-   const char* titlePrefix = _("VNC authentication");
-   unsigned int titleLen = strlen(titlePrefix) + strlen(secType) + 4;
-diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h
---- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h.102434	2009-03-23 17:49:47.000000000 +0100
-+++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h	2010-07-21 16:55:44.414314911 +0200
+   if (!user) {
+     fl_message_title(_("VNC authentication"));
+     *password = strDup(fl_password(_("Password:"), ""));
+diff -up tigervnc-1.0.90-20100721svn4113/vncviewer/parameters.h.102434 tigervnc-1.0.90-20100721svn4113/vncviewer/parameters.h
+--- tigervnc-1.0.90-20100721svn4113/vncviewer/parameters.h.102434	2009-03-23 17:49:47.000000000 +0100
++++ tigervnc-1.0.90-20100721svn4113/vncviewer/parameters.h	2010-07-21 16:55:44.414314911 +0200
 @@ -42,6 +42,7 @@ extern rfb::BoolParameter customCompress
  extern rfb::IntParameter compressLevel;
  extern rfb::BoolParameter noJpeg;
@@ -37,21 +37,20 @@
  
  extern char aboutText[];
  extern char* programName;
-diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx
---- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx.102434	2010-04-23 16:06:38.000000000 +0200
-+++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx	2010-07-21 17:01:05.979161234 +0200
-@@ -59,7 +59,7 @@ IntParameter wmDecorationHeight("WMDecor
+diff -up tigervnc-1.0.90-20100721svn4113/vncviewer/parameters.cxx.102434 tigervnc-1.0.90-20100721svn4113/vncviewer/parameters.cxx
+--- tigervnc-1.0.90-20100721svn4113/vncviewer/parameters.cxx.102434	2010-04-23 16:06:38.000000000 +0200
++++ tigervnc-1.0.90-20100721svn4113/vncviewer/parameters.cxx	2010-07-21 17:01:05.979161234 +0200
+@@ -59,6 +59,7 @@ IntParameter wmDecorationHeight("WMDecor
  StringParameter passwordFile("PasswordFile",
                               "Password file for VNC authentication", "");
  AliasParameter passwd("passwd", "Alias for PasswordFile", &passwordFile);
--
 +BoolParameter passwdInput("passwdInput", "Gets password from stdin", false);
- BoolParameter useLocalCursor("UseLocalCursor",
-                              "Render the mouse cursor locally", true);
- BoolParameter dotWhenNoCursor("DotWhenNoCursor",
-diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man
---- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man.102434	2009-10-07 17:13:00.000000000 +0200
-+++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man	2010-07-21 16:55:44.414314911 +0200
+ 
+ BoolParameter autoSelect("AutoSelect",
+                          "Auto select pixel format and encoding. "
+diff -up tigervnc-1.0.90-20100721svn4113/vncviewer/vncviewer.man.102434 tigervnc-1.0.90-20100721svn4113/vncviewer/vncviewer.man
+--- tigervnc-1.0.90-20100721svn4113/vncviewer/vncviewer.man.102434	2009-10-07 17:13:00.000000000 +0200
++++ tigervnc-1.0.90-20100721svn4113/vncviewer/vncviewer.man	2010-07-21 16:55:44.414314911 +0200
 @@ -119,6 +119,11 @@ the server, you can specify it here to a
  "~/.vnc/passwd".
  

================================================================
Index: packages/tigervnc/tigervnc-viewer-reparent.patch
diff -u packages/tigervnc/tigervnc-viewer-reparent.patch:1.1 packages/tigervnc/tigervnc-viewer-reparent.patch:1.2
--- packages/tigervnc/tigervnc-viewer-reparent.patch:1.1	Sun Oct 10 20:22:44 2010
+++ packages/tigervnc/tigervnc-viewer-reparent.patch	Sat Mar 24 00:07:08 2012
@@ -73,9 +73,9 @@
    XSizeHints sizeHints;
    std::map<Atom,Time> selectionOwnTime;
    std::map<Atom,bool> selectionOwner_;
-diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx
---- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.viewer-reparent	2008-10-23 13:11:39.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx	2008-10-23 13:11:39.000000000 +0200
+diff -up tightvnc-1.5.0-20081015svn3022/vncviewer/CConn.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/vncviewer/CConn.cxx
+--- tightvnc-1.5.0-20081015svn3022/vncviewer/CConn.cxx.viewer-reparent	2008-10-23 13:11:39.000000000 +0200
++++ tightvnc-1.5.0-20081015svn3022/vncviewer/CConn.cxx	2008-10-23 13:11:39.000000000 +0200
 @@ -647,10 +647,18 @@ void CConn::recreateViewport()
  
  void CConn::reconfigureViewport()
@@ -95,9 +95,9 @@
    } else {
      int w = cp.width;
      int h = cp.height;
-diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h
---- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.viewer-reparent	2008-10-23 13:11:39.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h	2008-10-23 13:12:41.000000000 +0200
+diff -up tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.h.viewer-reparent tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.h
+--- tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.h.viewer-reparent	2008-10-23 13:11:39.000000000 +0200
++++ tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.h	2008-10-23 13:12:41.000000000 +0200
 @@ -42,6 +42,7 @@ extern rfb::IntParameter compressLevel;
  extern rfb::BoolParameter noJpeg;
  extern rfb::IntParameter qualityLevel;
@@ -106,16 +106,16 @@
  
  extern char aboutText[];
  extern char* programName;
-diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx
---- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.viewer-reparent	2008-10-23 13:11:39.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx	2008-10-23 13:12:59.000000000 +0200
+diff -up tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.cxx
+--- tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.cxx.viewer-reparent	2008-10-23 13:11:39.000000000 +0200
++++ tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.cxx	2008-10-23 13:12:59.000000000 +0200
 @@ -106,6 +106,9 @@ StringParameter displayname("display", "
- 
- StringParameter via("via", "Gateway to tunnel via", "");
- 
+ StringParameter preferredEncoding("PreferredEncoding",
+                                   "Preferred encoding to use (Tight, ZRLE, Hextile or"
+				   " Raw)", "Tight");
 +/* Support for reparenting */
 +StringParameter embedParent("Parent", "X Window to use as a parent", "");
 +
  BoolParameter customCompressLevel("CustomCompressLevel",
- 				 "Use custom compression level. "
- 				 "Default if CompressLevel is specified.", false);
+                                   "Use custom compression level. "
+                                   "Default if CompressLevel is specified.", false);

================================================================
Index: packages/tigervnc/tigervnc.spec
diff -u packages/tigervnc/tigervnc.spec:1.54 packages/tigervnc/tigervnc.spec:1.55
--- packages/tigervnc/tigervnc.spec:1.54	Mon Mar  5 07:27:23 2012
+++ packages/tigervnc/tigervnc.spec	Sat Mar 24 00:07:08 2012
@@ -7,12 +7,12 @@
 Summary:	A TigerVNC remote display system
 Summary(pl.UTF-8):	System zdalnego dostępu TigerVNC
 Name:		tigervnc
-Version:	1.1.0
-Release:	11
+Version:	1.2.0
+Release:	0.1
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/tigervnc/1.1.0/%{name}-%{version}.tar.gz
-# Source0-md5:	1a5598b4a2ac530fb51411438959e11e
+# Source0-md5:	3a5755b4ed600a81c3a17976c6f8420d
 Source1:	%{name}.desktop
 Patch0:		%{name}-cookie.patch
 Patch1:		%{name}-ldnow.patch
@@ -22,6 +22,10 @@
 Patch5:		%{name}-ipv6.patch
 Patch6:		%{name}-xorg111.patch
 Patch7:		%{name}-rh692048.patch
+Patch8:		gnutls3.patch
+Patch9:		no-bashizm.patch
+Patch10:	xorg112.patch
+Patch11:	cmake-mandir.patch
 URL:		http://www.tigervnc.com/
 BuildRequires:	ImageMagick
 BuildRequires:	ImageMagick-coder-png
@@ -66,7 +70,7 @@
 BuildRequires:	xorg-lib-libXxf86misc-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
 BuildRequires:	xorg-lib-libfontenc-devel
-BuildRequires:	xorg-lib-libpciaccess-devel >= 0.8.0
+BuildRequires:	xorg-lib-libpciaccess-devel >= 0.13
 BuildRequires:	xorg-lib-libxkbfile-devel
 BuildRequires:	xorg-lib-libxkbui-devel >= 1.0.2
 BuildRequires:	xorg-lib-xtrans-devel >= 1.2.2
@@ -172,33 +176,30 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+#patch3 -p1
 %patch4 -p1
 %patch5 -p0
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch11 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
 cd unix/xserver
 patch -p1 <../xserver110.patch
 cd -
 %patch6 -p1
+%patch10 -p1
 
 %build
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-%{configure} \
-	--with-system-jpeg
-
+%cmake .
 %{__make}
 
 cd unix/xserver
-%{__automake}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__automake}
+export CXXFLAGS="%{rpmcxxflags} -fpermissive"
 %configure \
 	--with-os-name="PLD/Linux" \
 	--with-os-vendor="PLD/Team" \
@@ -218,6 +219,7 @@
 	--disable-xephyr \
 	--disable-kdrive \
 	--disable-xfbdev \
+	--disable-dri \
 	--enable-dri2 \
 	--with-pic \
 	--disable-static \
@@ -310,6 +312,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2012/03/23 23:07:08  baggins
+- updated to 1.2.0
+- build fixes for xserver 1.12
+- disabled viewer-reparent.patch, too many things changed for it
+
 Revision 1.54  2012/03/05 06:27:23  arekm
 - release 11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/tigervnc/tigervnc-as-needed.patch?r1=1.5&r2=1.6
    http://cvs.pld-linux.org/packages/tigervnc/tigervnc-rh102434.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/tigervnc/tigervnc-viewer-reparent.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/tigervnc/tigervnc.spec?r1=1.54&r2=1.55



More information about the pld-cvs-commit mailing list