ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

Merge remote-tracking branch 'origin/3.6' into 3.7

Browse Source
This commit is contained in:
Tim Biermann 2022-06-29 19:19:23 +02:00
commit c370b8a266
15 changed files with 46 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
harfbuzz/.footprint
View File

@ -11,6 +11,7 @@ drwxr-xr-x root/root usr/include/harfbuzz/
-rw-r--r-- root/root usr/include/harfbuzz/hb-blob.h
-rw-r--r-- root/root usr/include/harfbuzz/hb-buffer.h
-rw-r--r-- root/root usr/include/harfbuzz/hb-common.h
-rw-r--r-- root/root usr/include/harfbuzz/hb-cplusplus.hh
-rw-r--r-- root/root usr/include/harfbuzz/hb-deprecated.h
-rw-r--r-- root/root usr/include/harfbuzz/hb-draw.h
-rw-r--r-- root/root usr/include/harfbuzz/hb-face.h
@ -48,14 +49,14 @@ drwxr-xr-x root/root usr/lib/cmake/harfbuzz/
drwxr-xr-x root/root usr/lib/girepository-1.0/
-rw-r--r-- root/root usr/lib/girepository-1.0/HarfBuzz-0.0.typelib
lrwxrwxrwx root/root usr/lib/libharfbuzz-gobject.so -> libharfbuzz-gobject.so.0
lrwxrwxrwx root/root usr/lib/libharfbuzz-gobject.so.0 -> libharfbuzz-gobject.so.0.40300.0
-rwxr-xr-x root/root usr/lib/libharfbuzz-gobject.so.0.40300.0
lrwxrwxrwx root/root usr/lib/libharfbuzz-gobject.so.0 -> libharfbuzz-gobject.so.0.40401.0
-rwxr-xr-x root/root usr/lib/libharfbuzz-gobject.so.0.40401.0
lrwxrwxrwx root/root usr/lib/libharfbuzz-subset.so -> libharfbuzz-subset.so.0
lrwxrwxrwx root/root usr/lib/libharfbuzz-subset.so.0 -> libharfbuzz-subset.so.0.40300.0
-rwxr-xr-x root/root usr/lib/libharfbuzz-subset.so.0.40300.0
lrwxrwxrwx root/root usr/lib/libharfbuzz-subset.so.0 -> libharfbuzz-subset.so.0.40401.0
-rwxr-xr-x root/root usr/lib/libharfbuzz-subset.so.0.40401.0
lrwxrwxrwx root/root usr/lib/libharfbuzz.so -> libharfbuzz.so.0
lrwxrwxrwx root/root usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.40300.0
-rwxr-xr-x root/root usr/lib/libharfbuzz.so.0.40300.0
lrwxrwxrwx root/root usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.40401.0
-rwxr-xr-x root/root usr/lib/libharfbuzz.so.0.40401.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/harfbuzz-gobject.pc
-rw-r--r-- root/root usr/lib/pkgconfig/harfbuzz-subset.pc

8
harfbuzz/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Vbj3UNlPW6JWrnhm7PXdnEMJvdIl3oFWgkHwiY1ubvXIhdJC1P7Me5SEP9yLe+ckG+2Arl9/P7rnQNOny+V5Ag=
SHA256 (Pkgfile) = 424fc211efb71955631bd079a5cf99f180443c9067f419c2abedc827697c1a21
SHA256 (.footprint) = 5a4d2c2dcb518260c500ff15cf4a67087a691cf126f544f631e80f7f39ff30d2
SHA256 (harfbuzz-4.3.0.tar.xz) = a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530
RWSE3ohX2g5d/Q2gvF7qJRVbtDjzwVNGHpSjzEjQZ6Uysc2GWw4t/N6xZs6cv6xhklq8ma3TihJEe4QNc0mRqcOY2zCP/IXjTQI=
SHA256 (Pkgfile) = 87ba34975a11df9268ef83c0565cc7b1bc7e7ef4e369f9d9edddebcb4b08c946
SHA256 (.footprint) = eec646e38baef428713cdec0c9658992bdbc83a44276db7690ae688bb1e1ff6b
SHA256 (harfbuzz-4.4.1.tar.xz) = c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee

2
harfbuzz/Pkgfile
View File

@ -5,7 +5,7 @@
# Optional: chafa graphite2 icu
name=harfbuzz
version=4.3.0
version=4.4.1
release=1
source=(https://github.com/harfbuzz/harfbuzz/releases/download/$version/$name-$version.tar.xz)

1
libzip/.footprint
View File

@ -65,6 +65,7 @@ drwxr-xr-x root/root usr/share/man/man3/
-rw-r--r-- root/root usr/share/man/man3/zip_file_get_comment.3.gz
-rw-r--r-- root/root usr/share/man/man3/zip_file_get_error.3.gz
-rw-r--r-- root/root usr/share/man/man3/zip_file_get_external_attributes.3.gz
-rw-r--r-- root/root usr/share/man/man3/zip_file_is_seekable.3.gz
-rw-r--r-- root/root usr/share/man/man3/zip_file_rename.3.gz
-rw-r--r-- root/root usr/share/man/man3/zip_file_replace.3.gz
-rw-r--r-- root/root usr/share/man/man3/zip_file_set_comment.3.gz

8
libzip/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/RgIDfH0l9RZH5yesWVomEP0l+MSrnutojIj6EJ0lt9KipYpM/Wukfr1so19US1PSddBbPuGlfcrhvjMj2+yfgg=
SHA256 (Pkgfile) = 3e253e10f47a35edb7b20ede438021020f26351d744ef30da051178acfa66616
SHA256 (.footprint) = ff1c4d88013d10f7c10932083cea091225f3354dc2e42f66da21591ea7924902
SHA256 (libzip-1.9.0.tar.xz) = a17240ee88f0705a9067bb0087fde1cee73948b3cf6c3978a21a58fdb73b76a2
RWSE3ohX2g5d/YgOosAazqnoMM9ZoPn5LLpdPbN41XntbsHDDNV0q8ZpCpIDymO4oesfKjrIckxofZiqf5NsqoW6xEfRH3fwUQI=
SHA256 (Pkgfile) = 458828cb634f164411ce27007e902f4b54808e6df947474b43fabd1f90dac8ac
SHA256 (.footprint) = 7a33815426f5de3caacca3a3aef2919c0b5623a04ca43ddf1290d68e71768059
SHA256 (libzip-1.9.2.tar.xz) = c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937

2
libzip/Pkgfile
View File

@ -5,7 +5,7 @@
# Optional: ninja
name=libzip
version=1.9.0
version=1.9.2
release=1
source=(https://libzip.org/download/$name-$version.tar.xz)

6
neovim/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/a560kzcUpH/teoxoT7OspNnskaQizn+0EFjJ8hIRifw5yNyuuoxpSWNYBWCBsmMJP7fgDki5yl1QQPp+HXFJwo=
SHA256 (Pkgfile) = 4a89fd62feedd77a07c1d59bb99817876bb7fce213588b41b187de4d199bf045
RWSE3ohX2g5d/W7CAvtasCNxTU9BTjivE8jgU3a4HC4jtBhTefeLULu0/i1RaYfZ6P22Ge0QB8ntQ/f/zwDxaOvUGaEOH1wFwwo=
SHA256 (Pkgfile) = 6ef873444dee7698814d8dcc696e3bdae978ab9a88d6380fc7a7637d5972bdf8
SHA256 (.footprint) = 92c0bcbf9088b35a21ba3aaa041bcbf471787cbce2de442d39bc8c0cd1838f9f
SHA256 (neovim-0.7.0.tar.gz) = 792a9c55d5d5f4a5148d475847267df309d65fb20f05523f21c1319ea8a6c7df
SHA256 (neovim-0.7.2.tar.gz) = ccab8ca02a0c292de9ea14b39f84f90b635a69282de38a6b4ccc8565bc65d096

2
neovim/Pkgfile
View File

@ -5,7 +5,7 @@
# Optional: ninja tree-sitter
name=neovim
version=0.7.0
version=0.7.2
release=1
source=(https://github.com/neovim/neovim/archive/v$version/$name-$version.tar.gz)

4
pulseaudio/.footprint
View File

@ -78,8 +78,8 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libpulse-simple.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libpulse.pc
drwxr-xr-x root/root usr/lib/pulseaudio/
-rwxr-xr-x root/root usr/lib/pulseaudio/libpulsecommon-16.0.so
-rwxr-xr-x root/root usr/lib/pulseaudio/libpulsecore-16.0.so
-rwxr-xr-x root/root usr/lib/pulseaudio/libpulsecommon-16.1.so
-rwxr-xr-x root/root usr/lib/pulseaudio/libpulsecore-16.1.so
-rwxr-xr-x root/root usr/lib/pulseaudio/libpulsedsp.so
drwxr-xr-x root/root usr/lib/pulseaudio/modules/
-rwxr-xr-x root/root usr/lib/pulseaudio/modules/libalsa-util.so

8
pulseaudio/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Z2iIj8RaR1w14aJTVIyVpj6D1zhOyOKrkXS4YIqzIeVmbwMt96oOBsju7vf2v9YLgRKs7SUpaijnzlXxzZ6YA4=
SHA256 (Pkgfile) = 9d10e521f5910b115d2bb0c4b161cca172dc122f5125566cc1abbaf08ec3a1e8
SHA256 (.footprint) = df7a6d5b0f2b4e62baad81a80b8ad4fe3c7f33ba1e102b5fd9c58bdd00c8521f
SHA256 (pulseaudio-16.0.tar.xz) = b4ec6271910a1a86803f165056547f700dfabaf8d5c6c69736f706b5bb889f47
RWSE3ohX2g5d/SU0erLc/HobUm4Tvd0xZVc19+pL1GYPixjnwr5iVa24CvQtw0H0Pp7r64HTbdxW0wqAONLl49siQ/j8S5lpeAQ=
SHA256 (Pkgfile) = 22389c588098157496aaeb10fa45c28faa8d9e24b5ee48f39e129ae0009da9f6
SHA256 (.footprint) = 62d22fb11c92bc8eedb38679d49bfc77f115894b42ce0866a1a384799ac3a565
SHA256 (pulseaudio-16.1.tar.xz) = 8eef32ce91d47979f95fd9a935e738cd7eb7463430dabc72863251751e504ae4

2
pulseaudio/Pkgfile
View File

@ -5,7 +5,7 @@
# Optional: avahi bluez fftw gst-plugins-base sbc xorg-libice xorg-libsm xorg-libxtst
name=pulseaudio
version=16.0
version=16.1
release=1
source=(https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$version.tar.xz)

10
qtwebengine/.signature
View File

@ -1,14 +1,12 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/QDrrJTqcp65T5VqJkEuPdGfb5vQSTLoyr0KXn011jNZkJgBvdJvzYo0Qh3D7H0DTU8+MyImPnmf9UlK7774Lgk=
SHA256 (Pkgfile) = d040ab8079379e5d7a880c3cbe1d0113fab5d1921b468b14316c2f24d4fde9d2
RWSE3ohX2g5d/YVLseJexSWcGujgg9xH1oTiOIwzJ0/OODc1qOpA41Hmd97whsBqh1QZ9V06iM79Ob9/lzsRAWqpuVURon3+hQU=
SHA256 (Pkgfile) = eb45f8a030408d04a98a3baeb9114e62831b3d521f267b7c79805be9a49f6fd6
SHA256 (.footprint) = 44b1db82a792e29d0e7a4bf1a4ea7d0ed7b440ab9f0df493452d03ff3c164554
SHA256 (qtwebengine-5.15.9.tar.xz) = 4b61afcd5b5452d9b3178f28335fb455da543170220f72dba85fe6aa8e76fa39
SHA256 (qtwebengine-5.15.9-build_fixes-1.patch) = 78aa2fb51bf3b4916f23e4bf81dcaff838da7b38c3261d8cfd18178b52e50445
SHA256 (qtwebengine-5.15.10.tar.xz) = 07e9845fe51104a80c0be3bceaa66a11c846bd3f96eeab5bf4af940a7bde1701
SHA256 (qtwebengine-5.15.10-build_fixes-1.patch) = 4d86ddd723ffe605066a8cf4412535cc0b0929ee2819919a749bb17ad9464093
SHA256 (qtwebengine-5.15.2-disable-fatal-warnings.patch) = 19dac26d6753f4cbe1fe2bcb911d8124ea082f55ff86b45cdcba294d3c199249
SHA256 (qtwebengine-5.15.2-extra_gn.patch) = 3b691d9fb242688e1521a26bf1c47ce5aaa9cd6f7e7fdc458c332470a563d6be
SHA256 (qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch) = 4bd5364a5f45c68e0bd452dad7a6f638142503da8c43aaeb15d577aa09369c7c
SHA256 (qtwebengine-5.15.2_p20210521-clang-libc++.patch) = 64f786a919c7c145033139e6effe236459dad7b7bb5b52428e00fc70592ce05d
SHA256 (qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch) = 391f899137cabf4c90ff3bc3a1cf9687d6a273e7bd42618760e7f09c7e0d3e32
SHA256 (qtwebengine-5.15.3_p20220406-ffmpeg5.patch) = 63b0a709c7d1e84193dada20109740d6b9a768f6d83809247dd9691ff50bfc7c
SHA256 (qt5-webengine-pipewire-0.3.patch) = 5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f
SHA256 (gcc12.patch) = 2a59acf4574bdd9a0c1a2314aef11d44a2de033392b72ae21f97370e4bbaba99

29
qtwebengine/Pkgfile
View File

@ -1,21 +1,20 @@
# Description: Provides support for web applications using the Chromium browser project.
# URL: https://www.qt.io/
# Maintainer: Danny Rawlins, crux at romster dot me
# Depends on: ffmpeg libvpx libwebp nodejs nss opus python qt5 xorg-libxscrnsaver xorg-libxtst
# Depends on: ffmpeg libvpx libwebp nodejs nss qt5 xorg-libxscrnsaver xorg-libxtst
# Optional: jsoncpp krb5 libevent libsrtp pipewire pulseaudio snappy
name=qtwebengine
version=5.15.9
release=2
version=5.15.10
release=1
source=(https://anduin.linuxfromscratch.org/BLFS/qtwebengine/$name-$version.tar.xz
https://www.linuxfromscratch.org/patches/blfs/svn/qtwebengine-$version-build_fixes-1.patch
qtwebengine-5.15.2-disable-fatal-warnings.patch
qtwebengine-5.15.2-extra_gn.patch
qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
qtwebengine-5.15.2_p20210521-clang-libc++.patch
qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
qtwebengine-5.15.3_p20220406-ffmpeg5.patch
qt5-webengine-pipewire-0.3.patch
gcc12.patch)
qt5-webengine-pipewire-0.3.patch)
build() {
cd qtwebengine-$version
@ -23,13 +22,11 @@ build() {
# https://www.linuxfromscratch.org/blfs/view/svn/x/qtwebengine.html
patch -p1 -i $SRC/qtwebengine-$version-build_fixes-1.patch
patch -p1 -i $SRC/qtwebengine-5.15.2-disable-fatal-warnings.patch
patch -p1 -i $SRC/qtwebengine-5.15.2-extra_gn.patch
patch -p1 -i $SRC/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
patch -p1 -i $SRC/qtwebengine-5.15.2_p20210521-clang-libc++.patch
patch -p1 -i $SRC/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
patch -p1 -i $SRC/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
patch -p1 -d src/3rdparty -i $SRC/qt5-webengine-pipewire-0.3.patch
patch -p0 -d src/3rdparty/chromium/third_party/skia/src/utils/ -i $SRC/gcc12.patch
mkdir -pv .git src/3rdparty/chromium/.git
sed -e '/^MODULE_VERSION/s/5.*/5.15.2/' -i .qmake.conf
@ -42,13 +39,14 @@ build() {
# Ninja, by default, sets the number of jobs to the number of availalble threads
test -n "$JOBS" && export NINJAFLAGS+=" -j ${JOBS-1}"
prt-get isinst clang && CC=clang CXX=clang++
prt-get isinst ccache && export \
QMAKE_CC='ccache gcc' \
QMAKE_LINK_C='ccache gcc' \
QMAKE_LINK_C_SHLIB='ccache gcc' \
QMAKE_CXX='ccache g++' \
QMAKE_LINK='ccache g++' \
QMAKE_LINK_SHLIB='ccache g++' \
QMAKE_CC="ccache ${CC:-gcc}" \
QMAKE_LINK_C="ccache ${CC:-gcc}" \
QMAKE_LINK_C_SHLIB="ccache ${CC:-gcc}" \
QMAKE_CXX="ccache ${CXX:-g++}" \
QMAKE_LINK="ccache ${CXX:-g++}" \
QMAKE_LINK_SHLIB="ccache ${CXX:-g++}" \
PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
install -d build
@ -56,8 +54,7 @@ build() {
prt-get isinst pulseaudio && PKGMK_QTWEBENGINE+=' -pulseaudio' || PKGMK_QTWEBENGINE+=' -no-pulseaudio'
prt-get isinst pipewire && PKGMK_QTWEBENGINE+=' -webengine-webrtc-pipewire'
#prt-get isinst icu && PKGMK_QTWEBENGINE+=' -webengine-icu' || PKGMK_QTWEBENGINE+=' -no-webengine-icu'
PKGMK_QTWEBENGINE+=' -no-webengine-icu'
prt-get isinst icu && PKGMK_QTWEBENGINE+=' -webengine-icu' || PKGMK_QTWEBENGINE+=' -no-webengine-icu'
qmake-qt5 .. -- \
$PKGMK_QTWEBENGINE \

10
qtwebengine/gcc12.patch
View File

@ -1,10 +0,0 @@
--- SkParseColor.cpp.orig 2022-05-10 21:02:09.968689017 +0200
+++ SkParseColor.cpp 2022-05-10 21:02:17.812647846 +0200
@@ -6,6 +6,7 @@
*/
+#include <iterator>
#include "include/utils/SkParse.h"
static constexpr const char* gColorNames[] = {

12
qtwebengine/qtwebengine-5.15.2-extra_gn.patch
View File

@ -1,12 +0,0 @@
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
index 3d6fda80e..3d0bc86fe 100644
--- a/src/core/gn_run.pro
+++ b/src/core/gn_run.pro
@@ -38,5 +38,6 @@ build_pass|!debug_and_release {
}
+ gn_args += $$(EXTRA_GN)
gn_args = $$system_quote($$gn_args)
gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir()))
gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
gn_python = "--script-executable=$$pythonPathForSystem()"