From db1426020f73b37b574d084b49e4db82f6b70bad09d81f5b9ea9789ffa26e27d Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Thu, 27 Jun 2024 15:15:20 +0300 Subject: [PATCH] Less external dependencies for WebKit --- build/distfiles/.gitignore | 4 ++ .../glib-networking-2.80.0.tar.xz.meta4 | 18 ++++++++ build/distfiles/libproxy-0.4.18.tar.xz.meta4 | 18 ++++++++ build/distfiles/libpsl-0.21.5.tar.lz.meta4 | 36 +++++++++++++++ build/distfiles/libsoup-2.74.3.tar.xz.meta4 | 18 ++++++++ build/skel/dns/libpsl-0.21.5.do | 28 ++++++++++++ build/skel/games/freeciv-3.0.10.do | 5 +-- build/skel/graphics/zathura-0.5.2.do | 1 - build/skel/net/glib-networking-2.80.0.do | 40 +++++++++++++++++ build/skel/net/libproxy-0.4.18.do | 38 ++++++++++++++++ build/skel/net/libproxy-fix-pkgconf.patch | 31 +++++++++++++ build/skel/net/libproxy-fix-visibility.patch | 45 +++++++++++++++++++ build/skel/net/libsoup-2.74.3.do | 40 +++++++++++++++++ build/skel/security/gnutls-3.7.10.do | 3 +- build/skel/www/links-2.29.do | 1 - build/skel/www/webkitgtk-2.34.6.do | 2 +- 16 files changed, 320 insertions(+), 8 deletions(-) create mode 100644 build/distfiles/glib-networking-2.80.0.tar.xz.meta4 create mode 100644 build/distfiles/libproxy-0.4.18.tar.xz.meta4 create mode 100644 build/distfiles/libpsl-0.21.5.tar.lz.meta4 create mode 100644 build/distfiles/libsoup-2.74.3.tar.xz.meta4 create mode 100644 build/skel/dns/libpsl-0.21.5.do create mode 100644 build/skel/net/glib-networking-2.80.0.do create mode 100644 build/skel/net/libproxy-0.4.18.do create mode 100644 build/skel/net/libproxy-fix-pkgconf.patch create mode 100644 build/skel/net/libproxy-fix-visibility.patch create mode 100644 build/skel/net/libsoup-2.74.3.do diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index 1773cd4..164b59e 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -55,6 +55,7 @@ /girara.git/ /git-2.45.2.tar.xz /glib-2.58.3.tar.xz +/glib-networking-2.80.0.tar.xz /gm4-1.4.19.tar.xz /gmake-4.4.1.tar.gz /gmime-3.2.7.tar.xz @@ -120,8 +121,11 @@ /libplacebo-v6.338.0-117-g5c1e6da2.tar.zst /libplacebo/ /libpng-1.6.43.tar.xz +/libproxy-0.4.18.tar.xz +/libpsl-0.21.5.tar.lz /librsvg-2.40.21.tar.xz /libsndfile-1.0.31.tar.bz2 +/libsoup-2.74.3.tar.xz /libtap-0.1.0-44-gb53e4ef.tar.zst /libtap.git/ /libtool-2.4.7.tar.xz diff --git a/build/distfiles/glib-networking-2.80.0.tar.xz.meta4 b/build/distfiles/glib-networking-2.80.0.tar.xz.meta4 new file mode 100644 index 0000000..6849549 --- /dev/null +++ b/build/distfiles/glib-networking-2.80.0.tar.xz.meta4 @@ -0,0 +1,18 @@ + + + + e271ef92bbdd2209ae24afe8d2d468ef8c870529a9607629dfcbf9f60e295295 + cf407acf5876756dac1fae19b6442b718aa8cdcfd381b00a2d34acc9cac60b519df82a27ceca9af0cc25d54dac03bf43cf74e5f485e6c8fe6b84e11e71719200 + 7dc8537b25febeee8bfda71566165b07e05ed11cde29f445566d69e6194159c6 + ca55f38999acc4ab5682e98c66bec355763c62e00bc8b1a3e09c988580b851685ba9aff4728c19586e8ca2b111929db31a892e790545d8fcec5809210ed84631 + df38c5dfdea73292cbc40012e548d5fdc92080210abad9d14f8a782b15923c50 + 6da1ca35233d4c59723a7988691d74c264811ae27411abcc88b52679f3dc14a0cab8c1b7bc046a8f6cfc46f672313b3af04f0302075da6547ee038e84bb703ff + 9707bd47a7f613bc24ac3212737b6b67c57fb6c5dc20e8659a6276750cb07d2af7d42277e4c7294644e8e833eb5aea28320f3d517073e1316860a1dee2e3dc2b + d8f4f1aab213179ae3351617b59dab5de6bcc9e785021eee178998ebd4bb3acf + 6c5e90b669494a376080446488d1e1332712376643abebcb4b2a8c7a839ec8c18986088dbe83a05e8e0d73eff1875a53608ac79b2d53ee8b047d2123a8f8ede6 + e3c371638f3af2c998e178c3af508c424b809da5030588bad0a6490a1a2222ed + 6b4351bb0afea84a35630908bcf7829b + 287044 + https://download.gnome.org/sources/glib-networking/2.80/glib-networking-2.80.0.tar.xz + + diff --git a/build/distfiles/libproxy-0.4.18.tar.xz.meta4 b/build/distfiles/libproxy-0.4.18.tar.xz.meta4 new file mode 100644 index 0000000..8a3feb0 --- /dev/null +++ b/build/distfiles/libproxy-0.4.18.tar.xz.meta4 @@ -0,0 +1,18 @@ + + + + 1d3f0a481d56e99c967af03767bd340e18df70795be77bdbb3f43df3bba14aaa + 9e7188b1a47a3fbc162966eb57f7816259384ccfee76495495471a8779122aac7228d1ad75e0e0243c473a99370eb36dabcee11c58c89761058deb65ed0a87c8 + 8c61233c62b93b6e78ca798b500459f34051036ac66f441079c637cd9aaf0875 + cd4e8a4f1d9819223322d7b8b80e3d29e1c8bf22c3413cc55ea0a347e4c443cc5847de5bfff808473c0560febc984a46590300e709931f6619be12b9009efb3a + c6b5a36fbf98b43af9a44cb37459043abd2fa3c1d17195746a507579e51823bc + cd209cc09667e55067a31fa933ada2f6c6b46154047a9765784154012f0cd3b24d186cd93b551211721512ab0dcc46060f9a6da774cc73d5148e16c2124f84d4 + 0c6b138bc8da9abcf21e091b876527cfff0703800995363e5a46c29a2a9caa2946c45b299abed6129b314461123949dae387456a0cddcbb0b29a84b9b55f499c + 69b5856e9ea42c38ac77e6b8c92ffc86a71d341fef74e77bef85f9cc6c47a4b1 + 9be7392665092f0ac7eefd3fda05f28db358a0e3705e55204c7283c205df24dfa98c0f16923ed2399bde0dc142c0154e31e67aa629c3ce1291fee8b31087afaa + 7a58e83a7515e088f98c8c640c2d034562c5883c03ad0cd5f11666e1a1d2c349 + 188ceb9d8ed0e04ec2e4a1d7473c34ec + 82020 + https://github.com/libproxy/libproxy/releases/download/0.4.18/libproxy-0.4.18.tar.xz + + diff --git a/build/distfiles/libpsl-0.21.5.tar.lz.meta4 b/build/distfiles/libpsl-0.21.5.tar.lz.meta4 new file mode 100644 index 0000000..fe42382 --- /dev/null +++ b/build/distfiles/libpsl-0.21.5.tar.lz.meta4 @@ -0,0 +1,36 @@ + + + + 91318b7b876b12ff4649b7a0d6f6ed4ab1ab44f48a49508c8978ab7b4ccf3298 + 316724235897418aa9cf1a070e82a0f3c17501919be2f28ffb682b3e3fd20e6da1553df740e16c1ea6f2c78936ab7cea22aa87c99f0351b446c6906075a70f70 + 373b4b887c8939db8007beda645b017783a641a9b11bf3576ea7c66a793dcd35 + 89a999c3cc17fa0066d9cd22ef4a38a12bda2dbf198620329a887e6396a6b47b96d6c3f9abdcbaedb14d65c3fcddd1c5b05298deadc5eaef4e37b7fc66e3756b + 432a7d799498d115131fe66d3f3220e265fa023896f307b097dbcd84bdda441c + 23ab27588f4a5f9545b6def48ef7fbbc0c64a2753c78b3b4663a8a47a04dbf9f965c0b2f7e4a6bbe91c23a1ff5641469a428390a48c205f83bfc5fa88daa6448 + a6608770375453fea1f0bf25368775c682e87b5b127e4bd88305007f7a74d00eecc5f22304c3bd3466dc3bb292faec533a180a16356627b08ef51d87a3830a7b + 9a9f6a8c6edba650cf9ea55475cd172dd28487316804e9c73202d97572cd3a2d + 1c61b3c2fba87ae41d2cbefbe3bf2d3b3ea15c8eee26b08957bdb5857d290a6d9a0b2c69f5868597ad27b7cc2f3756a64d056a3333b82f3adaec8d5fda7018fe + ac6bd71ce18693f7788a85cb58e503018a34933dd9744677513303d12d5811b2 + 71678267007d3759ad67a2e7fd962030 + + 2016549 + https://github.com/rockdaboot/libpsl/releases/download/0.21.5/libpsl-0.21.5.tar.lz + + diff --git a/build/distfiles/libsoup-2.74.3.tar.xz.meta4 b/build/distfiles/libsoup-2.74.3.tar.xz.meta4 new file mode 100644 index 0000000..41720bd --- /dev/null +++ b/build/distfiles/libsoup-2.74.3.tar.xz.meta4 @@ -0,0 +1,18 @@ + + + + 067cc0dea967c4775c04552a898442e840c59e5abd85e6261a54d9f33c32f3be + 91f441197414314bb78cf15e7c13b54714e669145784812fb7a68cc41c8965ea29c53dc686d690e00f28f711be9f767038e5cc43b11aa0136f190dd2d41ec2a0 + 24a9130d746093301cab3ff1c300bd978a8e5032406f840317a5f7edea3617e5 + 79e011845848904fb5389936ee80e6fa330a18110da7a06ed90b32b07030a8c3d4e728effac04338fd55ff29fec9ac6010570cb1013f4eeff8ae2d7ea096268c + 9ec61586579417e2fc6dbb7c27b053325013e31567b3d13191634d5aabd8878f + 58b4b625c7246291072edcd94add43f80098a893979db7174565b32f28b26d505da4862cd782501a3a000453c629f6c2d358f94fa850165b0a2db7048b3ca97c + 72f8a055df984cb35105fe67f4ca67d3fb110d40a9cacb660fccd89f93b06bc32e25d94375dcc76608a245f7c5e081d968d7aaf5952eb16013d81c741247cb4c + e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13 + 056a041d509bde24e0dc309c6a69f8d7da247dc3de678f9e85d90d8904e7fcdcba040e1b42490c6c119ae591360d4b6dc22f57fcea383060042c6c1c187f1246 + ae984e5f8ab0c773295e1fd22d899a76b96c02dbea262ac412fecde3534826b6 + 945dadecde30058840304a1c122f0841 + 1504804 + https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.3.tar.xz + + diff --git a/build/skel/dns/libpsl-0.21.5.do b/build/skel/dns/libpsl-0.21.5.do new file mode 100644 index 0000000..f09d7a3 --- /dev/null +++ b/build/skel/dns/libpsl-0.21.5.do @@ -0,0 +1,28 @@ +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +sname=$1.do . "$BASS_ROOT"/lib/rc +. "$BASS_ROOT"/build/skel/common.rc + +bdeps=" +rc-paths +stow +archivers/zstd +devel/pkgconf-2.1.1 +lang/Python-3.7.3 +archivers/lzip-1.24 +" +redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.lz $rdeps +hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) +. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc +"$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps +. ./rc +$TAR xf "$DISTFILES"/$NAME.tar.lz +"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh + +cd $NAME +./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2 +make -j$MAKE_JOBS >&2 +make install >&2 + +cd "$SKELBINS"/$ARCH +"$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps +"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/games/freeciv-3.0.10.do b/build/skel/games/freeciv-3.0.10.do index 6961864..625b8b2 100644 --- a/build/skel/games/freeciv-3.0.10.do +++ b/build/skel/games/freeciv-3.0.10.do @@ -10,10 +10,7 @@ devel/gmake-4.4.1 devel/pkgconf-2.1.1 shells/bash-5.2.21 " -rdeps=" -ftp/curl-with-tls-8.7.1 -x11-toolkits/gtk+-3.24.42 -" +rdeps=ftp/curl-with-tls-8.7.1 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc diff --git a/build/skel/graphics/zathura-0.5.2.do b/build/skel/graphics/zathura-0.5.2.do index 315441a..d0ba0bf 100644 --- a/build/skel/graphics/zathura-0.5.2.do +++ b/build/skel/graphics/zathura-0.5.2.do @@ -13,7 +13,6 @@ lang/Python-3.7.3 rdeps=" graphics/djvulibre-3.5.28 graphics/mupdf-1.24.0-170-g05063f228 -x11-toolkits/gtk+-3.24.42 " meson=meson-0.63.3 pdfmupdf=zathura-pdf-mupdf-0.4.3 diff --git a/build/skel/net/glib-networking-2.80.0.do b/build/skel/net/glib-networking-2.80.0.do new file mode 100644 index 0000000..3e99f1c --- /dev/null +++ b/build/skel/net/glib-networking-2.80.0.do @@ -0,0 +1,40 @@ +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +sname=$1.do . "$BASS_ROOT"/lib/rc +. "$BASS_ROOT"/build/skel/common.rc + +bdeps=" +rc-paths +stow +archivers/zstd +devel/cmake-3.28.3 +devel/pkgconf-2.1.1 +devel/ninja-v1.12.1 +lang/Python-3.7.3 +" +rdeps=" +security/gnutls-3.7.10 +net/libproxy-0.4.18 +dns/libpsl-0.21.5 +" +meson=meson-0.63.3 +redo-ifchange $bdeps \ + "$DISTFILES"/$NAME.tar.xz \ + "$DISTFILES"/$meson.tar.gz \ + $rdeps +hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) +. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc +"$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps +. ./rc +$TAR xf "$DISTFILES"/$meson.tar.gz +$TAR xf "$DISTFILES"/$NAME.tar.xz +"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh + +cd $NAME +../$meson/meson.py setup --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \ + -Denvironment_proxy=enabled build >&2 +../$meson/meson.py compile -C build >&2 +../$meson/meson.py install -C build >&2 + +cd "$SKELBINS"/$ARCH +"$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps +"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/net/libproxy-0.4.18.do b/build/skel/net/libproxy-0.4.18.do new file mode 100644 index 0000000..2c2afdc --- /dev/null +++ b/build/skel/net/libproxy-0.4.18.do @@ -0,0 +1,38 @@ +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +sname=$1.do . "$BASS_ROOT"/lib/rc +. "$BASS_ROOT"/build/skel/common.rc + +bdeps=" +rc-paths +stow +archivers/zstd +devel/cmake-3.28.3 +devel/gmake-4.4.1 +devel/pkgconf-2.1.1 +" +redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz +hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) +. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc +"$BASS_ROOT"/build/bin/pkg-inst $bdeps +. ./rc +$TAR xf "$DISTFILES"/$NAME.tar.xz +"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh + +cd $NAME +patch <"$BASS_ROOT"/build/skel/net/libproxy-fix-visibility.patch >&2 +patch <"$BASS_ROOT"/build/skel/net/libproxy-fix-pkgconf.patch >&2 +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX="$SKELBINS"/$ARCH/$NAME-$hsh \ + -DWITH_PERL=OFF \ + -DWITH_PYTHON2=OFF \ + -DWITH_PYTHON3=OFF \ + -DWITH_KDE=OFF \ + -DWITH_GNOME=OFF \ + -DWITH_GNOME3=OFF \ + .. >&2 +gmake -j$MAKE_JOBS >&2 +gmake install >&2 + +cd "$SKELBINS"/$ARCH +"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/net/libproxy-fix-pkgconf.patch b/build/skel/net/libproxy-fix-pkgconf.patch new file mode 100644 index 0000000..c0e1ebf --- /dev/null +++ b/build/skel/net/libproxy-fix-pkgconf.patch @@ -0,0 +1,31 @@ +As the library is only built in the master port, and therfore missing in the +build directory for the slave ports, find it via pkg-config and link against it, +when building a slave. + +--- CMakeLists.txt.orig 2020-12-29 11:30:46 UTC ++++ CMakeLists.txt +@@ -26,6 +26,15 @@ else() + set(CMAKE_INSTALL_CONFIG_NAME ${CMAKE_BUILD_TYPE}) + endif() + ++# Make building the library optional. ++option(WITH_LIBRARY "Build libproxy.so" ON) ++ ++if (NOT WITH_LIBRARY) ++ # For the other ports provide an easy way to link against libproxy.so via PkgConfig::LIBPROXY. ++ find_package(PkgConfig) ++ pkg_check_modules(LIBPROXY libproxy-1.0 REQUIRED IMPORTED_TARGET) ++endif () ++ + include(cmake/cpack.cmk) + include(cmake/ctest.cmk) + include(cmake/paths.cmk) +@@ -44,5 +53,7 @@ endif() + + # Always build these + add_subdirectory(libproxy) +-add_subdirectory(utils) ++if (WITH_LIBRARY) ++ add_subdirectory(utils) ++endif() + diff --git a/build/skel/net/libproxy-fix-visibility.patch b/build/skel/net/libproxy-fix-visibility.patch new file mode 100644 index 0000000..5d7b1c2 --- /dev/null +++ b/build/skel/net/libproxy-fix-visibility.patch @@ -0,0 +1,45 @@ +Setting _POSIX_C_SOURCE unsets __BSD_VISIBLE by default, and several symbols +end up being hidden, leading to failures such as: + +In file included from /wrkdir/libproxy-0.4.12/libproxy/test/url-encode.cpp:2: +In file included from /usr/include/c++/v1/iostream:38: +In file included from /usr/include/c++/v1/ios:216: +/usr/include/c++/v1/__locale:545:16: error: use of undeclared identifier 'isascii' + return isascii(__c) ? (__tab_[static_cast(__c)] & __m) !=0 : false; + ^ +/usr/include/c++/v1/__locale:552:22: error: use of undeclared identifier 'isascii' + *__vec = isascii(*__low) ? __tab_[static_cast(*__low)] : 0; + ^ +/usr/include/c++/v1/__locale:560:17: error: use of undeclared identifier 'isascii' + if (isascii(*__low) && (__tab_[static_cast(*__low)] & __m)) + ^ +/usr/include/c++/v1/__locale:569:19: error: use of undeclared identifier 'isascii' + if (!(isascii(*__low) && (__tab_[static_cast(*__low)] & __m))) + ^ +--- libproxy/CMakeLists.txt.orig 2017-05-11 09:33:33 UTC ++++ libproxy/CMakeLists.txt +@@ -6,18 +6,19 @@ set_project_version(0 4 15) + if (WIN32) + add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) + else(WIN32) +- add_definitions(-D_POSIX_C_SOURCE=200112L) + set(CMAKE_CXX_FLAGS "-fvisibility=hidden ${CMAKE_CXX_FLAGS}") + endif(WIN32) + + ### Modules + include(cmake/modules.cmk) + +-### Dev files +-include(cmake/devfiles.cmk) ++if(WITH_LIBRARY) ++ ### Dev files ++ include(cmake/devfiles.cmk) + +-### Main library +-include(cmake/libproxy.cmk) ++ ### Main library ++ include(cmake/libproxy.cmk) ++endif() + + ### Tests + add_testdirectory(test) diff --git a/build/skel/net/libsoup-2.74.3.do b/build/skel/net/libsoup-2.74.3.do new file mode 100644 index 0000000..d291513 --- /dev/null +++ b/build/skel/net/libsoup-2.74.3.do @@ -0,0 +1,40 @@ +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +sname=$1.do . "$BASS_ROOT"/lib/rc +. "$BASS_ROOT"/build/skel/common.rc + +bdeps=" +rc-paths +stow +archivers/zstd +devel/pkgconf-2.1.1 +devel/ninja-v1.12.1 +lang/Python-3.7.3 +" +rdeps=net/glib-networking-2.80.0 +meson=meson-0.63.3 +redo-ifchange $bdeps \ + "$DISTFILES"/$NAME.tar.xz \ + "$DISTFILES"/$meson.tar.gz \ + $rdeps +hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) +. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc +"$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps +. ./rc +$TAR xf "$DISTFILES"/$meson.tar.gz +$TAR xf "$DISTFILES"/$NAME.tar.xz +"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh + +cd $NAME +../$meson/meson.py setup --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \ + -Dsysprof=disabled \ + -Dtests=false \ + -Dinstalled_tests=false \ + -Dtls_check=false \ + -Dntlm=disabled \ + build >&2 +../$meson/meson.py compile -C build >&2 +../$meson/meson.py install -C build >&2 + +cd "$SKELBINS"/$ARCH +"$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps +"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh diff --git a/build/skel/security/gnutls-3.7.10.do b/build/skel/security/gnutls-3.7.10.do index f653156..3984389 100644 --- a/build/skel/security/gnutls-3.7.10.do +++ b/build/skel/security/gnutls-3.7.10.do @@ -13,7 +13,8 @@ $TAR xf "$DISTFILES"/$NAME.tar.xz "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh cd $NAME -./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh --without-tpm >&2 +./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \ + --without-tpm --without-p11-kit >&2 make -j$MAKE_JOBS >&2 make install >&2 diff --git a/build/skel/www/links-2.29.do b/build/skel/www/links-2.29.do index 5d5f3c6..1c3ce4f 100644 --- a/build/skel/www/links-2.29.do +++ b/build/skel/www/links-2.29.do @@ -4,7 +4,6 @@ sname=$1.do . "$BASS_ROOT"/lib/rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" rdeps=" -graphics/gdk-pixbuf-2.42.12 graphics/libpng-1.6.43 graphics/librsvg-2.40.21 graphics/libjpeg-turbo-3.0.3 diff --git a/build/skel/www/webkitgtk-2.34.6.do b/build/skel/www/webkitgtk-2.34.6.do index c800bf2..ae5ea4f 100644 --- a/build/skel/www/webkitgtk-2.34.6.do +++ b/build/skel/www/webkitgtk-2.34.6.do @@ -18,8 +18,8 @@ graphics/libjpeg-turbo-3.0.3 graphics/libpng-1.6.43 graphics/libwebp-1.4.0 graphics/openjpeg-2.5.2 +net/libsoup-2.74.3 security/libgcrypt-1.11.0 -x11-toolkits/gtk+-3.24.42 " redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) -- 2.48.1