summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/libxcb/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/libxcb/files')
-rw-r--r--x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch257
-rw-r--r--x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch30
-rw-r--r--x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch18
-rw-r--r--x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch29
-rwxr-xr-xx11-libs/libxcb/files/xcb-rebuilder.sh71
5 files changed, 405 insertions, 0 deletions
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
new file mode 100644
index 000000000000..0f8aa1198234
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
@@ -0,0 +1,257 @@
+From e9b5234b3b0b53bd3a35f947ddb8a72d03cf1825 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@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 <remi@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.11-xevie-xprint_removal.patch b/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch
new file mode 100644
index 000000000000..e8c24d34b232
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000000..2c884d79626f
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 000000000000..3ad63ffef2c7
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch
@@ -0,0 +1,29 @@
+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
new file mode 100755
index 000000000000..43625622303b
--- /dev/null
+++ b/x11-libs/libxcb/files/xcb-rebuilder.sh
@@ -0,0 +1,71 @@
+#!/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 $?