xcb-util-wm: Changes to 'upstream-unstable'
.gitignore |3 +-- COPYING | 27 +++ NEWS| 18 +- README | 19 +++ autogen.sh | 15 +++ configure.ac| 18 ++ ewmh/Makefile.am| 18 -- ewmh/ewmh.c.m4 | 18 -- ewmh/xcb-ewmh.pc.in |2 +- icccm/Makefile.am | 10 +++--- icccm/icccm.c |4 m4 |2 +- xcb_util_intro.in | 24 13 files changed, 114 insertions(+), 64 deletions(-) New commits: commit 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 Author: Arnaud Fontaine ar...@debian.org Date: Wed Feb 19 20:23:08 2014 +0900 Release 0.4.1. Signed-off-by: Arnaud Fontaine ar...@debian.org diff --git a/NEWS b/NEWS index 66d5913..cb7b6a1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +Release 0.4.1 (2014-02-19) +== + +- xcb-proto should have never been required as xcb provides the Atoms. +- Do not distribute ewmh C source file as they are generated with M4. +- config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES. +- config: use AC_CONFIG_HEADERS to create a config.h file. +- make: implement the silent rules for m4 generated files. +- make: compile the library with standard xorg warning flags. + - Bump required xorg-macros version to = 1.16.0. + Release 0.4.0 (2014-01-19) == diff --git a/configure.ac b/configure.ac index f95a93f..efbd906 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf = 2.62 AC_PREREQ(2.62) -AC_INIT([xcb-util-wm],[0.4.0], +AC_INIT([xcb-util-wm],[0.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xcbcomponent=Utils], [xcb-util-wm]) AC_CONFIG_SRCDIR([Makefile.am]) commit d299dc68509fdecd02a5136bcf6285ae5b454e8f Author: Arnaud Fontaine ar...@debian.org Date: Mon Feb 17 18:18:07 2014 +0900 Follow changes in m4 submodule. diff --git a/m4 b/m4 index 9dd4002..f662e3a 16 --- a/m4 +++ b/m4 @@ -1 +1 @@ -Subproject commit 9dd400297f673851dfaea22de2b51583c7b89cb6 +Subproject commit f662e3a93ebdec3d1c9374382dcc070093a42fed commit dbc3e15004598dc94f26b7221ef5a61f4d3b2f61 Author: Gaetan Nadon mems...@videotron.ca Date: Thu Feb 6 16:55:53 2014 -0500 make: compile the library with standard xorg warning flags The new BASE_CFLAGS variable contains only warning flags that do not alter the generated byte code, unlike the deprecated CWARNFLAGS which turns off the GNUCC strict aliasing optimization. Also, update m4 submodule as util-macros version 1.16 or later is required. Signed-off-by: Gaetan Nadon mems...@videotron.ca Signed-off-by: Arnaud Fontaine ar...@debian.org diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am index e2b428d..488d006 100644 --- a/ewmh/Makefile.am +++ b/ewmh/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libxcb-ewmh.la nodist_xcbinclude_HEADERS = xcb_ewmh.h -AM_CFLAGS = $(CWARNFLAGS) +AM_CFLAGS = $(BASE_CFLAGS) AM_CPPFLAGS = $(XCB_CFLAGS) libxcb_ewmh_la_SOURCES = ewmh.c.m4 atomlist.m4 xcb_ewmh.h.m4 diff --git a/icccm/Makefile.am b/icccm/Makefile.am index b7366b8..8dc2680 100644 --- a/icccm/Makefile.am +++ b/icccm/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libxcb-icccm.la xcbinclude_HEADERS = xcb_icccm.h -AM_CFLAGS = $(CWARNFLAGS) +AM_CFLAGS = $(BASE_CFLAGS) AM_CPPFLAGS = $(XCB_CFLAGS) libxcb_icccm_la_SOURCES = icccm.c diff --git a/m4 b/m4 index 177e4af..9dd4002 16 --- a/m4 +++ b/m4 @@ -1 +1 @@ -Subproject commit 177e4afb9b57a7b7589c15d8a9bd85b4a5524128 +Subproject commit 9dd400297f673851dfaea22de2b51583c7b89cb6 commit 18b823af6ab13aa0db0c814a07b43548aa953a68 Author: Gaetan Nadon mems...@videotron.ca Date: Sat Feb 8 10:59:10 2014 -0500 make: implement the silent rules for m4 generated files. Signed-off-by: Gaetan Nadon mems...@videotron.ca diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am index c841e7b..e2b428d 100644 --- a/ewmh/Makefile.am +++ b/ewmh/Makefile.am @@ -17,7 +17,7 @@ BUILT_SOURCES = ewmh.c xcb_ewmh.h CLEANFILES = $(BUILT_SOURCES) ewmh.c: ewmh.c.m4 atomlist.m4 - $(M4) -I$(srcdir) $ $@ + $(AM_V_GEN)$(M4) -I$(srcdir) $ $@ xcb_ewmh.h: xcb_ewmh.h.m4 atomlist.m4 - $(M4) -I$(srcdir) $ $@ + $(AM_V_GEN)$(M4) -I$(srcdir) $ $@ commit 3546b8114e87c17d19df3dd7aa50c5efd6ca6083 Author: Gaetan Nadon mems...@videotron.ca Date: Thu Feb 6 16:55:48 2014 -0500 Remove documentation dead code There is no evidence this file has ever been used. Signed-off-by: Gaetan Nadon mems...@videotron.ca Reviewed-by: Arnaud Fontaine ar...@debian.org diff --git a/.gitignore b/.gitignore index a6605c5..7c46eb6 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,5 @@ core # Edit the following section as needed # For example, !report.pc overrides *.pc.
xcb-util-wm: Changes to 'upstream-unstable'
Doxyfile | 1306 -
Makefile.am|1
NEWS |6
configure.ac |2
ewmh/Makefile.am |2
ewmh/ewmh.c.m4 |6
ewmh/xcb_ewmh.h.m4 | 16
icccm/xcb_icccm.h |6
8 files changed, 23 insertions(+), 1322 deletions(-)
New commits:
commit b488f4142298640f3237914a489c8eb6107922fd
Author: Arnaud Fontaine ar...@debian.org
Date: Thu May 31 11:22:27 2012 +0900
Release 0.3.9
Signed-off-by: Arnaud Fontaine ar...@debian.org
diff --git a/NEWS b/NEWS
index 2802b0a..05a6290 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Release 0.3.9 (2012-05-30)
+==
+
+- Replacing c++ class keyword in interface header.
+- Fix incomplete implementation of _NET_SUPPORTING_WM_CHECK.
+
Release 0.3.8 (2010-04-25)
==
diff --git a/configure.ac b/configure.ac
index 8cfc47c..a405d1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf = 2.62
AC_PREREQ(2.62)
-AC_INIT([xcb-util-wm],0.3.8,[x...@lists.freedesktop.org])
+AC_INIT([xcb-util-wm],0.3.9,[x...@lists.freedesktop.org])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 0f4ab3bc122cadf4b07c93d00bdaea1fd322ef27
Author: Arnaud Fontaine ar...@debian.org
Date: Thu May 31 11:21:48 2012 +0900
Bump SONAME version following 23a4eb6.
Signed-off-by: Arnaud Fontaine ar...@debian.org
diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am
index 235d5e4..f9b78b1 100644
--- a/ewmh/Makefile.am
+++ b/ewmh/Makefile.am
@@ -9,7 +9,7 @@ AM_CFLAGS = $(CWARNFLAGS)
libxcb_ewmh_la_SOURCES = ewmh.c ewmh.c.m4 atomlist.m4 xcb_ewmh.h.m4
libxcb_ewmh_la_CPPFLAGS = $(XCB_CFLAGS) $(XPROTO_CFLAGS)
libxcb_ewmh_la_LIBADD = $(XCB_LIBS) $(XPROTO_LIBS)
-libxcb_ewmh_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+libxcb_ewmh_la_LDFLAGS = -version-info 2:0:0 -no-undefined
pkgconfig_DATA = xcb-ewmh.pc
commit 30d73e882ddd9a42148d76fbf3082fa019f6e6c3
Author: Arnaud Fontaine ar...@debian.org
Date: Wed May 30 14:33:16 2012 +0900
Fix GCC warning on ewmh_atom_t type.
Signed-off-by: Arnaud Fontaine ar...@debian.org
diff --git a/ewmh/ewmh.c.m4 b/ewmh/ewmh.c.m4
index 6fafa0a..21c4db1 100644
--- a/ewmh/ewmh.c.m4
+++ b/ewmh/ewmh.c.m4
@@ -53,7 +53,7 @@ typedef struct {
/** The Atom name length */
uint8_t name_len;
/** The Atom name string */
- char *name;
+ const char *name;
size_t m_offset;
} ewmh_atom_t;
commit 20d6aec4bd276110e929da756adee9942cbee347
Author: Arnaud Fontaine ar...@debian.org
Date: Mon May 21 11:02:30 2012 +0900
Add autogen.sh to EXTRA_DIST.
diff --git a/Makefile.am b/Makefile.am
index bc8df99..1d62d8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,3 +13,4 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
SUBDIRS = icccm ewmh
+EXTRA_DIST = autogen.sh
commit 23a4eb6059e0a694e342c3ff41ab076dad50b745
Author: Arnaud Fontaine ar...@debian.org
Date: Thu Aug 11 21:10:58 2011 +0900
Fix incomplete implementation of _NET_SUPPORTING_WM_CHECK.
EWMH specification states that _NET_SUPPORTING_WM_CHECK must also be set on
the
child window, not only on the root window.
diff --git a/ewmh/ewmh.c.m4 b/ewmh/ewmh.c.m4
index 7192ee6..6fafa0a 100644
--- a/ewmh/ewmh.c.m4
+++ b/ewmh/ewmh.c.m4
@@ -780,8 +780,8 @@ DO_REPLY_LIST_VALUES(workarea, XCB_ATOM_CARDINAL,
xcb_ewmh_geometry_t)
* _NET_SUPPORTING_WM_CHECK
*/
-DO_ROOT_SINGLE_VALUE(supporting_wm_check, _NET_SUPPORTING_WM_CHECK,
- XCB_ATOM_WINDOW, xcb_window_t)
+DO_SINGLE_VALUE(supporting_wm_check, _NET_SUPPORTING_WM_CHECK,
+XCB_ATOM_WINDOW, xcb_window_t)
/**
* _NET_VIRTUAL_ROOTS
diff --git a/ewmh/xcb_ewmh.h.m4 b/ewmh/xcb_ewmh.h.m4
index 676e700..4f3e77a 100644
--- a/ewmh/xcb_ewmh.h.m4
+++ b/ewmh/xcb_ewmh.h.m4
@@ -1427,20 +1427,20 @@ void
xcb_ewmh_get_workarea_reply_wipe(xcb_ewmh_get_workarea_reply_t *r);
* _NET_SUPPORTING_WM_CHECK, WINDOW/32
*
* @param ewmh The per-screen EWMH information
- * @param screen_nbr The screen number
- * @param new_window The child window created by the WM
+ * @param parent_window The root window or child window created by the WM
+ * @param child_window The child window created by the WM
* @return Cookie associated with the ChangeProperty _NET_SUPPORTING_WM_CHECK
request
*/
xcb_void_cookie_t xcb_ewmh_set_supporting_wm_check(xcb_ewmh_connection_t *ewmh,
- int screen_nbr,
- xcb_window_t new_window);
+ xcb_window_t parent_window,
+ xcb_window_t child_window);
/**
* @see xcb_ewmh_set_supporting_wm_check
*/
xcb_void_cookie_t
xcb_ewmh_set_supporting_wm_check_checked(xcb_ewmh_connection_t *ewmh,
-
