[Xcb-commit] xcb/util: 8 commits - configure.ac COPYING .gitignore m4 src xcb_util_intro.in
Arnaud Fontaine
arnau at kemper.freedesktop.org
Mon Feb 17 09:49:51 CET 2014
.gitignore | 1 -
COPYING | 29 +++++++++++++++++++++++++++++
configure.ac | 11 +++++------
m4 | 2 +-
src/atoms.c | 5 +++++
src/event.c | 8 +++++---
src/xcb_aux.c | 4 ++++
xcb_util_intro.in | 24 ------------------------
8 files changed, 49 insertions(+), 35 deletions(-)
New commits:
commit 984aa2d66d74e611e842afc81624a537bb8d7f28
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Thu Feb 13 17:24:39 2014 -0500
Pick-up changes in m4 submodule
Better to have all util repos at same m4 level
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau at debian.org>
diff --git a/m4 b/m4
index 177e4af..9dd4002 160000
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit 177e4afb9b57a7b7589c15d8a9bd85b4a5524128
+Subproject commit 9dd400297f673851dfaea22de2b51583c7b89cb6
commit 4a6cde4f80c8c2168d217f0d64d31835167f0803
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Thu Feb 13 17:07:22 2014 -0500
config: remove old dead code for documentation
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau at debian.org>
diff --git a/.gitignore b/.gitignore
index fa4026e..c9f356c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,4 +76,3 @@ core
# Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore'
#
-xcb_util_intro
diff --git a/configure.ac b/configure.ac
index a5224c7..5a6b220 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,5 @@ AC_CONFIG_FILES([Makefile
xcb-atom.pc
xcb-aux.pc
xcb-event.pc
- xcb-util.pc
- xcb_util_intro])
+ xcb-util.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 @@
-/**
- at file
- at brief XCB Utility functions
-
-These routines are used to facilitate the use of XCB in programs.
-*/
-
-/**
-
- at mainpage XCB Utility Documentation
- at version @PACKAGE_VERSION@
- at author Ian Osgood <iano at quirkster.com>
- at author Bart Massey <bart at cs.pdx.edu>
- at author Jamey Sharp <jamey at minilop.net>
- at author Josh Triplett <josh at freedesktop.org>
- at author Keith Packard <keithp at keithp.com>
- at author Vincent Torri <torri at iecn.u-nancy.fr>
- at author Julien Danjou <julien at danjou.info>
- at author Arnaud Fontaine <arnau at debian.org>
- at date 2005-2008
-
- at section intro What is available ?
-
-*/
commit 218448233fc37b694d9721176f771f2a52afe70e
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 9 12:01:47 2014 -0500
config: remove the dependency on X11 Protocol
The XPROTO_CFLAGS variable is not used.
The dependency on libxcb is sufficient as it depends on xproto.
This package compiles even if xproto is uninstalled after configuration.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau at debian.org>
diff --git a/configure.ac b/configure.ac
index 4e07d2d..a5224c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,6 @@ XCB_UTIL_COMMON([1.4], [1.6])
AC_CHECK_FUNCS_ONCE(vasprintf)
-PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8)
-
AC_CONFIG_FILES([Makefile
src/Makefile
xcb-atom.pc
commit aea9992778d9e3999714943fa429f64fbc1c3841
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 9 11:36:17 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.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau at debian.org>
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..ce5913e
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,29 @@
+Copyright © 2008 Bart Massey <bart at cs.pdx.edu>
+Copyright © 2008 Ian Osgood <iano at quirkster.com>
+Copyright © 2008 Jamey Sharp <jamey at minilop.net>
+Copyright © 2008 Josh Triplett <josh at freedesktop.org>
+Copyright © 2008-2009 Julien Danjou <julien at danjou.info>
+
+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 b2af8b1f198b9254c51588970df1f26d05d0d0d3
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 9 10:49:23 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.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau at debian.org>
diff --git a/src/event.c b/src/event.c
index b868252..88058c4 100644
--- a/src/event.c
+++ b/src/event.c
@@ -36,9 +36,7 @@
#include "xcb_event.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 37b11560dffc042833f2d20f87d577edfd861613
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 9 11:21:25 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
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau at debian.org>
diff --git a/configure.ac b/configure.ac
index 5e66d01..4e07d2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,6 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
XCB_UTIL_COMMON([1.4], [1.6])
AC_CHECK_FUNCS_ONCE(vasprintf)
-AC_TYPE_SSIZE_T
PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8)
commit 95e997ca45fc1c4235eea7a211c6ab2fa5e489f8
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 9 10:41:18 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.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau at debian.org>
diff --git a/configure.ac b/configure.ac
index 7693872..5e66d01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@ AC_INIT([xcb-util],[0.3.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xcb&component=Utils],
[xcb-util])
AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/src/atoms.c b/src/atoms.c
index e9133a6..e5c33e5 100644
--- a/src/atoms.c
+++ b/src/atoms.c
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
/* Rely on vasprintf (GNU extension) instead of vsnprintf if
possible... */
#define _GNU_SOURCE
diff --git a/src/event.c b/src/event.c
index de8899a..b868252 100644
--- a/src/event.c
+++ b/src/event.c
@@ -26,6 +26,10 @@
* prior written authorization from the authors.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <assert.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/xcb_aux.c b/src/xcb_aux.c
index 4efb5cb..b6f64f8 100644
--- a/src/xcb_aux.c
+++ b/src/xcb_aux.c
@@ -29,6 +29,10 @@
* prior written authorization from the authors.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
commit 80ce6834e2374711eba834386643a354565a84f2
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 9 10:34:02 2014 -0500
config: add bug URL to AC_INIT
Use same layout as libxcb.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau at debian.org>
diff --git a/configure.ac b/configure.ac
index 5178873..7693872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,7 @@
AC_PREREQ(2.59c)
-AC_INIT([xcb-util],0.3.9,[xcb at lists.freedesktop.org])
+AC_INIT([xcb-util],[0.3.9],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xcb&component=Utils],
+ [xcb-util])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
More information about the xcb-commit
mailing list