root
4 years ago
parent
93d081e937
commit
dd56f6144d
Binary file not shown.
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46
|
||||
DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792
|
||||
DIST cdist-6.5.4.tar.gz 898002 BLAKE2B b4565cd8112ce1bff6ac74625a5920886a708fec827f70c3a3a2df156408761badebff4e161900cd09685bfbbb4954927c9771f6516c54a510b582ebec075e76 SHA512 3f1405e1b28d7568ef3ae543d59e760b2dc1fc8004be031550ba52d3aa2d8911cef4325865fb9ed5df053ec1609a076bb31a520b100bad5811f0de9cd73f416e
|
||||
DIST cdist-6.5.6.tar.gz 950790 BLAKE2B f13927009eb8c0172ecc0d59c1eb90fccd17542beed21033f17cec0746f6a41d5f9b39103942ffadf5a45251f49d97bc10ac82ff94bd5cd05d86c48f5d4f839f SHA512 b62a62feca742be233af9602b9216408c68cc66f114d9e581619f564359ccddc23a54257f16d70105476b76f6ba19ecd8937253f01dc479f806609e11fde8741
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python{3_6,3_7,3_8} )
|
||||
DISTUTILS_USE_SETUPTOOLS=no
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A usable configuration management system"
|
||||
HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc"
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
|
||||
distutils-r1_python_install_all
|
||||
|
||||
doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
|
||||
}
|
||||
Binary file not shown.
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!--maintainer-needed-->
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">pet2tgz</remote-id>
|
||||
</upstream>
|
||||
<!-- maintainer-needed -->
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">pet2tgz</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,26 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 76627c7..527e2cb 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -119,7 +119,7 @@ AC_TYPE_UINT16_T
|
||||
AC_TYPE_UINT32_T
|
||||
AC_TYPE_UINT8_T
|
||||
AC_CHECK_TYPES([ptrdiff_t])
|
||||
-
|
||||
+AC_CHECK_TOOL(AR, ar, false)
|
||||
|
||||
|
||||
|
||||
diff --git a/src/user_interface/Makefile.in b/src/user_interface/Makefile.in
|
||||
index 5d5f1fc..4d8214b 100644
|
||||
--- a/src/user_interface/Makefile.in
|
||||
+++ b/src/user_interface/Makefile.in
|
||||
@@ -88,7 +88,7 @@ CONFIG_HEADER = $(top_builddir)/config_cdw.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
LIBRARIES = $(noinst_LIBRARIES)
|
||||
-AR = ar
|
||||
+AR = @AR@
|
||||
ARFLAGS = cru
|
||||
AM_V_AR = $(am__v_AR_@AM_V@)
|
||||
am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
|
||||
Binary file not shown.
@ -0,0 +1,25 @@
|
||||
From 5b1dbb5f8eada9002ec10f4ebc0bc418272e58b2 Mon Sep 17 00:00:00 2001
|
||||
From: Salah Coronya <salah.coronya@gmail.com>
|
||||
Date: Sun, 7 Jun 2020 12:34:03 -0500
|
||||
Subject: [PATCH] src/tddl/Makefile.am: Mark tddl.a nodist
|
||||
|
||||
This makes tddl.a nodist like the others, so it is not installed
|
||||
|
||||
Signed-off-by: Salah Coronya <salah.coronya@gmail.com>
|
||||
---
|
||||
src/tddl/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tddl/Makefile.am b/src/tddl/Makefile.am
|
||||
index 607eb8e..2cd599b 100644
|
||||
--- a/src/tddl/Makefile.am
|
||||
+++ b/src/tddl/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-lib_LIBRARIES=libtddl.a
|
||||
+noinst_LIBRARIES=libtddl.a
|
||||
|
||||
libtddl_a_SOURCES=tddl.c
|
||||
libtddl_a_CFLAGS=-DAPPID=\"TCSD\ TDDL\" -I${top_srcdir}/src/include -fPIE -DPIE
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -1,104 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools linux-info readme.gentoo-r1 systemd user udev
|
||||
|
||||
DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
|
||||
HOMEPAGE="http://trousers.sf.net"
|
||||
SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="CPL-1.0 GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
|
||||
IUSE="doc libressl selinux" # gtk
|
||||
|
||||
# gtk support presently does NOT compile.
|
||||
# gtk? ( >=x11-libs/gtk+-2 )
|
||||
|
||||
DEPEND=">=dev-libs/glib-2
|
||||
!libressl? ( >=dev-libs/openssl-0.9.7:0= )
|
||||
libressl? ( dev-libs/libressl:0= )"
|
||||
RDEPEND="${DEPEND}
|
||||
selinux? ( sec-policy/selinux-tcsd )"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
|
||||
"${FILESDIR}/${P}-libressl.patch"
|
||||
)
|
||||
|
||||
DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
|
||||
|
||||
DOC_CONTENTS="
|
||||
If you have problems starting tcsd, please check permissions and
|
||||
ownership on /dev/tpm* and ~tss/system.data
|
||||
"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
pkg_setup() {
|
||||
# Check for driver (not sure it can be an rdep, because ot depends on the
|
||||
# version of virtual/linux-sources... Is that supported by portage?)
|
||||
linux-info_pkg_setup
|
||||
local tpm_kernel_version tpm_kernel_present tpm_module
|
||||
kernel_is ge 2 6 12 && tpm_kernel_version="yes"
|
||||
if linux_config_exists; then
|
||||
linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
|
||||
else
|
||||
ewarn "No kernel configuration could be found."
|
||||
fi
|
||||
has_version app-crypt/tpm-emulator && tpm_module="yes"
|
||||
if [[ -n "${tpm_kernel_present}" ]]; then
|
||||
einfo "Good, you seem to have in-kernel TPM support."
|
||||
elif [[ -n "${tpm_module}" ]]; then
|
||||
einfo "Good, you seem to have TPM support with the external module."
|
||||
if [[ -n "${tpm_kernel_version}" ]]; then
|
||||
elog
|
||||
elog "Note that since you have a >=2.6.12 kernel, you could use"
|
||||
elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
|
||||
fi
|
||||
elif [[ -n "${tpm_kernel_version}" ]]; then
|
||||
eerror
|
||||
eerror "To use this package, you will have to activate TPM support"
|
||||
eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
|
||||
eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
|
||||
eerror
|
||||
else
|
||||
eerror
|
||||
eerror "To use this package, you should install a TPM driver."
|
||||
eerror "You can have the following options:"
|
||||
eerror " - install app-crypt/tpm-emulator"
|
||||
eerror " - switch to a >=2.6.12 kernel and compile the kernel module"
|
||||
eerror
|
||||
fi
|
||||
|
||||
# New user/group for the daemon
|
||||
enewgroup tss
|
||||
enewuser tss -1 -1 /var/lib/tpm tss
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# econf --with-gui=$(usex gtk gtk openssl)
|
||||
econf --with-gui=openssl
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
|
||||
keepdir /var/lib/tpm
|
||||
use doc && dodoc doc/*
|
||||
newinitd "${FILESDIR}"/tcsd.initd tcsd
|
||||
newconfd "${FILESDIR}"/tcsd.confd tcsd
|
||||
systemd_dounit "${FILESDIR}"/tcsd.service
|
||||
udev_dorules "${FILESDIR}"/61-trousers.rules
|
||||
fowners tss:tss /var/lib/tpm
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST alertmanager-0.18.0.tar.gz 5181819 BLAKE2B efcc856ccacb97646915e8d622179cf3cc7554351036cf556347ec46cdede5c9223139cb209b52376964c7b19b119f3683f82698d1e7c07b1432bb3e4bb37239 SHA512 59faec308abaac3d2b59198fef25109b208de1a807b38803dc10722ff0caf1bac9d9795005fefb3b4e2acda62be136bfcafe7b9702ae52565021a424f99fa730
|
||||
DIST alertmanager-0.19.0.tar.gz 5862442 BLAKE2B a79336286ca1099dcc73cce897eccaff8d40f8d3140ebf1943a1189cf1d2ec58738cbe7fc02221826ffc0e1535954a11a461ac6ea222113c79a44d43cc9eda83 SHA512 2c21bfbb1001e07e81b1115439ad15e7c0e7089839e56a19c445177e322b8ef9aa2b85e96478f3c3d709cbbd3a5447662a8c55da370b84aa4b6b24f83848744b
|
||||
DIST alertmanager-0.21.0.tar.gz 5704209 BLAKE2B 646ac0b05eb194d1c35f49e38c0a206d09a9c45d4f2f7c371a53ecfff5deba6e2c2af82f3f4ce2b591338c557241766395f42b8bd3c91ae2da4ef7e570666fda SHA512 72568407af4e90455975eff504ed49f4877eb517673532f655b6b0459725db5df7bbd1a3be120106c46b30dd7056714cc0b34b46df9c4d8c98e1f8c9eb0c39da
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit go-module user
|
||||
GIT_COMMIT=4c6c03eb
|
||||
MY_PV="${PV/_rc/-rc.}"
|
||||
|
||||
DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
|
||||
HOMEPAGE="https://github.com/prometheus/alertmanager"
|
||||
SRC_URI="https://github.com/prometheus/alertmanager/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
BDEPEND="dev-util/promu"
|
||||
|
||||
RESTRICT+=" test"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${PN}
|
||||
enewuser ${PN} -1 -1 -1 ${PN}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
promu build -v --prefix bin || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/*
|
||||
dodoc {README,CHANGELOG,CONTRIBUTING}.md
|
||||
insinto /etc/alertmanager/
|
||||
newins doc/examples/simple.yml config.yml.example
|
||||
keepdir /var/lib/alertmanager /var/log/alertmanager
|
||||
newinitd "${FILESDIR}"/${PN}.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
|
||||
}
|
||||
@ -1 +1,3 @@
|
||||
DIST prometheus-2.13.1.tar.gz 15249891 BLAKE2B 35cd3c81bdb4f3a783c2ab1f1318946db5b25c94496fe351739a59259a726bf54d418d6b29efeff44c8007353ed63368819ce89ffe6a4f380b7ae216da3c4d63 SHA512 aed3b44db97cd2a67add64d13e950246b25c2b459f6b1081a6c548862c4e85c055254a0dfb94b08ac85f83dbbe30afceb1c54a8ad6f7ff1367aeb6af6d270e8a
|
||||
DIST prometheus-2.19.1-assets.tar.gz 5032055 BLAKE2B 75bc247d3dfbcccf3a9d7ef8a23fabe2d92d698670f5aabb19e1ee019e0197aa4fd49cfd53353e09a765a014af70ad860c7d1b6bce292632e5ed1175dd206ae9 SHA512 52d1f80d9ab2de778e8a0c81549ff83647d3d8af37ccf535a6fc4ac45fe29f25f6592e9b5eb137cd5ed6f6730835e4ba52b6c4c82e5b0bb2336b90c809d756de
|
||||
DIST prometheus-2.19.1.tar.gz 13343138 BLAKE2B 042f2c6e10e3d7f50b2373d9c3977db0318c8c9839e313463890ccae58c91d6d46c306d5aaeb795fb1a9649477b179999cb6b182aca9dee222d8fba557bf6d74 SHA512 a54a83b21ac8f3477e678ca365b8f04adcbe5cdd8a17d842eb9cd2e3428238841fb0492da6f4ec973f48803b0739667c734ae8a88b48d12555e23410e6461629
|
||||
|
||||
@ -0,0 +1,65 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit go-module user
|
||||
|
||||
MY_PV=v${PV/_rc/-rc.}
|
||||
GIT_COMMIT=eba3fdcbf
|
||||
|
||||
DESCRIPTION="Prometheus monitoring system and time series database"
|
||||
HOMEPAGE="https://github.com/prometheus/prometheus"
|
||||
SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
BDEPEND=">=dev-util/promu-0.3.0"
|
||||
DEPEND="!app-metrics/prometheus-bin"
|
||||
|
||||
PROMETHEUS_HOME="/var/lib/prometheus"
|
||||
|
||||
RESTRICT+=" test"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup prometheus
|
||||
enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
|
||||
mv ../assets_vfsdata.go web/ui || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
promu build --prefix bin -v || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/*
|
||||
dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
|
||||
insinto /etc/prometheus
|
||||
doins documentation/examples/prometheus.yml
|
||||
insinto /usr/share/prometheus
|
||||
doins -r console_libraries consoles
|
||||
dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
|
||||
dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
|
||||
|
||||
newinitd "${FILESDIR}"/prometheus.initd prometheus
|
||||
newconfd "${FILESDIR}"/prometheus.confd prometheus
|
||||
keepdir /var/log/prometheus /var/lib/prometheus
|
||||
fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
|
||||
ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
|
||||
ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
|
||||
ewarn "This release requires a clean storage directory and is not compatible with"
|
||||
ewarn "files created by previous beta releases"
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST lfm-2.3.tar.gz 119120 BLAKE2B 12d72d1caed7745dc336644589fba359c198c145d29bb419dbd0586ebe5e170d1a743e24638913a4581137c6e0d2f312a58fb84b22218ecb3f93942cf3d63db9 SHA512 d244cd03ebf4b145c0d364d9d7038a2b640010e7e6bc413a3613d4519afac4856ee7694a962176d7693bef6503b80703685b1cefab1eda0f8d0768ae10abf6c7
|
||||
DIST lfm-3.1.tar.gz 88878 BLAKE2B 409b61d24de671db33c25ff78c039f690fb376fce7bf146c452a67e72d3b50d54b461994ae7a2fb9a17fb64fc94de83f58d5faa0bd960970a53ee5c42fc9c166 SHA512 9e6142c0d871fe19b4b82e5333e03de562ca87a7498bd7fb496cca27e0b42c56a33913f2a7eb46439447ab7adb4a87da44bfcc1548101e15703aaa21ec105af8
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- lfm-2.3/setup.py.orig
|
||||
+++ lfm-2.3/setup.py
|
||||
@@ -56,8 +56,7 @@
|
||||
'lfm/actions', 'lfm/compress', 'lfm/utils', 'lfm/vfs',
|
||||
'lfm/config', 'lfm/pyview'],
|
||||
scripts = ['lfm/lfm', 'lfm/pyview'],
|
||||
- data_files = [('share/doc/lfm', DOC_FILES),
|
||||
- ('share/man/man1', MAN_FILES)]
|
||||
+ data_files = [('share/man/man1', MAN_FILES)]
|
||||
# **addargs
|
||||
)
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="ncurses"
|
||||
|
||||
inherit distutils-r1 eutils
|
||||
|
||||
DESCRIPTION="Last File Manager is a powerful file manager for the console"
|
||||
HOMEPAGE="https://inigo.katxi.org/devel/lfm/"
|
||||
SRC_URI="https://inigo.katxi.org/devel/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-no-doc.patch
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="convert filenames to utf8 or any other charset"
|
||||
HOMEPAGE="https://www.j3e.de/linux/convmv/"
|
||||
SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-lang/perl"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.05-manpage_nocompress.patch" #729544
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
|
||||
dodoc CREDITS Changes TODO VERSION
|
||||
}
|
||||
|
||||
src_test() {
|
||||
unpack ./testsuite.tar
|
||||
|
||||
cd "${S}"/suite || die
|
||||
./dotests.sh || die "Tests failed"
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
--- convmv-2.05/Makefile
|
||||
+++ convmv-2.05/Makefile
|
||||
@@ -10,11 +10,11 @@
|
||||
install: all
|
||||
mkdir -p $(DESTDIR)$(MANDIR)/man1/
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/bin/
|
||||
- cp convmv.1.gz $(DESTDIR)$(MANDIR)/man1/
|
||||
+ cp convmv.1 $(DESTDIR)$(MANDIR)/man1/
|
||||
install -m 755 convmv $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
manpage:
|
||||
- pod2man --section 1 --center=" " convmv | gzip > convmv.1.gz
|
||||
+ pod2man --section 1 --center=" " convmv > convmv.1
|
||||
|
||||
clean:
|
||||
rm -f convmv.1.gz convmv-*.tar.gz MD5sums SHA256sums .files .name
|
||||
@ -1,2 +1 @@
|
||||
DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
|
||||
DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( pypy3 python3_6 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
|
||||
HOMEPAGE="https://github.com/joeyespo/grip"
|
||||
LICENSE="MIT"
|
||||
|
||||
SLOT="0"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="app-arch/unzip"
|
||||
RDEPEND="
|
||||
>=dev-python/docopt-0.6.2
|
||||
>=dev-python/flask-0.10.1
|
||||
>=dev-python/markdown-2.5.1
|
||||
>=dev-python/path-and-address-1.0.0
|
||||
>=dev-python/pygments-1.6
|
||||
>=dev-python/requests-2.4.1
|
||||
"
|
||||
@ -1 +1 @@
|
||||
DIST q-1.5.0.tar.gz 58746 BLAKE2B a35f7ea605a42e81be1ee4899ed9e8c2b4e81e896b6e4c1eb6045b64cc7fa3ffdf6f754be168b3ebe25faa4c8b80f63e2ffff3174231357260263acf335b8d5c SHA512 d21dd16a31629e36f0dee72ebc574283c7937821cb2da7ccaacb8484a35b53193dad05fe9857d1498434a0c1083514ea5b9e5d8a636bcd51d4c5924cb7bb1b55
|
||||
DIST q-2.0.10.tar.gz 218824 BLAKE2B 91f6485d94325768d7bfd32223d379cd90f3ade3760e44c859ec25aee6aeb73c943b3dedbf56b378222f6bc094faf160d86dcacab3dd0ce5ebf93230ca61696d SHA512 ab503a555380b6d17500972256db5e9eb19066d7a1f480091e777681d694746d6d7743254f3839bfd2f08697308aee8cea60e4583a0b1a4d93caf522342f25b2
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,14 +0,0 @@
|
||||
On amd64 linux /usr/lib does not match default 64-bit ABI.
|
||||
|
||||
Let's rely on default compiler and linker paths instead.
|
||||
--- a/src/compiler/crystal/codegen/link.cr
|
||||
+++ b/src/compiler/crystal/codegen/link.cr
|
||||
@@ -106,7 +106,7 @@ module Crystal
|
||||
|
||||
private def lib_flags_posix
|
||||
library_path = ENV["LIBRARY_PATH"]?.try(&.split(':', remove_empty: true)) ||
|
||||
- ["/usr/lib", "/usr/local/lib"]
|
||||
+ [] of String
|
||||
has_pkg_config = nil
|
||||
|
||||
String.build do |flags|
|
||||
@ -1,34 +0,0 @@
|
||||
From 8491f0dc74f8bc89bb926b8130b45eaa5ba92c4b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co>
|
||||
Date: Sat, 28 Mar 2020 10:49:16 +0100
|
||||
Subject: [PATCH] Fix improper regex use, closes #9914
|
||||
|
||||
---
|
||||
lib/elixir/test/elixir/regex_test.exs | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/lib/elixir/test/elixir/regex_test.exs
|
||||
+++ b/lib/elixir/test/elixir/regex_test.exs
|
||||
@@ -91,8 +91,10 @@ defmodule RegexTest do
|
||||
assert <<0xA0::utf8>> =~ ~r/[[:space:]]/u
|
||||
assert <<0xA0::utf8>> =~ ~r/\s/u
|
||||
|
||||
+ # Erlang/OTP 23 raises badarg on invalid UTF-8.
|
||||
+ # Earlier versions simply would not match.
|
||||
+ assert catch_error(if <<?<, 255, ?>>> =~ ~r/<.>/u, do: flunk("failed"), else: raise("failed"))
|
||||
assert <<?<, 255, ?>>> =~ ~r/<.>/
|
||||
- refute <<?<, 255, ?>>> =~ ~r/<.>/u
|
||||
end
|
||||
|
||||
test "ungreedy" do
|
||||
@@ -349,6 +351,6 @@ defmodule RegexTest do
|
||||
end
|
||||
|
||||
defp matches_escaped?(string, match) do
|
||||
- Regex.match?(~r/#{Regex.escape(string)}/simxu, match)
|
||||
+ Regex.match?(~r/#{Regex.escape(string)}/simx, match)
|
||||
end
|
||||
end
|
||||
--
|
||||
2.26.1
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
--- qp10.5.orig/configure.in 2019-12-29 00:57:44.000000000 +0100
|
||||
+++ qp10.5/configure.in 2020-06-25 08:53:32.610430095 +0200
|
||||
@@ -209,22 +209,6 @@
|
||||
uname \
|
||||
)
|
||||
|
||||
-#----------------------------------------------------------------------------
|
||||
-dnl Check for CPP version
|
||||
-AC_MSG_CHECKING([for GCC version])
|
||||
-qp_cpp_ver=[`gcc --version 2>/dev/null | head -1 | sed -e 's/^[^[:digit:]]*\([[:digit:]][^[:space:]]*\).*$/\1/'`]
|
||||
-if test -n "$qp_cpp_ver"; then
|
||||
- AC_MSG_RESULT($qp_cpp_ver)
|
||||
- case "$qp_cpp_ver" in
|
||||
- 2.*)
|
||||
- AC_DEFINE(GCC_VERSION_2, 1, [Whether or not the GCC is gcc 2])
|
||||
- ;;
|
||||
- esac
|
||||
-else
|
||||
- AC_MSG_RESULT(not found)
|
||||
- AC_MSG_ERROR(Could not determine GCC version)
|
||||
-fi
|
||||
-
|
||||
#-----------------------------------------------------------------------------
|
||||
dnl Check for -fno-strict-aliasing
|
||||
AC_MSG_CHECKING([for -fno-strict-aliasing])
|
||||
@ -0,0 +1,100 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools eutils multilib qmake-utils
|
||||
|
||||
MY_P=qp${PV}
|
||||
|
||||
DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
|
||||
HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
|
||||
SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="debug doc examples pedro qt5 readline threads"
|
||||
|
||||
RDEPEND="
|
||||
!dev-util/mpatch
|
||||
!dev-util/rej
|
||||
qt5? (
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtgui:5
|
||||
)
|
||||
pedro? ( net-misc/pedro )
|
||||
readline? ( app-misc/rlwrap )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl"
|
||||
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
|
||||
eapply "${FILESDIR}"/${PN}-10.5-gcc-version.patch
|
||||
eapply_user
|
||||
|
||||
eautoconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
$(use_enable debug) \
|
||||
$(use_enable threads multiple-threads)
|
||||
|
||||
if use qt5; then
|
||||
cd "${S}"/src/xqp || die
|
||||
eqmake5 xqp.pro
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake OPTIMISATION="${CXXFLAGS}"
|
||||
|
||||
if use qt5; then
|
||||
cd "${S}"/src/xqp || die
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
sed \
|
||||
-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
|
||||
-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
|
||||
|
||||
dobin bin/{qc,qecat,qp,kq}
|
||||
|
||||
use qt5 && dobin src/xqp/xqp
|
||||
|
||||
into /usr/$(get_libdir)/${PN}
|
||||
dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/bin
|
||||
doins bin/rl_commands
|
||||
doins bin/{qc1.qup,qecat,qg,qp}.qx
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/library
|
||||
doins prolog/library/*.qo
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/compiler
|
||||
doins prolog/compiler/*.qo
|
||||
|
||||
doman doc/man/man1/*.1
|
||||
|
||||
dodoc README
|
||||
|
||||
if use doc ; then
|
||||
docinto reference-manual
|
||||
dodoc doc/manual/*.html
|
||||
docinto user-guide
|
||||
dodoc doc/user/main.pdf
|
||||
fi
|
||||
|
||||
if use examples ; then
|
||||
docinto examples
|
||||
newdoc examples/README README.examples
|
||||
dodoc examples/*.ql
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
|
||||
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
|
||||
@ -0,0 +1,185 @@
|
||||
From fa1b9053729ec6a4425a44ec5502dd388928274a Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
|
||||
Date: Fri, 12 Oct 2018 08:19:25 +0200
|
||||
Subject: [PATCH] [clang-format] Introduce the flag which allows not to shrink
|
||||
lines
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
* https://reviews.llvm.org/D53072
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Currently there's no way to prevent to lines optimization even
|
||||
if you have intentionally put <CR> to split the line.
|
||||
|
||||
In general case it's fine. So I would prefer to have such option
|
||||
which you can enable in special cases (for me it's an IDE related use case).
|
||||
|
||||
Revert this change if upstream clang-format offers better solution.
|
||||
|
||||
This is a cherry pick from commits b748c82e3664c2e2e3d29645ede472d87b8cde63
|
||||
and 1817513d4f3a2e4e26be124dbe395340f798fd51.
|
||||
|
||||
Change-Id: I9d2935b937bb68ea8dc59fac8463718475e9c080
|
||||
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
||||
---
|
||||
include/clang/Format/Format.h | 13 +++++++++++++
|
||||
lib/Format/Format.cpp | 4 ++++
|
||||
lib/Format/UnwrappedLineFormatter.cpp | 9 +++++----
|
||||
lib/Format/UnwrappedLineParser.cpp | 2 ++
|
||||
unittests/Format/FormatTest.cpp | 16 ++++++++++++++++
|
||||
5 files changed, 40 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/clang/Format/Format.h b/include/clang/Format/Format.h
|
||||
index cb37b0c890c..b9c4df3d1af 100644
|
||||
--- a/include/clang/Format/Format.h
|
||||
+++ b/include/clang/Format/Format.h
|
||||
@@ -22,6 +22,8 @@
|
||||
#include "llvm/Support/Regex.h"
|
||||
#include <system_error>
|
||||
|
||||
+#define KEEP_LINE_BREAKS_FOR_NON_EMPTY_LINES_BACKPORTED
|
||||
+
|
||||
namespace llvm {
|
||||
namespace vfs {
|
||||
class FileSystem;
|
||||
@@ -1200,6 +1202,16 @@ struct FormatStyle {
|
||||
/// \endcode
|
||||
bool JavaScriptWrapImports;
|
||||
|
||||
+ /// If true, no line breaks are optimized out (works only with ColumnLimit = 0)
|
||||
+ /// \code
|
||||
+ /// true: false:
|
||||
+ /// int foo(int a, vs. int foo(int a, int b) {
|
||||
+ /// int b) {
|
||||
+ /// bar(); bar();
|
||||
+ /// } }
|
||||
+ /// \endcode
|
||||
+ bool KeepLineBreaksForNonEmptyLines;
|
||||
+
|
||||
/// If true, the empty line at the start of blocks is kept.
|
||||
/// \code
|
||||
/// true: false:
|
||||
@@ -1767,6 +1779,7 @@ struct FormatStyle {
|
||||
JavaImportGroups == R.JavaImportGroups &&
|
||||
JavaScriptQuotes == R.JavaScriptQuotes &&
|
||||
JavaScriptWrapImports == R.JavaScriptWrapImports &&
|
||||
+ KeepLineBreaksForNonEmptyLines == R.KeepLineBreaksForNonEmptyLines &&
|
||||
KeepEmptyLinesAtTheStartOfBlocks ==
|
||||
R.KeepEmptyLinesAtTheStartOfBlocks &&
|
||||
MacroBlockBegin == R.MacroBlockBegin &&
|
||||
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
|
||||
index 2c4f8760540..61ea88626ee 100644
|
||||
--- a/lib/Format/Format.cpp
|
||||
+++ b/lib/Format/Format.cpp
|
||||
@@ -417,6 +417,8 @@ template <> struct MappingTraits<FormatStyle> {
|
||||
IO.mapOptional("JavaImportGroups", Style.JavaImportGroups);
|
||||
IO.mapOptional("JavaScriptQuotes", Style.JavaScriptQuotes);
|
||||
IO.mapOptional("JavaScriptWrapImports", Style.JavaScriptWrapImports);
|
||||
+ IO.mapOptional("KeepLineBreaksForNonEmptyLines",
|
||||
+ Style.KeepLineBreaksForNonEmptyLines);
|
||||
IO.mapOptional("KeepEmptyLinesAtTheStartOfBlocks",
|
||||
Style.KeepEmptyLinesAtTheStartOfBlocks);
|
||||
IO.mapOptional("MacroBlockBegin", Style.MacroBlockBegin);
|
||||
@@ -678,6 +680,7 @@ FormatStyle getLLVMStyle() {
|
||||
LLVMStyle.JavaScriptWrapImports = true;
|
||||
LLVMStyle.TabWidth = 8;
|
||||
LLVMStyle.MaxEmptyLinesToKeep = 1;
|
||||
+ LLVMStyle.KeepLineBreaksForNonEmptyLines = false;
|
||||
LLVMStyle.KeepEmptyLinesAtTheStartOfBlocks = true;
|
||||
LLVMStyle.NamespaceIndentation = FormatStyle::NI_None;
|
||||
LLVMStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Auto;
|
||||
@@ -745,6 +748,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
|
||||
{"^<ext/.*\\.h>", 2}, {"^<.*\\.h>", 1}, {"^<.*", 2}, {".*", 3}};
|
||||
GoogleStyle.IncludeStyle.IncludeIsMainRegex = "([-_](test|unittest))?$";
|
||||
GoogleStyle.IndentCaseLabels = true;
|
||||
+ GoogleStyle.KeepLineBreaksForNonEmptyLines = false;
|
||||
GoogleStyle.KeepEmptyLinesAtTheStartOfBlocks = false;
|
||||
GoogleStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Never;
|
||||
GoogleStyle.ObjCSpaceAfterProperty = false;
|
||||
diff --git a/lib/Format/UnwrappedLineFormatter.cpp b/lib/Format/UnwrappedLineFormatter.cpp
|
||||
index 6b6a9aff461..c88efbc6867 100644
|
||||
--- a/lib/Format/UnwrappedLineFormatter.cpp
|
||||
+++ b/lib/Format/UnwrappedLineFormatter.cpp
|
||||
@@ -684,7 +684,7 @@ public:
|
||||
LineFormatter(ContinuationIndenter *Indenter, WhitespaceManager *Whitespaces,
|
||||
const FormatStyle &Style,
|
||||
UnwrappedLineFormatter *BlockFormatter)
|
||||
- : Indenter(Indenter), Whitespaces(Whitespaces), Style(Style),
|
||||
+ : Indenter(Indenter), Style(Style), Whitespaces(Whitespaces),
|
||||
BlockFormatter(BlockFormatter) {}
|
||||
virtual ~LineFormatter() {}
|
||||
|
||||
@@ -727,7 +727,8 @@ protected:
|
||||
// assert so that we can simply call this function for all tokens.
|
||||
return true;
|
||||
|
||||
- if (NewLine) {
|
||||
+ if (NewLine || (Previous.Children[0]->First->MustBreakBefore &&
|
||||
+ Style.KeepLineBreaksForNonEmptyLines)) {
|
||||
int AdditionalIndent = State.Stack.back().Indent -
|
||||
Previous.Children[0]->Level * Style.IndentWidth;
|
||||
|
||||
@@ -772,10 +773,10 @@ protected:
|
||||
}
|
||||
|
||||
ContinuationIndenter *Indenter;
|
||||
+ const FormatStyle &Style;
|
||||
|
||||
private:
|
||||
WhitespaceManager *Whitespaces;
|
||||
- const FormatStyle &Style;
|
||||
UnwrappedLineFormatter *BlockFormatter;
|
||||
};
|
||||
|
||||
@@ -798,7 +799,7 @@ public:
|
||||
while (State.NextToken) {
|
||||
bool Newline =
|
||||
Indenter->mustBreak(State) ||
|
||||
- (Indenter->canBreak(State) && State.NextToken->NewlinesBefore > 0);
|
||||
+ (State.NextToken->NewlinesBefore > 0 && Indenter->canBreak(State));
|
||||
unsigned Penalty = 0;
|
||||
formatChildren(State, Newline, /*DryRun=*/false, Penalty);
|
||||
Indenter->addTokenToState(State, Newline, /*DryRun=*/false);
|
||||
diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
|
||||
index 3cd3c8f9cdf..3aa30c7cb3f 100644
|
||||
--- a/lib/Format/UnwrappedLineParser.cpp
|
||||
+++ b/lib/Format/UnwrappedLineParser.cpp
|
||||
@@ -2554,6 +2554,8 @@ void UnwrappedLineParser::nextToken(int LevelDifference) {
|
||||
else
|
||||
readTokenWithJavaScriptASI();
|
||||
FormatTok->Previous = Previous;
|
||||
+ if (FormatTok->NewlinesBefore && Style.KeepLineBreaksForNonEmptyLines)
|
||||
+ FormatTok->MustBreakBefore = true;
|
||||
}
|
||||
|
||||
void UnwrappedLineParser::distributeComments(
|
||||
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
|
||||
index c05fceb4766..38906d9ee31 100644
|
||||
--- a/unittests/Format/FormatTest.cpp
|
||||
+++ b/unittests/Format/FormatTest.cpp
|
||||
@@ -385,6 +385,22 @@ TEST_F(FormatTest, RemovesEmptyLines) {
|
||||
" void funk() {}\n"
|
||||
"};",
|
||||
Style));
|
||||
+
|
||||
+ Style.KeepLineBreaksForNonEmptyLines = true;
|
||||
+ Style.ColumnLimit = 0;
|
||||
+ EXPECT_EQ("int foo(int a,\n"
|
||||
+ " int b)\n"
|
||||
+ "{\n"
|
||||
+ "}",
|
||||
+ format("int foo(int a,\n"
|
||||
+ "int b) {}",
|
||||
+ Style));
|
||||
+
|
||||
+ EXPECT_EQ("[]() {\n"
|
||||
+ " foo(); }",
|
||||
+ format("[]() {\n"
|
||||
+ "foo(); }",
|
||||
+ Style));
|
||||
}
|
||||
|
||||
TEST_F(FormatTest, RecognizesBinaryOperatorKeywords) {
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -0,0 +1,72 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake llvm llvm.org toolchain-funcs
|
||||
|
||||
DESCRIPTION="A static clangformat library patched for IDE use"
|
||||
HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9"
|
||||
LLVM_COMPONENTS=( clang )
|
||||
|
||||
llvm.org_set_globals
|
||||
|
||||
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
|
||||
SLOT="$(ver_cut 1)"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug"
|
||||
|
||||
DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]"
|
||||
|
||||
# least intrusive of all
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
|
||||
PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" )
|
||||
|
||||
pkg_setup() {
|
||||
LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
llvm.org_src_unpack
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
-DLLVM_ENABLE_EH=ON
|
||||
-DLLVM_ENABLE_RTTI=ON
|
||||
)
|
||||
|
||||
if [[ -n ${EPREFIX} ]]; then
|
||||
mycmakeargs+=(
|
||||
-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
|
||||
)
|
||||
fi
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
[[ -x "/usr/bin/clang-tblgen" ]] \
|
||||
|| die "/usr/bin/clang-tblgen not found or usable"
|
||||
mycmakeargs+=(
|
||||
-DCMAKE_CROSSCOMPILING=ON
|
||||
-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
|
||||
)
|
||||
fi
|
||||
|
||||
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
|
||||
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile libclangFormat.a
|
||||
}
|
||||
|
||||
src_install() {
|
||||
into usr/lib/llvm/${SLOT}
|
||||
newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a
|
||||
insinto usr/lib/llvm/${SLOT}/include/clang/Format
|
||||
newins "${S}/include/clang/Format/Format.h" FormatIDE.h
|
||||
}
|
||||
@ -0,0 +1,72 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake llvm llvm.org toolchain-funcs
|
||||
|
||||
DESCRIPTION="A static clangformat library patched for IDE use"
|
||||
HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9"
|
||||
LLVM_COMPONENTS=( clang )
|
||||
|
||||
llvm.org_set_globals
|
||||
|
||||
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
|
||||
SLOT="$(ver_cut 1)"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug"
|
||||
|
||||
DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]"
|
||||
|
||||
# least intrusive of all
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
|
||||
PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" )
|
||||
|
||||
pkg_setup() {
|
||||
LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
llvm.org_src_unpack
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
-DLLVM_ENABLE_EH=ON
|
||||
-DLLVM_ENABLE_RTTI=ON
|
||||
)
|
||||
|
||||
if [[ -n ${EPREFIX} ]]; then
|
||||
mycmakeargs+=(
|
||||
-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
|
||||
)
|
||||
fi
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
[[ -x "/usr/bin/clang-tblgen" ]] \
|
||||
|| die "/usr/bin/clang-tblgen not found or usable"
|
||||
mycmakeargs+=(
|
||||
-DCMAKE_CROSSCOMPILING=ON
|
||||
-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
|
||||
)
|
||||
fi
|
||||
|
||||
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
|
||||
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile libclangFormat.a
|
||||
}
|
||||
|
||||
src_install() {
|
||||
into usr/lib/llvm/${SLOT}
|
||||
newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a
|
||||
insinto usr/lib/llvm/${SLOT}/include/clang/Format
|
||||
newins "${S}/include/clang/Format/Format.h" FormatIDE.h
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>pesa@gentoo.org</email>
|
||||
<name>Davide Pesavento</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1,3 +1,2 @@
|
||||
DIST libinput-1.15.4.tar.xz 580616 BLAKE2B cac324f08b8dc3c6cc18ca62d528c3a00fbd70a1d434aa171da2e144d8d74f961bcb491f6dc39b365f766ea8e5ed87b29b1dd5aa9f62b12707f8e49e5c63a5d7 SHA512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80
|
||||
DIST libinput-1.15.5.tar.xz 582800 BLAKE2B 8575dbe6699230610e05f4c7e9e72aebb1fb765be1d305ba6d9fcf69c6efc990ec78bd0746b29921a2414df99c536c3f267b1dd1d6d98c872e360fc16572e2a4 SHA512 a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a
|
||||
DIST libinput-1.15.6.tar.xz 584184 BLAKE2B 9963e9df41cb32c40454a3dc76975315f74a2e8b2549c037868c651c2ada90f77a605048ba603a4c01d0641fc39154b578a766309f1c376c07d3bdd02dfd387c SHA512 90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
# Copyright 2014-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{6,7} )
|
||||
|
||||
inherit meson python-any-r1 udev
|
||||
|
||||
DESCRIPTION="Library to handle input devices in Wayland"
|
||||
HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
|
||||
SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/10"
|
||||
[[ "$(ver_cut 3)" -gt 900 ]] || \
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
|
||||
IUSE="doc input_devices_wacom test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
$(python_gen_any_dep '
|
||||
dev-python/commonmark[${PYTHON_USEDEP}]
|
||||
dev-python/recommonmark[${PYTHON_USEDEP}]
|
||||
dev-python/sphinx[${PYTHON_USEDEP}]
|
||||
>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
|
||||
')
|
||||
>=app-doc/doxygen-1.8.3
|
||||
>=media-gfx/graphviz-2.38.0
|
||||
)
|
||||
"
|
||||
# test? ( dev-util/valgrind )
|
||||
RDEPEND="
|
||||
input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
|
||||
>=dev-libs/libevdev-1.3
|
||||
>=sys-libs/mtdev-1.1
|
||||
virtual/libudev:=
|
||||
virtual/udev
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( >=dev-libs/check-0.9.10 )"
|
||||
|
||||
python_check_deps() {
|
||||
has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
|
||||
has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
|
||||
has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
|
||||
has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use doc && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# gui can be built but will not be installed
|
||||
local emesonargs=(
|
||||
-Ddebug-gui=false
|
||||
$(meson_use doc documentation)
|
||||
$(meson_use input_devices_wacom libwacom)
|
||||
$(meson_use test tests)
|
||||
-Dudev-dir="${EPREFIX}$(get_udevdir)"
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
if use doc ; then
|
||||
docinto html
|
||||
dodoc -r "${BUILD_DIR}"/Documentation/.
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
pkgname="dev-python/python-libevdev"
|
||||
if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then
|
||||
einfo "${pkgname} must be installed to use the"
|
||||
einfo "libinput measure and libinput replay tools."
|
||||
fi
|
||||
|
||||
udevadm hwdb --update --root="${ROOT}"
|
||||
}
|
||||
Binary file not shown.
@ -1,433 +0,0 @@
|
||||
From 44d5360d0caed1f4f364691f789fe825fcd17a3e Mon Sep 17 00:00:00 2001
|
||||
From: crito <crito@fnordpipe.org>
|
||||
Date: Mon, 1 Oct 2018 20:10:05 +0200
|
||||
Subject: [PATCH] fix libressl compat
|
||||
|
||||
add conditions to build with libressl and add missing functions.
|
||||
backported from upstream repo.
|
||||
---
|
||||
src/compat.c | 11 ++++++++---
|
||||
src/digest.c | 2 +-
|
||||
src/ec.c | 2 +-
|
||||
src/engine.c | 10 +++++-----
|
||||
src/lhash.c | 7 ++++---
|
||||
src/openssl.c | 12 ++++++++++--
|
||||
src/ots.c | 5 +++++
|
||||
src/pkcs7.c | 24 ++++++++++++------------
|
||||
src/private.h | 7 ++++---
|
||||
src/sm2.c | 2 +-
|
||||
src/srp.c | 3 ++-
|
||||
src/x509.c | 2 +-
|
||||
12 files changed, 54 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/src/compat.c b/src/compat.c
|
||||
index cc4cc21..cc45845 100644
|
||||
--- a/src/compat.c
|
||||
+++ b/src/compat.c
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "openssl.h"
|
||||
#include "private.h"
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
int BIO_up_ref(BIO *b)
|
||||
{
|
||||
CRYPTO_add(&b->references, 1, CRYPTO_LOCK_BIO);
|
||||
@@ -16,6 +16,11 @@ int X509_up_ref(X509 *x)
|
||||
CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
|
||||
return 1;
|
||||
}
|
||||
+int X509_CRL_up_ref(X509_CRL *x)
|
||||
+{
|
||||
+ int refs = CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL);
|
||||
+ return (refs > 1) ? 1 : 0;
|
||||
+}
|
||||
int X509_STORE_up_ref(X509_STORE *s)
|
||||
{
|
||||
CRYPTO_add(&s->references, 1, CRYPTO_LOCK_X509_STORE);
|
||||
@@ -464,7 +469,7 @@ const ASN1_BIT_STRING *TS_STATUS_INFO_get0_failure_info(const TS_STATUS_INFO *a)
|
||||
return a->failure_info;
|
||||
}
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10002000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
int i2d_re_X509_tbs(X509 *x, unsigned char **pp)
|
||||
{
|
||||
x->cert_info->enc.modified = 1;
|
||||
@@ -527,4 +532,4 @@ unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
|
||||
return ctx->imprint;
|
||||
}
|
||||
|
||||
-#endif /* < 1.1.0 */
|
||||
\ No newline at end of file
|
||||
+#endif /* < 1.1.0 */
|
||||
diff --git a/src/digest.c b/src/digest.c
|
||||
index 02e8fe1..0dcf65b 100644
|
||||
--- a/src/digest.c
|
||||
+++ b/src/digest.c
|
||||
@@ -468,7 +468,7 @@ restore md data
|
||||
static LUA_FUNCTION(openssl_digest_ctx_data)
|
||||
{
|
||||
EVP_MD_CTX *ctx = CHECK_OBJECT(1, EVP_MD_CTX, "openssl.evp_digest_ctx");
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
if (lua_isnone(L, 2))
|
||||
{
|
||||
lua_pushlstring(L, ctx->md_data, ctx->digest->ctx_size);
|
||||
diff --git a/src/ec.c b/src/ec.c
|
||||
index f0d2b6b..5db32db 100644
|
||||
--- a/src/ec.c
|
||||
+++ b/src/ec.c
|
||||
@@ -611,7 +611,7 @@ static int openssl_ecdsa_set_method(lua_State *L)
|
||||
{
|
||||
EC_KEY *ec = CHECK_OBJECT(1, EC_KEY, "openssl.ec_key");
|
||||
ENGINE *e = CHECK_OBJECT(2, ENGINE, "openssl.engine");
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
const ECDSA_METHOD *m = ENGINE_get_ECDSA(e);
|
||||
if (m) {
|
||||
int r = ECDSA_set_method(ec, m);
|
||||
diff --git a/src/engine.c b/src/engine.c
|
||||
index 1a26d8b..f12ca53 100644
|
||||
--- a/src/engine.c
|
||||
+++ b/src/engine.c
|
||||
@@ -14,7 +14,7 @@ enum
|
||||
{
|
||||
TYPE_RSA,
|
||||
TYPE_DSA,
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
TYPE_ECDH,
|
||||
TYPE_ECDSA,
|
||||
#else
|
||||
@@ -24,7 +24,7 @@ enum
|
||||
TYPE_RAND,
|
||||
TYPE_CIPHERS,
|
||||
TYPE_DIGESTS,
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
TYPE_STORE,
|
||||
#else
|
||||
TYPE_PKEY_METHODS,
|
||||
@@ -150,7 +150,7 @@ static int openssl_engine_register(lua_State*L)
|
||||
else
|
||||
ENGINE_register_DSA(eng);
|
||||
break;
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
case TYPE_ECDH:
|
||||
if (unregister)
|
||||
ENGINE_unregister_ECDH(eng);
|
||||
@@ -183,7 +183,7 @@ static int openssl_engine_register(lua_State*L)
|
||||
else
|
||||
ENGINE_register_RAND(eng);
|
||||
break;
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
case TYPE_STORE:
|
||||
if (unregister)
|
||||
ENGINE_unregister_STORE(eng);
|
||||
@@ -392,7 +392,7 @@ static int openssl_engine_set_default(lua_State*L)
|
||||
case TYPE_DSA:
|
||||
ret = ENGINE_set_default_DSA(eng);
|
||||
break;
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
case TYPE_ECDH:
|
||||
ret = ENGINE_set_default_ECDH(eng);
|
||||
break;
|
||||
diff --git a/src/lhash.c b/src/lhash.c
|
||||
index 564bb52..8057efb 100644
|
||||
--- a/src/lhash.c
|
||||
+++ b/src/lhash.c
|
||||
@@ -130,21 +130,22 @@ static void dump_value_doall_arg(CONF_VALUE *a, lua_State *L)
|
||||
}
|
||||
}
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
IMPLEMENT_LHASH_DOALL_ARG_CONST(CONF_VALUE, lua_State);
|
||||
#elif OPENSSL_VERSION_NUMBER >= 0x10000002L
|
||||
static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE, lua_State)
|
||||
#endif
|
||||
+#if !defined(LIBRESSL_VERSION_NUMBER)
|
||||
#define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \
|
||||
lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
|
||||
-
|
||||
+#endif
|
||||
|
||||
static LUA_FUNCTION(openssl_lhash_parse)
|
||||
{
|
||||
LHASH* lhash = CHECK_OBJECT(1, LHASH, "openssl.lhash");
|
||||
|
||||
lua_newtable(L);
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
lh_CONF_VALUE_doall_lua_State(lhash, dump_value_doall_arg, L);
|
||||
#elif OPENSSL_VERSION_NUMBER >= 0x10000002L
|
||||
lh_CONF_VALUE_doall_arg(lhash, LHASH_DOALL_ARG_FN(dump_value), lua_State, L);
|
||||
diff --git a/src/openssl.c b/src/openssl.c
|
||||
index 994c22b..debea63 100644
|
||||
--- a/src/openssl.c
|
||||
+++ b/src/openssl.c
|
||||
@@ -338,6 +338,9 @@ get FIPS mode
|
||||
*/
|
||||
static int openssl_fips_mode(lua_State *L)
|
||||
{
|
||||
+#if defined(LIBRESSL_VERSION_NUMBER)
|
||||
+ return 0;
|
||||
+#else
|
||||
int ret =0, on = 0;
|
||||
if(lua_isnone(L, 1))
|
||||
{
|
||||
@@ -353,6 +356,7 @@ static int openssl_fips_mode(lua_State *L)
|
||||
else
|
||||
ret = openssl_pushresult(L, ret);
|
||||
return ret;
|
||||
+#endif
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
|
||||
@@ -405,7 +409,9 @@ void CRYPTO_thread_cleanup(void);
|
||||
|
||||
static int luaclose_openssl(lua_State *L)
|
||||
{
|
||||
+#if !defined(LIBRESSL_VERSION_NUMBER)
|
||||
FIPS_mode_set(0);
|
||||
+#endif
|
||||
#if defined(OPENSSL_THREADS)
|
||||
CRYPTO_thread_cleanup();
|
||||
#endif
|
||||
@@ -421,7 +427,7 @@ static int luaclose_openssl(lua_State *L)
|
||||
CRYPTO_cleanup_all_ex_data();
|
||||
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
|
||||
#if !(defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_FP_API))
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10101000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10101000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
CRYPTO_mem_leaks_fp(stderr);
|
||||
#else
|
||||
if(CRYPTO_mem_leaks_fp(stderr)!=1)
|
||||
@@ -541,13 +547,15 @@ LUALIB_API int luaopen_openssl(lua_State*L)
|
||||
luaopen_dh(L);
|
||||
lua_setfield(L, -2, "dh");
|
||||
|
||||
-#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2)
|
||||
+#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
luaopen_sm2(L);
|
||||
lua_setfield(L, -2, "sm2");
|
||||
#endif
|
||||
|
||||
+#if !defined(LIBRESSL_VERSION_NUMBER)
|
||||
luaopen_srp(L);
|
||||
lua_setfield(L, -2, "srp");
|
||||
+#endif
|
||||
|
||||
#ifdef ENABLE_OPENSSL_GLOBAL
|
||||
lua_pushvalue(L, -1);
|
||||
diff --git a/src/ots.c b/src/ots.c
|
||||
index 6b75946..762d17e 100644
|
||||
--- a/src/ots.c
|
||||
+++ b/src/ots.c
|
||||
@@ -1265,7 +1265,12 @@ static LUA_FUNCTION(openssl_ts_resp_ctx_set_time_cb)
|
||||
arg->cb_arg = luaL_ref(L, LUA_REGISTRYINDEX);
|
||||
|
||||
openssl_valueset(L, ctx, time_cb_key);
|
||||
+#if defined(LIBRESSL_VERSION_NUMBER)
|
||||
+ ctx->time_cb = openssl_time_cb;
|
||||
+ ctx->time_cb_data = L;
|
||||
+#else
|
||||
TS_RESP_CTX_set_time_cb(ctx, openssl_time_cb, L);
|
||||
+#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/src/pkcs7.c b/src/pkcs7.c
|
||||
index f043c86..f0e5221 100644
|
||||
--- a/src/pkcs7.c
|
||||
+++ b/src/pkcs7.c
|
||||
@@ -346,7 +346,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
|
||||
os = p7->d.signed_and_enveloped->enc_data->enc_data;
|
||||
if (!os)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
os = M_ASN1_OCTET_STRING_new();
|
||||
#else
|
||||
os = ASN1_OCTET_STRING_new();
|
||||
@@ -364,7 +364,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
|
||||
os = p7->d.enveloped->enc_data->enc_data;
|
||||
if (!os)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
os = M_ASN1_OCTET_STRING_new();
|
||||
#else
|
||||
os = ASN1_OCTET_STRING_new();
|
||||
@@ -383,7 +383,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
|
||||
/* If detached data then the content is excluded */
|
||||
if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
M_ASN1_OCTET_STRING_free(os);
|
||||
#else
|
||||
ASN1_OCTET_STRING_free(os);
|
||||
@@ -398,7 +398,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
|
||||
/* If detached data then the content is excluded */
|
||||
if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
M_ASN1_OCTET_STRING_free(os);
|
||||
#else
|
||||
ASN1_OCTET_STRING_free(os);
|
||||
@@ -474,7 +474,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
|
||||
goto err;
|
||||
if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
|
||||
goto err;
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
|
||||
#else
|
||||
ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
|
||||
@@ -577,7 +577,7 @@ int PKCS7_signatureVerify_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509,
|
||||
|
||||
md_type = OBJ_obj2nid(si->digest_alg->algorithm);
|
||||
md = EVP_get_digestbynid(md_type);
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
if (!md || !data || (hash && len != (size_t) md->ctx_size) )
|
||||
goto err;
|
||||
|
||||
@@ -1137,7 +1137,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
|
||||
os = p7->d.signed_and_enveloped->enc_data->enc_data;
|
||||
if (!os)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
os = M_ASN1_OCTET_STRING_new();
|
||||
#else
|
||||
os = ASN1_OCTET_STRING_new();
|
||||
@@ -1155,7 +1155,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
|
||||
os = p7->d.enveloped->enc_data->enc_data;
|
||||
if (!os)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
os = M_ASN1_OCTET_STRING_new();
|
||||
#else
|
||||
os = ASN1_OCTET_STRING_new();
|
||||
@@ -1174,7 +1174,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
|
||||
/* If detached data then the content is excluded */
|
||||
if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
M_ASN1_OCTET_STRING_free(os);
|
||||
#else
|
||||
ASN1_OCTET_STRING_free(os);
|
||||
@@ -1189,7 +1189,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
|
||||
/* If detached data then the content is excluded */
|
||||
if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
M_ASN1_OCTET_STRING_free(os);
|
||||
#else
|
||||
ASN1_OCTET_STRING_free(os);
|
||||
@@ -1217,7 +1217,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
|
||||
|
||||
if (hash)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
if (l == (size_t) mdc->digest->ctx_size)
|
||||
{
|
||||
memcpy(mdc->md_data, data, l);
|
||||
@@ -1272,7 +1272,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
|
||||
unsigned int md_len;
|
||||
md = EVP_get_digestbynid(OBJ_obj2nid(p7->d.digest->md->algorithm));
|
||||
EVP_DigestInit_ex(mdc, md, NULL);
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
if (l == (size_t) mdc->digest->ctx_size)
|
||||
{
|
||||
memcpy(mdc->md_data, data, l);
|
||||
diff --git a/src/private.h b/src/private.h
|
||||
index 8e9d5b8..7140cae 100644
|
||||
--- a/src/private.h
|
||||
+++ b/src/private.h
|
||||
@@ -46,9 +46,10 @@ extern "C" {
|
||||
luaL_getmetatable(L,"openssl.bn"); \
|
||||
lua_setmetatable(L,-2)
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
int BIO_up_ref(BIO *b);
|
||||
int X509_up_ref(X509 *x);
|
||||
+int X509_CRL_up_ref(X509_CRL *x);
|
||||
int X509_STORE_up_ref(X509_STORE *s);
|
||||
int EVP_PKEY_up_ref(EVP_PKEY *pkey);
|
||||
|
||||
@@ -124,12 +125,12 @@ STACK_OF(X509) *TS_VERIFY_CTS_set_certs(TS_VERIFY_CTX *ctx,
|
||||
unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
|
||||
unsigned char *hexstr, long len);
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10002000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
int i2d_re_X509_tbs(X509 *x, unsigned char **pp);
|
||||
+#endif
|
||||
void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
|
||||
const X509 *x);
|
||||
int X509_get_signature_nid(const X509 *x);
|
||||
-#endif
|
||||
|
||||
#endif
|
||||
|
||||
diff --git a/src/sm2.c b/src/sm2.c
|
||||
index 0655888..1db3198 100644
|
||||
--- a/src/sm2.c
|
||||
+++ b/src/sm2.c
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "openssl.h"
|
||||
#include "private.h"
|
||||
|
||||
-#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2)
|
||||
+#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
|
||||
# include <openssl/sm2.h>
|
||||
|
||||
diff --git a/src/srp.c b/src/srp.c
|
||||
index 85626b5..6fb0a50 100644
|
||||
--- a/src/srp.c
|
||||
+++ b/src/srp.c
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "openssl.h"
|
||||
#include "private.h"
|
||||
|
||||
+#if !defined(LIBRESSL_VERSION_NUMBER)
|
||||
#include <openssl/srp.h>
|
||||
#include <openssl/bn.h>
|
||||
|
||||
@@ -198,4 +199,4 @@ int luaopen_srp(lua_State *L)
|
||||
lua_settable(L, -3);
|
||||
return 1;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
diff --git a/src/x509.c b/src/x509.c
|
||||
index 94e9982..07adb54 100644
|
||||
--- a/src/x509.c
|
||||
+++ b/src/x509.c
|
||||
@@ -1196,7 +1196,7 @@ static int openssl_x509_extensions(lua_State* L)
|
||||
else
|
||||
{
|
||||
STACK_OF(X509_EXTENSION) *others = (STACK_OF(X509_EXTENSION) *)openssl_sk_x509_extension_fromtable(L, 2);
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
sk_X509_EXTENSION_pop_free(self->cert_info->extensions, X509_EXTENSION_free);
|
||||
self->cert_info->extensions = others;
|
||||
#else
|
||||
--
|
||||
2.16.4
|
||||
|
||||
Binary file not shown.
@ -1,23 +0,0 @@
|
||||
diff -r f52d1198146d tests/test_lib_utils.py
|
||||
--- a/tests/test_lib_utils.py Tue Jan 15 16:06:40 2019 +0000
|
||||
+++ b/tests/test_lib_utils.py Sun Jan 27 10:21:29 2019 -0500
|
||||
@@ -112,7 +112,7 @@
|
||||
"test open and read of a relative file: URL"
|
||||
b = _rel_open_and_read('file:../docs/images/Edit_Prefs.gif')
|
||||
|
||||
- def test9(self):
|
||||
+ def xtest9(self):
|
||||
"test open and read of an http: URL"
|
||||
from reportlab.lib.utils import open_and_read
|
||||
b = open_and_read('http://www.reportlab.com/rsrc/encryption.gif')
|
||||
diff -r f52d1198146d tests/test_platypus_general.py
|
||||
--- a/tests/test_platypus_general.py Tue Jan 15 16:06:40 2019 +0000
|
||||
+++ b/tests/test_platypus_general.py Sun Jan 27 10:21:29 2019 -0500
|
||||
@@ -587,7 +587,7 @@
|
||||
|
||||
class PlatypusTestCase(unittest.TestCase):
|
||||
|
||||
- def test0(self):
|
||||
+ def xtest0(self):
|
||||
"Make a platypus document"
|
||||
run()
|
||||
@ -1,17 +0,0 @@
|
||||
--- a/src/reportlab/lib/utils.py
|
||||
+++ b/src/reportlab/lib/utils.py
|
||||
@@ -883,7 +883,13 @@
|
||||
im = self._image
|
||||
mode = self.mode = im.mode
|
||||
if mode in ('LA','RGBA'):
|
||||
- if Image.VERSION.startswith('1.1.7'): im.load()
|
||||
+ # Pillow 6.0.0 and above have removed the 'VERSION' attribute
|
||||
+ # https://bitbucket.org/rptlab/reportlab/issues/176/incompatibility-with-pillow-600
|
||||
+ try:
|
||||
+ im_ver = Image.__version__
|
||||
+ except AttributeError:
|
||||
+ im_ver = Image.VERSION
|
||||
+ if im_ver.startswith('1.1.7'): im.load()
|
||||
self._dataA = ImageReader(im.split()[3 if mode=='RGBA' else 1])
|
||||
nm = mode[:-1]
|
||||
im = im.convert(nm)
|
||||
Binary file not shown.
@ -1,3 +1,3 @@
|
||||
DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
|
||||
DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215
|
||||
DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
|
||||
DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
|
||||
|
||||
@ -0,0 +1,84 @@
|
||||
From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Levine <plevine457@gmail.com>
|
||||
Date: Tue, 5 May 2020 03:45:35 -0400
|
||||
Subject: [PATCH] Fix building against clang configured with
|
||||
CLANG_LINK_CLANG_DYLIB
|
||||
|
||||
LLVM/Clang upstream only officially supports building shared
|
||||
components as a single dynamic library (via
|
||||
LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..).
|
||||
Linux distros like Fedora and Gentoo have followed suit.
|
||||
|
||||
Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri
|
||||
file assumes clang is built with separate component libraries
|
||||
and the build fails.
|
||||
|
||||
This change alters the build to check for the existence
|
||||
of clang component libraries and, if found, link to them, or
|
||||
otherwise to libclang-cpp.
|
||||
|
||||
Task-number: QTCREATORBUG-23172
|
||||
Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86
|
||||
---
|
||||
src/shared/clang/clang_installation.pri | 35 +++++++++++++++----------
|
||||
1 file changed, 21 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
|
||||
index 08838838bca..c191c57f1c7 100644
|
||||
--- a/src/shared/clang/clang_installation.pri
|
||||
+++ b/src/shared/clang/clang_installation.pri
|
||||
@@ -204,19 +204,6 @@ isEmpty(LLVM_VERSION) {
|
||||
}
|
||||
}
|
||||
|
||||
- isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
|
||||
- CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
|
||||
- exists($$CLANGFORMAT_MAIN_HEADER) {
|
||||
- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
|
||||
- ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
|
||||
- -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
|
||||
- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
|
||||
- -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
|
||||
- win32:CLANGFORMAT_LIBS += -lversion
|
||||
- }
|
||||
- }
|
||||
- win32:ALL_CLANG_LIBS += -lversion
|
||||
-
|
||||
LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
|
||||
!exists($$LIBCLANG_MAIN_HEADER) {
|
||||
$$llvmWarningOrError(\
|
||||
@@ -237,10 +224,30 @@ isEmpty(LLVM_VERSION) {
|
||||
LIBCLANG_LIBS += $${CLANG_LIB}
|
||||
|
||||
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
|
||||
+ CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
|
||||
+ exists($$CLANGFORMAT_MAIN_HEADER) {
|
||||
+ exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {
|
||||
+ CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
|
||||
+ ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
|
||||
+ -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
|
||||
+ -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
|
||||
+ -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
|
||||
+ win32:CLANGFORMAT_LIBS += -lversion
|
||||
+ win32:ALL_CLANG_LIBS += -lversion
|
||||
+ } else {
|
||||
+ CLANGFORMAT_LIBS=-lclang-cpp
|
||||
+ ALL_CLANG_LIBS=-lclang-cpp
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING)
|
||||
isEmpty(QTC_DISABLE_CLANG_REFACTORING) {
|
||||
!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}
|
||||
- LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
|
||||
+ exists($${LLVM_LIBDIR}/libclangTooling.so*)|exists($${LLVM_LIBDIR}/libclangTooling.dylib) {
|
||||
+ LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
|
||||
+ } else {
|
||||
+ LIBTOOLING_LIBS += -lclang-cpp $$LLVM_STATIC_LIBS
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
--- a/src/plugins/clangformat/clangformatbaseindenter.h
|
||||
+++ b/src/plugins/clangformat/clangformatbaseindenter.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include <texteditor/indenter.h>
|
||||
|
||||
-#include <clang/Format/Format.h>
|
||||
+#include <clang/Format/FormatIDE.h>
|
||||
|
||||
namespace ClangFormat {
|
||||
|
||||
--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
|
||||
+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "ui_clangformatchecks.h"
|
||||
#include "ui_clangformatconfigwidget.h"
|
||||
|
||||
-#include <clang/Format/Format.h>
|
||||
+#include <clang/Format/FormatIDE.h>
|
||||
|
||||
#include <coreplugin/icore.h>
|
||||
#include <cppeditor/cpphighlighter.h>
|
||||
--- a/src/plugins/clangformat/clangformatplugin.cpp
|
||||
+++ b/src/plugins/clangformat/clangformatplugin.cpp
|
||||
@@ -56,7 +56,7 @@
|
||||
#include <texteditor/icodestylepreferences.h>
|
||||
#include <texteditor/texteditorsettings.h>
|
||||
|
||||
-#include <clang/Format/Format.h>
|
||||
+#include <clang/Format/FormatIDE.h>
|
||||
|
||||
#include <utils/algorithm.h>
|
||||
|
||||
--- a/src/plugins/clangformat/clangformatutils.h
|
||||
+++ b/src/plugins/clangformat/clangformatutils.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include <coreplugin/id.h>
|
||||
#include <utils/fileutils.h>
|
||||
-#include <clang/Format/Format.h>
|
||||
+#include <clang/Format/FormatIDE.h>
|
||||
|
||||
#include <QFile>
|
||||
|
||||
--- a/src/shared/clang/clang_installation.pri
|
||||
+++ b/src/shared/clang/clang_installation.pri
|
||||
@@ -227,7 +227,7 @@
|
||||
CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
|
||||
exists($$CLANGFORMAT_MAIN_HEADER) {
|
||||
exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {
|
||||
- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
|
||||
+ CLANGFORMAT_LIBS=-lclangFormatIDE -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
|
||||
ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
|
||||
-lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
|
||||
-lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
|
||||
@@ -235,7 +235,7 @@
|
||||
win32:CLANGFORMAT_LIBS += -lversion
|
||||
win32:ALL_CLANG_LIBS += -lversion
|
||||
} else {
|
||||
- CLANGFORMAT_LIBS=-lclang-cpp
|
||||
+ CLANGFORMAT_LIBS=-lclangFormatIDE -lclang-cpp
|
||||
ALL_CLANG_LIBS=-lclang-cpp
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,103 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PV_FULL=${PV/_p/-0-}
|
||||
PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
|
||||
BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
|
||||
|
||||
declare -A QT5_DOCS=(
|
||||
[3d]="qt3d"
|
||||
[assistant]="qtassistant"
|
||||
[bluetooth]="qtbluetooth"
|
||||
[concurrent]="qtconcurrent"
|
||||
[core]="qtcore qmake qtdoc"
|
||||
[dbus]="qtdbus"
|
||||
[declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
|
||||
[designer]="qtdesigner qtuitools"
|
||||
[gamepad]="qtgamepad"
|
||||
[graphicaleffects]="qtgraphicaleffects"
|
||||
[gui]="qtgui qtplatformheaders"
|
||||
[help]="qthelp"
|
||||
[imageformats]="qtimageformats"
|
||||
[linguist]="qtlinguist"
|
||||
[location]="qtlocation"
|
||||
[multimedia]="qtmultimedia"
|
||||
[network]="qtnetwork"
|
||||
[opengl]="qtopengl"
|
||||
[positioning]="qtpositioning"
|
||||
[printsupport]="qtprintsupport"
|
||||
[qdoc]="qdoc"
|
||||
[quickcontrols2]="qtquickcontrols"
|
||||
[quickcontrols]="qtquickcontrols1"
|
||||
[scxml]="qtscxml"
|
||||
[sensors]="qtsensors"
|
||||
[serialbus]="qtserialbus"
|
||||
[serialport]="qtserialport"
|
||||
[speech]="qtspeech"
|
||||
[sql]="qtsql"
|
||||
[svg]="qtsvg"
|
||||
[test]="qttestlib"
|
||||
[wayland]="qtwaylandcompositor"
|
||||
[webchannel]="qtwebchannel"
|
||||
[websockets]="qtwebsockets"
|
||||
[webview]="qtwebview"
|
||||
[widgets]="qtwidgets"
|
||||
[x11extras]="qtx11extras"
|
||||
[xml]="qtxml"
|
||||
[xmlpatterns]="qtxmlpatterns"
|
||||
)
|
||||
|
||||
DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
|
||||
HOMEPAGE="https://doc.qt.io/"
|
||||
|
||||
LICENSE="FDL-1.3"
|
||||
SLOT="5"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
|
||||
|
||||
IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine"
|
||||
REQUIRED_USE="|| ( html qch )"
|
||||
|
||||
SRC_URI="
|
||||
charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
|
||||
datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
|
||||
networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
|
||||
script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
|
||||
${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
|
||||
timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z )
|
||||
virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
|
||||
webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
|
||||
"
|
||||
|
||||
for DOCUSE in ${!QT5_DOCS[@]}; do
|
||||
IUSE+=" +${DOCUSE}"
|
||||
for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
|
||||
SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
|
||||
done
|
||||
done
|
||||
unset DOCTAR DOCUSE
|
||||
|
||||
BDEPEND="
|
||||
app-arch/p7zip
|
||||
media-libs/libpng:0
|
||||
"
|
||||
|
||||
S=${WORKDIR}/Docs/Qt-${PV%_p*}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix broken png file, bug 679146
|
||||
local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
|
||||
pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
|
||||
[[ $? -gt 15 ]] && die "Failed to fix ${png}"
|
||||
mv -f ${png/.png/fixed.png} ${png} || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# must be the same as QT5_DOCDIR
|
||||
insinto /usr/share/qt5-doc
|
||||
use html && doins -r */
|
||||
use qch && doins *.qch
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST qtquicktimeline-everywhere-src-5.15.0.tar.xz 102460 BLAKE2B f563ba5ab8ec1171e32a85422529a9e4e14833377091f3bd66d3f72b14671acc74db9dd11f3d56719921bb516ead885ce6cf994f8b00ea6a734a0f7b9371c451 SHA512 14e0f52800bf7b347f03264f306f2c13f4c0bf590c8881135b3bfeb1a08cd07248345de7ab7d3ae9af39f75a5247c0c9f98dde33466481995e45a93717a937b0
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>qt@gentoo.org</email>
|
||||
<name>Gentoo Qt Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<bugs-to>https://bugreports.qt.io/</bugs-to>
|
||||
<doc>https://doc.qt.io/qt-5/qtquicktimeline-index.html</doc>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,19 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Qt module for keyframe-based timeline construction"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DEPEND="
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdeclarative-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue