From 78634f348a30a55cc55606ee1ecde032241ceaeb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 Mar 2023 06:33:49 +0000 Subject: gentoo auto-resync : 19:03:2023 - 06:33:49 --- dev-libs/Manifest.gz | Bin 96260 -> 96254 bytes dev-libs/gjs/Manifest | 3 + ...0-move_have_gtk4_to_the_appropriate_place.patch | 38 +++++ dev-libs/gjs/gjs-1.76.0.ebuild | 72 +++++++++ dev-libs/openssl/Manifest | 1 - dev-libs/openssl/files/gentoo.config-1.0.3 | 172 --------------------- 6 files changed, 113 insertions(+), 173 deletions(-) create mode 100644 dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch create mode 100644 dev-libs/gjs/gjs-1.76.0.ebuild delete mode 100644 dev-libs/openssl/files/gentoo.config-1.0.3 (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index e1661458c4d5..237048518962 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 497bee8ad1d0..7d8eaa4bde3f 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,7 +1,10 @@ +AUX gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch 1417 BLAKE2B 203701b5535b338283b99aad63e3577d3abb295c005d2e2ac908e2f8abdb24e8f7b9ef311bcf35889a93804583f13ac65f1d9453111b5195320aab9442237b2e SHA512 e2f7ed4c5f15cec6a6a7d3303779a217716ca3d8fa5d3128f4e7e685c47284fd95b9e416d50b28ca34bd06a9c469ebb3f317db88526cdc2ba1088381871da9a4 DIST gjs-1.74.1.tar.xz 638536 BLAKE2B 375abcaa20a538cfa271f7dcf6f3715e4324ff5a4a9482ce0dd7f78213598a715ebc034f701fe458876f841f72802db4ae2aabf0abc04dc4ac5bb39c917741fd SHA512 346667accb589df0e6a045e30782017eab928115f263d36d521b61b0af38fd268bc518b8ab5ec78e5d25e0194b744a2ee59e65668da679e138b2122858ce0614 DIST gjs-1.74.2.tar.xz 639012 BLAKE2B 12f6f60b801d96a4cff260a0abc5da96c30a5b77d69d31b646b16db20a586761b36b2601c8da8ab7b313c96b8fb2319ed65cb53f3f3ca2d3d255648ceccdbc7c SHA512 738176aabcc8d0147cf77b7af3271c93ca4e8a473b2d35722b4cf9a15dcdc9f87962a29dd949607d947256df9ffcfd499d7189b6eff7ac416bbad594a2bc8ea9 DIST gjs-1.75.90.tar.xz 645228 BLAKE2B 853704b5eed8d14e070fe47ec10a27071ab6d7c6754f61206f03c20a3fba0038105c54fd2b2b2196dfeb0e74aea966a6bd886ad8d77a0c1d1d70bf6eb5bc0a54 SHA512 2bfdb9fb62612505e2f647c164944337257915d427e62c340b1dbe389d22cf309fe4ba4f55c9399c3027136e24b49ed441598b9fbd93389e8596e2de8a6917fc +DIST gjs-1.76.0.tar.xz 645364 BLAKE2B 9987033883e466c983af007c870cba4f2ef70ee08e276777e1b52103ddcebd1285ca9f3ce64c8ef52437a829157f58902cfb921eed06442e53fd9778d9cd9f2b SHA512 fa44431f431f14b82c648c388046b83722808db52d2bbe2deeb8d270d6fbeee9c4ee27feaa4fef425e1ab5ac65a1e68d7aa9457d543044362752810128064ea6 EBUILD gjs-1.74.1.ebuild 1960 BLAKE2B cc9f89f86583adacec4aee0d6d74696ff81a65356f8b455964c27d1910af46ea2365c8d4cc6586be739048a206447538476feccd324be373d47f8a8a22d65cb1 SHA512 304297e1c12d5dc1b86e09aa78ccd00fbf1a8137e2802e1852c0998b4aeef6f56adc92ee65e4002f6bbb0b2a6a567c8658690600d8705dfaeb1c100751a0d1c2 EBUILD gjs-1.74.2.ebuild 1966 BLAKE2B 2c2c4f2944ee02788e8b27d58b2e5c47ed7b3eed63cc4ff874ed9d2888215481b94b07a10025bd431925d1d245794c2f3e931e63e2acd4ab12f2cf83705bdf41 SHA512 a9a41000396bae156d79ed459b92f7db62ce4ed5b598385919854f4bbc5fd78894746c8cbbd4fc095b20dd2ac889fb96f9fe748e543e06a557dbe336920d408e EBUILD gjs-1.75.90.ebuild 1966 BLAKE2B 1783a96ee082e74ca58cb4f7292969a4c0374c8da4af3020d96163eff29585b0bc470ab275304928ed361c66a2554ec0f046e536eeecdf25940582ca510fcecc SHA512 2e3a9f5c5d42e76a96dfe533a9142ec1b332486bd16007d42b66d52bf8635a289b493122f92195b3a614cde78a084bb20be5a72b72e6965e98dd4c86c1326ea6 +EBUILD gjs-1.76.0.ebuild 2045 BLAKE2B bd2df26c6a082abb1f31ee2f3d3f7d8afd18c9f728e38fc6a23611ba91ed0446e1fee7eaaafe077d9d943fe4d259d7012f57601d29a213734761dc12162179eb SHA512 3c97c3f20a7764c8f03848304b41bb2c2943d7f43e1febeb1f8c76f83051bf31730c3abafe6dd16fcf9672c8c9aea6dc7ed1240c60690e5fd3c0f1585fe5dc52 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2 diff --git a/dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch b/dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch new file mode 100644 index 000000000000..2bb80126507f --- /dev/null +++ b/dev-libs/gjs/files/gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch @@ -0,0 +1,38 @@ +# https://gitlab.gnome.org/GNOME/gjs/-/issues/532 +# https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/830/diffs?commit_id=83683d093c157828cf7787e53a32c586ae4e85d3 +diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build +index 6db887d2250face397079b03d215bbd13f455efb..1e953ceb7695356b6e854775e5db005a9c22e053 100644 +--- a/installed-tests/js/meson.build ++++ b/installed-tests/js/meson.build +@@ -203,9 +203,13 @@ endif + # during build should be run using dbus-run-session + + dbus_tests = ['GDBus'] +-if have_gtk4 and not get_option('skip_gtk_tests') +- # FIXME: find out why GTK4 tries to acquire a message bus +- dbus_tests += 'Gtk4' ++if not get_option('skip_gtk_tests') ++ have_gtk4 = dependency('gtk4', required: false).found() ++ ++ if have_gtk4 ++ # FIXME: find out why GTK4 tries to acquire a message bus ++ dbus_tests += 'Gtk4' ++ endif + endif + + bus_config = files('../../test/test-bus.conf') +diff --git a/meson.build b/meson.build +index 3ac372a16b0bfaa364ed7422119f3e6e4af8971e..5c7703935b68c724347692ef5bf47a3edf868c61 100644 +--- a/meson.build ++++ b/meson.build +@@ -679,10 +679,6 @@ endif + + ### Tests and test setups ###################################################### + +-if not get_option('skip_gtk_tests') +- have_gtk4 = dependency('gtk4', required: false).found() +-endif +- + subdir('installed-tests') + + # Note: The test program in test/ needs to be ported diff --git a/dev-libs/gjs/gjs-1.76.0.ebuild b/dev-libs/gjs/gjs-1.76.0.ebuild new file mode 100644 index 000000000000..e7cdaae084f1 --- /dev/null +++ b/dev-libs/gjs/gjs-1.76.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic gnome.org meson virtualx + +DESCRIPTION="Javascript bindings for GNOME" +HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" + +LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" +SLOT="0" +IUSE="+cairo examples readline sysprof test" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.66.0:2 + dev-libs/libffi:= + >=dev-libs/gobject-introspection-1.71.1:= + >=dev-lang/spidermonkey-102.2.0:102 + cairo? ( x11-libs/cairo[X,glib] ) + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) + test? ( + sys-apps/dbus + >=x11-libs/gtk+-3.20:3[introspection] + ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${P}-move_have_gtk4_to_the_appropriate_place.patch" +) + +src_configure() { + append-cppflags -DG_DISABLE_CAST_CHECKS + + # On musl, it's required that either gjs, pixman or gnome-shell to be built + # with a larger stack otherwise librsvg fails to render a particular SVG, as + # a result we fail to get gdm or gnome-shell running (greeted with a fail + # whale screen). The bug has been reported to librsvg. This is ideally just + # a temporary workaround until we understand what exactly needs a larger + # stack size, as it's not sufficient to do just librsvg. + # + # Please refer to: + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/686 + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/874 + # + # TODO: Find an actual fix instead of increasing the stack + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + + # FIXME: add systemtap/dtrace support, like in glib:2 + local emesonargs=( + $(meson_feature cairo) + $(meson_feature readline) + $(meson_feature sysprof profiler) + -Dinstalled_tests=false + $(meson_use !test skip_dbus_tests) + $(meson_use !test skip_gtk_tests) + -Db_pch=True # TODO this has to go + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 9a98512a71e6..2dbe264ad0d6 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,5 +1,4 @@ AUX gentoo.config-1.0.2 5302 BLAKE2B b699533ed86c48c0d033092b4d901de837a6a495113925099d82cd2f768b521073a3caad06921e2f8d3ecdf4c4ef617ed9b9aba119d4a910b72f9c086b9fd21f SHA512 f8653c57ef8e3a3b3b762f66ef556c0012dfc8b997f0bdbe504f92d0901c0dc9fefa2c3e8244175d802fb83437533b7928b6db38b93fdd5a8ffefa79414106a1 -AUX gentoo.config-1.0.3 5300 BLAKE2B c2788ef1b790bdf2cadaf302e9576984f4536c7cf6e48610f986468ee712cf6fc3fed3bce1e0d2eea296811edc3266a6a248b2faa48557cb430e101ea2cea6ff SHA512 6609e9180bfbc6b9e365b53115da4f83e837aac4edc24e18cd09a2c4595d478c14476d0a1f5387ce5130bcf3effeeac605859f69ac7923408a1809e9c8b13489 AUX gentoo.config-1.0.4 5624 BLAKE2B 3db6ca219dae54bb33abfec0b91b17b453222d50884f31e294a47c985fde99ae8ed3189ad41b0b2d76af4006dc547050c38ce19413b2b7d8307d23c5b510f4b6 SHA512 d912c4adb5508c28f342c2741ef1d1bbc870073a3d4894ad8c6c5b9866e842430f5a23d2f6704d2d449546568313b6438b36b5012bcc037fedb5c8181a9de7de AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828 AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021dcbb3efa421866f6e09bbee6287aae95c6f5d9498bd9d8974b0de747ef696242691cfebec90b31dc9e2cc31b41b81ec SHA512 f75ae1034bb9dda7f4959e8a5d6d0dae21200723d82aebfbea58bd1d7775ef4042e49fdf49d5738771d79d764e44a1b6e0da341d210ea51d21516bb3874b626a diff --git a/dev-libs/openssl/files/gentoo.config-1.0.3 b/dev-libs/openssl/files/gentoo.config-1.0.3 deleted file mode 100644 index 0662f72b6d80..000000000000 --- a/dev-libs/openssl/files/gentoo.config-1.0.3 +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env bash -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# -# Openssl doesn't play along nicely with cross-compiling -# like autotools based projects, so let's teach it new tricks. -# -# Review the bundled 'config' script to see why kind of targets -# we can pass to the 'Configure' script. - - -# Testing routines -if [[ $1 == "test" ]] ; then - for c in \ - "arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \ - "armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \ - "x86_64-pc-linux-gnu |linux-x86_64" \ - "alpha-linux-gnu |linux-alpha-gcc" \ - "alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \ - "i686-pc-linux-gnu |linux-elf" \ - "whatever-gentoo-freebsdX.Y |BSD-generic32" \ - "i686-gentoo-freebsdX.Y |BSD-x86-elf" \ - "sparc64-alpha-freebsdX.Y |BSD-sparc64" \ - "ia64-gentoo-freebsd5.99234 |BSD-ia64" \ - "x86_64-gentoo-freebsdX.Y |BSD-x86_64" \ - "hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \ - "powerpc-gentOO-linux-uclibc |linux-ppc" \ - "powerpc64-unk-linux-gnu |linux-ppc64" \ - "powerpc64le-linux-gnu |linux-ppc64le" \ - "x86_64-apple-darwinX |darwin64-x86_64-cc" \ - "powerpc64-apple-darwinX |darwin64-ppc-cc" \ - "i686-apple-darwinX |darwin-i386-cc" \ - "i386-apple-darwinX |darwin-i386-cc" \ - "powerpc-apple-darwinX |darwin-ppc-cc" \ - "i586-pc-winnt |winnt-parity" \ - "s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \ - "s390x-linux-gnu |linux64-s390x" \ - ;do - CHOST=${c/|*} - ret_want=${c/*|} - ret_got=$(CHOST=${CHOST} "$0") - - if [[ ${ret_want} == "${ret_got}" ]] ; then - echo "PASS: ${CHOST}" - else - echo "FAIL: ${CHOST}" - echo -e "\twanted: ${ret_want}" - echo -e "\twe got: ${ret_got}" - fi - done - exit 0 -fi -[[ -z ${CHOST} && -n $1 ]] && CHOST=$1 - - -# Detect the operating system -case ${CHOST} in - *-aix*) system="aix";; - *-darwin*) system="darwin";; - *-freebsd*) system="BSD";; - *-hpux*) system="hpux";; - *-linux*) system="linux";; - *-solaris*) system="solaris";; - *-winnt*) system="winnt";; - x86_64-*-mingw*) system="mingw64";; - *mingw*) system="mingw";; - *) exit 0;; -esac - - -# Compiler munging -compiler="gcc" -if [[ ${CC} == "ccc" ]] ; then - compiler=${CC} -fi - - -# Detect target arch -machine="" -chost_machine=${CHOST%%-*} -case ${system} in -linux) - case ${chost_machine}:${ABI} in - aarch64*be*) machine="aarch64 -DB_ENDIAN";; - aarch64*) machine="aarch64 -DL_ENDIAN";; - alphaev56*|\ - alphaev[678]*)machine=alpha+bwx-${compiler};; - alpha*) machine=alpha-${compiler};; - armv[4-9]*b*) machine="armv4 -DB_ENDIAN";; - armv[4-9]*) machine="armv4 -DL_ENDIAN";; - arm*b*) machine="generic32 -DB_ENDIAN";; - arm*) machine="generic32 -DL_ENDIAN";; - avr*) machine="generic32 -DL_ENDIAN";; - bfin*) machine="generic32 -DL_ENDIAN";; - # hppa64*) machine=parisc64;; - hppa*) machine="generic32 -DB_ENDIAN";; - i[0-9]86*|\ - x86_64*:x86) machine=elf;; - ia64*) machine=ia64;; - loongarch64*) machine="generic64 -DL_ENDIAN";; - m68*) machine="latomic -DB_ENDIAN";; - mips*el*) machine="generic32 -DL_ENDIAN";; - mips*) machine="generic32 -DB_ENDIAN";; - powerpc64*le*)machine=ppc64le;; - powerpc64*) machine=ppc64;; - powerpc*le*) machine="generic32 -DL_ENDIAN";; - powerpc*) machine=ppc;; - riscv32*) machine="generic32 -DL_ENDIAN";; - riscv64*) machine="generic64 -DL_ENDIAN";; - # sh64*) machine=elf;; - sh*b*) machine="generic32 -DB_ENDIAN";; - sh*) machine="generic32 -DL_ENDIAN";; - # TODO: Might want to do -mcpu probing like glibc to determine a - # better default for sparc-linux-gnu targets. This logic will - # break v7 and older systems when they use it. - sparc*v7*) machine="generic32 -DB_ENDIAN";; - sparc64*) machine=sparcv9 system=linux64;; - sparc*v9*) machine=sparcv9;; - sparc*v8*) machine=sparcv8;; - sparc*) machine=sparcv8;; - s390x*) machine=s390x system=linux64;; - s390*) machine="generic32 -DB_ENDIAN";; - x86_64*:x32) machine=x32;; - x86_64*) machine=x86_64;; - esac - ;; -BSD) - case ${chost_machine} in - alpha*) machine=generic64;; - i[6-9]86*) machine=x86-elf;; - ia64*) machine=ia64;; - sparc64*) machine=sparc64;; - x86_64*) machine=x86_64;; - *) machine=generic32;; - esac - ;; -aix) - machine=${compiler} - ;; -darwin) - case ${chost_machine} in - powerpc64) machine=ppc-cc; system=${system}64;; - powerpc) machine=ppc-cc;; - i?86*) machine=i386-cc;; - x86_64) machine=x86_64-cc; system=${system}64;; - esac - ;; -hpux) - case ${chost_machine} in - ia64) machine=ia64-${compiler} ;; - esac - ;; -solaris) - case ${chost_machine} in - i386) machine=x86-${compiler} ;; - x86_64*) machine=x86_64-${compiler}; system=${system}64;; - sparcv9*) machine=sparcv9-${compiler}; system=${system}64;; - sparc*) machine=sparcv8-${compiler};; - esac - ;; -winnt) - machine=parity - ;; -mingw*) - # special case ... no xxx-yyy style name - echo ${system} - ;; -esac - - -# If we have something, show it -[[ -n ${machine} ]] && echo ${system}-${machine} -- cgit v1.2.3