diff options
Diffstat (limited to 'x11-libs')
596 files changed, 10073 insertions, 9972 deletions
diff --git a/x11-libs/agg/metadata.xml b/x11-libs/agg/metadata.xml index 7c6740158c47..bdd8fee53d13 100644 --- a/x11-libs/agg/metadata.xml +++ b/x11-libs/agg/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>chithanh@gentoo.org</email> diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest index c31ec15312de..2b6683a39b97 100644 --- a/x11-libs/c++-gtk-utils/Manifest +++ b/x11-libs/c++-gtk-utils/Manifest @@ -1,6 +1,2 @@ -DIST c++-gtk-utils-2.0.27.tar.gz 2608722 BLAKE2B 06f5663435a75d7a5560b982574f06c124842f2cb77fa1e4e171428944916da7b4f493294e0373243a062794739336719f548c4cd3b3e6789fffa3eebf0115ba SHA512 8d6c12797d54d9b379302bfd572ded8b9e6e64ea5911ba4b13a0dd6d588711ec6d10bc3a83af8cab23165feeaae8873de5c3945cec94954590806f60490038bc -DIST c++-gtk-utils-2.0.33.tar.gz 2837861 BLAKE2B d76333ea2c285e35c9c59ac6705c6c4321dfc84d638c2e95070b262b5b46bb6a2d8457e95febf2d3673cd50e78e35d3cd58ebc3ceb14c9e912d0b8a3437191c5 SHA512 dda1cf024ee80e872fc93e7d69203ee0f927b93c269100f9e80df42d53899240bc391a3e8bfbd8abd6549ace35da9f8f60952c5a1e905185d28561f594748d06 DIST c++-gtk-utils-2.0.34.tar.gz 2865687 BLAKE2B 4978bf9ce5ce364db5ad51bcb2d604ac2e7a22656e2affbc39785b7f27db6c75a77c1965e3524b6c617836aa5ae840c4ef45e0ea65eff01f12acb1ea770c04b2 SHA512 f155e50d152cd1444d282c47e995ea8cd93ead529d0cd86c11d548a266a567c83cf3367cdb82dd8d68af1bce28809c957d3e39595bcb0affe87db8f48718f6d4 -DIST c++-gtk-utils-2.2.10.tar.gz 2643918 BLAKE2B 3953b8acb7e8fcb47cfc55ade75baa6dd344e2e6e25187e67346137ef4cc241817c893597d75ae58462aaf0a0b58db5f018fd053e1da0b38716ae41c8ed40af3 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31 -DIST c++-gtk-utils-2.2.18.tar.gz 3031253 BLAKE2B 46b06cc8af02336784da301386f1eac7e5f70a6c03f1507baf8771958f120e44aa55e82040608b83f1f6cedbf6081b33006a790b97c57114367b181e0939adbd SHA512 46fece74e3a3908573cfe161c870f63b9bd442eaf9eea6da03843dc03e010ba073696232206c37a10dd7eedf1aa748cedbbd5e3a58af1cabc98d804095aa3d54 -DIST c++-gtk-utils-2.2.19.tar.gz 3060284 BLAKE2B 5edd6a5042cb79cc95e8080cd76d284dfa47641c8a01a6d80ff6cfdbecf5797b6a99a5b7f209c35e0da9a2bc5331225dd2f13f30bbcc3bbb04aaabdadb3cb643 SHA512 c6527cc32b6a14a5fe24705a91a6918863f418ec8a274d24c79b65e905efefab53a5e53edfa57b31ed8b14ab8d9d26b4876861cab37e3702df456feb84e1cc5c +DIST c++-gtk-utils-2.2.20.tar.gz 3085409 BLAKE2B 2b0ca2a3beb3ee82416cb1d731704f43398db06bd9bc03dea2875a2d6a1f80dc14b9fe418bea1467caf29d5ba9d8e4feefe7451bb69734561a580ed012755a41 SHA512 1e834c163f1c236e1a2fbdf92e93e98e88ebd6da04b87be52087fa7f7f395a9bd90e111958f3b9473938e7563182ed5c37fd2d2c4ef683933cb16f3b4665d1b3 diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild deleted file mode 100644 index 5579cb7226d3..000000000000 --- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils ltprune - -DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++" -HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="+gtk nls static-libs" -SLOT="3" - -RDEPEND=" - >=dev-libs/glib-2.26 - gtk? ( x11-libs/gtk+:3 ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -DOCS=( ChangeLog ) - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_with gtk) \ - $(use_enable static-libs static) \ - --docdir=/usr/share/doc/${PF} \ - --htmldir=/usr/share/doc/${PF}/html \ - --without-guile -} - -src_install() { - default - prune_libtool_files -} diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild deleted file mode 100644 index 3cb2a188c992..000000000000 --- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils ltprune - -DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++" -HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+gtk nls static-libs" -SLOT="3" - -RDEPEND=" - >=dev-libs/glib-2.26 - gtk? ( x11-libs/gtk+:3 ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -DOCS=( ChangeLog ) - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_with gtk) \ - $(use_enable static-libs static) \ - --without-guile -} - -src_install() { - default - prune_libtool_files -} diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild index 3d40232d7702..a368e2740bb3 100644 --- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild +++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild @@ -1,35 +1,37 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit virtualx + DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++" HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN/++/xx}/${P}.tar.gz" LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+gtk nls static-libs" SLOT="3" +KEYWORDS="amd64 ~ppc ~ppc64 x86" +IUSE="+gtk nls" RDEPEND=" - >=dev-libs/glib-2.26 - gtk? ( x11-libs/gtk+:3 ) -" -DEPEND=" - ${RDEPEND} + dev-libs/glib:2 + gtk? ( x11-libs/gtk+:3 )" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -DOCS=( ChangeLog ) + nls? ( sys-devel/gettext )" src_configure() { econf \ + --disable-static \ + --without-guile \ $(use_enable nls) \ - $(use_with gtk) \ - $(use_enable static-libs static) \ - --without-guile + $(use_with gtk) +} + +src_test() { + virtx default } src_install() { diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild deleted file mode 100644 index 62c3dd8183df..000000000000 --- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils ltprune - -DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++" -HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="+gtk nls static-libs" -SLOT="0" - -RDEPEND=" - >=dev-libs/glib-2.26 - gtk? ( x11-libs/gtk+:3 ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -DOCS=( ChangeLog ) - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_with gtk) \ - $(use_enable static-libs static) \ - --docdir=/usr/share/doc/${PF} \ - --htmldir=/usr/share/doc/${PF}/html \ - --without-guile -} - -src_install() { - default - prune_libtool_files -} diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild deleted file mode 100644 index 0a96955cf377..000000000000 --- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils ltprune - -DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++" -HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+gtk nls static-libs" -SLOT="0" - -RDEPEND=" - >=dev-libs/glib-2.26 - gtk? ( x11-libs/gtk+:3 ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -DOCS=( ChangeLog ) - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_with gtk) \ - $(use_enable static-libs static) \ - --without-guile -} - -src_install() { - default - prune_libtool_files -} diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild index b990bfb63656..bc05ff76981a 100644 --- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild +++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild @@ -1,35 +1,37 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit virtualx + DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++" HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN/++/xx}/${P}.tar.gz" LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+gtk nls static-libs" SLOT="0" +KEYWORDS="amd64 ~ppc ~ppc64 x86" +IUSE="+gtk nls" RDEPEND=" - >=dev-libs/glib-2.26 - gtk? ( x11-libs/gtk+:3 ) -" -DEPEND=" - ${RDEPEND} + dev-libs/glib:2 + gtk? ( x11-libs/gtk+:3 )" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -DOCS=( ChangeLog ) + nls? ( sys-devel/gettext )" src_configure() { econf \ + --disable-static \ + --without-guile \ $(use_enable nls) \ - $(use_with gtk) \ - $(use_enable static-libs static) \ - --without-guile + $(use_with gtk) +} + +src_test() { + virtx default } src_install() { diff --git a/x11-libs/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml index 9378e9d7e25b..aedd3f9bc9a1 100644 --- a/x11-libs/c++-gtk-utils/metadata.xml +++ b/x11-libs/c++-gtk-utils/metadata.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">cxx-gtk-utils</remote-id> + <changelog>http://cxx-gtk-utils.sourceforge.net/2.2/ChangeLog</changelog> </upstream> </pkgmetadata> diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index a9d5249c5cb1..644677d49780 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1 +1 @@ -DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f +DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B 1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b SHA512 bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40 diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild deleted file mode 100644 index 541a19e9c301..000000000000 --- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic autotools multilib-minimal - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git" - SRC_URI="" -else - SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A vector graphics library with cross-device output support" -HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind" -# gtk-doc regeneration doesn't seem to work with out-of-source builds -#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate - -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it -RESTRICT="test" - -BDEPEND=" - virtual/pkgconfig - >=sys-devel/libtool-2" -RDEPEND=" - >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] - >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] - sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}] - gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) - glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} -# doc? ( -# >=dev-util/gtk-doc-1.6 -# ~app-text/docbook-xml-dtd-4.2 -# )" - -REQUIRED_USE=" - gles2-only? ( !opengl ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch - "${FILESDIR}"/${PN}-respect-fontconfig.patch - "${FILESDIR}"/${P}-pdf-add-missing-flush.patch - "${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch -) - -src_prepare() { - default - - if has_version ">=sys-libs/binutils-libs-2.34"; then - eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch - fi - - # tests and perf tools require X, bug #483574 - if ! use X; then - sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die - fi - - # Slightly messed build system YAY - if [[ ${PV} == *9999* ]]; then - touch boilerplate/Makefile.am.features - touch src/Makefile.am.features - touch ChangeLog - fi - - eautoreconf -} - -multilib_src_configure() { - local myopts - - [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT - - use elibc_FreeBSD && myopts+=" --disable-symbol-lookup" - - # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)" - - ECONF_SOURCE="${S}" \ - econf \ - $(use_with X x) \ - $(use_enable X tee) \ - $(use_enable X xlib) \ - $(use_enable X xlib-xrender) \ - $(use_enable X xcb) \ - $(use_enable X xcb-shm) \ - $(use_enable aqua quartz) \ - $(use_enable aqua quartz-image) \ - $(use_enable debug test-surfaces) \ - $(use_enable gles2-only glesv2) \ - $(use_enable glib gobject) \ - $(use_enable opengl gl) \ - $(use_enable static-libs static) \ - $(use_enable svg) \ - $(use_enable utils trace) \ - $(use_enable valgrind) \ - --enable-ft \ - --enable-interpreter \ - --enable-pdf \ - --enable-png \ - --enable-ps \ - --enable-script \ - --disable-drm \ - --disable-directfb \ - --disable-gallium \ - --disable-qt \ - --disable-vg \ - --disable-xlib-xcb \ - ${myopts} -} - -multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die - einstalldocs -} diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild b/x11-libs/cairo/cairo-1.18.0.ebuild new file mode 100644 index 000000000000..080fd2318b5c --- /dev/null +++ b/x11-libs/cairo/cairo-1.18.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git" +else + SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="A vector graphics library with cross-device output support" +HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0" +IUSE="X aqua debug +glib gtk-doc test" +# Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml +# any2ppm tests seem to hang for now. +RESTRICT="test !test? ( test )" + +RDEPEND=" + >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}] + >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}] + debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) + glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}] + )" +DEPEND="${RDEPEND} + test? ( + app-text/ghostscript-gpl + app-text/poppler[cairo] + gnome-base/librsvg + ) + X? ( x11-base/xorg-proto )" +BDEPEND=" + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc )" + +PATCHES=( + "${FILESDIR}"/${PN}-respect-fontconfig.patch +) + +multilib_src_configure() { + local emesonargs=( + -Ddwrite=disabled + -Dfontconfig=enabled + -Dfreetype=enabled + -Dpng=enabled + $(meson_feature aqua quartz) + $(meson_feature X tee) + $(meson_feature X xcb) + $(meson_feature X xlib) + -Dxlib-xcb=disabled + -Dzlib=enabled + + # Requires poppler-glib (poppler[cairo]) which isn't available in multilib + $(meson_native_use_feature test tests) + + -Dgtk2-utils=disabled + + $(meson_feature glib) + -Dspectre=disabled # only used for tests + $(meson_feature debug symbol-lookup) + + $(meson_use gtk-doc gtk_doc) + ) + + meson_src_configure +} + +multilib_src_test() { + multilib_is_native_abi && meson_src_test +} + +multilib_src_install_all() { + einstalldocs + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die + mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die + rmdir "${ED}"/usr/share/gtk-doc/html || die + fi +} diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 453aa1b0d5ea..f51355062fef 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -1,132 +1,94 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic autotools multilib-minimal +inherit meson-multilib if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git" - SRC_URI="" else - SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind" -# gtk-doc regeneration doesn't seem to work with out-of-source builds -#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate +IUSE="X aqua debug +glib gtk-doc test" +# Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml +# any2ppm tests seem to hang for now. +RESTRICT="test !test? ( test )" -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it -RESTRICT="test" - -BDEPEND=" - virtual/pkgconfig - >=sys-devel/libtool-2" RDEPEND=" - >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] + >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] - sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}] - gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) + >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}] + debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} + test? ( + app-text/ghostscript-gpl + app-text/poppler[cairo] + gnome-base/librsvg + ) X? ( x11-base/xorg-proto )" -#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} -# doc? ( -# >=dev-util/gtk-doc-1.6 -# ~app-text/docbook-xml-dtd-4.2 -# )" - -REQUIRED_USE=" - gles2-only? ( !opengl ) -" +BDEPEND=" + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc )" PATCHES=( - "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch "${FILESDIR}"/${PN}-respect-fontconfig.patch ) -src_prepare() { - default - - if has_version ">=sys-libs/binutils-libs-2.34"; then - eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch - fi - - # tests and perf tools require X, bug #483574 - if ! use X; then - sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die - fi - - # Slightly messed build system YAY - if [[ ${PV} == *9999* ]]; then - touch boilerplate/Makefile.am.features - touch src/Makefile.am.features - touch ChangeLog - fi - - eautoreconf -} - multilib_src_configure() { - local myopts - - [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT - - use elibc_FreeBSD && myopts+=" --disable-symbol-lookup" - - # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)" + local emesonargs=( + -Dfontconfig=enabled + -Dfreetype=enabled + -Dpng=enabled + $(meson_feature aqua quartz) + $(meson_feature X tee) + $(meson_feature X xcb) + $(meson_feature X xlib) + -Dxlib-xcb=disabled + -Dzlib=enabled + + # Requires poppler-glib (poppler[cairo]) which isn't available in multilib + $(meson_native_use_feature test tests) + + -Dgtk2-utils=disabled + + $(meson_feature glib) + -Dspectre=disabled # only used for tests + $(meson_feature debug symbol-lookup) + + $(meson_use gtk-doc gtk_doc) + ) + + meson_src_configure +} - ECONF_SOURCE="${S}" \ - econf \ - $(use_with X x) \ - $(use_enable X tee) \ - $(use_enable X xlib) \ - $(use_enable X xlib-xrender) \ - $(use_enable X xcb) \ - $(use_enable X xcb-shm) \ - $(use_enable aqua quartz) \ - $(use_enable aqua quartz-image) \ - $(use_enable debug test-surfaces) \ - $(use_enable gles2-only glesv2) \ - $(use_enable glib gobject) \ - $(use_enable opengl gl) \ - $(use_enable static-libs static) \ - $(use_enable svg) \ - $(use_enable utils trace) \ - $(use_enable valgrind) \ - --enable-ft \ - --enable-interpreter \ - --enable-pdf \ - --enable-png \ - --enable-ps \ - --enable-script \ - --disable-drm \ - --disable-directfb \ - --disable-gallium \ - --disable-qt \ - --disable-vg \ - --disable-xlib-xcb \ - ${myopts} +multilib_src_test() { + multilib_is_native_abi && meson_src_test } multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die einstalldocs + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die + mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die + rmdir "${ED}"/usr/share/gtk-doc/html || die + fi } diff --git a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch deleted file mode 100644 index 6822121ce495..000000000000 --- a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 03fa352..7e11d24 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} - - DIST_SUBDIRS = src doc util boilerplate test perf - SUBDIRS = src doc util --# libpng is required for our test programs --if CAIRO_HAS_PNG_FUNCTIONS --SUBDIRS += boilerplate test perf --endif - - configure: cairo-version.h - diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch deleted file mode 100644 index 03daac0eca4b..000000000000 --- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/util/cairo-trace/lookup-symbol.c -+++ b/util/cairo-trace/lookup-symbol.c -@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd, - if (symbol->found) - return; - -- if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0) -+ if ((bfd_section_flags (section) & SEC_ALLOC) == 0) - return; - -- vma = bfd_get_section_vma (symtab->bfd, section); -+ vma = bfd_section_vma (section); - if (symbol->pc < vma) - return; - -- size = bfd_section_size (symtab->bfd, section); -+ size = bfd_section_size (section); - if (symbol->pc >= vma + size) - return; - diff --git a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch b/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch deleted file mode 100644 index 3709c5a90f80..000000000000 --- a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <cgarcia@igalia.com> -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.19.2 - diff --git a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch b/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch deleted file mode 100644 index 19345f141872..000000000000 --- a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4c8813f0eaacc32c27126ad2296951a626300b89 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Thu, 25 Oct 2018 18:46:17 +1030 -Subject: [PATCH] pdf: add missing flush - -Issue #342 ---- - src/cairo-pdf-surface.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c -index 7eb61aa1e..939b2d2d7 100644 ---- a/src/cairo-pdf-surface.c -+++ b/src/cairo-pdf-surface.c -@@ -7711,6 +7711,11 @@ _cairo_pdf_surface_mask (void *abstract_surface, - * and most common, case to handle. */ - if (_cairo_pattern_is_constant_alpha (mask, &extents.bounded, &alpha) && - _can_paint_pattern (source)) { -+ -+ status = _cairo_pdf_operators_flush (&surface->pdf_operators); -+ if (unlikely (status)) -+ goto cleanup; -+ - _cairo_output_stream_printf (surface->output, "q\n"); - status = _cairo_pdf_surface_paint_pattern (surface, - op, --- -2.19.2 - diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml index 4d03eec8d35e..8b4901f0d9a8 100644 --- a/x11-libs/cairo/metadata.xml +++ b/x11-libs/cairo/metadata.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> - </maintainer> - <use> - <flag name="opengl" restrict=">=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag> - <flag name="gles2-only">Build the OpenGL ES 2 backend</flag> - <flag name="glib">Compile with GLib Object System support</flag> - <flag name="utils">Build support for Cairo script and trace utilities</flag> - <flag name="valgrind">Built-in support to mark memory regions</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id> - </upstream> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <use> + <flag name="glib">Compile with GLib Object System support</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id> + <remote-id type="freedesktop-gitlab">cairo/cairo</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/cmrt/Manifest b/x11-libs/cmrt/Manifest new file mode 100644 index 000000000000..848ba8490df6 --- /dev/null +++ b/x11-libs/cmrt/Manifest @@ -0,0 +1 @@ +DIST cmrt-1.0.6.tar.gz 3717552 BLAKE2B 0bfb121f37b9b2e9e672d6129a6b7207ccfc3455ea613c8ae000965ee49260e56a154fba8595d8f3b022d153c9d84c7ded7b9f0914f7387eeca826acca9acfa0 SHA512 de115e86e4dc65e617e5e39dd1a14a4baa301480915d1ef31245b759acebbd2c85647e3affb9ccda3b55f7f9008b03d561689d2b63a61a70feba72c9a62b6505 diff --git a/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild new file mode 100644 index 000000000000..4973586aa1ac --- /dev/null +++ b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild @@ -0,0 +1,51 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Intel C for Media RunTime GPU kernel manager" +HOMEPAGE="https://github.com/intel/cmrt" +SRC_URI="https://github.com/intel/cmrt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + >=x11-libs/libdrm-2.4.23[video_cards_intel] + >=media-libs/libva-2.0.0 +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-musl-fix.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/864409 + # + # > Intel has ceased development and contributions including, but not + # > limited to, maintenance, bug fixes, new releases, or updates, to this + # > project. Intel no longer accepts patches to this project. + # No point in submitting a bug report or trying to get this into good shape. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + default +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch b/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch new file mode 100644 index 000000000000..91bae74ed8a1 --- /dev/null +++ b/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/os_defs.h b/src/os_defs.h +index 82794f5..13539ee 100644 +--- a/src/os_defs.h ++++ b/src/os_defs.h +@@ -109,6 +109,10 @@ typedef struct tagRECT { + + #define CONST const + ++#ifndef __CONCAT ++ #define __CONCAT( a1, a2 ) a1 ## a2 ++#endif ++ + #define __UNIQUENAME( a1, a2 ) __CONCAT( a1, a2 ) + #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ ) + #define STATIC_ASSERT(e) typedef char UNIQUENAME(STATIC_ASSERT_)[(e)?1:-1] diff --git a/x11-libs/cmrt/metadata.xml b/x11-libs/cmrt/metadata.xml new file mode 100644 index 000000000000..debd0b7111b7 --- /dev/null +++ b/x11-libs/cmrt/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>media-video@gentoo.org</email> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>kaichun.ning@gmail.com</email> + <name>Kai-Chun Ning</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">intel/cmrt</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest index 8c96fb2f5d33..85b9f024fce4 100644 --- a/x11-libs/colord-gtk/Manifest +++ b/x11-libs/colord-gtk/Manifest @@ -1 +1 @@ -DIST colord-gtk-0.1.26.tar.xz 280380 BLAKE2B 6ddd52b81726f21a2c376b1ab0c773f7670859882f3e5fe6038bf8728d5a9f3308b469b4e563dc784873b5b9cbed8ca671552e9bcb9cbccfaf28cd8f85e0b5bd SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d +DIST colord-gtk-0.3.1.tar.xz 22132 BLAKE2B 3ae1d7f0473d082c2fa2d9bfea18cee3a74d854bc3c99ed6db685ad479f12f2f376f44549fc4e833668718470217971cd327eb867cb1212db9d71370496d8636 SHA512 d8ac4e6f32a0672cd4e87585a03e82ecfc359ae4b99a4a6529ad81025f9beec5a3b479e94dff9a7e49db03e99671099b7f8370f6f87791e5a9fc008da859b238 diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild deleted file mode 100644 index a388681d24d6..000000000000 --- a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 vala - -DESCRIPTION="GTK support library for colord" -HOMEPAGE="https://www.freedesktop.org/software/colord/" -SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz" - -LICENSE="LGPL-3+" -SLOT="0/1" # subslot = libcolord-gtk soname version -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" - -# We still need to build gtk-doc, https://bugs.freedesktop.org/show_bug.cgi?id=69107 -IUSE="doc +introspection vala" -REQUIRED_USE="vala? ( introspection )" - -COMMON_DEPEND=" - >=dev-libs/glib-2.28:2 - >=media-libs/lcms-2.2:2= - x11-libs/gdk-pixbuf:2[introspection?] - x11-libs/gtk+:3[X(+),introspection?] - x11-misc/colord:=[introspection?,vala?] - introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) -" -# ${PN} was part of x11-misc/colord until 0.1.22 -RDEPEND="${COMMON_DEPEND} - !<x11-misc/colord-0.1.27 -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.35 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - doc? ( - app-text/docbook-xml-dtd:4.1.2 - >=dev-util/gtk-doc-1.9 - ) - vala? ( $(vala_depend) ) -" - -RESTRICT="test" # Tests need a display device with a default color profile set - -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-gtk2 \ - --disable-static \ - $(use_enable doc gtk-doc) \ - $(use_enable introspection) \ - $(use_enable vala) -} - -src_compile() { - if use doc; then - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile #482542 - else - gnome2_src_compile - fi -} diff --git a/x11-libs/colord-gtk/colord-gtk-0.3.1.ebuild b/x11-libs/colord-gtk/colord-gtk-0.3.1.ebuild new file mode 100644 index 000000000000..94a5b17bd275 --- /dev/null +++ b/x11-libs/colord-gtk/colord-gtk-0.3.1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit meson vala + +DESCRIPTION="GTK support library for colord" +HOMEPAGE="https://www.freedesktop.org/software/colord/" +SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz" + +LICENSE="LGPL-3+" +SLOT="0/1" # subslot = libcolord-gtk soname version +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" + +IUSE="doc +introspection vala" +REQUIRED_USE="vala? ( introspection )" + +DEPEND=" + >=dev-libs/glib-2.28:2 + >=x11-misc/colord-0.1.27:=[introspection?,vala?] + x11-libs/gtk+:3[introspection?] + >=gui-libs/gtk-4.4:4[introspection?] +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/libxslt + >=sys-devel/gettext-0.17 + virtual/pkgconfig + doc? ( + app-text/docbook-xml-dtd:4.1.2 + >=dev-util/gtk-doc-1.9 + ) + app-text/docbook-xsl-ns-stylesheets + introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) + vala? ( $(vala_depend) ) +" + +RESTRICT="test" # Tests need a display device with a default color profile set + +src_prepare() { + use vala && vala_src_prepare + default +} + +src_configure() { + local -a emesonargs=( + -Dgtk4=true + -Dgtk3=true + -Dgtk2=false + $(meson_use introspection) + $(meson_use vala vapi) + -Dtests=false + -Dman=true + $(meson_use doc docs) + ) + meson_src_configure +} diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml index 39980802b1da..a7e4ce0f7399 100644 --- a/x11-libs/colord-gtk/metadata.xml +++ b/x11-libs/colord-gtk/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">hughsie/colord-gtk</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/dnd/dnd-1.1-r3.ebuild b/x11-libs/dnd/dnd-1.1-r4.ebuild index cda4ff45d520..4a703c80c2b6 100644 --- a/x11-libs/dnd/dnd-1.1-r3.ebuild +++ b/x11-libs/dnd/dnd-1.1-r4.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="OffiX' Drag'n'drop library" HOMEPAGE="http://leb.net/offix" SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz" +S="${WORKDIR}/DND/DNDlib" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" -RDEPEND="x11-libs/libICE +RDEPEND=" + x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw @@ -27,13 +29,12 @@ PATCHES=( "${FILESDIR}"/Makefile-fix.patch ) -S="${WORKDIR}/DND/DNDlib" +DOCS=( + # README is useless + CHANGELOG +) src_configure() { tc-export CC CXX RANLIB AR econf --with-x } - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/x11-libs/dnd/metadata.xml b/x11-libs/dnd/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/x11-libs/dnd/metadata.xml +++ b/x11-libs/dnd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-libs/flowcanvas/Manifest b/x11-libs/flowcanvas/Manifest deleted file mode 100644 index 670a33ced112..000000000000 --- a/x11-libs/flowcanvas/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST flowcanvas-0.7.1.tar.bz2 139471 BLAKE2B e37f557fdd850c35dc70fc7efe71e7d9be5c60a7920fcfdb38fc4a9eb4d1a44639688b50feae4b0f529469cc68e906ea75e0b870a82379212d94e27e4be8abb1 SHA512 e9c7ee9693c6b78e44a0611a8d73c1b7ffa1ae0f3e36c9b0bbc88d5a293c3e5183c17e14b2079d611c988f30cb292caee52ab37f8a13da96b5c8c8261e408410 diff --git a/x11-libs/flowcanvas/files/gv234.patch b/x11-libs/flowcanvas/files/gv234.patch deleted file mode 100644 index ec03696135c0..000000000000 --- a/x11-libs/flowcanvas/files/gv234.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: flowcanvas-0.7.1/src/Canvas.cpp -=================================================================== ---- flowcanvas-0.7.1.orig/src/Canvas.cpp -+++ flowcanvas-0.7.1/src/Canvas.cpp -@@ -1253,21 +1253,21 @@ Canvas::layout_dot(bool use_length_hints - */ - - GVC_t* gvc = gvContext(); -- Agraph_t* G = agopen((char*)"g", AGDIGRAPH); -+ Agraph_t* G = agopen((char*)"g", Agdirected, 0); - - nodes.gvc = gvc; - nodes.G = G; - - if (_direction == HORIZONTAL) -- agraphattr(G, (char*)"rankdir", (char*)"LR"); -+ agattr(G, AGRAPH, (char*)"rankdir", (char*)"LR"); - else -- agraphattr(G, (char*)"rankdir", (char*)"TD"); -+ agattr(G, AGRAPH, (char*)"rankdir", (char*)"TD"); - - unsigned id = 0; - for (ItemList::const_iterator i = _items.begin(); i != _items.end(); ++i) { - std::ostringstream ss; - ss << "n" << id++; -- Agnode_t* node = agnode(G, strdup(ss.str().c_str())); -+ Agnode_t* node = agnode(G, strdup(ss.str().c_str()), 1); - if (boost::dynamic_pointer_cast<Module>(*i)) { - ss.str(""); - ss << (*i)->width() / 96.0; -@@ -1310,7 +1310,7 @@ Canvas::layout_dot(bool use_length_hints - - assert(src_node && dst_node); - -- Agedge_t* edge = agedge(G, src_node, dst_node); -+ Agedge_t* edge = agedge(G, src_node, dst_node, NULL, 1); - - if (use_length_hints && c->length_hint() != 0) { - std::ostringstream len_ss; -@@ -1325,7 +1325,7 @@ Canvas::layout_dot(bool use_length_hints - if (partner) { - GVNodes::iterator p = nodes.find(partner); - if (p != nodes.end()) -- agedge(G, i->second, p->second); -+ agedge(G, i->second, p->second, NULL, 1); - } - } - diff --git a/x11-libs/flowcanvas/files/ldconfig2.patch b/x11-libs/flowcanvas/files/ldconfig2.patch deleted file mode 100644 index d86e65eaf179..000000000000 --- a/x11-libs/flowcanvas/files/ldconfig2.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: flowcanvas-0.7.1/wscript -=================================================================== ---- flowcanvas-0.7.1.orig/wscript -+++ flowcanvas-0.7.1/wscript -@@ -85,5 +85,3 @@ def build(bld): - - # Documentation - autowaf.build_dox(bld, 'FLOWCANVAS', FLOWCANVAS_VERSION, top, out) -- -- bld.add_post_fun(autowaf.run_ldconfig) diff --git a/x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild b/x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild deleted file mode 100644 index f1135245ec69..000000000000 --- a/x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' - -inherit waf-utils python-any-r1 eutils - -DESCRIPTION="Gtkmm/Gnomecanvasmm widget for boxes and lines environments" -HOMEPAGE="http://wiki.drobilla.net/FlowCanvas" -SRC_URI="http://download.drobilla.net/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug doc" - -RDEPEND="dev-libs/boost - >=dev-cpp/gtkmm-2.4:2.4 - >=dev-cpp/libgnomecanvasmm-2.6:2.6 - media-gfx/graphviz" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS README ChangeLog ) - -src_prepare() { - epatch "${FILESDIR}/ldconfig2.patch" - has_version '>=media-gfx/graphviz-2.34' && epatch "${FILESDIR}/gv234.patch" -} - -src_configure() { - waf-utils_src_configure \ - --htmldir=/usr/share/doc/${PF}/html \ - $(use debug && echo "--debug") \ - $(use doc && echo "--doc") -} diff --git a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild deleted file mode 100644 index 452438c3dbc0..000000000000 --- a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' - -inherit waf-utils python-any-r1 eutils flag-o-matic - -DESCRIPTION="Gtkmm/Gnomecanvasmm widget for boxes and lines environments" -HOMEPAGE="http://wiki.drobilla.net/FlowCanvas" -SRC_URI="http://download.drobilla.net/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc" - -RDEPEND="dev-libs/boost - >=dev-cpp/gtkmm-2.4:2.4 - >=dev-cpp/libgnomecanvasmm-2.6:2.6 - media-gfx/graphviz" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS README ChangeLog ) - -src_prepare() { - epatch "${FILESDIR}/ldconfig2.patch" - has_version '>=media-gfx/graphviz-2.34' && epatch "${FILESDIR}/gv234.patch" - append-cxxflags -std=c++11 -} - -src_configure() { - waf-utils_src_configure \ - --htmldir=/usr/share/doc/${PF}/html \ - $(use debug && echo "--debug") \ - $(use doc && echo "--doc") -} diff --git a/x11-libs/flowcanvas/metadata.xml b/x11-libs/flowcanvas/metadata.xml deleted file mode 100644 index 9077960e2f25..000000000000 --- a/x11-libs/flowcanvas/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>proaudio@gentoo.org</email> - <name>Gentoo ProAudio Project</name> -</maintainer> -<longdescription lang="en"> - FlowCanvas is an interactive Gtkmm/Gnomecanvasmm widget for "boxes and - lines" environments (ie modular synths or interactive finite state automata - diagrams). -</longdescription> -</pkgmetadata> diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index e624e9ce136e..3864bc146832 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -1 +1,2 @@ DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821 +DIST fltk-1.3.8-source.tar.gz 5335306 BLAKE2B 8c2d2fca4243c0e7c5a8aa46083940f99c8b3e7873d39d6e590a4b66587876393f209e5e7e5eaf4a4cc13f0f97cb03671d97129853b0146eeab409aaf687935e SHA512 5c1cbfc156c49888e25b90dcb9b1ab86a03447e08e00864c3c7ae8a0e32cfbd9154ee630054235c9edfd29fd1d0371ae77eff7b78094fb660dbbdec5cecfc8fb diff --git a/x11-libs/fltk/files/fltk-1.3.5-AR.patch b/x11-libs/fltk/files/fltk-1.3.5-AR.patch new file mode 100644 index 000000000000..34dbc8769f09 --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.3.5-AR.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -430,7 +430,7 @@ AC_PATH_PROG(DOXYDOC,doxygen) + + dnl How do we make libraries? + AC_PROG_RANLIB +-AC_PATH_TOOL(AR, ar) ++AC_CHECK_TOOL(AR, ar) + + if test "x$AR" = "x:"; then + AC_MSG_ERROR([Configure could not find the library archiver, aborting.]) diff --git a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch new file mode 100644 index 000000000000..3f576d501ece --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch @@ -0,0 +1,19 @@ +diff --git a/configure.ac b/configure.ac +index 6b64110b0..1330d3f27 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1878,10 +1878,13 @@ dnl Set empty BINARY_DIR variable for fltk-config.in (CMake compatibility) + BINARY_DIR= + AC_SUBST([BINARY_DIR]) + ++INCLUDE_DIRS="${includedir}" ++AC_SUBST(INCLUDE_DIRS) ++ + dnl Write all of the files... + AC_CONFIG_HEADERS([config.h:configh.in]) + AC_CONFIG_HEADERS([FL/fl_config.h:fl_config.in]) +-AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile]) ++AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake]) + AC_OUTPUT + + dnl Make sure the fltk-config script is executable... diff --git a/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch new file mode 100644 index 000000000000..47db8d03c8d2 --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch @@ -0,0 +1,42 @@ +diff --git a/Makefile b/Makefile +index 2d99808d9..283f825dd 100644 +--- a/Makefile ++++ b/Makefile +@@ -103,9 +103,6 @@ makeinclude: configure configh.in makeinclude.in + touch config.h + chmod +x fltk-config + +-configure: configure.ac +- autoconf +- + portable-dist: + epm -v -s fltk.xpm fltk + +diff --git a/documentation/Makefile b/documentation/Makefile +index 0b176246b..882fbf8a4 100644 +--- a/documentation/Makefile ++++ b/documentation/Makefile +@@ -91,12 +91,6 @@ install: $(MANPAGES) + $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ + fi + echo "Installing man pages in $(DESTDIR)$(mandir) ..." +- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 +- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 +- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 +- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 +- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 +- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 + $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 +@@ -105,10 +99,6 @@ install: $(MANPAGES) + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 + + install-linux install-osx: +- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 +- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 +- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 +- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 + $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 + $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 diff --git a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch b/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch new file mode 100644 index 000000000000..e49aa7408cca --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index c02de0972..2d99808d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,8 +16,7 @@ + + include makeinclude + +-DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options test \ +- documentation ++DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fltk-options + + all: makeinclude fltk-config + for dir in $(DIRS); do\ diff --git a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch b/x11-libs/fltk/files/fltk-1.4.9999-optim.patch new file mode 100644 index 000000000000..a1e18bbb74b2 --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.9999-optim.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 1330d3f27..c76dba26f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1552,7 +1552,7 @@ AS_IF([test -n "$GCC"], [ + AS_IF([test "x$with_optim" != x], [ + OPTIM="$with_optim $OPTIM" + ], [ +- OPTIM="-Os $OPTIM" ++ OPTIM="$OPTIM" + ]) + ]) + diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild index 56edcb354e2f..ad957e104713 100644 --- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild +++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" SLOT="1" LICENSE="FLTK LGPL-2" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" RDEPEND=" @@ -37,7 +37,7 @@ DEPEND=" ${RDEPEND} virtual/pkgconfig x11-base/xorg-proto - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DOCS=( ANNOUNCEMENT @@ -66,6 +66,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.3.4-conf-tests.patch "${FILESDIR}"/${PN}-1.3.5-cmake.patch "${FILESDIR}"/${PN}-1.3.5-optim.patch + "${FILESDIR}"/${PN}-1.3.5-AR.patch ) src_prepare() { @@ -92,6 +93,11 @@ src_prepare() { } multilib_src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/881107 + # Seems to be fixed in git (1.4.9999) + filter-lto + unset FLTK_LIBDIRS local FLTK_INCDIR=${EPREFIX}/usr/include/fltk diff --git a/x11-libs/fltk/fltk-1.3.8.ebuild b/x11-libs/fltk/fltk-1.3.8.ebuild new file mode 100644 index 000000000000..710e3997f2a9 --- /dev/null +++ b/x11-libs/fltk/fltk-1.3.8.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multilib-minimal xdg + +DESCRIPTION="C++ user interface toolkit for X and OpenGL" +HOMEPAGE="https://www.fltk.org/" +SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" + +SLOT="1" +LICENSE="FLTK LGPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" + +RDEPEND=" + media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] + >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + x11-libs/libICE[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXt[${MULTILIB_USEDEP}] + cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + x11-base/xorg-proto + doc? ( app-text/doxygen ) +" +DOCS=( + ANNOUNCEMENT + CHANGES + CHANGES_1.0 + CHANGES_1.1 + CREDITS + README + README.abi-version.txt + README.Cairo.txt + README.CMake.txt + README.MSWindows.txt + README.OSX.txt + README.Unix.txt +) +FLTK_GAMES=" + blocks + checkers + sudoku +" +PATCHES=( + "${FILESDIR}"/${PN}-1.3.0-share.patch + "${FILESDIR}"/${PN}-1.3.4-conf-tests.patch + "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch + "${FILESDIR}"/${PN}-1.3.3-visibility.patch +) + +pkg_setup() { + unset FLTK_LIBDIRS +} + +src_prepare() { + default + + rm -rf zlib jpeg png || die + + sed -i \ + -e 's:@HLINKS@::g' FL/Makefile.in || die + sed -i \ + -e '/x-fluid/d' fluid/Makefile || die + sed -i \ + -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \ + -e '/^LDFLAGS=/d' \ + "${S}/fltk-config.in" || die + # docs in proper docdir + sed -i \ + -e "/^docdir/s:fltk:${PF}/html:" \ + -e "/SILENT:/d" \ + makeinclude.in || die + + # also in Makefile:config.guess config.sub: + cp misc/config.{guess,sub} . || die + + cp fluid/{,x-}fluid.desktop || die + + eaclocal + eautoconf + multilib_copy_sources +} + +multilib_src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/881107 + # Seems to be fixed in git (1.4.9999) + filter-lto + + unset FLTK_LIBDIRS + + local FLTK_INCDIR=${EPREFIX}/usr/include/fltk + local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk + FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} + + multilib_is_native_abi && use prefix && + append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" + + econf \ + $(use_enable cairo) \ + $(use_enable debug) \ + $(use_enable opengl gl) \ + $(use_enable threads) \ + $(use_enable xft) \ + $(use_enable xinerama) \ + --disable-localjpeg \ + --disable-localpng \ + --disable-localzlib \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --enable-largefile \ + --enable-shared \ + --enable-xcursor \ + --enable-xdbe \ + --enable-xfixes \ + --includedir=${FLTK_INCDIR} \ + --libdir=${FLTK_LIBDIR} \ + DSOFLAGS="${LDFLAGS}" \ + LDFLAGS="${LDFLAGS}" +} + +multilib_src_compile() { + # Prevent reconfigure on non-native ABIs. + touch -r makeinclude config.{guess,sub} || die + + default + + if multilib_is_native_abi; then + emake -C fluid + use doc && emake -C documentation html + use games && emake -C test ${FLTK_GAMES} + fi +} + +multilib_src_test() { + emake -C fluid + emake -C test +} + +multilib_src_install() { + default + + if multilib_is_native_abi; then + emake -C fluid DESTDIR="${D}" install-linux install + + use doc && \ + emake -C documentation DESTDIR="${D}" install + + use games && \ + emake -C test DESTDIR="${D}" install-linux + fi +} + +multilib_src_install_all() { + for app in fluid $(usex games "${FLTK_GAMES}" ''); do + dosym \ + ../icons/hicolor/32x32/apps/${app}.png \ + /usr/share/pixmaps/${app}.png + done + + if use examples; then + docinto examples + dodoc -r test/*.{h,cxx,fl} test/demo.menu + fi + + insinto /usr/share/cmake/Modules + doins CMake/FLTK*.cmake + + newenvd - 99fltk <<- _EOF_ + LDPATH="${FLTK_LIBDIRS}" + FLTK_DOCDIR="${EPREFIX}"/usr/share/doc/"${PF}"/html + _EOF_ + + # FIXME: This is bad, but building only shared libraries is hardly supported + # FIXME: The executables in test/ are linking statically against libfltk + if ! use static-libs; then + rm "${ED}"/usr/lib*/fltk/*.a || die + fi + + find "${D}" -name '*.la' -delete || die +} diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild index de2c6eb095ec..8362de128971 100644 --- a/x11-libs/fltk/fltk-1.3.9999.ebuild +++ b/x11-libs/fltk/fltk-1.3.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,7 +38,7 @@ DEPEND=" ${RDEPEND} virtual/pkgconfig x11-base/xorg-proto - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DOCS=( ANNOUNCEMENT @@ -99,6 +99,11 @@ src_prepare() { } multilib_src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/881107 + # Seems to be fixed in git (1.4.9999) + filter-lto + local FLTK_INCDIR=${EPREFIX}/usr/include/fltk local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild index 4ab26198da79..74b44b10b0b6 100644 --- a/x11-libs/fltk/fltk-1.4.9999.ebuild +++ b/x11-libs/fltk/fltk-1.4.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,7 +37,7 @@ DEPEND=" ${RDEPEND} virtual/pkgconfig x11-base/xorg-proto - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DOCS=( ANNOUNCEMENT @@ -46,15 +46,12 @@ DOCS=( CHANGES_1.1.txt CHANGES_1.3.txt CREDITS.txt - README.Android.md README.CMake.txt README.Cairo.txt README.IDE.txt - README.Pico.txt README.Unix.txt README.Windows.txt README.abi-version.txt - README.bundled-libs.txt README.macOS.md README.md README.txt @@ -66,10 +63,10 @@ FLTK_GAMES=" " PATCHES=( "${FILESDIR}"/${PN}-1.3.0-share.patch - "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch - "${FILESDIR}"/${PN}-1.3.4-conf-tests.patch - "${FILESDIR}"/${PN}-1.3.5-cmake.patch - "${FILESDIR}"/${PN}-1.3.5-optim.patch + "${FILESDIR}"/${PN}-1.4.9999-makefile-dirs.patch + "${FILESDIR}"/${PN}-1.4.9999-conf-tests.patch + "${FILESDIR}"/${PN}-1.4.9999-cmake.patch + "${FILESDIR}"/${PN}-1.4.9999-optim.patch ) pkg_setup() { @@ -95,9 +92,6 @@ src_prepare() { -e "/SILENT:/d" \ makeinclude.in || die - # also in Makefile:config.guess config.sub: - cp misc/config.{guess,sub} . || die - eautoconf multilib_copy_sources } diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml index 19be30c1abeb..cc385decf7fd 100644 --- a/x11-libs/fltk/metadata.xml +++ b/x11-libs/fltk/metadata.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> + <!-- maintainer-needed --> <longdescription> - The Fast Light ToolKit is a cross-platform C++ user interface - toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI - functionality and supports 3D graphics via OpenGL and its built-in - GLUT emulation. FLTK also includes a UI builder called FLUID that - can be used to create applications. + The Fast Light ToolKit is a cross-platform C++ user interface + toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI + functionality and supports 3D graphics via OpenGL and its built-in + GLUT emulation. FLTK also includes a UI builder called FLUID that + can be used to create applications. </longdescription> +<upstream> + <remote-id type="github">fltk/fltk</remote-id> +</upstream> <use> - <flag name="games">Builds and installs some extra games</flag> + <flag name="games">Builds and installs some extra games</flag> </use> </pkgmetadata> diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh b/x11-libs/fox-wrapper/files/fox-wrapper-2.sh deleted file mode 100644 index 19d09b5b9ca6..000000000000 --- a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1) -# -# Executes the correct fox-config version, based on the value of WANT_FOX. -# All versions of fox after 1.0.x ship with a fox-config script -# -# -# Stable branches first, in descending order, then unstable branches. -# After a new stable branch, prepend the new version and bump (or remove) -# the last unstable branch -# -vers="1.6 1.4 1.2 1.5" -bindir=/usr/bin - -if [ "${0##*/}" = "fox-wrapper.sh" ] ; then - echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2 - exit 1 -fi - -if [ -z "${WANT_FOX}" ] ; then - echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2 - echo " WANT_FOX=\"1.2\" fox-config $@" - exit 1 -fi - -for v in ${vers} ; do - eval binary_${v/./_}="fox-${v}-config" -done - -# -# Check the WANT_FOX setting -# -for v in ${vers} x ; do - if [ "${v}" = "x" ] ; then - echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2 - echo " Valid values of WANT_FOX are: ${vers// /, }" - exit 1 - fi - - if [ "${WANT_FOX}" = "${v}" ] ; then - binary="binary_${v/./_}" - binary="${!binary}" - break - fi -done - -if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then - echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2 - echo "fox-wrapper: DEBUG: will execute <$binary>" >&2 -fi - -# -# for further consistency -# -for v in ${vers} ; do - mybin="binary_${v/./_}" - if [ "${binary}" = "${!mybin}" ] ; then - export WANT_FOX="${v}" - fi -done - -# -# Now try to run the binary -# -if [ ! -x "${bindir}/${binary}" ] ; then - echo "fox-wrapper: $binary is missing or not executable." >&2 - echo " Please try emerging the correct version of fox, i.e.:" >&2 - echo " emerge '=x11-libs/${binary/-config/}*'" >&2 - exit 1 -fi - -"$binary" "$@" diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-3.sh b/x11-libs/fox-wrapper/files/fox-wrapper-3.sh index 3d6871e5f188..f0a582beb763 100644 --- a/x11-libs/fox-wrapper/files/fox-wrapper-3.sh +++ b/x11-libs/fox-wrapper/files/fox-wrapper-3.sh @@ -2,7 +2,7 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1) +# Based on the am-wrapper.sh script (dev-build/automake-wrapper-1-r1) # # Executes the correct fox-config version, based on the value of WANT_FOX. # All versions of fox after 1.0.x ship with a fox-config script diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3-r1.ebuild index b4b834556c50..5385e9e5df7b 100644 --- a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild +++ b/x11-libs/fox-wrapper/fox-wrapper-3-r1.ebuild @@ -1,21 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="wrapper for fox-config to manage multiple versions" +DESCRIPTION="Wrapper for fox-config to manage multiple versions" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="" +S=${WORKDIR} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -S=${WORKDIR} +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" src_install() { exeinto /usr/lib/misc diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild deleted file mode 100644 index d4ebbf63bbbc..000000000000 --- a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="wrapper for fox-config to manage multiple versions" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -S=${WORKDIR} - -src_install() { - exeinto /usr/lib/misc - newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh - - dodir /usr/bin - dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config -} diff --git a/x11-libs/fox-wrapper/metadata.xml b/x11-libs/fox-wrapper/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/x11-libs/fox-wrapper/metadata.xml +++ b/x11-libs/fox-wrapper/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest index ce1493d8b837..bfb8c275d25d 100644 --- a/x11-libs/fox/Manifest +++ b/x11-libs/fox/Manifest @@ -1,2 +1,3 @@ DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087 DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540 +DIST fox-1.7.84.tar.gz 5879987 BLAKE2B 803a698eb5d976a04dd30b03a3c65f840d09e173292b8448dc02905b37ea352d0fe71b4a35f806f7ee2a8b6e6436b0c1dc9185ac3a17ecda3fb63a1b583e7348 SHA512 5590f16272a0630cb49e74e0f591e65886dd81ba1b0121d403fa3689ca8b23a727c75b645b417eb87e67fd0ece465b493146c8bb51d117a6559bb19b1b2b4297 diff --git a/x11-libs/fox/files/fox-1.7.67-no-truetype.patch b/x11-libs/fox/files/fox-1.7.67-no-truetype.patch index 6f91d9746a1e..f57a945b8d61 100644 --- a/x11-libs/fox/files/fox-1.7.67-no-truetype.patch +++ b/x11-libs/fox/files/fox-1.7.67-no-truetype.patch @@ -1,6 +1,5 @@ -diff -ru fox-1.7.67/lib/FXFont.cpp /var/tmp/portage/x11-libs/fox-1.7.67/work/fox-1.7.67/lib/FXFont.cpp ---- fox-1.7.67/lib/FXFont.cpp 2019-05-08 05:21:21.000000000 +0200 -+++ /var/tmp/portage/x11-libs/fox-1.7.67/work/fox-1.7.67/lib/FXFont.cpp 2019-12-16 22:19:32.510138232 +0100 +--- a/lib/FXFont.cpp ++++ b/lib/FXFont.cpp @@ -829,26 +829,26 @@ // Weight @@ -43,4 +42,3 @@ diff -ru fox-1.7.67/lib/FXFont.cpp /var/tmp/portage/x11-libs/fox-1.7.67/work/fox } FXTRACE((160,"%4d: dweight=%-3d dsize=%3d dslant=%d dsetwidth=%d dscalable=%d dpolymorph=%d xres=%-3d yres=%-3d xlfd=\"%s\"\n",f,dweight,dsize,dslant,dsetwidth,dscalable,dpolymorph,xres,yres,fontnames[f])); - diff --git a/x11-libs/fox/files/fox-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch b/x11-libs/fox/files/fox-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch new file mode 100644 index 000000000000..21d37687f44e --- /dev/null +++ b/x11-libs/fox/files/fox-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/898866 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sat, 17 Jun 2023 15:32:10 +0000 +Subject: [PATCH 1/1] Fix building against musl C library + +PTHREAD_RWLOCK_PREFER_WRITER_NP isn't available in musl libc/non-glibc +systems. Checking for only __linux__ being defined isn't enough, +additional check of __GLIBC__ being defined is needed. + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/lib/FXReadWriteLock.cpp ++++ b/lib/FXReadWriteLock.cpp +@@ -80,7 +80,7 @@ FXReadWriteLock::FXReadWriteLock(){ + FXASSERT(sizeof(data)>=sizeof(pthread_rwlock_t)); + pthread_rwlockattr_t rwlockatt; + pthread_rwlockattr_init(&rwlockatt); +-#if defined(__linux__) ++#if defined(__linux__) && defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&rwlockatt,PTHREAD_RWLOCK_PREFER_WRITER_NP); + #endif + pthread_rwlock_init((pthread_rwlock_t*)data,&rwlockatt); +-- +2.41.0 + diff --git a/x11-libs/fox/files/fox-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch b/x11-libs/fox/files/fox-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch new file mode 100644 index 000000000000..233107e68e1d --- /dev/null +++ b/x11-libs/fox/files/fox-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/898866 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sat, 17 Jun 2023 15:32:10 +0000 +Subject: [PATCH 1/1] Fix building against musl C library + +PTHREAD_RWLOCK_PREFER_WRITER_NP isn't available in musl libc/non-glibc +systems. Additional check of __GLIBC__ being defined is needed. + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/lib/FXReadWriteLock.cpp ++++ b/lib/FXReadWriteLock.cpp +@@ -62,7 +62,7 @@ FXReadWriteLock::FXReadWriteLock(){ + InitializeCriticalSection(((RWLOCK*)data)->mutex); + InitializeCriticalSection(((RWLOCK*)data)->access); + ((RWLOCK*)data)->readers=0; +-#elif (_XOPEN_SOURCE >= 500) || (_POSIX_C_SOURCE >= 200809L) ++#elif (_XOPEN_SOURCE >= 500) || (_POSIX_C_SOURCE >= 200809L) && defined(__GLIBC__) + // If this fails on your machine, determine what value + // of sizeof(pthread_rwlock_t) is supposed to be on your + // machine and mail it to: jeroen@fox-toolkit.net!! diff --git a/x11-libs/fox/fox-1.6.57-r1.ebuild b/x11-libs/fox/fox-1.6.57-r3.ebuild index 3b8d8ad7645b..75a76109a911 100644 --- a/x11-libs/fox/fox-1.6.57-r1.ebuild +++ b/x11-libs/fox/fox-1.6.57-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively" HOMEPAGE="http://www.fox-toolkit.org/" @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="1.6" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile" RDEPEND=" @@ -19,10 +19,10 @@ RDEPEND=" x11-libs/libXcursor x11-libs/libXrandr bzip2? ( app-arch/bzip2 ) - jpeg? ( virtual/jpeg ) + jpeg? ( media-libs/libjpeg-turbo:= ) opengl? ( virtual/glu virtual/opengl ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0= ) + png? ( media-libs/libpng:= ) + tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 x11-libs/libXft @@ -31,7 +31,7 @@ RDEPEND=" DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/libXt" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" src_prepare() { default @@ -51,6 +51,14 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/864412 + # Fixed in 1.7.84 + # + # Do not trust it for LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf \ --disable-static \ --enable-$(usex debug debug release) \ diff --git a/x11-libs/fox/fox-1.7.67.ebuild b/x11-libs/fox/fox-1.7.67-r1.ebuild index 46ddd5fdb5e2..1a2513f96a04 100644 --- a/x11-libs/fox/fox-1.7.67.ebuild +++ b/x11-libs/fox/fox-1.7.67-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively" HOMEPAGE="http://www.fox-toolkit.org/" @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="1.7" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools" RDEPEND=" @@ -19,10 +19,10 @@ RDEPEND=" x11-libs/libXcursor x11-libs/libXrandr bzip2? ( app-arch/bzip2 ) - jpeg? ( virtual/jpeg ) + jpeg? ( media-libs/libjpeg-turbo:= ) opengl? ( virtual/glu virtual/opengl ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0= ) + png? ( media-libs/libpng:= ) + tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 x11-libs/libXft @@ -31,7 +31,7 @@ RDEPEND=" DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/libXt" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}"/"${PN}"-1.7.67-no-truetype.patch ) @@ -57,6 +57,14 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/864412 + # Fixed in 1.7.84 + # + # Do not trust it for LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf \ --disable-static \ --enable-$(usex debug debug release) \ diff --git a/x11-libs/fox/fox-1.7.67-r2.ebuild b/x11-libs/fox/fox-1.7.67-r2.ebuild new file mode 100644 index 000000000000..6f22d0fa1c2f --- /dev/null +++ b/x11-libs/fox/fox-1.7.67-r2.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively" +HOMEPAGE="http://www.fox-toolkit.org/" +SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="1.7" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools" + +RDEPEND=" + x11-libs/fox-wrapper + x11-libs/libXcursor + x11-libs/libXrandr + bzip2? ( app-arch/bzip2 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + opengl? ( virtual/glu virtual/opengl ) + png? ( media-libs/libpng:= ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-libs/freetype:2 + x11-libs/libXft + ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/libXt" +BDEPEND="doc? ( app-text/doxygen )" + +PATCHES=( + "${FILESDIR}"/"${PN}"-1.7.67-no-truetype.patch + "${FILESDIR}"/"${PN}"-1.7.67-pthread_rwlock_prefer_writer_np-musl.patch +) + +src_prepare() { + default + + sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove spurious debug line." + sed -i -e "s:windows::" Makefile.am || die + sed -i -e 's/register //g' lib/*.cpp || die "Unable remove register keywords from sources under lib folder" + sed -i -e 's/register //g' shutterbug/*.cpp || die "Unable remove register keywords from sources under shutterbug folder" + sed -i -e 's/register //g' calculator/*.cpp || die "Unable remove register keywords from sources under calculator folder" + sed -i -e 's/register //g' glviewer/*.cpp || die "Unable remove register keywords from sources under glviewer folder" + sed -i -e 's/register //g' chart/*.cpp || die "Unable remove register keywords from sources under chart folder" + if ! use tools; then + local d + for d in adie calculator pathfinder shutterbug; do + sed -i -e "s:${d}::" Makefile.am || die + done + fi + + # Respect system CXXFLAGS + sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags." + + # don't strip binaries + sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping." + + eautoreconf +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/864412 + # Fixed in 1.7.84 + # + # Do not trust it for LTO either. + append-flags -fno-strict-aliasing + filter-lto + + econf \ + --disable-static \ + --enable-$(usex debug debug release) \ + $(use_enable bzip2 bz2lib) \ + $(use_enable jpeg) \ + $(use_with opengl) \ + $(use_enable png) \ + $(use_enable tiff) \ + $(use_with truetype xft) \ + $(use_enable zlib) \ + $(use_with profile profiling) +} + +src_compile() { + emake + use doc && emake -C doc docs +} + +src_install() { + emake install \ + DESTDIR="${D}" \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \ + screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots + + local CP="${ED}"/usr/bin/ControlPanel + if [[ -f ${CP} ]]; then + mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \ + die "Failed to install ControlPanel" + fi + + dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING + + if use doc; then + # install class reference docs if USE=doc + docinto html + dodoc -r doc/ref + else + # remove documentation if USE=-doc + rm -rf "${ED}"/usr/share/doc/${PF}/html || die + fi + + # slot fox-config + if [[ -f ${ED}/usr/bin/fox-config ]] ; then + mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \ + || die "failed to install fox-config" + fi + + # no static archives + find "${D}" -name '*.la' -delete || die +} diff --git a/x11-libs/fox/fox-1.7.84.ebuild b/x11-libs/fox/fox-1.7.84.ebuild new file mode 100644 index 000000000000..33e6f56e8667 --- /dev/null +++ b/x11-libs/fox/fox-1.7.84.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively" +HOMEPAGE="http://www.fox-toolkit.org/" +SRC_URI="ftp://www.fox-toolkit.org/pub/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="1.7" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools" + +COMMON_DEPEND=" + x11-libs/libXcursor + x11-libs/libXrandr + bzip2? ( app-arch/bzip2 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + opengl? ( virtual/glu virtual/opengl ) + png? ( media-libs/libpng:= ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-libs/freetype:2 + x11-libs/libXft + ) + zlib? ( sys-libs/zlib ) +" +RDEPEND=" + ${COMMON_DEPEND} + x11-libs/fox-wrapper +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto + x11-libs/libXt +" +BDEPEND="doc? ( app-text/doxygen )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch +) + +src_prepare() { + default + + sed -i -e "s:windows::" Makefile.am || die + + if ! use tools; then + local d + for d in adie calculator pathfinder shutterbug; do + sed -i -e "s:${d}::" Makefile.am || die + done + fi + + # Respect system CXXFLAGS + sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags." + + # don't strip binaries + sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping." + + eautoreconf +} + +src_configure() { + use debug || append-cppflags -DNDEBUG + + # Not using --enable-release because of the options it sets like no SSP + econf \ + $(use_enable debug) \ + $(use_enable bzip2 bz2lib) \ + $(use_enable jpeg) \ + $(use_with opengl) \ + $(use_enable png) \ + $(use_enable tiff) \ + $(use_with truetype xft) \ + $(use_enable zlib) \ + $(use_with profile profiling) +} + +src_compile() { + emake + use doc && emake -C doc docs +} + +src_install() { + emake install \ + DESTDIR="${D}" \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \ + screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots + + local CP="${ED}"/usr/bin/ControlPanel + if [[ -f ${CP} ]]; then + mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \ + die "Failed to install ControlPanel" + fi + + dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING + + if use doc; then + # install class reference docs if USE=doc + docinto html + dodoc -r doc/ref + else + # remove documentation if USE=-doc + rm -rf "${ED}"/usr/share/doc/${PF}/html || die + fi + + # slot fox-config + if [[ -f ${ED}/usr/bin/fox-config ]] ; then + mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \ + || die "failed to install fox-config" + fi + + # no static archives + find "${D}" -name '*.la' -delete || die +} diff --git a/x11-libs/fox/metadata.xml b/x11-libs/fox/metadata.xml index a0084d6b4b7c..19fdb2a74ce8 100644 --- a/x11-libs/fox/metadata.xml +++ b/x11-libs/fox/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zx2c4@gentoo.org</email> diff --git a/x11-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-20160328234507.ebuild b/x11-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-20160328234507.ebuild deleted file mode 100644 index 8ec1d797cd9a..000000000000 --- a/x11-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-20160328234507.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://github.com/aruiz/webp-pixbuf-loader" -EGIT_COMMIT=9b92950d49d7939f90ba7413deb7ec6b392b2054 - -inherit git-r3 cmake-multilib gnome2-utils - -DESCRIPTION="WebP Image format GdkPixbuf loader" -HOMEPAGE="https://github.com/aruiz/webp-pixbuf-loader" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND=">=media-libs/libwebp-0.4.3 - >=x11-libs/gdk-pixbuf-2.22" -RDEPEND="${DEPEND}" - -multilib_src_configure() { - local mycmakeargs=( -DINSTALL_LIB_DIR:PATH=$(get_libdir) ) - cmake-utils_src_configure -} - -pkg_preinst() { - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - gnome2_gdk_pixbuf_update -} - -pkg_postinst() { - gnome2_gdk_pixbuf_update -} diff --git a/x11-libs/gdk-pixbuf-loader-webp/metadata.xml b/x11-libs/gdk-pixbuf-loader-webp/metadata.xml deleted file mode 100644 index 00f1f8a2cff9..000000000000 --- a/x11-libs/gdk-pixbuf-loader-webp/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>andy.kittner@gmail.com</email> - <name>Andy Kittner</name> - </maintainer> - <maintainer type="project"> - <email>graphics@gentoo.org</email> - <name>Gentoo Graphics Project</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription lang="en"> - A gdk-pixbuf plugin that allows GTK applications to view webp images. - </longdescription> - <upstream> - <remote-id type="github">aruiz/webp-pixbuf-loader</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest new file mode 100644 index 000000000000..528a205b0c9b --- /dev/null +++ b/x11-libs/gdk-pixbuf-xlib/Manifest @@ -0,0 +1 @@ +DIST gdk-pixbuf-xlib-2.40.2.tar.xz 53588 BLAKE2B a515e86bc69f59910f61fe9c275ab89c0732f0aa2cfb614ac94e597de420d25708a11b9b21313c7cfe3763434f45a8318412ae5889c24c8ed57dac68e09c0227 SHA512 246bcace03f4d7d694c4d08f28c7ad044cab63b5cf264b478ee1fe161499e7607c7ffeff93908f1f3b308e5108d78c4b51a3f90b79189d42a1a653c8edc53e37 diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild new file mode 100644 index 000000000000..3672fcdf9d59 --- /dev/null +++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org meson-multilib + +DESCRIPTION="Deprecated Xlib integration for GdkPixbuf" +HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib" +LICENSE="LGPL-2+ MPL-1.1" +SLOT="0" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="gtk-doc" + +RDEPEND=" + dev-libs/glib:2[${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.42.0[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + >=dev-util/gtk-doc-1.20 + ) +" + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool gtk-doc gtk_doc) + ) + meson_src_configure +} diff --git a/x11-libs/gdk-pixbuf-xlib/metadata.xml b/x11-libs/gdk-pixbuf-xlib/metadata.xml new file mode 100644 index 000000000000..f84b957434d3 --- /dev/null +++ b/x11-libs/gdk-pixbuf-xlib/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf-xlib</remote-id> + <remote-id type="gnome-gitlab">Archive/gdk-pixbuf-xlib</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index a0bb80434d64..9f22e8781787 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1 +1 @@ -DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa +DIST gdk-pixbuf-2.42.10.tar.xz 6519776 BLAKE2B b6bec388b70a971ea5b336001920fdf433bcbc539d54e62c7b6198e968f0bd3560ef9adc94215b64b01e7d5db69c95d5a1d32654b38b051fceb75e93666b3385 SHA512 ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch deleted file mode 100644 index 77ea7e75521e..000000000000 --- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <blueness@gentoo.org> -Date: Wed, 14 Oct 2015 16:18:19 -0400 -Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on - uClibc - -pixbuf-lowmem.c depends on GNU libc internals and does not build -on musl or uClibc. Commit e1fd25a fixes this issue for musl by -testing if __GLIBC__ is set. However, uClibc sets __GLIBC__ and -so this check is insufficient there. We expand the check so that -we run pixbuf-lowmem on glibc, while avoiding it on both musl and -uClibc. - -Signed-off-by: Anthony G. Basile <blueness@gentoo.org> ---- - tests/pixbuf-lowmem.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c -index 9e9571f..ec7504f 100644 ---- a/tests/pixbuf-lowmem.c -+++ b/tests/pixbuf-lowmem.c -@@ -24,7 +24,7 @@ - #include <time.h> - #include <string.h> - --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - #define PRETEND_MEM_SIZE (16 * 1024 * 1024) - #define REMAINING_MEM_SIZE 100000 - --- -2.4.9 - diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild deleted file mode 100644 index a9771c2a5045..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -# TODO: EAPI-7 needs gnome2-utils fixes - ${EROOT%/} and co usage for EAPI-7 in gdk_pixbuf_* -# TODO: functions and eutils inherit for emktemp or some other solution - -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X gtk-doc +introspection jpeg tiff" - -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review -DEPEND=" - >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise -RDEPEND="${DEPEND} - !<gnome-base/gail-1000 - !<gnome-base/librsvg-2.31.0 - !<x11-libs/gtk+-2.21.3:2 - !<x11-libs/gtk+-2.90.4:3 -" -DEPEND="${DEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.3 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) -) - -PATCHES=( - # Do not run lowmem test on uclibc - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 - "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch -) - -src_prepare() { - xdg_src_prepare - # This will avoid polluting the pkg-config file with versioned libpng, - # which is causing problems with libpng14 -> libpng15 upgrade - # See upstream bug #667068 - # First check that the pattern is present, to catch upstream changes on bumps, - # because sed doesn't return failure code if it doesn't do any replacements - grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream" - sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die -} - -multilib_src_configure() { - local emesonargs=( - -Dpng=true - $(meson_use tiff) - $(meson_use jpeg) - -Djasper=false - $(meson_use X x11) - -Dbuiltin_loaders=png - -Drelocatable=false - #native_windows_loaders - -Dinstalled_tests=false - -Dgio_sniffing=true - ) - if multilib_is_native_abi; then - emesonargs+=( - $(meson_use gtk-doc docs) - $(meson_use introspection gir) - -Dman=true - ) - else - emesonargs+=( - -Ddocs=false - -Dgir=false - -Dman=false - ) - fi - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} - -pkg_preinst() { - xdg_pkg_preinst - - multilib_pkg_preinst() { - # Make sure loaders.cache belongs to gdk-pixbuf alone - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" - - if [[ -e ${EROOT%/}/${cache} ]]; then - cp "${EROOT%/}"/${cache} "${ED}"/${cache} || die - else - touch "${ED%/}"/${cache} || die - fi - } - - multilib_foreach_abi multilib_pkg_preinst - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - xdg_pkg_postinst - multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - xdg_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - rm -f "${EROOT%/}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache - fi -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10-r1.ebuild new file mode 100644 index 000000000000..b6c6a7768807 --- /dev/null +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson-multilib multilib xdg + +DESCRIPTION="Image loading library for GTK+" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="gtk-doc +introspection jpeg test tiff" +RESTRICT="!test? ( test )" + +# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review +DEPEND=" + >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + tiff? ( >=media-libs/tiff-3.9.2:=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.3 + dev-libs/glib:2 + dev-libs/libxslt + dev-python/docutils + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) +) + +src_prepare() { + default + xdg_environment_reset +} + +multilib_src_configure() { + local emesonargs=( + -Dpng=enabled + $(meson_feature tiff) + $(meson_feature jpeg) + -Dbuiltin_loaders=png,jpeg + -Drelocatable=false + #native_windows_loaders + $(meson_use test tests) + -Dinstalled_tests=false + -Dgio_sniffing=true + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_feature introspection) + $(meson_native_true man) + ) + + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die + fi +} + +pkg_preinst() { + xdg_pkg_preinst + + multilib_pkg_preinst() { + # Make sure loaders.cache belongs to gdk-pixbuf alone + local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" + + if [[ -e ${EROOT}/${cache} ]]; then + cp "${EROOT}"/${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + } + + multilib_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + xdg_pkg_postinst + multilib_foreach_abi gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + xdg_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache + fi +} diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml index 8901219e2688..abaa572b786f 100644 --- a/x11-libs/gdk-pixbuf/metadata.xml +++ b/x11-libs/gdk-pixbuf/metadata.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="X">Build and install the legacy gdk_pixbuf_xlib-2.0 library</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf</remote-id> -</upstream> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf</remote-id> + <remote-id type="gnome-gitlab">GNOME/gdk-pixbuf</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest index 40cb87fca8c0..4a1583da0355 100644 --- a/x11-libs/gl2ps/Manifest +++ b/x11-libs/gl2ps/Manifest @@ -1,2 +1 @@ -DIST gl2ps-1.3.9.tgz 294907 BLAKE2B b8473f9f3fc6cefa2374f6fdd94fb98d73ea79b9c0087ccc573f6b66eafe11098fc4312d8ff121abe2a8d6c9a3474f69dcb321ef978f8777b6dc077e5504621f SHA512 e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb -DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131ce69e3512e9c558f7817a34bc76985311c3879cfcec5f715f36f0b8300300dd26025cdb7e72478802aa7d SHA512 420b21a5b4397c9a9a2323a8686b8635c2683354c94762d2d0172c661fc36c4298042498dd8ef2323adf32f45aa4e0a3dba146058ccde597e5a46c2027cbf7ce +DIST gl2ps-1.4.2.tgz 301134 BLAKE2B 43c93f93d09dd7a6af0711819647f5f82c0853a80822dbc600b7502f2c86612f5cb2edc31729c67abbab44cc8fec7aa1fa7e13f0d115b0d79c7a7d45fa1a3079 SHA512 46652e1b3825ace61dbd77c4b0bf451e7671c248eb18bbd3369e2fac00056ea4cd5d2578561984313c239e3b02f78b9d9a76d963c935af65a13bc2abfc538620 diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch b/x11-libs/gl2ps/files/gl2ps-1.4.2-cmake.patch index f22760fd6eca..9865c439aa78 100644 --- a/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch +++ b/x11-libs/gl2ps/files/gl2ps-1.4.2-cmake.patch @@ -1,45 +1,32 @@ -From: Sebastien Fabbro <bicatali@gentoo.org> - -Patch to add various enhancements to cmake: -* use GNU standard CMAKE_INSTALL_DOCDIR -* optional documenation building -* optional examples building -* do not install static libraries - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,6 +46,8 @@ - +--- a/CMakeLists.txt 2020-07-08 17:53:51.133105546 +0200 ++++ b/CMakeLists.txt 2020-07-08 17:58:02.652237439 +0200 +@@ -50,4 +50,6 @@ option(ENABLE_ZLIB "Enable compression using ZLIB" ON) option(ENABLE_PNG "Enable PNG support" ON) +option(ENABLE_DOC "Enable documentation" OFF) +option(ENABLE_EXAMPLES "Build and install examples" OFF) set(GL2PS_MAJOR_VERSION 1) - set(GL2PS_MINOR_VERSION 3) -@@ -103,8 +105,6 @@ - include_directories(${EXTERNAL_INCLUDES}) +@@ -140,6 +142,4 @@ if(OPENGL_FOUND) - add_library(lib STATIC gl2ps.c gl2ps.h) - set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps) add_library(shared SHARED gl2ps.c gl2ps.h) - target_link_libraries(shared ${EXTERNAL_LIBRARIES}) -@@ -116,29 +116,32 @@ - set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS") - endif(MSVC) - -- install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX}) -+ install(TARGETS shared DESTINATION lib${LIB_SUFFIX}) - endif(OPENGL_FOUND) - - if(WIN32) +@@ -152,5 +152,5 @@ + COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS") + endif() +- install(TARGETS lib shared RUNTIME DESTINATION bin ++ install(TARGETS shared RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -160,15 +160,16 @@ set(GL2PS_DOC .) - else(WIN32) + else() - set(GL2PS_DOC share/doc/gl2ps) + set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR}) - endif(WIN32) + endif() install(FILES gl2ps.h DESTINATION include) install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC}) @@ -47,28 +34,25 @@ Patch to add various enhancements to cmake: -install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC}) +install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC}) + -+ +if(ENABLE_EXAMPLES) install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC}) install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC}) -- - if(GLUT_FOUND) + +-if(GLUT_FOUND) ++if(GLUT_FOUND AND BUILD_TESTING) add_executable(gl2psTest WIN32 gl2psTest.c) target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES}) - add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c) +@@ -176,5 +177,7 @@ target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES}) - endif(GLUT_FOUND) -+endif(ENABLE_EXAMPLES) + endif() ++endif() +if(ENABLE_DOC) find_package(LATEX) if(PDFLATEX_COMPILER) - add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex -@@ -157,6 +160,7 @@ - add_custom_target(html DEPENDS gl2ps.html) - endif(TTH) - endif(PDFLATEX_COMPILER) -+endif(ENABLE_DOC) +@@ -195,4 +198,5 @@ + endif() + endif() ++endif() set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine") - set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION}) diff --git a/x11-libs/gl2ps/gl2ps-1.3.9.ebuild b/x11-libs/gl2ps/gl2ps-1.3.9.ebuild deleted file mode 100644 index e61f4896fc9f..000000000000 --- a/x11-libs/gl2ps/gl2ps-1.3.9.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -DESCRIPTION="OpenGL to PostScript printing library" -HOMEPAGE="http://www.geuz.org/gl2ps/" -SRC_URI="http://geuz.org/${PN}/src/${P}.tgz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc png zlib" - -RDEPEND=" - media-libs/freeglut - x11-libs/libXmu - png? ( media-libs/libpng:0= ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - doc? ( - dev-tex/tth - dev-texlive/texlive-latex - dev-texlive/texlive-latexrecommended )" - -S=${WORKDIR}/${P}-source - -PATCHES=( "${FILESDIR}"/${PN}-1.3.8-cmake.patch ) - -src_prepare() { - cmake-utils_src_prepare - sed '/^install.*TODO\.txt/d' -i "${S}"/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DUSE_ENABLE_DOC="$(usex doc)" - -DUSE_ENABLE_PNG="$(usex png)" - -DUSE_ENABLE_ZLIB="$(usex zlib)" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if [[ ${CHOST} == *-darwin* ]] ; then - install_name_tool \ - -id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \ - "${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die - fi -} diff --git a/x11-libs/gl2ps/gl2ps-1.4.0.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild index 2fcb4189a4e8..e248470f2bde 100644 --- a/x11-libs/gl2ps/gl2ps-1.4.0.ebuild +++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils +EAPI=7 +inherit cmake DESCRIPTION="OpenGL to PostScript printing library" HOMEPAGE="http://www.geuz.org/gl2ps/" @@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc png zlib" RDEPEND=" @@ -24,12 +24,10 @@ DEPEND="${RDEPEND} dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended )" -S=${WORKDIR}/${P}-source - -PATCHES=( "${FILESDIR}"/${PN}-1.3.8-cmake.patch ) +PATCHES=( "${FILESDIR}"/${PN}-1.4.2-cmake.patch ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed '/^install.*TODO\.txt/d' -i "${S}"/CMakeLists.txt || die } @@ -40,14 +38,14 @@ src_configure() { -DENABLE_PNG="$(usex png)" -DENABLE_ZLIB="$(usex zlib)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if [[ ${CHOST} == *-darwin* ]] ; then install_name_tool \ -id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \ - "${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die + "${D}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die fi } diff --git a/x11-libs/gl2ps/metadata.xml b/x11-libs/gl2ps/metadata.xml index 6577818b4308..8d83fa3496ac 100644 --- a/x11-libs/gl2ps/metadata.xml +++ b/x11-libs/gl2ps/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest deleted file mode 100644 index 4b9b30f782eb..000000000000 --- a/x11-libs/gnome-pty-helper/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vte-0.40.2.tar.xz 923852 BLAKE2B 666f1e8bd5ce1392c8c533c180e7e6700a6b0023e9b0ab467f2d99a38661fb600c53d83bda10bc97302dc54801f8e1d8780eb27a2c5cd184d786a55d513dfc24 SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2 diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild deleted file mode 100644 index 32bdb56b0881..000000000000 --- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" -GNOME_ORG_MODULE="vte" - -inherit gnome2 - -DESCRIPTION="GNOME Setuid helper for opening ptys" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" -# gnome-pty-helper is inside vte - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+hardened" - -# gnome-pty-helper was spit out with 0.27.90 -RDEPEND="!<x11-libs/vte-0.27.90" -DEPEND="" - -S="${WORKDIR}/vte-${PV}/gnome-pty-helper" - -src_prepare() { - # As recommended by upstream (/usr/libexec/$PN is a setgid binary) - if use hardened; then - export SUID_CFLAGS="-fPIE ${SUID_CFLAGS}" - export SUID_LDFLAGS="-pie ${SUID_LDFLAGS}" - fi - gnome2_src_prepare -} diff --git a/x11-libs/gnome-pty-helper/metadata.xml b/x11-libs/gnome-pty-helper/metadata.xml deleted file mode 100644 index 39980802b1da..000000000000 --- a/x11-libs/gnome-pty-helper/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest index 6a3263aced13..2a5494fb18d1 100644 --- a/x11-libs/goffice/Manifest +++ b/x11-libs/goffice/Manifest @@ -1 +1 @@ -DIST goffice-0.10.46.tar.xz 2397976 BLAKE2B a05696cde60b1cb1ee915bebd3a6e99d1f0a31dc232481615a1c6bbc05ee5433cdebfb05d96160026b260c752c2cfb11c0aecc338079cda66fd40b653fb8b0d1 SHA512 23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3 +DIST goffice-0.10.57.tar.xz 2518848 BLAKE2B d513722cf882d3fb320b2b60830027bf9d393c4032ac6d88305ba08af0effa070f74301911d8b28392a2490a0c0b5cf394d5d0cf73f1ccb79a81dc47789aa99a SHA512 be5a9f269dc8d1177df5a98b2294cf2344548eb7512c8937682eaabb09f6dce700b66990552e3ba6e1c8bc58f3d748136c63f5011da048ec1d415ef547f76dfc diff --git a/x11-libs/goffice/goffice-0.10.46.ebuild b/x11-libs/goffice/goffice-0.10.57.ebuild index e6023df8247a..19dc94bf1b6c 100644 --- a/x11-libs/goffice/goffice-0.10.46.ebuild +++ b/x11-libs/goffice/goffice-0.10.57.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - +EAPI=8 inherit gnome.org libtool DESCRIPTION="A library of document-centric objects and utilities" @@ -10,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/" LICENSE="GPL-2" SLOT="0.10" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="+introspection" # FIXME: add lasem to tree @@ -21,7 +20,7 @@ RDEPEND=" dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] - >=x11-libs/cairo-1.10:=[svg] + >=x11-libs/cairo-1.10:=[svg(+)] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= @@ -35,7 +34,7 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-lang/perl dev-util/glib-utils - >=dev-util/gtk-doc-am-1.12 + >=dev-build/gtk-doc-am-1.12 >=dev-util/intltool-0.35 virtual/perl-Compress-Raw-Zlib virtual/perl-Getopt-Long @@ -61,6 +60,5 @@ src_install() { default dodoc MAINTAINERS - # no static archives - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/x11-libs/goffice/metadata.xml b/x11-libs/goffice/metadata.xml index 2bc9db5d368f..a0d065c6e2c2 100644 --- a/x11-libs/goffice/metadata.xml +++ b/x11-libs/goffice/metadata.xml @@ -1,12 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <longdescription lang="en"> - GOffice is a library of document-centric objects and utilities building - on top of GLib and Gtk+ and used by software such as Gnumeric. - </longdescription> + <maintainer type="person"> + <email>soap@gentoo.org</email> + <name>David Seifert</name> + </maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <longdescription lang="en"> + GOffice is a library of document-centric objects and utilities building + on top of GLib and Gtk+ and used by software such as Gnumeric. + </longdescription> + <upstream> + <remote-id type="gnome-gitlab">GNOME/goffice</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest index 2fdbd0d2d50e..a44ee5b9ad93 100644 --- a/x11-libs/goocanvas/Manifest +++ b/x11-libs/goocanvas/Manifest @@ -1,2 +1,2 @@ -DIST goocanvas-1.0.0.tar.bz2 570552 BLAKE2B 00b1a3d59448cc2f40dd20b0c97977cfc477a6656f32e2106b3f3bd5c42b8b625e270d9f96de44f30caf83b744b331699e7c6385b5269bf7b22e3bb25a879948 SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688 +DIST goocanvas-3.0.0.tar.xz 556832 BLAKE2B 4ee632a614b6b881000bbee8d5e21a166151a94667c603c92b94c5e076fab78a6df44fe1d45fb4d7c4d65c0e060b599abf3970313542836a63efbca33d6a075b SHA512 a53839af4d98afdfc0f92531bdb09013dd71e964185dc2670af077bb7b41b9ff5c75f2801f6e77c99055b38f3603d8cf197f84affb8d7c3196526ce824b228e3 diff --git a/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch b/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch deleted file mode 100644 index c395c6ffd797..000000000000 --- a/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index b49c009..9c3316b 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -12,7 +12,7 @@ INCLUDES = \ - - lib_LTLIBRARIES = libgoocanvas.la - --libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -+libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm - - if PLATFORM_WIN32 - no_undefined = -no-undefined -diff --git a/src/Makefile.in b/src/Makefile.in -index c4d43b2..8d555fe 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -254,7 +254,7 @@ INCLUDES = \ - # -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ - # -DGTK_DISABLE_DEPRECATED - lib_LTLIBRARIES = libgoocanvas.la --libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -+libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - libtool_opts = \ - -version-info $(LT_VERSION_INFO) \ diff --git a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild deleted file mode 100644 index 21cdeed5f8d9..000000000000 --- a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG=no -GNOME2_LA_PUNT=yes -GNOME_TARBALL_SUFFIX="bz2" - -inherit eutils gnome2 libtool - -DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing" -HOMEPAGE="https://wiki.gnome.org/Projects/GooCanvas" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="examples" - -RDEPEND=" - >=x11-libs/gtk+-2.12:2 - >=dev-libs/glib-2.10:2 - >=x11-libs/cairo-1.4 -" -DEPEND="${RDEPEND} - dev-util/glib-utils - dev-util/gtk-doc-am - virtual/pkgconfig -" - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=671766 - epatch "${FILESDIR}"/${P}-gold.patch - - # Fails to build with recent GTK+ - sed -e "s/-D.*_DISABLE_DEPRECATED//g" \ - -i src/Makefile.am src/Makefile.in demo/Makefile.am demo/Makefile.in \ - || die "sed 1 failed" - - sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \ - -i Makefile.am Makefile.in || die "sed 2 failed" - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-rebuilds \ - --disable-static -} - -src_install() { - gnome2_src_install - - if use examples; then - insinto /usr/share/doc/${P}/examples/ - doins demo/*.c demo/flower.png demo/toroid.png - fi -} diff --git a/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild new file mode 100644 index 000000000000..b7b95ceefbab --- /dev/null +++ b/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2 + +DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing" +HOMEPAGE="https://wiki.gnome.org/GooCanvas" + +LICENSE="LGPL-2" +SLOT="2.0" +KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86" +IUSE="examples +introspection" + +RDEPEND=" + >=x11-libs/cairo-1.10.0 + >=dev-libs/glib-2.28.0:2 + >=x11-libs/gtk+-3.0.0:3 + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + >=dev-build/gtk-doc-am-1.16 + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig +" + +src_prepare() { + # Do not build demos + sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \ + -i Makefile.{am,in} || die "Failed to sed demo" + + # Python bindings are built/installed manually, but not at all anymore (py2). + sed -e "/SUBDIRS = python/d" \ + -i bindings/Makefile.{am,in} || die "Failed to sed python subdirs" + + gnome2_src_prepare +} + +src_configure() { + PYTHON=true gnome2_src_configure \ + --disable-rebuilds \ + --disable-static \ + $(use_enable introspection) \ + --disable-python +} + +src_install() { + gnome2_src_install + + if use examples; then + insinto "/usr/share/doc/${P}/examples/" + doins demo/*.[ch] demo/*.png + fi +} diff --git a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild deleted file mode 100644 index ebee51dd3a38..000000000000 --- a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit gnome2 python-r1 - -DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing" -HOMEPAGE="https://wiki.gnome.org/GooCanvas" - -LICENSE="LGPL-2" -SLOT="2.0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" -IUSE="examples +introspection python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# python only enables python specific binding override -RDEPEND=" - >=x11-libs/gtk+-3.0.0:3 - >=dev-libs/glib-2.28.0:2 - >=x11-libs/cairo-1.10.0 - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygobject-2.90.4:3[${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.16 - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig -" - -src_prepare() { - # Do not build demos - sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \ - -i Makefile.am Makefile.in || die "sed failed" - - # Python bindings are built/installed manually. - sed -e "/SUBDIRS = python/d" -i bindings/Makefile.am bindings/Makefile.in - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-rebuilds \ - --disable-static \ - $(use_enable introspection) \ - --disable-python -} - -src_install() { - gnome2_src_install - - if use python; then - sub_install() { - python_moduleinto $(python -c "import gi;print gi._overridesdir") - python_domodule bindings/python/GooCanvas.py - } - python_foreach_impl sub_install - fi - - if use examples; then - insinto "/usr/share/doc/${P}/examples/" - doins demo/*.[ch] demo/*.png - fi -} diff --git a/x11-libs/goocanvas/goocanvas-3.0.0.ebuild b/x11-libs/goocanvas/goocanvas-3.0.0.ebuild new file mode 100644 index 000000000000..bf6a749e26e6 --- /dev/null +++ b/x11-libs/goocanvas/goocanvas-3.0.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2 + +DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing" +HOMEPAGE="https://wiki.gnome.org/GooCanvas" + +LICENSE="LGPL-2" +SLOT="3.0" +KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86" +IUSE="examples +introspection" + +RDEPEND=" + >=x11-libs/cairo-1.10.0 + >=dev-libs/glib-2.28.0:2 + >=x11-libs/gtk+-3.0.0:3 + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + >=dev-build/gtk-doc-am-1.16 + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig +" + +src_prepare() { + # Do not build demos + sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \ + -i Makefile.{am,in} || die "Failed to sed demo" + + # Python bindings are built/installed manually, but not at all anymore (py2). + sed -e "/SUBDIRS = python/d" \ + -i bindings/Makefile.{am,in} || die "Failed to sed python subdirs" + + gnome2_src_prepare +} + +src_configure() { + PYTHON=true gnome2_src_configure \ + --disable-rebuilds \ + --disable-static \ + $(use_enable introspection) \ + --disable-python +} + +src_install() { + gnome2_src_install + + if use examples; then + insinto "/usr/share/doc/${P}/examples/" + doins demo/*.[ch] demo/*.png + fi +} diff --git a/x11-libs/goocanvas/metadata.xml b/x11-libs/goocanvas/metadata.xml index 39980802b1da..e5f3354373c0 100644 --- a/x11-libs/goocanvas/metadata.xml +++ b/x11-libs/goocanvas/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/goocanvas</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 0d4d5891ddc0..227cb690f62d 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,5 +1,4 @@ -DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858 -DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 -DIST gtk+-3.24.16.tar.xz 20417592 BLAKE2B a0b18c72cd91ddb6533577efad7327df60870b5424409076698ce2b8cbe68a4382a12d947d7c60243ddf4eebe0e14ae9986d5b82a11bef64f1f0287949354986 SHA512 181d31dea038016357cd0eba5b9e8a17056bc061f4ae2ebc713bceee46cd30787993cec463aae658faddc57b9071549fa196f6a2a1f67c314d99e4365f50a0cb -DIST gtk+-3.24.18.tar.xz 21292668 BLAKE2B 4d06789d027f9b9e070093460daa579afa88a14b9d5a3c028db3dbf20dfadbaab671ae56a9820eef5b2244a00f09f4be4413f1c06b11ac4db6c1044f824a01f6 SHA512 51ba13ae3cd0db9b62462ba399f08738885648adcb545bf0852c4e5b04bc2a1dd88629fafefc282f6a200daa8330e7606f22a70bd2ce6fde32a992a6cd7a0950 -DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556 +DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5 +DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade +DIST gtk+-3.24.41.tar.xz 13188312 BLAKE2B fbded114fe2b5c1c7bffe79d0a22d559f97081eb972baf31b5c9bd7190bd1ea2875f1c632d3f3be8233377299f1df15bbffbe45d50cc7ff588e034eb41eb8f6e SHA512 aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98 +DIST gtk+-3.24.42.tar.xz 13226980 BLAKE2B 04675abfa056d19a8324c8310789227e661458cfa356b670ba79d61a9498fa1c65161d19799d33d717742912cdddc3400a548573809d5dd4e0f289d0c75e88d9 SHA512 53e86e35d33f82384f1d40bd91feee67be68bc9003abd095842991441b1f2ee11a5b431168963270d3ffc0c653d26673ca97cdd55a8f577ef21dbd5d6004b643 diff --git a/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch b/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch new file mode 100644 index 000000000000..4ee55d277f3a --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch @@ -0,0 +1,167 @@ +https://bugs.gentoo.org/880617 + +From 81c42586e6d9db7434e9b3f657fbd238294dd9d9 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gentoo.org> +Date: Sat, 13 May 2023 11:35:28 -0400 +Subject: [PATCH] Fix casts + +--- + gtk/gtkcellrendererspin.c | 2 +- + gtk/gtkcomboboxtext.c | 2 +- + gtk/gtkimmodule.c | 2 +- + gtk/gtklabel.c | 2 +- + gtk/gtkscale.c | 2 +- + gtk/gtktoolpalette.c | 2 +- + gtk/gtktreeview.c | 2 +- + gtk/gtkuimanager.c | 2 +- + gtk/gtkwidget.c | 2 +- + modules/other/gail/gailtreeview.c | 2 +- + modules/printbackends/cups/gtkprintbackendcups.c | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c +index 2a3961bf20..68e5b9aaae 100644 +--- a/gtk/gtkcellrendererspin.c ++++ b/gtk/gtkcellrendererspin.c +@@ -207,7 +207,7 @@ gtk_cell_renderer_spin_set_property (GObject *object, + } + + if (obj) +- priv->adjustment = g_object_ref_sink (obj); ++ priv->adjustment = GTK_ADJUSTMENT (g_object_ref_sink (obj)); + break; + case PROP_CLIMB_RATE: + priv->climb_rate = g_value_get_double (value); +diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c +index 9ffba68766..42c51abebc 100644 +--- a/gtk/gtkcomboboxtext.c ++++ b/gtk/gtkcomboboxtext.c +@@ -275,7 +275,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable, + + parser_data = g_slice_new0 (ItemParserData); + parser_data->builder = g_object_ref (builder); +- parser_data->object = g_object_ref (buildable); ++ parser_data->object = G_OBJECT (g_object_ref (buildable)); + parser_data->domain = gtk_builder_get_translation_domain (builder); + *parser = item_parser; + *data = parser_data; +diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c +index 1fcb17a7d8..445b2be87f 100644 +--- a/gtk/gtkimmodule.c ++++ b/gtk/gtkimmodule.c +@@ -662,7 +662,7 @@ lookup_immodule (gchar **immodules_list) + gboolean found; + gchar *context_id; + found = g_hash_table_lookup_extended (contexts_hash, *immodules_list, +- &context_id, NULL); ++ (gpointer *) &context_id, NULL); + if (found) + return context_id; + } +diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c +index c47de5924f..cf68685536 100644 +--- a/gtk/gtklabel.c ++++ b/gtk/gtklabel.c +@@ -1336,7 +1336,7 @@ gtk_label_buildable_custom_tag_start (GtkBuildable *buildable, + + parser_data = g_slice_new0 (PangoParserData); + parser_data->builder = g_object_ref (builder); +- parser_data->object = g_object_ref (buildable); ++ parser_data->object = G_OBJECT (g_object_ref (buildable)); + *parser = pango_parser; + *data = parser_data; + return TRUE; +diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c +index 4317523fb8..a573b2f6ba 100644 +--- a/gtk/gtkscale.c ++++ b/gtk/gtkscale.c +@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale *scale, + mark->position = position; + + priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark, +- (GCompareFunc) compare_marks, ++ compare_marks, + GINT_TO_POINTER ( + gtk_range_get_inverted (GTK_RANGE (scale)) + )); +diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c +index b984193ca3..f64b552fb0 100644 +--- a/gtk/gtktoolpalette.c ++++ b/gtk/gtktoolpalette.c +@@ -734,7 +734,7 @@ gtk_tool_palette_add (GtkContainer *container, + + g_ptr_array_add (palette->priv->groups, info); + info->pos = palette->priv->groups->len - 1; +- info->widget = g_object_ref_sink (child); ++ info->widget = (GtkToolItemGroup *) g_object_ref_sink (child); + + gtk_widget_set_parent (child, GTK_WIDGET (palette)); + } +diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c +index 89301eb91d..0d2d15b488 100644 +--- a/gtk/gtktreeview.c ++++ b/gtk/gtktreeview.c +@@ -14147,7 +14147,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view, + + if (entry) + { +- tree_view->priv->search_entry = g_object_ref (entry); ++ tree_view->priv->search_entry = GTK_WIDGET (g_object_ref (entry)); + tree_view->priv->search_custom_entry_set = TRUE; + + if (tree_view->priv->search_entry_changed_id == 0) +diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c +index d004cf1ed3..8cbeda9e85 100644 +--- a/gtk/gtkuimanager.c ++++ b/gtk/gtkuimanager.c +@@ -503,7 +503,7 @@ gtk_ui_manager_buildable_construct_child (GtkBuildable *buildable, + g_signal_connect (widget, "hierarchy-changed", + G_CALLBACK (child_hierarchy_changed_cb), + GTK_UI_MANAGER (buildable)); +- return g_object_ref (widget); ++ return G_OBJECT (g_object_ref (widget)); + } + + static void +diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c +index 1d1f6bb60e..a2ae2b430f 100644 +--- a/gtk/gtkwidget.c ++++ b/gtk/gtkwidget.c +@@ -10679,7 +10679,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable, + AccelGroupParserData *parser_data; + + parser_data = g_slice_new0 (AccelGroupParserData); +- parser_data->object = g_object_ref (buildable); ++ parser_data->object = G_OBJECT (g_object_ref (buildable)); + *parser = accel_group_parser; + *data = parser_data; + return TRUE; +diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c +index 23923c59a1..ac6ff0a1c4 100644 +--- a/modules/other/gail/gailtreeview.c ++++ b/modules/other/gail/gailtreeview.c +@@ -995,7 +995,7 @@ gail_tree_view_ref_child (AtkObject *obj, + gail_cell_add_state (cell, ATK_STATE_FOCUSABLE, FALSE); + if (focus_index == i) + { +- gailview->focus_cell = g_object_ref (cell); ++ gailview->focus_cell = ATK_OBJECT (g_object_ref (cell)); + gail_cell_add_state (cell, ATK_STATE_FOCUSED, FALSE); + g_signal_emit_by_name (gailview, + "active-descendant-changed", +diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c +index 2a000dc16f..753c53cb89 100644 +--- a/modules/printbackends/cups/gtkprintbackendcups.c ++++ b/modules/printbackends/cups/gtkprintbackendcups.c +@@ -3479,7 +3479,7 @@ cups_request_ppd (GtkPrinter *printer) + g_io_channel_set_encoding (data->ppd_io, NULL, NULL); + g_io_channel_set_close_on_unref (data->ppd_io, TRUE); + +- data->printer = g_object_ref (printer); ++ data->printer = GTK_PRINTER_CUPS (g_object_ref (printer)); + + resource = g_strdup_printf ("/printers/%s.ppd", + gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer))); +-- +2.39.3 + diff --git a/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch new file mode 100644 index 000000000000..0c74d962ecf4 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/725852 +--- a/configure.ac ++++ b/configure.ac +@@ -190,7 +190,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) + AC_SYS_LARGEFILE + + AM_PROG_AS +-AC_PATH_TOOL(NM, nm, nm) ++AC_CHECK_TOOL(NM, nm, nm) + + dnl Initialize maintainer mode + AM_MAINTAINER_MODE([enable]) diff --git a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch index 6fcbb5c07ba4..a648ba40f4c8 100644 --- a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch +++ b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch @@ -1,4 +1,4 @@ -From 87693de873b15194b122e98438b3bc1bf37f6d0b Mon Sep 17 00:00:00 2001 +From ce23725d2b25b61a4eec8db0899d49d5a9dbcc6d Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue <eva@gentoo.org> Date: Tue, 1 Nov 2016 15:24:22 +0100 Subject: [PATCH] Always use external gtk-update-icon-cache @@ -10,14 +10,14 @@ used when building. demos/gtk-demo/Makefile.am | 2 +- demos/widget-factory/Makefile.am | 2 +- docs/reference/gtk/Makefile.am | 1 - - gtk/Makefile.am | 44 -------------------------------- - 5 files changed, 4 insertions(+), 47 deletions(-) + gtk/Makefile.am | 27 --------------------------- + 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/configure.ac b/configure.ac -index f700616649..e3604fef05 100644 +index 36dda2ebaf..df9d9b0e9b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1003,6 +1003,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling +@@ -974,6 +974,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) @@ -27,10 +27,10 @@ index f700616649..e3604fef05 100644 # Windowing system checks ######################################## diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am -index c8529e5bf7..b2924fc081 100644 +index 4a2f827469..369ba5d3cc 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am -@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy +@@ -174,7 +174,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png @@ -40,7 +40,7 @@ index c8529e5bf7..b2924fc081 100644 install-data-hook: install-update-icon-cache uninstall-hook: uninstall-update-icon-cache diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am -index 62c156aa09..7aad079dcd 100644 +index c33a6d0a95..291f389f53 100644 --- a/demos/widget-factory/Makefile.am +++ b/demos/widget-factory/Makefile.am @@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget @@ -53,10 +53,10 @@ index 62c156aa09..7aad079dcd 100644 install-data-hook: install-update-icon-cache uninstall-hook: uninstall-update-icon-cache diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am -index abdea7fb59..0ee826c31e 100644 +index dc9b80c6c5..bcaa4032c9 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am -@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in +@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in man_MANS = \ gtk-query-immodules-3.0.1 \ @@ -65,10 +65,10 @@ index abdea7fb59..0ee826c31e 100644 gtk-launch.1 \ gtk3-demo.1 \ diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index e556e9d3af..4d7973f3b1 100644 +index 9608ab3355..74792a4b40 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1653,7 +1653,6 @@ endif +@@ -1658,7 +1658,6 @@ endif # bin_PROGRAMS = \ gtk-query-immodules-3.0 \ @@ -76,7 +76,7 @@ index e556e9d3af..4d7973f3b1 100644 gtk-encode-symbolic-svg \ gtk-builder-tool \ gtk-query-settings \ -@@ -1666,9 +1665,6 @@ gtk_query_immodules_3_0_LDADD = \ +@@ -1671,9 +1670,6 @@ gtk_query_immodules_3_0_LDADD = \ $(GMODULE_LIBS) \ $(GTK_DEP_LIBS) @@ -86,7 +86,7 @@ index e556e9d3af..4d7973f3b1 100644 gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c gtk_encode_symbolic_svg_LDADD = \ $(GDK_PIXBUF_LIBS) \ -@@ -1693,46 +1689,6 @@ gtk_launch_LDADD = \ +@@ -1698,29 +1694,6 @@ gtk_launch_LDADD = \ $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) @@ -101,27 +101,10 @@ index e556e9d3af..4d7973f3b1 100644 -GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc -GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o - --$(GTK_UPDATE_ICON_CACHE_MANIFEST): -- (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \ -- echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \ -- echo ' <assemblyIdentity version="1.0.0.0"' ; \ -- echo ' processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \ -- echo ' name="gtk-update-icon-cache.exe"' ; \ -- echo ' type="win32"/>' ; \ -- echo ' <!-- Identify the application security requirements. -->' ; \ -- echo ' <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \ -- echo ' <security>' ; \ -- echo ' <requestedPrivileges>' ; \ -- echo ' <requestedExecutionLevel' ; \ -- echo ' level="asInvoker"' ; \ -- echo ' uiAccess="false"/>' ; \ -- echo ' </requestedPrivileges>' ; \ -- echo ' </security>' ; \ -- echo ' </trustInfo>' ; \ -- echo '</assembly>' ) >$@ +-$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py +- $(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir) - --$(GTK_UPDATE_ICON_CACHE_RC): -- (echo -e '#include <winuser.h>\nCREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@ +-$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST) - -$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST) - $(WINDRES) --input $< --output $@ --output-format=coff @@ -134,5 +117,5 @@ index e556e9d3af..4d7973f3b1 100644 files: -- -2.17.0 +2.30.0 diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch new file mode 100644 index 000000000000..19af75c398a5 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch @@ -0,0 +1,29 @@ +--- a/docs/reference/gtk/meson.build ++++ b/docs/reference/gtk/meson.build +@@ -500,7 +500,6 @@ + + man_files = [ + [ 'gtk-query-immodules-3.0', '1', ], +- [ 'gtk-update-icon-cache', '1', ], + [ 'gtk-encode-symbolic-svg', '1', ], + [ 'gtk-launch', '1', ], + [ 'gtk-builder-tool', '1', ], +--- a/gtk/meson.build ++++ b/gtk/meson.build +@@ -1109,16 +1109,6 @@ + extra_update_icon_cache_objs = import('windows').compile_resources(uac_rc) + endif + +-gtk_update_icon_cache = executable( +- 'gtk-update-icon-cache', +- 'updateiconcache.c', +- extra_update_icon_cache_objs, +- c_args: gtk_cargs, +- dependencies: libgtk_dep, +- install: true +-) +-gtk_tools += gtk_update_icon_cache +- + gtk_query_immodules = executable( + 'gtk-query-immodules-3.0', + 'queryimmodules.c', diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild index 4e81883be6ca..d6e8c26b77a2 100644 --- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild @@ -1,15 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -GNOME2_LA_PUNT="yes" +EAPI=8 GNOME2_EAUTORECONF="yes" -inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx +inherit flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz" LICENSE="LGPL-2+" SLOT="2" @@ -18,17 +16,18 @@ REQUIRED_USE=" xinerama? ( !aqua ) " -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" # Upstream wants us to do their job: # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1 RESTRICT="test" COMMON_DEPEND=" - >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}] + >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),${MULTILIB_USEDEP}] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}] x11-misc/shared-mime-info @@ -36,36 +35,26 @@ COMMON_DEPEND=" cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( - >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),X,${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) ) " -# docbook-4.1.2 and xsl required for man pages -# docbook-4.3 required for gtk-doc DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - dev-libs/gobject-introspection-common - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] !aqua? ( x11-base/xorg-proto ) test? ( - x11-themes/hicolor-icon-theme + media-fonts/font-cursor-misc media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) + x11-themes/hicolor-icon-theme + ) " # gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0 @@ -73,18 +62,30 @@ DEPEND="${COMMON_DEPEND} # in sync. RDEPEND="${COMMON_DEPEND} >=dev-util/gtk-update-icon-cache-2 - !<gnome-base/gail-1000 - !<dev-util/gtk-builder-convert-${PV} - !<x11-libs/vte-0.28.2-r201:0 >=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard + !<dev-util/gtk-builder-convert-${PV} " # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 PDEPEND=" - x11-themes/gtk-engines-adwaita gnome-base/librsvg[${MULTILIB_USEDEP}] + x11-themes/gtk-engines-adwaita vim-syntax? ( app-vim/gtk-syntax ) " +# docbook-4.1.2 and xsl required for man pages +# docbook-4.3 required for gtk-doc +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xml-dtd:4.3 + app-text/docbook-xsl-stylesheets + dev-libs/gobject-introspection-common + dev-libs/libxslt + dev-util/glib-utils + >=dev-build/gtk-doc-am-1.20 + >=sys-devel/gettext-0.18.3 + virtual/pkgconfig + examples? ( x11-libs/gdk-pixbuf ) +" DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default, @@ -101,8 +102,10 @@ PATCHES=( "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch # Rely on split gtk-update-icon-cache package, bug #528810 "${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf - # Upstream gtk-2-24 branch up to 2018-09-08 state, bug #650536 safety - "${WORKDIR}"/patches/ # requires eautoreconf + # Respect ${NM}, bug #725852 + "${FILESDIR}"/${PN}-2.24.33-respect-NM.patch # requires eautoreconf + # Fix casts, bug #880617 + "${FILESDIR}"/${PN}-2.24.33-Fix-casts.patch ) strip_builddir() { @@ -158,7 +161,7 @@ src_prepare() { # UI tests require immodules already installed; bug #413185 if ! has_version 'x11-libs/gtk+:2'; then ewarn "Disabling UI tests because this is the first install of" - ewarn "gtk+:2 on this machine. Please re-run the tests after $P" + ewarn "gtk+:2 on this machine. Please re-run the tests after ${P}" ewarn "has been installed." sed '/g_test_add_func.*ui-tests/ d' \ -i gtk/tests/testing.c || die "sed 2 failed" @@ -208,19 +211,20 @@ multilib_src_install() { multilib_src_install_all() { # see bug #133241 # Also set more default variables in sync with gtk3 and other distributions - echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc" - echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc" - echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc" - echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc" - insinto /usr/share/gtk-2.0 - doins "${T}"/gtkrc + newins - gtkrc <<- 'EOF' + gtk-fallback-icon-theme = "gnome" + gtk-theme-name = "Adwaita" + gtk-icon-theme-name = "Adwaita" + gtk-cursor-theme-name = "Adwaita" + EOF einstalldocs + rm "${ED}"/usr/share/doc/${P}/ChangeLog # empty file # dev-util/gtk-builder-convert split off into a separate package, #402905 - rm "${ED}"usr/bin/gtk-builder-convert || die - rm "${ED}"usr/share/man/man1/gtk-builder-convert.* || die + rm "${ED}"/usr/bin/gtk-builder-convert || die + rm "${ED}"/usr/share/man/man1/gtk-builder-convert.* || die readme.gentoo_create_doc } @@ -230,12 +234,12 @@ pkg_preinst() { multilib_pkg_preinst() { # Make immodules.cache belongs to gtk+ alone - local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" + local cache="/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die + if [[ -e "${EROOT}${cache}" ]]; then + cp "${EROOT}${cache}" "${ED}${cache}" || die else - touch "${ED}"/${cache} || die + touch "${ED}${cache}" || die fi } multilib_parallel_foreach_abi multilib_pkg_preinst @@ -252,35 +256,35 @@ pkg_postinst() { set_gtk2_confdir - if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then + if [[ -e "${EROOT}/etc/gtk-2.0/gtk.immodules" ]]; then elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST" elog "aware location. Removing deprecated file." - rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules + rm -f "${EROOT}/etc/gtk-2.0/gtk.immodules" fi - if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then + if [[ -e "${EROOT}${GTK2_CONFDIR}/gtk.immodules" ]]; then elog "File /etc/gtk-2.0/gtk.immodules has been moved to" - elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" + elog "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" elog "Removing deprecated file." - rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules + rm -f "${EROOT}${GTK2_CONFDIR}/gtk.immodules" fi # pixbufs are now handled by x11-libs/gdk-pixbuf - if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then - elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" + if [[ -e "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]]; then + elog "File ${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" elog "Removing deprecated file." - rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders + rm -f "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" fi # two checks needed since we dropped multilib conditional - if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then - elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" + if [[ -e "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]]; then + elog "File ${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" elog "Removing deprecated file." - rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders + rm -f "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" fi - if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then - elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* + if [[ -e "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* ]]; then + elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* elog "to do that you can use qfile from portage-utils:" elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" fi @@ -299,7 +303,7 @@ pkg_postrm() { if [[ -z ${REPLACED_BY_VERSION} ]]; then multilib_pkg_postrm() { - rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache + rm -f "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" } multilib_foreach_abi multilib_pkg_postrm fi diff --git a/x11-libs/gtk+/gtk+-3.24.18.ebuild b/x11-libs/gtk+/gtk+-3.24.18.ebuild deleted file mode 100644 index ddb924517c94..000000000000 --- a/x11-libs/gtk+/gtk+-3.24.18.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit flag-o-matic gnome2 multilib virtualx multilib-minimal - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Upstream wants us to do their job: -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 -RESTRICT="test" - -# FIXME: introspection data is built against system installation of gtk+:3, -# bug #???? -COMMON_DEPEND=" - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] - >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}] - >=media-libs/harfbuzz-0.9:= - x11-misc/shared-mime-info - - cloudprint? ( - >=net-libs/rest-0.7[${MULTILIB_USEDEP}] - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) - cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39:= ) - wayland? ( - >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.14 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] - media-libs/mesa[X(+),${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - dev-libs/gobject-introspection-common - >=dev-util/gdbus-codegen-2.48 - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.3 ) - >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( x11-base/xorg-proto ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 - !<gnome-base/gail-1000 - !<x11-libs/vte-0.31.0:2.90 -" -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 -PDEPEND=" - gnome-base/librsvg[${MULTILIB_USEDEP}] - >=x11-themes/adwaita-icon-theme-3.14 - vim-syntax? ( app-vim/gtk-syntax ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gtk-query-immodules-3.0$(get_exeext) -) - -strip_builddir() { - local rule=$1 - shift - local directory=$1 - shift - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ - || die "Could not strip director ${directory} from build." -} - -src_prepare() { - if ! use test ; then - # don't waste time building tests - strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} - - # the tests dir needs to be build now because since commit - # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there - # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} - fi - - if ! use examples; then - # don't waste time building demos - strip_builddir SRC_SUBDIRS demos Makefile.{am,in} - strip_builddir SRC_SUBDIRS examples Makefile.{am,in} - fi - - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache - eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch - - # Fix broken autotools logic - eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch - - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=( - $(use_enable aqua quartz-backend) - $(use_enable broadway broadway-backend) - $(use_enable cloudprint) - $(use_enable colord) - $(use_enable cups cups auto) - $(multilib_native_use_enable gtk-doc) - $(multilib_native_use_enable introspection) - $(use_enable wayland wayland-backend) - $(use_enable X x11-backend) - $(use_enable X xcomposite) - $(use_enable X xdamage) - $(use_enable X xfixes) - $(use_enable X xkb) - $(use_enable X xrandr) - $(use_enable xinerama) - # cloudprovider is not packaged in Gentoo yet - --disable-cloudproviders - --disable-papi - # sysprof integration needs >=sysprof-3.33.2 - --disable-profiler - --enable-man - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog - # need libdir here to avoid a double slash in a path that libtool doesn't - # grok so well during install (// between $EPREFIX and usr ...) - # TODO: Is this still the case? - --libdir="${EPREFIX}"/usr/$(get_libdir) - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" - ) - - if use wayland; then - myconf+=( - # Include wayland immodule into gtk itself, to avoid problems like - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a - # user overridden GTK_IM_MODULE envvar - --with-included-immodules=wayland - ) - fi; - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in gdk gtk libgail-util; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - # Skip README.{in,commits,win32} that would get installed by default - DOCS=( AUTHORS ChangeLog NEWS README ) - einstalldocs -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # Make immodules.cache belongs to gtk+ alone - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - } - multilib_parallel_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_query_immodules_gtk3 \ - || die "Update immodules cache failed (for ${ABI})" - } - multilib_parallel_foreach_abi multilib_pkg_postinst - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your settings.ini file." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache - } - multilib_foreach_abi multilib_pkg_postrm - fi -} diff --git a/x11-libs/gtk+/gtk+-3.24.20.ebuild b/x11-libs/gtk+/gtk+-3.24.20.ebuild deleted file mode 100644 index ddb924517c94..000000000000 --- a/x11-libs/gtk+/gtk+-3.24.20.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit flag-o-matic gnome2 multilib virtualx multilib-minimal - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Upstream wants us to do their job: -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 -RESTRICT="test" - -# FIXME: introspection data is built against system installation of gtk+:3, -# bug #???? -COMMON_DEPEND=" - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] - >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}] - >=media-libs/harfbuzz-0.9:= - x11-misc/shared-mime-info - - cloudprint? ( - >=net-libs/rest-0.7[${MULTILIB_USEDEP}] - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) - cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39:= ) - wayland? ( - >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.14 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] - media-libs/mesa[X(+),${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - dev-libs/gobject-introspection-common - >=dev-util/gdbus-codegen-2.48 - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.3 ) - >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( x11-base/xorg-proto ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 - !<gnome-base/gail-1000 - !<x11-libs/vte-0.31.0:2.90 -" -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 -PDEPEND=" - gnome-base/librsvg[${MULTILIB_USEDEP}] - >=x11-themes/adwaita-icon-theme-3.14 - vim-syntax? ( app-vim/gtk-syntax ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gtk-query-immodules-3.0$(get_exeext) -) - -strip_builddir() { - local rule=$1 - shift - local directory=$1 - shift - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ - || die "Could not strip director ${directory} from build." -} - -src_prepare() { - if ! use test ; then - # don't waste time building tests - strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} - - # the tests dir needs to be build now because since commit - # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there - # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} - fi - - if ! use examples; then - # don't waste time building demos - strip_builddir SRC_SUBDIRS demos Makefile.{am,in} - strip_builddir SRC_SUBDIRS examples Makefile.{am,in} - fi - - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache - eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch - - # Fix broken autotools logic - eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch - - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=( - $(use_enable aqua quartz-backend) - $(use_enable broadway broadway-backend) - $(use_enable cloudprint) - $(use_enable colord) - $(use_enable cups cups auto) - $(multilib_native_use_enable gtk-doc) - $(multilib_native_use_enable introspection) - $(use_enable wayland wayland-backend) - $(use_enable X x11-backend) - $(use_enable X xcomposite) - $(use_enable X xdamage) - $(use_enable X xfixes) - $(use_enable X xkb) - $(use_enable X xrandr) - $(use_enable xinerama) - # cloudprovider is not packaged in Gentoo yet - --disable-cloudproviders - --disable-papi - # sysprof integration needs >=sysprof-3.33.2 - --disable-profiler - --enable-man - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog - # need libdir here to avoid a double slash in a path that libtool doesn't - # grok so well during install (// between $EPREFIX and usr ...) - # TODO: Is this still the case? - --libdir="${EPREFIX}"/usr/$(get_libdir) - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" - ) - - if use wayland; then - myconf+=( - # Include wayland immodule into gtk itself, to avoid problems like - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a - # user overridden GTK_IM_MODULE envvar - --with-included-immodules=wayland - ) - fi; - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in gdk gtk libgail-util; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - # Skip README.{in,commits,win32} that would get installed by default - DOCS=( AUTHORS ChangeLog NEWS README ) - einstalldocs -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # Make immodules.cache belongs to gtk+ alone - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - } - multilib_parallel_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_query_immodules_gtk3 \ - || die "Update immodules cache failed (for ${ABI})" - } - multilib_parallel_foreach_abi multilib_pkg_postinst - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your settings.ini file." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache - } - multilib_foreach_abi multilib_pkg_postrm - fi -} diff --git a/x11-libs/gtk+/gtk+-3.24.16.ebuild b/x11-libs/gtk+/gtk+-3.24.35.ebuild index d477b0005f60..122bdbeb50e3 100644 --- a/x11-libs/gtk+/gtk+-3.24.16.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.35.ebuild @@ -1,24 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -GNOME2_LA_PUNT="yes" +EAPI=7 GNOME2_EAUTORECONF="yes" -inherit flag-o-matic gnome2 multilib virtualx multilib-minimal +inherit gnome2 multilib multilib-minimal virtualx DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2+" SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama" +IUSE="aqua broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" REQUIRED_USE=" || ( aqua wayland X ) xinerama? ( X ) " -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" # Upstream wants us to do their job: # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 @@ -27,66 +26,50 @@ RESTRICT="test" # FIXME: introspection data is built against system installation of gtk+:3, # bug #???? COMMON_DEPEND=" - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] + >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.2.0:= >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] - >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}] - >=media-libs/harfbuzz-0.9:= + >=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}] x11-misc/shared-mime-info - cloudprint? ( - >=net-libs/rest-0.7[${MULTILIB_USEDEP}] - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.14 + >=dev-libs/wayland-protocols-1.21 media-libs/mesa[wayland,${MULTILIB_USEDEP}] >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] ) X? ( - >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] - media-libs/mesa[X(+),${MULTILIB_USEDEP}] + media-libs/libglvnd[X(+),${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] x11-libs/libXdamage[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.8[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) " DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - dev-libs/gobject-introspection-common - >=dev-util/gdbus-codegen-2.48 - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.3 ) - >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( x11-base/xorg-proto ) test? ( + media-fonts/font-cursor-misc media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) + ) + X? ( x11-base/xorg-proto ) " -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 RDEPEND="${COMMON_DEPEND} >=dev-util/gtk-update-icon-cache-3 - !<gnome-base/gail-1000 - !<x11-libs/vte-0.31.0:2.90 " # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 PDEPEND=" @@ -94,11 +77,36 @@ PDEPEND=" >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax ) " +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xsl-stylesheets + dev-libs/gobject-introspection-common + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.48 + dev-util/glib-utils + >=dev-build/gtk-doc-am-1.20 + wayland? ( dev-util/wayland-scanner ) + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig + x11-libs/gdk-pixbuf:2 + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + >=dev-util/gtk-doc-1.20 + ) +" MULTILIB_CHOST_TOOLS=( /usr/bin/gtk-query-immodules-3.0$(get_exeext) ) +PATCHES=( + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache + "${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch + + # Fix broken autotools logic + "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch +) + strip_builddir() { local rule=$1 shift @@ -124,12 +132,6 @@ src_prepare() { strip_builddir SRC_SUBDIRS examples Makefile.{am,in} fi - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache - eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch - - # Fix broken autotools logic - eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch - gnome2_src_prepare } @@ -137,11 +139,11 @@ multilib_src_configure() { local myconf=( $(use_enable aqua quartz-backend) $(use_enable broadway broadway-backend) - $(use_enable cloudprint) $(use_enable colord) $(use_enable cups cups auto) $(multilib_native_use_enable gtk-doc) $(multilib_native_use_enable introspection) + $(use_enable sysprof profiler) $(use_enable wayland wayland-backend) $(use_enable X x11-backend) $(use_enable X xcomposite) @@ -153,8 +155,6 @@ multilib_src_configure() { # cloudprovider is not packaged in Gentoo yet --disable-cloudproviders --disable-papi - # sysprof integration needs >=sysprof-3.33.2 - --disable-profiler --enable-man --with-xml-catalog="${EPREFIX}"/etc/xml/catalog # need libdir here to avoid a double slash in a path that libtool doesn't @@ -206,12 +206,12 @@ pkg_preinst() { multilib_pkg_preinst() { # Make immodules.cache belongs to gtk+ alone - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die + cp "${EROOT}${cache}" "${ED}${cache}" || die else - touch "${ED}"/${cache} || die + touch "${ED}${cache}" || die fi } multilib_parallel_foreach_abi multilib_pkg_preinst @@ -238,7 +238,7 @@ pkg_postrm() { if [[ -z ${REPLACED_BY_VERSION} ]]; then multilib_pkg_postrm() { - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache + rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" } multilib_foreach_abi multilib_pkg_postrm fi diff --git a/x11-libs/gtk+/gtk+-3.24.41.ebuild b/x11-libs/gtk+/gtk+-3.24.41.ebuild new file mode 100644 index 000000000000..8e646b3879db --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.24.41.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2 meson-multilib multilib toolchain-funcs virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="3" +IUSE="aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + test? ( X ) + xinerama? ( X ) +" +RESTRICT="!test? ( test )" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.2.0:= + >=media-libs/libepoxy-1.4[X(+)?,egl(+),${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + + cloudproviders? ( net-libs/libcloudproviders[${MULTILIB_USEDEP}] ) + colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.32 + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + media-libs/libglvnd[X(+),${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.8[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + X? ( x11-base/xorg-proto ) +" +RDEPEND="${COMMON_DEPEND} + >=dev-util/gtk-update-icon-cache-3 +" +# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 +PDEPEND=" + gnome-base/librsvg[${MULTILIB_USEDEP}] + >=x11-themes/adwaita-icon-theme-3.14 + vim-syntax? ( app-vim/gtk-syntax ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xsl-stylesheets + dev-libs/gobject-introspection-common + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.48 + dev-util/glib-utils + >=dev-build/gtk-doc-am-1.20 + wayland? ( dev-util/wayland-scanner ) + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig + x11-libs/gdk-pixbuf:2 + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + >=dev-util/gtk-doc-1.20 + ) + test? ( sys-apps/dbus ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gtk-query-immodules-3.0$(get_exeext) +) + +PATCHES=( + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache + "${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch +) + +src_prepare() { + default + + # The border-image-excess-size.ui test is known to fail on big-endian platforms + # See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904 + if [[ $(tc-endian) == big ]]; then + sed -i \ + -e "/border-image-excess-size.ui/d" \ + -e "/^xfails =/a 'border-image-excess-size.ui'," \ + testsuite/reftests/meson.build || die + fi +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use aqua quartz_backend) + $(meson_use broadway broadway_backend) + $(meson_use cloudproviders) + $(meson_use examples demos) + $(meson_use examples) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_bool introspection) + $(meson_use sysprof profiler) + $(meson_use wayland wayland_backend) + $(meson_use X x11_backend) + -Dcolord=$(usex colord yes no) + -Dprint_backends=$(usex cups cups,file,lpr file,lpr) + -Dxinerama=$(usex xinerama yes no) + # Include backend immodules into gtk itself, to avoid problems like + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a + # user overridden GTK_IM_MODULE envvar + -Dbuiltin_immodules=backend + -Dman=true + $(meson_use test tests) + -Dtracker3=false + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" --timeout-multiplier 4 || die +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + insinto /etc/gtk-3.0 + doins "${FILESDIR}"/settings.ini + # Skip README.win32.md that would get installed by default + DOCS=( NEWS README.md ) + einstalldocs +} + +pkg_preinst() { + gnome2_pkg_preinst + + multilib_pkg_preinst() { + # Make immodules.cache belongs to gtk+ alone + local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}${cache}" "${ED}${cache}" || die + else + touch "${ED}${cache}" || die + fi + } + multilib_parallel_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + gnome2_pkg_postinst + + multilib_pkg_postinst() { + gnome2_query_immodules_gtk3 \ + || die "Update immodules cache failed (for ${ABI})" + } + multilib_parallel_foreach_abi multilib_pkg_postinst + + if ! has_version "app-text/evince"; then + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your settings.ini file." + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + } + multilib_foreach_abi multilib_pkg_postrm + fi +} diff --git a/x11-libs/gtk+/gtk+-3.24.42.ebuild b/x11-libs/gtk+/gtk+-3.24.42.ebuild new file mode 100644 index 000000000000..655c05a8a518 --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.24.42.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2 meson-multilib multilib toolchain-funcs virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="3" +IUSE="aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + test? ( X ) + xinerama? ( X ) +" +RESTRICT="!test? ( test )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.2.0:= + >=media-libs/libepoxy-1.4[X(+)?,egl(+),${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + + cloudproviders? ( net-libs/libcloudproviders[${MULTILIB_USEDEP}] ) + colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + wayland? ( + >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.32 + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + media-libs/libglvnd[X(+),${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.8[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.33.2:4[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) +" +RDEPEND="${COMMON_DEPEND} + >=dev-util/gtk-update-icon-cache-3 +" +# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 +PDEPEND=" + gnome-base/librsvg[${MULTILIB_USEDEP}] + >=x11-themes/adwaita-icon-theme-3.14 + vim-syntax? ( app-vim/gtk-syntax ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xsl-stylesheets + dev-libs/gobject-introspection-common + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.48 + dev-util/glib-utils + >=dev-build/gtk-doc-am-1.20 + wayland? ( dev-util/wayland-scanner ) + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig + x11-libs/gdk-pixbuf:2 + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + >=dev-util/gtk-doc-1.20 + ) + test? ( sys-apps/dbus ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gtk-query-immodules-3.0$(get_exeext) +) + +PATCHES=( + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache + "${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch +) + +src_prepare() { + default + + # Force sysprof-capture-4 instead of checking sysprof-capture-3 first; either is + # fine as far as deps are concerned, as it static links, but sysprof-capture-3 + # links to glib which would be done statically if there's glib[static-libs], + # making the whole of gtk+ static link to glib instead of dynamic linking to glib. + sed -i -e "s/'sysprof-capture-3'/'sysprof-capture-4'/g" meson.build || die + + # The border-image-excess-size.ui test is known to fail on big-endian platforms + # See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904 + if [[ $(tc-endian) == big ]]; then + sed -i \ + -e "/border-image-excess-size.ui/d" \ + -e "/^xfails =/a 'border-image-excess-size.ui'," \ + testsuite/reftests/meson.build || die + fi +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use aqua quartz_backend) + $(meson_use broadway broadway_backend) + $(meson_use cloudproviders) + $(meson_use examples demos) + $(meson_use examples) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_bool introspection) + $(meson_use sysprof profiler) + $(meson_use wayland wayland_backend) + $(meson_use X x11_backend) + -Dcolord=$(usex colord yes no) + -Dprint_backends=$(usex cups cups,file,lpr file,lpr) + -Dxinerama=$(usex xinerama yes no) + # Include backend immodules into gtk itself, to avoid problems like + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a + # user overridden GTK_IM_MODULE envvar + -Dbuiltin_immodules=backend + -Dman=true + $(meson_use test tests) + -Dtracker3=false + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" --timeout-multiplier 4 || die +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + insinto /etc/gtk-3.0 + doins "${FILESDIR}"/settings.ini + # Skip README.win32.md that would get installed by default + DOCS=( NEWS README.md ) + einstalldocs +} + +pkg_preinst() { + gnome2_pkg_preinst + + multilib_pkg_preinst() { + # Make immodules.cache belongs to gtk+ alone + local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}${cache}" "${ED}${cache}" || die + else + touch "${ED}${cache}" || die + fi + } + multilib_parallel_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + gnome2_pkg_postinst + + multilib_pkg_postinst() { + gnome2_query_immodules_gtk3 \ + || die "Update immodules cache failed (for ${ABI})" + } + multilib_parallel_foreach_abi multilib_pkg_postinst + + if ! has_version "app-text/evince"; then + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your settings.ini file." + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + } + multilib_foreach_abi multilib_pkg_postrm + fi +} diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml index 7fe0a6b99d41..7692b1145ef4 100644 --- a/x11-libs/gtk+/metadata.xml +++ b/x11-libs/gtk+/metadata.xml @@ -1,23 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <longdescription> - GTK+ is a multi-platform toolkit for creating graphical user - interfaces. Offering a complete set of widgets, GTK+ is suitable - for projects ranging from small one-off projects to complete - application suites. - </longdescription> - <use> - <flag name="broadway">Enable the GDK Broadway backend.</flag> - <flag name="cloudprint">Enable printing via Google Cloud Print.</flag> - <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management - in printing</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id> - </upstream> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <longdescription> + GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, GTK+ is suitable + for projects ranging from small one-off projects to complete + application suites. + </longdescription> + <use> + <flag name="broadway">Enable the GDK Broadway backend</flag> + <flag name="cloudproviders">Enable GtkPlacesSidebar to access cloud services</flag> + <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management in printing</flag> + <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id> + <remote-id type="gnome-gitlab">GNOME/gtk</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest deleted file mode 100644 index 80e7f9ec45cd..000000000000 --- a/x11-libs/gtk+extra/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gtkextra-3.3.3.tar.gz 1503817 BLAKE2B dc99923ad962348d617b8db2171b99e925d0dc06501110d805f166ba25cff72094c02031e3375304ddfd96cc7d3f76a1b06d56b196aec1d1868f10d154acfc8e SHA512 864fa2e957941a05a9c4b4a4283ae48e733d72ab334e2fb8440fc884166b0d1ad34d381924184f7a88f829d00bbd857d5f3f32d89f159e0133dd89233a8a93e9 -DIST gtkextra-3.3.4.tar.gz 1542795 BLAKE2B 5a6d5b72f34c8373db615961728a01d0c27005726f316c1233b0b4c4dba688022a53236cc3abe090891a53441d910322ea938ea864a13933a5cea87f18e3426b SHA512 fd61bce7070cf4f28129b47a6c0b01e974101d96b525be9ce1bc4b40ce94197f3c411d17fd8954f5549075c4cdd7ac58a6aaa6faa2f5d3013b761391559e570b diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild deleted file mode 100644 index ae91f559dbfc..000000000000 --- a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Useful Additional GTK+ widgets" -HOMEPAGE="http://gtkextra.sourceforge.net" -SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz" - -LICENSE="FDL-1.1 LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="+introspection static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/gtk+-2.12.0:2 - dev-libs/glib:2 - introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - virtual/pkgconfig -" -# dev-libs/gobject-introspection-common needed for eautoreconf - -S="${WORKDIR}/gtkextra-${PV}" - -src_configure() { - gnome2_src_configure \ - --enable-glade=no \ - --disable-man \ - $(use_enable introspection) \ - $(use_enable static-libs static) \ - $(use_enable test tests) -} diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild deleted file mode 100644 index 03058820a695..000000000000 --- a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Useful Additional GTK+ widgets" -HOMEPAGE="http://gtkextra.sourceforge.net" -SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz" - -LICENSE="FDL-1.1 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+introspection static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/gtk+-2.12.0:2 - dev-libs/glib:2 - introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - virtual/pkgconfig -" -# dev-libs/gobject-introspection-common needed for eautoreconf - -S="${WORKDIR}/gtkextra-${PV}" - -src_configure() { - gnome2_src_configure \ - --enable-glade=no \ - --disable-man \ - $(use_enable introspection) \ - $(use_enable static-libs static) \ - $(use_enable test tests) -} diff --git a/x11-libs/gtk+extra/metadata.xml b/x11-libs/gtk+extra/metadata.xml deleted file mode 100644 index cbb03314ae25..000000000000 --- a/x11-libs/gtk+extra/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">gtkextra</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild index 2cf046c6889f..5b3e0ecb73b5 100644 --- a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild +++ b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DESCRIPTION="Menubar, doc and app bundle integration for GTK+" HOMEPAGE="https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration" -SRC_URI="https://download.gnome.org/sources/${PN}/2.0/${P}.tar.xz" +SRC_URI="https://download.gnome.org/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x64-macos" -IUSE="" -DEPEND="virtual/pkgconfig +DEPEND=" >=dev-libs/glib-2.14.0 - x11-libs/gtk+[aqua]" - + x11-libs/gtk+:3[aqua] +" RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" src_configure() { econf --enable-python=no diff --git a/x11-libs/gtk-mac-integration/metadata.xml b/x11-libs/gtk-mac-integration/metadata.xml index 0c982d881307..232d18dd1fa2 100644 --- a/x11-libs/gtk-mac-integration/metadata.xml +++ b/x11-libs/gtk-mac-integration/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>prefix@gentoo.org</email> diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest index 288c2ca30f84..9d224af66096 100644 --- a/x11-libs/gtkdatabox/Manifest +++ b/x11-libs/gtkdatabox/Manifest @@ -1 +1 @@ -DIST gtkdatabox-0.9.3.0.tar.gz 2883977 BLAKE2B d9d5de1c4d07bd01940ea6f75f2b2f455b46cf018dbae67bcb643f523353e675e1a97cfc10b696fe16aa0391cb006e5e866bef52cefcdd8ca4de057589164e6e SHA512 5c2464dafcf9cdd4ee11bec6f8e627533c0270fe28d736e1be45ad084c42d430a50c39cf08531138627cc59ab034a191ecd7b97ccfce633467ff99e6e9cd593a +DIST gtkdatabox-1.0.0.tar.gz 520992 BLAKE2B d04dfc833ae6807fd593ebddcdbd45ee3c5be6818d11b8c3da313649d7279ddcfcc635571d84a2da3e2b867e3ec3f50fead2c0ee2fe25fad43851abc19610883 SHA512 63007ab50e1e1eba185a2c05ccc1a8759aded91797688c4b4888728af3527514cc79280851981e36b01e24859fe8e0f95d660a219d456edeb50e0b847d7b9999 diff --git a/x11-libs/gtkdatabox/files/gtkdatabox-1.0.0-slibtool.patch b/x11-libs/gtkdatabox/files/gtkdatabox-1.0.0-slibtool.patch new file mode 100644 index 000000000000..b729c4ad1e80 --- /dev/null +++ b/x11-libs/gtkdatabox/files/gtkdatabox-1.0.0-slibtool.patch @@ -0,0 +1,48 @@ +https://sourceforge.net/p/gtkdatabox/git/merge-requests/5/ +https://sourceforge.net/p/gtkdatabox/git/ci/88d2bd66571e083e3beaf0ea6004c1b739a20713/ + +From 88d2bd66571e083e3beaf0ea6004c1b739a20713 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Thu, 7 Mar 2024 14:29:18 -0800 +Subject: [PATCH] gtk: add missing libm depedency + +When building with slibtool it fails with undefined references for libm, +with GNU libtool it doesn't fails because -no-undefined gets silently +ignored while slibtool correctly passes -Wl,--no-undefined to the +linker. + +Gentoo issue: https://bugs.gentoo.org/913728 +--- + configure.ac | 2 ++ + gtk/Makefile.am | 5 ++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 78b8caa..ac95247 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,6 +40,8 @@ AC_PROG_CC_C99 + AC_PROG_CPP + AC_PROG_INSTALL + ++LT_LIB_M ++ + m4_define([gtk_required_version], [3.4.0]) + m4_define([pango_required_version], [1.29.0]) + m4_define([cairo_required_version], [1.10.0]) +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 4a816fb..7d399de 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -20,7 +20,10 @@ libgtkdatabox_la_SOURCES= \ + + libgtkdatabox_la_LDFLAGS= \ + -version-info $(DATABOX_LT_VERSION)\ +- -no-undefined \ ++ -no-undefined ++ ++libgtkdatabox_la_LIBADD= \ ++ @LIBM@ \ + @GTK_LIBS@ + + diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild deleted file mode 100644 index 7e3cc26ba97b..000000000000 --- a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils ltprune - -DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data" -HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="examples +glade static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/pango - glade? ( gnome-base/libglade )" -DEPEND=${RDEPEND} - -src_prepare() { - default - - # Remove -D.*DISABLE_DEPRECATED cflags - find . -iname 'Makefile.am' -exec \ - sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die - # Do Makefile.in after Makefile.am to avoid automake maintainer-mode - find . -iname 'Makefile.in' -exec \ - sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die - sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am -i Makefile.in || die -} - -src_configure() { - econf \ - $(use_enable glade libglade) \ - --disable-glade \ - $(use_enable static-libs static) \ - $(use_enable test gtktest) \ - --enable-libtool-lock -} - -src_install() { - default - - prune_libtool_files - - dodoc AUTHORS ChangeLog README TODO - if use examples; then - docinto examples - dodoc "${S}"/examples/* - fi -} diff --git a/x11-libs/gtkdatabox/gtkdatabox-1.0.0-r1.ebuild b/x11-libs/gtkdatabox/gtkdatabox-1.0.0-r1.ebuild new file mode 100644 index 000000000000..bef7ad10ed6f --- /dev/null +++ b/x11-libs/gtkdatabox/gtkdatabox-1.0.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools xdg-utils + +DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data" +HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="examples +glade" + +RDEPEND=" + dev-libs/atk + dev-libs/glib:2 + media-libs/harfbuzz:= + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/gdk-pixbuf:2 + x11-libs/pango + glade? ( dev-util/glade:3.10= ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-slibtool.patch +) + +src_prepare() { + default + + # Remove -D.*DISABLE_DEPRECATED cflags + find . -iname 'Makefile.am' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die + sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am || die + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable glade) \ + --enable-libtool-lock +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die + + dodoc AUTHORS ChangeLog README TODO + + if use examples; then + docinto examples + dodoc "${S}"/examples/* + fi +} + +maybe_update_xdg_icon_cache() { + if use glade; then + xdg_icon_cache_update + fi +} + +pkg_postinst() { + maybe_update_xdg_icon_cache +} + +pkg_postrm() { + maybe_update_xdg_icon_cache +} diff --git a/x11-libs/gtkdatabox/metadata.xml b/x11-libs/gtkdatabox/metadata.xml index 74c404fc5067..7f6df4e26ea9 100644 --- a/x11-libs/gtkdatabox/metadata.xml +++ b/x11-libs/gtkdatabox/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-electronics@gentoo.org</email> <name>Gentoo Electronics Project</name> </maintainer> - <longdescription>Gtk+ Widgets for live display fluctuating numerical data</longdescription> <use> <flag name="glade">Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget</flag> </use> diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch new file mode 100644 index 000000000000..f1d282d6cde5 --- /dev/null +++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch @@ -0,0 +1,92 @@ +--- a/configure.in ++++ b/configure.in +@@ -59,10 +59,6 @@ + m4_define([pango_pkg], [pango]) + m4_define([pango_required_version], [1.0.0]) + +-# Pangox +-m4_define([pangox_pkg], [pangox]) +-m4_define([pangox_required_version], [1.0.0]) +- + # PangoFT2 + m4_define([pangoft2_pkg], [pangoft2]) + m4_define([pangoft2_required_version], [1.0.0]) +@@ -350,7 +346,6 @@ + gtk_pkg >= gtk_required_version \ + gdk_pkg >= gdk_required_version \ + pango_pkg >= pango_required_version \ +-pangox_pkg >= pangox_required_version \ + gmodule_pkg >= gmodule_required_version \ + ]) + +@@ -570,7 +565,7 @@ + # CFLAGS and LIBS + ################################################## + +-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg" ++GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg" + GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS" + GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GLU_LIBS $GDKGLEXT_WIN_LIBS" + GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`" +--- a/gdk/x11/gdkglfont-x11.c ++++ b/gdk/x11/gdkglfont-x11.c +@@ -18,7 +18,8 @@ + + #include <string.h> + +-#include <pango/pangox.h> ++//#include <pango/pangox.h> ++#include <pango/pangocairo.h> + + #include "gdkglx.h" + #include "gdkglprivate-x11.h" +@@ -77,9 +78,9 @@ + { + PangoFont *font = NULL; + gchar *charset = NULL; +- PangoXSubfont subfont_id; ++ //PangoXSubfont subfont_id; + gchar *xlfd = NULL; +- PangoXFontCache *font_cache; ++ //PangoXFontCache *font_cache; + XFontStruct *fs; + + GDK_GL_NOTE_FUNC_PRIVATE (); +@@ -91,6 +92,7 @@ + goto FAIL; + } + ++ /* + charset = gdk_gl_font_charset_for_locale (); + if (!pango_x_find_first_subfont (font, &charset, 1, &subfont_id)) + { +@@ -114,6 +116,7 @@ + glXUseXFont (fs->fid, first, count, list_base); + + pango_x_font_cache_unload (font_cache, fs); ++ */ + + FAIL: + +@@ -149,11 +152,7 @@ + + GDK_GL_NOTE_FUNC (); + +-#ifdef GDKGLEXT_MULTIHEAD_SUPPORT +- font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); +-#else /* GDKGLEXT_MULTIHEAD_SUPPORT */ +- font_map = pango_x_font_map_for_display (gdk_x11_get_default_xdisplay ()); +-#endif /* GDKGLEXT_MULTIHEAD_SUPPORT */ ++ font_map = pango_cairo_font_map_get_default (); + + return gdk_gl_font_use_pango_font_common (font_map, font_desc, + first, count, list_base); +@@ -187,7 +186,7 @@ + + GDK_GL_NOTE_FUNC (); + +- font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY (display)); ++ font_map = pango_cairo_font_map_get_default (); + + return gdk_gl_font_use_pango_font_common (font_map, font_desc, + first, count, list_base); diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild index e37df52431b7..9cfb390f1761 100644 --- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild +++ b/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild @@ -1,52 +1,49 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools gnome2 multilib-minimal +EAPI=8 + +GNOME2_EAUTORECONF=yes +inherit gnome2 multilib-minimal DESCRIPTION="GL extensions for Gtk+ 2.0" HOMEPAGE="http://gtkglext.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] - >=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils - >=sys-devel/autoconf-archive-2014.02.28 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + >=dev-build/autoconf-archive-2014.02.28 + virtual/pkgconfig " -src_prepare() { +PATCHES=( # Fix build issues with gcc patch from Fedora, bug #649718 - eapply "${FILESDIR}"/${P}-gcc8-fixes.patch + "${FILESDIR}"/${P}-gcc8-fixes.patch # Ancient configure.in with broken multilib gl detection (bug #543050) # Backport some configure updates from upstream git master to fix - eapply "${FILESDIR}/${P}-gl-configure.patch" - - mv configure.{in,ac} || die "mv failed" - eautoreconf + "${FILESDIR}"/${P}-gl-configure.patch - gnome2_src_prepare -} + # Drop pangox-compat dep with patch from Fedora, bugs #698950, #706344 + "${FILESDIR}"/${P}-no-pangox.patch +) multilib_src_configure() { - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static + ECONF_SOURCE="${S}" gnome2_src_configure } multilib_src_install() { @@ -54,6 +51,6 @@ multilib_src_install() { } multilib_src_install_all() { - local DOCS="AUTHORS ChangeLog* NEWS README TODO" + local DOCS=( AUTHORS ChangeLog{,.pre-1-0} NEWS README TODO ) einstalldocs } diff --git a/x11-libs/gtkglext/metadata.xml b/x11-libs/gtkglext/metadata.xml index aa10f62c61db..d6d3335b6c63 100644 --- a/x11-libs/gtkglext/metadata.xml +++ b/x11-libs/gtkglext/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>gnome@gentoo.org</email> diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r5.ebuild index 06c60839782d..1159f5c61a22 100644 --- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild +++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r5.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools DESCRIPTION="Rendering engine for MathML documents" @@ -9,9 +10,8 @@ HOMEPAGE="http://helm.cs.unibo.it/mml-widget/" SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz" LICENSE="LGPL-3" - SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="mathml svg t1lib" RDEPEND=" @@ -21,13 +21,12 @@ RDEPEND=" mathml? ( media-fonts/texcm-ttf ) t1lib? ( >=media-libs/t1lib-5:5 ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-libs/libxslt virtual/pkgconfig " -DOCS=( ANNOUNCEMENT AUTHORS BUGS ChangeLog CONTRIBUTORS HISTORY NEWS README TODO ) - PATCHES=( "${FILESDIR}"/${P}-gcc43.patch "${FILESDIR}"/${P}-gcc44.patch @@ -52,6 +51,7 @@ src_prepare() { fi sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + rm README.MacOSX || die AT_M4DIR=ac-helpers eautoreconf } @@ -59,7 +59,9 @@ src_prepare() { src_configure() { # --disable-popt will build only the library and not the frontend # TFM is needed for SVG, default value is 2 - econf --disable-gtk \ + econf \ + --disable-gmetadom \ + --disable-gtk \ $(use_enable svg) \ $(use_with t1lib) \ --with-popt \ @@ -69,12 +71,12 @@ src_configure() { --enable-tfm=2 \ --enable-builder-cache \ --enable-breaks \ - --enable-boxml \ - --disable-gmetadom \ - --disable-static + --enable-boxml } src_install() { default - find "${D}" -name '*.la' -delete || die + dodoc ANNOUNCEMENT CONTRIBUTORS HISTORY + + find "${ED}" -name '*.la' -delete || die } diff --git a/x11-libs/gtkmathview/metadata.xml b/x11-libs/gtkmathview/metadata.xml index ff2703fcd58b..35a500e8628e 100644 --- a/x11-libs/gtkmathview/metadata.xml +++ b/x11-libs/gtkmathview/metadata.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="mathml">Install additional fonts for proper mathml - support.</flag> - <flag name="t1lib">Enable <pkg>media-libs/t1lib</pkg> support</flag> -</use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="mathml">Install additional fonts for proper mathml support.</flag> + <flag name="t1lib">Enable <pkg>media-libs/t1lib</pkg> support</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">Archive/gtkmathview</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest index 1e0f547a014f..b2019a219d4b 100644 --- a/x11-libs/gtksourceview/Manifest +++ b/x11-libs/gtksourceview/Manifest @@ -1,4 +1,3 @@ DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2 -DIST gtksourceview-4.2.0.tar.xz 1410764 BLAKE2B 8f20a762c16a0abc47ff191a2ea4d6b44a397cabee056e98263d0ba59cbc7207ac72341a630aa83fe7855804bd6add77e0d93e706ac9561c9577843f17e00246 SHA512 f2350b1e7042309c01be0feda6059d788a7ef55c4ccd48e16b4c92a71292ed6f92243455ca42aa0950db61de8d68f4a76f4fac46cd46316b690bcef1ea34c641 -DIST gtksourceview-4.4.0.tar.xz 1105776 BLAKE2B ef4ed4ed15435daba60795598ba41624b2680b0518246d5d6ade3630cb96e2bac96fea08105e72db7b5a07e714f9270ce27c11e9448fd1b21e8d3942989b2255 SHA512 068e723525290c5356c5ce3f5e5b5b8ecc9f7b1ff2f8234da247d1a84bed63ff5601cad6550981720859286e107705ec25cc7793b754ada164ec6569df0df9eb +DIST gtksourceview-4.8.4.tar.xz 1159636 BLAKE2B 0fb649522ff904993b7673c380b8ffb6458c0727b6af906e5328d972fb5385a2a668c2ca45b7dd3533f9f00b2ed9eaade55ee7b20a0b75fb1c031b917c27af2d SHA512 9e4262e52a92b3a052f33b799622d4fd4dcc7cc5355df12f160d0e60a6d6c135bc52f07eb40c06b357d5d74bec7228d4ec545a69ee5af69429d4170cc1e2243d diff --git a/x11-libs/gtksourceview/files/2.0/gentoo.lang b/x11-libs/gtksourceview/files/2.0/gentoo.lang index f1e0660c74fc..56f6366ca282 100644 --- a/x11-libs/gtksourceview/files/2.0/gentoo.lang +++ b/x11-libs/gtksourceview/files/2.0/gentoo.lang @@ -77,7 +77,7 @@ <!-- portage variables - currently unused --> <context id="portvars" style-ref="variable"> - <match>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</match> + <match>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</match> </context> <!-- portage functions - currently unused --> diff --git a/x11-libs/gtksourceview/files/4.6-gentoo.lang b/x11-libs/gtksourceview/files/4.6-gentoo.lang new file mode 100644 index 000000000000..4889b4ceca29 --- /dev/null +++ b/x11-libs/gtksourceview/files/4.6-gentoo.lang @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + GtkSourceView syntax highlight for Gentoo-specific files + + Originally written for gtksourceview-1.x by: + Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006. + Rewritten for gtksourceview-2 by: + Rene 'Necoro' Neumann <necoro@necoro.net>, 2007 + + Distributed under the same license(s) as gtksourceview. + + TODO: + - do not highlight "enable" in the configure options + - perhaps highlight portage variables and portage functions different + +--> + +<language name="gentoo" id="gentoo" version="2.0" _section="Scripts"> + <metadata> + <property name="globs">*.ebuild;*.eclass</property> + <property name="line-comment-start">#</property> + </metadata> + + <styles> + <style id="variable" _name="Portage variables" map-to="def:builtin" /> + <style id="command" _name="Portage command" map-to="def:type" /> + <style id="function" _name="Portage function" map-to="def:function" /> + <style id="string" _name="String" map-to="def:string" /> + </styles> + + <definitions> + + <!-- rewrite shell string to show highlighted variables --> + <context id="string" style-ref="def:string"> + <start>"</start> + <end>"</end> + <include> + <context ref="def:escape"/> + <context ref="def:line-continue"/> + <context ref="sh:variable"/> + </include> + </context> + + <context id="string-2" style-ref="def:string"> + <start>'</start> + <end>'</end> + <include> + <context ref="def:escape"/> + <context ref="def:line-continue"/> + <context ref="sh:variable"/> + </include> + </context> + + <!-- subprograms: + - $(..) is not supported currently in the normal sh.lang + - `...` is interpreted as string - I think the subshell behavior is more acurate --> + <context id="subprogram"> + <start>\$\(</start> + <end>\)</end> + <include> + <context sub-pattern="0" where="start" style-ref="sh:keyword"/> + <context sub-pattern="0" where="end" style-ref="sh:keyword"/> + <context ref="gentoo"/> + </include> + </context> + + <context id="subprogram-2"> + <start>`</start> + <end>`</end> + <include> + <context sub-pattern="0" where="start" style-ref="sh:keyword"/> + <context sub-pattern="0" where="end" style-ref="sh:keyword"/> + <context ref="gentoo"/> + </include> + </context> + + <!-- portage variables - currently unused --> + <context id="portvars" style-ref="variable"> + <match>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</match> + </context> + + <!-- portage functions - currently unused --> + <context id="portfuncs" style-ref="function"> + <match>^(src_(unpack|compile|install|test)|pkg_(config|nofetch|setup|(pre|post)(inst|rm)))</match> + </context> + + <!-- extra portage commands --> + <context id="portcmds" style-ref="command"> + <match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match> + </context> + + <context id="built-in-command"> + <include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop --> + <context ref="sh:reserved-word" /> + <context ref="sh:let-command" /> + <context ref="portcmds" /> + </include> + </context> + + <!-- gentoo is just a shell with the replacements --> + <replace id="sh:built-in-command" ref="built-in-command" /> + <replace id="sh:backtick-subshell" ref="subprogram-2" /> + <context id="gentoo"> + <include> + <context ref="subprogram"/> + <context ref="sh:sh"/> + </include> + </context> + </definitions> +</language> diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild index fda495015019..711b6abc5b4e 100644 --- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild +++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild @@ -1,19 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" +EAPI=7 -inherit eutils gnome2 virtualx +GNOME_TARBALL_SUFFIX="bz2" +inherit gnome2 virtualx -DESCRIPTION="A text widget implementing syntax highlighting and other features" +DESCRIPTION="Text widget implementing syntax highlighting and other features" HOMEPAGE="https://www.gnome.org/" LICENSE="GPL-2+ LGPL-2.1+" SLOT="2.0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" @@ -21,27 +19,28 @@ RDEPEND=" >=dev-libs/libxml2-2.5:2 >=dev-libs/glib-2.14:2 " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig " +DOCS=( AUTHORS ChangeLog HACKING MAINTAINERS NEWS README ) + +# Patch from 3.x for bug #394925 +PATCHES=( "${FILESDIR}/${P}-G_CONST_RETURN.patch" ) + src_prepare() { - DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README" + gnome2_src_prepare # Skip broken test until upstream bug #621383 is solved sed -i -e "/guess-language/d" tests/test-languagemanager.c || die # The same for another broken test, upstream bug #631214 sed -i -e "/get-language/d" tests/test-languagemanager.c || die - - # Patch from 3.x for bug #394925 - epatch "${FILESDIR}/${P}-G_CONST_RETURN.patch" - - gnome2_src_prepare } src_configure() { @@ -49,7 +48,7 @@ src_configure() { } src_test() { - Xemake check + virtx emake check } src_install() { diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11-r1.ebuild index 353bbe0234ed..ca4f20dcd0da 100644 --- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild +++ b/x11-libs/gtksourceview/gtksourceview-3.24.11-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -VALA_MIN_API_VERSION="0.24" -VALA_USE_DEPEND="vapigen" +EAPI=8 +VALA_USE_DEPEND="vapigen" inherit gnome2 vala virtualx DESCRIPTION="A text widget implementing syntax highlighting and other features" @@ -12,12 +11,10 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView" LICENSE="GPL-2+ LGPL-2.1+" SLOT="3.0/3" - +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="glade +introspection +vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" - RDEPEND=" >=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 @@ -25,20 +22,18 @@ RDEPEND=" glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils - >=dev-util/gtk-doc-am-1.25 + >=dev-build/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 virtual/pkgconfig vala? ( $(vala_depend) ) " -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} - src_configure() { + use vala && vala_setup + gnome2_src_configure \ $(use_enable glade glade-catalog) \ $(use_enable introspection) \ diff --git a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild deleted file mode 100644 index b0a2c2c951bd..000000000000 --- a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -VALA_MIN_API_VERSION="0.24" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 vala virtualx - -DESCRIPTION="A text widget implementing syntax highlighting and other features" -HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="4" - -IUSE="glade +introspection +vala" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.48:2 - >=dev-libs/libxml2-2.6:2 - >=x11-libs/gtk+-3.20:3[introspection?] - glade? ( >=dev-util/glade-3.9:3.10 ) - introspection? ( >=dev-libs/gobject-introspection-1.42:= ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.25 - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_enable glade glade-catalog) \ - $(use_enable introspection) \ - $(use_enable vala) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - insinto /usr/share/${PN}-4/language-specs - doins "${FILESDIR}"/2.0/gentoo.lang - - # Avoid conflict with gtksourceview:3.0 glade-catalog - # TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used - if use glade; then - mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die - fi -} diff --git a/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.4.ebuild index ffbaf7e29848..73ffb44cb69e 100644 --- a/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild +++ b/x11-libs/gtksourceview/gtksourceview-4.8.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,11 +14,11 @@ SLOT="4" IUSE="glade gtk-doc +introspection +vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" >=dev-libs/glib-2.48:2 - >=x11-libs/gtk+-3.22:3[introspection?] + >=x11-libs/gtk+-3.24:3[introspection?] >=dev-libs/libxml2-2.6:2 glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) @@ -27,8 +27,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.25 - app-text/docbook-xml-dtd:4.3 ) + gtk-doc? ( + >=dev-util/gtk-doc-1.25 + app-text/docbook-xml-dtd:4.3 + ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( $(vala_depend) ) @@ -58,7 +60,7 @@ src_install() { meson_src_install insinto /usr/share/${PN}-4/language-specs - doins "${FILESDIR}"/2.0/gentoo.lang + newins "${FILESDIR}"/4.6-gentoo.lang gentoo.lang # Avoid conflict with gtksourceview:3.0 glade-catalog # TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used diff --git a/x11-libs/gtksourceview/metadata.xml b/x11-libs/gtksourceview/metadata.xml index 7bcd75b4aa2d..2a8dca93e90e 100644 --- a/x11-libs/gtksourceview/metadata.xml +++ b/x11-libs/gtksourceview/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="glade">Install a glade catalog file</flag> -</use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="glade">Install a glade catalog file</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gtksourceview</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest index 10f52c11b5c0..8bb43c9be993 100644 --- a/x11-libs/libFS/Manifest +++ b/x11-libs/libFS/Manifest @@ -1 +1 @@ -DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643dc11ab6d68d36afe5f70b9326023fafb7a17ab14a083bbda20f99d6e140bf85facc4a3177d356b7c5dd6e126 SHA512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f +DIST libFS-1.0.9.tar.xz 287416 BLAKE2B b4425ab4ce1c9e4e0c283419231e2966f462a6c9225ff8bd056b5ec41c7a6a96e35bd2edd47ce6bfad87040c6042f19619f32f8f045262da5609af5c55b03fe4 SHA512 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8 diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild b/x11-libs/libFS/libFS-1.0.8.ebuild deleted file mode 100644 index 2338a4d8ea39..000000000000 --- a/x11-libs/libFS/libFS-1.0.8.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xorg-3 - -DESCRIPTION="X.Org FS library" - -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="ipv6" - -DEPEND="x11-base/xorg-proto - x11-libs/xtrans" -RDEPEND="" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - ) -} diff --git a/x11-libs/libFS/libFS-1.0.9.ebuild b/x11-libs/libFS/libFS-1.0.9.ebuild new file mode 100644 index 000000000000..d6866a6bb1c9 --- /dev/null +++ b/x11-libs/libFS/libFS-1.0.9.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org FS library" + +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" + +DEPEND=" + x11-base/xorg-proto + x11-libs/xtrans" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + --enable-ipv6 + ) + xorg-3_src_configure +} diff --git a/x11-libs/libFS/metadata.xml b/x11-libs/libFS/metadata.xml index e943b72b8a48..e43902c7757b 100644 --- a/x11-libs/libFS/metadata.xml +++ b/x11-libs/libFS/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libFS</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild index 6be3bab29d6b..578224c74202 100644 --- a/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild +++ b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 MY_P=glw-"${PV}" DESCRIPTION="Mesa GLw library" -HOMEPAGE="http://mesa3d.sourceforge.net/" +HOMEPAGE="https://mesa3d.sourceforge.net/" SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2" LICENSE="MIT" diff --git a/x11-libs/libGLw/metadata.xml b/x11-libs/libGLw/metadata.xml index 0b5ff5f5177a..229348827fdc 100644 --- a/x11-libs/libGLw/metadata.xml +++ b/x11-libs/libGLw/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">mesa3d</remote-id> - </upstream> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">mesa/glw</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest index 78e6e6acd932..9d07fe65f5d1 100644 --- a/x11-libs/libICE/Manifest +++ b/x11-libs/libICE/Manifest @@ -1 +1 @@ -DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468 +DIST libICE-1.1.1.tar.xz 335960 BLAKE2B 2849418aa0a66a9137481194bb91208fae4a1eb9a4f9f509b52da7668b8281b6c36f4ba4bdc686eb008a2561b89801fb9270b22887b7c5044e6c14a1ae94dfae SHA512 2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3 diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild deleted file mode 100644 index 03ead5ac2d4e..000000000000 --- a/x11-libs/libICE/libICE-1.0.10.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="X.Org Inter-Client Exchange library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="ipv6" - -DEPEND="x11-base/xorg-proto - x11-libs/xtrans" -RDEPEND="${DEPEND} - elibc_glibc? ( dev-libs/libbsd )" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - --disable-docs - --disable-specs - --without-fop - ) -} diff --git a/x11-libs/libICE/libICE-1.1.1-r1.ebuild b/x11-libs/libICE/libICE-1.1.1-r1.ebuild new file mode 100644 index 000000000000..482112f9608a --- /dev/null +++ b/x11-libs/libICE/libICE-1.1.1-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Inter-Client Exchange library" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + elibc_glibc? ( + || ( >=sys-libs/glibc-2.36 dev-libs/libbsd[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/xtrans +" + +XORG_CONFIGURE_OPTIONS=( + --enable-ipv6 + --disable-docs + --disable-specs + --without-fop +) diff --git a/x11-libs/libICE/metadata.xml b/x11-libs/libICE/metadata.xml index e943b72b8a48..7e59014eba4f 100644 --- a/x11-libs/libICE/metadata.xml +++ b/x11-libs/libICE/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libICE</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest index 3c91cb004b19..ebe470f32af2 100644 --- a/x11-libs/libQGLViewer/Manifest +++ b/x11-libs/libQGLViewer/Manifest @@ -1 +1,2 @@ DIST libQGLViewer-2.7.1.tar.gz 3078737 BLAKE2B 0374c60374af0f4594ee79fafd53440654e9bb5114cef38e50deba86584cc55eef03d2177b5d54829f5b111d4d029384fff19f8a5bebf750cac1ab8cfe6afaa5 SHA512 1f597d737614f07682bde0d886c9c2eee57f478607a4caeac40922f66a6310ff30ea32e8ab44de0b23e0d1e5db2e6deea8c4fe3bc2cddc78ed5b971f638b09bd +DIST libQGLViewer-2.7.2.tar.gz 3135146 BLAKE2B a46df06a135821fcb7895d4d037ee422cd9041695c57601cb7dccad3e1c4905ccbcacad91e47a79aa4adc85550db572adbb2311b1254d8779aba12d8fb36b255 SHA512 888695e413aa42b62d029efd1313f8aa101b4529f51edcea6416b58f6281715f8cdf27289d8f60cf1b0cdceba204e43e8477d30166350f8d3e090e6a93d8d595 diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild new file mode 100644 index 000000000000..ac6ea56e5114 --- /dev/null +++ b/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic qmake-utils + +DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers" +HOMEPAGE="http://www.libqglviewer.com" +SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/qt5" +KEYWORDS="~amd64 ~arm" +IUSE="designer examples" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + virtual/glu + virtual/opengl +" +RDEPEND="${DEPEND} + designer? ( dev-qt/designer:5 ) +" + +src_configure() { + append-ldflags "-LQGLViewer" + sed -e 's#designerPlugin##' -i ${P}.pro || die + use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die + eqmake5 ${P}.pro \ + PREFIX="${EPREFIX}/usr" \ + LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ + DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + if use designer ; then + cd "designerPlugin" || die + eqmake5 designerPlugin.pro + fi +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README + + if use designer ; then + cd "${S}/designerPlugin" || die + emake INSTALL_ROOT="${D}" install + fi + + if use examples ; then + exeinto /usr/bin/${PN}-examples + doexe $(find "${S}/examples" -type f -executable ! -name '*.vcproj') + fi +} diff --git a/x11-libs/libQGLViewer/metadata.xml b/x11-libs/libQGLViewer/metadata.xml index 6f836ff48534..6810e9ef38d9 100644 --- a/x11-libs/libQGLViewer/metadata.xml +++ b/x11-libs/libQGLViewer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>aballier@gentoo.org</email> @@ -8,4 +8,7 @@ <use> <flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag> </use> + <upstream> + <remote-id type="github">GillesDebunne/libQGLViewer</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest index c85bffd502d9..96c5aa3da26b 100644 --- a/x11-libs/libSM/Manifest +++ b/x11-libs/libSM/Manifest @@ -1 +1 @@ -DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903 +DIST libSM-1.2.4.tar.xz 306944 BLAKE2B c1944cd8e25389cffc18e9f6e46e3543381a2d74036cff2c24f063c1defca001c94055ef278dc468123b1f60f145df5daf34bcec39875ad918b664a3c279777a SHA512 7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86 diff --git a/x11-libs/libSM/libSM-1.2.3.ebuild b/x11-libs/libSM/libSM-1.2.4.ebuild index e54c21ed13d1..1d0670369325 100644 --- a/x11-libs/libSM/libSM-1.2.3.ebuild +++ b/x11-libs/libSM/libSM-1.2.4.ebuild @@ -1,24 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -inherit xorg-2 +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 DESCRIPTION="X.Org Session Management library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="doc ipv6 +uuid" - -RDEPEND="x11-base/xorg-proto - >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] - x11-libs/xtrans - !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( - uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] ) - ) ) )" -DEPEND="${RDEPEND}" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+uuid" + +RDEPEND=" + >=x11-libs/libICE-1.1.0[${MULTILIB_USEDEP}] + uuid? ( + elibc_Darwin? ( sys-libs/native-uuid ) + !elibc_SunOS? ( !elibc_Darwin? ( + >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] + ) ) + )" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/xtrans" src_configure() { local withuuid=$(use_with uuid libuuid) @@ -29,8 +33,8 @@ src_configure() { if use uuid ; then case ${CHOST} in *-solaris*|*-darwin*) - if [[ ! -d ${EROOT}usr/include/uuid ]] && - [[ -d ${ROOT}usr/include/uuid ]] + if [[ ! -d ${EROOT}/usr/include/uuid ]] && + [[ -d ${ROOT}/usr/include/uuid ]] then # Solaris and Darwin have uuid provided by the host # system. Since util-linux's version is based on this @@ -39,19 +43,20 @@ src_configure() { # installed, while in fact we don't withuuid="--without-libuuid" export HAVE_LIBUUID=yes - export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid" + export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid" # Darwin has uuid in libSystem [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid" fi ;; esac fi - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) + + local XORG_CONFIGURE_OPTIONS=( + --enable-ipv6 $(use_enable doc docs) $(use_with doc xmlto) ${withuuid} --without-fop ) - xorg-2_src_configure + xorg-3_src_configure } diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml index 73384252f25d..6de6174551fa 100644 --- a/x11-libs/libSM/metadata.xml +++ b/x11-libs/libSM/metadata.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -<use> - <flag name="uuid">Use UUID for session identification instead of IP address - and system time. - </flag> -</use> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <use> + <flag name="uuid">Use UUID for session identification instead of IP address and system time.</flag> + </use> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libSM</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest index 7b7ca0feb3c7..cbcce5636e7c 100644 --- a/x11-libs/libX11/Manifest +++ b/x11-libs/libX11/Manifest @@ -1 +1,2 @@ -DIST libX11-1.6.9.tar.bz2 2283814 BLAKE2B 00fb965b9cd19bde79c4e598c677d21058c85a8ac37d9addab7fb0b2faf67e3d65b91e1864bcd7180e5fd8b0ab7ec3cf68ae7f95ac8e82a049529b5a139b43bd SHA512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31 +DIST libX11-1.8.7.tar.xz 1859256 BLAKE2B 335d8af91c13aba11255c266c4687a7f66b021207a92485d723b4107601bbabb6a0e5535241a3bcff4ac9a99142730d2b3d2e2eaff86b507fee5b35a2590d792 SHA512 d53bfc18f38d339a6a695b09835b2ae96b323881678bfe7ddca697605e3bdf4102ff49cc3078880a6c55b5977fcdd0aadaf5429086132de3a5bda302f79a2fa6 +DIST libX11-1.8.9.tar.xz 1811900 BLAKE2B 8858157ac490d65e19500bfbb2ab773a3a30041f8a757ff22fff8fb0124044b8bb826f6dff4115230c757a175b61a3f7d596d976d98be760085749878d64f871 SHA512 737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96 diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild b/x11-libs/libX11/libX11-1.6.9.ebuild deleted file mode 100644 index 10c68c7a868a..000000000000 --- a/x11-libs/libX11/libX11-1.6.9.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="X.Org X11 library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="ipv6 test" -RESTRICT="!test? ( test )" - -RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}] - !<x11-base/xorg-proto-2019.2" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/xtrans" -BDEPEND="test? ( dev-lang/perl )" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_with doc xmlto) - $(use_enable doc specs) - $(use_enable ipv6) - --without-fop - ) -} diff --git a/x11-libs/libX11/libX11-1.8.7.ebuild b/x11-libs/libX11/libX11-1.8.7.ebuild new file mode 100644 index 000000000000..30b04e004b26 --- /dev/null +++ b/x11-libs/libX11/libX11-1.8.7.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX=xz +inherit toolchain-funcs xorg-3 + +# Note: please bump this with x11-misc/compose-tables +DESCRIPTION="X.Org X11 library" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}] + x11-misc/compose-tables + + !<xfce-base/xfce4-settings-4.16.3 +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/xtrans +" +BDEPEND="test? ( dev-lang/perl )" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_with doc xmlto) + $(use_enable doc specs) + --enable-ipv6 + --without-fop + --with-keysymdefdir="${ESYSROOT}/usr/include/X11" + CPP="$(tc-getPROG CPP cpp)" + ) + xorg-3_src_configure +} + +src_install() { + xorg-3_src_install + rm -rf "${ED}"/usr/share/X11/locale || die +} diff --git a/x11-libs/libX11/libX11-1.8.9.ebuild b/x11-libs/libX11/libX11-1.8.9.ebuild new file mode 100644 index 000000000000..09df058a702d --- /dev/null +++ b/x11-libs/libX11/libX11-1.8.9.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX=xz +inherit toolchain-funcs xorg-3 + +# Note: please bump this with x11-misc/compose-tables +DESCRIPTION="X.Org X11 library" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}] + x11-misc/compose-tables + + !<xfce-base/xfce4-settings-4.16.3 +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/xtrans +" +BDEPEND="test? ( dev-lang/perl )" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_with doc xmlto) + $(use_enable doc specs) + --enable-ipv6 + --without-fop + --with-keysymdefdir="${ESYSROOT}/usr/include/X11" + CPP="$(tc-getPROG CPP cpp)" + ) + xorg-3_src_configure +} + +src_install() { + xorg-3_src_install + rm -rf "${ED}"/usr/share/X11/locale || die +} diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml index e1e8e6f760c3..2e0798c98274 100644 --- a/x11-libs/libX11/metadata.xml +++ b/x11-libs/libX11/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id> -</upstream> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id> + <remote-id type="freedesktop-gitlab">xorg/lib/libX11</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest index 0715e1a8c20b..ed857ef3f6fe 100644 --- a/x11-libs/libXScrnSaver/Manifest +++ b/x11-libs/libXScrnSaver/Manifest @@ -1 +1 @@ -DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a +DIST libXScrnSaver-1.2.4.tar.xz 264384 BLAKE2B 03cd9431dd8efd4842d5775c7b8219941c1ee6e440fa38111e7f582b10c554cbedd03511494920d09f57fd278eeb05987043f730882e27d998dd9b71a0bca7a3 SHA512 e4395af85f8496618afb23ffdaca1a75f5e3d213478d8dc73249cbc9840d7b993ba7513dbf6015cb38b48fe3f2223496365158a148dd5e1ac7475c5ee569e28c diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild deleted file mode 100644 index 50ea188d6f3d..000000000000 --- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org XScrnSaver library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -RDEPEND="x11-base/xorg-proto - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.4.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.4.ebuild new file mode 100644 index 000000000000..b0c2552b4e09 --- /dev/null +++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.4.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org XScrnSaver library" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXScrnSaver/metadata.xml b/x11-libs/libXScrnSaver/metadata.xml index e943b72b8a48..e10fbd95bbef 100644 --- a/x11-libs/libXScrnSaver/metadata.xml +++ b/x11-libs/libXScrnSaver/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXScrnSaver</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest index 2e169e2453f0..564f4c325e6e 100644 --- a/x11-libs/libXau/Manifest +++ b/x11-libs/libXau/Manifest @@ -1 +1 @@ -DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562 +DIST libXau-1.0.11.tar.xz 274108 BLAKE2B ffd037d6a5bd8bbf10d15747469c5277b3061b87793d8acf095f60aa121bdc0831da9d3e6c369846fd40d2ba03ef209e1e8febff64736d4ececd135a8fabb0a3 SHA512 f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd diff --git a/x11-libs/libXau/libXau-1.0.11.ebuild b/x11-libs/libXau/libXau-1.0.11.ebuild new file mode 100644 index 000000000000..65d799fc5bda --- /dev/null +++ b/x11-libs/libXau/libXau-1.0.11.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org X authorization library" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +DEPEND="x11-base/xorg-proto" diff --git a/x11-libs/libXau/libXau-1.0.9.ebuild b/x11-libs/libXau/libXau-1.0.9.ebuild deleted file mode 100644 index 85f36a1183b0..000000000000 --- a/x11-libs/libXau/libXau-1.0.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org X authorization library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="x11-base/xorg-proto" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXau/metadata.xml b/x11-libs/libXau/metadata.xml index e943b72b8a48..560505c18fb1 100644 --- a/x11-libs/libXau/metadata.xml +++ b/x11-libs/libXau/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXau</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest index b4481e147024..44a630dea049 100644 --- a/x11-libs/libXaw/Manifest +++ b/x11-libs/libXaw/Manifest @@ -1 +1 @@ -DIST libXaw-1.0.13.tar.bz2 674140 BLAKE2B e141a135d1a45edfb71687951542a31d838bf560997a631b3590db0581f94768a8cc77ebd86c7cff60668e9843b1258a9eb60383a4d25b704ce9dc91fc6d0bdf SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f +DIST libXaw-1.0.16.tar.xz 602848 BLAKE2B 342ca47da7fce2ddcc01b12bff6b279ad1ce6a743e3d6cf20120a98d67cc8c533d0c19c33250552d8709c8fc401e72147b04522e9ced998b05b7639a15115e23 SHA512 1cabad1a9b06dec7de601b977e844536823ee1a0045244acc42ca6b6107da9b4953736d94898a96cab40845eab77dae21e20e1fa66a3dfc4dedf575dfbca04aa diff --git a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.16.ebuild index 4f65e1ca4a4a..d764114b30eb 100644 --- a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild +++ b/x11-libs/libXaw/libXaw-1.0.16.ebuild @@ -1,31 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -inherit xorg-2 +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 DESCRIPTION="X.Org Xaw library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="deprecated" -RDEPEND="x11-base/xorg-proto +RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" src_configure() { - XORG_CONFIGURE_OPTIONS=( + local XORG_CONFIGURE_OPTIONS=( $(use_enable deprecated xaw6) $(use_enable doc specs) $(use_with doc xmlto) --without-fop ) - xorg-2_src_configure + xorg-3_src_configure } diff --git a/x11-libs/libXaw/metadata.xml b/x11-libs/libXaw/metadata.xml index 570177e533dc..a13415bbc470 100644 --- a/x11-libs/libXaw/metadata.xml +++ b/x11-libs/libXaw/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -<use> - <flag name="deprecated">Install deprecated Xaw6 library.</flag> -</use> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <use> + <flag name="deprecated">Install deprecated Xaw6 library.</flag> + </use> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXaw</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest index af907b357762..c679c10e529f 100644 --- a/x11-libs/libXaw3d/Manifest +++ b/x11-libs/libXaw3d/Manifest @@ -1 +1 @@ -DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424 +DIST libXaw3d-1.6.6.tar.xz 482040 BLAKE2B d0c7be64283837a7b32f67a2671eebd6d608818819afc4055c360d46152a3348d895159e9a7b7321913b2fea5ec8c587043e921127043d4d37f929a4b71bd27d SHA512 f324ddb1117ae6f8d50137390b2e82b638b53a6b170cce8f7bd8108fd98ce956badc7dede6b49065419f1565f9f4304571880842e799f7f48fb36bebe3dc3603 diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild deleted file mode 100644 index c0981dea6a40..000000000000 --- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit xorg-2 - -DESCRIPTION="X.Org Xaw3d library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="unicode xpm" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - xpm? ( x11-libs/libXpm )" -DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc - x11-base/xorg-proto" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable unicode internationalization) - $(use_enable xpm multiplane-bitmaps) - --enable-arrow-scrollbars - --enable-gray-stipples - ) - - xorg-2_pkg_setup -} diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild new file mode 100644 index 000000000000..e6a9a306cb1d --- /dev/null +++ b/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xaw3d library" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="xpm" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + xpm? ( x11-libs/libXpm )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + --enable-internationalization + $(use_enable xpm multiplane-bitmaps) + --enable-gray-stipples + --enable-arrow-scrollbars + ) + xorg-3_src_configure +} diff --git a/x11-libs/libXaw3d/metadata.xml b/x11-libs/libXaw3d/metadata.xml index e943b72b8a48..2d02310791b8 100644 --- a/x11-libs/libXaw3d/metadata.xml +++ b/x11-libs/libXaw3d/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXaw3d</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest index 75ee54ff0259..74c6e4a4b563 100644 --- a/x11-libs/libXaw3dXft/Manifest +++ b/x11-libs/libXaw3dXft/Manifest @@ -1 +1 @@ -DIST libXaw3dXft-1.6.2d.tar.bz2 584670 BLAKE2B cde040659a90edb50ac5aa374e8ec04442479ae1c06fe3d5b1387bd3e02c1a0b40ff286ad40f0ae7841544d1244648e34905570e5827dc0efe60a62da3261c9a SHA512 ac434b7f055d20ceb0bd17851d8ba69976ec562a60cb8012a259045e52c038278f0a8b25b52a61befab3aa169b74fd919278c671f1b6e282efb404e089772740 +DIST libXaw3dXft-1.6.2h.tar.bz2 593436 BLAKE2B e0e5c3a3e5b4564d58bb059ad7eb594d1a46cc37e0e21799ea11892d206a57f3f11a46d7413310d2a43738f03e001f5dc6f8c3b86bbe806fbc651661e9f720db SHA512 bc9b6de80379bdc82c7f5cd46ac78a422282b018eed979ef5548d0382f43e53619a6ebaf40c6b9ae264d597536022dc1daf023c1d1a04e948d4b4658bc6479ca diff --git a/x11-libs/libXaw3dXft/files/libXaw3dXft-1.6.2h-fix-gcc-14.patch b/x11-libs/libXaw3dXft/files/libXaw3dXft-1.6.2h-fix-gcc-14.patch new file mode 100644 index 000000000000..ae69a5dccba1 --- /dev/null +++ b/x11-libs/libXaw3dXft/files/libXaw3dXft-1.6.2h-fix-gcc-14.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/919239 + +Fix compilation with gcc 14 [-Wincompatible-pointer-types] + +buffer_return is a char* cast to wchar_t* at call site. + +--- a/src/XawIm.c ++++ b/src/XawIm.c +@@ -1522,7 +1522,7 @@ + if ((vw = SearchVendorShell(inwidg)) && (ve = GetExtPart(vw)) && + ve->im.xim && (p = GetIcTableShared(inwidg, ve)) && p->xic) { + if (_Xaw3dXft->encoding == -1) +- ret = Xutf8LookupString (p->xic, event, buffer_return, bytes_buffer, keysym_return, status_return); ++ ret = Xutf8LookupString (p->xic, event, (char*)buffer_return, bytes_buffer, keysym_return, status_return); + else + ret = XwcLookupString(p->xic, event, buffer_return, bytes_buffer, + keysym_return, status_return); diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild deleted file mode 100644 index 705b95f8aae6..000000000000 --- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit xorg-2 - -DESCRIPTION="Xaw3dXft library" -HOMEPAGE="https://sourceforge.net/projects/sf-xpaint" -SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" - -KEYWORDS="amd64 x86" -IUSE="unicode xpm" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXmu - x11-libs/libXt - xpm? ( x11-libs/libXpm )" -DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc - x11-base/xorg-proto" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable unicode internationalization) - $(usex xpm "--enable-multiplane-bitmaps" "") - --enable-arrow-scrollbars - --enable-gray-stipples - ) - - xorg-2_pkg_setup -} diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h-r1.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h-r1.ebuild new file mode 100644 index 000000000000..c58e5f8fb14a --- /dev/null +++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xorg-3 + +DESCRIPTION="Xaw3dXft library" +HOMEPAGE="https://sourceforge.net/projects/sf-xpaint/" +SRC_URI="https://downloads.sourceforge.net/project/sf-xpaint/${PN,,}/${P}.tar.bz2" + +KEYWORDS="amd64 x86" +IUSE="xpm" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXt + xpm? ( x11-libs/libXpm )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc + x11-misc/util-macros" + +QA_PKGCONFIG_VERSION="${PV//[!0-9.]}" + +PATCHES=( + "${FILESDIR}"/${P}-fix-gcc-14.patch +) + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(usev xpm --enable-multiplane-bitmaps) + + --enable-internationalization + --enable-arrow-scrollbars + --enable-gray-stipples + ) + xorg-3_src_configure +} diff --git a/x11-libs/libXaw3dXft/metadata.xml b/x11-libs/libXaw3dXft/metadata.xml index 9809f23e9c1a..5318f2ee316c 100644 --- a/x11-libs/libXaw3dXft/metadata.xml +++ b/x11-libs/libXaw3dXft/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> + <name>Viorel Munteanu</name> + </maintainer> <upstream> <remote-id type="sourceforge">sf-xpaint</remote-id> </upstream> diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest index d14cd577c1ef..2d64f5b37fb3 100644 --- a/x11-libs/libXcomposite/Manifest +++ b/x11-libs/libXcomposite/Manifest @@ -1 +1 @@ -DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5 +DIST libXcomposite-0.4.6.tar.xz 265596 BLAKE2B 1e017ac65c7fb9973f8a1ad06116c67b9ebecf880bee8fb9b2afd83e85ec53853eb082c7edfb6a53f1a8451ac8c61c63c540facbf97953997695b18d65d00c45 SHA512 f35a0da8f9f22fd788eee01209557fe3a1b1abdc9744f76330ba42b21b6e3af5464ca4451c33415856417c30da5aa5624e3707980c644327249bfeda5a62a59b diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild deleted file mode 100644 index af9569a717be..000000000000 --- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="X.Org Xcomposite library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=" - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_with doc xmlto) - ) -} diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild new file mode 100644 index 000000000000..44293c6f26b0 --- /dev/null +++ b/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xcomposite library" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + x11-base/xorg-proto" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_with doc xmlto) + ) + xorg-3_src_configure +} diff --git a/x11-libs/libXcomposite/metadata.xml b/x11-libs/libXcomposite/metadata.xml index e943b72b8a48..cf1b7e277bb4 100644 --- a/x11-libs/libXcomposite/metadata.xml +++ b/x11-libs/libXcomposite/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXcomposite</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest index b0d8cbfe67e6..2f933cb90dd2 100644 --- a/x11-libs/libXcursor/Manifest +++ b/x11-libs/libXcursor/Manifest @@ -1 +1 @@ -DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03 +DIST libXcursor-1.2.2.tar.xz 289536 BLAKE2B 1619f71a514586bab7651aa47702a06a3b6e8d9c60b27c7eabe39b49dff9e83a050b88e171fdde4735ad4c62b1be4be10c84af35bb3e78dedccd9cd85fe3680c SHA512 6550ce1e69b35ef3356f25e31aa2779503d9cea780eff307cb646364993dfaa971304085d32677e68996bd3b8e067436c8fc89aeb4db07a12ce5bc93b735b5b0 diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.2.ebuild index 55402fb5281d..f067187a18c5 100644 --- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild +++ b/x11-libs/libXcursor/libXcursor-1.2.2.ebuild @@ -1,22 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX=xz inherit xorg-3 DESCRIPTION="X.Org Xcursor library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc" RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" XORG_CONFIGURE_OPTIONS=( - --with-icondir=/usr/share/cursors/xorg-x11 + --with-icondir="${EPREFIX}"/usr/share/cursors/xorg-x11 --with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps' ) diff --git a/x11-libs/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml index e943b72b8a48..62a3ce952cd3 100644 --- a/x11-libs/libXcursor/metadata.xml +++ b/x11-libs/libXcursor/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXcursor</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest index 93ac653df614..8d98ee8baa06 100644 --- a/x11-libs/libXdamage/Manifest +++ b/x11-libs/libXdamage/Manifest @@ -1 +1 @@ -DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124 +DIST libXdamage-1.1.6.tar.xz 257532 BLAKE2B 9b9e21c180fa2ddfeb15e97edc1e7665de722f7fdf9997273fead3348df78b8eec610181d7fd2ef41af7305286285ccf57b56fe7859ebd863b9d8bc1321247c8 SHA512 624dcefa1c79064569df952892f7f1351dc19ad338ce73d1a57041e406cb3e18abe531bab352b93d1f0f5c9b5c6b2652cc84a8f1fbfcbba648343812695a8acb diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild deleted file mode 100644 index 3db214720c91..000000000000 --- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="X.Org Xdamage library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND=" - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - x11-base/xorg-proto" diff --git a/x11-libs/libXdamage/libXdamage-1.1.6.ebuild b/x11-libs/libXdamage/libXdamage-1.1.6.ebuild new file mode 100644 index 000000000000..778663d40ef5 --- /dev/null +++ b/x11-libs/libXdamage/libXdamage-1.1.6.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xdamage library" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + x11-base/xorg-proto" diff --git a/x11-libs/libXdamage/metadata.xml b/x11-libs/libXdamage/metadata.xml index e943b72b8a48..ecad519bc329 100644 --- a/x11-libs/libXdamage/metadata.xml +++ b/x11-libs/libXdamage/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXdamage</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest index d2b34b6db221..b10cc6d47f73 100644 --- a/x11-libs/libXdmcp/Manifest +++ b/x11-libs/libXdmcp/Manifest @@ -1 +1 @@ -DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec +DIST libXdmcp-1.1.5.tar.xz 297596 BLAKE2B 81d02e510d07083550a630867bbf60f4f6fd0044433c99af504d791211f828d8109763ae0f01bb1b690a13f099f75a21a7c3bfc4aa7e2435f7327467eedd514e SHA512 d7a1d70a58b7d34ddd01a91d3ccbc086a36626b7081cfcbb150d24288c6adad612b042ba7ea63a218595afb2ee04384c0f8ba84ee3c6bd29913724b54e898d83 diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild deleted file mode 100644 index 12c01730cf30..000000000000 --- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="X.Org X Display Manager Control Protocol library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="elibc_glibc? ( dev-libs/libbsd )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable doc docs) - $(use_with doc xmlto) - --without-fop - ) -} diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild new file mode 100644 index 000000000000..2f1a86339ec9 --- /dev/null +++ b/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org X Display Manager Control Protocol library" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + elibc_glibc? ( + || ( >=sys-libs/glibc-2.36 dev-libs/libbsd[${MULTILIB_USEDEP}] ) + ) + !elibc_glibc? ( + dev-libs/libbsd[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_enable doc docs) + $(use_with doc xmlto) + --without-fop + ) + xorg-3_src_configure +} diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml index 8b173f9d4e9b..b0ec49a2dafd 100644 --- a/x11-libs/libXdmcp/metadata.xml +++ b/x11-libs/libXdmcp/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:x.org:libxdmcp</remote-id> -</upstream> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:x.org:libxdmcp</remote-id> + <remote-id type="freedesktop-gitlab">xorg/lib/libXdmcp</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest index d97a33a8595b..c53b01e88521 100644 --- a/x11-libs/libXext/Manifest +++ b/x11-libs/libXext/Manifest @@ -1 +1 @@ -DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a +DIST libXext-1.3.6.tar.xz 341092 BLAKE2B 9879ba01e45fb84613c62b161334bdb49e0cd9a5ca6c33d27a4add2a94c4bae700cc8021e383493cc1eec31da4969f99461dcb1a2aa0613cb300ceaefd3a3b7e SHA512 fd7693b5698cc4f5e80002a2cd4bd88e5d52c755c19a0417ee73029bd65f9d77b0969e765a1febc4d8fce1ba5dfb7278717f47be742e33d8fc5eb941e769792e diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild deleted file mode 100644 index a42e64f0aa37..000000000000 --- a/x11-libs/libXext/libXext-1.3.4.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="X.Org Xext library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable doc specs) - $(use_with doc xmlto) - --without-fop - ) -} diff --git a/x11-libs/libXext/libXext-1.3.6.ebuild b/x11-libs/libXext/libXext-1.3.6.ebuild new file mode 100644 index 000000000000..cbd9e9c81fea --- /dev/null +++ b/x11-libs/libXext/libXext-1.3.6.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xext library" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_enable doc specs) + $(use_with doc xmlto) + --without-fop + ) + xorg-3_src_configure +} diff --git a/x11-libs/libXext/metadata.xml b/x11-libs/libXext/metadata.xml index e943b72b8a48..d9597c7b7443 100644 --- a/x11-libs/libXext/metadata.xml +++ b/x11-libs/libXext/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXext</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest index b09a0cd53a87..95206f1c85eb 100644 --- a/x11-libs/libXfixes/Manifest +++ b/x11-libs/libXfixes/Manifest @@ -1 +1 @@ -DIST libXfixes-5.0.3.tar.bz2 294400 BLAKE2B b9a6ce65bef20c24cd75985d7518ab19d7874419d508f4ca6767fe804adfd0e3baebaab69aa9c201901192b8ff5067f5de8d10362ef5c9b6ec12363553389639 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10 +DIST libXfixes-6.0.1.tar.xz 265636 BLAKE2B 829264dc189dbc64aa16e4505464b90a0ccecd97a3c2594b2ad467f17a3bae1413e018f4ddc28608dbbbb3edf3157778158480ae71f8ccf5c17ffc6e7117ffb1 SHA512 b46deffb30cd73ec8a127390d99f2ba2f3ab78f334fdba227f1f461441644a0c169b0d13ffa47576fa458780e7a6db664ff8b93e9195fb217262efd8128f1ffe diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild deleted file mode 100644 index b5970c8e602f..000000000000 --- a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Xfixes library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="x11-base/xorg-proto - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXfixes/libXfixes-6.0.1.ebuild b/x11-libs/libXfixes/libXfixes-6.0.1.ebuild new file mode 100644 index 000000000000..df1f84c6642b --- /dev/null +++ b/x11-libs/libXfixes/libXfixes-6.0.1.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xfixes library" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + >=x11-base/xorg-proto-2021.4" diff --git a/x11-libs/libXfixes/metadata.xml b/x11-libs/libXfixes/metadata.xml index e943b72b8a48..b9264e8801c4 100644 --- a/x11-libs/libXfixes/metadata.xml +++ b/x11-libs/libXfixes/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXfixes</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest index ea362bd0ceb4..e0d77e6aca8e 100644 --- a/x11-libs/libXfont2/Manifest +++ b/x11-libs/libXfont2/Manifest @@ -1 +1 @@ -DIST libXfont2-2.0.4.tar.bz2 513167 BLAKE2B 924cf8462a8fc593755080866b63d6cca6e58b5d875f1d25b95271a56d883e983445f72f8950adf1964e0bf10ca5b8bb2ddfe0c56d4395086e460952a5933bd7 SHA512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106 +DIST libXfont2-2.0.6.tar.xz 446848 BLAKE2B 77e1fd0af5dae4f7d7cec5b9cbd20414df2c66699270ae46f81f6d21f6725b56bb0df9cea504a7a930084a4a759d7dcc3e204ab6c94dfcf0ff0006289f09a68d SHA512 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.6-r1.ebuild index fa279ce88edc..58284adc9d10 100644 --- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild +++ b/x11-libs/libXfont2/libXfont2-2.0.6-r1.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -XORG_PACKAGE_NAME=libxfont XORG_DOC=doc +XORG_PACKAGE_NAME=libxfont +XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xfont library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 ipv6 truetype" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="bzip2 truetype" RDEPEND="sys-libs/zlib - x11-base/xorg-proto + elibc_glibc? ( || ( >=sys-libs/glibc-2.38 dev-libs/libbsd ) ) x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 )" @@ -21,13 +22,14 @@ DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/xtrans" -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + --enable-ipv6 $(use_enable doc devel-docs) $(use_with doc xmlto) $(use_with bzip2) $(use_enable truetype freetype) --without-fop ) + xorg-3_src_configure } diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild deleted file mode 100644 index cfd74911baa4..000000000000 --- a/x11-libs/libXfont2/libXfont2-9999.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_PACKAGE_NAME=libxfont -XORG_DOC=doc -inherit xorg-3 - -DESCRIPTION="X.Org Xfont library" - -KEYWORDS="" -IUSE="bzip2 ipv6 truetype" - -RDEPEND="sys-libs/zlib - x11-base/xorg-proto - x11-libs/libfontenc - bzip2? ( app-arch/bzip2 ) - truetype? ( >=media-libs/freetype-2 )" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/xtrans" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable doc devel-docs) - $(use_with doc xmlto) - $(use_with bzip2) - $(use_enable truetype freetype) - --without-fop - ) -} diff --git a/x11-libs/libXfont2/metadata.xml b/x11-libs/libXfont2/metadata.xml index cb2e6a7213ce..3048bbd52bf5 100644 --- a/x11-libs/libXfont2/metadata.xml +++ b/x11-libs/libXfont2/metadata.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> - </maintainer> - <use> - <flag name="bzip2">Support bzip2 compressed PCF fonts.</flag> - <flag name="truetype">Use media-libs/freetype for font rasterization.</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:x.org:libxfont</remote-id> - </upstream> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <use> + <flag name="bzip2">Support bzip2 compressed PCF fonts.</flag> + <flag name="truetype">Use <pkg>media-libs/freetype</pkg> for font rasterization.</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:x.org:libxfont</remote-id> + <remote-id type="freedesktop-gitlab">xorg/lib/libXfont</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest index 1f2f4e37e905..a3ab839b6293 100644 --- a/x11-libs/libXft/Manifest +++ b/x11-libs/libXft/Manifest @@ -1 +1 @@ -DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8 +DIST libXft-2.3.8.tar.xz 311664 BLAKE2B c850cf5de1a4c6f96e5ff5697c827348c5c0741cbf4f967ca7f6a6c9616253439d80b7a0a121bd82ecd23b11f40e816db182649cbb8c0648872fc4b109203811 SHA512 fc385d73e1acb701942c154ffb5a283d17891f21d3ac598c4a3fb375a7d6082734593062368c15cad67c1a94177dd15deed878ec5ea852188393b52e92c372c8 diff --git a/x11-libs/libXft/libXft-2.3.3.ebuild b/x11-libs/libXft/libXft-2.3.8.ebuild index 4dbd19d6d348..746455070a0a 100644 --- a/x11-libs/libXft/libXft-2.3.3.ebuild +++ b/x11-libs/libXft/libXft-2.3.8.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xft library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc" RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] diff --git a/x11-libs/libXft/metadata.xml b/x11-libs/libXft/metadata.xml index e943b72b8a48..c6226ac4ee0c 100644 --- a/x11-libs/libXft/metadata.xml +++ b/x11-libs/libXft/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXft</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest index 0d5a09adaaf0..7a79f0de2dc2 100644 --- a/x11-libs/libXi/Manifest +++ b/x11-libs/libXi/Manifest @@ -1 +1 @@ -DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218 +DIST libXi-1.8.1.tar.xz 404252 BLAKE2B a25e1e74ef2cc02b455b7b1c5f70040a3b2ecc19d4375c465e63e8b2638b4f90b0480c737fb7dcd5f658330871c623b364b0f8db61d3371cf97d680fdd840058 SHA512 a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9 diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.8.1.ebuild index 5524ed44cbd1..9ac1293acbf5 100644 --- a/x11-libs/libXi/libXi-1.7.10.ebuild +++ b/x11-libs/libXi/libXi-1.8.1.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xi library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - x11-base/xorg-proto" + >=x11-base/xorg-proto-2021.4.99.2" -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( +src_configure() { + local XORG_CONFIGURE_OPTIONS=( $(use_enable doc specs) $(use_with doc xmlto) $(use_with doc asciidoc) --without-fop ) + xorg-3_src_configure } diff --git a/x11-libs/libXi/metadata.xml b/x11-libs/libXi/metadata.xml index e943b72b8a48..98ba0f6f63cd 100644 --- a/x11-libs/libXi/metadata.xml +++ b/x11-libs/libXi/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXi</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest index 3984f27e5b44..fc00170ec68c 100644 --- a/x11-libs/libXinerama/Manifest +++ b/x11-libs/libXinerama/Manifest @@ -1 +1 @@ -DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14 +DIST libXinerama-1.1.5.tar.xz 260272 BLAKE2B fd51aad9c9d42634a246130a8ae0a155e34b67a2225b5f5a30b2bcebed0a9a98f19646625e9e423f0a9318a1358ad5251eb27a20eeb60eabc9ccd330ebdeba92 SHA512 735b5320de4782005b379e409bf2f976131c17d496b297d33a0e127ca1443034778586b6b25c077b2ad73a4ab34d440d7510475e0041f38202bb40f15fb08ff7 diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild deleted file mode 100644 index 7b17509be5c0..000000000000 --- a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Xinerama library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="x11-base/xorg-proto - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXinerama/libXinerama-1.1.5.ebuild b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild new file mode 100644 index 000000000000..94a60a45722f --- /dev/null +++ b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xinerama library" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXinerama/metadata.xml b/x11-libs/libXinerama/metadata.xml index e943b72b8a48..07d37bcf2814 100644 --- a/x11-libs/libXinerama/metadata.xml +++ b/x11-libs/libXinerama/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXinerama</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest index cdb58846ef44..d618fb13c406 100644 --- a/x11-libs/libXmu/Manifest +++ b/x11-libs/libXmu/Manifest @@ -1 +1,2 @@ -DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762 +DIST libXmu-1.1.4.tar.xz 349264 BLAKE2B fe78cd3f529402394c19842b31b2451da2b16dc768b5aac1d157feea0af06b04dbe2be879d17c7ccff08630c0bdab0abbb853bc5672340f55da0cd1412db9df6 SHA512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1 +DIST libXmu-1.2.1.tar.xz 364888 BLAKE2B fca2e16c663483c0147f87830d6a583bb32026719901bd0aa7b7c4e81b18667b7152e0dd0805e22faf51b62e86cffd7a9423c366f1cafd3af007807cf9965262 SHA512 05a30e5961e00e940ad7ec4eb94ec482b5cbe808585972bf70c849333af3fddf4ae4bd87895d706507fb3a94ed0fb73ea161e0e27dc2840323a1a1af49c0e8a3 diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.4.ebuild index cb728135828b..b2834adda38a 100644 --- a/x11-libs/libXmu/libXmu-1.1.3.ebuild +++ b/x11-libs/libXmu/libXmu-1.1.4.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xmu library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ipv6" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] @@ -19,11 +19,11 @@ RDEPEND=" DEPEND="${RDEPEND} x11-base/xorg-proto" -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) +src_configure() { + local XORG_CONFIGURE_OPTIONS=( $(use_enable doc docs) $(use_with doc xmlto) --without-fop ) + xorg-3_src_configure } diff --git a/x11-libs/libXmu/libXmu-1.2.1.ebuild b/x11-libs/libXmu/libXmu-1.2.1.ebuild new file mode 100644 index 000000000000..7b124ffa9dfa --- /dev/null +++ b/x11-libs/libXmu/libXmu-1.2.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xmu library" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + test? ( dev-libs/glib[${MULTILIB_USEDEP}] ) +" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_enable doc docs) + $(use_with doc xmlto) + --without-fop + ) + xorg-3_src_configure +} diff --git a/x11-libs/libXmu/metadata.xml b/x11-libs/libXmu/metadata.xml index e943b72b8a48..c8246dced2f6 100644 --- a/x11-libs/libXmu/metadata.xml +++ b/x11-libs/libXmu/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXmu</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest index 90ef1a76e97b..8f4198a4ac9b 100644 --- a/x11-libs/libXpm/Manifest +++ b/x11-libs/libXpm/Manifest @@ -1 +1 @@ -DIST libXpm-3.5.13.tar.bz2 463251 BLAKE2B eb8a390802f13ffdd8199e21f5f18d4d17141783d7259c6b558dbaddd2dce05f7cb27306dd5cb73e27d01cffa62f5e4808c143b72974dae443e958069e70cd17 SHA512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 +DIST libXpm-3.5.17.tar.xz 468964 BLAKE2B 28b5168495b20b1442f21d0be8395aab58a7e42dfb95e33a60694ccee1aa868b516f35a09d47ba798608a9ed3e4f92c63a3418a0c857a38308a0d95c6fbad4d7 SHA512 52f9d2664a47a26c1a6ad65d18867de870b66947b0b0d99cca3512756a0aaa6ce2a245c0b49f20b70c3ce48bf04c47c333e8119a147465c277bca727f6ab017e diff --git a/x11-libs/libXpm/libXpm-3.5.13.ebuild b/x11-libs/libXpm/libXpm-3.5.13.ebuild deleted file mode 100644 index 1c952f151c47..000000000000 --- a/x11-libs/libXpm/libXpm-3.5.13.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="X.Org Xpm library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="sys-devel/gettext" diff --git a/x11-libs/libXpm/libXpm-3.5.17.ebuild b/x11-libs/libXpm/libXpm-3.5.17.ebuild new file mode 100644 index 000000000000..0fdb9a35b4d2 --- /dev/null +++ b/x11-libs/libXpm/libXpm-3.5.17.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xpm library" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + + app-alternatives/gzip + app-arch/ncompress +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + test? ( >=dev-libs/glib-2.46:2 ) +" +BDEPEND=" + sys-devel/gettext + test? ( + app-arch/gzip + app-arch/ncompress + ) +" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_enable test unit-tests) + ) + xorg-3_src_configure +} diff --git a/x11-libs/libXpm/metadata.xml b/x11-libs/libXpm/metadata.xml index e943b72b8a48..78dbe4c45154 100644 --- a/x11-libs/libXpm/metadata.xml +++ b/x11-libs/libXpm/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXpm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest index a0fdb160f053..c78a20b8a45c 100644 --- a/x11-libs/libXpresent/Manifest +++ b/x11-libs/libXpresent/Manifest @@ -1 +1 @@ -DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b +DIST libXpresent-1.0.1.tar.xz 257136 BLAKE2B 22c66f595f8f42ed8a7bcf60c4ae5689e590e443d9e99785fc8747dabe7aa20031f303c72950c8fdd64b347776f84d17156d539cb83900d60a11dae3b6c21df8 SHA512 a4551f49a68f4487eb70dc5b50b7f745fbc8b6842cfa60422afe3834af41c504a37bcfddb4e7e9ee084b250df256034290776c8eb7d8838e392eb626fff55d25 diff --git a/x11-libs/libXpresent/files/libXpresent-1.0.0-add-depends-to-pkgconfig.patch b/x11-libs/libXpresent/files/libXpresent-1.0.0-add-depends-to-pkgconfig.patch deleted file mode 100644 index 1b5be70a4f3c..000000000000 --- a/x11-libs/libXpresent/files/libXpresent-1.0.0-add-depends-to-pkgconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ -[mattst88] Dropped configure.ac changes. ebuild depends on these. - -From dd6771cdf6f04cde37eb14891573c0e55be83241 Mon Sep 17 00:00:00 2001 -From: Julien Cristau <jcristau@debian.org> -Date: Sun, 26 Apr 2015 17:53:15 +0200 -Subject: configure, xpresent.pc: require xext, xfixes and xrandr - -include/X11/extensions/Xpresent.h:#include <X11/extensions/Xfixes.h> -include/X11/extensions/Xpresent.h:#include <X11/extensions/Xrandr.h> -include/X11/extensions/Xpresent.h:#include <X11/extensions/sync.h> - -v2: also add requirement in xpresent.pc since we include those in our - public header - -Signed-off-by: Julien Cristau <jcristau@debian.org> - -diff --git a/xpresent.pc.in b/xpresent.pc.in -index d5d0d38..8f6047a 100644 ---- a/xpresent.pc.in -+++ b/xpresent.pc.in -@@ -7,6 +7,6 @@ Name: Xpresent - Description: X Present Library - Version: @PACKAGE_VERSION@ - Requires: xproto presentproto >= @PRESENTEXT_VERSION@ --Requires.private: x11 -+Requires.private: x11 xext xfixes xrandr - Cflags: -I${includedir} - Libs: -L${libdir} -lXpresent --- diff --git a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild deleted file mode 100644 index 36cb42c766e0..000000000000 --- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X Present Extension C Library" - -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=" - x11-base/xorg-proto - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-add-depends-to-pkgconfig.patch ) diff --git a/x11-libs/libXpresent/libXpresent-1.0.1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild new file mode 100644 index 000000000000..f4532dbc3c07 --- /dev/null +++ b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X Present Extension C Library" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" + +RDEPEND=" + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXpresent/metadata.xml b/x11-libs/libXpresent/metadata.xml index e943b72b8a48..19117efd1fea 100644 --- a/x11-libs/libXpresent/metadata.xml +++ b/x11-libs/libXpresent/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXpresent</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest index 974a28f31639..d14de463eccd 100644 --- a/x11-libs/libXrandr/Manifest +++ b/x11-libs/libXrandr/Manifest @@ -1 +1 @@ -DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87 +DIST libXrandr-1.5.4.tar.xz 282928 BLAKE2B 683205e5d2727dca1319c096ce035469bc9c70844f57750df465d19fad31c3aadd3535860f5c02aebed324b41ffe4471c0389128fc3d15ef560956bc196ff489 SHA512 f7c0b083943e11b4cc3c97e10e2cbbc3920fe0c9c5031ef86fca2eb5df413d767caf53dca266abf65395eb10e55354c8fe59ed6b3265402ffccb919a813bc781 diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.4.ebuild index 321ee557d984..2937fa4dff89 100644 --- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild +++ b/x11-libs/libXrandr/libXrandr-1.5.4.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xrandr library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc" RDEPEND=" diff --git a/x11-libs/libXrandr/metadata.xml b/x11-libs/libXrandr/metadata.xml index e943b72b8a48..6a73169216a8 100644 --- a/x11-libs/libXrandr/metadata.xml +++ b/x11-libs/libXrandr/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXrandr</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest index 90b620b7a259..6d46a5d40c0a 100644 --- a/x11-libs/libXrender/Manifest +++ b/x11-libs/libXrender/Manifest @@ -1 +1 @@ -DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe +DIST libXrender-0.9.11.tar.xz 302900 BLAKE2B b603118a02bc0bd64a98ac9820e6fd46a0613441b630d10aa8955c3a5e364c283f3d7323f7cd64e6c3a4c599409ae9d7c847751edc3250946342008abb66a015 SHA512 2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de diff --git a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild deleted file mode 100644 index fb3071e83370..000000000000 --- a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Xrender library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="x11-base/xorg-proto - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXrender/libXrender-0.9.11.ebuild b/x11-libs/libXrender/libXrender-0.9.11.ebuild new file mode 100644 index 000000000000..eb64ae980c3e --- /dev/null +++ b/x11-libs/libXrender/libXrender-0.9.11.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xrender library" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXrender/metadata.xml b/x11-libs/libXrender/metadata.xml index e943b72b8a48..d758ae51b5c8 100644 --- a/x11-libs/libXrender/metadata.xml +++ b/x11-libs/libXrender/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXrender</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest index 989d4f8173f9..6050f0f2978b 100644 --- a/x11-libs/libXres/Manifest +++ b/x11-libs/libXres/Manifest @@ -1 +1 @@ -DIST libXres-1.2.0.tar.bz2 286635 BLAKE2B 0c0813118c7ecd5851b075a4001e0e34fa3df92bd8367717eee42ec20352cab3443d232715c1d40c5df313f6508d2dddc779980d11744a1f897cc7511bfdfdf4 SHA512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172 +DIST libXres-1.2.2.tar.xz 261400 BLAKE2B 569d4e4b8bf43254139a7c1428ba9dbce592930b05588ca90266e42721fe7cdfb997d05f983dce97afda460c39b9b232128f760f2c69aa87d800f948562a03fc SHA512 897f2d426ea6f41169a5a52c356d1a1cb2ffb9144ae41b9fedd06455c3d81042930fe55be269ce4b8545ee65fcfe168101192a599053d810e8810f627c94f810 diff --git a/x11-libs/libXres/libXres-1.2.0-r1.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild deleted file mode 100644 index 6516b7f4a2ef..000000000000 --- a/x11-libs/libXres/libXres-1.2.0-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit xorg-2 - -DESCRIPTION="X.Org XRes library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXres/libXres-1.2.2.ebuild b/x11-libs/libXres/libXres-1.2.2.ebuild new file mode 100644 index 000000000000..7e53a18d6d56 --- /dev/null +++ b/x11-libs/libXres/libXres-1.2.2.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org XRes library" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND="x11-libs/libX11 + x11-libs/libXext" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXres/metadata.xml b/x11-libs/libXres/metadata.xml index e943b72b8a48..1edcea235fde 100644 --- a/x11-libs/libXres/metadata.xml +++ b/x11-libs/libXres/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXres</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest index 10bc7df2fdb2..3693dc4a2d0b 100644 --- a/x11-libs/libXt/Manifest +++ b/x11-libs/libXt/Manifest @@ -1 +1 @@ -DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1 +DIST libXt-1.3.0.tar.xz 688084 BLAKE2B e8ac62bee544521471f25d3138b88d8d740bf8701aa7b6c1badcb9f725659c2648f3fd31813e0a05f1091514323bcea0788319cd36dfa945213f83cae87afb7c SHA512 64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118 diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.3.0.ebuild index 5f0a40ed243a..41ed5f22c83a 100644 --- a/x11-libs/libXt/libXt-1.2.0.ebuild +++ b/x11-libs/libXt/libXt-1.3.0.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org X Toolkit Intrinsics library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -21,11 +21,12 @@ DEPEND="${RDEPEND} x11-base/xorg-proto test? ( dev-libs/glib[${MULTILIB_USEDEP}] )" -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( +src_configure() { + local XORG_CONFIGURE_OPTIONS=( $(use_with doc xmlto) $(use_enable doc specs) $(use_enable test unit-tests) --without-fop ) + xorg-3_src_configure } diff --git a/x11-libs/libXt/metadata.xml b/x11-libs/libXt/metadata.xml index e943b72b8a48..938f41e6afae 100644 --- a/x11-libs/libXt/metadata.xml +++ b/x11-libs/libXt/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXt</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest index 85f0651d5109..1361afb91270 100644 --- a/x11-libs/libXtst/Manifest +++ b/x11-libs/libXtst/Manifest @@ -1 +1 @@ -DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765 +DIST libXtst-1.2.4.tar.xz 287636 BLAKE2B 6c3e6154f221530158b8275ee638934c633f2e812333df0093a01663c416ded0b6be509578cca78d51c6b540ab17379e1e0503bf296abe3112f1afeda12e4af9 SHA512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d diff --git a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild deleted file mode 100644 index 358c3155ac7d..000000000000 --- a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_DOC="doc" -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="x11-base/xorg-proto - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXtst/libXtst-1.2.4.ebuild b/x11-libs/libXtst/libXtst-1.2.4.ebuild new file mode 100644 index 000000000000..5d7e071c9c92 --- /dev/null +++ b/x11-libs/libXtst/libXtst-1.2.4.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXtst/metadata.xml b/x11-libs/libXtst/metadata.xml index e943b72b8a48..70920d078425 100644 --- a/x11-libs/libXtst/metadata.xml +++ b/x11-libs/libXtst/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXtst</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest index 223d5bba4d18..972bbbc76147 100644 --- a/x11-libs/libXv/Manifest +++ b/x11-libs/libXv/Manifest @@ -1 +1 @@ -DIST libXv-1.0.11.tar.bz2 317921 BLAKE2B 3c656e1f5cd02c936813b3e10a359d23e7a8643a45ade42ddd584084ba04d09cafbefcc68ab9356b78c1a716a050637062e956c7f50a03a522d28ff7aa31c3b0 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58 +DIST libXv-1.0.12.tar.xz 276020 BLAKE2B 567e824b77dd05a9e48f0ff0a4591d7088ee5b681b8822cda6a89c85b14a7471603cc5c80138d0734d7adaf9746610d443013492d10aa2a9efe4749e15e0388c SHA512 bdd00de1ce6a8911056181ab4de32f9e319a68567389162d4bc2e3c9946d5f3c60f87eb6c53f74c9b6a342255e591d5fef4a445a4ac8ca3c1b6fe87d42c51c1e diff --git a/x11-libs/libXv/libXv-1.0.11-r1.ebuild b/x11-libs/libXv/libXv-1.0.11-r1.ebuild deleted file mode 100644 index 542f6414c7b9..000000000000 --- a/x11-libs/libXv/libXv-1.0.11-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Xv library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="x11-base/xorg-proto - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXv/libXv-1.0.12.ebuild b/x11-libs/libXv/libXv-1.0.12.ebuild new file mode 100644 index 000000000000..5b3c83c8baaf --- /dev/null +++ b/x11-libs/libXv/libXv-1.0.12.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xv library" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXv/metadata.xml b/x11-libs/libXv/metadata.xml index e943b72b8a48..f6b405aca6a8 100644 --- a/x11-libs/libXv/metadata.xml +++ b/x11-libs/libXv/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXv</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest index a83e6a51a86d..b0bf84b4834d 100644 --- a/x11-libs/libXvMC/Manifest +++ b/x11-libs/libXvMC/Manifest @@ -1 +1 @@ -DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955 +DIST libXvMC-1.0.14.tar.xz 278492 BLAKE2B 91c50f188ff944e9515043b0ff4b76477814a12a281a577dced157b8ffac5512f282c9393592c384743fb908bfc745f985e8f622e7a7034f84aa3ceb5bb1e004 SHA512 fc76c6d591780f3481f5032d1f956f2043f3dc7655a4b776dfda4bae55d4424a36d1a3c63dafe2a851908f33159297c0b038a41329d7a137ca7ea73d3db3eedf diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild deleted file mode 100644 index 4c60cab7e1c0..000000000000 --- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="X.Org XvMC library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="" - -RDEPEND=" - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] - !<x11-base/xorg-proto-2019.2" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -PDEPEND="app-eselect/eselect-xvmc" diff --git a/x11-libs/libXvMC/libXvMC-1.0.14.ebuild b/x11-libs/libXvMC/libXvMC-1.0.14.ebuild new file mode 100644 index 000000000000..5cc898da65c5 --- /dev/null +++ b/x11-libs/libXvMC/libXvMC-1.0.14.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 meson-multilib + +DESCRIPTION="X.Org XvMC library" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +# Override xorg-3's src_prepare +src_prepare() { + default +} + +multilib_src_configure() { + local emesonargs=( + -Ddefault_library=shared + ) + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + mv "${ED}"/usr/share/doc/{${PN},${P}}/XvMC_API.txt || die + rmdir "${ED}"/usr/share/doc/${PN} || die +} diff --git a/x11-libs/libXvMC/metadata.xml b/x11-libs/libXvMC/metadata.xml index e943b72b8a48..f27bc93b06b1 100644 --- a/x11-libs/libXvMC/metadata.xml +++ b/x11-libs/libXvMC/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXvMC</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest index 224a62d1967b..2a003470fdd1 100644 --- a/x11-libs/libXxf86dga/Manifest +++ b/x11-libs/libXxf86dga/Manifest @@ -1 +1 @@ -DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89 +DIST libXxf86dga-1.1.6.tar.xz 267760 BLAKE2B cd571cd05f205ea770335e1d12f0051f85d786317d051cb22d0dfbaf105f2e6e2df36d50c2113b525fb7ab16a9f3c1262b5fdab864570f81f7318bc5019201ae SHA512 61f7954471df63840ffb5e82347018e285d30d64d4d0a97770ca031c8554a0f52d1b007ab8342a283cd2f0d534f564fb59f57ec92515714f20a7d145912c65d9 diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild index 2b6893fd7043..7bfbcb8ff59f 100644 --- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild +++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xxf86dga library" - -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc" RDEPEND=" diff --git a/x11-libs/libXxf86dga/metadata.xml b/x11-libs/libXxf86dga/metadata.xml index e943b72b8a48..7a351d94894f 100644 --- a/x11-libs/libXxf86dga/metadata.xml +++ b/x11-libs/libXxf86dga/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXxf86dga</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest deleted file mode 100644 index b356b57efafb..000000000000 --- a/x11-libs/libXxf86misc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libXxf86misc-1.0.4.tar.bz2 282048 BLAKE2B 5d60bc5d04f232444143aa1d89b5760a92aa5951efb41b83eed449916219346d049f0c2b7893858c7ba5148dcf273bb0d2b558e43843f897d057780362d0ccca SHA512 1dbd51a51188a060f676b88e5d98809ea355f69933972ceb7721c83289b5bb94c1f7b889baa83209a5ed864e67dd8a4ed62f1393634e97cc99ce36a2cef447fb diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild deleted file mode 100644 index 77d0a9236e43..000000000000 --- a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit xorg-2 - -DESCRIPTION="X.Org Xxf86misc library" - -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXxf86misc/metadata.xml b/x11-libs/libXxf86misc/metadata.xml deleted file mode 100644 index e943b72b8a48..000000000000 --- a/x11-libs/libXxf86misc/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -</pkgmetadata> diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest index 6903725394e2..aec6416bb92f 100644 --- a/x11-libs/libXxf86vm/Manifest +++ b/x11-libs/libXxf86vm/Manifest @@ -1 +1 @@ -DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0 +DIST libXxf86vm-1.1.5.tar.xz 265384 BLAKE2B 4e94267ad815cf47ec558959ca122d89b5f8b54ead2b2cb93dc3ef7f9bc694b515978a0b2301bb8e48d32bc768595b50cd8cb71e7a65c65a752699b80c2c079b SHA512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6 diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild deleted file mode 100644 index 5136c718ee31..000000000000 --- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Xxf86vm library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="x11-base/xorg-proto - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild new file mode 100644 index 000000000000..cac85a119588 --- /dev/null +++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xxf86vm library" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXxf86vm/metadata.xml b/x11-libs/libXxf86vm/metadata.xml index e943b72b8a48..01301f064958 100644 --- a/x11-libs/libXxf86vm/metadata.xml +++ b/x11-libs/libXxf86vm/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libXxf86vm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest deleted file mode 100644 index 625316657e63..000000000000 --- a/x11-libs/libast/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d diff --git a/x11-libs/libast/libast-0.7-r2.ebuild b/x11-libs/libast/libast-0.7-r2.ebuild deleted file mode 100644 index 1d705a9e46f5..000000000000 --- a/x11-libs/libast/libast-0.7-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="LIBrary of Assorted Spiffy Things" -HOMEPAGE="http://www.eterm.org/download/" -SRC_URI="http://www.eterm.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="imlib cpu_flags_x86_mmx pcre" - -RDEPEND=" - !sci-astronomy/ast - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - media-libs/freetype - imlib? ( media-libs/imlib2 ) - pcre? ( dev-libs/libpcre )" - -DEPEND="${RDEPEND}" - -DOCS=( README DESIGN ChangeLog ) - -src_prepare() { - default - local myregexp="posix" - use pcre && myregexp="pcre" - econf \ - $(use_with imlib) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - --with-regexp="${myregexp}" -} - -src_install() { - default - emake DESTDIR="${D}" install -} diff --git a/x11-libs/libast/metadata.xml b/x11-libs/libast/metadata.xml deleted file mode 100644 index dd5dfdb80459..000000000000 --- a/x11-libs/libast/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -<longdescription> -LibAST is the Library of Assorted Spiffy Things. It contains many -spiffy things, and it is a library. Thus, the ever-so-creative name. -LibAST has been previously known as libmej, the Eterm helper library -which nobody really understood and certainly never used. My current -plan is to gradually remove some of the neat stuff from Eterm that -could be made generic (things like the theme parsing engine, the -command-line options parser, perhaps the event engine, ...) and place -it here in the hopes that others will find them useful. -</longdescription> -</pkgmetadata> diff --git a/x11-libs/libclxclient/libclxclient-3.9.2.ebuild b/x11-libs/libclxclient/libclxclient-3.9.2.ebuild index 5baa5183f222..b257be17e7c2 100644 --- a/x11-libs/libclxclient/libclxclient-3.9.2.ebuild +++ b/x11-libs/libclxclient/libclxclient-3.9.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,6 +22,7 @@ CDEPEND=" " RDEPEND="${CDEPEND}" DEPEND="${CDEPEND}" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/clxclient-${PV}" diff --git a/x11-libs/libclxclient/metadata.xml b/x11-libs/libclxclient/metadata.xml index c870d0eef0ab..b69a849fd57e 100644 --- a/x11-libs/libclxclient/metadata.xml +++ b/x11-libs/libclxclient/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sound@gentoo.org</email> diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest deleted file mode 100644 index 2eb76c23fa70..000000000000 --- a/x11-libs/libcryptui/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libcryptui-3.12.2.tar.xz 1163784 BLAKE2B 4a13f5dbe4229673da293115dd0d57added87f0522d6ed41d3072780e738b64bfee7c1b9af5872e9877ae22117492a5e3e1b119d4842536c2e762870fe8de85e SHA512 50ef407f0a9fe2ac8f4ab075e125fe8eabc55160b9b96a852d34e52c46be04e04b2a7c8288d2669e24865a89dc179af6bb0da8f6799e8b07fff7bc667c8eb1f0 diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch deleted file mode 100644 index d3fdf3c408d0..000000000000 --- a/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a576e407d913b35804f838d615da52899681d61d Mon Sep 17 00:00:00 2001 -From: Andreas Henriksson <andreas@fatal.se> -Date: Mon, 15 Aug 2016 18:12:06 +0200 -Subject: [PATCH 2/3] daemon: fix conflicting return types - -... in functions seahorse_dbus_server_{init,cleanup} - -Reported-by: Michael Tautschnig <mt@debian.org> -Bug-Debian: https://bugs.debian.org/749001 - -https://bugzilla.gnome.org/show_bug.cgi?id=769943 ---- - daemon/seahorse-daemon.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/daemon/seahorse-daemon.h b/daemon/seahorse-daemon.h -index 93c0c452..09716bb5 100644 ---- a/daemon/seahorse-daemon.h -+++ b/daemon/seahorse-daemon.h -@@ -24,9 +24,9 @@ - /* seahorse-dbus-server.c --------------------------------------------------- */ - - --gboolean seahorse_dbus_server_init (); -+void seahorse_dbus_server_init (); - --gboolean seahorse_dbus_server_cleanup (); -+void seahorse_dbus_server_cleanup (); - - DBusGConnection* seahorse_dbus_server_get_connection (); - --- -2.14.1 - diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch deleted file mode 100644 index d968dd367a11..000000000000 --- a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 183d7619c29482a5d4ae8019692899f87f198171 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot <ajacoutot@gnome.org> -Date: Sat, 17 Oct 2015 08:52:35 +0200 -Subject: [PATCH] Allow building with gnupg 2.1. - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 406b9f3f..b621b236 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check, - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.1" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) - ok="no" --- -2.14.1 - diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch deleted file mode 100644 index 4feaf2b18265..000000000000 --- a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 98afc46861678162aad8cae1c4c01dc4d6780bef Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Sat, 2 Sep 2017 17:48:44 +0200 -Subject: [PATCH] Allow building with gnupg 2.2 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4486e7b2..be5b28b4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check, - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0 2.1" -+ accepted_versions="1.2 1.4 2.0 2.1 2.2" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) - ok="no" --- -2.14.1 - diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch deleted file mode 100644 index 5ca31f664136..000000000000 --- a/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 728aceb6defd4e6e4f07fa49ca76f5e745230fee Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Date: Fri, 16 Sep 2016 11:46:55 +0200 -Subject: [PATCH 3/3] daemon: port to gcr-3 - -This removes the dependency on libgnome-keyring and adds a dependency -on libgcr instead. - -Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Signed-off-by: Stef Walter <stefw@redhat.com> - * Updated commit message - -https://bugzilla.gnome.org/show_bug.cgi?id=771522 ---- - configure.ac | 14 +++++++------- - daemon/seahorse-secure-buffer.c | 7 ++++--- - daemon/seahorse-secure-memory.c | 21 +++++++++++---------- - 3 files changed, 22 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b621b236..4486e7b2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -252,18 +252,18 @@ if test "$enable_fatal_messages" = "yes" && test "$enable_debug" = "yes"; then - fi - - dnl **************************************************************************** --dnl GNOME-KEYRING -+dnl GCR - dnl **************************************************************************** - --PKG_CHECK_MODULES([GNOME_KEYRING], gnome-keyring-1 >= 2.25.5, -- [enable_gnome_keyring=yes],[enable_gnome_keyring=no]) -+PKG_CHECK_MODULES([GCR], gcr-3, -+ [enable_gcr=yes],[enable_gcr=no]) - --if test "$enable_gnome_keyring" = "no"; then -- AC_MSG_ERROR([gnome-keyring library or headers not found.]) -+if test "$enable_gcr" = "no"; then -+ AC_MSG_ERROR([gcr library or headers not found.]) - fi - --SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS" --SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS" -+SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCR_CFLAGS" -+SEAHORSE_LIBS="$SEAHORSE_LIBS $GCR_LIBS" - - dnl **************************************************************************** - dnl LIBCRYPTUI -diff --git a/daemon/seahorse-secure-buffer.c b/daemon/seahorse-secure-buffer.c -index 0db87961..63f87cd3 100644 ---- a/daemon/seahorse-secure-buffer.c -+++ b/daemon/seahorse-secure-buffer.c -@@ -20,7 +20,8 @@ - #include "config.h" - - #include "seahorse-secure-buffer.h" --#include <gnome-keyring-memory.h> -+#define GCR_API_SUBJECT_TO_CHANGE 1 -+#include <gcr/gcr.h> - - #include <string.h> - -@@ -92,7 +93,7 @@ seahorse_secure_buffer_real_insert_text (GtkEntryBuffer *buffer, guint position, - } - } - -- pv->text = gnome_keyring_memory_realloc (pv->text, pv->text_size); -+ pv->text = gcr_secure_memory_realloc (pv->text, pv->text_size); - } - - /* Actual text insertion */ -@@ -158,7 +159,7 @@ seahorse_secure_buffer_finalize (GObject *obj) - SeahorseSecureBufferPrivate *pv = self->priv; - - if (pv->text) { -- gnome_keyring_memory_free (pv->text); -+ gcr_secure_memory_free (pv->text); - pv->text = NULL; - pv->text_bytes = pv->text_size = 0; - pv->text_chars = 0; -diff --git a/daemon/seahorse-secure-memory.c b/daemon/seahorse-secure-memory.c -index 3d94a674..f201d1df 100644 ---- a/daemon/seahorse-secure-memory.c -+++ b/daemon/seahorse-secure-memory.c -@@ -23,7 +23,8 @@ - - #include <glib.h> - --#include <gnome-keyring-memory.h> -+#define GCR_API_SUBJECT_TO_CHANGE 1 -+#include <gcr/gcr.h> - - #include "seahorse-secure-memory.h" - -@@ -47,7 +48,7 @@ switch_malloc (gsize size) - if (size == 0) - return NULL; - if (seahorse_use_secure_mem) -- p = gnome_keyring_memory_try_alloc (size); -+ p = gcr_secure_memory_try_alloc (size); - else - p = malloc (size); - return p; -@@ -71,7 +72,7 @@ switch_calloc (gsize num, gsize size) - if (size == 0 || num == 0) - return NULL; - if (seahorse_use_secure_mem) -- p = gnome_keyring_memory_try_alloc (size * num); -+ p = gcr_secure_memory_try_alloc (size * num); - else - p = calloc (num, size); - return p; -@@ -99,11 +100,11 @@ switch_realloc (gpointer mem, gsize size) - - if (!mem) { - if (seahorse_use_secure_mem) -- p = gnome_keyring_memory_alloc (size); -+ p = gcr_secure_memory_alloc (size); - else - p = malloc (size); -- } else if (gnome_keyring_memory_is_secure (mem)) -- p = gnome_keyring_memory_try_realloc (mem, size); -+ } else if (gcr_secure_memory_is_secure (mem)) -+ p = gcr_secure_memory_try_realloc (mem, size); - else - p = realloc (mem, size); - return p; -@@ -120,8 +121,8 @@ static void - switch_free (gpointer mem) - { - if (mem) { -- if (gnome_keyring_memory_is_secure (mem)) -- gnome_keyring_memory_free (mem); -+ if (gcr_secure_memory_is_secure (mem)) -+ gcr_secure_memory_free (mem); - else - free (mem); - } -@@ -138,9 +139,9 @@ seahorse_try_gk_secure_memory () - { - gpointer p; - -- p = gnome_keyring_memory_try_alloc (10); -+ p = gcr_secure_memory_try_alloc (10); - if (p != NULL) { -- gnome_keyring_memory_free (p); -+ gcr_secure_memory_free (p); - return TRUE; - } - --- -2.14.1 - diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch deleted file mode 100644 index 0a172a635107..000000000000 --- a/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7c805b5d4eca798a03ac56b40e53cb335e30c187 Mon Sep 17 00:00:00 2001 -From: Vlad Orlov <monsta@inbox.ru> -Date: Mon, 15 Aug 2016 18:23:31 +0200 -Subject: [PATCH 1/3] libcryptui: fix logic flaw in the prompt recipients - dialog - -The prompt recipients dialog has been broken in commit -https://github.com/GNOME/libcryptui/commit/cd74aa6bf810a5ce0935d2ec89d6db64dbbde24d#diff-f0ea8a1eef5386b0149314d2a1743e85L202 - -The patch fixes the logic there and makes seahorse-tool's -encrypt command work again. Therefore, seahorse plugins for both -Nautilus and Nemo should start working as well. - -Bug-Debian: https://bugs.debian.org/770436 - -https://bugzilla.gnome.org/show_bug.cgi?id=769944 - -Reviewed-by: Stef Walter <stefw@gnome.org> ---- - libcryptui/cryptui.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libcryptui/cryptui.c b/libcryptui/cryptui.c -index 92f0d5d4..2bbfa409 100644 ---- a/libcryptui/cryptui.c -+++ b/libcryptui/cryptui.c -@@ -211,7 +211,7 @@ cryptui_prompt_recipients_with_symmetric (CryptUIKeyset *keyset, - *symmetric = cryptui_key_chooser_get_symmetric (chooser); - } - -- if (symmetric != NULL && !*symmetric) { -+ if (symmetric == NULL || *symmetric == FALSE) { - recipients = cryptui_key_chooser_get_recipients (chooser); - keys = g_new0(gchar*, g_list_length (recipients) + 1); - for (l = recipients, i = 0; l; l = g_list_next (l), i++) --- -2.14.1 - diff --git a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild deleted file mode 100644 index f9dd72c17240..000000000000 --- a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" - -inherit gnome2 - -DESCRIPTION="User interface components for OpenPGP" -HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse" - -LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1" -SLOT="0" -IUSE="debug +introspection libnotify" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86" - -# Pull in libnotify-0.7 because it's controlled via an automagic ifdef -COMMON_DEPEND=" - >=dev-libs/glib-2.32:2 - >=x11-libs/gtk+-3:3[introspection?] - >=dev-libs/dbus-glib-0.72 - >=app-crypt/gcr-3[gtk] - x11-libs/libICE - x11-libs/libSM - - >=app-crypt/gpgme-1:1= - >=app-crypt/gnupg-1.4 - - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) - libnotify? ( >=x11-libs/libnotify-0.7:= ) -" -DEPEND="${COMMON_DEPEND} - app-text/rarian - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" -# Before 3.1.4, libcryptui was part of seahorse -RDEPEND="${COMMON_DEPEND} - !<app-crypt/seahorse-3.1.4 -" - -PATCHES=( - # Support GnuPG 2.1, in master - # https://bugzilla.gnome.org/show_bug.cgi?id=745843 - "${FILESDIR}"/${PN}-3.12.2-gnupg-2.1.patch - # from master, in Debian as well - "${FILESDIR}"/${PN}-3.12.2-prompt-recipient.patch - "${FILESDIR}"/${PN}-3.12.2-fix-return-types.patch - "${FILESDIR}"/${PN}-3.12.2-port-gcr-3.patch - # Support GnuPG 2.2 - # https://bugs.gentoo.org/show_bug.cgi?id=629572 - "${FILESDIR}"/${PN}-3.12.2-gnupg-2.2.patch -) - -src_prepare() { - # FIXME: Do not mess with CFLAGS with USE="debug" - sed -e '/CFLAGS="$CFLAGS -g -O0/d' \ - -e 's/-Werror//' \ - -i configure.ac configure || die "sed failed" - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --disable-update-mime-database \ - $(use_enable debug) \ - $(use_enable introspection) \ - $(use_enable libnotify) -} diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml deleted file mode 100644 index 39980802b1da..000000000000 --- a/x11-libs/libcryptui/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild b/x11-libs/libdlo/libdlo-0.1.2-r2.ebuild index bded69069db1..5854396239bc 100644 --- a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild +++ b/x11-libs/libdlo/libdlo-0.1.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools diff --git a/x11-libs/libdlo/metadata.xml b/x11-libs/libdlo/metadata.xml index aa25988e5b07..862238e9e7d2 100644 --- a/x11-libs/libdlo/metadata.xml +++ b/x11-libs/libdlo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>conikost@gentoo.org</email> diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest deleted file mode 100644 index 4470d278d9c6..000000000000 --- a/x11-libs/libdmx/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9 diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild deleted file mode 100644 index cb4400adde85..000000000000 --- a/x11-libs/libdmx/libdmx-1.1.4.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit xorg-2 - -DESCRIPTION="X.Org dmx library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" -IUSE="" - -RDEPEND="x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libdmx/metadata.xml b/x11-libs/libdmx/metadata.xml deleted file mode 100644 index e943b72b8a48..000000000000 --- a/x11-libs/libdmx/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -</pkgmetadata> diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest index 703e4d8c2f7e..2bae8342c4a8 100644 --- a/x11-libs/libdockapp/Manifest +++ b/x11-libs/libdockapp/Manifest @@ -1 +1 @@ -DIST libdockapp-0.7.2.tar.gz 40462 BLAKE2B 8d4d2e3d9b1856875a275661cba809852e7c91867ffae33052bc472208db911c19caf1b77b16e367f007e1606be6add6d9bc5a1e76ea8fa2b8616163e922f21e SHA512 a2f216ac1105abe0efbea191691bae986b6022510f96c78b08c1b809cff131794c81810197af7d1321f9b248202376cc7092e79a4d4afa3fb93e9ed8000c9d79 +DIST libdockapp-0.7.3.tar.gz 387507 BLAKE2B 83c11c81701b2be5eb197cf54ecb9ff34ad5d6cd730b2538a6ec8176dbf3728a98ff635a2da4ba2cc9238b559f1f6fe59126f9880e11099541a1e2d6e0faf246 SHA512 38d35599675fc8a8e9d14b0f059a0d1585106ed870210712f53f315d0442e98ad1df40a74b9f00e3f22656cb859d03fc93793b6042b9432394e572b89c58a815 diff --git a/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch b/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch deleted file mode 100644 index 80f54c88cf26..000000000000 --- a/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur libdockapp-0.7.2.orig/src/wmgeneral.c libdockapp-0.7.2/src/wmgeneral.c ---- libdockapp-0.7.2.orig/src/wmgeneral.c 2015-10-27 10:32:25.000000000 +0100 -+++ libdockapp-0.7.2/src/wmgeneral.c 2020-03-29 17:12:56.648083089 +0200 -@@ -85,6 +85,7 @@ - GC NormalGC; - XpmIcon wmgen; - Pixmap pixmask; -+Display *display; - - /*****************/ - /* Mouse Regions */ -diff -Naur libdockapp-0.7.2.orig/src/wmgeneral.h libdockapp-0.7.2/src/wmgeneral.h ---- libdockapp-0.7.2.orig/src/wmgeneral.h 2015-10-27 10:32:25.000000000 +0100 -+++ libdockapp-0.7.2/src/wmgeneral.h 2020-03-29 17:12:41.411042265 +0200 -@@ -66,7 +66,7 @@ - /* Global variable */ - /*******************/ - --Display *display; -+extern Display *display; - - /***********************/ - /* Function Prototypes */ diff --git a/x11-libs/libdockapp/libdockapp-0.7.2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild deleted file mode 100644 index 1e3c71d610be..000000000000 --- a/x11-libs/libdockapp/libdockapp-0.7.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools font - -DESCRIPTION="Window Maker Dock Applet Library" -HOMEPAGE="https://www.dockapps.net/libdockapp" -SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" - -LICENSE="MIT public-domain" -SLOT="0/3" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" -# Required for font eclass -IUSE="+X" -REQUIRED_USE="X" - -RDEPEND="x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext - x11-libs/libXpm" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -FONT_S=${S}/fonts -FONT_SUFFIX="gz" -DOCS="README ChangeLog NEWS AUTHORS" - -src_prepare() -{ - eautoreconf -} - -src_configure() -{ - # Font installation handled by font eclass - econf --without-font --without-examples -} - -src_install() -{ - emake DESTDIR="${D}" install - font_src_install -} diff --git a/x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild index 146ca4db16de..2ed25f582411 100644 --- a/x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild +++ b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools font +inherit font DESCRIPTION="Window Maker Dock Applet Library" HOMEPAGE="https://www.dockapps.net/libdockapp" -SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" +SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" LICENSE="MIT public-domain" SLOT="0/3" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" -# Required for font eclass -IUSE="+X" +KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86" +# X required for font eclass +IUSE="+X static-libs" REQUIRED_USE="X" RDEPEND="x11-libs/libX11 @@ -25,22 +25,18 @@ DEPEND="${RDEPEND} FONT_S=${S}/fonts FONT_SUFFIX="gz" DOCS="README ChangeLog NEWS AUTHORS" -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) -src_prepare() -{ - default - eautoreconf -} - -src_configure() -{ +src_configure() { # Font installation handled by font eclass - econf --without-font --without-examples + econf \ + $(use_enable static-libs static) \ + --without-font \ + --without-examples } -src_install() -{ +src_install() { emake DESTDIR="${D}" install font_src_install + + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/x11-libs/libdockapp/metadata.xml b/x11-libs/libdockapp/metadata.xml index 1d5e6504004e..0cd5b9db476b 100644 --- a/x11-libs/libdockapp/metadata.xml +++ b/x11-libs/libdockapp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>voyageur@gentoo.org</email> diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest index 6fefb9e3a4fa..df01bc319859 100644 --- a/x11-libs/libdrm/Manifest +++ b/x11-libs/libdrm/Manifest @@ -1,2 +1 @@ -DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247 -DIST libdrm-2.4.101.tar.xz 408856 BLAKE2B 4b2ab7ecf6c360bbe259913943aadabacdbc4fe2eef72cddced4e2abf830e253230d28c8c2e595f93c20a48813eeeef6eb8d20250a8afe1ddce76c48bfa3988a SHA512 658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c +DIST libdrm-2.4.120.tar.xz 479564 BLAKE2B 218d674da334c32aae27a31c10992cb276b08543704c875c7d7bf8f3dd348d1cf1c95f35b0afc8f3034d83152c2df460f84807388a21b241792db3e81c98dbfc SHA512 6dc16e5134a669eeb59debb1dc2d15b857483ab7476dc2b94bd05a32d8953f046f5656f6cf9e1a63e97e7156fb65ebb58b6a29fe45cb6326058baaf820626e70 diff --git a/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch b/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch new file mode 100644 index 000000000000..1d01db322a8c --- /dev/null +++ b/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch @@ -0,0 +1,62 @@ +https://bugs.gentoo.org/927204 +https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/353 + +From 525e80447fee011734af464b3b5d478b2b7b17af Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Fri, 22 Mar 2024 11:20:17 -0400 +Subject: [PATCH 1/2] symbols-check: Add _GLOBAL_OFFSET_TABLE_ + +This is exported on hppa/parisc. + +See also: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26978 + +Bug: https://bugs.gentoo.org/927204 +--- + symbols-check.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/symbols-check.py b/symbols-check.py +index 2e7ba68d1..47bc3bead 100644 +--- a/symbols-check.py ++++ b/symbols-check.py +@@ -7,6 +7,7 @@ import subprocess + + # This list contains symbols that _might_ be exported for some platforms + PLATFORM_SYMBOLS = [ ++ '_GLOBAL_OFFSET_TABLE_', + '__bss_end__', + '__bss_start__', + '__bss_start', +-- +GitLab + + +From c45ffb1edf19faff79238934abe01fd92e9e3d0a Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Fri, 22 Mar 2024 11:21:39 -0400 +Subject: [PATCH 2/2] symbols-check: Add _fbss, _fdata, _ftext + +These are exported on mips/mips64. + +See also: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11955 +--- + symbols-check.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/symbols-check.py b/symbols-check.py +index 47bc3bead..c63c0d112 100644 +--- a/symbols-check.py ++++ b/symbols-check.py +@@ -17,6 +17,9 @@ PLATFORM_SYMBOLS = [ + '_end', + '_fini', + '_init', ++ '_fbss', ++ '_fdata', ++ '_ftext', + ] + + +-- +GitLab + diff --git a/x11-libs/libdrm/libdrm-2.4.100.ebuild b/x11-libs/libdrm/libdrm-2.4.100.ebuild deleted file mode 100644 index 83a5eaf7240b..000000000000 --- a/x11-libs/libdrm/libdrm-2.4.100.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson multilib-minimal - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} libkms valgrind" -RESTRICT="test" # see bug #236845 -LICENSE="MIT" -SLOT="0" - -RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] ) - video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind )" - -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_src_unpack -} - -multilib_src_configure() { - local emesonargs=( - # Udev is only used by tests now. - -Dudev=false - -Dcairo-tests=false - -Damdgpu=$(usex video_cards_amdgpu true false) - -Dexynos=$(usex video_cards_exynos true false) - -Dfreedreno=$(usex video_cards_freedreno true false) - -Dintel=$(usex video_cards_intel true false) - -Dnouveau=$(usex video_cards_nouveau true false) - -Domap=$(usex video_cards_omap true false) - -Dradeon=$(usex video_cards_radeon true false) - -Dtegra=$(usex video_cards_tegra true false) - -Dvc4=$(usex video_cards_vc4 true false) - -Detnaviv=$(usex video_cards_vivante true false) - -Dvmwgfx=$(usex video_cards_vmware true false) - -Dlibkms=$(usex libkms true false) - # valgrind installs its .pc file to the pkgconfig for the primary arch - -Dvalgrind=$(usex valgrind auto false) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} diff --git a/x11-libs/libdrm/libdrm-2.4.101.ebuild b/x11-libs/libdrm/libdrm-2.4.101.ebuild deleted file mode 100644 index 46ea35c8a426..000000000000 --- a/x11-libs/libdrm/libdrm-2.4.101.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson multilib-minimal - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} libkms valgrind" -RESTRICT="test" # see bug #236845 -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind )" - -multilib_src_configure() { - local emesonargs=( - # Udev is only used by tests now. - -Dudev=false - -Dcairo-tests=false - -Damdgpu=$(usex video_cards_amdgpu true false) - -Dexynos=$(usex video_cards_exynos true false) - -Dfreedreno=$(usex video_cards_freedreno true false) - -Dintel=$(usex video_cards_intel true false) - -Dnouveau=$(usex video_cards_nouveau true false) - -Domap=$(usex video_cards_omap true false) - -Dradeon=$(usex video_cards_radeon true false) - -Dtegra=$(usex video_cards_tegra true false) - -Dvc4=$(usex video_cards_vc4 true false) - -Detnaviv=$(usex video_cards_vivante true false) - -Dvmwgfx=$(usex video_cards_vmware true false) - -Dlibkms=$(usex libkms true false) - # valgrind installs its .pc file to the pkgconfig for the primary arch - -Dvalgrind=$(usex valgrind auto false) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} diff --git a/x11-libs/libdrm/libdrm-2.4.120.ebuild b/x11-libs/libdrm/libdrm-2.4.120.ebuild new file mode 100644 index 000000000000..009f5144834f --- /dev/null +++ b/x11-libs/libdrm/libdrm-2.4.120.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git" +PYTHON_COMPAT=( python3_{10..12} ) + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +inherit ${GIT_ECLASS} python-any-r1 meson-multilib + +DESCRIPTION="X.Org libdrm library" +HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +LICENSE="MIT" +SLOT="0" +IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind )" +RDEPEND="${COMMON_DEPEND} + video_cards_amdgpu? ( + tools? ( >=dev-util/cunit-2.1 ) + test? ( >=dev-util/cunit-2.1 ) + ) + udev? ( virtual/udev )" +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')" + +PATCHES=( "${FILESDIR}/${PN}-2.4.120-backport-pr353.patch" ) + +python_check_deps() { + python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + symbols-check.py || die # bug #925550 +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use udev) + -Dcairo-tests=disabled + $(meson_feature video_cards_amdgpu amdgpu) + $(meson_feature video_cards_exynos exynos) + $(meson_feature video_cards_freedreno freedreno) + $(meson_feature video_cards_intel intel) + $(meson_feature video_cards_nouveau nouveau) + $(meson_feature video_cards_omap omap) + $(meson_feature video_cards_radeon radeon) + $(meson_feature video_cards_tegra tegra) + $(meson_feature video_cards_vc4 vc4) + $(meson_feature video_cards_vivante etnaviv) + $(meson_feature video_cards_vmware vmwgfx) + # valgrind installs its .pc file to the pkgconfig for the primary arch + -Dvalgrind=$(usex valgrind auto disabled) + $(meson_native_use_bool tools install-test-programs) + ) + + if use test || { multilib_is_native_abi && use tools; }; then + emesonargs+=( -Dtests=true ) + else + emesonargs+=( -Dtests=false ) + fi + meson_src_configure +} diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild index 46ea35c8a426..aaedf84080c4 100644 --- a/x11-libs/libdrm/libdrm-9999.ebuild +++ b/x11-libs/libdrm/libdrm-9999.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git" +PYTHON_COMPAT=( python3_{10..12} ) if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson multilib-minimal +inherit ${GIT_ECLASS} python-any-r1 meson-multilib DESCRIPTION="X.Org libdrm library" HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else +if [[ ${PV} != 9999* ]]; then SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" @@ -25,47 +24,58 @@ for card in ${VIDEO_CARDS}; do IUSE_VIDEO_CARDS+=" video_cards_${card}" done -IUSE="${IUSE_VIDEO_CARDS} libkms valgrind" -RESTRICT="test" # see bug #236845 LICENSE="MIT" SLOT="0" +IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind" +RESTRICT="!test? ( test )" -RDEPEND=" +COMMON_DEPEND=" video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind )" - -multilib_src_configure() { - local emesonargs=( - # Udev is only used by tests now. - -Dudev=false - -Dcairo-tests=false - -Damdgpu=$(usex video_cards_amdgpu true false) - -Dexynos=$(usex video_cards_exynos true false) - -Dfreedreno=$(usex video_cards_freedreno true false) - -Dintel=$(usex video_cards_intel true false) - -Dnouveau=$(usex video_cards_nouveau true false) - -Domap=$(usex video_cards_omap true false) - -Dradeon=$(usex video_cards_radeon true false) - -Dtegra=$(usex video_cards_tegra true false) - -Dvc4=$(usex video_cards_vc4 true false) - -Detnaviv=$(usex video_cards_vivante true false) - -Dvmwgfx=$(usex video_cards_vmware true false) - -Dlibkms=$(usex libkms true false) - # valgrind installs its .pc file to the pkgconfig for the primary arch - -Dvalgrind=$(usex valgrind auto false) +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind )" +RDEPEND="${COMMON_DEPEND} + video_cards_amdgpu? ( + tools? ( >=dev-util/cunit-2.1 ) + test? ( >=dev-util/cunit-2.1 ) ) - meson_src_configure -} + udev? ( virtual/udev )" +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')" -multilib_src_compile() { - meson_src_compile +python_check_deps() { + python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" } -multilib_src_test() { - meson_src_test +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + symbols-check.py || die # bug #925550 } -multilib_src_install() { - meson_src_install +multilib_src_configure() { + local emesonargs=( + $(meson_use udev) + -Dcairo-tests=disabled + $(meson_feature video_cards_amdgpu amdgpu) + $(meson_feature video_cards_exynos exynos) + $(meson_feature video_cards_freedreno freedreno) + $(meson_feature video_cards_intel intel) + $(meson_feature video_cards_nouveau nouveau) + $(meson_feature video_cards_omap omap) + $(meson_feature video_cards_radeon radeon) + $(meson_feature video_cards_tegra tegra) + $(meson_feature video_cards_vc4 vc4) + $(meson_feature video_cards_vivante etnaviv) + $(meson_feature video_cards_vmware vmwgfx) + # valgrind installs its .pc file to the pkgconfig for the primary arch + -Dvalgrind=$(usex valgrind auto disabled) + $(meson_native_use_bool tools install-test-programs) + ) + + if use test || { multilib_is_native_abi && use tools; }; then + emesonargs+=( -Dtests=true ) + else + emesonargs+=( -Dtests=false ) + fi + meson_src_configure } diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml index 25fe9f86f2ee..be660f032d0c 100644 --- a/x11-libs/libdrm/metadata.xml +++ b/x11-libs/libdrm/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>x11@gentoo.org</email> -<name>X11</name> -</maintainer> -<use> -<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag> -<flag name="valgrind">Compile in valgrind memory hints</flag> -</use> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <use> + <flag name="tools">Install optional tests and tools</flag> + </use> + <upstream> + <remote-id type="freedesktop-gitlab">mesa/drm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libfakeXinerama/Manifest b/x11-libs/libfakeXinerama/Manifest new file mode 100644 index 000000000000..99c08a1f1285 --- /dev/null +++ b/x11-libs/libfakeXinerama/Manifest @@ -0,0 +1 @@ +DIST libfakeXinerama-0.1.0.tar.bz2 3191 BLAKE2B 3f3572a64c6aafc71df9db7dc0c88125f4eb53dc7ae5dd22a704964664f3e21423241892b92be3591dffeca264660b1dd0880989e8088091d0731105ffec224b SHA512 6b2cd7a3ebd751d869b8afd1c129412f7bc8e8098d7f27a1781078c33f5fa644374524d3e7f5a7b9cf0297edb848d6ff7ec8f29d312e2af0c88d248c751ef907 diff --git a/x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild b/x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild new file mode 100644 index 000000000000..2686e3b386b2 --- /dev/null +++ b/x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib toolchain-funcs + +DESCRIPTION="Fake library to override default libXinerama and expose custom screen dimensions" +HOMEPAGE="https://github.com/Xpra-org/libfakeXinerama" +SRC_URI="https://xpra.org/src/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND=" + x11-libs/libX11 + x11-libs/libXinerama +" + +src_compile() { + libtool --tag=CC --mode=compile $(tc-getCC) -shared ${CFLAGS} -c ${PN#lib}.c || die + libtool --tag=CC --mode=link $(tc-getCC) -shared ${LDFLAGS} -Wl,-z,defs ${PN#lib}.lo \ + -o ${PN}.la -rpath "${EPREFIX}/usr/$(get_libdir)" -version-number 1:0:0 || die +} + +src_install() { + dolib.so .libs/${PN}$(get_libname)* + dodoc README.TXT +} diff --git a/x11-libs/libfakeXinerama/metadata.xml b/x11-libs/libfakeXinerama/metadata.xml new file mode 100644 index 000000000000..ecd8e3de07da --- /dev/null +++ b/x11-libs/libfakeXinerama/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">Xpra-org/libfakeXinerama</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-libs/libfakekey/libfakekey-0.3.ebuild b/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild index 02a258f0146f..958e50604274 100644 --- a/x11-libs/libfakekey/libfakekey-0.3.ebuild +++ b/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,13 @@ SRC_URI="https://git.yoctoproject.org/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" IUSE="debug doc" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND=" + x11-base/xorg-proto + doc? ( app-text/doxygen ) +" DEPEND="x11-libs/libXtst" RDEPEND="${DEPEND}" @@ -34,6 +37,7 @@ src_configure() { local myeconfargs=( # --with/without-x is ignored by configure script and X is used. --with-x + --disable-static $(use_enable debug) $(use_enable doc doxygen-docs) ) @@ -43,4 +47,5 @@ src_configure() { src_install() { use doc && local HTML_DOCS=( doc/html/. ) default + find "${D}" -name '*.la' -type f -delete || die } diff --git a/x11-libs/libfakekey/metadata.xml b/x11-libs/libfakekey/metadata.xml index 2fdbf33d963d..8641e5bdd399 100644 --- a/x11-libs/libfakekey/metadata.xml +++ b/x11-libs/libfakekey/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest index ff3641052b80..2f5220c47e3a 100644 --- a/x11-libs/libfm-extra/Manifest +++ b/x11-libs/libfm-extra/Manifest @@ -1,2 +1 @@ -DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc -DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc +DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6 diff --git a/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch b/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch new file mode 100644 index 000000000000..fd9a0535a4c3 --- /dev/null +++ b/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch @@ -0,0 +1,59 @@ +From a5cabf67a7460ce27c73e66c9ac98481c6cd1db2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 15 Mar 2021 09:44:40 +0100 +Subject: [PATCH] Drop -Werror and unwanted CPPFLAGS, disable docs + +--- + Makefile.am | 2 +- + configure.ac | 8 ++------ + 2 files changed, 3 insertions(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 427edae..f5fd4f0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,7 +5,7 @@ NULL= + DIST_SUBDIRS = src po data + + # a little trick against gtk-doc is here +-SUBDIRS_DOCS = docs ++SUBDIRS_DOCS = + + EXTRA_DIST_DOCS = \ + gtk-doc.make \ +diff --git a/configure.ac b/configure.ac +index bf6b07f..2f331ec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + + AC_PREREQ([2.63]) + AC_INIT([libfm], [1.3.2], [http://pcmanfm.sourceforge.net/]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability]) + AC_CONFIG_MACRO_DIR(m4) + AC_CONFIG_HEADERS([config.h]) + +@@ -277,7 +277,7 @@ AC_ARG_ENABLE(debug, + ) + if test "$enable_debug" = "yes"; then + # turn on debug and disable optimization +- CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g" ++ CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" + case "$CC" in + gcc*) + CPPFLAGS="$CPPFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers" +@@ -323,10 +323,6 @@ AC_CONFIG_FILES([ + data/lxshortcut.1 + data/ui/Makefile + po/Makefile.in +- docs/Makefile +- docs/reference/Makefile +- docs/reference/libfm/Makefile +- docs/reference/libfm/version.xml + libfm.pc + libfm-gtk.pc + libfm-gtk3.pc +-- +2.30.2 + diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild deleted file mode 100644 index 23720ac53293..000000000000 --- a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools xdg-utils - -MY_PV=${PV/_/} -MY_PN="libfm" -MY_P="${MY_PN}-${MY_PV}" -DESCRIPTION="A library for file management" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-2" -SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly -IUSE="" - -RDEPEND=">=dev-libs/glib-2.18:2" -DEPEND="${RDEPEND} - app-arch/xz-utils - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext - dev-util/gtk-doc-am - !!<=x11-libs/libfm-1.2.3" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed" - sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed" - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \ - configure.ac || die "sed failed" - - #disable unused translations. Bug #356029 - for trans in app-chooser ask-rename exec-file file-prop preferred-apps \ - progress;do - echo "data/ui/"${trans}.ui >> po/POTFILES.in - done - #Remove -Werror for automake-1.12. Bug #421101 - sed -i "s:-Werror::" configure.ac || die - - # subslot sanity check - local sub_slot=${SLOT#*/} - local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.') - - if [[ ${sub_slot} != ${libfm_major_abi} ]]; then - eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})" - eerror "Please update SLOT variable as follows:" - eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\"" - eerror - die "sub-slot sanity check failed" - fi - - eautoreconf - rm -r autom4te.cache || die - eapply_user -} - -src_configure() { - econf --disable-static --with-extra-only -} - -src_install() { - default - find "${D}" -name '*.la' -exec rm -f '{}' + - # Sometimes a directory is created instead of a symlink. No idea why... - # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm - # symlink to it. - if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then - rm -r "${D}"/usr/include/${MY_PN} - fi -} - -pkg_preinst() { - # Resolve the symlink mess. Bug #439570 - [[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \ - rm -rf "${ROOT}"/usr/include/${MY_PN} - if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then - cd "${D}"/usr/include - ln -s --force ${MY_PN}-1.0 ${MY_PN} - fi -} - -pkg_postinst() { - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild index 69258a65c60e..533ed1bde147 100644 --- a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild +++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild @@ -1,45 +1,46 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools xdg-utils +EAPI=7 -MY_PV=${PV/_/} MY_PN="libfm" -MY_P="${MY_PN}-${MY_PV}" -DESCRIPTION="A library for file management" +MY_P="${MY_PN}-${PV/_/}" +inherit autotools xdg + +DESCRIPTION="Library for file management" HOMEPAGE="https://wiki.lxde.org/en/PCManFM" SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux" LICENSE="GPL-2" -SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly +SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly +KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=dev-libs/glib-2.18:2" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-arch/xz-utils + dev-build/gtk-doc-am >=dev-util/intltool-0.40 - virtual/pkgconfig sys-devel/gettext - dev-util/gtk-doc-am - !!<=x11-libs/libfm-1.2.3" + virtual/pkgconfig +" -S="${WORKDIR}"/${MY_P} +PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" ) src_prepare() { - sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed" - sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed" - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \ - configure.ac || die "sed failed" + xdg_src_prepare - #disable unused translations. Bug #356029 - for trans in app-chooser ask-rename exec-file file-prop preferred-apps \ - progress;do - echo "data/ui/"${trans}.ui >> po/POTFILES.in - done - #Remove -Werror for automake-1.12. Bug #421101 - sed -i "s:-Werror::" configure.ac || die + # disable unused translations. Bug #356029 + cat <<-EOF >> po/POTFILES.in || die +data/ui/app-chooser.ui +data/ui/ask-rename.ui +data/ui/exec-file.ui +data/ui/file-prop.ui +data/ui/preferred-apps.ui +data/ui/progress.ui +EOF # subslot sanity check local sub_slot=${SLOT#*/} @@ -58,34 +59,30 @@ src_prepare() { } src_configure() { - econf --disable-static --with-extra-only + econf \ + --disable-static \ + --with-extra-only } src_install() { default - find "${D}" -name '*.la' -exec rm -f '{}' + + find "${ED}" -name '*.la' -delete || die # Sometimes a directory is created instead of a symlink. No idea why... # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm # symlink to it. if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then - rm -r "${D}"/usr/include/${MY_PN} + rm -r "${D}"/usr/include/${MY_PN} || die fi } pkg_preinst() { + xdg_pkg_preinst # Resolve the symlink mess. Bug #439570 - [[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \ - rm -rf "${ROOT}"/usr/include/${MY_PN} + if [[ -d "${ROOT}"/usr/include/${MY_PN} ]]; then + rm -rf "${ROOT}"/usr/include/${MY_PN} || die + fi if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then - cd "${D}"/usr/include - ln -s --force ${MY_PN}-1.0 ${MY_PN} + cd "${D}"/usr/include || die + ln -s --force ${MY_PN}-1.0 ${MY_PN} || die fi } - -pkg_postinst() { - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml index c46e9eb9b836..d53514de1063 100644 --- a/x11-libs/libfm-extra/metadata.xml +++ b/x11-libs/libfm-extra/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>lxqt@gentoo.org</email> diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest index 8955a00504f9..ecf23cd1d259 100644 --- a/x11-libs/libfm-qt/Manifest +++ b/x11-libs/libfm-qt/Manifest @@ -1,2 +1,3 @@ -DIST libfm-qt-0.14.1.tar.xz 328192 BLAKE2B ff229256d3232eabc046da1fed3e4b4e51a09c3d1f2815fa726bad62f3fc53111e5d7f003e82e383dde4fe910584644e66613cbc1803ad0e11f7b6bdb2e30cfe SHA512 a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7 -DIST libfm-qt-0.15.1.tar.xz 337396 BLAKE2B 619787039857f0b67245ff86f4c8de1b5305909bbf1dc07f20ab53f07a955d541853066a9011bb76d04a49006732ea23c4100e94fe3c61de77f1edbbbdef5854 SHA512 9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5 +DIST libfm-qt-1.1.0.tar.xz 383280 BLAKE2B f01b8d2b21bee05c265f55d6b1c71644001bd668a03d8c4994a4e0fde2f07e53014d3b079d818b7a66cd25f8c9141fa980d0cdb9d3b8e4a66eb3b1521c46690b SHA512 6717bc3fd3a2795389071e4dbfba2e73f3abfeafce8a583f99b3281e60347430db48246eb29796c5b7647b35b064824e90fc3a286547288798a1c6da3a3f5137 +DIST libfm-qt-1.3.0.tar.xz 388256 BLAKE2B 454b2a685f505ad93c007744d92f9b87cdf2c02b65467762a337b021f9be648be92497e539d419b7a46556a281ee2b1f56fe57fbbdb8d3cf0d661f6f3260c8aa SHA512 fd7ecc1a8e94893682b7e0ca76805b36dbf184a4f2f7d84008ef81ea2257d994db0f8f8e18f890b8554fd1f20e23f8d7f20cf6b3112b32d66c969b683f8db3ba +DIST libfm-qt-1.4.0.tar.xz 398004 BLAKE2B fbae0e86d468ce9b83b06c342a0473c9f44fe301c03b64e472f86791f297d99c3d2e52e482edcd7adc38683de71958b210e89dbb662e0f924c3b71df53e8c885 SHA512 d5a9bbb1f295dfbe88add760fc9c8da60771d4d49b64408b1278315b52dd071d7e24dbc9ff8354f0c68e5ad58e809e78a2dae77e2d4f52cd8e0b8409c0d7f5cb diff --git a/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch b/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch deleted file mode 100644 index b9edab299cd4..000000000000 --- a/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch +++ /dev/null @@ -1,109 +0,0 @@ -From f944be7d2447d5c579a57fb5519ee5e2dece5871 Mon Sep 17 00:00:00 2001 -From: Tsu Jan <tsujan2000@gmail.com> -Date: Sun, 21 Apr 2019 14:11:14 +0430 -Subject: [PATCH] Don't ignore creation-deletion sequences - -Fixes https://github.com/lxqt/pcmanfm-qt/issues/944 - -Previously, if a file was in addition queue and then it came into the deletion queue, its addition and deletion were both ignored. That was wrong and could result in showing nonexistent files because addition can also happen in directory list job before being processed by file info job. - -Also process accumulated changes only after finishing the current info job and don't clear all deletion paths after processing them (because, logically, only those paths that can be deleted should be removed). ---- - src/core/folder.cpp | 60 +++++++++++++++++++++++---------------------- - 1 file changed, 31 insertions(+), 29 deletions(-) - -diff --git a/src/core/folder.cpp b/src/core/folder.cpp -index 6c2b27d..2385a8b 100644 ---- a/src/core/folder.cpp -+++ b/src/core/folder.cpp -@@ -228,16 +228,6 @@ void Folder::onFileInfoFinished() { - return; - } - -- // process the changes accumulated during this info job -- if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()" -- || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) { -- QTimer::singleShot(0, this, &Folder::processPendingChanges); -- } -- // there's no pending change at the moment; let the next one be processed -- else { -- has_idle_update_handler = false; -- } -- - FileInfoList files_to_add; - FileInfoList files_to_delete; - std::vector<FileInfoPair> files_to_update; -@@ -271,6 +261,16 @@ void Folder::onFileInfoFinished() { - Q_EMIT filesChanged(files_to_update); - } - Q_EMIT contentChanged(); -+ -+ // process the changes accumulated during this info job -+ if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()" -+ || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) { -+ QTimer::singleShot(0, this, &Folder::processPendingChanges); -+ } -+ // there's no pending change at the moment; let the next one be processed -+ else { -+ has_idle_update_handler = false; -+ } - } - - void Folder::processPendingChanges() { -@@ -314,21 +314,24 @@ void Folder::processPendingChanges() { - } - - // process deletion -- if(!paths_to_del.empty()) { -- FileInfoList deleted_files; -- for(const auto &path: paths_to_del) { -- auto name = path.baseName(); -- auto it = files_.find(name.get()); -- if(it != files_.end()) { -- deleted_files.push_back(it->second); -- files_.erase(it); -- } -+ FileInfoList deleted_files; -+ auto path_it = paths_to_del.begin(); -+ while(path_it != paths_to_del.end()) { -+ const auto& path = *path_it; -+ auto name = path.baseName(); -+ auto it = files_.find(name.get()); -+ if(it != files_.end()) { -+ deleted_files.push_back(it->second); -+ files_.erase(it); -+ path_it = paths_to_del.erase(path_it); - } -- if(!deleted_files.empty()) { -- Q_EMIT filesRemoved(deleted_files); -- Q_EMIT contentChanged(); -+ else { -+ ++path_it; - } -- paths_to_del.clear(); -+ } -+ if(!deleted_files.empty()) { -+ Q_EMIT filesRemoved(deleted_files); -+ Q_EMIT contentChanged(); - } - - if(pending_change_notify) { -@@ -404,13 +407,12 @@ void Folder::eventFileDeleted(const FilePath& path) { - bool deleted = true; - // qDebug() << "delete " << path.baseName().get(); - // G_LOCK(lists); -- if(std::find(paths_to_add.cbegin(), paths_to_add.cend(), path) != paths_to_add.cend()) { -- // if the file was going to be added, just remove it from the addition queue -- paths_to_add.erase(std::remove(paths_to_add.begin(), paths_to_add.end(), path), paths_to_add.cend()); -- } -- else if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) { -+ /* WARNING: If the file is in the addition queue, we shouldn not remove it from that queue -+ and ignore its deletion because it may have been added by the directory list job, in -+ which case, ignoring an addition-deletion sequence would result in a nonexistent file. */ -+ if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) { - paths_to_del.push_back(path); -- // the update queue should be cancelled for a file that is going to be deleted -+ // the update queue can be cancelled for a file that is going to be deleted - paths_to_update.erase(std::remove(paths_to_update.begin(), paths_to_update.end(), path), paths_to_update.cend()); - } - else { diff --git a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild deleted file mode 100644 index 57a6caf855e8..000000000000 --- a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers" -HOMEPAGE="https://lxqt.github.io/" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -fi - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/5" - -BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.6.0 - virtual/pkgconfig -" -DEPEND=" - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - >=lxde-base/menu-cache-1.1.0 - media-libs/libexif:= - x11-libs/libxcb:= -" -RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n -" - -PATCHES="${FILESDIR}/${PN}-0.14.1-phantom-desktop-files.patch" diff --git a/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild b/x11-libs/libfm-qt/libfm-qt-1.1.0.ebuild index d22a9ffd9ab0..711640a78ccf 100644 --- a/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild +++ b/x11-libs/libfm-qt/libfm-qt-1.1.0.ebuild @@ -1,42 +1,40 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils DESCRIPTION="Qt Library for Building File Managers" -HOMEPAGE="https://lxqt.github.io/" +HOMEPAGE="https://lxqt-project.org/" if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" fi LICENSE="BSD GPL-2+ LGPL-2.1+" SLOT="0/7" BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.7.0 + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.11.0 virtual/pkgconfig " DEPEND=" dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5= + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 >=lxde-base/menu-cache-1.1.0:= media-libs/libexif - x11-libs/libxcb -" -RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n + x11-libs/libxcb:= " +RDEPEND="${DEPEND}" pkg_postinst() { xdg_mimeinfo_database_update diff --git a/x11-libs/libfm-qt/libfm-qt-1.3.0.ebuild b/x11-libs/libfm-qt/libfm-qt-1.3.0.ebuild new file mode 100644 index 000000000000..2f4ab56bad31 --- /dev/null +++ b/x11-libs/libfm-qt/libfm-qt-1.3.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt Library for Building File Managers" +HOMEPAGE="https://lxqt-project.org/" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +fi + +LICENSE="BSD GPL-2+ LGPL-2.1+" +SLOT="0/7" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 + virtual/pkgconfig +" +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5= + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + >=lxde-base/menu-cache-1.1.0:= + media-libs/libexif + x11-libs/libxcb:= +" +RDEPEND="${DEPEND}" + +pkg_postinst() { + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_mimeinfo_database_update +} diff --git a/x11-libs/libfm-qt/libfm-qt-1.4.0.ebuild b/x11-libs/libfm-qt/libfm-qt-1.4.0.ebuild new file mode 100644 index 000000000000..c4ae78111418 --- /dev/null +++ b/x11-libs/libfm-qt/libfm-qt-1.4.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake xdg-utils + +DESCRIPTION="Qt Library for Building File Managers" +HOMEPAGE="https://lxqt-project.org/" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +fi + +LICENSE="BSD GPL-2+ LGPL-2.1+" +SLOT="0/7" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 + virtual/pkgconfig +" +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5= + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + >=lxde-base/menu-cache-1.1.0:= + =lxqt-base/lxqt-menu-data-${MY_PV}* + media-libs/libexif + x11-libs/libxcb:= +" +RDEPEND="${DEPEND}" + +pkg_postinst() { + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_mimeinfo_database_update +} diff --git a/x11-libs/libfm-qt/metadata.xml b/x11-libs/libfm-qt/metadata.xml index da013df65136..cb633cd2f5f0 100644 --- a/x11-libs/libfm-qt/metadata.xml +++ b/x11-libs/libfm-qt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>lxqt@gentoo.org</email> diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest index ff3641052b80..2f5220c47e3a 100644 --- a/x11-libs/libfm/Manifest +++ b/x11-libs/libfm/Manifest @@ -1,2 +1 @@ -DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc -DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc +DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6 diff --git a/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch b/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch new file mode 100644 index 000000000000..3b5f2b5061ee --- /dev/null +++ b/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch @@ -0,0 +1,34 @@ +From 5db9cb19a2b33c89255b8d483f42d5fc647df2c9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 15 Mar 2021 01:20:02 +0100 +Subject: [PATCH] Drop -Werror and unwanted CPPFLAGS + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bf6b07f..181eed7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + + AC_PREREQ([2.63]) + AC_INIT([libfm], [1.3.2], [http://pcmanfm.sourceforge.net/]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability]) + AC_CONFIG_MACRO_DIR(m4) + AC_CONFIG_HEADERS([config.h]) + +@@ -277,7 +277,7 @@ AC_ARG_ENABLE(debug, + ) + if test "$enable_debug" = "yes"; then + # turn on debug and disable optimization +- CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g" ++ CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" + case "$CC" in + gcc*) + CPPFLAGS="$CPPFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers" +-- +2.30.2 + diff --git a/x11-libs/libfm/files/libfm-1.3.2-c99.patch b/x11-libs/libfm/files/libfm-1.3.2-c99.patch new file mode 100644 index 000000000000..b84cf01111c8 --- /dev/null +++ b/x11-libs/libfm/files/libfm-1.3.2-c99.patch @@ -0,0 +1,48 @@ +https://bugs.gentoo.org/919076 +https://github.com/lxde/libfm/issues/100 +https://github.com/lxde/libfm/pull/101 + +From ec6a21263d150aea918826941a80f335b45470a8 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Fri, 1 Mar 2024 14:19:46 +0900 +Subject: [PATCH] FIX: support gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to -Werror=incompatible-pointer-types . +To support this, cast GTK related objects for assignment +properly. + +Fixes #100 . +--- a/src/gtk/exo/exo-icon-view.c ++++ b/src/gtk/exo/exo-icon-view.c +@@ -2819,7 +2819,7 @@ exo_icon_view_key_press_event (GtkWidget *widget, + /* allocate a new event to forward */ + new_event = gdk_event_copy ((GdkEvent *) event); + g_object_unref (G_OBJECT (new_event->key.window)); +- new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry))); ++ new_event->key.window = GDK_WINDOW(g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)))); + + /* send the event to the search entry. If the "preedit-changed" signal is + * emitted during this event, priv->search_imcontext_changed will be set. +--- a/src/gtk/fm-dnd-dest.c ++++ b/src/gtk/fm-dnd-dest.c +@@ -458,7 +458,7 @@ static GdkDragAction _ask_action_on_drop(GtkWidget *widget, + gtk_action_set_sensitive(act, FALSE); + } + } +- ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup")); ++ ri.menu = GTK_MENU(g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"))); + g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL); + unmap_handler = g_signal_connect(ri.menu, "unmap", + G_CALLBACK(run_unmap_handler), &ri); +--- a/src/gtk/fm-standard-view.c ++++ b/src/gtk/fm-standard-view.c +@@ -637,7 +637,7 @@ static inline void create_icon_view(FmStandardView* fv, GList* sels) + "text", FM_FOLDER_MODEL_COL_NAME ); + if(fv->renderer_text) + g_object_unref(fv->renderer_text); +- fv->renderer_text = g_object_ref_sink(render); ++ fv->renderer_text = FM_CELL_RENDERER_TEXT(g_object_ref_sink(render)); + exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME); + g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv); + g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv); + diff --git a/x11-libs/libfm/files/libfm-fix-use-after-free.diff b/x11-libs/libfm/files/libfm-fix-use-after-free.diff deleted file mode 100644 index 4a0ae61c40b4..000000000000 --- a/x11-libs/libfm/files/libfm-fix-use-after-free.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur libfm-1.2.3/src/base/fm-config.c libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c ---- libfm-1.2.3/src/base/fm-config.c 2014-10-14 18:29:21.000000000 +0200 -+++ libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c 2016-06-18 18:23:35.721837971 +0200 -@@ -346,7 +346,8 @@ - cfg->modules_blacklist = NULL; - cfg->system_modules_blacklist = NULL; - _cfg_monitor_free(cfg); -- g_free(cfg->_cfg_name); -+ if(name != cfg->_cfg_name) -+ g_free(cfg->_cfg_name); - if(G_LIKELY(!name)) - name = "libfm/libfm.conf"; - else -@@ -363,7 +364,8 @@ - } - } - -- cfg->_cfg_name = g_strdup(name); -+ if(name != cfg->_cfg_name) -+ cfg->_cfg_name = g_strdup(name); - dirs = g_get_system_config_dirs(); - /* bug SF #887: first dir in XDG_CONFIG_DIRS is the most relevant - so we shoult process the list in reverse order */ diff --git a/x11-libs/libfm/libfm-1.2.5.ebuild b/x11-libs/libfm/libfm-1.2.5.ebuild deleted file mode 100644 index a94b843ec8e5..000000000000 --- a/x11-libs/libfm/libfm-1.2.5.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools multilib vala xdg-utils - -MY_PV=${PV/_/} -MY_P="${PN}-${MY_PV}" -DESCRIPTION="A library for file management" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-2" -SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly -IUSE="+automount debug doc examples exif gtk udisks vala" - -COMMON_DEPEND=">=dev-libs/glib-2.18:2 - gtk? ( >=x11-libs/gtk+-2.16:2 ) - >=lxde-base/menu-cache-0.3.2:= - ~x11-libs/libfm-extra-${PV} - udisks? ( dev-libs/dbus-glib )" -RDEPEND="${COMMON_DEPEND} - !lxde-base/lxshortcut - x11-misc/shared-mime-info - automount? ( - udisks? ( gnome-base/gvfs[udev,udisks] ) - !udisks? ( gnome-base/gvfs[udev] ) - ) - exif? ( media-libs/libexif )" -DEPEND="${COMMON_DEPEND} - vala? ( $(vala_depend) ) - doc? ( - dev-util/gtk-doc - ) - app-arch/xz-utils - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext" - -S="${WORKDIR}"/${MY_P} - -REQUIRED_USE="udisks? ( automount ) doc? ( gtk )" - -src_prepare() { - # Fix use after free bug, see - # https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321 - epatch "${FILESDIR}"/libfm-fix-use-after-free.diff - - if ! use doc; then - sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed" - sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed" - fi - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \ - configure.ac || die "sed failed" - - #disable unused translations. Bug #356029 - for trans in app-chooser ask-rename exec-file file-prop preferred-apps \ - progress;do - echo "data/ui/"${trans}.ui >> po/POTFILES.in - done - #Remove -Werror for automake-1.12. Bug #421101 - sed -i "s:-Werror::" configure.ac || die - - # subslot sanity check - local sub_slot=${SLOT#*/} - local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.') - - if [[ ${sub_slot} != ${libfm_major_abi} ]]; then - eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})" - eerror "Please update SLOT variable as follows:" - eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\"" - eerror - die "sub-slot sanity check failed" - fi - - eautoreconf - rm -r autom4te.cache || die - use vala && export VALAC="$(type -p valac-$(vala_best_api_version))" -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable examples demo) \ - $(use_enable exif) \ - $(use_enable debug) \ - $(use_enable udisks) \ - $(use_enable vala actions) \ - $(use_with gtk) \ - $(use_enable doc gtk-doc) \ - --with-html-dir=/usr/share/doc/${PF}/html -} - -src_install() { - default - find "${D}" -name '*.la' -exec rm -f '{}' + - # Sometimes a directory is created instead of a symlink. No idea why... - # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm - # symlink to it. - if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then - rm -r "${D}"/usr/include/${PN} - fi - # Remove files installed by split-off libfm-extra package - rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h - rm "${D}"/usr/$(get_libdir)/libfm-extra* - rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc -} - -pkg_preinst() { - # Resolve the symlink mess. Bug #439570 - [[ -d "${ROOT}"/usr/include/${PN} ]] && \ - rm -rf "${ROOT}"/usr/include/${PN} - if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then - cd "${D}"/usr/include - ln -s --force ${PN}-1.0 ${PN} - fi -} - -pkg_postinst() { - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} diff --git a/x11-libs/libfm/libfm-1.3.1.ebuild b/x11-libs/libfm/libfm-1.3.1.ebuild deleted file mode 100644 index 1f7612edb4b5..000000000000 --- a/x11-libs/libfm/libfm-1.3.1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib vala xdg-utils - -MY_PV=${PV/_/} -MY_P="${PN}-${MY_PV}" -DESCRIPTION="A library for file management" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-2" -SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly -IUSE="+automount debug doc examples exif gtk udisks vala" - -COMMON_DEPEND=">=dev-libs/glib-2.18:2 - gtk? ( >=x11-libs/gtk+-2.16:2 ) - >=lxde-base/menu-cache-0.3.2:= - ~x11-libs/libfm-extra-${PV} - udisks? ( dev-libs/dbus-glib )" -RDEPEND="${COMMON_DEPEND} - !lxde-base/lxshortcut - x11-misc/shared-mime-info - automount? ( - udisks? ( gnome-base/gvfs[udev,udisks] ) - !udisks? ( gnome-base/gvfs[udev] ) - ) - exif? ( media-libs/libexif )" -DEPEND="${COMMON_DEPEND} - vala? ( $(vala_depend) ) - doc? ( - dev-util/gtk-doc - ) - app-arch/xz-utils - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext - dev-util/glib-utils" - -S="${WORKDIR}"/${MY_P} - -REQUIRED_USE="udisks? ( automount ) doc? ( gtk )" - -src_prepare() { - if ! use doc; then - sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed" - sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed" - fi - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \ - configure.ac || die "sed failed" - - #disable unused translations. Bug #356029 - for trans in app-chooser ask-rename exec-file file-prop preferred-apps \ - progress;do - echo "data/ui/"${trans}.ui >> po/POTFILES.in - done - #Remove -Werror for automake-1.12. Bug #421101 - sed -i "s:-Werror::" configure.ac || die - - # subslot sanity check - local sub_slot=${SLOT#*/} - local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.') - - if [[ ${sub_slot} != ${libfm_major_abi} ]]; then - eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})" - eerror "Please update SLOT variable as follows:" - eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\"" - eerror - die "sub-slot sanity check failed" - fi - - eautoreconf - rm -r autom4te.cache || die - use vala && export VALAC="$(type -p valac-$(vala_best_api_version))" - - eapply_user -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable examples demo) \ - $(use_enable exif) \ - $(use_enable debug) \ - $(use_enable udisks) \ - $(use_enable vala old-actions) \ - $(use_with gtk) \ - $(use_enable doc gtk-doc) \ - --with-html-dir=/usr/share/doc/${PF}/html -} - -src_install() { - default - find "${D}" -name '*.la' -exec rm -f '{}' + - # Sometimes a directory is created instead of a symlink. No idea why... - # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm - # symlink to it. - if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then - rm -r "${D}"/usr/include/${PN} - fi - # Remove files installed by split-off libfm-extra package - rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h - rm "${D}"/usr/$(get_libdir)/libfm-extra* - rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc -} - -pkg_preinst() { - # Resolve the symlink mess. Bug #439570 - [[ -d "${ROOT}"/usr/include/${PN} ]] && \ - rm -rf "${ROOT}"/usr/include/${PN} - if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then - cd "${D}"/usr/include - ln -s --force ${PN}-1.0 ${PN} - fi -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/x11-libs/libfm/libfm-1.3.2-r1.ebuild b/x11-libs/libfm/libfm-1.3.2-r1.ebuild new file mode 100644 index 000000000000..63012f59c6ff --- /dev/null +++ b/x11-libs/libfm/libfm-1.3.2-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${PN}-${PV/_/}" +inherit autotools vala xdg + +DESCRIPTION="Library for file management" +HOMEPAGE="https://wiki.lxde.org/en/PCManFM" +SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="+automount debug doc examples exif gtk udisks vala" + +REQUIRED_USE="udisks? ( automount ) doc? ( gtk )" + +DEPEND=" + >=dev-libs/glib-2.18:2 + >=lxde-base/menu-cache-1.1.0-r1:= + ~x11-libs/libfm-extra-${PV} + gtk? ( x11-libs/gtk+:3 ) + udisks? ( dev-libs/dbus-glib ) +" +RDEPEND="${DEPEND} + !lxde-base/lxshortcut + x11-misc/shared-mime-info + automount? ( + udisks? ( gnome-base/gvfs[udev,udisks] ) + !udisks? ( gnome-base/gvfs[udev] ) + ) + exif? ( media-libs/libexif ) +" +BDEPEND=" + app-arch/xz-utils + dev-util/glib-utils + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) +" + +PATCHES=( + "${FILESDIR}/${P}-buildsystem.patch" + "${FILESDIR}/${PN}-1.3.2-c99.patch" +) + +src_prepare() { + xdg_src_prepare + + if ! use doc; then + sed -ie '/^SUBDIR.*=/s#docs##' Makefile.am || die + sed -ie '/^[[:space:]]*docs/d' configure.ac || die + fi + + # disable unused translations. Bug #356029 + cat <<-EOF >> po/POTFILES.in || die +data/ui/app-chooser.ui +data/ui/ask-rename.ui +data/ui/exec-file.ui +data/ui/file-prop.ui +data/ui/preferred-apps.ui +data/ui/progress.ui +EOF + + # subslot sanity check + local sub_slot=${SLOT#*/} + local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.') + + if [[ ${sub_slot} != ${libfm_major_abi} ]]; then + eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})" + eerror "Please update SLOT variable as follows:" + eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\"" + eerror + die "sub-slot sanity check failed" + fi + + eautoreconf + rm -r autom4te.cache || die + use vala && export VALAC="$(type -p valac-$(vala_best_api_version))" +} + +src_configure() { + local myeconfargs=( + --disable-static + --with-html-dir=/usr/share/doc/${PF}/html + $(use_enable debug) + $(use_enable doc gtk-doc) + $(use_enable examples demo) + $(use_enable exif) + $(use_with gtk gtk 3) + $(use_enable udisks) + $(use_enable vala old-actions) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + # Sometimes a directory is created instead of a symlink. No idea why... + # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm + # symlink to it. + if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then + rm -r "${D}"/usr/include/${PN} || die + fi + # Remove files installed by split-off libfm-extra package + rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h || die + rm "${D}"/usr/$(get_libdir)/libfm-extra* || die + rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc || die +} + +pkg_preinst() { + xdg_pkg_preinst + # Resolve the symlink mess. Bug #439570 + if [[ -d "${ROOT}"/usr/include/${PN} ]]; then + rm -rf "${ROOT}"/usr/include/${PN} || die + fi + if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then + cd "${D}"/usr/include || die + ln -s --force ${PN}-1.0 ${PN} || die + fi +} diff --git a/x11-libs/libfm/libfm-1.3.2.ebuild b/x11-libs/libfm/libfm-1.3.2.ebuild new file mode 100644 index 000000000000..881c58f06135 --- /dev/null +++ b/x11-libs/libfm/libfm-1.3.2.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${PN}-${PV/_/}" +inherit autotools vala xdg + +DESCRIPTION="Library for file management" +HOMEPAGE="https://wiki.lxde.org/en/PCManFM" +SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="+automount debug doc examples exif gtk udisks vala" + +REQUIRED_USE="udisks? ( automount ) doc? ( gtk )" + +DEPEND=" + >=dev-libs/glib-2.18:2 + >=lxde-base/menu-cache-1.1.0-r1:= + ~x11-libs/libfm-extra-${PV} + gtk? ( x11-libs/gtk+:3 ) + udisks? ( dev-libs/dbus-glib ) +" +RDEPEND="${DEPEND} + !lxde-base/lxshortcut + x11-misc/shared-mime-info + automount? ( + udisks? ( gnome-base/gvfs[udev,udisks] ) + !udisks? ( gnome-base/gvfs[udev] ) + ) + exif? ( media-libs/libexif ) +" +BDEPEND=" + app-arch/xz-utils + dev-util/glib-utils + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) +" + +PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" ) + +src_prepare() { + xdg_src_prepare + + if ! use doc; then + sed -ie '/^SUBDIR.*=/s#docs##' Makefile.am || die + sed -ie '/^[[:space:]]*docs/d' configure.ac || die + fi + + # disable unused translations. Bug #356029 + cat <<-EOF >> po/POTFILES.in || die +data/ui/app-chooser.ui +data/ui/ask-rename.ui +data/ui/exec-file.ui +data/ui/file-prop.ui +data/ui/preferred-apps.ui +data/ui/progress.ui +EOF + + # subslot sanity check + local sub_slot=${SLOT#*/} + local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.') + + if [[ ${sub_slot} != ${libfm_major_abi} ]]; then + eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})" + eerror "Please update SLOT variable as follows:" + eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\"" + eerror + die "sub-slot sanity check failed" + fi + + eautoreconf + rm -r autom4te.cache || die + use vala && export VALAC="$(type -p valac-$(vala_best_api_version))" +} + +src_configure() { + local myeconfargs=( + --disable-static + --with-html-dir=/usr/share/doc/${PF}/html + $(use_enable debug) + $(use_enable doc gtk-doc) + $(use_enable examples demo) + $(use_enable exif) + $(use_with gtk gtk 3) + $(use_enable udisks) + $(use_enable vala old-actions) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + # Sometimes a directory is created instead of a symlink. No idea why... + # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm + # symlink to it. + if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then + rm -r "${D}"/usr/include/${PN} || die + fi + # Remove files installed by split-off libfm-extra package + rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h || die + rm "${D}"/usr/$(get_libdir)/libfm-extra* || die + rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc || die +} + +pkg_preinst() { + xdg_pkg_preinst + # Resolve the symlink mess. Bug #439570 + if [[ -d "${ROOT}"/usr/include/${PN} ]]; then + rm -rf "${ROOT}"/usr/include/${PN} || die + fi + if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then + cd "${D}"/usr/include || die + ln -s --force ${PN}-1.0 ${PN} || die + fi +} diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild deleted file mode 100644 index 559e07188526..000000000000 --- a/x11-libs/libfm/libfm-9999.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -EGIT_REPO_URI="https://github.com/lxde/${PN}" -inherit autotools git-r3 vala xdg-utils - -DESCRIPTION="A library for file management" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" - -LICENSE="GPL-2" -SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly -IUSE="+automount debug doc examples exif gtk udisks vala" -KEYWORDS="" - -COMMON_DEPEND=">=dev-libs/glib-2.18:2 - gtk? ( >=x11-libs/gtk+-2.16:2 ) - >=lxde-base/menu-cache-0.3.2:= - x11-libs/libfm-extra" -RDEPEND="${COMMON_DEPEND} - !lxde-base/lxshortcut - x11-misc/shared-mime-info - automount? ( - udisks? ( gnome-base/gvfs[udev,udisks] ) - !udisks? ( gnome-base/gvfs[udev] ) - ) - exif? ( media-libs/libexif )" -DEPEND="${COMMON_DEPEND} - vala? ( $(vala_depend) ) - doc? ( - dev-util/gtk-doc - ) - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext - dev-util/glib-utils" - -DOCS=( AUTHORS TODO ) - -REQUIRED_USE="udisks? ( automount ) doc? ( gtk )" - -src_prepare() { - if ! use doc; then - sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed" - sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed" - else - gtkdocize --copy || die - fi - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \ - configure.ac || die "sed failed" - - intltoolize --force --copy --automake || die - #disable unused translations. Bug #356029 - for trans in app-chooser ask-rename exec-file file-prop preferred-apps \ - progress;do - echo "data/ui/"${trans}.ui >> po/POTFILES.in - done - #Remove -Werror for automake-1.12. Bug #421101 - sed -i "s:-Werror::" configure.ac || die - - # subslot sanity check - local sub_slot=${SLOT#*/} - local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.') - - if [[ ${sub_slot} != ${libfm_major_abi} ]]; then - eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})" - eerror "Please update SLOT variable as follows:" - eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\"" - eerror - die "sub-slot sanity check failed" - fi - - eautoreconf - rm -r autom4te.cache || die - use vala && export VALAC="$(type -p valac-$(vala_best_api_version))" -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable examples demo) \ - $(use_enable exif) \ - $(use_enable debug) \ - $(use_enable udisks) \ - $(use_enable vala actions) \ - $(use_with gtk) \ - $(use_enable doc gtk-doc) \ - --with-html-dir=/usr/share/doc/${PF}/html -} - -src_install() { - default - find "${D}" -name '*.la' -exec rm -f '{}' + - # Sometimes a directory is created instead of a symlink. No idea why... - # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm - # symlink to it. - if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then - rm -r "${D}"/usr/include/${PN} - fi - # Remove files installed by split-off libfm-extra package - rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h - rm "${D}"/usr/$(get_libdir)/libfm-extra* - rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc -} - -pkg_preinst() { - # Resolve the symlink mess. Bug #439570 - [[ -d "${ROOT}"/usr/include/${PN} ]] && \ - rm -rf "${ROOT}"/usr/include/${PN} - if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then - cd "${D}"/usr/include - ln -s --force ${PN}-1.0 ${PN} - fi -} - -pkg_postinst() { - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml index 1798db6cc201..95a0bf5b2f20 100644 --- a/x11-libs/libfm/metadata.xml +++ b/x11-libs/libfm/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="vala">Support custom actions in menus</flag> <flag name="udisks">Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs</flag> diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest index d655cf9aa022..447d602e505b 100644 --- a/x11-libs/libfontenc/Manifest +++ b/x11-libs/libfontenc/Manifest @@ -1 +1 @@ -DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582 +DIST libfontenc-1.1.8.tar.xz 274176 BLAKE2B b8bae8a25df2480281b00608998db59fb736b74cd5965958642036b16c5c4348c8bc6ccd65a8b784ef17650ddbb7635a728eb9dadd3b9c5cdad712ebfeb5df30 SHA512 c9ddea9c0c6c6f4933b5b8ed2044e3dc259a9edbb3070a32f0335a6ad4d47b1858cefc01fa2dff9f29808bee311e9c677b05861200d2f2c4552c92b33fe027e2 diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.8.ebuild index 478830d35f27..f36717f79fc1 100644 --- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild +++ b/x11-libs/libfontenc/libfontenc-1.1.8.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org fontenc library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="sys-libs/zlib" DEPEND="${RDEPEND} diff --git a/x11-libs/libfontenc/metadata.xml b/x11-libs/libfontenc/metadata.xml index e943b72b8a48..d7741fb1ad0e 100644 --- a/x11-libs/libfontenc/metadata.xml +++ b/x11-libs/libfontenc/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libfontenc</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0.ebuild index 20ed63f1a541..3a0811f9cd0d 100644 --- a/x11-libs/libgxim/libgxim-0.5.0.ebuild +++ b/x11-libs/libgxim/libgxim-0.5.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -USE_RUBY="ruby24 ruby25 ruby26" +EAPI="7" +USE_RUBY="ruby27 ruby30 ruby31 ruby32" inherit autotools ruby-single @@ -10,7 +10,7 @@ DESCRIPTION="GObject-based XIM protocol library" HOMEPAGE="https://tagoh.bitbucket.io/libgxim" SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ~x86" IUSE="${USE_RUBY//ruby/ruby_targets_ruby} static-libs test" @@ -22,11 +22,11 @@ RDEPEND="dev-libs/dbus-glib virtual/libintl x11-libs/gtk+:2 x11-libs/libX11" -DEPEND="${RDEPEND} - ${RUBY_DEPS} +DEPEND="${RDEPEND}" +BDEPEND="${RUBY_DEPS} dev-util/glib-utils dev-util/intltool - sys-devel/autoconf-archive + dev-build/autoconf-archive sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check )" diff --git a/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml index 412816b73f03..3e7fdc1647e2 100644 --- a/x11-libs/libgxim/metadata.xml +++ b/x11-libs/libgxim/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <upstream> - <remote-id type="bitbucket">tagoh/libgxim</remote-id> - </upstream> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <upstream> + <remote-id type="bitbucket">tagoh/libgxim</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest index bc7c99eeb75d..7fc95d3f794f 100644 --- a/x11-libs/libnotify/Manifest +++ b/x11-libs/libnotify/Manifest @@ -1,2 +1 @@ -DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94 -DIST libnotify-0.7.9.tar.xz 98148 BLAKE2B 4728d00a204cd1003e8171a54c23bb975c0477c245c1175558f27555763113ec8bd7abd7ef81f6bad2b98604efe436d843958e77473436e68560775804473383 SHA512 8a842b50777279efdb7d96a836a546c47decad158a4f03f7ffc818860d1f6276a657619e4f4a19a4e2f5ad55e0371c793420d50d802983700e8c342273b73874 +DIST libnotify-0.8.3.tar.xz 106008 BLAKE2B 05852c866dc91d42cf01804333605ecb546f7d779b143fabc341752263c8cacea9acda40bb60af90dbc84ab8327ba99966e09924ccc337f7a97909b95d39a874 SHA512 e55073fdf418a4c04375825221edc92ab6a01201b83db2a1f1530f8f91f7da9da32327452b0785251790553517dcc717cfe623142450691b7dd247ec9164cffb diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild deleted file mode 100644 index 67c486a9bef8..000000000000 --- a/x11-libs/libnotify/libnotify-0.7.8.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org meson multilib-minimal xdg-utils - -DESCRIPTION="A library for sending desktop notifications" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="gtk-doc +introspection test" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-eselect/eselect-notify-send - >=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-libs/gobject-introspection-common-1.32 - dev-util/glib-utils - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.1.2 ) - test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) -" -PDEPEND="virtual/notification-daemon" - -src_prepare() { - default - xdg_environment_reset -} - -multilib_src_configure() { - local emesonargs=( - -Dtests="$(usex test true false)" - -Dintrospection="$(multilib_native_usex introspection enabled disabled)" - -Dgtk_doc=$(multilib_native_usex gtk-doc true false) - -Ddocbook_docs=disabled - ) - meson_src_configure -} - -multilib_src_install() { - meson_src_install - - mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941 -} - -pkg_postinst() { - eselect notify-send update ifunset -} - -pkg_postrm() { - eselect notify-send update ifunset -} diff --git a/x11-libs/libnotify/libnotify-0.7.9.ebuild b/x11-libs/libnotify/libnotify-0.8.3.ebuild index 9783bf0f9890..d0a0f2c6fdb9 100644 --- a/x11-libs/libnotify/libnotify-0.7.9.ebuild +++ b/x11-libs/libnotify/libnotify-0.8.3.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit gnome.org meson multilib-minimal xdg-utils +inherit gnome.org meson-multilib xdg-utils DESCRIPTION="A library for sending desktop notifications" HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="gtk-doc +introspection test" RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( introspection )" RDEPEND=" - app-eselect/eselect-notify-send - >=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[introspection?,${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) " DEPEND="${RDEPEND}" @@ -27,10 +27,13 @@ BDEPEND=" virtual/pkgconfig app-text/docbook-xsl-ns-stylesheets dev-libs/libxslt - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.1.2 ) + gtk-doc? ( + dev-util/gi-docgen + app-text/docbook-xml-dtd:4.1.2 + ) test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) " +IDEPEND="app-eselect/eselect-notify-send" PDEPEND="virtual/notification-daemon" src_prepare() { @@ -40,18 +43,23 @@ src_prepare() { multilib_src_configure() { local emesonargs=( - -Dtests="$(usex test true false)" - -Dintrospection="$(multilib_native_usex introspection enabled disabled)" - -Dgtk_doc=$(multilib_native_usex gtk-doc true false) + $(meson_use test tests) + $(meson_native_use_feature introspection) + $(meson_native_use_bool gtk-doc gtk_doc) -Ddocbook_docs=disabled ) meson_src_configure } -multilib_src_install() { - meson_src_install - +multilib_src_install_all() { mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941 + + einstalldocs + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/ || die + mv "${ED}"/usr/share/{doc,gtk-doc}/libnotify-0 || die + fi } pkg_postinst() { diff --git a/x11-libs/libnotify/metadata.xml b/x11-libs/libnotify/metadata.xml index 0f6db5621bcb..c01abf03c313 100644 --- a/x11-libs/libnotify/metadata.xml +++ b/x11-libs/libnotify/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> <name>Gentoo Freedesktop Project</name> </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libnotify</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/liboglappth/files/gcc-4.3.patch b/x11-libs/liboglappth/files/gcc-4.3.patch index bc04b9e97c7b..cf45065916bc 100644 --- a/x11-libs/liboglappth/files/gcc-4.3.patch +++ b/x11-libs/liboglappth/files/gcc-4.3.patch @@ -1,10 +1,10 @@ ---- a/src/base_wcl.cpp 2008-07-07 23:49:10.000000000 -0700 -+++ b/src/base_wcl.cpp 2008-07-07 23:49:26.000000000 -0700 -@@ -11,6 +11,7 @@ +--- a/src/base_wcl.cpp ++++ b/src/base_wcl.cpp +@@ -22,6 +22,7 @@ #include "base_app.h" #include <stdlib.h> // the definition for NULL... +#include <cstring> - #include <GL/glut.h> - + #include <GL/gl.h> + #include <GL/glu.h> diff --git a/x11-libs/liboglappth/liboglappth-1.0.0.ebuild b/x11-libs/liboglappth/liboglappth-1.0.0-r1.ebuild index c0b2725651a1..eb68dba4208b 100644 --- a/x11-libs/liboglappth/liboglappth-1.0.0.ebuild +++ b/x11-libs/liboglappth/liboglappth-1.0.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Libary for OpenGL applications with easy-to-code scene setup and selection" HOMEPAGE="http://www.bioinformatics.org/ghemical/" @@ -10,12 +10,22 @@ SRC_URI="http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" RDEPEND=" virtual/opengl media-libs/freeglut" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/gcc-4.3.patch ) + +src_configure() { + econf --disable-static +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-libs/liboglappth/metadata.xml b/x11-libs/liboglappth/metadata.xml index 75150c966699..9bae00cd2582 100644 --- a/x11-libs/liboglappth/metadata.xml +++ b/x11-libs/liboglappth/metadata.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-chemistry@gentoo.org</email> <name>Gentoo Chemistry Project</name> </maintainer> <longdescription> -Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models -and molecular mechanics models (there is an experimental Tripos 5.2-like force -field for organic molecules). Also a tool for reduced protein models is -included. Geometry optimization, molecular dynamics and a large set of -visualization tools are currently available. -</longdescription> + Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models + and molecular mechanics models (there is an experimental Tripos 5.2-like force + field for organic molecules). Also a tool for reduced protein models is + included. Geometry optimization, molecular dynamics and a large set of + visualization tools are currently available. + </longdescription> </pkgmetadata> diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest index 80da7327ec60..47e634a93244 100644 --- a/x11-libs/libpciaccess/Manifest +++ b/x11-libs/libpciaccess/Manifest @@ -1 +1,2 @@ -DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1 +DIST libpciaccess-0.18.1.tar.xz 64452 BLAKE2B 19ebe4e8cb3f409f51be01d0c771aea79d9251d7b464f49d8adf40af55180b0f87c6092271023289f802cc2b684eecace963b5fdcb026ff7879481d22a34a675 SHA512 ef27999446e735df2331e94219ee3dafe9198a2472bb452f63ef9c9c446d5431f9e231e224cfabdeba1402974a5a0064546f9abced4d1770f994f5fc0c2b3310 +DIST libpciaccess-0.18.tar.xz 64452 BLAKE2B 06309f98aee985c92c2389344fdd0fcb4bebc6c69d71198e6bf5bc165dce85c7fd54aa1ff9454ee430264a8e1ff283976508285523d48d9948e242c53157761f SHA512 54dff9a493344586d072edf8c8eb8f7960c7dfd64aa5c51a8ec8d4e341f703fd39eb606ee41c4fdd9d5aad3372b7efe6e0fe96eadc575ea91de276320ebc3fbd diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild deleted file mode 100644 index 322abda1f522..000000000000 --- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="Library providing generic access to the PCI bus and devices" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="zlib" - -DEPEND=" - zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - sys-apps/hwids" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - "$(use_with zlib)" - "--with-pciids-path=${EPREFIX}/usr/share/misc" - ) -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - dodir /usr/bin - /bin/sh libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die - fi -} diff --git a/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild new file mode 100644 index 000000000000..c2ab3ec0a766 --- /dev/null +++ b/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 meson-multilib + +DESCRIPTION="Library providing generic access to the PCI bus and devices" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +IUSE="zlib" + +DEPEND=" + zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND} + sys-apps/hwdata" + +src_prepare() { + default +} + +multilib_src_configure() { + local emesonargs=( + -Dpci-ids="${EPREFIX}"/usr/share/hwdata + $(meson_feature zlib) + ) + meson_src_configure +} diff --git a/x11-libs/libpciaccess/libpciaccess-0.18.ebuild b/x11-libs/libpciaccess/libpciaccess-0.18.ebuild new file mode 100644 index 000000000000..c2ab3ec0a766 --- /dev/null +++ b/x11-libs/libpciaccess/libpciaccess-0.18.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 meson-multilib + +DESCRIPTION="Library providing generic access to the PCI bus and devices" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +IUSE="zlib" + +DEPEND=" + zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND} + sys-apps/hwdata" + +src_prepare() { + default +} + +multilib_src_configure() { + local emesonargs=( + -Dpci-ids="${EPREFIX}"/usr/share/hwdata + $(meson_feature zlib) + ) + meson_src_configure +} diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml index e943b72b8a48..769fcea0c3c1 100644 --- a/x11-libs/libpciaccess/metadata.xml +++ b/x11-libs/libpciaccess/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libpciaccess</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/librfm/Manifest b/x11-libs/librfm/Manifest deleted file mode 100644 index 9c7b73dca0ec..000000000000 --- a/x11-libs/librfm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST librfm5-5.3.16.3.tar.bz2 3304424 BLAKE2B 6651ef8a3967956e1858d4c94af055bddee1b0f2278fe3c0323232e1824e77d8d5d56533d23af3770a9641a2c8ea64eea35157e2cd02cd73f6bcbddd99ea9da8 SHA512 e3d00b0337c9368bbe939bcb2d7f6b1c3f3b6b5a810074c5d6bc7afccd938c5284075231a0326b5be2b93436bee346871fb47ee30c130e6ce00756148d214000 diff --git a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild b/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild deleted file mode 100644 index 265bef469574..000000000000 --- a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils ltprune - -MY_P="${PN}5-${PV}" - -DESCRIPTION="The basic library used by some rfm applications, such as Rodent filemanager" -HOMEPAGE="http://xffm.org/libxffm.html" -SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.22.5:2 - >=dev-libs/libdbh-5.0.13 - >=dev-libs/libtubo-5.0.13 - >=dev-libs/libxml2-2.4.0:2 - >=dev-libs/libzip-0.9:0= - >=gnome-base/librsvg-2.26:2 - >=x11-libs/cairo-1.12.6[X] - >=x11-libs/gtk+-3.12:3[X] - >=x11-libs/pango-1.28.0[X] - !<x11-misc/rodent-5 -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - sed -i -e "s|-O2|${CFLAGS}|" m4/rfm-conditionals.m4 || die - eautoreconf -} - -src_install() { - default - prune_libtool_files -} diff --git a/x11-libs/librfm/metadata.xml b/x11-libs/librfm/metadata.xml deleted file mode 100644 index c6e70021a646..000000000000 --- a/x11-libs/librfm/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <upstream> - <remote-id type="sourceforge">xffm</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1-r1.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1-r1.ebuild new file mode 100644 index 000000000000..c00a3a0b6d00 --- /dev/null +++ b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="tinynotify-send-${PV}" +DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send" +HOMEPAGE="https://github.com/projg2/tinynotify-send/" +SRC_URI="https://github.com/projg2/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + x11-libs/libtinynotify:= +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + virtual/pkgconfig +" + +src_configure() { + local myconf=( + --disable-gtk-doc + --disable-regular + --disable-system-wide + ) + + econf "${myconf[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild deleted file mode 100644 index d71dbc25ec9e..000000000000 --- a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P=tinynotify-send-${PV} -DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send" -HOMEPAGE="https://github.com/mgorny/tinynotify-send/" -SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc static-libs" - -RDEPEND="x11-libs/libtinynotify:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-util/gtk-doc )" - -S=${WORKDIR}/${MY_P} - -src_configure() { - local myconf=( - $(use_enable doc gtk-doc) - $(use_enable static-libs static) - --disable-regular - --disable-system-wide - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild deleted file mode 100644 index 101e5c636161..000000000000 --- a/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://github.com/mgorny/tinynotify-send.git" -inherit autotools git-r3 - -MY_P=tinynotify-send-${PV} -DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send" -HOMEPAGE="https://github.com/mgorny/tinynotify-send/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="doc static-libs" - -RDEPEND="x11-libs/libtinynotify:0=" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-1.18 - virtual/pkgconfig - doc? ( dev-util/gtk-doc )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - $(use_enable doc gtk-doc) - $(use_enable static-libs static) - --disable-regular - --disable-system-wide - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/x11-libs/libtinynotify-cli/metadata.xml b/x11-libs/libtinynotify-cli/metadata.xml index 59cabc032eb7..66d473d268b3 100644 --- a/x11-libs/libtinynotify-cli/metadata.xml +++ b/x11-libs/libtinynotify-cli/metadata.xml @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> <upstream> - <maintainer status="active"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <bugs-to>https://github.com/mgorny/tinynotify-send/issues/</bugs-to> - <remote-id type="github">mgorny/tinynotify-send</remote-id> + <remote-id type="github">projg2/tinynotify-send</remote-id> </upstream> </pkgmetadata> diff --git a/x11-libs/libtinynotify-systemwide/Manifest b/x11-libs/libtinynotify-systemwide/Manifest deleted file mode 100644 index fbcc267fea4a..000000000000 --- a/x11-libs/libtinynotify-systemwide/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libtinynotify-systemwide-0.1.tar.bz2 270071 BLAKE2B 154dbdee157ea43e35cb89c71e0cb75397f3d5a9244f0ff5bd89e647826d5870bbe854ab929305628bb48f8c81d8f251502c637de559ba5d2db30dd7508f4bb0 SHA512 95516208485ed46e4702806bca467af509b9756a738f5f345cec712d878f14f4d9c84b78c33f0e4a41e0bf7be3b6e8e50dcd230da753c2827ae75793ca1c74aa diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild deleted file mode 100644 index 4543af991c3e..000000000000 --- a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A system-wide notifications module for libtinynotify" -HOMEPAGE="https://github.com/mgorny/libtinynotify-systemwide/" -SRC_URI="https://github.com/mgorny/libtinynotify-systemwide/releases/download/${P}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc static-libs" - -RDEPEND="sys-process/procps:0= - x11-libs/libtinynotify:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-util/gtk-doc )" - -src_configure() { - local myconf=( - $(use_enable doc gtk-doc) - $(use_enable static-libs static) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild deleted file mode 100644 index d4effe7755cf..000000000000 --- a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://github.com/mgorny/${PN}.git" -inherit autotools git-r3 - -DESCRIPTION="A system-wide notifications module for libtinynotify" -HOMEPAGE="https://github.com/mgorny/libtinynotify-systemwide/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="doc static-libs" - -RDEPEND="sys-process/procps:0= - x11-libs/libtinynotify:0=" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-1.18 - virtual/pkgconfig - doc? ( dev-util/gtk-doc )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - $(use_enable doc gtk-doc) - $(use_enable static-libs static) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/x11-libs/libtinynotify-systemwide/metadata.xml b/x11-libs/libtinynotify-systemwide/metadata.xml deleted file mode 100644 index b393cf15509e..000000000000 --- a/x11-libs/libtinynotify-systemwide/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <upstream> - <maintainer status="active"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <bugs-to>https://github.com/mgorny/libtinynotify-systemwide/issues/</bugs-to> - <remote-id type="github">mgorny/libtinynotify-systemwide</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild index b87cfbb96ab0..b7935df8fb2c 100644 --- a/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild +++ b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild @@ -1,29 +1,26 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="A lightweight implementation of Desktop Notification Spec" -HOMEPAGE="https://github.com/mgorny/libtinynotify/" -SRC_URI="https://github.com/mgorny/libtinynotify/releases/download/${P}/${P}.tar.bz2" +HOMEPAGE="https://github.com/projg2/libtinynotify/" +SRC_URI="https://github.com/projg2/libtinynotify/releases/download/${P}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug doc static-libs" +IUSE="debug" -RDEPEND="sys-apps/dbus:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.18 )" +DEPEND="sys-apps/dbus:0=" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( README ) src_configure() { local myconf=( $(use_enable debug) - $(use_enable doc gtk-doc) - $(use_enable static-libs static) ) econf "${myconf[@]}" diff --git a/x11-libs/libtinynotify/libtinynotify-9999.ebuild b/x11-libs/libtinynotify/libtinynotify-9999.ebuild deleted file mode 100644 index c2e029412ac2..000000000000 --- a/x11-libs/libtinynotify/libtinynotify-9999.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://github.com/mgorny/${PN}.git" -inherit autotools git-r3 - -DESCRIPTION="A lightweight implementation of Desktop Notification Spec" -HOMEPAGE="https://github.com/mgorny/libtinynotify/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="debug doc static-libs" - -RDEPEND="sys-apps/dbus:0=" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-1.18 - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.18 )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - $(use_enable debug) - $(use_enable doc gtk-doc) - $(use_enable static-libs static) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete -} diff --git a/x11-libs/libtinynotify/metadata.xml b/x11-libs/libtinynotify/metadata.xml index 099105f604d9..644499183aba 100644 --- a/x11-libs/libtinynotify/metadata.xml +++ b/x11-libs/libtinynotify/metadata.xml @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> <upstream> - <maintainer status="active"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <bugs-to>https://github.com/mgorny/libtinynotify/issues/</bugs-to> - <remote-id type="github">mgorny/libtinynotify</remote-id> + <remote-id type="github">projg2/libtinynotify</remote-id> </upstream> </pkgmetadata> diff --git a/x11-libs/libva-compat/Manifest b/x11-libs/libva-compat/Manifest deleted file mode 100644 index 4a6cb482d4bb..000000000000 --- a/x11-libs/libva-compat/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea diff --git a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild b/x11-libs/libva-compat/libva-compat-1.8.3.ebuild deleted file mode 100644 index 5b82b4eb8871..000000000000 --- a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -MY_PN="${PN%-compat}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Video Acceleration (VA) API for Linux" -HOMEPAGE="https://01.org/linuxmedia/vaapi" -SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="1" -KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux" -IUSE="+drm egl opengl vdpau wayland X" - -VIDEO_CARDS="nvidia intel i965 nouveau" -for x in ${VIDEO_CARDS}; do - IUSE+=" video_cards_${x}" -done - -RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) - egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] ) - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] ) - !x11-libs/libva:0/0" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] ) - video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] ) - " - -REQUIRED_USE="|| ( drm wayland X ) - opengl? ( X )" - -S="${WORKDIR}/${MY_P}" -DOCS=( NEWS ) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" - $(use_enable opengl glx) - $(use_enable X x11) - $(use_enable wayland) - $(use_enable egl) - $(use_enable drm) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake -C va DESTDIR="${D}" install-libLTLIBRARIES - rm -v "${ED}"/usr/$(get_libdir)/*.{la,so} || die -} diff --git a/x11-libs/libva-compat/metadata.xml b/x11-libs/libva-compat/metadata.xml deleted file mode 100644 index 39b6984b394d..000000000000 --- a/x11-libs/libva-compat/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> - </maintainer> - <use> - <flag name="egl">Enables EGL support.</flag> - <flag name="drm">Enables VA/DRM API support.</flag> - </use> - <upstream> - <remote-id type="github">intel/libva</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest deleted file mode 100644 index 6f4bb412de38..000000000000 --- a/x11-libs/libva-intel-driver/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST intel-vaapi-driver-2.3.0.tar.bz2 2901075 BLAKE2B 606635c2b4ad05119a3fe1269354e2a27b944c56117360b5c4171b679506f3aa10d48057f1c99957efa1cff3b625a315138ac93e616aa14d30d20d540a3bb6a8 SHA512 60f37c09269e6ae07e55ecfc2c046ae7b6321abe71647625310ea7c75627ea875b94ed8e14813a36ec068bbd605c6d447dfa2c3bd692eb7953a58a871064fd5b -DIST intel-vaapi-driver-2.4.0.pre1.tar.bz2 2888363 BLAKE2B fc7861e5d7625ed598feadc3b5649335c4f6bc0cacd66bdc38a58bbe4d95909c27c9b84478abdda687725070fa9fea850b3d86925ae6a7ea821a168e2bb98a13 SHA512 f637ca24b34573ae022f24f0352be8a6e2904a703ccfa005fb84da00c54e9e02ff0282e882312b86dd7e2d1a1611fba3eef37909ac66a3c2beb056d8cba6019f diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild deleted file mode 100644 index 9ae6b9627fbf..000000000000 --- a/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_PN="intel-vaapi-driver" -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver" -fi -AUTOTOOLS_AUTORECONF="yes" -inherit autotools-multilib - -DESCRIPTION="HW video decode support for Intel integrated graphics" -HOMEPAGE="https://github.com/intel/intel-vaapi-driver" -if [[ ${PV} != *9999* ]] ; then - SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2" - S="${WORKDIR}/${MY_PN}-${PV}" - KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="wayland X" - -RDEPEND=" - >=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}] - >=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}] - wayland? ( - >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -DOCS=( AUTHORS NEWS README ) -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" - -src_prepare() { - sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die - autotools-multilib_src_prepare -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable wayland) - $(use_enable X x11) - ) - autotools-utils_src_configure -} diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.0_pre1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.0_pre1.ebuild deleted file mode 100644 index 4da19b9b7c0d..000000000000 --- a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.0_pre1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="intel-vaapi-driver" -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit git-r3 - EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver" -fi - -inherit autotools multilib-minimal - -DESCRIPTION="HW video decode support for Intel integrated graphics" -HOMEPAGE="https://github.com/intel/intel-vaapi-driver" -if [[ ${PV} != *9999* ]] ; then - SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV/_/.}/${MY_PN}-${PV/_/.}.tar.bz2" - S="${WORKDIR}/${MY_PN}-${PV/_/.}" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="wayland X" -RESTRICT="test" # No tests - -RDEPEND=" - >=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}] - >=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}] - wayland? ( - >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - eapply_user - sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die - eautoreconf -} - -multilib_src_configure() { - local myconf=( - $(use_enable wayland) - $(use_enable X x11) - ) - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -delete || die -} diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild deleted file mode 100644 index 4e4df0e31706..000000000000 --- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="intel-vaapi-driver" -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit git-r3 - EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver" -fi - -inherit autotools multilib-minimal - -DESCRIPTION="HW video decode support for Intel integrated graphics" -HOMEPAGE="https://github.com/intel/intel-vaapi-driver" -if [[ ${PV} != *9999* ]] ; then - SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2" - S="${WORKDIR}/${MY_PN}-${PV}" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="wayland X" -RESTRICT="test" # No tests - -RDEPEND=" - >=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}] - >=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}] - wayland? ( - >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - eapply_user - sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die - eautoreconf -} - -multilib_src_configure() { - local myconf=( - $(use_enable wayland) - $(use_enable X x11) - ) - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -delete || die -} diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml deleted file mode 100644 index 7949b9ce5161..000000000000 --- a/x11-libs/libva-intel-driver/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>aballier@gentoo.org</email> - <name>Alexis Ballier</name> - </maintainer> - <upstream> - <remote-id type="github">intel/intel-vaapi-driver</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest deleted file mode 100644 index fd0a6a7f3926..000000000000 --- a/x11-libs/libva-intel-media-driver/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST intel-media-18.3.0.tar.gz 14422845 BLAKE2B 07da8e78d069de091bd4f29beb0699c97f007ff0f6543baa40d35923488d6152cb0a921cbe16006b045be973d5651ee01dc98ead0b79d4c779ed39e7a8fb38d9 SHA512 96ee85c087994d1e46666b6bbd5fca8e558d9169f8b7c130fdb4571ecd4dcbb31fe4a73607cc1b055918f27e90dbb25843d851bb8a1e2557733b4795e937479d -DIST intel-media-18.4.1.tar.gz 14657816 BLAKE2B eb0be7c756e290bf5318987e375e9ad531fb4e318e4bf83f6c5d68106112a06d505ed7f8abc5ecb277b4430883d2153fe6c68ba683241253cb0d32853bb8dab2 SHA512 ed5d4116ab4af36761a0a819105f4ff5551d437e3f1ab8c1b2ea20a89a1792b7558bacd1ea8f082f595fce21d72810f806820b8543e1cbfcd2de7e28e649a536 -DIST intel-media-20.1.1.tar.gz 21788401 BLAKE2B 53f2ebf5941c487253d02d0e23229cd408eb3b53ef37cfdefb1a874e5a6c9b051b69ccda513c2d1d9bb9cc03814bc3db40a40241eb3c7a0a78edba3ba7e9bf01 SHA512 696f3b82d155e472285150b476daf9195ec6cbad0526f017fd0c57c1fb02618210b3e96eb13351ee286f3502df4970a22a940c3476877fa1f5c23dc85a646c25 diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.3.0.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.3.0.ebuild deleted file mode 100644 index 14fd59d27674..000000000000 --- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.3.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -fi - -DESCRIPTION="Intel Media Driver for VAAPI (iHD)" -HOMEPAGE="https://github.com/intel/media-driver" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz" - S="${WORKDIR}/media-driver-intel-media-${PV}" - KEYWORDS="~amd64" -fi - -LICENSE="MIT BSD" -SLOT="0" -IUSE="" - -DEPEND=">=media-libs/gmmlib-${PV} - >=x11-libs/libva-2.3.0 - >=x11-libs/libpciaccess-0.13.1-r1:= -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DMEDIA_RUN_TEST_SUITE=OFF - ) - - cmake-utils_src_configure -} diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild deleted file mode 100644 index e08e05733d2d..000000000000 --- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -fi - -DESCRIPTION="Intel Media Driver for VAAPI (iHD)" -HOMEPAGE="https://github.com/intel/media-driver" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz" - S="${WORKDIR}/media-driver-intel-media-${PV}" - KEYWORDS="~amd64" -fi - -LICENSE="MIT BSD" -SLOT="0" -IUSE="" - -DEPEND=">=media-libs/gmmlib-${PV} - >=x11-libs/libva-2.4.0 - >=x11-libs/libpciaccess-0.13.1-r1:= -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DMEDIA_RUN_TEST_SUITE=OFF - ) - - cmake-utils_src_configure -} diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild deleted file mode 100644 index 3c1a6331fa39..000000000000 --- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz" - S="${WORKDIR}/media-driver-intel-media-${PV}" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Intel Media Driver for VAAPI (iHD)" -HOMEPAGE="https://github.com/intel/media-driver" - -LICENSE="MIT BSD" -SLOT="0" -IUSE="" - -DEPEND=">=media-libs/gmmlib-${PV} - >=x11-libs/libva-2.7.1 - >=x11-libs/libpciaccess-0.13.1-r1:= -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DMEDIA_BUILD_FATAL_WARNINGS=OFF - -DMEDIA_RUN_TEST_SUITE=OFF - ) - - cmake-utils_src_configure -} diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild deleted file mode 100644 index 3c1a6331fa39..000000000000 --- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz" - S="${WORKDIR}/media-driver-intel-media-${PV}" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Intel Media Driver for VAAPI (iHD)" -HOMEPAGE="https://github.com/intel/media-driver" - -LICENSE="MIT BSD" -SLOT="0" -IUSE="" - -DEPEND=">=media-libs/gmmlib-${PV} - >=x11-libs/libva-2.7.1 - >=x11-libs/libpciaccess-0.13.1-r1:= -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DMEDIA_BUILD_FATAL_WARNINGS=OFF - -DMEDIA_RUN_TEST_SUITE=OFF - ) - - cmake-utils_src_configure -} diff --git a/x11-libs/libva-intel-media-driver/metadata.xml b/x11-libs/libva-intel-media-driver/metadata.xml deleted file mode 100644 index 80088c21d0ab..000000000000 --- a/x11-libs/libva-intel-media-driver/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>media-video@gentoo.org</email> -</maintainer> -</pkgmetadata> diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest deleted file mode 100644 index 3c4075e12c5b..000000000000 --- a/x11-libs/libva-vdpau-driver/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 BLAKE2B b9cd0bbbe1e638ad29363cd0d8c6452de222023017283ce81f138730c7ba3396f3ffca40478746cab4b93a8855e73de405aa783e44e6c1179c5e347bd7eff657 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094 diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch deleted file mode 100644 index 74caee3483df..000000000000 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch +++ /dev/null @@ -1,29 +0,0 @@ ->From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001 -From: "Xiang, Haihao" <haihao.xiang@intel.com> -Date: Fri, 21 Jun 2013 12:55:30 +0800 -Subject: [PATCH] VAEncH264VUIBufferType and VAEncH264SEIBufferType are - dropped from VA API - -The driver doesn't use them indeed - -Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com> ---- - src/vdpau_dump.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c -index 899888b..610e7cd 100644 ---- a/src/vdpau_dump.c -+++ b/src/vdpau_dump.c -@@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type) - _(VAEncSequenceParameterBufferType); - _(VAEncPictureParameterBufferType); - _(VAEncSliceParameterBufferType); -- _(VAEncH264VUIBufferType); -- _(VAEncH264SEIBufferType); - #endif - #if VA_CHECK_VERSION(0,31,1) - _(VAQMatrixBufferType); --- -1.7.9.5 - diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch deleted file mode 100644 index 221b9608fe44..000000000000 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./src/utils_glx.h~ 2012-10-05 16:02:58.000000000 +0100 -+++ ./src/utils_glx.h 2012-10-19 08:44:12.469642440 +0100 -@@ -48,6 +48,13 @@ - typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int); - #endif - -+#if GL_GLEXT_VERSION >= 85 -+/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED -+ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h> -+ Redefine the type here as an interim solution */ -+typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -+#endif -+ - #ifndef GL_FRAMEBUFFER_BINDING - #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT - #endif diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch deleted file mode 100644 index 0d92074ced93..000000000000 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/689530 - -libva commit 93c52a17b8d2 ("va_backend: remove unneeded -linux/videodev2.h include") removed an include that provided the -prototype of v4l2_format among other v4l2_* structs. - -Without this or a forward declaration of 'struct v4l2_format', the prototype -and definition of vdpau_CreateSurfaceFromV4L2Buf() (which has a 'struct -v4l2_format *' parameter) are seen as conflicting. - -Just include the removed header where we need it. - -diff --git a/src/vdpau_driver.h b/src/vdpau_driver.h -index 6286d16..54d37fb 100644 ---- a/src/vdpau_driver.h -+++ b/src/vdpau_driver.h -@@ -21,6 +21,8 @@ - #ifndef VDPAU_DRIVER_H - #define VDPAU_DRIVER_H - -+#include <linux/videodev2.h> -+ - #include <va/va_backend.h> - #include "vaapi_compat.h" - #include "vdpau_gate.h" diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch deleted file mode 100644 index 412e9c308480..000000000000 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/517778 - ---- a/src/vdpau_decode.c -+++ b/src/vdpau_decode.c -@@ -1289,7 +1289,7 @@ - driver_data, - obj_context->vdp_decoder, - obj_surface->vdp_surface, -- (VdpPictureInfo)&obj_context->vdp_picture_info, -+ (VdpPictureInfo *)&obj_context->vdp_picture_info, - obj_context->vdp_bitstream_buffers_count, - obj_context->vdp_bitstream_buffers - ); diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-sigfpe-crash.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-sigfpe-crash.patch deleted file mode 100644 index e2fe02ccf320..000000000000 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-sigfpe-crash.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Fix a crash if a heap is destroyed before being initialized -Author: Sebastian Ramacher <sramacher@debian.org> -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=58836 -Bug-Debian: http://bugs.debian.org/748294 -Last-Update: 2014-06-02 - ---- vdpau-video-0.7.4.orig/src/object_heap.c -+++ vdpau-video-0.7.4/src/object_heap.c -@@ -272,8 +272,10 @@ object_heap_destroy(object_heap_p heap) - ASSERT(obj->next_free != ALLOCATED); - } - -- for (i = 0; i < heap->heap_size / heap->heap_increment; i++) { -- free(heap->bucket[i]); -+ if (heap->bucket) { -+ for (i = 0; i < heap->heap_size / heap->heap_increment; i++) { -+ free(heap->bucket[i]); -+ } - } - - pthread_mutex_destroy(&heap->mutex); diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild deleted file mode 100644 index fb2ab0369c15..000000000000 --- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi" -SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64 x86" -IUSE="debug opengl" - -RDEPEND=">=x11-libs/libva-1.2.1-r1:=[X,opengl?,${MULTILIB_USEDEP}] - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - >=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( NEWS README AUTHORS ) - -PATCHES=( - "${FILESDIR}"/${P}-glext-missing-definition.patch - "${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch - "${FILESDIR}"/${P}-libvdpau-0.8.patch - "${FILESDIR}"/${P}-sigfpe-crash.patch - "${FILESDIR}"/${P}-include-linux-videodev2.h.patch -) - -src_prepare() { - default - sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable debug) - $(use_enable opengl glx) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} diff --git a/x11-libs/libva-vdpau-driver/metadata.xml b/x11-libs/libva-vdpau-driver/metadata.xml deleted file mode 100644 index e0c65e53b38c..000000000000 --- a/x11-libs/libva-vdpau-driver/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>aballier@gentoo.org</email> - <name>Alexis Ballier</name> - </maintainer> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> - </maintainer> -</pkgmetadata> diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest deleted file mode 100644 index dba94bce3592..000000000000 --- a/x11-libs/libva/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106 -DIST libva-2.6.1.tar.bz2 466497 BLAKE2B d4ea6e6d0102722206d94725932f0b3cf650bab3f02235f4c627dc83e5417b786f9524430d793f1067d002a0c9d7cbc92a7c740383c698d225a14946e1bb90ba SHA512 b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d -DIST libva-2.7.0.tar.bz2 477326 BLAKE2B 4ec99cebe3be8de46a7663b36cf5cededc271dc3ce6f6a42a2e861043c3bc3a1cb93ea31c4a2b7a1e5d7789de128066728b7d910bf19eceab107fe3b12966126 SHA512 4922d7c0d706d160b6885a045ca585e822275f04e66142d963b0e8e3efcf2ada81edc1255d0eb334c46c51b994e35c080d8ced10bf29a153cabe5c6991de3a68 -DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe5681669ecb3583a8910568bc96817b8da079ffe80915ecf1002f9ac247eea5e44f8f7ce305313719fc1a4f1c5892b3 SHA512 f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126 diff --git a/x11-libs/libva/libva-2.5.0-r1.ebuild b/x11-libs/libva/libva-2.5.0-r1.ebuild deleted file mode 100644 index f23c9f5ecc52..000000000000 --- a/x11-libs/libva/libva-2.5.0-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Video Acceleration (VA) API for Linux" -HOMEPAGE="https://01.org/linuxmedia/vaapi" - -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit autotools git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/intel/libva" - AUTOTOOLS_AUTORECONF="yes" -else - SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1)" -IUSE="+drm opengl utils vdpau wayland X" - -VIDEO_CARDS="nvidia intel i965 nouveau" -for x in ${VIDEO_CARDS}; do - IUSE+=" video_cards_${x}" -done - -RDEPEND=" - >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - utils? ( media-video/libva-utils ) -" - -REQUIRED_USE="|| ( drm wayland X ) - opengl? ( X )" - -DOCS=( NEWS ) - -MULTILIB_WRAPPED_HEADERS=( -/usr/include/va/va_backend_glx.h -/usr/include/va/va_x11.h -/usr/include/va/va_dri2.h -/usr/include/va/va_dricommon.h -/usr/include/va/va_glx.h -) - -src_prepare() { - default - [[ "${PV}" == *9999* ]] && eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" - $(use_enable opengl glx) - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/x11-libs/libva/libva-2.6.1.ebuild b/x11-libs/libva/libva-2.6.1.ebuild deleted file mode 100644 index 016d79e6442e..000000000000 --- a/x11-libs/libva/libva-2.6.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Video Acceleration (VA) API for Linux" -HOMEPAGE="https://01.org/linuxmedia/vaapi" - -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit autotools git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/intel/libva" - AUTOTOOLS_AUTORECONF="yes" -else - SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1)" -IUSE="+drm opengl utils vdpau wayland X" - -VIDEO_CARDS="nvidia intel i965 nouveau" -for x in ${VIDEO_CARDS}; do - IUSE+=" video_cards_${x}" -done - -RDEPEND=" - >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - utils? ( media-video/libva-utils ) -" - -REQUIRED_USE="|| ( drm wayland X ) - opengl? ( X )" - -DOCS=( NEWS ) - -MULTILIB_WRAPPED_HEADERS=( -/usr/include/va/va_backend_glx.h -/usr/include/va/va_x11.h -/usr/include/va/va_dri2.h -/usr/include/va/va_dricommon.h -/usr/include/va/va_glx.h -) - -src_prepare() { - default - [[ "${PV}" == *9999* ]] && eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" - $(use_enable opengl glx) - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/x11-libs/libva/libva-2.7.0.ebuild b/x11-libs/libva/libva-2.7.0.ebuild deleted file mode 100644 index 016d79e6442e..000000000000 --- a/x11-libs/libva/libva-2.7.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Video Acceleration (VA) API for Linux" -HOMEPAGE="https://01.org/linuxmedia/vaapi" - -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit autotools git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/intel/libva" - AUTOTOOLS_AUTORECONF="yes" -else - SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1)" -IUSE="+drm opengl utils vdpau wayland X" - -VIDEO_CARDS="nvidia intel i965 nouveau" -for x in ${VIDEO_CARDS}; do - IUSE+=" video_cards_${x}" -done - -RDEPEND=" - >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - utils? ( media-video/libva-utils ) -" - -REQUIRED_USE="|| ( drm wayland X ) - opengl? ( X )" - -DOCS=( NEWS ) - -MULTILIB_WRAPPED_HEADERS=( -/usr/include/va/va_backend_glx.h -/usr/include/va/va_x11.h -/usr/include/va/va_dri2.h -/usr/include/va/va_dricommon.h -/usr/include/va/va_glx.h -) - -src_prepare() { - default - [[ "${PV}" == *9999* ]] && eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" - $(use_enable opengl glx) - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/x11-libs/libva/libva-2.7.1.ebuild b/x11-libs/libva/libva-2.7.1.ebuild deleted file mode 100644 index 016d79e6442e..000000000000 --- a/x11-libs/libva/libva-2.7.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Video Acceleration (VA) API for Linux" -HOMEPAGE="https://01.org/linuxmedia/vaapi" - -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit autotools git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/intel/libva" - AUTOTOOLS_AUTORECONF="yes" -else - SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1)" -IUSE="+drm opengl utils vdpau wayland X" - -VIDEO_CARDS="nvidia intel i965 nouveau" -for x in ${VIDEO_CARDS}; do - IUSE+=" video_cards_${x}" -done - -RDEPEND=" - >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - utils? ( media-video/libva-utils ) -" - -REQUIRED_USE="|| ( drm wayland X ) - opengl? ( X )" - -DOCS=( NEWS ) - -MULTILIB_WRAPPED_HEADERS=( -/usr/include/va/va_backend_glx.h -/usr/include/va/va_x11.h -/usr/include/va/va_dri2.h -/usr/include/va/va_dricommon.h -/usr/include/va/va_glx.h -) - -src_prepare() { - default - [[ "${PV}" == *9999* ]] && eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" - $(use_enable opengl glx) - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild deleted file mode 100644 index 016d79e6442e..000000000000 --- a/x11-libs/libva/libva-9999.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Video Acceleration (VA) API for Linux" -HOMEPAGE="https://01.org/linuxmedia/vaapi" - -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit autotools git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/intel/libva" - AUTOTOOLS_AUTORECONF="yes" -else - SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1)" -IUSE="+drm opengl utils vdpau wayland X" - -VIDEO_CARDS="nvidia intel i965 nouveau" -for x in ${VIDEO_CARDS}; do - IUSE+=" video_cards_${x}" -done - -RDEPEND=" - >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) - video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) - utils? ( media-video/libva-utils ) -" - -REQUIRED_USE="|| ( drm wayland X ) - opengl? ( X )" - -DOCS=( NEWS ) - -MULTILIB_WRAPPED_HEADERS=( -/usr/include/va/va_backend_glx.h -/usr/include/va/va_x11.h -/usr/include/va/va_dri2.h -/usr/include/va/va_dricommon.h -/usr/include/va/va_glx.h -) - -src_prepare() { - default - [[ "${PV}" == *9999* ]] && eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" - $(use_enable opengl glx) - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml deleted file mode 100644 index 7f3149fdd2bb..000000000000 --- a/x11-libs/libva/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>aballier@gentoo.org</email> - <name>Alexis Ballier</name> - </maintainer> - <use> - <flag name="drm">Enables VA/DRM API support.</flag> - <flag name="utils">Install VA-API utility programs.</flag> - </use> - <upstream> - <remote-id type="github">intel/libva</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest index baf3ca4d8d81..4122e68350cd 100644 --- a/x11-libs/libvdpau/Manifest +++ b/x11-libs/libvdpau/Manifest @@ -1,3 +1 @@ -DIST libvdpau-1.3.tar.bz2 139009 BLAKE2B d535c7723638339d4e67002721e9d0d8aae89a6001fccc41d9c3b21d52f0fae9237705bca448fbf1c244dd7eeb71f5fc74ed81f05c975bed798fce503a571c90 SHA512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 -DIST libvdpau-1.4.tar.bz2 139504 BLAKE2B de2b9251060f10e3126b59f44595c3b9cc65c3f5bc719133809414ed51362fb1f90fa67d0351007a178455329493f929d0983a2a7e67c29022ff351ea1f5adfc SHA512 68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01 -DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e +DIST libvdpau-1.5.tar.bz2 143279 BLAKE2B 2c59250aa1fa45755d051381a6edf9967800af5dea6e07eb41a6daeb7dbce909b70683376d8cabbe57a14ab5cf9c25ae3950cce5f701f4a96e4154221c5c9a31 SHA512 7affb14874431eba1be6e8634fcbb6247cbf6956fb88116e06e60de30a7852a407e8598176a369c2ba4bfaef4be58727e51d4bc390f705991ac83d660f611ff5 diff --git a/x11-libs/libvdpau/libvdpau-1.2.ebuild b/x11-libs/libvdpau/libvdpau-1.2.ebuild deleted file mode 100644 index ae3a69df818d..000000000000 --- a/x11-libs/libvdpau/libvdpau-1.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VIRTUALX_REQUIRED="test" -inherit autotools flag-o-matic virtualx multilib-minimal - -DESCRIPTION="VDPAU wrapper and trace libraries" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" -SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${P}/${PN}-${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm64 x86" -IUSE="doc dri" - -RDEPEND=" - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - virtual/latex-base - ) - dri? ( x11-base/xorg-proto ) -" -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - default - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - append-cppflags -D_GNU_SOURCE - econf \ - $(use dri || echo --disable-dri2) \ - $(use_enable doc documentation) -} - -multilib_src_test() { - virtx emake check -} - -multilib_src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/x11-libs/libvdpau/libvdpau-1.3.ebuild b/x11-libs/libvdpau/libvdpau-1.3.ebuild deleted file mode 100644 index 09b8c0dd0f02..000000000000 --- a/x11-libs/libvdpau/libvdpau-1.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VIRTUALX_REQUIRED="test" -inherit flag-o-matic meson virtualx multilib-minimal - -DESCRIPTION="VDPAU wrapper and trace libraries" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" -SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 x86" -IUSE="doc dri" - -RDEPEND=" - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - virtual/latex-base - ) - dri? ( x11-base/xorg-proto ) -" - -src_prepare() { - sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die - default -} - -multilib_src_configure() { - append-cppflags -D_GNU_SOURCE - local emesonargs=( - -Ddri2=$(usex dri true false) - -Ddocumentation=$(usex doc true false) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} -multilib_src_test() { - virtx meson_src_test -} - -multilib_src_install() { - meson_src_install - find "${ED}" -name '*.la' -delete || die -} diff --git a/x11-libs/libvdpau/libvdpau-1.4.ebuild b/x11-libs/libvdpau/libvdpau-1.4.ebuild deleted file mode 100644 index e44442af1427..000000000000 --- a/x11-libs/libvdpau/libvdpau-1.4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VIRTUALX_REQUIRED="test" -inherit flag-o-matic meson virtualx multilib-minimal - -DESCRIPTION="VDPAU wrapper and trace libraries" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" -SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~x86" -IUSE="doc dri" - -RDEPEND=" - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - virtual/latex-base - ) - dri? ( x11-base/xorg-proto ) -" - -src_prepare() { - sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die - default -} - -multilib_src_configure() { - append-cppflags -D_GNU_SOURCE - local emesonargs=( - -Ddri2=$(usex dri true false) - -Ddocumentation=$(usex doc true false) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} -multilib_src_test() { - virtx meson_src_test -} - -multilib_src_install() { - meson_src_install - find "${ED}" -name '*.la' -delete || die -} diff --git a/x11-libs/libvdpau/libvdpau-1.5.ebuild b/x11-libs/libvdpau/libvdpau-1.5.ebuild new file mode 100644 index 000000000000..5d875d1bbede --- /dev/null +++ b/x11-libs/libvdpau/libvdpau-1.5.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib virtualx + +DESCRIPTION="VDPAU wrapper and trace libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU/" +SRC_URI="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm64 ~riscv x86" +IUSE="doc dri" + +RDEPEND=" + x11-libs/libX11[${MULTILIB_USEDEP}] + dri? ( x11-libs/libXext[${MULTILIB_USEDEP}] )" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/doxygen + media-gfx/graphviz + virtual/latex-base + )" + +src_prepare() { + default + + sed -i "/^docdir/s|${PN}|${PF}|" doc/meson.build || die +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool doc documentation) + $(meson_use dri dri2) + ) + + meson_src_configure +} + +multilib_src_test() { + virtx meson_src_test +} diff --git a/x11-libs/libvdpau/libvdpau-99999.ebuild b/x11-libs/libvdpau/libvdpau-99999.ebuild deleted file mode 100644 index ecc84d2648b3..000000000000 --- a/x11-libs/libvdpau/libvdpau-99999.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VIRTUALX_REQUIRED="test" -inherit flag-o-matic git-r3 meson virtualx multilib-minimal - -DESCRIPTION="VDPAU wrapper and trace libraries" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" -EGIT_REPO_URI="https://gitlab.freedesktop.org/vdpau/${PN}/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" -IUSE="doc dri" - -RDEPEND=" - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - media-gfx/graphviz - virtual/latex-base - ) - dri? ( x11-base/xorg-proto ) -" - -src_prepare() { - sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die - default -} - -multilib_src_configure() { - append-cppflags -D_GNU_SOURCE - local emesonargs=( - -Ddri2=$(usex dri true false) - -Ddocumentation=$(usex doc true false) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} -multilib_src_test() { - virtx meson_src_test -} - -multilib_src_install() { - meson_src_install - find "${ED}" -name '*.la' -delete || die -} diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml index f8bd6f3f34f9..59d45dbb24bd 100644 --- a/x11-libs/libvdpau/metadata.xml +++ b/x11-libs/libvdpau/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>jer@gentoo.org</email> - <name>Jeroen Roovers</name> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">vdpau/libvdpau</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest index 326088e44260..51c28860a817 100644 --- a/x11-libs/libwnck/Manifest +++ b/x11-libs/libwnck/Manifest @@ -1,2 +1 @@ -DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9 -DIST libwnck-3.30.0.tar.xz 800296 BLAKE2B 5917ac8a69f6f1e0d639f301a77349015226ca6d0fc12e8b23c00a81e18f6e9dbb7716b01e50aceb15bdbd64b5b1a8295be5b931d513e120508cdf14d2d15a23 SHA512 79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128 +DIST libwnck-43.0.tar.xz 455464 BLAKE2B 591b7a9016f5149a2493d36ed8ec8a7e2a59b13043aed23bf87ef67520954d2e5cab0edb6f427c36f33fe80478ad363c9db6f4dacbc7c6d4295e79191e7f5043 SHA512 f6c14b0a650c6d5ab4d4013e6add3972a0f0bcdedfb9785f64199c9a65713d11c9d936e8b04d0f04707c3d165dd345bfa806f654bf82eabb765546b8914d68d2 diff --git a/x11-libs/libwnck/files/libwnck-43.0-segfault_in_invalidate_icons.patch b/x11-libs/libwnck/files/libwnck-43.0-segfault_in_invalidate_icons.patch new file mode 100644 index 000000000000..d107f25d97c6 --- /dev/null +++ b/x11-libs/libwnck/files/libwnck-43.0-segfault_in_invalidate_icons.patch @@ -0,0 +1,29 @@ +From 6ceb684442eb26e3bdb8a38bf52264ad55f96a7b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com> +Date: Tue, 20 Sep 2022 15:40:22 +0300 +Subject: [PATCH] handle: avoid segfault in invalidate_icons + +Screens variable won't be initialized if default icon sizes are +set/changed before using wnck_screen_get_default. + +https://bugs.launchpad.net/ubuntu/+source/libwnck3/+bug/1990263 +--- + libwnck/wnck-handle.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libwnck/wnck-handle.c b/libwnck/wnck-handle.c +index e12ff882..8d5da45c 100644 +--- a/libwnck/wnck-handle.c ++++ b/libwnck/wnck-handle.c +@@ -70,6 +70,9 @@ invalidate_icons (WnckHandle *self) + Display *xdisplay; + int i; + ++ if (self->screens == NULL) ++ return; ++ + xdisplay = _wnck_get_default_display (); + + for (i = 0; i < ScreenCount (xdisplay); ++i) +-- + diff --git a/x11-libs/libwnck/files/libwnck-43.0-xres-extension.patch b/x11-libs/libwnck/files/libwnck-43.0-xres-extension.patch new file mode 100644 index 000000000000..2003c7df59ab --- /dev/null +++ b/x11-libs/libwnck/files/libwnck-43.0-xres-extension.patch @@ -0,0 +1,380 @@ +From 4ee0ab2b0665da5cb0ad16d6d163ad20549b7ba6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com> +Date: Fri, 30 Sep 2022 17:32:09 +0300 +Subject: [PATCH 1/4] handle: init XRes extension + +XResQueryClientIds needs XRes 1.2 or newer. +--- + libwnck/wnck-handle-private.h | 2 ++ + libwnck/wnck-handle.c | 48 +++++++++++++++++++++++++++++++++++ + meson.build | 2 +- + 3 files changed, 51 insertions(+), 1 deletion(-) + +diff --git a/libwnck/wnck-handle-private.h b/libwnck/wnck-handle-private.h +index c4217cef..06331040 100644 +--- a/libwnck/wnck-handle-private.h ++++ b/libwnck/wnck-handle-private.h +@@ -26,6 +26,8 @@ G_BEGIN_DECLS + + WnckClientType _wnck_handle_get_client_type (WnckHandle *self); + ++gboolean _wnck_handle_has_xres (WnckHandle *self); ++ + gsize _wnck_handle_get_default_icon_size (WnckHandle *self); + + gsize _wnck_handle_get_default_mini_icon_size (WnckHandle *self); +diff --git a/libwnck/wnck-handle.c b/libwnck/wnck-handle.c +index e12ff882..710b7548 100644 +--- a/libwnck/wnck-handle.c ++++ b/libwnck/wnck-handle.c +@@ -29,6 +29,11 @@ + #include "config.h" + #include "wnck-handle-private.h" + ++#include <X11/Xlib.h> ++#ifdef HAVE_XRES ++#include <X11/extensions/XRes.h> ++#endif ++ + #include "private.h" + #include "screen.h" + #include "window.h" +@@ -43,6 +48,8 @@ struct _WnckHandle + + WnckClientType client_type; + ++ gboolean have_xres; ++ + gsize default_icon_size; + gsize default_mini_icon_size; + +@@ -164,6 +171,40 @@ filter_func (GdkXEvent *gdkxevent, + return GDK_FILTER_CONTINUE; + } + ++static void ++init_xres (WnckHandle *self) ++{ ++#ifdef HAVE_XRES ++ Display *xdisplay; ++ int event_base; ++ int error_base; ++ int major; ++ int minor; ++ ++ xdisplay = _wnck_get_default_display (); ++ event_base = error_base = major = minor = 0; ++ ++ if (XResQueryExtension (xdisplay, &event_base, &error_base) && ++ XResQueryVersion (xdisplay, &major, &minor) == 1) ++ { ++ if (major > 1 || (major == 1 && minor >= 2)) ++ self->have_xres = TRUE; ++ } ++#endif ++} ++ ++static void ++wnck_handle_constructed (GObject *object) ++{ ++ WnckHandle *self; ++ ++ self = WNCK_HANDLE (object); ++ ++ G_OBJECT_CLASS (wnck_handle_parent_class)->constructed (object); ++ ++ init_xres (self); ++} ++ + static void + wnck_handle_finalize (GObject *object) + { +@@ -290,6 +331,7 @@ wnck_handle_class_init (WnckHandleClass *self_class) + + object_class = G_OBJECT_CLASS (self_class); + ++ object_class->constructed = wnck_handle_constructed; + object_class->finalize = wnck_handle_finalize; + object_class->get_property = wnck_handle_get_property; + object_class->set_property = wnck_handle_set_property; +@@ -343,6 +385,12 @@ _wnck_handle_get_client_type (WnckHandle *self) + return self->client_type; + } + ++gboolean ++_wnck_handle_has_xres (WnckHandle *self) ++{ ++ return self->have_xres; ++} ++ + /** + * wnck_handle_get_default_screen: + * @self: a #WnckHandle +diff --git a/meson.build b/meson.build +index 6b0eea97..907fdf26 100644 +--- a/meson.build ++++ b/meson.build +@@ -45,7 +45,7 @@ pkg_deps = [ + {'name': 'gtk+-3.0', 'version': '>= 3.22.0' }, + {'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required': get_option('startup_notification')}, + {'name': X11_PACKAGE }, +- {'name': XRES_PACKAGE, 'required': false}, ++ {'name': XRES_PACKAGE, 'version': '>= 1.2', 'required': false}, + ] + + foreach p: pkg_deps +-- +GitLab + + +From f6b973b1f15ac1d8b8203972195d9a1765c75ba2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com> +Date: Fri, 30 Sep 2022 18:07:55 +0300 +Subject: [PATCH 2/4] xutils: move XRes code to separate function + +--- + libwnck/xutils.c | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) + +diff --git a/libwnck/xutils.c b/libwnck/xutils.c +index 60ae7b25..d120ff16 100644 +--- a/libwnck/xutils.c ++++ b/libwnck/xutils.c +@@ -1145,13 +1145,12 @@ _wnck_get_session_id (Screen *screen, + _wnck_atom_get ("SM_CLIENT_ID")); + } + +-int +-_wnck_get_pid (Screen *screen, +- Window xwindow) ++#ifdef HAVE_XRES ++static int ++xres_get_pid (Screen *screen, ++ Window xwindow) + { + int pid = -1; +- +-#ifdef HAVE_XRES + XResClientIdSpec client_spec; + long client_id_count = 0; + XResClientIdValue *client_ids = NULL; +@@ -1172,10 +1171,23 @@ _wnck_get_pid (Screen *screen, + } + + XResClientIdsDestroy (client_id_count, client_ids); +- +- if (pid != -1) +- return pid; + } ++ ++ return pid; ++} ++#endif ++ ++int ++_wnck_get_pid (Screen *screen, ++ Window xwindow) ++{ ++ int pid = -1; ++ ++#ifdef HAVE_XRES ++ pid = xres_get_pid (screen, xwindow); ++ ++ if (pid != -1) ++ return pid; + #endif + + if (!_wnck_get_cardinal (screen, xwindow, +-- +GitLab + + +From 6e61e5ef2ad6726cf607ea70c011f49e269472e7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com> +Date: Fri, 30 Sep 2022 18:39:00 +0300 +Subject: [PATCH 3/4] xutils: use WnckScreen in _wnck_get_pid + +--- + libwnck/application.c | 2 +- + libwnck/window.c | 2 +- + libwnck/wnck-resource-usage.c | 26 +++++++++++++------------- + libwnck/xutils.c | 16 ++++++++++------ + libwnck/xutils.h | 4 ++-- + 5 files changed, 27 insertions(+), 23 deletions(-) + +diff --git a/libwnck/application.c b/libwnck/application.c +index 9ab7f489..31005ba4 100644 +--- a/libwnck/application.c ++++ b/libwnck/application.c +@@ -524,7 +524,7 @@ _wnck_application_create (Window xwindow, + if (application->priv->name) + application->priv->name_from_leader = TRUE; + +- application->priv->pid = _wnck_get_pid (xscreen, ++ application->priv->pid = _wnck_get_pid (screen, + application->priv->xwindow); + + application->priv->startup_id = _wnck_get_utf8_property (xscreen, +diff --git a/libwnck/window.c b/libwnck/window.c +index 35bb37c1..229b4cb1 100644 +--- a/libwnck/window.c ++++ b/libwnck/window.c +@@ -510,7 +510,7 @@ _wnck_window_create (Window xwindow, + _wnck_get_session_id (xscreen, window->priv->xwindow); + + window->priv->pid = +- _wnck_get_pid (xscreen, window->priv->xwindow); ++ _wnck_get_pid (screen, window->priv->xwindow); + + window->priv->x = 0; + window->priv->y = 0; +diff --git a/libwnck/wnck-resource-usage.c b/libwnck/wnck-resource-usage.c +index a845d82b..1d81c283 100644 +--- a/libwnck/wnck-resource-usage.c ++++ b/libwnck/wnck-resource-usage.c +@@ -126,10 +126,10 @@ wnck_gulong_equal (gconstpointer a, + } + + static gulong +-wnck_check_window_for_pid (Screen *screen, +- Window win, +- XID match_xid, +- XID mask) ++wnck_check_window_for_pid (WnckScreen *screen, ++ Window win, ++ XID match_xid, ++ XID mask) + { + if ((win & ~mask) == match_xid) + return _wnck_get_pid (screen, win); +@@ -138,13 +138,13 @@ wnck_check_window_for_pid (Screen *screen, + } + + static void +-wnck_find_pid_for_resource_r (Display *xdisplay, +- Screen *screen, +- Window win_top, +- XID match_xid, +- XID mask, +- gulong *xid, +- gulong *pid) ++wnck_find_pid_for_resource_r (Display *xdisplay, ++ WnckScreen *screen, ++ Window win_top, ++ XID match_xid, ++ XID mask, ++ gulong *xid, ++ gulong *pid) + { + Status qtres; + int err; +@@ -250,10 +250,10 @@ wnck_pid_read_resource_usage_fill_cache (struct xresclient_state *state) + + for (i = 0; i < ScreenCount (state->xdisplay); i++) + { +- Screen *screen; ++ WnckScreen *screen; + Window root; + +- screen = ScreenOfDisplay (state->xdisplay, i); ++ screen = wnck_handle_get_screen (_wnck_get_handle (), i); + root = RootWindow (state->xdisplay, i); + + if (root == None) +diff --git a/libwnck/xutils.c b/libwnck/xutils.c +index d120ff16..08be8aa9 100644 +--- a/libwnck/xutils.c ++++ b/libwnck/xutils.c +@@ -1147,18 +1147,21 @@ _wnck_get_session_id (Screen *screen, + + #ifdef HAVE_XRES + static int +-xres_get_pid (Screen *screen, +- Window xwindow) ++xres_get_pid (WnckScreen *screen, ++ Window xwindow) + { + int pid = -1; ++ Screen *xscreen; + XResClientIdSpec client_spec; + long client_id_count = 0; + XResClientIdValue *client_ids = NULL; + ++ xscreen = _wnck_screen_get_xscreen (screen); ++ + client_spec.client = xwindow; + client_spec.mask = XRES_CLIENT_ID_PID_MASK; + +- if (XResQueryClientIds (DisplayOfScreen (screen), 1, &client_spec, ++ if (XResQueryClientIds (DisplayOfScreen (xscreen), 1, &client_spec, + &client_id_count, &client_ids) == Success) + { + long i; +@@ -1178,8 +1181,8 @@ xres_get_pid (Screen *screen, + #endif + + int +-_wnck_get_pid (Screen *screen, +- Window xwindow) ++_wnck_get_pid (WnckScreen *screen, ++ Window xwindow) + { + int pid = -1; + +@@ -1190,7 +1193,8 @@ _wnck_get_pid (Screen *screen, + return pid; + #endif + +- if (!_wnck_get_cardinal (screen, xwindow, ++ if (!_wnck_get_cardinal (_wnck_screen_get_xscreen (screen), ++ xwindow, + _wnck_atom_get ("_NET_WM_PID"), + &pid)) + return 0; +diff --git a/libwnck/xutils.h b/libwnck/xutils.h +index 4e5c6204..700832a4 100644 +--- a/libwnck/xutils.h ++++ b/libwnck/xutils.h +@@ -123,8 +123,8 @@ void _wnck_change_viewport (Screen *screen, + + char* _wnck_get_session_id (Screen *screen, + Window xwindow); +-int _wnck_get_pid (Screen *screen, +- Window xwindow); ++int _wnck_get_pid (WnckScreen *screen, ++ Window xwindow); + char* _wnck_get_name (Screen *screen, + Window xwindow); + char* _wnck_get_icon_name (Screen *screen, +-- +GitLab + + +From dde756bc7788488f07b674cbe218943a62eb82e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com> +Date: Fri, 30 Sep 2022 18:43:07 +0300 +Subject: [PATCH 4/4] xutils: check if XRes is available before using + XResQueryClientIds + +https://gitlab.gnome.org/GNOME/libwnck/-/issues/154 +--- + libwnck/xutils.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libwnck/xutils.c b/libwnck/xutils.c +index 08be8aa9..91c2d50e 100644 +--- a/libwnck/xutils.c ++++ b/libwnck/xutils.c +@@ -1156,6 +1156,9 @@ xres_get_pid (WnckScreen *screen, + long client_id_count = 0; + XResClientIdValue *client_ids = NULL; + ++ if (!_wnck_handle_has_xres (wnck_screen_get_handle (screen))) ++ return -1; ++ + xscreen = _wnck_screen_get_xscreen (screen); + + client_spec.client = xwindow; +-- +GitLab + diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild deleted file mode 100644 index 4b2ede845578..000000000000 --- a/x11-libs/libwnck/libwnck-2.31.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GNOME2_LA_PUNT="yes" -GCONF_DEBUG="no" - -inherit flag-o-matic gnome2 - -DESCRIPTION="A window navigation construction kit" -HOMEPAGE="https://www.gnome.org/" - -LICENSE="LGPL-2+" -SLOT="1" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" - -IUSE="+introspection startup-notification" - -RDEPEND=" - >=x11-libs/gtk+-2.19.7:2[introspection?] - >=dev-libs/glib-2.16:2 - x11-libs/libX11 - x11-libs/libXres - x11-libs/libXext - introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) - startup-notification? ( >=x11-libs/startup-notification-0.4 ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig -" -# eautoreconf needs -# gnome-base/gnome-common - -src_prepare() { - DOCS="AUTHORS ChangeLog HACKING NEWS README" - - # Regenerate pregenerated marshalers for <glib-2.31 compatibility - rm -v libwnck/wnck-marshal.{c,h} || die "rm failed" - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable introspection) \ - $(use_enable startup-notification) -} diff --git a/x11-libs/libwnck/libwnck-3.30.0.ebuild b/x11-libs/libwnck/libwnck-3.30.0.ebuild deleted file mode 100644 index 716085618174..000000000000 --- a/x11-libs/libwnck/libwnck-3.30.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit flag-o-matic gnome2 - -DESCRIPTION="A window navigation construction kit" -HOMEPAGE="https://developer.gnome.org/libwnck/stable/" - -LICENSE="LGPL-2+" -SLOT="3" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" - -IUSE="+introspection startup-notification tools" - -RDEPEND=" - x11-libs/cairo[X] - >=x11-libs/gtk+-3.22:3[introspection?] - >=dev-libs/glib-2.32:2 - x11-libs/libX11 - x11-libs/libXres - x11-libs/libXext - introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) - startup-notification? ( >=x11-libs/startup-notification-0.4 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.9 - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig -" -# eautoreconf needs -# sys-devel/autoconf-archive - -src_configure() { - # Don't collide with SLOT=1 - gnome2_src_configure \ - --disable-static \ - $(use_enable introspection) \ - $(use_enable startup-notification) \ - $(use_enable tools) \ - --program-suffix=-${SLOT} -} diff --git a/x11-libs/libwnck/libwnck-43.0-r1.ebuild b/x11-libs/libwnck/libwnck-43.0-r1.ebuild new file mode 100644 index 000000000000..a432e8e6e451 --- /dev/null +++ b/x11-libs/libwnck/libwnck-43.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson xdg + +DESCRIPTION="A window navigation construction kit" +HOMEPAGE="https://developer.gnome.org/libwnck/stable/" + +LICENSE="LGPL-2+" +SLOT="3" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +IUSE="gtk-doc +introspection startup-notification tools" + +RDEPEND=" + x11-libs/cairo[X] + >=dev-libs/glib-2.44:2 + >=x11-libs/gtk+-3.22:3[X,introspection?] + startup-notification? ( >=x11-libs/startup-notification-0.4 ) + x11-libs/libX11 + x11-libs/libXres + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) +" +# libXi header used by wnckprop.c, which is compiled even with USE=-tools (just not installed then) +DEPEND="${RDEPEND} + x11-libs/libXi" +BDEPEND=" + gtk-doc? ( >=dev-util/gtk-doc-1.9 + app-text/docbook-xml-dtd:4.1.2 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # https://gitlab.gnome.org/GNOME/libwnck/-/issues/154 + "${FILESDIR}/${P}-xres-extension.patch" + + # https://gitlab.gnome.org/GNOME/libwnck/-/issues/155 + "${FILESDIR}/${P}-segfault_in_invalidate_icons.patch" +) + +src_prepare() { + default + xdg_environment_reset + # Don't collide with SLOT=1 with USE=tools + sed -e "s|executable(prog|executable(prog + '-3'|" -i libwnck/meson.build || die +} + +src_configure() { + local emesonargs=( + -Ddeprecation_flags=false + $(meson_use tools install_tools) + $(meson_feature startup-notification startup_notification) + $(meson_feature introspection) + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} diff --git a/x11-libs/libwnck/metadata.xml b/x11-libs/libwnck/metadata.xml index edf87c6f6e80..85ada7ba73a0 100644 --- a/x11-libs/libwnck/metadata.xml +++ b/x11-libs/libwnck/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="tools">Install wnckprop-3 and wnck-urgency-monitor-3 - command-line tools</flag> - </use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="tools">Install wnckprop-3 and wnck-urgency-monitor-3 command-line tools</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libwnck</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest index 7fce3a4ed083..59e6b19de21e 100644 --- a/x11-libs/libxcb/Manifest +++ b/x11-libs/libxcb/Manifest @@ -1 +1,2 @@ -DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6 +DIST libxcb-1.16.1.tar.xz 455368 BLAKE2B 91d489eaf8b0bfb0c02a4d974f72871963dc86cdf60478d618636d580974b260ab822ab33c7174e05dc45adf01e53e423a7449550b7b43fabb3917f7d99219c0 SHA512 e3afdae1c0e2a5ae2add7b2c4fdd3283cb86023ef6448f5b8b29a4bb72c274e34eaf0fc7523762bcd3f5116910fe7374490e8f26c25744301563ced80acc3e7f +DIST libxcb-1.17.0.tar.xz 455208 BLAKE2B e2a35606981c00f9f18e5590cdc26c7c2efd8f832c37dc4dc82db47e2870bf4ff48786162c5a8eb713cb5f3a305eb22d334e4b0ff631bf0e047f1b79cb0701d3 SHA512 945b1f28e8b407a4d0ebf88c99ef3cbef763fd75e6eaa8e971946e44ce8dbe9b478c56ae85aaaadab7fdb25987e88570d9d4fb9ad2febd6d6bf21d644a0e10d0 diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild deleted file mode 100644 index 59e72ccd0e61..000000000000 --- a/x11-libs/libxcb/libxcb-1.14.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -PYTHON_REQ_USE=xml - -XORG_TARBALL_SUFFIX="xz" -XORG_MULTILIB=yes -XORG_DOC=doc - -inherit python-any-r1 xorg-3 - -DESCRIPTION="X C-language Bindings library" -HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc selinux test +xkb" -RESTRICT="!test? ( test )" -SLOT="0/1.12" - -RDEPEND=" - >=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 -" -BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep '>=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version -b ">=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup - - XORG_CONFIGURE_OPTIONS=( - $(use_enable doc devel-docs) - $(use_enable selinux) - ) -} diff --git a/x11-libs/libxcb/libxcb-1.16.1.ebuild b/x11-libs/libxcb/libxcb-1.16.1.ebuild new file mode 100644 index 000000000000..23c3464ff0fd --- /dev/null +++ b/x11-libs/libxcb/libxcb-1.16.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" + +XORG_TARBALL_SUFFIX="xz" +XORG_MULTILIB=yes +XORG_DOC=doc + +inherit python-any-r1 xorg-3 + +DESCRIPTION="X C-language Bindings library" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc selinux test +xkb" +RESTRICT="!test? ( test )" +SLOT="0/1.12" + +RDEPEND=" + >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + >=x11-base/xcb-proto-1.16.0 + elibc_Darwin? ( dev-libs/libpthread-stubs ) + test? ( dev-libs/check[${MULTILIB_USEDEP}] ) +" +# Note: ${PYTHON_USEDEP} needs to go verbatim +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep '>=x11-base/xcb-proto-1.16.0[${PYTHON_USEDEP}]') + doc? ( app-text/doxygen[dot] ) + test? ( dev-libs/libxslt ) +" + +python_check_deps() { + python_has_version ">=x11-base/xcb-proto-1.16.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup + xorg-3_pkg_setup +} + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_enable doc devel-docs) + $(use_enable selinux) + ) + xorg-3_src_configure +} diff --git a/x11-libs/libxcb/libxcb-1.17.0.ebuild b/x11-libs/libxcb/libxcb-1.17.0.ebuild new file mode 100644 index 000000000000..cecbdf1967f4 --- /dev/null +++ b/x11-libs/libxcb/libxcb-1.17.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" + +XORG_TARBALL_SUFFIX="xz" +XORG_MULTILIB=yes +XORG_DOC=doc + +inherit python-any-r1 xorg-3 + +DESCRIPTION="X C-language Bindings library" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb" + +SLOT="0/1.12" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc selinux test +xkb" +RESTRICT="!test? ( test )" + +XCB_PROTO_DEP=">=x11-base/xcb-proto-${PV}" +RDEPEND=" + >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + ${XCB_PROTO_DEP} + elibc_Darwin? ( dev-libs/libpthread-stubs ) + test? ( dev-libs/check[${MULTILIB_USEDEP}] ) +" +# Note: ${PYTHON_USEDEP} needs to go verbatim +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep "${XCB_PROTO_DEP}"'[${PYTHON_USEDEP}]') + doc? ( app-text/doxygen[dot] ) + test? ( dev-libs/libxslt ) +" + +python_check_deps() { + python_has_version "${XCB_PROTO_DEP}[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup + xorg-3_pkg_setup +} + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_enable doc devel-docs) + $(use_enable selinux) + ) + xorg-3_src_configure +} diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml index 396f8bde1dad..9a732f52e92c 100644 --- a/x11-libs/libxcb/metadata.xml +++ b/x11-libs/libxcb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>x11@gentoo.org</email> @@ -10,5 +10,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:x:libxcb</remote-id> + <remote-id type="freedesktop-gitlab">xorg/lib/libxcb</remote-id> </upstream> </pkgmetadata> diff --git a/x11-libs/libxcvt/Manifest b/x11-libs/libxcvt/Manifest new file mode 100644 index 000000000000..328ad3356fdd --- /dev/null +++ b/x11-libs/libxcvt/Manifest @@ -0,0 +1 @@ +DIST libxcvt-0.1.2.tar.xz 9648 BLAKE2B 8a4803eb6790fd0ea1520fd31e335f7a363c3606e74837a959453be8819ce0d450af7bb651887a891aa657a5eeac3e4983041060fa5c87b1238c83354e425de7 SHA512 3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0 diff --git a/x11-libs/libxcvt/libxcvt-0.1.2.ebuild b/x11-libs/libxcvt/libxcvt-0.1.2.ebuild new file mode 100644 index 000000000000..2ab0546f16c2 --- /dev/null +++ b/x11-libs/libxcvt/libxcvt-0.1.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +XORG_TARBALL_SUFFIX="xz" + +inherit xorg-3 meson + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +DESCRIPTION="X.Org xcvt library and cvt program" + +RDEPEND="!<x11-base/xorg-server-1.20.11-r3" + +# Override xorg-3's src_prepare +src_prepare() { + default +} diff --git a/x11-libs/libxcvt/libxcvt-9999.ebuild b/x11-libs/libxcvt/libxcvt-9999.ebuild new file mode 100644 index 000000000000..920def423f8f --- /dev/null +++ b/x11-libs/libxcvt/libxcvt-9999.ebuild @@ -0,0 +1,20 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +XORG_TARBALL_SUFFIX="xz" + +inherit xorg-3 meson + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="X.Org xcvt library and cvt program" + +RDEPEND="!<x11-base/xorg-server-1.20.11-r3" + +# Override xorg-3's src_prepare +src_prepare() { + default +} diff --git a/x11-libs/libxcvt/metadata.xml b/x11-libs/libxcvt/metadata.xml new file mode 100644 index 000000000000..fac786631338 --- /dev/null +++ b/x11-libs/libxcvt/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxcvt</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest index 570598248cfd..6ff60c0b8e6d 100644 --- a/x11-libs/libxkbcommon/Manifest +++ b/x11-libs/libxkbcommon/Manifest @@ -1 +1,2 @@ -DIST libxkbcommon-0.10.0.tar.xz 383788 BLAKE2B 0e2cc110c35a4d07cfd55a46a4cc30038bc296f74522beb97b72d0318799adb76fa514427640f286254de7aa59fb8b8c26de5d8fd52f7e09c5ba3521febb97bd SHA512 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79 +DIST libxkbcommon-1.6.0.tar.xz 510456 BLAKE2B ffd373161f12ea6448a9206f57710355ab65b81ebab5dce74e4dfcee1bdc9175406fc434560648f5933b83cac163099c8564c3add6f51d34856def39ab077850 SHA512 4f93225eada1c5d0806bbc01f72d82d72729f4580ade963ff6a386711c9b2232aae5213c8488abf01c3b81f0e1fdb7f4d8a4d3786113ccc134251ff164c4be5c +DIST libxkbcommon-1.7.0.tar.xz 534312 BLAKE2B b85cd8a78fce3c624e0c64c26a37b6d99bb8b8f3de489c6909826f53bdb6d33842f7ffcf955f6a9a8eb57cad53fc9756bd15d05aeb813b0f92985827243949a8 SHA512 4b74a9f3f63e2ebc1cbdcaa963c70362e55fa527e1d89b6a1fd30d7a84a8b60c1b3dc99bcfbde85aa31890e0b2f62f0bad3c8ff8340fe6a930ee662b33448ba5 diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild deleted file mode 100644 index 356f8a40eb76..000000000000 --- a/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -fi - -inherit meson multilib-minimal ${GIT_ECLASS} - -DESCRIPTION="keymap handling library for toolkits and window systems" -HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/" -LICENSE="MIT" -IUSE="X doc test" -RESTRICT="!test? ( test )" -SLOT="0" - -BDEPEND=" - sys-devel/bison - doc? ( app-doc/doxygen )" -RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" - -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_src_unpack -} - -multilib_src_configure() { - local emesonargs=( - -Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb" - -Denable-wayland=false # Demo applications - $(meson_use X enable-x11) - $(meson_use doc enable-docs) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.6.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.6.0.ebuild new file mode 100644 index 000000000000..3fe9b0eff71b --- /dev/null +++ b/x11-libs/libxkbcommon/libxkbcommon-1.6.0.ebuild @@ -0,0 +1,71 @@ +# 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 ~ia64 ~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 ) ) +" + +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 +} diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.7.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.7.0.ebuild new file mode 100644 index 000000000000..3fe9b0eff71b --- /dev/null +++ b/x11-libs/libxkbcommon/libxkbcommon-1.7.0.ebuild @@ -0,0 +1,71 @@ +# 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 ~ia64 ~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 ) ) +" + +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 +} diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml index 720e8a2f5f07..9f2f9f386d67 100644 --- a/x11-libs/libxkbcommon/metadata.xml +++ b/x11-libs/libxkbcommon/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> - </maintainer> - <upstream> - <remote-id type="cpe">cpe:/a:xkbcommon:libxkbcommon</remote-id> - </upstream> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <use> + <flag name="tools">Build the xkbcli tools</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:xkbcommon:libxkbcommon</remote-id> + <remote-id type="github">xkbcommon/libxkbcommon</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest index de120bc2ada2..bab5dad82ddf 100644 --- a/x11-libs/libxkbfile/Manifest +++ b/x11-libs/libxkbfile/Manifest @@ -1 +1 @@ -DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826 +DIST libxkbfile-1.1.3.tar.xz 314520 BLAKE2B b0fc59e7f68005bee731f72dfaccac1d0f1b1ec2d07d3ec24745542d47aba7bf86cf7ead22153f04a2b4b5acf66f1300050aa4ae6e4f609cf609d8a3a2a6d031 SHA512 d80ac41f6fa3a1ffad77ea1f8f9d9542f0bd210d74b263802bc6e6c1594fe325b27f42b5454aeeb36352518963b1ed1fdbbad95d7db3690b2e36d54742b7c236 diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild deleted file mode 100644 index 0c90d407fef9..000000000000 --- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -XORG_MULTILIB=yes -inherit xorg-3 - -DESCRIPTION="X.Org xkbfile library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - x11-base/xorg-proto" diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild new file mode 100644 index 000000000000..dfc45043e66f --- /dev/null +++ b/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org xkbfile library" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libxkbfile/metadata.xml b/x11-libs/libxkbfile/metadata.xml index e943b72b8a48..bb8e604f2d16 100644 --- a/x11-libs/libxkbfile/metadata.xml +++ b/x11-libs/libxkbfile/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxkbfile</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libxklavier/files/clang-17.patch b/x11-libs/libxklavier/files/clang-17.patch new file mode 100644 index 000000000000..559867f5a180 --- /dev/null +++ b/x11-libs/libxklavier/files/clang-17.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/915208 +--- a/libxklavier/libxklavier.public ++++ b/libxklavier/libxklavier.public +@@ -81,11 +81,10 @@ xkl_engine_set_secondary_groups_mask + xkl_engine_set_window_transparent + xkl_engine_start_listen + xkl_engine_state_change_get_type + xkl_engine_stop_listen + xkl_engine_ungrab_key +-xkl_engine_VOID__FLAGS_INT_BOOLEAN + xkl_engine_VOID__ENUM_INT_BOOLEAN + xkl_get_country_name + xkl_get_language_name + xkl_get_last_error + xkl_restore_names_prop diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4-r1.ebuild index 6506faf579bb..900c15dff6ce 100644 --- a/x11-libs/libxklavier/libxklavier-5.4.ebuild +++ b/x11-libs/libxklavier/libxklavier-5.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit libtool vala xdg-utils +inherit libtool vala DESCRIPTION="A library for the X Keyboard Extension (high-level API)" HOMEPAGE="https://www.freedesktop.org/wiki/Software/LibXklavier" @@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2" LICENSE="LGPL-2" SLOT="0/16" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="+introspection vala" REQUIRED_USE="vala? ( introspection )" @@ -25,25 +25,27 @@ RDEPEND=" x11-libs/libxkbfile:= >=x11-misc/xkeyboard-config-2.4.1-r3 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) - vala? ( $(vala_depend) ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils - >=dev-util/gtk-doc-am-1.4 + >=dev-build/gtk-doc-am-1.4 sys-devel/gettext virtual/pkgconfig + vala? ( $(vala_depend) ) " +PATCHES=( "${FILESDIR}"/clang-17.patch ) + src_prepare() { default elibtoolize - xdg_environment_reset - use vala && vala_src_prepare } src_configure() { + use vala && vala_setup + econf \ - --disable-static \ --disable-gtk-doc \ $(use_enable introspection) \ $(use_enable vala) \ @@ -53,6 +55,5 @@ src_configure() { src_install() { default - dodoc CREDITS - find "${D}" -name '*.la' -delete || die + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/x11-libs/libxklavier/metadata.xml b/x11-libs/libxklavier/metadata.xml index f3cab85cf603..d0b58801b31a 100644 --- a/x11-libs/libxklavier/metadata.xml +++ b/x11-libs/libxklavier/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest index ee5c7cfa025b..1bc5e961ebd7 100644 --- a/x11-libs/libxshmfence/Manifest +++ b/x11-libs/libxshmfence/Manifest @@ -1 +1 @@ -DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7 +DIST libxshmfence-1.3.2.tar.xz 259024 BLAKE2B 2f0ef0767fbb29349acf43b4cb4d7177956c06c389f0443db06e398c4e0f3b424432ce6fe8946d70fdd59b9446c53bf2f1ee126df4d41b3065f1e94438facecf SHA512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild deleted file mode 100644 index 7551a9c6a8b9..000000000000 --- a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="Shared memory fences using futexes" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="" -DEPEND="x11-base/xorg-proto" diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild new file mode 100644 index 000000000000..a39e827676d7 --- /dev/null +++ b/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="Shared memory fences using futexes" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" + +DEPEND="x11-base/xorg-proto" diff --git a/x11-libs/libxshmfence/metadata.xml b/x11-libs/libxshmfence/metadata.xml index e943b72b8a48..397dc28abeb2 100644 --- a/x11-libs/libxshmfence/metadata.xml +++ b/x11-libs/libxshmfence/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxshmfence</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libyui-gtk/Manifest b/x11-libs/libyui-gtk/Manifest deleted file mode 100644 index 29d44ad8256d..000000000000 --- a/x11-libs/libyui-gtk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libyui-gtk-2.44.9.tar.gz 292864 BLAKE2B 74ff741a1fd2ee6c87acdc1b44d5c6f22ef32d9b148c4122ef75f40cbd2fc959c692b323aa31917371a5143bbf2f6f6f65bd89476d45e26c330f3ba27d97a8c8 SHA512 cb1641f79e189bbafa41dc07ad7ec0c09bb6ab7696b576fa8709d0112b6870b12c97b757cd3d6a0b42bb67d6a21655f7749bd72b714af0a3b77ab8a16169f51d diff --git a/x11-libs/libyui-gtk/libyui-gtk-2.44.9.ebuild b/x11-libs/libyui-gtk/libyui-gtk-2.44.9.ebuild deleted file mode 100644 index 5cfe8cedc876..000000000000 --- a/x11-libs/libyui-gtk/libyui-gtk-2.44.9.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="UI abstraction library - GTK plugin" -HOMEPAGE="https://github.com/libyui/libyui-gtk" -SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/6" -KEYWORDS="~amd64 ~x86" - -IUSE="static-libs" - -RDEPEND=" - x11-libs/gtk+:3 - x11-libs/libyui:${SLOT} -" -# Only Boost headers are needed -DEPEND="${RDEPEND} - dev-libs/boost -" - -src_prepare() { - cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die - - # TODO: set proper docs deps and USE flag for building them - sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed' - sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed' - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_EXAMPLES=OFF - -DENABLE_WERROR=OFF - -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DRESPECT_FLAGS=ON - -DENABLE_STATIC=$(usex static-libs) - ) - cmake-utils_src_configure -} diff --git a/x11-libs/libyui-gtk/metadata.xml b/x11-libs/libyui-gtk/metadata.xml deleted file mode 100644 index c6c4bd48f469..000000000000 --- a/x11-libs/libyui-gtk/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <longdescription lang="en"> -Gtk plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). -</longdescription> - <upstream> - <remote-id type="github">libyui/libyui-gtk</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/libyui-ncurses/Manifest b/x11-libs/libyui-ncurses/Manifest deleted file mode 100644 index 8a0a141f3467..000000000000 --- a/x11-libs/libyui-ncurses/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libyui-ncurses-2.48.3.tar.gz 189621 BLAKE2B 360b12f40c6e7dace84e5e10edb32d9b75ec33cb0c796ce31697b90b17df3ac13096d7a3d715d4bf4963c487e705ab4031dbe682f99237331dad951d19c32979 SHA512 18f7cec47aba1fd33443d4154b358c7dd769ed79a5544b11d907f6de461c96fcf1f980ee602781bd3cf3242d692d02721fcf975728a0c00955b34844104419d0 diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch deleted file mode 100644 index 9da76f194598..000000000000 --- a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fixes building with sys-libs/ncurses[tinfo] - ---- a/cmake/Modules/FindCurses6.cmake 2014-09-25 16:32:20.000000000 +0400 -+++ b/cmake/Modules/FindCurses6.cmake 2014-09-25 16:33:16.000000000 +0400 -@@ -11,11 +11,12 @@ - FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) - ENDFOREACH() - --SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY}) - # tinfo is optional (in 12.1 is not there) --IF(${CURSES6_TINFO_LIBRARY}) -- SET(CURSES6_LIBRARIES "${CURSES6_LIBRARIES} ${CURSES6_TINFO_LIBRARY}") --ENDIF(${CURSES6_TINFO_LIBRARY}) -+IF(NOT ${CURSES6_TINFO_LIBRARY} STREQUAL "CURSES6_TINFO_LIBRARY-NOTFOUND") -+ SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY} ${CURSES6_TINFO_LIBRARY}) -+ELSE() -+ SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY}) -+ENDIF() - - FIND_PATH(CURSES6_INCLUDE_DIR ncurses.h PATH_SUFFIXES ncurses6) - diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch deleted file mode 100644 index 7c58ce47ab69..000000000000 --- a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6444e043b58bf7703e4fc9035f380f3817207525 Mon Sep 17 00:00:00 2001 -From: Stefan Hundhammer <shundhammer@suse.de> -Date: Thu, 4 Jan 2018 17:21:56 +0100 -Subject: [PATCH] Removed function that conflicts with newer NCurses lib - (bsc#1074600) - ---- - src/ncursesw.h | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/src/ncursesw.h b/src/ncursesw.h -index d25923a..c8b95bb 100644 ---- a/src/ncursesw.h -+++ b/src/ncursesw.h -@@ -1607,14 +1607,6 @@ class NCursesWindow - return ::wtouchln( w, s, cnt, ( int )( changed ? 1 : 0 ) ); - } - -- /** -- * Return TRUE if line is marked as changed, FALSE otherwise -- */ -- bool is_linetouched( int line ) const -- { -- return ( ::is_linetouched( w, line ) ? TRUE : FALSE ); -- } -- - /** - * Return TRUE if window is marked as changed, FALSE otherwise - */ diff --git a/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild b/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild deleted file mode 100644 index 7567d80afdf0..000000000000 --- a/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="UI abstraction library - ncurses plugin" -HOMEPAGE="https://github.com/libyui/libyui-ncurses" -SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/6" -KEYWORDS="~amd64 ~x86" - -IUSE="static-libs" - -RDEPEND=" - sys-libs/ncurses:0= - x11-libs/libyui:${SLOT} -" -# Only Boost headers are needed -DEPEND="${RDEPEND} - dev-libs/boost -" - -PATCHES=( - "${FILESDIR}/${PN}-2.46.4-tinfo.patch" - "${FILESDIR}/${P}-ncurses.patch" -) - -src_prepare() { - cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die - - # TODO: set proper docs deps and USE flag for building them - sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed' - sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed' - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_EXAMPLES=OFF - -DENABLE_WERROR=OFF - -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DRESPECT_FLAGS=ON - -DENABLE_STATIC=$(usex static-libs) - ) - cmake-utils_src_configure -} diff --git a/x11-libs/libyui-ncurses/metadata.xml b/x11-libs/libyui-ncurses/metadata.xml deleted file mode 100644 index bc627c3f876a..000000000000 --- a/x11-libs/libyui-ncurses/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <longdescription lang="en"> -ncurses plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). - </longdescription> - <upstream> - <remote-id type="github">libyui/libyui-ncurses</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/libyui-qt/Manifest b/x11-libs/libyui-qt/Manifest deleted file mode 100644 index 6c51712ee5ae..000000000000 --- a/x11-libs/libyui-qt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libyui-qt-2.47.1.tar.gz 171152 BLAKE2B 54a8d1609ed717e97c1ec9b3eb6e86eed85446689223753db4b2dcb4c35f361675c42287378636708813b724c4120b14b6bab19c4c8fa17f91bbb612569d1a00 SHA512 9c5e23ff7bb08dd363a490a43c0347e4dbe1af3546bec85a9169da3267f87cbbe15f17f882058b2f3a813fb54efeb1594ec343b2b8d12e371ee77a105a8f4f99 diff --git a/x11-libs/libyui-qt/files/libyui-qt-2.46.21-norpc.patch b/x11-libs/libyui-qt/files/libyui-qt-2.46.21-norpc.patch deleted file mode 100644 index 8258fe7b1910..000000000000 --- a/x11-libs/libyui-qt/files/libyui-qt-2.46.21-norpc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a6e599e79bd15f6a97ff6d8f2e3109759ff37aaf Mon Sep 17 00:00:00 2001 -From: Thorsten Kukuk <kukuk@thkukuk.de> -Date: Mon, 13 Nov 2017 11:15:21 +0100 -Subject: [PATCH] Include sys/param.h instead of rpc/types.h for - MAXHOSTNAMELEN, we are not using RPC functions and sunrpc is deprecated in - glibc. - ---- - src/YQUI.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/YQUI.cc b/src/YQUI.cc -index 7c82468..f949979 100644 ---- a/src/YQUI.cc -+++ b/src/YQUI.cc -@@ -22,7 +22,7 @@ - - /-*/ - --#include <rpc/types.h> // MAXHOSTNAMELEN -+#include <sys/param.h> // MAXHOSTNAMELEN - #include <dlfcn.h> - #include <libintl.h> - #include <algorithm> diff --git a/x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild b/x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild deleted file mode 100644 index 3672afb555d2..000000000000 --- a/x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="UI abstraction library - Qt plugin" -HOMEPAGE="https://github.com/libyui/libyui-qt" -SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/6" -KEYWORDS="~amd64 ~x86" - -IUSE="static-libs" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - media-libs/freetype - x11-libs/libX11 - x11-libs/libyui:${SLOT} -" -# Only Boost headers are needed -# QtSvg headers only required, no linking -DEPEND="${RDEPEND} - dev-libs/boost - dev-qt/qtsvg:5 -" - -PATCHES=( "${FILESDIR}/${PN}-2.46.21-norpc.patch" ) - -src_prepare() { - cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die - - # TODO: set proper docs deps and USE flag for building them - sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed' - sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed' - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_EXAMPLES=OFF - -DENABLE_WERROR=OFF - -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DRESPECT_FLAGS=ON - -DENABLE_STATIC=$(usex static-libs) - ) - cmake-utils_src_configure -} diff --git a/x11-libs/libyui-qt/metadata.xml b/x11-libs/libyui-qt/metadata.xml deleted file mode 100644 index f6b1437056ef..000000000000 --- a/x11-libs/libyui-qt/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <longdescription lang="en"> -Qt plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). - </longdescription> - <upstream> - <remote-id type="github">libyui/libyui-qt</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest deleted file mode 100644 index 7eb785f0fdd9..000000000000 --- a/x11-libs/libyui/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libyui-3.3.3.tar.gz 230452 BLAKE2B 4be43bb4959eac5cd7c5974774130cb948367cae55dc83ad67b26d0c57f79cd1b8a7328b695478c450c3373167d0d74e2455e7804b4f25fd51b8386ceb113df1 SHA512 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f diff --git a/x11-libs/libyui/libyui-3.3.3.ebuild b/x11-libs/libyui/libyui-3.3.3.ebuild deleted file mode 100644 index 75f632ca8ee1..000000000000 --- a/x11-libs/libyui/libyui-3.3.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="UI abstraction library" -HOMEPAGE="https://github.com/libyui/libyui" -SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/6" -KEYWORDS="~amd64 ~x86" -IUSE="gtk ncurses qt5 static-libs" - -# Only Boost headers are needed -DEPEND="dev-libs/boost" -PDEPEND=" - gtk? ( x11-libs/libyui-gtk:${SLOT} ) - ncurses? ( x11-libs/libyui-ncurses:${SLOT} ) - qt5? ( x11-libs/libyui-qt:${SLOT} ) -" - -REQUIRED_USE="|| ( gtk ncurses qt5 )" - -src_prepare() { - cp buildtools/CMakeLists.common CMakeLists.txt || die - - # TODO: set proper docs deps and USE flag for building them - sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed' - sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed' - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_STATIC=$(usex static-libs) - -DENABLE_WERROR=OFF - -DRESPECT_FLAGS=ON - ) - cmake-utils_src_configure -} diff --git a/x11-libs/libyui/metadata.xml b/x11-libs/libyui/metadata.xml deleted file mode 100644 index 03d507f538b8..000000000000 --- a/x11-libs/libyui/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <longdescription lang="en"> -YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). This can be used independently of YaST2 for generic (C++) applications. -</longdescription> - <upstream> - <remote-id type="github">libyui/libyui</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/metadata.xml b/x11-libs/metadata.xml index 875590a5fe54..cfb5fab5007f 100644 --- a/x11-libs/metadata.xml +++ b/x11-libs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The x11-libs category contains various X11-related libraries. @@ -31,4 +31,3 @@ Kategoria x11-libs zawiera biblioteki powiązane z X11. </longdescription> </catmetadata> - diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest index 9cfd32417067..95f7f2d0744b 100644 --- a/x11-libs/motif/Manifest +++ b/x11-libs/motif/Manifest @@ -1,2 +1,2 @@ -DIST motif-2.3.8-patches-1.tar.xz 1896 BLAKE2B 7234860dadac55362c7f1804133a660da1ab468fb6c0f0c71cad76b956a5f0b1e58874496a6721f49bd6413e916014807e946112b48b9a22272db5e4d97d43d9 SHA512 22e5d8c590d2c1c57fc639cb46d16984dc5fbafb3b68fd647d180d6299a06f884a8ed69e2180da8153bb0f68821eb0031f93e9b9a3128ba93535fd7fb92b402b +DIST motif-2.3.8-patches-5.tar.xz 6156 BLAKE2B b8d1ac1f2bea3521c97b506ecb480ea92c64708376c1bd9c00b853109568527f82eb8f87bd50d78afe9e15a4c84aab51f32598a12b040f7d67ae0dee422c0366 SHA512 594b39ded4e932789baf906e5e7e3cc402f1940cba147b35ae43aba52f65522ba48a05f3193ed9f8ff5c03fed1b517bfde35b38c189e1e7169745c8b97a5d924 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55 diff --git a/x11-libs/motif/metadata.xml b/x11-libs/motif/metadata.xml index 40ef2c33fec6..8b80f7d45e98 100644 --- a/x11-libs/motif/metadata.xml +++ b/x11-libs/motif/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>ulm@gentoo.org</email> @@ -8,6 +8,7 @@ <flag name="motif22-compatibility">Compatibility with Open Motif 2.2</flag> </use> <upstream> + <bugs-to>http://bugs.motifzone.net/</bugs-to> <remote-id type="sourceforge">motif</remote-id> </upstream> </pkgmetadata> diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r5.ebuild index a12cad9e2ba0..b2b9a073828f 100644 --- a/x11-libs/motif/motif-2.3.8-r1.ebuild +++ b/x11-libs/motif/motif-2.3.8-r5.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal +inherit autotools flag-o-matic toolchain-funcs multilib-minimal DESCRIPTION="The Motif user interface component toolkit" HOMEPAGE="https://sourceforge.net/projects/motif/ https://motif.ics.com/" -SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz - https://dev.gentoo.org/~ulm/distfiles/${P}-patches-1.tar.xz" +SRC_URI="https://downloads.sourceforge.net/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz + https://dev.gentoo.org/~ulm/distfiles/${P}-patches-5.tar.xz" LICENSE="LGPL-2.1+ MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft" RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] ) unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) xft? ( @@ -29,15 +29,19 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - sys-devel/flex - dev-util/byacc x11-base/xorg-proto x11-misc/xbitmaps" +BDEPEND="sys-devel/flex + dev-util/byacc" + src_prepare() { eapply ../patch eapply_user + # remove files generated by flex #864533 + rm tools/wml/{wmllex,wmluiltok}.c || die + AT_M4DIR=. eautoreconf # get around some LANG problems in make (#15119) @@ -53,8 +57,7 @@ src_prepare() { [[ ${CHOST} == *-solaris2.11 ]] \ && append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3 - if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \ - && use unicode; then + if use !elibc_glibc && use !elibc_musl && use unicode; then # libiconv detection in configure script doesn't always work # http://bugs.motifzone.net/show_bug.cgi?id=1423 export LIBS="${LIBS} -liconv" @@ -65,6 +68,13 @@ src_prepare() { # remember the name of the C compiler for the native ABI MY_NATIVE_CC=$(tc-getCC) + + # -Werror=lto-type-mismatch + # + # Helpfully, the motif bugtracker is entirely down. They are also + # on sourceforge but only for merge requests? The project is a + # fascinating kind of ghostly haunting. Punting on reporting... for now. + filter-lto } multilib_src_configure() { @@ -102,7 +112,7 @@ multilib_src_install_all() { newins "${FILESDIR}"/Mwm.defaults Mwm # cleanup - rm -rf "${ED}"/usr/share/Xm + rm -rf "${ED}"/usr/share/Xm || die find "${D}" -type f -name "*.la" -delete || die dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO diff --git a/x11-libs/mx/Manifest b/x11-libs/mx/Manifest deleted file mode 100644 index 64d8ec2d3aff..000000000000 --- a/x11-libs/mx/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mx-1.4.7.tar.xz 939672 BLAKE2B 3f55018c6d282af95b80852748a6baa7a56ea1ea69e1b3740b6d936633818f3b18124f1bec2d5bc51596df75a5633d355362d1d22549c5a7e490e053fcca2bae SHA512 6870898548c947d43947ea6ded7c06d01d18aa721c81927fabf3ee0cfe20f65739e927d32277acce5c2e13968502828e29e043f9a8cf31af8f2bc20ec1ad0349 diff --git a/x11-libs/mx/files/mx-1.4.7-gl-types.patch b/x11-libs/mx/files/mx-1.4.7-gl-types.patch deleted file mode 100644 index 85c691378d84..000000000000 --- a/x11-libs/mx/files/mx-1.4.7-gl-types.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 297b654133436c6ee5146fce31529da4e52dfe74 Mon Sep 17 00:00:00 2001 -From: Brian Pepple <bpepple@fedoraproject.org> -Date: Sat, 25 Aug 2012 17:41:59 -0400 -Subject: [PATCH] Replace GL data types with equivalent glib types. - ---- - mx/mx-deform-texture.c | 8 ++++---- - mx/mx-texture-frame.c | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/mx/mx-deform-texture.c b/mx/mx-deform-texture.c -index 93c54d7..466cc9f 100644 ---- a/mx/mx-deform-texture.c -+++ b/mx/mx-deform-texture.c -@@ -493,9 +493,9 @@ mx_deform_texture_class_init (MxDeformTextureClass *klass) - static void - mx_deform_texture_init_arrays (MxDeformTexture *self) - { -- GLushort *idx, *bf_idx; -+ gushort *idx, *bf_idx; - gint x, y, direction; -- GLushort *static_indices, *static_bf_indices; -+ gushort *static_indices, *static_bf_indices; - MxDeformTexturePrivate *priv = self->priv; - - mx_deform_texture_free_arrays (self); -@@ -503,8 +503,8 @@ mx_deform_texture_init_arrays (MxDeformTexture *self) - priv->n_indices = (2 + 2 * priv->tiles_x) * - priv->tiles_y + - (priv->tiles_y - 1); -- static_indices = g_new (GLushort, priv->n_indices); -- static_bf_indices = g_new (GLushort, priv->n_indices); -+ static_indices = g_new (gushort, priv->n_indices); -+ static_bf_indices = g_new (gushort, priv->n_indices); - - #define MESH_INDEX(X, Y) (Y) * (priv->tiles_x + 1) + (X) - -diff --git a/mx/mx-texture-frame.c b/mx/mx-texture-frame.c -index bde57ff..a88985f 100644 ---- a/mx/mx-texture-frame.c -+++ b/mx/mx-texture-frame.c -@@ -200,7 +200,7 @@ mx_texture_frame_paint (ClutterActor *self) - - - { -- GLfloat rectangles[] = -+ gfloat rectangles[] = - { - /* top left corner */ - 0, 0, --- -1.7.12 - diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml deleted file mode 100644 index 6838de46e0f3..000000000000 --- a/x11-libs/mx/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">clutter-project/mx</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/mx/mx-1.4.7-r2.ebuild b/x11-libs/mx/mx-1.4.7-r2.ebuild deleted file mode 100644 index ec626e9d6266..000000000000 --- a/x11-libs/mx/mx-1.4.7-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="yes" - -inherit gnome2 eutils - -DESCRIPTION="A widget toolkit using Clutter" -HOMEPAGE="http://clutter-project.org/" -SRC_URI="https://github.com/downloads/clutter-project/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="1.0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="dbus +gtk +introspection startup-notification" - -RDEPEND=" - >=dev-libs/glib-2.28.0:2 - >=media-libs/clutter-1.7.91:1.0 - media-libs/cogl:= - >=x11-apps/xrandr-1.2.0 - - x11-libs/gdk-pixbuf:2[introspection?] - - dbus? ( >=dev-libs/dbus-glib-0.82 ) - gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] ) - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) - startup-notification? ( >=x11-libs/startup-notification-0.9 ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.35.0 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - # Tests are interactive, no use for us - sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \ - -i Makefile.am -i Makefile.in || die - # In 1.4.8 - epatch "${FILESDIR}/${P}-gl-types.patch" - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --with-winsys=x11 \ - --without-glade \ - $(use_enable gtk gtk-widgets) \ - $(use_enable introspection) \ - $(use_with dbus) \ - $(use_with startup-notification) -} diff --git a/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch b/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch new file mode 100644 index 000000000000..70059085ab3d --- /dev/null +++ b/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/871489 +--- a/X11/neXtaw/XawIm.c ++++ b/X11/neXtaw/XawIm.c +@@ -61,2 +61,3 @@ + #include <X11/StringDefs.h> ++#include <X11/ResourceI.h> + #include <X11/Xos.h> +--- a/X11/neXtaw/laygram.y ++++ b/X11/neXtaw/laygram.y +@@ -14,2 +14,5 @@ + ++void yyerror(char *s); ++int yylex(void); ++ + %} +--- a/X11/neXtaw/laylex.l ++++ b/X11/neXtaw/laylex.l +@@ -88,2 +88,3 @@ + ++void + yysetsource(s) +@@ -94,2 +95,3 @@ + ++void + yyerror(s) diff --git a/x11-libs/neXtaw/metadata.xml b/x11-libs/neXtaw/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/x11-libs/neXtaw/metadata.xml +++ b/x11-libs/neXtaw/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild deleted file mode 100644 index cf5551a641aa..000000000000 --- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Athena Widgets with N*XTSTEP appearance" -HOMEPAGE="http://siag.nu/neXtaw/" -SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="" - -RDEPEND="x11-base/xorg-proto - x11-libs/libICE - x11-libs/libXext - x11-libs/libXt - x11-libs/libX11 - x11-libs/libSM - x11-libs/libXmu - x11-libs/libxkbfile - x11-libs/libXpm - !<x11-libs/neXtaw-0.15.1-r1" -DEPEND="${RDEPEND}" - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog INSTALL NEWS README TODO -} diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r5.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r5.ebuild new file mode 100644 index 000000000000..f1e44ffca999 --- /dev/null +++ b/x11-libs/neXtaw/neXtaw-0.15.1-r5.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Athena Widgets with N*XTSTEP appearance" +HOMEPAGE="https://siag.nu/neXtaw/" +SRC_URI="https://siag.nu/pub/neXtaw/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + x11-libs/libxkbfile" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + # Clang 16, bug #879779 + eautoreconf +} + +src_configure() { + append-cflags -std=gnu89 # old codebase, incompatible with c2x + append-cflags -fno-strict-aliasing #864535 + + default +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest index 43cbd6530e5c..a7b68d9c3f10 100644 --- a/x11-libs/pango/Manifest +++ b/x11-libs/pango/Manifest @@ -1,3 +1,3 @@ -DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1 -DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc -DIST pango-1.44.7.tar.xz 521384 BLAKE2B 9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97fbbbb480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb SHA512 6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350 +DIST pango-1.51.0.tar.xz 1942044 BLAKE2B d7d343d5fb005b92dc70fc6f65c62d1d22cc81887185612d276e63614e622272117b64051f46aa1ae0348d4ccfbed0a473f9482703d51d5da7e81d1851b49071 SHA512 a427e93cdc00bf4bc97da2e1897363a53688886f112c8732684cc66c67b16fe82a84cf581ffa6c18a206e8e37bd54db4104856fdab8afa5a50a8bc0470e5d282 +DIST pango-1.52.1.tar.xz 1956856 BLAKE2B 0b7f58f3d74bd37df285f3fbf14d2d2d776fbcf773568d63f12f26976d2ff505c19616fcee11562933df2594762e9ca30fe96a1d02dcd174381b976d63c68ac1 SHA512 7cddbd61afc3c98ffd09ea08c5d7613e454b6705f72304cb9b3578865b6bda70ca20f98605dea73f2cbca5e264217c8d79e4539e9eb36b8775d5d2a4f769cf32 +DIST pango-1.52.2.tar.xz 1963588 BLAKE2B 9367703addcc6805fc14f0c0184d9d1b4093b8947fea9d260c54eb6c86ce56a0d6cfe35c3d6340eaa5d96fb84f0a94c5979ae308bfa79f02e4ce25c4c093556e SHA512 6b3d762d133e7c900c6dfa85f43c950699930f6149cb3c90bf0e787f1b5a126a0b90220b90e649f84e4c244e44c46d4b575d5d7afeb305232c333712effc0981 diff --git a/x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch b/x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch deleted file mode 100644 index eaf0784c1b31..000000000000 --- a/x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 490f8979a260c16b1df055eab386345da18a2d54 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Wed, 10 Jul 2019 20:26:23 -0400 -Subject: [PATCH] bidi: Be safer against bad input - -Don't run off the end of an array that we -allocated to certain length. - -Closes: https://gitlab.gnome.org/GNOME/pango/issues/342 ---- - pango/pango-bidi-type.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c -index 3e46b66c..5c02dbbb 100644 ---- a/pango/pango-bidi-type.c -+++ b/pango/pango-bidi-type.c -@@ -181,8 +181,11 @@ pango_log2vis_get_embedding_levels (const gchar *text, - for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++) - { - gunichar ch = g_utf8_get_char (p); -- FriBidiCharType char_type; -- char_type = fribidi_get_bidi_type (ch); -+ FriBidiCharType char_type = fribidi_get_bidi_type (ch); -+ -+ if (i == n_chars) -+ break; -+ - bidi_types[i] = char_type; - ored_types |= char_type; - if (FRIBIDI_IS_STRONG (char_type)) --- -2.21.0 - diff --git a/x11-libs/pango/files/1.42.4-pango-view.1.in b/x11-libs/pango/files/1.42.4-pango-view.1.in deleted file mode 100644 index 0b6f07a90d3a..000000000000 --- a/x11-libs/pango/files/1.42.4-pango-view.1.in +++ /dev/null @@ -1,113 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH PANGO-VIEW "1" "August 2018" "pango-view (pango) 1.42.4" "User Commands" -.SH NAME -pango-view \- Pango text viewer -.SH DESCRIPTION -.SS "Usage:" -.IP -pango\-view [OPTION?] \- FILE -.SS "Help Options:" -.TP -\fB\-h\fR, \fB\-\-help\fR -Show help options -.TP -\fB\-\-help\-all\fR -Show all help options -.TP -\fB\-\-help\-cairo\fR -Options understood by the cairo backend -.SS "Cairo backend options:" -.TP -\fB\-\-annotate\fR=\fI\,1\/\fR or 2 -Annotate the output -.SS "Application Options:" -.TP -\fB\-\-no\-auto\-dir\fR -No layout direction according to contents -.TP -\fB\-\-backend\fR=\fI\,cairo\/\fR/xft/ft2 -Pango backend to use for rendering (default: cairo) -.TP -\fB\-\-background\fR=\fI\,red\/\fR/#rrggbb/#rrggbbaa/transparent -Set the background color -.TP -\fB\-q\fR, \fB\-\-no\-display\fR -Do not display (just write to file or whatever) -.TP -\fB\-\-dpi\fR=\fI\,number\/\fR -Set the resolution -.TP -\fB\-\-align\fR=\fI\,left\/\fR/center/right -Text alignment -.TP -\fB\-\-ellipsize\fR=\fI\,start\/\fR/middle/end -Ellipsization mode -.TP -\fB\-\-font\fR=\fI\,description\/\fR -Set the font description -.TP -\fB\-\-foreground\fR=\fI\,red\/\fR/#rrggbb/#rrggbbaa -Set the text color -.TP -\fB\-\-gravity\fR=\fI\,south\/\fR/east/north/west/auto -Base gravity: glyph rotation -.TP -\fB\-\-gravity\-hint\fR=\fI\,natural\/\fR/strong/line -Gravity hint -.TP -\fB\-\-header\fR -Display the options in the output -.TP -\fB\-\-height=\fR+points/\-numlines -Height in points (positive) or number of lines (negative) for ellipsizing -.TP -\fB\-\-hinting\fR=\fI\,none\/\fR/auto/full -Hinting style -.TP -\fB\-\-indent\fR=\fI\,points\/\fR -Width in points to indent paragraphs -.TP -\fB\-\-justify\fR -Align paragraph lines to be justified -.TP -\fB\-\-language\fR=\fI\,en_US\/\fR/etc -Language to use for font selection -.TP -\fB\-\-margin\fR=\fI\,CSS\-style\/\fR numbers in pixels -Set the margin on the output in pixels -.TP -\fB\-\-markup\fR -Interpret text as Pango markup -.TP -\fB\-o\fR, \fB\-\-output\fR=\fI\,file\/\fR -Save rendered image to output file -.TP -\fB\-\-pixels\fR -Use pixel units instead of points (sets dpi to 72) -.TP -\fB\-\-rtl\fR -Set base direction to right\-to\-left -.TP -\fB\-\-rotate\fR=\fI\,degrees\/\fR -Angle at which to rotate results -.TP -\fB\-n\fR, \fB\-\-runs\fR=\fI\,integer\/\fR -Run Pango layout engine this many times -.TP -\fB\-\-single\-par\fR -Enable single\-paragraph mode -.TP -\fB\-t\fR, \fB\-\-text\fR=\fI\,string\/\fR -Text to display (instead of a file) -.TP -\fB\-\-version\fR -Show version numbers -.TP -\fB\-\-waterfall\fR -Create a waterfall display -.TP -\fB\-w\fR, \fB\-\-width\fR=\fI\,points\/\fR -Width in points to which to wrap lines or ellipsize -.TP -\fB\-\-wrap\fR=\fI\,word\/\fR/char/word\-char -Text wrapping mode (needs a width to be set) diff --git a/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch b/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch deleted file mode 100644 index 181d84587e13..000000000000 --- a/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://gitlab.gnome.org/GNOME/pango/merge_requests/161 - -From b73284747ac937e31dc9191f84ed6e24284c88ee Mon Sep 17 00:00:00 2001 -From: Chun-wei Fan <fanchunwei@src.gnome.org> -Date: Mon, 25 Nov 2019 14:58:32 +0800 -Subject: [PATCH] tests/test-break.c: Only test Thai breaks with libthai - available - -The four.break test data file involves the Thai language, meaning that -this test will fail unless we have libthai. Skip this test unless -libthai is found. ---- - tests/test-break.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/tests/test-break.c b/tests/test-break.c -index 8549b678..47fa3009 100644 ---- a/tests/test-break.c -+++ b/tests/test-break.c -@@ -305,6 +305,12 @@ main (int argc, char *argv[]) - if (!strstr (name, "break")) - continue; - -+#ifndef HAVE_LIBTHAI -+ /* four.break involves Thai, so only test it when we have libthai */ -+ if (strstr (name, "four.break")) -+ continue; -+#endif -+ - path = g_strdup_printf ("/break/%s", name); - g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "breaks", name, NULL), - test_break, g_free); --- -2.24.1 - diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml index ce9f853c7f5b..dfaa55f180f5 100644 --- a/x11-libs/pango/metadata.xml +++ b/x11-libs/pango/metadata.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="X">Build and install the legacy pangoxft library</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:pango:pango</remote-id> -</upstream> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag> + <flag name="X">Build and install the legacy pangoxft library</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:pango:pango</remote-id> + <remote-id type="gnome-gitlab">GNOME/pango</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild deleted file mode 100644 index 96d5811c15c3..000000000000 --- a/x11-libs/pango/pango-1.42.4-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit gnome2 multilib-minimal toolchain-funcs - -DESCRIPTION="Internationalized text layout and rendering library" -HOMEPAGE="https://www.pango.org/" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="LGPL-2+ FTL" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -IUSE="X +introspection test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),${MULTILIB_USEDEP}] - >=dev-libs/glib-2.50.2:2[${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}] - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) - X? ( - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - virtual/pkgconfig[${MULTILIB_USEDEP}] - test? ( media-fonts/cantarell ) - X? ( x11-base/xorg-proto ) - !<=sys-devel/autoconf-2.63:2.5 -" - -PATCHES=( - "${WORKDIR}"/patches/ # bug fix cherry-picks from master by 20190216; each patch has commit id of origin/master included and will be part of 1.43.1/1.44 - "${FILESDIR}"/${PV}-CVE-2019-1010238.patch -) - -src_prepare() { - gnome2_src_prepare - # This should be updated if next release fails to pre-generate the manpage as well, or src_prepare removed if is properly generated - # https://gitlab.gnome.org/GNOME/pango/issues/270 - cp -v "${FILESDIR}"/${PV}-pango-view.1.in "${S}/utils/pango-view.1.in" || die -} - -multilib_src_configure() { - tc-export CXX - - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --with-cairo \ - $(multilib_native_use_enable introspection) \ - $(use_with X xft) \ - "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \ - "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")" - - if multilib_is_native_abi; then - ln -s "${S}"/docs/html docs/html || die - fi -} - -multilib_src_install() { - gnome2_src_install -} diff --git a/x11-libs/pango/pango-1.44.7.ebuild b/x11-libs/pango/pango-1.44.7.ebuild deleted file mode 100644 index 7100e6c4679d..000000000000 --- a/x11-libs/pango/pango-1.44.7.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg - -DESCRIPTION="Internationalized text layout and rendering library" -HOMEPAGE="https://www.pango.org/" -SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz" - -LICENSE="LGPL-2+ FTL" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# X USE flag is simply a stub until all revdeps have been adjusted to use X(+) -IUSE="gtk-doc +introspection test +X" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.59.2:2[${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] - >=media-libs/harfbuzz-2.0:=[glib(+),truetype(+),${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - x11-base/xorg-proto -" -BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] - gtk-doc? ( - >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - ) -" - -PATCHES=( - "${FILESDIR}"/${P}-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch -) - -src_prepare() { - xdg_src_prepare - gnome2_environment_reset -} - -multilib_src_configure() { - tc-export CXX - - local emesonargs=( - -Dgtk_doc="$(multilib_native_usex gtk-doc true false)" - -Dintrospection="$(multilib_native_usex introspection true false)" - -Dinstall-tests=false - ) - meson_src_configure -} - -muiltilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_test() { - meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} diff --git a/x11-libs/pango/pango-1.51.0.ebuild b/x11-libs/pango/pango-1.51.0.ebuild new file mode 100644 index 000000000000..117b99451163 --- /dev/null +++ b/x11-libs/pango/pango-1.51.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic gnome2-utils meson-multilib xdg + +DESCRIPTION="Internationalized text layout and rendering library" +HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +IUSE="debug +introspection sysprof test X" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}] + >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + dev-util/glib-utils + sys-apps/help2man + virtual/pkgconfig + test? ( media-fonts/cantarell ) +" + +src_prepare() { + default + xdg_environment_reset + gnome2_environment_reset +} + +multilib_src_configure() { + if use debug; then + append-cflags -DPANGO_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS + fi + + local emesonargs=( + # Never use gi-docgen subproject + --wrap-mode nofallback + + -Dgtk_doc=false # we ship pregenerated docs + $(meson_native_use_feature introspection) + -Dinstall-tests=false + -Dfontconfig=enabled + $(meson_feature sysprof) + -Dlibthai=disabled + -Dcairo=enabled + $(meson_feature X xft) + -Dfreetype=enabled + ) + meson_src_configure +} + +multilib_src_install_all() { + insinto /usr/share/gtk-doc/html + # This will install PangoXft API docs regardless of USE=-X, but this is intentional + doins -r "${S}"/docs/Pango* +} + +pkg_postinst() { + xdg_pkg_postinst + + if has_version 'media-libs/freetype[-harfbuzz]' ; then + ewarn "media-libs/freetype is installed without harfbuzz support. This may" + ewarn "lead to minor font rendering problems, see bug 712374." + fi +} diff --git a/x11-libs/pango/pango-1.52.1.ebuild b/x11-libs/pango/pango-1.52.1.ebuild new file mode 100644 index 000000000000..117b99451163 --- /dev/null +++ b/x11-libs/pango/pango-1.52.1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic gnome2-utils meson-multilib xdg + +DESCRIPTION="Internationalized text layout and rendering library" +HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +IUSE="debug +introspection sysprof test X" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}] + >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + dev-util/glib-utils + sys-apps/help2man + virtual/pkgconfig + test? ( media-fonts/cantarell ) +" + +src_prepare() { + default + xdg_environment_reset + gnome2_environment_reset +} + +multilib_src_configure() { + if use debug; then + append-cflags -DPANGO_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS + fi + + local emesonargs=( + # Never use gi-docgen subproject + --wrap-mode nofallback + + -Dgtk_doc=false # we ship pregenerated docs + $(meson_native_use_feature introspection) + -Dinstall-tests=false + -Dfontconfig=enabled + $(meson_feature sysprof) + -Dlibthai=disabled + -Dcairo=enabled + $(meson_feature X xft) + -Dfreetype=enabled + ) + meson_src_configure +} + +multilib_src_install_all() { + insinto /usr/share/gtk-doc/html + # This will install PangoXft API docs regardless of USE=-X, but this is intentional + doins -r "${S}"/docs/Pango* +} + +pkg_postinst() { + xdg_pkg_postinst + + if has_version 'media-libs/freetype[-harfbuzz]' ; then + ewarn "media-libs/freetype is installed without harfbuzz support. This may" + ewarn "lead to minor font rendering problems, see bug 712374." + fi +} diff --git a/x11-libs/pango/pango-1.52.2.ebuild b/x11-libs/pango/pango-1.52.2.ebuild new file mode 100644 index 000000000000..08faaa35ef89 --- /dev/null +++ b/x11-libs/pango/pango-1.52.2.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic gnome2-utils meson-multilib xdg + +DESCRIPTION="Internationalized text layout and rendering library" +HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +IUSE="debug +introspection sysprof test X" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}] + >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.13.0:1.0[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.10[X?,${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + dev-util/glib-utils + sys-apps/help2man + virtual/pkgconfig + test? ( media-fonts/cantarell ) +" + +src_prepare() { + default + xdg_environment_reset + gnome2_environment_reset +} + +multilib_src_configure() { + if use debug; then + append-cflags -DPANGO_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS + fi + + local emesonargs=( + # Never use gi-docgen subproject + --wrap-mode nofallback + + -Dgtk_doc=false # we ship pregenerated docs + $(meson_native_use_feature introspection) + -Dinstall-tests=false + -Dfontconfig=enabled + $(meson_feature sysprof) + -Dlibthai=disabled + -Dcairo=enabled + $(meson_feature X xft) + -Dfreetype=enabled + ) + meson_src_configure +} + +multilib_src_install_all() { + insinto /usr/share/gtk-doc/html + # This will install PangoXft API docs regardless of USE=-X, but this is intentional + doins -r "${S}"/docs/Pango* +} + +pkg_postinst() { + xdg_pkg_postinst + + if has_version 'media-libs/freetype[-harfbuzz]' ; then + ewarn "media-libs/freetype is installed without harfbuzz support. This may" + ewarn "lead to minor font rendering problems, see bug 712374." + fi +} diff --git a/x11-libs/pangox-compat/Manifest b/x11-libs/pangox-compat/Manifest deleted file mode 100644 index 8469ec0108c4..000000000000 --- a/x11-libs/pangox-compat/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pangox-compat-0.0.2.tar.xz 267396 BLAKE2B 364761c9610e497e3bc2c8a1d311cffa0298256b3cf68754c5ea4e31ce096d136cd50e2deca473d2b34aedf24e50577e8e8c37ca2556ed53c9210e4d3ff663c9 SHA512 fd3e257157d78c3d86c948e7909226fdebe52408d02a52432de8a295443b64b80b37cb795fe646d581515e6072bd278f2dcab0e43cf27b63b03a82c01eb6b9b3 diff --git a/x11-libs/pangox-compat/metadata.xml b/x11-libs/pangox-compat/metadata.xml deleted file mode 100644 index 39980802b1da..000000000000 --- a/x11-libs/pangox-compat/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild deleted file mode 100644 index 9b8599f1f5f4..000000000000 --- a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 multilib-minimal - -DESCRIPTION="PangoX compatibility library" -HOMEPAGE="http://www.pango.org/" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -multilib_src_configure() { - ECONF_SOURCE=${S} gnome2_src_configure --disable-static -} - -multilib_src_install() { - gnome2_src_install -} diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild deleted file mode 100644 index 5b7a845e893c..000000000000 --- a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="PangoX compatibility library" -HOMEPAGE="http://www.pango.org/" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=">=dev-libs/glib-2.31:2 - >=x11-libs/pango-1.32 - x11-libs/libX11" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - G2CONF="${G2CONF} --disable-static" - - gnome2_src_configure -} diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest index 3ce2039a5fe9..df5657790619 100644 --- a/x11-libs/pixman/Manifest +++ b/x11-libs/pixman/Manifest @@ -1,2 +1 @@ -DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af -DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270 +DIST pixman-0.43.4.tar.xz 636900 BLAKE2B c31e5700bfadcd72f522af50509a4a6cd7bbf90c918c75b108e50246f1c76e858125138902a222040ada192710ec788deb43eb65085416f3eff88e3ed970933e SHA512 b40fb05bd58dc78f4e4e9b19c86991ab0611b708657c9a7fb42bfe82d57820a0fde01a34b00a0848a41da6c3fb90c2213942a70f435a0e9467631695d3bc7e36 diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml index 46b4979bd90c..9eeb5bbef528 100644 --- a/x11-libs/pixman/metadata.xml +++ b/x11-libs/pixman/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -<use> - <flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:pixman:pixman</remote-id> -</upstream> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <use> + <flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:pixman:pixman</remote-id> + <remote-id type="freedesktop-gitlab">pixman/pixman</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild deleted file mode 100644 index e327798978a0..000000000000 --- a/x11-libs/pixman/pixman-0.38.4.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs - -DESCRIPTION="Low-level pixel manipulation routines" -HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" - -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_src_unpack -} - -multilib_src_configure() { - local openmp=disabled - tc-has-openmp && openmp=enabled - - local emesonargs=( - $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) - $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) - $(meson_feature cpu_flags_x86_mmxext mmx) - $(meson_feature cpu_flags_x86_sse2 sse2) - $(meson_feature cpu_flags_x86_ssse3 ssse3) - $(meson_feature altivec vmx) - $(meson_feature neon neon) - $(meson_feature loongson2f loongson-mmi) - -Dgtk=disabled - -Dlibpng=disabled - -Dopenmp=$openmp # only used in unit tests - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - export OMP_NUM_THREADS=$(makeopts_jobs) - meson test -v -C "${BUILD_DIR}" -t 100 -} - -multilib_src_install() { - meson_src_install -} diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.43.4.ebuild index 9c15b1e09657..c20efe3bbb8c 100644 --- a/x11-libs/pixman/pixman-0.40.0.ebuild +++ b/x11-libs/pixman/pixman-0.43.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,24 +9,33 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs +inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" fi LICENSE="MIT" SLOT="0" -IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs" +IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test" +RESTRICT="!test? ( test )" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp +} multilib_src_configure() { - local openmp=disabled - tc-has-openmp && openmp=enabled + if ( use arm || use arm64 ) && tc-is-clang ; then + # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 + append-cflags $(test-flags-CC -fno-integrated-as) + fi local emesonargs=( $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) @@ -35,25 +44,25 @@ multilib_src_configure() { $(meson_feature cpu_flags_x86_sse2 sse2) $(meson_feature cpu_flags_x86_ssse3 ssse3) $(meson_feature cpu_flags_ppc_altivec vmx) - $(meson_feature cpu_flags_arm_neon neon) $(meson_feature loongson2f loongson-mmi) + $(meson_feature test openmp) # only used in unit tests + $(meson_feature test tests) -Ddefault_library=$(usex static-libs both shared) + -Ddemos=disabled -Dgtk=disabled -Dlibpng=disabled - -Dopenmp=$openmp # only used in unit tests ) - meson_src_configure -} -multilib_src_compile() { - meson_src_compile + if [[ ${ABI} == arm64 ]]; then + emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon)) + elif [[ ${ABI} == arm ]]; then + emesonargs+=($(meson_feature cpu_flags_arm_neon neon)) + fi + + meson_src_configure } multilib_src_test() { export OMP_NUM_THREADS=$(makeopts_jobs) - meson test -v -C "${BUILD_DIR}" -t 100 -} - -multilib_src_install() { - meson_src_install + meson_src_test -t 100 } diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild index 9c15b1e09657..64f5bc702b84 100644 --- a/x11-libs/pixman/pixman-9999.ebuild +++ b/x11-libs/pixman/pixman-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,24 +9,33 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs +inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" fi LICENSE="MIT" SLOT="0" -IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs" +IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test" +RESTRICT="!test? ( test )" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp +} multilib_src_configure() { - local openmp=disabled - tc-has-openmp && openmp=enabled + if ( use arm || use arm64 ) && tc-is-clang ; then + # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 + append-cflags $(test-flags-CC -fno-integrated-as) + fi local emesonargs=( $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) @@ -35,25 +44,25 @@ multilib_src_configure() { $(meson_feature cpu_flags_x86_sse2 sse2) $(meson_feature cpu_flags_x86_ssse3 ssse3) $(meson_feature cpu_flags_ppc_altivec vmx) - $(meson_feature cpu_flags_arm_neon neon) $(meson_feature loongson2f loongson-mmi) + $(meson_feature test openmp) # only used in unit tests + $(meson_feature test tests) -Ddefault_library=$(usex static-libs both shared) + -Ddemos=disabled -Dgtk=disabled -Dlibpng=disabled - -Dopenmp=$openmp # only used in unit tests ) - meson_src_configure -} -multilib_src_compile() { - meson_src_compile + if [[ ${ABI} == arm64 ]]; then + emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon)) + elif [[ ${ABI} == arm ]]; then + emesonargs+=($(meson_feature cpu_flags_arm_neon neon)) + fi + + meson_src_configure } multilib_src_test() { export OMP_NUM_THREADS=$(makeopts_jobs) - meson test -v -C "${BUILD_DIR}" -t 100 -} - -multilib_src_install() { - meson_src_install + meson_src_test -t 100 } diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest index 384eaefb3f36..96cf9c1d21e4 100644 --- a/x11-libs/qscintilla/Manifest +++ b/x11-libs/qscintilla/Manifest @@ -1 +1 @@ -DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd +DIST QScintilla_src-2.14.1.tar.gz 3233610 BLAKE2B 83b54378f0d3fa39ea120214a06c91982f81281e15c61fc70a9e83928be64724cfd2679b5e4aafee44a324e24a6c4729693cd118c6ad0b1636a199f2f41d34fe SHA512 19e2f9e0a14947501c575018df368d24eb7f8c74e74faa5246db36415bf28dc0beee507ed0e73107c02b36a99bbaf55f0ef3349f479d2332e1b92b2c4a32788a diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml index c0732c358c37..09873122cae9 100644 --- a/x11-libs/qscintilla/metadata.xml +++ b/x11-libs/qscintilla/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="designer">Build plugin for Qt Designer</flag> </use> diff --git a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild deleted file mode 100644 index b6721fffe964..000000000000 --- a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic qmake-utils - -DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control" -HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro" - -MY_PN=QScintilla -MY_P=${MY_PN}-${PV/_pre/.dev} -if [[ ${PV} == *_pre* ]]; then - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz" -else - SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz" -fi - -LICENSE="GPL-3" -SLOT="0/15" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="designer doc" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - designer? ( dev-qt/designer:5 ) -" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - default - - # Sub-slot sanity check - local subslot=${SLOT#*/} - local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die) - local major=${version%%.*} - if [[ ${subslot} != ${major} ]]; then - eerror - eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})" - eerror "Please update SLOT variable as follows:" - eerror " SLOT=\"${SLOT%%/*}/${major}\"" - eerror - die "sub-slot sanity check failed" - fi -} - -qsci_run_in() { - pushd "$1" >/dev/null || die - shift || die - "$@" || die - popd >/dev/null || die -} - -src_configure() { - if use designer; then - # prevent building against system version (bug 466120) - append-cxxflags -I../Qt4Qt5 - append-ldflags -L../Qt4Qt5 - fi - - qsci_run_in Qt4Qt5 eqmake5 - use designer && qsci_run_in designer-Qt4Qt5 eqmake5 -} - -src_compile() { - qsci_run_in Qt4Qt5 emake - use designer && qsci_run_in designer-Qt4Qt5 emake -} - -src_install() { - qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install - use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install - - DOCS=( ChangeLog NEWS ) - use doc && HTML_DOCS=( doc/html-Qt4Qt5/. ) - einstalldocs -} diff --git a/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild new file mode 100644 index 000000000000..fb9ddb9b51a3 --- /dev/null +++ b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multibuild qmake-utils + +DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control" +HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro" + +MY_PN=QScintilla +MY_P=${MY_PN}_src-${PV/_pre/.dev} +SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-3" +SLOT="0/15" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86" +IUSE="designer doc +qt5 qt6" + +REQUIRED_USE="|| ( qt5 qt6 )" + +# no tests +RESTRICT="test" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + designer? ( dev-qt/designer:5 ) + ) + qt6? ( + dev-qt/qtbase:6[gui,widgets] + designer? ( dev-qt/qttools:6[designer] ) + ) +" +DEPEND="${RDEPEND}" + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_unpack() { + default + + # Sub-slot sanity check + local subslot=${SLOT#*/} + local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/src/qscintilla.pro || die) + local major=${version%%.*} + if [[ ${subslot} != ${major} ]]; then + eerror + eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})" + eerror "Please update SLOT variable as follows:" + eerror " SLOT=\"${SLOT%%/*}/${major}\"" + eerror + die "sub-slot sanity check failed" + fi + + multibuild_copy_sources +} + +qsci_run_in() { + pushd "$1" >/dev/null || die + shift || die + "$@" || die + popd >/dev/null || die +} + +src_configure() { + if use designer; then + # prevent building against system version (bug 466120) + append-cxxflags -I../src + append-ldflags -L../src + fi + my_src_configure() { + case ${MULTIBUILD_VARIANT} in + qt5) + qsci_run_in "${BUILD_DIR}"/src eqmake5; + use designer && qsci_run_in "${BUILD_DIR}"/designer eqmake5;; + qt6) + qsci_run_in "${BUILD_DIR}"/src eqmake6; + use designer && qsci_run_in "${BUILD_DIR}"/designer eqmake6;; + esac + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + my_src_compile() { + qsci_run_in "${BUILD_DIR}"/src emake + use designer && qsci_run_in "${BUILD_DIR}"/designer emake + } + + multibuild_foreach_variant my_src_compile +} + +src_install() { + my_src_install() { + qsci_run_in "${BUILD_DIR}"/src emake INSTALL_ROOT="${D}" install + use designer && qsci_run_in "${BUILD_DIR}"/designer emake INSTALL_ROOT="${D}" install + } + + multibuild_foreach_variant my_src_install + + use doc && local HTML_DOCS=( doc/html/. ) + einstalldocs +} diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest index d505ad7d9915..fde457163efa 100644 --- a/x11-libs/qtermwidget/Manifest +++ b/x11-libs/qtermwidget/Manifest @@ -1,2 +1,2 @@ -DIST qtermwidget-0.14.1.tar.xz 178952 BLAKE2B ae266dedc717da7de0b74c4fed2e89c6047f3d8d7e70c553ed5150ba8507e0b634978304105843009069240e09aabf153288a6c86e9874f9043b63f85f12d3d1 SHA512 6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410 -DIST qtermwidget-0.15.0.tar.xz 181284 BLAKE2B a862821d30831c829e2391f33348e1499e80b515d23226f06070bd8bb82b383d51ea73f0784f04e5a30630db5176564af35995641b3958d60a206f82fecd680f SHA512 95f44c77d0b678b1a204b559a7adb2fb68b2e82b2357d89239e9fc1c6f445346d84ec7f395d58f17a2ef7b42e58c02590f637683193eae4f7efbd001b61857c7 +DIST qtermwidget-1.3.0.tar.xz 189464 BLAKE2B f6257588d6c8505737affcec56cc2da66121cb1fecaa8a44f4afad528f5bd18cb738cb9b65da7b2c1632093680bec2403439a323cdec5d2845b8799de0e02a50 SHA512 f1731f6915bb9d5ea83a434cab169064fe7ac2fcf60c6b35c696e4d945fe11937dd98311916d6272016b059ed7f3fc66a955b91d0b0e7e6499f69627116608ed +DIST qtermwidget-1.4.0.tar.xz 190320 BLAKE2B 993674562bb15e423fc4dbfa1b99a839fe8fea52e4c49f2629858d01d8ac4a50750845b507fafa4b0bdf6337fef77458793d002388986923d8f55b321de3bb9b SHA512 b688290eff52bd77e4a9f342062b52bf7a03a8ba66fc86583875472d0c0b0414d59ea0ad6cde64117cc49061944eacd17950724b23f74bb6ada4995917a094bc diff --git a/x11-libs/qtermwidget/metadata.xml b/x11-libs/qtermwidget/metadata.xml index 779c6c6b024c..9b808832ca01 100644 --- a/x11-libs/qtermwidget/metadata.xml +++ b/x11-libs/qtermwidget/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> </maintainer> <longdescription lang="en"> QTermWidget is an opensource project based on konsole (a KDE application). diff --git a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild deleted file mode 100644 index ac30ad35a110..000000000000 --- a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Qt terminal emulator widget" -HOMEPAGE="https://lxqt.github.io/" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -fi - -LICENSE="BSD GPL-2 LGPL-2+" -SLOT="0/${PV}" - -BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.6.0 -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 -" -RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n -" diff --git a/x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild b/x11-libs/qtermwidget/qtermwidget-1.3.0.ebuild index 2f1859de6b24..67d0e6d192ae 100644 --- a/x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild +++ b/x11-libs/qtermwidget/qtermwidget-1.3.0.ebuild @@ -1,31 +1,31 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="Qt terminal emulator widget" -HOMEPAGE="https://lxqt.github.io/" +HOMEPAGE="https://lxqt-project.org/" if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" fi LICENSE="BSD GPL-2 LGPL-2+" SLOT="0/${PV}" BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.7.0 + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 " RDEPEND="${DEPEND}" diff --git a/x11-libs/qtermwidget/qtermwidget-1.4.0.ebuild b/x11-libs/qtermwidget/qtermwidget-1.4.0.ebuild new file mode 100644 index 000000000000..ff5db81487f3 --- /dev/null +++ b/x11-libs/qtermwidget/qtermwidget-1.4.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Qt terminal emulator widget" +HOMEPAGE="https://lxqt-project.org/" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +fi + +LICENSE="BSD GPL-2 LGPL-2+" +SLOT="0/${PV}" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 +" +DEPEND=" + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 +" +RDEPEND="${DEPEND}" diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild index 2f1859de6b24..1d05e00f94c1 100644 --- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild +++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild @@ -1,31 +1,31 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="Qt terminal emulator widget" -HOMEPAGE="https://lxqt.github.io/" +HOMEPAGE="https://lxqt-project.org/" if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi LICENSE="BSD GPL-2 LGPL-2+" SLOT="0/${PV}" BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.7.0 + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 " RDEPEND="${DEPEND}" diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest index 90ffa05af8b9..e33a6b4b3b9f 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -1,2 +1,4 @@ -DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a -DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da +DIST qwt-5.2.3_p20210211.tar.gz 2324714 BLAKE2B 86556c9cf65af80500b3cba7ef78be8aec0f2413a1d485641f8870b447a1b1370b9821ad6b4a58c74f87a73172e4b2fa3eb2f02bb525c0ab3982aec550914666 SHA512 8268213c9e809015d83f3f7d42e66c85b6c9cb16efb9586ad4e5da2fa60fdcc5bdf52e0a422adcdfe928e36df0f63d8bbed1fabded91ef36d226e6cc7fa372bb +DIST qwt-5.2.3_p20210828.tar.gz 2324516 BLAKE2B f86ee55dab0e70bb255f90384ee920985d71ff998aa74bb087c2bd7bf3cdc23034786bce0d4e652dd4a7b1551719e4723de6689c76500e5f618838f40f7ca838 SHA512 c5eb64593a476d9ff1ec6c16593896bf3b90738a17775bd8186ffc7f86911ae0b91ceb8e7c1736329e9871fd9e1e5653a85df0a4cdb780a1f2f993f33ee07f62 +DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22 +DIST qwt-6.2.0.tar.bz2 4815773 BLAKE2B 30011de7ef9b555584644ccb0994bfe56af2d7efe16690b236aa1aa0860a4408800fbd31003fd7a7a0ddf8572f573b4d0ff77069f291cd2858b31a2840952b3b SHA512 d992f9dddb09ad0e1d09e23a24a9331c950ca19a413d2627cf423e1ddc2a4ad4eb951646f789e8c7a9ab42668c30d7108071f3f8bbd8e1f4118cadb67c34939d diff --git a/x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch b/x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch new file mode 100644 index 000000000000..9ceff1035e69 --- /dev/null +++ b/x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch @@ -0,0 +1,28 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 502f097..35b8660 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -6,6 +6,7 @@ set( HEADERS + "qwt_color_map.h" + "qwt_clipper.h" + "qwt_double_interval.h" ++ "qwt_double_rect.h" + "qwt_dyngrid_layout.h" + "qwt_global.h" + "qwt_layout_metrics.h" +@@ -34,6 +35,7 @@ set( SRCS + "qwt_color_map.cpp" + "qwt_clipper.cpp" + "qwt_double_interval.cpp" ++ "qwt_double_rect.cpp" + "qwt_dyngrid_layout.cpp" + "qwt_layout_metrics.cpp" + "qwt_math.cpp" +@@ -156,6 +158,7 @@ if( QWT_WIDGETS ) + endif() + + add_library( qwt5-qt5 ${SRCS} ${HEADERS} ) ++set_target_properties( qwt5-qt5 PROPERTIES PUBLIC_HEADER "${HEADERS}" ) + + target_link_libraries( qwt5-qt5 Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport ) + diff --git a/x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch b/x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch deleted file mode 100644 index 0ee4b1f9d178..000000000000 --- a/x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch +++ /dev/null @@ -1,304 +0,0 @@ -From a5bdaa3b3a34b8a018fe67dfdd34bf8c890de2fa Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 22 May 2020 17:56:55 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing headers) - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - examples/dials/attitude_indicator.cpp | 1 + - examples/itemeditor/editor.cpp | 2 ++ - examples/sinusplot/sinusplot.cpp | 1 + - playground/graphicscale/mainwindow.h | 1 + - playground/symbols/symbols.cpp | 1 + - src/qwt_compass_rose.cpp | 1 + - src/qwt_dial_needle.cpp | 1 + - src/qwt_graphic.h | 1 + - src/qwt_null_paintdevice.cpp | 1 + - src/qwt_null_paintdevice.h | 1 + - src/qwt_painter.cpp | 1 + - src/qwt_painter.h | 2 ++ - src/qwt_painter_command.h | 2 ++ - src/qwt_plot_canvas.cpp | 1 + - src/qwt_plot_canvas.h | 1 + - src/qwt_plot_glcanvas.cpp | 1 + - src/qwt_plot_glcanvas.h | 2 ++ - src/qwt_plot_panner.cpp | 2 ++ - src/qwt_plot_renderer.cpp | 1 + - src/qwt_plot_shapeitem.cpp | 3 +++ - src/qwt_symbol.h | 2 ++ - src/qwt_widget_overlay.cpp | 1 + - 22 files changed, 30 insertions(+) - -diff --git a/examples/dials/attitude_indicator.cpp b/examples/dials/attitude_indicator.cpp -index ea0d5ab..a01611e 100644 ---- a/examples/dials/attitude_indicator.cpp -+++ b/examples/dials/attitude_indicator.cpp -@@ -3,6 +3,7 @@ - #include <qwt_round_scale_draw.h> - #include <qevent.h> - #include <qpainter.h> -+#include <qpainterpath.h> - #include <qpolygon.h> - - AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color ) -diff --git a/examples/itemeditor/editor.cpp b/examples/itemeditor/editor.cpp -index bd06372..c741b01 100644 ---- a/examples/itemeditor/editor.cpp -+++ b/examples/itemeditor/editor.cpp -@@ -4,6 +4,8 @@ - #include <qwt_scale_map.h> - #include <qwt_plot_shapeitem.h> - #include <qevent.h> -+#include <qpainter.h> -+#include <qpainterpath.h> - - class Overlay: public QwtWidgetOverlay - { -diff --git a/examples/sinusplot/sinusplot.cpp b/examples/sinusplot/sinusplot.cpp -index 119fa4a..6a9bfe7 100644 ---- a/examples/sinusplot/sinusplot.cpp -+++ b/examples/sinusplot/sinusplot.cpp -@@ -1,5 +1,6 @@ - #include <qapplication.h> - #include <qlayout.h> -+#include <qpainterpath.h> - #include <qwt_plot.h> - #include <qwt_plot_marker.h> - #include <qwt_plot_curve.h> -diff --git a/playground/graphicscale/mainwindow.h b/playground/graphicscale/mainwindow.h -index d284413..3b544de 100644 ---- a/playground/graphicscale/mainwindow.h -+++ b/playground/graphicscale/mainwindow.h -@@ -2,6 +2,7 @@ - #define MAIN_WINDOW_H - - #include <qmainwindow.h> -+#include <qpainterpath.h> - - class Canvas; - class QPainterPath; -diff --git a/playground/symbols/symbols.cpp b/playground/symbols/symbols.cpp -index f7b2ed6..5b9f56d 100644 ---- a/playground/symbols/symbols.cpp -+++ b/playground/symbols/symbols.cpp -@@ -1,5 +1,6 @@ - #include <qapplication.h> - #include <qpainter.h> -+#include <qpainterpath.h> - #include <qbuffer.h> - #ifdef QT_SVG_LIB - #include <qsvggenerator.h> -diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp -index 05f7039..fbd30fe 100644 ---- a/src/qwt_compass_rose.cpp -+++ b/src/qwt_compass_rose.cpp -@@ -11,6 +11,7 @@ - #include "qwt_point_polar.h" - #include "qwt_painter.h" - #include <qpainter.h> -+#include <qpainterpath.h> - - static QPointF qwtIntersection( - QPointF p11, QPointF p12, QPointF p21, QPointF p22 ) -diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp -index 49dd44a..d98f68c 100644 ---- a/src/qwt_dial_needle.cpp -+++ b/src/qwt_dial_needle.cpp -@@ -13,6 +13,7 @@ - #include "qwt_painter.h" - #include <qapplication.h> - #include <qpainter.h> -+#include <qpainterpath.h> - - #if QT_VERSION < 0x040601 - #define qFastSin(x) qSin(x) -diff --git a/src/qwt_graphic.h b/src/qwt_graphic.h -index cbd41f9..6881ea9 100644 ---- a/src/qwt_graphic.h -+++ b/src/qwt_graphic.h -@@ -14,6 +14,7 @@ - #include "qwt_null_paintdevice.h" - #include <qmetatype.h> - #include <qimage.h> -+#include <qpainterpath.h> - #include <qpixmap.h> - - class QwtPainterCommand; -diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp -index 3baf0e9..468a838 100644 ---- a/src/qwt_null_paintdevice.cpp -+++ b/src/qwt_null_paintdevice.cpp -@@ -9,6 +9,7 @@ - - #include "qwt_null_paintdevice.h" - #include <qpaintengine.h> -+#include <qpainterpath.h> - #include <qpixmap.h> - - class QwtNullPaintDevice::PrivateData -diff --git a/src/qwt_null_paintdevice.h b/src/qwt_null_paintdevice.h -index e4e9cad..b804429 100644 ---- a/src/qwt_null_paintdevice.h -+++ b/src/qwt_null_paintdevice.h -@@ -13,6 +13,7 @@ - #include "qwt_global.h" - #include <qpaintdevice.h> - #include <qpaintengine.h> -+#include <qpainterpath.h> - - /*! - \brief A null paint device doing nothing -diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp -index 7959fe5..626677f 100644 ---- a/src/qwt_painter.cpp -+++ b/src/qwt_painter.cpp -@@ -17,6 +17,7 @@ - #include <qframe.h> - #include <qrect.h> - #include <qpainter.h> -+#include <qpainterpath.h> - #include <qpalette.h> - #include <qpaintdevice.h> - #include <qpixmap.h> -diff --git a/src/qwt_painter.h b/src/qwt_painter.h -index c0a0ff7..bcbe289 100644 ---- a/src/qwt_painter.h -+++ b/src/qwt_painter.h -@@ -16,6 +16,8 @@ - #include <qrect.h> - #include <qpen.h> - #include <qline.h> -+#include <qpainter.h> -+#include <qpainterpath.h> - #include <qpalette.h> - - class QPainter; -diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h -index a2f509a..a49ee52 100644 ---- a/src/qwt_painter_command.h -+++ b/src/qwt_painter_command.h -@@ -12,6 +12,8 @@ - - #include "qwt_global.h" - #include <qpaintengine.h> -+#include <qpainter.h> -+#include <qpainterpath.h> - #include <qpixmap.h> - #include <qimage.h> - #include <qpolygon.h> -diff --git a/src/qwt_plot_canvas.cpp b/src/qwt_plot_canvas.cpp -index 9438f15..bfe660d 100644 ---- a/src/qwt_plot_canvas.cpp -+++ b/src/qwt_plot_canvas.cpp -@@ -13,6 +13,7 @@ - #include "qwt_math.h" - #include "qwt_plot.h" - #include <qpainter.h> -+#include <qpainterpath.h> - #include <qstyle.h> - #include <qstyleoption.h> - #include <qpaintengine.h> -diff --git a/src/qwt_plot_canvas.h b/src/qwt_plot_canvas.h -index c79e4e4..90a32ce 100644 ---- a/src/qwt_plot_canvas.h -+++ b/src/qwt_plot_canvas.h -@@ -12,6 +12,7 @@ - - #include "qwt_global.h" - #include <qframe.h> -+#include <qpainter.h> - #include <qpainterpath.h> - - class QwtPlot; -diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp -index 996c0ad..6975863 100644 ---- a/src/qwt_plot_glcanvas.cpp -+++ b/src/qwt_plot_glcanvas.cpp -@@ -12,6 +12,7 @@ - #include "qwt_painter.h" - #include <qevent.h> - #include <qpainter.h> -+#include <qpainterpath.h> - #include <qdrawutil.h> - #include <qstyle.h> - #include <qstyleoption.h> -diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h -index 7ca9b5a..a6c01e0 100644 ---- a/src/qwt_plot_glcanvas.h -+++ b/src/qwt_plot_glcanvas.h -@@ -13,6 +13,8 @@ - #include "qwt_global.h" - #include <qframe.h> - #include <qgl.h> -+#include <qpainter.h> -+#include <qpainterpath.h> - - class QwtPlot; - -diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp -index b7daa05..2f31d05 100644 ---- a/src/qwt_plot_panner.cpp -+++ b/src/qwt_plot_panner.cpp -@@ -14,6 +14,8 @@ - #include <qbitmap.h> - #include <qstyle.h> - #include <qstyleoption.h> -+#include <qpainter.h> -+#include <qpainterpath.h> - - #if QT_VERSION >= 0x050000 - #if QT_VERSION < 0x050100 -diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp -index 549c4bc..71cadec 100644 ---- a/src/qwt_plot_renderer.cpp -+++ b/src/qwt_plot_renderer.cpp -@@ -20,6 +20,7 @@ - #include "qwt_math.h" - - #include <qpainter.h> -+#include <qpainterpath.h> - #include <qtransform.h> - #include <qprinter.h> - #include <qfiledialog.h> -diff --git a/src/qwt_plot_shapeitem.cpp b/src/qwt_plot_shapeitem.cpp -index db7896b..09efd95 100644 ---- a/src/qwt_plot_shapeitem.cpp -+++ b/src/qwt_plot_shapeitem.cpp -@@ -13,6 +13,9 @@ - #include "qwt_curve_fitter.h" - #include "qwt_clipper.h" - -+#include <qpainter.h> -+#include <qpainterpath.h> -+ - static QPainterPath qwtTransformPath( const QwtScaleMap &xMap, - const QwtScaleMap &yMap, const QPainterPath &path, bool doAlign ) - { -diff --git a/src/qwt_symbol.h b/src/qwt_symbol.h -index 538778d..2961ebe 100644 ---- a/src/qwt_symbol.h -+++ b/src/qwt_symbol.h -@@ -11,6 +11,8 @@ - #define QWT_SYMBOL_H - - #include "qwt_global.h" -+#include <qpainter.h> -+#include <qpainterpath.h> - #include <qpolygon.h> - - class QPainter; -diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp -index 5974413..fa6da48 100644 ---- a/src/qwt_widget_overlay.cpp -+++ b/src/qwt_widget_overlay.cpp -@@ -10,6 +10,7 @@ - #include "qwt_widget_overlay.h" - #include "qwt_painter.h" - #include <qpainter.h> -+#include <qpainterpath.h> - #include <qpaintengine.h> - #include <qimage.h> - #include <qevent.h> --- -2.26.2 - diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml index 5fa861212232..4ae06e042f79 100644 --- a/x11-libs/qwt/metadata.xml +++ b/x11-libs/qwt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> @@ -11,12 +11,14 @@ Besides a 2D plot widget it provides scales, sliders, dials, compasses, thermometers, wheels and knobs to control or display values, arrays or ranges of type double. -</longdescription> + </longdescription> <use> <flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag> <flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag> + <flag name="polar">Install the QwtPolar headers</flag> </use> <upstream> <remote-id type="sourceforge">qwt</remote-id> + <remote-id type="github">SciDAVis/qwt5-qt5</remote-id> </upstream> </pkgmetadata> diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild new file mode 100644 index 000000000000..aa64d85aa9c9 --- /dev/null +++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils + +COMMIT="2a9f1ae2f394abf3a000906b507a0d925b1e4b25" + +DESCRIPTION="2D plotting library for Qt5" +HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5" +SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="qwt" +KEYWORDS="amd64 ~arm ppc ppc64 x86" +SLOT="5" +IUSE="designer examples" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtsvg:5 + designer? ( dev-qt/designer:5 ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}5-qt5-${COMMIT}" + +src_prepare() { + default + sed -e "/QwtVersion/s:5.2.2.:${PV/_*}:g" -i ${PN}.prf || die + + cat > qwtconfig.pri <<-EOF || die + target.path = "${EPREFIX}/usr/$(get_libdir)" + headers.path = "${EPREFIX}/usr/include/qwt5" + doc.path = "${EPREFIX}/usr/share/doc/${PF}" + CONFIG += qt warn_on thread release + CONFIG += QwtDll QwtPlot QwtWidgets QwtSVGItem + VERSION = ${PV/_*} + QWT_VERSION = ${PV/_*} + EOF + use designer && echo "CONFIG += QwtDesigner" >> qwtconfig.pri + # Fails to compile with MathML enabled + #use mathml && echo "CONFIG += QwtMathML" >> qwtconfig.pri + + cat >> qwtconfig.pri <<-EOF || die + QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer" + QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features" + EOF + sed -i -e 's/headers doc/headers/' src/src.pro || die +} + +src_configure() { + eqmake5 +} + +src_compile() { + default +} + +src_install () { + emake INSTALL_ROOT="${D}" install + einstalldocs + doman doc/man/*/* + + if use examples; then + # don't build examples - fix the qt files to build once installed + cat > examples/examples.pri <<-EOF || die + include( qwtconfig.pri ) + TEMPLATE = app + MOC_DIR = moc + INCLUDEPATH += "${EPREFIX}/usr/include/qwt5" + DEPENDPATH += "${EPREFIX}/usr/include/qwt5" + LIBS += -lqwt + EOF + sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die + cp *.pri examples/ || die + insinto /usr/share/${PN}5 + doins -r examples + fi + + # avoid file conflict with qwt:6 + # https://github.com/gbm19/qwt5-qt5/issues/2 + pushd "${ED}/usr/share/man/man3/" || die + for f in *; do + mv ${f} ${f//.3/.5qt5.3} || die + done + popd || die +} diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild new file mode 100644 index 000000000000..054f0a455778 --- /dev/null +++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DIR="doc" +DOCS_CONFIG_NAME="Doxyfile" +DOCS_DEPEND=" + media-gfx/graphviz + virtual/latex-base +" + +inherit docs cmake + +COMMIT="f7519200f102676fb04fb7bd0be555e0a419d378" + +DESCRIPTION="2D plotting library for Qt5" +HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5" +SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}5-qt5-${COMMIT}" + +LICENSE="qwt" +KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86" +SLOT="5" +IUSE="designer examples" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtsvg:5 + designer? ( dev-qt/designer:5 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-install-headers.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=$(usex examples) + -DQWT_DESIGNER=$(usex designer) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + docs_compile +} + +src_install() { + cmake_src_install + + # avoid file conflict with qwt:6 + # https://github.com/gbm19/qwt5-qt5/issues/2 + pushd "${ED}/usr/share/man/man3/" || die + for f in *; do + mv ${f} ${f//.3/.5qt5.3} || die + done + popd || die +} diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild deleted file mode 100644 index f9fd1d423593..000000000000 --- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${PN}-${PV/_/-}" -inherit multibuild qmake-utils - -DESCRIPTION="2D plotting library for Qt5" -HOMEPAGE="https://qwt.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2" - -LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" -KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -SLOT="6/1.3" -IUSE="designer doc examples mathml opengl static-libs svg" - -DEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - designer? ( dev-qt/designer:5 ) - opengl? ( - dev-qt/qtopengl:5 - virtual/opengl - ) - svg? ( dev-qt/qtsvg:5 ) -" -RDEPEND="${DEPEND} - !<x11-libs/qwt-5.2.3 - !x11-libs/qwt:5[doc] - doc? ( !<media-libs/coin-3.1.3[doc] ) -" - -S="${WORKDIR}"/${MY_P} - -DOCS=( CHANGES-6.1 README ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch - "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch -) - -pkg_setup() { - MULTIBUILD_VARIANTS=( shared $(usev static-libs) ) -} - -src_prepare() { - cat > qwtconfig.pri <<-EOF - QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" - QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" - QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" - QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig - VERSION = ${PV/_*} - QWT_VERSION = ${PV/_*} - EOF - - use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri - use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri - use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri - use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri - - cat > qwtbuild.pri <<-EOF - QWT_CONFIG += qt warn_on thread release no_keywords - EOF - - multibuild_copy_sources - - preparation() { - if [[ ${MULTIBUILD_VARIANT} == shared ]]; then - echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri - fi - - cat >> qwtconfig.pri <<-EOF - QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer" - QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features" - EOF - sed \ - -e 's/target doc/target/' \ - -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \ - -e "/^TARGET/s:qwt):qwt6-qt5):g" \ - -i src/src.pro || die - - sed \ - -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \ - -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \ - -i qwt.prf designer/designer.pro examples/examples.pri \ - textengines/mathml/qwtmathml.prf textengines/textengines.pri || die - - default - } - - multibuild_foreach_variant run_in_build_dir preparation -} - -src_configure() { - multibuild_foreach_variant run_in_build_dir eqmake5 -} - -src_compile() { - multibuild_foreach_variant run_in_build_dir default -} - -src_test() { - testing() { - cd examples || die - eqmake5 examples.pro - emake - } - multibuild_foreach_variant run_in_build_dir testing -} - -src_install() { - rm -f doc/man/*/{_,deprecated}* || die - - multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install - - if use mathml; then - sed \ - -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \ - -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die - fi - - if use doc; then - local HTML_DOCS=( doc/html/. ) - else - rm -rf "${ED}"/usr/share/doc/${PF}/html || die - fi - - einstalldocs - - mkdir -p "${ED}"/usr/share/man/ || die - mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \ - rmdir "${ED}"/usr/share/doc/${PF}/man || die - - if use examples; then - # don't build examples - fix the qt files to build once installed - cat > examples/examples.pri <<-EOF - include( qwtconfig.pri ) - TEMPLATE = app - MOC_DIR = moc - INCLUDEPATH += "${EPREFIX}/usr/include/qwt6" - DEPENDPATH += "${EPREFIX}/usr/include/qwt6" - LIBS += -lqwt6 - EOF - sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die - cp *.pri examples/ || die - insinto /usr/share/${PN}6 - doins -r examples - fi -} diff --git a/x11-libs/qwt/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild index de7c90317610..2a371e6e9b17 100644 --- a/x11-libs/qwt/qwt-6.1.4.ebuild +++ b/x11-libs/qwt/qwt-6.1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,12 @@ EAPI=7 inherit qmake-utils DESCRIPTION="2D plotting library for Qt5" -HOMEPAGE="https://qwt.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" +HOMEPAGE="https://qwt.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2" LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -SLOT="6/1.4" +KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +SLOT="6/1.5" IUSE="designer doc examples mathml opengl svg" DEPEND=" @@ -34,13 +34,12 @@ DOCS=( CHANGES-6.1 README ) PATCHES=( "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch - "${FILESDIR}"/${P}-qt-5.15.patch # trunk ) src_prepare() { default - cat > qwtconfig.pri <<-EOF + cat > qwtconfig.pri <<-EOF || die QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" @@ -54,13 +53,13 @@ src_prepare() { use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri - cat > qwtbuild.pri <<-EOF + cat > qwtbuild.pri <<-EOF || die QWT_CONFIG += qt warn_on thread release no_keywords EOF echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri - cat >> qwtconfig.pri <<-EOF + cat >> qwtconfig.pri <<-EOF || die QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer" QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features" EOF @@ -114,7 +113,7 @@ src_install() { if use examples; then # don't build examples - fix the qt files to build once installed - cat > examples/examples.pri <<-EOF + cat > examples/examples.pri <<-EOF || die include( qwtconfig.pri ) TEMPLATE = app MOC_DIR = moc diff --git a/x11-libs/qwt/qwt-6.2.0-r1.ebuild b/x11-libs/qwt/qwt-6.2.0-r1.ebuild new file mode 100644 index 000000000000..b521e25db7b9 --- /dev/null +++ b/x11-libs/qwt/qwt-6.2.0-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DIR="doc" +DOCS_CONFIG_NAME="Doxyfile" +DOCS_DEPEND="media-gfx/graphviz" + +inherit qmake-utils docs + +DESCRIPTION="2D plotting library for Qt5" +HOMEPAGE="https://qwt.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2" + +LICENSE="qwt" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +SLOT="6/2.0" +IUSE="designer doc examples opengl svg" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + designer? ( dev-qt/designer:5 ) + opengl? ( + dev-qt/qtopengl:5 + virtual/opengl + ) + svg? ( dev-qt/qtsvg:5 ) +" +RDEPEND="${DEPEND}" + +# tests require package to be already installed +RESTRICT="test" + +DOCS=( CHANGES-6.2 README ) + +src_prepare() { + default + + cat > qwtconfig.pri <<-EOF || die + QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" + QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" + QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" + QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig + VER_MAJ = $(ver_cut 1) + VER_MIN = $(ver_cut 2) + VER_PAT = $(ver_cut 3) + VERSION = ${PV/_*} + QWT_VER_MAJ = $(ver_cut 1) + QWT_VER_MIN = $(ver_cut 2) + QWT_VER_PAT = $(ver_cut 3) + QWT_VERSION = ${PV/_*} + EOF + + use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri + use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri + use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri + + cat > qwtbuild.pri <<-EOF || die + QWT_CONFIG += qt warn_on thread release no_keywords + DEFINES += QWT_MOC_INCLUDE=1 + EOF + + echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri + + cat >> qwtconfig.pri <<-EOF || die + QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer" + QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features" + EOF + sed \ + -e 's/target doc/target/' \ + -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \ + -e "/^TARGET/s:qwt):qwt6-qt5):g" \ + -e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-qt5.so:g" \ + -i src/src.pro || die + + sed \ + -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \ + -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \ + -i qwt.prf designer/designer.pro examples/examples.pri || die +} + +src_configure() { + eqmake5 +} + +src_compile() { + default + # need doxyfilter.sh in PATH + PATH="${PATH}:${S}/doc/" docs_compile +} + +src_test() { + cd tests || die + eqmake5 tests.pro + emake +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs + + mkdir -p "${ED}"/usr/share/man/ || die + mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \ + rmdir "${ED}"/usr/share/doc/${PF}/man || die + + if use examples; then + # don't build examples - fix the qt files to build once installed + cat > examples/examples.pri <<-EOF || die + include( qwtconfig.pri ) + TEMPLATE = app + MOC_DIR = moc + INCLUDEPATH += "${EPREFIX}/usr/include/qwt6" + DEPENDPATH += "${EPREFIX}/usr/include/qwt6" + LIBS += -lqwt6 + EOF + sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die + cp *.pri examples/ || die + insinto /usr/share/${PN}6 + doins -r examples + fi +} diff --git a/x11-libs/qwt/qwt-6.2.0-r3.ebuild b/x11-libs/qwt/qwt-6.2.0-r3.ebuild new file mode 100644 index 000000000000..d8f403b3a93e --- /dev/null +++ b/x11-libs/qwt/qwt-6.2.0-r3.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DIR="doc" +DOCS_CONFIG_NAME="Doxyfile" +DOCS_DEPEND="media-gfx/graphviz" + +inherit docs multibuild qmake-utils + +DESCRIPTION="2D plotting library for Qt" +HOMEPAGE="https://qwt.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2" + +LICENSE="qwt" +KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +SLOT="6/2.0" +IUSE="designer doc examples opengl polar +qt5 qt6 svg" +REQUIRED_USE="|| ( qt5 qt6 )" + +DEPEND=" + qt5? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + designer? ( dev-qt/designer:5 ) + opengl? ( + dev-qt/qtopengl:5 + virtual/opengl + ) + svg? ( dev-qt/qtsvg:5 ) + ) + qt6? ( + dev-qt/qtbase:6[concurrent,gui,cups,widgets] + designer? ( dev-qt/qttools:6[designer] ) + opengl? ( + dev-qt/qtbase:6[opengl] + virtual/opengl + ) + svg? ( dev-qt/qtsvg:6 ) + ) +" +RDEPEND="${DEPEND}" + +# tests require package to be already installed +RESTRICT="test" + +DOCS=( CHANGES-6.2 README ) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_prepare() { + my_src_prepare() { + cat > qwtconfig.pri <<-EOF || die + QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" + QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" + QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" + QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig + VER_MAJ = $(ver_cut 1) + VER_MIN = $(ver_cut 2) + VER_PAT = $(ver_cut 3) + VERSION = ${PV/_*} + QWT_VER_MAJ = $(ver_cut 1) + QWT_VER_MIN = $(ver_cut 2) + QWT_VER_PAT = $(ver_cut 3) + QWT_VERSION = ${PV/_*} + EOF + + use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri + use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri + use polar && echo "QWT_CONFIG += QwtPolar" >> qwtconfig.pri + use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri + + cat > qwtbuild.pri <<-EOF || die + QWT_CONFIG += qt warn_on thread release no_keywords + DEFINES += QWT_MOC_INCLUDE=1 + EOF + + echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri + + cat >> qwtconfig.pri <<-EOF || die + QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/plugins/designer" + QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/mkspecs/features" + EOF + sed \ + -e 's/target doc/target/' \ + -e "/^TARGET/s:(qwt):(qwt6-${MULTIBUILD_VARIANT}):g" \ + -e "/^TARGET/s:qwt):qwt6-${MULTIBUILD_VARIANT}):g" \ + -e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-${MULTIBUILD_VARIANT}.so:g" \ + -i src/src.pro || die + + sed \ + -e "/qwtAddLibrary/s:(qwt):(qwt6-${MULTIBUILD_VARIANT}):g" \ + -e "/qwtAddLibrary/s:qwt):qwt6-${MULTIBUILD_VARIANT}):g" \ + -i qwt.prf designer/designer.pro examples/examples.pri || die + } + default + multibuild_copy_sources + multibuild_foreach_variant run_in_build_dir my_src_prepare +} + +src_configure() { + my_src_configure() { + case ${MULTIBUILD_VARIANT} in + qt5) eqmake5 ;; + qt6) eqmake6 ;; + esac + } + multibuild_foreach_variant run_in_build_dir my_src_configure +} + +src_compile() { + multibuild_foreach_variant run_in_build_dir emake + + # need doxyfilter.sh in PATH + PATH="${PATH}:${S}/doc/" docs_compile +} + +src_test() { + my_src_test() { + cd "${BUILD_DIR}"/tests || die + case ${MULTIBUILD_VARIANT} in + qt5) eqmake5 tests.pro ;; + qt6) eqmake6 tests.pro ;; + esac + emake + } + multibuild_foreach_variant my_src_test +} + +src_install() { + multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install + einstalldocs + + mkdir -p "${ED}"/usr/share/man/ || die + mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \ + rmdir "${ED}"/usr/share/doc/${PF}/man || die + + if use examples; then + # don't build examples - fix the qt files to build once installed + cat > examples/examples.pri <<-EOF || die + include( qwtconfig.pri ) + TEMPLATE = app + MOC_DIR = moc + INCLUDEPATH += "${EPREFIX}/usr/include/qwt6" + DEPENDPATH += "${EPREFIX}/usr/include/qwt6" + LIBS += -lqwt6 + EOF + sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die + cp *.pri examples/ || die + insinto /usr/share/${PN}6 + doins -r examples + fi +} diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest new file mode 100644 index 000000000000..8ada881f3c31 --- /dev/null +++ b/x11-libs/qwtplot3d/Manifest @@ -0,0 +1,2 @@ +DIST qwtplot3d-0.2.tar.gz 322366 BLAKE2B 7c589efe13409089dd6e1b579f19891fb0b75e44a4add87128822b3184c4d22ec0e7b04ce4c7c52dfaf8644a17a8506419726ae1ab50ab7cd7bc9ea9f84f9268 SHA512 92addf10865d090216a92d5ced5b0793b50657c6c5e5faf5c8f78120cc9c94a0b6f8e351d2e053b73951411b8f81a4179c0f17aea27d78cd748df8f81b31bcf9 +DIST qwtplot3d-0.2_p20210828.tar.gz 162362 BLAKE2B e2382f8b1b6f9f3ac5526a6ae3269f649badf11240e65283c62a88ae620ca81d6f1bad51f39651c1ca1fa8bf63f47978a41386cdec64a374a16eb7bf579d0875 SHA512 92ecfd6e91a31921993171f41f4606abbbd675fb869c32c3f1e0665cb13e1d88718bba39493edbc350c8e0a7b66cdfb14fd998d46b3f67b7223a41260347061a diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-0.2_p20210828-install-headers.patch b/x11-libs/qwtplot3d/files/qwtplot3d-0.2_p20210828-install-headers.patch new file mode 100644 index 000000000000..c32dccaa09d7 --- /dev/null +++ b/x11-libs/qwtplot3d/files/qwtplot3d-0.2_p20210828-install-headers.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 12657be..c14ca89 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,5 @@ + cmake_minimum_required(VERSION 3.16) ++include(GNUInstallDirs) + + project( QwtPlot3D + VERSION 0.3.0 +@@ -104,8 +105,12 @@ set( HEADERS + "include/qwt3d_io_gl2ps.h" + ) + configure_file( "include/qwt3d_version.h.in" "qwt3d_version.h" @ONLY ) ++list( APPEND HEADERS ++ "${CMAKE_BINARY_DIR}/qwt3d_version.h" ++ ) + + add_library( qwtplot3d ${SRCS} ${HEADERS} ) ++set_target_properties( qwtplot3d PROPERTIES PUBLIC_HEADER "${HEADERS}" ) + + target_link_libraries( qwtplot3d + Qt${QT_VERSION_MAJOR}::Core diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch new file mode 100644 index 000000000000..b0632a380a2a --- /dev/null +++ b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch @@ -0,0 +1,28 @@ +--- qwtplot3d/doc/Doxyfile.doxygen.orig 2007-11-26 22:30:57.000000000 +0000 ++++ qwtplot3d/doc/Doxyfile.doxygen 2007-11-26 22:30:03.000000000 +0000 +@@ -116,7 +116,7 @@ + HTML_ALIGN_MEMBERS = YES
+ GENERATE_HTMLHELP = NO
+ CHM_FILE = qwtplot3d.chm
+-HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
++#HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
+ GENERATE_CHI = NO
+ BINARY_TOC = YES
+ TOC_EXPAND = YES
+@@ -181,7 +181,7 @@ + MACRO_EXPANSION = NO
+ EXPAND_ONLY_PREDEF = NO
+ SEARCH_INCLUDES = YES
+-INCLUDE_PATH = V:/cvs/qwtplot3d/include/
++INCLUDE_PATH = ../include
+ INCLUDE_FILE_PATTERNS = *.h
+ PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \
+ QT_VERSION=0x040000
+@@ -212,7 +212,6 @@ + GRAPHICAL_HIERARCHY = YES
+ DIRECTORY_GRAPH = YES
+ DOT_IMAGE_FORMAT = png
+-DOT_PATH = V:/graphviz/Graphviz/bin/
+ DOTFILE_DIRS =
+ MAX_DOT_GRAPH_WIDTH = 974
+ MAX_DOT_GRAPH_HEIGHT = 10000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch new file mode 100644 index 000000000000..f142c3379274 --- /dev/null +++ b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch @@ -0,0 +1,125 @@ +diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp +--- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 ++++ qwtplot3d/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:21:56.000000000 +0000 +@@ -9,7 +9,7 @@ +
+ #include "axes.h"
+ #include "axesmainwindow.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+
+ using namespace std;
+ using namespace Qwt3D;
+diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro +--- qwtplot3d.orig/examples/common.pro 2007-11-26 22:16:54.000000000 +0000 ++++ qwtplot3d/examples/common.pro 2007-11-26 23:43:33.000000000 +0000 +@@ -1,13 +1,13 @@ + TEMPLATE = app
+-CONFIG += qt warn_on thread debug
++CONFIG += qt warn_on thread
+ UI_DIR = tmp
+ MOC_DIR = tmp
+ OBJECTS_DIR = tmp
+-INCLUDEPATH += ../../include
++INCLUDEPATH += /usr/include/qwtplot3d
+ DEPENDPATH = $$INCLUDEPATH
+ DESTDIR = ../bin
+
+-unix:LIBS += -lqwtplot3d -L../../lib
++unix:LIBS += -lqwtplot3d
+ linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
+
+ win32{
+@@ -25,7 +25,7 @@ + ISQT4 = $$find(MYVERSION, ^[2-9])
+
+ !isEmpty( ISQT4 ) {
+-RESOURCES = ../images.qrc
++#RESOURCES = ../images.qrc
+ QT += opengl
+ }
+
+diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp +--- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 ++++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:22:48.000000000 +0000 +@@ -6,7 +6,7 @@ +
+ #include "enrichmentmainwindow.h"
+ #include "enrichments.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+
+ using namespace Qwt3D;
+
+diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h +--- qwtplot3d.orig/examples/mesh2/src/colormapreader.h 2007-11-26 22:16:54.000000000 +0000 ++++ qwtplot3d/examples/mesh2/src/colormapreader.h 2007-11-26 22:23:19.000000000 +0000 +@@ -5,7 +5,7 @@ + #include <qframe.h>
+ #include <qpixmap.h>
+
+-#include "../../../include/qwt3d_types.h"
++#include <qwt3d_types.h>
+
+ #if QT_VERSION < 0x040000
+
+diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h +--- qwtplot3d.orig/examples/mesh2/src/functions.h 2007-11-26 22:16:54.000000000 +0000 ++++ qwtplot3d/examples/mesh2/src/functions.h 2007-11-26 22:23:47.000000000 +0000 +@@ -2,8 +2,8 @@ + #define __EXAMPLE_H__
+
+ #include <math.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_function.h>
+
+ using namespace Qwt3D;
+
+diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h +--- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h 2007-11-26 22:16:54.000000000 +0000 ++++ qwtplot3d/examples/mesh2/src/lightingdlg.h 2007-11-26 22:24:41.000000000 +0000 +@@ -3,10 +3,10 @@ +
+ #include <math.h>
+ #include <qapplication.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_surfaceplot.h"
+-#include "../../../include/qwt3d_enrichment.h"
+-#include "../../../include/qwt3d_color.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_surfaceplot.h>
++#include <qwt3d_enrichment.h>
++#include <qwt3d_color.h>
+
+ #if QT_VERSION < 0x040000
+ #include "lightingdlgbase.h"
+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp +--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 ++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:25:33.000000000 +0000 +@@ -33,9 +33,9 @@ + #include "colormapreader.h"
+ #include "lightingdlg.h"
+ #include "femreader.h"
+-#include "../../../include/qwt3d_io.h"
+-#include "../../../include/qwt3d_io_gl2ps.h"
+-#include "../../../include/qwt3d_io_reader.h"
++#include <qwt3d_io.h>
++#include <qwt3d_io_gl2ps.h>
++#include <qwt3d_io_reader.h>
+
+ using namespace Qwt3D;
+ using namespace std;
+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h +--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:16:54.000000000 +0000 ++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:26:09.000000000 +0000 +@@ -1,7 +1,7 @@ + #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+ #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+
+-#include "../../../include/qwt3d_surfaceplot.h"
++#include <qwt3d_surfaceplot.h>
+
+
+ #if QT_VERSION < 0x040000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch new file mode 100644 index 000000000000..a76fe831ab91 --- /dev/null +++ b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch @@ -0,0 +1,12 @@ +diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h +--- qwtplot3d-orig/include/qwt3d_function.h 2009-07-25 18:18:58.000000000 -0400 ++++ qwtplot3d/include/qwt3d_function.h 2009-07-25 18:19:19.000000000 -0400 +@@ -2,6 +2,7 @@ + #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code
+
+ #include "qwt3d_gridmapping.h"
++#include <cstdio>
+
+ namespace Qwt3D
+ {
+Only in qwtplot3d/tmp: qwt3d_function.o diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch new file mode 100644 index 000000000000..ae10f48f0707 --- /dev/null +++ b/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch @@ -0,0 +1,34 @@ +diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h +--- qwtplot3d/include/qwt3d_io_gl2ps.h 2005-07-10 16:54:52.000000000 +0300 ++++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h 2012-01-21 22:15:20.000000000 +0200 +@@ -2,12 +2,7 @@ + #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+
+ #include <time.h>
+-
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
+
+ #include "qwt3d_types.h"
+ #include "qwt3d_io.h"
+diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h +--- qwtplot3d/include/qwt3d_openglhelper.h 2005-07-19 17:40:28.000000000 +0300 ++++ qwtplot3d.patched/include/qwt3d_openglhelper.h 2012-01-21 22:29:56.000000000 +0200 +@@ -2,11 +2,8 @@ + #define __openglhelper_2003_06_06_15_49__
+
+ #include "qglobal.h"
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
++#include <GL/glu.h>
+
+ namespace Qwt3D
+ {
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch new file mode 100644 index 000000000000..ee6534a5cfdb --- /dev/null +++ b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch @@ -0,0 +1,31 @@ +--- a/qwtplot3d.pro 2009-04-07 19:45:29.985645378 +0100 ++++ b/qwtplot3d.pro 2009-04-07 19:46:50.095747068 +0100 +@@ -80,13 +80,11 @@ + include/qwt3d_graphplot.h \
+ include/qwt3d_multiplot.h
+
+-# gl2ps support
+-HEADERS+=3rdparty/gl2ps/gl2ps.h \
+- include/qwt3d_io_gl2ps.h
++# gl2ps support taken from system libs
++HEADERS+=include/qwt3d_io_gl2ps.h
+
+-SOURCES+=src/qwt3d_io_gl2ps.cpp \
+- 3rdparty/gl2ps/gl2ps.c
+-
++SOURCES+=src/qwt3d_io_gl2ps.cpp
++unix:LIBS += -lgl2ps
+ # zlib support for gl2ps
+ zlib {
+ DEFINES += GL2PS_HAVE_ZLIB
+--- a/src/qwt3d_io_gl2ps.cpp 2009-04-07 19:44:38.536418391 +0100 ++++ b/src/qwt3d_io_gl2ps.cpp 2009-04-07 19:45:03.685133854 +0100 +@@ -4,7 +4,7 @@ +
+ #include <time.h>
+ #include "qwt3d_openglhelper.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include <gl2ps.h>
+ #include "qwt3d_io_gl2ps.h"
+ #include "qwt3d_plot.h"
+
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml new file mode 100644 index 000000000000..704d6f46f160 --- /dev/null +++ b/x11-libs/qwtplot3d/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <longdescription lang="en"> + QwtPlot3D is a graphics extension to the Qt GUI application framework. + It provides a 3D plotting widget for scientific data and mathematical expressions. + It compares to the existing Qwt Project. + </longdescription> + <upstream> + <remote-id type="sourceforge">qwtplot3d</remote-id> + <remote-id type="github">SciDAVis/qwtplot3d</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.ebuild new file mode 100644 index 000000000000..94347022ede3 --- /dev/null +++ b/x11-libs/qwtplot3d/qwtplot3d-0.2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DOCS_BUILDER="doxygen" +DOCS_DIR="doc" +DOCS_CONFIG_NAME="Doxyfile.doxygen" + +inherit docs qmake-utils + +DESCRIPTION="3D plotting library for Qt5" +HOMEPAGE="http://qwtplot3d.sourceforge.net/ https://github.com/SciDAVis/qwtplot3d/" +SRC_URI="https://github.com/SciDAVis/qwtplot3d/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ZLIB" +KEYWORDS="~amd64 ~x86" +SLOT="0" + +IUSE="doc examples" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + x11-libs/gl2ps +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-examples.patch" + "${FILESDIR}/${PN}-doxygen.patch" + "${FILESDIR}/${PN}-gcc44.patch" + "${FILESDIR}/${PN}-qt-4.8.0.patch" + "${FILESDIR}/${PN}-sys-gl2ps.patch" +) + +src_prepare() { + default + cat >> ${PN}.pro <<-EOF || die + target.path = "${EPREFIX}/usr/$(get_libdir)" + headers.path = "${EPREFIX}/usr/include/${PN}" + headers.files = \$\$HEADERS + INSTALLS = target headers + EOF +} + +src_configure() { + eqmake5 +} + +src_compile() { + default + docs_compile +} + +src_install () { + emake INSTALL_ROOT="${D}" install + einstalldocs + if use examples; then + insinto /usr/share/${PN} + doins -r examples + fi +} diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2_p20210828.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2_p20210828.ebuild new file mode 100644 index 000000000000..09a4bfa5cc32 --- /dev/null +++ b/x11-libs/qwtplot3d/qwtplot3d-0.2_p20210828.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DIR="doc" +DOCS_CONFIG_NAME="Doxyfile.doxygen" + +inherit docs cmake + +COMMIT="b2655743d30ed3185f3c0e2626b33a1d29655216" + +DESCRIPTION="3D plotting library for Qt5" +HOMEPAGE="http://qwtplot3d.sourceforge.net/ https://github.com/SciDAVis/qwtplot3d/" +SRC_URI="https://github.com/SciDAVis/qwtplot3d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="ZLIB" +KEYWORDS="~amd64 ~x86" +SLOT="0" + +IUSE="doc" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + x11-libs/gl2ps +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-doxygen.patch" + "${FILESDIR}/${PN}-gcc44.patch" + "${FILESDIR}/${P}-install-headers.patch" +) + +src_compile() { + cmake_src_compile + docs_compile +} diff --git a/x11-libs/qwtpolar/metadata.xml b/x11-libs/qwtpolar/metadata.xml index 5b5806a77b80..388d8d5fbf96 100644 --- a/x11-libs/qwtpolar/metadata.xml +++ b/x11-libs/qwtpolar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild index 39bb2faf54f9..657c6011c77c 100644 --- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild +++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit qmake-utils DESCRIPTION="Library for displaying values on a polar coordinate system" HOMEPAGE="https://qwtpolar.sourceforge.io/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" LICENSE="qwt" SLOT="0" @@ -20,7 +20,7 @@ RDEPEND=" dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 - x11-libs/qwt:6=[designer,qt5(+),svg] + <x11-libs/qwt-6.2:6=[designer,qt5(+),svg,-polar(-)] " DEPEND="${RDEPEND} dev-qt/qtconcurrent:5 diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest deleted file mode 100644 index ffaa923b6f41..000000000000 --- a/x11-libs/rep-gtk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rep-gtk_0.90.8.3.tar.xz 120616 BLAKE2B a0ada2bb13a8104d0dd532f35b64e6b049711284b60b4c4960b730909061ecce058a0ee79517cc508db95647d93f9af95c5ca73cf76e26b59467c8441064ac07 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac diff --git a/x11-libs/rep-gtk/metadata.xml b/x11-libs/rep-gtk/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/x11-libs/rep-gtk/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild deleted file mode 100644 index 35cfab023dca..000000000000 --- a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils - -MY_P="${PN}_${PV}" -DESCRIPTION="GTK+/libglade/GNOME bindings for the librep Lisp environment" -HOMEPAGE="http://sawfish.wikia.com/wiki/Main_Page" -SRC_URI="http://download.tuxfamily.org/librep/${PN}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="gtk-2.0" -KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86" -IUSE="examples" - -RDEPEND=">=dev-libs/librep-0.90.5 - >=dev-libs/glib-2.6:2 - >=x11-libs/gtk+-2.24.0:2 - >=x11-libs/gdk-pixbuf-2.23:2" -DEPEND="${RDEPEND} - virtual/pkgconfig - app-arch/xz-utils" - -S="${WORKDIR}/${MY_P}" - -DOCS=( AUTHORS ChangeLog README README.gtk-defs README.guile-gtk TODO ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --libdir=/usr/$(get_libdir) \ - --disable-static -} - -src_install() { - default - use examples && dodoc -r examples - find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" -} diff --git a/x11-libs/scw/Manifest b/x11-libs/scw/Manifest deleted file mode 100644 index 1d170c387b5e..000000000000 --- a/x11-libs/scw/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST scw-0.4.7.tar.gz 410761 BLAKE2B b241f6b54e11631611f26fcff807b406b7ecfbc29c140e805a5d1902c93f98247386e33294d1a03b953c4b58317f65660ab24c74185f333f0583e48b5b4453fb SHA512 bf042396cfeb7a4266a5e7156c618a533cbccd21ae499154c704e233b719a7031f051f421b3ed9371a60f2a1ba0ca3a86b5a665de1ef5443bbd12063ce013f8f diff --git a/x11-libs/scw/metadata.xml b/x11-libs/scw/metadata.xml deleted file mode 100644 index e58da27d9105..000000000000 --- a/x11-libs/scw/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - Scw is a widget set specifically designed for chat programs. It extends - the Gtk+ widget set. - </longdescription> -</pkgmetadata> diff --git a/x11-libs/scw/scw-0.4.7-r1.ebuild b/x11-libs/scw/scw-0.4.7-r1.ebuild deleted file mode 100644 index 479049556dfe..000000000000 --- a/x11-libs/scw/scw-0.4.7-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A GTK+ widget set specifically designed for chat programs" -HOMEPAGE="http://scwwidgets.googlepages.com" -SRC_URI="http://scwwidgets.googlepages.com/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="doc" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gtk+:2 -" -DEPEND=" - ${RDEPEND} - doc? ( dev-util/gtk-doc ) - dev-util/glib-utils - virtual/pkgconfig -" - -src_configure() { - econf $(use_enable doc gtk-doc) -} diff --git a/x11-libs/snorenotify/Manifest b/x11-libs/snorenotify/Manifest deleted file mode 100644 index 59fc92a8a62a..000000000000 --- a/x11-libs/snorenotify/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST snorenotify-0.7.0.tar.xz 200032 BLAKE2B 4eb4f7a57bfde7a780b868a8c57c5d1e262809fd2b591597d69c3e98b712b926e287009b453a5e00ba5f805728d986441824eb226bd73c94375d11129be03d4d SHA512 2030a7b6bc69d3803e83e1a6d26efa5bfdd3facf53dcaade6059b85cea3db879ea49b9e02dbce3b043b4ddded21509a6d5859a4002cfd57a870a0e39cd11011a diff --git a/x11-libs/snorenotify/files/snorenotify-0.7.0-desktop.patch b/x11-libs/snorenotify/files/snorenotify-0.7.0-desktop.patch deleted file mode 100644 index 914288d82348..000000000000 --- a/x11-libs/snorenotify/files/snorenotify-0.7.0-desktop.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 897a64b18f8727c951dac8ca91ebf43f2c18f908 Mon Sep 17 00:00:00 2001 -From: Javier Llorente <javier@opensuse.org> -Date: Sat, 13 Feb 2016 12:20:03 +0100 -Subject: [PATCH] Fix desktop categories, remove version (see - desktop-entry-spec), add a newline at eof - ---- - src/daemon/snorenotify.desktop.in | 3 +-- - src/settings/snoresettings.desktop.in | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/daemon/snorenotify.desktop.in b/src/daemon/snorenotify.desktop.in -index 83f0e3f..9fc1876 100644 ---- a/src/daemon/snorenotify.desktop.in -+++ b/src/daemon/snorenotify.desktop.in -@@ -1,8 +1,7 @@ - [Desktop Entry] - Type=Application --Version=@SNORE_VERSION_MAJOR@.@SNORE_VERSION_MINOR@.@SNORE_VERSION_PATCH@ - Name=SnoreNotify - Comment=A daemon redirecting desktop notifications to one or multiple additional backends. - Icon=snore - Exec=snorenotify --Categories=Qt;System; -\ No newline at end of file -+Categories=Qt;Settings;Qt;Utility;DesktopSettings; -diff --git a/src/settings/snoresettings.desktop.in b/src/settings/snoresettings.desktop.in -index 823bb2d..497d119 100644 ---- a/src/settings/snoresettings.desktop.in -+++ b/src/settings/snoresettings.desktop.in -@@ -1,8 +1,7 @@ - [Desktop Entry] - Type=Application --Version=@SNORE_VERSION_MAJOR@.@SNORE_VERSION_MINOR@.@SNORE_VERSION_PATCH@ - Name=SnoreSettings - Comment=Settings client for applications using libsnore. - Icon=snore - Exec=snoresettings --Categories=Qt;System; -\ No newline at end of file -+Categories=Qt;Settings;Qt;Utility;DesktopSettings; diff --git a/x11-libs/snorenotify/files/snorenotify-0.7.0-include.patch b/x11-libs/snorenotify/files/snorenotify-0.7.0-include.patch deleted file mode 100644 index ee99e26ed47c..000000000000 --- a/x11-libs/snorenotify/files/snorenotify-0.7.0-include.patch +++ /dev/null @@ -1,20 +0,0 @@ -Bug: https://bugs.gentoo.org/587898 - -commit 96fd4a7914e8daf924829606dc25f9e4767401dd -Author: Hannah von Reth <vonreth@kde.org> -Date: Mon Nov 21 08:57:00 2016 +0100 - - [WIP] Support to build with static Qt and static plugins - -diff --git a/src/libsnore/notification/icon.cpp b/src/libsnore/notification/icon.cpp -index b95ceb4..5c7c139 100644 ---- a/src/libsnore/notification/icon.cpp -+++ b/src/libsnore/notification/icon.cpp -@@ -25,6 +25,7 @@ - #include <QNetworkReply> - #include <QNetworkRequest> - #include <QUrl> -+#include <QTime> - - using namespace Snore; - diff --git a/x11-libs/snorenotify/metadata.xml b/x11-libs/snorenotify/metadata.xml deleted file mode 100644 index 2fdbf33d963d..000000000000 --- a/x11-libs/snorenotify/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> -</pkgmetadata> diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild deleted file mode 100644 index 5fa613294bc7..000000000000 --- a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VIRTUALX_REQUIRED="test" -inherit ecm - -DESCRIPTION="Multi platform Qt notification framework" -HOMEPAGE="https://techbase.kde.org/Projects/Snorenotify" -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="sound test" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -RDEPEND=" - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwebsockets:5 - dev-qt/qtwidgets:5 - sound? ( dev-qt/qtmultimedia:5 ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -PATCHES=( - "${FILESDIR}/${P}-desktop.patch" - "${FILESDIR}/${P}-include.patch" -) - -src_prepare() { - ecm_src_prepare - sed -e "/Categories/s/;Qt//" \ - -i src/{settings/snoresettings,daemon/snorenotify}.desktop.in || die -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package sound Qt5Multimedia) - $(cmake_use_find_package test Qt5Test) - ) - - ecm_src_configure -} diff --git a/x11-libs/spread-sheet-widget/Manifest b/x11-libs/spread-sheet-widget/Manifest index 84eb55942154..5f57cc65025f 100644 --- a/x11-libs/spread-sheet-widget/Manifest +++ b/x11-libs/spread-sheet-widget/Manifest @@ -1 +1,2 @@ -DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeacccce169a6f53d9f7f418f5e8469744fb19b SHA512 1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc +DIST spread-sheet-widget-0.7.tar.gz 517216 BLAKE2B 920fa2bc648d60f041e1b5d9d2faa7edb5b93310759de498e75bae42bcbba8493c7985e013a5099e405f2a748904e702ef8f431fa51a5d19c4e5a7a1efeceed0 SHA512 c27647a55e3ae878037a764e879244ac4396406f331ea6bd3795544165dc1a894c21be1bbd7314c45a4e1734f97c70d711520edb4f26438ade00b2ef39732c65 +DIST spread-sheet-widget-0.8.tar.gz 517294 BLAKE2B 05fe434a4b6f40b365defa03fe5f058c353f955837bbe7d1b5c5229dde7a644bc37319d8e8b887f01c2a27b0ee30c9552837ec93ebe80bbff07750065f61e370 SHA512 022941d9064bad83835345a999358b57ec2897650079326427be78600269762dc492d2d7674c6c5c2c3b46fa619786e5f02c15bd731a163cf2ff98ea22d25682 diff --git a/x11-libs/spread-sheet-widget/metadata.xml b/x11-libs/spread-sheet-widget/metadata.xml index 7bd5a01cbd2a..29e46088b236 100644 --- a/x11-libs/spread-sheet-widget/metadata.xml +++ b/x11-libs/spread-sheet-widget/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>alexxy@gentoo.org</email> diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild deleted file mode 100644 index 73c8b244c459..000000000000 --- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="GNU Spread Sheet Widget" -HOMEPAGE="https://www.gnu.org/software/ssw/" -SRC_URI="mirror://gnu-alpha/ssw/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="x11-libs/gtk+:3" -RDEPEND="${DEPEND}" -BDEPEND="" diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild new file mode 100644 index 000000000000..1baf7cd07c93 --- /dev/null +++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="GNU Spread Sheet Widget" +HOMEPAGE="https://www.gnu.org/software/ssw/" +SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND="dev-libs/glib + x11-libs/gtk+:3" +RDEPEND="${DEPEND}" + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild new file mode 100644 index 000000000000..3a9a54ad0f27 --- /dev/null +++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.8.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="GNU Spread Sheet Widget" +HOMEPAGE="https://www.gnu.org/software/ssw/" +SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-libs/glib + x11-libs/gtk+:3" +RDEPEND="${DEPEND}" +BDEPEND="dev-util/glib-utils" + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-libs/startup-notification/metadata.xml b/x11-libs/startup-notification/metadata.xml index fb76b944f2da..81e4eff693e3 100644 --- a/x11-libs/startup-notification/metadata.xml +++ b/x11-libs/startup-notification/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> </maintainer> +<upstream> +<remote-id type="freedesktop-gitlab">xdg/startup-notification</remote-id> +</upstream> </pkgmetadata> diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r2.ebuild index bb0bf32b48f2..beabbf2828a8 100644 --- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild +++ b/x11-libs/startup-notification/startup-notification-0.12-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils xorg-2 +EAPI=8 + +inherit libtool DESCRIPTION="Application startup notification and feedback library" HOMEPAGE="https://www.freedesktop.org/wiki/Software/startup-notification" @@ -10,8 +11,8 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz" LICENSE="LGPL-2 MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +RESTRICT="test" # no tests RDEPEND=">=x11-libs/libX11-1.4.3 >x11-libs/libxcb-1.6 @@ -21,9 +22,17 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog NEWS doc/${PN}.txt ) +PATCHES=( + "${FILESDIR}"/${P}-sys-select_h.patch + "${FILESDIR}"/${P}-time_t-crash-with-32bit.patch +) + src_prepare() { - epatch \ - "${FILESDIR}"/${P}-sys-select_h.patch \ - "${FILESDIR}"/${P}-time_t-crash-with-32bit.patch + default elibtoolize } + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest index 44416661c4ea..d19e2a411882 100644 --- a/x11-libs/tslib/Manifest +++ b/x11-libs/tslib/Manifest @@ -1 +1 @@ -DIST tslib-1.21.tar.xz 349216 BLAKE2B e19623c9390688b0aa85e6547a57542d2e10498c8ebbb30f840157d240dc9975c3e6735814a5e6f02fb71c273a52f860695cf4772fef28522e74c5781cdcb02a SHA512 66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4 +DIST tslib-1.22.tar.xz 351192 BLAKE2B 8cec9fe17b9aee7dac44bf54a78482b81a67072a7c1497b4c5a2a6703bb0e897a2481bc06df0fd91ca97fef3b4ebf17c475c3b717ce7f32fb677db5918630759 SHA512 8f51fc5e37bb1babb89e8d6d5302c7d7b712820525bed0253f980028a78b343e4100065bbe0ecafb828a7edf3a9b77f96929ab79205d516ebbf6c25b32af0008 diff --git a/x11-libs/tslib/metadata.xml b/x11-libs/tslib/metadata.xml index 640fc4e4a42a..23ae18f02363 100644 --- a/x11-libs/tslib/metadata.xml +++ b/x11-libs/tslib/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>embedded@gentoo.org</email> diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.22.ebuild index bd2fc9d88d55..7238f429a606 100644 --- a/x11-libs/tslib/tslib-1.21.ebuild +++ b/x11-libs/tslib/tslib-1.22.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake-multilib @@ -11,21 +11,19 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz" LICENSE="LGPL-2 uinput? ( GPL-2+ )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="evdev sdl uinput" -BDEPEND=" - evdev? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) -" DEPEND=" evdev? ( dev-libs/libevdev[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND}" +BDEPEND="evdev? ( virtual/pkgconfig )" DOCS=( AUTHORS NEWS README{,.md} ) -PATCHES=( "${FILESDIR}/${P}-optional-utils.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.21-optional-utils.patch" ) src_configure() { my_configure() { @@ -54,7 +52,7 @@ src_configure() { ) multilib_is_native_abi && mycmakeargs+=( -Dwith-sdl=$(usex sdl) ) - cmake-utils_src_configure + cmake_src_configure } multilib_parallel_foreach_abi my_configure } diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index 8843f9fc24ad..2224282550b4 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -1,5 +1,4 @@ -DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 -DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c -DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb -DIST vte-0.58.3-command-notify.patch.xz 4964 BLAKE2B f8414d3bf124bd3de4c08e22a051feabdb11fbded7562a0bf9858fb8b8cf6327a3fdf7e18592eacd9f3608af5b720fe9a0cb598092a12c816d37d36899d88f6b SHA512 0de06ec0019127ec2729950228f8cae3e61a306207e177b8427789d4f6477f102d78232bd7f1a6e02cc218f507474427ad8366bc3c16c8a305b432dba96ba685 -DIST vte-0.58.3.tar.xz 514844 BLAKE2B 1f48e95ec81397937c8a5a3d34ea9a7d1835d6cacec6e1b90b78568505d509b375f55678462428dd01da00e7290e4543bbab2dbb0aea46a322788fbaf022427b SHA512 b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a +DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7 +DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1 +DIST vte-0.74.0-command-notify.patch.xz 9248 BLAKE2B 30917bc72d2b3fd917178f49c26f023d40d37e9a44a896c44e55345396d0bfdb1b109f8b2fdead96c31f92f5febcc397f2899511647c3adf3c2aace2be8ffa94 SHA512 fc0bb3cfa70fc5e1384c44fcce6d6a76957d0dd72f61a882d9df22d55dd06fcee4e7bd2a136c443158fe403992befe5d7ce5970b8b657b690b3875ff5171ea83 +DIST vte-0.74.2.tar.bz2 505422 BLAKE2B 243eabfb26c0ec65d0b202437ae79265440256941dae4263e9d6dc9afea24d0fbbd7d421864a90b54d2ba953cd60a2b5a41aef9fb9e53396176bcc71400eef82 SHA512 203dd0f8606b8979cde01781412e0dbab3cb8857828e55f6d69ecfc2e4d58d53430aa5c61a2203e122c772ba1f6c5b739d3c03456b133580e76d511d67f3f534 diff --git a/x11-libs/vte/files/vte-0.28.2-interix.patch b/x11-libs/vte/files/vte-0.28.2-interix.patch deleted file mode 100644 index c54d46ebc3dc..000000000000 --- a/x11-libs/vte/files/vte-0.28.2-interix.patch +++ /dev/null @@ -1,51 +0,0 @@ -reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290 - -diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in ---- vte-0.26.2.orig/configure.in 2011-08-17 08:30:55 +0200 -+++ vte-0.26.2/configure.in 2011-08-17 08:35:42 +0200 -@@ -362,7 +362,11 @@ - AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.]) - fi - AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"])) --AC_CHECK_FUNCS([ceil floor]) -+dnl if the first check didn't find floor, it caches the "no" value, -+dnl and doesn't recheck. this makes the below check fail always on -+dnl systems with floor in -lm. thus we unset the chached result. -+unset ac_cv_func_floor -+AC_CHECK_FUNCS([ceil floor round]) - - # Look for tgetent - ---- vte-0.26.2.orig/configure 2012-04-30 20:02:55.000000000 +0200 -+++ vte-0.26.2/configure 2012-04-30 20:03:16.000000000 +0200 -@@ -13277,7 +13277,7 @@ - - fi - --for ac_func in ceil floor -+for ac_func in ceil floor round - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c ---- vte-0.26.2.orig/src/vte.c 2011-08-17 08:30:58 +0200 -+++ vte-0.26.2/src/vte.c 2011-08-17 08:38:09 +0200 -@@ -63,6 +63,18 @@ - #include <locale.h> - #endif - -+#ifndef HAVE_ROUND -+# if defined(HAVE_CEIL) && defined(HAVE_FLOOR) -+static inline double round(double x) { -+ if(x - floor(x) < 0.5) { -+ return floor(x); -+ } else { -+ return ceil(x); -+ } -+} -+# endif -+#endif -+ - #if GTK_CHECK_VERSION (2, 90, 7) - #define GDK_KEY(symbol) GDK_KEY_##symbol - #else diff --git a/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch b/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch deleted file mode 100644 index fd454079390f..000000000000 --- a/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch +++ /dev/null @@ -1,40 +0,0 @@ -From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe@gnome.org> -Date: Sat, 19 May 2012 17:36:09 +0000 -Subject: emulation: Limit integer arguments to 65535 - -To guard against malicious sequences containing excessively big numbers, -limit all parsed numbers to 16 bit range. Doing this here in the parsing -routine is a catch-all guard; this doesn't preclude enforcing -more stringent limits in the handlers themselves. - -https://bugzilla.gnome.org/show_bug.cgi?id=676090 ---- -diff --git a/src/table.c b/src/table.c -index 140e8c8..85cf631 100644 ---- a/src/table.c -+++ b/src/table.c -@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array, - if (G_UNLIKELY (*array == NULL)) { - *array = g_value_array_new(1); - } -- g_value_set_long(&value, total); -+ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT)); - g_value_array_append(*array, &value); - } while (i++ < arginfo->length); - g_value_unset(&value); -diff --git a/src/vteseq.c b/src/vteseq.c -index 457c06a..46def5b 100644 ---- a/src/vteseq.c -+++ b/src/vteseq.c -@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal, - GValueArray *params, - VteTerminalSequenceHandler handler) - { -- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG); -+ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT); - } - - static void --- -cgit v0.9.0.2 diff --git a/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch b/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch deleted file mode 100644 index 86e547103ad7..000000000000 --- a/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch +++ /dev/null @@ -1,86 +0,0 @@ -https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd - -From 88e8e89560a62d0981ce2b18974a230d0a07dbdd Mon Sep 17 00:00:00 2001 -From: Micah Cowan <micah@cowan.name> -Date: Tue, 22 Oct 2013 23:30:43 +0200 -Subject: widget: Fix invalidation region - -When the sequence handler moves the cursor into the restricted scrolling region, -the bbox needs to be reset, too. -Fixes glitches with interspersing writes to the bottom line with scrolls of the -upper region, and also fixes missing screen redraws when using mosh. - -https://bugzilla.gnome.org/show_bug.cgi?id=542087 -https://bugzilla.gnome.org/show_bug.cgi?id=686097 - -diff --git a/src/vte.c b/src/vte.c -index 9f6d7d8..a4d9d25 100644 ---- a/src/vte.c -+++ b/src/vte.c -@@ -4077,6 +4077,7 @@ vte_terminal_process_incoming(VteTerminal *terminal) - long wcount, start, delta; - gboolean leftovers, modified, bottom, again; - gboolean invalidated_text; -+ gboolean in_scroll_region; - GArray *unichars; - struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL; - -@@ -4096,6 +4097,10 @@ vte_terminal_process_incoming(VteTerminal *terminal) - cursor = screen->cursor_current; - cursor_visible = terminal->pvt->cursor_visible; - -+ in_scroll_region = screen->scrolling_restricted -+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) -+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); -+ - /* We should only be called when there's data to process. */ - g_assert(terminal->pvt->incoming || - (terminal->pvt->pending->len > 0)); -@@ -4194,6 +4199,8 @@ skip_chunk: - * points to the first character which isn't part of this - * sequence. */ - if ((match != NULL) && (match[0] != '\0')) { -+ gboolean new_in_scroll_region; -+ - /* Call the right sequence handler for the requested - * behavior. */ - _vte_terminal_handle_sequence(terminal, -@@ -4204,12 +4211,21 @@ skip_chunk: - start = (next - wbuf); - modified = TRUE; - -- /* if we have moved during the sequence handler, restart the bbox */ -+ new_in_scroll_region = screen->scrolling_restricted -+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) -+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); -+ -+ delta = screen->scroll_delta; /* delta may have changed from sequence. */ -+ -+ /* if we have moved greatly during the sequence handler, or moved -+ * into a scroll_region from outside it, restart the bbox. -+ */ - if (invalidated_text && -- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || -- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || -- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || -- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) { -+ ((new_in_scroll_region && !in_scroll_region) || -+ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || -+ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || -+ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || -+ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) { - /* Clip off any part of the box which isn't already on-screen. */ - bbox_topleft.x = MAX(bbox_topleft.x, 0); - bbox_topleft.y = MAX(bbox_topleft.y, delta); -@@ -4229,6 +4245,8 @@ skip_chunk: - bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT; - bbox_topleft.x = bbox_topleft.y = G_MAXINT; - } -+ -+ in_scroll_region = new_in_scroll_region; - } else - /* Second, we have a NULL match, and next points to the very - * next character in the buffer. Insert the character which --- -cgit v0.10.2 - diff --git a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch deleted file mode 100644 index bd364be5846c..000000000000 --- a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Tue, 15 Nov 2011 03:06:40 -0500 -Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2 - compatibility - -Also, since VTE_META_MASK is now a mask with multiple bits set, code that -compares gdk key modifiers to VTE_META_MASK by numerical equality is no -longer guaranteed to work. Therefore, for such comparisons a new function, -vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits -matching matching VTE_META_MASK are set, then all are set. - -https://bugzilla.gnome.org/show_bug.cgi?id=663779 ---- - src/keymap.c | 15 +++++++++++++-- - src/keymap.h | 2 +- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/src/keymap.c b/src/keymap.c -index 9a21669..95b4c5b 100644 ---- a/src/keymap.c -+++ b/src/keymap.c -@@ -990,6 +990,17 @@ static const struct _vte_keymap_group { - {GDK_KEY (F35), _vte_keymap_GDK_F35}, - }; - -+/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK, -+ * despite being a compound mask, is treated as indivisible. */ -+GdkModifierType -+_vte_keymap_fixup_modifiers(GdkModifierType modifiers, -+ GdkModifierType mask) -+{ -+ if (modifiers & VTE_META_MASK) -+ modifiers |= VTE_META_MASK; -+ return modifiers & mask; -+} -+ - /* Map the specified keyval/modifier setup, dependent on the mode, to either - * a literal string or a capability name. */ - void -@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval, - } else { - fkey_mode = fkey_default; - } -- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); -+ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); - - /* Search for the conditions. */ - for (i = 0; entries[i].normal_length || entries[i].special[0]; i++) -@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval, - return; - } - -- switch (modifiers & significant_modifiers) { -+ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) { - case 0: - modifier = 0; - break; -diff --git a/src/keymap.h b/src/keymap.h -index 243e22e..21d9b8e 100644 ---- a/src/keymap.h -+++ b/src/keymap.h -@@ -27,7 +27,7 @@ - - G_BEGIN_DECLS - --#define VTE_META_MASK GDK_META_MASK -+#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK) - #define VTE_NUMLOCK_MASK GDK_MOD2_MASK - - /* Map the specified keyval/modifier setup, dependent on the mode, to either --- -1.7.8.rc3 - diff --git a/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch new file mode 100644 index 000000000000..79171d29dead --- /dev/null +++ b/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch @@ -0,0 +1,48 @@ +https://gitlab.gnome.org/GNOME/vte/-/issues/350 + +From d459d32126119c8d78f8239b8b857a255e6005d7 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Sat, 1 May 2021 08:31:45 -0400 +Subject: [PATCH] meson: Find python explicitly to honor downstream python + choice + +--- + meson.build | 1 + + src/meson.build | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/meson.build b/meson.build +index 4f5a7c57..6404802f 100644 +--- a/meson.build ++++ b/meson.build +@@ -461,6 +461,7 @@ pango_dep = dependency('pango', version: '>=' + pango_req_version) + pcre2_dep = dependency('libpcre2-8', version: '>=' + pcre2_req_version) + pthreads_dep = dependency('threads') + zlib_dep = dependency('zlib') ++python = import('python').find_installation('python3') + + if get_option('fribidi') + fribidi_dep = dependency('fribidi', version: '>=' + fribidi_req_version) +diff --git a/src/meson.build b/src/meson.build +index a1440da5..4ac6a7f2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -60,6 +60,7 @@ modes_sources = files( + modes_sources += custom_target( + 'modes', + command: [ ++ python, + files('modes.py'), + '--destdir', '@OUTDIR@', + ], +@@ -92,6 +93,7 @@ parser_sources = files( + parser_sources += custom_target( + 'parser-seq', + command: [ ++ python, + files('parser-seq.py'), + '--destdir', '@OUTDIR@', + ], +-- +2.26.3 + diff --git a/x11-libs/vte/files/vte-0.66.2-musl-W_EXITCODE.patch b/x11-libs/vte/files/vte-0.66.2-musl-W_EXITCODE.patch new file mode 100644 index 000000000000..b629613feaf6 --- /dev/null +++ b/x11-libs/vte/files/vte-0.66.2-musl-W_EXITCODE.patch @@ -0,0 +1,29 @@ +https://gitlab.gnome.org/GNOME/vte/-/issues/72 +https://bugs.gentoo.org/835489 +https://bugs.gentoo/org/554416 + +From 1c1de9e9119cf1e0ef45a594ca9bbf306d2209cb Mon Sep 17 00:00:00 2001 +From: +Date: Fri, 12 Mar 2021 08:41:13 -0600 +Subject: [PATCH] Expanded non-standard W_EXITCODE macro for Musl compatibility + +--- a/src/widget.cc ++++ b/src/widget.cc +@@ -20,8 +20,6 @@ + + #include "widget.hh" + +-#include <sys/wait.h> // for W_EXITCODE +- + #include <exception> + #include <new> + #include <string> +@@ -235,7 +233,7 @@ void + Widget::dispose() noexcept + { + if (m_terminal->terminate_child()) { +- int status = W_EXITCODE(0, SIGKILL); ++ int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig) + emit_child_exited(status); + } + } diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml index e72feac7249e..e08b74f450f2 100644 --- a/x11-libs/vte/metadata.xml +++ b/x11-libs/vte/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="glade">Provide integration with <pkg>dev-util/glade</pkg>.</flag> - </use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="icu">Enable legacy charset support using <pkg>dev-libs/icu</pkg></flag> + <flag name="systemd">Support moving terminal child processes to their own systemd user scopes to avoid terminal getting killed due to child causing OOM</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/vte</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild deleted file mode 100644 index c579c5a9a8ad..000000000000 --- a/x11-libs/vte/vte-0.28.2-r208.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome2 python-r1 - -DESCRIPTION="GNOME terminal widget" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="debug +introspection python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/glib-2.26:2 - >=x11-libs/gtk+-2.20:2[introspection?] - >=x11-libs/pango-1.22.0 - - sys-libs/ncurses:0= - x11-libs/libX11 - x11-libs/libXft - - introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) - python? ( - ${PYTHON_DEPS} - dev-python/pygtk:2[${PYTHON_USEDEP}] - ) -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - virtual/pkgconfig - sys-devel/gettext -" -PDEPEND="x11-libs/gnome-pty-helper" - -PATCHES=( - # https://bugzilla.gnome.org/show_bug.cgi?id=663779 - "${FILESDIR}"/${PN}-0.30.1-alt-meta.patch - - # https://bugzilla.gnome.org/show_bug.cgi?id=652290 - "${FILESDIR}"/${PN}-0.28.2-interix.patch - - # Fix CVE-2012-2738, upstream bug #676090 - "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch - - # Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087 - # Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257 - "${FILESDIR}"/${PN}-0.28.2-repaint-after-change-scroll-region.patch -) - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -src_prepare() { - prepare_python() { - mkdir -p "${BUILD_DIR}" || die - } - if use python; then - python_foreach_impl prepare_python - fi - - gnome2_src_prepare -} - -src_configure() { - configure_python() { - ECONF_SOURCE="${S}" gnome2_src_configure --enable-python - } - - if use python; then - python_foreach_impl run_in_build_dir configure_python - fi - - local myconf="" - - if [[ ${CHOST} == *-interix* ]]; then - myconf="${myconf} --disable-Bsymbolic" - - # interix stropts.h is empty... - export ac_cv_header_stropts_h=no - fi - - # Do not disable gnome-pty-helper, bug #401389 - gnome2_src_configure --disable-python \ - --disable-deprecation \ - --disable-glade-catalogue \ - --disable-static \ - $(use_enable debug) \ - $(use_enable introspection) \ - --with-gtk=2.0 \ - ${myconf} -} - -src_compile() { - gnome2_src_compile - - compile_python() { - cd "${BUILD_DIR}"/python || die - ln -s "${S}"/src/libvte.la "${BUILD_DIR}"/src/ || die - mkdir -p "${BUILD_DIR}"/src/.libs || die - ln -s "${S}"/src/.libs/libvte.so "${BUILD_DIR}"/src/.libs/ || die - emake CPPFLAGS="${CPPFLAGS} -I${S}/src" - } - - if use python; then - python_foreach_impl run_in_build_dir compile_python - fi -} - -src_install() { - gnome2_src_install - - install_python() { - cd "${BUILD_DIR}"/python || die - emake install DESTDIR="${D}" \ - CPPFLAGS="${CPPFLAGS} -I${S}/src" - } - if use python; then - python_foreach_impl run_in_build_dir install_python - fi - - rm -v "${ED}usr/libexec/gnome-pty-helper" || die -} diff --git a/x11-libs/vte/vte-0.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild deleted file mode 100644 index c9fc52ee3441..000000000000 --- a/x11-libs/vte/vte-0.56.4.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -VALA_USE_DEPEND="vapigen" -VALA_MIN_API_VERSION="0.32" - -inherit gnome2 vala - -DESCRIPTION="Library providing a virtual terminal emulator widget" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" - -LICENSE="LGPL-2+" -SLOT="2.91" -IUSE="+crypt debug glade +introspection +vala vanilla" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -REQUIRED_USE="vala? ( introspection )" - -SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )" - -RDEPEND=" - >=dev-libs/glib-2.40:2 - >=dev-libs/libpcre2-10.21 - >=x11-libs/gtk+-3.16:3[introspection?] - >=x11-libs/pango-1.22.0 - - sys-libs/ncurses:0= - sys-libs/zlib - - crypt? ( >=net-libs/gnutls-3.2.7:0= ) - glade? ( >=dev-util/glade-3.9:3.10 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) -" -DEPEND="${RDEPEND} - dev-libs/libxml2:2 - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.13 - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig - - vala? ( $(vala_depend) ) -" -RDEPEND="${RDEPEND} - !x11-libs/vte:2.90[glade] -" - -src_prepare() { - if ! use vanilla; then - # Part of https://src.fedoraproject.org/rpms/vte291/blob/f30/f/vte291-cntr-ntfy-scroll.patch - # Patch distfile for 0.54 series is re-used, as only git hashes and co changed in patchset. - # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere - eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch - fi - - use vala && vala_src_prepare - - # build fails because of -Werror with gcc-5.x - sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed" - - gnome2_src_prepare -} - -src_configure() { - local myconf="" - - if [[ ${CHOST} == *-interix* ]]; then - myconf="${myconf} --disable-Bsymbolic" - - # interix stropts.h is empty... - export ac_cv_header_stropts_h=no - fi - - gnome2_src_configure \ - --disable-static \ - --with-gtk=3.0 \ - --with-iconv \ - $(use_enable debug) \ - $(use_enable glade glade-catalogue) \ - $(use_with crypt gnutls) \ - $(use_enable introspection) \ - $(use_enable vala) \ - ${myconf} -} - -src_install() { - gnome2_src_install - mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die -} diff --git a/x11-libs/vte/vte-0.58.3.ebuild b/x11-libs/vte/vte-0.68.0.ebuild index 338067e35d3e..31a008153e99 100644 --- a/x11-libs/vte/vte-0.58.3.ebuild +++ b/x11-libs/vte/vte-0.68.0.ebuild @@ -1,36 +1,42 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -VALA_USE_DEPEND="vapigen" -VALA_MIN_API_VERSION="0.32" +EAPI=8 -inherit gnome.org meson vala xdg +PYTHON_COMPAT=( python3_{9..10} ) + +inherit flag-o-matic gnome.org meson python-any-r1 vala xdg DESCRIPTION="Library providing a virtual terminal emulator widget" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" +HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte" +# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+) LICENSE="LGPL-3+ GPL-3+" SLOT="2.91" -IUSE="+crypt debug gtk-doc +introspection +vala vanilla" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" REQUIRED_USE="vala? ( introspection )" -SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.58.3-command-notify.patch.xz )" +# Upstream is hostile and refuses to upload tarballs. +SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2" +SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.68.0-command-notify.patch.xz )" RDEPEND=" - >=x11-libs/gtk+-3.16:3[introspection?] + >=x11-libs/gtk+-3.24.22:3[introspection?] >=dev-libs/fribidi-1.0.0 - >=dev-libs/glib-2.40:2 + >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) + icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 + systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?] " DEPEND="${RDEPEND}" BDEPEND=" + ${PYTHON_DEPS} dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.13 @@ -41,30 +47,43 @@ BDEPEND=" vala? ( $(vala_depend) ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch +) + src_prepare() { + default + use vala && vala_setup + xdg_environment_reset + + use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch + if ! use vanilla; then # Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere - eapply "${WORKDIR}"/${PN}-0.58.3-command-notify.patch + eapply "${WORKDIR}"/${PN}-0.68.0-command-notify.patch fi # -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter sed -e '/ggdb3/d' -i meson.build || die - - use vala && vala_src_prepare - xdg_src_prepare } src_configure() { + # Upstream don't support LTO & error out on it in meson.build (bug #926156) + filter-lto + local emesonargs=( + -Da11y=true $(meson_use debug debugg) $(meson_use gtk-doc docs) $(meson_use introspection gir) -Dfribidi=true # pulled in by pango anyhow + -Dglade=true $(meson_use crypt gnutls) -Dgtk3=true -Dgtk4=false - -Diconv=true + $(meson_use icu) + $(meson_use systemd _systemd) $(meson_use vala vapi) ) meson_src_configure diff --git a/x11-libs/vte/vte-0.74.2.ebuild b/x11-libs/vte/vte-0.74.2.ebuild new file mode 100644 index 000000000000..65965005d79e --- /dev/null +++ b/x11-libs/vte/vte-0.74.2.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit flag-o-matic gnome.org meson python-any-r1 vala xdg + +DESCRIPTION="Library providing a virtual terminal emulator widget" +HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" + +# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+) +LICENSE="LGPL-3+ GPL-3+" +SLOT="2.91" # vte_api_version in meson.build +IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" + +# Upstream is hostile and refuses to upload tarballs. +SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2" +SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.74.0-command-notify.patch.xz )" + +DEPEND=" + >=x11-libs/gtk+-3.24.22:3[introspection?] + >=x11-libs/cairo-1.0 + >=dev-libs/fribidi-1.0.0 + >=dev-libs/glib-2.60:2 + crypt? ( >=net-libs/gnutls-3.2.7:0= ) + icu? ( dev-libs/icu:= ) + >=x11-libs/pango-1.22.0 + >=dev-libs/libpcre2-10.21:= + systemd? ( >=sys-apps/systemd-220:= ) + sys-libs/zlib + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) + x11-libs/pango[introspection?] +" +RDEPEND="${DEPEND} + ~gui-libs/vte-common-${PV}[systemd?] +" +BDEPEND=" + ${PYTHON_DEPS} + dev-libs/libxml2:2 + dev-util/glib-utils + gtk-doc? ( dev-util/gi-docgen ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +src_prepare() { + default + use vala && vala_setup + xdg_environment_reset + + use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch + + if ! use vanilla; then + # From https://src.fedoraproject.org/rpms/vte291/raw/rawhide/f/vte291-cntnr-precmd-preexec-scroll.patch + # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere + eapply "${WORKDIR}"/${PN}-0.74.0-command-notify.patch + fi + + # -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter + sed -e '/ggdb3/d' -i meson.build || die + sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die +} + +src_configure() { + # Upstream don't support LTO & error out on it in meson.build (bug #926156) + filter-lto + + local emesonargs=( + -Da11y=true + $(meson_use debug debugg) + $(meson_use gtk-doc docs) + $(meson_use introspection gir) + -Dfribidi=true # pulled in by pango anyhow + -Dglade=true + $(meson_use crypt gnutls) + -Dgtk3=true + -Dgtk4=false + $(meson_use icu) + $(meson_use systemd _systemd) + $(meson_use vala vapi) + ) + meson_src_configure +} + +src_install() { + # not meson_src_install because this would include einstalldocs, which + # would result in file collisions with gui-libs/vte + meson_install + + # Remove files that are provided by gui-libs/vte-common + rm "${ED}"/usr/libexec/vte-urlencode-cwd || die + rm "${ED}"/etc/profile.d/vte.sh || die + rm "${ED}"/etc/profile.d/vte.csh || die + if use systemd; then + rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die + fi + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/ || die + mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die + fi +} diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index bef346b04220..298c9ebfa14b 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,3 +1,8 @@ DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9 +DIST wxGTK-3.0.5_p20210214.tar.xz 4560 BLAKE2B ac1815e679adfb2c36d74be0a4a9cc32d52e6b0b05a14393334bc5d30a8bc0da1386415a5b59a3f6dc4807d283272d36f033caa55a300c8c30cf0c402554b8bd SHA512 f1e34379b8bf594a68486bb6eccbd93f36dc2aeca37c0a7eb23de81c1c3825396437a65c43ed8d94673131e97414d49449ed51729970bf8b8e4608d36974a335 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158 +DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651e652b127ad9d548a00a498f06a4d4f868dc3bc33411ded2602c04c8329e927550d032bdbe633c2c7d1a7f89265874685d3cb3d9b SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac +DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d +DIST wxWidgets-3.2.2.1-docs-html.tar.bz2 18109775 BLAKE2B bb5dad886c2ba64feb9ec3be05f2cd4bcfb127d55f0a0af6d0aa59ee8f47663e39e7fcb3c0472cfdda9fbf99f1d32e07ff29604261e168f3b4218b9b5b61abc2 SHA512 9b883e1c611ac78f7b8457ffd8682c614d7653f561215c48e6239b6394cc4c084b34d6c55fe84fb7b76b38189591e94dc4596242f9e8653d2c72ae6f4b3a6293 +DIST wxWidgets-3.2.2.1.tar.bz2 27339515 BLAKE2B e761e768dbb32bf76dbabf27aa9feb634760aa214c2d8f85f9b4284700d01390617c275a855fa3ae28481a38233f3a71f8560e5a8a360d7b72ace2603c551327 SHA512 289d61ea2abd75a329aafcbd347ab84b136f31fca01dd902593f661691ecd30a4416286ff501c4257baa6765cf356ade3087eb8609af9a44599cfdc20e2f03a6 diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.5.1-configure-modern-c.patch b/x11-libs/wxGTK/files/wxGTK-3.0.5.1-configure-modern-c.patch new file mode 100644 index 000000000000..6512c6329efb --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.0.5.1-configure-modern-c.patch @@ -0,0 +1,54 @@ +https://github.com/wxWidgets/wxWidgets/commit/da4b42688a6cd5444eefb91bf40183d88203ffca +https://bugs.gentoo.org/874441 +--- a/configure ++++ b/configure +@@ -19586,6 +19586,7 @@ else + /* end confdefs.h. */ + + #include <stdio.h> ++ #include <stdlib.h> + + int main() + { +@@ -22300,6 +22301,7 @@ else + + #include <zlib.h> + #include <stdio.h> ++ #include <stdlib.h> + + int main() + { +@@ -22422,6 +22424,7 @@ else + + #include <png.h> + #include <stdio.h> ++ #include <stdlib.h> + + int main() + { +--- a/configure.in ++++ b/configure.in +@@ -1482,6 +1482,7 @@ case "${host}" in + dnl Check the gcc version macro. + [ + #include <stdio.h> ++ #include <stdlib.h> + + int main() + { +@@ -2439,6 +2440,7 @@ if test "$wxUSE_ZLIB" != "no" ; then + [ + #include <zlib.h> + #include <stdio.h> ++ #include <stdlib.h> + + int main() + { +@@ -2507,6 +2509,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then + [ + #include <png.h> + #include <stdio.h> ++ #include <stdlib.h> + + int main() + { diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.5.1-excise-autoptr.patch b/x11-libs/wxGTK/files/wxGTK-3.0.5.1-excise-autoptr.patch new file mode 100644 index 000000000000..e03f64632f2b --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.0.5.1-excise-autoptr.patch @@ -0,0 +1,322 @@ +Direct replacement of auto_ptr, equivalent to parts of upstream commits: +https://github.com/wxWidgets/wxWidgets/commit/b8c9cd35288a5c94f88ea83bf8c9ee644f99ece1 +https://github.com/wxWidgets/wxWidgets/commit/11a5728b327d5f16ef284d737f6329d38ae4d4b1 +made by diffing new-er upstream version with fixes included and current file +diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp +index fa122d1..845ee0b 100644 +--- a/tests/archive/archivetest.cpp ++++ b/tests/archive/archivetest.cpp +@@ -32,7 +32,6 @@ + #include <sys/stat.h> + + using std::string; +-using std::auto_ptr; + + + // Check whether member templates can be used +@@ -559,7 +558,7 @@ TestEntry& ArchiveTestCase<ClassFactoryT>::Add(const char *name, + template <class ClassFactoryT> + void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out) + { +- auto_ptr<OutputStreamT> arc(m_factory->NewStream(out)); ++ wxScopedPtr<OutputStreamT> arc(m_factory->NewStream(out)); + TestEntries::iterator it; + + OnCreateArchive(*arc); +@@ -587,7 +586,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out) + + if ((choices & 2) || testEntry.IsText()) { + // try PutNextEntry(EntryT *pEntry) +- auto_ptr<EntryT> entry(m_factory->NewEntry()); ++ wxScopedPtr<EntryT> entry(m_factory->NewEntry()); + entry->SetName(name, wxPATH_UNIX); + if (setIsDir) + entry->SetIsDir(); +@@ -701,8 +700,8 @@ template <class ClassFactoryT> + void ArchiveTestCase<ClassFactoryT>::ModifyArchive(wxInputStream& in, + wxOutputStream& out) + { +- auto_ptr<InputStreamT> arcIn(m_factory->NewStream(in)); +- auto_ptr<OutputStreamT> arcOut(m_factory->NewStream(out)); ++ wxScopedPtr<InputStreamT> arcIn(m_factory->NewStream(in)); ++ wxScopedPtr<OutputStreamT> arcOut(m_factory->NewStream(out)); + EntryT *pEntry; + + const wxString deleteName = wxT("bin/bin1000"); +@@ -714,7 +713,7 @@ void ArchiveTestCase<ClassFactoryT>::ModifyArchive(wxInputStream& in, + arcOut->CopyArchiveMetaData(*arcIn); + + while ((pEntry = arcIn->GetNextEntry()) != NULL) { +- auto_ptr<EntryT> entry(pEntry); ++ wxScopedPtr<EntryT> entry(pEntry); + OnSetNotifier(*entry); + wxString name = entry->GetName(wxPATH_UNIX); + +@@ -759,7 +758,7 @@ void ArchiveTestCase<ClassFactoryT>::ModifyArchive(wxInputStream& in, + + // try adding a new entry + TestEntry& testEntry = Add(newName.mb_str(), newData); +- auto_ptr<EntryT> newentry(m_factory->NewEntry()); ++ wxScopedPtr<EntryT> newentry(m_factory->NewEntry()); + newentry->SetName(newName); + newentry->SetDateTime(testEntry.GetDateTime()); + newentry->SetSize(testEntry.GetLength()); +@@ -782,7 +781,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in) + typedef std::list<EntryPtr> Entries; + typedef typename Entries::iterator EntryIter; + +- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); ++ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); + int expectedTotal = m_testEntries.size(); + EntryPtr entry; + Entries entries; +@@ -991,7 +990,7 @@ void ArchiveTestCase<ClassFactoryT>::TestIterator(wxInputStream& in) + typedef std::list<EntryT*> ArchiveCatalog; + typedef typename ArchiveCatalog::iterator CatalogIter; + +- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); ++ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); + size_t count = 0; + + #ifdef WXARC_MEMBER_TEMPLATES +@@ -1003,7 +1002,7 @@ void ArchiveTestCase<ClassFactoryT>::TestIterator(wxInputStream& in) + #endif + + for (CatalogIter it = cat.begin(); it != cat.end(); ++it) { +- auto_ptr<EntryT> entry(*it); ++ wxScopedPtr<EntryT> entry(*it); + count += m_testEntries.count(entry->GetName(wxPATH_UNIX)); + } + +@@ -1020,7 +1019,7 @@ void ArchiveTestCase<ClassFactoryT>::TestPairIterator(wxInputStream& in) + typedef std::map<wxString, EntryT*> ArchiveCatalog; + typedef typename ArchiveCatalog::iterator CatalogIter; + +- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); ++ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); + size_t count = 0; + + #ifdef WXARC_MEMBER_TEMPLATES +@@ -1032,7 +1031,7 @@ void ArchiveTestCase<ClassFactoryT>::TestPairIterator(wxInputStream& in) + #endif + + for (CatalogIter it = cat.begin(); it != cat.end(); ++it) { +- auto_ptr<EntryT> entry(it->second); ++ wxScopedPtr<EntryT> entry(it->second); + count += m_testEntries.count(entry->GetName(wxPATH_UNIX)); + } + +@@ -1049,7 +1048,7 @@ void ArchiveTestCase<ClassFactoryT>::TestSmartIterator(wxInputStream& in) + typedef typename ArchiveCatalog::iterator CatalogIter; + typedef wxArchiveIterator<InputStreamT, Ptr<EntryT> > Iter; + +- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); ++ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); + + #ifdef WXARC_MEMBER_TEMPLATES + ArchiveCatalog cat((Iter)*arc, Iter()); +@@ -1080,7 +1079,7 @@ void ArchiveTestCase<ClassFactoryT>::TestSmartPairIterator(wxInputStream& in) + typedef wxArchiveIterator<InputStreamT, + std::pair<wxString, Ptr<EntryT> > > PairIter; + +- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); ++ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); + + #ifdef WXARC_MEMBER_TEMPLATES + ArchiveCatalog cat((PairIter)*arc, PairIter()); +@@ -1108,8 +1107,8 @@ void ArchiveTestCase<ClassFactoryT>::ReadSimultaneous(TestInputStream& in) + + // create two archive input streams + TestInputStream in2(in); +- auto_ptr<InputStreamT> arc(m_factory->NewStream(in)); +- auto_ptr<InputStreamT> arc2(m_factory->NewStream(in2)); ++ wxScopedPtr<InputStreamT> arc(m_factory->NewStream(in)); ++ wxScopedPtr<InputStreamT> arc2(m_factory->NewStream(in2)); + + // load the catalog + #ifdef WXARC_MEMBER_TEMPLATES +@@ -1201,7 +1200,7 @@ protected: + void CreateArchive(wxOutputStream& out); + void ExtractArchive(wxInputStream& in); + +- auto_ptr<wxArchiveClassFactory> m_factory; // factory to make classes ++ wxScopedPtr<wxArchiveClassFactory> m_factory; // factory to make classes + int m_options; // test options + }; + +@@ -1241,7 +1240,7 @@ void CorruptionTestCase::runTest() + + void CorruptionTestCase::CreateArchive(wxOutputStream& out) + { +- auto_ptr<wxArchiveOutputStream> arc(m_factory->NewStream(out)); ++ wxScopedPtr<wxArchiveOutputStream> arc(m_factory->NewStream(out)); + + arc->PutNextDirEntry(wxT("dir")); + arc->PutNextEntry(wxT("file")); +@@ -1250,8 +1249,8 @@ void CorruptionTestCase::CreateArchive(wxOutputStream& out) + + void CorruptionTestCase::ExtractArchive(wxInputStream& in) + { +- auto_ptr<wxArchiveInputStream> arc(m_factory->NewStream(in)); +- auto_ptr<wxArchiveEntry> entry(arc->GetNextEntry()); ++ wxScopedPtr<wxArchiveInputStream> arc(m_factory->NewStream(in)); ++ wxScopedPtr<wxArchiveEntry> entry(arc->GetNextEntry()); + + while (entry.get() != NULL) { + char buf[1024]; +@@ -1259,7 +1258,6 @@ void CorruptionTestCase::ExtractArchive(wxInputStream& in) + while (arc->IsOk()) + arc->Read(buf, sizeof(buf)); + +- auto_ptr<wxArchiveEntry> next(arc->GetNextEntry()); +- entry = next; ++ entry.reset(arc->GetNextEntry()); + } + } +diff --git a/tests/archive/archivetest.h b/tests/archive/archivetest.h +index 7a1a306..37a083c 100644 +--- a/tests/archive/archivetest.h ++++ b/tests/archive/archivetest.h +@@ -13,7 +13,7 @@ + + #include "wx/archive.h" + #include "wx/wfstream.h" +- ++#include "wx/scopedptr.h" + + /////////////////////////////////////////////////////////////////////////////// + // Bit flags for options for the tests +@@ -213,7 +213,7 @@ protected: + + typedef std::map<wxString, TestEntry*> TestEntries; + TestEntries m_testEntries; // test data +- std::auto_ptr<ClassFactoryT> m_factory; // factory to make classes ++ wxScopedPtr<ClassFactoryT> m_factory; // factory to make classes + int m_options; // test options + wxDateTime m_timeStamp; // timestamp to give test entries + int m_id; // select between the possibilites +diff --git a/tests/archive/ziptest.cpp b/tests/archive/ziptest.cpp +index 3e9cff3..dc3fef5 100644 +--- a/tests/archive/ziptest.cpp ++++ b/tests/archive/ziptest.cpp +@@ -22,7 +22,6 @@ + #include "wx/zipstrm.h" + + using std::string; +-using std::auto_ptr; + + + /////////////////////////////////////////////////////////////////////////////// +@@ -186,7 +185,7 @@ void ZipPipeTestCase::runTest() + TestInputStream in(out, m_id % ((m_options & PipeIn) ? 4 : 3)); + wxZipInputStream zip(in); + +- auto_ptr<wxZipEntry> entry(zip.GetNextEntry()); ++ wxScopedPtr<wxZipEntry> entry(zip.GetNextEntry()); + CPPUNIT_ASSERT(entry.get() != NULL); + + if ((m_options & PipeIn) == 0) +diff --git a/tests/net/socket.cpp b/tests/net/socket.cpp +index acd91ae..7e27fc4 100644 +--- a/tests/net/socket.cpp ++++ b/tests/net/socket.cpp +@@ -28,10 +28,11 @@ + #include "wx/url.h" + #include "wx/sstream.h" + #include "wx/evtloop.h" ++#include "wx/scopedptr.h" + #include <memory> + +-typedef std::auto_ptr<wxSockAddress> wxSockAddressPtr; +-typedef std::auto_ptr<wxSocketClient> wxSocketClientPtr; ++typedef wxScopedPtr<wxSockAddress> wxSockAddressPtr; ++typedef wxScopedPtr<wxSocketClient> wxSocketClientPtr; + + static wxString gs_serverHost(wxGetenv("WX_TEST_SERVER")); + +@@ -257,7 +258,7 @@ void SocketTestCase::UrlTest() + + wxURL url("http://" + gs_serverHost); + +- const std::auto_ptr<wxInputStream> in(url.GetInputStream()); ++ const wxScopedPtr<wxInputStream> in(url.GetInputStream()); + CPPUNIT_ASSERT( in.get() ); + + wxStringOutputStream out; +diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp +index 9c6c481..59fca24 100644 +--- a/tests/streams/largefile.cpp ++++ b/tests/streams/largefile.cpp +@@ -33,6 +33,7 @@ + + #include "wx/filename.h" + #include "wx/wfstream.h" ++#include "wx/scopedptr.h" + + #ifdef __WINDOWS__ + #include "wx/msw/wrapwin.h" +@@ -51,7 +52,6 @@ + #define fileno _fileno + #endif + +-using std::auto_ptr; + + + /////////////////////////////////////////////////////////////////////////////// +@@ -120,7 +120,7 @@ void LargeFileTest::runTest() + + // write a large file + { +- auto_ptr<wxOutputStream> out(MakeOutStream(tmpfile.m_name)); ++ wxScopedPtr<wxOutputStream> out(MakeOutStream(tmpfile.m_name)); + + // write 'A's at [ 0x7fffffbf, 0x7fffffff [ + pos = 0x7fffffff - size; +@@ -154,7 +154,7 @@ void LargeFileTest::runTest() + + // read the large file back + { +- auto_ptr<wxInputStream> in(MakeInStream(tmpfile.m_name)); ++ wxScopedPtr<wxInputStream> in(MakeInStream(tmpfile.m_name)); + char buf[size]; + + if (haveLFS) { +@@ -218,7 +218,7 @@ protected: + + wxInputStream *LargeFileTest_wxFile::MakeInStream(const wxString& name) const + { +- auto_ptr<wxFileInputStream> in(new wxFileInputStream(name)); ++ wxScopedPtr<wxFileInputStream> in(new wxFileInputStream(name)); + CPPUNIT_ASSERT(in->IsOk()); + return in.release(); + } +@@ -250,7 +250,7 @@ protected: + + wxInputStream *LargeFileTest_wxFFile::MakeInStream(const wxString& name) const + { +- auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(name)); ++ wxScopedPtr<wxFFileInputStream> in(new wxFFileInputStream(name)); + CPPUNIT_ASSERT(in->IsOk()); + return in.release(); + } +diff --git a/wxWidgets-3.0.5.1/src/stc/scintilla/src/Editor.cxx.old b/wxWidgets-3.0.5.1/src/stc/scintilla/src/Editor.cxx +index 2081df2..a8c8572 100644 +--- a/src/stc/scintilla/src/Editor.cxx ++++ b/src/stc/scintilla/src/Editor.cxx +@@ -41,6 +41,7 @@ + #include "Selection.h" + #include "PositionCache.h" + #include "Editor.h" ++#include "wx/scopedptr.h" + + #ifdef SCI_NAMESPACE + using namespace Scintilla; +@@ -5706,7 +5707,7 @@ long Editor::FindText( + + Sci_TextToFind *ft = reinterpret_cast<Sci_TextToFind *>(lParam); + int lengthFound = istrlen(ft->lpstrText); +- std::auto_ptr<CaseFolder> pcf(CaseFolderForEncoding()); ++ wxScopedPtr<CaseFolder> pcf(CaseFolderForEncoding()); + int pos = pdoc->FindText(ft->chrg.cpMin, ft->chrg.cpMax, ft->lpstrText, + (wParam & SCFIND_MATCHCASE) != 0, + (wParam & SCFIND_WHOLEWORD) != 0, diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.1-configure-tests.patch b/x11-libs/wxGTK/files/wxGTK-3.2.1-configure-tests.patch new file mode 100644 index 000000000000..fe90b3aab0d9 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.2.1-configure-tests.patch @@ -0,0 +1,19 @@ +diff --git a/configure b/configure +index d2acb7d..69ae083 100755 +--- a/configure ++++ b/configure +@@ -45622,6 +45622,14 @@ $as_echo "yes" >&6; } + fi + fi + ++# explicit override to enable or disable tests ++if test "${enable_tests+set}" = set; then ++ SUBDIRS="$SUBDIRS tests" ++fi ++if test "${disable_tests+set}" = set; then ++ SUBDIRS="${SUBDIRS% tests}" ++fi ++ + for subdir in $SUBDIRS; do + if test -d ${srcdir}/${subdir} ; then + if test "$wxUSE_GUI" = "yes"; then diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.1-gtk3-translation-domain.patch b/x11-libs/wxGTK/files/wxGTK-3.2.1-gtk3-translation-domain.patch new file mode 100644 index 000000000000..9fbb9d8bc064 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.2.1-gtk3-translation-domain.patch @@ -0,0 +1,12 @@ +Modify AddStdCatalog to use the versioned wxstd32-gtk3.mo. +--- a/src/common/translation.cpp ++++ b/src/common/translation.cpp +@@ -1409,7 +1409,7 @@ bool wxTranslations::AddStdCatalog() + if ( AddCatalog("wxstd-" wxSTRINGIZE(wxMAJOR_VERSION) "." wxSTRINGIZE(wxMINOR_VERSION)) ) + return true; + +- if ( AddCatalog(wxS("wxstd")) ) ++ if ( AddCatalog(wxS("wxstd32-gtk3")) ) + return true; + + return false; diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.1-prefer-lib64-in-tests.patch b/x11-libs/wxGTK/files/wxGTK-3.2.1-prefer-lib64-in-tests.patch new file mode 100644 index 000000000000..748eeb4dd328 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.2.1-prefer-lib64-in-tests.patch @@ -0,0 +1,33 @@ +From eafc2ad88b9164a8ef6bd2f6d79e8d7da90246e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> +Date: Mon, 19 Dec 2022 12:30:09 +0100 +Subject: [PATCH] tests: Prefer /lib64 to /lib in DynamicLibrary test + +--- +Upstream has been notified about this test failure, however, I'd prefer a +different fix in place of this one, so I haven't sent a patch in yet. + +https://github.com/wxWidgets/wxWidgets/commit/512b8033feef6ba99c4dfdf6ada42a56d7425d6d + + tests/misc/dynamiclib.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/misc/dynamiclib.cpp b/tests/misc/dynamiclib.cpp +index 020eb5b..ee41f1d 100644 +--- a/tests/misc/dynamiclib.cpp ++++ b/tests/misc/dynamiclib.cpp +@@ -37,9 +37,10 @@ TEST_CASE("DynamicLibrary::Load", "[dynlib]") + #else // other Unix + static const char* const candidateDirs[] = + { ++ "/lib64", ++ "/usr/lib64", + "/lib/x86_64-linux-gnu", + "/lib", +- "/lib64", + "/usr/lib", + }; + +-- +2.39.0 + diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.1-wayland-control.patch b/x11-libs/wxGTK/files/wxGTK-3.2.1-wayland-control.patch new file mode 100644 index 000000000000..568c3b760fd2 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.2.1-wayland-control.patch @@ -0,0 +1,185 @@ +From d886c4cada68ed5bfdca72de846182be63f2619e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> +Date: Mon, 19 Dec 2022 11:30:58 +0100 +Subject: [PATCH] configure.in: Allow disabling Wayland support + +--- +This patch is not forwarded upstream since, AFAIK, the autoconf+bakefile build +system is currently in the process of being replaced. + +This patch enables us to explicitly disable GDK wayland platform detection via +an enable flag. It doesn't implement failed detection logic since that +shouldn't happen in the scenario Portage is in. This patch also runs includes +patches for the configure script itself, because the configuration was +generated by a seemingly patched Autoconf 2.69. + + configure | 53 +++++++++++++++++++++++++++++++++++++++++++--------- + configure.in | 37 ++++++++++++++++++++---------------- + 2 files changed, 65 insertions(+), 25 deletions(-) + +diff --git a/configure b/configure +index 54eb7a7..b6d5e52 100755 +--- a/configure ++++ b/configure +@@ -1218,6 +1218,7 @@ enable_textfile + enable_timer + enable_variant + enable_zipstream ++enable_wayland + enable_url + enable_protocol + enable_protocol_http +@@ -2190,6 +2191,7 @@ Optional Features: + --enable-timer use wxTimer class + --enable-variant use wxVariant class + --enable-zipstream use wxZip streams ++ --enable-wayland allow using Wayland EGL backend + --enable-url use wxURL class + --enable-protocol use wxProtocol class + --enable-protocol-http HTTP support in wxProtocol +@@ -8228,6 +8230,35 @@ fi + eval "$wx_cv_use_zipstream" + + ++ enablestring= ++ defaultval=$wxUSE_ALL_FEATURES ++ if test -z "$defaultval"; then ++ if test x"$enablestring" = xdisable; then ++ defaultval=yes ++ else ++ defaultval=no ++ fi ++ fi ++ ++ # Check whether --enable-wayland was given. ++if test "${enable_wayland+set}" = set; then : ++ enableval=$enable_wayland; ++ if test "$enableval" = yes; then ++ wx_cv_use_wayland='wxUSE_WAYLAND=yes' ++ else ++ wx_cv_use_wayland='wxUSE_WAYLAND=no' ++ fi ++ ++else ++ ++ wx_cv_use_wayland='wxUSE_WAYLAND=${'DEFAULT_wxUSE_WAYLAND":-$defaultval}" ++ ++fi ++ ++ ++ eval "$wx_cv_use_wayland" ++ ++ + + enablestring= + defaultval=$wxUSE_ALL_FEATURES +@@ -29335,26 +29366,27 @@ done + TOOLKIT=GTK + GUIDIST=GTK_DIST + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK Wayland backend" >&5 ++ if test x"$wxUSE_WAYLAND" = xyes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK Wayland backend" >&5 + $as_echo_n "checking for GDK Wayland backend... " >&6; } + if ${wx_cv_gdk_wayland+:} false; then : + $as_echo_n "(cached) " >&6 + else + +- save_CFLAGS=$CFLAGS +- CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ save_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +- #include <gdk/gdk.h> ++ #include <gdk/gdk.h> + + int + main () + { + +- #ifndef GDK_WINDOWING_WAYLAND +- Not GDK Windowing Wayland +- #endif ++ #ifndef GDK_WINDOWING_WAYLAND ++ Not GDK Windowing Wayland ++ #endif + + ; + return 0; +@@ -29367,11 +29399,14 @@ else + + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS=$save_CFLAGS ++ CFLAGS=$save_CFLAGS + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gdk_wayland" >&5 + $as_echo "$wx_cv_gdk_wayland" >&6; } ++ else ++ wx_cv_gdk_wayland=no ++ fi + + if test "$wxUSE_GPE" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpewidget library" >&5 +diff --git a/configure.in b/configure.in +index c76c528..430cdff 100644 +--- a/configure.in ++++ b/configure.in +@@ -779,6 +779,7 @@ WX_ARG_FEATURE(textfile, [ --enable-textfile use wxTextFile class], + WX_ARG_FEATURE(timer, [ --enable-timer use wxTimer class], wxUSE_TIMER) + WX_ARG_FEATURE(variant, [ --enable-variant use wxVariant class], wxUSE_VARIANT) + WX_ARG_FEATURE(zipstream, [ --enable-zipstream use wxZip streams], wxUSE_ZIPSTREAM) ++WX_ARG_FEATURE(wayland, [ --enable-wayland allow using Wayland EGL backend], wxUSE_WAYLAND) + + dnl URL-related classes + WX_ARG_FEATURE(url, [ --enable-url use wxURL class], wxUSE_URL) +@@ -3292,22 +3293,26 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config + TOOLKIT=GTK + GUIDIST=GTK_DIST + +- AC_CACHE_CHECK([for GDK Wayland backend], wx_cv_gdk_wayland, [ +- save_CFLAGS=$CFLAGS +- CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" +- AC_TRY_COMPILE([ +- #include <gdk/gdk.h> +- ], +- [ +- #ifndef GDK_WINDOWING_WAYLAND +- Not GDK Windowing Wayland +- #endif +- ], +- wx_cv_gdk_wayland=yes, +- wx_cv_gdk_wayland=no +- ) +- CFLAGS=$save_CFLAGS +- ]) ++ if test x"$wxUSE_WAYLAND" = xyes; then ++ AC_CACHE_CHECK([for GDK Wayland backend], wx_cv_gdk_wayland, [ ++ save_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" ++ AC_TRY_COMPILE([ ++ #include <gdk/gdk.h> ++ ], ++ [ ++ #ifndef GDK_WINDOWING_WAYLAND ++ Not GDK Windowing Wayland ++ #endif ++ ], ++ wx_cv_gdk_wayland=yes, ++ wx_cv_gdk_wayland=no ++ ) ++ CFLAGS=$save_CFLAGS ++ ]) ++ else ++ wx_cv_gdk_wayland=no ++ fi + + dnl test for external libxpm if we're configured to use it + if test "$wxUSE_GPE" = "yes"; then +-- +2.39.0 + diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch new file mode 100644 index 000000000000..2adf03aef45b --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch @@ -0,0 +1,88 @@ +https://bugs.gentoo.org/916884 +https://github.com/wxWidgets/wxWidgets/pull/24197 + +From 891bfff867b7dc92ed6330ea46ee2dcfa5424ee0 Mon Sep 17 00:00:00 2001 +From: Cliff Zhao <qzhao@suse.com> +Date: Thu, 4 Jan 2024 08:01:00 +0100 +Subject: [PATCH] Fix testsuite failures on s390x + +``/sys/power/state`` does not exist on s390x platforms and certain +types of containers, so check that the file exist before running the +test case. + +Output from ``make check`` was: + + ./textfile/textfiletest.cpp:351 + ............................................................................... + + ./textfile/textfiletest.cpp:354: FAILED: + CHECK( f.Open("/sys/power/state") ) + with expansion: + false + + ./textfile/textfiletest.cpp:355: FAILED: + REQUIRE( f.GetLineCount() == 1 ) + with expansion: + 0 == 1 +--- + tests/file/filetest.cpp | 2 ++ + tests/filename/filenametest.cpp | 2 ++ + tests/textfile/textfiletest.cpp | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/tests/file/filetest.cpp b/tests/file/filetest.cpp +index 8902eb4d6684..fc3c90569480 100644 +--- a/tests/file/filetest.cpp ++++ b/tests/file/filetest.cpp +@@ -153,6 +153,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]") + CHECK( fileProc.ReadAll(&s) ); + CHECK( !s.empty() ); + ++ if ( wxFile::Exists("/sys/power/state") ) { + // All files in /sys have the size of one kernel page, even if they don't + // have that much data in them. + const long pageSize = sysconf(_SC_PAGESIZE); +@@ -163,6 +164,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]") + CHECK( fileSys.ReadAll(&s) ); + CHECK( !s.empty() ); + CHECK( s.length() < pageSize ); ++ } + } + + #endif // __LINUX__ +diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp +index 84356b39f719..ce2ec2af2760 100644 +--- a/tests/filename/filenametest.cpp ++++ b/tests/filename/filenametest.cpp +@@ -1040,9 +1040,11 @@ TEST_CASE("wxFileName::GetSizeSpecial", "[filename][linux][special-file]") + INFO( "size of /proc/kcore=" << size ); + CHECK( size > 0 ); + ++ if ( wxFile::Exists("/sys/power/state") ) { + // All files in /sys are one page in size, irrespectively of the size of + // their actual contents. + CHECK( wxFileName::GetSize("/sys/power/state") == sysconf(_SC_PAGESIZE) ); ++ } + } + + #endif // __LINUX__ +diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp +index f744ffc3271b..73467be8f85f 100644 +--- a/tests/textfile/textfiletest.cpp ++++ b/tests/textfile/textfiletest.cpp +@@ -348,6 +348,7 @@ TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]") + CHECK( f.GetLineCount() > 1 ); + } + ++ if ( wxFile::Exists("/sys/power/state") ) { + SECTION("/sys") + { + wxTextFile f; +@@ -356,6 +357,7 @@ TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]") + INFO( "/sys/power/state contains \"" << f[0] << "\"" ); + CHECK( (f[0].find("mem") != wxString::npos || f[0].find("disk") != wxString::npos) ); + } ++ } + } + + #endif // __LINUX__ diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch new file mode 100644 index 000000000000..db351b29d648 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-dont-break-flags.patch @@ -0,0 +1,48 @@ +From f092f50b794b487e552e930b11d165a736fc8edb Mon Sep 17 00:00:00 2001 +From: Arsen Arsenović <arsen@gentoo.org> +Date: Sun, 2 Apr 2023 13:25:11 +0200 +Subject: [PATCH] configure: Remove flag deduplication logic + +Parsing compiler flags is a complex task that this function screws up. + +Bug: https://bugs.gentoo.org/903668 +--- + configure | 5 ++--- + configure.in | 5 ++--- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index a476a3c..a9b815b 100755 +--- a/configure ++++ b/configure +@@ -45550,9 +45550,8 @@ esac + + dedup_flags() + { +- printf "%s " "$@" | +- awk 'BEGIN { RS=" "; ORS=" " } +- { if ($0=="-arch" || $0=="-framework" || !seen[$0]++) print }' ++ # Gentoo: Don't hack out flags, parsing them is complex. ++ printf '%s ' "$@" + } + + WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"` +diff --git a/configure.in b/configure.in +index a4c4178..9cf9c30 100644 +--- a/configure.in ++++ b/configure.in +@@ -8570,9 +8570,8 @@ dnl flags which are explicitly allowed to occur multiple times, as all their + dnl occurrences must be preserved). + dedup_flags() + { +- printf "%s " "$@" | +- awk 'BEGIN { RS=" "; ORS=" " } +- { if ($0=="-arch" || $0=="-framework" || !seen[[$0]]++) print }' ++ # Gentoo: Don't hack out flags, parsing them is complex. ++ printf '%s ' "$@" + } + + WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"` +-- +2.40.0 + diff --git a/x11-libs/wxGTK/files/wxGTK-configure-tests.patch b/x11-libs/wxGTK/files/wxGTK-configure-tests.patch new file mode 100644 index 000000000000..efbb2d7c55bf --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-configure-tests.patch @@ -0,0 +1,28 @@ +diff --git a/configure b/configure +index 0f3c4c9..92c84f3 100755 +--- a/configure ++++ b/configure +@@ -1368,6 +1368,7 @@ enable_dependency_tracking + enable_precomp_headers + with_cppunit_prefix + with_cppunit_exec_prefix ++enable_tests + ' + ac_precious_vars='build_alias + host_alias +@@ -40955,8 +40956,13 @@ fi + + fi + +- +- ++# explicit override to enable or disable tests ++if test "${enable_tests+set}" = set; then ++ SUBDIRS="$SUBDIRS tests" ++fi ++if test "${disable_tests+set}" = set; then ++ SUBDIRS="${SUBDIRS% tests}" ++fi + + + for subdir in $SUBDIRS; do diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml index aa10f7e1f6dd..ae985025c0ac 100644 --- a/x11-libs/wxGTK/metadata.xml +++ b/x11-libs/wxGTK/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>wxwidgets@gentoo.org</email> - <description>All modifications to this package must be approved by the wxwidgets herd.</description> + <name>Gentoo wxWidgets Project</name> </maintainer> <use> <flag name="gstreamer"> @@ -17,6 +17,7 @@ </use> <upstream> <remote-id type="sourceforge">wxpython</remote-id> + <remote-id type="github">wxWidgets/wxWidgets</remote-id> </upstream> <slots> <slot name="*">Slots reflect MAJOR.MINOR versions which can diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r5.ebuild index c7da89e676d4..597919bb53e1 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r5.ebuild @@ -1,57 +1,51 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit multilib-minimal +inherit multilib-minimal flag-o-matic DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" HOMEPAGE="https://wxwidgets.org/" -SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 +SRC_URI=" + https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" +S="${WORKDIR}/wxWidgets-${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff" - +LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="3.0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl pch sdl tiff" RDEPEND=" dev-libs/expat[${MULTILIB_USEDEP}] sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) X? ( - >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] + dev-libs/glib:2[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + media-libs/libpng:=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:2[${MULTILIB_USEDEP}] x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] x11-libs/libSM[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] x11-libs/pango[${MULTILIB_USEDEP}] gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] ) + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + ) libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - ) - aqua? ( - x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] + tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) + )" +DEPEND=" + ${RDEPEND} opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) X? ( x11-base/xorg-proto )" - +BDEPEND="virtual/pkgconfig" PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" -LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" - -S="${WORKDIR}/wxWidgets-${PV}" PATCHES=( "${WORKDIR}"/wxGTK-3.0.4_p20190713/ "${FILESDIR}"/${PN}-3.0.5-collision.patch @@ -59,14 +53,21 @@ PATCHES=( ) multilib_src_configure() { - local myconf - - # X independent options - myconf=" - --with-zlib=sys - --with-expat=sys - --enable-compat28 - $(use_with sdl)" + # Workaround for bug #915154 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + local myconf=( + # X independent options + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl) + + # PCHes are unstable and are disabled in-tree where possible + # See bug #504204 + # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 + $(use_enable pch precomp-headers) + ) # debug in >=2.9 # there is no longer separate debug libraries (gtk2ud) @@ -75,17 +76,16 @@ multilib_src_configure() { # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. # http://docs.wxwidgets.org/3.0/overview_debugging.html # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c - use debug \ - && myconf="${myconf} --enable-debug=max" + use debug && myconf+=( --enable-debug=max ) # wxGTK options # --enable-graphics_ctx - needed for webkit, editra # --without-gnomevfs - bug #203389 - use X && \ - myconf="${myconf} + if use X; then + myconf+=( + --enable-gui --enable-graphics_ctx --with-gtkprint - --enable-gui --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys @@ -94,48 +94,35 @@ multilib_src_configure() { $(use_enable gstreamer mediactrl) $(use_with libnotify) $(use_with opengl) - $(use_with tiff libtiff sys)" - - use aqua && \ - myconf="${myconf} - --enable-graphics_ctx - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --with-mac - --with-opengl" - # cocoa toolkit seems to be broken - - # wxBase options - if use !X && use !aqua ; then - myconf="${myconf} - --disable-gui" + $(use_with tiff libtiff sys) + ) + else + # wxBase options + myconf+=( --disable-gui ) fi - ECONF_SOURCE="${S}" econf ${myconf} + ECONF_SOURCE="${S}" econf "${myconf[@]}" } multilib_src_install_all() { - cd "${S}"/docs || die + cd docs || die dodoc changes.txt readme.txt newdoc base/readme.txt base_readme.txt newdoc gtk/readme.txt gtk_readme.txt - use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/. + use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. ) einstalldocs # Stray windows locale file, causes collisions - local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" - [[ -e ${wxmsw} ]] && rm "${wxmsw}" + rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo || die } pkg_postinst() { - has_version app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update + has_version app-eselect/eselect-wxwidgets && + eselect wxwidgets update } pkg_postrm() { - has_version app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update + has_version app-eselect/eselect-wxwidgets && + eselect wxwidgets update } diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1-r1.ebuild index e081aaad649e..6b61006effd7 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.5.1-r1.ebuild @@ -1,34 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib-minimal +inherit multilib-minimal flag-o-matic -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="https://wxwidgets.org/" -SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 - https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz - doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" - -WXSUBVERSION=${PV}.0-gtk3 # 3.0.3.0-gtk3 -WXVERSION=${WXSUBVERSION%.*} # 3.0.3 +WXSUBVERSION=${PV}-gtk3 # 3.0.5.1-gtk3 +WXVERSION=${WXSUBVERSION%.*} # 3.0.5 WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3 WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3 +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="https://wxwidgets.org/" +SRC_URI=" + https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 + https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.5_p20210214.tar.xz + doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${WXVERSION}/wxWidgets-${WXVERSION}-docs-html.tar.bz2 )" +S="${WORKDIR}/wxWidgets-${PV}" + +LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl pch sdl test tiff webkit" +REQUIRED_USE="test? ( tiff ) tiff? ( X )" +RESTRICT="!test? ( test )" RDEPEND=" + >=app-eselect/eselect-wxwidgets-20131230 dev-libs/expat[${MULTILIB_USEDEP}] sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) X? ( >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] x11-libs/gtk+:3[${MULTILIB_USEDEP}] x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] @@ -38,33 +43,27 @@ RDEPEND=" x11-libs/pango[${MULTILIB_USEDEP}] gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] ) + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + ) libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) webkit? ( net-libs/webkit-gtk:4 ) - ) - aqua? ( - x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - )" - + )" DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) X? ( x11-base/xorg-proto )" - -PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" - -LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" - -S="${WORKDIR}/wxWidgets-${PV}" +BDEPEND=" + test? ( >=dev-util/cppunit-1.8.0 ) + >=app-eselect/eselect-wxwidgets-20131230 + virtual/pkgconfig" PATCHES=( - "${WORKDIR}"/wxGTK-3.0.4_p20190713/ + "${WORKDIR}"/wxGTK-3.0.5_p20210214/ "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 + "${FILESDIR}"/${PN}-configure-tests.patch + "${FILESDIR}"/${PN}-3.0.5.1-configure-modern-c.patch ) src_prepare() { @@ -78,7 +77,7 @@ src_prepare() { -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \ -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \ - Makefile.in || die + Makefile.in tests/Makefile.in || die sed -i \ -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ @@ -93,14 +92,24 @@ src_prepare() { } multilib_src_configure() { - local myconf + # Workaround for bug #915154 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # X independent options - myconf=" - --with-zlib=sys - --with-expat=sys - --enable-compat28 - $(use_with sdl)" + local myeconfargs=( + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl) + + # PCHes are unstable and are disabled in-tree where possible + # See bug #504204 + # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 + $(use_enable pch precomp-headers) + + # Don't hard-code libdir's prefix for wx-config + --libdir='${prefix}'/$(get_libdir) + ) # debug in >=2.9 # there is no longer separate debug libraries (gtk2ud) @@ -109,77 +118,69 @@ multilib_src_configure() { # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. # http://docs.wxwidgets.org/3.0/overview_debugging.html # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c - use debug \ - && myconf="${myconf} --enable-debug=max" + use debug && myeconfargs+=( --enable-debug=max ) # wxGTK options # --enable-graphics_ctx - needed for webkit, editra # --without-gnomevfs - bug #203389 - use X && \ - myconf="${myconf} - --enable-graphics_ctx - --with-gtkprint - --enable-gui - --with-gtk=3 - --with-libpng=sys - --with-libjpeg=sys - --without-gnomevfs - $(use_enable gstreamer mediactrl) - $(multilib_native_use_enable webkit webview) - $(use_with libnotify) - $(use_with opengl) - $(use_with tiff libtiff sys)" - - use aqua && \ - myconf="${myconf} - --enable-graphics_ctx - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --with-mac - --with-opengl" - # cocoa toolkit seems to be broken + use X && myeconfargs+=( + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-gtk=3 + --with-libpng=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(multilib_native_use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys) + $(use_enable test tests) + ) # wxBase options - if use !X && use !aqua ; then - myconf="${myconf} - --disable-gui" - fi + ! use X && myeconfargs+=( --disable-gui ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} - ECONF_SOURCE="${S}" econf ${myconf} +multilib_src_test() { + emake -C tests + (cd tests && ./test) || die } multilib_src_install_all() { - cd "${S}"/docs || die + cd docs || die dodoc changes.txt readme.txt newdoc base/readme.txt base_readme.txt newdoc gtk/readme.txt gtk_readme.txt - use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/. + use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${WXVERSION}-docs-html/. ) einstalldocs # Stray windows locale file, bug #650118 - local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo" - [[ -e ${wxmsw} ]] && rm "${wxmsw}" + rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die # Unversioned links - rm "${D}"/usr/bin/wx{-config,rc} + rm "${ED}"/usr/bin/wx-config || die + use X && { rm "${ED}"/usr/bin/wxrc || die; } # version bakefile presets - pushd "${D}"usr/share/bakefile/presets/ > /dev/null + pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die + local f for f in wx*; do - mv "${f}" "${f/wx/wx30gtk3}" + mv "${f}" "${f/wx/wx30gtk3}" || die done - popd > /dev/null + popd >/dev/null || die } pkg_postinst() { - has_version app-eselect/eselect-wxwidgets \ + has_version -b app-eselect/eselect-wxwidgets \ && eselect wxwidgets update } pkg_postrm() { - has_version app-eselect/eselect-wxwidgets \ + has_version -b app-eselect/eselect-wxwidgets \ && eselect wxwidgets update } diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1-r2.ebuild new file mode 100644 index 000000000000..832b85ae5e18 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.5.1-r2.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal flag-o-matic + +WXSUBVERSION=${PV}-gtk3 # 3.0.5.1-gtk3 +WXVERSION=${WXSUBVERSION%.*} # 3.0.5 +WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3 +WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3 + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="https://wxwidgets.org/" +SRC_URI=" + https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 + https://dev.gentoo.org/~leio/distfiles/wxGTK-${WXVERSION}_p20210214.tar.xz + doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${WXVERSION}/wxWidgets-${WXVERSION}-docs-html.tar.bz2 )" +S="${WORKDIR}/wxWidgets-${PV}" + +LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" +SLOT="${WXRELEASE}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl pch sdl test tiff webkit" +REQUIRED_USE="test? ( tiff ) tiff? ( X )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-eselect/eselect-wxwidgets-20131230 + dev-libs/expat[${MULTILIB_USEDEP}] + sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) + X? ( + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + x11-libs/pango[${MULTILIB_USEDEP}] + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + ) + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) + opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) + webkit? ( net-libs/webkit-gtk:4 ) + )" +DEPEND="${RDEPEND} + opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto )" +BDEPEND=" + test? ( >=dev-util/cppunit-1.8.0 ) + >=app-eselect/eselect-wxwidgets-20131230 + virtual/pkgconfig" + +PATCHES=( + "${WORKDIR}"/wxGTK-3.0.5_p20210214/ + "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch + "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 + "${FILESDIR}"/${PN}-configure-tests.patch + "${FILESDIR}"/${PN}-3.0.5.1-configure-modern-c.patch + "${FILESDIR}"/${PN}-3.0.5.1-excise-autoptr.patch + +) + +src_prepare() { + default + + # Versionating + sed -i \ + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ + -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\ + -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\ + -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ + -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \ + -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \ + Makefile.in tests/Makefile.in || die + + sed -i \ + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ + utils/wxrc/Makefile.in || die + + sed -i \ + -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \ + -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \ + -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \ + -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \ + configure || die +} + +multilib_src_configure() { + # Workaround for bug #915154 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + # X independent options + local myeconfargs=( + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl) + + # PCHes are unstable and are disabled in-tree where possible + # See bug #504204 + # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 + $(use_enable pch precomp-headers) + + # Don't hard-code libdir's prefix for wx-config + --libdir='${prefix}'/$(get_libdir) + ) + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug && myeconfargs+=( --enable-debug=max ) + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && myeconfargs+=( + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-gtk=3 + --with-libpng=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(multilib_native_use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys) + $(use_enable test tests) + ) + + # wxBase options + ! use X && myeconfargs+=( --disable-gui ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + emake -C tests + (cd tests && ./test) || die +} + +multilib_src_install_all() { + cd docs || die + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${WXVERSION}-docs-html/. ) + einstalldocs + + # Stray windows locale file, bug #650118 + rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die + + # Unversioned links + rm "${ED}"/usr/bin/wx-config || die + use X && { rm "${ED}"/usr/bin/wxrc || die; } + + # version bakefile presets + pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die + local f + for f in wx*; do + mv "${f}" "${f/wx/wx30gtk3}" || die + done + popd >/dev/null || die +} + +pkg_postinst() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1-r3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1-r3.ebuild new file mode 100644 index 000000000000..9489bf2fa698 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.5.1-r3.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal flag-o-matic + +WXSUBVERSION=${PV}-gtk3 # 3.0.5.1-gtk3 +WXVERSION=${WXSUBVERSION%.*} # 3.0.5 +WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3 +WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3 + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="https://wxwidgets.org/" +SRC_URI=" + https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 + https://dev.gentoo.org/~leio/distfiles/wxGTK-${WXVERSION}_p20210214.tar.xz + doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${WXVERSION}/wxWidgets-${WXVERSION}-docs-html.tar.bz2 )" +S="${WORKDIR}/wxWidgets-${PV}" + +LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" +SLOT="${WXRELEASE}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl pch sdl test tiff webkit" +REQUIRED_USE="test? ( tiff ) tiff? ( X )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-eselect/eselect-wxwidgets-20131230 + dev-libs/expat[${MULTILIB_USEDEP}] + sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) + X? ( + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + x11-libs/pango[${MULTILIB_USEDEP}] + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + ) + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) + opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) + webkit? ( net-libs/webkit-gtk:4 ) + )" +DEPEND="${RDEPEND} + opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto )" +BDEPEND=" + test? ( >=dev-util/cppunit-1.8.0 ) + >=app-eselect/eselect-wxwidgets-20131230 + virtual/pkgconfig" + +PATCHES=( + "${WORKDIR}"/wxGTK-3.0.5_p20210214/ + "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch + "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 + "${FILESDIR}"/${PN}-configure-tests.patch + "${FILESDIR}"/${PN}-3.0.5.1-configure-modern-c.patch + "${FILESDIR}"/${PN}-3.0.5.1-excise-autoptr.patch + +) + +src_prepare() { + default + + # Versionating + sed -i \ + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ + -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\ + -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\ + -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ + -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \ + -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \ + Makefile.in tests/Makefile.in || die + + sed -i \ + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ + utils/wxrc/Makefile.in || die + + sed -i \ + -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \ + -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \ + -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \ + -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \ + configure || die +} + +multilib_src_configure() { + # Workaround for bug #915154 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + # X independent options + local myeconfargs=( + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl) + + # PCHes are unstable and are disabled in-tree where possible + # See bug #504204 + # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 + $(use_enable pch precomp-headers) + + # Don't hard-code libdir's prefix for wx-config + --libdir='${prefix}'/$(get_libdir) + ) + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug && myeconfargs+=( --enable-debug=max ) + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && myeconfargs+=( + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-gtk=3 + --with-libpng=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(multilib_native_use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys) + $(use_enable test tests) + ) + + # wxBase options + ! use X && myeconfargs+=( --disable-gui ) + + # wxWidgets installs a configuration file with a reference to EGREP. + # Autoconf discovers these programs via full paths, which is + # unnecessary and fails if a build happened on a merged-usr system + # but is being used on a split-usr system. Bug #927920. + export ac_cv_path_SED="sed" + export ac_cv_path_EGREP="grep -E" + export ac_cv_path_EGREP_TRADITIONAL="grep -E" + export ac_cv_path_FGREP="grep -F" + export ac_cv_path_GREP="grep" + export ac_cv_path_lt_DD="dd" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + emake -C tests + (cd tests && ./test) || die +} + +multilib_src_install_all() { + cd docs || die + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${WXVERSION}-docs-html/. ) + einstalldocs + + # Stray windows locale file, bug #650118 + rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die + + # Unversioned links + rm "${ED}"/usr/bin/wx-config || die + use X && { rm "${ED}"/usr/bin/wxrc || die; } + + # version bakefile presets + pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die + local f + for f in wx*; do + mv "${f}" "${f/wx/wx30gtk3}" || die + done + popd >/dev/null || die +} + +pkg_postinst() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild new file mode 100644 index 000000000000..b27344e0947d --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal flag-o-matic + +WXSUBVERSION="${PV}-gtk3" # 3.2.1-gtk3 +WXVERSION="$(ver_cut 1-3)" # 3.2.1 +# Make sure that this matches the number of components in ${PV} +WXRELEASE="$(ver_cut 1-2)-gtk3" # 3.2-gtk3 +WXRELEASE_NODOT=${WXRELEASE//./} # 32-gtk3 + +DESCRIPTION="GTK version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="https://wxwidgets.org/" +SRC_URI=" + https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 + doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" +S="${WORKDIR}/wxWidgets-${PV}" + +LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" +SLOT="${WXRELEASE}" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit" +REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-eselect/eselect-wxwidgets-20131230 + dev-libs/expat[${MULTILIB_USEDEP}] + dev-libs/libpcre2[pcre16,pcre32,unicode] + sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) + curl? ( net-misc/curl ) + lzma? ( app-arch/xz-utils ) + X? ( + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[wayland?,${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXtst + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + media-libs/fontconfig + x11-libs/pango[${MULTILIB_USEDEP}] + keyring? ( app-crypt/libsecret ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-bad:1.0[${MULTILIB_USEDEP}] + ) + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/opengl[${MULTILIB_USEDEP}] + wayland? ( dev-libs/wayland ) + ) + spell? ( app-text/gspell:= ) + tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) + webkit? ( net-libs/webkit-gtk:4= ) + )" +DEPEND="${RDEPEND} + opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto )" +BDEPEND=" + test? ( >=dev-util/cppunit-1.8.0 ) + >=app-eselect/eselect-wxwidgets-20131230 + virtual/pkgconfig" + +# Note about the gst-plugin-base dep: The build system queries for it, +# but doesn't link it for some reason? Either way - probably best to +# depend on it anyway. +# Note about the wayland dep: Appears to be only required for the OpenGL +# canvas, and it seems impossible to disable the X dependency, unless +# I'm missing something. This is an automagic header dep, though. + +PATCHES=( + #"${WORKDIR}"/wxGTK-3.0.5_p20210214/ + "${FILESDIR}/${PN}-3.2.1-gtk3-translation-domain.patch" + #"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 + "${FILESDIR}/${PN}-3.2.1-configure-tests.patch" + "${FILESDIR}/${PN}-3.2.1-wayland-control.patch" + "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch" + "${FILESDIR}/${PN}-3.2.2.1-dont-break-flags.patch" + "${FILESDIR}/${PN}-3.2.2.1-backport-pr24197.patch" +) + +src_prepare() { + default + + # find . -iname Makefile.in -not -path ./samples'/*' \ + # | xargs grep -l WX_RELEASE + local versioned_makefiles=( + ./tests/benchmarks/Makefile.in + ./tests/Makefile.in + ./utils/emulator/src/Makefile.in + ./utils/execmon/Makefile.in + ./utils/wxrc/Makefile.in + ./utils/helpview/src/Makefile.in + ./utils/hhp2cached/Makefile.in + ./utils/screenshotgen/src/Makefile.in + ./utils/ifacecheck/src/Makefile.in + ./Makefile.in + ./demos/life/Makefile.in + ./demos/bombs/Makefile.in + ./demos/fractal/Makefile.in + ./demos/forty/Makefile.in + ./demos/poem/Makefile.in + ) + + # Versionating + sed -i \ + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ + -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\ + -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\ + -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ + "${versioned_makefiles[@]}" || die + + sed -i \ + -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \ + -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \ + -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \ + -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \ + configure || die +} + +multilib_src_configure() { + # Workaround for bug #915154 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + # X independent options + local myeconfargs=( + --with-zlib=sys + --with-expat=sys + --enable-compat30 + --enable-xrc + $(use_with sdl) + $(use_with lzma liblzma) + # Currently defaults to curl, could change. Watch the VDB! + $(use_enable curl webrequest) + + # PCHes are unstable and are disabled in-tree where possible + # See bug #504204 + # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 + $(use_enable pch precomp-headers) + + # Don't hard-code libdir's prefix for wx-config + --libdir='${prefix}'/$(get_libdir) + ) + + # By default, we now build with the GLX GLCanvas because some software like + # PrusaSlicer does not yet support EGL: + # + # https://github.com/prusa3d/PrusaSlicer/issues/9774 . + # + # A solution for this is being developed upstream: + # + # https://github.com/wxWidgets/wxWidgets/issues/22325 . + # + # Any software that needs to use OpenGL under Wayland can be patched like + # this to run under xwayland: + # + # https://github.com/visualboyadvance-m/visualboyadvance-m/commit/aca206a721265366728222d025fec30ee500de82 . + # + # Check that the macro wxUSE_GLCANVAS_EGL is set to 1. + # + myeconfargs+=( "--disable-glcanvasegl" ) + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug && myeconfargs+=( --enable-debug=max ) + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && myeconfargs+=( + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-gtk=3 + --with-libpng=sys + --with-libjpeg=sys + + # Choosing to enable this unconditionally seems fair, pcre2 is + # almost certain to be installed. + --with-regex=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(multilib_native_use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys) + $(use_enable keyring secretstore) + $(use_enable spell spellcheck) + $(use_enable test tests) + $(use_enable wayland) + ) + + # wxBase options + ! use X && myeconfargs+=( --disable-gui ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + emake -C tests + (cd tests && ./test '~[.]~[net]') || die +} + +multilib_src_install_all() { + cd docs || die + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. ) + einstalldocs + + # Unversioned links + rm "${ED}"/usr/bin/wx-config || die + rm "${ED}"/usr/bin/wxrc || die + + # version bakefile presets + pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die + local f + for f in wx*; do + mv "${f}" "${f/wx/wx32gtk3}" || die + done + popd >/dev/null || die +} + +pkg_postinst() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r4.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r4.ebuild new file mode 100644 index 000000000000..a9276d1c119a --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r4.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal flag-o-matic + +WXSUBVERSION="${PV}-gtk3" # 3.2.1-gtk3 +WXVERSION="$(ver_cut 1-3)" # 3.2.1 +# Make sure that this matches the number of components in ${PV} +WXRELEASE="$(ver_cut 1-2)-gtk3" # 3.2-gtk3 +WXRELEASE_NODOT=${WXRELEASE//./} # 32-gtk3 + +DESCRIPTION="GTK version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="https://wxwidgets.org/" +SRC_URI=" + https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 + doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" +S="${WORKDIR}/wxWidgets-${PV}" + +LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" +SLOT="${WXRELEASE}" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit" +REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-eselect/eselect-wxwidgets-20131230 + dev-libs/expat[${MULTILIB_USEDEP}] + dev-libs/libpcre2[pcre16,pcre32,unicode] + sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) + curl? ( net-misc/curl ) + lzma? ( app-arch/xz-utils ) + X? ( + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[wayland?,${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXtst + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + media-libs/fontconfig + x11-libs/pango[${MULTILIB_USEDEP}] + keyring? ( app-crypt/libsecret ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-bad:1.0[${MULTILIB_USEDEP}] + ) + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/opengl[${MULTILIB_USEDEP}] + wayland? ( dev-libs/wayland ) + ) + spell? ( app-text/gspell:= ) + tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) + webkit? ( net-libs/webkit-gtk:4= ) + )" +DEPEND="${RDEPEND} + opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto )" +BDEPEND=" + test? ( >=dev-util/cppunit-1.8.0 ) + >=app-eselect/eselect-wxwidgets-20131230 + virtual/pkgconfig" + +# Note about the gst-plugin-base dep: The build system queries for it, +# but doesn't link it for some reason? Either way - probably best to +# depend on it anyway. +# Note about the wayland dep: Appears to be only required for the OpenGL +# canvas, and it seems impossible to disable the X dependency, unless +# I'm missing something. This is an automagic header dep, though. + +PATCHES=( + #"${WORKDIR}"/wxGTK-3.0.5_p20210214/ + "${FILESDIR}/${PN}-3.2.1-gtk3-translation-domain.patch" + #"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 + "${FILESDIR}/${PN}-3.2.1-configure-tests.patch" + "${FILESDIR}/${PN}-3.2.1-wayland-control.patch" + "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch" + "${FILESDIR}/${PN}-3.2.2.1-dont-break-flags.patch" + "${FILESDIR}/${PN}-3.2.2.1-backport-pr24197.patch" +) + +src_prepare() { + default + + # find . -iname Makefile.in -not -path ./samples'/*' \ + # | xargs grep -l WX_RELEASE + local versioned_makefiles=( + ./tests/benchmarks/Makefile.in + ./tests/Makefile.in + ./utils/emulator/src/Makefile.in + ./utils/execmon/Makefile.in + ./utils/wxrc/Makefile.in + ./utils/helpview/src/Makefile.in + ./utils/hhp2cached/Makefile.in + ./utils/screenshotgen/src/Makefile.in + ./utils/ifacecheck/src/Makefile.in + ./Makefile.in + ./demos/life/Makefile.in + ./demos/bombs/Makefile.in + ./demos/fractal/Makefile.in + ./demos/forty/Makefile.in + ./demos/poem/Makefile.in + ) + + # Versionating + sed -i \ + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ + -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\ + -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\ + -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ + "${versioned_makefiles[@]}" || die + + sed -i \ + -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \ + -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \ + -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \ + -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \ + configure || die +} + +multilib_src_configure() { + # Workaround for bug #915154 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + # X independent options + local myeconfargs=( + --with-zlib=sys + --with-expat=sys + --enable-compat30 + --enable-xrc + $(use_with sdl) + $(use_with lzma liblzma) + # Currently defaults to curl, could change. Watch the VDB! + $(use_enable curl webrequest) + + # PCHes are unstable and are disabled in-tree where possible + # See bug #504204 + # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 + $(use_enable pch precomp-headers) + + # Don't hard-code libdir's prefix for wx-config + --libdir='${prefix}'/$(get_libdir) + ) + + # By default, we now build with the GLX GLCanvas because some software like + # PrusaSlicer does not yet support EGL: + # + # https://github.com/prusa3d/PrusaSlicer/issues/9774 . + # + # A solution for this is being developed upstream: + # + # https://github.com/wxWidgets/wxWidgets/issues/22325 . + # + # Any software that needs to use OpenGL under Wayland can be patched like + # this to run under xwayland: + # + # https://github.com/visualboyadvance-m/visualboyadvance-m/commit/aca206a721265366728222d025fec30ee500de82 . + # + # Check that the macro wxUSE_GLCANVAS_EGL is set to 1. + # + myeconfargs+=( "--disable-glcanvasegl" ) + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug && myeconfargs+=( --enable-debug=max ) + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && myeconfargs+=( + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-gtk=3 + --with-libpng=sys + --with-libjpeg=sys + + # Choosing to enable this unconditionally seems fair, pcre2 is + # almost certain to be installed. + --with-regex=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(multilib_native_use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys) + $(use_enable keyring secretstore) + $(use_enable spell spellcheck) + $(use_enable test tests) + $(use_enable wayland) + ) + + # wxBase options + ! use X && myeconfargs+=( --disable-gui ) + + # wxWidgets installs a configuration file with a reference to EGREP. + # Autoconf discovers these programs via full paths, which is + # unnecessary and fails if a build happened on a merged-usr system + # but is being used on a split-usr system. Bug #927920. + export ac_cv_path_SED="sed" + export ac_cv_path_EGREP="grep -E" + export ac_cv_path_EGREP_TRADITIONAL="grep -E" + export ac_cv_path_FGREP="grep -F" + export ac_cv_path_GREP="grep" + export ac_cv_path_lt_DD="dd" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + emake -C tests + (cd tests && ./test '~[.]~[net]') || die +} + +multilib_src_install_all() { + cd docs || die + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. ) + einstalldocs + + # Unversioned links + rm "${ED}"/usr/bin/wx-config || die + rm "${ED}"/usr/bin/wxrc || die + + # version bakefile presets + pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die + local f + for f in wx*; do + mv "${f}" "${f/wx/wx32gtk3}" || die + done + popd >/dev/null || die +} + +pkg_postinst() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/xapp/Manifest b/x11-libs/xapp/Manifest new file mode 100644 index 000000000000..5ec7ffc08ebf --- /dev/null +++ b/x11-libs/xapp/Manifest @@ -0,0 +1,2 @@ +DIST xapp-2.6.1.tar.gz 270606 BLAKE2B 0f2572b2e9ec4056bea0fc532f5327bd6de4741719a49b68180d45ff00fcea9b760acb362fc39d3f2dc9d94001b7021267a8a84c067aa90c5a201a46be76e97c SHA512 f96006fffac67b312caba644e8da75209c443688b08254b9bb5b17eb9148e66b35a8b1fe336e8880c7b950f8fc696884d8f5d610092c2cb44357ad3bf3ef43c7 +DIST xapp-2.8.2.tar.gz 272539 BLAKE2B 1e2fb92b976196c2e9f36e322656ee40252e4c358a13361a054ead88e6fa3df35a53f1b0ee594df4189a68c1739c4a040558fac533ace095536fcc1dca76954b SHA512 97d19b95626a37fc08a0a159be741de5d9bcc034484e977bd739b91bd37122fcf2f3479285d544282a92c8fa180b116db1ad5e96fe19284c62287d3c5b135163 diff --git a/x11-libs/xapp/files/0001-don-t-install-pastebin-upload-wrapper.patch b/x11-libs/xapp/files/0001-don-t-install-pastebin-upload-wrapper.patch new file mode 100644 index 000000000000..1609c909f4bd --- /dev/null +++ b/x11-libs/xapp/files/0001-don-t-install-pastebin-upload-wrapper.patch @@ -0,0 +1,26 @@ +From 3ef6f2cb9da305ac71d807ac3a51c3c8c345676f Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Sat, 2 Mar 2024 22:12:44 -0500 +Subject: [PATCH] don't install pastebin upload wrapper + +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + scripts/meson.build | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/scripts/meson.build b/scripts/meson.build +index 7b1c1bc..6c31e5d 100644 +--- a/scripts/meson.build ++++ b/scripts/meson.build +@@ -1,7 +1,4 @@ +-scripts = files( +- 'pastebin', +- 'upload-system-info', +- 'xapp-gpu-offload') ++scripts = files('xapp-gpu-offload') + + if get_option('xfce') + scripts += files('xfce4-set-wallpaper') +-- +2.43.0 + diff --git a/x11-libs/xapp/files/xapp-optional-de-options.patch b/x11-libs/xapp/files/xapp-optional-de-options.patch new file mode 100644 index 000000000000..1d054f3dc663 --- /dev/null +++ b/x11-libs/xapp/files/xapp-optional-de-options.patch @@ -0,0 +1,106 @@ +From fda9544509c1b3c2c5417a4b27490e7a07e480ec Mon Sep 17 00:00:00 2001 +From: Sparky Bluefang <sparky@bluefang-logic.com> +Date: Tue, 27 Jun 2023 21:54:08 -0400 +Subject: [PATCH 1/2] Remove unused meson scripts + +--- + libxapp/install_generated_header.py | 12 ------------ + meson-scripts/install_generated_header.py | 12 ------------ + 2 files changed, 24 deletions(-) + delete mode 100644 libxapp/install_generated_header.py + delete mode 100644 meson-scripts/install_generated_header.py + +diff --git a/libxapp/install_generated_header.py b/libxapp/install_generated_header.py +deleted file mode 100644 +index d487ad9..0000000 +--- a/libxapp/install_generated_header.py ++++ /dev/null +@@ -1,12 +0,0 @@ +-#!/usr/bin/python3 +- +-import os +-import sys +-import subprocess +- +-install_dir = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], 'include', 'xapp', 'libxapp') +-header_path = os.path.join(os.environ['MESON_BUILD_ROOT'], 'libxapp', sys.argv[1]) +- +-print("\nInstalling generated header '%s' to %s\n" % (sys.argv[1], install_dir)) +- +-subprocess.call(['cp', header_path, install_dir]) +diff --git a/meson-scripts/install_generated_header.py b/meson-scripts/install_generated_header.py +deleted file mode 100644 +index d487ad9..0000000 +--- a/meson-scripts/install_generated_header.py ++++ /dev/null +@@ -1,12 +0,0 @@ +-#!/usr/bin/python3 +- +-import os +-import sys +-import subprocess +- +-install_dir = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], 'include', 'xapp', 'libxapp') +-header_path = os.path.join(os.environ['MESON_BUILD_ROOT'], 'libxapp', sys.argv[1]) +- +-print("\nInstalling generated header '%s' to %s\n" % (sys.argv[1], install_dir)) +- +-subprocess.call(['cp', header_path, install_dir]) + +From dac2e1ab74c3eb109b928ccba66b805e9a40aaee Mon Sep 17 00:00:00 2001 +From: Sparky Bluefang <sparky@bluefang-logic.com> +Date: Tue, 2 Jan 2024 23:46:57 -0500 +Subject: [PATCH 2/2] Add confiure options for environment specific + integrations + +--- + meson_options.txt | 10 ++++++++++ + scripts/meson.build | 7 +++++-- + status-applets/meson.build | 4 +++- + 3 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index a36933a..3ea5310 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -28,3 +28,13 @@ option('debian_derivative', + value: false, + description: 'Use paths specific to Debian and derivatives.' + ) ++option('mate', ++ type: 'boolean', ++ value: true, ++ description: 'Install mate specific items.' ++) ++option('xfce', ++ type: 'boolean', ++ value: true, ++ description: 'Install xfce specific items.' ++) +diff --git a/scripts/meson.build b/scripts/meson.build +index b210f45..7b1c1bc 100644 +--- a/scripts/meson.build ++++ b/scripts/meson.build +@@ -1,8 +1,11 @@ + scripts = files( + 'pastebin', + 'upload-system-info', +- 'xapp-gpu-offload', +- 'xfce4-set-wallpaper') ++ 'xapp-gpu-offload') ++ ++if get_option('xfce') ++ scripts += files('xfce4-set-wallpaper') ++endif + + install_data(scripts, + install_dir: join_paths(get_option('prefix'), get_option('bindir')), +diff --git a/status-applets/meson.build b/status-applets/meson.build +index 979682e..b464d49 100644 +--- a/status-applets/meson.build ++++ b/status-applets/meson.build +@@ -1 +1,3 @@ +-subdir('mate') ++if get_option('mate') ++ subdir('mate') ++endif diff --git a/x11-libs/xapp/metadata.xml b/x11-libs/xapp/metadata.xml new file mode 100644 index 000000000000..180583c82807 --- /dev/null +++ b/x11-libs/xapp/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>sparky@bluefang-logic.com</email> + <name>Matthew Turnbull</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">linuxmint/xapp</remote-id> + </upstream> + <use> + <flag name="mate">Install integrations for <pkg>mate-base/mate</pkg></flag> + <flag name="xfce">Install integrations for <pkg>xfce-base/xfce4-meta</pkg></flag> + </use> +</pkgmetadata> diff --git a/x11-libs/xapp/xapp-2.6.1.ebuild b/x11-libs/xapp/xapp-2.6.1.ebuild new file mode 100644 index 000000000000..352c01c40923 --- /dev/null +++ b/x11-libs/xapp/xapp-2.6.1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..11} ) +VALA_USE_DEPEND="vapigen" + +inherit gnome2-utils vala meson python-r1 + +DESCRIPTION="Cross-desktop libraries and common resources" +HOMEPAGE="https://github.com/linuxmint/xapp/" +LICENSE="LGPL-3" + +SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" + +SLOT="0" +IUSE="gtk-doc introspection mate" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + >=dev-libs/glib-2.44.0:2 + dev-libs/libdbusmenu[gtk3] + gnome-base/libgnomekbd:= + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] + >=x11-libs/gtk+-3.16.0:3[introspection?] + x11-libs/libxkbfile + x11-libs/libX11 + x11-libs/pango + + mate? ( + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} + $(vala_depend) + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-util/gdbus-codegen + dev-util/glib-utils + sys-apps/dbus + sys-devel/gettext + + gtk-doc? ( dev-util/gtk-doc ) +" + +src_prepare() { + vala_src_prepare + default + + # don't install distro specific tools + sed -i "s/subdir('scripts')/#&/" meson.build || die + + # make mate integrations optional + if ! use mate; then + sed -i "s/subdir('mate')/#&/" status-applets/meson.build || die + fi + + # Fix meson helpers + python_setup + python_fix_shebang . +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc docs) + -Dpy-overrides-dir="/pygobject" + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # copy pygobject files to each active python target + # work-around for "py-overrides-dir" only supporting a single target + install_pygobject_override() { + PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die) + einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}" + mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die + cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die + python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/" + } + python_foreach_impl install_pygobject_override + rm -r "${D}/pygobject" || die +} + +pkg_postinst() { + xdg_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/x11-libs/xapp/xapp-2.8.2-r1.ebuild b/x11-libs/xapp/xapp-2.8.2-r1.ebuild new file mode 100644 index 000000000000..e98da20b7e9c --- /dev/null +++ b/x11-libs/xapp/xapp-2.8.2-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..12} ) +VALA_USE_DEPEND="vapigen" + +inherit gnome2-utils vala meson python-r1 + +DESCRIPTION="Cross-desktop libraries and common resources" +HOMEPAGE="https://github.com/linuxmint/xapp/" +LICENSE="LGPL-3 xfce? ( GPL-3 )" + +SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" + +SLOT="0" +IUSE="gtk-doc introspection mate xfce" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + >=dev-libs/glib-2.44.0:2 + dev-libs/libdbusmenu[gtk3] + gnome-base/libgnomekbd:= + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] + >=x11-libs/gtk+-3.22.0:3[introspection?] + x11-libs/libxkbfile + x11-libs/libX11 + x11-libs/pango +" +RDEPEND=" + ${PYTHON_DEPS} + ${DEPEND} + dev-python/pygobject:3[${PYTHON_USEDEP}] +" +BDEPEND=" + ${PYTHON_DEPS} + $(vala_depend) + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-util/gdbus-codegen + dev-util/glib-utils + sys-apps/dbus + sys-devel/gettext + + gtk-doc? ( + dev-util/gtk-doc + ) +" + +PATCHES=( + # Make desktop environment integrations optional + # https://github.com/linuxmint/xapp/pull/176 + "${FILESDIR}"/${PN}-optional-de-options.patch + + # don't install pastebin upload wrapper + "${FILESDIR}"/0001-don-t-install-pastebin-upload-wrapper.patch +) + +src_prepare() { + vala_src_prepare + default + + # Fix meson helpers + python_setup + python_fix_shebang . +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc docs) + $(meson_use mate) + $(meson_use xfce) + -Dpy-overrides-dir="/pygobject" + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # copy pygobject files to each active python target + # work-around for "py-overrides-dir" only supporting a single target + install_pygobject_override() { + PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die) + einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}" + mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die + cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die + python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/" + } + python_foreach_impl install_pygobject_override + rm -r "${D}/pygobject" || die +} + +pkg_postinst() { + xdg_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest deleted file mode 100644 index aaa8dbcf4ab2..000000000000 --- a/x11-libs/xapps/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST xapps-1.4.2.tar.gz 69709 BLAKE2B 514e4cb2e614ccd9fa303625eb5ffb818847447b29d6d989c2abdc90b6b9840dac6124d8484b71ffc2e489a925f83dae597c0904aa79cd5d5a0c27d44420da96 SHA512 2d16bd893a16876270c41d755c62ca454f561931750acc719c480e63036b70dca8dae25e6a313f13ed0daae09fd650e0efcef9d272c405ccd9c04147aaf59fe2 -DIST xapps-1.8.4.tar.gz 179340 BLAKE2B f6558b87320cbd73e73c5294f48a3c0c94c7239abc9ede9cd88e66ccd53fd0c9cba9c638837efbd5eecd8a4f372262fde759e05ba9e97ad9955ab74464c34c21 SHA512 483e8e334d4883e2172e06835d690d20af2752fcc195f63776053b83abc0ffcb25c757633450a02b153e70e67e98c477754de12169c167a2f9f3fea103e12bad diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapps/metadata.xml deleted file mode 100644 index 0f3abac753e0..000000000000 --- a/x11-libs/xapps/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>olivier.laurantin@laposte.net</email> - <name>Olivier Laurantin</name> - </maintainer> - <maintainer type="project"> - <email>cinnamon@gentoo.org</email> - <name>Cinnamon Project</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <maintainer type="person"> - <email>sparky@bluefang-logic.com</email> - <name>Matthew Turnbull</name> - </maintainer> - <upstream> - <remote-id type="github">linuxmint/xapps</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/xapps/xapps-1.4.2.ebuild b/x11-libs/xapps/xapps-1.4.2.ebuild deleted file mode 100644 index 91cf0720f3f4..000000000000 --- a/x11-libs/xapps/xapps-1.4.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -VALA_USE_DEPEND="vapigen" -inherit vala meson gnome2-utils xdg-utils - -DESCRIPTION="Cross-desktop libraries and common resources" -HOMEPAGE="https://github.com/linuxmint/xapps/" -LICENSE="GPL-3" - -SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 x86" - -SLOT="0" -IUSE="introspection static-libs" - -RDEPEND=" - >=dev-libs/glib-2.37.3:2 - dev-libs/gobject-introspection:0= - gnome-base/libgnomekbd - gnome-base/gnome-common - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] - >=x11-libs/gtk+-3.3.16:3[introspection?] - x11-libs/libxkbfile -" -DEPEND="${RDEPEND} - sys-devel/gettext - dev-util/gtk-doc - dev-util/gtk-doc-am - $(vala_depend) -" - -src_prepare() { - xdg_environment_reset - vala_src_prepare - default -} - -src_configure() { - meson_src_configure \ - -Dwith-docs=true -} - -src_install() { - meson_src_install - rm -rf "${ED%/}"/usr/bin || die - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-libs/xapps/xapps-1.8.4.ebuild b/x11-libs/xapps/xapps-1.8.4.ebuild deleted file mode 100644 index 6e106233d427..000000000000 --- a/x11-libs/xapps/xapps-1.8.4.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -VALA_USE_DEPEND="vapigen" -inherit gnome2-utils vala meson python-r1 xdg-utils - -DESCRIPTION="Cross-desktop libraries and common resources" -HOMEPAGE="https://github.com/linuxmint/xapps/" -LICENSE="GPL-3" - -SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -SLOT="0" -IUSE="gtk-doc introspection static-libs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.37.3:2 - dev-libs/gobject-introspection:0= - gnome-base/libgnomekbd - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] - >=x11-libs/gtk+-3.3.16:3[introspection?] - x11-libs/libxkbfile - dev-libs/libdbusmenu[gtk3] -" -DEPEND="${RDEPEND} - sys-devel/gettext - gtk-doc? ( dev-util/gtk-doc ) - $(vala_depend) -" -BDEPEND=" - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-util/gdbus-codegen - >=dev-util/intltool-0.40.6 - sys-devel/gettext -" - -src_prepare() { - xdg_environment_reset - vala_src_prepare - default -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc docs) - -Dpy-overrides-dir="/pygobject" - ) - meson_src_configure -} - -src_install() { - meson_src_install - rm -rf "${ED}/usr/bin" || die - - # package provides .pc files - find "${D}" -name '*.la' -delete || die - - # copy pygobject files to each active python target - # work-around for "py-overrides-dir" only supporting a single target - install_pygobject_override() { - PYTHON_GI_OVERRIDESDIR=$("${PYTHON}" -c 'import gi;print(gi._overridesdir)') || die - einfo "gobject overrides directory: $PYTHON_GI_OVERRIDESDIR" - mkdir -p "${ED}/$PYTHON_GI_OVERRIDESDIR/" - cp -r "${D}"/pygobject/* "${ED}/$PYTHON_GI_OVERRIDESDIR/" || die - python_optimize - } - python_foreach_impl install_pygobject_override - rm -rf "${D}/pygobject" || die -} - -pkg_postinst() { - xdg_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_icon_cache_update - gnome2_schemas_update -} diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml index ff903b86644f..de21169f5ddf 100644 --- a/x11-libs/xbae/metadata.xml +++ b/x11-libs/xbae/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild index 053b59bd7120..7d79a5fa59f3 100644 --- a/x11-libs/xbae/xbae-4.60.4.ebuild +++ b/x11-libs/xbae/xbae-4.60.4.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet" HOMEPAGE="http://xbae.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples" # tests need X display # and are interactive so virtualx will not help diff --git a/x11-libs/xcb-imdkit/Manifest b/x11-libs/xcb-imdkit/Manifest new file mode 100644 index 000000000000..62b402c98894 --- /dev/null +++ b/x11-libs/xcb-imdkit/Manifest @@ -0,0 +1,2 @@ +DIST xcb-imdkit-1.0.7.tar.xz 346244 BLAKE2B 32cfd7d278ce8d65c2b2dec033ae0b4bb3e18f7b91e620788c797192dcb94a1c578930ac816fc7298d01362fb7abb9b461e1aec918164433b01aea6c85c47ecd SHA512 222b6fa4e699832c9ff926ebed6ca6c959aa2a55a9aebe9c8824ca1d84dcd4d699bbe75e4ceb36453340be9dcd86e0dbad01553d01e89c3a4ba6d48ff1f100a4 +DIST xcb-imdkit-1.0.8.tar.zst 580618 BLAKE2B 760f9a65692986b2bbb359f919e209a5c0ef42b302b25dbb1892cf9bc986b3d9c05963ac454bc4b3ad42f7c2b3549cb5e1c3bbd29fcb39aa03490cb20c00c2d6 SHA512 318106904d1dca79d006e91f21dd965ff486be72edc790a79100908e588e8c26b9faa505daa45d59789feeac8f01a132f14c9509ac68c8ebc43af5719774443d diff --git a/x11-libs/xcb-imdkit/metadata.xml b/x11-libs/xcb-imdkit/metadata.xml new file mode 100644 index 000000000000..538010282c48 --- /dev/null +++ b/x11-libs/xcb-imdkit/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <maintainer status="active"> + <name>Weng Xuetian</name> + </maintainer> + <bugs-to>https://github.com/fcitx/xcb-imdkit/issues</bugs-to> + <remote-id type="github">fcitx/xcb-imdkit</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-libs/xcb-imdkit/xcb-imdkit-1.0.7.ebuild b/x11-libs/xcb-imdkit/xcb-imdkit-1.0.7.ebuild new file mode 100644 index 000000000000..77009381c920 --- /dev/null +++ b/x11-libs/xcb-imdkit/xcb-imdkit-1.0.7.ebuild @@ -0,0 +1,35 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Input method development support for xcb" +HOMEPAGE="https://github.com/fcitx/xcb-imdkit" +SRC_URI="https://download.fcitx-im.org/fcitx5/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +RDEPEND=" + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms +" +DEPEND=" + ${RDEPEND} + dev-libs/uthash +" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_UTHASH=ON + ) + cmake_src_configure +} diff --git a/x11-libs/xcb-imdkit/xcb-imdkit-1.0.8.ebuild b/x11-libs/xcb-imdkit/xcb-imdkit-1.0.8.ebuild new file mode 100644 index 000000000000..fe5d788eb8b3 --- /dev/null +++ b/x11-libs/xcb-imdkit/xcb-imdkit-1.0.8.ebuild @@ -0,0 +1,35 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake unpacker + +DESCRIPTION="Input method development support for xcb" +HOMEPAGE="https://github.com/fcitx/xcb-imdkit" +SRC_URI="https://download.fcitx-im.org/fcitx5/${PN}/${P}.tar.zst" + +LICENSE="LGPL-2.1" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +RDEPEND=" + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms +" +DEPEND=" + ${RDEPEND} + dev-libs/uthash +" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_UTHASH=ON + ) + cmake_src_configure +} diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest index ee189ce86170..182984dd9867 100644 --- a/x11-libs/xcb-util-cursor/Manifest +++ b/x11-libs/xcb-util-cursor/Manifest @@ -1 +1 @@ -DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21 +DIST xcb-util-cursor-0.1.5.tar.xz 266788 BLAKE2B a6c2d3d539191fdf896814711f7483ddd5e450dbd11293d8fbf9b04a05ebc3a0e2374b910bc43dd57a8d33936c611048a1ba20563f2df585b5ceed69332c1942 SHA512 e2d14c3f0ab117524ba90d1a992b61717ccee04bc9e66c587a6a0f10571f15e89fc5db3413882ca7ce14ebc07b6b7b0a4ddecd59ba910e6ca654ea9b1c705ed5 diff --git a/x11-libs/xcb-util-cursor/metadata.xml b/x11-libs/xcb-util-cursor/metadata.xml index e943b72b8a48..a332e74fc227 100644 --- a/x11-libs/xcb-util-cursor/metadata.xml +++ b/x11-libs/xcb-util-cursor/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-cursor</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild deleted file mode 100644 index 89c2412cb38e..000000000000 --- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MODULE=/ -XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-2 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor.git" -EGIT_HAS_SUBMODULES=yes - -DESCRIPTION="X C-language Bindings sample implementations" -HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] - >=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}] - >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=x11-base/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}] - x11-base/xorg-proto - >=dev-util/gperf-3.0.1 - test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_with doc doxygen) - --with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps' - ) - - xorg-2_src_configure -} diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild new file mode 100644 index 000000000000..ccdf4c68655e --- /dev/null +++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X C-language Bindings sample implementations" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}] + >=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}] + >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + >=x11-base/xcb-proto-1.8-r3:= + x11-base/xorg-proto" +BDEPEND=">=dev-util/gperf-3.0.1" + +XORG_CONFIGURE_OPTIONS=( + --with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps' +) diff --git a/x11-libs/xcb-util-errors/Manifest b/x11-libs/xcb-util-errors/Manifest new file mode 100644 index 000000000000..ebc06fda3d0e --- /dev/null +++ b/x11-libs/xcb-util-errors/Manifest @@ -0,0 +1 @@ +DIST xcb-util-errors-1.0.1.tar.xz 268052 BLAKE2B cdcac4234110441e4a115e339fcf3462cb0aa75297c8eb1bdf5c6bf9305996dd2021321e40a274c369191dc68de9f0fa8f42a919c80307c2aa10e856e073cf01 SHA512 e883e178921a6f783e0100acae66eaf0ed13fc169fd21b0c313d7a70c9358c129b01b117675eda50e258e8b3b27ff7b21aa4d15c4da69249ffc6bbc7dcf87d4a diff --git a/x11-libs/xcb-util-errors/metadata.xml b/x11-libs/xcb-util-errors/metadata.xml new file mode 100644 index 000000000000..3f17fbc10883 --- /dev/null +++ b/x11-libs/xcb-util-errors/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-errors</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-libs/xcb-util-errors/xcb-util-errors-1.0.1-r1.ebuild b/x11-libs/xcb-util-errors/xcb-util-errors-1.0.1-r1.ebuild new file mode 100644 index 000000000000..5d519c7d5a3f --- /dev/null +++ b/x11-libs/xcb-util-errors/xcb-util-errors-1.0.1-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +XORG_TARBALL_SUFFIX="xz" +inherit python-any-r1 xorg-3 + +DESCRIPTION="Library that gives human readable names to XCB error, event, & request codes" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-errors" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +RDEPEND=">=x11-libs/libxcb-1.9.1:=" +DEPEND="${RDEPEND} + x11-base/xcb-proto" +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]') +" + +python_check_deps() { + python_has_version "x11-base/xcb-proto[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup + xorg-3_pkg_setup +} diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest index d2e3e2bd680d..20ad5ca8b31e 100644 --- a/x11-libs/xcb-util-image/Manifest +++ b/x11-libs/xcb-util-image/Manifest @@ -1 +1 @@ -DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f +DIST xcb-util-image-0.4.1.tar.xz 289016 BLAKE2B 7f1c7c3da950604adf4a22146e9bd3b77fb3b0d35f0a1bb17a1eefeb1ba5546d58a3e40ac0c130d67ebcbc8bdaf40ef734ff19434f66bd57bc4a4a849a88cf82 SHA512 9b47ba38b91196d76541b6ccabeaf291d3b91036f15422909cd6a79b3fd1a9786d5b1728e411bc41cfdf3d60a253485f4ef7c65ffa6ae646fa93439ec782746e diff --git a/x11-libs/xcb-util-image/metadata.xml b/x11-libs/xcb-util-image/metadata.xml index e943b72b8a48..c8a814d0cc52 100644 --- a/x11-libs/xcb-util-image/metadata.xml +++ b/x11-libs/xcb-util-image/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-image</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild deleted file mode 100644 index 482024f64369..000000000000 --- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MODULE=/ -XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-2 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git" - -DESCRIPTION="X C-language Bindings sample implementations" -HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="x11-base/xorg-proto - >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}] - >=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=dev-util/gperf-3.0.1 - test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_with doc doxygen) - ) - xorg-2_src_configure -} diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild new file mode 100644 index 000000000000..160c47d95fa8 --- /dev/null +++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X C-language Bindings sample implementations" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}] + >=x11-libs/xcb-util-0.4:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest index 5b8dccf32cd9..c32fd2c38a1b 100644 --- a/x11-libs/xcb-util-keysyms/Manifest +++ b/x11-libs/xcb-util-keysyms/Manifest @@ -1 +1 @@ -DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4 +DIST xcb-util-keysyms-0.4.1.tar.xz 259860 BLAKE2B 15d08761c673647fda2d8faf7fd47b817f7068cde157384d7ea879b0a50983eb97ea6f4b593c26d631419ee59a128f7fb5b3ca029dedf14f6629096fcb49ed7b SHA512 dd53a36b52647f22bf0da8cded4b2974a51899eaac799797017ed8534f14bc2d2d339a14fa5ef387ae4528b7d9a5d31920bb0c71b09ca34f58e5081e768e2bbf diff --git a/x11-libs/xcb-util-keysyms/metadata.xml b/x11-libs/xcb-util-keysyms/metadata.xml index e943b72b8a48..04e11fd9dabd 100644 --- a/x11-libs/xcb-util-keysyms/metadata.xml +++ b/x11-libs/xcb-util-keysyms/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-keysyms</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild deleted file mode 100644 index e7d51513b02a..000000000000 --- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MODULE=/ -XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-2 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git" - -DESCRIPTION="X C-language Bindings sample implementations" -HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=dev-util/gperf-3.0.1 - x11-base/xorg-proto - test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_with doc doxygen) - ) - xorg-2_src_configure -} diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild new file mode 100644 index 000000000000..6905e72cb18f --- /dev/null +++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X C-language Bindings sample implementations" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest index 3be66bee4e0a..139df2b654d4 100644 --- a/x11-libs/xcb-util-renderutil/Manifest +++ b/x11-libs/xcb-util-renderutil/Manifest @@ -1 +1 @@ -DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc +DIST xcb-util-renderutil-0.3.10.tar.xz 262028 BLAKE2B 49b017fed34cd1c8cceae697bf76dc17c34c32dcc05acaff87c75f74fcd486bc0abc9fe4699cc989c1afd13ac33fc04092719209e9d48aceb5e35d64a5790393 SHA512 9cfa9201be2df7c0b832e1e1fe506e7c7a1e0f2b1b1d4a4b58620eadc241190a36478fa3ea27c32047fa79bf199f17dcd0b106853dbf5eda8cd584f3fc2b0c15 diff --git a/x11-libs/xcb-util-renderutil/metadata.xml b/x11-libs/xcb-util-renderutil/metadata.xml index e943b72b8a48..05de8ed16cbd 100644 --- a/x11-libs/xcb-util-renderutil/metadata.xml +++ b/x11-libs/xcb-util-renderutil/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-render-util</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild new file mode 100644 index 000000000000..ecee995a6153 --- /dev/null +++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X C-language Bindings sample implementations" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild deleted file mode 100644 index 304d5773da98..000000000000 --- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MODULE=/ -XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-2 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util.git" -EGIT_HAS_SUBMODULES=yes - -DESCRIPTION="X C-language Bindings sample implementations" -HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=dev-util/gperf-3.0.1 - test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_with doc doxygen) - ) - - xorg-2_src_configure -} diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest index 0e27033a1a91..c6c13ba4c33d 100644 --- a/x11-libs/xcb-util-wm/Manifest +++ b/x11-libs/xcb-util-wm/Manifest @@ -1 +1 @@ -DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326 +DIST xcb-util-wm-0.4.2.tar.xz 285152 BLAKE2B 091bdfe318d0ab37df934dd4ea75382a8792577e60471dd6bfb3de8966a9ac9c25c8776a9fa7afb0a0b924f952ebc17084070f1fcfe9665cb5c0e1b2d576d39b SHA512 eab6588e6a47d28a3b25ecd13b5018529419db6b49c74458c093699b60a194933be1e1f6f7799abf03344f7ebc7af88586ff2935938d53644bdd5c763a7fa9b0 diff --git a/x11-libs/xcb-util-wm/metadata.xml b/x11-libs/xcb-util-wm/metadata.xml index e943b72b8a48..808c3a272e7b 100644 --- a/x11-libs/xcb-util-wm/metadata.xml +++ b/x11-libs/xcb-util-wm/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-wm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild deleted file mode 100644 index 160f8dc8699f..000000000000 --- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MODULE=/ -XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-2 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git" -EGIT_HAS_SUBMODULES=yes - -DESCRIPTION="X C-language Bindings sample implementations" -HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=dev-util/gperf-3.0.1 - test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_with doc doxygen) - ) - xorg-2_src_configure -} diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild new file mode 100644 index 000000000000..a51d4ac3ceea --- /dev/null +++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X C-language Bindings sample implementations" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/xcb-util-xrm/metadata.xml b/x11-libs/xcb-util-xrm/metadata.xml index 2b0c7132c378..c87b1348b281 100644 --- a/x11-libs/xcb-util-xrm/metadata.xml +++ b/x11-libs/xcb-util-xrm/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <longdescription> The XCB util modules provides a number of libraries which sit on top diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild index 97a2a94bdd05..8bda1a04bbb9 100644 --- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild +++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild @@ -1,26 +1,20 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -XORG_BASE_INDIVIDUAL_URI="" -XORG_DOC=doc XORG_MULTILIB=yes -inherit xorg-2 +inherit xorg-3 DESCRIPTION="X C-language Bindings sample implementations" HOMEPAGE="https://xcb.freedesktop.org/" SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" -RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] +RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}] x11-libs/xcb-util[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) + x11-base/xorg-proto x11-libs/libX11[${MULTILIB_USEDEP}]" # Only for tests, but configure.ac requires it - -src_configure() { - xorg-2_src_configure -} diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest index 9e1dd3166720..a0db880a16e0 100644 --- a/x11-libs/xcb-util/Manifest +++ b/x11-libs/xcb-util/Manifest @@ -1 +1 @@ -DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e +DIST xcb-util-0.4.1.tar.xz 267396 BLAKE2B bcde73073590c56771af6233f1a04a692197a756ef9ce70b6e0bd3625ad6d61f99f4c671dcfae39c8dd66e3225f40f7e9b42dd115ffe83a561e48a9808bf00e3 SHA512 da67f2f017d2a1788dcf35f28d6956e171303a622a1dd085cd3d69fdb2ed77965d83c557cc926ebf9b32e905eb2cbb5921987250192d78a2f5edc4d437ed7d2b diff --git a/x11-libs/xcb-util/metadata.xml b/x11-libs/xcb-util/metadata.xml index e943b72b8a48..43dcf8588bb3 100644 --- a/x11-libs/xcb-util/metadata.xml +++ b/x11-libs/xcb-util/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-util</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild deleted file mode 100644 index 36b3edb1583c..000000000000 --- a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MODULE=/ -XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-2 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git" - -DESCRIPTION="X C-language Bindings sample implementations" -HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - >=dev-util/gperf-3.0.1 - test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )" - -PDEPEND=" - >=x11-libs/xcb-util-cursor-0.1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/xcb-util-image-${PV}:=[${MULTILIB_USEDEP}] - >=x11-libs/xcb-util-keysyms-${PV}:=[${MULTILIB_USEDEP}] - >=x11-libs/xcb-util-renderutil-0.3.9:=[${MULTILIB_USEDEP}] - >=x11-libs/xcb-util-wm-${PV}:=[${MULTILIB_USEDEP}] -" - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_with doc doxygen) - ) - xorg-2_src_configure -} diff --git a/x11-libs/xcb-util/xcb-util-0.4.1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.1.ebuild new file mode 100644 index 000000000000..a21d2b9359dc --- /dev/null +++ b/x11-libs/xcb-util/xcb-util-0.4.1.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X C-language Bindings sample implementations" +HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/xforms/files/xforms-1.2.4-fno-common.patch b/x11-libs/xforms/files/xforms-1.2.4-fno-common.patch new file mode 100644 index 000000000000..fd4ca7714fcf --- /dev/null +++ b/x11-libs/xforms/files/xforms-1.2.4-fno-common.patch @@ -0,0 +1,40 @@ +Description: Fix FTBFS with GCC 10 +Author: Paul Wise <pabs@debian.org> +Bug-Debian: https://bugs.debian.org/957439 +Origin: upstream, extracted from two separate commits: + https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=9806bce102d0c079c2c486b25ae6bdac3c98eecf + https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=2c1a9f151baf50887a517280645ec23379fb96f8 +--- a/fdesign/sp_spinner.c ++++ b/fdesign/sp_spinner.c +@@ -29,7 +29,7 @@ + #include "spec/spinner_spec.h" + + static FD_spinnerattrib * spn_attrib; +-FL_OBJECT *curobj; ++static FL_OBJECT *curobj; + + + /*************************************** +--- a/fdesign/sp_twheel.c ++++ b/fdesign/sp_twheel.c +@@ -38,7 +38,7 @@ + #include "spec/twheel_spec.h" + + static FD_twheelattrib * twheel_attrib; +-FL_OBJECT * curobj; ++static FL_OBJECT * curobj; + + + /*************************************** +--- a/lib/objects.c ++++ b/lib/objects.c +@@ -36,6 +36,9 @@ + + #define TRANSLATE_Y( obj, form ) ( form->h - obj->h - obj->y ) + ++extern FL_OBJECT * fli_handled_obj; /* defined in events.c */ ++extern FL_OBJECT * fli_handled_parent; /* defined in events.c */ ++ + extern FL_FORM * fli_fast_free_object; /* defined in forms.c */ + + extern FL_OBJECT * fli_handled_obj; /* defined in events.c */ diff --git a/x11-libs/xforms/metadata.xml b/x11-libs/xforms/metadata.xml index 58c1077b82e4..115e9d64a669 100644 --- a/x11-libs/xforms/metadata.xml +++ b/x11-libs/xforms/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-libs/xforms/xforms-1.2.4.ebuild b/x11-libs/xforms/xforms-1.2.4-r1.ebuild index cf658a52cc1a..7681e0333f9f 100644 --- a/x11-libs/xforms/xforms-1.2.4.ebuild +++ b/x11-libs/xforms/xforms-1.2.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools eutils ltprune +inherit autotools MY_P="${P/-/_}" @@ -13,8 +13,8 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="doc opengl static-libs" +KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc opengl" RDEPEND=" virtual/jpeg:0= @@ -29,6 +29,8 @@ DEPEND=" S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + DOCS=( ChangeLog README ) src_prepare() { @@ -40,10 +42,10 @@ src_configure() { econf \ $(use_enable doc docs) \ $(use_enable opengl gl) \ - $(use_enable static-libs static) + --disable-static } src_install() { default - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } diff --git a/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch index 8446297f15ce..6aabea7b0d29 100644 --- a/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch +++ b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch @@ -3,8 +3,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=286632 This patch disables reordering and duplicate removing for non-libs arguments, thus --param and alike gcc options may be used safe now. written by Andrew Savchenko ---- script/xosd-config.in.orig -+++ script/xosd-config.in +--- a/script/xosd-config.in ++++ b/script/xosd-config.in @@ -161,7 +161,6 @@ fi;; *) diff --git a/x11-libs/xosd/metadata.xml b/x11-libs/xosd/metadata.xml index 191f4f0bda1b..e68094ce0644 100644 --- a/x11-libs/xosd/metadata.xml +++ b/x11-libs/xosd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!--maintainer-needed--> <upstream> diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild index a25c22f6e5fd..eea6affd7bca 100644 --- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild +++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild @@ -1,22 +1,24 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils autotools versionator +EAPI=7 -MY_PV=$(get_version_component_range 1-3) -MY_PATCH_MAJ=$(get_version_component_range 4) -MY_PATCH_MIN=$(get_version_component_range 5) +inherit autotools + +MY_PV=$(ver_cut 1-3) +MY_PATCH_MAJ=$(ver_cut 5) +MY_PATCH_MIN=$(ver_cut 7) DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display" HOMEPAGE="https://sourceforge.net/projects/libxosd/" SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}.orig.tar.gz mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}-${MY_PATCH_MAJ/p/}.${MY_PATCH_MIN/p/}.debian.tar.xz http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2" +S="${WORKDIR}"/${PN}-${MY_PV} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="static-libs xinerama" RDEPEND="x11-libs/libX11 @@ -24,22 +26,28 @@ RDEPEND="x11-libs/libX11 x11-libs/libXt media-fonts/font-misc-misc" DEPEND="${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" DOCS=( AUTHORS ChangeLog NEWS README TODO ) -S=${WORKDIR}/${PN}-${MY_PV} -src_prepare() { - epatch "${WORKDIR}"/debian/patches/*.diff +PATCHES=( + "${WORKDIR}"/debian/patches/20_underquoted_definition.diff + "${WORKDIR}"/debian/patches/25_fix_mangapges.diff + "${WORKDIR}"/debian/patches/30_aclocal.diff + "${WORKDIR}"/debian/patches/328676.diff + "${WORKDIR}"/debian/patches/35_beep_media_player.diff + "${WORKDIR}"/debian/patches/54_fix_man_makefile.diff # bug #286632 - epatch "${FILESDIR}"/"${PN}"-config-incorrect-dup-filter-fix.patch + "${FILESDIR}"/${PN}-config-incorrect-dup-filter-fix.patch +) - eapply_user +src_prepare() { + default - AT_M4DIR="${WORKDIR}/m4" eautoreconf + AT_M4DIR="${WORKDIR}"/m4 eautoreconf } src_configure() { diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest index d53473e47016..e48687e99cc5 100644 --- a/x11-libs/xpa/Manifest +++ b/x11-libs/xpa/Manifest @@ -1,3 +1 @@ -DIST xpa-2.1.15.tar.gz 861859 BLAKE2B 4ca3dd5dbfe6c5a39c1ed73db287d3fb4fe0e0eb1ec61086a7990f4a902a2a98e187e9ef34e1025861ed98fbce3d8ec644bd2d171f5698e82c435f91eda8aacc SHA512 62b453eb138197b452fca8d1ded1df97be54bcfbd13a0d5fecafc206c1589913c7d09593247077fb07c8b66a87ac0b22b95dfe74c49f2bd0abb942942fa87ce8 -DIST xpa-2.1.17.tar.gz 900465 BLAKE2B 0f61b40ef9944497286afe7f0f3a5c54d9db5d8e35ff4ee2ffbe85e1b51e24dc496731560bd8e6aa5b5b715d81568f35d11c8fdf22358306d6a2b52814e82586 SHA512 c9742b8427a9d8512a429f5a3b2bc6a55803b975c1524ead64906a4387a589f229e8715c46814b7b1bfb30a05f2f5fe59e944e1dabc333fcceca71c569a05a50 DIST xpa-2.1.18.tar.gz 900579 BLAKE2B bce33b30235e17309979e6e91d6508286403b476ee890c437985a434145992c442b1b3fd923da2658bb7d0dd6656ffa93bc20d2e8ff8bedb7438b9cbfa48e6a1 SHA512 4482325338ed15b70a1a934d8ba848712a4eed7546b4197fc89baa93dc80df1be29170a7350453f176d45264fae6f0474d136e487c0239d9e97dbd09dd8d0b19 diff --git a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch index 34aeed5b39dd..1ceb29dbfcb2 100644 --- a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch +++ b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch @@ -1,5 +1,5 @@ ---- a/Makefile.in 2016-12-19 19:21:28.566222982 +0000 -+++ b/Makefile.in 2016-12-19 19:23:23.795246443 +0000 +--- a/Makefile.in ++++ b/Makefile.in @@ -28,6 +28,11 @@ prefix = @prefix@ @@ -37,24 +37,33 @@ # Platform-specific X compiler flags (include file specifications) X_CFLAGS = @X_CFLAGS@ -@@ -177,7 +182,7 @@ +@@ -173,12 +178,12 @@ + + $(LIB): $(LIBOBJS) + $(RM) $(LIB) +- ar crv $(LIB) $(LIBOBJS) ++ $(AR) crv $(LIB) $(LIBOBJS) $(RANLIB) $(LIB) shlib: $(LIB) - @(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \ +- (cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \ + @(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \ - (cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \ ++ (cd lib$(PACKAGE).tmp && $(AR) x ../lib$(PACKAGE).a); \ rm -f lib$(PACKAGE).tmp/xt*.o; \ rm -f lib$(PACKAGE).tmp/tcl*.o; \ -@@ -193,7 +198,7 @@ + CC='$(CC)' CXX=$(CXX) \ +@@ -193,8 +198,8 @@ -lwsock32 tclxpa: $(LIB) - @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \ +- (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \ + @(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \ - (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \ ++ (cd libtclxpa.tmp && $(AR) x ../lib$(PACKAGE).a); \ rm -f libtclxpa.tmp/xt*.o; \ CC='$(CC)' CXX=$(CXX) \ + ./mklib -o tclxpa libtclxpa.tmp/*.o $(TCL_LIBS); \ @@ -275,7 +280,7 @@ do \ if [ ! -d $$i ] ; then \ @@ -108,3 +117,26 @@ cp -p -R ./man/* $(DISTDIR)/man/.) release: dist +--- a/mklib ++++ b/mklib +@@ -211,9 +211,9 @@ + if [ "x$LINK" = "x" ] ; then + # -linker was not specified so set default link command now + if [ $CPLUSPLUS = 1 ] ; then +- LINK=g++ ++ LINK=${CXX} + else +- LINK=gcc ++ LINK=${CC} + fi + fi + +@@ -248,7 +248,7 @@ + elif [ $STATIC = 1 ] ; then + LIBNAME="lib${LIBNAME}.a" # prefix with "lib", suffix with ".a" + echo "mklib: Making" $ARCH "static library: " ${LIBNAME} +- LINK="ar" ++ LINK="${AR}" + OPTS="-ru" + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} diff --git a/x11-libs/xpa/files/xpa-2.1.8-makefile.patch b/x11-libs/xpa/files/xpa-2.1.8-makefile.patch deleted file mode 100644 index 290309662bb5..000000000000 --- a/x11-libs/xpa/files/xpa-2.1.8-makefile.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- Makefile.in.orig 2008-11-03 12:05:33.000000000 +0000 -+++ Makefile.in 2008-11-03 12:07:48.000000000 +0000 -@@ -28,6 +28,11 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+libdir = @libdir@ -+datadir = @datadir@ -+mandir = @mandir@ -+includedir = @includedir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -37,19 +42,19 @@ - INSTALL_ROOT = - - # Directory in which to install the .a or .so binary for the XPA library: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the program wish: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include file xpa.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) - - # Top-level directory for manual entries: --MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) - - # Top-level directory for share entries: --MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/xpa -+MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/xpa - - # Platform-specific X compiler flags (include file specifications) - X_CFLAGS = @X_CFLAGS@ -@@ -175,7 +180,7 @@ - $(RANLIB) $(LIB) - - shlib: $(LIB) -- @(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \ -+ @(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \ - (cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \ - rm -f lib$(PACKAGE).tmp/xt*.o; \ - rm -f lib$(PACKAGE).tmp/tcl*.o; \ -@@ -184,7 +189,7 @@ - rm -rf lib$(PACKAGE).tmp) - - tclxpa: $(LIB) -- @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \ -+ @(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \ - (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \ - rm -f libtclxpa.tmp/xt*.o; \ - CC='$(CC)' CXX=$(CXX) \ -@@ -259,7 +264,7 @@ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -@@ -281,7 +286,7 @@ - install-man: - @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \ - echo "Making directory $(MAN_INSTALL_DIR)"; \ -- mkdir $(MAN_INSTALL_DIR); \ -+ mkdir -p $(MAN_INSTALL_DIR); \ - chmod 755 $(MAN_INSTALL_DIR); \ - else true; \ - fi; -@@ -292,7 +297,7 @@ - M="$(MAN_INSTALL_DIR)/man$$E"; \ - if [ ! -d $$M ] ; then \ - echo "Making directory $$M"; \ -- mkdir $$M; \ -+ mkdir -p $$M; \ - chmod 755 $$M; \ - else true; \ - fi; \ diff --git a/x11-libs/xpa/metadata.xml b/x11-libs/xpa/metadata.xml index bb77c4ecb722..23941e947688 100644 --- a/x11-libs/xpa/metadata.xml +++ b/x11-libs/xpa/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-astronomy@gentoo.org</email> diff --git a/x11-libs/xpa/xpa-2.1.15.ebuild b/x11-libs/xpa/xpa-2.1.15.ebuild deleted file mode 100644 index 54682a96d22b..000000000000 --- a/x11-libs/xpa/xpa-2.1.15.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools - -DESCRIPTION="Messaging system providing communication between programs" -HOMEPAGE="http://hea-www.harvard.edu/RD/xpa/" -SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -RDEPEND=" - dev-lang/tcl:0= - x11-libs/libXt - !<sci-astronomy/ds9-5.3" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch - sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die - eautoconf -} - -src_configure() { - econf \ - --enable-shared \ - --enable-threaded-xpans \ - --with-x \ - --with-tcl \ - --with-threads -} - -src_compile() { - emake shlib tclxpa -} - -src_install() { - dodir /usr/$(get_libdir) - emake INSTALL_ROOT="${D}" install - insinto /usr/$(get_libdir)/tclxpa - doins pkgIndex.tcl - mv "${ED}"/usr/$(get_libdir)/libtclxpa* \ - "${ED}"/usr/$(get_libdir)/tclxpa/ || die - dodoc README - use doc && dodoc doc/*.pdf && dohtml doc/*.html - # build system so crappy not worth patching to a non respondant upstream - # and builds static with PIC - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a -} diff --git a/x11-libs/xpa/xpa-2.1.17.ebuild b/x11-libs/xpa/xpa-2.1.17.ebuild deleted file mode 100644 index ad5228ffb298..000000000000 --- a/x11-libs/xpa/xpa-2.1.17.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools - -DESCRIPTION="Messaging system providing communication between programs" -HOMEPAGE="https://github.com/ericmandel/xpa" -SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/1" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -RDEPEND=" - dev-lang/tcl:0= - x11-libs/libXt:0" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch - sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die - eautoconf -} - -src_configure() { - econf \ - --enable-shared \ - --enable-threaded-xpans \ - --with-x \ - --with-tcl \ - --with-threads -} - -src_compile() { - emake shlib tclxpa -} - -src_install() { - dodir /usr/$(get_libdir) - emake INSTALL_ROOT="${D}" install - insinto /usr/$(get_libdir)/tclxpa - doins pkgIndex.tcl - mv "${ED}"/usr/$(get_libdir)/libtclxpa* \ - "${ED}"/usr/$(get_libdir)/tclxpa/ || die - dodoc README - use doc && dodoc doc/*.pdf && dohtml doc/*.html - # build system so crappy not worth patching to a non respondant upstream - # and builds static with PIC - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a -} diff --git a/x11-libs/xpa/xpa-2.1.18.ebuild b/x11-libs/xpa/xpa-2.1.18.ebuild index 623d26c31983..984f56d2241d 100644 --- a/x11-libs/xpa/xpa-2.1.18.ebuild +++ b/x11-libs/xpa/xpa-2.1.18.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils autotools +inherit autotools toolchain-funcs DESCRIPTION="Messaging system providing communication between programs" HOMEPAGE="https://github.com/ericmandel/xpa" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1" SLOT="0/1" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" +IUSE="doc" RDEPEND=" dev-lang/tcl:0= @@ -26,12 +26,13 @@ PATCHES=( src_prepare() { default - sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \ - -i mklib || die + sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" -i mklib || die eautoconf } src_configure() { + tc-export AR CC + econf \ --enable-shared \ --enable-threaded-xpans \ @@ -47,11 +48,16 @@ src_compile() { src_install() { dodir /usr/$(get_libdir) emake INSTALL_ROOT="${D}" install + insinto /usr/$(get_libdir)/tclxpa doins pkgIndex.tcl - mv "${ED}"/usr/$(get_libdir)/libtclxpa* \ + + mv "${ED}"/usr/$(get_libdir)/libtclxpa* \ "${ED}"/usr/$(get_libdir)/tclxpa/ || die + dodoc README use doc && dodoc doc/*.pdf && dodoc doc/*.html - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a + + # no static archives + rm "${ED}"/usr/$(get_libdir)/libxpa.a || die } diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest index c048e9593404..043c085ac8c4 100644 --- a/x11-libs/xtrans/Manifest +++ b/x11-libs/xtrans/Manifest @@ -1 +1 @@ -DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214 +DIST xtrans-1.5.0.tar.xz 170388 BLAKE2B a07dc501a36f4a6d7d9c407c36c5fcaa9555eeec3066d91fa8531118ac04bc55a1fbdce6370782aa8a18e1f26b14e3ad644e1e98ae3a353234e3ecae71fe065b SHA512 e8091f11d4ad2b14e01de3eac56bdf2267ea26687ce66e3056374d0d02e049480c0b27c482f8828a0efd086f1e4c485108ca4dce3f83d66c1896effa3b38b228 diff --git a/x11-libs/xtrans/metadata.xml b/x11-libs/xtrans/metadata.xml index e943b72b8a48..19a21bde1111 100644 --- a/x11-libs/xtrans/metadata.xml +++ b/x11-libs/xtrans/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/lib/libxtrans</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild deleted file mode 100644 index bbf5e21fbac0..000000000000 --- a/x11-libs/xtrans/xtrans-1.4.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_PACKAGE_NAME="lib${PN}" -# this package just installs some .c and .h files, no libraries -XORG_STATIC=no -XORG_DOC=doc -inherit xorg-3 - -DESCRIPTION="X.Org xtrans library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="" -DEPEND="" - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable doc docs) - $(use_with doc xmlto) - --without-fop - ) -} diff --git a/x11-libs/xtrans/xtrans-1.5.0.ebuild b/x11-libs/xtrans/xtrans-1.5.0.ebuild new file mode 100644 index 000000000000..2b3c33b5a88a --- /dev/null +++ b/x11-libs/xtrans/xtrans-1.5.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_PACKAGE_NAME="lib${PN}" +# this package just installs some .c and .h files, no libraries +XORG_DOC=doc +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org xtrans library" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_enable doc docs) + $(use_with doc xmlto) + --without-fop + ) + xorg-3_src_configure +} |