openkylin
/
mate-desktop
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

format patches

This commit is contained in:
openKylinBot 2022-05-14 03:39:29 +08:00
parent 62bd203ce3
commit 669ec7541b
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/patches/2001_prefer-x-terminal-emulator.patch vendored
View File

@ -1,14 +1,22 @@
Description: Debian specific; prefer x-terminal-emulator as terminal to run applications in.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 14 May 2022 03:39:29 +0800
Subject: Debian specific;
prefer x-terminal-emulator as terminal to run applications in.
---
libmate-desktop/mate-desktop-utils.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libmate-desktop/mate-desktop-utils.c b/libmate-desktop/mate-desktop-utils.c
index b86253e..fd8466b 100644
--- a/libmate-desktop/mate-desktop-utils.c
+++ b/libmate-desktop/mate-desktop-utils.c
@@ -136,6 +136,8 @@
@@ -135,6 +135,8 @@ mate_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
* as -e in mate-terminal is broken we use that. */
term_argv[1] = g_strdup ("-x");
} else {
if (check == NULL)
+ check = g_find_program_in_path ("x-terminal-emulator");
+ if (check == NULL)
+ check = g_find_program_in_path ("x-terminal-emulator");
if (check == NULL)
check = g_find_program_in_path ("nxterm");
if (check == NULL)
check = g_find_program_in_path ("color-xterm");

21
debian/patches/2002_reproducible-build.patch vendored
View File

@ -1,16 +1,23 @@
Description: Make the build reproducible
Author: Chris Lamb <lamby@debian.org>
From: Chris Lamb <lamby@debian.org>
Date: Sat, 14 May 2022 03:39:29 +0800
Subject: Make the build reproducible
Last-Update: 2020-02-15
---
configure.ac | 3 +++
1 file changed, 3 insertions(+)
--- mate-desktop-1.24.0.orig/configure.ac
+++ mate-desktop-1.24.0/configure.ac
@@ -62,6 +62,9 @@ AC_DEFINE(MATE_MINOR, [mate_minor], [Def
diff --git a/configure.ac b/configure.ac
index af02709..db96529 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,9 @@ AC_DEFINE(MATE_MINOR, [mate_minor], [Define to the minor version])
AC_DEFINE(MATE_MICRO, [mate_micro], [Define to the micro version])
RELEASE_YEAR=`date +%Y`
+if test "x$SOURCE_DATE_EPOCH" != "x"; then
+ RELEASE_YEAR=`date -u -d "@$SOURCE_DATE_EPOCH" +%Y 2>/dev/null || date -u -r $SOURCE_DATE_EPOCH +%Y || date -u +%Y`
+fi
AC_SUBST([RELEASE_YEAR])
AC_ARG_ENABLE(deprecation_flags,

3
debian/patches/README vendored
View File

@ -1,3 +0,0 @@
0xxx: Grabbed from upstream development.
1xxx: Possibly relevant for upstream adoption.
2xxx: Only relevant for official Debian release.