Update awesome to v3.4.14 (White Christmas)
This commit is contained in:
dcoppa
parent
9b16ff67b0
commit
92120f86f5
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.55 2012/11/22 08:53:32 dcoppa Exp $
|
||||
# $OpenBSD: Makefile,v 1.56 2012/12/31 17:41:43 dcoppa Exp $
|
||||
|
||||
COMMENT= highly configurable framework window manager
|
||||
|
||||
DISTNAME= awesome-3.4.13
|
||||
REVISION= 3
|
||||
DISTNAME= awesome-3.4.14
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
CATEGORIES= x11
|
||||
|
||||
@ -17,17 +16,17 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB+= GL Imlib2 X11 Xau Xdamage Xdmcp Xext Xfixes
|
||||
WANTLIB+= Xrender Xxf86vm c cairo dbus-1 drm ev
|
||||
WANTLIB+= execinfo expat fontconfig freetype glib-2.0
|
||||
WANTLIB+= gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB+= ${MODLUA_WANTLIB} m pango-1.0 pangocairo-1.0
|
||||
WANTLIB+= pangoft2-1.0 pixman-1 png pthread
|
||||
WANTLIB+= pthread-stubs startup-notification-1 xcb
|
||||
WANTLIB+= xcb-atom xcb-aux xcb-event xcb-icccm
|
||||
WANTLIB+= xcb-image xcb-keysyms xcb-property
|
||||
WANTLIB+= xcb-randr xcb-render xcb-shape xcb-shm
|
||||
WANTLIB+= xcb-xinerama xcb-xtest xdg-basedir z
|
||||
WANTLIB= GL Imlib2 X11 X11-xcb Xcursor Xext \
|
||||
Xrender c cairo dbus-1 ev execinfo \
|
||||
expat fontconfig freetype glib-2.0 \
|
||||
gobject-2.0 ${MODLUA_WANTLIB} m \
|
||||
pango-1.0 pangocairo-1.0 pangoft2-1.0 \
|
||||
pixman-1 png pthread-stubs \
|
||||
startup-notification-1 xcb xcb-atom \
|
||||
xcb-aux xcb-event xcb-icccm xcb-image \
|
||||
xcb-keysyms xcb-property xcb-randr \
|
||||
xcb-render xcb-shape xcb-shm \
|
||||
xcb-xinerama xcb-xtest xdg-basedir z
|
||||
|
||||
MASTER_SITES= ${HOMEPAGE}download/
|
||||
|
||||
@ -56,6 +55,7 @@ MODULES= devel/cmake \
|
||||
lang/lua
|
||||
|
||||
CONFIGURE_ARGS= -DCOMPRESS_MANPAGES=off
|
||||
CONFIGURE_ENV= SYSCONFDIR="${SYSCONFDIR}"
|
||||
|
||||
SEPARATE_BUILD= No
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (awesome-3.4.13.tar.xz) = GRbZadt2hOLc+COUheg39NyrDBe3u0R9q+7+xtF6Gko=
|
||||
SIZE (awesome-3.4.13.tar.xz) = 722876
|
||||
SHA256 (awesome-3.4.14.tar.xz) = ODdrizJ3GGPCTuKw1ElHxId5rP27z5wTpAq6BnAQlwo=
|
||||
SIZE (awesome-3.4.14.tar.xz) = 723292
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.13 2012/06/19 11:18:53 dcoppa Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.14 2012/12/31 17:41:44 dcoppa Exp $
|
||||
|
||||
These auto-generated (db2man.xsl) manpages contain a mixture of ISO
|
||||
latin-1 characters and numerical HTML entities that neither mandoc
|
||||
nor groff can fully understand: do not install them.
|
||||
|
||||
--- CMakeLists.txt.orig Mon May 16 16:35:17 2011
|
||||
+++ CMakeLists.txt Tue May 17 14:22:25 2011
|
||||
@@ -88,7 +88,6 @@ set(AWE_MAN_SRCS
|
||||
Fix usage of -export-dynamic
|
||||
|
||||
--- CMakeLists.txt.orig Mon Dec 24 15:36:05 2012
|
||||
+++ CMakeLists.txt Mon Dec 31 12:34:14 2012
|
||||
@@ -88,17 +88,16 @@ set(AWE_MAN_SRCS
|
||||
${SOURCE_DIR}/manpages/awsetbg.1.txt
|
||||
${SOURCE_DIR}/manpages/awesome-client.1.txt
|
||||
${SOURCE_DIR}/manpages/awesomerc.5.txt)
|
||||
@ -14,7 +16,20 @@ nor groff can fully understand: do not install them.
|
||||
|
||||
add_executable(${PROJECT_AWE_NAME}
|
||||
${AWE_SRCS}
|
||||
@@ -172,68 +171,45 @@ if(GENERATE_MANPAGES)
|
||||
${BUILD_DIR}/common/tokenize.c)
|
||||
|
||||
-# FreeBSD requires dynamic linking
|
||||
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||
+# FreeBSD and OpenBSD require dynamic linking
|
||||
+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
|
||||
set_target_properties(${PROJECT_AWE_NAME}
|
||||
PROPERTIES
|
||||
- LINK_FLAGS -export-dynamic)
|
||||
+ LINK_FLAGS -Wl,--export-dynamic)
|
||||
endif()
|
||||
|
||||
target_link_libraries(${PROJECT_AWE_NAME}
|
||||
@@ -175,68 +174,45 @@ if(GENERATE_MANPAGES)
|
||||
if(NOT BUILD_DIR STREQUAL SOURCE_DIR)
|
||||
file(MAKE_DIRECTORY ${BUILD_DIR}/manpages)
|
||||
endif()
|
||||
@ -116,7 +131,7 @@ nor groff can fully understand: do not install them.
|
||||
endforeach()
|
||||
|
||||
add_custom_target(man ALL DEPENDS ${MAN_FILES})
|
||||
@@ -331,13 +307,8 @@ install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESO
|
||||
@@ -334,13 +310,8 @@ install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESO
|
||||
install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR}
|
||||
RENAME ${AWE_CONF_FILE})
|
||||
if(GENERATE_MANPAGES)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-awesomeConfig_cmake,v 1.8 2012/07/17 11:32:00 dcoppa Exp $
|
||||
--- awesomeConfig.cmake.orig Sun Jul 15 12:12:21 2012
|
||||
+++ awesomeConfig.cmake Tue Jul 17 13:16:29 2012
|
||||
@@ -16,11 +16,11 @@ option(COMPRESS_MANPAGES "compress manpages" ON)
|
||||
$OpenBSD: patch-awesomeConfig_cmake,v 1.9 2012/12/31 17:41:44 dcoppa Exp $
|
||||
--- awesomeConfig.cmake.orig Mon Dec 24 15:36:05 2012
|
||||
+++ awesomeConfig.cmake Mon Dec 31 17:18:32 2012
|
||||
@@ -16,12 +16,11 @@ option(COMPRESS_MANPAGES "compress manpages" ON)
|
||||
option(GENERATE_LUADOC "generate luadoc" ON)
|
||||
|
||||
# {{{ CFLAGS
|
||||
@ -10,15 +10,16 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.8 2012/07/17 11:32:00 dcoppa Exp $
|
||||
- -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
|
||||
- -Wpointer-arith -Wredundant-decls -Wformat-nonliteral
|
||||
- -Wno-format-zero-length -Wmissing-format-attribute -Wmissing-prototypes
|
||||
- -Wstrict-prototypes)
|
||||
+add_definitions(-std=gnu99 -fgnu89-inline -fno-strict-aliasing
|
||||
+ -Wchar-subscripts -Wcast-align -Wwrite-strings
|
||||
+ -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized
|
||||
+ -Wpointer-arith -Wformat-nonliteral -Wno-format-zero-length
|
||||
+ -Wmissing-format-attribute -Wmissing-prototypes
|
||||
-Wstrict-prototypes)
|
||||
+ -Wchar-subscripts -Wcast-align -Wwrite-strings -Wsign-compare
|
||||
+ -Wunused -Wno-unused-parameter -Wuninitialized -Wpointer-arith
|
||||
+ -Wno-format-zero-length -Wmissing-format-attribute
|
||||
+ -Wmissing-prototypes -Wstrict-prototypes)
|
||||
# }}}
|
||||
|
||||
@@ -54,7 +54,6 @@ a_find_program(ASCIIDOC_EXECUTABLE asciidoc FALSE)
|
||||
# {{{ Endianness
|
||||
@@ -54,7 +53,6 @@ a_find_program(ASCIIDOC_EXECUTABLE asciidoc FALSE)
|
||||
a_find_program(XMLTO_EXECUTABLE xmlto FALSE)
|
||||
a_find_program(GZIP_EXECUTABLE gzip FALSE)
|
||||
# lua documentation
|
||||
@ -26,18 +27,18 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.8 2012/07/17 11:32:00 dcoppa Exp $
|
||||
a_find_program(LUADOC_EXECUTABLE luadoc FALSE)
|
||||
# theme graphics
|
||||
a_find_program(CONVERT_EXECUTABLE convert TRUE)
|
||||
@@ -62,8 +61,8 @@ a_find_program(CONVERT_EXECUTABLE convert TRUE)
|
||||
@@ -62,8 +60,8 @@ a_find_program(CONVERT_EXECUTABLE convert TRUE)
|
||||
include(FindDoxygen)
|
||||
# pkg-config
|
||||
include(FindPkgConfig)
|
||||
-# lua 5.1
|
||||
-include(FindLua51) #Due to a cmake bug, you will see Lua50 on screen
|
||||
-include(FindLua51)
|
||||
+# lua libraries
|
||||
+include(FindLuaLibs)
|
||||
# }}}
|
||||
|
||||
# {{{ Check if documentation can be build
|
||||
@@ -139,9 +138,10 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
|
||||
@@ -141,9 +139,10 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
|
||||
xcb-xtest
|
||||
xcb-xinerama
|
||||
xcb-shape
|
||||
@ -50,7 +51,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.8 2012/07/17 11:32:00 dcoppa Exp $
|
||||
xcb-image>=0.3.0
|
||||
cairo-xcb
|
||||
libstartup-notification-1.0>=0.10
|
||||
@@ -192,7 +192,7 @@ else()
|
||||
@@ -194,7 +193,7 @@ else()
|
||||
endif()
|
||||
|
||||
# Error check
|
||||
@ -59,16 +60,15 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.8 2012/07/17 11:32:00 dcoppa Exp $
|
||||
message(FATAL_ERROR "lua library not found")
|
||||
endif()
|
||||
|
||||
@@ -232,7 +232,7 @@ endif()
|
||||
@@ -231,6 +230,7 @@ endif()
|
||||
# {{{ Install path and configuration variables
|
||||
#If a sysconfdir is specified, use it instead
|
||||
#of the default configuration dir.
|
||||
+set(SYSCONFDIR $ENV{SYSCONFDIR})
|
||||
if(DEFINED SYSCONFDIR)
|
||||
set(SYSCONFDIR ${SYSCONFDIR} CACHE PATH "config directory")
|
||||
else()
|
||||
- set(SYSCONFDIR ${CMAKE_INSTALL_PREFIX}/etc CACHE PATH "config directory")
|
||||
+ set(SYSCONFDIR /etc CACHE PATH "config directory")
|
||||
endif()
|
||||
|
||||
#If an XDG Config Dir is specificed, use it instead
|
||||
@@ -261,7 +261,7 @@ endif()
|
||||
@@ -263,7 +263,7 @@ endif()
|
||||
if(DEFINED AWESOME_MAN_PATH)
|
||||
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
|
||||
else()
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-awesome_c,v 1.3 2011/11/30 11:50:58 dcoppa Exp $
|
||||
$OpenBSD: patch-awesome_c,v 1.4 2012/12/31 17:41:44 dcoppa Exp $
|
||||
|
||||
Revert to the old xcb-util-0.3.6 API
|
||||
|
||||
--- awesome.c.orig Wed Nov 30 11:05:05 2011
|
||||
+++ awesome.c Wed Nov 30 11:05:55 2011
|
||||
@@ -137,7 +137,7 @@ scan(xcb_query_tree_cookie_t tree_c[])
|
||||
--- awesome.c.orig Mon Dec 24 15:36:05 2012
|
||||
+++ awesome.c Mon Dec 31 11:54:55 2012
|
||||
@@ -139,7 +139,7 @@ scan(xcb_query_tree_cookie_t tree_c[])
|
||||
|
||||
if(!attr_r || attr_r->override_redirect
|
||||
|| attr_r->map_state == XCB_MAP_STATE_UNMAPPED
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-awesome_desktop,v 1.1 2012/08/23 15:02:48 dcoppa Exp $
|
||||
|
||||
From 22e7251fbf18a7c7e0d5d8ca4e6dda25f72f0d65 Mon Sep 17 00:00:00 2001
|
||||
From: Steven Oliver <oliver.steven@gmail.com>
|
||||
Date: Tue, 21 Aug 2012 21:09:08 -0400
|
||||
Subject: [PATCH] Add NoDisplay to .desktop file (FS#1031)
|
||||
|
||||
--- awesome.desktop.orig Thu Aug 23 16:51:59 2012
|
||||
+++ awesome.desktop Thu Aug 23 16:52:22 2012
|
||||
@@ -2,6 +2,7 @@
|
||||
Encoding=UTF-8
|
||||
Name=awesome
|
||||
Comment=Highly configurable framework window manager
|
||||
+NoDisplay=true
|
||||
TryExec=awesome
|
||||
Exec=awesome
|
||||
Type=Application
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-lib_awful_client_lua_in,v 1.5 2012/08/21 10:09:57 dcoppa Exp $
|
||||
|
||||
Fix client screen in awful.client.setslave
|
||||
(upstream git commit 99230fc632bec31c776c483f61c8620af028bbb6)
|
||||
|
||||
--- lib/awful/client.lua.in.orig Tue Aug 21 12:00:56 2012
|
||||
+++ lib/awful/client.lua.in Tue Aug 21 12:01:42 2012
|
||||
@@ -405,7 +405,7 @@ end
|
||||
--- Set the client as slave: put it at the end of other windows.
|
||||
-- @param c The window to set as slave.
|
||||
function setslave(c)
|
||||
- local cls = capi.client.get(screen)
|
||||
+ local cls = capi.client.get(c.screen)
|
||||
for k, v in pairs(cls) do
|
||||
c:swap(v)
|
||||
end
|
||||
@ -1,10 +1,15 @@
|
||||
$OpenBSD: patch-lib_naughty_lua_in,v 1.4 2012/11/22 08:53:32 dcoppa Exp $
|
||||
|
||||
naughty: Correctly handle rowstride on icons
|
||||
(upstream git commit ec714276ec9516afa690a207013866527fb37beb)
|
||||
|
||||
--- lib/naughty.lua.in.orig Sun Jul 15 12:12:21 2012
|
||||
+++ lib/naughty.lua.in Thu Nov 22 09:30:47 2012
|
||||
$OpenBSD: patch-lib_naughty_lua_in,v 1.5 2012/12/31 17:41:44 dcoppa Exp $
|
||||
--- lib/naughty.lua.in.orig Mon Dec 24 15:36:05 2012
|
||||
+++ lib/naughty.lua.in Mon Dec 31 17:05:35 2012
|
||||
@@ -30,7 +30,7 @@ module("naughty")
|
||||
-- @field padding Space between popups and edge of the workarea. Default: 4
|
||||
-- @field spacing Spacing between popups. Default: 1
|
||||
-- @field icon_dirs List of directories that will be checked by getIcon()
|
||||
--- Default: { "/usr/share/pixmaps/", }
|
||||
+-- Default: { "${LOCALBASE}/share/pixmaps/", }
|
||||
-- @field icon_formats List of formats that will be checked by getIcon()
|
||||
-- Default: { "png", "gif" }
|
||||
-- @field default_preset Preset to be used by default.
|
||||
@@ -47,7 +47,7 @@ module("naughty")
|
||||
config = {}
|
||||
config.padding = 4
|
||||
@ -14,40 +19,3 @@ naughty: Correctly handle rowstride on icons
|
||||
config.icon_formats = { "png", "gif" }
|
||||
config.notify_callback = nil
|
||||
|
||||
@@ -501,24 +501,23 @@ if capi.dbus then
|
||||
-- icon_data is an array:
|
||||
-- 1 -> width, 2 -> height, 3 -> rowstride, 4 -> has alpha
|
||||
-- 5 -> bits per sample, 6 -> channels, 7 -> data
|
||||
+ local width, height, rowstride = hints.icon_data[1], hints.icon_data[2], hints.icon_data[3]
|
||||
|
||||
local imgdata = ""
|
||||
- -- If has alpha (ARGB32)
|
||||
- if hints.icon_data[6] == 4 then
|
||||
- for i = 1, #hints.icon_data[7], 4 do
|
||||
+ local bpp = hints.icon_data[6]
|
||||
+ local offset = 0
|
||||
+ for y = 1, height do
|
||||
+ for i = 1 + offset, width * bpp + offset, bpp do
|
||||
imgdata = imgdata .. hints.icon_data[7]:sub(i, i + 2):reverse()
|
||||
- imgdata = imgdata .. hints.icon_data[7]:sub(i + 3, i + 3)
|
||||
+ if bpp == 4 then
|
||||
+ imgdata = imgdata .. hints.icon_data[7]:sub(i + 3, i + 3)
|
||||
+ else
|
||||
+ imgdata = imgdata .. string.format("%c", 255)
|
||||
+ end
|
||||
end
|
||||
- -- If has not alpha (RGB24)
|
||||
- elseif hints.icon_data[6] == 3 then
|
||||
- for i = 1, #hints.icon_data[7], 3 do
|
||||
- imgdata = imgdata .. hints.icon_data[7]:sub(i , i + 2):reverse()
|
||||
- imgdata = imgdata .. string.format("%c", 255) -- alpha is 255
|
||||
- end
|
||||
+ offset = offset + rowstride
|
||||
end
|
||||
- if imgdata then
|
||||
- args.icon = capi.image.argb32(hints.icon_data[1], hints.icon_data[2], imgdata)
|
||||
- end
|
||||
+ args.icon = capi.image.argb32(width, height, imgdata)
|
||||
end
|
||||
if replaces_id and replaces_id ~= "" and replaces_id ~= 0 then
|
||||
args.replaces_id = replaces_id
|
||||
|
||||
Loading…
Reference in New Issue
Block a user