From 4b9869e202bdc1b646d067ed8e4329b20b6f3e8e Mon Sep 17 00:00:00 2001 From: "S. Gilles" Date: Mon, 7 Feb 2022 09:31:24 -0500 Subject: [PATCH] dev-libs/wayland: remove, obsolete --- dev-libs/wayland/Manifest | 5 - ...uild-fix-configure-disable-dtd-validation.patch | 247 --------------------- .../1.10.0-scanner-avoid-executable-stack.patch | 45 ---- dev-libs/wayland/metadata.xml | 8 - dev-libs/wayland/wayland-1.11.0-r1.ebuild | 66 ------ dev-libs/wld/Manifest | 1 - dev-libs/wld/wld-9999.ebuild | 55 ----- 7 files changed, 427 deletions(-) delete mode 100644 dev-libs/wayland/Manifest delete mode 100644 dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch delete mode 100644 dev-libs/wayland/files/1.10.0-scanner-avoid-executable-stack.patch delete mode 100644 dev-libs/wayland/metadata.xml delete mode 100644 dev-libs/wayland/wayland-1.11.0-r1.ebuild delete mode 100644 dev-libs/wld/Manifest delete mode 100644 dev-libs/wld/wld-9999.ebuild diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest deleted file mode 100644 index ae16778..0000000 --- a/dev-libs/wayland/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX 1.10.0-build-fix-configure-disable-dtd-validation.patch 8777 SHA256 56580d0306fc485580f45ea73bab8c7b3c081936f25193fa601ea4f033ddb4e4 SHA512 7fe13b8305d9b27ff83176a991de614b3761851a3c582e27d1788360be0011376219ecb9d42fbfda3f2beead2c2fff599100bf926e1504240a1b25c287f63e13 WHIRLPOOL 4b09d485c324bd78162f3ecf6536f4b573583891d8c3cdb1f725933004741eed835a60d59dbf5ff94a73eab6f4769708c47b3fc61bea173daa10b3683958bc0c -AUX 1.10.0-scanner-avoid-executable-stack.patch 1362 SHA256 4565d29bc982e334d9ff65ce2e6e240d6ff88d99cdfd0a9703e5443ae8886ebf SHA512 1cac970eb314a7d74369d0dc62eb3823079fa6cb1e337f753a53bcd2dff285837ffcf1eed5a87c6603ec2f26f99e510de627d5309ccc4a266fb9e21ec8e4912b WHIRLPOOL 9647845904f1a3076bbbe734bde901245272b9d23af8752dd4caa4081da3f75bb0011c7cd4543f8dcce898ce671c0981633520ff282a525d514d9ff21db646c1 -DIST wayland-1.11.0.tar.xz 374468 SHA256 9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0 SHA512 c8a0c927b6e095707a58398fe545ed708f4c808a70920c1f82c79d4275e6137cdf9926c0f18227faba511f717f4db4dfee9528075e00ec600ea44b97479471dd WHIRLPOOL 6361bb1b05c5629b56e32d75ef4dd8398bacc31c03174e082b75850aeda2284fad929ccf91548b9d95b65524d3200013c27e02038c63ccb7e7f2f680e47cd3dd -EBUILD wayland-1.11.0-r1.ebuild 1476 SHA256 c616006f7408f24c8e9ea993d5567525b2248c13044166500f8c3e79713819eb SHA512 b3605a50b9bd821ba033d0e56d3679c59b8370366015b78ddea3214e7b44b305bfee41a0723c9903a77bbb2539ec7d89fd291841ff9ec365d2238fb71db6920a WHIRLPOOL de0722ff721e0455f0f2e55698d0e17295e6c99cd413c9bcdd44e445f5bc4298819f38879d6f5cd6c0e74fbf8eb70b199caf750d77b876734f7906bf1f4e6121 -MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306 diff --git a/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch b/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch deleted file mode 100644 index 7b55e2f..0000000 --- a/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch +++ /dev/null @@ -1,247 +0,0 @@ -From: Pekka Paalanen -Date: Mon, 29 Feb 2016 14:59:51 +0200 -Subject: [PATCH] build: fix ./configure --disable-dtd-validation - -When configured with --disable-dtd-validation: - - CPPAS src/dtddata.o -src/dtddata.S: Assembler messages: -src/dtddata.S:39: Error: file not found: src/wayland.dtd.embed -Makefile:1520: recipe for target 'src/dtddata.o' failed - -This is because the variable name used does not match the implicit -variable name in autoconf. - -Fix the variable name, making both --disable-dtd-validation and ---enable-dtd-validation to what they should. - -Do not try to build dtddata.S if dtd-validation is disabled. It depends -on wayland.dtd.embed which is created by configure only if -dtd-validation is enabled. - -If not building dtddata.S, also make sure the extern definitions in -scanner.c are compiled out. - -Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=575212 -Reported-by: leio@gentoo.org -Signed-off-by: Pekka Paalanen -Reviewed-by: Quentin Glidic -Tested-by: Bryce Harrington -[Mart: Added Makefile.in and configure changes to patch file to avoid autoreconf] -Signed-off-by: Mart Raudsepp ---- - Makefile.am | 5 ++++- - Makefile.in | 20 ++++++++++++-------- - configure | 18 ++++++++++++++++-- - configure.ac | 5 +++-- - src/scanner.c | 6 +++--- - 5 files changed, 38 insertions(+), 16 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e850abc..49e25a6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -23,11 +23,14 @@ pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = - - bin_PROGRAMS = wayland-scanner --wayland_scanner_SOURCES = src/scanner.c src/dtddata.S -+wayland_scanner_SOURCES = src/scanner.c - wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS) - wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la - pkgconfig_DATA += src/wayland-scanner.pc - -+if DTD_VALIDATION -+wayland_scanner_SOURCES += src/dtddata.S -+endif - src/dtddata.o: protocol/wayland.dtd - - if USE_HOST_SCANNER -diff --git a/configure.ac b/configure.ac -index f54a8b9..b27f34b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation], - [AC_HELP_STRING([--disable-dtd-validation], - [Disable DTD validation of the protocol])], - [], -- [enable_dtdvalidation=yes]) -+ [enable_dtd_validation=yes]) - - AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes) - -@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [], - AC_SUBST(EXPAT_LIBS) - ]) - --if test "x$enable_dtdvalidation" = "xyes"; then -+AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"]) -+if test "x$enable_dtd_validation" = "xyes"; then - PKG_CHECK_MODULES(LIBXML, [libxml-2.0]) - AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available]) - AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd]) -diff --git a/aclocal.m4 b/aclocal.m4 -index 71ca3dc..86eace8 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1327,6 +1327,7 @@ AC_SUBST([am__tar]) - AC_SUBST([am__untar]) - ]) # _AM_PROG_TAR - -+#timestamp update to avoid regen - m4_include([m4/libtool.m4]) - m4_include([m4/ltoptions.m4]) - m4_include([m4/ltsugar.m4]) -diff --git a/config.h.in b/config.h.in -index 1400592..33f0e99 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -15,6 +15,7 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_INTTYPES_H - -+/* Timestamp update */ - /* libxml-2.0 is available */ - #undef HAVE_LIBXML - -diff --git a/Makefile.in b/Makefile.in -index 6d9ffb2..32e6d51 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -82,8 +82,9 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - bin_PROGRAMS = wayland-scanner$(EXEEXT) --@ENABLE_LIBRARIES_TRUE@am__append_1 = libwayland-private.la --@ENABLE_LIBRARIES_TRUE@am__append_2 = src/wayland-client.pc \ -+@DTD_VALIDATION_TRUE@am__append_1 = src/dtddata.S -+@ENABLE_LIBRARIES_TRUE@am__append_2 = libwayland-private.la -+@ENABLE_LIBRARIES_TRUE@am__append_3 = src/wayland-client.pc \ - @ENABLE_LIBRARIES_TRUE@ src/wayland-server.pc \ - @ENABLE_LIBRARIES_TRUE@ cursor/wayland-cursor.pc - @ENABLE_LIBRARIES_TRUE@TESTS = array-test$(EXEEXT) \ -@@ -101,7 +102,7 @@ bin_PROGRAMS = wayland-scanner$(EXEEXT) - @ENABLE_LIBRARIES_TRUE@ resources-test$(EXEEXT) \ - @ENABLE_LIBRARIES_TRUE@ message-test$(EXEEXT) \ - @ENABLE_LIBRARIES_TRUE@ headers-test$(EXEEXT) $(am__EXEEXT_1) --@ENABLE_CPP_TEST_TRUE@@ENABLE_LIBRARIES_TRUE@am__append_3 = cpp-compile-test -+@ENABLE_CPP_TEST_TRUE@@ENABLE_LIBRARIES_TRUE@am__append_4 = cpp-compile-test - @ENABLE_LIBRARIES_TRUE@check_PROGRAMS = $(am__EXEEXT_2) \ - @ENABLE_LIBRARIES_TRUE@ exec-fd-leak-checker$(EXEEXT) - @ENABLE_LIBRARIES_TRUE@noinst_PROGRAMS = fixed-benchmark$(EXEEXT) -@@ -382,8 +383,10 @@ am__socket_test_SOURCES_DIST = tests/socket-test.c - @ENABLE_LIBRARIES_TRUE@ tests/socket-test.$(OBJEXT) - socket_test_OBJECTS = $(am_socket_test_OBJECTS) - @ENABLE_LIBRARIES_TRUE@socket_test_DEPENDENCIES = libtest-runner.la -+am__wayland_scanner_SOURCES_DIST = src/scanner.c src/dtddata.S -+@DTD_VALIDATION_TRUE@am__objects_1 = src/dtddata.$(OBJEXT) - am_wayland_scanner_OBJECTS = src/wayland_scanner-scanner.$(OBJEXT) \ -- src/dtddata.$(OBJEXT) -+ $(am__objects_1) - wayland_scanner_OBJECTS = $(am_wayland_scanner_OBJECTS) - wayland_scanner_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) libwayland-util.la -@@ -491,7 +494,8 @@ DIST_SOURCES = $(am__libtest_runner_la_SOURCES_DIST) \ - $(am__resources_test_SOURCES_DIST) \ - $(am__sanity_test_SOURCES_DIST) \ - $(am__signal_test_SOURCES_DIST) \ -- $(am__socket_test_SOURCES_DIST) $(wayland_scanner_SOURCES) -+ $(am__socket_test_SOURCES_DIST) \ -+ $(am__wayland_scanner_SOURCES_DIST) - RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ -@@ -918,8 +922,8 @@ dist_pkgdata_DATA = \ - protocol/wayland.dtd - - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = src/wayland-scanner.pc $(am__append_2) --wayland_scanner_SOURCES = src/scanner.c src/dtddata.S -+pkgconfig_DATA = src/wayland-scanner.pc $(am__append_3) -+wayland_scanner_SOURCES = src/scanner.c $(am__append_1) - wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS) - wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la - @USE_HOST_SCANNER_FALSE@wayland_scanner = $(top_builddir)/wayland-scanner -@@ -929,7 +933,7 @@ libwayland_util_la_SOURCES = \ - src/wayland-util.c \ - src/wayland-util.h - --noinst_LTLIBRARIES = libwayland-util.la $(am__append_1) -+noinst_LTLIBRARIES = libwayland-util.la $(am__append_2) - @ENABLE_LIBRARIES_TRUE@lib_LTLIBRARIES = libwayland-server.la \ - @ENABLE_LIBRARIES_TRUE@ libwayland-client.la \ - @ENABLE_LIBRARIES_TRUE@ libwayland-cursor.la -diff --git a/configure b/configure -index 83e4971..6340d4f 100755 ---- a/configure -+++ b/configure -@@ -711,6 +711,8 @@ HAVE_XSLTPROC_TRUE - XSLTPROC - LIBXML_LIBS - LIBXML_CFLAGS -+DTD_VALIDATION_FALSE -+DTD_VALIDATION_TRUE - EXPAT_LIBS - EXPAT_CFLAGS - FFI_LIBS -@@ -15728,7 +15730,7 @@ fi - if test "${enable_dtd_validation+set}" = set; then : - enableval=$enable_dtd_validation; - else -- enable_dtdvalidation=yes -+ enable_dtd_validation=yes - fi - - -@@ -16114,7 +16116,15 @@ $as_echo "yes" >&6; } - - fi - --if test "x$enable_dtdvalidation" = "xyes"; then -+ if test "x$enable_dtd_validation" = "xyes"; then -+ DTD_VALIDATION_TRUE= -+ DTD_VALIDATION_FALSE='#' -+else -+ DTD_VALIDATION_TRUE='#' -+ DTD_VALIDATION_FALSE= -+fi -+ -+if test "x$enable_dtd_validation" = "xyes"; then - - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML" >&5 -@@ -16669,6 +16679,10 @@ if test -z "${ENABLE_LIBRARIES_TRUE}" && test -z "${ENABLE_LIBRARIES_FALSE}"; th - as_fn_error $? "conditional \"ENABLE_LIBRARIES\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${DTD_VALIDATION_TRUE}" && test -z "${DTD_VALIDATION_FALSE}"; then -+ as_fn_error $? "conditional \"DTD_VALIDATION\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${HAVE_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then - as_fn_error $? "conditional \"HAVE_XSLTPROC\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/src/scanner.c b/src/scanner.c -index d3e2328..04747e3 100644 ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -40,13 +40,13 @@ - - #if HAVE_LIBXML - #include --#endif -- --#include "wayland-util.h" - - /* Embedded wayland.dtd file, see dtddata.S */ - extern char DTD_DATA_begin; - extern int DTD_DATA_len; -+#endif -+ -+#include "wayland-util.h" - - enum side { - CLIENT, --- -2.6.4 - diff --git a/dev-libs/wayland/files/1.10.0-scanner-avoid-executable-stack.patch b/dev-libs/wayland/files/1.10.0-scanner-avoid-executable-stack.patch deleted file mode 100644 index ff4899a..0000000 --- a/dev-libs/wayland/files/1.10.0-scanner-avoid-executable-stack.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f8f3e54aa7bc15871ca4296cbc16ae065b07de4e Mon Sep 17 00:00:00 2001 -From: Pekka Paalanen -Date: Wed, 2 Mar 2016 11:00:35 +0200 -Subject: [PATCH] scanner: avoid executable stack - -Before this patch: -$ scanelf -lpqe ./wayland-scanner -RWX --- --- ./wayland-scanner - -That indicates the stack is executable, which is a bad thing for -security. Wayland-scanner does not actually need an executable stack, it -is just an oversight from using an .S file in the sources. - -Add a special incantation in dtddata.S to make it not cause the stack to -become executable. - -Reported-by: Mart Raudsepp -Signed-off-by: Pekka Paalanen -Tested-by: Mart Raudsepp ---- - src/dtddata.S | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/dtddata.S b/src/dtddata.S -index 68e3435..ce51133 100644 ---- a/src/dtddata.S -+++ b/src/dtddata.S -@@ -20,6 +20,14 @@ - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+/* -+ * Avoid executable stack. -+ * from: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart -+ */ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ - /* from: http://www.linuxjournal.com/content/embedding-file-executable-aka-hello-world-version-5967#comment-348129 */ - - .macro binfile name file --- -2.6.4 - diff --git a/dev-libs/wayland/metadata.xml b/dev-libs/wayland/metadata.xml deleted file mode 100644 index e943b72..0000000 --- a/dev-libs/wayland/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - x11@gentoo.org - X11 - - diff --git a/dev-libs/wayland/wayland-1.11.0-r1.ebuild b/dev-libs/wayland/wayland-1.11.0-r1.ebuild deleted file mode 100644 index 6348daa..0000000 --- a/dev-libs/wayland/wayland-1.11.0-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}" - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" - AUTOTOOLS_AUTORECONF=1 -fi - -inherit autotools-multilib toolchain-funcs $GIT_ECLASS - -DESCRIPTION="Wayland protocol libraries" -HOMEPAGE="https://wayland.freedesktop.org/" - -if [[ $PV = 9999* ]]; then - SRC_URI="${SRC_PATCHES}" - KEYWORDS="" -else - SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="doc static-libs" - -RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] - dev-libs/libxml2:=" -DEPEND="${RDEPEND} - doc? ( - >=app-doc/doxygen-1.6[dot] - app-text/xmlto - >=media-gfx/graphviz-2.26.0 - sys-apps/grep[pcre] - ) - virtual/pkgconfig" - -src_prepare() { - # Sue me - sed -e 's/uint /unsigned int /g' -i src/scanner.c -} - -multilib_src_configure() { - local myeconfargs=( - $(multilib_native_use_enable doc documentation) - $(multilib_native_enable dtd-validation) - ) - if tc-is-cross-compiler ; then - myeconfargs+=( --with-host-scanner ) - fi - - autotools-utils_src_configure -} - -src_test() { - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - autotools-multilib_src_test -} diff --git a/dev-libs/wld/Manifest b/dev-libs/wld/Manifest deleted file mode 100644 index ec9417d..0000000 --- a/dev-libs/wld/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD wld-9999.ebuild 1371 SHA256 e44b02c97b64c5d83962738800f5cd4f522f4ea9652047e40f7f7d39844fe72d SHA512 3f02b64bf018163a06e395c9b6cb1b31760028ae426497e4c6180d0031ca7cdb09c3947dbeb399e92ab8848598b4e078ea6cb31a7e2ad8dc68227a3d4d98580f WHIRLPOOL b8e20e946903f4d19c13e717b979c187b0c8e8d9a44c087a2d1075001ce629c54032723e2d29dde676db9997e9cf3fd3de72cb8073cb16c4e7932bdf1854458d diff --git a/dev-libs/wld/wld-9999.ebuild b/dev-libs/wld/wld-9999.ebuild deleted file mode 100644 index 6c5293b..0000000 --- a/dev-libs/wld/wld-9999.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2013, 2014 Michael Forney -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit git-r3 - -DESCRIPTION="WLD is a primitive drawing library targeted at Wayland" -HOMEPAGE="https://github.com/michaelforney/wld" -EGIT_REPO_URI="git://github.com/michaelforney/wld.git" -SRC_URI="" - -LICENCE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm" -VIDEO_CARDS="intel nouveau" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done -IUSE="${IUSE_VIDEO_CARDS} drm wayland" - -RDEPEND=" - media-libs/fontconfig - >=media-libs/freetype-2.0.0 - x11-libs/pixman - drm? ( x11-libs/libdrm[video_cards_intel?,video_cards_nouveau?] ) - wayland? ( dev-libs/wayland ) -" - -DEPEND="${RDEPEND}" - -src_configure() { - local drm_drivers=( ) wayland_interfaces=( ) - - use video_cards_intel && drm_drivers+=( intel ) - use video_cards_nouveau && drm_drivers+=( nouveau ) - use drm && use wayland && wayland_interfaces+=( drm ) - use wayland && wayland_interfaces+=( shm ) - - cat > config.mk <