x11-libs: Sync with upstream
libX11 1.7.2 -> 1.7.3
gdk-pixbuf 2.42.6 -> 2.42.6-r1
BUG=none
TEST=CQ
Change-Id: I37c8813c79717beb98b71abdcc7a3930621fe5e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3336916
Tested-by: Fergus Dall <sidereal@google.com>
Auto-Submit: Fergus Dall <sidereal@google.com>
Reviewed-by: David Riley <davidriley@chromium.org>
Commit-Queue: David Riley <davidriley@chromium.org>
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild
similarity index 87%
rename from x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
rename to x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild
index c68e3f6..22435b4 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild
@@ -11,7 +11,7 @@
LICENSE="LGPL-2.1+"
SLOT="2"
KEYWORDS="*"
-IUSE="gtk-doc +introspection jpeg tiff"
+IUSE="+introspection jpeg tiff"
# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
DEPEND="
@@ -27,16 +27,12 @@
"
BDEPEND="
app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.3
dev-libs/glib:2
dev-libs/libxslt
dev-util/glib-utils
- gtk-doc? (
- app-text/docbook-xml-dtd:4.3
- dev-util/gi-docgen
- )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
- >=dev-util/meson-0.55.3
"
MULTILIB_CHOST_TOOLS=(
@@ -65,12 +61,12 @@
-Dpng=true
$(meson_use tiff)
$(meson_use jpeg)
- -Dbuiltin_loaders=png
+ -Dbuiltin_loaders=png,jpeg
-Drelocatable=false
#native_windows_loaders
-Dinstalled_tests=false
-Dgio_sniffing=true
- $(meson_native_use_bool gtk-doc gtk_doc)
+ -Dgtk_doc=false
$(meson_native_use_feature introspection)
$(meson_native_true man)
)
@@ -79,11 +75,10 @@
}
multilib_src_install_all() {
- if use gtk-doc; then
- mkdir "${ED}"/usr/share/doc/${PF}/html || die
- mv "${ED}"/usr/share/doc/{${PN}/,${PF}/html/} || die
- mv "${ED}"/usr/share/doc/{gdk-pixdata/,${PF}/html/} || die
- fi
+ einstalldocs
+ insinto /usr/share/gtk-doc/html
+ doins -r "${S}"/docs/gdk-pixbuf
+ doins -r "${S}"/docs/gdk-pixdata
}
pkg_preinst() {
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index b64f51b..a285fd2 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1 +1 @@
-DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
+DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.3.ebuild
similarity index 95%
rename from x11-libs/libX11/libX11-1.7.2.ebuild
rename to x11-libs/libX11/libX11-1.7.3.ebuild
index 66372b6..3e66bce 100644
--- a/x11-libs/libX11/libX11-1.7.2.ebuild
+++ b/x11-libs/libX11/libX11-1.7.3.ebuild
@@ -5,6 +5,7 @@
XORG_DOC=doc
XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX=xz
inherit toolchain-funcs xorg-3
# Note: please bump this with x11-misc/compose-tables
@@ -16,7 +17,6 @@
RDEPEND="
>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
- !<x11-base/xorg-proto-2019.2
x11-misc/compose-tables"
DEPEND="${RDEPEND}
x11-base/xorg-proto
