commit: 62a5fd84f037cc2848ae888810c12c1a0be9d1dc Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun May 20 18:33:09 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun May 20 18:33:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a5fd84
x11-libs/libxcb: Drop old versions x11-libs/libxcb/Manifest | 1 - ...ll-headers-man-pages-for-disabled-extensi.patch | 257 --------------------- ...bxcb-1.12-fix-inconsistent-use-tabs-space.patch | 55 ----- x11-libs/libxcb/libxcb-1.12-r2.ebuild | 57 ----- 4 files changed, 370 deletions(-) diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest index 9f78262395e..aea3ef1bfbc 100644 --- a/x11-libs/libxcb/Manifest +++ b/x11-libs/libxcb/Manifest @@ -1,2 +1 @@ -DIST libxcb-1.12.tar.bz2 613822 BLAKE2B 61f164ba6fb9493fe0692badc74a2866ee08ce3c3499773be0bddf742d0ffc69bb876233aae46a7e76cb9263485eb007d105b16091a73750d490da0528482ff2 SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896 DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c diff --git a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch deleted file mode 100644 index 0f8aa119823..00000000000 --- a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch +++ /dev/null @@ -1,257 +0,0 @@ -From e9b5234b3b0b53bd3a35f947ddb8a72d03cf1825 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <r...@gentoo.org> -Date: Mon, 29 Dec 2014 20:18:22 +0100 -Subject: [PATCH] Don't install headers/man pages for disabled extensions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -https://bugs.gentoo.org/show_bug.cgi?id=533906 - -Signed-off-by: Rémi Cardona <r...@gentoo.org> ---- - src/Makefile.am | 52 ++++++++++++++++++++++++++-------------------------- - 1 file changed, 26 insertions(+), 26 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5a3c52a..774ad8e 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -24,208 +24,208 @@ XCB_LIBS = libxcb.la - - # FIXME: find a way to autogenerate this from the XML files. - --EXTSOURCES += composite.c - if BUILD_COMPOSITE -+EXTSOURCES += composite.c - lib_LTLIBRARIES += libxcb-composite.la - libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_composite_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_composite_la_SOURCES = composite.c composite.h - endif - --EXTSOURCES += damage.c - if BUILD_DAMAGE -+EXTSOURCES += damage.c - lib_LTLIBRARIES += libxcb-damage.la - libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_damage_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_damage_la_SOURCES = damage.c damage.h - endif - --EXTSOURCES += dpms.c - if BUILD_DPMS -+EXTSOURCES += dpms.c - lib_LTLIBRARIES += libxcb-dpms.la - libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_dpms_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h - endif - --EXTSOURCES += dri2.c - if BUILD_DRI2 -+EXTSOURCES += dri2.c - lib_LTLIBRARIES += libxcb-dri2.la - libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_dri2_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h - endif - --EXTSOURCES += dri3.c - if BUILD_DRI3 -+EXTSOURCES += dri3.c - lib_LTLIBRARIES += libxcb-dri3.la - libxcb_dri3_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_dri3_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_dri3_la_SOURCES = dri3.c dri3.h - endif - --EXTSOURCES += present.c - if BUILD_PRESENT -+EXTSOURCES += present.c - lib_LTLIBRARIES += libxcb-present.la - libxcb_present_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_present_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_present_la_SOURCES = present.c present.h - endif - --EXTSOURCES += glx.c - if BUILD_GLX - lib_LTLIBRARIES += libxcb-glx.la -+EXTSOURCES += glx.c - libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_glx_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_glx_la_SOURCES = glx.c glx.h - endif - --EXTSOURCES += randr.c - if BUILD_RANDR -+EXTSOURCES += randr.c - lib_LTLIBRARIES += libxcb-randr.la - libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@ - libxcb_randr_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_randr_la_SOURCES = randr.c randr.h - endif - --EXTSOURCES += record.c - if BUILD_RECORD -+EXTSOURCES += record.c - lib_LTLIBRARIES += libxcb-record.la - libxcb_record_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_record_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_record_la_SOURCES = record.c record.h - endif - --EXTSOURCES += render.c - if BUILD_RENDER -+EXTSOURCES += render.c - lib_LTLIBRARIES += libxcb-render.la - libxcb_render_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_render_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_render_la_SOURCES = render.c render.h - endif - --EXTSOURCES += res.c - if BUILD_RESOURCE -+EXTSOURCES += res.c - lib_LTLIBRARIES += libxcb-res.la - libxcb_res_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_res_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_res_la_SOURCES = res.c res.h - endif - --EXTSOURCES += screensaver.c - if BUILD_SCREENSAVER -+EXTSOURCES += screensaver.c - lib_LTLIBRARIES += libxcb-screensaver.la - libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_screensaver_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h - endif - --EXTSOURCES += shape.c - if BUILD_SHAPE -+EXTSOURCES += shape.c - lib_LTLIBRARIES += libxcb-shape.la - libxcb_shape_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_shape_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_shape_la_SOURCES = shape.c shape.h - endif - --EXTSOURCES += shm.c - if BUILD_SHM -+EXTSOURCES += shm.c - lib_LTLIBRARIES += libxcb-shm.la - libxcb_shm_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_shm_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_shm_la_SOURCES = shm.c shm.h - endif - --EXTSOURCES += sync.c - if BUILD_SYNC -+EXTSOURCES += sync.c - lib_LTLIBRARIES += libxcb-sync.la - libxcb_sync_la_LDFLAGS = -version-info 1:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_sync_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_sync_la_SOURCES = sync.c sync.h - endif - --EXTSOURCES += xevie.c - if BUILD_XEVIE -+EXTSOURCES += xevie.c - lib_LTLIBRARIES += libxcb-xevie.la - libxcb_xevie_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_xevie_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xevie_la_SOURCES = xevie.c xevie.h - endif - --EXTSOURCES += xf86dri.c - if BUILD_XFREE86_DRI -+EXTSOURCES += xf86dri.c - lib_LTLIBRARIES += libxcb-xf86dri.la - libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_xf86dri_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h - endif - --EXTSOURCES += xfixes.c - if BUILD_XFIXES -+EXTSOURCES += xfixes.c - lib_LTLIBRARIES += libxcb-xfixes.la - libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_xfixes_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h - endif - --EXTSOURCES += xinerama.c - if BUILD_XINERAMA -+EXTSOURCES += xinerama.c - lib_LTLIBRARIES += libxcb-xinerama.la - libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_xinerama_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h - endif - --EXTSOURCES += xinput.c - if BUILD_XINPUT -+EXTSOURCES += xinput.c - lib_LTLIBRARIES += libxcb-xinput.la - libxcb_xinput_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@ - libxcb_xinput_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h - endif - --EXTSOURCES += xkb.c - if BUILD_XKB -+EXTSOURCES += xkb.c - lib_LTLIBRARIES += libxcb-xkb.la - libxcb_xkb_la_LDFLAGS = -version-info 1:0:0 -no-undefined - libxcb_xkb_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h - endif - --EXTSOURCES += xprint.c - if BUILD_XPRINT -+EXTSOURCES += xprint.c - lib_LTLIBRARIES += libxcb-xprint.la - libxcb_xprint_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_xprint_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xprint_la_SOURCES = xprint.c xprint.h - endif - --EXTSOURCES += xselinux.c - if BUILD_SELINUX -+EXTSOURCES += xselinux.c - lib_LTLIBRARIES += libxcb-xselinux.la - libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_xselinux_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h - endif - --EXTSOURCES += xtest.c - if BUILD_XTEST -+EXTSOURCES += xtest.c - lib_LTLIBRARIES += libxcb-xtest.la - libxcb_xtest_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_xtest_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xtest_la_SOURCES = xtest.c xtest.h - endif - --EXTSOURCES += xv.c - if BUILD_XV -+EXTSOURCES += xv.c - lib_LTLIBRARIES += libxcb-xv.la - libxcb_xv_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_xv_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xv_la_SOURCES = xv.c xv.h - endif - --EXTSOURCES += xvmc.c - if BUILD_XVMC -+EXTSOURCES += xvmc.c - lib_LTLIBRARIES += libxcb-xvmc.la - libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_xvmc_la_LIBADD = $(XCB_LIBS) --- -2.2.1 - diff --git a/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch b/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch deleted file mode 100644 index bbac9a96fc3..00000000000 --- a/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <w...@netbsd.org> -Date: Thu, 19 May 2016 17:31:18 +0200 -Subject: Fix inconsistent use of tabs vs. space. - -Needed for at least python-3.5.x. - -Signed-off-by: Thomas Klausner <w...@netbsd.org> -Signed-off-by: Uli Schlachter <psyc...@znc.in> - -diff --git a/src/c_client.py b/src/c_client.py -index 57de3fb..043338d 100644 ---- a/src/c_client.py -+++ b/src/c_client.py -@@ -1364,7 +1364,7 @@ def _c_serialize(context, self): - _c(' unsigned int xcb_align_to = 0;') - if self.is_switch: - _c(' unsigned int xcb_padding_offset = %d;', -- self.get_align_offset() ) -+ self.get_align_offset() ) - prefix = [('_aux', '->', self)] - aux_ptr = 'xcb_out' - -@@ -1390,7 +1390,7 @@ def _c_serialize(context, self): - _c(' unsigned int xcb_align_to = 0;') - if self.is_switch: - _c(' unsigned int xcb_padding_offset = %d;', -- self.get_align_offset() ) -+ self.get_align_offset() ) - - elif 'sizeof' == context: - param_names = [p[2] for p in params] -@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field): - # from the request size and divide that by the member size - return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))' - else: -- # use the accessor to get the start of the list, then -- # compute the length of it by subtracting it from -+ # use the accessor to get the start of the list, then -+ # compute the length of it by subtracting it from - # the adress of the first byte after the end of the - # request -- after_end_of_request = '(((char*)R) + R->length * 4)' -- start_of_list = '%s(R)' % (field.c_accessor_name) -+ after_end_of_request = '(((char*)R) + R->length * 4)' -+ start_of_list = '%s(R)' % (field.c_accessor_name) - bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list) -- return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) -+ return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) - else: - raise Exception( - "lengthless lists with varsized members are not supported. Fieldname '%s'" --- -cgit v0.10.2 - diff --git a/x11-libs/libxcb/libxcb-1.12-r2.ebuild b/x11-libs/libxcb/libxcb-1.12-r2.ebuild deleted file mode 100644 index 922c0eb9855..00000000000 --- a/x11-libs/libxcb/libxcb-1.12-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE=xml - -XORG_DOC=doc -XORG_MULTILIB=yes -XORG_EAUTORECONF=yes -inherit python-any-r1 xorg-2 - -DESCRIPTION="X C-language Bindings library" -HOMEPAGE="https://xcb.freedesktop.org/"; -EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"; -[[ ${PV} != 9999* ]] && \ - SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"; - -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc selinux test xkb" -SLOT="0/1.12" # Locked down for now to 1.12 to avoid further rebuilds on no ABI changes (e.g with any upcoming 1.12.1 bugfix release), bug 576890 - -RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]" -# Note: ${PYTHON_USEDEP} needs to go verbatim -DEPEND="${RDEPEND} - test? ( dev-libs/check[${MULTILIB_USEDEP}] ) - doc? ( app-doc/doxygen[dot] ) - dev-libs/libxslt - ${PYTHON_DEPS} - $(python_gen_any_dep \ - "~x11-base/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")" - -python_check_deps() { - has_version --host-root ">=x11-base/xcb-proto-1.11[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -PATCHES=( - "${FILESDIR}/${PN}-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch" - "${FILESDIR}/${P}-fix-inconsistent-use-tabs-space.patch" -) - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable doc devel-docs) - $(use_enable selinux) - $(use_enable xkb) - --enable-xinput - ) - xorg-2_src_configure -}
