Accepting request 595580 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/595580
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=50

n_tigervnc-date-time.patch

@@ -1,41 +1,74 @@
-Index: tigervnc-1.4.1/unix/xserver/hw/vnc/buildtime.c
+Index: tigervnc-1.8.0/unix/xserver/hw/vnc/buildtime.c
 ===================================================================
---- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/buildtime.c
+--- tigervnc-1.8.0.orig/unix/xserver/hw/vnc/buildtime.c
-+++ tigervnc-1.4.1/unix/xserver/hw/vnc/buildtime.c
++++ tigervnc-1.8.0/unix/xserver/hw/vnc/buildtime.c
 @@ -15,4 +15,4 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
   * USA.
   */
 -char buildtime[] = __DATE__ " " __TIME__;
 +char buildtime[] = "??? ?? ???? ??:??:??";
-Index: tigervnc-1.4.1/unix/vncconfig/buildtime.c
+Index: tigervnc-1.8.0/unix/vncconfig/buildtime.c
 ===================================================================
---- tigervnc-1.4.1.orig/unix/vncconfig/buildtime.c
+--- tigervnc-1.8.0.orig/unix/vncconfig/buildtime.c
-+++ tigervnc-1.4.1/unix/vncconfig/buildtime.c
++++ tigervnc-1.8.0/unix/vncconfig/buildtime.c
 @@ -15,4 +15,4 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
   * USA.
   */
 -char buildtime[] = __DATE__ " " __TIME__;
 +char buildtime[] = "??? ?? ???? ??:??:??";
-Index: tigervnc-1.4.1/unix/x0vncserver/buildtime.c
+Index: tigervnc-1.8.0/unix/x0vncserver/buildtime.c
 ===================================================================
---- tigervnc-1.4.1.orig/unix/x0vncserver/buildtime.c
+--- tigervnc-1.8.0.orig/unix/x0vncserver/buildtime.c
-+++ tigervnc-1.4.1/unix/x0vncserver/buildtime.c
++++ tigervnc-1.8.0/unix/x0vncserver/buildtime.c
 @@ -15,4 +15,4 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
   * USA.
   */
 -char buildtime[] = __DATE__ " " __TIME__;
 +char buildtime[] = "??? ?? ???? ??:??:??";
-Index: tigervnc-1.4.1/win/winvnc/buildTime.cxx
+Index: tigervnc-1.8.0/win/winvnc/buildTime.cxx
 ===================================================================
---- tigervnc-1.4.1.orig/win/winvnc/buildTime.cxx
+--- tigervnc-1.8.0.orig/win/winvnc/buildTime.cxx
-+++ tigervnc-1.4.1/win/winvnc/buildTime.cxx
++++ tigervnc-1.8.0/win/winvnc/buildTime.cxx
 @@ -15,4 +15,4 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
   * USA.
   */
 -const char* buildTime = "Built on " __DATE__ " at " __TIME__;
 +const char* buildTime = "Built on ??? ?? ???? at ??:??:??";
-Index: tigervnc-1.4.1/CMakeLists.txt
+Index: tigervnc-1.8.0/CMakeLists.txt
+===================================================================
+--- tigervnc-1.8.0.orig/CMakeLists.txt
++++ tigervnc-1.8.0/CMakeLists.txt
+@@ -42,12 +42,6 @@ if(MSVC)
+   message(FATAL_ERROR "TigerVNC cannot be built with Visual Studio.  Please use MinGW")
+ endif()
+ 
+-if(NOT BUILD_TIMESTAMP)
+-  set(BUILD_TIMESTAMP "")
+-  execute_process(COMMAND "date" "+%Y-%m-%d %H:%M" OUTPUT_VARIABLE BUILD_TIMESTAMP)
+-  string(REGEX REPLACE "\n" "" BUILD_TIMESTAMP ${BUILD_TIMESTAMP})
+-endif()
+-
+ # Default to optimised builds instead of debug ones. Our code has no bugs ;)
+ # (CMake makes it fairly easy to toggle this back to Debug if needed)
+ if(NOT CMAKE_BUILD_TYPE)
+Index: tigervnc-1.8.0/vncviewer/vncviewer.cxx
+===================================================================
+--- tigervnc-1.8.0.orig/vncviewer/vncviewer.cxx
++++ tigervnc-1.8.0/vncviewer/vncviewer.cxx
+@@ -98,11 +98,9 @@ static const char *about_text()
+   // time.
+   snprintf(buffer, sizeof(buffer),
+            _("TigerVNC Viewer %d-bit v%s\n"
+-             "Built on: %s\n"
+              "Copyright (C) 1999-%d TigerVNC Team and many others (see README.txt)\n"
+              "See http://www.tigervnc.org for information on TigerVNC."),
+-           (int)sizeof(size_t)*8, PACKAGE_VERSION,
+-           BUILD_TIMESTAMP, 2017);
++           (int)sizeof(size_t)*8, PACKAGE_VERSION, 2017);
+ 
+   return buffer;
+ }

tigervnc.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Apr 11 09:48:51 UTC 2018 - jengelh@inai.de
+
+- Limit feature description to openSUSE. Ensure neutrality of
+  description.
+
+-------------------------------------------------------------------
+Wed Apr 11 08:12:52 UTC 2018 - msrb@suse.com
+
+- Add u_change-button-layout-in-ServerDialog.patch
+  * To fit strings in languages with longer words... (bnc#1084865)
+- Refresh n_tigervnc-date-time.patch
+  * Completely hide the build time (bnc#1082968)
+
 -------------------------------------------------------------------
 Thu Mar 22 14:27:28 UTC 2018 - msrb@suse.com
 

tigervnc.spec

@@ -107,8 +107,8 @@ Requires(postun): update-alternatives
 %endif
 Url:            http://tigervnc.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        A high-performance, platform-neutral implementation of VNC
+Summary:        An implementation of VNC
-License:        GPL-2.0 and MIT
+License:        GPL-2.0-only AND MIT
 Group:          System/X11/Servers/XF86_4
 Source1:        https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz
 Source4:        10-libvnc.conf
@@ -140,13 +140,14 @@ Patch10:        U_handle_certificate_verification_for_saved_certs_correctly.patc
 Patch11:        u_tigervnc-add-autoaccept-parameter.patch
 Patch12:        u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch
 Patch13:        tigervnc-1.8.0-nowindows.patch
+Patch14:        u_change-button-layout-in-ServerDialog.patch
 
 %description
-TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), 
+TigerVNC is an implementation of VNC (Virtual Network Computing), a
-a client/server application that allows users to launch and interact with graphical applications on remote machines. 
+client/server application that allows users to launch and interact
-TigerVNC provides the levels of performance necessary to run 3D and video applications;
+with graphical applications on remote machines. TigerVNC is capable
-it attempts to maintain a common look and feel and re-use components, where possible, across the various platforms that it supports. 
+of running 3D and video applications. TigerVNC also provides
-TigerVNC also provides extensions for advanced authentication methods and TLS encryption.
+extensions for advanced authentication methods and TLS encryption.
 
 %package -n xorg-x11-Xvnc
 Requires(post): /usr/sbin/useradd
@@ -241,6 +242,7 @@ cp -r /usr/src/xserver/* unix/xserver/
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 pushd unix/xserver
 patch -p1 < ../xserver119.patch
@@ -250,7 +252,7 @@ popd
 export CXXFLAGS="%optflags"
 export CFLAGS="%optflags"
 # Build all tigervnc
-cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TIMESTAMP="??-??-?? ??:??"
+cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo
 make %{?_smp_mflags}
 
 # Build Xvnc server

u_change-button-layout-in-ServerDialog.patch

@@ -0,0 +1,35 @@
+Patch-mainline: To be upstreamed
+References: bnc#1084865
+Author: Michal Srb <msrb@suse.com>
+Subject: Change button layout in ServerDialog.
+
+To fit strings in languages with longer words...
+---
+ vncviewer/ServerDialog.cxx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/vncviewer/ServerDialog.cxx b/vncviewer/ServerDialog.cxx
+index de67f87b..0a8aa775 100644
+--- a/vncviewer/ServerDialog.cxx
++++ b/vncviewer/ServerDialog.cxx
+@@ -53,7 +53,7 @@ ServerDialog::ServerDialog()
+   
+   serverName = new Fl_Input(x, y, w() - margin*2 - server_label_width, INPUT_HEIGHT, _("VNC server:"));
+ 
+-  int adjust = (w() - 20) / 4;
++  int adjust = (w() - 20) / 3;
+   int button_width = adjust - margin/2;
+ 
+   x = margin;
+@@ -76,6 +76,8 @@ ServerDialog::ServerDialog()
+   
+   x = 0;
+   y += margin/2 + BUTTON_HEIGHT;
++  adjust = (w() - 20) / 4;
++  button_width = adjust - margin/2;
+ 
+   divider = new Fl_Box(x, y, w(), 2);
+   divider->box(FL_THIN_DOWN_FRAME);
+-- 
+2.13.6
+