* [gentoo-commits] proj/x11:master commit in: x11-libs/xcb-util/, x11-libs/xcb-util/files/
@ 2011-03-19 11:46 Tomas Chvatal
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal @ 2011-03-19 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 0e2b895e575ec212e85f0d48aa0bc865f5fd499f
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 11:46:16 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 11:46:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0e2b895e
[x11-libs/xcb-util] Fix autotools to make the thing eautoreconf and compile.
---
...ng-dir-definitions-and-check-for-libtool-.patch | 68 ++++++++++++++++++++
x11-libs/xcb-util/xcb-util-9999.ebuild | 9 ++-
2 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/x11-libs/xcb-util/files/0001-Fixup-missing-dir-definitions-and-check-for-libtool-.patch b/x11-libs/xcb-util/files/0001-Fixup-missing-dir-definitions-and-check-for-libtool-.patch
new file mode 100644
index 0000000..3ce7217
--- /dev/null
+++ b/x11-libs/xcb-util/files/0001-Fixup-missing-dir-definitions-and-check-for-libtool-.patch
@@ -0,0 +1,68 @@
+From 87a901a617b3bf627e0d45dddd8cde312bf02e4f Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <scarabeus@gentoo.org>
+Date: Sat, 19 Mar 2011 12:25:49 +0100
+Subject: [PATCH] Fixup missing dir definitions and check for libtool and m4.
+
+---
+ Makefile.am | 1 +
+ configure.ac | 17 ++++++++++++-----
+ src/Makefile.am | 1 +
+ 3 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 603f904..9e91071 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
+
+ SUBDIRS = src
+
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = \
+ xcb-atom.pc \
+ xcb-aux.pc \
+diff --git a/configure.ac b/configure.ac
+index bb15881..044d900 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,13 +6,20 @@ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+
+-XCB_UTIL_M4_WITH_INCLUDE_PATH
+-XCB_UTIL_COMMON([1.4], [1.6])
++dnl XCB_UTIL_M4_WITH_INCLUDE_PATH
++dnl XCB_UTIL_COMMON([1.4], [1.6])
++
++AC_PROG_LIBTOOL
++
++AC_CHECK_PROGS(M4, m4, [no])
++AS_IF([test x$M4 = xno],
++ AC_MSG_ERROR([Can't find m4, please install it and try again])
++)
+
+ AC_CHECK_PROGS(GPERF, gperf, [no])
+-if test $GPERF = "no"; then
+- AC_MSG_ERROR([Can't find gperf, please install it and try again])
+-fi
++AS_IF([test $GPERF = xno],
++ AC_MSG_ERROR([Can't find gperf, please install it and try again])
++)
+
+ AC_CHECK_FUNCS_ONCE(vasprintf)
+ AC_TYPE_SSIZE_T
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 39ad3bf..ffd0bcf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,6 +11,7 @@ libxcb_util_la_SOURCES = \
+ event.c \
+ xcb_aux.c
+
++xcbincludedir = $(includedir)/xcb
+ xcbinclude_HEADERS = \
+ xcb_util.h \
+ xcb_atom.h \
+--
+1.7.4
+
diff --git a/x11-libs/xcb-util/xcb-util-9999.ebuild b/x11-libs/xcb-util/xcb-util-9999.ebuild
index 17df64c..af9e025 100644
--- a/x11-libs/xcb-util/xcb-util-9999.ebuild
+++ b/x11-libs/xcb-util/xcb-util-9999.ebuild
@@ -10,10 +10,13 @@ HOMEPAGE="http://xcb.freedesktop.org/"
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
+IUSE=""
RDEPEND=">=x11-libs/libxcb-1
x11-proto/xproto"
DEPEND="${RDEPEND}
- >=dev-util/gperf-3.0.1
- test? ( >=dev-libs/check-0.9.4 )"
+ >=dev-util/gperf-3.0.1"
+
+PATCHES=(
+ "${FILESDIR}/0001-Fixup-missing-dir-definitions-and-check-for-libtool-.patch"
+)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/xcb-util/, x11-libs/xcb-util/files/
@ 2011-03-19 11:57 Tomas Chvatal
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal @ 2011-03-19 11:57 UTC (permalink / raw
To: gentoo-commits
commit: 3c779e855bac1728700f8f46d68a3ece0d7e376e
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 11:56:51 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 11:56:51 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3c779e85
:Revert "[x11-libs/xcb-util] Fix autotools to make the thing eautoreconf and compile."
This reverts commit 0e2b895e575ec212e85f0d48aa0bc865f5fd499f.
---
...ng-dir-definitions-and-check-for-libtool-.patch | 68 --------------------
x11-libs/xcb-util/xcb-util-9999.ebuild | 9 +--
2 files changed, 3 insertions(+), 74 deletions(-)
diff --git a/x11-libs/xcb-util/files/0001-Fixup-missing-dir-definitions-and-check-for-libtool-.patch b/x11-libs/xcb-util/files/0001-Fixup-missing-dir-definitions-and-check-for-libtool-.patch
deleted file mode 100644
index 3ce7217..0000000
--- a/x11-libs/xcb-util/files/0001-Fixup-missing-dir-definitions-and-check-for-libtool-.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 87a901a617b3bf627e0d45dddd8cde312bf02e4f Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <scarabeus@gentoo.org>
-Date: Sat, 19 Mar 2011 12:25:49 +0100
-Subject: [PATCH] Fixup missing dir definitions and check for libtool and m4.
-
----
- Makefile.am | 1 +
- configure.ac | 17 ++++++++++++-----
- src/Makefile.am | 1 +
- 3 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 603f904..9e91071 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
-
- SUBDIRS = src
-
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = \
- xcb-atom.pc \
- xcb-aux.pc \
-diff --git a/configure.ac b/configure.ac
-index bb15881..044d900 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,13 +6,20 @@ AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
-
--XCB_UTIL_M4_WITH_INCLUDE_PATH
--XCB_UTIL_COMMON([1.4], [1.6])
-+dnl XCB_UTIL_M4_WITH_INCLUDE_PATH
-+dnl XCB_UTIL_COMMON([1.4], [1.6])
-+
-+AC_PROG_LIBTOOL
-+
-+AC_CHECK_PROGS(M4, m4, [no])
-+AS_IF([test x$M4 = xno],
-+ AC_MSG_ERROR([Can't find m4, please install it and try again])
-+)
-
- AC_CHECK_PROGS(GPERF, gperf, [no])
--if test $GPERF = "no"; then
-- AC_MSG_ERROR([Can't find gperf, please install it and try again])
--fi
-+AS_IF([test $GPERF = xno],
-+ AC_MSG_ERROR([Can't find gperf, please install it and try again])
-+)
-
- AC_CHECK_FUNCS_ONCE(vasprintf)
- AC_TYPE_SSIZE_T
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 39ad3bf..ffd0bcf 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -11,6 +11,7 @@ libxcb_util_la_SOURCES = \
- event.c \
- xcb_aux.c
-
-+xcbincludedir = $(includedir)/xcb
- xcbinclude_HEADERS = \
- xcb_util.h \
- xcb_atom.h \
---
-1.7.4
-
diff --git a/x11-libs/xcb-util/xcb-util-9999.ebuild b/x11-libs/xcb-util/xcb-util-9999.ebuild
index af9e025..17df64c 100644
--- a/x11-libs/xcb-util/xcb-util-9999.ebuild
+++ b/x11-libs/xcb-util/xcb-util-9999.ebuild
@@ -10,13 +10,10 @@ HOMEPAGE="http://xcb.freedesktop.org/"
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
+IUSE="test"
RDEPEND=">=x11-libs/libxcb-1
x11-proto/xproto"
DEPEND="${RDEPEND}
- >=dev-util/gperf-3.0.1"
-
-PATCHES=(
- "${FILESDIR}/0001-Fixup-missing-dir-definitions-and-check-for-libtool-.patch"
-)
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.4 )"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-19 11:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-19 11:57 [gentoo-commits] proj/x11:master commit in: x11-libs/xcb-util/, x11-libs/xcb-util/files/ Tomas Chvatal
-- strict thread matches above, loose matches on Subject: below --
2011-03-19 11:46 Tomas Chvatal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox