Removed obsolete stuff
This commit is contained in:
parent
5a7e30ce99
commit
062704968a
@ -1,9 +0,0 @@
|
|||||||
AUX dsmc.conf.d 196 BLAKE2B e87b70a2580b33a2e9c18b25b98b0f8452ec9396a0bcd757286ef2362bb2707fad468397dad71689d63cf42b27e5e2d775fd42c33a4c78a3d41f8fc95754df5e SHA512 5697da5a820f328e80c78063be2216572b544e4195efbb0866d15f781be8d155aac257b3bb843e67d466b2c1b37efdc3922397cf49fdf5cc18f0c5c08808f634
|
|
||||||
AUX dsmc.init.d 718 BLAKE2B a1de3d6eab6e0ee94f9549a73f45323728911eff36c87b5d471046daa27052932a77bf70c66411ab01db228c276553ddf04e6c2b9bc6a574fafe026105443629 SHA512 01cf7775b0a7e3ad84cc2c35bd73ae3ce6a4fb1c1968da6cfe9d97a8804833970af32873f895181d7d2220b0787e96b67c4b5f8ff4b6d450ee3a5d92735a6f2c
|
|
||||||
AUX dsmc.service 184 BLAKE2B a6a14302b32cdfdd9d1460b2d686a9a828d1cdd3c19dc53f8f57b4febccdb389d12813e0cb6ec34d9e1914d85f19865d7d8e75d5ecdac101bb4108ba68f9c64a SHA512 b047251e3fb7d006315b0f069adac62bc3c7f6ccc835ab59a2975a3f206151de8b0cb6a8f414d0f41922a961378376d79d61e38cd7be2aa5743822f365f87bf6
|
|
||||||
AUX dsmcad.init.d-r1 531 BLAKE2B 840b6431f083df2da7f42d79a1b28a87ed3b90d497e54a165b98dec9466323d1ec8ffad894c5d165fd994a99e7a52ca22bb6b81597e93001f22be2af641da6a9 SHA512 b69166e9e004d81a7f43551e5f1189c3a545afc67e5029009e9693fbed20a247f922975fec695542f0a3afd7c0c5a4ee6c026678de4812b00488afc45699699a
|
|
||||||
AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed61564fd45380ac792c89c20da1f8296f617467c411605f86a5cc2190d2135be771348c1d58b7c56c SHA512 e3572098abf5b2831d10a3b649337b5c9f1cd9fda4ed58844408b6fe31fdc68a3bbc197eab227f9808bc9ab4b4a7488c766aaa472e801d88631b6b8ec398eb45
|
|
||||||
AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
|
|
||||||
DIST 8.1.15.0-TIV-TSMBAC-LinuxX86.tar 680560640 BLAKE2B 837cbe2d7e63a827062639fe52e8a17275bc7f7f47f52ddf59d5f00cc8f5a3c2875a39107047cc53cd57ac7100011bd8b0d72b0a893edcedef285a10c0d34c01 SHA512 2bdf22ae31af37641e8f06cea118671e461d157dd943c86ffafd866f6fe99ebf40135ba3ea1d2511742ed9c3841db93b8ccb46c29825ce87c217bc94c93fed73
|
|
||||||
EBUILD tsm-8.1.15.0.ebuild 7482 BLAKE2B 30e53b911e6413240a9b7541ef1899ea56c38a5eeaf172c138db11c53b25418dff0736ce3ad75ea3d242d7e112fd85c9dbc2952bc6a8e5751062b65f5455925d SHA512 51c51183f56769e62e800c1067045786c9661130bceb6bcb1cfd8bc7f3a151a04d828e2c0c50ec1d8551809f00fea38e7a7bfefe612332715109f4bfadb2f862
|
|
||||||
MISC metadata.xml 398 BLAKE2B fb4d250c3bf724349ac31d66b1c43e766d4ba9b001e88b47949c6fe188a629eb1b87321ef3391d2886e9b74daf235cff0139079fd6f72b7342119542438e30e6 SHA512 bd6ec11787dd6f2ff1a59e7e1027a01b80b22256530d35d6a2fb5b3398ee641b9c778f6a8c2555b7098a199bbb1eda1a5204be53509e5eb47399dbad83798547
|
|
@ -1,7 +0,0 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
# Config file for /etc/init.d/tivoli
|
|
||||||
|
|
||||||
# See your TSM manual for valid ops
|
|
||||||
#DSMC_OPTS=""
|
|
@ -1,27 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
use net
|
|
||||||
after dns
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
ebegin "Starting dsmc"
|
|
||||||
start-stop-daemon --start --background --nicelevel 15 \
|
|
||||||
--make-pidfile --pidfile /var/run/dsmc.pid \
|
|
||||||
--exec /opt/tivoli/tsm/client/ba/bin/dsmc sched ${DSMC_OPTS}
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin "Stopping dsmc"
|
|
||||||
# For whatever reason SIGTERM doesn't affect the dsmc process, but
|
|
||||||
# SIGHUP makes it exit cleanly
|
|
||||||
start-stop-daemon --stop \
|
|
||||||
--signal 1 \
|
|
||||||
--pidfile /var/run/dsmc.pid
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=Tivoli Storage Manager (TSM) - dsmc
|
|
||||||
After=network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Nice=15
|
|
||||||
ExecStart=/opt/tivoli/tsm/client/ba/bin/dsmc sched
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
@ -1,25 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
command=/opt/tivoli/tsm/client/ba/bin/dsmcad
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
use net
|
|
||||||
after dns dsmc
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
ebegin "Starting dsmcad"
|
|
||||||
start-stop-daemon --start --nicelevel 15 \
|
|
||||||
--exec ${command}
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin "Stopping dsmcad"
|
|
||||||
start-stop-daemon --stop \
|
|
||||||
--signal 1 \
|
|
||||||
--exec ${command}
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=Tivoli Storage Manager (TSM) - dsmcad
|
|
||||||
After=network.target dsmc.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=forking
|
|
||||||
Nice=15
|
|
||||||
ExecStart=/opt/tivoli/tsm/client/ba/bin/dsmcad
|
|
||||||
GuessMainPID=no
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
@ -1,4 +0,0 @@
|
|||||||
/var/log/tsm/*.log {
|
|
||||||
create 0660 root tsm
|
|
||||||
delaycompress
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>dilfridge@gentoo.org</email>
|
|
||||||
</maintainer>
|
|
||||||
<use>
|
|
||||||
<flag name="tsm_cit">IBM Tivoli Common Inventory Technology</flag>
|
|
||||||
<flag name="tsm_hw">Difference snapshot support for NetApp and N-Series file servers</flag>
|
|
||||||
</use>
|
|
||||||
</pkgmetadata>
|
|
@ -1,244 +0,0 @@
|
|||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
inherit readme.gentoo-r1 rpm systemd pax-utils
|
|
||||||
|
|
||||||
DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
|
|
||||||
HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
|
|
||||||
|
|
||||||
MY_PV_MAJOR=$(ver_cut 1)
|
|
||||||
MY_PV_MINOR=$(ver_cut 2)
|
|
||||||
MY_PV_TINY=$(ver_cut 3)
|
|
||||||
MY_PV_PATCH=$(ver_cut 4)
|
|
||||||
|
|
||||||
MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
|
|
||||||
MY_PVR_ALLDOTS=${PV}
|
|
||||||
|
|
||||||
if [[ ${MY_PV_PATCH} == 0 ]]; then
|
|
||||||
MY_RELEASE_PATH=maintenance
|
|
||||||
else
|
|
||||||
MY_RELEASE_PATH=patches
|
|
||||||
fi
|
|
||||||
BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
|
|
||||||
BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
|
|
||||||
BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
|
|
||||||
SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
|
|
||||||
SRC_URI="${BASE_URI}${SRC_TAR}"
|
|
||||||
|
|
||||||
RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
|
|
||||||
LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
|
|
||||||
dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
|
|
||||||
ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
|
|
||||||
|| ( BSD GPL-2+ ) gSOAP libpng tsm"
|
|
||||||
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* amd64"
|
|
||||||
IUSE="acl java +tsm-cit +tsm-hw"
|
|
||||||
QA_PREBUILT="*"
|
|
||||||
|
|
||||||
# not available (yet?)
|
|
||||||
#MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP
|
|
||||||
# ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW"
|
|
||||||
MY_LANG_PV="${MY_PVR_ALLDOTS}-"
|
|
||||||
for lang in ${MY_LANGS}; do
|
|
||||||
IUSE="${IUSE} l10n_${lang%:*}"
|
|
||||||
SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \
|
|
||||||
${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
|
|
||||||
${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
|
|
||||||
done
|
|
||||||
unset lang
|
|
||||||
|
|
||||||
DEPEND="
|
|
||||||
acct-group/tsm
|
|
||||||
"
|
|
||||||
RDEPEND="
|
|
||||||
acct-group/tsm
|
|
||||||
dev-libs/expat
|
|
||||||
dev-libs/libxml2
|
|
||||||
sys-fs/fuse:0
|
|
||||||
acl? ( sys-apps/acl )
|
|
||||||
java? ( virtual/jre:1.8 )
|
|
||||||
|| (
|
|
||||||
sys-libs/libxcrypt[compat]
|
|
||||||
sys-libs/glibc[crypt(+)]
|
|
||||||
)"
|
|
||||||
|
|
||||||
S="${WORKDIR}/bacli"
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
DOC_CONTENTS="
|
|
||||||
Note that you have to be root to be able to use the Tivoli Storage Manager
|
|
||||||
client. The dsmtca trusted agent binary does not exist anymore.
|
|
||||||
|
|
||||||
For information on how to give other users access, please see the following
|
|
||||||
URLs:
|
|
||||||
https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_cfg_nonadmin.html#c_macuninst_nonadmin
|
|
||||||
https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_secure_pwd.html#c_secure_pwd__sec_no_tca
|
|
||||||
"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
local rpm rpms lang
|
|
||||||
mkdir bacli || die
|
|
||||||
cd bacli || die
|
|
||||||
unpack ${SRC_TAR}
|
|
||||||
|
|
||||||
cd "${S}"
|
|
||||||
for rpm in *.rpm; do
|
|
||||||
case ${rpm} in
|
|
||||||
TIVsm-APIcit.*|TIVsm-BAcit.*)
|
|
||||||
use tsm-cit && rpms="${rpms} ./${rpm}"
|
|
||||||
;;
|
|
||||||
TIVsm-BAhdw.*)
|
|
||||||
use tsm-hw && rpms="${rpms} ./${rpm}"
|
|
||||||
;;
|
|
||||||
TIVsm-JBB.*|*-filepath-*)
|
|
||||||
# "journal based backup" for all filesystems
|
|
||||||
# requires a kernel module.
|
|
||||||
# "Linux Filepath source code" available
|
|
||||||
# by request from vendor
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
rpms="${rpms} ./${rpm}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
for rpm in ${A}; do
|
|
||||||
case ${rpm} in
|
|
||||||
*.rpm)
|
|
||||||
rpms="${rpms} ${rpm}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
rpm_unpack ${rpms}
|
|
||||||
|
|
||||||
# Avoid strange error messages caused by read-only files
|
|
||||||
chmod -R u+w "${S}" || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
cp -a opt "${D}"/ || die
|
|
||||||
cp -a usr "${D}"/ || die
|
|
||||||
|
|
||||||
# The RPM files contain postinstall scripts which can be extracted
|
|
||||||
# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
|
|
||||||
# Below we try to mimic the behaviour of these scripts.
|
|
||||||
# We don't deal with SELinux compliance (yet), though.
|
|
||||||
local RPM_INSTALL_PREFIX CLIENTDIR i
|
|
||||||
RPM_INSTALL_PREFIX=/opt
|
|
||||||
CLIENTDIR=${RPM_INSTALL_PREFIX}/tivoli/tsm/client
|
|
||||||
|
|
||||||
# Create links for messages; this is spread over several postin scripts.
|
|
||||||
#for i in $(cd "${D}"/${CLIENTDIR}/lang; ls -1d ??_??); do
|
|
||||||
# dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
|
|
||||||
# dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
|
|
||||||
#done
|
|
||||||
|
|
||||||
# Mimic TIVsm-API64 postinstall script
|
|
||||||
for i in libgpfs.so libdmapi.so; do
|
|
||||||
dosym ../..${CLIENTDIR}/api/bin64/${i} /usr/lib64/${i}
|
|
||||||
done
|
|
||||||
|
|
||||||
# The TIVsm-BA postinstall script only does messages and ancient upgrades
|
|
||||||
|
|
||||||
# The gscrypt64 postinstall script only deals with s390[x] SELinux
|
|
||||||
# and the symlink for the iccs library which we handle in the loop below.
|
|
||||||
|
|
||||||
# Move stuff from /usr/local to /opt, #452332
|
|
||||||
mv "${D}"/usr/local/ibm "${D}"/opt/ || die
|
|
||||||
rmdir "${D}"/usr/local || die
|
|
||||||
|
|
||||||
# Mimic gskssl64 postinstall script
|
|
||||||
for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
|
|
||||||
dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
|
|
||||||
/usr/lib64/libgsk8${i}_64.so
|
|
||||||
done
|
|
||||||
for i in capicmd ver; do
|
|
||||||
dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
|
|
||||||
done
|
|
||||||
|
|
||||||
# Done with the postinstall scripts as the RPMs contain them.
|
|
||||||
# Now on to some more Gentoo-specific installation.
|
|
||||||
|
|
||||||
rm -rf "${D}/usr/lib/.build-id" &> /dev/null
|
|
||||||
[[ -d "${D}/usr/lib" ]] && rmdir "${D}/usr/lib" || die "Using 32bit lib dir in 64bit only system"
|
|
||||||
|
|
||||||
# Avoid "QA Notice: Found an absolute symlink in a library directory"
|
|
||||||
local target
|
|
||||||
find "${D}"/usr/lib* -lname '/*' | while read i; do
|
|
||||||
target=$(readlink "${i}")
|
|
||||||
rm -v "${i}" || die
|
|
||||||
dosym "../..${target}" "${i#${D}/}"
|
|
||||||
done
|
|
||||||
|
|
||||||
keepdir /var/log/tsm
|
|
||||||
insinto /etc/logrotate.d
|
|
||||||
newins "${FILESDIR}/tsm.logrotate" tsm
|
|
||||||
|
|
||||||
keepdir /etc/tivoli
|
|
||||||
|
|
||||||
cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
|
|
||||||
echo ' PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
|
|
||||||
echo ' PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
|
|
||||||
|
|
||||||
# Added the hostname to be more friendly, the admin will need to edit this file anyway
|
|
||||||
echo ' NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
|
|
||||||
echo ' ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
|
|
||||||
echo ' SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
|
|
||||||
dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
|
|
||||||
|
|
||||||
cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
|
|
||||||
dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
|
|
||||||
|
|
||||||
# Setup the env
|
|
||||||
dodir /etc/env.d
|
|
||||||
ENV_FILE="${D}/etc/env.d/80tivoli"
|
|
||||||
echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
|
|
||||||
echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
|
|
||||||
echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
|
|
||||||
# echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
|
|
||||||
|
|
||||||
echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die
|
|
||||||
insinto "/etc/revdep-rebuild"
|
|
||||||
doins "${T}/80${PN}"
|
|
||||||
|
|
||||||
newconfd "${FILESDIR}/dsmc.conf.d" dsmc
|
|
||||||
newinitd "${FILESDIR}/dsmc.init.d" dsmc
|
|
||||||
newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
|
|
||||||
|
|
||||||
# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
|
|
||||||
pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
|
|
||||||
|
|
||||||
systemd_dounit "${FILESDIR}/dsmc.service"
|
|
||||||
systemd_dounit "${FILESDIR}/dsmcad.service"
|
|
||||||
|
|
||||||
readme.gentoo_create_doc
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
local i dirs
|
|
||||||
for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
|
|
||||||
if [[ ! -e ${i} ]]; then
|
|
||||||
touch ${i} || die
|
|
||||||
chown :tsm ${i} || die
|
|
||||||
chmod 0660 ${i} || die
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Bug #375041: the log directory itself should not be world writable.
|
|
||||||
# Have to do this in postinst due to bug #141619
|
|
||||||
chown root:tsm /var/log/tsm || die
|
|
||||||
chmod 0750 /var/log/tsm || die
|
|
||||||
|
|
||||||
# Bug 508052: directories used to be too restrictive, have to widen perms.
|
|
||||||
dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
|
|
||||||
chown root:root "${dirs[@]}" || die
|
|
||||||
chmod 0755 "${dirs[@]}" || die
|
|
||||||
|
|
||||||
FORCE_PRINT_ELOG=1
|
|
||||||
DISABLE_AUTOFORMATTING=1
|
|
||||||
readme.gentoo_print_elog
|
|
||||||
}
|
|
@ -1,2 +0,0 @@
|
|||||||
DIST certbot-2.6.0.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
|
|
||||||
EBUILD certbot-dns-rfc2136-2.6.0.ebuild 942 BLAKE2B 49450ab1bdff5b1ce1361ee7de07e978bd00a7ffd10fc2166e46fdd2ae0f12a173691d20205ff14fb0613e63d0acb89cd7c8a6804b42d8af4f4dd6e40c8a22a6 SHA512 e2c2968795f027f7c7cd32f007374100cfcfe154522adce0525f5069c1064ea72405e619cd8928b0bd027b2b91bfd86ac0d38d1779250cb0861701bed31e9f7f
|
|
@ -1,32 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{9..12} )
|
|
||||||
DISTUTILS_USE_PEP517=setuptools
|
|
||||||
|
|
||||||
if [[ ${PV} == 9999* ]]; then
|
|
||||||
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
|
|
||||||
inherit git-r3
|
|
||||||
S=${WORKDIR}/${P}/${PN}
|
|
||||||
else
|
|
||||||
SRC_URI="https://github.com/${PN%-dns-rfc2136}/${PN%-dns-rfc2136}/archive/v${PV}.tar.gz -> ${PN%-dns-rfc2136}-${PV}.tar.gz"
|
|
||||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
|
||||||
S=${WORKDIR}/${PN%-dns-rfc2136}-${PV}/${PN}
|
|
||||||
fi
|
|
||||||
|
|
||||||
inherit distutils-r1
|
|
||||||
|
|
||||||
DESCRIPTION="DNS RFC 2136 plugin for certbot (Let's Encrypt Client)"
|
|
||||||
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
|
|
||||||
|
|
||||||
LICENSE="Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
|
|
||||||
RDEPEND="~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
|
|
||||||
~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
|
|
||||||
>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]"
|
|
||||||
|
|
||||||
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
|
|
||||||
distutils_enable_tests pytest
|
|
@ -1,44 +0,0 @@
|
|||||||
# Copyright 1999-2020 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]] ; then
|
|
||||||
inherit subversion
|
|
||||||
ESVN_REPO_URI="https://svn.code.sf.net/p/gpsim/code/trunk"
|
|
||||||
else
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
|
||||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
|
|
||||||
HOMEPAGE="http://gpsim.sourceforge.net"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="doc gtk static-libs"
|
|
||||||
|
|
||||||
RDEPEND=">=dev-embedded/gputils-0.12
|
|
||||||
dev-libs/glib:2
|
|
||||||
dev-libs/popt
|
|
||||||
sys-libs/readline:0=
|
|
||||||
gtk? ( >=x11-libs/gtk+extra-2 )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-devel/flex
|
|
||||||
virtual/pkgconfig
|
|
||||||
virtual/yacc"
|
|
||||||
|
|
||||||
DOCS=( ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO )
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
econf \
|
|
||||||
$(use_enable gtk gui) \
|
|
||||||
$(use_enable static-libs static)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
use doc && dodoc doc/gpsim.pdf
|
|
||||||
find "${D}" -name '*.la' -delete || die
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
AUX oracle-jdk-bin-1.7.env 833 SHA256 cef5b8196f18b4c7bd195fbe5084dde6e38b693accfc68859f48cb1460bee4fb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8 WHIRLPOOL 0fa41d4b45e7b85628feffb55a8ca5ccb99c8a3e8d59907e42947135ac5cbc39564e609be7901e321ec5a0de8f0b6705e02333a771fa738434774cd198c32770
|
|
||||||
DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
|
|
||||||
DIST javafx_samples-2_2_80-linux.zip 21218149 SHA256 bd632d2c0f36be8bfc798ee6b78b328ff12d9b6ccea5e077dffc7a06f7933819 SHA512 00ec77bfbc7c9a9b1a61acb360b8278febd07bd16fc407a0b52ca0b694d35c79c0fb92d11caf131a8ee16238275962f6bc2e1f8471740ee0045b96bd14e957ba WHIRLPOOL b3f5032b1496b1bb8776e79566ed6a3da1dec3ab2b6d66d3cf67901bbaab5e746a1f3967af271c7b5a90b4522b6763ad7a5f172dfcf588184c5392a1a8a5a785
|
|
||||||
DIST jdk-7u80-linux-x64-demos.tar.gz 20882163 SHA256 09c55d37508ff6c4b9ebac34e8d5fb65d7ace5cf45d5074726b413e8aa30dfa1 SHA512 2c24799ca0f14d74053e504cee0a9160472fd7e26e1d86d4eb72b190ec934b041bd72b5ce77f44bdca4b7fe8d8104515572491145f2f14e6d295be0bb010b2ef WHIRLPOOL e9f0312261049a5610ffbc64417f41025f36fc0ffec0f40dbcdfd391a3152f1c05ef80d584671d46fe26f86846825ea66e91090159e79a5192f11c695396e8ef
|
|
||||||
DIST jdk-7u80-linux-x64.tar.gz 153530841 SHA256 bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623 SHA512 a772878f740e87835bafc82841e8f4c1dfbe8bc79e072d3f6c5c74d3a206eb9001a53b474d91a22819c7c0d6407ed88993635c39738779c2b08c22c7a1c2e9e9 WHIRLPOOL fac71585db57851245891919daca1f043c1a8c002c193426ea7e30b482129e65adee336c2421e4aa1241b8fd7cc69b8a1918cd0c44315bf4aec715e86d116384
|
|
||||||
EBUILD oracle-jdk-bin-1.7.0.80.ebuild 9278 SHA256 48f4f3eca3844ead84250ca1c2443c1119ac8538a46498e31efc1b3d9a24c0b5 SHA512 ce89ce509a7becac2b669d6d8cfcf61845581cc0816620c081c41b4e2ede6f7a413647f62fe6316378c9d009daf9a34a67a271b44140cc19088739e12c399355 WHIRLPOOL 1a813c7f28c6720b6d6fcb5f14ede2512af8f4927f3aaaaea5234f89bc7ee9af9e95c0462ae7af5857ca261fa0323313ca6ae9cc4e5417d570333ed9e57b6dd7
|
|
@ -1,16 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
VERSION="Oracle JDK ${PV}"
|
|
||||||
JAVA_HOME="${EPREFIX}/opt/${P}"
|
|
||||||
JDK_HOME="${EPREFIX}/opt/${P}"
|
|
||||||
JAVAC="\${JAVA_HOME}/bin/javac"
|
|
||||||
PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
|
|
||||||
ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
|
|
||||||
LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
|
|
||||||
MANPATH="${EPREFIX}/opt/${P}/man"
|
|
||||||
PROVIDES_TYPE="JDK JRE"
|
|
||||||
PROVIDES_VERSION="${SLOT}"
|
|
||||||
BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/classes"
|
|
||||||
GENERATION="2"
|
|
||||||
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
|
|
@ -1,292 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI="6"
|
|
||||||
|
|
||||||
inherit eutils java-vm-2 prefix versionator
|
|
||||||
|
|
||||||
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
|
|
||||||
S_PV="$(replace_version_separator 3 '_')"
|
|
||||||
|
|
||||||
# This URIs need to be updated when bumping!
|
|
||||||
JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html#jdk-${MY_PV}-oth-JPR"
|
|
||||||
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
|
|
||||||
# This is a list of archs supported by this update.
|
|
||||||
# Currently arm comes and goes.
|
|
||||||
AT_AVAILABLE=( amd64 )
|
|
||||||
# Sometimes some or all of the demos are missing, this is to not have to rewrite half
|
|
||||||
# the ebuild when it happens.
|
|
||||||
DEMOS_AVAILABLE=( amd64 )
|
|
||||||
FX_VERSION="2_2_$(get_version_component_range 4)"
|
|
||||||
|
|
||||||
AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
|
|
||||||
|
|
||||||
FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
|
|
||||||
|
|
||||||
DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
|
|
||||||
|
|
||||||
JCE_DIR="UnlimitedJCEPolicy"
|
|
||||||
JCE_FILE="${JCE_DIR}JDK7.zip"
|
|
||||||
|
|
||||||
DESCRIPTION="Oracle's Java SE Development Kit"
|
|
||||||
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
|
|
||||||
for d in "${AT_AVAILABLE[@]}"; do
|
|
||||||
SRC_URI+=" ${d}? ("
|
|
||||||
SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
|
|
||||||
if has ${d} "${DEMOS_AVAILABLE[@]}"; then
|
|
||||||
SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
|
|
||||||
fi
|
|
||||||
SRC_URI+=" )"
|
|
||||||
done
|
|
||||||
unset d
|
|
||||||
SRC_URI+=" jce? ( ${JCE_FILE} )"
|
|
||||||
|
|
||||||
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
|
|
||||||
SLOT="1.7"
|
|
||||||
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
|
||||||
IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source"
|
|
||||||
|
|
||||||
RESTRICT="fetch strip"
|
|
||||||
QA_PREBUILT="*"
|
|
||||||
|
|
||||||
COMMON_DEP=""
|
|
||||||
RDEPEND="${COMMON_DEP}
|
|
||||||
X? ( !aqua? (
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXext
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXrender
|
|
||||||
x11-libs/libXtst
|
|
||||||
) )
|
|
||||||
alsa? ( media-libs/alsa-lib )
|
|
||||||
doc? ( dev-java/java-sdk-docs:1.7 )
|
|
||||||
fontconfig? ( media-libs/fontconfig )
|
|
||||||
!prefix? ( sys-libs/glibc )
|
|
||||||
selinux? ( sec-policy/selinux-java )"
|
|
||||||
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
|
|
||||||
# marking. #427642
|
|
||||||
DEPEND="${COMMON_DEP}
|
|
||||||
jce? ( app-arch/unzip )
|
|
||||||
examples? ( kernel_linux? ( app-arch/unzip ) )
|
|
||||||
pax_kernel? ( sys-apps/paxctl )"
|
|
||||||
|
|
||||||
S="${WORKDIR}"/jdk${S_PV}
|
|
||||||
|
|
||||||
check_tarballs_available() {
|
|
||||||
local uri=$1; shift
|
|
||||||
local dl= unavailable=
|
|
||||||
for dl in "${@}"; do
|
|
||||||
[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ -n "${unavailable}" ]]; then
|
|
||||||
if [[ -z ${_check_tarballs_available_once} ]]; then
|
|
||||||
einfo
|
|
||||||
einfo "Oracle requires you to download the needed files manually after"
|
|
||||||
einfo "accepting their license through a javascript capable web browser."
|
|
||||||
einfo
|
|
||||||
_check_tarballs_available_once=1
|
|
||||||
fi
|
|
||||||
einfo "Download the following files:"
|
|
||||||
for dl in ${unavailable}; do
|
|
||||||
einfo " ${dl}"
|
|
||||||
done
|
|
||||||
einfo "at '${uri}'"
|
|
||||||
einfo "and move them to '${DISTDIR}'"
|
|
||||||
einfo
|
|
||||||
einfo "If the above mentioned urls do not point to the correct version anymore,"
|
|
||||||
einfo "please download the files from Oracle's java download archive:"
|
|
||||||
einfo
|
|
||||||
einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jdk-${MY_PV}-oth-JPR"
|
|
||||||
einfo
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_nofetch() {
|
|
||||||
local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
|
|
||||||
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
|
|
||||||
distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
|
|
||||||
fi
|
|
||||||
check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
|
|
||||||
|
|
||||||
use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
# Special case for ARM soft VS hard float.
|
|
||||||
if use arm ; then
|
|
||||||
if [[ ${CHOST} == *-hardfloat-* ]] ; then
|
|
||||||
unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
|
|
||||||
use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
|
|
||||||
else
|
|
||||||
unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
|
|
||||||
use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
|
|
||||||
fi
|
|
||||||
use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
|
|
||||||
use jce && unpack ${JCE_FILE}
|
|
||||||
elif use x86-macos || use x64-macos ; then
|
|
||||||
pushd "${T}" > /dev/null
|
|
||||||
mkdir dmgmount
|
|
||||||
hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
|
|
||||||
-mountpoint "${T}"/dmgmount
|
|
||||||
xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
|
|
||||||
hdiutil detach "${T}"/dmgmount
|
|
||||||
zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
|
|
||||||
mv Contents/Home "${S}"
|
|
||||||
popd > /dev/null
|
|
||||||
else
|
|
||||||
default
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
if use jce; then
|
|
||||||
mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local dest="/opt/${P}"
|
|
||||||
local ddest="${ED}${dest}"
|
|
||||||
|
|
||||||
# Create files used as storage for system preferences.
|
|
||||||
mkdir jre/.systemPrefs || die
|
|
||||||
touch jre/.systemPrefs/.system.lock || die
|
|
||||||
touch jre/.systemPrefs/.systemRootModFile || die
|
|
||||||
|
|
||||||
# We should not need the ancient plugin for Firefox 2 anymore, plus it has
|
|
||||||
# writable executable segments
|
|
||||||
if use x86; then
|
|
||||||
rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
|
|
||||||
{,jre/}lib/i386/libjavaplugin_nscp*.so
|
|
||||||
rm -vrf jre/plugin/i386
|
|
||||||
fi
|
|
||||||
# Without nsplugin flag, also remove the new plugin
|
|
||||||
local arch=${ARCH};
|
|
||||||
use x86 && arch=i386;
|
|
||||||
if ! use nsplugin; then
|
|
||||||
rm -vf {,jre/}lib/${arch}/libnpjp2.so \
|
|
||||||
{,jre/}lib/${arch}/libjavaplugin_jni.so
|
|
||||||
fi
|
|
||||||
|
|
||||||
dodoc COPYRIGHT
|
|
||||||
dohtml README.html
|
|
||||||
|
|
||||||
dodir "${dest}"
|
|
||||||
cp -pPR bin include jre lib man "${ddest}" || die
|
|
||||||
|
|
||||||
if use derby; then
|
|
||||||
cp -pPR db "${ddest}" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
|
|
||||||
cp -pPR demo sample "${ddest}" || die
|
|
||||||
if use kernel_linux; then
|
|
||||||
cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
|
|
||||||
"${ddest}"/javafx-samples || die
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use jce; then
|
|
||||||
dodir "${dest}"/jre/lib/security/strong-jce
|
|
||||||
mv "${ddest}"/jre/lib/security/US_export_policy.jar \
|
|
||||||
"${ddest}"/jre/lib/security/strong-jce || die
|
|
||||||
mv "${ddest}"/jre/lib/security/local_policy.jar \
|
|
||||||
"${ddest}"/jre/lib/security/strong-jce || die
|
|
||||||
dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
|
|
||||||
"${dest}"/jre/lib/security/US_export_policy.jar
|
|
||||||
dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
|
|
||||||
"${dest}"/jre/lib/security/local_policy.jar
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use nsplugin; then
|
|
||||||
install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use source; then
|
|
||||||
cp -p src.zip "${ddest}" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use !arm && use !x86-macos && use !x64-macos ; then
|
|
||||||
# Install desktop file for the Java Control Panel.
|
|
||||||
# Using ${PN}-${SLOT} to prevent file collision with jre and or
|
|
||||||
# other slots. make_desktop_entry can't be used as ${P} would
|
|
||||||
# end up in filename.
|
|
||||||
newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
|
|
||||||
sun-jcontrol-${PN}-${SLOT}.png || die
|
|
||||||
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
|
|
||||||
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
|
|
||||||
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
|
|
||||||
-e "s#Application;##" \
|
|
||||||
-e "/Encoding/d" \
|
|
||||||
jre/lib/desktop/applications/sun_java.desktop \
|
|
||||||
> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
|
|
||||||
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Prune all fontconfig files so libfontconfig will be used and only install
|
|
||||||
# a Gentoo specific one if fontconfig is disabled.
|
|
||||||
# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
|
|
||||||
rm "${ddest}"/jre/lib/fontconfig.*
|
|
||||||
if ! use fontconfig; then
|
|
||||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
|
|
||||||
eprefixify "${T}"/fontconfig.properties
|
|
||||||
insinto "${dest}"/jre/lib/
|
|
||||||
doins "${T}"/fontconfig.properties
|
|
||||||
fi
|
|
||||||
|
|
||||||
# This needs to be done before CDS - #215225
|
|
||||||
java-vm_set-pax-markings "${ddest}"
|
|
||||||
|
|
||||||
# see bug #207282
|
|
||||||
einfo "Creating the Class Data Sharing archives"
|
|
||||||
case ${ARCH} in
|
|
||||||
arm|ia64)
|
|
||||||
${ddest}/bin/java -client -Xshare:dump || die
|
|
||||||
;;
|
|
||||||
x86)
|
|
||||||
${ddest}/bin/java -client -Xshare:dump || die
|
|
||||||
# limit heap size for large memory on x86 #467518
|
|
||||||
# this is a workaround and shouldn't be needed.
|
|
||||||
${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
${ddest}/bin/java -server -Xshare:dump || die
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Remove empty dirs we might have copied
|
|
||||||
find "${D}" -type d -empty -exec rmdir -v {} + || die
|
|
||||||
|
|
||||||
if use x86-macos || use x64-macos ; then
|
|
||||||
# fix misc install_name issues
|
|
||||||
pushd "${ddest}"/jre/lib > /dev/null || die
|
|
||||||
local lib needed nlib npath
|
|
||||||
for lib in \
|
|
||||||
libJObjC libdecora-sse libglass libjavafx-{font,iio} \
|
|
||||||
libjfxmedia libjfxwebkit libprism-es2 ;
|
|
||||||
do
|
|
||||||
lib=${lib}.dylib
|
|
||||||
einfo "Fixing self-reference of ${lib}"
|
|
||||||
install_name_tool \
|
|
||||||
-id "${EPREFIX}${dest}/jre/lib/${lib}" \
|
|
||||||
"${lib}"
|
|
||||||
done
|
|
||||||
popd > /dev/null
|
|
||||||
for nlib in jdk1{5,6} ; do
|
|
||||||
install_name_tool -change \
|
|
||||||
/usr/lib/libgcc_s_ppc64.1.dylib \
|
|
||||||
$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
|
|
||||||
"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
|
|
||||||
install_name_tool -id \
|
|
||||||
"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
|
|
||||||
"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
set_java_env
|
|
||||||
java-vm_revdep-mask
|
|
||||||
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
|
|
||||||
EBUILD pecl-imagick-3.4.4.ebuild 751 BLAKE2B 3c1ca71995a093d2bc7bc460193022f19145aea57ac264776c8b63daf0cd2bbe142a21dd3308c7d788a109e814549c4f5b517c16b174d2cb682c58942942aacb SHA512 4ba789a3e3a5428f93e2bd4b53eb32a1b7c8b23bd9ed6a50e4374d969c1243f73520cfcb054e0303b53f45a7f337a6dcbc0a63cb7c6fc47e305db448db20da57
|
|
||||||
MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
|
|
@ -1,12 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>php-bugs@gentoo.org</email>
|
|
||||||
<name>PHP</name>
|
|
||||||
</maintainer>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>mjo@gentoo.org</email>
|
|
||||||
<name>Michael Orlitzky</name>
|
|
||||||
</maintainer>
|
|
||||||
</pkgmetadata>
|
|
@ -1,26 +0,0 @@
|
|||||||
# Copyright 1999-2020 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="7"
|
|
||||||
|
|
||||||
PHP_EXT_NAME="imagick"
|
|
||||||
USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
|
|
||||||
|
|
||||||
inherit php-ext-pecl-r3
|
|
||||||
|
|
||||||
KEYWORDS="amd64 ~arm ~arm64 x86"
|
|
||||||
|
|
||||||
DESCRIPTION="PHP wrapper for the ImageMagick library"
|
|
||||||
HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick"
|
|
||||||
LICENSE="PHP-3.01"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="examples test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
# imagemagick[-openmp] is needed wrt bug 547922 and upstream
|
|
||||||
# https://github.com/mkoppanen/imagick#openmp
|
|
||||||
RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,svg,truetype,xml] )"
|
|
||||||
|
|
||||||
PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
|
|
@ -1,103 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: $
|
|
||||||
|
|
||||||
inherit check-reqs gnome2-utils fdo-mime
|
|
||||||
|
|
||||||
EXPORT_FUNCTIONS pkg_pretend pkg_preinst pkg_postinst pkg_postrm pkg_setup
|
|
||||||
|
|
||||||
palemoon-2_pkg_pretend() {
|
|
||||||
# Ensure we have enough disk space to compile:
|
|
||||||
CHECKREQS_DISK_BUILD=${REQUIRED_BUILDSPACE}
|
|
||||||
check-reqs_pkg_setup
|
|
||||||
|
|
||||||
# Ensure we are not on a gcc 5.* profile:
|
|
||||||
if [ "$(cc --version | head -c 3)" == "gcc" ]; then
|
|
||||||
einfo "Checking gcc version..."
|
|
||||||
if [ "$(gcc -dumpversion | head -c 1)" -ge 5 ]; then
|
|
||||||
if [ "$(gcc -dumpversion | head -c 1)" -eq 7 ]; then
|
|
||||||
gcc-7_error
|
|
||||||
die
|
|
||||||
fi
|
|
||||||
gcc-5_warning
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
palemoon-2_pkg_preinst() {
|
|
||||||
gnome2_icon_savelist
|
|
||||||
}
|
|
||||||
|
|
||||||
palemoon-2_pkg_postinst() {
|
|
||||||
# Update mimedb for the new .desktop file:
|
|
||||||
fdo-mime_desktop_database_update
|
|
||||||
gnome2_icon_cache_update
|
|
||||||
}
|
|
||||||
|
|
||||||
palemoon-2_pkg_postrm() {
|
|
||||||
gnome2_icon_cache_update
|
|
||||||
}
|
|
||||||
|
|
||||||
palemoon-2_pkg_setup() {
|
|
||||||
# Nested configure scripts in mozilla products generate unrecognized
|
|
||||||
# options false positives when toplevel configure passes downwards:
|
|
||||||
export QA_CONFIGURE_OPTIONS=".*"
|
|
||||||
}
|
|
||||||
|
|
||||||
official-branding_warning() {
|
|
||||||
elog "You are enabling official branding. You may not redistribute this build"
|
|
||||||
elog "to any users on your network or the internet. Doing so puts yourself into"
|
|
||||||
elog "a legal problem with Moonchild Productions"
|
|
||||||
elog "You can disable it by emerging ${PN} _without_ the official-branding USE-flag"
|
|
||||||
}
|
|
||||||
|
|
||||||
gcc-5_warning() {
|
|
||||||
eerror "Building Pale Moon with gcc >=5 may result in an unstable build."
|
|
||||||
eerror "You can use gcc-config to change your compiler profile,"
|
|
||||||
eerror "just remember to change it back afterwards."
|
|
||||||
eerror "You need to have the appropriate versions of gcc installed"
|
|
||||||
eerror "for them to be shown in gcc-config."
|
|
||||||
}
|
|
||||||
|
|
||||||
gcc-7_error() {
|
|
||||||
eerror "You are currently on a gcc 7.* compiler profile."
|
|
||||||
eerror "Building Pale Moon with gcc 7 is risky and rarely possible."
|
|
||||||
eerror "You can use gcc-config to change your compiler profile,"
|
|
||||||
eerror "just remember to change it back afterwards."
|
|
||||||
eerror "You need to have the appropriate versions of gcc installed"
|
|
||||||
eerror "for them to be shown in gcc-config."
|
|
||||||
}
|
|
||||||
mozconfig_init() {
|
|
||||||
cp -L "${S}/browser/config/mozconfig" "${S}/.mozconfig" || die
|
|
||||||
}
|
|
||||||
|
|
||||||
mozconfig_enable() {
|
|
||||||
for option in "$@"; do
|
|
||||||
echo "ac_add_options --enable-${option}" >> "${S}/.mozconfig"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
mozconfig_disable() {
|
|
||||||
for option in "$@"; do
|
|
||||||
echo "ac_add_options --disable-${option}" >> "${S}/.mozconfig"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
mozconfig_with() {
|
|
||||||
for option in "$@"; do
|
|
||||||
echo "ac_add_options --with-${option}" >> "${S}/.mozconfig"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
mozconfig_var() {
|
|
||||||
echo "mk_add_options $1=\"$2\"" >> "${S}/.mozconfig"
|
|
||||||
}
|
|
||||||
|
|
||||||
load_default_prefs() {
|
|
||||||
PREFS_FILE="${S}/${obj_dir}/dist/bin/browser/defaults/preferences/firefox.js"
|
|
||||||
cat "${FILESDIR}"/default-prefs.js-0 >> $PREFS_FILE || die
|
|
||||||
}
|
|
||||||
|
|
||||||
set_pref() {
|
|
||||||
echo "pref(\"$1\", \"$2\");" >> $PREFS_FILE
|
|
||||||
}
|
|
@ -1,5 +0,0 @@
|
|||||||
DIST gnome-shell-extension-appindicator-56.tar.gz 67239 BLAKE2B 9f4a4706e2555dd20d2328415058d006f26e422ff199d0fbb692168a3618a34c51a5fe5a49656201f60e6f8a245ae2fea19b64a3a2411c74633747fcc4050d94 SHA512 1f69d7f714aff9296a3a56bbffd5f5f12baaaf9ab645463f757d18861edfcae993d5ec1f9228c7486c74beefb8c31835ebca868734f41a5495020501573ed422
|
|
||||||
DIST gnome-shell-extension-appindicator-57.tar.gz 67246 BLAKE2B cdbfce7c2ff731732dea76ce53421424ad887ab7c95b555142f1fccb549723c9f9816cde527dd0dca6b9c6b835d9ec8d255f8350f8d772199920ac69d2d26809 SHA512 256d365a653db40490cb0d4da5ee5f7508298bc9189e0a8e98a4f1c904f5627cd0cb1b5586786005638025e3b8a31bf948d08a69a40977887b5860f8dc5ee53e
|
|
||||||
EBUILD gnome-shell-extension-appindicator-56.ebuild 1050 BLAKE2B 04e38f392aa27d7aff691291cfdf6eae1dfd871dacd04b04f542e1cb2925a78ecf613c956833afa0c12f682948472083473707119f7aa7da0f5fd8eb6ad983a4 SHA512 b9e92fb613f7dbd38d3702f722c8d5625cae0875bbd0404f1d403b9456f5d6dc6a2cd3f736a672c9f250207b8e1dbf645df34081f73d7793e6804baad5accafe
|
|
||||||
EBUILD gnome-shell-extension-appindicator-57.ebuild 1050 BLAKE2B 04e38f392aa27d7aff691291cfdf6eae1dfd871dacd04b04f542e1cb2925a78ecf613c956833afa0c12f682948472083473707119f7aa7da0f5fd8eb6ad983a4 SHA512 b9e92fb613f7dbd38d3702f722c8d5625cae0875bbd0404f1d403b9456f5d6dc6a2cd3f736a672c9f250207b8e1dbf645df34081f73d7793e6804baad5accafe
|
|
||||||
MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
|
|
@ -1,47 +0,0 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
inherit gnome2-utils meson
|
|
||||||
|
|
||||||
DESCRIPTION="Support legacy, AppIndicators and KStatusNotifierItems in Gnome"
|
|
||||||
HOMEPAGE="https://github.com/ubuntu/gnome-shell-extension-appindicator"
|
|
||||||
SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
app-eselect/eselect-gnome-shell-extensions
|
|
||||||
>=gnome-base/gnome-shell-3.34
|
|
||||||
"
|
|
||||||
BDEPEND="
|
|
||||||
app-misc/jq
|
|
||||||
"
|
|
||||||
|
|
||||||
#src_prepare() {
|
|
||||||
# default
|
|
||||||
# # https://github.com/ubuntu/gnome-shell-extension-appindicator/issues/419
|
|
||||||
# eapply -R "${FILESDIR}/${P}-41a8e9c.patch"
|
|
||||||
#}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
meson_src_install
|
|
||||||
rm "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
gnome2_schemas_savelist
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
ebegin "Updating list of installed extensions"
|
|
||||||
eselect gnome-shell-extensions update
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
}
|
|
@ -1,47 +0,0 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
inherit gnome2-utils meson
|
|
||||||
|
|
||||||
DESCRIPTION="Support legacy, AppIndicators and KStatusNotifierItems in Gnome"
|
|
||||||
HOMEPAGE="https://github.com/ubuntu/gnome-shell-extension-appindicator"
|
|
||||||
SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
app-eselect/eselect-gnome-shell-extensions
|
|
||||||
>=gnome-base/gnome-shell-3.34
|
|
||||||
"
|
|
||||||
BDEPEND="
|
|
||||||
app-misc/jq
|
|
||||||
"
|
|
||||||
|
|
||||||
#src_prepare() {
|
|
||||||
# default
|
|
||||||
# # https://github.com/ubuntu/gnome-shell-extension-appindicator/issues/419
|
|
||||||
# eapply -R "${FILESDIR}/${P}-41a8e9c.patch"
|
|
||||||
#}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
meson_src_install
|
|
||||||
rm "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
gnome2_schemas_savelist
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
ebegin "Updating list of installed extensions"
|
|
||||||
eselect gnome-shell-extensions update
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
}
|
|
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>pacho@gentoo.org</email>
|
|
||||||
</maintainer>
|
|
||||||
<stabilize-allarches/>
|
|
||||||
</pkgmetadata>
|
|
@ -1,6 +0,0 @@
|
|||||||
DIST gnome-shell-extension-gsconnect-53.tar.gz 729500 BLAKE2B 5cb841d67ee9021b3402420104dd8f74d94c2ed50c45182aec24fd2a39a4f30bab2167192c6cd701e211c3fa12b3a92a5dc18e92867eaee5dd233f107ddf6e42 SHA512 fa2ed1755180446b7e5a203f70a8fa098771380296ceb7f72c9c862a71e0baa8c8b9d34294e6608d6dad149bb98ff9fc224fd0b37bf8f532397df6f7587102c0
|
|
||||||
DIST gnome-shell-extension-gsconnect-54.tar.gz 879104 BLAKE2B 7d666775fc1ddf3ca76f59d2047b85cbc35f9953883941d1bca93f8711dcbf7ed5b8be697c300c13edf2195ffab10aa8f7edc7cbc6fde3d09797155f47349706 SHA512 9a3cae1cfaf3cc66dde3de1d74f68df7817abce86a8f68d6f93151f9e750d797ad75667bcf532f818c1b6d5ddc57d2721225aa6bc499b46593f87c5721e98622
|
|
||||||
EBUILD gnome-shell-extension-gsconnect-53.ebuild 1613 BLAKE2B 256af71a27da58c575b4f32818aa1a956dca48a9aaba40be0f51d6aa38cf0d83cc6dfea30b5f0f4315c5cc1c0802046cb17176e68c266a701a67a5cf948e4db8 SHA512 91d8197acdd565c4c64ab8035c57cbd45698b9e7a4646c4c195b6ad1681526885d0011fca6e9a8f716e94f77293ed2d5d44c6130e3dad280dab78e026c25e6e9
|
|
||||||
EBUILD gnome-shell-extension-gsconnect-54.ebuild 1612 BLAKE2B ac48425772f28ed7dce83d309597dd1323f5b67cb2eec8d04f11fdcf91ad2f5284f372e1de5117272ebcfc0be333ee722c2b79b923e1faea0183976b899900f0 SHA512 7d215384fb4c8e67e4cddbc1f3534d1c829d1aa597991d682f0134c97e79db4233f001f2d658c32538b1c5d1a1cb384fe8b251bdf34ee2100e54daf626224287
|
|
||||||
EBUILD gnome-shell-extension-gsconnect-9999.ebuild 1750 BLAKE2B b97888ace4d269e1163b05210b0f4f1062c568643f699b8e07aca774b754993bef201124a5d3a6b1698d4a72ee97d7eb971f91cbf2672f55d61f78e301205ee6 SHA512 e90d8a28c5a98ae6dae27b5c68fd8988372238d704ac37b5448addc1dd38bebbadbc4d333baea58718bd3944816d6d19d349ffed5771b0ec282a54a193ce7ef0
|
|
||||||
MISC metadata.xml 346 BLAKE2B d1e2c79cae69a58f7af962316046f4620238b88d42e0f211a28ba271633993bae4df79956ab9dde4f4e94e7e77233288657d5b3c1876c9192118a11ee5ee678f SHA512 00b2e45892280f1a042b3ec03d66c3fcc7a2b95f94534d22fb8df936976384bb78433337b339ae023ae9850f2e4c0cfb8b12fae28ae7863d2ebe93a47784a77a
|
|
@ -1,68 +0,0 @@
|
|||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
inherit gnome2-utils meson readme.gentoo-r1 xdg
|
|
||||||
|
|
||||||
DESCRIPTION="KDE Connect implementation for Gnome Shell"
|
|
||||||
HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
|
|
||||||
SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 x86"
|
|
||||||
IUSE="nautilus"
|
|
||||||
|
|
||||||
COMMON_DEPEND="dev-libs/glib:2"
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
app-eselect/eselect-gnome-shell-extensions
|
|
||||||
>=dev-libs/gjs-1.68
|
|
||||||
=gnome-base/gnome-shell-42*
|
|
||||||
gnome-base/gvfs
|
|
||||||
gnome-extra/evolution-data-server
|
|
||||||
|| ( media-libs/libcanberra media-libs/gsound )
|
|
||||||
nautilus? (
|
|
||||||
dev-python/nautilus-python
|
|
||||||
gnome-base/nautilus[introspection] )
|
|
||||||
"
|
|
||||||
DEPEND="${COMMON_DEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
DISABLE_AUTOFORMATTING="yes"
|
|
||||||
DOC_CONTENTS="For knowing more about how to do the setup, please visit:
|
|
||||||
https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
|
|
||||||
# https://bugs.gentoo.org/694388
|
|
||||||
meson_src_configure \
|
|
||||||
-Dinstalled_tests=false \
|
|
||||||
-Dnemo=false \
|
|
||||||
$(meson_use nautilus)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
meson_src_install
|
|
||||||
readme.gentoo_create_doc
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
gnome2_schemas_savelist
|
|
||||||
xdg_pkg_preinst
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
xdg_pkg_postinst
|
|
||||||
ebegin "Updating list of installed extensions"
|
|
||||||
eselect gnome-shell-extensions update
|
|
||||||
eend $?
|
|
||||||
readme.gentoo_print_elog
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
xdg_pkg_postrm
|
|
||||||
}
|
|
@ -1,68 +0,0 @@
|
|||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
inherit gnome2-utils meson readme.gentoo-r1 xdg
|
|
||||||
|
|
||||||
DESCRIPTION="KDE Connect implementation for Gnome Shell"
|
|
||||||
HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
|
|
||||||
SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 x86"
|
|
||||||
IUSE="nautilus"
|
|
||||||
|
|
||||||
COMMON_DEPEND="dev-libs/glib:2"
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
app-eselect/eselect-gnome-shell-extensions
|
|
||||||
>=dev-libs/gjs-1.68
|
|
||||||
<gnome-base/gnome-shell-44
|
|
||||||
gnome-base/gvfs
|
|
||||||
gnome-extra/evolution-data-server
|
|
||||||
|| ( media-libs/libcanberra media-libs/gsound )
|
|
||||||
nautilus? (
|
|
||||||
dev-python/nautilus-python
|
|
||||||
gnome-base/nautilus[introspection] )
|
|
||||||
"
|
|
||||||
DEPEND="${COMMON_DEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
DISABLE_AUTOFORMATTING="yes"
|
|
||||||
DOC_CONTENTS="For knowing more about how to do the setup, please visit:
|
|
||||||
https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
|
|
||||||
# https://bugs.gentoo.org/694388
|
|
||||||
meson_src_configure \
|
|
||||||
-Dinstalled_tests=false \
|
|
||||||
-Dnemo=false \
|
|
||||||
$(meson_use nautilus)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
meson_src_install
|
|
||||||
readme.gentoo_create_doc
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
gnome2_schemas_savelist
|
|
||||||
xdg_pkg_preinst
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
xdg_pkg_postinst
|
|
||||||
ebegin "Updating list of installed extensions"
|
|
||||||
eselect gnome-shell-extensions update
|
|
||||||
eend $?
|
|
||||||
readme.gentoo_print_elog
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
xdg_pkg_postrm
|
|
||||||
}
|
|
@ -1,76 +0,0 @@
|
|||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
inherit gnome2-utils meson readme.gentoo-r1 xdg
|
|
||||||
|
|
||||||
DESCRIPTION="KDE Connect implementation for Gnome Shell"
|
|
||||||
HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
|
|
||||||
|
|
||||||
if [ ${PV} == "9999" ] ; then
|
|
||||||
inherit git-r3
|
|
||||||
SRC_URI=""
|
|
||||||
EGIT_REPO_URI="https://github.com/GSConnect/${PN}.git"
|
|
||||||
KEYWORDS=""
|
|
||||||
else
|
|
||||||
SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
KEYWORDS="amd64 x86"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LICENSE="GPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="nautilus"
|
|
||||||
|
|
||||||
COMMON_DEPEND="dev-libs/glib:2"
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
app-eselect/eselect-gnome-shell-extensions
|
|
||||||
>=dev-libs/gjs-1.68
|
|
||||||
<gnome-base/gnome-shell-44
|
|
||||||
gnome-base/gvfs
|
|
||||||
gnome-extra/evolution-data-server
|
|
||||||
|| ( media-libs/libcanberra media-libs/gsound )
|
|
||||||
nautilus? (
|
|
||||||
dev-python/nautilus-python
|
|
||||||
gnome-base/nautilus[introspection] )
|
|
||||||
"
|
|
||||||
DEPEND="${COMMON_DEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
DISABLE_AUTOFORMATTING="yes"
|
|
||||||
DOC_CONTENTS="For knowing more about how to do the setup, please visit:
|
|
||||||
https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
|
|
||||||
# https://bugs.gentoo.org/694388
|
|
||||||
meson_src_configure \
|
|
||||||
-Dinstalled_tests=false \
|
|
||||||
-Dnemo=false \
|
|
||||||
$(meson_use nautilus)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
meson_src_install
|
|
||||||
readme.gentoo_create_doc
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
gnome2_schemas_savelist
|
|
||||||
xdg_pkg_preinst
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
xdg_pkg_postinst
|
|
||||||
ebegin "Updating list of installed extensions"
|
|
||||||
eselect gnome-shell-extensions update
|
|
||||||
eend $?
|
|
||||||
readme.gentoo_print_elog
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
gnome2_schemas_update
|
|
||||||
xdg_pkg_postrm
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>pacho@gentoo.org</email>
|
|
||||||
</maintainer>
|
|
||||||
<stabilize-allarches/>
|
|
||||||
<use>
|
|
||||||
<flag name="nautilus">Install Nautilus extension for sending files via GSConnect</flag>
|
|
||||||
</use>
|
|
||||||
</pkgmetadata>
|
|
@ -1,3 +0,0 @@
|
|||||||
AUX gnome-shell-extensions-topicons-plus-gnome-40.patch 1362 BLAKE2B 2675c19e3cd2ee815f1387e2de9bbb8bcfeeb99fbde2a8ed510e3e383633f4142baed3627fa0926f48d7a328394cd4e5e2717730ff62367c623a8caeb6fd50fd SHA512 13276a1a5dfc6628f63148e8cb402140bc1e40009b840873cc2efab4ff65e8143384d663d313d5c056308cd5e09d7d7f16d4959b032dc03bf50546700a99b1f6
|
|
||||||
EBUILD gnome-shell-extensions-topicons-plus-9999.ebuild 1213 BLAKE2B 23c7e676d2779ff2e388d76b52f8bd670fa7c6e0f9e621e65e6a649d49242d9b51dc837bcac8329d44e51dcbb887d75ec7d6d40c04c4f6e9c3eec827ea69d626 SHA512 62e4a02a0284a487b6d2ae4ee493c13f84fa0ab19e4c5714965c84670d8e85031c15e1dd3ef4faeb17294b786fa7662455c825d39a37841fe9c0d027aced8a2a
|
|
||||||
MISC metadata.xml 339 BLAKE2B 2447959005caf5fd3e73add40ea3dbd534fdf7570c9eac45802e20a75f608b6832e17c9a3ba7a735e15d2eb812fe5fccc07a94f49ef8686d3833473c39ff13c2 SHA512 daa6bf05b44ba64d31e32eff4088da410928c6c32666e816426f5ebd27dbe8cfba302e48adebaa8f89cff63019adadb8dcc5d09e1e6bfdda2e58280384ad7d50
|
|
@ -1,51 +0,0 @@
|
|||||||
From 98cd17aa324a031e2ee3d344582dfdafd1e4642f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tiramisu Mokka <kofemann@gmail.com>
|
|
||||||
Date: Fri, 19 Mar 2021 19:00:32 +0100
|
|
||||||
Subject: [PATCH] fix compatibility with gnome40
|
|
||||||
|
|
||||||
---
|
|
||||||
metadata.json | 5 ++---
|
|
||||||
prefs.js | 6 ++----
|
|
||||||
2 files changed, 4 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/metadata.json b/metadata.json
|
|
||||||
index e4c9691..8a07918 100644
|
|
||||||
--- a/metadata.json
|
|
||||||
+++ b/metadata.json
|
|
||||||
@@ -3,11 +3,10 @@
|
|
||||||
"name": "TopIcons Plus",
|
|
||||||
"gettext-domain": "TopIcons-Plus",
|
|
||||||
"shell-version": [
|
|
||||||
- "3.34",
|
|
||||||
- "3.36"
|
|
||||||
+ "40"
|
|
||||||
],
|
|
||||||
"settings-schema": "org.gnome.shell.extensions.topicons",
|
|
||||||
"url": "https://github.com/phocean/TopIcons-plus",
|
|
||||||
"uuid": "TopIcons@phocean.net",
|
|
||||||
- "version": 27
|
|
||||||
+ "version": 28
|
|
||||||
}
|
|
||||||
diff --git a/prefs.js b/prefs.js
|
|
||||||
index bd372d2..f6b1277 100644
|
|
||||||
--- a/prefs.js
|
|
||||||
+++ b/prefs.js
|
|
||||||
@@ -12,7 +12,7 @@ const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
|
|
||||||
const _ = Gettext.gettext;
|
|
||||||
|
|
||||||
function init() {
|
|
||||||
- Convenience.initTranslations();
|
|
||||||
+ ExtensionUtils.initTranslations();
|
|
||||||
}
|
|
||||||
|
|
||||||
const TopIconsPlusSettings = new GObject.Class({
|
|
||||||
@@ -180,8 +180,6 @@ const TopIconsPlusSettings = new GObject.Class({
|
|
||||||
});
|
|
||||||
|
|
||||||
function buildPrefsWidget() {
|
|
||||||
- let widget = new TopIconsPlusSettings();
|
|
||||||
- widget.show_all();
|
|
||||||
+ return new TopIconsPlusSettings();
|
|
||||||
|
|
||||||
- return widget;
|
|
||||||
}
|
|
@ -1,45 +0,0 @@
|
|||||||
# Copyright 1999-2020 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
MY_PN="TopIcons-plus"
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
DESCRIPTION="Moves legacy tray icons to top panel"
|
|
||||||
HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
|
|
||||||
EGIT_REPO_URI="https://github.com/phocean/${MY_PN}.git"
|
|
||||||
|
|
||||||
LICENSE="GPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
# glib for glib-compile-schemas at build time, needed at runtime anyways
|
|
||||||
DEPEND="
|
|
||||||
dev-libs/glib:2
|
|
||||||
"
|
|
||||||
RDEPEND="${DEPEND}
|
|
||||||
app-eselect/eselect-gnome-shell-extensions
|
|
||||||
>=gnome-base/gnome-shell-3.36
|
|
||||||
"
|
|
||||||
BDEPEND=""
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
eapply "${FILESDIR}/${PN}-gnome-40.patch"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
# TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
|
|
||||||
make install INSTALL_PATH="${ED}/usr/share/gnome-shell/extensions/"
|
|
||||||
rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
|
|
||||||
# Assuming it needs only compiled gettext catalogs at runtime
|
|
||||||
rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
|
|
||||||
dodoc README.md
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
ebegin "Updating list of installed extensions"
|
|
||||||
eselect gnome-shell-extensions update
|
|
||||||
eend $?
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>gnome@gentoo.org</email>
|
|
||||||
<name>Gentoo GNOME Desktop</name>
|
|
||||||
</maintainer>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">phocean/TopIcons-plus</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
@ -1,15 +0,0 @@
|
|||||||
AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
|
|
||||||
AUX openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch 790 BLAKE2B b08a024f81a29d7fb4e0860977b814d2ec6ce6dcbf8ab87655f5d36f51ea3bbce6559369363c33ca7593cbc3284de920f71be3c38e3ab7b5efa83d3466132b79 SHA512 2af887d7b085c49203e72ad41cb5c0e32b772a8abd35843485434cb11b263ba8a727a0ebc34c7138bff1e6852245f2bdaf7d91711184a5f16ed22603578a0892
|
|
||||||
AUX openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 1396 BLAKE2B a43872dd83427f28a48528fbac534924796db769bd0213ba1b6fca41a65c766aa3355aa9ee3f7d68dcbbf3d578cee984f2ad61f599fdf9551ef55724f460f4db SHA512 ffbf402976054c1e7294a0d661e0648bdb359cf57e676d818cf1140644b7a0d0943f5adf1d2f511ad17ca45a35e31785aae584dc7607f13bfc9d94795fc3812b
|
|
||||||
AUX openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch 1380 BLAKE2B b359211ef34bd0e1306f37fcf84f65fc8b3a03036608abb36ece8e134bee419646754fedb52134947f1a3943c02fc07d778127f544d873346d62e5cd36c3ce9a SHA512 4c0dea73a578db8e6ff499a4fc9b337292d66dc1d652559d73616e85ee57d4a5c06d93e96a4e543a9b7087d3f4939e98bd7e22f9a9305c612a487527454e4d38
|
|
||||||
AUX openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch 3690 BLAKE2B c320ddd5077e8f4c92f21e9ea18e741b6844f409d1be1ca90fcf8ed8fe0b394694d2a4198b068858b92d8b004e603070bd51a0de1ccafdd3afc1925377f00082 SHA512 1a08d7207a6c98493022a6019d44db468ad8b1b0a7623296302895ffcda789fd9ad90f3d361026b6309fbbd23051a5f686e1a21c01bd90a668dd5ce08fd6ba9f
|
|
||||||
AUX openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch 752 BLAKE2B a54676bdf69a78cbc0ff1d11676de4b5913030093f06a2029bb44bb301dee681a7a971f3cd31b033061f5f4e03ac243c83b51d21576b0bbe21cdc8457632d885 SHA512 49f43408021397d8ca8a628de102dde9f55ccc4fa219f84f7a0e08db6b63232d5d31562814669728273379db521e98d819fe939521ba7a346232a05aa9dcdc89
|
|
||||||
AUX openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch 1390 BLAKE2B 2c5e96675b15f9dc7020f21d5d2b5a9f7edcde154533dcda14762aef5cbe8bec78ac0fb9cc8b0426817027543313a6862c07dd5d17eb46fa101633ed55ed75d6 SHA512 58cfa61093edb3e18022b73cca93d4741ba2fddd259c37864d604ee66bc8f9f1f170677f2151b539ebdf70e3043c6d1650fa7578037c70c277d3eec4ca030a4e
|
|
||||||
AUX openscad-2021.01-Fix-build-issue-with-overloaded-join.patch 3336 BLAKE2B c92caab0f33551ee7e66c6527dfa61d5ae70c3820d51188b6b4fc042a66cd58d207d4dbcdc87641b79733784d1c088af34a85078899fa4468522b4653fed7ab7 SHA512 f8860ec827efcdf1e0037c22ec0c1f8364b5f9554d264d2bac5be57c1b86e79f6ab284b65f1763c1548e8e3479c0ca510954937907f18f0db745826338a4f2f8
|
|
||||||
AUX openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch 775 BLAKE2B eed37277c3e7ea84635c0b8cd02cc4ffde7abea78400ee39e67bcc782800197c57dae07a82084df47705951ced8968be78243a1d0e14a551783b8adcb669d43f SHA512 94306e68e53b01e799a5feb6f16a8f44c965a4b653b60227833013712f23648d20ac8272a7bfe38bde201af42946f91fe17231f120adfbe5b16e42b07d9f8d10
|
|
||||||
AUX openscad-2021.01-boost-1.85.patch 621 BLAKE2B f86fa92c1f3c4a059550017e7a16ee808bdd4ff4a4196c19dacf8b86fd97458f72ebbf0ef763b88115d56eb0cb6ec565b63dd789c4558d8011aaf252b9ceea00 SHA512 786bf3739f8296b83047ac6c36432d331f392a1d1cf67fc2135a98f227840ff1b099437f5157bf8472ea47206a7ff2ef0de09e2b8780830e235c94bfe6ccad5b
|
|
||||||
AUX openscad-2021.01-fix-cstd.patch 459 BLAKE2B 883e7c080d625093dfab151abe116d77651c8d6a40cec0f30c537153051aa102f81e94fa7c516410ff4b9d14fafd36486504a93804df18985d3aca86b1a3a341 SHA512 bc66c0300b7f23256f1b66aa55e1219e25fbcc7490f55e0163448e90450d4d3023b19a1a2862652fa3f9dc9befa27d14db24c74580e5ddd92364d58971246613
|
|
||||||
DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
|
|
||||||
EBUILD openscad-2021.01-r5.ebuild 2937 BLAKE2B e3dd68f56119438f43d14fdc38a79b7d9d7f379b1f767622cbfe531195353d8d7a83a4e2e5dfecd8be88f112be6c2f03cfbb6193ab3de6ba6c0cef4bb16af00d SHA512 f5d288bfedf36ff8f956250bec83f58ba798e20a558db9de0d7a9fb6a93eddef5a7c651b043705e8e60958ec77bf5a75d3f8318c9c9ac17fc56b95c71cfc8eb6
|
|
||||||
EBUILD openscad-9999.ebuild 2489 BLAKE2B e073d8eecb56895c3886177abd346cf19d6215462dd0a6a15a5b9b1adddee17853fa2b808c6e8f03908647bf518e3bd7a77a5f69cd640cb8c701c894594e0764 SHA512 751617f4f6b1164cc1cb42f61665a6f10c47f18e8693b6451e9ea87cf45ee25d26892ac2c72321c234a943befe0e707f5cc7d08535461e478c3c392d28ce9e77
|
|
||||||
MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1
|
|
@ -1,3 +0,0 @@
|
|||||||
(add-to-list 'load-path "@SITELISP@")
|
|
||||||
(autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t)
|
|
||||||
(add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode))
|
|
@ -1,32 +0,0 @@
|
|||||||
From c138881767262b9f5c64a465a0e1e46ffcfc5899 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bernd Waibel <waebbl-gentoo@posteo.net>
|
|
||||||
Date: Sun, 28 Feb 2021 16:51:30 +0100
|
|
||||||
Subject: [PATCH] [Gentoo specific] Disable ccache building
|
|
||||||
|
|
||||||
On Gentoo, we use a USE flag to determine whether ccache
|
|
||||||
should be used for building.
|
|
||||||
|
|
||||||
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
|
|
||||||
---
|
|
||||||
openscad.pro | 5 -----
|
|
||||||
1 file changed, 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/openscad.pro b/openscad.pro
|
|
||||||
index b76ca76..678e08d 100755
|
|
||||||
--- a/openscad.pro
|
|
||||||
+++ b/openscad.pro
|
|
||||||
@@ -211,11 +211,6 @@ mdi {
|
|
||||||
DEFINES += ENABLE_MDI
|
|
||||||
}
|
|
||||||
|
|
||||||
-system("ccache -V >/dev/null 2>/dev/null") {
|
|
||||||
- CONFIG += ccache
|
|
||||||
- message("Using ccache")
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
include(common.pri)
|
|
||||||
|
|
||||||
# mingw has to come after other items so OBJECT_DIRS will work properly
|
|
||||||
--
|
|
||||||
2.30.1
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
|||||||
From 16847a70cf05484a668d8f79aba4ccec7e16c025 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bernd Waibel <waebbl-gentoo@posteo.net>
|
|
||||||
Date: Sat, 6 Mar 2021 22:59:17 +0100
|
|
||||||
Subject: [PATCH] fix to find lib3mf-2
|
|
||||||
|
|
||||||
The pkgconfig file for lib3mf has been renamed in case
|
|
||||||
for lib3mf-2 versions.
|
|
||||||
This patch uses the news names.
|
|
||||||
|
|
||||||
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
|
|
||||||
---
|
|
||||||
features/lib3mf.prf | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/features/lib3mf.prf b/features/lib3mf.prf
|
|
||||||
index 2c512da..47be364 100644
|
|
||||||
--- a/features/lib3mf.prf
|
|
||||||
+++ b/features/lib3mf.prf
|
|
||||||
@@ -15,8 +15,8 @@ isEmpty(LIB3MF_LIBPATH) {
|
|
||||||
}
|
|
||||||
|
|
||||||
isEmpty(LIB3MF_INCLUDEPATH) {
|
|
||||||
- LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3MF")
|
|
||||||
- LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3MF")
|
|
||||||
+ LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3mf")
|
|
||||||
+ LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3mf")
|
|
||||||
!isEmpty(LIB3MF_CFLAGS) {
|
|
||||||
ENABLE_LIB3MF=yes
|
|
||||||
}
|
|
||||||
@@ -25,8 +25,8 @@ isEmpty(LIB3MF_INCLUDEPATH) {
|
|
||||||
}
|
|
||||||
|
|
||||||
isEmpty(LIB3MF_LIBPATH) {
|
|
||||||
- LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3MF")
|
|
||||||
- LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3MF")
|
|
||||||
+ LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3mf")
|
|
||||||
+ LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3mf")
|
|
||||||
!isEmpty(LIB3MF_LIBS) {
|
|
||||||
ENABLE_LIB3MF=yes
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.30.1
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
|||||||
https://bugs.gentoo.org/851189
|
|
||||||
From https://github.com/openscad/openscad/commit/abfebc651343909b534ef337aacc7604c99cf0ea Mon Sep 17 00:00:00 2001
|
|
||||||
From: Torsten Paul <Torsten.Paul@gmx.de>
|
|
||||||
Date: Wed, 2 Feb 2022 02:30:59 +0100
|
|
||||||
Subject: [PATCH 09/11] CGAL build fix, v5.4 renames projection traits header
|
|
||||||
files and classes.
|
|
||||||
|
|
||||||
--- a/src/cgalutils-tess.cc
|
|
||||||
+++ b/src/cgalutils-tess.cc
|
|
||||||
@@ -6,10 +6,12 @@
|
|
||||||
#pragma push_macro("NDEBUG")
|
|
||||||
#undef NDEBUG
|
|
||||||
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
|
|
||||||
-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
|
|
||||||
- #include <CGAL/Triangulation_2_projection_traits_3.h>
|
|
||||||
+#if CGAL_VERSION_NR < 1050401000
|
|
||||||
+#include <CGAL/Triangulation_2_projection_traits_3.h>
|
|
||||||
+typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
|
|
||||||
#else
|
|
||||||
- #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
|
|
||||||
+#include <CGAL/Projection_traits_3.h>
|
|
||||||
+typedef CGAL::Filtered_projection_traits_3<K> Projection;
|
|
||||||
#endif
|
|
||||||
#include <CGAL/Triangulation_face_base_with_info_2.h>
|
|
||||||
#pragma pop_macro("NDEBUG")
|
|
||||||
@@ -19,7 +21,6 @@ struct FaceInfo {
|
|
||||||
bool in_domain() { return nesting_level%2 == 1; }
|
|
||||||
};
|
|
||||||
|
|
||||||
-typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
|
|
||||||
typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
|
|
||||||
typedef CGAL::Triangulation_data_structure_2<
|
|
||||||
CGAL::Triangulation_vertex_base_2<Projection>,
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -1,74 +0,0 @@
|
|||||||
From https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Torsten Paul <Torsten.Paul@gmx.de>
|
|
||||||
Date: Sat, 5 Feb 2022 18:38:31 +0100
|
|
||||||
Subject: [PATCH 01/11] CVE-2022-0496 Out-of-bounds memory access in DXF
|
|
||||||
loader.
|
|
||||||
|
|
||||||
Public issue:
|
|
||||||
https://github.com/openscad/openscad/issues/4037
|
|
||||||
|
|
||||||
Fix in master branch:
|
|
||||||
https://github.com/openscad/openscad/pull/4090
|
|
||||||
--- a/src/dxfdata.cc
|
|
||||||
+++ b/src/dxfdata.cc
|
|
||||||
@@ -441,6 +441,11 @@ DxfData::DxfData(double fn, double fs, double fa,
|
|
||||||
auto lv = grid.data(this->points[lines[idx].idx[j]][0], this->points[lines[idx].idx[j]][1]);
|
|
||||||
for (size_t ki = 0; ki < lv.size(); ++ki) {
|
|
||||||
int k = lv.at(ki);
|
|
||||||
+ if (k < 0 || k >= lines.size()) {
|
|
||||||
+ LOG(message_group::Warning,Location::NONE,"",
|
|
||||||
+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
if (k == idx || lines[k].disabled) continue;
|
|
||||||
goto next_open_path_j;
|
|
||||||
}
|
|
||||||
@@ -466,13 +471,20 @@ DxfData::DxfData(double fn, double fs, double fa,
|
|
||||||
auto lv = grid.data(ref_point[0], ref_point[1]);
|
|
||||||
for (size_t ki = 0; ki < lv.size(); ++ki) {
|
|
||||||
int k = lv.at(ki);
|
|
||||||
+ if (k < 0 || k >= lines.size()) {
|
|
||||||
+ LOG(message_group::Warning,Location::NONE,"",
|
|
||||||
+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
if (lines[k].disabled) continue;
|
|
||||||
- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
|
|
||||||
+ auto idk0 = lines[k].idx[0]; // make it easier to read and debug
|
|
||||||
+ auto idk1 = lines[k].idx[1];
|
|
||||||
+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
|
|
||||||
current_line = k;
|
|
||||||
current_point = 0;
|
|
||||||
goto found_next_line_in_open_path;
|
|
||||||
}
|
|
||||||
- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
|
|
||||||
+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
|
|
||||||
current_line = k;
|
|
||||||
current_point = 1;
|
|
||||||
goto found_next_line_in_open_path;
|
|
||||||
@@ -501,13 +513,20 @@ DxfData::DxfData(double fn, double fs, double fa,
|
|
||||||
auto lv = grid.data(ref_point[0], ref_point[1]);
|
|
||||||
for (size_t ki = 0; ki < lv.size(); ++ki) {
|
|
||||||
int k = lv.at(ki);
|
|
||||||
+ if (k < 0 || k >= lines.size()) {
|
|
||||||
+ LOG(message_group::Warning,Location::NONE,"",
|
|
||||||
+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
if (lines[k].disabled) continue;
|
|
||||||
- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
|
|
||||||
+ auto idk0 = lines[k].idx[0]; // make it easier to read and debug
|
|
||||||
+ auto idk1 = lines[k].idx[1];
|
|
||||||
+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
|
|
||||||
current_line = k;
|
|
||||||
current_point = 0;
|
|
||||||
goto found_next_line_in_closed_path;
|
|
||||||
}
|
|
||||||
- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
|
|
||||||
+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
|
|
||||||
current_line = k;
|
|
||||||
current_point = 1;
|
|
||||||
goto found_next_line_in_closed_path;
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
From https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Torsten Paul <Torsten.Paul@gmx.de>
|
|
||||||
Date: Sat, 5 Feb 2022 18:45:29 +0100
|
|
||||||
Subject: [PATCH 02/11] CVE-2022-0497 Out-of-bounds memory access in comment
|
|
||||||
parser.
|
|
||||||
|
|
||||||
Public issue:
|
|
||||||
https://github.com/openscad/openscad/issues/4043
|
|
||||||
|
|
||||||
Fix in master branch:
|
|
||||||
https://github.com/openscad/openscad/pull/4044
|
|
||||||
--- a/src/comment.cpp
|
|
||||||
+++ b/src/comment.cpp
|
|
||||||
@@ -92,7 +92,7 @@ static std::string getComment(const std::string &fulltext, int line)
|
|
||||||
}
|
|
||||||
|
|
||||||
int end = start + 1;
|
|
||||||
- while (fulltext[end] != '\n') end++;
|
|
||||||
+ while (end < fulltext.size() && fulltext[end] != '\n') end++;
|
|
||||||
|
|
||||||
std::string comment = fulltext.substr(start, end - start);
|
|
||||||
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
|||||||
https://bugs.gentoo.org/851189
|
|
||||||
From https://github.com/openscad/openscad/commit/9aa0d7e9f2914fe5f547bdde69202161d1c6064d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jordan Brown <github@jordan.maileater.net>
|
|
||||||
Date: Sun, 18 Jul 2021 21:01:46 -0700
|
|
||||||
Subject: [PATCH 05/11] Fix build failure with "generic_print_polyhedron" on
|
|
||||||
CGAL-5.3.
|
|
||||||
|
|
||||||
--- a/src/cgalutils-polyhedron.cc
|
|
||||||
+++ b/src/cgalutils-polyhedron.cc
|
|
||||||
@@ -337,19 +337,6 @@ namespace CGALUtils {
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
- template <typename Polyhedron>
|
|
||||||
- std::string printPolyhedron(const Polyhedron &p) {
|
|
||||||
- std::ostringstream sstream;
|
|
||||||
- sstream.precision(20);
|
|
||||||
-
|
|
||||||
- Polyhedron_writer writer;
|
|
||||||
- generic_print_polyhedron(sstream, p, writer);
|
|
||||||
-
|
|
||||||
- return sstream.str();
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- template std::string printPolyhedron(const CGAL_Polyhedron &p);
|
|
||||||
-
|
|
||||||
}; // namespace CGALUtils
|
|
||||||
|
|
||||||
#endif /* ENABLE_CGAL */
|
|
||||||
--- a/src/cgalutils.h
|
|
||||||
+++ b/src/cgalutils.h
|
|
||||||
@@ -45,7 +45,6 @@ namespace CGALUtils {
|
|
||||||
bool is_approximately_convex(const PolySet &ps);
|
|
||||||
Geometry const* applyMinkowski(const Geometry::Geometries &children);
|
|
||||||
|
|
||||||
- template <typename Polyhedron> std::string printPolyhedron(const Polyhedron &p);
|
|
||||||
template <typename Polyhedron> bool createPolySetFromPolyhedron(const Polyhedron &p, PolySet &ps);
|
|
||||||
template <typename Polyhedron> bool createPolyhedronFromPolySet(const PolySet &ps, Polyhedron &p);
|
|
||||||
template <class Polyhedron_A, class Polyhedron_B>
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -1,60 +0,0 @@
|
|||||||
https://bugs.gentoo.org/851189
|
|
||||||
From https://github.com/openscad/openscad/commit/08bf69b4115c989fc5671254e0d05735d01bcca5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Torsten Paul <Torsten.Paul@gmx.de>
|
|
||||||
Date: Wed, 2 Feb 2022 00:50:43 +0100
|
|
||||||
Subject: [PATCH 10/11] Fix build issue with overloaded join().
|
|
||||||
|
|
||||||
--- a/src/openscad.cc
|
|
||||||
+++ b/src/openscad.cc
|
|
||||||
@@ -65,7 +65,6 @@
|
|
||||||
#include <chrono>
|
|
||||||
#include <boost/algorithm/string.hpp>
|
|
||||||
#include <boost/algorithm/string/split.hpp>
|
|
||||||
-#include <boost/algorithm/string/join.hpp>
|
|
||||||
#include <boost/range/adaptor/transformed.hpp>
|
|
||||||
#include <boost/program_options.hpp>
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
@@ -307,7 +306,7 @@ void set_render_color_scheme(const std::string color_scheme, const bool exit_if_
|
|
||||||
}
|
|
||||||
|
|
||||||
if (exit_if_not_found) {
|
|
||||||
- LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(), "\n")));
|
|
||||||
+ LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(), "\n")));
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
} else {
|
|
||||||
@@ -885,7 +884,7 @@ struct CommaSeparatedVector
|
|
||||||
};
|
|
||||||
|
|
||||||
template <class Seq, typename ToString>
|
|
||||||
-std::string join(const Seq &seq, const std::string &sep, const ToString &toString)
|
|
||||||
+std::string str_join(const Seq &seq, const std::string &sep, const ToString &toString)
|
|
||||||
{
|
|
||||||
return boost::algorithm::join(boost::adaptors::transform(seq, toString), sep);
|
|
||||||
}
|
|
||||||
@@ -947,7 +946,7 @@ int main(int argc, char **argv)
|
|
||||||
("P,P", po::value<string>(), "customizer parameter set")
|
|
||||||
#ifdef ENABLE_EXPERIMENTAL
|
|
||||||
("enable", po::value<vector<string>>(), ("enable experimental features: " +
|
|
||||||
- join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
|
|
||||||
+ str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
|
|
||||||
[](const Feature *feature) {
|
|
||||||
return feature->get_name();
|
|
||||||
}) +
|
|
||||||
@@ -964,11 +963,11 @@ int main(int argc, char **argv)
|
|
||||||
("render", po::value<string>()->implicit_value(""), "for full geometry evaluation when exporting png")
|
|
||||||
("preview", po::value<string>()->implicit_value(""), "[=throwntogether] -for ThrownTogether preview png")
|
|
||||||
("animate", po::value<unsigned>(), "export N animated frames")
|
|
||||||
- ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::join(viewOptions.names(), " | ")).c_str())
|
|
||||||
+ ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::algorithm::join(viewOptions.names(), " | ")).c_str())
|
|
||||||
("projection", po::value<string>(), "=(o)rtho or (p)erspective when exporting png")
|
|
||||||
("csglimit", po::value<unsigned int>(), "=n -stop rendering at n CSG elements when exporting png")
|
|
||||||
("colorscheme", po::value<string>(), ("=colorscheme: " +
|
|
||||||
- join(ColorMap::inst()->colorSchemeNames(), " | ",
|
|
||||||
+ str_join(ColorMap::inst()->colorSchemeNames(), " | ",
|
|
||||||
[](const std::string& colorScheme) {
|
|
||||||
return (colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") + colorScheme;
|
|
||||||
}) +
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
|||||||
From https://github.com/openscad/openscad/commit/45a5e3bdd6c8071cb50b9c3f2b14a62554aafc4a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Torsten Paul <Torsten.Paul@gmx.de>
|
|
||||||
Date: Thu, 14 Apr 2022 16:07:04 +0200
|
|
||||||
Subject: [PATCH 11/11] Remove double quoting of the output file parameter for
|
|
||||||
ghostscript.
|
|
||||||
|
|
||||||
--- a/tests/export_pngtest.py
|
|
||||||
+++ b/tests/export_pngtest.py
|
|
||||||
@@ -82,7 +82,7 @@ result = subprocess.call(export_cmd, env = fontenv)
|
|
||||||
if result != 0:
|
|
||||||
failquit('OpenSCAD failed with return code ' + str(result))
|
|
||||||
|
|
||||||
-convert_cmd = gs_cmd + ["-sOutputFile=\"" + pngfile + "\"", exportfile]
|
|
||||||
+convert_cmd = gs_cmd + ["-sOutputFile=" + pngfile, exportfile]
|
|
||||||
print('Running Converter:', ' '.join(convert_cmd), file=sys.stderr)
|
|
||||||
result = subprocess.call(convert_cmd)
|
|
||||||
if result != 0:
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
diff '--color=auto' -ur openscad-2021.01-orig/src/FileModule.cc openscad-2021.01/src/FileModule.cc
|
|
||||||
--- openscad-2021.01-orig/src/FileModule.cc 2021-01-31 21:17:41.000000000 +0100
|
|
||||||
+++ openscad-2021.01/src/FileModule.cc 2024-05-20 07:50:31.746487490 +0200
|
|
||||||
@@ -65,7 +65,7 @@
|
|
||||||
auto ext = fs::path(path).extension().generic_string();
|
|
||||||
|
|
||||||
if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
|
|
||||||
- if (fs::is_regular(path)) {
|
|
||||||
+ if (fs::is_regular_file(path)) {
|
|
||||||
FontCache::instance()->register_font_file(path);
|
|
||||||
} else {
|
|
||||||
LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path);
|
|
@ -1,14 +0,0 @@
|
|||||||
diff '--color=auto' -ur openscad-2021.01.orig/c++std.pri openscad-2021.01/c++std.pri
|
|
||||||
--- openscad-2021.01.orig/c++std.pri 2021-01-31 21:17:41.000000000 +0100
|
|
||||||
+++ openscad-2021.01/c++std.pri 2024-11-05 11:27:55.002178949 +0100
|
|
||||||
@@ -26,8 +26,8 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
c++std {
|
|
||||||
- CONFIG += c++14 strict_c++
|
|
||||||
- message("Using C++14")
|
|
||||||
+ CONFIG += c++17 strict_c++
|
|
||||||
+ message("Using C++17")
|
|
||||||
|
|
||||||
*clang*: {
|
|
||||||
# 3rd party libraries will probably violate this for a long time
|
|
@ -1,38 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person" proxied="yes">
|
|
||||||
<email>waebbl-gentoo@posteo.net</email>
|
|
||||||
<name>Bernd Waibel</name>
|
|
||||||
</maintainer>
|
|
||||||
<maintainer type="project" proxied="proxy">
|
|
||||||
<email>proxy-maint@gentoo.org</email>
|
|
||||||
<name>Proxy Maintainers</name>
|
|
||||||
</maintainer>
|
|
||||||
<longdescription>
|
|
||||||
OpenSCAD is a software for creating solid 3D CAD objects. Unlike
|
|
||||||
most free software for creating 3D models (such as the famous
|
|
||||||
application Blender) it does not focus on the artistic aspects of 3D
|
|
||||||
modelling but instead on the CAD aspects. Thus it might be the
|
|
||||||
application you are looking for when you are planning to create 3D
|
|
||||||
models of machine parts but pretty sure is not what you are looking
|
|
||||||
for when you are more interested in creating computer-animated movies.
|
|
||||||
OpenSCAD is free software and available for Linux/UNIX, MS Windows and
|
|
||||||
Mac OS X.
|
|
||||||
</longdescription>
|
|
||||||
<use>
|
|
||||||
<flag name="gamepad">
|
|
||||||
Add support for gamepads through <pkg>dev-qt/qtgamepad</pkg>
|
|
||||||
</flag>
|
|
||||||
<flag name="headless">
|
|
||||||
Build a binary without GUI
|
|
||||||
</flag>
|
|
||||||
<flag name="spacenav">
|
|
||||||
Add support for space navigator devices through
|
|
||||||
<pkg>dev-libs/libspnav</pkg>
|
|
||||||
</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">openscad/openscad</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
@ -1,119 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
inherit elisp-common flag-o-matic qmake-utils xdg
|
|
||||||
|
|
||||||
SITEFILE="50${PN}-gentoo.el"
|
|
||||||
|
|
||||||
DESCRIPTION="The Programmers Solid 3D CAD Modeller"
|
|
||||||
HOMEPAGE="https://openscad.org/"
|
|
||||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
|
|
||||||
IUSE="emacs"
|
|
||||||
# tests are not fully working and need cmake which isn't yet
|
|
||||||
# officially supported.
|
|
||||||
RESTRICT="test"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-cpp/eigen:3
|
|
||||||
dev-libs/boost:=
|
|
||||||
dev-libs/double-conversion:=
|
|
||||||
dev-libs/glib:2
|
|
||||||
dev-libs/gmp:0=
|
|
||||||
dev-libs/hidapi
|
|
||||||
dev-libs/libspnav
|
|
||||||
dev-libs/libxml2
|
|
||||||
dev-libs/libzip:=
|
|
||||||
dev-libs/mpfr:0=
|
|
||||||
dev-qt/qtconcurrent:5
|
|
||||||
dev-qt/qtcore:5
|
|
||||||
dev-qt/qtdbus:5
|
|
||||||
dev-qt/qtgui:5[-gles2-only]
|
|
||||||
dev-qt/qtmultimedia:5
|
|
||||||
dev-qt/qtnetwork:5
|
|
||||||
dev-qt/qtopengl:5
|
|
||||||
dev-qt/qtwidgets:5
|
|
||||||
media-gfx/opencsg:=
|
|
||||||
media-libs/fontconfig
|
|
||||||
media-libs/freetype
|
|
||||||
>=media-libs/glew-2.0.0:0=
|
|
||||||
media-libs/harfbuzz:=
|
|
||||||
media-libs/lib3mf
|
|
||||||
sci-mathematics/cgal:=
|
|
||||||
x11-libs/cairo
|
|
||||||
>=x11-libs/qscintilla-2.10.3:=[qt5(+)]
|
|
||||||
emacs? ( >=app-editors/emacs-23.1:* )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
dev-util/itstool
|
|
||||||
app-alternatives/yacc
|
|
||||||
app-alternatives/lex
|
|
||||||
sys-devel/gettext
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch
|
|
||||||
"${FILESDIR}"/${P}-0002-fix-to-find-lib3mf-2.patch
|
|
||||||
"${FILESDIR}"/${P}-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
|
|
||||||
"${FILESDIR}"/${P}-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
|
|
||||||
"${FILESDIR}"/${P}-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
|
|
||||||
"${FILESDIR}"/${P}-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
|
|
||||||
"${FILESDIR}"/${P}-Fix-build-issue-with-overloaded-join.patch
|
|
||||||
"${FILESDIR}"/${P}-Remove-double-quoting-of-the-output-file-parameter-f.patch
|
|
||||||
"${FILESDIR}"/${P}-boost-1.85.patch
|
|
||||||
"${FILESDIR}"/${P}-fix-cstd.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# -Werror=odr
|
|
||||||
# https://github.com/openscad/openscad/issues/5239
|
|
||||||
filter-lto
|
|
||||||
|
|
||||||
if has ccache ${FEATURES}; then
|
|
||||||
eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
|
|
||||||
else
|
|
||||||
eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
# We have random parallel build issues, bug #856430
|
|
||||||
emake -j1
|
|
||||||
|
|
||||||
if use emacs ; then
|
|
||||||
elisp-compile contrib/*.el
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake install INSTALL_ROOT="${D}"
|
|
||||||
|
|
||||||
if use emacs; then
|
|
||||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
|
||||||
elisp-install ${PN} contrib/*.el contrib/*.elc
|
|
||||||
fi
|
|
||||||
|
|
||||||
mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
|
|
||||||
ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
|
|
||||||
|
|
||||||
einstalldocs
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
use emacs && elisp-site-regen
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_mimeinfo_database_update
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
use emacs && elisp-site-regen
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_mimeinfo_database_update
|
|
||||||
}
|
|
@ -1,127 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
inherit cmake elisp-common git-r3 xdg
|
|
||||||
|
|
||||||
SITEFILE="50${PN}-gentoo.el"
|
|
||||||
|
|
||||||
DESCRIPTION="The Programmers Solid 3D CAD Modeller"
|
|
||||||
HOMEPAGE="https://www.openscad.org/"
|
|
||||||
SRC_URI=""
|
|
||||||
EGIT_REPO_URI="https://github.com/openscad/openscad.git"
|
|
||||||
|
|
||||||
# Code is GPL-3+, MCAD library is LGPL-2.1
|
|
||||||
LICENSE="GPL-3+ LGPL-2.1"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS=""
|
|
||||||
IUSE="cairo dbus emacs gamepad headless spacenav"
|
|
||||||
RESTRICT="test" # 32 out 1300+ tests fail
|
|
||||||
|
|
||||||
REQUIRED_USE="
|
|
||||||
headless? ( !dbus !gamepad !spacenav )
|
|
||||||
"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-cpp/eigen:3
|
|
||||||
dev-libs/boost:=
|
|
||||||
dev-libs/double-conversion:=
|
|
||||||
dev-libs/glib:2
|
|
||||||
dev-libs/libxml2
|
|
||||||
dev-libs/libzip:=
|
|
||||||
media-gfx/opencsg
|
|
||||||
media-libs/fontconfig
|
|
||||||
media-libs/freetype
|
|
||||||
media-libs/glew:0=
|
|
||||||
media-libs/harfbuzz:=
|
|
||||||
media-libs/lib3mf
|
|
||||||
sci-mathematics/cgal:=
|
|
||||||
virtual/opengl
|
|
||||||
cairo? ( x11-libs/cairo )
|
|
||||||
emacs? ( app-editors/emacs:* )
|
|
||||||
!headless? (
|
|
||||||
dev-qt/qtconcurrent:5
|
|
||||||
dev-qt/qtcore:5
|
|
||||||
dev-qt/qtgui:5[-gles2-only]
|
|
||||||
dev-qt/qtmultimedia:5
|
|
||||||
dev-qt/qtnetwork:5
|
|
||||||
dev-qt/qtopengl:5
|
|
||||||
dev-qt/qtwidgets:5
|
|
||||||
x11-libs/qscintilla:=
|
|
||||||
dbus? ( dev-qt/qtdbus:5 )
|
|
||||||
gamepad? ( dev-qt/qtgamepad:5 )
|
|
||||||
)
|
|
||||||
spacenav? ( dev-libs/libspnav )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
dev-util/itstool
|
|
||||||
sys-devel/bison
|
|
||||||
sys-devel/flex
|
|
||||||
sys-devel/gettext
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
DOCS=(
|
|
||||||
RELEASE_NOTES.md
|
|
||||||
doc/TODO.txt
|
|
||||||
doc/contributor_copyright.txt
|
|
||||||
doc/hacking.md
|
|
||||||
doc/testing.txt
|
|
||||||
)
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local mycmakeargs=(
|
|
||||||
-DCLANG_TIDY=OFF
|
|
||||||
-DENABLE_CAIRO=$(usex cairo)
|
|
||||||
-DENABLE_SPNAV=$(usex spacenav)
|
|
||||||
-DENABLE_TESTS=OFF
|
|
||||||
-DHEADLESS=$(usex headless)
|
|
||||||
-DUSE_CCACHE=OFF
|
|
||||||
)
|
|
||||||
|
|
||||||
if use !headless; then
|
|
||||||
mycmakeargs+=(
|
|
||||||
-DENABLE_GAMEPAD=$(usex gamepad)
|
|
||||||
-DENABLE_QTDBUS=$(usex dbus)
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
cmake_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
cmake_src_compile
|
|
||||||
|
|
||||||
if use emacs ; then
|
|
||||||
elisp-compile contrib/*.el
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
DOCS+=( doc/*.pdf )
|
|
||||||
cmake_src_install
|
|
||||||
|
|
||||||
mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
|
|
||||||
ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
|
|
||||||
|
|
||||||
if use emacs; then
|
|
||||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
|
||||||
elisp-install ${PN} contrib/*.el contrib/*.elc
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
use emacs && elisp-site-regen
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_icon_cache_update
|
|
||||||
xdg_mimeinfo_database_update
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
use emacs && elisp-site-regen
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_icon_cache_update
|
|
||||||
xdg_mimeinfo_database_update
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
DIST tsmuxer-2.6.11.tar.gz 538798 BLAKE2B 18f5f9002e356664ae84343afbadcddd447743404bcdcca709ba039ebb2ab05e5fba7eda0f30c86c29e18040d646004d1aec7dec34ed008ddbdb15228c63f09d SHA512 25b552153b76231ac1b88858d2178564d22edd18c6b08dc872765ac214ca6fd1ff6df5c5fff0f24647ea35f3f990e364bfb8adff5dd79c69cc12875fafb4f137
|
|
||||||
EBUILD tsmuxer-2.6.11-r1.ebuild 781 BLAKE2B c80e0a7ee39138d0dd6b1e1c818d6d56b6715a4ed56e5bed49c5eddf86203da406e2e6adc2487c90f34b9732192f1f54307ea91362cce8cadfce8cbc0a4d058c SHA512 c3fae0850034c37fa6a1c30950d6d17b872ef7954783e5af80fa7175cba43c427f81114b1c14cd58d792d47b5d83e86732327be04e967a27cc941a931e83f7f3
|
|
||||||
MISC metadata.xml 573 BLAKE2B 324a4a4396cf858d2da5d3c2b4183310adb33aeecef814980cab79bbb094b9a8c0e0f5d984737df564e5895a62ca519d36795b6216641fe4768a27ca2013fd6f SHA512 a84cbfc78aaddca9576bbb744d162794c1cd5297fda1f2672d37b8b05519d3d677561e8ef5a2a8a58b5fb4fccb74a573f0f5d202635051e394f3b14e551e912d
|
|
@ -1,14 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>media-video@gentoo.org</email>
|
|
||||||
<name>Gentoo Video project</name>
|
|
||||||
</maintainer>
|
|
||||||
<longdescription lang="en">
|
|
||||||
SmartLabs tsMuxeR - the software utility to create TS and M2TS files for
|
|
||||||
IP broadcasting as well as for viewing at hardware video players (i.e.,
|
|
||||||
Dune HD Ultra, Sony Playstation3 and others). tsMuxeR is a part of
|
|
||||||
SmartCONTENT, content preparation solution.
|
|
||||||
</longdescription>
|
|
||||||
</pkgmetadata>
|
|
@ -1,38 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
DESCRIPTION="Utility to create and demux TS and M2TS files"
|
|
||||||
HOMEPAGE="http://forum.doom9.org/showthread.php?t=168539"
|
|
||||||
SRC_URI="https://drive.google.com/uc?export=download&id=0B0VmPcEZTp8NekJxLUVJRWMwejQ -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="SmartLabs"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
|
|
||||||
|
|
||||||
DEPEND="|| (
|
|
||||||
>=app-arch/upx-3.01
|
|
||||||
>=app-arch/upx-bin-3.01
|
|
||||||
)"
|
|
||||||
RDEPEND="
|
|
||||||
>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
|
|
||||||
"
|
|
||||||
|
|
||||||
S="${WORKDIR}"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
upx -d tsMuxeR tsMuxerGUI || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
dodir /opt/bin
|
|
||||||
exeinto /opt/${PN}/bin
|
|
||||||
|
|
||||||
doexe tsMuxeR
|
|
||||||
dosym ../${PN}/bin/tsMuxeR /opt/bin/tsMuxeR
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
AUX 4.4/samba4.confd 2035 BLAKE2B a9fa538a0b259c8a184012e0370819729e24fa971de52e3d3891107bd78e6d4e074a2df80b1c424c23229ce5e84ea1da908887c8fef88dd45104eb5c6eb0e4a5 SHA512 d6a7ae560621407b7a5f94db6489d6a85c5056f4212a2a9a24210eaeb585caf4f15801282d1b8682962c0cf5642766fe09cc70c48fffafd1560de615154503af
|
|
||||||
AUX 4.4/samba4.initd-r1 1112 BLAKE2B 91d28710ccd512e19307bfd5ba97710ca071b478696d8e933d90b385f0c958a493ab684436915630de2884383e24eb1c9955ebd2b526b0b8f30438d9204dcb57 SHA512 3bfa4c8e0d77994fbca25eb0e12617166909c4d6742d1800c73f5640a7c39ee760988a315d39ddf8a575097df3d3c6fe3f308e8ca1cd698018544a9060176f4e
|
|
||||||
AUX 4.4/system-auth-winbind.pam 590 BLAKE2B d8c0190dff88c5b65f7f01b3a84fd776194d3b4ce5c973bd1145e6a12750f01882b2873be03b537e9a68899c0a19fee7a4834385961090e4cb69dda7ae1763c0 SHA512 0886cfd99b3c3dc117b2a83b04bf59d080ebf77d6ea91f24cfc4d8be7af9db377e0efc2216e7c1f8a180b09fb425476ef6874180d9f0fa47e4889faf1d429679
|
|
||||||
AUX ldb-2.5.2-skip-wav-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8
|
|
||||||
AUX samba-4.18.4-pam.patch 900 BLAKE2B c2e07609d619a50086ac7727d714ae5bd9508b548f070b9c8193fa5ff4c2051b8f9ee8c3d636693746ae4b4a422add093a95bf3e713e7a4c9325fe6a8a2a2f4c SHA512 5cb997276a35ad6a188801deac7ccaad0e1b8c92f2070fcac62513ea371afc1d9d3414550d3c65726a4a813a4a619ada25063a6d7f145243873c1d9ed6d9690f
|
|
||||||
AUX samba.conf 146 BLAKE2B d86e630dba5fcb3a0bb22ac6daf8b0f63d30903c31911353116bc7a63e3ba434f69fd2cbe7a854ab3dc994b95e630932dcbe556fdd6372d27cea5a15618aa816 SHA512 da9ae57a6740135745453e776040b1e54bb492b351a1aa700b8868ef2d1716c0d54b55400cd9b1b1877e065d896ca1569b5a617863c698676250d8ea29939a52
|
|
||||||
DIST samba-4.22.0.tar.gz 42860320 BLAKE2B 27997ad025cbdc246c906bb05bf1c67749decc8e760c68cd4837b5121295613824b11f0eea91de6e7cb551ccc5193d189d5742dc7096305565ca8794baa7b585 SHA512 3d0f34d570eb0c119f1300ffe10f16c1dbc65ef719780d1ffd0c2060b0c283aa57f2d0f5445f1db66d61e52cf5ae1d1093705867973f3b6450b642878073a63f
|
|
||||||
EBUILD samba-4.22.0.ebuild 11615 BLAKE2B 8c9bad48b56acfdd2e12d0d072b2ef2324dfbcfb0e8986667fb4dc9ebb72519a547e6cb9b6c125023470443cdb53f73decfb02f94f1b362cb0fcf3e463f44b60 SHA512 98018b564e09dd5e82a5c1c7dda42d95fc84a538e9ac6ea4904c4e6a194b40d208be14fa299e7cfff9c723e281c5245312b17ba08e7fede2307b5704378f32da
|
|
||||||
MISC metadata.xml 2129 BLAKE2B 22716cc1235dc573023fe31c941bf999916a73bd0de504703c9e9f66b4a1a776e47b74dafe951d0bf04911dfa5e3d8d6354dd8e532fecdf0d51b02cf5eb30da5 SHA512 a6927d5243e95f31a896befa759fea648dd16c19a0a35935da525283a22d314faf5d515f23810026eab94e3bd3cec6431eb5aa3168be8989418f7d66452d92fb
|
|
@ -1,45 +0,0 @@
|
|||||||
# Add "winbind" to the daemon_list if you also want winbind to start.
|
|
||||||
# Replace "smbd nmbd" by "samba4" if you want the active directory domain controller part or the ntvfs
|
|
||||||
# file server part or the rpc proxy to start.
|
|
||||||
# Note that samba4 controls 'smbd' by itself, thus it can't be started manually. You can, however,
|
|
||||||
# tweak the behaviour of a samba4-controlled smbd by modifying your '/etc/samba/smb.conf' file
|
|
||||||
# accordingly.
|
|
||||||
daemon_list="smbd nmbd"
|
|
||||||
|
|
||||||
piddir="/run/samba"
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
|
||||||
# Daemons calls: <daemon_name>_<command_option>
|
|
||||||
#----------------------------------------------------------------------------
|
|
||||||
my_service_name="samba"
|
|
||||||
my_service_PRE="unset TMP TMPDIR"
|
|
||||||
my_service_POST=""
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
|
||||||
# Daemons calls: <daemon_name>_<command_option>
|
|
||||||
#----------------------------------------------------------------------------
|
|
||||||
smbd_start_options="-D"
|
|
||||||
smbd_command="/usr/sbin/smbd"
|
|
||||||
smbd_start="start-stop-daemon --start --exec ${smbd_command} -- ${smbd_start_options}"
|
|
||||||
smbd_stop="start-stop-daemon --stop --exec ${smbd_command}"
|
|
||||||
smbd_reload="killall -HUP smbd"
|
|
||||||
|
|
||||||
nmbd_start_options="-D"
|
|
||||||
nmbd_command="/usr/sbin/nmbd"
|
|
||||||
nmbd_start="start-stop-daemon --start --exec ${nmbd_command} -- ${nmbd_start_options}"
|
|
||||||
nmbd_stop="start-stop-daemon --stop --exec ${nmbd_command}"
|
|
||||||
nmbd_reload="killall -HUP nmbd"
|
|
||||||
|
|
||||||
samba4_start_options=""
|
|
||||||
samba4_command="/usr/sbin/samba"
|
|
||||||
samba4_pidfile="${piddir}/samba.pid"
|
|
||||||
samba4_start="start-stop-daemon --start --exec ${samba4_command} --pidfile ${samba4_pidfile} -- ${samba4_start_options}"
|
|
||||||
samba4_stop="start-stop-daemon --stop --exec ${samba4_command} --pidfile ${samba4_pidfile}"
|
|
||||||
samba4_reload="killall -HUP samba"
|
|
||||||
|
|
||||||
winbind_start_options=""
|
|
||||||
winbind_command="/usr/sbin/winbindd"
|
|
||||||
winbind_start="start-stop-daemon --start --exec ${winbind_command} -- ${winbind_start_options}"
|
|
||||||
winbind_stop="start-stop-daemon --stop --exec ${winbind_command}"
|
|
||||||
winbind_reload="killall -HUP winbindd"
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2020 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License, v2 or later
|
|
||||||
|
|
||||||
extra_started_commands="reload"
|
|
||||||
[ -z "${piddir}" ] && piddir="/run/samba"
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
after slapd
|
|
||||||
use cupsd
|
|
||||||
}
|
|
||||||
|
|
||||||
DAEMONNAME="${SVCNAME##samba.}"
|
|
||||||
[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME}
|
|
||||||
|
|
||||||
signal_do() {
|
|
||||||
local signal="$1"
|
|
||||||
[ -z "${signal}" ] && return 0
|
|
||||||
|
|
||||||
local result=0 last_result=0 daemon= cmd_exec=
|
|
||||||
for daemon in ${daemon_list} ; do
|
|
||||||
eval cmd_exec=\$${daemon}_${signal}
|
|
||||||
if [ -n "${cmd_exec}" ]; then
|
|
||||||
ebegin "${my_service_name} -> ${signal}: ${daemon}"
|
|
||||||
#echo ${cmd} '->' ${!cmd}
|
|
||||||
${cmd_exec} > /dev/null
|
|
||||||
last_result=$?
|
|
||||||
eend ${last_result}
|
|
||||||
fi
|
|
||||||
result=$(( ${result} + ${last_result} ))
|
|
||||||
done
|
|
||||||
return ${result}
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
${my_service_PRE}
|
|
||||||
[ -d "${piddir}" ] || mkdir -p "${piddir}"
|
|
||||||
signal_do start && return 0
|
|
||||||
|
|
||||||
eerror "Error: starting services (see system logs)"
|
|
||||||
signal_do stop
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
stop() {
|
|
||||||
${my_service_PRE}
|
|
||||||
if signal_do stop ; then
|
|
||||||
${my_service_POST}
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
reload() {
|
|
||||||
${my_service_PRE}
|
|
||||||
signal_do reload
|
|
||||||
}
|
|
@ -1,18 +0,0 @@
|
|||||||
#%PAM-1.0
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
auth required pam_env.so
|
|
||||||
auth sufficient pam_winbind.so
|
|
||||||
auth sufficient pam_unix.so likeauth nullok use_first_pass
|
|
||||||
auth required pam_deny.so
|
|
||||||
|
|
||||||
account sufficient pam_winbind.so
|
|
||||||
account required pam_unix.so
|
|
||||||
|
|
||||||
password required pam_cracklib.so retry=3
|
|
||||||
password sufficient pam_unix.so nullok use_authtok md5 shadow
|
|
||||||
password required pam_deny.so
|
|
||||||
|
|
||||||
session required pam_mkhomedir.so skel=/etc/skel/ umask=0022
|
|
||||||
session required pam_limits.so
|
|
||||||
session required pam_unix.so
|
|
@ -1,12 +0,0 @@
|
|||||||
--- ldb-1.3.6/lib/tevent/wscript
|
|
||||||
+++ ldb-1.3.6/lib/tevent/wscript
|
|
||||||
@@ -34,8 +34,7 @@
|
|
||||||
if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
|
|
||||||
onlyif='talloc', implied_deps='replace talloc'):
|
|
||||||
conf.define('USING_SYSTEM_TEVENT', 1)
|
|
||||||
- if not conf.env.disable_python and \
|
|
||||||
- conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
|
|
||||||
+ if not conf.env.disable_python:
|
|
||||||
conf.define('USING_SYSTEM_PYTEVENT', 1)
|
|
||||||
|
|
||||||
if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
|
|
@ -1,29 +0,0 @@
|
|||||||
--- a/source3/wscript
|
|
||||||
+++ b/source3/wscript
|
|
||||||
@@ -863,7 +863,7 @@
|
|
||||||
if conf.env.with_iconv:
|
|
||||||
conf.DEFINE('HAVE_ICONV', 1)
|
|
||||||
|
|
||||||
- if Options.options.with_pam:
|
|
||||||
+ if Options.options.with_pam != False:
|
|
||||||
use_pam=True
|
|
||||||
conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h')
|
|
||||||
if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'):
|
|
||||||
@@ -940,6 +940,17 @@
|
|
||||||
"or headers not found. Use --without-pam to disable "
|
|
||||||
"PAM support.");
|
|
||||||
|
|
||||||
+ else:
|
|
||||||
+ Logs.warn("PAM disabled")
|
|
||||||
+ use_pam=False
|
|
||||||
+ conf.undefine('WITH_PAM')
|
|
||||||
+ conf.undefine('WITH_PAM_MODULES')
|
|
||||||
+ conf.undefine('HAVE_SECURITY_PAM_APPL_H')
|
|
||||||
+ conf.undefine('PAM_RHOST')
|
|
||||||
+ conf.undefine('PAM_TTY')
|
|
||||||
+ conf.undefine('HAVE_PAM_PAM_APPL_H')
|
|
||||||
+
|
|
||||||
+
|
|
||||||
seteuid = False
|
|
||||||
|
|
||||||
#
|
|
@ -1,8 +0,0 @@
|
|||||||
d /run/samba
|
|
||||||
d /run/ctdb
|
|
||||||
d /run/lock/samba
|
|
||||||
d /var/cache/samba
|
|
||||||
d /var/lib/ctdb
|
|
||||||
d /var/lib/samba/bind-dns
|
|
||||||
d /var/lib/samba/private
|
|
||||||
d /var/log/samba
|
|
@ -1,38 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>samba@gentoo.org</email>
|
|
||||||
<name>Samba Team</name>
|
|
||||||
</maintainer>
|
|
||||||
<longdescription>
|
|
||||||
Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Integration with various accounting and antivirus backends. License: GNU General Public License.
|
|
||||||
</longdescription>
|
|
||||||
<use>
|
|
||||||
<flag name="addc">Enable Active Directory Domain Controller support</flag>
|
|
||||||
<flag name="ads">Enable Active Directory support</flag>
|
|
||||||
<flag name="ceph">Enable support for Ceph distributed filesystem via <pkg>sys-cluster/ceph</pkg></flag>
|
|
||||||
<flag name="client">Enables the client part</flag>
|
|
||||||
<flag name="cluster">Enable support for clustering</flag>
|
|
||||||
<flag name="glusterfs">Enable support for Glusterfs filesystem via <pkg>sys-cluster/glusterfs</pkg></flag>
|
|
||||||
<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag>
|
|
||||||
<flag name="iprint">Enabling iPrint technology by Novell</flag>
|
|
||||||
<flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag>
|
|
||||||
<flag name="lmdb">Enable LMDB backend for bundled ldb</flag>
|
|
||||||
<flag name="profiling-data">Enables support for collecting profiling data</flag>
|
|
||||||
<flag name="quota">Enables support for user quotas</flag>
|
|
||||||
<flag name="regedit">Enable support for regedit command-line tool</flag>
|
|
||||||
<flag name="snapper">Enable vfs_snapper module (requires <pkg>sys-apps/dbus</pkg>)</flag>
|
|
||||||
<flag name="spotlight">Enable support for spotlight backend</flag>
|
|
||||||
<flag name="system-heimdal">Use <pkg>app-crypt/heimdal</pkg> instead of
|
|
||||||
bundled heimdal.</flag>
|
|
||||||
<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of
|
|
||||||
<pkg>app-crypt/heimdal</pkg>.</flag>
|
|
||||||
<flag name="unwind">Enable libunwind usage for backtraces</flag>
|
|
||||||
<flag name="winbind">Enables support for the winbind auth daemon</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="cpe">cpe:/a:samba:samba</remote-id>
|
|
||||||
<remote-id type="gitlab">samba-team/samba</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
@ -1,389 +0,0 @@
|
|||||||
# Copyright 1999-2025 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{10..13} )
|
|
||||||
PYTHON_REQ_USE="threads(+),xml(+)"
|
|
||||||
inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
|
|
||||||
|
|
||||||
DESCRIPTION="Samba Suite Version 4"
|
|
||||||
HOMEPAGE="https://samba.org/"
|
|
||||||
|
|
||||||
MY_PV="${PV/_rc/rc}"
|
|
||||||
MY_P="${PN}-${MY_PV}"
|
|
||||||
if [[ ${PV} == *_rc* ]]; then
|
|
||||||
SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
|
|
||||||
else
|
|
||||||
SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
|
||||||
fi
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
LICENSE="GPL-3"
|
|
||||||
SLOT="0/2.10.0"
|
|
||||||
IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
|
|
||||||
IUSE+=" iprint json ldap llvm-libunwind lmdb pam profiling-data python quota"
|
|
||||||
IUSE+=" +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5"
|
|
||||||
IUSE+=" systemd test unwind winbind zeroconf"
|
|
||||||
|
|
||||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
|
||||||
addc? ( json python !system-mitkrb5 winbind )
|
|
||||||
ads? ( acl ldap python winbind )
|
|
||||||
cluster? ( ads )
|
|
||||||
gpg? ( addc )
|
|
||||||
spotlight? ( json )
|
|
||||||
test? ( python )
|
|
||||||
!ads? ( !addc )
|
|
||||||
?? ( system-heimdal system-mitkrb5 )
|
|
||||||
"
|
|
||||||
|
|
||||||
# the test suite is messed, it uses system-installed samba
|
|
||||||
# bits instead of what was built, tests things disabled via use
|
|
||||||
# flags, and generally just fails to work in a way ebuilds could
|
|
||||||
# rely on in its current state
|
|
||||||
RESTRICT="test"
|
|
||||||
|
|
||||||
MULTILIB_WRAPPED_HEADERS=(
|
|
||||||
/usr/include/samba-4.0/policy.h
|
|
||||||
/usr/include/samba-4.0/dcerpc_server.h
|
|
||||||
/usr/include/samba-4.0/ctdb.h
|
|
||||||
/usr/include/samba-4.0/ctdb_client.h
|
|
||||||
/usr/include/samba-4.0/ctdb_protocol.h
|
|
||||||
/usr/include/samba-4.0/ctdb_private.h
|
|
||||||
/usr/include/samba-4.0/ctdb_typesafe_cb.h
|
|
||||||
/usr/include/samba-4.0/ctdb_version.h
|
|
||||||
)
|
|
||||||
|
|
||||||
TALLOC_VERSION="2.4.3"
|
|
||||||
TDB_VERSION="1.4.13"
|
|
||||||
TEVENT_VERSION="0.16.2"
|
|
||||||
|
|
||||||
COMMON_DEPEND="
|
|
||||||
>=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}]
|
|
||||||
dev-lang/perl:=
|
|
||||||
dev-libs/icu:=[${MULTILIB_USEDEP}]
|
|
||||||
dev-libs/libbsd[${MULTILIB_USEDEP}]
|
|
||||||
dev-libs/libtasn1:=[${MULTILIB_USEDEP}]
|
|
||||||
dev-libs/popt[${MULTILIB_USEDEP}]
|
|
||||||
dev-perl/Parse-Yapp
|
|
||||||
>=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
|
|
||||||
>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
|
|
||||||
!sys-libs/ldb
|
|
||||||
sys-libs/libcap[${MULTILIB_USEDEP}]
|
|
||||||
sys-libs/liburing:=[${MULTILIB_USEDEP}]
|
|
||||||
sys-libs/ncurses:=
|
|
||||||
sys-libs/readline:=
|
|
||||||
>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
|
|
||||||
>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
|
|
||||||
>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
|
|
||||||
sys-libs/zlib[${MULTILIB_USEDEP}]
|
|
||||||
virtual/libcrypt:=[${MULTILIB_USEDEP}]
|
|
||||||
virtual/libiconv
|
|
||||||
$(python_gen_cond_dep '
|
|
||||||
addc? (
|
|
||||||
dev-python/dnspython:=[${PYTHON_USEDEP}]
|
|
||||||
dev-python/markdown[${PYTHON_USEDEP}]
|
|
||||||
)
|
|
||||||
ads? (
|
|
||||||
dev-python/dnspython:=[${PYTHON_USEDEP}]
|
|
||||||
net-dns/bind-tools[gssapi]
|
|
||||||
)
|
|
||||||
')
|
|
||||||
acl? ( virtual/acl )
|
|
||||||
ceph? ( sys-cluster/ceph )
|
|
||||||
cluster? ( net-libs/rpcsvc-proto )
|
|
||||||
cups? ( net-print/cups )
|
|
||||||
debug? ( dev-util/lttng-ust )
|
|
||||||
fam? ( virtual/fam )
|
|
||||||
gpg? ( app-crypt/gpgme:= )
|
|
||||||
json? ( dev-libs/jansson:= )
|
|
||||||
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
|
|
||||||
lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] )
|
|
||||||
pam? ( sys-libs/pam )
|
|
||||||
python? (
|
|
||||||
sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
|
|
||||||
sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
|
|
||||||
sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
|
|
||||||
)
|
|
||||||
snapper? ( sys-apps/dbus )
|
|
||||||
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
|
|
||||||
system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
|
|
||||||
!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
|
|
||||||
systemd? ( sys-apps/systemd:= )
|
|
||||||
unwind? (
|
|
||||||
llvm-libunwind? ( llvm-runtimes/libunwind:= )
|
|
||||||
!llvm-libunwind? ( sys-libs/libunwind:= )
|
|
||||||
)
|
|
||||||
zeroconf? ( net-dns/avahi[dbus] )
|
|
||||||
"
|
|
||||||
DEPEND="${COMMON_DEPEND}
|
|
||||||
dev-perl/JSON
|
|
||||||
net-libs/libtirpc[${MULTILIB_USEDEP}]
|
|
||||||
net-libs/rpcsvc-proto
|
|
||||||
spotlight? ( dev-libs/glib )
|
|
||||||
test? (
|
|
||||||
>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
|
|
||||||
$(python_gen_cond_dep "dev-python/python-subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
|
|
||||||
!system-mitkrb5? (
|
|
||||||
>=net-dns/resolv_wrapper-1.1.4
|
|
||||||
>=net-libs/socket_wrapper-1.1.9
|
|
||||||
>=sys-libs/nss_wrapper-1.1.3
|
|
||||||
>=sys-libs/uid_wrapper-1.2.1
|
|
||||||
)
|
|
||||||
)"
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
client? ( net-fs/cifs-utils[ads?] )
|
|
||||||
python? ( ${PYTHON_DEPS} )
|
|
||||||
selinux? ( sec-policy/selinux-samba )
|
|
||||||
"
|
|
||||||
BDEPEND="${PYTHON_DEPS}
|
|
||||||
app-text/docbook-xsl-stylesheets
|
|
||||||
dev-libs/libxslt
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-4.18.4-pam.patch
|
|
||||||
"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
CONFDIR="${FILESDIR}/4.4"
|
|
||||||
WAF_BINARY="${S}/buildtools/bin/waf"
|
|
||||||
SHAREDMODS=""
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
# Package fails to build with distcc
|
|
||||||
export DISTCC_DISABLE=1
|
|
||||||
export PYTHONHASHSEED=1
|
|
||||||
|
|
||||||
python-single-r1_pkg_setup
|
|
||||||
|
|
||||||
SHAREDMODS="$(usev !snapper '!')vfs_snapper"
|
|
||||||
if use cluster ; then
|
|
||||||
SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
|
|
||||||
elif use ads ; then
|
|
||||||
SHAREDMODS+=",idmap_ad"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
check_samba_dep_versions() {
|
|
||||||
actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
|
|
||||||
if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
|
|
||||||
eerror "Source talloc version: ${TALLOC_VERSION}"
|
|
||||||
eerror "Ebuild talloc version: ${actual_talloc_version}"
|
|
||||||
die "Ebuild needs to fix TALLOC_VERSION!"
|
|
||||||
fi
|
|
||||||
|
|
||||||
actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
|
|
||||||
if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
|
|
||||||
eerror "Source tdb version: ${TDB_VERSION}"
|
|
||||||
eerror "Ebuild tdb version: ${actual_tdb_version}"
|
|
||||||
die "Ebuild needs to fix TDB_VERSION!"
|
|
||||||
fi
|
|
||||||
|
|
||||||
actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
|
|
||||||
if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
|
|
||||||
eerror "Source tevent version: ${TEVENT_VERSION}"
|
|
||||||
eerror "Ebuild tevent version: ${actual_tevent_version}"
|
|
||||||
die "Ebuild needs to fix TEVENT_VERSION!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
|
|
||||||
check_samba_dep_versions
|
|
||||||
|
|
||||||
# Unbundle dnspython
|
|
||||||
sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
|
|
||||||
|
|
||||||
# Unbundle iso8601 unless tests are enabled
|
|
||||||
if ! use test ; then
|
|
||||||
sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ugly hackaround for bug #592502
|
|
||||||
#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
|
|
||||||
|
|
||||||
sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
|
|
||||||
-i source4/dsdb/samdb/ldb_modules/password_hash.c \
|
|
||||||
|| die
|
|
||||||
|
|
||||||
# bug #943942
|
|
||||||
append-cflags -std=gnu17
|
|
||||||
|
|
||||||
# WAF
|
|
||||||
multilib_copy_sources
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
# When specifying libs for samba build you must append NONE to the end to
|
|
||||||
# stop it automatically including things
|
|
||||||
local bundled_libs="NONE"
|
|
||||||
if ! use system-heimdal && ! use system-mitkrb5 ; then
|
|
||||||
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# We "use" bundled cmocka when we're not running tests as we're
|
|
||||||
# not using it anyway. Means we avoid making users install it for
|
|
||||||
# no reason. bug #802531
|
|
||||||
if ! use test ; then
|
|
||||||
bundled_libs="cmocka,${bundled_libs}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# bug #874633
|
|
||||||
if use llvm-libunwind ; then
|
|
||||||
mkdir -p "${T}"/${ABI}/pkgconfig || die
|
|
||||||
|
|
||||||
local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
|
|
||||||
|
|
||||||
cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
|
|
||||||
exec_prefix=\${prefix}
|
|
||||||
libdir=/usr/$(get_libdir)
|
|
||||||
includedir=\${prefix}/include
|
|
||||||
|
|
||||||
Name: libunwind-generic
|
|
||||||
Description: libunwind generic library
|
|
||||||
Version: 1.70
|
|
||||||
Libs: -L\${libdir} -lunwind
|
|
||||||
Cflags: -I\${includedir}
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
local myconf=(
|
|
||||||
--enable-fhs
|
|
||||||
--sysconfdir="${EPREFIX}/etc"
|
|
||||||
--localstatedir="${EPREFIX}/var"
|
|
||||||
--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
|
|
||||||
--with-piddir="${EPREFIX}/run/${PN}"
|
|
||||||
--bundled-libraries="${bundled_libs}"
|
|
||||||
--builtin-libraries=NONE
|
|
||||||
--disable-rpath
|
|
||||||
--disable-rpath-install
|
|
||||||
--nopyc
|
|
||||||
--nopyo
|
|
||||||
--without-winexe
|
|
||||||
$(multilib_native_use_with acl acl-support)
|
|
||||||
$(multilib_native_usex addc '' '--without-ad-dc')
|
|
||||||
$(use_with ads)
|
|
||||||
$(multilib_native_use_enable ceph cephfs)
|
|
||||||
$(multilib_native_use_with cluster cluster-support)
|
|
||||||
$(multilib_native_use_enable cups)
|
|
||||||
--without-dmapi
|
|
||||||
$(multilib_native_use_with fam)
|
|
||||||
$(multilib_native_use_enable glusterfs)
|
|
||||||
$(multilib_native_use_with gpg gpgme)
|
|
||||||
$(multilib_native_use_with json)
|
|
||||||
$(multilib_native_use_enable iprint)
|
|
||||||
$(multilib_native_use_with pam)
|
|
||||||
$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
|
|
||||||
$(multilib_native_use_with quota quotas)
|
|
||||||
$(multilib_native_use_with regedit)
|
|
||||||
$(multilib_native_use_enable spotlight)
|
|
||||||
$(multilib_native_use_with syslog)
|
|
||||||
$(multilib_native_use_with systemd)
|
|
||||||
--systemd-install-services
|
|
||||||
--with-systemddir="$(systemd_get_systemunitdir)"
|
|
||||||
$(multilib_native_use_with unwind libunwind)
|
|
||||||
$(multilib_native_use_with winbind)
|
|
||||||
$(multilib_native_usex python '' '--disable-python')
|
|
||||||
$(multilib_native_use_enable zeroconf avahi)
|
|
||||||
$(multilib_native_usex test '--enable-selftest' '')
|
|
||||||
$(usev system-mitkrb5 "--with-system-mitkrb5 ${ESYSROOT}/usr $(multilib_native_usex addc --with-experimental-mit-ad-dc '')")
|
|
||||||
$(use_with debug lttng)
|
|
||||||
$(use_with ldap)
|
|
||||||
$(use_with profiling-data)
|
|
||||||
--private-libraries='!ldb'
|
|
||||||
$(usex lmdb '' --without-ldb-lmdb)
|
|
||||||
# bug #683148
|
|
||||||
--jobs 1
|
|
||||||
)
|
|
||||||
|
|
||||||
if multilib_is_native_abi ; then
|
|
||||||
myconf+=( --with-shared-modules=${SHAREDMODS} )
|
|
||||||
else
|
|
||||||
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
|
|
||||||
fi
|
|
||||||
|
|
||||||
append-cppflags "-I${ESYSROOT}/usr/include/et"
|
|
||||||
|
|
||||||
waf-utils_src_configure ${myconf[@]}
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_compile() {
|
|
||||||
waf-utils_src_compile
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_test() {
|
|
||||||
if multilib_is_native_abi ; then
|
|
||||||
"${WAF_BINARY}" test || die "Test failed"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install() {
|
|
||||||
waf-utils_src_install
|
|
||||||
|
|
||||||
# Make all .so files executable
|
|
||||||
find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
|
|
||||||
# smbspool_krb5_wrapper must only be accessible to root, bug #880739
|
|
||||||
find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
|
|
||||||
|
|
||||||
# Remove empty runtime dirs created by build system (bug #892341)
|
|
||||||
find "${ED}"/{run,var} -type d -empty -delete || die
|
|
||||||
|
|
||||||
if multilib_is_native_abi ; then
|
|
||||||
# Install ldap schema for server (bug #491002)
|
|
||||||
if use ldap ; then
|
|
||||||
insinto /etc/openldap/schema
|
|
||||||
doins examples/LDAP/samba.schema
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create symlink for cups (bug #552310)
|
|
||||||
if use cups ; then
|
|
||||||
dosym ../../../bin/smbspool \
|
|
||||||
/usr/libexec/cups/backend/smb
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install example config file
|
|
||||||
insinto /etc/samba
|
|
||||||
doins examples/smb.conf.default
|
|
||||||
|
|
||||||
# Fix paths in example file (bug #603964)
|
|
||||||
sed \
|
|
||||||
-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
|
|
||||||
-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
|
|
||||||
-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
|
|
||||||
-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
|
|
||||||
-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
|
|
||||||
-i "${ED}"/etc/samba/smb.conf.default || die
|
|
||||||
|
|
||||||
# Install init script and conf.d file
|
|
||||||
newinitd "${CONFDIR}/samba4.initd-r1" samba
|
|
||||||
newconfd "${CONFDIR}/samba4.confd" samba
|
|
||||||
|
|
||||||
dotmpfiles "${FILESDIR}"/samba.conf
|
|
||||||
if ! use addc ; then
|
|
||||||
rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
|
|
||||||
|| die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Preserve functionality for old gentoo-specific unit names
|
|
||||||
dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
|
|
||||||
dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
|
|
||||||
dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
|
|
||||||
|
|
||||||
use python && python_optimize
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use pam && use winbind ; then
|
|
||||||
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
|
|
||||||
# bugs #376853 and #590374
|
|
||||||
insinto /etc/security
|
|
||||||
doins examples/pam_winbind/pam_winbind.conf
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
tmpfiles_process samba.conf
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
DIST skypeforlinux_8.96.0.408_amd64.deb 124565400 BLAKE2B 56f8e20c3f192322267afb308fb211bb1af13f144c19e4d42ea2df3ac6a4f1648f47738ca9f1f44ed13f8f20b796726ffc41d9a658431bbd12ecb92579ae3d04 SHA512 b7aa70435c6d0f2b821a8f33b5b33ef6204dafe1467f92024389498c013260ea86649928d93c10ad3a29ffe5b277f0c57b2732d4ed6efe93568b7053ecdfbf44
|
|
||||||
EBUILD skypeforlinux-8.96.0.408.ebuild 3213 BLAKE2B 4fc27cac27364a037d25a1baee0b60caef291968df48356766c463a729df7a68e3b1dd1ded650092fec2b4d898de4d78e2775ccd1fddb86644e3cd4610beaf3f SHA512 72ffd827f647e3e6749a24e8f8dbf6831afbd10353c2590d88f9ad8a03ba413d31024dfd2212a381709a8a8848ef1ae7e47219c1eb858c590891a1dce7e4ea11
|
|
||||||
MISC metadata.xml 461 BLAKE2B 9bcbfe1d6892c40ce917a76c600baad338b5b86967e5656f79b9bf29e75c3ba474dc11444d8e347769f37934610a971097f96b22ae171ea46cd3f1aef2e9f3e5 SHA512 81df3ef175eafabad357f3d5792c71534b85ffd2c1bd9280ea7ef9cbea17aceb396bc7ac65abdb09e5fba8c3d98384c0d67c58a8daa2d42a657e1a7b150b52e7
|
|
@ -1,9 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>soap@gentoo.org</email>
|
|
||||||
<name>David Seifert</name>
|
|
||||||
</maintainer>
|
|
||||||
<longdescription>Skype is for doing things together, whenever you're apart. Skype's text, voice and video make it simple to share experiences with the people that matter to you, wherever they are.</longdescription>
|
|
||||||
</pkgmetadata>
|
|
@ -1,100 +0,0 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
MULTILIB_COMPAT=( abi_x86_64 )
|
|
||||||
|
|
||||||
inherit chromium-2 desktop pax-utils unpacker multilib-build xdg
|
|
||||||
|
|
||||||
DESCRIPTION="Instant messaging client, with support for audio and video"
|
|
||||||
HOMEPAGE="https://www.skype.com/"
|
|
||||||
SRC_URI="https://repo.skype.com/deb/pool/main/s/skypeforlinux/${PN}_${PV}_amd64.deb"
|
|
||||||
S="${WORKDIR}"
|
|
||||||
|
|
||||||
LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* ~amd64"
|
|
||||||
|
|
||||||
QA_PREBUILT="*"
|
|
||||||
RESTRICT="mirror bindist strip" #299368
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
app-crypt/libsecret[${MULTILIB_USEDEP}]
|
|
||||||
app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
|
|
||||||
dev-libs/expat[${MULTILIB_USEDEP}]
|
|
||||||
dev-libs/glib:2[${MULTILIB_USEDEP}]
|
|
||||||
dev-libs/nspr[${MULTILIB_USEDEP}]
|
|
||||||
dev-libs/nss[${MULTILIB_USEDEP}]
|
|
||||||
media-libs/alsa-lib[${MULTILIB_USEDEP}]
|
|
||||||
media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
|
|
||||||
media-libs/freetype:2[${MULTILIB_USEDEP}]
|
|
||||||
media-libs/libv4l[${MULTILIB_USEDEP}]
|
|
||||||
net-print/cups[${MULTILIB_USEDEP}]
|
|
||||||
sys-apps/dbus[${MULTILIB_USEDEP}]
|
|
||||||
sys-devel/gcc[cxx]
|
|
||||||
sys-libs/glibc
|
|
||||||
virtual/ttf-fonts
|
|
||||||
x11-libs/cairo[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/gtk+:3[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libX11[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXcomposite[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXcursor[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXdamage[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXext[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXfixes[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXi[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXrandr[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXrender[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libXtst[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libxcb[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/libxkbfile[${MULTILIB_USEDEP}]
|
|
||||||
x11-libs/pango[${MULTILIB_USEDEP}]"
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
chromium_suid_sandbox_check_kernel_config
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
unpack_deb ${A}
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
|
|
||||||
-i usr/bin/skypeforlinux || die
|
|
||||||
sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
|
|
||||||
-e "/^OnlyShowIn=/d" \
|
|
||||||
-i usr/share/applications/skypeforlinux.desktop || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
dodir /opt
|
|
||||||
cp -a usr/share/skypeforlinux "${ED}"/opt || die
|
|
||||||
|
|
||||||
# remove chrome-sandbox binary, users should use kernel namespaces
|
|
||||||
# https://bugs.gentoo.org/692692#c18
|
|
||||||
rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
|
|
||||||
|
|
||||||
dobin usr/bin/skypeforlinux
|
|
||||||
|
|
||||||
dodoc usr/share/skypeforlinux/*.html
|
|
||||||
dodoc -r usr/share/doc/skypeforlinux/.
|
|
||||||
# symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
|
|
||||||
dosym ${PF} usr/share/doc/skypeforlinux
|
|
||||||
|
|
||||||
doicon usr/share/pixmaps/skypeforlinux.png
|
|
||||||
|
|
||||||
local res
|
|
||||||
for res in 16 32 256 512; do
|
|
||||||
newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
|
|
||||||
done
|
|
||||||
|
|
||||||
domenu usr/share/applications/skypeforlinux.desktop
|
|
||||||
|
|
||||||
pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
|
|
||||||
pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
|
|
||||||
}
|
|
@ -1,7 +0,0 @@
|
|||||||
DIST teams_1.3.00.16851_amd64.deb 70105596 BLAKE2B cbadd17aac8722248eb01a51ee709ea51aad4a88a5e1b4e13ba86608af41b409f556d010dfcb03deb63a672730d96b92cb835d533183525e7a7b87f273cac175 SHA512 be2f9f37e1eb283c6f2c57fede83482eb5f2bbe0f5107ab2fb9054135375de6fcf43cf128fe3b43a21353d0105f092e5b5755ff708c0874d40c7eb4153a3b3a4
|
|
||||||
DIST teams_1.3.00.30857_amd64.deb 76334658 BLAKE2B 486ee2945f46e7a7c7bfe1d2a6edf29f8cac5a7827c0a8bcf121d25ce95fde2caf31fed520c2f036e27b399c986ac1acc1531aaa1a9caf5a5d6848b10ac0d204 SHA512 5a8be75bfe752347bd36bf2abc2de74ad069cbf4a6430bfcad9ca7396d5b5bf8196a74798a0595908a33ebcb2fcdbedc403c7ff31eec76d07246a3d1c46eeab4
|
|
||||||
DIST teams_1.4.00.4855_amd64.deb 76579552 BLAKE2B 3b03451d5a333a0e3736fd48d21252498a0b08041104a97b33a6166263ee8a5d2149f138e5598356bb42aa0c8d7a0619c6b1cd954d2ac5793b063c9bdbb3b929 SHA512 5596db57e8019068e8dac94cc6da8df2b1b6c813e8b67b4a61717fb7775f28973b09b49d77d001ab2dfd65ffe99ef2aaeaba8bc722f1348a474677b3d7a84df8
|
|
||||||
EBUILD teams-1.3.00.16851.ebuild 2759 BLAKE2B 4632904d295c314769bf449be3d50f7b3aff7ec2a78d7e4cd97615bcc65771c3cf9c15900e501236b87ccdda0c78d0c7f13f6a3bb6266394d9d064e2104ebbca SHA512 68834a6dfbcd86d7a40b3832e4afd36b52546376c5b0b28d99d4da58c71452d0d1b0794510cb9aace7479a937934f767262b9886271c3f9ff944c87f47edc6e7
|
|
||||||
EBUILD teams-1.3.00.30857.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
|
|
||||||
EBUILD teams-1.4.00.4855.ebuild 3212 BLAKE2B 1f2ef2fe7193200b0ff0eabddc7ad0766b9dddb974c6fd48428a1f2dea3ace7cc0a13a32131e26b193ffd81a4a3e3d1ed67d0a5976745e2c459ac2ad4100dd24 SHA512 26a97d7d21c5834497917e9d4e70d39e690997c4dd647b6b0940c4a3eec40fef28a1ae5b7c6ec9d1a1644bf64a45312d57d5e6416083c2484db7d6a2a63d20cf
|
|
||||||
MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
|
|
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>dilfridge@gentoo.org</email>
|
|
||||||
<name>Andreas K. Huettel</name>
|
|
||||||
</maintainer>
|
|
||||||
</pkgmetadata>
|
|
@ -1,96 +0,0 @@
|
|||||||
# Copyright 1999-2020 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
inherit desktop unpacker xdg-utils
|
|
||||||
|
|
||||||
DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
|
|
||||||
HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
|
|
||||||
SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
|
|
||||||
|
|
||||||
LICENSE="ms-teams-pre"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* ~amd64"
|
|
||||||
RESTRICT="bindist mirror splitdebug test"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
QA_PREBUILT="*"
|
|
||||||
|
|
||||||
# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
|
|
||||||
# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
|
|
||||||
# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
|
|
||||||
# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
|
|
||||||
# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
|
|
||||||
RDEPEND="
|
|
||||||
app-accessibility/at-spi2-atk
|
|
||||||
app-crypt/libsecret
|
|
||||||
dev-libs/atk
|
|
||||||
dev-libs/expat
|
|
||||||
dev-libs/glib
|
|
||||||
dev-libs/nspr
|
|
||||||
dev-libs/nss
|
|
||||||
gnome-base/libgnome-keyring
|
|
||||||
media-libs/alsa-lib
|
|
||||||
media-libs/fontconfig
|
|
||||||
media-libs/mesa
|
|
||||||
media-video/ffmpeg[chromium]
|
|
||||||
net-print/cups
|
|
||||||
sys-apps/dbus
|
|
||||||
sys-apps/util-linux
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/gdk-pixbuf
|
|
||||||
x11-libs/gtk+:3
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXScrnSaver
|
|
||||||
x11-libs/libXcomposite
|
|
||||||
x11-libs/libXcursor
|
|
||||||
x11-libs/libXdamage
|
|
||||||
x11-libs/libXext
|
|
||||||
x11-libs/libXfixes
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXrender
|
|
||||||
x11-libs/libXtst
|
|
||||||
x11-libs/libxcb
|
|
||||||
x11-libs/libxkbfile
|
|
||||||
x11-libs/pango
|
|
||||||
"
|
|
||||||
|
|
||||||
S="${WORKDIR}"
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
rm _gpgorigin || die
|
|
||||||
doins -r .
|
|
||||||
|
|
||||||
fperms +x /usr/bin/teams
|
|
||||||
fperms +x /usr/share/teams/teams
|
|
||||||
|
|
||||||
# use system ffmpeg
|
|
||||||
rm -f "${D}"/usr/share/teams/libffmpeg.so || die
|
|
||||||
|
|
||||||
cat > 99teams <<-EOF
|
|
||||||
LDPATH=${EROOT}/usr/$(get_libdir)/chromium
|
|
||||||
EOF
|
|
||||||
doenvd 99teams
|
|
||||||
|
|
||||||
# use system mesa
|
|
||||||
rm -f "${D}"/usr/share/teams/libEGL.so || die
|
|
||||||
rm -f "${D}"/usr/share/teams/libGLESv2.so || die
|
|
||||||
rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
|
|
||||||
rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
|
|
||||||
|
|
||||||
sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
|
|
||||||
domenu usr/share/applications/teams.desktop
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
@ -1,101 +0,0 @@
|
|||||||
# Copyright 1999-2020 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
inherit desktop unpacker xdg-utils
|
|
||||||
|
|
||||||
DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
|
|
||||||
HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
|
|
||||||
SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
|
|
||||||
|
|
||||||
LICENSE="ms-teams-pre"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* ~amd64"
|
|
||||||
RESTRICT="bindist mirror splitdebug test"
|
|
||||||
IUSE="system-ffmpeg system-mesa"
|
|
||||||
|
|
||||||
QA_PREBUILT="*"
|
|
||||||
|
|
||||||
# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
|
|
||||||
# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
|
|
||||||
# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
|
|
||||||
# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
|
|
||||||
# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
|
|
||||||
RDEPEND="
|
|
||||||
app-accessibility/at-spi2-atk
|
|
||||||
app-crypt/libsecret
|
|
||||||
dev-libs/atk
|
|
||||||
dev-libs/expat
|
|
||||||
dev-libs/glib
|
|
||||||
dev-libs/nspr
|
|
||||||
dev-libs/nss
|
|
||||||
media-libs/alsa-lib
|
|
||||||
media-libs/fontconfig
|
|
||||||
net-print/cups
|
|
||||||
sys-apps/dbus
|
|
||||||
sys-apps/util-linux
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/gdk-pixbuf
|
|
||||||
x11-libs/gtk+:3
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXScrnSaver
|
|
||||||
x11-libs/libXcomposite
|
|
||||||
x11-libs/libXcursor
|
|
||||||
x11-libs/libXdamage
|
|
||||||
x11-libs/libXext
|
|
||||||
x11-libs/libXfixes
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXrender
|
|
||||||
x11-libs/libXtst
|
|
||||||
x11-libs/libxcb
|
|
||||||
x11-libs/libxkbfile
|
|
||||||
x11-libs/pango
|
|
||||||
system-mesa? ( media-libs/mesa )
|
|
||||||
system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
|
|
||||||
"
|
|
||||||
|
|
||||||
S="${WORKDIR}"
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
rm _gpgorigin || die
|
|
||||||
doins -r .
|
|
||||||
|
|
||||||
fperms +x /usr/bin/teams
|
|
||||||
fperms +x /usr/share/teams/teams
|
|
||||||
|
|
||||||
if use system-ffmpeg ; then
|
|
||||||
rm -f "${D}"/usr/share/teams/libffmpeg.so || die
|
|
||||||
|
|
||||||
cat > 99teams <<-EOF
|
|
||||||
LDPATH=${EROOT}/usr/$(get_libdir)/chromium
|
|
||||||
EOF
|
|
||||||
doenvd 99teams
|
|
||||||
elog "Using system ffmpeg. This is experimental and may lead to crashes."
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use system-mesa ; then
|
|
||||||
rm -f "${D}"/usr/share/teams/libEGL.so || die
|
|
||||||
rm -f "${D}"/usr/share/teams/libGLESv2.so || die
|
|
||||||
rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
|
|
||||||
rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
|
|
||||||
elog "Using system mesa. This is experimental and may lead to crashes."
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
|
|
||||||
|
|
||||||
sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
|
|
||||||
domenu usr/share/applications/teams.desktop
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
@ -1,110 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
inherit desktop unpacker xdg-utils chromium-2
|
|
||||||
|
|
||||||
DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
|
|
||||||
HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
|
|
||||||
SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
|
|
||||||
|
|
||||||
LICENSE="ms-teams-pre"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* ~amd64"
|
|
||||||
RESTRICT="bindist mirror splitdebug test"
|
|
||||||
IUSE="system-ffmpeg system-mesa"
|
|
||||||
|
|
||||||
QA_PREBUILT="*"
|
|
||||||
|
|
||||||
# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
|
|
||||||
# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
|
|
||||||
# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
|
|
||||||
# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
|
|
||||||
# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
|
|
||||||
RDEPEND="
|
|
||||||
app-accessibility/at-spi2-atk
|
|
||||||
app-crypt/libsecret
|
|
||||||
dev-libs/atk
|
|
||||||
dev-libs/expat
|
|
||||||
dev-libs/glib
|
|
||||||
dev-libs/nspr
|
|
||||||
dev-libs/nss
|
|
||||||
media-libs/alsa-lib
|
|
||||||
media-libs/fontconfig
|
|
||||||
net-print/cups
|
|
||||||
sys-apps/dbus
|
|
||||||
sys-apps/util-linux
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/gdk-pixbuf
|
|
||||||
x11-libs/gtk+:3
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXScrnSaver
|
|
||||||
x11-libs/libXcomposite
|
|
||||||
x11-libs/libXcursor
|
|
||||||
x11-libs/libXdamage
|
|
||||||
x11-libs/libXext
|
|
||||||
x11-libs/libXfixes
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXrender
|
|
||||||
x11-libs/libXtst
|
|
||||||
x11-libs/libxcb
|
|
||||||
x11-libs/libxkbfile
|
|
||||||
x11-libs/pango
|
|
||||||
system-mesa? ( media-libs/mesa )
|
|
||||||
system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
|
|
||||||
"
|
|
||||||
|
|
||||||
S="${WORKDIR}"
|
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
chromium_suid_sandbox_check_kernel_config
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
chromium_suid_sandbox_check_kernel_config
|
|
||||||
default
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
rm _gpgorigin || die
|
|
||||||
doins -r .
|
|
||||||
|
|
||||||
fperms +x /usr/bin/teams
|
|
||||||
fperms +x /usr/share/teams/teams
|
|
||||||
|
|
||||||
if use system-ffmpeg ; then
|
|
||||||
rm -f "${D}"/usr/share/teams/libffmpeg.so || die
|
|
||||||
|
|
||||||
cat > 99teams <<-EOF
|
|
||||||
LDPATH=${EROOT}/usr/$(get_libdir)/chromium
|
|
||||||
EOF
|
|
||||||
doenvd 99teams
|
|
||||||
elog "Using system ffmpeg. This is experimental and may lead to crashes."
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use system-mesa ; then
|
|
||||||
rm -f "${D}"/usr/share/teams/libEGL.so || die
|
|
||||||
rm -f "${D}"/usr/share/teams/libGLESv2.so || die
|
|
||||||
rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
|
|
||||||
rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
|
|
||||||
elog "Using system mesa. This is experimental and may lead to crashes."
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
|
|
||||||
|
|
||||||
sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
|
|
||||||
domenu usr/share/applications/teams.desktop
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
xdg_desktop_database_update
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
@ -1,4 +0,0 @@
|
|||||||
AUX 2.48.3-fix-ftbfs-riscv64.patch 1469 BLAKE2B c6e74307539730b31e3c67f8d80b54c5b8ae39fadfd6623d0bb964553510a3f6c0797183d89589ef0a29ab843adea341b3a00ced422f72352ca9aaa29dcda42b SHA512 2835d3b4093f1c0fe369494d401f75645df166eb60da97a983a2396407b71ef7485646d7e7f7c2d7cc2d15e7160e45fb62b6bcfcf0e08197c7c0ff93b52011f7
|
|
||||||
DIST webkitgtk-2.48.3.tar.xz 44171964 BLAKE2B d07afd02ca3159e2a8998167818614eb586754f6485ea5b998a10686df44a16c99c5890b6fc7ccb3c1aa4aef82f1626be39cd67a4e60dbbe9eda466fd17aa002 SHA512 0724e0d22403552409d0f621d9ed3a6404813ca63d445b9ac8f99682a544c95a3cf8108ac880cb3bcadc0ecd5a772db40e68f753c286700ffc7f2851bba12e84
|
|
||||||
EBUILD webkit-gtk-2.48.3-r410.ebuild 8262 BLAKE2B ab22d294384133d585fbee59c06519cdf4b9a7f348fb2cf92e7db5c6f275abdf1f3ade30d9e757600d9c3005476fa87009e2fd8503be181dd1387dc66ee00641 SHA512 f50e6c75551b143853d50e9975de6e5c1f78b30a3ab71a7dfcaf506ae713187711eee4359f670c9b0e20ae52b4d7aecff4835042b3db036a8c8be8df0bd5abae
|
|
||||||
MISC metadata.xml 790 BLAKE2B cc1db6c1cd6771cafe9b2690790b12a34a7ea49f3dd00c9439ad05a18099c96dd1c5a6575c884c55d09e34f6dc247ca05256a52facb35a54376e61640eececd0 SHA512 b9e123a69e0353a20661ce817ead87b61370d0a68ef175cdf1ced00afacf67204c67bb549aac2006326d8aab7d6e41a841b00d16fc4431626e7ad7782f6158db
|
|
@ -1,40 +0,0 @@
|
|||||||
From: Alberto Garcia <berto@igalia.com>
|
|
||||||
Description: Use WTF_CPU_UNKNOWN when building for riscv64
|
|
||||||
WebKitGTK doesn't build on riscv64 even with the JIT disabled.
|
|
||||||
Treating the CPU as unknown is perhaps a bit severe, but it allows us
|
|
||||||
to get the build done until someone steps up to maintain this
|
|
||||||
properly.
|
|
||||||
Bug: https://bugs.webkit.org/show_bug.cgi?id=271371
|
|
||||||
Forwarded: no
|
|
||||||
Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
|
|
||||||
===================================================================
|
|
||||||
--- webkitgtk.orig/Source/WTF/wtf/PlatformCPU.h
|
|
||||||
+++ webkitgtk/Source/WTF/wtf/PlatformCPU.h
|
|
||||||
@@ -285,14 +285,6 @@
|
|
||||||
|
|
||||||
#endif /* ARM */
|
|
||||||
|
|
||||||
-/* CPU(RISCV64) - RISC-V 64-bit */
|
|
||||||
-#if defined(__riscv) \
|
|
||||||
- && defined(__riscv_xlen) \
|
|
||||||
- && (__riscv_xlen == 64)
|
|
||||||
-#define WTF_CPU_RISCV64 1
|
|
||||||
-#define WTF_CPU_KNOWN 1
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#if !CPU(KNOWN)
|
|
||||||
#define WTF_CPU_UNKNOWN 1
|
|
||||||
#endif
|
|
||||||
Index: webkitgtk/Source/cmake/WebKitCommon.cmake
|
|
||||||
===================================================================
|
|
||||||
--- webkitgtk.orig/Source/cmake/WebKitCommon.cmake
|
|
||||||
+++ webkitgtk/Source/cmake/WebKitCommon.cmake
|
|
||||||
@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
|
|
||||||
set(WTF_CPU_PPC64 1)
|
|
||||||
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
|
|
||||||
set(WTF_CPU_PPC64LE 1)
|
|
||||||
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
|
|
||||||
- set(WTF_CPU_RISCV64 1)
|
|
||||||
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
|
|
||||||
set(WTF_CPU_LOONGARCH64 1)
|
|
||||||
else ()
|
|
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>gnome@gentoo.org</email>
|
|
||||||
<name>Gentoo GNOME Desktop</name>
|
|
||||||
</maintainer>
|
|
||||||
<use>
|
|
||||||
<flag name="examples">Install the MiniBrowser example application</flag>
|
|
||||||
<flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
|
|
||||||
<flag name="jumbo-build">Combine source files to speed up build process</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<bugs-to>https://bugs.webkit.org</bugs-to>
|
|
||||||
<changelog>https://www.webkitgtk.org/news.html</changelog>
|
|
||||||
<doc>https://webkitgtk.org/reference/webkitgtk/stable/</doc>
|
|
||||||
<remote-id type="github">WebKit/WebKit</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
@ -1,263 +0,0 @@
|
|||||||
# Copyright 1999-2025 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
PYTHON_REQ_USE="xml(+)"
|
|
||||||
PYTHON_COMPAT=( python3_{10..13} )
|
|
||||||
USE_RUBY="ruby31 ruby32 ruby33 ruby34"
|
|
||||||
|
|
||||||
inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
|
|
||||||
|
|
||||||
MY_P="webkitgtk-${PV}"
|
|
||||||
DESCRIPTION="Open source web browser engine"
|
|
||||||
HOMEPAGE="https://www.webkitgtk.org"
|
|
||||||
SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
|
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2+ BSD"
|
|
||||||
SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
|
|
||||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
|
||||||
|
|
||||||
IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
|
|
||||||
REQUIRED_USE="|| ( aqua wayland X )"
|
|
||||||
|
|
||||||
# Tests do not run when built from tarballs
|
|
||||||
# https://bugs.webkit.org/show_bug.cgi?id=215986
|
|
||||||
RESTRICT="test"
|
|
||||||
|
|
||||||
# Dependencies can be found in Source/cmake/OptionsGTK.cmake.
|
|
||||||
#
|
|
||||||
# * Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream.
|
|
||||||
#
|
|
||||||
# * media-libs/mesa dep is for libgbm
|
|
||||||
#
|
|
||||||
# * >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
|
|
||||||
#
|
|
||||||
# * TODO: gst-plugins-base[X] is only needed when build configuration ends up
|
|
||||||
# with GLX set, but that's a bit automagic too to fix
|
|
||||||
#
|
|
||||||
# * Cairo is only needed on big-endian systems, where Skia is not officially
|
|
||||||
# supported (the build system will choose a backend for you). We could probably
|
|
||||||
# hard-code a list of BE arches here, to avoid the extra dependency? But I am
|
|
||||||
# holding out hope that this might actually get fixed before we need to do that.
|
|
||||||
#
|
|
||||||
# * dev-util/sysprof-capture is disabled because it was a new dependency in 2.46
|
|
||||||
# and we don't need any more new problems.
|
|
||||||
#
|
|
||||||
RDEPEND="
|
|
||||||
app-accessibility/at-spi2-core:2
|
|
||||||
dev-db/sqlite:3
|
|
||||||
dev-libs/glib:2
|
|
||||||
dev-libs/hyphen
|
|
||||||
dev-libs/icu:=
|
|
||||||
dev-libs/libgcrypt:0=
|
|
||||||
dev-libs/libtasn1:=
|
|
||||||
dev-libs/libxml2:2
|
|
||||||
dev-libs/libxslt
|
|
||||||
media-libs/fontconfig:1.0
|
|
||||||
media-libs/freetype:2
|
|
||||||
media-libs/harfbuzz:=[icu(+)]
|
|
||||||
media-libs/libjpeg-turbo:0=
|
|
||||||
media-libs/libepoxy[egl(+)]
|
|
||||||
media-libs/libglvnd
|
|
||||||
media-libs/libpng:0=
|
|
||||||
media-libs/libwebp:=
|
|
||||||
media-libs/mesa
|
|
||||||
media-libs/woff2
|
|
||||||
net-libs/libsoup:3.0[introspection?]
|
|
||||||
sys-libs/zlib:0
|
|
||||||
x11-libs/cairo[X?]
|
|
||||||
x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]
|
|
||||||
x11-libs/libdrm
|
|
||||||
avif? ( media-libs/libavif:= )
|
|
||||||
gamepad? ( dev-libs/libmanette )
|
|
||||||
gstreamer? (
|
|
||||||
media-libs/gstreamer:1.0
|
|
||||||
media-libs/gst-plugins-base:1.0[egl,opengl,X?]
|
|
||||||
media-plugins/gst-plugins-opus:1.0
|
|
||||||
media-libs/gst-plugins-bad:1.0
|
|
||||||
)
|
|
||||||
introspection? ( dev-libs/gobject-introspection:= )
|
|
||||||
jpegxl? ( media-libs/libjxl:= )
|
|
||||||
keyring? ( app-crypt/libsecret )
|
|
||||||
lcms? ( media-libs/lcms:2 )
|
|
||||||
seccomp? (
|
|
||||||
sys-apps/bubblewrap
|
|
||||||
sys-libs/libseccomp
|
|
||||||
sys-apps/xdg-dbus-proxy
|
|
||||||
)
|
|
||||||
spell? ( app-text/enchant:2 )
|
|
||||||
systemd? ( sys-apps/systemd:= )
|
|
||||||
X? ( x11-libs/libX11 )
|
|
||||||
wayland? (
|
|
||||||
dev-libs/wayland
|
|
||||||
dev-libs/wayland-protocols
|
|
||||||
)
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
# Need real bison, not yacc
|
|
||||||
BDEPEND="
|
|
||||||
${PYTHON_DEPS}
|
|
||||||
${RUBY_DEPS}
|
|
||||||
app-accessibility/at-spi2-core
|
|
||||||
dev-lang/perl
|
|
||||||
dev-util/gdbus-codegen
|
|
||||||
dev-util/glib-utils
|
|
||||||
dev-util/gperf
|
|
||||||
dev-util/unifdef
|
|
||||||
sys-devel/bison
|
|
||||||
sys-devel/gettext
|
|
||||||
virtual/perl-Data-Dumper
|
|
||||||
virtual/perl-Carp
|
|
||||||
virtual/perl-JSON-PP
|
|
||||||
virtual/pkgconfig
|
|
||||||
wayland? ( dev-util/wayland-scanner )
|
|
||||||
"
|
|
||||||
|
|
||||||
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
|
|
||||||
|
|
||||||
# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
|
|
||||||
# gnome2_src_prepare, and both apply ${PATCHES[@]}
|
|
||||||
PATCHES=()
|
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
if [[ ${MERGE_TYPE} != "binary" ]] ; then
|
|
||||||
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
|
|
||||||
einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
|
|
||||||
check-reqs_pkg_pretend
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! test-flag-CXX -std=c++17 ; then
|
|
||||||
die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
|
|
||||||
check-reqs_pkg_setup
|
|
||||||
fi
|
|
||||||
|
|
||||||
python-any-r1_pkg_setup
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
cmake_src_prepare
|
|
||||||
gnome2_src_prepare
|
|
||||||
|
|
||||||
# https://bugs.gentoo.org/938162, see also mycmakeargs
|
|
||||||
eapply "${FILESDIR}"/2.48.3-fix-ftbfs-riscv64.patch
|
|
||||||
|
|
||||||
# We don't want -Werror for gobject-introspection (bug #947761)
|
|
||||||
sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# Respect CC, otherwise fails on prefix #395875
|
|
||||||
tc-export CC
|
|
||||||
|
|
||||||
# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
|
|
||||||
filter-lto
|
|
||||||
|
|
||||||
# It does not compile on alpha without this in LDFLAGS
|
|
||||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
|
|
||||||
use alpha && append-ldflags "-Wl,--no-relax"
|
|
||||||
|
|
||||||
# Sigbuses on SPARC with mcpu and co., bug #???
|
|
||||||
use sparc && filter-flags "-mvis"
|
|
||||||
|
|
||||||
# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
|
|
||||||
use ppc64 && append-flags "-mminimal-toc"
|
|
||||||
|
|
||||||
# Try to use less memory, bug #469942 (see Fedora .spec for reference)
|
|
||||||
append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
|
|
||||||
|
|
||||||
# Ruby situation is a bit complicated. See bug 513888
|
|
||||||
local rubyimpl
|
|
||||||
local ruby_interpreter=""
|
|
||||||
local RUBY
|
|
||||||
for rubyimpl in ${USE_RUBY}; do
|
|
||||||
if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
|
|
||||||
RUBY="$(type -P ${rubyimpl})"
|
|
||||||
ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
# This will rarely occur. Only a couple of corner cases could lead us to
|
|
||||||
# that failure. See bug 513888
|
|
||||||
[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
|
|
||||||
# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
|
|
||||||
# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
|
|
||||||
sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
|
|
||||||
|
|
||||||
# TODO: Check Web Audio support
|
|
||||||
# should somehow let user select between them?
|
|
||||||
local mycmakeargs=(
|
|
||||||
-DPython_EXECUTABLE="${PYTHON}"
|
|
||||||
${ruby_interpreter}
|
|
||||||
# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
|
|
||||||
-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
|
|
||||||
-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
|
|
||||||
-DPORT=GTK
|
|
||||||
# Source/cmake/WebKitFeatures.cmake
|
|
||||||
-DENABLE_API_TESTS=OFF
|
|
||||||
-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
|
|
||||||
-DENABLE_DRAG_SUPPORT=ON # This should be ON or it breaks stuff like Evolution: https://bugs.gentoo.org/958952
|
|
||||||
-DENABLE_GAMEPAD=$(usex gamepad)
|
|
||||||
-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
|
|
||||||
-DENABLE_MINIBROWSER=$(usex examples)
|
|
||||||
-DENABLE_PDFJS=$(usex pdf)
|
|
||||||
-DENABLE_SPEECH_SYNTHESIS=OFF
|
|
||||||
-DENABLE_SPELLCHECK=$(usex spell)
|
|
||||||
-DENABLE_TOUCH_EVENTS=OFF
|
|
||||||
-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
|
|
||||||
-DENABLE_VIDEO=$(usex gstreamer)
|
|
||||||
-DENABLE_WEB_AUDIO=$(usex gstreamer)
|
|
||||||
-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
|
|
||||||
-DENABLE_WEBDRIVER=OFF
|
|
||||||
-DENABLE_WEBGL=ON
|
|
||||||
-DUSE_AVIF=$(usex avif)
|
|
||||||
-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
|
|
||||||
-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
|
|
||||||
# Source/cmake/OptionsGTK.cmake
|
|
||||||
-DENABLE_DOCUMENTATION=OFF
|
|
||||||
-DENABLE_INTROSPECTION=$(usex introspection)
|
|
||||||
-DENABLE_JOURNALD_LOG=$(usex systemd)
|
|
||||||
-DENABLE_QUARTZ_TARGET=$(usex aqua)
|
|
||||||
-DENABLE_WAYLAND_TARGET=$(usex wayland)
|
|
||||||
-DENABLE_X11_TARGET=$(usex X)
|
|
||||||
-DUSE_GBM=ON
|
|
||||||
-DUSE_GTK4=OFF
|
|
||||||
-DUSE_JPEGXL=$(usex jpegxl)
|
|
||||||
-DUSE_LCMS=$(usex lcms)
|
|
||||||
-DUSE_LIBBACKTRACE=OFF
|
|
||||||
-DUSE_LIBDRM=ON
|
|
||||||
-DUSE_LIBHYPHEN=ON
|
|
||||||
-DUSE_LIBSECRET=$(usex keyring)
|
|
||||||
-DUSE_SOUP2=OFF
|
|
||||||
-DUSE_SYSPROF_CAPTURE=OFF
|
|
||||||
-DUSE_WOFF2=ON
|
|
||||||
)
|
|
||||||
|
|
||||||
# Temporary workaround for bug 938162 (upstream bug 271371)
|
|
||||||
# in concert with our Debian patch. The idea to enable C_LOOP
|
|
||||||
# is also stolen from Debian's build.
|
|
||||||
use riscv && mycmakeargs+=(
|
|
||||||
-DENABLE_WEBASSEMBLY=OFF
|
|
||||||
-DENABLE_JIT=OFF
|
|
||||||
-DENABLE_C_LOOP=ON
|
|
||||||
)
|
|
||||||
|
|
||||||
# https://bugs.gentoo.org/761238
|
|
||||||
append-cppflags -DNDEBUG
|
|
||||||
|
|
||||||
WK_USE_CCACHE=NO cmake_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
|
|
||||||
optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
|
|
||||||
optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
|
|
||||||
optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
|
|
||||||
optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
AUX 4.0.12-use-pkgconfig.patch 1010 BLAKE2B d37cb4ad77e191229c0ca7ae64b8f51b7ce275ea7f7434b0fdf629c0773f2b4f742e05a6afb06a627d4f7bb609e053f00e994bbea8b157d959a5852e8dcf135e SHA512 d0ea9514dbc7354d2d771af049de04455ccdf9145823174b99f963c82d1a4453f3198e31abc6a4953883f860df86b55452a2bfc0dd269112c029df6eddd3e1e6
|
|
||||||
AUX 4.0.7-perl-module.patch 323 BLAKE2B c291580e579f27efe5d1bbf26ff1a5ad7345cae33a8e1499437f096691c53f6d43be3c4c55491bdcc7c852d9538064a1d9df575012f4d83c451a6c7920d466a3 SHA512 913cf4dca46b028581d7e5cf11ef8a4d03b3a0ad415059eea4db5825a67c18e2e62adff26c7a7d67b6af78109c176553849a28b57d06c383ff59c8b0c12a514a
|
|
||||||
AUX 4.0.7-respect-ldflag.patch 596 BLAKE2B b540f6b0a03a8abe28e245069ce1703e8505862c326ae8fa95c9b548c8eb908b90b6c7681d928b0e74a9963daec0a8fba6f7e37efaadfd79d46aa8961da615d7 SHA512 afb080f281c1c5a6b0011964a7c73e9f843fa347543324b4441c40aabe7b534a5689ae4be285095e43b91f5cf37f4cbd1d8f091740fc3c1824eb0099aabc9ca8
|
|
||||||
DIST foomatic-db-engine-4.0.12.tar.gz 360499 BLAKE2B b03ba0a0cddc2d1c59a64ffa33e577f991d36c478e3f7b43f66474c749b7fb546f0ad5b04fee056c69532a6f126b87c95a72e5561443ef79bf3bdfed650d6b07 SHA512 b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
|
|
||||||
EBUILD foomatic-db-engine-4.0.12-r1.ebuild 1269 BLAKE2B 7b30bab883b60de599f8771feb115a2db9a22490be5f6a2b4269c64118e1bf70f325eb9b3a534a5e61cb0466b56347d3856ecda4fd61888087f9192bcc515fba SHA512 8c574ac205e38acb9e79ad59e26aaccdc5d559f5a10c3ad87ab02a9201ce312077df86fb46dddbd87b27467ee95d41f66a02d3698c40c20ee6b5931ee417ec21
|
|
||||||
MISC metadata.xml 260 BLAKE2B ef27f93753b1b9b96d35941f8a39c7e3b1695a49bff8076cb92b718524ddf1449ffa97d26ae289ad493695a8bfbeadb6bee0030f649bef02e0ae155ca851713e SHA512 94c019f5d5e8bec9d817d4b192ae0b87effc9f73283800b6ee7b5fe50a85bf6e245eb9720c2d8f3b497b40c7e298969c5e23c5afe3af14384eee92e76afacc8c
|
|
@ -1,35 +0,0 @@
|
|||||||
https://bugs.linuxfoundation.org/show_bug.cgi?id=1339
|
|
||||||
|
|
||||||
From: Brian Norris <computersforpeace@gmail.com>
|
|
||||||
Date: Fri, 15 Jan 2016 11:12:03 -0800
|
|
||||||
Subject: [PATCH] configure.ac: use pkg-config instead of xml2-config
|
|
||||||
|
|
||||||
The former is much more standard, and libxml2 ships a .pc file.
|
|
||||||
|
|
||||||
Leave libxml alone, since I haven't tested it, and it may not ship a .pc
|
|
||||||
file.
|
|
||||||
---
|
|
||||||
configure.ac | 8 +-------
|
|
||||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 1562ee61b9d5..0ed5323ff2e7 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -22,12 +22,7 @@ dnl LIBS="$LIBS"
|
|
||||||
# Test for libxml
|
|
||||||
#
|
|
||||||
xml_version=
|
|
||||||
-AC_PATH_PROG(XML2_CONFIG, xml2-config)
|
|
||||||
-if test ! -z "$XML2_CONFIG"; then
|
|
||||||
- xml_version=libxml2
|
|
||||||
- XML_CFLAGS=`$XML2_CONFIG --cflags`
|
|
||||||
- XML_LIBS=`$XML2_CONFIG --libs`
|
|
||||||
-fi
|
|
||||||
+PKG_CHECK_MODULES(XML, libxml-2.0, [xml_version=libxml2])
|
|
||||||
if test -z "$xml_version"; then
|
|
||||||
AC_PATH_PROG(XML_CONFIG, xml-config)
|
|
||||||
if test ! -z "$XML_CONFIG"; then
|
|
||||||
--
|
|
||||||
2.1.2
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
|||||||
--- a/Makefile.in
|
|
||||||
+++ b/Makefile.in
|
|
||||||
@@ -42,7 +42,7 @@ LOCAL_LIBDIR=@LOCAL_LIBDIR@
|
|
||||||
FOOMATIC_RIP=@FOOMATIC_RIP@
|
|
||||||
|
|
||||||
# foomatic-rip path for a "make inplace" installation
|
|
||||||
-LOCAL_FOOMATIC_RIP=@LOCAL_FOOMATIC_RIP@
|
|
||||||
+LOCAL_FOOMATIC_RIP=@FOOMATIC_RIP@
|
|
||||||
|
|
||||||
# Locations for installing the components of this package
|
|
||||||
BINDIR=$(bindir)
|
|
@ -1,15 +0,0 @@
|
|||||||
--- a/Makefile.in
|
|
||||||
+++ b/Makefile.in
|
|
||||||
@@ -231,10 +231,10 @@
|
|
||||||
( cd lib && $(PERL) Makefile.PL verbose INSTALLDIRS=$(PERL_INSTALLDIRS) )
|
|
||||||
|
|
||||||
foomatic-combo-xml: foomatic-combo-xml.c
|
|
||||||
- $(CC) $(CFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
|
|
||||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
|
|
||||||
|
|
||||||
foomatic-perl-data: foomatic-perl-data.c
|
|
||||||
- $(CC) $(CFLAGS) $(XML_CFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_LIBS)
|
|
||||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_CFLAGS) $(XML_LIBS)
|
|
||||||
|
|
||||||
man: lib/Foomatic/Defaults.pm
|
|
||||||
chmod a+rx ./makeMan
|
|
@ -1,67 +0,0 @@
|
|||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
inherit autotools perl-module
|
|
||||||
|
|
||||||
DESCRIPTION="Generates ppds out of xml foomatic printer description files"
|
|
||||||
HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
|
|
||||||
SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
|
|
||||||
|
|
||||||
BDEPEND="
|
|
||||||
net-print/cups
|
|
||||||
virtual/pkgconfig"
|
|
||||||
RDEPEND="
|
|
||||||
dev-libs/libxml2
|
|
||||||
>=net-print/cups-filters-1.0.43-r1[foomatic]
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
PDEPEND="net-print/foomatic-db"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
eapply \
|
|
||||||
"${FILESDIR}"/4.0.7-perl-module.patch \
|
|
||||||
"${FILESDIR}"/4.0.7-respect-ldflag.patch \
|
|
||||||
"${FILESDIR}"/4.0.12-use-pkgconfig.patch
|
|
||||||
sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" Makefile.in || die
|
|
||||||
eautoreconf
|
|
||||||
|
|
||||||
cd lib || die
|
|
||||||
perl-module_src_prepare
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
default
|
|
||||||
|
|
||||||
cd lib || die
|
|
||||||
perl-module_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake defaults
|
|
||||||
default
|
|
||||||
|
|
||||||
cd lib || die
|
|
||||||
perl-module_src_compile
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
cd lib || die
|
|
||||||
perl-module_src_test
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
dodoc USAGE
|
|
||||||
|
|
||||||
cd lib || die
|
|
||||||
perl-module_src_install
|
|
||||||
pushd "${S}/lib/Foomatic/"
|
|
||||||
perl_domodule -C Foomatic Defaults.pm
|
|
||||||
}
|
|
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>printing@gentoo.org</email>
|
|
||||||
<name>Gentoo Printing Project</name>
|
|
||||||
</maintainer>
|
|
||||||
</pkgmetadata>
|
|
@ -1,4 +0,0 @@
|
|||||||
AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad
|
|
||||||
DIST CGAL-5.3.1-doc_html.tar.xz 49574000 BLAKE2B 66b098b5fc190468ca9be2892ed57695a3c62b02e2168c7791bcaefa3b51a61f260109658d0ba374f2d253b07cbdb015876b1b1c23df4753cebcee027d0cc663 SHA512 792b8d7652b3dc33f922812b28a4a5ce55647f3a7661fc62ef0420f80e1f82971235ef69b74996eac260ec12d6e893acc40b06c27ecce7ad7c63a46f8e52799a
|
|
||||||
DIST CGAL-5.3.1.tar.xz 23295932 BLAKE2B f97dec0e634e3284779db9229612049a4934a643d8194fa510f167460d64bb2dfa7c8cc09d5193a96550de64c81e04f7649886687df331f252b30140c0251692 SHA512 f51f0ce574fb654ee1358f0d864365c795965eb2e2961dd1216483e53f0fad5eca414437ec38ee4ca144b92da363cbd0138a79f3f023d2308640d1708fe4d7d6
|
|
||||||
EBUILD cgal-5.3.1.ebuild 1696 BLAKE2B bc92a6f33cb9fdfa12adadf9205ef6861a3ad9bbd71e5e1b392aefe10a93c8857320df5e31d756eb99aeb8996d4769f16fda1bd29dc53df665cf6837fa5fded1 SHA512 d1023cc35bdff8ad375de67d844de5052c23ab581089ee1929b1483ab237b7d58d59717a6c2cc84cdf2f3ab0e5c0d5052af21462c749abaab7d115f077374c6c
|
|
@ -1,77 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
inherit cmake
|
|
||||||
|
|
||||||
MY_P=CGAL-${PV}
|
|
||||||
DESCRIPTION="C++ library for geometric algorithms and data structures"
|
|
||||||
HOMEPAGE="https://www.cgal.org/"
|
|
||||||
SRC_URI="
|
|
||||||
https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}.tar.xz
|
|
||||||
doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )"
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
LICENSE="LGPL-3 GPL-3 Boost-1.0"
|
|
||||||
SLOT="0/14"
|
|
||||||
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
|
|
||||||
IUSE="doc examples +gmp mpfi ntl qt5 shared"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-cpp/eigen
|
|
||||||
dev-libs/boost:=[threads(+)]
|
|
||||||
dev-libs/mpfr:=
|
|
||||||
sys-libs/zlib
|
|
||||||
x11-libs/libX11:=
|
|
||||||
virtual/glu:=
|
|
||||||
virtual/opengl:=
|
|
||||||
gmp? ( dev-libs/gmp:=[cxx] )
|
|
||||||
mpfi? ( sci-libs/mpfi )
|
|
||||||
ntl? ( dev-libs/ntl )
|
|
||||||
qt5? (
|
|
||||||
dev-qt/qtcore:5
|
|
||||||
dev-qt/qtgui:5
|
|
||||||
dev-qt/qtopengl:5
|
|
||||||
dev-qt/qtsvg:5
|
|
||||||
dev-qt/qtwidgets:5
|
|
||||||
)
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
BDEPEND="
|
|
||||||
app-arch/xz-utils
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch )
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
cmake_src_prepare
|
|
||||||
# modules provided by dev-cpp/eigen
|
|
||||||
rm cmake/modules/FindEigen3.cmake || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local mycmakeargs=(
|
|
||||||
-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
|
|
||||||
-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
|
|
||||||
-DCGAL_HEADER_ONLY=$(usex shared OFF ON)
|
|
||||||
-DWITH_LEDA=OFF
|
|
||||||
-DWITH_Eigen3=ON
|
|
||||||
-DWITH_ZLIB=ON
|
|
||||||
-DWITH_GMP=$(usex gmp)
|
|
||||||
-DWITH_GMPXX=$(usex gmp)
|
|
||||||
-DWITH_MPFI=$(usex mpfi)
|
|
||||||
-DWITH_NTL=$(usex ntl)
|
|
||||||
-DWITH_CGAL_Qt5=$(usex qt5)
|
|
||||||
)
|
|
||||||
cmake_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
|
|
||||||
cmake_src_install
|
|
||||||
if use examples; then
|
|
||||||
dodoc -r examples demo
|
|
||||||
fi
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
diff -urEbwB CGAL-4.11.1/cmake/modules/CGAL_SetupFlags.cmake CGAL-4.11.1.new/cmake/modules/CGAL_SetupFlags.cmake
|
|
||||||
--- CGAL-4.11.1/cmake/modules/CGAL_SetupFlags.cmake 2018-02-24 21:00:36.000000000 +0100
|
|
||||||
+++ CGAL-4.11.1.new/cmake/modules/CGAL_SetupFlags.cmake 2018-03-05 12:13:47.233411449 +0100
|
|
||||||
@@ -61,11 +61,6 @@
|
|
||||||
add_definitions(-DCGAL_TEST_SUITE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-if ( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug"
|
|
||||||
- AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel" )
|
|
||||||
- message( FATAL_ERROR "${CMAKE_BUILD_TYPE} is not a valid build type: only Release, Debug, RelWithDebInfo or MinSizeRel is allowed" )
|
|
||||||
-endif()
|
|
||||||
-
|
|
||||||
message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" )
|
|
||||||
|
|
||||||
string( TOUPPER "${CMAKE_BUILD_TYPE}" CGAL_BUILD_TYPE_UPPER )
|
|
@ -1,66 +0,0 @@
|
|||||||
AUX chromium-109-system-openh264.patch 577 BLAKE2B ec83d9a72a163683d791893e6b72fd5a6ffaa18d611bc6e6785819292370cc9f4fd37d8d3a33ecb5621beb33a3271df00d7a1b629300fdfa8db6e4e4eb196f1e SHA512 5ea73c8522619d83047fcd429988b24687e928e01c2915ef4145469fbb1238ef4a72beca73493794e2275b855f95412355700579a31649d64d74133ed815f1cb
|
|
||||||
AUX chromium-109-system-zlib.patch 440 BLAKE2B 95bb1099055e3e0e122d4d8a77cddec0a3417b3d87ef252d7a475f6be23b16f587ec627c90bac41d743bd9dc07488edccb0946ed465f2244b61adc44cd19761d SHA512 b4e386613eb2a0dd61af40bb29621356085e183b97d830661e5157e4f22c2ada5606d80e56d5a65fb2985cdffb505a878c32bdafb081b1fa24cbe976c7b60b86
|
|
||||||
AUX chromium-111-InkDropHost-crash.patch 1066 BLAKE2B ee0b42803a59ef4731e4f316849c2062870b92040ff4e339c3f3f2562999b54fa3176b27e432f31ada76559087631fd623d9f57f1961a42acd0684041c322a01 SHA512 dfa3ab6a84b57b6e66053be2597f0d6c7f4caf54b0e45a359774a56dfbe1e65bdea91120134e77b1e7c38c336a4fd8d05a7c26e9d3bf4bdc0fe40ad7cd832a54
|
|
||||||
AUX chromium-118-ffmpeg.patch 1684 BLAKE2B 01fc5b3f3a4c6b68aa03327e49847462567ceed09ce42db93106f13558bc358116a85cc22812ab1b060e5d5b8e9913ffb74485e76af533382eeaa90a4e71a0e5 SHA512 cab524c7030e8d01921450eb9c00eaa678fd06073b60fc29a973bc7fa19a878666ad812b1e99863cc947fe1037cfce7216333eae52943e90f53f1277fc6642c5
|
|
||||||
AUX chromium-123-qrcode.patch 2100 BLAKE2B d42df3fd72d1930aceef3f9e3633167573f7d0cde7907b27cdc3d7a100e37f822a557baf2d9f9687cc11e1a4160e09535226437bf2d724df039a58f796408ade SHA512 339499323bc55a755618035f1f2b56472127c8b467031400d63569e5f9300782d3a5e655cb7a191e9759e90d3d27475f22fde6f5f63ab348af7a9f2829e7b715
|
|
||||||
AUX chromium-125-cloud_authenticator.patch 627 BLAKE2B 0517aba87901e0c318fee6a0ac7e4317eb4ea18807841bc89b761b1da8938cb4266ea5e6ea7aee629ae16ab622ff966cbe2a3f6dcd7871ff516fc1477db26226 SHA512 e6afae2766bcbffa5f259a0bd8fb3b1b6078b9f61102023229bb7b2d619a9b3911beabd39b1c88b04e3ec8c80a98843733881ed53039b6d98f764bbb4ec9d124
|
|
||||||
AUX chromium-126-oauth2-client-switches.patch 2214 BLAKE2B 0dfc0dcd585bcd12793033292b1e10f448b84a65ee9354803237aca225a5de8b40a56f78cc806353d5240d41bed2efe82bc1b39ebea8ae4db2f79855f6ce1eaf SHA512 77e4e5609b9191160c73681020defd2d3e6fc3874837611e1febef538d3997fccea267ed87f6bbff6bd140f98d8e909d935ce3e3e0d53bf597882bb2282ab72c
|
|
||||||
AUX chromium-127-cargo_crate.patch 299 BLAKE2B b9998c8681738ffa9b846c581df8084ae627163070498576b762da7aa6654b3e40a4c341280763cc7ab7c40f86190187aa18bf1f3246e0012cb1af42690283f5 SHA512 73b8708077ba106f1c44f29a52bc403e54df424587ca7ff1c662f24ae32b83bc90608a43dbb9beca4ccd1aea8200791e9f9f42287415d6e6f8c795ef0adeaa7c
|
|
||||||
AUX chromium-127-crabby.patch 1894 BLAKE2B 9132792722b911867079caa808d923a9168f784f5e1c1ccb66efd0a8c15c4f0d388716469e78b9780b90083ff41895ae00e34b8c5b1ab2c1464d7732e2108ac4 SHA512 bae8e58c55b45d45cac192995109fd3554989e54676fd175cecb895f000336bdca51f80affe9d87f3951a587cb719485d44100e48131e07fb4e70563c29b0321
|
|
||||||
AUX chromium-128-gtk-fix-prefers-color-scheme-query.patch 1986 BLAKE2B 8a7f4a99672e834b1b673476ca7428939f710adeebb0507ab65783d419e1d213be08cc17f188ccc7923a2b07da3a2791f2f122e11c5735726f6a72d7d6938b39 SHA512 d89ea59ddd1e0525994def0f6d1b8e5dec79c9e3fd920323231c2ebd946e74f8241f48efcb307c41339e01f4faa065e224e25ffc7780d1869203d6e58fc7ebc9
|
|
||||||
AUX chromium-130-fix-building-without-tflite-lib.patch 2535 BLAKE2B 2495b705966180cf034504559e440a9157b99df654e98572ba68c6c5a856ecfb914e08e53bea8134531d28584ffe19609b3c9db254fb4bbec80c03d9e545d531 SHA512 73913c527083d682638c28dbec5477a1847e393d638b985e9e3962b5fbb2b0e6c72078851a7b32d6b8433a5ac685dc6ab431b48e092a2558d426d3a5c751e308
|
|
||||||
AUX chromium-130-fix-includes.patch 3375 BLAKE2B df286cb1069414a5ba0207bd2815f42f0947d0f547c19308ce0f44ba8c5705931cac4d115ee33df66bad15ad97c87eb2743abfa749c8cd6c43b63dd6a3d271f9 SHA512 4951147efd4fbbe936e2184b2f92b69cb19e95d6c96b73e4df0bbbcdcbe7c1e0abcc86b318abdba034c23df9c58978ff257a2ae420bdd486846b79bbafe07e4f
|
|
||||||
AUX chromium-130-fontations.patch 3040 BLAKE2B e0379c940bb8fdfa28fd1973c11d5bb7d1fda56e4a76169bc7c4a2b1cdb83792b3de142f8f4d594f462dec1735fe4afddb32b962a6319a6aeacd36c5737e4e47 SHA512 aee5c88e97b2afe3ef4218bab859702a12e0f503df797bc03f594df47664105c758d8b1c869574ee25f32cc94e2de3c84dae0d89cb614011e94d54c3da53ce69
|
|
||||||
AUX chromium-130-libstdc++.patch 4618 BLAKE2B 175d64d4367b68d6ecd9d7d4f9c796a1c026066cbc61cdecdf1570ba069ebb9cf81b3be3f3cc4c62594a0bca89bce5b9f89b0903193d6eab8e86d80c166fa79f SHA512 85d08144423e9545a9bdc98eeb70bc8cbae23fe78a771b13abeb2dd7d324b197731bf64162b8b4bed0d88a055d9edcb9905a929c8a6f6ac0cf79c4a2ea296269
|
|
||||||
AUX chromium-131-compiler.patch 9766 BLAKE2B 70c472390bbb99ffb0a5c1b5b23c0deac4624c43b18bed06d15e9ea467b22f365aafd785c8abc4102d81cabb8ed56e6385da3e438ceea708c86094ef10baafa8 SHA512 336e4e90e831e58fe06b63c4b3d276a79a38d0e777c33e70c4050f41ac8b0c5044d57225fa45f41a1f6bfd9d8d2d6bb3e01759b77bfb39bb490801ea7fcca282
|
|
||||||
AUX chromium-132-mold.patch 6134 BLAKE2B 71dbc254343be868c31f542f564547d8c090d4a1b0729b6f75d0d518b80010bba63cb1b6af0af9d7be4971611305eec25e11fa18b048ba5bd3bfccb10b787a49 SHA512 c753a5eed66d86070da4d18096c6c3a5c7d8ed5982f5fee2bc48172362cbdb983090b921a743e78639eb21041aaaf77653222cd057cc4941d7a761d29d234280
|
|
||||||
AUX chromium-132-no-link-builtins.patch 550 BLAKE2B f838540e21afb61d3041ba8690e1d71269cdd0f165618b12ef8c3fb24e5e3f846c1bb56a36ac19738e17246d02d75937416a53fb4bb789153f76f6f7fe9bbf28 SHA512 6b685dccd8e833e22c4be4be14e6fece5db13e7635bba0442b0fc8000da7e921e7bc479726569e587c9ea8338fa95cf795f0f1912ca3cf37bc2622dc4a07ca19
|
|
||||||
AUX chromium-134-qt5-optional.patch 4140 BLAKE2B 2a5879384a95fa0a9edf2e6506b2f374f6366ef0bd5f248b14333cbe721c5ad85d04101cf7a15a207c476525a8ba22645d8446c684363b3fa8b9c642c89b8fbf SHA512 b9fba4b3d33430a9565a6605f8d525618e6691622095bfe17f781e030e4395cb5ed25242625761ca16b19da8014e4afa1335fc6719cae78c8b3594c9e9092978
|
|
||||||
AUX chromium-135-gperf.patch 1539 BLAKE2B 59ddd646ae97f8b77e6f4852ff4d1c50b0910f48199508935ad855719a6ad4081fd1c088a89e7e19c906aa98842fef7bbe97f219c10d7c4d279563650e4b65fc SHA512 3a66cdd30a9a2bd69d6d1bcf06602290830509910b37a9a96b3f4df1525fcda3b6b5c683d255ad976228cbc8a215bc3746985ab4d8096b1f48740ec0eb9247a5
|
|
||||||
AUX chromium-137-fix-for-kde.patch 718 BLAKE2B 0f511723c4712563b8db97db9fcb0c54575a4f757c2d5a44ff265cddfd11e37fa89f2865d5c3f2956d6680bc67b2cc8c399bf57d591d3ad37ae2297b9a18b9b7 SHA512 669b35bd5204f50c0e06718435a92f000e9f692b084f8ce1154465b0fc4d3f5796953f72b480e3e55ed66f122827275cb9358fc6a58a522855adb7781ab940b3
|
|
||||||
AUX chromium-99-opus.patch 556 BLAKE2B cad43be94fab004267ea1311f329f38b032a49374691a639a871feac1b1fb304768ac40659c0c72b0705738791b4ce774bca5591e7a19546d0ca4f76bec5f369 SHA512 8e5691104f6d724b59ae6e73fe0720bf483ff95bd80a4e66116d1555fa786c1e4ab813d9479a26d363c5a36da39dc31b56c69d3d84eff39bf0c2deee1cf632e7
|
|
||||||
AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
|
|
||||||
AUX chromium-revert-84fcdd0620a72aa73ea521c682fb246067f2c14d.patch 563 BLAKE2B b15d3f70f8cf6bf94c9c52f17e90b9d989a035903d70f8e10fe09c388522b9ab6b9959da003996cce6e308cdc9abc0631805ff40efe5805cd99076713c27c34f SHA512 d0618255f8bcf0429f7dbb94ec8f2972e8b09568a4c5b10df2e5bebf99d8eaae2d0be3217c48d97e655c9a617025211b2610117797820609442c376d93aacd78
|
|
||||||
AUX chromium-system-av1.patch 787 BLAKE2B 1b7925c4923bc559890c04626d12c813816516aa593a6ddbb195c4be0135f55fc255194b60927a21f0348a65f84ed0239630fcdada6e90fae5ae2b9b3ce37058 SHA512 67fa937ac254656277ea0d75c742437db0313ee05fa03c7a53efb0880be6aaaaf1a813c11a5838d1f0f8e696f3ebcaf774f02f9b87d13655e6acd223e20d4a45
|
|
||||||
AUX chromium-system-libvpx.patch 764 BLAKE2B bc73407a255da53f45b471a9407cbdad7d64c47f5780dc58bd92e35255c87bea1f4738ade04f3dad4aa14f8db76f66ea37aea351c8b198575d3127985b6e2766 SHA512 436f8df62e1ac7c87c6f998870cbc68b71e321859d384c91e144c4c5b80df498d75f162975ddb11e2c4e336ac80e576161e2bc4ca7765edd75082233071503ea
|
|
||||||
AUX chromium-system-openjpeg-r4.patch 1035 BLAKE2B d269a25bb13b42929a6ddd73a8d1f367b557b58c6a81af9c52e6ad2fbe70810fdde065c6d909c83ea42d9cf485d3a68f490510c695a4c2de3f963bc5a23df828 SHA512 913d164bb094b3a1d467fd129fd817b3be345869a9d7949c42f25f2c1a02edea501c1a42adb4e5f083bae9ccda16f2368e05c00b170ef3facc31ae90c1a2410c
|
|
||||||
AUX chromium-ucf-dict-utility-r1.patch 3843 BLAKE2B c9da2ed82f6113f810a430f09fc584aebc27ba7174c82c0b773d5387a03d7220a400cc24733886ef3e6d6040c03e04796f19dde342b11765ea8ea1c872b381da SHA512 47ac0d83f097a66370049babcb78cc70387865a33c8a679ce7380234544d0f0f5ed1a01afad7d5b8a6e4622c9c7c4f45c9254ed3241a991b634f60cc3a3ac724
|
|
||||||
AUX disable-bluez-r1.patch 3265 BLAKE2B 72465c584899c3f277155931b75487edc7ce61d7b251446264cf0f33af4afcd9a2227a68af68101c07346e3b5dc1b3b1937c68fee3cad902fed6b6e2a8654c8c SHA512 d8d8d60a2f689919d9254da3530ff5fd362415ae979db6651bc45f4fb0f9d7b6aabdb7ec0190bb9d95d23986dedde37a94a9907a9a26be6cc4535787306ae674
|
|
||||||
AUX ffmpeg-nb_coded_side_data-dolby.diff 896 BLAKE2B a90921aa94edc200c08bcf0ddeab962e17f73a22a699166fdf7011bee36bc9b42730727e1d59003dc2f3b798bbeeaa1ebffada3d7801e68e1e0ec8739360b392 SHA512 c627eebcc05a674978201e4b27cfbfa17780260526bcb5d441a3a5dbf9c6006a1f1c3ad14a538bcb288eb01a0595085fe2a13eb1a1500b0254777968493490a0
|
|
||||||
AUX ffmpeg-nb_coded_side_data-r1.patch 9732 BLAKE2B 3d71f7e2acc4b5db098fd5e052081297a5894263857dc53111814deb73acc075cd0e30276723b3d934d05004c94675d4a1f72a363ea3e3da2a0beec06aa8a7e3 SHA512 ecfdeb14ee9ce794cff2695da99aa818cc2f00d013f78fd9878769f0c941fb63256cac281b3d69612d79e4d12985219ffe4f428382ec650017645d2fe2c0a187
|
|
||||||
AUX fix-building-without-safebrowsing.patch 175026 BLAKE2B 14a4071ea5d6896594c6cd6d8ebd6940c29203447713767f03db06c7e61627c7aada5f415fc28f5a60cf5e55c1ac98ae0e2f79fe72413cb2b9cf08e808c05e00 SHA512 8f8e4b92845cd487fee676a4aa1b21084a60514b4e5d0cd0804bdb435a24b914194c0c572fdf74247fb9f2e286e58a731fd2e219eb89a95d748e15f466f97770
|
|
||||||
AUX font-gc-r2.patch 2692 BLAKE2B cd1085fe89cc7446c52d9b1a68bca57811eeb21b3fbad2318752fe7434fcaf96a2708557c90884f286becc6b300ff21a8b6bd3107a69bddbde24a68df0be3e9f SHA512 3575a769a77f25734603105693bfe97343050f7d2b9f7d6df4e81c3a8643c3f7b49c5b6bafe4f09594551968c5a941deb5862da6409d3a1ce9120a55909321ea
|
|
||||||
AUX libusb.gn 502 BLAKE2B 8971df95ef9690762eeb41eda4814fa57488a840751f21671bed01291dd0d840b8028737f7a59b4cd0858b57bbfdad4feb65485805fb50934bd339358b952659 SHA512 b2667fd1751b871f935ead6e7388f5046aaeea2a5b393cab27af6170be690e82f679bdc44c932de03d2c1b2bf51abc75b0fac16dd702f84cdc8c078befcec49b
|
|
||||||
AUX perfetto-acc24608c84d2d2d8d684f40a110d0a6f4eddc51.patch 3584 BLAKE2B ce9b6b5cadd5cfeb77af9e4c6728aaf01b9e137c5ac026608310f784832c937270ab02bdfc7113b70c714907cc03d04c244cb2193643301552d5372645effbd3 SHA512 4c9c50efabed768acecf571e2f5e142959a2d2c3dce793771719cda3a878afa8fa6ff47180e0d90f1d8dc1ff863fe46855a5ddefa1dd8bd24fbf895ec1d60562
|
|
||||||
AUX perfetto-system-zlib.patch 433 BLAKE2B 4cd2883262ab5b52b3bc78fe4b1ac000682a7d9bbfd0e29af424a088dcdad262c4d09a6098317698c8f554d015abdb7cf63f03f2f708f10f9ce01bbe5c116d21 SHA512 dc5320ec9fd991aaf47bd021010ca54f033e1514d1b551378c7b0dbb9cf5b8effc4aa895d180eb9b81634c363098f4c85e944089024cd9c32fa0ee4bb4589d5b
|
|
||||||
AUX reverse-roll-src-third_party-ffmpeg.patch 12334 BLAKE2B 3764501173a12429b6a526af4cd5bce4c53f44aa35286f26776c7e7b436361106ec3e93ffb5e8110cbe27e118e4c145d4f0e1ad0c7acec192d51419cb7202cf9 SHA512 d7fe1952004669c2ce1928d3fcf9ff2bb0bb6c594a2ac903aca66a725cf72a9e4b4a2bd7ea532d8b4029e68b756c112d76bc290acfa3385371b223083a6268db
|
|
||||||
AUX reverse-roll-src-third_party-ffmpeg_duration.patch 902 BLAKE2B 1852c817a247393c1574781d32e41b154de25c542ac767f95bfdfd3380f99438b8e97fbc08fb5a2cf5b84eb68cf049a1cd02cc5f60bea4adb702037a3a46cb07 SHA512 550c8d4d29562e846ed793e6a434396202a7cfea09361a0544a0539d60cad807e4e052bf9a3d000ef8af02f4bb213525542e73560651b7b89f2b59cbb9539a3b
|
|
||||||
AUX thorium-130-fix-building-without-libjxl.patch 978 BLAKE2B d0290a82fe67d0c43ea1194f95e5dc15caa8559f1e20ff63eafe7a20e8254a61ab45235010dd630c4a9e41707459c479c4ba9c6f1e4e3084cca3c7b1e7a2c477 SHA512 5e030a41c5a6e7190e4d254ee42528ed842fd37d8ccdda33657293449c1f954440624d1bb71238b93fc63324b25c5f8f52f49e90b0ef9baa0fb28f5d8ef72782
|
|
||||||
AUX thorium-browser.xml 403 BLAKE2B ddf0e198b06e84b787d5920ac0adaa2e1e532a03fa8673ca6542784cd19e668599acc01c67efde445bbdf8790dafae9e0f2ec272ab4d759e2a8b5cf10ade4c38 SHA512 8474477ffaffd92013f8121e4318f7cc183db63baa4dbd2c78cddda5a9d3876dd451405374154ba40a17b7a8cdea78b485ef89b0ac4283ff9670f5a08fb53fc6
|
|
||||||
AUX thorium-launcher.sh 1626 BLAKE2B 615fce7563f12f7907eda4bca861f2345b0b03ddc0529857fb13050ff3a0b837ef04f26730fa12cdc6345e87e1d1bd46f6307df399896e3ccee620c0e157bf47 SHA512 af6e9f89e988c3c58be9bf93603835a2f610f45a9a73b0500abc49141d0836409b118a6838935737aeeb011318584381c146812eed25914e3b4147e3353376ca
|
|
||||||
AUX thorium-shell-launcher.sh 1281 BLAKE2B 7224eeed73a3a58a4cb7123953f23f4e54b4257e73c32f566bae0908c39e3114985131c6f8ffe056b224ddab7f36f013d273f17b60376a9d4e2d01534f9b2a95 SHA512 7f5d9f43ba8002ee69f136ea76932b23058d6fc5e80a7c0d010178f04b912685bae6c45df17f501ba168bb7e8a0e8251ed0a7a959a4bfc3572acacbcc124a0f1
|
|
||||||
AUX thorium-shell.default 273 BLAKE2B 478437d707a7346a17af1db104e02ebed43d508ae2c9901a9773e5d1393cd5d2e90ce2ef43ee8313e349d79c69dbf12e6860c6f00bf273c29e9dcaacdc2854f0 SHA512 2c27040b79c8d1c76c323ca6561f697f00876b0c3be6edf0888b17df14a502a09f01de61f3de77778d4b1d29bcf4dc39883173b34212a4f5500eff1ccff12362
|
|
||||||
AUX thorium-shell.desktop 431 BLAKE2B f9ff55e270b01646d87b1f9236c27490c06003a249bf04ec22160701fa2e5cd680ede7d4dc3e0fd9733ce6c6de1f6eefbb7d2102edf99507a1c212dae484b9d4 SHA512 294295d13c7347771dc5f7c8be50b5eb5b43f830d2b0e52b94ae6fd454a04852734cfabaea8afd63874035485afa9c8ad4d3466a5a6783b7d291300a176b5e08
|
|
||||||
AUX thorium.default 256 BLAKE2B dd7a3c12f068d416917accf01b4c670251c62b987480c05588ec54e33d199ec899d6d3dbe4e8a92870119f0a057e60cfdef340947dc73ba2bd5005f6da84ff0c SHA512 c28e30a9838fbb3653288adb474b499050e193c29d48e6929de7c1360bd593a19f95180d55cf6bb561bc5a50c67efe9397096c2315be24e91b48735bcc3c4626
|
|
||||||
AUX unbundle-ffmpeg-av_stream_get_first_dts.patch 393 BLAKE2B fed72675027a27c852936559272ec88e18ccf6fe73cd4562270427005682e1d2dd184f9b51c470ab4e96dbb9751cbff1ae0c102d287c16294800d39b44a11f75 SHA512 4d184faf083a82e2a51480b8513b14c81a8d03a821fd25bd41523093e064bc2ced8e23fdc37da548d9e1e171784263436b82be373aa7307b4da41ee8b3b26a89
|
|
||||||
AUX update-dicts.sh 1680 BLAKE2B 8d3e8e90f62cde763256c0d3e48aa075776e8c21df9df60a23e788eed992ce12446fd1c92b3a9207793eeb8f7c4537e322845e728d35d0b57a2c83bffa5251a9 SHA512 c9868aadfa5a905b94e749074fe98a29489947f9aeecd728498918697a39b4bf77970c7b40f0b53f8de56985bd47ee17a3550ee5239d00e166e35d32f585cf4e
|
|
||||||
DIST chromium-130.0.6723.174-testdata-gentoo.tar.xz 97492 BLAKE2B 997562de242b14a99aa6998c41ce9f77d1fd36a73f48deff1c57ce90c6dac7c04a7a74493e1ea3c2206f0706dcbd24ed4be7d2283fa267cb628168b5eb38b176 SHA512 2e9d46f83a5649c0f06ea67df779a6f46f011636be08a0a3c0623f7ffcbc27af1e269d49319535b4c5f89e72ae0949736b6c0cd705a2890453ebea1b361253d7
|
|
||||||
DIST chromium-130.0.6723.174.tar.xz 1316010876 BLAKE2B 88ba934d72ffc9b40f456af925a46c94d6ff2378c6d246f686b258360a64c12590db7f92ccb5591430e79f33c10f7ca17cf4c17fd5903699b6e31c6a359c1392 SHA512 12c458560183965d1457147167f3ef598e9c83b9332a9bc27303647ef7f580849563351e6644d34aa78960db028780d834c3364a7e662f38d5b516ca2a2a287a
|
|
||||||
DIST chromium-39583ff118920284de516d262979960e7159bcfc.patch 1391 BLAKE2B 28815a2a49a78791c74462442863e26c10fbe770e883d82a36b8793f2900c4feea0053f116d9029bfb66b53f2df133fbe8f92635dcd460e3405d34dc9afb5329 SHA512 0ade99c4c8c4acff35502b195b0c46b944f31f2e2c5beb0e9f63a345cceebb1c4dd21e9e3410484f40d75e3ebae170536f651edcaa0b5c8d50edb7272b62a492
|
|
||||||
DIST chromium-40c273b2c0f5f26e16e67428ceaafd8b339bb61f.patch 1745 BLAKE2B 8df526e88bd22bc27a00ad5fafabcda20865c5fa2bd0ac91523c3b22709a725c010e4290bbb400c3f96f4bce61ca4b13f472fc27e2da34a7a2afa57e912a3f75 SHA512 4debcfe22af457bc3606bb7e394abaf3efd8f6e544f86da4bd3e0e0be81a7201ff038253e8d54fea5765cd1cfb52950e21f98685cf79c5c1a22f8e448b9e894c
|
|
||||||
DIST chromium-47fb59539e5744467eb6f7aae52f5a169910d56c.patch 1405 BLAKE2B e72e76133ef9e75eee65d5e7e840337912f93148ab6bc04d12d64c6d4b58c80fd4f3dfd9f033649948357e3956c6dac04561f9198d5bf443f03438a1dc72bc2e SHA512 714feb8e53b7510072407ac5c0d9026e978805d65a754d62dd53605f2d7dcdb8c5da1634c4a84614872c10f31d6ee2a5c15bb4d621a426ea939b38e42d5e39b8
|
|
||||||
DIST chromium-4c49d7f04f43ab4757637cac21cfef7c0cd060fc.patch 1172 BLAKE2B 346027f24009cccdbb479055567aae9e327ea88163d5cc25becc1512b7035c809ec8089b69b6084e6278b9a6029123dabbe824b7ffd988aa244ba84dceff629f SHA512 63028b4e747b92fd462d2663fc317bec8f3ee1e3fc486a9135fef7fd5f68eaae9d883144024f8ddebbce5f053ccfe8ef142b3f6d0dfbd785310fd40bbb060f6a
|
|
||||||
DIST chromium-7e28832cd3320d2b603e6ef9468581e1c65c14f1.patch 1339 BLAKE2B 8b8c9daa68f981b70627a07d9f7638c33158802d3ece8e7ab4e25734332944407810e8a2aa4f701d8153ccdd72138525598e23660feeb4b8a8e69893cc523d8d SHA512 10298ad3a257488add2e942e5522ac43e7979162acaf037122e437fe0a9734893e9bc03bd6a528d3052bb3ae2efe94fe61fb1fa051307db544e507d17603e4c3
|
|
||||||
DIST chromium-8739a5b33176e82e06a746163c0c76de4908ced9.patch 1635 BLAKE2B 3c8a62403bf90e3e35f237f0774196b8a15669717a4ece79f5d8306fd2bdfe01f7c1f1715609578185c236a12d5cf9c4b4438a6400fc16e4a89e6f7f681c8820 SHA512 0323edb3fb4f34e50035588423af412c16d95ea06fdbc6ff82758b4e640cad803d40989195a2c9782b87759374e42f3d38110ff929224f8e3dce3dfef9a7fae1
|
|
||||||
DIST chromium-b51da416e04ecc9edafff531f9678c6404e654b7.patch 1346 BLAKE2B f1215a48fcaf36b70b4cc1430f78d43e84d51089cc4cdfa8508e37574e0aa198bfd99ef99a627ca4b98e79547549a2844dac5debc7b8c026964db15bdaf849aa SHA512 7d1f79184e69d927e025371d3c50a997fe82ce9a328af7be4f7e459a92bb74b5cdc545c7d65974242ae084835cd59f3e1ce7924252cf79e5e698940052bd11d5
|
|
||||||
DIST chromium-c502d310d8cb91f1c1098a7287e75114023e57f0.patch 1391 BLAKE2B 4d7dbe9c2173d01756f99208804bafa2732d8992c9a9132905964a600103e8b8018aa188a2dfe96e0cf688686b585fffe05930cb3af734c26c648ccb9ad211df SHA512 0c3f681d8cf971511cc325db17bb36e81589c12404e70858a6f41dc3b41d1b0eb4ac8ccb02904218739625275683cd5fd94b7426c57e3d43ae8753303ef1d6aa
|
|
||||||
DIST chromium-dc9db222b929f5da415216134b77d7f3bf141813.patch 1253 BLAKE2B f0480b418bc2b4f0a0a21a10a139f304760b1ffad093a22fca3618afffc452e2bd22e9139751508ef00814f1a5c78391a845632dbdffc205bf73ed2bcf35666e SHA512 929004b1286f15916a4d21b6b7c4f73a6da9d7ed704ad2d52fbc37fe0f967615be0a774890cd4cbc377f99bd8ea3e1560bc837e4dcc9527c4d052195265e5490
|
|
||||||
DIST chromium-openpower-a85b64f07b.tar.bz2 387899 BLAKE2B b01fda2d64ce73068d1536a10cc0896f07a4b714cdb25698b1df8b3252baa0c21c4209b307cf1cb554854f6d0bfe3cd35e06aaa8d02ac5d409a119335084c324 SHA512 05eee81677e8766808441c939bee68e2e6c58ec91f471d88a40181d2eda78614a0a6d27d92ff8f9dda564d12f3451bace4ff2727594748c5c238a3533038019b
|
|
||||||
DIST chromium-patches-130-2.tar.bz2 10151 BLAKE2B b46515a3e01153d8c4e5c3ee1f6e9f905265bf88b698d46c8ceed0f90d36a057b8bb30a860e8d934bf0b85f9c0a671bef2c9a00349228fa076b7aec37ff62ca0 SHA512 e1ecca666c3998ee285426751be3220a5b67a057f2c92b1f45c7b786efb8d0b0e1d49ba70471fa74155f79f22811d240af636f61007191756c9981b53d3b23de
|
|
||||||
DIST chromium-testfonts-f26f29c9d3.tar.gz 32750602 BLAKE2B 498f8b2e0811c98dc3d4aaa75559e69c782afb4bd12328cfdb7244ddba5cae7ee47becd27b2549d7b36bed417601f70f4c192934b0f08496cef1547d0502d93c SHA512 96b090446862997c8134e2971f0e38793ecc1208d547e554c9b651ccfb4127c4de86754903fea57a7292a2823c45117bae0ec13ed87aed20c248fb779579fbde
|
|
||||||
DIST ruy-587c2cf8b11d3c32fa26887063eda3171a3d353e.patch 684 BLAKE2B d00895efda90c4254ceb875e52d2959cb0d4c95cfc98775a02a6430f60f038c7da701316de40888e5f63ad907f087bff105d79ee9c9bd386bae5053de9517a64 SHA512 93c78353c0f3d50d4ebfcbf34b0b5d2c2bc3e1a38bc0e545d2e547010f540dbe2e0e284362810a554f58e300d3c770d35ec49ff87e565dc4b66537ac515109a5
|
|
||||||
DIST thorium-6a89d88a334d8df585ce07f9a56254ef85fc8956.tar.gz 158609045 BLAKE2B 74173fc5373aa0ea975c944a1fe6683d86120f9476918b4cfe176deb6b892c32e27af5e060eff6d4b5eb0f0f7bc62a9c2a43bcfc07eb80da9a85c6bfb88f29b6 SHA512 cb9211ce25248345ca2f7d410686e9cdc7c6de5ba5871760f2564177749c5961990dce95da3e83e8aad9b58da2e7176d526d6da1b89cba6649f4a0be9414b9a0
|
|
||||||
DIST thorium-libjxl-059d2253e91e3c8af7cc860f1c633f18ac19eb67.tar.gz 3610533 BLAKE2B 019cce40f13fb163436a5d2a90c11f9d25836103ea7bdb508492138d9eeaa2f895e520bbc70ea54290b1d110283411ea4a70e427c75958bc4ade8467b254e132 SHA512 40634e8124f039d461984ce1929f36cb6d1a02ceb11c207390f7968a270bf4f513b45f588da607848edb9023c6f4795440e621f8d79366f70cbf5a6d90bf723d
|
|
||||||
DIST ungoogled-chromium-130.0.6723.116-1.tar.gz 1247229 BLAKE2B eaf49861d5a58854ccfb95d35fdb24c9adbee1d9c14ee5d51c1c2e14a8a41dc807c94b949e3f20f87c92c1f859a6a4c331f748367b08b9fd251ca3969a1e8da7 SHA512 aaf2bea58ee2a7689ed6df68f7b311df404f9d7a2b34e3101fb0689ffff158a4e7a6c6eed43e256183696eb6a3f6fe527162b37323015168ffbe279ed1638efb
|
|
||||||
EBUILD thorium-130.0.6723.174.ebuild 67354 BLAKE2B e077a826feed3de8f2612c44fef4510d0d42c9f87d95d151de61f51a185bd7633113d02454ba1700c84ce1db5afeb8865dc38da4c63f65bda0281d50a2e303fa SHA512 b1c21b36d707a20c5ac9583bceddacbd2d2b99c1458dd6dfa5265d01bdbc67769296952deb0e4e5ddc14db2bcda198d4ba22a62132cb445113e595525c3e8233
|
|
||||||
MISC metadata.xml 4711 BLAKE2B 47daffd026624b61a2da6bfb3d02b77f92e6b4f774a5d96994f01d02d84077b4f577b70b10d728f57f269ea9a5e75518d27650f3134120656cce24eb5bb493a3 SHA512 23917be73dd857421f3d9fb0d6b36940e8f7a215042219c48f0f1a91d5b0c8ae33d3078fc68b9ab4a5298c822a5ca141de9c21815ab1808206b7643502128ce8
|
|
@ -1,20 +0,0 @@
|
|||||||
--- a/build/linux/unbundle/openh264.gn
|
|
||||||
+++ b/build/linux/unbundle/openh264.gn
|
|
||||||
@@ -2,6 +2,7 @@
|
|
||||||
# Use of this source code is governed by a BSD-style license that can be
|
|
||||||
# found in the LICENSE file.
|
|
||||||
|
|
||||||
+import("//build/buildflag_header.gni")
|
|
||||||
import("//build/config/linux/pkg_config.gni")
|
|
||||||
import("//build/shim_headers.gni")
|
|
||||||
|
|
||||||
@@ -34,3 +35,9 @@ source_set("encoder") {
|
|
||||||
deps = [ ":openh264_shim" ]
|
|
||||||
public_configs = [ ":config" ]
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+buildflag_header("buildflags") {
|
|
||||||
+ header = "buildflags.h"
|
|
||||||
+ header_dir = "third_party/openh264"
|
|
||||||
+ flags = [ "OPENH264_API_WELS=1" ]
|
|
||||||
+}
|
|
@ -1,10 +0,0 @@
|
|||||||
--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
|
|
||||||
+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
|
|
||||||
@@ -19,7 +19,6 @@ limitations under the License.
|
|
||||||
#include <cstdio>
|
|
||||||
|
|
||||||
#include "absl/strings/string_view.h" // from @com_google_absl
|
|
||||||
-#include "third_party/zlib/contrib/minizip/ioapi.h"
|
|
||||||
|
|
||||||
namespace tflite {
|
|
||||||
namespace metadata {
|
|
@ -1,25 +0,0 @@
|
|||||||
https://chromium-review.googlesource.com/c/chromium/src/+/2959890
|
|
||||||
|
|
||||||
--- a/ui/views/animation/ink_drop_host.h
|
|
||||||
+++ b/ui/views/animation/ink_drop_host.h
|
|
||||||
@@ -238,6 +238,11 @@ class VIEWS_EXPORT InkDropHost {
|
|
||||||
// Used to observe View and inform the InkDrop of host-transform changes.
|
|
||||||
ViewLayerTransformObserver host_view_transform_observer_;
|
|
||||||
|
|
||||||
+ // Declared before |ink_drop_|, because InkDropImpl may call
|
|
||||||
+ // RemoveInkDropLayer on partly destructed InkDropHost. In
|
|
||||||
+ // that case |ink_drop_mask_| must be still valid.
|
|
||||||
+ std::unique_ptr<views::InkDropMask> ink_drop_mask_;
|
|
||||||
+
|
|
||||||
// Should not be accessed directly. Use GetInkDrop() instead.
|
|
||||||
std::unique_ptr<InkDrop> ink_drop_;
|
|
||||||
|
|
||||||
@@ -261,8 +266,6 @@ class VIEWS_EXPORT InkDropHost {
|
|
||||||
int ink_drop_small_corner_radius_ = 2;
|
|
||||||
int ink_drop_large_corner_radius_ = 4;
|
|
||||||
|
|
||||||
- std::unique_ptr<views::InkDropMask> ink_drop_mask_;
|
|
||||||
-
|
|
||||||
base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_;
|
|
||||||
base::RepeatingCallback<std::unique_ptr<InkDropRipple>()>
|
|
||||||
create_ink_drop_ripple_callback_;
|
|
@ -1,40 +0,0 @@
|
|||||||
--- chromium-118.0.5993.54/media/filters/ffmpeg_demuxer.cc.orig 2023-10-04 23:53:53.691762700 +0200
|
|
||||||
+++ chromium-118.0.5993.54/media/filters/ffmpeg_demuxer.cc 2023-10-08 16:56:57.616681160 +0200
|
|
||||||
@@ -398,7 +398,11 @@
|
|
||||||
// TODO(crbug.com/1471504): This is now broken without side data; remove.
|
|
||||||
buffer = DecoderBuffer::CopyFrom(packet->data, packet->size);
|
|
||||||
} else {
|
|
||||||
+#if defined FF_API_BUFFER_SIZE_T && ! FF_API_BUFFER_SIZE_T
|
|
||||||
size_t side_data_size = 0;
|
|
||||||
+#else
|
|
||||||
+ int side_data_size = 0;
|
|
||||||
+#endif
|
|
||||||
uint8_t* side_data = av_packet_get_side_data(
|
|
||||||
packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
|
|
||||||
|
|
||||||
@@ -461,7 +465,11 @@
|
|
||||||
packet->size - data_offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if defined FF_API_BUFFER_SIZE_T && ! FF_API_BUFFER_SIZE_T
|
|
||||||
size_t skip_samples_size = 0;
|
|
||||||
+#else
|
|
||||||
+ int skip_samples_size = 0;
|
|
||||||
+#endif
|
|
||||||
const uint32_t* skip_samples_ptr =
|
|
||||||
reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
|
|
||||||
packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
|
|
||||||
--- chromium-118.0.5993.54/media/filters/audio_decoder_unittest.cc.orig 2023-10-04 23:53:53.683762000 +0200
|
|
||||||
+++ chromium-118.0.5993.54/media/filters/audio_decoder_unittest.cc 2023-10-08 16:58:23.727519824 +0200
|
|
||||||
@@ -108,7 +108,11 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the timestamp is positive, try to use FFmpeg's discard data.
|
|
||||||
+#if defined FF_API_BUFFER_SIZE_T && ! FF_API_BUFFER_SIZE_T
|
|
||||||
size_t skip_samples_size = 0;
|
|
||||||
+#else
|
|
||||||
+ int skip_samples_size = 0;
|
|
||||||
+#endif
|
|
||||||
const uint32_t* skip_samples_ptr =
|
|
||||||
reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
|
|
||||||
packet, AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
|
|
@ -1,68 +0,0 @@
|
|||||||
--- a/components/qr_code_generator/BUILD.gn
|
|
||||||
+++ b/components/qr_code_generator/BUILD.gn
|
|
||||||
@@ -38,24 +38,11 @@
|
|
||||||
"qr_code_generator.h",
|
|
||||||
]
|
|
||||||
deps = [
|
|
||||||
- ":qr_code_generator_ffi_glue",
|
|
||||||
"//base",
|
|
||||||
]
|
|
||||||
public_deps = [
|
|
||||||
":error",
|
|
||||||
"//base",
|
|
||||||
- ]
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-rust_static_library("qr_code_generator_ffi_glue") {
|
|
||||||
- allow_unsafe = true # Needed for FFI that underpins the `cxx` crate.
|
|
||||||
- crate_root = "qr_code_generator_ffi_glue.rs"
|
|
||||||
- sources = [ "qr_code_generator_ffi_glue.rs" ]
|
|
||||||
- cxx_bindings = [ "qr_code_generator_ffi_glue.rs" ]
|
|
||||||
- visibility = [ ":qr_code_generator" ]
|
|
||||||
- deps = [
|
|
||||||
- ":error",
|
|
||||||
- "//third_party/rust/qr_code/v2:lib",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/components/qr_code_generator/qr_code_generator.cc
|
|
||||||
+++ b/components/qr_code_generator/qr_code_generator.cc
|
|
||||||
@@ -8,9 +8,7 @@
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "base/check_op.h"
|
|
||||||
-#include "base/containers/span_rust.h"
|
|
||||||
#include "base/numerics/safe_conversions.h"
|
|
||||||
-#include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h"
|
|
||||||
|
|
||||||
namespace qr_code_generator {
|
|
||||||
|
|
||||||
@@ -22,27 +20,7 @@
|
|
||||||
base::expected<GeneratedCode, Error> GenerateCode(
|
|
||||||
base::span<const uint8_t> in,
|
|
||||||
std::optional<int> min_version) {
|
|
||||||
- rust::Slice<const uint8_t> rs_in = base::SpanToRustSlice(in);
|
|
||||||
-
|
|
||||||
- // `min_version` might come from a fuzzer and therefore we use a lenient
|
|
||||||
- // `saturated_cast` instead of a `checked_cast`.
|
|
||||||
- int16_t rs_min_version =
|
|
||||||
- base::saturated_cast<int16_t>(min_version.value_or(0));
|
|
||||||
-
|
|
||||||
- std::vector<uint8_t> result_pixels;
|
|
||||||
- size_t result_width = 0;
|
|
||||||
- Error result_error = Error::kUnknownError;
|
|
||||||
- bool result_is_success = generate_qr_code_using_rust(
|
|
||||||
- rs_in, rs_min_version, result_pixels, result_width, result_error);
|
|
||||||
-
|
|
||||||
- if (!result_is_success) {
|
|
||||||
- return base::unexpected(result_error);
|
|
||||||
- }
|
|
||||||
- GeneratedCode code;
|
|
||||||
- code.data = std::move(result_pixels);
|
|
||||||
- code.qr_size = base::checked_cast<int>(result_width);
|
|
||||||
- CHECK_EQ(code.data.size(), static_cast<size_t>(code.qr_size * code.qr_size));
|
|
||||||
- return code;
|
|
||||||
+ return base::unexpected(Error::kUnknownError);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace qr_code_generator
|
|
@ -1,19 +0,0 @@
|
|||||||
--- a/chrome/browser/webauthn/BUILD.gn
|
|
||||||
+++ b/chrome/browser/webauthn/BUILD.gn
|
|
||||||
@@ -26,6 +26,5 @@
|
|
||||||
"//url",
|
|
||||||
]
|
|
||||||
|
|
||||||
- data_deps = [ "//third_party/cloud_authenticator/test/local_service:cloud_authenticator_test_service" ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
--- a/chrome/test/BUILD.gn
|
|
||||||
+++ b/chrome/test/BUILD.gn
|
|
||||||
@@ -7112,7 +7112,6 @@
|
|
||||||
"//third_party/metrics_proto",
|
|
||||||
"//third_party/microsoft_webauthn",
|
|
||||||
"//third_party/re2",
|
|
||||||
- "//third_party/rust/fend_core/v1/wrapper:unit_tests",
|
|
||||||
"//third_party/webrtc_overrides:webrtc_component",
|
|
||||||
"//third_party/widevine/cdm:headers",
|
|
||||||
"//third_party/zlib/google:compression_utils",
|
|
@ -1,45 +0,0 @@
|
|||||||
From b6cda4bc2283a02a5b5209c0f4282a8365f6f33e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Matt Jolly <Matt.Jolly@footclan.ninja>
|
|
||||||
Date: Tue, 21 May 2024 10:04:24 +1000
|
|
||||||
Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials -
|
|
||||||
126 update
|
|
||||||
|
|
||||||
126 changed the function proto; patch rebased.
|
|
||||||
|
|
||||||
Google doesn't let us bake in OAuth2 credentials, and for some time,
|
|
||||||
Google sign-in has been broken. Arch dealt with this in March, and so
|
|
||||||
did we to some degree, but in the last few months, our sign-in
|
|
||||||
credentials have been broken. It appears that we actually did remove API
|
|
||||||
credentials in March around Chrome 89, but they got added back, perhaps
|
|
||||||
when rotating newer versions to replace older versions. Work around this
|
|
||||||
by following Arch's lead: we remove the predefined credentials, as
|
|
||||||
before, but also we patch Chromium so that people can use their own
|
|
||||||
easily, using Arch's patch for that.
|
|
||||||
|
|
||||||
For more info, see:
|
|
||||||
|
|
||||||
https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
|
|
||||||
https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5
|
|
||||||
https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/791871
|
|
||||||
Signed-off-by: Matt Jolly <kangie@gentoo.org>
|
|
||||||
--- a/google_apis/google_api_keys-inc.cc
|
|
||||||
+++ b/google_apis/google_api_keys-inc.cc
|
|
||||||
@@ -193,11 +193,11 @@ class APIKeyCache {
|
|
||||||
std::string default_client_id = CalculateKeyValue(
|
|
||||||
GOOGLE_DEFAULT_CLIENT_ID,
|
|
||||||
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(),
|
|
||||||
- nullptr, std::string(), environment.get(), command_line, gaia_config);
|
|
||||||
+ ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config);
|
|
||||||
std::string default_client_secret = CalculateKeyValue(
|
|
||||||
GOOGLE_DEFAULT_CLIENT_SECRET,
|
|
||||||
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
|
|
||||||
- nullptr, std::string(), environment.get(), command_line, gaia_config);
|
|
||||||
+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config);
|
|
||||||
|
|
||||||
// We currently only allow overriding the baked-in values for the
|
|
||||||
// default OAuth2 client ID and secret using a command-line
|
|
||||||
--
|
|
||||||
2.45.1
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
--- a/build/rust/cargo_crate.gni
|
|
||||||
+++ b/build/rust/cargo_crate.gni
|
|
||||||
@@ -5,6 +5,8 @@
|
|
||||||
import("//build/rust/rust_executable.gni")
|
|
||||||
import("//build/rust/rust_macro.gni")
|
|
||||||
import("//build/rust/rust_static_library.gni")
|
|
||||||
+
|
|
||||||
+rust_sysroot=""
|
|
||||||
|
|
||||||
# This template allows for building Cargo crates within gn.
|
|
||||||
#
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
|||||||
--- a/third_party/blink/renderer/platform/image-decoders/BUILD.gn
|
|
||||||
+++ b/third_party/blink/renderer/platform/image-decoders/BUILD.gn
|
|
||||||
@@ -74,12 +74,9 @@
|
|
||||||
sources += [
|
|
||||||
"avif/avif_image_decoder.cc",
|
|
||||||
"avif/avif_image_decoder.h",
|
|
||||||
- "avif/crabbyavif_image_decoder.cc",
|
|
||||||
- "avif/crabbyavif_image_decoder.h",
|
|
||||||
]
|
|
||||||
|
|
||||||
deps += [
|
|
||||||
- "//third_party/crabbyavif",
|
|
||||||
"//third_party/libavif",
|
|
||||||
"//third_party/libavifinfo",
|
|
||||||
]
|
|
||||||
--- a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
|
|
||||||
+++ b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
|
|
||||||
@@ -47,7 +47,6 @@
|
|
||||||
|
|
||||||
#if BUILDFLAG(ENABLE_AV1_DECODER)
|
|
||||||
#include "third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.h"
|
|
||||||
-#include "third_party/blink/renderer/platform/image-decoders/avif/crabbyavif_image_decoder.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace blink {
|
|
||||||
@@ -192,9 +191,7 @@
|
|
||||||
return "image/bmp";
|
|
||||||
}
|
|
||||||
#if BUILDFLAG(ENABLE_AV1_DECODER)
|
|
||||||
- if (base::FeatureList::IsEnabled(blink::features::kCrabbyAvif)
|
|
||||||
- ? CrabbyAVIFImageDecoder::MatchesAVIFSignature(fast_reader)
|
|
||||||
- : AVIFImageDecoder::MatchesAVIFSignature(fast_reader)) {
|
|
||||||
+ if (AVIFImageDecoder::MatchesAVIFSignature(fast_reader)) {
|
|
||||||
return "image/avif";
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -300,11 +300,7 @@
|
|
||||||
max_decoded_bytes);
|
|
||||||
#if BUILDFLAG(ENABLE_AV1_DECODER)
|
|
||||||
} else if (mime_type == "image/avif") {
|
|
||||||
- if (base::FeatureList::IsEnabled(blink::features::kCrabbyAvif)) {
|
|
||||||
- decoder = std::make_unique<CrabbyAVIFImageDecoder>(
|
|
||||||
- alpha_option, high_bit_depth_decoding_option, color_behavior,
|
|
||||||
- max_decoded_bytes, animation_option);
|
|
||||||
- } else {
|
|
||||||
+ if (true) {
|
|
||||||
decoder = std::make_unique<AVIFImageDecoder>(
|
|
||||||
alpha_option, high_bit_depth_decoding_option, color_behavior,
|
|
||||||
max_decoded_bytes, animation_option);
|
|
@ -1,53 +0,0 @@
|
|||||||
From 1c8472c1a44e63c96da7b7cb3873a2822635c18b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rune Lillesveen <futhark@chromium.org>
|
|
||||||
Date: Fri, 03 Dec 2021 12:28:22 +0100
|
|
||||||
Subject: [PATCH] Make dark theme Gtk affect preferred color scheme.
|
|
||||||
|
|
||||||
Selecting a dark Gtk theme gives a dark NativeThemeGtk and UI, but it
|
|
||||||
didn't affect the preferred color scheme on the web instance. Hence, the
|
|
||||||
prefers-color-scheme media query still matched 'light', not 'dark'.
|
|
||||||
|
|
||||||
Observe the ui native theme instance to propagate any theme changes to
|
|
||||||
the web instance. Code copied from the NativeThemeWin implementation.
|
|
||||||
|
|
||||||
This is a reland of:
|
|
||||||
|
|
||||||
https://chromium-review.googlesource.com/c/chromium/src/+/1774922
|
|
||||||
|
|
||||||
Bug: 998903
|
|
||||||
Change-Id: Id8147ecfbda1f3f5899a1e35b97f36382e63e899
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/ui/gtk/native_theme_gtk.cc b/ui/gtk/native_theme_gtk.cc
|
|
||||||
index 4afa399..fbaaf06e 100644
|
|
||||||
--- a/ui/gtk/native_theme_gtk.cc
|
|
||||||
+++ b/ui/gtk/native_theme_gtk.cc
|
|
||||||
@@ -96,6 +96,12 @@
|
|
||||||
NativeThemeGtk::NativeThemeGtk()
|
|
||||||
: NativeThemeBase(/*should_only_use_dark_colors=*/false,
|
|
||||||
ui::SystemTheme::kGtk) {
|
|
||||||
+ // Add the web native theme as an observer to stay in sync with dark mode,
|
|
||||||
+ // high contrast, and preferred color scheme changes.
|
|
||||||
+ color_scheme_observer_ =
|
|
||||||
+ std::make_unique<NativeTheme::ColorSchemeNativeThemeObserver>(
|
|
||||||
+ NativeTheme::GetInstanceForWeb());
|
|
||||||
+ AddObserver(color_scheme_observer_.get());
|
|
||||||
OnThemeChanged(gtk_settings_get_default(), nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/ui/gtk/native_theme_gtk.h b/ui/gtk/native_theme_gtk.h
|
|
||||||
index 876a738..ad3b88d41 100644
|
|
||||||
--- a/ui/gtk/native_theme_gtk.h
|
|
||||||
+++ b/ui/gtk/native_theme_gtk.h
|
|
||||||
@@ -93,6 +93,11 @@
|
|
||||||
mutable absl::optional<SkColor> color_cache_[kColorId_NumColors];
|
|
||||||
|
|
||||||
ScopedCssProvider theme_css_override_;
|
|
||||||
+
|
|
||||||
+ // Used to notify the web native theme of changes to dark mode, high
|
|
||||||
+ // contrast, and preferred color scheme.
|
|
||||||
+ std::unique_ptr<NativeTheme::ColorSchemeNativeThemeObserver>
|
|
||||||
+ color_scheme_observer_;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace gtk
|
|
@ -1,63 +0,0 @@
|
|||||||
--- a/chrome/renderer/chrome_render_frame_observer.cc
|
|
||||||
+++ b/chrome/renderer/chrome_render_frame_observer.cc
|
|
||||||
@@ -69,7 +69,6 @@
|
|
||||||
#include "url/gurl.h"
|
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_ANDROID)
|
|
||||||
-#include "chrome/renderer/accessibility/read_anything_app_controller.h"
|
|
||||||
#include "chrome/renderer/searchbox/searchbox_extension.h"
|
|
||||||
#endif // !BUILDFLAG(IS_ANDROID)
|
|
||||||
|
|
||||||
@@ -320,21 +319,6 @@ void ChromeRenderFrameObserver::DidCommi
|
|
||||||
}
|
|
||||||
|
|
||||||
void ChromeRenderFrameObserver::DidClearWindowObject() {
|
|
||||||
-#if !BUILDFLAG(IS_ANDROID)
|
|
||||||
- const base::CommandLine& command_line =
|
|
||||||
- *base::CommandLine::ForCurrentProcess();
|
|
||||||
- if (command_line.HasSwitch(switches::kInstantProcess))
|
|
||||||
- SearchBoxExtension::Install(render_frame()->GetWebFrame());
|
|
||||||
-
|
|
||||||
- // Install ReadAnythingAppController on render frames with the Read Anything
|
|
||||||
- // url, which is chrome-untrusted. ReadAnythingAppController installs v8
|
|
||||||
- // bindings in the chrome.readingMode namespace which are consumed by
|
|
||||||
- // read_anything/app.ts, the resource of the Read Anything WebUI.
|
|
||||||
- if (render_frame()->GetWebFrame()->GetDocument().Url() ==
|
|
||||||
- chrome::kChromeUIUntrustedReadAnythingSidePanelURL) {
|
|
||||||
- ReadAnythingAppController::Install(render_frame());
|
|
||||||
- }
|
|
||||||
-#endif // !BUILDFLAG(IS_ANDROID)
|
|
||||||
}
|
|
||||||
|
|
||||||
void ChromeRenderFrameObserver::DidMeaningfulLayout(
|
|
||||||
--- a/chrome/renderer/BUILD.gn
|
|
||||||
+++ b/chrome/renderer/BUILD.gn
|
|
||||||
@@ -383,18 +383,6 @@ static_library("renderer") {
|
|
||||||
]
|
|
||||||
} else {
|
|
||||||
sources += [
|
|
||||||
- "accessibility/ax_tree_distiller.cc",
|
|
||||||
- "accessibility/ax_tree_distiller.h",
|
|
||||||
- "accessibility/read_aloud_app_model.cc",
|
|
||||||
- "accessibility/read_aloud_app_model.h",
|
|
||||||
- "accessibility/read_aloud_traversal_utils.cc",
|
|
||||||
- "accessibility/read_aloud_traversal_utils.h",
|
|
||||||
- "accessibility/read_anything_app_controller.cc",
|
|
||||||
- "accessibility/read_anything_app_controller.h",
|
|
||||||
- "accessibility/read_anything_app_model.cc",
|
|
||||||
- "accessibility/read_anything_app_model.h",
|
|
||||||
- "accessibility/read_anything_node_utils.cc",
|
|
||||||
- "accessibility/read_anything_node_utils.h",
|
|
||||||
"media/chrome_speech_recognition_client.cc",
|
|
||||||
"media/chrome_speech_recognition_client.h",
|
|
||||||
"searchbox/searchbox.cc",
|
|
||||||
--- a/services/passage_embeddings/passage_embeddings_service.cc
|
|
||||||
+++ b/services/passage_embeddings/passage_embeddings_service.cc
|
|
||||||
@@ -6,7 +6,6 @@
|
|
||||||
|
|
||||||
#include "base/files/file.h"
|
|
||||||
#include "components/optimization_guide/machine_learning_tflite_buildflags.h"
|
|
||||||
-#include "services/passage_embeddings/passage_embedder.h"
|
|
||||||
|
|
||||||
namespace passage_embeddings {
|
|
||||||
|
|
@ -1,56 +0,0 @@
|
|||||||
diff '--color=auto' -urN chromium-130.0.6723.174.orig/chrome/browser/ui/browser_commands.cc chromium-130.0.6723.174/chrome/browser/ui/browser_commands.cc
|
|
||||||
--- chromium-130.0.6723.174.orig/chrome/browser/ui/browser_commands.cc 2024-12-20 16:23:12.000000000 +0100
|
|
||||||
+++ chromium-130.0.6723.174/chrome/browser/ui/browser_commands.cc 2025-07-08 16:23:07.925563618 +0200
|
|
||||||
@@ -5,6 +5,7 @@
|
|
||||||
#include "chrome/browser/ui/browser_commands.h"
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
+#include <numeric>
|
|
||||||
#include <optional>
|
|
||||||
#include <utility>
|
|
||||||
#include <vector>
|
|
||||||
diff '--color=auto' -urN chromium-130.0.6723.174.orig/chrome/browser/ui/lens/lens_overlay_controller.cc chromium-130.0.6723.174/chrome/browser/ui/lens/lens_overlay_controller.cc
|
|
||||||
--- chromium-130.0.6723.174.orig/chrome/browser/ui/lens/lens_overlay_controller.cc 2024-12-20 16:23:12.000000000 +0100
|
|
||||||
+++ chromium-130.0.6723.174/chrome/browser/ui/lens/lens_overlay_controller.cc 2025-07-08 16:23:07.925373915 +0200
|
|
||||||
@@ -12,6 +12,7 @@
|
|
||||||
#include "base/system/sys_info.h"
|
|
||||||
#include "base/task/bind_post_task.h"
|
|
||||||
#include "base/task/sequenced_task_runner.h"
|
|
||||||
+#include "base/task/thread_pool.h"
|
|
||||||
#include "chrome/browser/feedback/show_feedback_page.h"
|
|
||||||
#include "chrome/browser/lens/core/mojom/geometry.mojom.h"
|
|
||||||
#include "chrome/browser/lens/core/mojom/overlay_object.mojom.h"
|
|
||||||
diff '--color=auto' -urN chromium-130.0.6723.174.orig/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc chromium-130.0.6723.174/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc
|
|
||||||
--- chromium-130.0.6723.174.orig/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc 2024-12-20 16:23:12.000000000 +0100
|
|
||||||
+++ chromium-130.0.6723.174/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc 2025-07-08 16:23:07.925657709 +0200
|
|
||||||
@@ -6,6 +6,7 @@
|
|
||||||
|
|
||||||
#include "base/debug/dump_without_crashing.h"
|
|
||||||
#include "base/functional/bind.h"
|
|
||||||
+#include "base/metrics/histogram_functions.h"
|
|
||||||
#include "base/metrics/histogram_macros.h"
|
|
||||||
#include "chrome/browser/accessibility/accessibility_state_utils.h"
|
|
||||||
#include "chrome/browser/net/system_network_context_manager.h"
|
|
||||||
diff '--color=auto' -urN chromium-130.0.6723.174.orig/chrome/browser/ui/webui/searchbox/searchbox_handler.cc chromium-130.0.6723.174/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
|
|
||||||
--- chromium-130.0.6723.174.orig/chrome/browser/ui/webui/searchbox/searchbox_handler.cc 2024-12-20 16:23:12.000000000 +0100
|
|
||||||
+++ chromium-130.0.6723.174/chrome/browser/ui/webui/searchbox/searchbox_handler.cc 2025-07-08 16:23:07.925476942 +0200
|
|
||||||
@@ -6,6 +6,7 @@
|
|
||||||
|
|
||||||
#include "base/base64.h"
|
|
||||||
#include "base/base64url.h"
|
|
||||||
+#include "base/containers/contains.h"
|
|
||||||
#include "build/branding_buildflags.h"
|
|
||||||
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
|
|
||||||
#include "chrome/browser/browser_process.h"
|
|
||||||
diff '--color=auto' -urN chromium-130.0.6723.174.orig/third_party/re2/src/re2/re2.h chromium-130.0.6723.174/third_party/re2/src/re2/re2.h
|
|
||||||
--- chromium-130.0.6723.174.orig/third_party/re2/src/re2/re2.h 2024-12-20 16:23:12.000000000 +0100
|
|
||||||
+++ chromium-130.0.6723.174/third_party/re2/src/re2/re2.h 2025-07-08 16:20:41.135306190 +0200
|
|
||||||
@@ -220,7 +220,7 @@
|
|
||||||
#include "absl/base/call_once.h"
|
|
||||||
#include "absl/strings/string_view.h"
|
|
||||||
#include "absl/types/optional.h"
|
|
||||||
-#include "re2/stringpiece.h"
|
|
||||||
+#include "stringpiece.h"
|
|
||||||
|
|
||||||
#if defined(__APPLE__)
|
|
||||||
#include <TargetConditionals.h>
|
|
@ -1,93 +0,0 @@
|
|||||||
--- a/skia/BUILD.gn
|
|
||||||
+++ b/skia/BUILD.gn
|
|
||||||
@@ -8,7 +8,6 @@
|
|
||||||
import("//build/config/freetype/freetype.gni")
|
|
||||||
import("//build/config/rust.gni")
|
|
||||||
import("//build/config/sanitizers/sanitizers.gni")
|
|
||||||
-import("//build/rust/rust_static_library.gni")
|
|
||||||
import("//gpu/vulkan/features.gni")
|
|
||||||
import("//testing/test.gni")
|
|
||||||
import("//third_party/skia/gn/shared_sources.gni")
|
|
||||||
@@ -47,27 +46,6 @@
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
-source_set("path_bridge") {
|
|
||||||
- sources = skia_fontations_path_bridge_sources
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-rust_static_library("bridge_rust_side") {
|
|
||||||
- allow_unsafe = true
|
|
||||||
- crate_root = skia_fontations_bridge_root
|
|
||||||
- sources = skia_fontations_bridge_sources
|
|
||||||
- cxx_bindings = skia_fontations_bridge_sources
|
|
||||||
- deps = [
|
|
||||||
- ":path_bridge",
|
|
||||||
- "//third_party/rust/font_types/v0_7:lib",
|
|
||||||
- "//third_party/rust/read_fonts/v0_22:lib",
|
|
||||||
- "//third_party/rust/skrifa/v0_22:lib",
|
|
||||||
- ]
|
|
||||||
- configs -= [ "//build/config/compiler:chromium_code" ]
|
|
||||||
- configs += [
|
|
||||||
- ":skia_config",
|
|
||||||
- "//build/config/compiler:no_chromium_code",
|
|
||||||
- ]
|
|
||||||
-}
|
|
||||||
|
|
||||||
# External-facing config for dependent code.
|
|
||||||
config("skia_config") {
|
|
||||||
@@ -394,15 +373,9 @@
|
|
||||||
# See SK_TYPEFACE_FACTORY_FREETYPE
|
|
||||||
sources += skia_ports_freetype_sources
|
|
||||||
sources += skia_ports_fontmgr_custom_sources
|
|
||||||
- sources += skia_ports_typeface_fontations_sources
|
|
||||||
sources += skia_ports_fontmgr_empty_sources
|
|
||||||
public += skia_ports_fontmgr_empty_public
|
|
||||||
|
|
||||||
- # Fontations Rust/C++ bridge interfaces.
|
|
||||||
- deps += [
|
|
||||||
- ":bridge_rust_side",
|
|
||||||
- ":path_bridge",
|
|
||||||
- ]
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_win) {
|
|
||||||
--- a/third_party/blink/renderer/platform/fonts/web_font_typeface_factory.cc
|
|
||||||
+++ b/third_party/blink/renderer/platform/fonts/web_font_typeface_factory.cc
|
|
||||||
@@ -12,7 +12,6 @@
|
|
||||||
#include "third_party/blink/renderer/platform/fonts/opentype/font_format_check.h"
|
|
||||||
#include "third_party/skia/include/core/SkStream.h"
|
|
||||||
#include "third_party/skia/include/core/SkTypeface.h"
|
|
||||||
-#include "third_party/skia/include/ports/SkTypeface_fontations.h"
|
|
||||||
|
|
||||||
#if BUILDFLAG(IS_WIN)
|
|
||||||
#include "third_party/blink/renderer/platform/fonts/win/dwrite_font_format_support.h"
|
|
||||||
@@ -54,7 +53,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
sk_sp<SkTypeface> MakeTypefaceDefaultFontMgr(sk_sp<SkData> data) {
|
|
||||||
-#if !(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE))
|
|
||||||
+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE))
|
|
||||||
if (RuntimeEnabledFeatures::FontationsFontBackendEnabled()) {
|
|
||||||
std::unique_ptr<SkStreamAsset> stream(new SkMemoryStream(data));
|
|
||||||
return SkTypeface_Make_Fontations(std::move(stream), SkFontArguments());
|
|
||||||
@@ -82,10 +81,6 @@
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-sk_sp<SkTypeface> MakeTypefaceFontations(sk_sp<SkData> data) {
|
|
||||||
- std::unique_ptr<SkStreamAsset> stream(new SkMemoryStream(data));
|
|
||||||
- return SkTypeface_Make_Fontations(std::move(stream), SkFontArguments());
|
|
||||||
-}
|
|
||||||
|
|
||||||
sk_sp<SkTypeface> MakeVariationsTypeface(
|
|
||||||
sk_sp<SkData> data,
|
|
||||||
@@ -187,7 +182,6 @@
|
|
||||||
const FontFormatCheck format_check(data);
|
|
||||||
const FontInstantiator instantiator = {
|
|
||||||
MakeTypefaceDefaultFontMgr,
|
|
||||||
- MakeTypefaceFontations,
|
|
||||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE)
|
|
||||||
MakeTypefaceFallback,
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,82 +0,0 @@
|
|||||||
diff -r -u chromium-120.0.6099.129old/components/viz/service/display/surface_aggregator.cc chromium-120.0.6099.129/components/viz/service/display/surface_aggregator.cc
|
|
||||||
--- chromium-120.0.6099.129old/components/viz/service/display/surface_aggregator.cc 2023-12-21 01:49:05.646315300 +0100
|
|
||||||
+++ chromium-120.0.6099.129/components/viz/service/display/surface_aggregator.cc 2023-12-21 15:28:15.668850824 +0100
|
|
||||||
@@ -2228,7 +2228,7 @@
|
|
||||||
root_surface_id_ = surface_id;
|
|
||||||
|
|
||||||
// Start recording new stats for this aggregation.
|
|
||||||
- stats_.emplace();
|
|
||||||
+ stats_.emplace(AggregateStatistics{});
|
|
||||||
|
|
||||||
base::ElapsedTimer prewalk_timer;
|
|
||||||
ResolvedFrameData* resolved_frame = GetResolvedFrame(surface_id);
|
|
||||||
diff -r -u chromium-120.0.6099.129old/gpu/command_buffer/service/shared_image/shared_image_backing.cc chromium-120.0.6099.129/gpu/command_buffer/service/shared_image/shared_image_backing.cc
|
|
||||||
--- chromium-120.0.6099.129old/gpu/command_buffer/service/shared_image/shared_image_backing.cc 2023-12-21 01:49:08.186538700 +0100
|
|
||||||
+++ chromium-120.0.6099.129/gpu/command_buffer/service/shared_image/shared_image_backing.cc 2023-12-21 15:59:04.210747172 +0100
|
|
||||||
@@ -343,7 +343,7 @@
|
|
||||||
|
|
||||||
void SharedImageBacking::OnWriteSucceeded() {
|
|
||||||
AutoLock auto_lock(this);
|
|
||||||
- scoped_write_uma_.emplace();
|
|
||||||
+ scoped_write_uma_.emplace(gpu::SharedImageBacking::ScopedWriteUMA{});
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t SharedImageBacking::GetEstimatedSize() const {
|
|
||||||
diff -r -u chromium-120.0.6099.129old/gpu/command_buffer/service/shared_image/shared_image_backing.h chromium-120.0.6099.129/gpu/command_buffer/service/shared_image/shared_image_backing.h
|
|
||||||
--- chromium-120.0.6099.129old/gpu/command_buffer/service/shared_image/shared_image_backing.h 2023-12-21 01:49:08.186538700 +0100
|
|
||||||
+++ chromium-120.0.6099.129/gpu/command_buffer/service/shared_image/shared_image_backing.h 2023-12-21 15:57:27.336515319 +0100
|
|
||||||
@@ -340,8 +340,8 @@
|
|
||||||
public:
|
|
||||||
ScopedWriteUMA() = default;
|
|
||||||
|
|
||||||
- ScopedWriteUMA(const ScopedWriteUMA&) = delete;
|
|
||||||
- ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete;
|
|
||||||
+ ScopedWriteUMA(const ScopedWriteUMA&) = default;
|
|
||||||
+ ScopedWriteUMA& operator=(const ScopedWriteUMA&) = default;
|
|
||||||
|
|
||||||
~ScopedWriteUMA() {
|
|
||||||
UMA_HISTOGRAM_BOOLEAN("GPU.SharedImage.ContentConsumed",
|
|
||||||
diff -r -u chromium-120.0.6099.129old/mojo/public/cpp/bindings/lib/multiplex_router.cc chromium-120.0.6099.129/mojo/public/cpp/bindings/lib/multiplex_router.cc
|
|
||||||
--- chromium-120.0.6099.129old/mojo/public/cpp/bindings/lib/multiplex_router.cc 2023-12-21 01:49:10.754764600 +0100
|
|
||||||
+++ chromium-120.0.6099.129/mojo/public/cpp/bindings/lib/multiplex_router.cc 2023-12-21 13:19:27.412481231 +0100
|
|
||||||
@@ -870,7 +870,7 @@
|
|
||||||
DCHECK(!exclusive_sync_wait_);
|
|
||||||
|
|
||||||
scoped_refptr<MultiplexRouter> keep_alive(this);
|
|
||||||
- exclusive_sync_wait_.emplace();
|
|
||||||
+ exclusive_sync_wait_.emplace(ExclusiveSyncWaitInfo{});
|
|
||||||
exclusive_sync_wait_->interface_id = interface_id;
|
|
||||||
exclusive_sync_wait_->request_id = request_id;
|
|
||||||
while (!exclusive_sync_wait_->finished) {
|
|
||||||
--- a/third_party/blink/common/interest_group/auction_config_mojom_traits.cc
|
|
||||||
+++ b/third_party/blink/common/interest_group/auction_config_mojom_traits.cc
|
|
||||||
@@ -207,8 +207,6 @@
|
|
||||||
!data.ReadAllBuyersPrioritySignals(&out->all_buyers_priority_signals) ||
|
|
||||||
!data.ReadAuctionReportBuyerKeys(&out->auction_report_buyer_keys) ||
|
|
||||||
!data.ReadAuctionReportBuyers(&out->auction_report_buyers) ||
|
|
||||||
- !data.ReadAuctionReportBuyerDebugModeConfig(
|
|
||||||
- &out->auction_report_buyer_debug_mode_config) ||
|
|
||||||
!data.ReadRequiredSellerCapabilities(
|
|
||||||
&out->required_seller_capabilities) ||
|
|
||||||
!data.ReadRequestedSize(&out->requested_size) ||
|
|
||||||
--- a/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h
|
|
||||||
+++ b/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h
|
|
||||||
@@ -594,7 +594,7 @@
|
|
||||||
mojom::blink::ScrollBehavior scroll_behavior) override {
|
|
||||||
if (!should_restore_scroll)
|
|
||||||
return;
|
|
||||||
- pending_view_state_.emplace();
|
|
||||||
+ pending_view_state_.emplace(PendingViewState{});
|
|
||||||
pending_view_state_->state = view_state;
|
|
||||||
pending_view_state_->scroll_behavior = scroll_behavior;
|
|
||||||
}
|
|
||||||
--- a/third_party/blink/renderer/platform/wtf/text/string_view.h
|
|
||||||
+++ b/third_party/blink/renderer/platform/wtf/text/string_view.h
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
#include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
|
|
||||||
#include "third_party/blink/renderer/platform/wtf/get_ptr.h"
|
|
||||||
#include "third_party/blink/renderer/platform/wtf/text/string_impl.h"
|
|
||||||
+#include "third_party/blink/renderer/platform/wtf/text/code_point_iterator.h"
|
|
||||||
|
|
||||||
#if DCHECK_IS_ON()
|
|
||||||
#include "base/memory/scoped_refptr.h"
|
|
@ -1,288 +0,0 @@
|
|||||||
--- a/build/config/compiler/BUILD.gn
|
|
||||||
+++ b/build/config/compiler/BUILD.gn
|
|
||||||
@@ -311,9 +311,6 @@
|
|
||||||
|
|
||||||
configs += [
|
|
||||||
# See the definitions below.
|
|
||||||
- ":clang_revision",
|
|
||||||
- ":rustc_revision",
|
|
||||||
- ":compiler_cpu_abi",
|
|
||||||
":compiler_codegen",
|
|
||||||
":compiler_deterministic",
|
|
||||||
]
|
|
||||||
@@ -587,63 +584,6 @@
|
|
||||||
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (is_clang && !is_nacl) {
|
|
||||||
- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
|
|
||||||
- if (save_reproducers_on_lld_crash && use_lld) {
|
|
||||||
- ldflags += [
|
|
||||||
- "-fcrash-diagnostics=all",
|
|
||||||
- "-fcrash-diagnostics-dir=" + clang_diagnostic_dir,
|
|
||||||
- ]
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- # TODO(hans): Remove this once Clang generates better optimized debug info
|
|
||||||
- # by default. https://crbug.com/765793
|
|
||||||
- cflags += [
|
|
||||||
- "-mllvm",
|
|
||||||
- "-instcombine-lower-dbg-declare=0",
|
|
||||||
- ]
|
|
||||||
- if (!is_debug && use_thin_lto && is_a_target_toolchain) {
|
|
||||||
- if (is_win) {
|
|
||||||
- ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ]
|
|
||||||
- } else {
|
|
||||||
- ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- # TODO(crbug.com/40283598): This causes binary size growth and potentially
|
|
||||||
- # other problems.
|
|
||||||
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
|
|
||||||
- if (default_toolchain != "//build/toolchain/cros:target" &&
|
|
||||||
- !llvm_android_mainline) {
|
|
||||||
- cflags += [
|
|
||||||
- # "-mllvm",
|
|
||||||
- # "-split-threshold-for-reg-with-hint=0",
|
|
||||||
- ]
|
|
||||||
- if (use_thin_lto && is_a_target_toolchain) {
|
|
||||||
- if (is_win) {
|
|
||||||
- # ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
|
|
||||||
- } else {
|
|
||||||
- # ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- if (use_avx2 || use_avx512 || use_fma || current_cpu == "arm64" || is_mac) {
|
|
||||||
- if (is_win) {
|
|
||||||
- cflags += [ "/clang:-ffp-contract=fast" ]
|
|
||||||
- } else {
|
|
||||||
- cflags += [ "-ffp-contract=fast" ]
|
|
||||||
- }
|
|
||||||
- } else {
|
|
||||||
- # TODO(crbug.com/40192287): Investigate why/if this should be needed.
|
|
||||||
- if (is_win) {
|
|
||||||
- cflags += [ "/clang:-ffp-contract=off" ]
|
|
||||||
- } else {
|
|
||||||
- cflags += [ "-ffp-contract=off" ]
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
# C11/C++11 compiler flags setup.
|
|
||||||
# ---------------------------
|
|
||||||
if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
|
|
||||||
@@ -1748,52 +1688,6 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- # Makes builds independent of absolute file path.
|
|
||||||
- if (is_clang && strip_absolute_paths_from_debug_symbols) {
|
|
||||||
- # If debug option is given, clang includes $cwd in debug info by default.
|
|
||||||
- # For such build, this flag generates reproducible obj files even we use
|
|
||||||
- # different build directory like "out/feature_a" and "out/feature_b" if
|
|
||||||
- # we build same files with same compile flag.
|
|
||||||
- # Other paths are already given in relative, no need to normalize them.
|
|
||||||
- if (is_nacl) {
|
|
||||||
- # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
|
|
||||||
- cflags += [
|
|
||||||
- "-Xclang",
|
|
||||||
- "-fdebug-compilation-dir",
|
|
||||||
- "-Xclang",
|
|
||||||
- ".",
|
|
||||||
- ]
|
|
||||||
- } else {
|
|
||||||
- # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
|
|
||||||
- # and -fcoverage-compilation-dir=.
|
|
||||||
- cflags += [ "-ffile-compilation-dir=." ]
|
|
||||||
-
|
|
||||||
- # Convert absolute paths to relative paths. Expands to, for example:
|
|
||||||
- # -file-prefix-map /path/to/chromium/src=../..
|
|
||||||
- swiftflags += [
|
|
||||||
- "-file-prefix-map",
|
|
||||||
- rebase_path("//.", "") + "=" + rebase_path("//.", root_build_dir),
|
|
||||||
- ]
|
|
||||||
- }
|
|
||||||
- if (!is_win) {
|
|
||||||
- # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
|
|
||||||
- asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- if (is_win && use_lld) {
|
|
||||||
- if (symbol_level == 2 || (is_clang && using_sanitizer)) {
|
|
||||||
- # Absolutize source file paths for PDB. Pass the real build directory
|
|
||||||
- # if the pdb contains source-level debug information and if linker
|
|
||||||
- # reproducibility is not critical.
|
|
||||||
- ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]
|
|
||||||
- } else {
|
|
||||||
- # Use a fake fixed base directory for paths in the pdb to make the pdb
|
|
||||||
- # output fully deterministic and independent of the build directory.
|
|
||||||
- ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
# Tells the compiler not to use absolute paths when passing the default
|
|
||||||
# paths to the tools it invokes. We don't want this because we don't
|
|
||||||
# really need it and it can mess up the RBE cache entries.
|
|
||||||
@@ -1812,40 +1706,6 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-config("clang_revision") {
|
|
||||||
- if (is_clang && clang_base_path == default_clang_base_path &&
|
|
||||||
- current_os != "zos") {
|
|
||||||
- update_args = [
|
|
||||||
- "--print-revision",
|
|
||||||
- "--verify-version=$clang_version",
|
|
||||||
- ]
|
|
||||||
- if (llvm_force_head_revision) {
|
|
||||||
- update_args += [ "--llvm-force-head-revision" ]
|
|
||||||
- }
|
|
||||||
- clang_revision = exec_script("//tools/clang/scripts/update.py",
|
|
||||||
- update_args,
|
|
||||||
- "trim string")
|
|
||||||
-
|
|
||||||
- # This is here so that all files get recompiled after a clang roll and
|
|
||||||
- # when turning clang on or off. (defines are passed via the command line,
|
|
||||||
- # and build system rebuild things when their commandline changes). Nothing
|
|
||||||
- # should ever read this define.
|
|
||||||
- defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ]
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-config("rustc_revision") {
|
|
||||||
- if (rustc_revision != "") {
|
|
||||||
- # Similar to the above config, this is here so that all files get recompiled
|
|
||||||
- # after a rustc roll. Nothing should ever read this cfg. This will not be
|
|
||||||
- # set if a custom toolchain is used.
|
|
||||||
- rustflags = [
|
|
||||||
- "--cfg",
|
|
||||||
- "cr_rustc_revision=\"$rustc_revision\"",
|
|
||||||
- ]
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
config("compiler_arm_fpu") {
|
|
||||||
if (current_cpu == "arm" && !is_ios && !is_nacl) {
|
|
||||||
cflags = [ "-mfpu=$arm_fpu" ]
|
|
||||||
@@ -2252,11 +2112,7 @@
|
|
||||||
defines = [ "_HAS_NODISCARD" ]
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
- cflags = [ "-Wall" ]
|
|
||||||
- if (is_clang) {
|
|
||||||
- # Enable extra warnings for chromium_code when we control the compiler.
|
|
||||||
- cflags += [ "-Wextra" ]
|
|
||||||
- }
|
|
||||||
+ cflags = []
|
|
||||||
|
|
||||||
# In Chromium code, we define __STDC_foo_MACROS in order to get the
|
|
||||||
# C99 macros on Mac and Linux.
|
|
||||||
@@ -2265,24 +2121,6 @@
|
|
||||||
"__STDC_FORMAT_MACROS",
|
|
||||||
]
|
|
||||||
|
|
||||||
- if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
|
|
||||||
- current_cpu != "s390" && current_cpu != "ppc64" &&
|
|
||||||
- current_cpu != "mips" && current_cpu != "mips64" &&
|
|
||||||
- current_cpu != "riscv64" && current_cpu != "loong64") {
|
|
||||||
- # Non-chromium code is not guaranteed to compile cleanly with
|
|
||||||
- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
|
|
||||||
- # disabled, so only do that for Release build.
|
|
||||||
- fortify_level = "2"
|
|
||||||
-
|
|
||||||
- # ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3
|
|
||||||
- # implementation with a few custom glibc patches. Use that if it's
|
|
||||||
- # available.
|
|
||||||
- if (is_chromeos_device && !lacros_use_chromium_toolchain) {
|
|
||||||
- fortify_level = "3"
|
|
||||||
- }
|
|
||||||
- defines += [ "_FORTIFY_SOURCE=" + fortify_level ]
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
if (is_apple) {
|
|
||||||
cflags_objc = [ "-Wimplicit-retain-self" ]
|
|
||||||
cflags_objcc = [ "-Wimplicit-retain-self" ]
|
|
||||||
@@ -2950,7 +2788,8 @@
|
|
||||||
# [0]: https://pinpoint-dot-chromeperf.appspot.com/job/147634a8be0000
|
|
||||||
# [1]: https://pinpoint-dot-chromeperf.appspot.com/job/132bc772be0000
|
|
||||||
# [2]: https://crrev.com/c/5447532
|
|
||||||
-config("optimize") {
|
|
||||||
+config("optimize") { }
|
|
||||||
+config("xoptimize") {
|
|
||||||
if (is_win) {
|
|
||||||
# clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for
|
|
||||||
# consistency with the other platforms.
|
|
||||||
@@ -3000,7 +2839,8 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
# Turn off optimizations.
|
|
||||||
-config("no_optimize") {
|
|
||||||
+config("no_optimize") { }
|
|
||||||
+config("xno_optimize") {
|
|
||||||
if (is_win) {
|
|
||||||
cflags = [
|
|
||||||
"/Od", # Disable optimization.
|
|
||||||
@@ -3040,7 +2880,8 @@
|
|
||||||
# Turns up the optimization level. Used to explicitly enable -O2 instead of
|
|
||||||
# -Os for select targets on platforms that use optimize_for_size. No-op
|
|
||||||
# elsewhere.
|
|
||||||
-config("optimize_max") {
|
|
||||||
+config("optimize_max") { }
|
|
||||||
+config("xoptimize_max") {
|
|
||||||
if (is_nacl && is_nacl_irt) {
|
|
||||||
# The NaCl IRT is a special case and always wants its own config.
|
|
||||||
# Various components do:
|
|
||||||
@@ -3076,7 +2917,8 @@
|
|
||||||
#
|
|
||||||
# TODO(crbug.com/41259697) - rework how all of these configs are related
|
|
||||||
# so that we don't need this disclaimer.
|
|
||||||
-config("optimize_speed") {
|
|
||||||
+config("optimize_speed") { }
|
|
||||||
+config("xoptimize_speed") {
|
|
||||||
if (is_nacl && is_nacl_irt) {
|
|
||||||
# The NaCl IRT is a special case and always wants its own config.
|
|
||||||
# Various components do:
|
|
||||||
@@ -3105,7 +2947,8 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-config("optimize_fuzzing") {
|
|
||||||
+config("optimize_fuzzing") { }
|
|
||||||
+config("xoptimize_fuzzing") {
|
|
||||||
cflags = [ "-O3" ] + common_optimize_on_cflags
|
|
||||||
rustflags = [ "-Copt-level=3", ]
|
|
||||||
ldflags = common_optimize_on_ldflags
|
|
||||||
@@ -3271,7 +3114,8 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
# Full symbols.
|
|
||||||
-config("symbols") {
|
|
||||||
+config("symbols") { }
|
|
||||||
+config("xsymbols") {
|
|
||||||
rustflags = []
|
|
||||||
configs = []
|
|
||||||
if (is_win) {
|
|
||||||
@@ -3433,7 +3277,8 @@
|
|
||||||
# Minimal symbols.
|
|
||||||
# This config guarantees to hold symbol for stack trace which are shown to user
|
|
||||||
# when crash happens in unittests running on buildbot.
|
|
||||||
-config("minimal_symbols") {
|
|
||||||
+config("minimal_symbols") { }
|
|
||||||
+config("xminimal_symbols") {
|
|
||||||
rustflags = []
|
|
||||||
if (is_win) {
|
|
||||||
# Functions, files, and line tables only.
|
|
||||||
@@ -3518,7 +3363,8 @@
|
|
||||||
# This configuration contains function names only. That is, the compiler is
|
|
||||||
# told to not generate debug information and the linker then just puts function
|
|
||||||
# names in the final debug information.
|
|
||||||
-config("no_symbols") {
|
|
||||||
+config("no_symbols") { }
|
|
||||||
+config("xno_symbols") {
|
|
||||||
if (is_win) {
|
|
||||||
ldflags = [ "/DEBUG" ]
|
|
||||||
|
|
@ -1,175 +0,0 @@
|
|||||||
--- a/build/config/compiler/BUILD.gn
|
|
||||||
+++ b/build/config/compiler/BUILD.gn
|
|
||||||
@@ -206,7 +206,7 @@
|
|
||||||
# Set to true to use icf, Identical Code Folding.
|
|
||||||
use_icf = (is_posix || is_fuchsia) && !is_debug && !using_sanitizer &&
|
|
||||||
!use_clang_coverage && current_os != "zos" &&
|
|
||||||
- !(is_android && use_order_profiling) && use_lld
|
|
||||||
+ !(is_android && use_order_profiling) && (use_lld || use_mold)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_android) {
|
|
||||||
@@ -377,7 +377,9 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (use_lld) {
|
|
||||||
+ if (use_mold) {
|
|
||||||
+ ldflags += [ "-fuse-ld=mold" ]
|
|
||||||
+ } else if (use_lld) {
|
|
||||||
ldflags += [ "-fuse-ld=lld" ]
|
|
||||||
if (lld_path != "") {
|
|
||||||
ldflags += [ "-B$lld_path" ]
|
|
||||||
@@ -430,7 +432,7 @@
|
|
||||||
# links.
|
|
||||||
ldflags += [ "-Wl,--build-id=sha1" ]
|
|
||||||
} else if (current_os != "aix" && current_os != "zos") {
|
|
||||||
- if (use_lld && !is_nacl) {
|
|
||||||
+ if ((use_lld || use_mold) && !is_nacl) {
|
|
||||||
ldflags += [ "-Wl,--build-id=fast" ]
|
|
||||||
} else {
|
|
||||||
ldflags += [ "-Wl,--build-id" ]
|
|
||||||
@@ -511,7 +513,7 @@
|
|
||||||
|
|
||||||
# Linux-specific compiler flags setup.
|
|
||||||
# ------------------------------------
|
|
||||||
- if (use_icf && (!is_apple || use_lld)) {
|
|
||||||
+ if (use_icf && (!is_apple || use_lld || use_mold)) {
|
|
||||||
ldflags += [ "-Wl,--icf=all" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -549,7 +551,7 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (use_lld) {
|
|
||||||
+ if (use_lld || use_mold) {
|
|
||||||
# TODO(thakis): Make the driver pass --color-diagnostics to the linker
|
|
||||||
# if -fcolor-diagnostics is passed to it, and pass -fcolor-diagnostics
|
|
||||||
# in ldflags instead.
|
|
||||||
@@ -564,7 +566,7 @@
|
|
||||||
|
|
||||||
# Enable text section splitting only on linux when using lld for now. Other
|
|
||||||
# platforms can be added later if needed.
|
|
||||||
- if ((is_linux || is_chromeos) && use_lld && use_text_section_splitting) {
|
|
||||||
+ if ((is_linux || is_chromeos) && (use_lld || use_mold) && use_text_section_splitting) {
|
|
||||||
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -732,7 +734,7 @@
|
|
||||||
# [0]: https://pinpoint-dot-chromeperf.appspot.com/job/15efb0313e0000
|
|
||||||
# [1]: https://pinpoint-dot-chromeperf.appspot.com/job/157f0b42be0000
|
|
||||||
if (!is_debug && use_thin_lto && is_a_target_toolchain) {
|
|
||||||
- assert(use_lld, "LTO is only supported with lld")
|
|
||||||
+ assert(use_lld || use_mold, "LTO is only supported with lld or mold")
|
|
||||||
|
|
||||||
cflags += [
|
|
||||||
"-flto=thin",
|
|
||||||
@@ -774,7 +776,9 @@
|
|
||||||
# [0]: https://pinpoint-dot-chromeperf.appspot.com/job/16984a18be0000
|
|
||||||
# [1]: https://pinpoint-dot-chromeperf.appspot.com/job/11984a18be0000
|
|
||||||
# [2]: https://ci.chromium.org/ui/p/chromium/builders/try/android-binary-size/1848442
|
|
||||||
+ if (!use_mold) {
|
|
||||||
import_instr_limit = 100
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (is_win) {
|
|
||||||
ldflags += [
|
|
||||||
@@ -807,7 +811,9 @@
|
|
||||||
import_instr_limit = 5
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (!use_mold) {
|
|
||||||
ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (is_apple) {
|
|
||||||
ldflags += [ "-Wcrl,object_path_lto" ]
|
|
||||||
@@ -815,7 +821,9 @@
|
|
||||||
|
|
||||||
# We only use one version of LLVM within a build so there's no need to
|
|
||||||
# upgrade debug info, which can be expensive since it runs the verifier.
|
|
||||||
+ if (!use_mold) {
|
|
||||||
ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!optimize_for_size) {
|
|
||||||
@@ -827,7 +835,7 @@
|
|
||||||
]
|
|
||||||
if (is_win) {
|
|
||||||
ldflags += [ "-mllvm:-inlinehint-threshold=360" ]
|
|
||||||
- } else {
|
|
||||||
+ } else if (!use_mold) {
|
|
||||||
ldflags += [ "-Wl,-mllvm,-inlinehint-threshold=360" ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -888,7 +896,7 @@
|
|
||||||
|
|
||||||
# TODO(crbug.com/40242425): Cleanup undefined symbol errors caught by
|
|
||||||
# --no-undefined-version.
|
|
||||||
- if (use_lld && !is_win && !is_mac && !is_ios) {
|
|
||||||
+ if ((use_lld || use_mold) && !is_win && !is_mac && !is_ios) {
|
|
||||||
ldflags += [ "-Wl,--undefined-version" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -948,7 +956,7 @@
|
|
||||||
assert(
|
|
||||||
is_android && host_os == "linux",
|
|
||||||
"MLGO is currently only supported for targeting Android on a linux host")
|
|
||||||
- if (use_thin_lto) {
|
|
||||||
+ if (use_thin_lto && !use_mold ) {
|
|
||||||
ldflags += [ "-Wl,-mllvm,-enable-ml-inliner=release" ]
|
|
||||||
if (is_high_end_android) {
|
|
||||||
# Besides using the arm64 - trained model, instruct the inline advisor
|
|
||||||
@@ -1545,7 +1553,9 @@
|
|
||||||
# This can be removed once https://bugs.llvm.org/show_bug.cgi?id=40348
|
|
||||||
# has been resolved, and -mno-outline is obeyed by the linker during
|
|
||||||
# ThinLTO.
|
|
||||||
+ if (!use_mold) {
|
|
||||||
ldflags += [ "-Wl,-mllvm,-enable-machine-outliner=never" ]
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
asmflags = cflags
|
|
||||||
@@ -2928,7 +2938,7 @@
|
|
||||||
# sections" there. Maybe just a bug in nacl_switch_32.S.
|
|
||||||
_enable_gdb_index =
|
|
||||||
symbol_level == 2 && !is_apple && !is_nacl && current_cpu != "x86" &&
|
|
||||||
- current_os != "zos" && use_lld &&
|
|
||||||
+ current_os != "zos" && (use_lld || use_mold) &&
|
|
||||||
# Disable on non-fission 32-bit Android because it pushes
|
|
||||||
# libcomponents_unittests over the 4gb size limit.
|
|
||||||
!(is_android && !use_debug_fission && current_cpu != "x64" &&
|
|
||||||
--- a/build/config/compiler/pgo/BUILD.gn
|
|
||||||
+++ b/build/config/compiler/pgo/BUILD.gn
|
|
||||||
@@ -150,7 +150,7 @@
|
|
||||||
if (use_thin_lto) {
|
|
||||||
if (is_win) {
|
|
||||||
ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ]
|
|
||||||
- } else {
|
|
||||||
+ } else if (!use_mold) {
|
|
||||||
ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ]
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
--- a/build/config/compiler/compiler.gni.orig
|
|
||||||
+++ b/build/config/compiler/compiler.gni
|
|
||||||
@@ -36,6 +36,9 @@
|
|
||||||
# The default linker everywhere else.
|
|
||||||
use_lld = is_clang && current_os != "zos"
|
|
||||||
|
|
||||||
+ # Set to true to use mold, the modern linker.
|
|
||||||
+ use_mold = false
|
|
||||||
+
|
|
||||||
# If true, optimize for size.
|
|
||||||
# Default to favoring speed over size for platforms not listed below.
|
|
||||||
optimize_for_size =
|
|
||||||
@@ -74,7 +77,7 @@
|
|
||||||
# gcc >= 4.8 or clang.
|
|
||||||
# http://gcc.gnu.org/wiki/DebugFission
|
|
||||||
use_debug_fission = !is_android && !is_fuchsia && !is_apple && !is_win &&
|
|
||||||
- use_lld && cc_wrapper == ""
|
|
||||||
+ (use_lld || use_mold) && cc_wrapper == ""
|
|
||||||
|
|
||||||
# Enables support for ThinLTO, which links 3x-10x faster than full LTO. See
|
|
||||||
# also http://blog.llvm.org/2016/06/thinlto-scalable-and-incremental-lto.html
|
|
@ -1,16 +0,0 @@
|
|||||||
--- a/build/config/clang/BUILD.gn
|
|
||||||
+++ b/build/config/clang/BUILD.gn
|
|
||||||
@@ -237,7 +237,12 @@
|
|
||||||
|
|
||||||
# Adds a dependency on the Clang runtime library clang_rt.builtins.
|
|
||||||
clang_lib("compiler_builtins") {
|
|
||||||
- if (is_mac) {
|
|
||||||
+ if (!toolchain_has_rust) {
|
|
||||||
+ # Since there's no Rust in the toolchain, there's no concern that we'll use
|
|
||||||
+ # the Rust stdlib's intrinsics here.
|
|
||||||
+ #
|
|
||||||
+ # Don't define libname which makes this target do nothing.
|
|
||||||
+ } else if (is_mac) {
|
|
||||||
libname = "osx"
|
|
||||||
} else if (is_ios) {
|
|
||||||
if (target_environment == "simulator") {
|
|
@ -1,133 +0,0 @@
|
|||||||
https://chromium.googlesource.com/chromium/src/+/0d8d0e0943489b59e452b4d0214959821880ad7f
|
|
||||||
From: Matt Jolly <kangie@gentoo.org>
|
|
||||||
Date: Tue, 28 Jan 2025 12:00:57 -0800
|
|
||||||
Subject: [PATCH] UI: make QT5 optional
|
|
||||||
|
|
||||||
To build with `use_qt6`, QT5 (`use_qt`) is also required.
|
|
||||||
This is undesirable for downstreams who are actively working
|
|
||||||
to drop support for QT5 (e.g. Gentoo).
|
|
||||||
|
|
||||||
To resolve this:
|
|
||||||
|
|
||||||
- Add `use_qt5`
|
|
||||||
- Replace most `use_qt` conditionals with this option;
|
|
||||||
these appear to be from before QT6 support was added.
|
|
||||||
- Use `use_qt5` to gate some previously unconditional QT5-related
|
|
||||||
items in chrome/installer/linux
|
|
||||||
- Remove `use_qt` as an argument, instead set to `use_qt5 || use_qt6`.
|
|
||||||
|
|
||||||
This change should not impact the current behaviour; if no options
|
|
||||||
are selected QT5 and QT6 support will be enabled, using existing logic
|
|
||||||
unless one is explicitly disabled with `use_qt{x}=false`.
|
|
||||||
|
|
||||||
See-also: https://bugs.gentoo.org/926166, https://bugs.gentoo.org/948836
|
|
||||||
Signed-off-by: Matt Jolly <kangie@gentoo.org>
|
|
||||||
Fixed: 328182252
|
|
||||||
Change-Id: I22ec7a068356412d3f9fce68a19aee4f8c89892c
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6205488
|
|
||||||
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
|
|
||||||
Commit-Queue: Lei Zhang <thestig@chromium.org>
|
|
||||||
Reviewed-by: Lei Zhang <thestig@chromium.org>
|
|
||||||
Cr-Commit-Position: refs/heads/main@{#1412471}
|
|
||||||
--- a/chrome/installer/linux/BUILD.gn
|
|
||||||
+++ b/chrome/installer/linux/BUILD.gn
|
|
||||||
@@ -77,10 +77,10 @@ if (enable_swiftshader) {
|
|
||||||
packaging_files += [ "$root_out_dir/vk_swiftshader_icd.json" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
-if (use_qt) {
|
|
||||||
- # Even though this is a shared library, add it to `packaging_files` instead of
|
|
||||||
- # `packaging_files_shlibs` to skip the dependency check. This is intentional
|
|
||||||
- # to prevent a hard dependency on QT for the package.
|
|
||||||
+# Even though this is a shared library, add it to `packaging_files` instead of
|
|
||||||
+# `packaging_files_shlibs` to skip the dependency check. This is intentional
|
|
||||||
+# to prevent a hard dependency on QT for the package.
|
|
||||||
+if (use_qt5) {
|
|
||||||
packaging_files += [ "$root_out_dir/libqt5_shim.so" ]
|
|
||||||
}
|
|
||||||
if (use_qt6) {
|
|
||||||
@@ -206,7 +206,7 @@ if (build_with_internal_optimization_guide) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-if (use_qt) {
|
|
||||||
+if (use_qt5) {
|
|
||||||
strip_binary("strip_qt5_shim") {
|
|
||||||
binary_input = "$root_out_dir/libqt5_shim.so"
|
|
||||||
deps = [ "//ui/qt:qt5_shim" ]
|
|
||||||
@@ -399,7 +399,7 @@ group("installer_deps") {
|
|
||||||
"//components/optimization_guide/internal:optimization_guide_internal",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
- if (use_qt) {
|
|
||||||
+ if (use_qt5) {
|
|
||||||
public_deps += [
|
|
||||||
":strip_qt5_shim",
|
|
||||||
"//ui/qt:qt5_shim",
|
|
||||||
--- a/ui/qt/BUILD.gn
|
|
||||||
+++ b/ui/qt/BUILD.gn
|
|
||||||
@@ -101,10 +101,12 @@ template("qt_shim") {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-qt_shim("qt5_shim") {
|
|
||||||
- qt_version = "5"
|
|
||||||
- if (!use_sysroot) {
|
|
||||||
- moc_qt_path = "$moc_qt5_path"
|
|
||||||
+if (use_qt5) {
|
|
||||||
+ qt_shim("qt5_shim") {
|
|
||||||
+ qt_version = "5"
|
|
||||||
+ if (!use_sysroot) {
|
|
||||||
+ moc_qt_path = "$moc_qt5_path"
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (use_qt6) {
|
|
||||||
@@ -122,7 +124,10 @@ component("qt") {
|
|
||||||
defines = [ "IS_QT_IMPL" ]
|
|
||||||
|
|
||||||
# qt_shim is in data_deps since we want to load it manually.
|
|
||||||
- data_deps = [ ":qt5_shim" ]
|
|
||||||
+ data_deps = []
|
|
||||||
+ if (use_qt5) {
|
|
||||||
+ data_deps += [ ":qt5_shim" ]
|
|
||||||
+ }
|
|
||||||
if (use_qt6) {
|
|
||||||
data_deps += [ ":qt6_shim" ]
|
|
||||||
}
|
|
||||||
--- a/ui/qt/qt.gni
|
|
||||||
+++ b/ui/qt/qt.gni
|
|
||||||
@@ -6,27 +6,20 @@ import("//build/config/cast.gni")
|
|
||||||
import("//build/config/sanitizers/sanitizers.gni")
|
|
||||||
import("//build/config/sysroot.gni")
|
|
||||||
|
|
||||||
+# TODO(crbug.com/40260415): Allow QT in MSAN builds once QT is
|
|
||||||
+# added to the instrumented libraries.
|
|
||||||
declare_args() {
|
|
||||||
- # TODO(crbug.com/40260415): Allow QT in MSAN builds once QT is
|
|
||||||
- # added to the instrumented libraries.
|
|
||||||
- use_qt = is_linux && !is_castos && !is_msan
|
|
||||||
+ use_qt5 = use_sysroot && is_linux && !is_castos && !is_msan
|
|
||||||
+ use_qt6 = use_sysroot && is_linux && !is_castos && !is_msan
|
|
||||||
}
|
|
||||||
|
|
||||||
declare_args() {
|
|
||||||
- if (!use_sysroot && use_qt) {
|
|
||||||
+ if (!use_sysroot && use_qt5) {
|
|
||||||
moc_qt5_path = ""
|
|
||||||
}
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-declare_args() {
|
|
||||||
- use_qt6 = use_qt && use_sysroot
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-declare_args() {
|
|
||||||
if (!use_sysroot && use_qt6) {
|
|
||||||
moc_qt6_path = ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-# use_qt6 => use_qt
|
|
||||||
-assert(!use_qt6 || use_qt)
|
|
||||||
+use_qt = use_qt5 || use_qt6
|
|
@ -1,28 +0,0 @@
|
|||||||
https://bugs.gentoo.org/953436#c5
|
|
||||||
--- a/third_party/blink/renderer/build/scripts/gperf.py
|
|
||||||
+++ b/third_party/blink/renderer/build/scripts/gperf.py
|
|
||||||
@@ -28,24 +28,6 @@
|
|
||||||
stdout=subprocess.PIPE,
|
|
||||||
universal_newlines=True)
|
|
||||||
gperf_output = gperf.communicate(gperf_input)[0]
|
|
||||||
- # Massage gperf output to be more palatable for modern compilers.
|
|
||||||
- # TODO(thakis): Upstream these to gperf so we don't need massaging.
|
|
||||||
- # `register` is deprecated in C++11 and removed in C++17, so remove
|
|
||||||
- # it from gperf's output.
|
|
||||||
- # https://savannah.gnu.org/bugs/index.php?53028
|
|
||||||
- gperf_output = re.sub(r'\bregister ', '', gperf_output)
|
|
||||||
- # -Wimplicit-fallthrough needs an explicit fallthrough statement,
|
|
||||||
- # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
|
|
||||||
- # https://savannah.gnu.org/bugs/index.php?53029
|
|
||||||
- gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
|
|
||||||
- ' [[fallthrough]];')
|
|
||||||
- # -Wpointer-to-int-cast warns about casting pointers to smaller ints
|
|
||||||
- # Replace {(int)(long)&(foo), bar} with
|
|
||||||
- # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
|
|
||||||
- gperf_output = re.sub(
|
|
||||||
- r'\(int\)\(long\)(.*?),',
|
|
||||||
- r'static_cast<int>(reinterpret_cast<uintptr_t>(\1)),',
|
|
||||||
- gperf_output)
|
|
||||||
script = 'third_party/blink/renderer/build/scripts/gperf.py'
|
|
||||||
return '// Generated by %s\n' % script + gperf_output
|
|
||||||
except OSError:
|
|
@ -1,12 +0,0 @@
|
|||||||
--- a/chrome/browser/renderer_preferences_util.cc 2025-06-09 23:43:12.302027536 +0700
|
|
||||||
+++ b/chrome/browser/renderer_preferences_util.cc 2025-06-09 23:43:38.084028322 +0700
|
|
||||||
@@ -183,7 +183,8 @@
|
|
||||||
#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
|
|
||||||
auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
|
|
||||||
if (linux_ui_theme) {
|
|
||||||
- if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
|
|
||||||
+ if (ThemeServiceFactory::GetForProfile(profile) &&
|
|
||||||
+ ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
|
|
||||||
linux_ui_theme->GetFocusRingColor(&prefs->focus_ring_color);
|
|
||||||
linux_ui_theme->GetActiveSelectionBgColor(
|
|
||||||
&prefs->active_selection_bg_color);
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -up chromium-99.0.4818.0/media/audio/audio_opus_encoder.h.omv~ chromium-99.0.4818.0/media/audio/audio_opus_encoder.h
|
|
||||||
--- chromium-99.0.4818.0/media/audio/audio_opus_encoder.h.omv~ 2022-01-13 05:42:57.571250471 +0100
|
|
||||||
+++ chromium-99.0.4818.0/media/audio/audio_opus_encoder.h 2022-01-13 05:43:06.233291236 +0100
|
|
||||||
@@ -13,7 +13,7 @@
|
|
||||||
#include "media/base/audio_encoder.h"
|
|
||||||
#include "media/base/audio_push_fifo.h"
|
|
||||||
#include "media/base/audio_timestamp_helper.h"
|
|
||||||
-#include "third_party/opus/src/include/opus.h"
|
|
||||||
+#include <opus/opus.h>
|
|
||||||
|
|
||||||
namespace media {
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
--- a/build/toolchain/linux/unbundle/BUILD.gn
|
|
||||||
+++ b/build/toolchain/linux/unbundle/BUILD.gn
|
|
||||||
@@ -35,7 +35,7 @@ gcc_toolchain("host") {
|
|
||||||
extra_ldflags = getenv("BUILD_LDFLAGS")
|
|
||||||
|
|
||||||
toolchain_args = {
|
|
||||||
- current_cpu = current_cpu
|
|
||||||
- current_os = current_os
|
|
||||||
+ current_cpu = host_cpu
|
|
||||||
+ current_os = host_os
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
--- a/media/filters/ffmpeg_glue.cc
|
|
||||||
+++ b/media/filters/ffmpeg_glue.cc
|
|
||||||
@@ -123,7 +123,8 @@
|
|
||||||
// We don't allow H.264 parsing during demuxing since we have our own parser
|
|
||||||
// and the ffmpeg one increases memory usage unnecessarily.
|
|
||||||
if (base::FeatureList::IsEnabled(kForbidH264ParsingDuringDemuxing)) {
|
|
||||||
- format_context_->flags |= AVFMT_FLAG_NOH264PARSE;
|
|
||||||
+ // TODO(crbug.com/355485812): Re-enable this flag.
|
|
||||||
+ // format_context_->flags |= AVFMT_FLAG_NOH264PARSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ensures format parsing errors will bail out. From an audit on 11/2017, all
|
|
@ -1,22 +0,0 @@
|
|||||||
===================================================================
|
|
||||||
--- a/media/base/libaom_thread_wrapper.cc
|
|
||||||
+++ b/media/base/libaom_thread_wrapper.cc
|
|
||||||
@@ -4,18 +4,11 @@
|
|
||||||
|
|
||||||
#include "base/logging.h"
|
|
||||||
#include "media/base/codec_worker_impl.h"
|
|
||||||
#include "media/base/libvpx_thread_wrapper.h"
|
|
||||||
-#include "third_party/libaom/source/libaom/aom_util/aom_thread.h"
|
|
||||||
|
|
||||||
namespace media {
|
|
||||||
|
|
||||||
void InitLibAomThreadWrapper() {
|
|
||||||
- const AVxWorkerInterface interface =
|
|
||||||
- CodecWorkerImpl<AVxWorkerInterface, AVxWorkerImpl, AVxWorker,
|
|
||||||
- AVxWorkerStatus, AVX_WORKER_STATUS_NOT_OK,
|
|
||||||
- AVX_WORKER_STATUS_OK,
|
|
||||||
- AVX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface();
|
|
||||||
- CHECK(aom_set_worker_interface(&interface));
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace media
|
|
@ -1,23 +0,0 @@
|
|||||||
===================================================================
|
|
||||||
--- a/media/base/libvpx_thread_wrapper.cc
|
|
||||||
+++ b/media/base/libvpx_thread_wrapper.cc
|
|
||||||
@@ -4,19 +4,11 @@
|
|
||||||
|
|
||||||
#include "media/base/libvpx_thread_wrapper.h"
|
|
||||||
|
|
||||||
#include "media/base/codec_worker_impl.h"
|
|
||||||
-#include "third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h"
|
|
||||||
|
|
||||||
namespace media {
|
|
||||||
|
|
||||||
void InitLibVpxThreadWrapper() {
|
|
||||||
- const VPxWorkerInterface interface =
|
|
||||||
- CodecWorkerImpl<VPxWorkerInterface, VPxWorkerImpl, VPxWorker,
|
|
||||||
- VPxWorkerStatus, VPX_WORKER_STATUS_NOT_OK,
|
|
||||||
- VPX_WORKER_STATUS_OK,
|
|
||||||
- VPX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface();
|
|
||||||
-
|
|
||||||
- CHECK(vpx_set_worker_interface(&interface));
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace media
|
|
@ -1,35 +0,0 @@
|
|||||||
description: build using system openjpeg
|
|
||||||
author: Michael Gilbert <mgilbert@debian.org>
|
|
||||||
|
|
||||||
--- a/third_party/pdfium/BUILD.gn
|
|
||||||
+++ b/third_party/pdfium/BUILD.gn
|
|
||||||
@@ -25,7 +25,7 @@
|
|
||||||
cflags = []
|
|
||||||
cflags_cc = []
|
|
||||||
ldflags = []
|
|
||||||
- include_dirs = [ "." ]
|
|
||||||
+ include_dirs = [ ".", "/usr/include/openjpeg-2.4", "/usr/include/openjpeg-2.5" ]
|
|
||||||
defines = []
|
|
||||||
|
|
||||||
if (!use_system_libopenjpeg2) {
|
|
||||||
--- a/third_party/pdfium/core/fpdfapi/render/BUILD.gn
|
|
||||||
+++ b/third_party/pdfium/core/fpdfapi/render/BUILD.gn
|
|
||||||
@@ -49,6 +49,7 @@ source_set("render") {
|
|
||||||
"../../../:pdfium_noshorten_config",
|
|
||||||
]
|
|
||||||
deps = [
|
|
||||||
+ "../../../third_party:libopenjpeg2",
|
|
||||||
"../../../constants",
|
|
||||||
"../../fxcodec",
|
|
||||||
"../../fxcrt",
|
|
||||||
--- a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.h
|
|
||||||
+++ b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.h
|
|
||||||
@@ -12,7 +12,7 @@
|
|
||||||
#include "core/fxcrt/unowned_ptr.h"
|
|
||||||
#include "third_party/base/span.h"
|
|
||||||
|
|
||||||
-#if defined(USE_SYSTEM_LIBOPENJPEG2)
|
|
||||||
+#if 1
|
|
||||||
#include <openjpeg.h>
|
|
||||||
#else
|
|
||||||
#include "third_party/libopenjpeg20/openjpeg.h"
|
|
@ -1,112 +0,0 @@
|
|||||||
Taken from
|
|
||||||
https://github.com/qvint/ungoogled-chromium-fedora/commit/a68fdd679566da5134d916776f14e00c8e6a8042
|
|
||||||
|
|
||||||
--- a/chrome/tools/convert_dict/convert_dict.cc
|
|
||||||
+++ b/chrome/tools/convert_dict/convert_dict.cc
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#include "build/build_config.h"
|
|
||||||
#include "chrome/tools/convert_dict/aff_reader.h"
|
|
||||||
#include "chrome/tools/convert_dict/dic_reader.h"
|
|
||||||
+#include "components/spellcheck/common/spellcheck_common.h"
|
|
||||||
#include "third_party/hunspell/google/bdict_reader.h"
|
|
||||||
#include "third_party/hunspell/google/bdict_writer.h"
|
|
||||||
|
|
||||||
@@ -76,13 +77,32 @@ bool VerifyWords(const convert_dict::Dic
|
|
||||||
}
|
|
||||||
|
|
||||||
int PrintHelp() {
|
|
||||||
- printf("Usage: convert_dict <dicfile base name>\n\n");
|
|
||||||
- printf("Example:\n");
|
|
||||||
- printf(" convert_dict en-US\nwill read en-US.dic, en-US.dic_delta, and "
|
|
||||||
- "en-US.aff from the current directory and generate en-US.bdic\n\n");
|
|
||||||
+ printf(
|
|
||||||
+ "Usage:\n"
|
|
||||||
+ " dict-utility list\n"
|
|
||||||
+ " dict-utility convert <aff_path> <dic_path> <out_path>\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
+int PrintList() {
|
|
||||||
+ base::FilePath root("/");
|
|
||||||
+ std::vector<std::string> languages = spellcheck::SpellCheckLanguages();
|
|
||||||
+
|
|
||||||
+ for (auto &language : languages) {
|
|
||||||
+ std::string language_region =
|
|
||||||
+ spellcheck::GetSpellCheckLanguageRegion(language);
|
|
||||||
+ base::FilePath language_bdic_path =
|
|
||||||
+ spellcheck::GetVersionedFileName(language, root).BaseName();
|
|
||||||
+
|
|
||||||
+ printf("%s\t%s\t%s\n",
|
|
||||||
+ language.c_str(),
|
|
||||||
+ language_region.c_str(),
|
|
||||||
+ language_bdic_path.value().c_str());
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
#if defined(OS_WIN)
|
|
||||||
@@ -91,16 +111,15 @@ int wmain(int argc, wchar_t* argv[]) {
|
|
||||||
int main(int argc, char* argv[]) {
|
|
||||||
#endif
|
|
||||||
base::EnableTerminationOnHeapCorruption();
|
|
||||||
- if (argc != 2)
|
|
||||||
+ if (argc == 2 && strcmp(argv[1], "list") == 0)
|
|
||||||
+ return PrintList();
|
|
||||||
+ if (argc != 5 || strcmp(argv[1], "convert") != 0)
|
|
||||||
return PrintHelp();
|
|
||||||
|
|
||||||
base::AtExitManager exit_manager;
|
|
||||||
base::i18n::InitializeICU();
|
|
||||||
|
|
||||||
- base::FilePath file_base = base::FilePath(argv[1]);
|
|
||||||
-
|
|
||||||
- base::FilePath aff_path =
|
|
||||||
- file_base.ReplaceExtension(FILE_PATH_LITERAL(".aff"));
|
|
||||||
+ base::FilePath aff_path = base::FilePath(argv[2]);
|
|
||||||
printf("Reading %" PRFilePath " ...\n", aff_path.value().c_str());
|
|
||||||
convert_dict::AffReader aff_reader(aff_path);
|
|
||||||
if (!aff_reader.Read()) {
|
|
||||||
@@ -108,8 +127,7 @@ int main(int argc, char* argv[]) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
- base::FilePath dic_path =
|
|
||||||
- file_base.ReplaceExtension(FILE_PATH_LITERAL(".dic"));
|
|
||||||
+ base::FilePath dic_path = base::FilePath(argv[3]);
|
|
||||||
printf("Reading %" PRFilePath " ...\n", dic_path.value().c_str());
|
|
||||||
// DicReader will also read the .dic_delta file.
|
|
||||||
convert_dict::DicReader dic_reader(dic_path);
|
|
||||||
@@ -135,8 +153,7 @@ int main(int argc, char* argv[]) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
- base::FilePath out_path =
|
|
||||||
- file_base.ReplaceExtension(FILE_PATH_LITERAL(".bdic"));
|
|
||||||
+ base::FilePath out_path = base::FilePath(argv[4]);
|
|
||||||
printf("Writing %" PRFilePath " ...\n", out_path.value().c_str());
|
|
||||||
FILE* out_file = base::OpenFile(out_path, "wb");
|
|
||||||
if (!out_file) {
|
|
||||||
--- a/chrome/tools/convert_dict/BUILD.gn
|
|
||||||
+++ b/chrome/tools/convert_dict/BUILD.gn
|
|
||||||
@@ -34,6 +34,7 @@ executable("convert_dict") {
|
|
||||||
"//base",
|
|
||||||
"//base:i18n",
|
|
||||||
"//build/win:default_exe_manifest",
|
|
||||||
+ "//components/spellcheck/common",
|
|
||||||
"//third_party/hunspell",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
--- a/components/spellcheck/common/spellcheck_common.h
|
|
||||||
+++ b/components/spellcheck/common/spellcheck_common.h
|
|
||||||
@@ -34,6 +34,8 @@
|
|
||||||
// chrome/browser/resources/settings/languages_page/edit_dictionary_page.js
|
|
||||||
static const size_t kMaxCustomDictionaryWordBytes = 99;
|
|
||||||
|
|
||||||
+std::string GetSpellCheckLanguageRegion(std::string_view input_language);
|
|
||||||
+
|
|
||||||
base::FilePath GetVersionedFileName(std::string_view input_language,
|
|
||||||
const base::FilePath& dict_dir);
|
|
||||||
|
|
@ -1,92 +0,0 @@
|
|||||||
From: PF4Public@users.noreply.github.com
|
|
||||||
License: BSD
|
|
||||||
Subject: Fix building with use_bluez=false
|
|
||||||
|
|
||||||
This is a quick and dirty fix for building chromium with use_bluez=false
|
|
||||||
It prevents initialization and usage of Bluetooth by the browser
|
|
||||||
It is not supposed to be applied for use_bluez=true
|
|
||||||
The browser will SEGFAULT upon accessing chrome://bluetooth-internals/
|
|
||||||
It also breaks WebAuthn: https://github.com/PF4Public/gentoo-overlay/issues/254
|
|
||||||
|
|
||||||
---
|
|
||||||
--- a/headless/lib/browser/headless_browser_main_parts_posix.cc
|
|
||||||
+++ b/headless/lib/browser/headless_browser_main_parts_posix.cc
|
|
||||||
@@ -25,9 +25,8 @@
|
|
||||||
#include "components/os_crypt/sync/os_crypt.h"
|
|
||||||
#include "headless/public/switches.h"
|
|
||||||
|
|
||||||
-#if defined(USE_DBUS)
|
|
||||||
-#include "device/bluetooth/dbus/bluez_dbus_manager.h"
|
|
||||||
-#endif
|
|
||||||
+#include "device/bluetooth/bluetooth_adapter_factory.h"
|
|
||||||
+#include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
|
|
||||||
|
|
||||||
#endif // BUILDFLAG(IS_LINUX)
|
|
||||||
|
|
||||||
@@ -134,7 +133,7 @@
|
|
||||||
#if BUILDFLAG(IS_LINUX)
|
|
||||||
|
|
||||||
#if defined(USE_DBUS)
|
|
||||||
- bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr);
|
|
||||||
+ bluez::DBusBluezManagerWrapperLinux::Initialize();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Set up crypt config. This needs to be done before anything starts the
|
|
||||||
--- a/chrome/browser/chrome_browser_main_linux.cc
|
|
||||||
+++ b/chrome/browser/chrome_browser_main_linux.cc
|
|
||||||
@@ -35,6 +35,11 @@
|
|
||||||
#include "chrome/browser/dbus_memory_pressure_evaluator_linux.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if BUILDFLAG(IS_LINUX)
|
|
||||||
+#include "device/bluetooth/bluetooth_adapter_factory.h"
|
|
||||||
+#include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if !BUILDFLAG(IS_CHROMEOS_ASH)
|
|
||||||
#include "base/command_line.h"
|
|
||||||
#include "base/linux_util.h"
|
|
||||||
@@ -59,7 +64,9 @@
|
|
||||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_CHROMEOS)
|
|
||||||
- bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
|
|
||||||
+ #if BUILDFLAG(IS_LINUX)
|
|
||||||
+ bluez::DBusBluezManagerWrapperLinux::Initialize();
|
|
||||||
+ #endif
|
|
||||||
|
|
||||||
// Set up crypt config. This needs to be done before anything starts the
|
|
||||||
// network service, as the raw encryption key needs to be shared with the
|
|
||||||
@@ -117,7 +124,7 @@
|
|
||||||
#endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
|
|
||||||
|
|
||||||
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
|
|
||||||
-#if BUILDFLAG(IS_CHROMEOS)
|
|
||||||
+#if BUILDFLAG(IS_LINUX)
|
|
||||||
// No-op; per PostBrowserStart() comment, this is done elsewhere.
|
|
||||||
#else
|
|
||||||
bluez::BluezDBusManager::Shutdown();
|
|
||||||
--- a/chrome/browser/metrics/bluetooth_metrics_provider.cc
|
|
||||||
+++ b/chrome/browser/metrics/bluetooth_metrics_provider.cc
|
|
||||||
@@ -16,9 +16,7 @@
|
|
||||||
|
|
||||||
bool BluetoothMetricsProvider::ProvideHistograms() {
|
|
||||||
base::UmaHistogramEnumeration("Bluetooth.StackName",
|
|
||||||
- floss::features::IsFlossEnabled()
|
|
||||||
- ? BluetoothStackName::kFloss
|
|
||||||
- : BluetoothStackName::kBlueZ);
|
|
||||||
+ BluetoothStackName::kBlueZ);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/device/bluetooth/adapter.cc
|
|
||||||
+++ b/device/bluetooth/adapter.cc
|
|
||||||
@@ -115,7 +115,7 @@
|
|
||||||
adapter_info->system_name = adapter_->GetSystemName();
|
|
||||||
#endif
|
|
||||||
#if BUILDFLAG(IS_CHROMEOS)
|
|
||||||
- adapter_info->floss = floss::features::IsFlossEnabled();
|
|
||||||
+ adapter_info->floss = false;
|
|
||||||
adapter_info->extended_advertisement_support =
|
|
||||||
adapter_->IsExtendedAdvertisementsAvailable();
|
|
||||||
#endif
|
|
@ -1,24 +0,0 @@
|
|||||||
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
index a55e4ab51d5b353..6049c6edb6a1ff3 100644
|
|
||||||
--- a/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
+++ b/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
@@ -762,7 +762,7 @@ bool AVStreamToVideoDecoderConfig(const AVStream* stream,
|
|
||||||
type.codec = VideoCodec::kDolbyVision;
|
|
||||||
type.level = dovi->dv_level;
|
|
||||||
type.color_space = color_space;
|
|
||||||
- type.hdr_metadata_type = gfx::HdrMetadataType::kSmpteSt2094_10;
|
|
||||||
+ type.hdr_metadata_type = gfx::HdrMetadataType::kNone;
|
|
||||||
switch (dovi->dv_profile) {
|
|
||||||
case 0:
|
|
||||||
type.profile = VideoCodecProfile::DOLBYVISION_PROFILE0;
|
|
||||||
@@ -796,8 +796,8 @@ bool AVStreamToVideoDecoderConfig(const AVStream* stream,
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
#endif // BUILDFLAG(ENABLE_PLATFORM_DOLBY_VISION)
|
|
||||||
- default:
|
|
||||||
- break;
|
|
||||||
+ default:
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,224 +0,0 @@
|
|||||||
From 84d1d7adcd1697348e3f821811179c525d3b5717 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dale Curtis <dalecurtis@chromium.org>
|
|
||||||
Date: Tue, 28 Nov 2023 00:41:42 +0000
|
|
||||||
Subject: [PATCH] Roll src/third_party/ffmpeg/ c1d0dc413..866768f35 (492
|
|
||||||
commits)
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
index 3c97e4a6cf4c781..a55e4ab51d5b353 100644
|
|
||||||
--- a/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
+++ b/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
@@ -653,15 +653,6 @@ bool AVStreamToVideoDecoderConfig(const AVStream* stream,
|
|
||||||
profile = ProfileIDToVideoCodecProfile(codec_context->profile);
|
|
||||||
}
|
|
||||||
|
|
||||||
- void* display_matrix =
|
|
||||||
- av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
|
|
||||||
-
|
|
||||||
- VideoTransformation video_transformation = VideoTransformation();
|
|
||||||
- if (display_matrix) {
|
|
||||||
- video_transformation = VideoTransformation::FromFFmpegDisplayMatrix(
|
|
||||||
- static_cast<int32_t*>(display_matrix));
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
if (!color_space.IsSpecified()) {
|
|
||||||
// VP9 frames may have color information, but that information cannot
|
|
||||||
// express new color spaces, like HDR. For that reason, color space
|
|
||||||
@@ -718,88 +709,92 @@ bool AVStreamToVideoDecoderConfig(const AVStream* stream,
|
|
||||||
codec_context->extradata + codec_context->extradata_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (stream->nb_side_data) {
|
|
||||||
- for (int i = 0; i < stream->nb_side_data; ++i) {
|
|
||||||
- AVPacketSideData side_data = stream->side_data[i];
|
|
||||||
- switch (side_data.type) {
|
|
||||||
- case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: {
|
|
||||||
- AVMasteringDisplayMetadata* mdcv =
|
|
||||||
- reinterpret_cast<AVMasteringDisplayMetadata*>(side_data.data);
|
|
||||||
- gfx::HdrMetadataSmpteSt2086 smpte_st_2086;
|
|
||||||
- if (mdcv->has_primaries) {
|
|
||||||
- smpte_st_2086.primaries = {
|
|
||||||
- static_cast<float>(av_q2d(mdcv->display_primaries[0][0])),
|
|
||||||
- static_cast<float>(av_q2d(mdcv->display_primaries[0][1])),
|
|
||||||
- static_cast<float>(av_q2d(mdcv->display_primaries[1][0])),
|
|
||||||
- static_cast<float>(av_q2d(mdcv->display_primaries[1][1])),
|
|
||||||
- static_cast<float>(av_q2d(mdcv->display_primaries[2][0])),
|
|
||||||
- static_cast<float>(av_q2d(mdcv->display_primaries[2][1])),
|
|
||||||
- static_cast<float>(av_q2d(mdcv->white_point[0])),
|
|
||||||
- static_cast<float>(av_q2d(mdcv->white_point[1])),
|
|
||||||
- };
|
|
||||||
- }
|
|
||||||
- if (mdcv->has_luminance) {
|
|
||||||
- smpte_st_2086.luminance_max = av_q2d(mdcv->max_luminance);
|
|
||||||
- smpte_st_2086.luminance_min = av_q2d(mdcv->min_luminance);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- // TODO(https://crbug.com/1446302): Consider rejecting metadata that
|
|
||||||
- // does not specify all values.
|
|
||||||
- if (mdcv->has_primaries || mdcv->has_luminance) {
|
|
||||||
- hdr_metadata.smpte_st_2086 = smpte_st_2086;
|
|
||||||
- }
|
|
||||||
- break;
|
|
||||||
+ VideoTransformation video_transformation = VideoTransformation();
|
|
||||||
+ for (int i = 0; i < stream->codecpar->nb_coded_side_data; ++i) {
|
|
||||||
+ const auto& side_data = stream->codecpar->coded_side_data[i];
|
|
||||||
+ switch (side_data.type) {
|
|
||||||
+ case AV_PKT_DATA_DISPLAYMATRIX: {
|
|
||||||
+ CHECK_EQ(side_data.size, sizeof(int32_t) * 3 * 3);
|
|
||||||
+ video_transformation = VideoTransformation::FromFFmpegDisplayMatrix(
|
|
||||||
+ reinterpret_cast<int32_t*>(side_data.data));
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: {
|
|
||||||
+ AVMasteringDisplayMetadata* mdcv =
|
|
||||||
+ reinterpret_cast<AVMasteringDisplayMetadata*>(side_data.data);
|
|
||||||
+ gfx::HdrMetadataSmpteSt2086 smpte_st_2086;
|
|
||||||
+ if (mdcv->has_primaries) {
|
|
||||||
+ smpte_st_2086.primaries = {
|
|
||||||
+ static_cast<float>(av_q2d(mdcv->display_primaries[0][0])),
|
|
||||||
+ static_cast<float>(av_q2d(mdcv->display_primaries[0][1])),
|
|
||||||
+ static_cast<float>(av_q2d(mdcv->display_primaries[1][0])),
|
|
||||||
+ static_cast<float>(av_q2d(mdcv->display_primaries[1][1])),
|
|
||||||
+ static_cast<float>(av_q2d(mdcv->display_primaries[2][0])),
|
|
||||||
+ static_cast<float>(av_q2d(mdcv->display_primaries[2][1])),
|
|
||||||
+ static_cast<float>(av_q2d(mdcv->white_point[0])),
|
|
||||||
+ static_cast<float>(av_q2d(mdcv->white_point[1])),
|
|
||||||
+ };
|
|
||||||
}
|
|
||||||
- case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: {
|
|
||||||
- AVContentLightMetadata* clli =
|
|
||||||
- reinterpret_cast<AVContentLightMetadata*>(side_data.data);
|
|
||||||
- hdr_metadata.cta_861_3 =
|
|
||||||
- gfx::HdrMetadataCta861_3(clli->MaxCLL, clli->MaxFALL);
|
|
||||||
- break;
|
|
||||||
+ if (mdcv->has_luminance) {
|
|
||||||
+ smpte_st_2086.luminance_max = av_q2d(mdcv->max_luminance);
|
|
||||||
+ smpte_st_2086.luminance_min = av_q2d(mdcv->min_luminance);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // TODO(https://crbug.com/1446302): Consider rejecting metadata that
|
|
||||||
+ // does not specify all values.
|
|
||||||
+ if (mdcv->has_primaries || mdcv->has_luminance) {
|
|
||||||
+ hdr_metadata.smpte_st_2086 = smpte_st_2086;
|
|
||||||
}
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: {
|
|
||||||
+ AVContentLightMetadata* clli =
|
|
||||||
+ reinterpret_cast<AVContentLightMetadata*>(side_data.data);
|
|
||||||
+ hdr_metadata.cta_861_3 =
|
|
||||||
+ gfx::HdrMetadataCta861_3(clli->MaxCLL, clli->MaxFALL);
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
#if BUILDFLAG(ENABLE_PLATFORM_DOLBY_VISION)
|
|
||||||
- case AV_PKT_DATA_DOVI_CONF: {
|
|
||||||
- AVDOVIDecoderConfigurationRecord* dovi =
|
|
||||||
- reinterpret_cast<AVDOVIDecoderConfigurationRecord*>(
|
|
||||||
- side_data.data);
|
|
||||||
- VideoType type;
|
|
||||||
- type.codec = VideoCodec::kDolbyVision;
|
|
||||||
- type.level = dovi->dv_level;
|
|
||||||
- type.color_space = color_space;
|
|
||||||
- type.hdr_metadata_type = gfx::HdrMetadataType::kSmpteSt2094_10;
|
|
||||||
- switch (dovi->dv_profile) {
|
|
||||||
- case 0:
|
|
||||||
- type.profile = VideoCodecProfile::DOLBYVISION_PROFILE0;
|
|
||||||
- break;
|
|
||||||
- case 5:
|
|
||||||
- type.profile = VideoCodecProfile::DOLBYVISION_PROFILE5;
|
|
||||||
- break;
|
|
||||||
- case 7:
|
|
||||||
- type.profile = VideoCodecProfile::DOLBYVISION_PROFILE7;
|
|
||||||
- break;
|
|
||||||
- case 8:
|
|
||||||
- type.profile = VideoCodecProfile::DOLBYVISION_PROFILE8;
|
|
||||||
- break;
|
|
||||||
- case 9:
|
|
||||||
- type.profile = VideoCodecProfile::DOLBYVISION_PROFILE9;
|
|
||||||
- break;
|
|
||||||
- default:
|
|
||||||
- type.profile = VideoCodecProfile::VIDEO_CODEC_PROFILE_UNKNOWN;
|
|
||||||
- break;
|
|
||||||
- }
|
|
||||||
- // Treat dolby vision contents as dolby vision codec only if the
|
|
||||||
- // device support clear DV decoding, otherwise use the original
|
|
||||||
- // HEVC or AVC codec and profile.
|
|
||||||
- if (media::IsSupportedVideoType(type)) {
|
|
||||||
- codec = type.codec;
|
|
||||||
- profile = type.profile;
|
|
||||||
- }
|
|
||||||
- break;
|
|
||||||
+ case AV_PKT_DATA_DOVI_CONF: {
|
|
||||||
+ AVDOVIDecoderConfigurationRecord* dovi =
|
|
||||||
+ reinterpret_cast<AVDOVIDecoderConfigurationRecord*>(side_data.data);
|
|
||||||
+ VideoType type;
|
|
||||||
+ type.codec = VideoCodec::kDolbyVision;
|
|
||||||
+ type.level = dovi->dv_level;
|
|
||||||
+ type.color_space = color_space;
|
|
||||||
+ type.hdr_metadata_type = gfx::HdrMetadataType::kSmpteSt2094_10;
|
|
||||||
+ switch (dovi->dv_profile) {
|
|
||||||
+ case 0:
|
|
||||||
+ type.profile = VideoCodecProfile::DOLBYVISION_PROFILE0;
|
|
||||||
+ break;
|
|
||||||
+ case 5:
|
|
||||||
+ type.profile = VideoCodecProfile::DOLBYVISION_PROFILE5;
|
|
||||||
+ break;
|
|
||||||
+ case 7:
|
|
||||||
+ type.profile = VideoCodecProfile::DOLBYVISION_PROFILE7;
|
|
||||||
+ break;
|
|
||||||
+ case 8:
|
|
||||||
+ type.profile = VideoCodecProfile::DOLBYVISION_PROFILE8;
|
|
||||||
+ break;
|
|
||||||
+ case 9:
|
|
||||||
+ type.profile = VideoCodecProfile::DOLBYVISION_PROFILE9;
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ type.profile = VideoCodecProfile::VIDEO_CODEC_PROFILE_UNKNOWN;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ // Treat dolby vision contents as dolby vision codec only if the
|
|
||||||
+ // device support clear DV decoding, otherwise use the original
|
|
||||||
+ // HEVC or AVC codec and profile.
|
|
||||||
+ if (media::IsSupportedVideoType(type)) {
|
|
||||||
+ codec = type.codec;
|
|
||||||
+ profile = type.profile;
|
|
||||||
}
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
#endif // BUILDFLAG(ENABLE_PLATFORM_DOLBY_VISION)
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/media/filters/audio_video_metadata_extractor.cc b/media/filters/audio_video_metadata_extractor.cc
|
|
||||||
index cb002490a6322bf..e841b4ad13383ac 100644
|
|
||||||
--- a/media/filters/audio_video_metadata_extractor.cc
|
|
||||||
+++ b/media/filters/audio_video_metadata_extractor.cc
|
|
||||||
@@ -113,13 +113,16 @@ bool AudioVideoMetadataExtractor::Extract(DataSource* source,
|
|
||||||
if (!stream)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
- void* display_matrix =
|
|
||||||
- av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
|
|
||||||
- if (display_matrix) {
|
|
||||||
- rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
|
|
||||||
- static_cast<int32_t*>(display_matrix))
|
|
||||||
- .rotation;
|
|
||||||
- info.tags["rotate"] = base::NumberToString(rotation_);
|
|
||||||
+ for (int j = 0; j < stream->codecpar->nb_coded_side_data; j++) {
|
|
||||||
+ const AVPacketSideData& sd = stream->codecpar->coded_side_data[j];
|
|
||||||
+ if (sd.type == AV_PKT_DATA_DISPLAYMATRIX) {
|
|
||||||
+ CHECK_EQ(sd.size, sizeof(int32_t) * 3 * 3);
|
|
||||||
+ rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
|
|
||||||
+ reinterpret_cast<int32_t*>(sd.data))
|
|
||||||
+ .rotation;
|
|
||||||
+ info.tags["rotate"] = base::NumberToString(rotation_);
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract dictionary from streams also. Needed for containers that attach
|
|
File diff suppressed because it is too large
Load Diff
@ -1,69 +0,0 @@
|
|||||||
--- a/third_party/blink/renderer/platform/fonts/font_face_creation_params.h
|
|
||||||
+++ b/third_party/blink/renderer/platform/fonts/font_face_creation_params.h
|
|
||||||
@@ -64,7 +64,7 @@
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
- FontFaceCreationParams(const std::string& filename,
|
|
||||||
+ FontFaceCreationParams(const WTF::String& filename,
|
|
||||||
int fontconfig_interface_id,
|
|
||||||
int ttc_index = 0)
|
|
||||||
: creation_type_(kCreateFontByFciIdAndTtcIndex),
|
|
||||||
@@ -77,7 +77,7 @@
|
|
||||||
DCHECK_EQ(creation_type_, kCreateFontByFamily);
|
|
||||||
return family_;
|
|
||||||
}
|
|
||||||
- const std::string& Filename() const {
|
|
||||||
+ const WTF::String& Filename() const {
|
|
||||||
DCHECK_EQ(creation_type_, kCreateFontByFciIdAndTtcIndex);
|
|
||||||
#if defined(ADDRESS_SANITIZER)
|
|
||||||
DCHECK(filename_.has_value());
|
|
||||||
@@ -105,7 +105,7 @@
|
|
||||||
std::tuple<int, int, unsigned> hash_data = {
|
|
||||||
ttc_index_, fontconfig_interface_id_,
|
|
||||||
HasFilename() ? StringHasher::HashMemory(
|
|
||||||
- Filename().data(),
|
|
||||||
+ Filename().Utf8().data(),
|
|
||||||
static_cast<unsigned>(Filename().length()))
|
|
||||||
: 0};
|
|
||||||
return StringHasher::HashMemory(&hash_data, sizeof(hash_data));
|
|
||||||
@@ -130,7 +130,7 @@
|
|
||||||
FontFaceCreationType creation_type_;
|
|
||||||
AtomicString family_;
|
|
||||||
|
|
||||||
- void SetFilename(std::string& filename) {
|
|
||||||
+ void SetFilename(WTF::String& filename) {
|
|
||||||
#if defined(ADDRESS_SANITIZER)
|
|
||||||
*filename_ = filename;
|
|
||||||
#else
|
|
||||||
@@ -167,7 +167,7 @@
|
|
||||||
// See crbug.com/346174906.
|
|
||||||
std::optional<std::string> filename_;
|
|
||||||
#else
|
|
||||||
- std::string filename_;
|
|
||||||
+ WTF::String filename_;
|
|
||||||
#endif
|
|
||||||
int fontconfig_interface_id_ = 0;
|
|
||||||
int ttc_index_ = 0;
|
|
||||||
--- a/third_party/blink/renderer/platform/fonts/linux/font_cache_linux.cc
|
|
||||||
+++ b/third_party/blink/renderer/platform/fonts/linux/font_cache_linux.cc
|
|
||||||
@@ -111,7 +111,7 @@
|
|
||||||
|
|
||||||
FontFaceCreationParams creation_params;
|
|
||||||
creation_params = FontFaceCreationParams(
|
|
||||||
- fallback_font.filepath.value(), fallback_font.fontconfig_interface_id,
|
|
||||||
+ WTF::String(fallback_font.filepath.value()), fallback_font.fontconfig_interface_id,
|
|
||||||
fallback_font.ttc_index);
|
|
||||||
|
|
||||||
// Changes weight and/or italic of given FontDescription depends on
|
|
||||||
--- a/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
|
|
||||||
+++ b/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
|
|
||||||
@@ -234,7 +234,7 @@
|
|
||||||
creation_params.FontconfigInterfaceId(), creation_params.TtcIndex());
|
|
||||||
}
|
|
||||||
return SkTypeface_Factory::FromFilenameAndTtcIndex(
|
|
||||||
- creation_params.Filename().data(), creation_params.TtcIndex());
|
|
||||||
+ creation_params.Filename().Utf8().data(), creation_params.TtcIndex());
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
|||||||
# Copyright 2016 The Chromium Authors. All rights reserved.
|
|
||||||
# Use of this source code is governed by a BSD-style license that can be
|
|
||||||
# found in the LICENSE file.
|
|
||||||
|
|
||||||
import("//build/config/linux/pkg_config.gni")
|
|
||||||
import("//build/shim_headers.gni")
|
|
||||||
|
|
||||||
pkg_config("system_libusb") {
|
|
||||||
packages = [ "libusb-1.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
shim_headers("libusb_shim") {
|
|
||||||
root_path = "src/libusb"
|
|
||||||
headers = [
|
|
||||||
"libusb.h",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
source_set("libusb") {
|
|
||||||
deps = [
|
|
||||||
":libusb_shim",
|
|
||||||
]
|
|
||||||
public_configs = [ ":system_libusb" ]
|
|
||||||
}
|
|
@ -1,89 +0,0 @@
|
|||||||
From acc24608c84d2d2d8d684f40a110d0a6f4eddc51 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniele Di Proietto <ddiproietto@google.com>
|
|
||||||
Date: Mon, 6 Jan 2025 15:30:23 +0000
|
|
||||||
Subject: [PATCH] Small fixes for libstdc++
|
|
||||||
|
|
||||||
Change-Id: I054305ff3de0007f98f9713347f72d63d69569e8
|
|
||||||
---
|
|
||||||
include/perfetto/tracing/track.h | 1 +
|
|
||||||
src/profiling/common/producer_support.cc | 1 +
|
|
||||||
src/trace_processor/importers/common/tracks.h | 4 ++--
|
|
||||||
src/trace_processor/importers/common/tracks_internal.h | 8 ++++----
|
|
||||||
.../perfetto_sql/engine/created_function.cc | 4 ++--
|
|
||||||
src/trace_processor/util/regex.h | 2 +-
|
|
||||||
src/traceconv/pprof_reader.cc | 2 +-
|
|
||||||
7 files changed, 12 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/perfetto/tracing/track.h b/include/perfetto/tracing/track.h
|
|
||||||
index 43a8de13d4299387bc1c77582d33542371ffd74f..2a857298c7f4769a05d0db309aca59b72c22b115 100644
|
|
||||||
--- a/include/perfetto/tracing/track.h
|
|
||||||
+++ b/include/perfetto/tracing/track.h
|
|
||||||
@@ -39,6 +39,7 @@
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <map>
|
|
||||||
#include <mutex>
|
|
||||||
+#include <optional>
|
|
||||||
|
|
||||||
namespace perfetto {
|
|
||||||
namespace internal {
|
|
||||||
diff --git a/src/profiling/common/producer_support.cc b/src/profiling/common/producer_support.cc
|
|
||||||
index 5303658d7b7bb0d4b08c00a1decc5c757b006ecb..e9e193db81f87b5c48eefc5aa5a3cfa307baafdb 100644
|
|
||||||
--- a/src/profiling/common/producer_support.cc
|
|
||||||
+++ b/src/profiling/common/producer_support.cc
|
|
||||||
@@ -16,6 +16,7 @@
|
|
||||||
|
|
||||||
#include "src/profiling/common/producer_support.h"
|
|
||||||
|
|
||||||
+#include <algorithm>
|
|
||||||
#include <optional>
|
|
||||||
|
|
||||||
#include "perfetto/ext/base/android_utils.h"
|
|
||||||
diff --git a/src/trace_processor/perfetto_sql/engine/created_function.cc b/src/trace_processor/perfetto_sql/engine/created_function.cc
|
|
||||||
index 1c01c1787ea9ab1972159ce4efd65e225040cee6..e6cef14909d7dab58d1c4abbbe3e536c696910fb 100644
|
|
||||||
--- a/src/trace_processor/perfetto_sql/engine/created_function.cc
|
|
||||||
+++ b/src/trace_processor/perfetto_sql/engine/created_function.cc
|
|
||||||
@@ -109,7 +109,7 @@ struct StoredSqlValue {
|
|
||||||
// the destructors run correctly for non-trivial members of the
|
|
||||||
// union.
|
|
||||||
using Data =
|
|
||||||
- std::variant<int64_t, double, OwnedString, OwnedBytes, nullptr_t>;
|
|
||||||
+ std::variant<int64_t, double, OwnedString, OwnedBytes, std::nullptr_t>;
|
|
||||||
|
|
||||||
StoredSqlValue(SqlValue value) {
|
|
||||||
switch (value.type) {
|
|
||||||
@@ -134,7 +134,7 @@ struct StoredSqlValue {
|
|
||||||
}
|
|
||||||
|
|
||||||
SqlValue AsSqlValue() {
|
|
||||||
- if (std::holds_alternative<nullptr_t>(data)) {
|
|
||||||
+ if (std::holds_alternative<std::nullptr_t>(data)) {
|
|
||||||
return SqlValue();
|
|
||||||
} else if (std::holds_alternative<int64_t>(data)) {
|
|
||||||
return SqlValue::Long(std::get<int64_t>(data));
|
|
||||||
diff --git a/src/trace_processor/util/regex.h b/src/trace_processor/util/regex.h
|
|
||||||
index 120e4c968279d75d8b8f341a96a1f6402a9c4e41..167af55d9bebe4c3c7febf1be91d0bdd01910282 100644
|
|
||||||
--- a/src/trace_processor/util/regex.h
|
|
||||||
+++ b/src/trace_processor/util/regex.h
|
|
||||||
@@ -48,7 +48,7 @@ class Regex {
|
|
||||||
regfree(®ex_.value());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- Regex(Regex&) = delete;
|
|
||||||
+ Regex(const Regex&) = delete;
|
|
||||||
Regex(Regex&& other) {
|
|
||||||
regex_ = std::move(other.regex_);
|
|
||||||
other.regex_ = std::nullopt;
|
|
||||||
diff --git a/src/traceconv/pprof_reader.cc b/src/traceconv/pprof_reader.cc
|
|
||||||
index f14cca73778b14505cce7d4f99848fae67a111c0..612b7c7a40e7127109550a7d0bcfed3685afa2b6 100644
|
|
||||||
--- a/src/traceconv/pprof_reader.cc
|
|
||||||
+++ b/src/traceconv/pprof_reader.cc
|
|
||||||
@@ -16,8 +16,8 @@
|
|
||||||
|
|
||||||
#include "src/traceconv/pprof_reader.h"
|
|
||||||
|
|
||||||
+#include <algorithm>
|
|
||||||
#include <cinttypes>
|
|
||||||
-#include <fstream>
|
|
||||||
|
|
||||||
#include "perfetto/ext/base/file_utils.h"
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
|||||||
--- a/third_party/perfetto/gn/BUILD.gn
|
|
||||||
+++ b/third_party/perfetto/gn/BUILD.gn
|
|
||||||
@@ -382,7 +382,7 @@
|
|
||||||
if (enable_perfetto_zlib) {
|
|
||||||
group("zlib") {
|
|
||||||
if (perfetto_use_system_zlib) {
|
|
||||||
- public_configs = [ "//gn:system_zlib_config" ]
|
|
||||||
+ public_configs = [ ":system_zlib_config" ]
|
|
||||||
} else if (perfetto_root_path == "//") {
|
|
||||||
public_configs = [ "//buildtools:zlib_config" ]
|
|
||||||
public_deps = [ "//buildtools:zlib" ]
|
|
@ -1,287 +0,0 @@
|
|||||||
--- b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
|
|
||||||
+++ a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
|
|
||||||
@@ -74,7 +74,7 @@
|
|
||||||
codec_context->sample_fmt = AV_SAMPLE_FMT_NONE;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ codec_context->channels = config.channel_count;
|
|
||||||
- codec_context->ch_layout.nb_channels = config.channel_count;
|
|
||||||
codec_context->sample_rate = config.samples_per_second;
|
|
||||||
|
|
||||||
if (config.extra_data) {
|
|
||||||
@@ -124,8 +124,8 @@
|
|
||||||
case cdm::kAudioFormatPlanarS16:
|
|
||||||
case cdm::kAudioFormatPlanarF32: {
|
|
||||||
const int decoded_size_per_channel =
|
|
||||||
+ decoded_audio_size / av_frame.channels;
|
|
||||||
+ for (int i = 0; i < av_frame.channels; ++i) {
|
|
||||||
- decoded_audio_size / av_frame.ch_layout.nb_channels;
|
|
||||||
- for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) {
|
|
||||||
memcpy(output_buffer, av_frame.extended_data[i],
|
|
||||||
decoded_size_per_channel);
|
|
||||||
output_buffer += decoded_size_per_channel;
|
|
||||||
@@ -185,14 +185,13 @@
|
|
||||||
// Success!
|
|
||||||
decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get());
|
|
||||||
samples_per_second_ = config.samples_per_second;
|
|
||||||
+ bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8;
|
|
||||||
- bytes_per_frame_ =
|
|
||||||
- codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8;
|
|
||||||
output_timestamp_helper_ =
|
|
||||||
std::make_unique<AudioTimestampHelper>(config.samples_per_second);
|
|
||||||
is_initialized_ = true;
|
|
||||||
|
|
||||||
// Store initial values to guard against midstream configuration changes.
|
|
||||||
+ channels_ = codec_context_->channels;
|
|
||||||
- channels_ = codec_context_->ch_layout.nb_channels;
|
|
||||||
av_sample_format_ = codec_context_->sample_fmt;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
@@ -292,19 +291,17 @@
|
|
||||||
for (auto& frame : audio_frames) {
|
|
||||||
int decoded_audio_size = 0;
|
|
||||||
if (frame->sample_rate != samples_per_second_ ||
|
|
||||||
+ frame->channels != channels_ || frame->format != av_sample_format_) {
|
|
||||||
- frame->ch_layout.nb_channels != channels_ ||
|
|
||||||
- frame->format != av_sample_format_) {
|
|
||||||
DLOG(ERROR) << "Unsupported midstream configuration change!"
|
|
||||||
<< " Sample Rate: " << frame->sample_rate << " vs "
|
|
||||||
+ << samples_per_second_ << ", Channels: " << frame->channels
|
|
||||||
+ << " vs " << channels_ << ", Sample Format: " << frame->format
|
|
||||||
+ << " vs " << av_sample_format_;
|
|
||||||
- << samples_per_second_
|
|
||||||
- << ", Channels: " << frame->ch_layout.nb_channels << " vs "
|
|
||||||
- << channels_ << ", Sample Format: " << frame->format << " vs "
|
|
||||||
- << av_sample_format_;
|
|
||||||
return cdm::kDecodeError;
|
|
||||||
}
|
|
||||||
|
|
||||||
decoded_audio_size = av_samples_get_buffer_size(
|
|
||||||
+ nullptr, codec_context_->channels, frame->nb_samples,
|
|
||||||
- nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
|
|
||||||
codec_context_->sample_fmt, 1);
|
|
||||||
if (!decoded_audio_size)
|
|
||||||
continue;
|
|
||||||
@@ -323,9 +320,9 @@
|
|
||||||
size_t* total_size,
|
|
||||||
std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames,
|
|
||||||
AVFrame* frame) {
|
|
||||||
+ *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels,
|
|
||||||
+ frame->nb_samples,
|
|
||||||
+ codec_context_->sample_fmt, 1);
|
|
||||||
- *total_size += av_samples_get_buffer_size(
|
|
||||||
- nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
|
|
||||||
- codec_context_->sample_fmt, 1);
|
|
||||||
audio_frames->emplace_back(av_frame_clone(frame));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
--- b/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
+++ a/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
@@ -345,11 +345,10 @@
|
|
||||||
codec_context->sample_fmt, codec_context->codec_id);
|
|
||||||
|
|
||||||
ChannelLayout channel_layout =
|
|
||||||
+ codec_context->channels > 8
|
|
||||||
- codec_context->ch_layout.nb_channels > 8
|
|
||||||
? CHANNEL_LAYOUT_DISCRETE
|
|
||||||
+ : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout,
|
|
||||||
+ codec_context->channels);
|
|
||||||
- : ChannelLayoutToChromeChannelLayout(
|
|
||||||
- codec_context->ch_layout.u.mask,
|
|
||||||
- codec_context->ch_layout.nb_channels);
|
|
||||||
|
|
||||||
int sample_rate = codec_context->sample_rate;
|
|
||||||
switch (codec) {
|
|
||||||
@@ -402,7 +401,7 @@
|
|
||||||
extra_data, encryption_scheme, seek_preroll,
|
|
||||||
codec_context->delay);
|
|
||||||
if (channel_layout == CHANNEL_LAYOUT_DISCRETE)
|
|
||||||
+ config->SetChannelsForDiscrete(codec_context->channels);
|
|
||||||
- config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels);
|
|
||||||
|
|
||||||
#if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
|
|
||||||
// These are bitstream formats unknown to ffmpeg, so they don't have
|
|
||||||
@@ -471,7 +470,7 @@
|
|
||||||
|
|
||||||
// TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses
|
|
||||||
// said information to decode.
|
|
||||||
+ codec_context->channels = config.channels();
|
|
||||||
- codec_context->ch_layout.nb_channels = config.channels();
|
|
||||||
codec_context->sample_rate = config.samples_per_second();
|
|
||||||
|
|
||||||
if (config.extra_data().empty()) {
|
|
||||||
--- b/media/filters/audio_file_reader.cc
|
|
||||||
+++ a/media/filters/audio_file_reader.cc
|
|
||||||
@@ -113,15 +113,14 @@
|
|
||||||
|
|
||||||
// Verify the channel layout is supported by Chrome. Acts as a sanity check
|
|
||||||
// against invalid files. See http://crbug.com/171962
|
|
||||||
+ if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout,
|
|
||||||
+ codec_context_->channels) ==
|
|
||||||
- if (ChannelLayoutToChromeChannelLayout(
|
|
||||||
- codec_context_->ch_layout.u.mask,
|
|
||||||
- codec_context_->ch_layout.nb_channels) ==
|
|
||||||
CHANNEL_LAYOUT_UNSUPPORTED) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store initial values to guard against midstream configuration changes.
|
|
||||||
+ channels_ = codec_context_->channels;
|
|
||||||
- channels_ = codec_context_->ch_layout.nb_channels;
|
|
||||||
audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id);
|
|
||||||
sample_rate_ = codec_context_->sample_rate;
|
|
||||||
av_sample_format_ = codec_context_->sample_fmt;
|
|
||||||
@@ -224,7 +223,7 @@
|
|
||||||
if (frames_read < 0)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
+ const int channels = frame->channels;
|
|
||||||
- const int channels = frame->ch_layout.nb_channels;
|
|
||||||
if (frame->sample_rate != sample_rate_ || channels != channels_ ||
|
|
||||||
frame->format != av_sample_format_) {
|
|
||||||
DLOG(ERROR) << "Unsupported midstream configuration change!"
|
|
||||||
--- b/media/filters/audio_file_reader_unittest.cc
|
|
||||||
+++ a/media/filters/audio_file_reader_unittest.cc
|
|
||||||
@@ -121,11 +121,11 @@
|
|
||||||
EXPECT_FALSE(reader_->Open());
|
|
||||||
}
|
|
||||||
|
|
||||||
+ void RunTestFailingDecode(const char* fn) {
|
|
||||||
- void RunTestFailingDecode(const char* fn, int expect_read = 0) {
|
|
||||||
Initialize(fn);
|
|
||||||
EXPECT_TRUE(reader_->Open());
|
|
||||||
std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets;
|
|
||||||
+ EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0);
|
|
||||||
- EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read);
|
|
||||||
}
|
|
||||||
|
|
||||||
void RunTestPartialDecode(const char* fn) {
|
|
||||||
@@ -219,7 +219,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
|
|
||||||
+ RunTestFailingDecode("midstream_config_change.mp3");
|
|
||||||
- RunTestFailingDecode("midstream_config_change.mp3", 42624);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--- b/media/filters/audio_video_metadata_extractor.cc
|
|
||||||
+++ a/media/filters/audio_video_metadata_extractor.cc
|
|
||||||
@@ -113,15 +113,6 @@
|
|
||||||
if (!stream)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
- void* display_matrix =
|
|
||||||
- av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
|
|
||||||
- if (display_matrix) {
|
|
||||||
- rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
|
|
||||||
- static_cast<int32_t*>(display_matrix))
|
|
||||||
- .rotation;
|
|
||||||
- info.tags["rotate"] = base::NumberToString(rotation_);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
// Extract dictionary from streams also. Needed for containers that attach
|
|
||||||
// metadata to contained streams instead the container itself, like OGG.
|
|
||||||
ExtractDictionary(stream->metadata, &info.tags);
|
|
||||||
@@ -264,6 +255,8 @@
|
|
||||||
if (raw_tags->find(tag->key) == raw_tags->end())
|
|
||||||
(*raw_tags)[tag->key] = tag->value;
|
|
||||||
|
|
||||||
+ if (ExtractInt(tag, "rotate", &rotation_))
|
|
||||||
+ continue;
|
|
||||||
if (ExtractString(tag, "album", &album_))
|
|
||||||
continue;
|
|
||||||
if (ExtractString(tag, "artist", &artist_))
|
|
||||||
--- b/media/filters/ffmpeg_aac_bitstream_converter.cc
|
|
||||||
+++ a/media/filters/ffmpeg_aac_bitstream_converter.cc
|
|
||||||
@@ -195,15 +195,14 @@
|
|
||||||
if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id ||
|
|
||||||
audio_profile_ != stream_codec_parameters_->profile ||
|
|
||||||
sample_rate_index_ != sample_rate_index ||
|
|
||||||
+ channel_configuration_ != stream_codec_parameters_->channels ||
|
|
||||||
- channel_configuration_ !=
|
|
||||||
- stream_codec_parameters_->ch_layout.nb_channels ||
|
|
||||||
frame_length_ != header_plus_packet_size) {
|
|
||||||
header_generated_ =
|
|
||||||
GenerateAdtsHeader(stream_codec_parameters_->codec_id,
|
|
||||||
0, // layer
|
|
||||||
stream_codec_parameters_->profile, sample_rate_index,
|
|
||||||
0, // private stream
|
|
||||||
+ stream_codec_parameters_->channels,
|
|
||||||
- stream_codec_parameters_->ch_layout.nb_channels,
|
|
||||||
0, // originality
|
|
||||||
0, // home
|
|
||||||
0, // copyrighted_stream
|
|
||||||
@@ -215,7 +214,7 @@
|
|
||||||
codec_ = stream_codec_parameters_->codec_id;
|
|
||||||
audio_profile_ = stream_codec_parameters_->profile;
|
|
||||||
sample_rate_index_ = sample_rate_index;
|
|
||||||
+ channel_configuration_ = stream_codec_parameters_->channels;
|
|
||||||
- channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels;
|
|
||||||
frame_length_ = header_plus_packet_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
--- b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
|
|
||||||
+++ a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
|
|
||||||
@@ -34,7 +34,7 @@
|
|
||||||
memset(&test_parameters_, 0, sizeof(AVCodecParameters));
|
|
||||||
test_parameters_.codec_id = AV_CODEC_ID_AAC;
|
|
||||||
test_parameters_.profile = FF_PROFILE_AAC_MAIN;
|
|
||||||
+ test_parameters_.channels = 2;
|
|
||||||
- test_parameters_.ch_layout.nb_channels = 2;
|
|
||||||
test_parameters_.extradata = extradata_header_;
|
|
||||||
test_parameters_.extradata_size = sizeof(extradata_header_);
|
|
||||||
}
|
|
||||||
--- b/media/filters/ffmpeg_audio_decoder.cc
|
|
||||||
+++ a/media/filters/ffmpeg_audio_decoder.cc
|
|
||||||
@@ -28,7 +28,7 @@
|
|
||||||
|
|
||||||
// Return the number of channels from the data in |frame|.
|
|
||||||
static inline int DetermineChannels(AVFrame* frame) {
|
|
||||||
+ return frame->channels;
|
|
||||||
- return frame->ch_layout.nb_channels;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Called by FFmpeg's allocation routine to allocate a buffer. Uses
|
|
||||||
@@ -231,7 +231,7 @@
|
|
||||||
// Translate unsupported into discrete layouts for discrete configurations;
|
|
||||||
// ffmpeg does not have a labeled discrete configuration internally.
|
|
||||||
ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout(
|
|
||||||
+ codec_context_->channel_layout, codec_context_->channels);
|
|
||||||
- codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels);
|
|
||||||
if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED &&
|
|
||||||
config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) {
|
|
||||||
channel_layout = CHANNEL_LAYOUT_DISCRETE;
|
|
||||||
@@ -348,11 +348,11 @@
|
|
||||||
// Success!
|
|
||||||
av_sample_format_ = codec_context_->sample_fmt;
|
|
||||||
|
|
||||||
+ if (codec_context_->channels != config.channels()) {
|
|
||||||
- if (codec_context_->ch_layout.nb_channels != config.channels()) {
|
|
||||||
MEDIA_LOG(ERROR, media_log_)
|
|
||||||
<< "Audio configuration specified " << config.channels()
|
|
||||||
<< " channels, but FFmpeg thinks the file contains "
|
|
||||||
+ << codec_context_->channels << " channels";
|
|
||||||
- << codec_context_->ch_layout.nb_channels << " channels";
|
|
||||||
ReleaseFFmpegResources();
|
|
||||||
state_ = DecoderState::kUninitialized;
|
|
||||||
return false;
|
|
||||||
@@ -403,7 +403,7 @@
|
|
||||||
if (frame->nb_samples <= 0)
|
|
||||||
return AVERROR(EINVAL);
|
|
||||||
|
|
||||||
+ if (s->channels != channels) {
|
|
||||||
- if (s->ch_layout.nb_channels != channels) {
|
|
||||||
DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count.";
|
|
||||||
return AVERROR(EINVAL);
|
|
||||||
}
|
|
||||||
@@ -436,8 +436,7 @@
|
|
||||||
ChannelLayout channel_layout =
|
|
||||||
config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE
|
|
||||||
? CHANNEL_LAYOUT_DISCRETE
|
|
||||||
+ : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels);
|
|
||||||
- : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask,
|
|
||||||
- s->ch_layout.nb_channels);
|
|
||||||
|
|
||||||
if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) {
|
|
||||||
DLOG(ERROR) << "Unsupported channel layout.";
|
|
@ -1,15 +0,0 @@
|
|||||||
--- a/media/filters/audio_file_reader.cc
|
|
||||||
+++ b/media/filters/audio_file_reader.cc
|
|
||||||
@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame(
|
|
||||||
// silence from being output. In the case where we are also discarding some
|
|
||||||
// portion of the packet (as indicated by a negative pts), we further want to
|
|
||||||
// adjust the duration downward by however much exists before zero.
|
|
||||||
- if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
|
|
||||||
+ if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
|
|
||||||
const base::TimeDelta pkt_duration = ConvertFromTimeBase(
|
|
||||||
glue_->format_context()->streams[stream_index_]->time_base,
|
|
||||||
- frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
|
|
||||||
+ frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
|
|
||||||
const base::TimeDelta frame_duration =
|
|
||||||
base::Seconds(frames_read / static_cast<double>(sample_rate_));
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
|||||||
--- a/third_party/blink/public/public_features.gni
|
|
||||||
+++ b/third_party/blink/public/public_features.gni
|
|
||||||
@@ -4,6 +4,11 @@
|
|
||||||
|
|
||||||
import("//build/config/ui.gni")
|
|
||||||
|
|
||||||
+declare_args() {
|
|
||||||
+ # Thorium internal flag
|
|
||||||
+ is_thorium_build = true
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
# Unhandled Tap enable means Contextual Search aka Touch to Search.
|
|
||||||
# TODO(donnd): remove all unhandled-tap handling after the Long-press experiment
|
|
||||||
# is fully launched.
|
|
||||||
--- a/chrome/browser/about_flags.cc
|
|
||||||
+++ b/chrome/browser/about_flags.cc
|
|
||||||
@@ -8928,12 +8928,6 @@
|
|
||||||
"LauncherDynamicAnimations")},
|
|
||||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
|
||||||
|
|
||||||
-#if BUILDFLAG(ENABLE_JXL_DECODER)
|
|
||||||
- {"enable-jxl", flag_descriptions::kEnableJXLName,
|
|
||||||
- flag_descriptions::kEnableJXLDescription, kOsAll,
|
|
||||||
- FEATURE_VALUE_TYPE(blink::features::kJXL)},
|
|
||||||
-#endif // BUILDFLAG(ENABLE_JXL_DECODER)
|
|
||||||
-
|
|
||||||
#if BUILDFLAG(IS_ANDROID)
|
|
||||||
{"incognito-reauthentication-for-android",
|
|
||||||
flag_descriptions::kIncognitoReauthenticationForAndroidName,
|
|
@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
|
|
||||||
<default-apps>
|
|
||||||
<web-browsers>
|
|
||||||
<web-browser>
|
|
||||||
<name>Thorium</name>
|
|
||||||
<executable>thorium-browser</executable>
|
|
||||||
<command>thorium-browser %s</command>
|
|
||||||
<icon-name>thorium-browser</icon-name>
|
|
||||||
<run-in-terminal>false</run-in-terminal>
|
|
||||||
</web-browser>
|
|
||||||
</web-browsers>
|
|
||||||
</default-apps>
|
|
@ -1,59 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Allow the user to override command-line flags, bug #357629.
|
|
||||||
# This is based on Debian's chromium-browser package, and is intended
|
|
||||||
# to be consistent with Debian.
|
|
||||||
for f in /etc/thorium/*; do
|
|
||||||
[[ -f ${f} ]] && source "${f}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
|
|
||||||
# default CHROMIUM_FLAGS (from /etc/thorium/default).
|
|
||||||
CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
|
|
||||||
|
|
||||||
# Let the wrapped binary know that it has been run through the wrapper
|
|
||||||
export CHROME_WRAPPER=$(readlink -f "$0")
|
|
||||||
|
|
||||||
PROGDIR=${CHROME_WRAPPER%/*}
|
|
||||||
|
|
||||||
case ":$PATH:" in
|
|
||||||
*:$PROGDIR:*)
|
|
||||||
# $PATH already contains $PROGDIR
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# Append $PROGDIR to $PATH
|
|
||||||
export PATH="$PATH:$PROGDIR"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
|
|
||||||
# Running as root with HOME owned by root.
|
|
||||||
# Pass --user-data-dir to work around upstream failsafe.
|
|
||||||
CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/thorium
|
|
||||||
${CHROMIUM_FLAGS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Select session type and platform
|
|
||||||
if @@OZONE_AUTO_SESSION@@; then
|
|
||||||
platform=
|
|
||||||
if [[ ${XDG_SESSION_TYPE} == x11 ]]; then
|
|
||||||
platform=x11
|
|
||||||
elif [[ ${XDG_SESSION_TYPE} == wayland ]]; then
|
|
||||||
platform=wayland
|
|
||||||
else
|
|
||||||
if [[ -n ${WAYLAND_DISPLAY} ]]; then
|
|
||||||
platform=wayland
|
|
||||||
else
|
|
||||||
platform=x11
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if ${DISABLE_OZONE_PLATFORM:-false}; then
|
|
||||||
platform=x11
|
|
||||||
fi
|
|
||||||
CHROMIUM_FLAGS="--ozone-platform=${platform} ${CHROMIUM_FLAGS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set the .desktop file name
|
|
||||||
export CHROME_DESKTOP="thorium-browser-thorium.desktop"
|
|
||||||
|
|
||||||
exec -a "thorium-browser" "$PROGDIR/thorium" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
|
|
@ -1,42 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Allow the user to override command-line flags, bug #357629.
|
|
||||||
# This is based on Debian's chromium-browser package, and is intended
|
|
||||||
# to be consistent with Debian.
|
|
||||||
for f in /etc/thorium-shell/*; do
|
|
||||||
[[ -f ${f} ]] && source "${f}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
|
|
||||||
# default CHROMIUM_FLAGS (from /etc/thorium-shell/default).
|
|
||||||
CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
|
|
||||||
|
|
||||||
# Let the wrapped binary know that it has been run through the wrapper
|
|
||||||
export CHROME_WRAPPER=$(readlink -f "$0")
|
|
||||||
|
|
||||||
PROGDIR=${CHROME_WRAPPER%/*}
|
|
||||||
|
|
||||||
case ":$PATH:" in
|
|
||||||
*:$PROGDIR:*)
|
|
||||||
# $PATH already contains $PROGDIR
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# Append $PROGDIR to $PATH
|
|
||||||
export PATH="$PATH:$PROGDIR"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
|
|
||||||
# Running as root with HOME owned by root.
|
|
||||||
# Pass --user-data-dir to work around upstream failsafe.
|
|
||||||
CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/thorium-shell
|
|
||||||
${CHROMIUM_FLAGS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
CHROMIUM_FLAGS="--enable-experimental-web-platform-features --debug --enable-clear-hevc-for-testing
|
|
||||||
${CHROMIUM_FLAGS}"
|
|
||||||
|
|
||||||
# Set the .desktop file name
|
|
||||||
export CHROME_DESKTOP="thorium-shell.desktop"
|
|
||||||
|
|
||||||
exec -a "thorium-shell" "$PROGDIR/thorium_shell" ${CHROMIUM_FLAGS} "$@"
|
|
@ -1,7 +0,0 @@
|
|||||||
# Default settings for thorium_shell. This file is sourced by /bin/bash
|
|
||||||
# from the thorium_shell launcher.
|
|
||||||
|
|
||||||
# Options to pass to thorium_shell.
|
|
||||||
# See https://github.com/Alex313031/thorium/blob/main/docs/PATCHES.md for additional
|
|
||||||
# command-line switches.
|
|
||||||
#CHROMIUM_FLAGS=""
|
|
@ -1,15 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=Thorium Shell
|
|
||||||
GenericName=Blink Core
|
|
||||||
Comment=Run Thorium Tests in content_shell
|
|
||||||
Exec=/usr/bin/thorium-shell %U
|
|
||||||
Terminal=false
|
|
||||||
X-MultipleArgs=True
|
|
||||||
Keywords=shell
|
|
||||||
Type=Application
|
|
||||||
Icon=thorium-shell
|
|
||||||
Categories=Network;WebBrowser;
|
|
||||||
MimeType=text/html;text/xml;application/xhtml_xml;application/x-mimearchive;x-scheme-handler/http;x-scheme-handler/https;
|
|
||||||
StartupWMClass=thorium_shell
|
|
||||||
StartupNotify=true
|
|
@ -1,7 +0,0 @@
|
|||||||
# Default settings for thorium. This file is sourced by /bin/bash
|
|
||||||
# from the chromium launcher.
|
|
||||||
|
|
||||||
# Options to pass to thorium.
|
|
||||||
# See https://github.com/Alex313031/thorium/blob/main/docs/PATCHES.md for additional
|
|
||||||
# command-line switches.
|
|
||||||
#CHROMIUM_FLAGS=""
|
|
@ -1,12 +0,0 @@
|
|||||||
diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
|
|
||||||
index 16e20744706..6a079b32221 100644
|
|
||||||
--- a/build/linux/unbundle/ffmpeg.gn
|
|
||||||
+++ b/build/linux/unbundle/ffmpeg.gn
|
|
||||||
@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") {
|
|
||||||
"libavformat",
|
|
||||||
"libavutil",
|
|
||||||
]
|
|
||||||
+ defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
buildflag_header("ffmpeg_features") {
|
|
@ -1,58 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Taken from
|
|
||||||
# https://github.com/qvint/ungoogled-chromium-fedora/commit/a68fdd679566da5134d916776f14e00c8e6a8042
|
|
||||||
|
|
||||||
self="$(readlink -f "${0}")"
|
|
||||||
self_dir="$(dirname "${self}")"
|
|
||||||
dict_utility="${self_dir}/convert_dict"
|
|
||||||
|
|
||||||
# Defaults.
|
|
||||||
hunspell_dicts_dir="/usr/share/myspell"
|
|
||||||
user_data_dir="${HOME}/.config/thorium"
|
|
||||||
|
|
||||||
# Parse command-line arguments.
|
|
||||||
while [[ $# -gt 0 ]]; do
|
|
||||||
arg_name="${1}"
|
|
||||||
|
|
||||||
case "${arg_name}" in
|
|
||||||
"--hunspell-dicts-dir")
|
|
||||||
hunspell_dicts_dir="${2}"
|
|
||||||
shift; shift
|
|
||||||
;;
|
|
||||||
"--user-data-dir")
|
|
||||||
user_data_dir="${2}"
|
|
||||||
shift; shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo -n "Usage: ungoogled-chromium-update-dicts "
|
|
||||||
echo "[--hunspell-dicts-dir DIR] [--user-data-dir DIR]"
|
|
||||||
exit 1
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# List all chromium language entries.
|
|
||||||
chromium_language_entries="$("${dict_utility}" list)"
|
|
||||||
|
|
||||||
# Iterate through chromium language entries and make *.bdic files.
|
|
||||||
chromium_dicts_dir="${user_data_dir}/Dictionaries"
|
|
||||||
mkdir -p "${chromium_dicts_dir}"
|
|
||||||
while read -r chromium_language_entry; do
|
|
||||||
while read \
|
|
||||||
chromium_language \
|
|
||||||
chromium_language_region \
|
|
||||||
chromium_bdic_basename; do
|
|
||||||
|
|
||||||
hunspell_language_region="${chromium_language_region//-/_}"
|
|
||||||
aff_path="${hunspell_dicts_dir}/${hunspell_language_region}.aff"
|
|
||||||
dic_path="${hunspell_dicts_dir}/${hunspell_language_region}.dic"
|
|
||||||
bdic_path="${chromium_dicts_dir}/${chromium_bdic_basename}"
|
|
||||||
|
|
||||||
if \
|
|
||||||
[[ -f "${aff_path}" ]] && \
|
|
||||||
[[ -f "${dic_path}" ]] && \
|
|
||||||
[[ ! -f "${bdic_path}" ]]; then
|
|
||||||
"${dict_utility}" convert "${aff_path}" "${dic_path}" "${bdic_path}"
|
|
||||||
fi
|
|
||||||
done <<< "${chromium_language_entry}"
|
|
||||||
done <<< "${chromium_language_entries}"
|
|
@ -1,53 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<name>blackteahamburger</name>
|
|
||||||
<email>blackteahamburger@outlook.com</email>
|
|
||||||
</maintainer>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">Alex313031/thorium</remote-id>
|
|
||||||
<remote-id type="gitlab">Matt.Jolly/chromium-patches</remote-id>
|
|
||||||
<bugs-to>https://github.com/Alex313031/thorium</bugs-to>
|
|
||||||
<doc>https://thorium.rocks/docs</doc>
|
|
||||||
</upstream>
|
|
||||||
<use>
|
|
||||||
<flag name="bluetooth">Enable Bluetooth. Disabling bluetooth does break WebAuthn. Could also break something else. Improved patch is welcome.</flag>
|
|
||||||
<flag name="cfi">Build with CFI (Control Flow Integrity) enabled. It requires "-stdlib=libc++", see #40 for more details.</flag>
|
|
||||||
<flag name="convert-dict">Patch and build the convert_dict utility. The script will be installed into /usr/lib64/chromium-browser/update-dicts.sh. More info here: https://github.com/ungoogled-software/ungoogled-chromium/issues/188#issuecomment-444752907</flag>
|
|
||||||
<flag name="debug">Enable DCHECK feature with severity configurable at runtime. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
|
|
||||||
<flag name="enable-driver">Build chromedriver</flag>
|
|
||||||
<flag name="gtk4">Build with GTK4 headers</flag>
|
|
||||||
<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag>
|
|
||||||
<flag name="headless">Build Ozone only with headless backend, NOT RECOMMENDED for general uses</flag>
|
|
||||||
<flag name="hevc">Enable HEVC decoding support. Should work with system-ffmpeg, but might require additional patching for the built-in one.</flag>
|
|
||||||
<flag name="libcxx">Use bundled C++ Standard Library (libc++)</flag>
|
|
||||||
<flag name="nvidia">Use libXNVCtrl library from <pkg>x11-drivers/nvidia-drivers</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="official">Enable Official build instead of Developer build</flag>
|
|
||||||
<flag name="optimize-webui">Optimize parts of Chromium's UI written with web technologies (HTML/CSS/JS) for runtime performance purposes. This does more work at compile time for speed benefits at runtime.</flag>
|
|
||||||
<flag name="pax-kernel">Allow building on a PaX-enabled kernel</flag>
|
|
||||||
<flag name="pgo">Enable PGO. Requires bundled binary profile data in sources tree. Often requires masked/testing llvm.</flag>
|
|
||||||
<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
|
|
||||||
<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
|
|
||||||
<flag name="system-brotli">Use the system <pkg>app-arch/brotli</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-crc32c">Use the system <pkg>dev-libs/crc32c</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-double-conversion">Use the system <pkg>dev-libs/double-conversion</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-ffmpeg">Use the system <pkg>media-video/ffmpeg</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-harfbuzz">Use the system <pkg>media-libs/harfbuzz</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-icu">Use the system <pkg>dev-libs/icu</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-jsoncpp">Use the system <pkg>dev-libs/jsoncpp</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-libevent">Use the system <pkg>dev-libs/libevent</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-libusb">Use the system <pkg>dev-libs/libusb</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-openh264">Use the system <pkg>media-libs/openh264</pkg> instead of the bundled one. If disabled, it will restrict USE=bindist.</flag>
|
|
||||||
<flag name="system-openjpeg">Use the system-wide <pkg>media-libs/openjpeg</pkg> instead of the bundled one. OpenJPEG use are exclusively for Chromium's PDF viewer.</flag>
|
|
||||||
<flag name="system-png">Use system libpng instead of the bundled one</flag>
|
|
||||||
<flag name="system-re2">Use the system-wide <pkg>dev-libs/re2</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-snappy">Use the system-wide <pkg>app-arch/snappy</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-woff2">Use the system <pkg>media-libs/woff2</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="system-zstd">Use the system <pkg>app-arch/zstd</pkg> instead of the bundled one</flag>
|
|
||||||
<flag name="ungoogled">Apply ungoogled-chromium modifications to chromium sources</flag>
|
|
||||||
<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
|
|
||||||
<flag name="thorium-libjxl">Build with libjxl for Thorium</flag>
|
|
||||||
<flag name="thorium-shell">Build Thorium Content Shell</flag>
|
|
||||||
</use>
|
|
||||||
</pkgmetadata>
|
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user