awesome: Update to 4.3

Note: no documentation included yet, we don't have the tools

Awesome v4.3 is the third release of the 4.x API. It comes after one and
a half years of little fixes and improvements. Awesome v4.2 was very
stable thanks to everybody's effort to unit test everything. Given no
major bug warranted a new release, this one adds a few large features
while preserving full compatibility with existing user configurations.

Some highlights:
- Better DPI handling
- Extendable awful.rules providers and better awful.spawn functions
- A brand new keygrabber API
- A new GTK color palette based theme
- Widgets improvements

4 files changed, 12 insertions, 116 deletions

diff --git a/wm/awesome/patches/patch-CMakeLists.txt b/wm/awesome/patches/patch-CMakeLists.txt
index b5a54071c4b..f36e8898cb9 100644
--- a/wm/awesome/patches/patch-CMakeLists.txt
+++ b/wm/awesome/patches/patch-CMakeLists.txt
@@ -1,15 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2017/08/15 10:57:35 triaxx Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2019/07/17 22:08:58 nia Exp $
 
-Use pkgsrc lua interpreter instead of builtin one.
+Install config file to the examples directory.
 
---- CMakeLists.txt.orig	2017-07-15 13:53:13.000000000 +0000
+--- CMakeLists.txt.orig	2019-01-28 06:53:24.000000000 +0000
 +++ CMakeLists.txt
-@@ -406,7 +406,7 @@ add_custom_target(check-integration
-     VERBATIM)
- add_dependencies(check-integration test-gravity)
- add_custom_target(check-requires
--    lua "${CMAKE_SOURCE_DIR}/build-utils/check_for_invalid_requires.lua"
-+    @LUA_INTERPRETER@ "${CMAKE_SOURCE_DIR}/build-utils/check_for_invalid_requires.lua"
-     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-     COMMENT "Checking use of require()"
-     USES_TERMINAL
+@@ -371,7 +371,7 @@ install(TARGETS ${PROJECT_AWE_NAME} RUNT
+ install(FILES "utils/awesome-client" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESOME_DATA_PATH}
+     PATTERN "*.in" EXCLUDE)
+-install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${AWESOME_SYSCONFDIR}
++install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/awesome
+         RENAME rc.lua)
+ if(GENERATE_MANPAGES)
+     if(COMPRESS_MANPAGES)
diff --git a/wm/awesome/patches/patch-awesomeConfig.cmake b/wm/awesome/patches/patch-awesomeConfig.cmake
deleted file mode 100644
index 58fdd459566..00000000000
--- a/wm/awesome/patches/patch-awesomeConfig.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-awesomeConfig.cmake,v 1.5 2017/08/18 10:16:11 triaxx Exp $
-
-Use pkgsrc lua interpreter instead of builtin one.
-
---- awesomeConfig.cmake.orig	2017-07-15 13:53:13.000000000 +0000
-+++ awesomeConfig.cmake
-@@ -40,7 +40,7 @@ a_find_program(XMLTO_EXECUTABLE xmlto FA
- a_find_program(GZIP_EXECUTABLE gzip FALSE)
- # Lua documentation
- if(GENERATE_DOC)
--    a_find_program(LDOC_EXECUTABLE ldoc FALSE)
-+    a_find_program(LDOC_EXECUTABLE @LDOC_EXECUTABLE@ FALSE)
-     if(NOT LDOC_EXECUTABLE)
-         a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
-     endif()
-@@ -361,7 +361,7 @@ file(MAKE_DIRECTORY ${BUILD_DIR}/script_
- 
- add_custom_command(
-         OUTPUT ${BUILD_DIR}/docs/06-appearance.md
--        COMMAND lua ${SOURCE_DIR}/docs/06-appearance.md.lua
-+        COMMAND @LUA_INTERPRETER@ ${SOURCE_DIR}/docs/06-appearance.md.lua
-         ${BUILD_DIR}/docs/06-appearance.md
-         DEPENDS lgi-check
- )
-@@ -369,7 +369,7 @@ add_custom_command(
- add_custom_command(
-         OUTPUT ${BUILD_DIR}/awesomerc.lua ${BUILD_DIR}/docs/05-awesomerc.md
-             ${BUILD_DIR}/script_files/rc.lua
--        COMMAND lua ${SOURCE_DIR}/docs/05-awesomerc.md.lua
-+        COMMAND @LUA_INTERPRETER@ ${SOURCE_DIR}/docs/05-awesomerc.md.lua
-         ${BUILD_DIR}/docs/05-awesomerc.md ${SOURCE_DIR}/awesomerc.lua
-         ${BUILD_DIR}/awesomerc.lua
-         ${BUILD_DIR}/script_files/rc.lua
-@@ -377,7 +377,7 @@ add_custom_command(
- 
- add_custom_command(
-         OUTPUT ${BUILD_DIR}/script_files/theme.lua
--        COMMAND lua ${SOURCE_DIR}/docs/sample_theme.lua ${BUILD_DIR}/script_files/
-+        COMMAND @LUA_INTERPRETER@ ${SOURCE_DIR}/docs/sample_theme.lua ${BUILD_DIR}/script_files/
- )
- 
- # Create a target for the auto-generated awesomerc.lua and other files
diff --git a/wm/awesome/patches/patch-build-utils_lgi-check.sh b/wm/awesome/patches/patch-build-utils_lgi-check.sh
deleted file mode 100644
index 3e2ca73e0e2..00000000000
--- a/wm/awesome/patches/patch-build-utils_lgi-check.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-build-utils_lgi-check.sh,v 1.2 2017/08/15 10:57:35 triaxx Exp $
-
-Use pkgsrc lua interpreter instead of builtin one.
-
---- build-utils/lgi-check.sh.orig	2017-07-15 13:53:13.000000000 +0000
-+++ build-utils/lgi-check.sh
-@@ -22,16 +22,16 @@ die()
- }
- 
- # Check if we have lgi
--lua -e 'require("lgi")' || die
-+@LUA_INTERPRETER@ -e 'require("lgi")' || die
- 
- # Check the version number.
- # Keep this in sync with lib/gears/surface.lua and .travis.yml (LGIVER)!
--lua -e '_, _, major_minor, patch = string.find(require("lgi.version"), "^(%d%.%d)%.(%d)");
-+@LUA_INTERPRETER@ -e '_, _, major_minor, patch = string.find(require("lgi.version"), "^(%d%.%d)%.(%d)");
- 	if tonumber(major_minor) < 0.8 or (tonumber(major_minor) == 0.8 and tonumber(patch) < 0) then
- 		error(string.format("lgi is too old, need at least version %s, got %s.",
- 		                    "0.8.0", require("lgi.version"))) end' || die
- 
- # Check for the needed gi files
--lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo, l.GLib, l.Gio)' || die
-+@LUA_INTERPRETER@ -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo, l.GLib, l.Gio)' || die
- 
- # vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/wm/awesome/patches/patch-tests_examples_CMakeLists.txt b/wm/awesome/patches/patch-tests_examples_CMakeLists.txt
deleted file mode 100644
index 96060b1d280..00000000000
--- a/wm/awesome/patches/patch-tests_examples_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-tests_examples_CMakeLists.txt,v 1.1 2017/08/15 10:57:35 triaxx Exp $
-
-Use pkgsrc lua interpreter instead of builtin one.
-
---- tests/examples/CMakeLists.txt.orig	2017-07-15 13:53:13.000000000 +0000
-+++ tests/examples/CMakeLists.txt
-@@ -12,7 +12,7 @@
- cmake_minimum_required(VERSION 3.0.0)
- 
- # Get and update the LUA_PATH so the scripts can be executed without Awesome.
--execute_process(COMMAND lua -e print\(package.path\) OUTPUT_VARIABLE "LUA_PATH_")
-+execute_process(COMMAND @LUA_INTERPRETER@ -e print\(package.path\) OUTPUT_VARIABLE "LUA_PATH_")
- 
- # Make sure the system can be called from the test directory
- if(NOT SOURCE_DIR AND ${CMAKE_CURRENT_SOURCE_DIR} MATCHES "/tests/examples")
-@@ -26,7 +26,7 @@ endif()
- 
- if (DEFINED ENV{DO_COVERAGE} AND NOT $ENV{DO_COVERAGE} STREQUAL "0")
-   execute_process(
--    COMMAND lua -e "require('luacov.runner')('${TOP_SOURCE_DIR}/.luacov')"
-+    COMMAND @LUA_INTERPRETER@ -e "require('luacov.runner')('${TOP_SOURCE_DIR}/.luacov')"
-     RESULT_VARIABLE TEST_RESULT
-     ERROR_VARIABLE  TEST_ERROR
-     ERROR_STRIP_TRAILING_WHITESPACE)
-@@ -34,9 +34,9 @@ if (DEFINED ENV{DO_COVERAGE} AND NOT $EN
-     message(${TEST_ERROR})
-     message(FATAL_ERROR "Failed to run luacov.runner.")
-   endif()
--  set(LUA_COV_RUNNER lua "-erequire('luacov.runner')('${TOP_SOURCE_DIR}/.luacov')")
-+  set(LUA_COV_RUNNER @LUA_INTERPRETER@ "-erequire('luacov.runner')('${TOP_SOURCE_DIR}/.luacov')")
- else()
--  set(LUA_COV_RUNNER lua)
-+  set(LUA_COV_RUNNER @LUA_INTERPRETER@)
- endif()
- 
- # Add the main awesome lua libraries.