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

Update to awesome v3.4.11 (Pickapart)

Browse Source 
ChangeLog at http://awesome.naquadah.org/changelogs/short/v3.4.11
This commit is contained in:
dcoppa 2011-11-30 11:50:58 +00:00
parent 0764d62851
commit 8161c89872
17 changed files with 552 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/awesome/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.42 2011/11/08 09:30:52 dcoppa Exp $
# $OpenBSD: Makefile,v 1.43 2011/11/30 11:50:58 dcoppa Exp $
COMMENT= fast, small, dynamic and awesome window manager
DISTNAME= awesome-3.4.10
REVISION= 5
EXTRACT_SUFX= .tar.bz2
DISTNAME= awesome-3.4.11
EXTRACT_SUFX= .tar.xz
CATEGORIES= x11
HOMEPAGE= http://awesome.naquadah.org/
@ -60,8 +59,13 @@ SEPARATE_BUILD= No
NO_REGRESS= Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/lib/naughty.lua.in \
${WRKSRC}/lib/awful/util.lua.in
post-install:
@find ${WRKINST} -name '*.lua.in.orig' -print0 | xargs -0 rm
@rm ${WRKINST}/${LOCALBASE}/share/awesome/lib/*.{beforesubst,orig}
@rm ${WRKINST}/${LOCALBASE}/share/awesome/lib/awful/*.{beforesubst,orig}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/awesome
@mv ${WRKINST}/${SYSCONFDIR}/xdg/awesome/rc.lua \
${PREFIX}/share/examples/awesome/

10
x11/awesome/distinfo
View File

@ -1,5 +1,5 @@
MD5 (awesome-3.4.10.tar.bz2) = JFCH+AZYZ+/zeiEzKH1cAw==
RMD160 (awesome-3.4.10.tar.bz2) = 9kKYyYZe/8oXMGUBQtLv6b5pDdM=
SHA1 (awesome-3.4.10.tar.bz2) = 8/uCRiMZeqcHCMKOo6oMBmVhcBY=
SHA256 (awesome-3.4.10.tar.bz2) = Ptcs+aY7kykNbOTcu7Vs/1VcsXKGiqrAKmTe6ZXgw7A=
SIZE (awesome-3.4.10.tar.bz2) = 747589
MD5 (awesome-3.4.11.tar.xz) = 1qpxM0tc1O9jzmnWxhLs8g==
RMD160 (awesome-3.4.11.tar.xz) = qe5UE/Cxh3ntYqP7astf+hRQGnw=
SHA1 (awesome-3.4.11.tar.xz) = E0F4o87QZan+e7m4zCySVtHA8XI=
SHA256 (awesome-3.4.11.tar.xz) = V2tPbSw/Vt++Uq2S8u7OzhEfDwWBbjISbNA9S0OHdh0=
SIZE (awesome-3.4.11.tar.xz) = 717440

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

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.11 2011/07/06 15:17:39 dcoppa Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.12 2011/11/30 11:50:58 dcoppa Exp $
These auto-generated (db2man.xsl) manpages contain a mixture of ISO
latin-1 characters and numerical HTML entities that neither mandoc
@ -10,7 +10,7 @@ nor groff can fully understand: do not install them.
${SOURCE_DIR}/manpages/awsetbg.1.txt
${SOURCE_DIR}/manpages/awesome-client.1.txt
${SOURCE_DIR}/manpages/awesomerc.5.txt)
-set(AWE_MAN_LANGS es fr de)
-set(AWE_MAN_LANGS es fr de ru)
add_executable(${PROJECT_AWE_NAME}
${AWE_SRCS}

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

@ -1,6 +1,6 @@
$OpenBSD: patch-awesomeConfig_cmake,v 1.4 2011/01/17 13:23:06 dcoppa Exp $
--- awesomeConfig.cmake.orig Mon Jan 17 12:38:13 2011
+++ awesomeConfig.cmake Mon Jan 17 13:07:59 2011
$OpenBSD: patch-awesomeConfig_cmake,v 1.5 2011/11/30 11:50:58 dcoppa Exp $
--- awesomeConfig.cmake.orig Wed Nov 23 15:08:50 2011
+++ awesomeConfig.cmake Wed Nov 30 10:43:32 2011
@@ -16,11 +16,11 @@ option(COMPRESS_MANPAGES "compress manpages" ON)
option(GENERATE_LUADOC "generate luadoc" ON)
@ -18,7 +18,20 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.4 2011/01/17 13:23:06 dcoppa Exp $
-Wstrict-prototypes)
# }}}
@@ -240,7 +240,7 @@ endif()
@@ -139,9 +139,10 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
xcb-xtest
xcb-xinerama
xcb-shape
- xcb-util>=0.3.8
+ xcb-aux>=0.3.6
+ xcb-atom>=0.3.6
xcb-keysyms>=0.3.4
- xcb-icccm>=0.3.8
+ xcb-icccm>=0.3.6
xcb-image>=0.3.0
cairo-xcb
libstartup-notification-1.0>=0.10
@@ -239,7 +240,7 @@ endif()
if(DEFINED SYSCONFDIR)
set(SYSCONFDIR ${SYSCONFDIR} CACHE PATH "config directory")
else()
@ -27,7 +40,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.4 2011/01/17 13:23:06 dcoppa Exp $
endif()
#If an XDG Config Dir is specificed, use it instead
@@ -269,7 +269,7 @@ endif()
@@ -268,7 +269,7 @@ endif()
if(DEFINED AWESOME_MAN_PATH)
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
else()

15
x11/awesome/patches/patch-awesome_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-awesome_c,v 1.3 2011/11/30 11:50:58 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[])
if(!attr_r || attr_r->override_redirect
|| attr_r->map_state == XCB_MAP_STATE_UNMAPPED
- || state == XCB_ICCCM_WM_STATE_WITHDRAWN)
+ || state == XCB_WM_STATE_WITHDRAWN)
{
geom_wins[i] = NULL;
p_delete(&attr_r);

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

@ -1,7 +1,7 @@
$OpenBSD: patch-awesomerc_lua_in,v 1.1 2011/07/15 13:23:19 dcoppa Exp $
--- awesomerc.lua.in.orig Fri Jul 15 15:16:39 2011
+++ awesomerc.lua.in Fri Jul 15 15:16:53 2011
@@ -13,7 +13,7 @@ beautiful.init("@AWESOME_THEMES_PATH@/default/theme.lu
$OpenBSD: patch-awesomerc_lua_in,v 1.2 2011/11/30 11:50:58 dcoppa Exp $
--- awesomerc.lua.in.orig Wed Nov 23 15:08:50 2011
+++ awesomerc.lua.in Wed Nov 30 10:29:56 2011
@@ -38,7 +38,7 @@ beautiful.init("@AWESOME_THEMES_PATH@/default/theme.lu
-- This is used later as the default terminal and editor to run.
terminal = "xterm"

210
x11/awesome/patches/patch-client_c Normal file
View File

@ -0,0 +1,210 @@
$OpenBSD: patch-client_c,v 1.3 2011/11/30 11:50:58 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
@@ -52,7 +52,7 @@ luaA_client_gc(lua_State *L)
client_t *c = luaA_checkudata(L, 1, &client_class);
button_array_wipe(&c->buttons);
key_array_wipe(&c->keys);
- xcb_icccm_get_wm_protocols_reply_wipe(&c->protocols);
+ xcb_get_wm_protocols_reply_wipe(&c->protocols);
p_delete(&c->machine);
p_delete(&c->class);
p_delete(&c->instance);
@@ -94,21 +94,21 @@ client_set_urgent(lua_State *L, int cidx, bool urgent)
if(c->urgent != urgent)
{
xcb_get_property_cookie_t hints =
- xcb_icccm_get_wm_hints_unchecked(globalconf.connection, c->window);
+ xcb_get_wm_hints_unchecked(globalconf.connection, c->window);
c->urgent = urgent;
ewmh_client_update_hints(c);
/* update ICCCM hints */
- xcb_icccm_wm_hints_t wmh;
- xcb_icccm_get_wm_hints_reply(globalconf.connection, hints, &wmh, NULL);
+ xcb_wm_hints_t wmh;
+ xcb_get_wm_hints_reply(globalconf.connection, hints, &wmh, NULL);
if(urgent)
- wmh.flags |= XCB_ICCCM_WM_HINT_X_URGENCY;
+ wmh.flags |= XCB_WM_HINT_X_URGENCY;
else
- wmh.flags &= ~XCB_ICCCM_WM_HINT_X_URGENCY;
+ wmh.flags &= ~XCB_WM_HINT_X_URGENCY;
- xcb_icccm_set_wm_hints(globalconf.connection, c->window, &wmh);
+ xcb_set_wm_hints(globalconf.connection, c->window, &wmh);
hook_property(c, "urgent");
luaA_object_emit_signal(L, cidx, "property::urgent", 0);
@@ -730,7 +730,7 @@ HANDLE_GEOM(height)
*
* At this stage it's just safer to keep it in normal state and avoid confusion.
*/
- window_state_set(c->window, XCB_ICCCM_WM_STATE_NORMAL);
+ window_state_set(c->window, XCB_WM_STATE_NORMAL);
if(!startup)
{
@@ -776,14 +776,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 */
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+ if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE)
{
basew = c->size_hints.base_width;
baseh = c->size_hints.base_height;
real_basew = basew;
real_baseh = baseh;
}
- else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+ else if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
{
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)
basew = baseh = 0;
/* min size is substituted with base size if not specified */
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+ if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
{
minw = c->size_hints.min_width;
minh = c->size_hints.min_height;
}
- else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+ else if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE)
{
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)
else
minw = minh = 0;
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT
+ if(c->size_hints.flags & XCB_SIZE_HINT_P_ASPECT
&& 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)
if(minh)
geometry.height = MAX(geometry.height, minh);
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
+ if(c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE)
{
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)
geometry.height = MIN(geometry.height, c->size_hints.max_height);
}
- if(c->size_hints.flags & (XCB_ICCCM_SIZE_HINT_P_RESIZE_INC | XCB_ICCCM_SIZE_HINT_BASE_SIZE)
+ if(c->size_hints.flags & (XCB_SIZE_HINT_P_RESIZE_INC | XCB_SIZE_HINT_BASE_SIZE)
&& 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)
c->minimized = s;
banning_need_update((c)->screen);
if(s)
- window_state_set(c->window, XCB_ICCCM_WM_STATE_ICONIC);
+ window_state_set(c->window, XCB_WM_STATE_ICONIC);
else
- window_state_set(c->window, XCB_ICCCM_WM_STATE_NORMAL);
+ window_state_set(c->window, XCB_WM_STATE_NORMAL);
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)
/* Do this last to avoid races with clients. According to ICCCM, clients
* arent allowed to re-use the window until after this. */
- window_state_set(c->window, XCB_ICCCM_WM_STATE_WITHDRAWN);
+ window_state_set(c->window, XCB_WM_STATE_WITHDRAWN);
/* set client as invalid */
c->invalid = true;
@@ -2061,9 +2061,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
lua_createtable(L, 0, 1);
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_US_POSITION)
+ if(c->size_hints.flags & XCB_SIZE_HINT_US_POSITION)
u_or_p = "user_position";
- else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_POSITION)
+ else if(c->size_hints.flags & XCB_SIZE_HINT_P_POSITION)
u_or_p = "program_position";
if(u_or_p)
@@ -2077,9 +2077,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
u_or_p = NULL;
}
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_US_SIZE)
+ if(c->size_hints.flags & XCB_SIZE_HINT_US_SIZE)
u_or_p = "user_size";
- else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+ else if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE)
u_or_p = "program_size";
if(u_or_p)
@@ -2092,7 +2092,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
lua_setfield(L, -2, u_or_p);
}
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+ if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
{
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)
lua_setfield(L, -2, "min_height");
}
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
+ if(c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE)
{
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)
lua_setfield(L, -2, "max_height");
}
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)
+ if(c->size_hints.flags & XCB_SIZE_HINT_P_RESIZE_INC)
{
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)
lua_setfield(L, -2, "height_inc");
}
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT)
+ if(c->size_hints.flags & XCB_SIZE_HINT_P_ASPECT)
{
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)
lua_setfield(L, -2, "max_aspect_den");
}
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
+ if(c->size_hints.flags & XCB_SIZE_HINT_BASE_SIZE)
{
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)
lua_setfield(L, -2, "base_height");
}
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_WIN_GRAVITY)
+ if(c->size_hints.flags & XCB_SIZE_HINT_P_WIN_GRAVITY)
{
switch(c->size_hints.win_gravity)
{

26
x11/awesome/patches/patch-client_h Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-client_h,v 1.1 2011/11/30 11:50:58 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
@@ -123,7 +123,7 @@ struct client_t
/** Window holding command needed to start it (session management related) */
xcb_window_t leader_window;
/** Client's WM_PROTOCOLS property */
- xcb_icccm_get_wm_protocols_reply_t protocols;
+ xcb_get_wm_protocols_reply_t protocols;
/** Client logical screen */
screen_t *screen;
/** Client physical screen */
@@ -248,8 +248,8 @@ client_raise(client_t *c)
static inline bool
client_isfixed(client_t *c)
{
- return (c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE
- && c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE
+ return (c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE
+ && c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE
&& c->size_hints.max_width == c->size_hints.min_width
&& c->size_hints.max_height == c->size_hints.min_height
&& c->size_hints.max_width

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

@ -0,0 +1,14 @@
$OpenBSD: patch-common_xutil_c,v 1.1 2011/11/30 11:50:58 dcoppa Exp $
Revert to the old xcb-util-0.3.6 API
--- common/xutil.c.orig Wed Nov 23 15:08:50 2011
+++ common/xutil.c Wed Nov 30 10:55:11 2011
@@ -25,6 +25,7 @@
#include "common/util.h"
#include <xcb/xcb.h>
+#include <xcb/xcb_atom.h>
#include <xcb/xcb_icccm.h>
#include "common/xutil.h"

15
x11/awesome/patches/patch-event_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-event_c,v 1.1 2011/11/30 11:50:58 dcoppa Exp $
Revert to the old xcb-util-0.3.6 API
--- event.c.orig Wed Nov 23 15:08:50 2011
+++ event.c Wed Nov 30 10:55:11 2011
@@ -721,7 +721,7 @@ event_handle_clientmessage(xcb_client_message_event_t
client_t *c;
if((c = client_getbywin(ev->window))
&& ev->format == 32
- && ev->data.data32[0] == XCB_ICCCM_WM_STATE_ICONIC)
+ && ev->data.data32[0] == XCB_WM_STATE_ICONIC)
{
luaA_object_push(globalconf.L, c);
client_set_minimized(globalconf.L, -1, true);

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

@ -1,26 +0,0 @@
$OpenBSD: patch-lib_awful_mouse_init_lua_in,v 1.1 2011/07/06 09:58:16 dcoppa Exp $
Don't move clients with fixed positions
(upstream git commit 45576b6c6f8255e979187b034a73385d508c9223)
--- lib/awful/mouse/init.lua.in.orig Mon May 16 16:35:17 2011
+++ lib/awful/mouse/init.lua.in Wed Jul 6 11:07:09 2011
@@ -147,14 +147,14 @@ function client.snap(c, snap, x, y, fixed_x, fixed_y)
end
end
- -- It's easiest to undo changes afterwards if they're not allowed
- if fixed_x then geom.x = cur_geom.x end
- if fixed_y then geom.y = cur_geom.y end
-
geom.width = geom.width - (2 * c.border_width)
geom.height = geom.height - (2 * c.border_width)
geom.x = geom.x + (2 * c.border_width)
geom.y = geom.y + (2 * c.border_width)
+
+ -- It's easiest to undo changes afterwards if they're not allowed
+ if fixed_x then geom.x = cur_geom.x end
+ if fixed_y then geom.y = cur_geom.y end
return geom
end

22
x11/awesome/patches/patch-lib_awful_util_lua_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-lib_awful_util_lua_in,v 1.3 2011/06/22 12:54:03 dcoppa Exp $
$OpenBSD: patch-lib_awful_util_lua_in,v 1.4 2011/11/30 11:50:58 dcoppa Exp $
XXX THIS IS A HACK
This is needed to workaround the effects of userland
threads which change I/O operations to non-blocking.
--- lib/awful/util.lua.in.orig Mon May 16 16:35:17 2011
+++ lib/awful/util.lua.in Wed Jun 22 12:59:39 2011
@@ -88,18 +88,46 @@ function spawn_with_shell(cmd, screen)
--- lib/awful/util.lua.in.orig Wed Nov 23 15:08:50 2011
+++ lib/awful/util.lua.in Wed Nov 30 11:41:52 2011
@@ -89,19 +89,47 @@ function spawn_with_shell(cmd, screen)
end
end
@ -43,7 +43,7 @@ threads which change I/O operations to non-blocking.
else
- return err
+ return nil
+ end
end
+
+ fd_check = io.open(tmp2)
+ if not fd_check then return nil end
@ -57,6 +57,16 @@ threads which change I/O operations to non-blocking.
+ return nil
+ else
+ return sout
end
+ end
end
end
@@ -182,7 +210,7 @@ end
-- @param dirs Table of dirs to search, otherwise { '/usr/share/pixmaps/' }
function geticonpath(iconname, exts, dirs)
exts = exts or { 'png', 'gif' }
- dirs = dirs or { '/usr/share/pixmaps/' }
+ dirs = dirs or { '${LOCALBASE}/share/pixmaps/' }
for _, d in pairs(dirs) do
for _, e in pairs(exts) do
local icon = d .. iconname .. '.' .. e

12
x11/awesome/patches/patch-lib_naughty_lua_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_naughty_lua_in,v 1.3 2011/11/30 11:50:58 dcoppa Exp $
--- lib/naughty.lua.in.orig Wed Nov 30 11:39:37 2011
+++ lib/naughty.lua.in Wed Nov 30 11:41:42 2011
@@ -47,7 +47,7 @@ module("naughty")
config = {}
config.padding = 4
config.spacing = 1
-config.icon_dirs = { "/usr/share/pixmaps/", }
+config.icon_dirs = { "${LOCALBASE}/share/pixmaps/", }
config.icon_formats = { "png", "gif" }
config.notify_callback = nil

147
x11/awesome/patches/patch-property_c Normal file
View File

@ -0,0 +1,147 @@
$OpenBSD: patch-property_c,v 1.1 2011/11/30 11:50:58 dcoppa Exp $
Revert to the old xcb-util-0.3.6 API
--- property.c.orig Wed Nov 30 11:25:32 2011
+++ property.c Wed Nov 30 11:28:37 2011
@@ -105,13 +105,13 @@ property_update_wm_transient_for(client_t *c, xcb_get_
if(reply)
{
- if(!xcb_icccm_get_wm_transient_for_from_reply(&trans, reply))
+ if(!xcb_get_wm_transient_for_from_reply(&trans, reply))
return;
}
else
{
- if(!xcb_icccm_get_wm_transient_for_reply(globalconf.connection,
- xcb_icccm_get_wm_transient_for_unchecked(globalconf.connection,
+ if(!xcb_get_wm_transient_for_reply(globalconf.connection,
+ xcb_get_wm_transient_for_unchecked(globalconf.connection,
c->window),
&trans, NULL))
return;
@@ -160,13 +160,13 @@ property_update_wm_normal_hints(client_t *c, xcb_get_p
{
if(reply)
{
- if(!xcb_icccm_get_wm_size_hints_from_reply(&c->size_hints, reply))
+ if(!xcb_get_wm_size_hints_from_reply(&c->size_hints, reply))
return;
}
else
{
- if(!xcb_icccm_get_wm_normal_hints_reply(globalconf.connection,
- xcb_icccm_get_wm_normal_hints_unchecked(globalconf.connection,
+ if(!xcb_get_wm_normal_hints_reply(globalconf.connection,
+ xcb_get_wm_normal_hints_unchecked(globalconf.connection,
c->window),
&c->size_hints, NULL))
return;
@@ -180,31 +180,31 @@ property_update_wm_normal_hints(client_t *c, xcb_get_p
void
property_update_wm_hints(client_t *c, xcb_get_property_reply_t *reply)
{
- xcb_icccm_wm_hints_t wmh;
+ xcb_wm_hints_t wmh;
if(reply)
{
- if(!xcb_icccm_get_wm_hints_from_reply(&wmh, reply))
+ if(!xcb_get_wm_hints_from_reply(&wmh, reply))
return;
}
else
{
- if(!xcb_icccm_get_wm_hints_reply(globalconf.connection,
- xcb_icccm_get_wm_hints_unchecked(globalconf.connection, c->window),
+ if(!xcb_get_wm_hints_reply(globalconf.connection,
+ xcb_get_wm_hints_unchecked(globalconf.connection, c->window),
&wmh, NULL))
return;
}
luaA_object_push(globalconf.L, c);
- client_set_urgent(globalconf.L, -1, xcb_icccm_wm_hints_get_urgency(&wmh));
- if(wmh.flags & XCB_ICCCM_WM_HINT_STATE &&
- wmh.initial_state == XCB_ICCCM_WM_STATE_WITHDRAWN)
+ client_set_urgent(globalconf.L, -1, xcb_wm_hints_get_urgency(&wmh));
+ if(wmh.flags & XCB_WM_HINT_STATE &&
+ wmh.initial_state == XCB_WM_STATE_WITHDRAWN)
client_set_border_width(globalconf.L, -1, 0);
- if(wmh.flags & XCB_ICCCM_WM_HINT_INPUT)
+ if(wmh.flags & XCB_WM_HINT_INPUT)
c->nofocus = !wmh.input;
- if(wmh.flags & XCB_ICCCM_WM_HINT_WINDOW_GROUP)
+ if(wmh.flags & XCB_WM_HINT_WINDOW_GROUP)
client_set_group_window(globalconf.L, -1, wmh.window_group);
lua_pop(globalconf.L, 1);
@@ -217,17 +217,17 @@ property_update_wm_hints(client_t *c, xcb_get_property
void
property_update_wm_class(client_t *c, xcb_get_property_reply_t *reply)
{
- xcb_icccm_get_wm_class_reply_t hint;
+ xcb_get_wm_class_reply_t hint;
if(reply)
{
- if(!xcb_icccm_get_wm_class_from_reply(&hint, reply))
+ if(!xcb_get_wm_class_from_reply(&hint, reply))
return;
}
else
{
- if(!xcb_icccm_get_wm_class_reply(globalconf.connection,
- xcb_icccm_get_wm_class_unchecked(globalconf.connection, c->window),
+ if(!xcb_get_wm_class_reply(globalconf.connection,
+ xcb_get_wm_class_unchecked(globalconf.connection, c->window),
&hint, NULL))
return;
}
@@ -238,7 +238,7 @@ property_update_wm_class(client_t *c, xcb_get_property
/* only delete reply if we get it ourselves */
if(!reply)
- xcb_icccm_get_wm_class_reply_wipe(&hint);
+ xcb_get_wm_class_reply_wipe(&hint);
}
static int
@@ -308,14 +308,14 @@ property_update_net_wm_pid(client_t *c,
void
property_update_wm_protocols(client_t *c, xcb_get_property_reply_t *reply)
{
- xcb_icccm_get_wm_protocols_reply_t protocols;
+ xcb_get_wm_protocols_reply_t protocols;
xcb_get_property_reply_t *reply_copy;
if(reply)
{
reply_copy = p_dup(reply, 1);
- if(!xcb_icccm_get_wm_protocols_from_reply(reply_copy, &protocols))
+ if(!xcb_get_wm_protocols_from_reply(reply_copy, &protocols))
{
p_delete(&reply_copy);
return;
@@ -324,14 +324,14 @@ property_update_wm_protocols(client_t *c, xcb_get_prop
else
{
/* If this fails for any reason, we still got the old value */
- if(!xcb_icccm_get_wm_protocols_reply(globalconf.connection,
- xcb_icccm_get_wm_protocols_unchecked(globalconf.connection,
+ if(!xcb_get_wm_protocols_reply(globalconf.connection,
+ xcb_get_wm_protocols_unchecked(globalconf.connection,
c->window, WM_PROTOCOLS),
&protocols, NULL))
return;
}
- xcb_icccm_get_wm_protocols_reply_wipe(&c->protocols);
+ xcb_get_wm_protocols_reply_wipe(&c->protocols);
memcpy(&c->protocols, &protocols, sizeof(protocols));
}

29
x11/awesome/patches/patch-selection_c Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-selection_c,v 1.1 2011/11/30 11:50:58 dcoppa Exp $
Revert to the old xcb-util-0.3.6 API
--- selection.c.orig Wed Nov 30 11:29:06 2011
+++ selection.c Wed Nov 30 11:29:18 2011
@@ -86,18 +86,18 @@ luaA_selection_get(lua_State *L)
if(event_notify->selection == XCB_ATOM_PRIMARY
&& event_notify->property != XCB_NONE)
{
- xcb_icccm_get_text_property_reply_t prop;
+ xcb_get_text_property_reply_t prop;
xcb_get_property_cookie_t cookie =
- xcb_icccm_get_text_property(globalconf.connection,
+ xcb_get_text_property(globalconf.connection,
event_notify->requestor,
event_notify->property);
- if(xcb_icccm_get_text_property_reply(globalconf.connection,
+ if(xcb_get_text_property_reply(globalconf.connection,
cookie, &prop, NULL))
{
lua_pushlstring(L, prop.name, prop.name_len);
- xcb_icccm_get_text_property_reply_wipe(&prop);
+ xcb_get_text_property_reply_wipe(&prop);
xcb_delete_property(globalconf.connection,
event_notify->requestor,

15
x11/awesome/patches/patch-systray_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-systray_c,v 1.1 2011/11/30 11:50:58 dcoppa Exp $
Revert to the old xcb-util-0.3.6 API
--- systray.c.orig Wed Nov 30 11:29:38 2011
+++ systray.c Wed Nov 30 11:29:51 2011
@@ -197,7 +197,7 @@ systray_request_handle(xcb_window_t embed_win, int phy
xcb_change_window_attributes(globalconf.connection, embed_win, XCB_CW_EVENT_MASK,
select_input_val);
- window_state_set(embed_win, XCB_ICCCM_WM_STATE_WITHDRAWN);
+ window_state_set(embed_win, XCB_WM_STATE_WITHDRAWN);
/* we grab the window, but also make sure it's automatically reparented back
* to the root window if we should die.

15
x11/awesome/patches/patch-window_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-window_c,v 1.1 2011/11/30 11:50:58 dcoppa Exp $
Revert to the old xcb-util-0.3.6 API
--- window.c.orig Wed Nov 23 15:08:50 2011
+++ window.c Wed Nov 30 11:01:53 2011
@@ -60,7 +60,7 @@ uint32_t
window_state_get_reply(xcb_get_property_cookie_t cookie)
{
/* If no property is set, we just assume a sane default. */
- uint32_t result = XCB_ICCCM_WM_STATE_NORMAL;
+ uint32_t result = XCB_WM_STATE_NORMAL;
xcb_get_property_reply_t *prop_r;
if((prop_r = xcb_get_property_reply(globalconf.connection, cookie, NULL)))