pool/xorg-x11-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 583450 from home:bmwiedemann:branches:X11:XOrg

Browse Source 
Add u_xorg-x11-server-reproducible.patch to make build reproducible (boo#1047218)

Now with extra metadata in patch

OBS-URL: https://build.opensuse.org/request/show/583450
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=694
This commit is contained in:
Stefan Dirsch 2018-03-06 15:29:04 +00:00 committed by Git OBS Bridge
parent 683dd399a9
commit 89fefb764a
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
u_xorg-x11-server-reproducible.patch Normal file
View File

@ -0,0 +1,33 @@
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Thu, 20 Jul 2017 15:42:15 +0100
Subject: configure.ac: Make BUILD_{DATE,TIME} respect SOURCE_DATE_EPOCH
References: boo#1047218
upstreaming in generalized form
https://lists.x.org/pipermail/xorg-devel/2017-July/054127.html from lamby
still not in 2018-02-20 with 1.19.6
Signed-off-by: Bernhard M. Wiedemann <bwiedemann suse de>
Index: xorg-server-1.19.3/configure.ac
===================================================================
--- xorg-server-1.19.3.orig/configure.ac
+++ xorg-server-1.19.3/configure.ac
@@ -2555,9 +2555,14 @@ AC_DEFINE_DIR(PROJECTROOT, prefix, [Over
AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [sysconfdir])
AC_SUBST([RELEASE_DATE])
-BUILD_DATE="`date +'%Y%m%d'`"
+if test "x$SOURCE_DATE_EPOCH" = "x"; then
+ BUILD_DATE="`date +'%Y%m%d'`"
+ BUILD_TIME="`date +'1%H%M%S'`"
+else
+ BUILD_DATE="`date --utc --date="@$SOURCE_DATE_EPOCH" +'%Y%m%d'`"
+ BUILD_TIME="`date --utc --date="@$SOURCE_DATE_EPOCH" +'1%H%M%S'`"
+fi
AC_SUBST([BUILD_DATE])
-BUILD_TIME="`date +'1%H%M%S'`"
AC_SUBST([BUILD_TIME])
DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"

6
xorg-x11-server.changes
View File

@ -8,6 +8,12 @@ Thu Feb 22 10:54:41 UTC 2018 - fcrozat@suse.com
* Various crash and bug fixes in XWayland server (bgo#791383,
bgo#790502).
-------------------------------------------------------------------
Tue Feb 20 20:07:00 UTC 2018 - bwiedemann@suse.com
- Add u_xorg-x11-server-reproducible.patch to make build reproducible
(boo#1047218)
-------------------------------------------------------------------
Fri Feb 9 15:13:00 UTC 2018 - sndirsch@suse.com

2
xorg-x11-server.spec
View File

@ -230,6 +230,7 @@ Patch1301: U_0001-animcur-Use-fixed-size-screen-private.patch
Patch1302: U_0002-animcur-Return-the-next-interval-directly-from-the-t.patch
Patch1303: U_0003-animcur-Run-the-timer-from-the-device-not-the-screen.patch
Patch1304: U_0004-animcur-Fix-transitions-between-animated-cursors.patch
Patch1305: u_xorg-x11-server-reproducible.patch
%description
This package contains the X.Org Server.
@ -379,6 +380,7 @@ sh %{SOURCE92} --verify . %{SOURCE91}
%patch1302 -p1
%patch1303 -p1
%patch1304 -p1
%patch1305 -p1
%build
test -e source-file-list || \