diff --git a/n_tigervnc-date-time.patch b/n_tigervnc-date-time.patch index 24b40b9..dc0f497 100644 --- a/n_tigervnc-date-time.patch +++ b/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.4.1/unix/xserver/hw/vnc/buildtime.c +--- tigervnc-1.8.0.orig/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.4.1/unix/vncconfig/buildtime.c +--- tigervnc-1.8.0.orig/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.4.1/unix/x0vncserver/buildtime.c +--- tigervnc-1.8.0.orig/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.4.1/win/winvnc/buildTime.cxx +--- tigervnc-1.8.0.orig/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; + } diff --git a/tigervnc.changes b/tigervnc.changes index 3caac5a..d6de1b1 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,8 +1,10 @@ ------------------------------------------------------------------- Wed Apr 11 08:12:52 UTC 2018 - msrb@suse.com -- u_change-button-layout-in-ServerDialog.patch +- 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 diff --git a/tigervnc.spec b/tigervnc.spec index c3dab5a..83585b1 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -252,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