.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=xcb&component=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 160000 --- 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 160000 --- 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. See 'man gitignore' # -xcb_util_intro ewmh/ewmh.c -ewmh/xcb_ewmh.h \ No newline at end of file +ewmh/xcb_ewmh.h diff --git a/configure.ac b/configure.ac index 719aef2..f95a93f 100644 --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,5 @@ AC_CONFIG_FILES([Makefile icccm/Makefile icccm/xcb-icccm.pc ewmh/Makefile - ewmh/xcb-ewmh.pc - xcb_util_intro]) + ewmh/xcb-ewmh.pc]) AC_OUTPUT diff --git a/xcb_util_intro.in b/xcb_util_intro.in deleted file mode 100644 index f063613..0000000 --- a/xcb_util_intro.in +++ /dev/null @@ -1,24 +0,0 @@ -/** -@file -@brief XCB Utility functions - -These routines are used to facilitate the use of XCB in programs. -*/ - -/** - -@mainpage XCB Utility Documentation -@version @PACKAGE_VERSION@ -@author Ian Osgood <i...@quirkster.com> -@author Bart Massey <b...@cs.pdx.edu> -@author Jamey Sharp <ja...@minilop.net> -@author Josh Triplett <j...@freedesktop.org> -@author Keith Packard <kei...@keithp.com> -@author Vincent Torri <to...@iecn.u-nancy.fr> -@author Julien Danjou <jul...@danjou.info> -@author Arnaud Fontaine <ar...@debian.org> -@date 2005-2008 - -@section intro What is available ? - -*/ commit 2e4e3cc896361202e7b310e9df048f44723094a4 Author: Gaetan Nadon <mems...@videotron.ca> Date: Thu Feb 6 16:55:52 2014 -0500 make: using EXTRA_DIST for xcb-*.pc.in is redundant All files mentionned in AC_CONFIG_FILES have their source files distributed automatically. http://www.gnu.org/software/automake/manual/automake.html Signed-off-by: Gaetan Nadon <mems...@videotron.ca> Reviewed-by: Arnaud Fontaine <ar...@debian.org> diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am index ce938b9..c841e7b 100644 --- a/ewmh/Makefile.am +++ b/ewmh/Makefile.am @@ -13,8 +13,6 @@ libxcb_ewmh_la_LDFLAGS = -version-info 2:0:0 -no-undefined pkgconfig_DATA = xcb-ewmh.pc -EXTRA_DIST = xcb-ewmh.pc.in - BUILT_SOURCES = ewmh.c xcb_ewmh.h CLEANFILES = $(BUILT_SOURCES) diff --git a/icccm/Makefile.am b/icccm/Makefile.am index 8598fe1..b7366b8 100644 --- a/icccm/Makefile.am +++ b/icccm/Makefile.am @@ -11,5 +11,3 @@ libxcb_icccm_la_LIBADD = $(XCB_LIBS) libxcb_icccm_la_LDFLAGS = -version-info 4:0:0 -no-undefined pkgconfig_DATA = xcb-icccm.pc - -EXTRA_DIST = xcb-icccm.pc.in commit 2ff4244bcc5232b02978dc65a0ea359b96ed8423 Author: Gaetan Nadon <mems...@videotron.ca> Date: Thu Feb 6 16:55:51 2014 -0500 make: there should be no attempt to remove any Makefile.in file Files generated by autoconf (and the various tools it calls) must not be removed by running a makefile. This is outside the scope of the makefile. http://lists.gnu.org/archive/html/autoconf/2007-03/msg00043.html One can use git-clean to return to the original state of the module prior to running autogen.sh, autoreconf or configure. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> Reviewed-by: Arnaud Fontaine <ar...@debian.org> diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am index 9a2acd8..ce938b9 100644 --- a/ewmh/Makefile.am +++ b/ewmh/Makefile.am @@ -1,4 +1,3 @@ -MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libxcb-ewmh.la diff --git a/icccm/Makefile.am b/icccm/Makefile.am index 5850db4..8598fe1 100644 --- a/icccm/Makefile.am +++ b/icccm/Makefile.am @@ -1,6 +1,4 @@ -MAINTAINERCLEANFILES = Makefile.in - lib_LTLIBRARIES = libxcb-icccm.la xcbinclude_HEADERS = xcb_icccm.h commit 1bdd2c56ebc9442ab2159f82d399848e7d97ccb9 Author: Gaetan Nadon <mems...@videotron.ca> Date: Thu Feb 6 16:55:50 2014 -0500 make: use AM_CPPFLAGS rather than per-target libxcb_*_la_CPPFLAGS There is only one target in this directory, so we do not need to trigger the per-target infrastructure which would require AC_PROG_CC_C_O macro. So libxcb_ewmh_la-ewmh.o simply becomes ewmh.o. http://www.gnu.org/software/automake/manual/automake.html#Renamed-Objects Signed-off-by: Gaetan Nadon <mems...@videotron.ca> Reviewed-by: Arnaud Fontaine <ar...@debian.org> diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am index 49e2ad8..9a2acd8 100644 --- a/ewmh/Makefile.am +++ b/ewmh/Makefile.am @@ -5,10 +5,10 @@ lib_LTLIBRARIES = libxcb-ewmh.la nodist_xcbinclude_HEADERS = xcb_ewmh.h AM_CFLAGS = $(CWARNFLAGS) +AM_CPPFLAGS = $(XCB_CFLAGS) libxcb_ewmh_la_SOURCES = ewmh.c.m4 atomlist.m4 xcb_ewmh.h.m4 nodist_libxcb_ewmh_la_SOURCES = ewmh.c -libxcb_ewmh_la_CPPFLAGS = $(XCB_CFLAGS) libxcb_ewmh_la_LIBADD = $(XCB_LIBS) libxcb_ewmh_la_LDFLAGS = -version-info 2:0:0 -no-undefined diff --git a/icccm/Makefile.am b/icccm/Makefile.am index 32b6f92..5850db4 100644 --- a/icccm/Makefile.am +++ b/icccm/Makefile.am @@ -6,9 +6,9 @@ lib_LTLIBRARIES = libxcb-icccm.la xcbinclude_HEADERS = xcb_icccm.h AM_CFLAGS = $(CWARNFLAGS) +AM_CPPFLAGS = $(XCB_CFLAGS) libxcb_icccm_la_SOURCES = icccm.c -libxcb_icccm_la_CPPFLAGS = $(XCB_CFLAGS) libxcb_icccm_la_LIBADD = $(XCB_LIBS) libxcb_icccm_la_LDFLAGS = -version-info 4:0:0 -no-undefined commit ba897f290b0a71e7ffb8047bbd241da71ca47003 Author: Gaetan Nadon <mems...@videotron.ca> Date: Thu Feb 6 16:55:49 2014 -0500 make: remove unused XPROTO_CFLAGS and XPROTO_LIBS These should have been removed with the patch: "Split up icccm and ewmh into their own repository" back in 2011. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> Reviewed-by: Arnaud Fontaine <ar...@debian.org> diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am index 347a3c2..49e2ad8 100644 --- a/ewmh/Makefile.am +++ b/ewmh/Makefile.am @@ -8,8 +8,8 @@ AM_CFLAGS = $(CWARNFLAGS) libxcb_ewmh_la_SOURCES = ewmh.c.m4 atomlist.m4 xcb_ewmh.h.m4 nodist_libxcb_ewmh_la_SOURCES = ewmh.c -libxcb_ewmh_la_CPPFLAGS = $(XCB_CFLAGS) $(XPROTO_CFLAGS) -libxcb_ewmh_la_LIBADD = $(XCB_LIBS) $(XPROTO_LIBS) +libxcb_ewmh_la_CPPFLAGS = $(XCB_CFLAGS) +libxcb_ewmh_la_LIBADD = $(XCB_LIBS) libxcb_ewmh_la_LDFLAGS = -version-info 2:0:0 -no-undefined pkgconfig_DATA = xcb-ewmh.pc diff --git a/icccm/Makefile.am b/icccm/Makefile.am index 15bdebb..32b6f92 100644 --- a/icccm/Makefile.am +++ b/icccm/Makefile.am @@ -8,8 +8,8 @@ xcbinclude_HEADERS = xcb_icccm.h AM_CFLAGS = $(CWARNFLAGS) libxcb_icccm_la_SOURCES = icccm.c -libxcb_icccm_la_CPPFLAGS = $(XCB_CFLAGS) $(XPROTO_CFLAGS) -libxcb_icccm_la_LIBADD = $(XCB_LIBS) $(XPROTO_LIBS) +libxcb_icccm_la_CPPFLAGS = $(XCB_CFLAGS) +libxcb_icccm_la_LIBADD = $(XCB_LIBS) libxcb_icccm_la_LDFLAGS = -version-info 4:0:0 -no-undefined pkgconfig_DATA = xcb-icccm.pc commit efd712f4e5c4da9c575e249e4e747b269fb458ae Author: Arnaud Fontaine <ar...@debian.org> Date: Fri Jan 31 15:10:15 2014 +0900 Do not distribute ewmh C source file as they are generated with M4. Signed-off-by: Arnaud Fontaine <ar...@debian.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am index f9b78b1..347a3c2 100644 --- a/ewmh/Makefile.am +++ b/ewmh/Makefile.am @@ -2,11 +2,12 @@ MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libxcb-ewmh.la -xcbinclude_HEADERS = xcb_ewmh.h +nodist_xcbinclude_HEADERS = xcb_ewmh.h AM_CFLAGS = $(CWARNFLAGS) -libxcb_ewmh_la_SOURCES = ewmh.c ewmh.c.m4 atomlist.m4 xcb_ewmh.h.m4 +libxcb_ewmh_la_SOURCES = ewmh.c.m4 atomlist.m4 xcb_ewmh.h.m4 +nodist_libxcb_ewmh_la_SOURCES = ewmh.c libxcb_ewmh_la_CPPFLAGS = $(XCB_CFLAGS) $(XPROTO_CFLAGS) libxcb_ewmh_la_LIBADD = $(XCB_LIBS) $(XPROTO_LIBS) libxcb_ewmh_la_LDFLAGS = -version-info 2:0:0 -no-undefined commit e36487b50714f492e0797b4e9d84fbd18664df14 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sat Feb 1 11:55:13 2014 -0500 config: update the README file for bug tracking Update bug tracker info following libxcb format. Reviewed-by: Arnaud Fontaine <ar...@debian.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/README b/README index 618d591..dfec36e 100644 --- a/README +++ b/README @@ -28,11 +28,22 @@ XCB util-wm module provides the following libraries: - ewmh: Both client and window-manager helpers for EWMH. - icccm: Both client and window-manager helpers for ICCCM. -You can obtain the latest development versions of XCB util-wm using -GIT. For anonymous checkouts, use: - git clone --recursive git://anongit.freedesktop.org/git/xcb/util-wm +Please report any issues you find to the freedesktop.org bug tracker, +at: + + <https://bugs.freedesktop.org/enter_bug.cgi?product=xcb&component=Utils> + +Discussion about XCB occurs on the XCB mailing list: + + <mailto:xcb at lists.freedesktop.org> + <http://lists.freedesktop.org/mailman/listinfo/xcb> + +You can obtain the latest development versions of XCB using GIT. +For anonymous checkouts, use: + + git clone --recursive git://anongit.freedesktop.org/git/xcb/util-wm For developers, use: - git clone --recursive git+ssh://git.freedesktop.org/git/xcb/util-wm + git clone --recursive git+ssh://git.freedesktop.org/git/xcb/util-wm commit 1151e11053bb619a58d01ff6f0762aa5fee34d89 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sat Feb 1 11:41:15 2014 -0500 config: add missing COPYING file This file is mandatory. It reflects the copyright statements found in the source code as written by their respective owners. Reviewed-by: Arnaud Fontaine <ar...@debian.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..ef4db09 --- /dev/null +++ b/COPYING @@ -0,0 +1,27 @@ + +Copyright © 2008-2011 Arnaud Fontaine <ar...@debian.org> +Copyright © 2007-2008 Vincent Torri <vto...@univ-evry.fr> + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the names of the authors or +their institutions shall not be used in advertising or otherwise to +promote the sale, use or other dealings in this Software without +prior written authorization from the authors. commit f401c736a61a59ae2530bd7cd2a9a0afe29f43c3 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sat Feb 1 11:29:33 2014 -0500 config: add bug URL to AC_INIT Use same layout as libxcb. Reviewed-by: Arnaud Fontaine <ar...@debian.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 621f15a..719aef2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62 AC_PREREQ(2.62) -AC_INIT([xcb-util-wm],0.4.0,[x...@lists.freedesktop.org]) +AC_INIT([xcb-util-wm],[0.4.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xcb&component=Utils], + [xcb-util-wm]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) commit 5d7f2805d83944ed8da6fcc5b8506531262b9da9 Author: Gaetan Nadon <mems...@videotron.ca> Date: Fri Jan 31 22:36:29 2014 -0500 config: drop the check for sys/types.h All the X supported systems do have this header file. None of the xorg modules have this check, so it is safe to remove. Reviewed-by: Arnaud Fontaine <ar...@debian.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/ewmh/ewmh.c.m4 b/ewmh/ewmh.c.m4 index 769b36b..b986105 100644 --- a/ewmh/ewmh.c.m4 +++ b/ewmh/ewmh.c.m4 @@ -43,9 +43,7 @@ #include <xcb/xcb.h> #include <xcb/xproto.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif +#include <sys/types.h> #define ssizeof(foo) (ssize_t)sizeof(foo) #define countof(foo) (ssizeof(foo) / ssizeof(foo[0])) commit 9c45c1919b68330bab44b4c1a0984f644bd66110 Author: Gaetan Nadon <mems...@videotron.ca> Date: Fri Jan 31 22:29:08 2014 -0500 config: use AC_CONFIG_HEADERS to create a config.h file This file contains C preprocessor #define statements which replace the current -Ds added to each compilation invocation. This makes the gcc output command easier to read and prevents exceeding the max line limits on some computers. This is the preferred method in al the xorg modules. Reviewed-by: Arnaud Fontaine <ar...@debian.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 5262b91..621f15a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62 AC_PREREQ(2.62) AC_INIT([xcb-util-wm],0.4.0,[x...@lists.freedesktop.org]) AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/ewmh/ewmh.c.m4 b/ewmh/ewmh.c.m4 index d951208..769b36b 100644 --- a/ewmh/ewmh.c.m4 +++ b/ewmh/ewmh.c.m4 @@ -26,6 +26,11 @@ * prior written authorization from the authors. */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xcb_ewmh.h" #include <string.h> diff --git a/icccm/icccm.c b/icccm/icccm.c index ed623d0..f6daf0d 100644 --- a/icccm/icccm.c +++ b/icccm/icccm.c @@ -27,6 +27,10 @@ * prior written authorization from the authors. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <limits.h> #include <string.h> commit 01b94c100022ce8dd3a44e319c42c57c6e2a5849 Author: Gaetan Nadon <mems...@videotron.ca> Date: Fri Jan 31 19:31:24 2014 -0500 config: remove AC_TYPE_SSIZE_T This is not needed as we have standard headers and C99. This result in no change to the defines used at compile time. http://www.gnu.org/software/autoconf/manual/autoconf.html Reviewed-by: Arnaud Fontaine <ar...@debian.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 634c2a1..5262b91 100644 --- a/configure.ac +++ b/configure.ac @@ -6,8 +6,6 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_TYPE_SSIZE_T - XCB_UTIL_M4_WITH_INCLUDE_PATH XCB_UTIL_COMMON([1.4], [1.6]) commit 879a1aa3ef8aca4d737aacba35bf0850e46c9a02 Author: Gaetan Nadon <mems...@videotron.ca> Date: Fri Jan 31 19:09:07 2014 -0500 config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES Fix Automake warning: AC_OUTPUT should be used without arguments. www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files Changed layout to one file per file like other xorg modules. Reviewed-by: Arnaud Fontaine <ar...@debian.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 9e89119..634c2a1 100644 --- a/configure.ac +++ b/configure.ac @@ -11,8 +11,10 @@ AC_TYPE_SSIZE_T XCB_UTIL_M4_WITH_INCLUDE_PATH XCB_UTIL_COMMON([1.4], [1.6]) -AC_OUTPUT([Makefile - icccm/Makefile icccm/xcb-icccm.pc - ewmh/Makefile ewmh/xcb-ewmh.pc - xcb_util_intro - ]) +AC_CONFIG_FILES([Makefile + icccm/Makefile + icccm/xcb-icccm.pc + ewmh/Makefile + ewmh/xcb-ewmh.pc + xcb_util_intro]) +AC_OUTPUT commit 08666113d3341b9817c8821854d1297acfd5f58f Author: Arnaud Fontaine <ar...@debian.org> Date: Wed Jan 29 17:33:56 2014 +0900 xcb-proto should have never been required as xcb provides the Atoms. Reported on Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722632 Signed-off-by: Arnaud Fontaine <ar...@debian.org> diff --git a/ewmh/xcb-ewmh.pc.in b/ewmh/xcb-ewmh.pc.in index 84b1fa4..eb0e771 100644 --- a/ewmh/xcb-ewmh.pc.in +++ b/ewmh/xcb-ewmh.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: XCB EWMH library Description: XCB EWMH binding Version: @PACKAGE_VERSION@ -Requires: xcb xcb-proto +Requires: xcb Libs: -L${libdir} -lxcb-ewmh @LIBS@ Cflags: -I${includedir} commit 1ad70737e5076baf1f99cb6463e10a362f78ceee Author: Arnaud Fontaine <ar...@debian.org> Date: Wed Jan 29 15:45:03 2014 +0900 Release 0.4.0. Signed-off-by: Arnaud Fontaine <ar...@debian.org> diff --git a/NEWS b/NEWS index 05a6290..66d5913 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +Release 0.4.0 (2014-01-19) +========================== + +- Set EWMH ClientMessage window to the Root, not mandated but expected by some WMs. + Release 0.3.9 (2012-05-30) ========================== @@ -17,4 +22,4 @@ Release 0.3.8 (2010-04-25) - Link with -no-undefined. - Validate size of wm_hints and wm_size_hints. - Ensure get_wm_class_from_reply returns a valid C-string. -- Add AM_MAINTAINER_MODE for vendors +- Add AM_MAINTAINER_MODE for vendors. diff --git a/configure.ac b/configure.ac index a405d1a..9e89119 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.9,[x...@lists.freedesktop.org]) +AC_INIT([xcb-util-wm],0.4.0,[x...@lists.freedesktop.org]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit c3d61ece8098ec3f1b3f5c3f8c5c95f2a5c3c0f7 Author: Niclas Zeising <zeis...@daemonic.se> Date: Mon Aug 12 13:53:10 2013 +0200 Check submodules before running autoconf. Exit early with an informative message if the submodules are missing, since they are needed. Without this autoconf throws a bunch of uninformative errors which does not point to the actual problem. This was taken from util-keysyms. Signed-off-by: Niclas Zeising <zeis...@daemonic.se> Reviewed-By: Arnaud Fontaine <ar...@debian.org> diff --git a/autogen.sh b/autogen.sh index 904cd67..afe5299 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,6 +6,21 @@ test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` cd $srcdir +# If this is a git checkout, verify that the submodules are initialized, +# otherwise autotools will just fail with an unhelpful error message. +if [ -d ".git" ] && [ -r ".gitmodules" ] +then + # If git is not in PATH, this will not return 0, thus not keeping us + # from building. Since the message is worthless when git is not + # installed, this is what we want. + if git submodule status 2>/dev/null | grep -q '^-' + then + echo "You have uninitialized git submodules." >&2 + echo "Please run: git submodule update --init" >&2 + exit 1 + fi +fi + autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? commit c33a20fa5876e96c5ec6ec882b681379f145a66e Author: Arnaud Fontaine <ar...@debian.org> Date: Tue Jul 16 17:48:32 2013 +0900 Even though EWMH spec does not mandate window to be set, some WM expect it to be set. For example, Awesome 3.4 with Zaphod mode checks this attribute to match it to the relevant root window. Signed-off-by: Arnaud Fontaine <ar...@debian.org> diff --git a/ewmh/ewmh.c.m4 b/ewmh/ewmh.c.m4 index 21c4db1..d951208 100644 --- a/ewmh/ewmh.c.m4 +++ b/ewmh/ewmh.c.m4 @@ -662,7 +662,8 @@ xcb_ewmh_request_change_desktop_geometry(xcb_ewmh_connection_t *ewmh, { const uint32_t data[] = { new_width, new_height }; - return xcb_ewmh_send_client_message(ewmh->connection, XCB_NONE, + return xcb_ewmh_send_client_message(ewmh->connection, + ewmh->screens[screen_nbr]->root, ewmh->screens[screen_nbr]->root, ewmh->_NET_DESKTOP_GEOMETRY, sizeof(data), data); @@ -713,7 +714,8 @@ xcb_ewmh_request_change_desktop_viewport(xcb_ewmh_connection_t *ewmh, { const uint32_t data[] = { x, y }; - return xcb_ewmh_send_client_message(ewmh->connection, XCB_NONE, + return xcb_ewmh_send_client_message(ewmh->connection, + ewmh->screens[screen_nbr]->root, ewmh->screens[screen_nbr]->root, ewmh->_NET_DESKTOP_VIEWPORT, sizeof(data), data); @@ -733,7 +735,8 @@ xcb_ewmh_request_change_current_desktop(xcb_ewmh_connection_t *ewmh, { const uint32_t data[] = { new_desktop, timestamp }; - return xcb_ewmh_send_client_message(ewmh->connection, XCB_NONE, + return xcb_ewmh_send_client_message(ewmh->connection, + ewmh->screens[screen_nbr]->root, ewmh->screens[screen_nbr]->root, ewmh->_NET_CURRENT_DESKTOP, sizeof(data), data); -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1wg5ql-0005cs...@moszumanska.debian.org