diff options
Diffstat (limited to 'x11-libs')
28 files changed, 321 insertions, 783 deletions
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest index 8c96fb2f5d33..5397459c0d55 100644 --- a/x11-libs/colord-gtk/Manifest +++ b/x11-libs/colord-gtk/Manifest @@ -1 +1,2 @@ DIST colord-gtk-0.1.26.tar.xz 280380 BLAKE2B 6ddd52b81726f21a2c376b1ab0c773f7670859882f3e5fe6038bf8728d5a9f3308b469b4e563dc784873b5b9cbed8ca671552e9bcb9cbccfaf28cd8f85e0b5bd SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d +DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f90eb96a3fedc6e30a1764d9c667cd82408116cdf65591496ab4e2f59f2b415cd1aa8f995fe2162ee4d649c5d496 SHA512 797eebfd4451fcae4cf70835f5de3d9bdc9e8401ddb82a2fef2310002f28bf523b599c587ff35eb89ceff38a245a6311129ad90b107f837ac4f42f268c9aad97 diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild index a388681d24d6..5a9ec9a5e484 100644 --- a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild +++ b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild @@ -33,6 +33,7 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} dev-libs/libxslt + app-text/docbook-xsl-ns-stylesheets >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig diff --git a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild new file mode 100644 index 000000000000..2fc2da43b919 --- /dev/null +++ b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2021 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 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="doc +introspection vala" +REQUIRED_USE="vala? ( introspection )" + +DEPEND=" + >=dev-libs/glib-2.28:2 + x11-libs/gtk+:3[introspection?] + >=x11-misc/colord-0.1.27:=[introspection?,vala?] +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-ns-stylesheets + >=sys-devel/gettext-0.17 + virtual/pkgconfig + doc? ( + app-text/docbook-xml-dtd:4.1.2 + >=dev-util/gtk-doc-1.9 + ) + introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) + vala? ( $(vala_depend) ) +" + +RESTRICT="test" # Tests need a display device with a default color profile set + +PATCHES=( + "${FILESDIR}/${P}-optional-introspection.patch" +) + +src_prepare() { + use vala && vala_src_prepare + default +} + +src_configure() { + local -a emesonargs=( + -Dgtk2=false + -Dman=true + -Dtests=false + $(meson_use doc docs) + $(meson_use introspection) + $(meson_use vala vapi) + ) + meson_src_configure +} diff --git a/x11-libs/colord-gtk/files/colord-gtk-0.2.0-optional-introspection.patch b/x11-libs/colord-gtk/files/colord-gtk-0.2.0-optional-introspection.patch new file mode 100644 index 000000000000..543b443e3aec --- /dev/null +++ b/x11-libs/colord-gtk/files/colord-gtk-0.2.0-optional-introspection.patch @@ -0,0 +1,41 @@ +From 0fb3425873a04ba100b57d59449d27bba6768ff3 Mon Sep 17 00:00:00 2001 +From: David Michael <fedora.dm0@gmail.com> +Date: Sat, 9 Jan 2021 14:42:39 -0500 +Subject: [PATCH] Make introspection optional in meson + +It defaults to enabled to preserve existing behavior. +--- + libcolord-gtk/meson.build | 2 ++ + meson_options.txt | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/libcolord-gtk/meson.build b/libcolord-gtk/meson.build +index c4fe704..18f36a0 100644 +--- a/libcolord-gtk/meson.build ++++ b/libcolord-gtk/meson.build +@@ -61,6 +61,7 @@ pkgg.generate( + description : 'colord-gtk is GTK integration for libcolord', + ) + ++if get_option('introspection') + libcolord_gtk_gir = gnome.generate_gir( + colord_gtk, + sources : [ +@@ -97,6 +98,7 @@ libcolord_gtk_gir = gnome.generate_gir( + ], + install : true + ) ++endif + + if get_option('vapi') + gnome.generate_vapi( +diff --git a/meson_options.txt b/meson_options.txt +index 1c3cecc..a4efa84 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,4 +1,5 @@ + option('gtk2', type : 'boolean', value : false, description : 'Build Gtk2 library') ++option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection typelib files') + option('vapi', type : 'boolean', value : false, description : 'Build vala bindings') + option('tests', type : 'boolean', value : true, description : 'Build self tests') + option('man', type : 'boolean', value : true, description : 'Generate man pages') diff --git a/x11-libs/goffice/goffice-0.10.48.ebuild b/x11-libs/goffice/goffice-0.10.48.ebuild index fbebd6ff5a36..f40e08daebd7 100644 --- a/x11-libs/goffice/goffice-0.10.48.ebuild +++ b/x11-libs/goffice/goffice-0.10.48.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/" LICENSE="GPL-2" SLOT="0.10" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="+introspection" # FIXME: add lasem to tree diff --git a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild index 29fae7a267d4..a17109103a16 100644 --- a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE=" xinerama? ( X ) " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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 diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest index 10bc7df2fdb2..8ec0376e43e1 100644 --- a/x11-libs/libXt/Manifest +++ b/x11-libs/libXt/Manifest @@ -1 +1,2 @@ DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1 +DIST libXt-1.2.1.tar.bz2 784610 BLAKE2B 69a1446a22acb50e625ab4a7b24b5db634d47a540d4543a3f58459dbb380d61aa4bbbde50328c76b2c31eaae3662a1c71cdbcf9bd3a0c915ae4e587f63fbee7a SHA512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c diff --git a/x11-libs/libXt/libXt-1.2.1.ebuild b/x11-libs/libXt/libXt-1.2.1.ebuild new file mode 100644 index 000000000000..72b65cdea0cb --- /dev/null +++ b/x11-libs/libXt/libXt-1.2.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 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 Toolkit Intrinsics library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] + >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto + test? ( dev-libs/glib[${MULTILIB_USEDEP}] )" + +pkg_setup() { + XORG_CONFIGURE_OPTIONS=( + $(use_with doc xmlto) + $(use_enable doc specs) + $(use_enable test unit-tests) + --without-fop + ) +} diff --git a/x11-libs/libXv/libXv-1.0.11-r2.ebuild b/x11-libs/libXv/libXv-1.0.11-r2.ebuild index e8ef65812110..451fa0fad8bd 100644 --- a/x11-libs/libXv/libXv-1.0.11-r2.ebuild +++ b/x11-libs/libXv/libXv-1.0.11-r2.ebuild @@ -3,6 +3,7 @@ EAPI=7 +XORG_DOC=doc XORG_MULTILIB=yes inherit xorg-3 diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest index cf9606772dc6..b2a8365b41dd 100644 --- a/x11-libs/libdrm/Manifest +++ b/x11-libs/libdrm/Manifest @@ -1 +1,2 @@ DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885 +DIST libdrm-2.4.104.tar.xz 419372 BLAKE2B 4f9c1d88e8e13e12b192b822aaddcbb01716771b85445f7468129600df3214a9dd3559539830eeec4df61f03c187fa88a6d0bb2d5278a5125d2aa11cef6805ea SHA512 0fdbef53e0e7c441c805c95ac55ca2c94f11e8fa18e36b4dc7534c22e2b5bc8eca7283fdf41785da753f98d0b589023111abdba70db7e79837729b1540253d6e diff --git a/x11-libs/libdrm/libdrm-2.4.104.ebuild b/x11-libs/libdrm/libdrm-2.4.104.ebuild new file mode 100644 index 000000000000..48e056d6a358 --- /dev/null +++ b/x11-libs/libdrm/libdrm-2.4.104.ebuild @@ -0,0 +1,71 @@ +# 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 ~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 + +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/libfm-qt/libfm-qt-0.16.0.ebuild b/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild index 35be3618d54b..7b04c4a72ebd 100644 --- a/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild +++ b/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then 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 ~ppc64 x86" fi LICENSE="BSD GPL-2+ LGPL-2.1+" diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest index baf3ca4d8d81..0207705af252 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 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/qwt/Manifest b/x11-libs/qwt/Manifest index 67c5258709bd..8975bcd4c249 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -1,2 +1 @@ -DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22 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/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.4.ebuild deleted file mode 100644 index 152afdf4b6b8..000000000000 --- a/x11-libs/qwt/qwt-6.1.4.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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" - -LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" -KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -SLOT="6/1.4" -IUSE="designer doc examples mathml 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}" - -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 - 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 - - echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri - - 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 -} - -src_configure() { - eqmake5 -} - -src_compile() { - default -} - -src_test() { - cd examples || die - eqmake5 examples.pro - emake -} - -src_install() { - 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 -r "${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.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild index 43b1263c98ca..1c2423d812c1 100644 --- a/x11-libs/qwt/qwt-6.1.5.ebuild +++ b/x11-libs/qwt/qwt-6.1.5.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/" SRC_URI="mirror://sourceforge/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" +KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" SLOT="6/1.5" IUSE="designer doc examples mathml opengl svg" diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index c43019f99ac7..9afeca85de41 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -3,3 +3,4 @@ DIST vte-0.60.3-command-notify.patch.xz 6108 BLAKE2B 1f96788c097b003a3f9041529a0 DIST vte-0.60.3.tar.xz 535504 BLAKE2B c5556fdb91d876aa681d2a9466fa4f4c0ee6be630d076949fbd01878baffdf319e50ec75575729c49c09484914d9ee103d4d491861aedb678b0e336cd4ddcc2e SHA512 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18 DIST vte-0.62.1-command-notify.patch.xz 4844 BLAKE2B 22301fdc5f1969beb2ad9b316fea8972f696f0e54e1a24d5eceedec71162afc2991b7963a71ce8925a94f6c40e5303d3db760b872d0eebbdc6d05b22d3c59ecc SHA512 491e241b0f5aae50e59d25751e95579d40c47e7e4c7f2b279522347f7f2f7f00c92bdf5fa4a651e4146bcfa9439f03b6311b4061fb20c5679c09b97a4924dcf1 DIST vte-0.62.1.tar.xz 444672 BLAKE2B 83cf49c8700792a149d572bae692d4909ada613b43a752b55cb658926dc37041b98d69364a88f813b1cc6d20f0667ea566f994e0f08bd1dd918731d20edb1376 SHA512 2f8f76953e0ea6c604357ab08630d3822a252051d8997cf7714553fec1688735468726bfd74e03f122dd1c8d0717e511ec7ec1e5463a086bd407afc6f7df91cf +DIST vte-0.62.2.tar.xz 444888 BLAKE2B 07a9d302b3fe67fbc149f129da9e7482f516f3d8fb550bfcd2ddea000f059a24184e857b9f7c4c69c751e40a2b53c044d8596c990b722a22fa13b810a353414c SHA512 61ea130d43d60531dcaa8bddfecacfd4a934a2e868da69b598fad0a2feb04885fc0b5dd520dac4b0d3a4daf11ea70c5357066ed15759e36436346dae498e8ef8 diff --git a/x11-libs/vte/vte-0.62.2.ebuild b/x11-libs/vte/vte-0.62.2.ebuild new file mode 100644 index 000000000000..80301a89aacd --- /dev/null +++ b/x11-libs/vte/vte-0.62.2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2021 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" + +inherit gnome.org meson vala xdg + +DESCRIPTION="Library providing a virtual terminal emulator widget" +HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" + +LICENSE="LGPL-3+ GPL-3+" +SLOT="2.91" +IUSE="+crypt debug gtk-doc +icu +introspection systemd +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/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )" + +RDEPEND=" + >=x11-libs/gtk+-3.24.14:3[introspection?] + >=dev-libs/fribidi-1.0.0 + >=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=" + dev-libs/libxml2:2 + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.13 + app-text/docbook-xml-dtd:4.1.2 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + + vala? ( $(vala_depend) ) +" + +src_prepare() { + 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.62.1-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() { + local emesonargs=( + -Da11y=true + $(meson_use debug debugg) + $(meson_use gtk-doc docs) + $(meson_use introspection gir) + -Dfribidi=true # pulled in by pango anyhow + $(meson_use crypt gnutls) + -Dgtk3=true + -Dgtk4=false + $(meson_use icu) + $(meson_use systemd _systemd) + $(meson_use vala vapi) + ) + meson_src_configure +} + +src_install() { + meson_src_install + mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die +} diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild index 80c06b04b624..30aaaa87ceef 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild @@ -11,8 +11,8 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge 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" -IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl sdl tiff" SLOT="3.0" @@ -35,11 +35,6 @@ RDEPEND=" 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} @@ -96,19 +91,8 @@ multilib_src_configure() { $(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 + if use !X ; then myconf="${myconf} --disable-gui" fi diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild index e165e79b71ea..d147f35a694a 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild @@ -11,8 +11,8 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge 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" -IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl sdl tiff webkit" WXSUBVERSION=${PV}.0-gtk3 # 3.0.3.0-gtk3 WXVERSION=${WXSUBVERSION%.*} # 3.0.3 @@ -43,11 +43,6 @@ RDEPEND=" opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) tiff? ( media-libs/tiff:0[${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} @@ -130,19 +125,8 @@ multilib_src_configure() { $(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 + if use !X ; then myconf="${myconf} --disable-gui" fi diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest index 8c2a1566ebba..e7fd537dbc87 100644 --- a/x11-libs/xapps/Manifest +++ b/x11-libs/xapps/Manifest @@ -1,4 +1,3 @@ -AUX xapps-2.0.5-fix-gtk-module-env.patch 1132 BLAKE2B 511e19805a454a400fd9b92e1426e7412e6c8c2f366ce05466ad2356688f4c1864b8ff01e38a6e8ae8c08305c6d33da3718eb03c92aa07bf35b061b329730edd SHA512 3ef0f0a162a470f1ee178b063f2072bed68487a30cff4e7a6b08a34228ff4f07060e8d38736862333f76596864de611bd6aae1dc2ae80c633472d319f67d9400 -DIST xapps-2.0.5.tar.gz 230322 BLAKE2B 5af266ae599068c46c8e7684602370199a9b9b45fdbfa6f727d82a44ce752f67ede035403ae99a4fffd809d5e9f58cd07f4820b8f478b755ace5346b9f8b2859 SHA512 d4a8760ea1509ae8297005c739b50ac8d40786d6b286a49194b7b972def8a82a53271b9a72f44f4970bd89cb401575de2810d0eba1d7d50ccbf759c52e153d54 -EBUILD xapps-2.0.5.ebuild 2301 BLAKE2B c21d58b41a1342556e6c973d591a067de43d4c94ff0612fbbffcba400ba46f24c3fe522d4b621f4a71edafdabcde19c8920c2352f347a7592d0fde8a6c6d6088 SHA512 e493de5782228f88058360e2aff749ffb0b0b16b036d87223f20f25639d113081046f266403e0ce7aaeffe6118dd9108e0523c0fef1474f65b61fb44275f9123 +DIST xapps-2.0.6.tar.gz 231023 BLAKE2B bc3907966c132c683e75769f8f45839d45229c77933ef861f58b03a21cca15a4f3dd610acb6a19fc16d35ddb189340cdef80704e78c89a3e49659a2f82be121e SHA512 bac6e105e2b1e237958fb610a9bd697a023c10a45131da7dee984532986022895414d81849f53bc0007c319c2139c6d39474e2e7fd9ce4e53365517f4ba4f012 +EBUILD xapps-2.0.6.ebuild 2144 BLAKE2B c143d5495e11ac2e46ecf1e533d7521856ceadfcfb12976a90d173801e8009b75e451ed959819edf89f531eeea1ff1c792f3692c397cff0111a7e47afe25b512 SHA512 3d40facf41937492d3ad593b4dc46f26649b24de15a5580a6f871fac52a66a54396f0069c6e0a359069058cdd2ab6b168d8647baaa6c3c8731780f03b34739b6 MISC metadata.xml 577 BLAKE2B ed5786f6e30619e209d841a04547b52f7a9a09eeb5a64f0fcbe9f33031e936610aaef4b80cd29f45d662ac23295448ba336786c31a2b5f302332750497d0f545 SHA512 3af23ee720d2691213fccfbcdde69b5af42259fb0acee32e499c51e13dc8a5414fed038372b2a485db65548b38163886911d4b44ebaaca8ff0e0274c4c40d48b diff --git a/x11-libs/xapps/files/xapps-2.0.5-fix-gtk-module-env.patch b/x11-libs/xapps/files/xapps-2.0.5-fix-gtk-module-env.patch deleted file mode 100644 index 5b97ef5edb86..000000000000 --- a/x11-libs/xapps/files/xapps-2.0.5-fix-gtk-module-env.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e846e76a392d44d211b7007691358f173f1b44a3 Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Sat, 2 Jan 2021 21:19:15 -0500 -Subject: [PATCH] 80xapp-gtk3-module.sh: Use GTK3_MODULES instead of - GTK_MODULES. - -Currently gtk2 (and qt, when using the 'gtk2' theme style) programs -are trying to load the xapp module even though they're not supported. -This is harmless but can cause alarm. - -This will prevent gtk2 from seeing this module. ---- - data/80xapp-gtk3-module.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/data/80xapp-gtk3-module.sh b/data/80xapp-gtk3-module.sh -index 4b2ec2a..180aa54 100644 ---- a/data/80xapp-gtk3-module.sh -+++ b/data/80xapp-gtk3-module.sh -@@ -1,10 +1,10 @@ - #!/bin/bash - # This file is sourced by xinit(1) or a display manager's Xsession, not executed. - --if [ -z "$GTK_MODULES" ] ; then -- GTK_MODULES="xapp-gtk3-module" -+if [ -z "$GTK3_MODULES" ] ; then -+ GTK3_MODULES="xapp-gtk3-module" - else -- GTK_MODULES="$GTK_MODULES:xapp-gtk3-module" -+ GTK3_MODULES="$GTK3_MODULES:xapp-gtk3-module" - fi - --export GTK_MODULES -+export GTK3_MODULES diff --git a/x11-libs/xapps/xapps-2.0.5.ebuild b/x11-libs/xapps/xapps-2.0.6.ebuild index 612f8520c27a..a25f51ed1b16 100644 --- a/x11-libs/xapps/xapps-2.0.5.ebuild +++ b/x11-libs/xapps/xapps-2.0.6.ebuild @@ -31,31 +31,31 @@ RDEPEND=" >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile " -DEPEND="${RDEPEND} - $(vala_depend) - sys-devel/gettext - - gtk-doc? ( dev-util/gtk-doc ) +DEPEND=" + ${RDEPEND} " BDEPEND=" ${PYTHON_DEPS} + $(vala_depend) dev-python/pygobject:3[${PYTHON_USEDEP}] dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.40.6 sys-devel/gettext -" -PATCHES=( - # Use proper GTK modules env variable - # https://github.com/linuxmint/xapp/commit/e846e76a392d44d211b7007691358f173f1b44a3 - "${FILESDIR}/${PN}-2.0.5-fix-gtk-module-env.patch" -) + gtk-doc? ( dev-util/gtk-doc ) +" src_prepare() { - xdg_environment_reset vala_src_prepare default + + # don't install distro specific tools + sed -i "/subdir('scripts')/d" meson.build || die + + # Fix meson helpers + python_setup + python_fix_shebang meson-scripts } src_configure() { @@ -68,22 +68,18 @@ 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 "${ED}/$PYTHON_GI_OVERRIDESDIR/" + PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die) + einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}" + mkdir -p "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die + cp -r "${D}"/pygobject/* "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die + python_optimize "${ED}/${PYTHON_GI_OVERRIDESDIR}/" } python_foreach_impl install_pygobject_override - rm -rf "${D}/pygobject" || die + rm -r "${D}/pygobject" || die } pkg_postinst() { diff --git a/x11-libs/xforms/xforms-1.2.4.ebuild b/x11-libs/xforms/xforms-1.2.4.ebuild deleted file mode 100644 index abc3d51ea8b4..000000000000 --- a/x11-libs/xforms/xforms-1.2.4.ebuild +++ /dev/null @@ -1,49 +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="${P/-/_}" - -DESCRIPTION="A graphical user interface toolkit for X" -HOMEPAGE="https://xforms-toolkit.org/" -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" - -RDEPEND=" - virtual/jpeg:0= - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXpm - opengl? ( virtual/opengl )" - -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" - -S="${WORKDIR}/${MY_P}" - -DOCS=( ChangeLog README ) - -src_prepare() { - default - AT_M4DIR=config eautoreconf -} - -src_configure() { - econf \ - $(use_enable doc docs) \ - $(use_enable opengl gl) \ - $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} 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; \ |