FTBFS fix for Lua 5.4

3 files changed, 21 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85a9be835ebd..44c6eb7e27e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,11 +9,13 @@ pkgbase = devilspie2
 	depends = lua>=5.1
 	depends = gtk3
 	depends = libwnck3
-	source = http://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.43-src.tar.gz
-	source = http://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.43-src.tar.gz.asc
+	source = http://download.savannah.nongnu.org/releases/devilspie2/devilspie2_0.43-src.tar.gz
+	source = http://download.savannah.nongnu.org/releases/devilspie2/devilspie2_0.43-src.tar.gz.asc
+	source = devilspie2-0.43-lua-5.4.patch
 	validpgpkeys = DB306E4B10FFD98EF4DB55D7194B631AB2DA2888
 	md5sums = 26eed0b5b4af5c7e13c551eceaeab832
 	md5sums = SKIP
+	md5sums = 8fd96127706934b138af50aaa2da0664
 
 pkgname = devilspie2
 
diff --git a/PKGBUILD b/PKGBUILD
index 4270f4b8a8b9..a78ceb2c8b3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,11 @@ arch=('i686' 'x86_64')
 url="http://www.nongnu.org/$pkgname/"
 license=('GPL3')
 depends=('lua>=5.1' 'gtk3' 'libwnck3')
-source=("http://download.savannah.gnu.org/releases/$pkgname/${pkgname}_$pkgver-src.tar.gz"{,.asc})
+source=("http://download.savannah.nongnu.org/releases/$pkgname/${pkgname}_$pkgver-src.tar.gz"{,.asc}
+	    "$pkgname-0.43-lua-5.4.patch")
 md5sums=('26eed0b5b4af5c7e13c551eceaeab832'
-         'SKIP')
+         'SKIP'
+         '8fd96127706934b138af50aaa2da0664')
 validpgpkeys=('DB306E4B10FFD98EF4DB55D7194B631AB2DA2888') # Andreas Rönnquist <gusnan@gusnan.se>
 
 build() {
diff --git a/devilspie2-0.43-lua-5.4.patch b/devilspie2-0.43-lua-5.4.patch
new file mode 100644
index 000000000000..8cbec6bafadf
--- /dev/null
+++ b/devilspie2-0.43-lua-5.4.patch
@@ -0,0 +1,13 @@
+diff -ur -Nur devilspie2-0.43.orig/src/script_functions.c devilspie2-0.43/src/script_functions.c
+--- devilspie2-0.43.orig/src/script_functions.c	2017-09-26 15:03:36.000000000 +0200
++++ devilspie2-0.43/src/script_functions.c	2020-06-30 15:29:15.024643740 +0200
+@@ -470,8 +470,7 @@
+ 		lua_call(lua, 1, 1);
+ 		s = lua_tostring(lua, -1);  /* get result */
+ 		if (s == NULL)
+-			return luaL_error(lua, LUA_QL("tostring") " must return a string to "
+-			                  LUA_QL("print"));
++			return luaL_error(lua, "'tostring' must return a string to 'print'");
+ 		if (i > 1) {
+ 			if (devilspie2_debug) fputs("\t", stdout);
+ 		}