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

Bugfix update to awesome v3.4.13 (Octopus)

Browse Source
This commit is contained in:
dcoppa 2012-07-17 11:31:59 +00:00
parent 4c72ac37de
commit dfc52b1e7c
6 changed files with 35 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/awesome/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.50 2012/07/10 15:21:01 jasper Exp $
# $OpenBSD: Makefile,v 1.51 2012/07/17 11:31:59 dcoppa Exp $
COMMENT= highly configurable framework window manager
DISTNAME= awesome-3.4.12
REVISION= 1
DISTNAME= awesome-3.4.13
EXTRACT_SUFX= .tar.xz
CATEGORIES= x11

7
x11/awesome/distinfo
View File

@ -1,5 +1,2 @@
MD5 (awesome-3.4.12.tar.xz) = LDSQuCChnARCkAJ+by62yA==
RMD160 (awesome-3.4.12.tar.xz) = Y6bGX8QKZ31fkUkB/EYydBFYOIk=
SHA1 (awesome-3.4.12.tar.xz) = MK3TFMxzzU0DJLVtnaYmpwygq5Q=
SHA256 (awesome-3.4.12.tar.xz) = lN5gey1i4RpFtxxOfTrEPcrPut/b5LmmsaOqee0NfAM=
SIZE (awesome-3.4.12.tar.xz) = 723780
SHA256 (awesome-3.4.13.tar.xz) = GRbZadt2hOLc+COUheg39NyrDBe3u0R9q+7+xtF6Gko=
SIZE (awesome-3.4.13.tar.xz) = 722876

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

@ -1,6 +1,6 @@
$OpenBSD: patch-awesomeConfig_cmake,v 1.7 2012/07/12 15:36:20 dcoppa Exp $
--- awesomeConfig.cmake.orig Mon Jun 11 13:57:35 2012
+++ awesomeConfig.cmake Thu Jul 12 16:05:02 2012
$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)
option(GENERATE_LUADOC "generate luadoc" ON)
@ -59,21 +59,21 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.7 2012/07/12 15:36:20 dcoppa Exp $
message(FATAL_ERROR "lua library not found")
endif()
@@ -239,7 +239,7 @@ endif()
@@ -232,7 +232,7 @@ endif()
if(DEFINED SYSCONFDIR)
set(SYSCONFDIR ${SYSCONFDIR} CACHE PATH "config directory")
else()
- set(SYSCONFDIR ${PREFIX}/etc CACHE PATH "config directory")
- 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
@@ -268,7 +268,7 @@ endif()
@@ -261,7 +261,7 @@ endif()
if(DEFINED AWESOME_MAN_PATH)
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
else()
- set(AWESOME_MAN_PATH ${PREFIX}/share/man CACHE PATH "awesome manpage directory")
+ set(AWESOME_MAN_PATH ${PREFIX}/man CACHE PATH "awesome manpage directory")
- set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "awesome manpage directory")
+ set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/man CACHE PATH "awesome manpage directory")
endif()
# Hide to avoid confusion

38
x11/awesome/patches/patch-client_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-client_c,v 1.3 2011/11/30 11:50:58 dcoppa Exp $
$OpenBSD: patch-client_c,v 1.4 2012/07/17 11:32:00 dcoppa Exp $
Revert to the old xcb-util-0.3.6 API
--- client.c.orig Wed Nov 30 11:06:39 2011
+++ client.c Wed Nov 30 11:21:09 2011
--- client.c.orig Sun Jul 15 12:12:21 2012
+++ client.c Tue Jul 17 13:16:29 2012
@@ -52,7 +52,7 @@ luaA_client_gc(lua_State *L)
client_t *c = luaA_checkudata(L, 1, &client_class);
button_array_wipe(&c->buttons);
@ -41,7 +41,7 @@ Revert to the old xcb-util-0.3.6 API
hook_property(c, "urgent");
luaA_object_emit_signal(L, cidx, "property::urgent", 0);
@@ -730,7 +730,7 @@ HANDLE_GEOM(height)
@@ -720,7 +720,7 @@ HANDLE_GEOM(height)
*
* At this stage it's just safer to keep it in normal state and avoid confusion.
*/
@ -50,7 +50,7 @@ Revert to the old xcb-util-0.3.6 API
if(!startup)
{
@@ -776,14 +776,14 @@ client_geometry_hints(client_t *c, area_t geometry)
@@ -766,14 +766,14 @@ client_geometry_hints(client_t *c, area_t geometry)
int32_t real_basew = 0, real_baseh = 0;
/* base size is substituted with min size if not specified */
@ -67,7 +67,7 @@ Revert to the old xcb-util-0.3.6 API
{
basew = c->size_hints.min_width;
baseh = c->size_hints.min_height;
@@ -792,12 +792,12 @@ client_geometry_hints(client_t *c, area_t geometry)
@@ -782,12 +782,12 @@ client_geometry_hints(client_t *c, area_t geometry)
basew = baseh = 0;
/* min size is substituted with base size if not specified */
@ -82,7 +82,7 @@ Revert to the old xcb-util-0.3.6 API
{
minw = c->size_hints.base_width;
minh = c->size_hints.base_height;
@@ -805,7 +805,7 @@ client_geometry_hints(client_t *c, area_t geometry)
@@ -795,7 +795,7 @@ client_geometry_hints(client_t *c, area_t geometry)
else
minw = minh = 0;
@ -91,7 +91,7 @@ Revert to the old xcb-util-0.3.6 API
&& c->size_hints.min_aspect_den > 0
&& c->size_hints.max_aspect_den > 0
&& geometry.height - real_baseh > 0
@@ -847,7 +847,7 @@ client_geometry_hints(client_t *c, area_t geometry)
@@ -837,7 +837,7 @@ client_geometry_hints(client_t *c, area_t geometry)
if(minh)
geometry.height = MAX(geometry.height, minh);
@ -100,7 +100,7 @@ Revert to the old xcb-util-0.3.6 API
{
if(c->size_hints.max_width)
geometry.width = MIN(geometry.width, c->size_hints.max_width);
@@ -855,7 +855,7 @@ client_geometry_hints(client_t *c, area_t geometry)
@@ -845,7 +845,7 @@ client_geometry_hints(client_t *c, area_t geometry)
geometry.height = MIN(geometry.height, c->size_hints.max_height);
}
@ -109,7 +109,7 @@ Revert to the old xcb-util-0.3.6 API
&& c->size_hints.width_inc && c->size_hints.height_inc)
{
uint16_t t1 = geometry.width, t2 = geometry.height;
@@ -978,9 +978,9 @@ client_set_minimized(lua_State *L, int cidx, bool s)
@@ -968,9 +968,9 @@ client_set_minimized(lua_State *L, int cidx, bool s)
c->minimized = s;
banning_need_update((c)->screen);
if(s)
@ -121,7 +121,7 @@ Revert to the old xcb-util-0.3.6 API
ewmh_client_update_hints(c);
if(strut_has_value(&c->strut))
screen_emit_signal(globalconf.L, c->screen, "property::workarea", 0);
@@ -1342,7 +1342,7 @@ client_unmanage(client_t *c)
@@ -1332,7 +1332,7 @@ client_unmanage(client_t *c)
/* Do this last to avoid races with clients. According to ICCCM, clients
* arent allowed to re-use the window until after this. */
@ -130,7 +130,7 @@ Revert to the old xcb-util-0.3.6 API
/* set client as invalid */
c->invalid = true;
@@ -2061,9 +2061,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
@@ -2051,9 +2051,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
lua_createtable(L, 0, 1);
@ -142,7 +142,7 @@ Revert to the old xcb-util-0.3.6 API
u_or_p = "program_position";
if(u_or_p)
@@ -2077,9 +2077,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
@@ -2067,9 +2067,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
u_or_p = NULL;
}
@ -154,7 +154,7 @@ Revert to the old xcb-util-0.3.6 API
u_or_p = "program_size";
if(u_or_p)
@@ -2092,7 +2092,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
@@ -2082,7 +2082,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
lua_setfield(L, -2, u_or_p);
}
@ -163,7 +163,7 @@ Revert to the old xcb-util-0.3.6 API
{
lua_pushnumber(L, c->size_hints.min_width);
lua_setfield(L, -2, "min_width");
@@ -2100,7 +2100,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
@@ -2090,7 +2090,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
lua_setfield(L, -2, "min_height");
}
@ -172,7 +172,7 @@ Revert to the old xcb-util-0.3.6 API
{
lua_pushnumber(L, c->size_hints.max_width);
lua_setfield(L, -2, "max_width");
@@ -2108,7 +2108,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
@@ -2098,7 +2098,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
lua_setfield(L, -2, "max_height");
}
@ -181,7 +181,7 @@ Revert to the old xcb-util-0.3.6 API
{
lua_pushnumber(L, c->size_hints.width_inc);
lua_setfield(L, -2, "width_inc");
@@ -2116,7 +2116,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
@@ -2106,7 +2106,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
lua_setfield(L, -2, "height_inc");
}
@ -190,7 +190,7 @@ Revert to the old xcb-util-0.3.6 API
{
lua_pushnumber(L, c->size_hints.min_aspect_num);
lua_setfield(L, -2, "min_aspect_num");
@@ -2128,7 +2128,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
@@ -2118,7 +2118,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
lua_setfield(L, -2, "max_aspect_den");
}
@ -199,7 +199,7 @@ Revert to the old xcb-util-0.3.6 API
{
lua_pushnumber(L, c->size_hints.base_width);
lua_setfield(L, -2, "base_width");
@@ -2136,7 +2136,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
@@ -2126,7 +2126,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
lua_setfield(L, -2, "base_height");
}

8
x11/awesome/patches/patch-client_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-client_h,v 1.1 2011/11/30 11:50:58 dcoppa Exp $
$OpenBSD: patch-client_h,v 1.2 2012/07/17 11:32:00 dcoppa Exp $
Revert to the old xcb-util-0.3.6 API
--- client.h.orig Wed Nov 30 11:24:03 2011
+++ client.h Wed Nov 30 11:25:08 2011
--- client.h.orig Sun Jul 15 12:12:21 2012
+++ client.h Tue Jul 17 13:16:29 2012
@@ -123,7 +123,7 @@ struct client_t
/** Window holding command needed to start it (session management related) */
xcb_window_t leader_window;
@ -13,7 +13,7 @@ Revert to the old xcb-util-0.3.6 API
/** Client logical screen */
screen_t *screen;
/** Client physical screen */
@@ -248,8 +248,8 @@ client_raise(client_t *c)
@@ -247,8 +247,8 @@ client_raise(client_t *c)
static inline bool
client_isfixed(client_t *c)
{

26
x11/awesome/patches/patch-lib_awful_client_lua_in
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-lib_awful_client_lua_in,v 1.3 2012/07/09 09:01:54 dcoppa Exp $
Revert commit c0dffca646c1a02276da510bf3587fb7fad8e0e9: "Focus
history: Don't ignore unfocusable clients". This caused focus
problems with some panels, most notably fbpanel and gnome-panel
(upstream git commit c084eb5b085287e4fb2661e834197cf8cf233215)
--- lib/awful/client.lua.in.orig Mon Jun 11 13:57:35 2012
+++ lib/awful/client.lua.in Mon Jul 9 10:49:18 2012
@@ -131,10 +131,12 @@ end
--- Update client focus history.
-- @param c The client that has been focused.
function focus.history.add(c)
- -- Remove the client if its in stack
- focus.history.delete(c)
- -- Record the client has latest focused
- table.insert(data.focus, 1, c)
+ if focus.filter(c) then
+ -- Remove the client if its in stack
+ focus.history.delete(c)
+ -- Record the client has latest focused
+ table.insert(data.focus, 1, c)
+ end
end
--- Get the latest focused client for a screen in history.