root
6 years ago
parent
630da4c39a
commit
f2c7f51f1d
Binary file not shown.
Binary file not shown.
@ -1,8 +1,6 @@
|
||||
DIST ansible-2.5.6.tar.gz 10157989 BLAKE2B 07341ab7a087e3139442d5420b461ca332f3a9e550874a746f43904763660ef12c9a2041bb991eeb315abdc7f6e31e3615d9283f407003eddddf2b661331c59a SHA512 169badaa6a94d1ea2d16cb97c7e5eb0b8c225a455edfa95f3ad9e4ec968d5b9525dec4732b60e5ba5f92412f87d8aacc0b2299f2595f3bb820ad8604be8e76d6
|
||||
DIST ansible-2.5.7.tar.gz 10162406 BLAKE2B 1374b0fba39f0cb263a24425d9ebcd9087c0dbad869ddaa1491465db60a80a1a3b82858c80d2d4fc1d03db05d94840f2eeddd4c5a13632426fac178663b7baca SHA512 1be274b080dcc4aba40c884ba45b1403788aadb1f14bd00fd52283bc6e691ec7863f061cb4b7d70965d48cdb49c6b849e9b2e49dd7dd6dd5d8788f2d637960b1
|
||||
DIST ansible-2.5.8.tar.gz 10169397 BLAKE2B 7cb0abb168af25a3cd7b94880309cf19f018a68277472afb24811bb4ccc329c129f754d2b97626f71052712690e372856bfb62345cdae74165eca38066e86779 SHA512 8de8ddf1925ef1465654f4bc1d54fd9f5f9d700ef2c5a4982684f3a4560ac933b05ff0661c34e61235006abc64fd6acf299d0c45f7b5796c3a89dda5382099ed
|
||||
DIST ansible-2.5.9.tar.gz 10165368 BLAKE2B 10d30d3200702958e15695d8fb0aa84ee89b65f966b2879f3d9e89c1bae9d38bffa5936f88dbd7e3b0329f07e523677898230fff424d0d61f03cbe2dab8f3020 SHA512 0962d2f30030889b07e72346452f21cdc99305920bb8e246fc19d37ca4c837dbfba3230634db398b74959a6a67f4ed9dd097eb7783a2854f0969aeeab7e00341
|
||||
DIST ansible-2.6.1.tar.gz 10724749 BLAKE2B af4523ab904660fa3369bdae2839ab4b2f386235be5a004e1f9a9a5f7c555a2e6fe82319abe20ecbf7e74152f8e2ad5060fda2c2af0f5d62fdd9416901c9072c SHA512 1235e12a510317665956bfae9e0d03814083a24ba6e5c98072437e50b4a596437a173b32d9d5af37b4b9e168e35045fdb65e65276fdc830f473ab1f42dcba2d2
|
||||
DIST ansible-2.6.2.tar.gz 10738149 BLAKE2B ac46fe99da9aba55702c578c6d177b7cb1bcd17fb73f08f160afbbcb6a868de721202492e8198e8cb8c68a1ce771572ce0bb598cd310f2ce35d08b0aeeee3f8d SHA512 2283d69be267474e839af44e0e7a14a5532cadef7d65baa2af4045cb93d88b76890b735a78cce348916c04f5dc3c2ed78deb22bb8d94d0c0c0306180d79b1a9b
|
||||
DIST ansible-2.6.3.tar.gz 10748570 BLAKE2B ff27e46771ab5c574202a195bdddb2affc256ba67de98627ef07d3899a1b6bbdb742a71deff63ad6a22aa53298eb22a22a44a885f53098e2404823565fbc513c SHA512 f34052379b892d5dff5e170e4237d4595ecf9d951226cc928fc092e253f5fa9f492a6e953ff09ed63b19ddb0f2b8df66ac738c2f48923e6d5b1dcc96fc2799c9
|
||||
DIST ansible-2.6.4.tar.gz 10751810 BLAKE2B 16a01b76387b6fb0c6554861fd02a57858cf2623ea89e55c0940589b69a6589d4db00bdf87f1e51ab64e638c187657f66ebb5af33a6fa008b7f1dba1e853b3f3 SHA512 b3dc3469dd7e34e3b39b3382df65c3684a44be0515f68861997a4d0e5fce44d64000bc0da0b38fd3d27b45aa1ec3973da581482e0de54c5cc41eb761b230b116
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{5,6} )
|
||||
|
||||
inherit distutils-r1 eutils
|
||||
|
||||
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
|
||||
HOMEPAGE="https://ansible.com/"
|
||||
SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x64-macos"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/paramiko[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/cryptography[${PYTHON_USEDEP}]
|
||||
dev-python/httplib2[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
dev-python/netaddr[${PYTHON_USEDEP}]
|
||||
net-misc/sshpass
|
||||
virtual/ssh
|
||||
"
|
||||
DEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/coverage[${PYTHON_USEDEP}]
|
||||
dev-python/unittest2[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)"
|
||||
|
||||
# not included in release tarball
|
||||
RESTRICT="test"
|
||||
|
||||
python_compile_all() {
|
||||
if use doc; then
|
||||
cd docs/docsite || die
|
||||
export CPUS=4
|
||||
emake -f Makefile.sphinx html
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
|
||||
distutils-r1_python_install_all
|
||||
|
||||
doman docs/man/man1/*.1
|
||||
dodoc -r examples
|
||||
}
|
||||
@ -1,66 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{5,6} )
|
||||
|
||||
inherit distutils-r1 eutils
|
||||
|
||||
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
|
||||
HOMEPAGE="https://ansible.com/"
|
||||
SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x64-macos"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/paramiko[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/cryptography[${PYTHON_USEDEP}]
|
||||
dev-python/httplib2[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
dev-python/netaddr[${PYTHON_USEDEP}]
|
||||
net-misc/sshpass
|
||||
virtual/ssh
|
||||
"
|
||||
DEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/coverage[${PYTHON_USEDEP}]
|
||||
dev-python/unittest2[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)"
|
||||
|
||||
# not included in release tarball
|
||||
RESTRICT="test"
|
||||
|
||||
python_compile_all() {
|
||||
if use doc; then
|
||||
cd docs/docsite || die
|
||||
export CPUS=4
|
||||
emake -f Makefile.sphinx html
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
|
||||
distutils-r1_python_install_all
|
||||
|
||||
doman docs/man/man1/*.1
|
||||
dodoc -r examples
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST consul-1.2.2.tar.gz 15789375 BLAKE2B 8a0af370568f6fcb90334b147bd84e479efb682ed6c58d63dd56f3554f9e6538d37963ac825bb8598eef8948492feec688b8266733223d1557dbce9704daef35 SHA512 715f69e7b36d0070ea4e602dc50f51aa2547dbbbbb07cce985da79d1e201c6e84dade8a7c810e3602f88cfbd30e063669076954d2541810a18a0c9e7c9ff8458
|
||||
DIST consul-1.2.3.tar.gz 18428593 BLAKE2B 14582bf9668e4f2a1c8c443cb01d7b9780c9bc414ff226907335f3873c135b77566898649d16b352ef21ee9300c290338f59672c5fb2b187694aea97b8735dec SHA512 71a7dbfc031df4a96faf2ddd829f289e96adefd0e0087208bbdd26e742a24e3da05fceea4181eb915703ad3323ed5b02bf74eb3fdfbed1e9a1afa2f74acb2a34
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit golang-vcs-snapshot systemd user
|
||||
GIT_COMMIT="48d287e"
|
||||
KEYWORDS="~amd64"
|
||||
EGO_PN="github.com/hashicorp/consul"
|
||||
DESCRIPTION="A tool for service discovery, monitoring and configuration"
|
||||
HOMEPAGE="https://www.consul.io"
|
||||
SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="MPL-2.0"
|
||||
IUSE=""
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="dev-go/gox
|
||||
>=dev-lang/go-1.9:=
|
||||
>=dev-go/go-tools-0_pre20160121"
|
||||
RDEPEND=""
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup consul
|
||||
enewuser consul -1 -1 /var/lib/${PN} consul
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -e 's:go get -u -v $(GOTOOLS)::' \
|
||||
-e 's:vendorfmt dev-build:dev-build:' \
|
||||
-i "src/${EGO_PN}/GNUmakefile" || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# The dev target sets causes build.sh to set appropriate XC_OS
|
||||
# and XC_ARCH, and skips generation of an unused zip file,
|
||||
# avoiding a dependency on app-arch/zip.
|
||||
GOPATH="${S}" \
|
||||
GOBIN="${S}/bin" \
|
||||
GIT_DESCRIBE="v${PV}" \
|
||||
GIT_DIRTY="" \
|
||||
GIT_COMMIT="${GIT_COMMIT}" \
|
||||
emake -C "src/${EGO_PN}" dev-build
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local x
|
||||
|
||||
dobin bin/consul
|
||||
|
||||
keepdir /etc/consul.d
|
||||
insinto /etc/consul.d
|
||||
doins "${FILESDIR}/"*.json.example
|
||||
|
||||
for x in /var/{lib,log}/${PN}; do
|
||||
keepdir "${x}"
|
||||
fowners consul:consul "${x}"
|
||||
done
|
||||
|
||||
newinitd "${FILESDIR}/consul.initd" "${PN}"
|
||||
newconfd "${FILESDIR}/consul.confd" "${PN}"
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
|
||||
systemd_dounit "${FILESDIR}/consul.service"
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST KeePass-2.38-Source.zip 5091900 BLAKE2B 22e3f7046984204a3e0c4a1c6d8303661048bc0fee4bcdb7999b521d0ed6e5463d89044d2897cfec0c932349cc80a7b43d4c8dfbceb4f2e88041c642e0c0d231 SHA512 42fa7274874d4858da360a6772eb25adbf3a6dafe375093459d9a25903d8c159360ea722e969fe8b330bccf62ee5d381e131bd0ba075445932d8019eee19bf20
|
||||
DIST KeePass-2.39.1-Source.zip 5109228 BLAKE2B 0b1214ac70d3d615e029c89abe63176f31e29a3fb800d84b6102220d2d39ebba848e3100e85e6f3d5cd4965461c68798ba880d5b229e8f8e6a20b0d65c2c632c SHA512 9f2b5f6c86b00932f132f8eea24fc35f08c217ed3feb047afe585592761f5297b76140c3154fb519dc5c9137718227a0bc4b6a45d22d1eb0ac95d08c73a70314
|
||||
DIST KeePass-2.40-Source.zip 5136918 BLAKE2B 7b5071cbe3bc5f20450a094a4b8969e2e25f6bba27d88ee5c2c25f2706ed3cf18e721ba53ff54c78db6ea1e167cef1108611fc8253a9d6e19eb3f9d1f3317c73 SHA512 222f7e7ef65be8b0d75baa0a6e871d5edad1b570b64f261405b843d7387ec1faeb4138afb8b31934d70eebe0add297681028cb4f3acfcbe4f518c763fe6c0145
|
||||
|
||||
@ -0,0 +1,111 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils gnome2-utils xdg-utils
|
||||
|
||||
MY_PN="KeePass"
|
||||
DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
|
||||
HOMEPAGE="https://keepass.info/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="aot"
|
||||
|
||||
COMMON_DEPEND="dev-lang/mono"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/unzip
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
dev-dotnet/libgdiplus[cairo]
|
||||
"
|
||||
|
||||
S="${WORKDIR}"
|
||||
PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
|
||||
|
||||
src_prepare() {
|
||||
# KeePass looks for some XSL files in the same folder as the executable,
|
||||
# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
|
||||
# This XSL file will not be upstreamed since the KeePass creator said that
|
||||
# including this patch would break the Portable USB version of KeePass
|
||||
# (which keeps/looks for xsl files in its own folder)
|
||||
default
|
||||
|
||||
# Switch into build dir so the mono prepration script works correctly
|
||||
pushd Build || die
|
||||
source PrepMonoDev.sh || die
|
||||
popd || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Build with Release target
|
||||
xbuild /target:KeePass /property:Configuration=Release || die
|
||||
|
||||
# Run Ahead Of Time compiler on the binary
|
||||
if use aot; then
|
||||
cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
|
||||
mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Wrapper script to launch mono
|
||||
make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
|
||||
|
||||
# Some XSL files
|
||||
insinto "/usr/share/${PN}/XSL"
|
||||
doins Ext/XSL/*
|
||||
|
||||
insinto "/usr/$(get_libdir)/${PN}"
|
||||
exeinto "/usr/$(get_libdir)/${PN}"
|
||||
|
||||
doins Ext/KeePass.exe.config
|
||||
|
||||
# Default configuration, simply says to use user-specific configuration
|
||||
doins Ext/KeePass.config.xml
|
||||
|
||||
# The actual executable
|
||||
doexe Build/KeePass/Release/KeePass.exe
|
||||
|
||||
# Copy the AOT compilation result
|
||||
if use aot; then
|
||||
doexe Build/KeePass/Release/KeePass.exe.so
|
||||
fi
|
||||
|
||||
# Prepare the icons
|
||||
newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
|
||||
newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
|
||||
|
||||
# Create a desktop entry and associate it with the KeePass mime type
|
||||
make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
|
||||
|
||||
# MIME descriptor for .kdbx files
|
||||
insinto /usr/share/mime/packages
|
||||
doins "${FILESDIR}/${PN}.xml"
|
||||
|
||||
# sed, because patching this really sucks
|
||||
sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
|
||||
if ! has_version x11-misc/xdotool ; then
|
||||
elog "Optional dependencies:"
|
||||
elog " x11-misc/xdotool (enables autotype/autofill)"
|
||||
fi
|
||||
|
||||
elog "Some systems may experience issues with copy and paste operations."
|
||||
elog "If you encounter this, please install x11-misc/xsel."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
DIST tpm_emulator-0.7.4.tar.gz 214145 BLAKE2B b8bbd53ecfb90e87f1306c03d2c65a472819d23d10bd63fa966bfadef4776c3876c2f6fc03cc878ece670bdfcd22c9f403ef4bc7f4593a0a6c7f8d17051ac3ba SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35
|
||||
DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53 SHA512 24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
|
||||
|
||||
@ -1,120 +0,0 @@
|
||||
|
||||
Pull request:
|
||||
https://github.com/PeterHuewe/tpm-emulator/pull/37
|
||||
|
||||
|
||||
From 694b7c24ac09e0ec1e54ab71eb9c82a8d4f41d33 Mon Sep 17 00:00:00 2001
|
||||
From: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
Date: Tue, 11 Sep 2018 14:08:49 +0300
|
||||
Subject: [PATCH 1/3] build: use GNUInstallDirs to allow override install
|
||||
directories
|
||||
|
||||
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
tddl/CMakeLists.txt | 6 +++---
|
||||
tpmd/unix/CMakeLists.txt | 2 +-
|
||||
3 files changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f362298..d047ce3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -6,6 +6,7 @@
|
||||
project(TPM_Emulator C)
|
||||
|
||||
cmake_minimum_required(VERSION 2.4)
|
||||
+include(GNUInstallDirs)
|
||||
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
|
||||
if(COMMAND cmake_policy)
|
||||
cmake_policy(SET CMP0003 NEW)
|
||||
diff --git a/tddl/CMakeLists.txt b/tddl/CMakeLists.txt
|
||||
index 0be3281..6cc63b3 100644
|
||||
--- a/tddl/CMakeLists.txt
|
||||
+++ b/tddl/CMakeLists.txt
|
||||
@@ -15,9 +15,9 @@ elseif(WIN32)
|
||||
set_target_properties(tddl PROPERTIES PREFIX "")
|
||||
endif()
|
||||
|
||||
-install(TARGETS tddl DESTINATION lib)
|
||||
-install(TARGETS tddl_static DESTINATION lib)
|
||||
-install(FILES "tddl.h" DESTINATION include)
|
||||
+install(TARGETS tddl DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+install(TARGETS tddl_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+install(FILES "tddl.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
add_executable(test_tddl test_tddl.c)
|
||||
diff --git a/tpmd/unix/CMakeLists.txt b/tpmd/unix/CMakeLists.txt
|
||||
index 40c436b..c5c394a 100644
|
||||
--- a/tpmd/unix/CMakeLists.txt
|
||||
+++ b/tpmd/unix/CMakeLists.txt
|
||||
@@ -13,5 +13,5 @@ target_link_libraries(tpmd mtm tpm tpm_crypto)
|
||||
else()
|
||||
target_link_libraries(tpmd tpm tpm_crypto)
|
||||
endif()
|
||||
-install(TARGETS tpmd RUNTIME DESTINATION bin)
|
||||
+install(TARGETS tpmd RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
--
|
||||
2.16.4
|
||||
|
||||
From 89bf733368dda265040cf44ff8be69a15ab66712 Mon Sep 17 00:00:00 2001
|
||||
From: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
Date: Tue, 11 Sep 2018 16:36:12 +0300
|
||||
Subject: [PATCH 2/3] build: do not build mtm unless enabled
|
||||
|
||||
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d047ce3..b8b68a3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -67,7 +67,9 @@ include_directories(${CMAKE_BINARY_DIR})
|
||||
|
||||
# add internal libraries
|
||||
add_subdirectory(tpm)
|
||||
-add_subdirectory(mtm)
|
||||
+if(MTM_EMULATOR)
|
||||
+ add_subdirectory(mtm)
|
||||
+endif()
|
||||
add_subdirectory(crypto)
|
||||
|
||||
# add TDDL
|
||||
--
|
||||
2.16.4
|
||||
|
||||
From 24bbf683de0b0b24f0ec81d093c03e1f6a9570f2 Mon Sep 17 00:00:00 2001
|
||||
From: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
Date: Tue, 11 Sep 2018 14:20:19 +0300
|
||||
Subject: [PATCH 3/3] build: support BUILD_DEV to disable device build
|
||||
|
||||
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b8b68a3..9ae6562 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -76,7 +76,12 @@ add_subdirectory(crypto)
|
||||
add_subdirectory(tddl)
|
||||
|
||||
# add kernel modules
|
||||
-add_subdirectory(tpmd_dev)
|
||||
+if(NOT DEFINED BUILD_DEV)
|
||||
+ set(BUILD_DEV ON)
|
||||
+endif()
|
||||
+if(BUILD_DEV)
|
||||
+ add_subdirectory(tpmd_dev)
|
||||
+endif()
|
||||
|
||||
# add executables
|
||||
add_subdirectory(tpmd)
|
||||
--
|
||||
2.16.4
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
STARTUP_MODE="save"
|
||||
#DEBUG="true"
|
||||
@ -1,59 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License, v2 or later
|
||||
|
||||
STARTUP_MODE='save';
|
||||
|
||||
extra_started_commands="clear save deactivated"
|
||||
command="/usr/bin/tpmd"
|
||||
command_args="-o tss -g tss"
|
||||
|
||||
depend() {
|
||||
use logger
|
||||
after coldplug
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
lsmod | grep -q "^tpmd_dev\b" \
|
||||
|| modprobe tpmd_dev &>/dev/null \
|
||||
|| eerror "Failed to load module tpmd_dev";
|
||||
|
||||
if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then
|
||||
eerror "No TPM device found!"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting tpm-emulator daemon with mode '$STARTUP_MODE' (tpmd)"
|
||||
checkconfig || eend $?
|
||||
checkpath -d -m 0775 -o tss /var/run/tpm
|
||||
start-stop-daemon --start --exec "${command}" -- ${command_args} $STARTUP_MODE > /dev/null
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping tpm-emulator daemon (tpmd)"
|
||||
start-stop-daemon --stop --exec "${command}" -- ${command_args} > /dev/null
|
||||
eend $?
|
||||
}
|
||||
|
||||
clear() {
|
||||
STARTUP_MODE='clear';
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
||||
save() {
|
||||
STARTUP_MODE='save';
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
||||
deactivated() {
|
||||
STARTUP_MODE='deactivated';
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
MODULES_OPTIONAL_USE="modules"
|
||||
inherit flag-o-matic user linux-mod cmake-utils udev
|
||||
|
||||
MY_P=${P/-/_}
|
||||
DESCRIPTION="Emulator driver for tpm"
|
||||
HOMEPAGE="https://sourceforge.net/projects/tpm-emulator.berlios/"
|
||||
SRC_URI="mirror://sourceforge/tpm-emulator/${MY_P}.tar.gz"
|
||||
LICENSE="GPL-2"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="libressl ssl"
|
||||
RDEPEND="ssl? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
!ssl? ( dev-libs/gmp )"
|
||||
|
||||
S=${WORKDIR}/${P/-/_}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-build.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup tss
|
||||
enewuser tss -1 -1 /var/lib/tpm tss
|
||||
if use modules; then
|
||||
CONFIG_CHECK="MODULES"
|
||||
linux-mod_pkg_setup
|
||||
BUILD_TARGETS="all"
|
||||
BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
# do not build and install the kernel module
|
||||
sed -i 's/COMMAND ${tpmd_dev_BUILD_CMD}//' tpmd_dev/CMakeLists.txt || die
|
||||
sed -i 's/install(CODE.*//' tpmd_dev/CMakeLists.txt || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DUSE_OPENSSL=$(usex ssl)
|
||||
)
|
||||
append-cflags -Wno-implicit-fallthrough
|
||||
cmake-utils_src_configure
|
||||
|
||||
# only here we have BUILD_DIR
|
||||
MODULE_NAMES="tpmd_dev(misc:${BUILD_DIR}/tpmd_dev/linux)"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
use modules && linux-mod_src_compile
|
||||
emake -C "${BUILD_DIR}/tpmd_dev/linux" tpmd_dev.rules
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
use modules && linux-mod_src_install
|
||||
|
||||
dodoc README
|
||||
|
||||
udev_newrules "${BUILD_DIR}/tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}.initd-0.7.4 ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd-0.7.4 ${PN}
|
||||
|
||||
keepdir /var/log/tpm
|
||||
fowners tss:tss /var/log/tpm
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,13 +1,13 @@
|
||||
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
|
||||
DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
|
||||
DIST wine-3.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
|
||||
DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
|
||||
DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
|
||||
DIST wine-d3d9-3.12.tar.gz 50544 BLAKE2B 68c58a8800facf910b72e07f8be77d260060175da25583d3e6562cbe18c4fa1cf2fe0f5d109747e6901677231483adf02a0f1d76105e66733faf1e932c75e876 SHA512 9beb98528600b6699a6112abaf037d73a7cd0e791de04dee2c1874075b9b99a24438df92421802eb89e1285e1235e6a36b6cd7260757fc43d7f8cb3b913296ad
|
||||
DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
|
||||
DIST wine-d3d9-3.13.tar.gz 50546 BLAKE2B 2773503ad2c952c47982258c8b7d7486b5822bfd759a96aa138996aed5ac16d7e3c7add7700f4394292f6154fdd8d58dbfabad1faf8b5013fb88f68ed7657521 SHA512 c3da30c0ce7fca433a703e42213c4a4f6c7a1f8a2d7744555a385641e5c344772dfd142779978d131bf42e79cddb4925b9926fd96e7e1497e173a755f1ec6ce5
|
||||
DIST wine-d3d9-3.14.tar.gz 50546 BLAKE2B 47169741d0330902a006ce4a7663de317b221cfaa3e19abfbb3af2ff886e2a42a1185151531c2b67b57bdafc5646c10f57cd4ff11faf1d2f36c9f269f382637d SHA512 921bd096aa039d002b0f3c5f856668063a34164ad097cee696f45af7d148e80a78b05dfb879f91337fea2cb6e06dd99be2d199b5186c9cd7726dc72f31ddd1ea
|
||||
DIST wine-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7
|
||||
DIST wine-staging-3.12.tar.gz 9936375 BLAKE2B 5c48fb1037d39ce6ab78c03a002b2edfc2fc434c0f661bb6def050becd7411998b9ae763db99bda3b5190e3e6ab355699806d976d01f813904080c6156dafb7e SHA512 166f991f7c8f59df656f3fb28150a8e26e48d1ff6906b3eccd31cb84524e28efe7e7df00eadc21881940308ccc4b4edebcb2a71bdd03ba3de5beb1cf42e2f058
|
||||
DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10
|
||||
DIST wine-staging-3.13.tar.gz 9936353 BLAKE2B f5791c6f1bc43395860ea938cfadefe88e6839e44d6e3a8c5b9474e1ec17654645145459a2a9c32adbec6a5cd6441f754b0121958ff4c12e424262bb61c18358 SHA512 0124950cc18d566daecc532a432bce27d712f48eaaa9b37bf930e056b460e30a8fb1806aa179f72b44a95dc56963a3dc063b4acb71affb7b8ddff3001fe59b9a
|
||||
DIST wine-staging-3.14.tar.gz 9938677 BLAKE2B 0f801298ad23d24688d072236bfa5b9fc549e1ecb964912f90029efd71fab27a38661df27433b52d1356a2b800c9a7c39d91ae08f60eb2deaf211d97a1ba60b7 SHA512 f998baac6be3fece1ae6d4e924f883befea43f849d678c987e9fe4d102cf22fde7b4a0fa728294c46d70c7d29caa037022fb9e33ce4b4fac0e49c94d25cdfa66
|
||||
DIST wine-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541
|
||||
DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
|
||||
DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
|
||||
DIST wine-3.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
|
||||
DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
|
||||
DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
|
||||
DIST wine-d3d9-3.12.tar.gz 50544 BLAKE2B 68c58a8800facf910b72e07f8be77d260060175da25583d3e6562cbe18c4fa1cf2fe0f5d109747e6901677231483adf02a0f1d76105e66733faf1e932c75e876 SHA512 9beb98528600b6699a6112abaf037d73a7cd0e791de04dee2c1874075b9b99a24438df92421802eb89e1285e1235e6a36b6cd7260757fc43d7f8cb3b913296ad
|
||||
DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
|
||||
DIST wine-d3d9-3.13.tar.gz 50546 BLAKE2B 2773503ad2c952c47982258c8b7d7486b5822bfd759a96aa138996aed5ac16d7e3c7add7700f4394292f6154fdd8d58dbfabad1faf8b5013fb88f68ed7657521 SHA512 c3da30c0ce7fca433a703e42213c4a4f6c7a1f8a2d7744555a385641e5c344772dfd142779978d131bf42e79cddb4925b9926fd96e7e1497e173a755f1ec6ce5
|
||||
DIST wine-d3d9-3.14.tar.gz 50546 BLAKE2B 47169741d0330902a006ce4a7663de317b221cfaa3e19abfbb3af2ff886e2a42a1185151531c2b67b57bdafc5646c10f57cd4ff11faf1d2f36c9f269f382637d SHA512 921bd096aa039d002b0f3c5f856668063a34164ad097cee696f45af7d148e80a78b05dfb879f91337fea2cb6e06dd99be2d199b5186c9cd7726dc72f31ddd1ea
|
||||
DIST wine-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7
|
||||
DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
|
||||
DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
|
||||
DIST wine-3.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
|
||||
DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
|
||||
DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
|
||||
DIST wine-staging-3.12.tar.gz 9936375 BLAKE2B 5c48fb1037d39ce6ab78c03a002b2edfc2fc434c0f661bb6def050becd7411998b9ae763db99bda3b5190e3e6ab355699806d976d01f813904080c6156dafb7e SHA512 166f991f7c8f59df656f3fb28150a8e26e48d1ff6906b3eccd31cb84524e28efe7e7df00eadc21881940308ccc4b4edebcb2a71bdd03ba3de5beb1cf42e2f058
|
||||
DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
|
||||
DIST wine-staging-3.13.tar.gz 9936353 BLAKE2B f5791c6f1bc43395860ea938cfadefe88e6839e44d6e3a8c5b9474e1ec17654645145459a2a9c32adbec6a5cd6441f754b0121958ff4c12e424262bb61c18358 SHA512 0124950cc18d566daecc532a432bce27d712f48eaaa9b37bf930e056b460e30a8fb1806aa179f72b44a95dc56963a3dc063b4acb71affb7b8ddff3001fe59b9a
|
||||
DIST wine-staging-3.14.tar.gz 9938677 BLAKE2B 0f801298ad23d24688d072236bfa5b9fc549e1ecb964912f90029efd71fab27a38661df27433b52d1356a2b800c9a7c39d91ae08f60eb2deaf211d97a1ba60b7 SHA512 f998baac6be3fece1ae6d4e924f883befea43f849d678c987e9fe4d102cf22fde7b4a0fa728294c46d70c7d29caa037022fb9e33ce4b4fac0e49c94d25cdfa66
|
||||
DIST wine-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541
|
||||
DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
|
||||
DIST wine-3.0.2.tar.xz 19726920 BLAKE2B e108f851b2d893b052a26ae4368f3337bebcc81bb9ea9abf93c5b7d6e01e613ce6e5db98696ab6ad8e266f6f0f0b9c5ddccb66ae7ba7183912a7911fac4b9633 SHA512 dbd0f242c5eace297ad16e314b8ad139e7d430de7eb8ca52b2006d0b80db4809e28a0e785d404a65ea1acdb56e7f06ebfc9a50071db1edaa6180c8835e7c4b13
|
||||
DIST wine-3.0.3.tar.xz 19735412 BLAKE2B f0ccbe272f1013386f89805cf1573cf001eb875bccb31a1884fad1dff5f90caf727c460406af80f63db7a227d85f25f57c8e8e650a171adbe0c3f5178ddf17e8 SHA512 11043a9a9434681f9c73590688b600b3b9e3d311be2c4d97b5f58f0740500ebcfbdc826bd6584d5dd392dccbdd9389ffa04c8fedbba43a4df2e6aeb922414412
|
||||
DIST wine-3.12.tar.xz 20516708 BLAKE2B 6ff32f8d471492c1ca42db434b16c0273e98cd15215d2f67e3d8e34e298d36620f55409bb781687f3ab11e6a44bd95eaa033e642fdb0d7aae90319ac2ddd2fb6 SHA512 afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1
|
||||
DIST wine-3.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
|
||||
DIST wine-3.14.tar.xz 20583696 BLAKE2B 5e9410c5dadd0c08cbe0e52b0170840492890784dbd1afc8f01ab50caac8443513133575fa6f64143276ce315dde8614f5ece4b3cd5568c224a3379c85619b63 SHA512 50dbbf8a832abfa01247b9d170c6e1fe4f722cc8868659512df7bc17efd7e9d618db10283baf1eda0f1e4abbcdd130be16dbdb8d5a91b155c2c441e50e2b43f1
|
||||
DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
|
||||
DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,91 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit rpm eapi7-ver
|
||||
|
||||
BASE_PV=$(ver_cut 1-3)
|
||||
MY_PV="${PV/_alpha/.alpha}"
|
||||
MY_PV="${MY_PV/_beta/.beta}"
|
||||
[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
|
||||
|
||||
DESCRIPTION="Translations for the Libreoffice suite"
|
||||
HOMEPAGE="https://www.libreoffice.org"
|
||||
BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
|
||||
BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
|
||||
|
||||
LICENSE="|| ( LGPL-3 MPL-1.1 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="offlinehelp"
|
||||
|
||||
#
|
||||
# when changing the language lists, please be careful to preserve the spaces (bug 491728)
|
||||
#
|
||||
# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
|
||||
LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
|
||||
LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
|
||||
|
||||
for lang in ${LANGUAGES_HELP}; do
|
||||
helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
|
||||
SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
|
||||
done
|
||||
for lang in ${LANGUAGES}; do
|
||||
if [[ ${lang%:*} != en ]]; then
|
||||
langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
|
||||
SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
|
||||
fi
|
||||
IUSE+=" l10n_${lang%:*}"
|
||||
done
|
||||
unset lang helppack langpack
|
||||
|
||||
RDEPEND+="app-text/hunspell"
|
||||
|
||||
RESTRICT="strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
local lang dir rpmdir
|
||||
|
||||
# First remove dictionaries, we want to use system ones.
|
||||
find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
|
||||
|
||||
for lang in ${LANGUAGES}; do
|
||||
# break away if not enabled
|
||||
use l10n_${lang%:*} || continue
|
||||
|
||||
dir=${lang#*:}
|
||||
|
||||
# for english we provide just helppack, as translation is always there
|
||||
if [[ ${lang%:*} != en ]]; then
|
||||
rpmdir="LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
|
||||
[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
|
||||
rpm_unpack ./${rpmdir}/*.rpm
|
||||
fi
|
||||
if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
|
||||
rpmdir="LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
|
||||
[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
|
||||
rpm_unpack ./${rpmdir}/*.rpm
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
|
||||
# Condition required for people that do not install anything eg no l10n
|
||||
# or just english with no offlinehelp.
|
||||
if [[ -d "${dir}" ]] ; then
|
||||
insinto /usr/$(get_libdir)/${PN/-l10n/}/
|
||||
doins -r "${dir}"/*
|
||||
fi
|
||||
# remove extensions that are in the l10n for some weird reason
|
||||
rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
|
||||
die "Failed to remove extensions"
|
||||
}
|
||||
@ -0,0 +1,566 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
PYTHON_REQ_USE="threads,xml"
|
||||
|
||||
MY_PV="${PV/_alpha/.alpha}"
|
||||
MY_PV="${MY_PV/_beta/.beta}"
|
||||
# experimental ; release ; old
|
||||
# Usually the tarballs are moved a lot so this should make everyone happy.
|
||||
DEV_URI="
|
||||
https://dev-builds.libreoffice.org/pre-releases/src
|
||||
https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
|
||||
https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
|
||||
"
|
||||
ADDONS_URI="https://dev-www.libreoffice.org/src/"
|
||||
|
||||
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
|
||||
# PATCHSET="${P}-patchset-01.tar.xz"
|
||||
|
||||
[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
|
||||
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
|
||||
unset SCM_ECLASS
|
||||
|
||||
DESCRIPTION="A full office productivity suite"
|
||||
HOMEPAGE="https://www.libreoffice.org"
|
||||
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
|
||||
[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
|
||||
|
||||
# Split modules following git/tarballs; Core MUST be first!
|
||||
# Help is used for the image generator
|
||||
# Only release has the tarballs
|
||||
if [[ ${MY_PV} != *9999* ]]; then
|
||||
for i in ${DEV_URI}; do
|
||||
SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
|
||||
SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
unset DEV_URI
|
||||
|
||||
# Really required addons
|
||||
# These are bundles that can't be removed for now due to huge patchsets.
|
||||
# If you want them gone, patches are welcome.
|
||||
ADDONS_SRC=(
|
||||
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
|
||||
# no release for 8 years, should we package it?
|
||||
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
|
||||
# Does not build with 1.6 rhino at all
|
||||
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
|
||||
# requirement of rhino
|
||||
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
|
||||
# not packageable
|
||||
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
|
||||
)
|
||||
SRC_URI+=" ${ADDONS_SRC[*]}"
|
||||
|
||||
unset ADDONS_URI
|
||||
unset ADDONS_SRC
|
||||
|
||||
# Extensions that need extra work:
|
||||
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
|
||||
|
||||
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
|
||||
gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
|
||||
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
bluetooth? ( dbus )
|
||||
kde? ( gtk )
|
||||
libreoffice_extensions_nlpsolver? ( java )
|
||||
libreoffice_extensions_scripting-beanshell? ( java )
|
||||
libreoffice_extensions_scripting-javascript? ( java )
|
||||
libreoffice_extensions_wiki-publisher? ( java )
|
||||
"
|
||||
|
||||
LICENSE="|| ( LGPL-3 MPL-1.1 )"
|
||||
SLOT="0"
|
||||
[[ ${MY_PV} == *9999* ]] || \
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
COMMON_DEPEND="${PYTHON_DEPS}
|
||||
app-arch/unzip
|
||||
app-arch/zip
|
||||
app-crypt/gpgme[cxx]
|
||||
app-text/hunspell:=
|
||||
>=app-text/libabw-0.1.0
|
||||
>=app-text/libebook-0.1
|
||||
app-text/libepubgen
|
||||
>=app-text/libetonyek-0.1
|
||||
app-text/libexttextcat
|
||||
app-text/liblangtag
|
||||
>=app-text/libmspub-0.1.0
|
||||
>=app-text/libmwaw-0.3.1
|
||||
app-text/libnumbertext
|
||||
>=app-text/libodfgen-0.1.0
|
||||
app-text/libqxp
|
||||
app-text/libstaroffice
|
||||
app-text/libwpd:0.10[tools]
|
||||
app-text/libwpg:0.3
|
||||
>=app-text/libwps-0.4
|
||||
app-text/mythes
|
||||
>=dev-cpp/clucene-2.3.3.4-r2
|
||||
=dev-cpp/libcmis-0.5*
|
||||
dev-db/unixODBC
|
||||
dev-lang/perl
|
||||
dev-libs/boost:=[nls]
|
||||
dev-libs/expat
|
||||
dev-libs/hyphen
|
||||
dev-libs/icu:=
|
||||
dev-libs/libassuan
|
||||
dev-libs/libgpg-error
|
||||
=dev-libs/liborcus-0.13*
|
||||
dev-libs/librevenge
|
||||
dev-libs/libxml2
|
||||
dev-libs/libxslt
|
||||
dev-libs/nspr
|
||||
dev-libs/nss
|
||||
>=dev-libs/redland-1.0.16
|
||||
>=dev-libs/xmlsec-1.2.24[nss]
|
||||
media-gfx/graphite2
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype:2
|
||||
>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libcdr-0.1.0
|
||||
>=media-libs/libepoxy-1.3.1[X]
|
||||
>=media-libs/libfreehand-0.1.0
|
||||
media-libs/libpagemaker
|
||||
>=media-libs/libpng-1.4:0=
|
||||
>=media-libs/libvisio-0.1.0
|
||||
media-libs/libzmf
|
||||
net-libs/neon
|
||||
net-misc/curl
|
||||
net-nds/openldap
|
||||
sci-mathematics/lpsolve
|
||||
sys-libs/zlib:=
|
||||
virtual/glu
|
||||
virtual/jpeg:0
|
||||
virtual/opengl
|
||||
x11-libs/cairo[X]
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
coinmp? ( sci-libs/coinor-mp )
|
||||
cups? ( net-print/cups )
|
||||
dbus? ( dev-libs/dbus-glib )
|
||||
eds? (
|
||||
dev-libs/glib:2
|
||||
gnome-base/dconf
|
||||
gnome-extra/evolution-data-server
|
||||
)
|
||||
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
)
|
||||
gtk? (
|
||||
dev-libs/glib:2
|
||||
dev-libs/gobject-introspection
|
||||
gnome-base/dconf
|
||||
media-libs/mesa[egl]
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/pango
|
||||
)
|
||||
gtk2? (
|
||||
x11-libs/gdk-pixbuf
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
x11-libs/pango
|
||||
)
|
||||
kde? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtx11extras:5
|
||||
dev-qt/qtwidgets:5
|
||||
kde-frameworks/kconfig:5
|
||||
kde-frameworks/kcoreaddons:5
|
||||
kde-frameworks/ki18n:5
|
||||
kde-frameworks/kio:5
|
||||
kde-frameworks/kwindowsystem:5
|
||||
)
|
||||
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
|
||||
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
|
||||
mysql? ( dev-db/mysql-connector-c++ )
|
||||
pdfimport? ( app-text/poppler:=[cxx] )
|
||||
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice-bin
|
||||
!app-office/libreoffice-bin-debug
|
||||
!app-office/openoffice
|
||||
media-fonts/dejavu
|
||||
media-fonts/liberation-fonts
|
||||
media-fonts/libertine
|
||||
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
kde? ( kde-frameworks/breeze-icons:* )
|
||||
vlc? ( media-video/vlc )
|
||||
"
|
||||
|
||||
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
|
||||
PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
|
||||
else
|
||||
# Translations are not reliable on live ebuilds
|
||||
# rather force people to use english only.
|
||||
PDEPEND="!app-office/libreoffice-l10n"
|
||||
fi
|
||||
|
||||
# FIXME: cppunit should be moved to test conditional
|
||||
# after everything upstream is under gbuild
|
||||
# as dmake execute tests right away
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/libatomic_ops-7.2d
|
||||
dev-perl/Archive-Zip
|
||||
>=dev-util/cppunit-1.14.0
|
||||
>=dev-util/gperf-3
|
||||
dev-util/intltool
|
||||
=dev-util/mdds-1.3*:1=
|
||||
media-libs/glm
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
sys-devel/ucpp
|
||||
virtual/pkgconfig
|
||||
x11-base/xorg-proto
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
java? (
|
||||
dev-java/ant-core
|
||||
>=virtual/jdk-1.6
|
||||
)
|
||||
odk? ( >=app-doc/doxygen-1.8.4 )
|
||||
test? (
|
||||
app-crypt/gnupg
|
||||
dev-util/cppunit
|
||||
media-fonts/dejavu
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
|
||||
|
||||
# not upstreamable stuff
|
||||
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
|
||||
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
|
||||
|
||||
# TODO: upstream
|
||||
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
|
||||
)
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
_check_reqs() {
|
||||
CHECKREQS_MEMORY="512M"
|
||||
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
|
||||
CHECKREQS_DISK_BUILD="22G"
|
||||
else
|
||||
CHECKREQS_DISK_BUILD="6G"
|
||||
fi
|
||||
check-reqs_$1
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
use java || \
|
||||
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
|
||||
|
||||
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
|
||||
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
|
||||
ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
|
||||
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
|
||||
fi
|
||||
|
||||
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-opt-2_pkg_setup
|
||||
python-single-r1_pkg_setup
|
||||
xdg_environment_reset
|
||||
|
||||
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
|
||||
if [[ ${MY_PV} = *9999* ]]; then
|
||||
local base_uri branch mypv
|
||||
base_uri="https://anongit.freedesktop.org/git"
|
||||
branch="master"
|
||||
mypv=${MY_PV/.9999}
|
||||
[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
|
||||
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
|
||||
git-r3_checkout "${base_uri}/${PN}/core"
|
||||
|
||||
git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
|
||||
git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# sandbox violations on many systems, we don't need it. Bug #646406
|
||||
sed -i \
|
||||
-e "/KF5_CONFIG/s/kf5-config/no/" \
|
||||
configure.ac || die "Failed to disable kf5-config"
|
||||
|
||||
AT_M4DIR="m4" eautoreconf
|
||||
# hack in the autogen.sh
|
||||
touch autogen.lastrun
|
||||
|
||||
# system pyuno mess
|
||||
sed -i \
|
||||
-e "s:%eprefix%:${EPREFIX}:g" \
|
||||
-e "s:%libdir%:$(get_libdir):g" \
|
||||
pyuno/source/module/uno.py \
|
||||
pyuno/source/officehelper.py || die
|
||||
# sed in the tests
|
||||
sed -i \
|
||||
-e "s#all : build unitcheck#all : build#g" \
|
||||
solenv/gbuild/Module.mk || die
|
||||
sed -i \
|
||||
-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
|
||||
-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
|
||||
Makefile.in || die
|
||||
|
||||
sed -i \
|
||||
-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
|
||||
-e "s,\$INSTALLDIRNAME.sh,${PN}," \
|
||||
bin/distro-install-desktop-integration || die
|
||||
|
||||
if use branding; then
|
||||
# hack...
|
||||
mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
|
||||
fi
|
||||
|
||||
# Don't list pdfimport support in desktop when built with none, bug # 605464
|
||||
if ! use pdfimport; then
|
||||
sed -i \
|
||||
-e ":MimeType: s:application/pdf;::" \
|
||||
-e ":Keywords: s:pdf;::" \
|
||||
sysui/desktop/menus/draw.desktop || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
|
||||
# Note: these are for Gentoo use ONLY. For your own distribution, please get
|
||||
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
|
||||
local google_default_client_id="329227923882.apps.googleusercontent.com"
|
||||
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
|
||||
|
||||
# optimization flags
|
||||
export GMAKE_OPTIONS="${MAKEOPTS}"
|
||||
# System python enablement:
|
||||
export PYTHON_CFLAGS=$(python_get_CFLAGS)
|
||||
export PYTHON_LIBS=$(python_get_LIBS)
|
||||
|
||||
if use kde; then
|
||||
export QT_SELECT=5 # bug 639620 needs proper fix though
|
||||
export QT5DIR="$(qt5_get_bindir)/../"
|
||||
export MOC5="$(qt5_get_bindir)/moc"
|
||||
fi
|
||||
|
||||
# system headers/libs/...: enforce using system packages
|
||||
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
|
||||
# --enable-cairo: ensure that cairo is always required
|
||||
# --enable-*-link: link to the library rather than just dlopen on runtime
|
||||
# --enable-release-build: build the libreoffice as release
|
||||
# --disable-fetch-external: prevent dowloading during compile phase
|
||||
# --enable-extension-integration: enable any extension integration support
|
||||
# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
|
||||
# --disable-report-builder: too much java packages pulled in without pkgs
|
||||
# --without-system-sane: just sane.h header that is used for scan in writer,
|
||||
# not linked or anything else, worthless to depend on
|
||||
# --disable-pdfium: not yet packaged
|
||||
local myeconfargs=(
|
||||
--with-system-dicts
|
||||
--with-system-epoxy
|
||||
--with-system-headers
|
||||
--with-system-jars
|
||||
--with-system-libs
|
||||
--enable-cairo-canvas
|
||||
--enable-largefile
|
||||
--enable-mergelibs
|
||||
--enable-neon
|
||||
--enable-python=system
|
||||
--enable-randr
|
||||
--enable-release-build
|
||||
--disable-breakpad
|
||||
--disable-ccache
|
||||
--disable-dependency-tracking
|
||||
--disable-epm
|
||||
--disable-fetch-external
|
||||
--disable-gstreamer-0-10
|
||||
--disable-kde5
|
||||
--disable-online-update
|
||||
--disable-openssl
|
||||
--disable-pdfium
|
||||
--disable-qt5
|
||||
--disable-report-builder
|
||||
--with-alloc=system
|
||||
--with-build-version="Gentoo official package"
|
||||
--enable-extension-integration
|
||||
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
|
||||
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
|
||||
--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
|
||||
--with-external-tar="${DISTDIR}"
|
||||
--with-lang=""
|
||||
--with-parallelism=$(makeopts_jobs)
|
||||
--with-system-ucpp
|
||||
--with-tls=nss
|
||||
--with-vendor="Gentoo Foundation"
|
||||
--with-x
|
||||
--without-fonts
|
||||
--without-myspell-dicts
|
||||
--without-help
|
||||
--with-helppack-integration
|
||||
--with-system-gpgmepp
|
||||
--without-system-sane
|
||||
$(use_enable bluetooth sdremote-bluetooth)
|
||||
$(use_enable coinmp)
|
||||
$(use_enable cups)
|
||||
$(use_enable dbus)
|
||||
$(use_enable debug)
|
||||
$(use_enable eds evolution2)
|
||||
$(use_enable firebird firebird-sdbc)
|
||||
$(use_enable gstreamer gstreamer-1-0)
|
||||
$(use_enable gtk gtk3)
|
||||
$(use_enable gtk2 gtk)
|
||||
$(use_enable kde gtk3-kde5)
|
||||
$(use_enable mysql ext-mariadb-connector)
|
||||
$(use_enable odk)
|
||||
$(use_enable pdfimport)
|
||||
$(use_enable postgres postgresql-sdbc)
|
||||
$(use_enable vlc)
|
||||
$(use_with coinmp system-coinmp)
|
||||
$(use_with googledrive gdrive-client-id ${google_default_client_id})
|
||||
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
|
||||
$(use_with java)
|
||||
$(use_with mysql system-mysql-cppconn)
|
||||
$(use_with odk doxygen)
|
||||
)
|
||||
|
||||
if use eds || use gtk; then
|
||||
myeconfargs+=( --enable-dconf --enable-gio )
|
||||
else
|
||||
myeconfargs+=( --disable-dconf --disable-gio )
|
||||
fi
|
||||
|
||||
# libreoffice extensions handling
|
||||
for lo_xt in ${LO_EXTS}; do
|
||||
if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
|
||||
myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
|
||||
else
|
||||
myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
|
||||
fi
|
||||
done
|
||||
|
||||
if use java; then
|
||||
# hsqldb: system one is too new
|
||||
myeconfargs+=(
|
||||
--without-junit
|
||||
--without-system-hsqldb
|
||||
--with-ant-home="${ANT_HOME}"
|
||||
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
|
||||
--with-jvm-path="${EPREFIX}/usr/lib/"
|
||||
)
|
||||
|
||||
use libreoffice_extensions_scripting-beanshell && \
|
||||
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
|
||||
|
||||
use libreoffice_extensions_scripting-javascript && \
|
||||
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
|
||||
fi
|
||||
|
||||
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# more and more LO stuff tries to use OpenGL, including tests during build
|
||||
# bug 501508, bug 540624, bug 545974 and probably more
|
||||
addpredict /dev/dri
|
||||
addpredict /dev/ati
|
||||
addpredict /dev/nvidiactl
|
||||
|
||||
# hack for offlinehelp, this needs fixing upstream at some point
|
||||
# it is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
(
|
||||
grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
|
||||
source "${T}/config_host.mk" 2&> /dev/null
|
||||
|
||||
local path="${WORKDIR}/helpcontent2/source/auxiliary/"
|
||||
mkdir -p "${path}" || die
|
||||
|
||||
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
|
||||
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
|
||||
-dir=helpcontent2/source/media/helpimg \
|
||||
> "${path}/helpimg.ilst"
|
||||
[[ -s "${path}/helpimg.ilst" ]] || \
|
||||
ewarn "The help images list is empty, something is fishy, report a bug."
|
||||
)
|
||||
|
||||
local target
|
||||
use test && target="build" || target="build-nocheck"
|
||||
|
||||
# this is not a proper make script
|
||||
make ${target} || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
make unitcheck || die
|
||||
make slowcheck || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# This is not Makefile so no buildserver
|
||||
make DESTDIR="${D}" distro-pack-install -o build -o check || die
|
||||
|
||||
# bug 593514
|
||||
if use gtk; then
|
||||
dosym libreoffice/program/liblibreofficekitgtk.so \
|
||||
/usr/$(get_libdir)/liblibreofficekitgtk.so
|
||||
fi
|
||||
|
||||
# bash completion aliases
|
||||
bashcomp_alias \
|
||||
libreoffice \
|
||||
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
|
||||
|
||||
if use branding; then
|
||||
insinto /usr/$(get_libdir)/${PN}/program
|
||||
newins "${WORKDIR}/branding-sofficerc" sofficerc
|
||||
dodir /etc/env.d
|
||||
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
|
||||
fi
|
||||
|
||||
# Hack for offlinehelp, this needs fixing upstream at some point.
|
||||
# It is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
insinto /usr/$(get_libdir)/libreoffice/help
|
||||
doins xmlhelp/util/*.xsl
|
||||
|
||||
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
|
||||
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,167 @@
|
||||
From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
|
||||
From: Abs62 <ottomann@yandex.ru>
|
||||
Date: Fri, 30 Mar 2018 22:53:24 +0300
|
||||
Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
|
||||
|
||||
---
|
||||
ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
|
||||
1 file changed, 62 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
|
||||
index ed1172bd..56e8f788 100644
|
||||
--- a/ffmpegaudio.cc
|
||||
+++ b/ffmpegaudio.cc
|
||||
@@ -91,6 +91,7 @@ struct DecoderContext
|
||||
QByteArray audioData_;
|
||||
QDataStream audioDataStream_;
|
||||
AVFormatContext * formatContext_;
|
||||
+ AVCodec * codec_;
|
||||
AVCodecContext * codecContext_;
|
||||
AVIOContext * avioContext_;
|
||||
AVStream * audioStream_;
|
||||
@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
|
||||
audioData_( audioData ),
|
||||
audioDataStream_( audioData_ ),
|
||||
formatContext_( NULL ),
|
||||
+ codec_( NULL ),
|
||||
codecContext_( NULL ),
|
||||
avioContext_( NULL ),
|
||||
audioStream_( NULL ),
|
||||
@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
|
||||
return false;
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
|
||||
unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
|
||||
+#else
|
||||
+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
|
||||
+#endif
|
||||
if ( !avioBuffer )
|
||||
{
|
||||
errorString = QObject::tr( "av_malloc() failed." );
|
||||
@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
|
||||
// Find audio stream, use the first audio stream if available
|
||||
for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
|
||||
{
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
|
||||
if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
|
||||
+#else
|
||||
+ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
|
||||
+#endif
|
||||
{
|
||||
audioStream_ = formatContext_->streams[i];
|
||||
break;
|
||||
@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
|
||||
return false;
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
|
||||
codecContext_ = audioStream_->codec;
|
||||
- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
|
||||
- if ( !codec )
|
||||
+ codec_ = avcodec_find_decoder( codecContext_->codec_id );
|
||||
+ if ( !codec_ )
|
||||
{
|
||||
errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
|
||||
return false;
|
||||
}
|
||||
+#else
|
||||
+ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
|
||||
+ if ( !codec_ )
|
||||
+ {
|
||||
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
|
||||
+ return false;
|
||||
+ }
|
||||
+ codecContext_ = avcodec_alloc_context3( codec_ );
|
||||
+ if ( !codecContext_ )
|
||||
+ {
|
||||
+ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
|
||||
+ return false;
|
||||
+ }
|
||||
+ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
|
||||
+#endif
|
||||
|
||||
- ret = avcodec_open2( codecContext_, codec, NULL );
|
||||
+ ret = avcodec_open2( codecContext_, codec_, NULL );
|
||||
if ( ret < 0 )
|
||||
{
|
||||
errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
|
||||
return false;
|
||||
}
|
||||
|
||||
- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
|
||||
+ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
|
||||
codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
|
||||
return true;
|
||||
}
|
||||
@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
|
||||
|
||||
// Closing a codec context without prior avcodec_open2() will result in
|
||||
// a crash in ffmpeg
|
||||
- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
|
||||
+ if ( audioStream_ && codecContext_ && codec_ )
|
||||
{
|
||||
audioStream_->discard = AVDISCARD_ALL;
|
||||
- avcodec_close( audioStream_->codec );
|
||||
+ avcodec_close( codecContext_ );
|
||||
+#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
|
||||
+ avcodec_free_context( &codecContext_ );
|
||||
+#endif
|
||||
}
|
||||
|
||||
avformat_close_input( &formatContext_ );
|
||||
@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
|
||||
if ( packet.stream_index == audioStream_->index )
|
||||
{
|
||||
AVPacket pack = packet;
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
|
||||
int gotFrame = 0;
|
||||
do
|
||||
{
|
||||
@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
|
||||
pack.data += len;
|
||||
}
|
||||
while( pack.size > 0 );
|
||||
+#else
|
||||
+ int ret = avcodec_send_packet( codecContext_, &pack );
|
||||
+ /* read all the output frames (in general there may be any number of them) */
|
||||
+ while( ret >= 0 )
|
||||
+ {
|
||||
+ ret = avcodec_receive_frame( codecContext_, frame);
|
||||
+
|
||||
+ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
|
||||
+ break;
|
||||
+
|
||||
+ playFrame( frame );
|
||||
+ }
|
||||
+#endif
|
||||
}
|
||||
// av_free_packet() must be called after each call to av_read_frame()
|
||||
#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
|
||||
@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
|
||||
#endif
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
|
||||
if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
|
||||
codecContext_->codec->capabilities & CODEC_CAP_DELAY )
|
||||
{
|
||||
@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
|
||||
playFrame( frame );
|
||||
}
|
||||
}
|
||||
+#else
|
||||
+ /* flush the decoder */
|
||||
+ av_init_packet( &packet );
|
||||
+ int ret = avcodec_send_packet(codecContext_, &packet );
|
||||
+ while( ret >= 0 )
|
||||
+ {
|
||||
+ ret = avcodec_receive_frame(codecContext_, frame);
|
||||
+ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
|
||||
+ break;
|
||||
+ playFrame( frame );
|
||||
+ }
|
||||
+#endif
|
||||
|
||||
#if LIBAVCODEC_VERSION_MAJOR < 54
|
||||
av_free( frame );
|
||||
@ -1,3 +1,2 @@
|
||||
DIST master-pdf-editor-4.3.82_qt5.amd64.tar.gz 14934502 BLAKE2B f93c756f9270b2857af02047c6ebd242d35ddaf23b70118d440c21cc7a0718937aa9945bb24adad6544e984f9390e9f49bfce5298bb8bc54f3c705372aff0fd4 SHA512 9bc6b056bdc8ce349dbab139f64c90948f3e0498918f07df6249fee2fad98a35b133aa7913e375366d062e134878feed0fadd097ab1d5504e97884ffa2c37b24
|
||||
DIST master-pdf-editor-5.0.36_qt5.amd64.tar.gz 16021838 BLAKE2B d46b9f6205e2832535060584a8841e3fa35d3b59c99a7fc2bcca5f913771633eed0d987a94141ef186b2077b65c781509b5f9938a033a5a856a9b0ad914bd5fc SHA512 31bae232d4629e10b29a4c7273ef7635bb7ec7cce9dc837355fc0d9aacc98943ec009eeac7b445f022831da8a2c400a7ce2b1de82b4e780d625ff49120e2a964
|
||||
DIST master-pdf-editor-5.1.00_qt5.amd64.tar.gz 16045580 BLAKE2B 89696a74d2df83836b1e9201d1bee8ba6a30a41f6a39664a975f9bbfb061b4536558d8746e24c57bfcb495f5324ed9d851471276f0da9f9f1d8caa454bf48c38 SHA512 a67d0668cb4c9daa0287af7bce4f24436c31b1636d29aed03503c0976c3efbc2df9ff34c2e65421e5e4cd3e184544bd78a4312b85aa6aee6af0cdaa18ba9c4a2
|
||||
DIST master-pdf-editor-5.1.30_qt5.amd64.tar.gz 16150271 BLAKE2B dfbdacb6df75d268c57cc5d7f6c949c796abecd09394a80694dfc05b5e666c4e836f636b5af6a17a309625ed243e88c1871347e8f7162b6e3f8c47fc27d83e26 SHA512 3cc0a85e9518e75581cfdc05ac8dbdbd534fa11b4f4cfb490a0e9b411b84c073d52e9a5a3aa620507c88117cc04e033f5e860e335b37aef49eec95f2352e9b21
|
||||
DIST master-pdf-editor-5.1.36_qt5.amd64.tar.gz 16149439 BLAKE2B 882f399bfb5cf7b2a39c8174f541a1124953df5bc3bf5ded27bba1eec3ebc966e1b5c0174219759995d939ff203426a2004be61989fa7d062c26dc64320769b5 SHA512 934e9d856476e412a7b40858365e843a8350f638b48a9b593faeab12cd9032243042fd11929e826a294a29ab3810110c40fdd07f56e8c5d0fb6fa2f957a36c21
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit xdg-utils desktop
|
||||
|
||||
DESCRIPTION="A complete solution for viewing and editing PDF files"
|
||||
HOMEPAGE="https://code-industry.net/free-pdf-editor/"
|
||||
SRC_URI="http://get.code-industry.net/public/${P}_qt5.amd64.tar.gz"
|
||||
|
||||
LICENSE="master-pdf-editor"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
RESTRICT="mirror"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-arch/bzip2
|
||||
dev-libs/double-conversion
|
||||
dev-libs/glib
|
||||
dev-libs/icu
|
||||
dev-libs/openssl
|
||||
media-gfx/graphite2
|
||||
media-gfx/sane-backends
|
||||
media-libs/freetype
|
||||
media-libs/harfbuzz
|
||||
media-libs/libjpeg-turbo
|
||||
media-libs/libpng
|
||||
media-libs/tiff
|
||||
x11-libs/libX11
|
||||
x11-libs/libXau
|
||||
x11-libs/libxcb
|
||||
x11-libs/libXdmcp
|
||||
x11-libs/libXext
|
||||
>=dev-qt/qtsvg-5.4:5
|
||||
>=dev-qt/qtnetwork-5.4:5
|
||||
>=dev-qt/qtgui-5.4:5
|
||||
>=dev-qt/qtprintsupport-5.4:5
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}-${PV%%.*}"
|
||||
|
||||
src_install() {
|
||||
insinto /opt/${PN}
|
||||
doins -r fonts lang stamps templates masterpdfeditor4.png
|
||||
|
||||
exeinto /opt/${PN}
|
||||
doexe masterpdfeditor4
|
||||
|
||||
dosym ../${PN}/masterpdfeditor4 /opt/bin/masterpdfeditor4
|
||||
make_desktop_entry "masterpdfeditor4 %f" \
|
||||
"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor4.png \
|
||||
"Office;Graphics;Viewer" \
|
||||
"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
@ -1,4 +1,3 @@
|
||||
DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
|
||||
DIST qpdfview-0.4.17beta1.tar.gz 658978 BLAKE2B 7f0ba945cf7903cae7bb11ac1d3baa08fc5f70e9e5a20a9f265cf8de4f0ce0f847f34852b2ce4374e2736542c8fc1e07c15e6bd4ae54d5147d14524e076f312f SHA512 803bd9a1165fc84302fb3c7734127eaab754bd2bf23083a1bcf340810fa617800f3d0069eae7b1f43fb528ebe17a6a32a652efbb902d525a95efc31efeb1e10a
|
||||
DIST qpdfview-0.4.18_pre.tar.gz 667869 BLAKE2B ed729b6aa1104ca1525877242bc3f2c630d8ee563005ab35854d775197c24352f0a39be13bf4808e4544c50072619da9cd5c36cdbdcbae33fa2fc2016b80ce18 SHA512 3a7a2cc474078dc742fccba2c87710c1e05cec76f0bd66650fa6cb4d6d8e2103241474689d4798da28ae1aeb2caa6e09dd8d1e9d0433c2eba21b202166aa3051
|
||||
DIST qpdfview-0.4.18_pre2.tar.gz 668677 BLAKE2B 1c79a7f9f9d67c533660457ca74d27c1cb389224910d0c8482c2e1d6a0843787e588a40ae7f4e02268392c15aa19b54b6383c2422cc60b20e521d26133c10a3e SHA512 ad19dd6a2bfeb3c5f26488619688ad96653ed50821203b7e5cb2817a4f9957510ce238804b48bf3b21d965ceed25ad1b0386e0bb5e9d0bc5e5c95e6fe10ef811
|
||||
DIST qpdfview-0.4.18_pre3.tar.gz 747794 BLAKE2B 08420a350ae6f8bba65efe2a930a8941a00182900e33266a03d9b6ded4b8ba7ac446de9ed8095f8876dfd3ecfb26b20cc146c82d9c9228fd5c136ad36d749061 SHA512 c72f766b0ffb175e0577f08975490b985e859cb41ccf1d6bcdb618664b96b3c4d0fe4ffab2e493ac20b87b85aa658f3beb5b0d430d21deae78df4c503649f1c0
|
||||
|
||||
@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
|
||||
|
||||
inherit l10n qmake-utils
|
||||
|
||||
DESCRIPTION="A tabbed document viewer"
|
||||
HOMEPAGE="https://launchpad.net/qpdfview"
|
||||
SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_/}/+download/${P/_/}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
|
||||
|
||||
REQUIRED_USE="?? ( fitz pdf )"
|
||||
|
||||
RDEPEND="
|
||||
dev-qt/qtconcurrent:5
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtprintsupport:5
|
||||
dev-qt/qtwidgets:5
|
||||
cups? ( net-print/cups )
|
||||
dbus? ( dev-qt/qtdbus:5 )
|
||||
djvu? ( app-text/djvu )
|
||||
fitz? ( >=app-text/mupdf-1.7:= )
|
||||
pdf? (
|
||||
>=app-text/poppler-0.35[qt5]
|
||||
dev-qt/qtxml:5
|
||||
)
|
||||
postscript? ( app-text/libspectre )
|
||||
sqlite? ( dev-qt/qtsql:5[sqlite] )
|
||||
svg? ( dev-qt/qtsvg:5 )
|
||||
!svg? ( virtual/freedesktop-icon-theme )
|
||||
synctex? ( app-text/texlive-core )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-qt/linguist-tools:5
|
||||
virtual/pkgconfig"
|
||||
|
||||
DOCS=( CHANGES CONTRIBUTORS README TODO )
|
||||
|
||||
S="${WORKDIR}/${P/_/}"
|
||||
|
||||
src_prepare() {
|
||||
local mylrelease="$(qt5_get_bindir)"/lrelease
|
||||
|
||||
prepare_locale() {
|
||||
"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
|
||||
}
|
||||
|
||||
rm_help() {
|
||||
rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
|
||||
}
|
||||
|
||||
l10n_find_plocales_changes translations ${PN}_ .ts
|
||||
l10n_for_each_locale_do prepare_locale
|
||||
l10n_for_each_disabled_locale_do rm_help
|
||||
|
||||
# adapt for prefix
|
||||
sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconfig=() i=
|
||||
for i in cups dbus djvu pdf svg synctex; do
|
||||
use ${i} || myconfig+=(without_${i})
|
||||
done
|
||||
use fitz && myconfig+=(with_fitz)
|
||||
use postscript || myconfig+=(without_ps)
|
||||
use sqlite || myconfig+=(without_sql)
|
||||
|
||||
local myqmakeargs=(
|
||||
qpdfview.pro
|
||||
CONFIG+="${myconfig[@]}"
|
||||
PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
|
||||
)
|
||||
eqmake5 "${myqmakeargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_ROOT="${D}" install
|
||||
einstalldocs
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it ja kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
|
||||
PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
|
||||
|
||||
inherit l10n qmake-utils xdg-utils gnome2-utils
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST libcmis-0.5.2_pre20160820.tar.gz 285100 BLAKE2B 980200d1a56240d8d069aba2ad349ec02e90d345bad4956f6cbbea3606f9f90951523804293b349ad0419dd2db6db294a45a97872469105c1ba392c888fab332 SHA512 4b6d0fc4d80444fea2c5eb16621b92a10b41c58128cc8a355caca50f12648ed5113bd977cc5dbe8971e3dbc11f9d7ae8d45c9d2aa19f37c83659141af135bd1a
|
||||
DIST libcmis-0.5.2_pre20180118.tar.gz 291080 BLAKE2B 1cb5664dcb0bef7f5a04c422b21ac54a9b70d38dec74d688327732630e4a134a88c7262d763a39d1730eda1cd45f5d3c3d47a56099959d01bf5e23972181a793 SHA512 630cf7e5c31266e2b55ca093aa942fc373eb24bbb5b9aedd687f67f1b3c6b627a3bdb58878859449bcb340626f3e1bdafa2b9cbb5e61e8e4336c45b804fca7a9
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From 3ef3569c4ae1c5319aff0664d52cbd8a8d42c909 Mon Sep 17 00:00:00 2001
|
||||
From: rezso <rezso@rezso.net>
|
||||
Date: Tue, 4 Sep 2018 01:18:10 +0200
|
||||
Subject: tdf#119344 fix libcmis build with boost 1.68
|
||||
|
||||
Change-Id: I80d6ea8ecd001dc02b941c1eb8974c9244316045
|
||||
Reviewed-on: https://gerrit.libreoffice.org/59958
|
||||
Tested-by: Jenkins
|
||||
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
||||
|
||||
--- a/src/libcmis/xml-utils.cxx
|
||||
+++ b/src/libcmis/xml-utils.cxx
|
||||
@@ -31,7 +31,12 @@
|
||||
#include <sstream>
|
||||
#include <stdlib.h>
|
||||
|
||||
+#include <boost/version.hpp>
|
||||
+#if (BOOST_VERSION >= 106800)
|
||||
+#include <boost/uuid/detail/sha1.hpp>
|
||||
+#else
|
||||
#include <boost/uuid/sha1.hpp>
|
||||
+#endif
|
||||
#include <curl/curl.h>
|
||||
|
||||
#include "xml-utils.hxx"
|
||||
@ -0,0 +1,69 @@
|
||||
From 33f7485dedea90e0f80c6348fa8ac5f27c5052e0 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Tue, 4 Sep 2018 16:45:00 +0200
|
||||
Subject: Properly encode OAuth2 credentials
|
||||
|
||||
Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5
|
||||
Reviewed-on: https://gerrit.libreoffice.org/59986
|
||||
Tested-by: Jenkins
|
||||
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
||||
|
||||
--- a/src/libcmis/oauth2-providers.cxx
|
||||
+++ b/src/libcmis/oauth2-providers.cxx
|
||||
@@ -26,6 +26,8 @@
|
||||
* instead of those above.
|
||||
*/
|
||||
|
||||
+#include <cassert>
|
||||
+
|
||||
#include <libxml/HTMLparser.h>
|
||||
#include <libxml/xmlreader.h>
|
||||
|
||||
@@ -45,6 +47,29 @@
|
||||
#define HTML_PARSE_RECOVER 0
|
||||
#endif
|
||||
|
||||
+namespace {
|
||||
+
|
||||
+// See <https://url.spec.whatwg.org/#concept-urlencoded-byte-serializer>:
|
||||
+void addXWwwFormUrlencoded(std::string * buffer, std::string const & data) {
|
||||
+ assert(buffer);
|
||||
+ for (string::const_iterator i = data.begin(); i != data.end(); ++i) {
|
||||
+ unsigned char c = static_cast<unsigned char>(*i);
|
||||
+ if (c == ' ' || c == '*' || c == '-' || c == '.' || (c >= '0' && c <= '9')
|
||||
+ || (c >= 'A' && c <= 'Z') || c == '_' || (c >= 'a' && c <= 'z'))
|
||||
+ {
|
||||
+ *buffer += static_cast<char>(c);
|
||||
+ } else {
|
||||
+ static const char hex[16] = {
|
||||
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
|
||||
+ *buffer += '%';
|
||||
+ *buffer += hex[c >> 4];
|
||||
+ *buffer += hex[c & 0xF];
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+}
|
||||
+
|
||||
string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl,
|
||||
const string& username, const string& password )
|
||||
{
|
||||
@@ -97,7 +120,7 @@
|
||||
return string( );
|
||||
|
||||
loginEmailPost += "Email=";
|
||||
- loginEmailPost += string( username );
|
||||
+ addXWwwFormUrlencoded(&loginEmailPost, username);
|
||||
|
||||
istringstream loginEmailIs( loginEmailPost );
|
||||
string loginEmailRes;
|
||||
@@ -119,7 +142,7 @@
|
||||
return string( );
|
||||
|
||||
loginPasswdPost += "Passwd=";
|
||||
- loginPasswdPost += string( password );
|
||||
+ addXWwwFormUrlencoded(&loginPasswdPost, password);
|
||||
|
||||
istringstream loginPasswdIs( loginPasswdPost );
|
||||
string loginPasswdRes;
|
||||
@ -0,0 +1,77 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
if [[ ${PV} = 9999 ]]; then
|
||||
EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
|
||||
inherit git-r3
|
||||
elif [[ ${PV} = *_pre* ]]; then
|
||||
COMMIT=738528d790b2b1d52d9b72d673842969a852815d
|
||||
SRC_URI="https://github.com/tdf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
else
|
||||
SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
inherit autotools flag-o-matic
|
||||
|
||||
DESCRIPTION="C++ client library for the CMIS interface"
|
||||
HOMEPAGE="https://github.com/tdf/libcmis"
|
||||
|
||||
LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
|
||||
SLOT="0.5"
|
||||
|
||||
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
|
||||
[[ ${PV} == 9999 ]] || \
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
IUSE="man static-libs test"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=
|
||||
dev-libs/libxml2
|
||||
net-misc/curl
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
man? (
|
||||
app-text/docbook2X
|
||||
dev-libs/libxslt
|
||||
)
|
||||
test? (
|
||||
dev-util/cppcheck
|
||||
dev-util/cppunit
|
||||
)
|
||||
"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.5.2-boost-1.68.patch"
|
||||
"${FILESDIR}/${PN}-0.5.2-oauth2-encode.patch"
|
||||
)
|
||||
|
||||
[[ ${PV} = *_pre* ]] && S="${WORKDIR}/${PN}-${COMMIT}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
[[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# bug 618778
|
||||
append-cxxflags -std=c++14
|
||||
|
||||
econf \
|
||||
--program-suffix=-$(ver_cut 1-2) \
|
||||
--disable-werror \
|
||||
$(use_with man) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable test tests) \
|
||||
--enable-client
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
Binary file not shown.
@ -1,5 +1,2 @@
|
||||
DIST mysql-connector-c++-1.1.3.tar.gz 496226 BLAKE2B 51537d8728d4afdd98474107a02d3f70f6d44a6ee66f26edc101110d6674fce60e5e80bb736fd28cddf446c67590d7759cf28771f5a5f3c7d37e10c5d00a876c SHA512 c03a4ae25e9d189a5114ab630bef6edaefd1aee809dbb1ec26b765f5e84b93fbe17e5f7357a4fe2a95c179cd2028b676151df4baf4e3da7515543ecc0834afd7
|
||||
DIST mysql-connector-c++-1.1.6.tar.gz 522236 BLAKE2B 5f728b418fa7d395a83679fbda5c8757e1d06078e27865c7e02a6666ccb1a32c5c8cd77d481b0bc4d4354cea518bd2db2e06076db88ee285365583e27a5f0c23 SHA512 e940b6ee090f792bad8acbbfa3dacd46310ac40c7993c4097eeebb6be4b792d3f1856574e603a71e2795773db97169f47c9ed76a127654472370c726bcb291c7
|
||||
DIST mysql-connector-c++-1.1.8.tar.gz 528954 BLAKE2B fc2a606364426834335142375b99546e2ff1251e97add8ee4ecc370feccd7b9dd09f0abc3e1e9084b824141bde2a44d55ff9baddc093f8ec17b2b91060057148 SHA512 c3ab5c1e805598d557a449c44f77ce44cc110e5b529075e38b4f775d3726ebd16a2155f61e47a378a375a9d9362d1520334ea25376636151ddd087291aafd85d
|
||||
DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
|
||||
DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f SHA512 5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils cmake-utils flag-o-matic multilib
|
||||
|
||||
DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
|
||||
HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
|
||||
URI_DIR="Connector-C++"
|
||||
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm ppc ppc64 sparc x86"
|
||||
IUSE="debug examples gcov static-libs"
|
||||
|
||||
DEPEND=">=virtual/mysql-5.1:=
|
||||
dev-libs/boost:0=
|
||||
dev-libs/openssl:0="
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.1.3-fix-cmake.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# native lib/wrapper needs this!
|
||||
append-flags "-fno-strict-aliasing"
|
||||
|
||||
local mycmakeargs=(
|
||||
"-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF"
|
||||
"-DMYSQLCPPCONN_ICU_ENABLE=OFF"
|
||||
$(cmake-utils_use debug MYSQLCPPCONN_TRACE_ENABLE)
|
||||
$(cmake-utils_use gcov MYSQLCPPCONN_GCOV_ENABLE)
|
||||
-DINSTALL_DOCS="/usr/share/doc/${PF}"
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# static lib has wrong name so we need to rename it
|
||||
if use static-libs; then
|
||||
mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
|
||||
"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
|
||||
else
|
||||
rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
|
||||
fi
|
||||
|
||||
# examples
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins "${S}"/examples/*
|
||||
fi
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils cmake-utils flag-o-matic multilib
|
||||
|
||||
DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
|
||||
HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
|
||||
URI_DIR="Connector-C++"
|
||||
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm ppc ppc64 sparc x86"
|
||||
IUSE="debug examples gcov static-libs"
|
||||
|
||||
DEPEND="virtual/libmysqlclient:=
|
||||
dev-libs/boost:=
|
||||
dev-libs/openssl:0="
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
|
||||
"${FILESDIR}/${PN}-1.1.5-fix-mariadb.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# native lib/wrapper needs this!
|
||||
append-flags "-fno-strict-aliasing"
|
||||
|
||||
local mycmakeargs=(
|
||||
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
|
||||
-DMYSQLCPPCONN_ICU_ENABLE=OFF
|
||||
$(cmake-utils_use debug MYSQLCPPCONN_TRACE_ENABLE)
|
||||
$(cmake-utils_use gcov MYSQLCPPCONN_GCOV_ENABLE)
|
||||
-DINSTALL_DOCS="/usr/share/doc/${PF}"
|
||||
-DMYSQL_CXX_LINKAGE=0
|
||||
-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# static lib has wrong name so we need to rename it
|
||||
if use static-libs; then
|
||||
mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
|
||||
"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
|
||||
else
|
||||
rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
|
||||
fi
|
||||
|
||||
# examples
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins "${S}"/examples/*
|
||||
fi
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils flag-o-matic
|
||||
|
||||
DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
|
||||
HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
|
||||
URI_DIR="Connector-C++"
|
||||
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="debug examples gcov static-libs"
|
||||
|
||||
DEPEND="virtual/libmysqlclient:=
|
||||
dev-libs/boost:=
|
||||
dev-libs/openssl:0=
|
||||
!<dev-db/mysql-connector-c-6.1.8"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
|
||||
"${FILESDIR}/${PN}-1.1.8-fix-mariadb.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# native lib/wrapper needs this!
|
||||
append-flags "-fno-strict-aliasing"
|
||||
|
||||
local mycmakeargs=(
|
||||
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
|
||||
-DMYSQLCPPCONN_ICU_ENABLE=OFF
|
||||
-DUSE_MYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
|
||||
-DUSE_MYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
|
||||
-DINSTALL_DOCS="/usr/share/doc/${PF}"
|
||||
-DMYSQL_CXX_LINKAGE=0
|
||||
-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# static lib has wrong name so we need to rename it
|
||||
if use static-libs; then
|
||||
mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
|
||||
"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
|
||||
else
|
||||
rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
|
||||
fi
|
||||
|
||||
# examples
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins "${S}"/examples/*
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
WANT_AUTOMAKE="1.13"
|
||||
|
||||
inherit autotools libtool
|
||||
|
||||
MY_PN="super-smack"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
DESCRIPTION="Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL"
|
||||
HOMEPAGE="http://vegan.net/tony/supersmack/"
|
||||
SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="+mysql postgres"
|
||||
REQUIRED_USE="|| ( mysql postgres )"
|
||||
|
||||
COMMON_DEPEND="sys-libs/zlib:=
|
||||
mysql? ( dev-db/mysql-connector-c:= )
|
||||
postgres? ( dev-db/postgresql:*[server] )"
|
||||
DEPEND="${COMMON_DEPEND} sys-devel/bison sys-devel/flex"
|
||||
RDEPEND="${COMMON_DEPEND} mysql? ( virtual/mysql )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.2.destdir.patch
|
||||
"${FILESDIR}"/${PN}-1.3.amd64.patch
|
||||
"${FILESDIR}"/${PN}-1.3.gcc4.3.patch
|
||||
"${FILESDIR}"/${PN}-1.3-gen-data.patch
|
||||
"${FILESDIR}"/${PN}-1.3-automake-1.13.patch
|
||||
)
|
||||
DOCS=( CHANGES INSTALL MANUAL README TUTORIAL )
|
||||
|
||||
src_prepare() {
|
||||
# Clean up files so eautoreconf does not pick up any
|
||||
# deprecated autotools macros.
|
||||
rm acinclude.m4 aclocal.m4 acconfig.h config.status config.h || die
|
||||
mv configure.in configure.ac || die
|
||||
export CXXFLAGS+=" -std=gnu++98"
|
||||
default
|
||||
eautoreconf
|
||||
elibtoolize --patch-only
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
$(usex mysql --with-mysql "")
|
||||
$(usex postgres --with-pgsql "")
|
||||
--with-datadir=/var/tmp/${MY_PN}
|
||||
--with-smacks-dir=/usr/share/${MY_PN}
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
keepdir /var/tmp/${MY_PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "The gen-data binary is now installed as super-smack-gen-data"
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST tar-0.4.0.1.tar.gz 17875 BLAKE2B c8de1ee0a04df64327f2464ac25b5d13c188aea0dcd84e7efa9487cce7af8bc30dd644771420773e80183a8be1503716c6fba5c8560bf27e63d17bc1202bd2b7 SHA512 7cb042f77dc70b856b4dfd5d0a06620f669f9260a84800ad27e1803ec24a50932bb3775b35a6cc91cefb30ea4cd2b453dd6566007d586327acea0edccc0dee47
|
||||
DIST tar-0.4.2.1.tar.gz 29825 BLAKE2B 0a23f3742eaf7b4958dce1669d7be40a73f58eadf6c9c9a6926c10d2b0728d2e73a1343eb5e188e12634bc0ff9aa989d654536af39619c28c0d8914f603b8afe SHA512 8684f20fd31a1d4c83fd6b74e6662eac8f8b0075856b47105c5dc72f39eee5ef3ddbf1b45d2cc730f924b385df4e74ff82a03ec45489662dac1b8b91170397f0
|
||||
DIST tar-0.5.0.3.tar.gz 38764 BLAKE2B 3761544917248f02c08e48b00c10975e622b6ef1b296fd57449edec95ba6bde509429259baae55c9a7139afa27e671e15bafcb4b93079e01d4edf7041367aa5e SHA512 f90899e3a5fe097645e29b143cbf25ccf131f8b794bfea655e5b562369e4d7d492df78e53710d3ca4776233f07ace9335242eafbd3b4ba8d0e1d4664fd24a27d
|
||||
DIST tar-0.5.1.0.tar.gz 39271 BLAKE2B 7867fb111bd5f7efe93899116fa9f36dd52e61089bfb3431a9297521c36f8c9a1c051cb141073d14a9aaa74fd95f2a695ea1a5f057162886b40dafa79ddd104e SHA512 60992ef69be64430d7d322816940182ce91669cb31b6612789abf0fca42e8fa292b2f96f284b1857d82e58e159bc5bebdefef97f7c8e3edb85be4836f0b5eb1c
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
# ebuild generated by hackport 0.5.4.9999
|
||||
|
||||
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="Reading, writing and manipulating \\"
|
||||
HOMEPAGE="http://hackage.haskell.org/package/tar"
|
||||
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~x86 ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
#gienah: tests pass for me with QC-2.10.1
|
||||
#RESTRICT=test # QC-2.10 manages to generate counterexamples
|
||||
|
||||
RDEPEND=">=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
|
||||
<dev-haskell/old-time-1.2:=[profile?]
|
||||
>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
|
||||
>=dev-lang/ghc-7.4.1:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.8
|
||||
test? ( dev-haskell/bytestring-handle
|
||||
>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
|
||||
>=dev-haskell/tasty-0.10
|
||||
>=dev-haskell/tasty-quickcheck-0.8 )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
cabal_chdeps \
|
||||
'tasty >= 0.10 && <0.12' 'tasty >= 0.10' \
|
||||
'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
DIST libclc-0.2.0_pre20180319.tar.gz 161608 BLAKE2B b8e4f2d475c0425cbe5b41a5ba3b7b40d14c045f5c23d007e87cdfedc7a01a8317218e5f3b881e944256f04b9fb68a130bff2a137e51cb961b3d5bb7f2e2261d SHA512 5a4130eeb416f90901b66708adc17c825baa757d00d983a12e217f36503e4ed5d208f3a49cc26d7f9b71134ee3d258748153bf52cf7769bcbc06ec0510087a36
|
||||
DIST libclc-0.2.0_pre20180610.tar.gz 170102 BLAKE2B 3f8c33a9961db34e68cebc328a88a71173000972b5540d099fa79fe89fd186b7f2f8791a86b45b1be135383d26a92fd4ccdc2827b5620b5f86f0b48467fc092f SHA512 0c75c3e7b81754c175c5c43614ad313cda2fa09a1865794c904675b8d2527f78ffa357178f7d4a471b52ac3d7d96b0184303439b69060df4bf482a01871fcb95
|
||||
DIST libclc-0.2.0_pre20180915.tar.gz 170385 BLAKE2B 43a90347936be5ad383fe4e4b06523aac455596d6cb1fc58038811ea19b4f6ab2091ffc345e68ff2ad7f7f1615713085000711b31b9d1ad3911a85bc0db93d5b SHA512 5b8e68f7683d72390d8f9c263e15a54b4b4613b73eff2bf3881d7a35d6480468693a62dcaed159fd8421ae80768d6aaebcd6c33163b082c0a2cf15581d37dcab
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST libgpiod-1.0.tar.gz 411974 BLAKE2B e6c962329f7fad374d2771e60aa87e679970e3b593dda73d51f0511b14122d8a9d94eee3355ede2221d4ff0cd10f7116874c535fe90092fd61ccc5aa8f7e9818 SHA512 e8a71a7028fa73a94d8507d4329bee024c3e73d1b619dd5500172bf36509c7ccee521ddb6ef07283e3a4217af9da12ce154af657f8a536883f5495ffccf46e0c
|
||||
DIST libgpiod-1.1.1.tar.xz 302672 BLAKE2B 71c624f923118b7c50970beb737f2c813d1470a34f95798f9ce821211e16f15e2a3fd42d0054e25529ddc9846725c0935d915784f22d2509b844a0bac61b66b6 SHA512 a1d902ce8e1c94d5550ade2fb4889ebe28b86523505b92ab907f58c8e6903eaf07ce16278126989462956b879f591b42ddd50fbc4537c1b5af459f23a4dfc12f
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
|
||||
DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed8836f573adba4b5f0e3f2e1410acfca0c50dbe06ea3b50a2df819aa01e7522902fbd5270e5329075b854881150ab64 SHA512 e1ed3c103cd4c9897e7dd2360a11f63cf30382b7566ce6fcc81117804e203714446b5a62179ce628c3834b0b32ecdeeceecbdfa417507ce9ed5a107a0ebefb39
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From 9608d20739b36087f0e6865cc924769d3b286188 Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
Date: Tue, 12 Sep 2017 23:44:35 +0200
|
||||
Subject: [PATCH] Move XML_CONFIG assignment to unbreak xslt-config
|
||||
|
||||
Bug: https://bugs.gentoo.org/630784
|
||||
---
|
||||
configure.in | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index e6f649cd..49e6b6cf 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -518,9 +518,6 @@ else
|
||||
LIBXML_MANUAL_SEARCH=yes
|
||||
fi
|
||||
|
||||
-if test "x$LIBXML_MANUAL_SEARCH" != "xno"
|
||||
-then
|
||||
-
|
||||
dnl
|
||||
dnl where is xml2-config
|
||||
dnl
|
||||
@@ -534,6 +531,9 @@ else
|
||||
AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false])
|
||||
fi
|
||||
|
||||
+if test "x$LIBXML_MANUAL_SEARCH" != "xno"
|
||||
+then
|
||||
+
|
||||
dnl
|
||||
dnl imported from libxml2, c.f. #77827
|
||||
dnl
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
diff --git a/configure.in b/configure.in
|
||||
index d6aa366..20aafb8 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -165,11 +165,11 @@ XSLT_LOCALE_XLOCALE=0
|
||||
XSLT_LOCALE_WINAPI=0
|
||||
|
||||
AC_CHECK_HEADERS([locale.h xlocale.h])
|
||||
-if test $ac_cv_header_xlocale_h = yes; then
|
||||
+if test $ac_cv_header_locale_h = yes; then
|
||||
dnl
|
||||
dnl Check for generic locale_t declaration
|
||||
dnl
|
||||
-AC_MSG_CHECKING([if xlocale program link])
|
||||
+AC_MSG_CHECKING([if locale program link])
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
||||
#ifdef HAVE_LOCALE_H
|
||||
#include <locale.h>
|
||||
diff --git a/libxslt/xsltlocale.h b/libxslt/xsltlocale.h
|
||||
index 8a9ca15..2f64424 100644
|
||||
--- a/libxslt/xsltlocale.h
|
||||
+++ b/libxslt/xsltlocale.h
|
||||
@@ -17,7 +17,9 @@
|
||||
#ifdef XSLT_LOCALE_XLOCALE
|
||||
|
||||
#include <locale.h>
|
||||
+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 26
|
||||
#include <xlocale.h>
|
||||
+#endif
|
||||
|
||||
#ifdef __GLIBC__
|
||||
/*locale_t is defined only if _GNU_SOURCE is defined*/
|
||||
@ -1,250 +0,0 @@
|
||||
From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
Date: Wed, 11 Nov 2015 17:49:07 +0100
|
||||
Subject: [PATCH] Simplify python setup in autoconf
|
||||
|
||||
AM_PATH_PYTHON does most of the job without using pkg-config as expected
|
||||
from the rest of the autoconf script.
|
||||
---
|
||||
Makefile.am | 14 +++++--
|
||||
configure.in | 119 ++++++++++++++---------------------------------------
|
||||
python/Makefile.am | 28 ++++---------
|
||||
3 files changed, 49 insertions(+), 112 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index ff10f574..65decb3c 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -2,9 +2,13 @@ SUBDIRS = \
|
||||
libxslt \
|
||||
libexslt \
|
||||
xsltproc \
|
||||
- doc \
|
||||
- $(PYTHON_SUBDIR) \
|
||||
- tests
|
||||
+ doc
|
||||
+
|
||||
+if WITH_PYTHON
|
||||
+SUBDIRS += python
|
||||
+endif
|
||||
+
|
||||
+SUBDIRS += tests
|
||||
|
||||
DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
|
||||
|
||||
@@ -51,7 +55,9 @@ tests: dummy
|
||||
@echo '## Running the regression test suite'
|
||||
@(cd tests ; $(MAKE) -s tests)
|
||||
@(cd xsltproc ; $(MAKE) -s tests)
|
||||
- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi)
|
||||
+if WITH_PYTHON
|
||||
+ @(cd python ; $(MAKE) -s tests)
|
||||
+endif
|
||||
|
||||
valgrind:
|
||||
@echo '## Running the regression tests under Valgrind'
|
||||
diff --git a/configure.in b/configure.in
|
||||
index d6aa3664..0a538944 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -293,90 +293,37 @@ dnl
|
||||
dnl check for python
|
||||
dnl
|
||||
|
||||
-PYTHON_VERSION=
|
||||
-PYTHON_INCLUDES=
|
||||
-PYTHON_SITE_PACKAGES=
|
||||
-pythondir=
|
||||
-AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found])
|
||||
-if test "$with_python" != "no" ; then
|
||||
- if test -x "$with_python/bin/python"
|
||||
- then
|
||||
- echo Found python in $with_python/bin/python
|
||||
- PYTHON="$with_python/bin/python"
|
||||
- else
|
||||
- if test -x "$with_python"
|
||||
- then
|
||||
- echo Found python in $with_python
|
||||
- PYTHON="$with_python"
|
||||
- else
|
||||
- if test -x "$PYTHON"
|
||||
- then
|
||||
- echo Found python in environment PYTHON=$PYTHON
|
||||
- with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
|
||||
- else
|
||||
- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- if test "$PYTHON" != ""
|
||||
- then
|
||||
- echo "PYTHON is pointing at $PYTHON"
|
||||
- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
|
||||
- echo Found Python version $PYTHON_VERSION
|
||||
- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1
|
||||
-except: print 0"`
|
||||
- if test "$LIBXML2_PYTHON" = "1"
|
||||
- then
|
||||
- echo Found libxml2-python module
|
||||
- else
|
||||
- echo Warning: Missing libxml2-python
|
||||
- fi
|
||||
- fi
|
||||
- if test "$PYTHON_VERSION" != ""
|
||||
- then
|
||||
- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
|
||||
- -d $with_python/lib/python$PYTHON_VERSION/site-packages
|
||||
- then
|
||||
- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
|
||||
- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
|
||||
- else
|
||||
- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
|
||||
- then
|
||||
- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
|
||||
- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
|
||||
- else
|
||||
- if test -r /usr/include/python$PYTHON_VERSION/Python.h
|
||||
- then
|
||||
- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
|
||||
- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
|
||||
- else
|
||||
- echo could not find python$PYTHON_VERSION/Python.h
|
||||
- fi
|
||||
- fi
|
||||
- if test ! -d "$PYTHON_SITE_PACKAGES"
|
||||
- then
|
||||
- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
|
||||
- fi
|
||||
- fi
|
||||
- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
|
||||
- fi
|
||||
- if test "$with_python" != ""
|
||||
- then
|
||||
- pythondir='$(PYTHON_SITE_PACKAGES)'
|
||||
- else
|
||||
- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
|
||||
- fi
|
||||
-fi
|
||||
-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
|
||||
-if test "$PYTHON_INCLUDES" != ""
|
||||
-then
|
||||
- PYTHON_SUBDIR=python
|
||||
-else
|
||||
- PYTHON_SUBDIR=
|
||||
-fi
|
||||
-AC_SUBST(pythondir)
|
||||
-AC_SUBST(PYTHON_SUBDIR)
|
||||
-AC_SUBST(PYTHON_LIBS)
|
||||
+AC_ARG_WITH([python],
|
||||
+ AS_HELP_STRING([--with-python], [Build Python bindings if found])
|
||||
+)
|
||||
+
|
||||
+AS_IF([test "$with_python" = "yes"],
|
||||
+ [AM_PATH_PYTHON
|
||||
+ AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no])
|
||||
+ AS_IF([test "$PYTHON_CONFIG" = "no"],
|
||||
+ [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])])
|
||||
+ AS_IF([test "$PYTHON_CONFIG" != "no"],
|
||||
+ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
|
||||
+ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
|
||||
+ PYTHON_LIBS=`$PYTHON_CONFIG --libs`],
|
||||
+ [AC_MSG_ERROR([Missing python development files.])])
|
||||
+ AC_MSG_CHECKING([libxml2 module in $PYTHON])
|
||||
+ LIBXML2_PYTHON=`$PYTHON -c "import sys;
|
||||
+try:
|
||||
+ import libxml2
|
||||
+ sys.stdout.write('1')
|
||||
+except:
|
||||
+ sys.stdout.write('0')"`
|
||||
+ AS_IF([test "$LIBXML2_PYTHON" = "1"],
|
||||
+ [AC_MSG_RESULT([yes])],
|
||||
+ [AC_MSG_RESULT([no])
|
||||
+ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])])
|
||||
+ ])
|
||||
+
|
||||
+AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"])
|
||||
+AC_SUBST([PYTHON_CFLAGS])
|
||||
+AC_SUBST([PYTHON_LDFLAGS])
|
||||
+AC_SUBST([PYTHON_LIBS])
|
||||
|
||||
AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)])
|
||||
WITH_CRYPTO=0
|
||||
@@ -678,10 +625,6 @@ AC_SUBST(PYTHONSODV)
|
||||
AC_SUBST(XML_CONFIG)
|
||||
AC_SUBST(LIBXML_LIBS)
|
||||
AC_SUBST(LIBXML_CFLAGS)
|
||||
-AC_SUBST(PYTHON)
|
||||
-AC_SUBST(PYTHON_VERSION)
|
||||
-AC_SUBST(PYTHON_INCLUDES)
|
||||
-AC_SUBST(PYTHON_SITE_PACKAGES)
|
||||
|
||||
XSLT_LIBDIR='-L${libdir}'
|
||||
XSLT_INCLUDEDIR='-I${includedir}'
|
||||
diff --git a/python/Makefile.am b/python/Makefile.am
|
||||
index fa58b78f..3a5ecd6a 100644
|
||||
--- a/python/Makefile.am
|
||||
+++ b/python/Makefile.am
|
||||
@@ -5,9 +5,9 @@ SUBDIRS= . tests
|
||||
|
||||
AM_CFLAGS = $(LIBXML_CFLAGS)
|
||||
|
||||
-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
|
||||
+docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
|
||||
# libxsltclass.txt is generated
|
||||
-DOCS = TODO
|
||||
+dist_docs_DATA = TODO
|
||||
|
||||
EXTRA_DIST = \
|
||||
libxslt.c \
|
||||
@@ -16,10 +16,7 @@ EXTRA_DIST = \
|
||||
libxml_wrap.h \
|
||||
libxslt_wrap.h \
|
||||
libxsl.py \
|
||||
- libxslt-python-api.xml \
|
||||
- $(DOCS)
|
||||
-
|
||||
-libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
|
||||
+ libxslt-python-api.xml
|
||||
|
||||
if WITH_PYTHON
|
||||
mylibs = \
|
||||
@@ -28,31 +25,22 @@ mylibs = \
|
||||
|
||||
all-local: libxslt.py
|
||||
|
||||
-python_LTLIBRARIES = libxsltmod.la
|
||||
+python_PYTHON = libxslt.py
|
||||
+pyexec_LTLIBRARIES = libxsltmod.la
|
||||
|
||||
libxsltmod_la_CPPFLAGS = \
|
||||
- -I$(PYTHON_INCLUDES) \
|
||||
-I$(top_srcdir)/libxslt \
|
||||
-I$(top_srcdir) \
|
||||
- -I../libexslt
|
||||
+ -I$(top_srcdir)/libexslt \
|
||||
+ $(PYTHON_CFLAGS)
|
||||
libxsltmod_la_SOURCES = libxslt.c types.c
|
||||
nodist_libxsltmod_la_SOURCES = libxslt-py.c
|
||||
libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
|
||||
+libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
|
||||
|
||||
libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
|
||||
cat $(srcdir)/libxsl.py libxsltclass.py > $@
|
||||
|
||||
-install-data-local:
|
||||
- $(MKDIR_P) $(DESTDIR)$(pythondir)
|
||||
- $(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir)
|
||||
- $(MKDIR_P) $(DESTDIR)$(DOCS_DIR)
|
||||
- @(for doc in $(DOCS) ; \
|
||||
- do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
|
||||
-
|
||||
-uninstall-local:
|
||||
- rm -f $(DESTDIR)$(pythondir)/libxslt.py
|
||||
- rm -rf $(DESTDIR)$(DOCS_DIR)
|
||||
-
|
||||
GENERATE = generator.py
|
||||
API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml
|
||||
GENERATED= libxsltclass.py \
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
diff -ur libxslt-1.1.26.orig/libxslt.m4 libxslt-1.1.26/libxslt.m4
|
||||
--- libxslt-1.1.26.orig/libxslt.m4 2009-05-12 09:29:34.000000000 +0300
|
||||
+++ libxslt-1.1.26/libxslt.m4 2009-10-07 17:03:04.000000000 +0300
|
||||
@@ -52,8 +52,10 @@
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_xslttest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
+ ac_save_CXXFLAGS="$CXXFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $XSLT_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS"
|
||||
LIBS="$XSLT_LIBS $LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed libxslt is sufficiently new.
|
||||
@@ -138,6 +140,7 @@
|
||||
}
|
||||
],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
+ CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
@@ -158,6 +161,7 @@
|
||||
else
|
||||
echo "*** Could not run libxslt test program, checking why..."
|
||||
CFLAGS="$CFLAGS $XSLT_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS"
|
||||
LIBS="$LIBS $XSLT_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <libxslt/xslt.h>
|
||||
@@ -177,6 +181,7 @@
|
||||
echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
+ CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue