SHA256
1
0
forked from pool/tigervnc

Accepting request 235723 from home:elvigia:branches:X11:XOrg

- n_tigervnc-date-time.patch package republishes everyday
 and gets on my nerves, this is because the binaries contain
 hardcoded timestamps, avoid that.
- export CXXFLAGS and CFLAGS before building ttigervnc otherwise
  it gets built without optimization.
- Make build verbose so it rpmlint catches errors like the above ones.

OBS-URL: https://build.opensuse.org/request/show/235723
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=30
This commit is contained in:
Michal Srb 2014-05-30 12:45:02 +00:00 committed by Git OBS Bridge
parent a6b08fbc40
commit 215d1da823
3 changed files with 57 additions and 4 deletions

View File

@ -0,0 +1,40 @@
--- tigervnc-1.3.1.orig/unix/xserver/hw/vnc/buildtime.c
+++ tigervnc-1.3.1/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[] = "??? ?? ???? ??:??:??";
--- tigervnc-1.3.1.orig/unix/vncconfig/buildtime.c
+++ tigervnc-1.3.1/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[] = "??? ?? ???? ??:??:??";
--- tigervnc-1.3.1.orig/unix/x0vncserver/buildtime.c
+++ tigervnc-1.3.1/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[] = "??? ?? ???? ??:??:??";
--- tigervnc-1.3.1.orig/vncviewer/buildTime.cxx
+++ tigervnc-1.3.1/vncviewer/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 ??:??:??";
--- tigervnc-1.3.1.orig/win/winvnc/buildTime.cxx
+++ tigervnc-1.3.1/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 ??:??:??";

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu May 29 03:37:30 UTC 2014 - crrodriguez@opensuse.org
- n_tigervnc-date-time.patch package republishes everyday
and gets on my nerves, this is because the binaries contain
hardcoded timestamps, avoid that.
- export CXXFLAGS and CFLAGS before building ttigervnc otherwise
it gets built without optimization.
- Make build verbose so it rpmlint catches errors like the above ones.
-------------------------------------------------------------------
Wed May 28 14:54:02 UTC 2014 - msrb@suse.com

View File

@ -107,7 +107,7 @@ Patch4: tigervnc-sf3492352.diff
Patch5: tigervnc-sf3495623.patch
Patch6: u_tigervnc-dont-send-ascii-control-characters.patch
Patch7: u_tigervnc-ignore-epipe-on-write.patch
Patch8: n_tigervnc-date-time.patch
# Xserver patches
Patch10: tigervnc-1.2.80-fix-int-to-pointer.patch
Patch11: u_aarch64-support.patch
@ -147,7 +147,7 @@ fi
%patch5 -p1
%patch6 -p0
%patch7 -p0
%patch8 -p1
pushd unix/xserver
patch -p1 < ../xserver114.patch
%patch10 -p1
@ -158,8 +158,10 @@ patch -p1 < ../xserver114.patch
popd
%build
export CXXFLAGS="%optflags"
export CFLAGS="%optflags"
# Build all tigervnc
cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo
cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo
make %{?_smp_mflags}
# Build Xvnc server
@ -180,7 +182,7 @@ autoreconf -fi
--disable-devel-docs \
--with-fontrootdir=/usr/share/fonts \
--disable-selective-werror
make %{?_smp_mflags}
make %{?_smp_mflags} V=1
popd
# Build java client