diff options
author | Matt Turner <mattst88@gentoo.org> | 2017-03-11 19:33:39 -0800 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2017-03-16 13:36:44 -0700 |
commit | dedcc9328c85590dea6b46eeb64a6afd914b0f41 (patch) | |
tree | 22e964c6469cde7afe4323a463c7b6b434b142d1 /x11-libs/libxcb/files | |
parent | x11-libs/libX11: Drop old versions (diff) | |
download | gentoo-dedcc9328c85590dea6b46eeb64a6afd914b0f41.tar.gz gentoo-dedcc9328c85590dea6b46eeb64a6afd914b0f41.tar.bz2 gentoo-dedcc9328c85590dea6b46eeb64a6afd914b0f41.zip |
x11-libs/libxcb: Drop old versions
Diffstat (limited to 'x11-libs/libxcb/files')
4 files changed, 0 insertions, 148 deletions
diff --git a/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch b/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch deleted file mode 100644 index e8c24d34b232..000000000000 --- a/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch +++ /dev/null @@ -1,30 +0,0 @@ -Both extensions have been dropped from the X-Server in 2008: - http://cgit.freedesktop.org/xorg/xserver/commit/?id=1c8bd31 - http://cgit.freedesktop.org/xorg/xserver/commit/?id=f4036f6 - -Don't build them by default. - -Reviewed-by: Julien Cristau <jcristau@debian.org> -Signed-off-by: Daniel Martin <consume.noise@gmail.com> -Signed-off-by: Uli Schlachter <psychon@znc.in> - -diff --git a/a/configure.ac b/b/configure.ac -index eb4a971..c9a1e91 100644 ---- a/a/configure.ac -+++ b/b/configure.ac -@@ -227,13 +227,13 @@ XCB_EXTENSION(Screensaver, "yes") - XCB_EXTENSION(Shape, "yes") - XCB_EXTENSION(Shm, "yes") - XCB_EXTENSION(Sync, "yes") --XCB_EXTENSION(Xevie, "yes") -+XCB_EXTENSION(Xevie, "no") - XCB_EXTENSION(XFixes, "yes") - XCB_EXTENSION(XFree86-DRI, "yes") - XCB_EXTENSION(Xinerama, "yes") - XCB_EXTENSION(XInput, "no") - XCB_EXTENSION(XKB, "yes") --XCB_EXTENSION(Xprint, "yes") -+XCB_EXTENSION(Xprint, "no") - XCB_EXTENSION(SELinux, "no") - XCB_EXTENSION(XTest, "yes") - XCB_EXTENSION(Xv, "yes") diff --git a/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch b/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch deleted file mode 100644 index 2c884d79626f..000000000000 --- a/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- libxcb-1.9.1-orig/src/xcb.h 2013-05-31 01:38:01.000000000 +1000 -+++ libxcb-1.9.1/src/xcb.h 2013-11-17 18:30:27.664675840 +1100 -@@ -143,6 +143,7 @@ - * An event as sent by the XGE extension. The length field specifies the - * number of 4-byte blocks trailing the struct. - */ -+#if 0 - typedef struct { - uint8_t response_type; /**< Type of the response */ - uint8_t pad0; /**< Padding */ -@@ -153,6 +154,7 @@ - uint32_t pad[5]; /**< Padding */ - uint32_t full_sequence; /**< full sequence */ - } xcb_ge_event_t; -+#endif - - /** - * @brief Generic error. diff --git a/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch b/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch deleted file mode 100644 index 3ad63ffef2c7..000000000000 --- a/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/c_client.py b/src/c_client.py -index ec66223..942e78a 100644 ---- a/src/c_client.py -+++ b/src/c_client.py -@@ -687,10 +687,20 @@ def _c_serialize_helper_switch(context, self, complex_name, - switch_expr = _c_accessor_get_expr(self.expr, None) - - for b in self.bitcases: -- bitcase_expr = _c_accessor_get_expr(b.type.expr, None) -- code_lines.append(' if(%s & %s) {' % (switch_expr, bitcase_expr)) --# code_lines.append(' printf("switch %s: entering bitcase section %s (mask=%%%%d)...\\n", %s);' % --# (self.name[-1], b.type.name[-1], bitcase_expr)) -+ len_expr = len(b.type.expr) -+ for n, expr in enumerate(b.type.expr): -+ bitcase_expr = _c_accessor_get_expr(expr, None) -+ # only one <enumref> in the <bitcase> -+ if len_expr == 1: -+ code_lines.append(' if(%s & %s) {' % (switch_expr, bitcase_expr)) -+ # multiple <enumref> in the <bitcase> -+ elif n == 0: # first -+ code_lines.append(' if((%s & %s) ||' % (switch_expr, bitcase_expr)) -+ elif len_expr == (n + 1): # last -+ code_lines.append(' (%s & %s)) {' % (switch_expr, bitcase_expr)) -+ else: # between first and last -+ code_lines.append(' (%s & %s) ||' % (switch_expr, bitcase_expr)) -+ - b_prefix = prefix - if b.type.has_name: - b_prefix = prefix + [(b.c_field_name, '.', b.type)] diff --git a/x11-libs/libxcb/files/xcb-rebuilder.sh b/x11-libs/libxcb/files/xcb-rebuilder.sh deleted file mode 100644 index 43625622303b..000000000000 --- a/x11-libs/libxcb/files/xcb-rebuilder.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -# To use something besides `emerge` to install packages, set -# XCB_REBUILDER_INSTALL to that binary. - -if ! . /lib/gentoo/functions.sh 2>/dev/null; then - echo 'Please install sys-apps/gentoo-functions and rerun this script.' - exit 1 -fi - -case ${1} in - '') ;; - *) - einfo 'Rebuilds broken packages from the XCB library renaming' - einfo - einfo 'To use something besides `emerge`, set the INSTALL variable to their binary.' - exit 1 - ;; -esac - -if ! type -p qfile >/dev/null; then - einfo "Please install app-portage/portage-utils." - exit 1 -fi - -if ! type -p scanelf >/dev/null; then - einfo "Please install app-misc/pax-utils." - exit 1 -fi - -einfo "Fixing broken libtool archives (.la)" -for i in $(qlist -a | grep "\.la$"); do - sed -i \ - -e "s:[^[:space:]]*xcb-xlib[^[:space:]]*::g" \ - "${i}" 2>/dev/null -done - -einfo "Scanning for libraries requiring libxcb-xlib.so..." -for i in $(qlist -a | grep "\.so$"); do - scanelf -n $i \ - | grep -q xcb-xlib \ - && XCB_LIBS="${XCB_LIBS} ${i}" -done - -if [[ -n ${XCB_LIBS} ]]; then - einfo "Broken libraries:" - for lib in ${XCB_LIBS}; do - echo " ${lib}" - done - ebegin "Scanning for packages installing broken libraries" - XCB_PACKAGES=$(qfile -qC ${XCB_LIBS} | sort | uniq) - eend 0 -else - einfo "No broken libraries detected" - exit 0 -fi - - -einfo "Broken packages:" -for pkg in ${XCB_PACKAGES}; do - echo " ${pkg}" -done - -echo -ewarn "Please read the libxcb upgrade guide for further instructions" -ewarn "http://www.gentoo.org/proj/en/desktop/x/x11/libxcb-1.4-upgrade-guide.xml" - -# -#ebegin "Rebuilding broken packages" -#${XCB_REBUILDER_INSTALL:-emerge -1} ${XCB_PACKAGES} -#eend $? |