cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to awesome-4.2

Browse Source
This commit is contained in:
dcoppa 2017-08-05 20:18:11 +00:00
parent 89cf21cf99
commit c72d528d1e
14 changed files with 100 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/awesome/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.106 2017/03/21 19:48:01 dcoppa Exp $
# $OpenBSD: Makefile,v 1.107 2017/08/05 20:18:11 dcoppa Exp $
COMMENT= highly configurable framework window manager
VER= 4.1
VER= 4.2
DISTNAME= awesome-${VER}
EXTRACT_SUFX= .tar.xz
CATEGORIES= x11
@ -57,28 +57,23 @@ CONFIGURE_ARGS= -DCOMPRESS_MANPAGES=off \
-DGENERATE_DOC=off \
-DSYSCONFDIR=${SYSCONFDIR}
SEPARATE_BUILD= No
NO_TEST= Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/awesomeConfig.cmake \
${WRKSRC}/docs/06-appearance.md.lua \
${WRKSRC}/lib/awful/completion.lua \
${WRKSRC}/lib/awful/util.lua \
${WRKSRC}/lib/beautiful/init.lua \
${WRKSRC}/lib/gears/filesystem.lua \
${WRKSRC}/lib/menubar/icon_theme.lua \
${WRKSRC}/lib/menubar/menu_gen.lua \
${WRKSRC}/lib/naughty/core.lua \
${WRKSRC}/themes/default/theme.lua \
${WRKSRC}/themes/xresources/theme.lua \
${WRKSRC}/utils/awesome-client
post-install:
@rm ${WRKINST}${LOCALBASE}/share/awesome/lib/awful/*.{beforesubst,orig} \
${WRKINST}${LOCALBASE}/share/awesome/lib/beautiful/*.{beforesubst,orig} \
${WRKINST}${LOCALBASE}/share/awesome/lib/menubar/*.{beforesubst,orig} \
${WRKINST}${LOCALBASE}/share/awesome/lib/naughty/*.{beforesubst,orig} \
${WRKINST}${LOCALBASE}/share/awesome/themes/default/*.{beforesubst,orig} \
@rm ${WRKINST}${LOCALBASE}/share/awesome/themes/default/*.{beforesubst,orig} \
${WRKINST}${LOCALBASE}/share/awesome/themes/xresources/*.{beforesubst,orig}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/awesome
@mv ${WRKINST}${SYSCONFDIR}/xdg/awesome/rc.lua \

4
x11/awesome/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (awesome-4.1.tar.xz) = J6HbE+9KqOEEp5XowRyGEdddiw2GTCd7jvfG8attBLg=
SIZE (awesome-4.1.tar.xz) = 960768
SHA256 (awesome-4.2.tar.xz) = rF2hqZ9frQg4IZk9K1bRzZWUFk6vwL4r61QFmDRdl08=
SIZE (awesome-4.2.tar.xz) = 987024

27
x11/awesome/patches/patch-CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.18 2017/03/21 19:48:01 dcoppa Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.19 2017/08/05 20:18:11 dcoppa Exp $
These auto-generated (db2man.xsl) manpages contain a mixture of ISO
latin-1 characters and numerical HTML entities that neither mandoc
@ -6,9 +6,10 @@ nor groff can fully understand: do not install them.
Fix usage of -export-dynamic
--- CMakeLists.txt.orig Sat Mar 18 10:49:46 2017
+++ CMakeLists.txt Tue Mar 21 18:07:44 2017
@@ -81,7 +81,6 @@ set(AWE_MAN_SRCS
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -97,7 +97,6 @@ set(AWE_MAN_SRCS
${SOURCE_DIR}/manpages/awesome.1.txt
${SOURCE_DIR}/manpages/awesome-client.1.txt
${SOURCE_DIR}/manpages/awesomerc.5.txt)
@ -16,7 +17,7 @@ Fix usage of -export-dynamic
# Don't strip RPATH if compiling on Solaris
if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
@@ -95,12 +94,11 @@ add_executable(${PROJECT_AWE_NAME}
@@ -111,12 +110,11 @@ add_executable(${PROJECT_AWE_NAME}
# CFLAGS
set(AWESOME_C_FLAGS
@ -34,7 +35,7 @@ Fix usage of -export-dynamic
CACHE STRING "CFLAGS used to compile ${PROJECT_AWE_NAME}")
mark_as_advanced(AWESOME_C_FLAGS)
target_compile_options(${PROJECT_AWE_NAME} PRIVATE ${AWESOME_C_FLAGS})
@@ -108,23 +106,11 @@ target_compile_options(${PROJECT_AWE_NAME} PRIVATE ${A
@@ -124,23 +122,11 @@ target_compile_options(${PROJECT_AWE_NAME} PRIVATE ${A
# Make sure awesomerc.lua is generated
add_dependencies(${PROJECT_AWE_NAME} generate_awesomerc)
@ -61,7 +62,7 @@ Fix usage of -export-dynamic
endif()
target_link_libraries(${PROJECT_AWE_NAME}
@@ -132,10 +118,6 @@ target_link_libraries(${PROJECT_AWE_NAME}
@@ -148,10 +134,6 @@ target_link_libraries(${PROJECT_AWE_NAME}
${AWESOME_REQUIRED_LDFLAGS}
${AWESOME_OPTIONAL_LDFLAGS})
@ -72,7 +73,7 @@ Fix usage of -export-dynamic
# {{{ Generated sources
# atoms
file(MAKE_DIRECTORY ${BUILD_DIR}/common)
@@ -186,68 +168,45 @@ if(GENERATE_MANPAGES)
@@ -202,68 +184,45 @@ if(GENERATE_MANPAGES)
if(NOT BUILD_DIR STREQUAL SOURCE_DIR)
file(MAKE_DIRECTORY ${BUILD_DIR}/manpages)
endif()
@ -174,7 +175,7 @@ Fix usage of -export-dynamic
endforeach()
add_custom_target(man ALL DEPENDS ${MAN_FILES})
@@ -354,13 +313,8 @@ install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESO
@@ -374,13 +333,8 @@ install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESO
install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${AWESOME_SYSCONFDIR}
RENAME rc.lua)
if(GENERATE_MANPAGES)
@ -190,15 +191,15 @@ Fix usage of -export-dynamic
endif()
install(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_DATA_PATH})
install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}
@@ -374,6 +328,7 @@ if(GENERATE_DOC)
@@ -394,6 +348,7 @@ if(GENERATE_DOC)
endif()
# }}}
+#[[
# {{{ Tests
add_custom_target(check-integration
sh -c "CMAKE_BINARY_DIR='${CMAKE_BINARY_DIR}' ${CMAKE_SOURCE_DIR}/tests/run.sh"
@@ -422,5 +377,6 @@ add_custom_target(check DEPENDS ${CHECK_TARGETS} check
add_executable(test-gravity tests/test-gravity.c)
target_link_libraries(test-gravity
@@ -450,5 +405,6 @@ add_custom_target(check DEPENDS ${CHECK_TARGETS} check
# }}}
INCLUDE(${CMAKE_SOURCE_DIR}/Packaging.cmake)

15
x11/awesome/patches/patch-awesomeConfig_cmake
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-awesomeConfig_cmake,v 1.22 2017/03/22 17:35:26 dcoppa Exp $
--- awesomeConfig.cmake.orig Sat Mar 18 10:49:46 2017
+++ awesomeConfig.cmake Wed Mar 22 18:25:36 2017
@@ -269,11 +269,7 @@ endif()
$OpenBSD: patch-awesomeConfig_cmake,v 1.23 2017/08/05 20:18:11 dcoppa Exp $
Index: awesomeConfig.cmake
--- awesomeConfig.cmake.orig
+++ awesomeConfig.cmake
@@ -236,11 +236,7 @@ endif()
# {{{ Install path and configuration variables
#If a sysconfdir is specified, use it instead
#of the default configuration dir.
@ -14,7 +15,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.22 2017/03/22 17:35:26 dcoppa Exp $
#If an XDG Config Dir is specificed, use it instead
#of the default XDG configuration dir.
@@ -308,7 +304,7 @@ endif()
@@ -275,7 +271,7 @@ endif()
if(DEFINED AWESOME_MAN_PATH)
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
else()
@ -23,7 +24,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.22 2017/03/22 17:35:26 dcoppa Exp $
endif()
# Hide to avoid confusion
@@ -394,15 +390,14 @@ file(MAKE_DIRECTORY ${BUILD_DIR}/script_files/)
@@ -361,15 +357,14 @@ file(MAKE_DIRECTORY ${BUILD_DIR}/script_files/)
add_custom_command(
OUTPUT ${BUILD_DIR}/docs/06-appearance.md
@ -41,7 +42,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.22 2017/03/22 17:35:26 dcoppa Exp $
${BUILD_DIR}/docs/05-awesomerc.md ${SOURCE_DIR}/awesomerc.lua
${BUILD_DIR}/awesomerc.lua
${BUILD_DIR}/script_files/rc.lua
@@ -410,7 +405,7 @@ add_custom_command(
@@ -377,7 +372,7 @@ add_custom_command(
add_custom_command(
OUTPUT ${BUILD_DIR}/script_files/theme.lua

9
x11/awesome/patches/patch-awesomerc_lua
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-awesomerc_lua,v 1.2 2017/03/21 19:48:01 dcoppa Exp $
--- awesomerc.lua.orig Sat Mar 18 10:49:46 2017
+++ awesomerc.lua Tue Mar 21 18:07:44 2017
@@ -48,7 +48,7 @@ beautiful.init(awful.util.get_themes_dir() .. "default
$OpenBSD: patch-awesomerc_lua,v 1.3 2017/08/05 20:18:11 dcoppa Exp $
Index: awesomerc.lua
--- awesomerc.lua.orig
+++ awesomerc.lua
@@ -49,7 +49,7 @@ beautiful.init(gears.filesystem.get_themes_dir() .. "d
-- @DOC_DEFAULT_APPLICATIONS@
-- This is used later as the default terminal and editor to run.
terminal = "xterm"

11
x11/awesome/patches/patch-docs_06-appearance_md_lua Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-docs_06-appearance_md_lua,v 1.1 2017/08/05 20:18:11 dcoppa Exp $
Index: docs/06-appearance.md.lua
--- docs/06-appearance.md.lua.orig
+++ docs/06-appearance.md.lua
@@ -1,4 +1,4 @@
-#! /usr/bin/lua
+#!${MODLUA_BIN}
local args = {...}
local gio = require("lgi").Gio

24
x11/awesome/patches/patch-lib_awful_completion_lua
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-lib_awful_completion_lua,v 1.1 2017/03/21 19:48:01 dcoppa Exp $
--- lib/awful/completion.lua.orig Tue Mar 21 20:26:14 2017
+++ lib/awful/completion.lua Tue Mar 21 20:26:49 2017
@@ -29,7 +29,7 @@ local bashcomp_src = "@SYSCONFDIR@/bash_completion"
$OpenBSD: patch-lib_awful_completion_lua,v 1.2 2017/08/05 20:18:11 dcoppa Exp $
Index: lib/awful/completion.lua
--- lib/awful/completion.lua.orig
+++ lib/awful/completion.lua
@@ -31,7 +31,7 @@ local bashcomp_src = "@SYSCONFDIR@/bash_completion"
-- @param src The bash completion source file, /etc/bash_completion by default.
function completion.bashcomp_load(src)
if src then bashcomp_src = src end
@ -10,22 +11,23 @@ $OpenBSD: patch-lib_awful_completion_lua,v 1.1 2017/03/21 19:48:01 dcoppa Exp $
if c then
while true do
local line = c:read("*line")
@@ -99,12 +99,12 @@ function completion.shell(command, cur_pos, ncomp, she
@@ -120,13 +120,13 @@ function completion.shell(command, cur_pos, ncomp, she
if comptype == "file" then
-- NOTE: ${~:-"..."} turns on GLOB_SUBST, useful for expansion of
-- "~/" ($HOME). ${:-"foo"} is the string "foo" as var.
- shell_cmd = "/usr/bin/env zsh -c 'local -a res; res=( ${~:-"
+ shell_cmd = "${LOCALBASE}/bin/zsh -c 'local -a res; res=( ${~:-"
.. string.format('%q', words[cword_index]) .. "}* ); "
.. string.format('%q', words[cword_index]) .. "}*(N) ); "
.. "print -ln -- ${res[@]}'"
else
-- check commands, aliases, builtins, functions and reswords
- shell_cmd = "/usr/bin/env zsh -c 'local -a res; "..
+ shell_cmd = "${LOCALBASE}/bin/zsh -c 'local -a res; "..
-- Check commands, aliases, builtins, functions and reswords.
-- Adds executables and non-empty dirs from $PWD (pwd_exe).
- shell_cmd = "/usr/bin/env zsh -c 'local -a res pwd_exe; "..
+ shell_cmd = "${LOCALBASE}/bin/zsh -c 'local -a res pwd_exe; "..
"pwd_exe=(*(N*:t) *(NF:t)); "..
"res=( "..
"\"${(k)commands[@]}\" \"${(k)aliases[@]}\" \"${(k)builtins[@]}\" \"${(k)functions[@]}\" "..
"\"${(k)reswords[@]}\" "..
@@ -115,13 +115,13 @@ function completion.shell(command, cur_pos, ncomp, she
@@ -138,13 +138,13 @@ function completion.shell(command, cur_pos, ncomp, she
else
if bashcomp_funcs[words[1]] then
-- fairly complex command with inline bash script to get the possible completions

9
x11/awesome/patches/patch-lib_awful_util_lua
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-lib_awful_util_lua,v 1.2 2017/03/21 19:48:01 dcoppa Exp $
--- lib/awful/util.lua.orig Sat Mar 18 10:49:46 2017
+++ lib/awful/util.lua Tue Mar 21 18:07:44 2017
@@ -230,12 +230,12 @@ end
$OpenBSD: patch-lib_awful_util_lua,v 1.3 2017/08/05 20:18:11 dcoppa Exp $
Index: lib/awful/util.lua
--- lib/awful/util.lua.orig
+++ lib/awful/util.lua
@@ -236,12 +236,12 @@ end
-- given extensions for the icon filename.
-- @param iconname The name of the icon to search for.
-- @param exts Table of image extensions allowed, otherwise { 'png', gif' }

9
x11/awesome/patches/patch-lib_beautiful_init_lua
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-lib_beautiful_init_lua,v 1.2 2017/03/21 19:48:01 dcoppa Exp $
--- lib/beautiful/init.lua.orig Sat Mar 18 10:49:46 2017
+++ lib/beautiful/init.lua Tue Mar 21 18:07:44 2017
@@ -88,7 +88,7 @@ local active_font
$OpenBSD: patch-lib_beautiful_init_lua,v 1.3 2017/08/05 20:18:11 dcoppa Exp $
Index: lib/beautiful/init.lua
--- lib/beautiful/init.lua.orig
+++ lib/beautiful/init.lua
@@ -89,7 +89,7 @@ local active_font
-- @beautiful beautiful.wallpaper
-- The icon theme name.

14
x11/awesome/patches/patch-lib_gears_filesystem_lua Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-lib_gears_filesystem_lua,v 1.1 2017/08/05 20:18:11 dcoppa Exp $
Index: lib/gears/filesystem.lua
--- lib/gears/filesystem.lua.orig
+++ lib/gears/filesystem.lua
@@ -92,7 +92,7 @@ end
--- Get the data dirs according to the XDG basedir specification.
-- @treturn table the data dirs (XDG_DATA_DIRS) with a slash at the end of each entry.
function filesystem.get_xdg_data_dirs()
- local xdg_data_dirs = os.getenv("XDG_DATA_DIRS") or "/usr/share:/usr/local/share"
+ local xdg_data_dirs = os.getenv("XDG_DATA_DIRS") or "${LOCALBASE}/share"
return gtable.map(
function(dir) return dir .. "/" end,
gstring.split(xdg_data_dirs, ":"))

12
x11/awesome/patches/patch-lib_menubar_menu_gen_lua
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_menubar_menu_gen_lua,v 1.2 2017/03/21 19:48:01 dcoppa Exp $
--- lib/menubar/menu_gen.lua.orig Sat Mar 18 10:49:46 2017
+++ lib/menubar/menu_gen.lua Tue Mar 21 18:17:24 2017
@@ -25,7 +25,7 @@ end
--- Specifies all directories where menubar should look for .desktop
-- files. The search is recursive.
-menu_gen.all_menu_dirs = { data_dir .. '/applications/', '/usr/share/applications/', '/usr/local/share/applications/' }
+menu_gen.all_menu_dirs = { data_dir .. '/applications/', '${LOCALBASE}/share/applications/' }
--- Specify the mapping of .desktop Categories section to the
-- categories in the menubar. If "use" flag is set to false then any of

9
x11/awesome/patches/patch-lib_naughty_core_lua
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-lib_naughty_core_lua,v 1.2 2017/03/21 19:48:01 dcoppa Exp $
--- lib/naughty/core.lua.orig Sat Mar 18 10:49:46 2017
+++ lib/naughty/core.lua Tue Mar 21 18:07:44 2017
$OpenBSD: patch-lib_naughty_core_lua,v 1.3 2017/08/05 20:18:11 dcoppa Exp $
Index: lib/naughty/core.lua
--- lib/naughty/core.lua.orig
+++ lib/naughty/core.lua
@@ -41,7 +41,7 @@ Naughty configuration - a table containing common popu
@tfield[opt=apply_dpi(4)] int padding Space between popups and edge of the
workarea.
@ -10,7 +11,7 @@ $OpenBSD: patch-lib_naughty_core_lua,v 1.2 2017/03/21 19:48:01 dcoppa Exp $
that will be checked by `getIcon()`.
@tfield[opt={ "png", "gif" }] table icon_formats List of formats that will be
checked by `getIcon()`.
@@ -62,7 +62,7 @@ notifications, e.g.
@@ -66,7 +66,7 @@ notifications, e.g.
naughty.config = {
padding = dpi(4),
spacing = dpi(1),

11
x11/awesome/patches/patch-themes_xresources_theme_lua
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-themes_xresources_theme_lua,v 1.2 2017/03/21 19:48:01 dcoppa Exp $
--- themes/xresources/theme.lua.orig Sat Mar 18 10:49:46 2017
+++ themes/xresources/theme.lua Tue Mar 21 18:07:44 2017
@@ -65,7 +65,7 @@ theme = theme_assets.recolor_titlebar_focus(theme, the
theme = theme_assets.recolor_layout(theme, theme.fg_normal)
$OpenBSD: patch-themes_xresources_theme_lua,v 1.3 2017/08/05 20:18:11 dcoppa Exp $
Index: themes/xresources/theme.lua
--- themes/xresources/theme.lua.orig
+++ themes/xresources/theme.lua
@@ -94,7 +94,7 @@ theme = theme_assets.recolor_titlebar(
)
-- Define the icon theme for application icons. If not set then the icons
--- from /usr/share/icons and /usr/share/icons/hicolor will be used.

8
x11/awesome/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2017/03/21 19:48:01 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.17 2017/08/05 20:18:11 dcoppa Exp $
@bin bin/awesome
bin/awesome-client
@man man/man1/awesome-client.1
@ -25,7 +25,10 @@ share/awesome/lib/awful/ewmh.lua
share/awesome/lib/awful/hotkeys_popup/
share/awesome/lib/awful/hotkeys_popup/init.lua
share/awesome/lib/awful/hotkeys_popup/keys/
share/awesome/lib/awful/hotkeys_popup/keys/firefox.lua
share/awesome/lib/awful/hotkeys_popup/keys/init.lua
share/awesome/lib/awful/hotkeys_popup/keys/qutebrowser.lua
share/awesome/lib/awful/hotkeys_popup/keys/tmux.lua
share/awesome/lib/awful/hotkeys_popup/keys/vim.lua
share/awesome/lib/awful/hotkeys_popup/widget.lua
share/awesome/lib/awful/init.lua
@ -63,6 +66,7 @@ share/awesome/lib/awful/wibar.lua
share/awesome/lib/awful/wibox.lua
share/awesome/lib/awful/widget/
share/awesome/lib/awful/widget/button.lua
share/awesome/lib/awful/widget/calendar_popup.lua
share/awesome/lib/awful/widget/clienticon.lua
share/awesome/lib/awful/widget/common.lua
share/awesome/lib/awful/widget/graph.lua
@ -134,6 +138,7 @@ share/awesome/lib/wibox/layout/fixed.lua
share/awesome/lib/wibox/layout/flex.lua
share/awesome/lib/wibox/layout/grid.lua
share/awesome/lib/wibox/layout/init.lua
share/awesome/lib/wibox/layout/manual.lua
share/awesome/lib/wibox/layout/margin.lua
share/awesome/lib/wibox/layout/mirror.lua
share/awesome/lib/wibox/layout/ratio.lua
@ -143,6 +148,7 @@ share/awesome/lib/wibox/layout/stack.lua
share/awesome/lib/wibox/widget/
share/awesome/lib/wibox/widget/background.lua
share/awesome/lib/wibox/widget/base.lua
share/awesome/lib/wibox/widget/calendar.lua
share/awesome/lib/wibox/widget/checkbox.lua
share/awesome/lib/wibox/widget/graph.lua
share/awesome/lib/wibox/widget/imagebox.lua