commit: eed812d9d5074dcf0a4d10e68b895f93e4530361 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Apr 2 23:58:44 2025 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Apr 3 00:02:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed812d9
x11-libs/libxkbcommon: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/libxkbcommon/Manifest | 1 - .../files/libxkbcommon-1.7.0-symbol-ver.patch | 104 --------------------- x11-libs/libxkbcommon/libxkbcommon-1.7.0-r1.ebuild | 75 --------------- 3 files changed, 180 deletions(-) diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest index 4b037f98826d..ef96490809a0 100644 --- a/x11-libs/libxkbcommon/Manifest +++ b/x11-libs/libxkbcommon/Manifest @@ -1,3 +1,2 @@ -DIST libxkbcommon-1.7.0.tar.xz 534312 BLAKE2B b85cd8a78fce3c624e0c64c26a37b6d99bb8b8f3de489c6909826f53bdb6d33842f7ffcf955f6a9a8eb57cad53fc9756bd15d05aeb813b0f92985827243949a8 SHA512 4b74a9f3f63e2ebc1cbdcaa963c70362e55fa527e1d89b6a1fd30d7a84a8b60c1b3dc99bcfbde85aa31890e0b2f62f0bad3c8ff8340fe6a930ee662b33448ba5 DIST libxkbcommon-1.8.0.tar.gz 995648 BLAKE2B 8edd795aff35c881bfad7905b4dc73d4a99fde23afad1b8874cb599490b5245e6b1d83a97dfd7a2031c1d232618c9a8ecfd586990b4a46df1eb87944f20660c1 SHA512 2e9a9c02bcc515c43db38266ad4b23d3530be3de28d05e086d3c12155cf1c569609a55fa4ea4ca9b0adbd8d2a553724bfa78f63481487bfee6379b3664f3aed0 DIST libxkbcommon-1.8.1.tar.gz 983334 BLAKE2B e990a37261e584b9f87348518f9036793896b7e55c490b90a05329a00c3589eb9ad1001ed7e125dc4b98b51f5e4f77de32779967407fd986697c0dc079e94142 SHA512 a11b8563b11bd085b909753fa99e5b2129343363a05d4fac44a46b334b644dbdd57c356021926e9fdcc2bf6855b90283af93e74c471c3d5677c2ed1bf19427c2 diff --git a/x11-libs/libxkbcommon/files/libxkbcommon-1.7.0-symbol-ver.patch b/x11-libs/libxkbcommon/files/libxkbcommon-1.7.0-symbol-ver.patch deleted file mode 100644 index 6defb3563b78..000000000000 --- a/x11-libs/libxkbcommon/files/libxkbcommon-1.7.0-symbol-ver.patch +++ /dev/null @@ -1,104 +0,0 @@ -Avoid breaking with older binutils (silently not having versioned symbols). - -https://github.com/xkbcommon/libxkbcommon/commit/621e31014cbc985bd99d778260ad11a5fee783da -https://github.com/xkbcommon/libxkbcommon/commit/1d8a25d6f10ecfc638d7a889bf7d42f79c692a40 - -From 621e31014cbc985bd99d778260ad11a5fee783da Mon Sep 17 00:00:00 2001 -From: Pierre Le Marre <[email protected]> -Date: Tue, 16 Jul 2024 07:00:53 +0200 -Subject: [PATCH] build: Require meson >= 0.58 - -This will enable f-strings and allow us to simplify the build file. ---- - meson.build | 14 ++++---------- - 2 files changed, 5 insertions(+), 10 deletions(-) - create mode 100644 changes/build/+meson_bump.breaking.md - ---- a/meson.build -+++ b/meson.build -@@ -7,7 +7,7 @@ project( - 'warning_level=2', - 'b_lundef=true', - ], -- meson_version : '>= 0.52.0', -+ meson_version : '>= 0.58.0', # Released on May 2021 - ) - pkgconfig = import('pkgconfig') - cc = meson.get_compiler('c') -@@ -270,9 +270,7 @@ dep_libxkbcommon = declare_dependency( - link_with: libxkbcommon, - include_directories: include_directories('include'), - ) --if meson.version().version_compare('>= 0.54.0') -- meson.override_dependency('xkbcommon', dep_libxkbcommon) --endif -+meson.override_dependency('xkbcommon', dep_libxkbcommon) - pkgconfig.generate( - libxkbcommon, - name: 'xkbcommon', -@@ -341,9 +339,7 @@ You can disable X11 support with -Denable-x11=false.''') - link_with: libxkbcommon_x11, - include_directories: include_directories('include'), - ) -- if meson.version().version_compare('>= 0.54.0') -- meson.override_dependency('xkbcommon-x11', dep_libxkbcommon_x11) -- endif -+ meson.override_dependency('xkbcommon-x11', dep_libxkbcommon_x11) - pkgconfig.generate( - libxkbcommon_x11, - name: 'xkbcommon-x11', -@@ -409,9 +405,7 @@ if get_option('enable-xkbregistry') - link_with: libxkbregistry, - include_directories: include_directories('include'), - ) -- if meson.version().version_compare('>= 0.54.0') -- meson.override_dependency('xkbregistry', dep_libxkbregistry) -- endif -+ meson.override_dependency('xkbregistry', dep_libxkbregistry) - endif - - man_pages = [] - -From 1d8a25d6f10ecfc638d7a889bf7d42f79c692a40 Mon Sep 17 00:00:00 2001 -From: Pierre Le Marre <[email protected]> -Date: Fri, 12 Jul 2024 11:10:46 +0200 -Subject: [PATCH] build: Check for --undefined-version support - -Gate the use of `--undefined-version` in the linker because it breaks on -older GNU `ld`: https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=58272. ---- - meson.build | 11 +++++++++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index e8451b69..d0738468 100644 ---- a/meson.build -+++ b/meson.build -@@ -142,10 +142,17 @@ configh_data.set('_CRT_NONSTDC_NO_DEPRECATE', 1) - # Reduce unnecessary includes on MSVC. - configh_data.set('WIN32_LEAN_AND_MEAN', 1) - -+xkbcommon_map = meson.current_source_dir() / 'xkbcommon.map' -+ - # Supports -Wl,--version-script? -+if cc.has_link_argument('-Wl,--undefined-version') -+ extra_linker_args = ',--undefined-version' -+else -+ extra_linker_args = '' -+endif - have_version_script = cc.links( - 'int main(){}', -- args: '-Wl,--undefined-version,--version-script=' + meson.current_source_dir()/'xkbcommon.map', -+ args: f'-Wl,--version-script=@xkbcommon_map@@extra_linker_args@', - name: '-Wl,--version-script', - ) - -@@ -235,7 +242,7 @@ libxkbcommon_sources = [ - libxkbcommon_link_args = [] - libxkbcommon_link_deps = [] - if have_version_script -- libxkbcommon_link_args += '-Wl,--version-script=' + meson.current_source_dir()/'xkbcommon.map' -+ libxkbcommon_link_args += f'-Wl,--version-script=@xkbcommon_map@' - libxkbcommon_link_deps += 'xkbcommon.map' - elif cc.get_argument_syntax() == 'msvc' - libxkbcommon_def = custom_target('xkbcommon.def', diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.7.0-r1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.7.0-r1.ebuild deleted file mode 100644 index df29c4ceb028..000000000000 --- a/x11-libs/libxkbcommon/libxkbcommon-1.7.0-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = *9999* ]]; then - GIT_ECLASS="git-r3" - EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"; -else - SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit bash-completion-r1 meson-multilib ${GIT_ECLASS} python-any-r1 virtualx - -DESCRIPTION="Keymap handling library for toolkits and window systems" -HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"; -LICENSE="MIT" -SLOT="0" - -IUSE="doc static-libs test tools wayland X" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-alternatives/yacc - doc? ( app-text/doxygen[dot] ) - test? ( ${PYTHON_DEPS} ) - tools? ( wayland? ( dev-util/wayland-scanner ) ) -" -RDEPEND=" - X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP}] ) - tools? ( wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] ) ) - dev-libs/libxml2[${MULTILIB_USEDEP}] - x11-misc/compose-tables - x11-misc/xkeyboard-config -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) - tools? ( wayland? ( >=dev-libs/wayland-protocols-1.12 ) ) -" - -PATCHES=( - "${FILESDIR}"/libxkbcommon-1.7.0-symbol-ver.patch -) - -pkg_setup() { - if use test; then - python-any-r1_pkg_setup - fi -} - -multilib_src_configure() { - local emesonargs=( - -Ddefault_library="$(usex static-libs both shared)" - -Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb" - -Dbash-completion-path="$(get_bashcompdir)" - $(meson_native_use_bool tools enable-tools) - $(meson_use X enable-x11) - $(meson_native_use_bool doc enable-docs) - $(meson_use wayland enable-wayland) - ) - meson_src_configure -} - -multilib_src_test() { - virtx meson_src_test -} - -multilib_src_install_all() { - if use doc; then - mv "${ED}"/usr/share/doc/{${PN},${P}} || die - fi -}
