Extend reproducible.patch to override build date (boo#1047218) OBS-URL: https://build.opensuse.org/request/show/622368 OBS-URL: https://build.opensuse.org/package/show/Emulators/dosemu?expand=0&rev=25
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
Upstream via
|
|
https://github.com/stsp/dosemu2/pull/386
|
|
and https://github.com/stsp/dosemu2/commit/8d7ab25daf6f2d8ca09e1598fd11de2d8460255e
|
|
and https://github.com/stsp/dosemu2/pull/640
|
|
|
|
Index: dosemu-1.4.0.1/src/arch/linux/Makefile.main
|
|
===================================================================
|
|
--- dosemu-1.4.0.1.orig/src/arch/linux/Makefile.main
|
|
+++ dosemu-1.4.0.1/src/arch/linux/Makefile.main
|
|
@@ -70,7 +70,7 @@ default: version include/confpath.h dosl
|
|
../etc/vga10x24.pcf.gz:
|
|
ifdef X_SUPPORT
|
|
@for i in $(REALTOPDIR)/etc/*.bdf; do \
|
|
- bdftopcf $$i | gzip -c -9 > ../etc/`basename $$i .bdf`.pcf.gz; \
|
|
+ bdftopcf $$i | gzip -n -c -9 > ../etc/`basename $$i .bdf`.pcf.gz; \
|
|
done
|
|
@cd ../etc; mkfontdir -x bdf
|
|
endif
|
|
Index: dosemu-1.4.0.1/mkpluginhooks
|
|
===================================================================
|
|
--- dosemu-1.4.0.1.orig/mkpluginhooks
|
|
+++ dosemu-1.4.0.1/mkpluginhooks
|
|
@@ -15,7 +15,7 @@ PINC=plugin_incdirs
|
|
PCONF=plugin_configure
|
|
PARSDIR=src/base/init
|
|
|
|
-PDIRS=`cd $SRCDIR; find ./ -maxdepth 1 ! -name include -type d -printf ' %f'`
|
|
+PDIRS=`cd $SRCDIR; find ./ -maxdepth 1 ! -name include -type d -printf '\n%f' | LC_ALL=C sort`
|
|
|
|
function gendummy {
|
|
for i in $HEADERS; do
|
|
Index: dosemu-1.4.0.1/configure.ac
|
|
===================================================================
|
|
--- dosemu-1.4.0.1.orig/configure.ac
|
|
+++ dosemu-1.4.0.1/configure.ac
|
|
@@ -416,7 +416,9 @@ AC_SUBST(PATCHLEVEL2)
|
|
AC_SUBST(RELEASE_DATE)
|
|
|
|
AC_DEFINE_UNQUOTED(EMUVER, "$EMUVER")
|
|
-CONFIG_TIME=`date`
|
|
+DATE_FMT="%F %T %z"
|
|
+SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
|
|
+CONFIG_TIME=$(date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u "+$DATE_FMT")
|
|
AC_DEFINE_UNQUOTED(CONFIG_HOST, "$CONFIG_HOST")
|
|
AC_DEFINE_UNQUOTED(CONFIG_TIME, "$CONFIG_TIME")
|
|
AC_DEFINE_UNQUOTED(VERSION, $VERSION)
|