root
8 years ago
parent
9bff3377a2
commit
e925a5e618
@ -1,4 +1,4 @@
|
||||
DIST filebeat-1.1.2-i686.tar.gz 3419775 SHA256 b740bb8f1849bc11554f27bbd300f10960b48ec206c250edbbf51579ef30c720 SHA512 24c12c85ce4f3e650ce2cf71a2ba4cd82969958d6e440f0c5f4c3984419dc0016af547ce3b0cbbd5071b87d86f24b619f6ba8d55bb9dc842fadbbd8ae21320d6 WHIRLPOOL 402f7c27aab938c99e00ca42635acb96c53b690f85b180da9dba762cd6b1030838f7bbc60a48e3e5c529888076edf674816276da45cb5ee45d815171a1379a45
|
||||
DIST filebeat-1.1.2-x86_64.tar.gz 3631167 SHA256 5b15ea8eb9f784fa530e8ddaccb545906a105f808233a36169d3419b7e8044d5 SHA512 95a76c5057e3c271cf4ed373870d2e6e9c68752ee79488d8e489c3260cc0e752311f90364267efd3e6f5fa1100685fb70a8da1c7ccf1b08b9b9382196c01fa1e WHIRLPOOL d2cc82f124b1add3db52062206f58581e3320f391da20da78d9e8ab2d5c469e8f82da3015b7c28cf9b72fec70ffeafc650eb57a744843054a135b175d2778776
|
||||
DIST filebeat-1.2.0-i686.tar.gz 3424132 SHA256 c365a3f6f4f7da3e7b34df607d7a311c6556abf954fcba289c2529b34ca0750b SHA512 6313912ded8ea3a4745a6111c33bf6b7051395c988ca7538b8929d9300620c5572d47d37226bec3dad01df57e5a1bdc045d52e8d2bf4a56adf404bc521dd14e1 WHIRLPOOL 3d5f7300bb4824564f018f87b2fa98251ce971273f91e5448a9681cf9f8560e85b55d6eca4bcf307e0450773600abbd99b874dc7f81a62c4c3facab56752ffc2
|
||||
DIST filebeat-1.2.0-x86_64.tar.gz 3640174 SHA256 bc535115e73be24b582594b4874fd7e46fef936fa783fffdec40576c20f06ad5 SHA512 f6d90c6885d30651de55fd07beab56f5e84adf5bac00a1b6f29ea90aca41bf8d3715791b8774e71731fa787bbd619d42684af536e36082a3e402bd6c18be4c23 WHIRLPOOL 02962f1bdef2a08fb6c366d8c5ca39085ccd36e1af0bfd5f3a1d2ff5de68064c74d49665d3b4d63f069dee054ae43c13d967b28c7bea25757285e9956d7a528c
|
||||
DIST filebeat-1.2.1-i686.tar.gz 3424092 SHA256 9b69919fbad36e70451ecf37d7e9e2437770ed7e9b602717880a6b8813f53d33 SHA512 55857a41f3f0380e187ce667b868b85fc0f824663e7087ad38170216f9c3887bc400af8730909d9ef3c5221e84b871ec561aab61522fea8a7aca502110a136b3 WHIRLPOOL 0c3df1b933657ede49f7b14e3b83044a3ecfab9a928fc3bccc4c811c32fb5ab0dd400d72b494fdee685d5008a7ffe40ecd17425e9ef1be6fd98aa05bfb7498e1
|
||||
DIST filebeat-1.2.1-x86_64.tar.gz 3639500 SHA256 82a891b060651e85107bc70b923f84891f8b94f7a84f3d482d6d45219f1b6bbf SHA512 e0983531b70ac7807e9b753d65fc7c5a3dcf76d7ef87745ff8b9dc1ef81b5528a0772febcc90fe82f4f5fe4b0c9d964a63dcde4127c5be46d7f1137daeda4ffc WHIRLPOOL eda946450b0e4b553f3f24550b13e8db93f981d022ef2b75a25408385f52cd0bacea5f31f8397f7e61ebd988c73dce7a469acb81f8cbe2d45d12901e9c59c12e
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST clamav-0.98.7.tar.gz 15118851 SHA256 282417b707740de13cd8f18d4cbca9ddd181cf96b444db2cad98913a5153e272 SHA512 acf01961472c13ccb219420cc3fa3c3e6f8a733edef371dbc04ce5867900aa1535e956ec8ad50d31c8f872a0a1d79fcccac944cd86e29ecdfa4af18f7fd5afb9 WHIRLPOOL c9f2e6f52f07f68bdcccf55ca1aab0bf3deaa6963279459d64ecca076a9ed0ef53c25996b2b673e9746833822df24689a9fab0654064c5ee6ed372a86966fbb6
|
||||
DIST clamav-0.99.1.tar.gz 15990867 SHA256 e144689122d3f91293808c82cbb06b7d3ac9eca7ae29564c5d148ffe7b25d58a SHA512 9beb5c0ebff2aef741bb27811c1f10a7cd5da354ff67272ee8994d87c95e272a5983105af0fe1a734e1fa99f112dc4dddd9d82074a0df6715814817f85a45f4f WHIRLPOOL e2afd7b7d377c1a1af802e780839bb21bcd318035ac858b6cb11545db3673d3f74ba3159b837238982248720379f98ab51e279a8636bbea89331136891e88e5d
|
||||
DIST clamav-0.99.tar.gz 15968038 SHA256 d2792c8cfadd685fffc40b2199679628815df031fd3149ccf961649fc8787ea9 SHA512 328e66fa412ba61f5e44c839b254c7a84d2ce7821fda6cf29e4ee9532c06e45bdec62f202ca561223e984fff170bfd8280e5cc8e306c09a3017b17e7db3bbf56 WHIRLPOOL 696b425c0d3a6639d627e6dba000a57c4e532232f9f42a564a992c0b459d8041a1947b09548d99b621a5685c78d91045adf4b61731242f55eda2b8d5150fc8b8
|
||||
|
||||
@ -0,0 +1,141 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils flag-o-matic user systemd
|
||||
|
||||
DESCRIPTION="Clam Anti-Virus Scanner"
|
||||
HOMEPAGE="http://www.clamav.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
|
||||
|
||||
CDEPEND="bzip2? ( app-arch/bzip2 )
|
||||
clamdtop? ( sys-libs/ncurses:0 )
|
||||
iconv? ( virtual/libiconv )
|
||||
metadata-analysis-api? ( dev-libs/json-c )
|
||||
milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
|
||||
dev-libs/libtommath
|
||||
>=sys-libs/zlib-1.2.2
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
sys-devel/libtool
|
||||
!!<app-antivirus/clamav-0.99"
|
||||
# openssl is now *required* see this link as to why
|
||||
# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-clamav )"
|
||||
|
||||
DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup clamav
|
||||
enewuser clamav -1 -1 /dev/null clamav
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
use ppc64 && append-flags -mminimal-toc
|
||||
use uclibc && export ac_cv_type_error_t=yes
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-experimental \
|
||||
--disable-fanotify \
|
||||
--enable-id-check \
|
||||
--with-dbdir="${EPREFIX}"/var/lib/clamav \
|
||||
--with-system-tommath \
|
||||
--with-zlib="${EPREFIX}"/usr \
|
||||
$(use_enable bzip2) \
|
||||
$(use_enable clamdtop) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable milter) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_with iconv) \
|
||||
$(use_with metadata-analysis-api libjson /usr)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
rm -rf "${ED}"/var/lib/clamav
|
||||
newinitd "${FILESDIR}"/clamd.initd-r6 clamd
|
||||
newconfd "${FILESDIR}"/clamd.conf-r1 clamd
|
||||
|
||||
systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
|
||||
systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
|
||||
systemd_dounit "${FILESDIR}/clamd.service"
|
||||
systemd_dounit "${FILESDIR}/freshclamd.service"
|
||||
|
||||
keepdir /var/lib/clamav
|
||||
fowners clamav:clamav /var/lib/clamav
|
||||
keepdir /var/log/clamav
|
||||
fowners clamav:clamav /var/log/clamav
|
||||
|
||||
dodir /etc/logrotate.d
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}"/clamav.logrotate clamav
|
||||
|
||||
# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
|
||||
sed -i -e "s:^\(Example\):\# \1:" \
|
||||
-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
|
||||
-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
|
||||
-e "s:.*\(User\) .*:\1 clamav:" \
|
||||
-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
|
||||
-e "s:^\#\(LogTime\).*:\1 yes:" \
|
||||
-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
|
||||
"${ED}"/etc/clamd.conf.sample || die
|
||||
sed -i -e "s:^\(Example\):\# \1:" \
|
||||
-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
|
||||
-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
|
||||
-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
|
||||
-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
|
||||
-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
|
||||
-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
|
||||
"${ED}"/etc/freshclam.conf.sample || die
|
||||
|
||||
if use milter ; then
|
||||
# MilterSocket one to include ' /' because there is a 2nd line for
|
||||
# inet: which we want to leave
|
||||
dodoc "${FILESDIR}"/clamav-milter.README.gentoo
|
||||
sed -i -e "s:^\(Example\):\# \1:" \
|
||||
-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
|
||||
-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
|
||||
-e "s:.*\(User\) .*:\1 clamav:" \
|
||||
-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
|
||||
-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
|
||||
-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
|
||||
"${ED}"/etc/clamav-milter.conf.sample || die
|
||||
cat >> "${ED}"/etc/conf.d/clamd <<-EOF
|
||||
MILTER_NICELEVEL=19
|
||||
START_MILTER=no
|
||||
EOF
|
||||
|
||||
systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
|
||||
fi
|
||||
|
||||
for i in clamd freshclam clamav-milter
|
||||
do
|
||||
[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
|
||||
done
|
||||
|
||||
prune_libtool_files --all
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use milter ; then
|
||||
elog "For simple instructions how to setup the clamav-milter read the"
|
||||
elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
|
||||
fi
|
||||
if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
|
||||
ewarn "You must run freshclam manually to populate the virus database files"
|
||||
ewarn "before starting clamav for the first time.\n"
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST flannel-0.5.4.tar.gz 578005 SHA256 14bbbabdbb85f3366ae6788a8b8ba110d56add15e06def4d8ead4c9698fc15fd SHA512 535d3de31186760cd72cac5753fabc269c8ebf9f3fe90a381b86dae0747a1dd4f4099cce19729a7d5990fefc99236bea8742062605a376f9bd9f653c07b4e92a WHIRLPOOL 10756f47fc35ce39ac1b9321d4bb347993d8d5dd37bc83bf769e35e32f3de02bbba89d39142c4b6eb8a6bd92be7a5ad91c45bf0f8aeb6e0efe050383766c3aef
|
||||
DIST flannel-0.5.5.tar.gz 592235 SHA256 dbbcb08c0e70713b0c920387a9967e5b30ef833c8118c847edbbca4f68ff0562 SHA512 5300583752fbfa0da3c1a066268a7441271c02a0304213cc854c252727b5035db4a51a4747ad54db3c741b6f623363c99920a5bf2292c59dc3dc4d653b366f83 WHIRLPOOL c97b7ece323309343fef40b36a826b420f3be5df61ac7bb9ae4faa48802c395be886b8a6740765779e2023a5bdbffde21dda1934179e4e284204aa821275e645
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit systemd user
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
DESCRIPTION="An etcd backed network fabric for containers"
|
||||
GO_PN="github.com/coreos/flannel"
|
||||
HOMEPAGE="https://${GO_PN}"
|
||||
SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=dev-lang/go-1.4:="
|
||||
RDEPEND=""
|
||||
|
||||
src_prepare() {
|
||||
local line
|
||||
sed -e 's:go build:[[ ${0##*/} == test ]] || \0 -v -x:' -i build || die
|
||||
sed -e 's:go test:\0 -v:' -i test || die
|
||||
|
||||
# remote_test.go:98: GetNetworkConfig failed: Get http://127.0.0.1:9999/v1/_/config: dial tcp 127.0.0.1:9999: getsockopt: connection refused
|
||||
sed -e 's:^func TestRemote:func _TestRemote:' -i remote/remote_test.go || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
"${BASH}" -ex ./build || die 'Build failed'
|
||||
}
|
||||
|
||||
src_test() {
|
||||
"${BASH}" -ex ./test || die 'Tests failed'
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/*
|
||||
exeinto /usr/libexec/flannel
|
||||
doexe dist/mk-docker-opts.sh
|
||||
insinto /etc/systemd/system/docker.service.d
|
||||
newins "${FILESDIR}/flannel-docker.conf" flannel.conf
|
||||
systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
|
||||
systemd_dounit "${FILESDIR}/flanneld.service"
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit multilib
|
||||
|
||||
DESCRIPTION="Utility to change the OpenCL implementation being used"
|
||||
HOMEPAGE="https://www.gentoo.org/"
|
||||
|
||||
# Source:
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
|
||||
|
||||
# Using copy by Mario Kicherer #496418
|
||||
|
||||
SRC_URI="
|
||||
https://dev.gentoo.org/~xarthisius/distfiles/${P}-r1.tar.xz
|
||||
https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl10.zip
|
||||
https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl11.zip
|
||||
https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl12.zip
|
||||
https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl20.zip
|
||||
https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl21.zip
|
||||
http://packages.gentooexperimental.org/opencl-cpp-headers.tar
|
||||
"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="app-arch/xz-utils"
|
||||
RDEPEND=">=app-admin/eselect-1.2.4"
|
||||
|
||||
pkg_postinst() {
|
||||
local impl="$(eselect opencl show)"
|
||||
if [[ -n "${impl}" && "${impl}" != '(none)' ]] ; then
|
||||
eselect opencl set "${impl}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/eselect/modules
|
||||
doins opencl.eselect
|
||||
#doman opencl.eselect.5
|
||||
|
||||
local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl_egl.h )
|
||||
|
||||
# We install all versions of OpenCL headers
|
||||
for CL_ABI in 1.0 1.1 1.2 2.0 2.1; do
|
||||
mkdir -p "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}"
|
||||
for f in ${headers[@]}; do
|
||||
cp "${WORKDIR}"/OpenCL-Headers-opencl${CL_ABI/./}/${f} "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}" > /dev/null
|
||||
done
|
||||
done
|
||||
|
||||
for i in 1.1 1.2 2.1; do
|
||||
cp "${WORKDIR}"/$i/cl.hpp "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/"
|
||||
done
|
||||
# Create symlinks to newest. Maybe this should be switchable?
|
||||
for f in ${headers[@]}; do
|
||||
dosym "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-1.2/${f}" "/usr/include/CL/${f}"
|
||||
done
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST anki-2.0.31.tgz 3329290 SHA256 4b969629255b00db9a9eb8a2fd70271cc41c92c47752eb1c78e8609ff025be2f SHA512 3e6e29247d83b026ece6974007c848822360a812838dbb718cf3f1423fc9d015236b027944cd99f3b419e0fe4fe6cb2390d185f00646af727ec8e76f4aa3cbb8 WHIRLPOOL 42b1ecf2cc856c15ad1fe690d45e8051a8b79ef0b850e701a6a8a510a56cc4e6711bf4c8acc8ae9add7a3c761788005979c9a6398a71e1b28c9821043d5f6053
|
||||
DIST anki-2.0.33.tgz 3376646 SHA256 b9fe2c35a68e90f3fa31f5c67f3447a7e1033d1c909baa381a1525ce5e71b9b4 SHA512 ac2df1ac94e5aa4cc04c17d41b8f96788b5f321860bc20b4a167d5ee0161ca4f7f586fda08ac9910a706ec3e7d1bd692d2e74f3de56997c9ce480122396e0d6d WHIRLPOOL fdddc9c51f2226373bdf5c6547a3b643b94aac37d68cf1e1430ee9355d4f5b11ae3e4cca218d65e7a76a0921f8d2e3e0676c2022aef4e49998e596531ce93848
|
||||
DIST anki-2.0.34.tgz 3411136 SHA256 ce70f10efb7deabb5cf5e6e003a3ee0b22a2d37ed24ac6c4d8f4e079b8ae5ff8 SHA512 289e937be7174b24b5213166d5d434a265ebef313815dbe105de6e21c83c6cf0cba93000e489b050fc5a04fc80bac25a71e7a42adad55bf2a1a2a246890dacdd WHIRLPOOL 3b3f2f9292b917dbde23825d75f2dde1219c3992538f29fea11a5c3bb6223abbf86a8593c50c0ee6d2ab783a23c38c5358c768a280a1cfbf6af01097e5070da2
|
||||
DIST anki-2.0.35.tgz 3410475 SHA256 bb8a229b85f551e2f69829f9ec8485633b739c701dabd0067acb06fe3b1af3b4 SHA512 4877e564bf052220b6ba8b59d18d7a1a3a326b01339dfdf85cc13513c6f54a8927f3fad2861f6edff0db691ea208dd1a481afa3f412d7b4af4ee94d645ee6e6e WHIRLPOOL 04166b0764c1f3e8aeee33b1a3b0a70510b3be8e34e9bee8b43ca0cbbfb416e03ff19b1fe714aa7c2e7970dfca86524bfa4d739e86a4ac1bdc07a765cd1b1d08
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
|
||||
inherit eutils python-single-r1
|
||||
|
||||
DESCRIPTION="A spaced-repetition memory training program (flash cards)"
|
||||
HOMEPAGE="http://ichi2.net/anki/"
|
||||
SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="latex +recording +sound"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
dev-python/PyQt4[X,svg,webkit]
|
||||
>=dev-python/httplib2-0.7.4
|
||||
dev-python/beautifulsoup:python-2
|
||||
dev-python/send2trash
|
||||
recording? ( media-sound/lame
|
||||
>=dev-python/pyaudio-0.2.4 )
|
||||
sound? ( media-video/mplayer )
|
||||
latex? ( app-text/texlive
|
||||
app-text/dvipng )"
|
||||
DEPEND=""
|
||||
|
||||
pkg_setup(){
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
rm -r thirdparty || die
|
||||
sed -i -e "s/updates=True/updates=False/" \
|
||||
aqt/profiles.py || die
|
||||
}
|
||||
|
||||
# Nothing to configure or compile
|
||||
src_configure() {
|
||||
true;
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
true;
|
||||
}
|
||||
|
||||
src_install() {
|
||||
doicon ${PN}.png
|
||||
domenu ${PN}.desktop
|
||||
doman ${PN}.1
|
||||
|
||||
dodoc README README.development
|
||||
python_domodule aqt anki
|
||||
python_doscript anki/anki
|
||||
|
||||
# Localization files go into the anki directory:
|
||||
python_moduleinto anki
|
||||
python_domodule locale
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/completions/Makefile.in b/completions/Makefile.in
|
||||
index 940e873..f9aaaa7 100644
|
||||
--- a/completions/Makefile.in
|
||||
+++ b/completions/Makefile.in
|
||||
@@ -1237,7 +1237,7 @@ symlinks: $(targetdir) $(DATA)
|
||||
rm -f $(targetdir)/$$file && \
|
||||
$(LN_S) mcrypt $(targetdir)/$$file ; \
|
||||
done
|
||||
- for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
|
||||
+ for file in mplayer2 mencoder gmplayer kplayer ; do \
|
||||
rm -f $(targetdir)/$$file && \
|
||||
$(LN_S) mplayer $(targetdir)/$$file ; \
|
||||
done
|
||||
@ -0,0 +1,17 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: quickly toggle boolean-type keywords"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=895"
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPTEXT=\
|
||||
"This plugin will toggle true/false, on/off, yes/no and so on when <C-T>
|
||||
is pressed."
|
||||
@ -0,0 +1,95 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
inherit git-r3
|
||||
fi
|
||||
|
||||
inherit golang-build
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
DESCRIPTION="Replicated SQLite using the Raft consensus protocol "
|
||||
EGO_PN="github.com/otoolep/rqlite/..."
|
||||
HOMEPAGE="https://${EGO_PN%/*} http://www.philipotoole.com/replicating-sqlite-using-raft-consensus"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/${PVR}"
|
||||
IUSE=""
|
||||
RESTRICT="test"
|
||||
EGIT_REPO_URI="https://github.com/otoolep/rqlite.git"
|
||||
EGIT_COMMIT="v${PV}"
|
||||
SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
|
||||
https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
|
||||
https://github.com/boltdb/bolt/archive/ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz -> bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz
|
||||
https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
|
||||
https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> hashicorp-raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz
|
||||
https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> hashicorp-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
|
||||
https://github.com/mattn/go-sqlite3/archive/10876d7dac65f02064c03d7372a2f1dfb90043fe.tar.gz -> go-sqlite3-1.1.0_p20160307.tar.gz"
|
||||
|
||||
get_archive_go_package() {
|
||||
local archive=${1} uri x
|
||||
for x in ${SRC_URI}; do
|
||||
if [[ ${x} == http* ]]; then
|
||||
uri=${x}
|
||||
elif [[ ${x} == ${archive} ]]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
uri=${uri#https://}
|
||||
echo ${uri%/archive/*}
|
||||
}
|
||||
|
||||
unpack_go_packages() {
|
||||
local go_package x
|
||||
# Unpack packages to appropriate locations for GOPATH
|
||||
for x in ${A}; do
|
||||
unpack ${x}
|
||||
if [[ ${x} == *.tar.gz ]]; then
|
||||
go_package=$(get_archive_go_package ${x})
|
||||
if [[ ${x%.tar.gz} -ef ${S} ]]; then
|
||||
mv "${S}"{,_} || die
|
||||
mkdir -p "${S}/src/${go_package%/*}" || die
|
||||
mv "${S}"_ "${S}/src/${go_package}" || die || die
|
||||
else
|
||||
mkdir -p "${S}/src/${go_package%/*}" || die
|
||||
for x in "${go_package##*/}"-*; do
|
||||
if [[ ! ${x} -ef ${S} ]]; then
|
||||
mv "${x}" "${S}/src/${go_package}" || die
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
git-r3_src_unpack
|
||||
mv "${S}"{,_} || die
|
||||
mkdir -p "$(dirname "${S}/src/${EGO_PN%/*}")" || die
|
||||
mv "${S}_" "${S}/src/${EGO_PN%/*}" || die
|
||||
fi
|
||||
unpack_go_packages
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Omit $(get_golibdir_gopath) from GOPATH, in order to avoid
|
||||
# interference from installed rqlite sources.
|
||||
GOPATH="${WORKDIR}/${P}" \
|
||||
go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
golang_install_pkgs
|
||||
}
|
||||
|
||||
golang_install_pkgs() {
|
||||
dobin bin/${PN}d
|
||||
insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
|
||||
rm -rf "${S}"/src/${EGO_PN%/*}/.git*
|
||||
doins -r "${S}"/src/${EGO_PN%/*}
|
||||
insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
|
||||
doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a}
|
||||
dodoc "${S}/src/${EGO_PN%/*}/"{CHANGELOG,README}.md
|
||||
}
|
||||
@ -0,0 +1,142 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit java-vm-2 multilib prefix toolchain-funcs
|
||||
|
||||
dist="https://dev.gentoo.org/~chewi/distfiles"
|
||||
TARBALL_VERSION="${PV}"
|
||||
|
||||
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
|
||||
HOMEPAGE="http://icedtea.classpath.org"
|
||||
SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
|
||||
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
|
||||
|
||||
for arch in amd64 arm x86; do
|
||||
SRC_URI+="
|
||||
${arch}? (
|
||||
${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
|
||||
examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
|
||||
)"
|
||||
done
|
||||
|
||||
LICENSE="GPL-2-with-linking-exception"
|
||||
SLOT="8"
|
||||
KEYWORDS="-* ~amd64 ~arm ~ppc64 ~x86"
|
||||
|
||||
IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source +webstart"
|
||||
REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
|
||||
|
||||
RESTRICT="preserve-libs strip"
|
||||
QA_PREBUILT="opt/.*"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.42:2
|
||||
>=dev-libs/nss-3.16.1-r1
|
||||
>=dev-libs/nspr-4.10
|
||||
media-fonts/dejavu
|
||||
>=media-libs/fontconfig-2.11:1.0
|
||||
>=media-libs/freetype-2.5.5:2
|
||||
>=media-libs/lcms-2.6:2
|
||||
>=sys-devel/gcc-4.9.3
|
||||
>=sys-libs/glibc-2.21
|
||||
>=sys-libs/zlib-1.2.8-r1
|
||||
virtual/jpeg:62
|
||||
alsa? ( >=media-libs/alsa-lib-1.0 )
|
||||
!headless-awt? (
|
||||
>=media-libs/giflib-4.1.6-r1
|
||||
media-libs/libpng:0/16
|
||||
>=x11-libs/libX11-1.6
|
||||
>=x11-libs/libXext-1.3
|
||||
>=x11-libs/libXi-1.7
|
||||
>=x11-libs/libXrender-0.9.8
|
||||
>=x11-libs/libXtst-1.2
|
||||
)
|
||||
cjk? (
|
||||
media-fonts/arphicfonts
|
||||
media-fonts/baekmuk-fonts
|
||||
media-fonts/lklug
|
||||
media-fonts/lohit-fonts
|
||||
media-fonts/sazanami
|
||||
)
|
||||
cups? ( >=net-print/cups-2.0 )
|
||||
gtk? (
|
||||
>=dev-libs/atk-2.16.0
|
||||
>=x11-libs/cairo-1.14.2
|
||||
x11-libs/gdk-pixbuf:2
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
>=x11-libs/pango-1.36
|
||||
)
|
||||
selinux? ( sec-policy/selinux-java )"
|
||||
|
||||
PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
|
||||
nsplugin? ( >=dev-java/icedtea-web-1.6.1:0 )
|
||||
pulseaudio? ( dev-java/icedtea-sound )"
|
||||
|
||||
pkg_pretend() {
|
||||
if [[ "$(tc-is-softfloat)" != "no" ]]; then
|
||||
die "These binaries require a hardfloat system."
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if ! use alsa; then
|
||||
rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
|
||||
fi
|
||||
|
||||
if use headless-awt; then
|
||||
rm -vr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
|
||||
{,jre/}bin/policytool bin/appletviewer || die
|
||||
fi
|
||||
|
||||
if [[ -n "${EPREFIX}" ]]; then
|
||||
# The binaries are built on a non-prefixed system so the
|
||||
# fontconfig needs to have prefixes inserted.
|
||||
sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
|
||||
eprefixify jre/lib/fontconfig.Gentoo.properties
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/opt/${P}"
|
||||
local ddest="${ED}${dest#/}"
|
||||
dodir "${dest}"
|
||||
|
||||
# doins doesn't preserve executable bits.
|
||||
cp -pRP bin include jre lib man "${ddest}" || die
|
||||
|
||||
dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
|
||||
use doc && dodoc -r doc/html
|
||||
|
||||
if use examples; then
|
||||
cp -pRP demo sample "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use source; then
|
||||
cp src.zip "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use webstart || use nsplugin; then
|
||||
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
|
||||
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
|
||||
fi
|
||||
if use webstart; then
|
||||
dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
|
||||
dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
|
||||
fi
|
||||
|
||||
# Both icedtea itself and the icedtea ebuild set PAX markings but we
|
||||
# disable them for the icedtea-bin build because the line below will
|
||||
# respect end-user settings when icedtea-bin is actually installed.
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
set_java_env
|
||||
java-vm_revdep-mask "${dest}"
|
||||
java-vm_sandbox-predict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Set as default VM if none exists
|
||||
java-vm-2_pkg_postinst
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
--- openjdk/common/autoconf/generated-configure.sh.orig 2016-04-01 04:32:19.000000000 +0100
|
||||
+++ openjdk/common/autoconf/generated-configure.sh 2016-04-10 20:04:53.472885447 +0100
|
||||
@@ -35764,7 +35764,7 @@
|
||||
# precompiled headers.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
|
||||
$as_echo_n "checking if ccache supports precompiled headers... " >&6; }
|
||||
- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
|
||||
+ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.[456789]|[2-9])") 2> /dev/null`
|
||||
if test "x$HAS_GOOD_CCACHE" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
|
||||
$as_echo "no, disabling ccache" >&6; }
|
||||
@ -0,0 +1,383 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
|
||||
|
||||
EAPI="5"
|
||||
SLOT="8"
|
||||
|
||||
inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
|
||||
|
||||
ICEDTEA_VER=$(get_version_component_range 1-3)
|
||||
ICEDTEA_BRANCH=$(get_version_component_range 1-2)
|
||||
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
|
||||
ICEDTEA_PRE=$(get_version_component_range _)
|
||||
CORBA_TARBALL="37af47894175.tar.xz"
|
||||
JAXP_TARBALL="4ed5441e40e1.tar.xz"
|
||||
JAXWS_TARBALL="a81c04154cc5.tar.xz"
|
||||
JDK_TARBALL="3334efeacd83.tar.xz"
|
||||
LANGTOOLS_TARBALL="dd581e8047e6.tar.xz"
|
||||
OPENJDK_TARBALL="8ed8d26a3f9a.tar.xz"
|
||||
NASHORN_TARBALL="697c5f792bec.tar.xz"
|
||||
HOTSPOT_TARBALL="5e587a29a6aa.tar.xz"
|
||||
|
||||
CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
|
||||
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
|
||||
|
||||
CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
|
||||
JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
|
||||
JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
|
||||
JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
|
||||
LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
|
||||
OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
|
||||
NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
|
||||
HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
|
||||
|
||||
CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
|
||||
JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
|
||||
|
||||
DROP_URL="http://icedtea.classpath.org/download/drops"
|
||||
ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
|
||||
|
||||
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
|
||||
HOMEPAGE="http://icedtea.classpath.org"
|
||||
SRC_PKG="${ICEDTEA_PKG}.tar.xz"
|
||||
SRC_URI="
|
||||
http://icedtea.classpath.org/download/source/${SRC_PKG}
|
||||
${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
|
||||
${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
|
||||
${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
|
||||
${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
|
||||
${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
|
||||
${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
|
||||
${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
|
||||
${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
|
||||
${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
|
||||
${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
|
||||
|
||||
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
|
||||
KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
|
||||
|
||||
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
|
||||
jamvm +jbootstrap libressl nsplugin pax_kernel
|
||||
pulseaudio sctp selinux smartcard +source +sunec test +webstart zero"
|
||||
|
||||
REQUIRED_USE="gtk? ( !headless-awt )"
|
||||
|
||||
# Ideally the following were optional at build time.
|
||||
ALSA_COMMON_DEP="
|
||||
>=media-libs/alsa-lib-1.0"
|
||||
CUPS_COMMON_DEP="
|
||||
>=net-print/cups-1.2.12"
|
||||
X_COMMON_DEP="
|
||||
>=media-libs/giflib-4.1.6:=
|
||||
>=media-libs/libpng-1.2:0=
|
||||
>=x11-libs/libX11-1.1.3
|
||||
>=x11-libs/libXext-1.1.1
|
||||
>=x11-libs/libXi-1.1.3
|
||||
>=x11-libs/libXrender-0.9.4
|
||||
>=x11-libs/libXtst-1.0.3
|
||||
x11-libs/libXcomposite"
|
||||
X_DEPEND="
|
||||
>=x11-libs/libXau-1.0.3
|
||||
>=x11-libs/libXdmcp-1.0.2
|
||||
>=x11-libs/libXinerama-1.0.2
|
||||
x11-proto/inputproto
|
||||
>=x11-proto/xextproto-7.1.1
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xproto"
|
||||
|
||||
# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
|
||||
# Kerberos will be added following PR1537
|
||||
COMMON_DEP="
|
||||
>=dev-libs/glib-2.26:2
|
||||
>=dev-util/systemtap-1
|
||||
media-libs/fontconfig
|
||||
>=media-libs/freetype-2.5.3:2=
|
||||
>=media-libs/lcms-2.5
|
||||
>=sys-libs/zlib-1.2.3:=
|
||||
virtual/jpeg:0=
|
||||
sctp? ( net-misc/lksctp-tools )
|
||||
smartcard? ( sys-apps/pcsc-lite )
|
||||
sunec? ( >=dev-libs/nss-3.16.1-r1 )"
|
||||
|
||||
# Gtk+ will move to COMMON_DEP in time; PR1982
|
||||
# gsettings-desktop-schemas will be needed for native proxy support; PR1976
|
||||
RDEPEND="${COMMON_DEP}
|
||||
!dev-java/icedtea:0
|
||||
!dev-java/icedtea-web:7
|
||||
media-fonts/dejavu
|
||||
alsa? ( ${ALSA_COMMON_DEP} )
|
||||
cjk? (
|
||||
media-fonts/arphicfonts
|
||||
media-fonts/baekmuk-fonts
|
||||
media-fonts/lklug
|
||||
media-fonts/lohit-fonts
|
||||
media-fonts/sazanami
|
||||
)
|
||||
cups? ( ${CUPS_COMMON_DEP} )
|
||||
gtk? (
|
||||
>=dev-libs/atk-1.30.0
|
||||
>=x11-libs/cairo-1.8.8:=
|
||||
x11-libs/gdk-pixbuf:2
|
||||
>=x11-libs/gtk+-2.8:2=
|
||||
>=x11-libs/pango-1.24.5
|
||||
)
|
||||
!headless-awt? ( ${X_COMMON_DEP} )
|
||||
selinux? ( sec-policy/selinux-java )"
|
||||
|
||||
# ca-certificates, perl and openssl are used for the cacerts keystore generation
|
||||
# perl is needed for running the SystemTap tests
|
||||
# lsb-release is used to obtain distro information for the version & crash dump output
|
||||
# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
|
||||
# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
|
||||
# Ant is no longer needed under the new build system
|
||||
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
|
||||
|| (
|
||||
dev-java/icedtea-bin:8
|
||||
dev-java/icedtea-bin:7
|
||||
dev-java/icedtea:8
|
||||
dev-java/icedtea:7
|
||||
)
|
||||
app-arch/cpio
|
||||
app-arch/unzip
|
||||
app-arch/zip
|
||||
app-misc/ca-certificates
|
||||
dev-lang/perl
|
||||
!libressl? ( dev-libs/openssl )
|
||||
libressl? ( dev-libs/libressl )
|
||||
sys-apps/attr
|
||||
sys-apps/lsb-release
|
||||
x11-libs/libXt
|
||||
virtual/pkgconfig
|
||||
pax_kernel? ( sys-apps/elfix )"
|
||||
|
||||
PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
|
||||
nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
|
||||
pulseaudio? ( dev-java/icedtea-sound )"
|
||||
|
||||
S="${WORKDIR}"/${ICEDTEA_PKG}
|
||||
|
||||
icedtea_check_requirements() {
|
||||
local CHECKREQS_DISK_BUILD
|
||||
|
||||
if use doc; then
|
||||
CHECKREQS_DISK_BUILD="9000M"
|
||||
else
|
||||
CHECKREQS_DISK_BUILD="8500M"
|
||||
fi
|
||||
|
||||
check-reqs_pkg_${EBUILD_PHASE}
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
icedtea_check_requirements
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
icedtea_check_requirements
|
||||
|
||||
JAVA_PKG_WANT_BUILD_VM="
|
||||
icedtea-8 icedtea-bin-8
|
||||
icedtea-7 icedtea-bin-7"
|
||||
JAVA_PKG_WANT_SOURCE="1.5"
|
||||
JAVA_PKG_WANT_TARGET="1.5"
|
||||
|
||||
java-vm-2_pkg_setup
|
||||
java-pkg-2_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${SRC_PKG}
|
||||
}
|
||||
|
||||
java_prepare() {
|
||||
# For bootstrap builds as the sandbox control file might not yet exist.
|
||||
addpredict /proc/self/coredump_filter
|
||||
|
||||
# icedtea doesn't like some locales. #330433 #389717
|
||||
export LANG="C" LC_ALL="C"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
|
||||
local vm=$(java-pkg_get-current-vm)
|
||||
|
||||
# gcj-jdk ensures ecj is present.
|
||||
if use jbootstrap || has "${vm}" gcj-jdk; then
|
||||
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
|
||||
config+=" --enable-bootstrap"
|
||||
else
|
||||
config+=" --disable-bootstrap"
|
||||
fi
|
||||
|
||||
# Use Zero if requested
|
||||
if use zero; then
|
||||
use_zero="yes"
|
||||
fi
|
||||
|
||||
# Use JamVM if requested
|
||||
if use jamvm; then
|
||||
use_jamvm="yes"
|
||||
fi
|
||||
|
||||
# Use CACAO if requested
|
||||
if use cacao; then
|
||||
use_cacao="yes"
|
||||
fi
|
||||
|
||||
# Are we on a architecture with a HotSpot port?
|
||||
# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
|
||||
if { use amd64 || use arm64 || use ppc64 || use sparc || use x86; }; then
|
||||
hotspot_port="yes"
|
||||
fi
|
||||
|
||||
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
|
||||
# Otherwise use Zero for now until alternate VMs are working
|
||||
if test "x${hotspot_port}" != "xyes"; then
|
||||
use_zero="yes"
|
||||
fi
|
||||
|
||||
# Turn on JamVM if needed (non-HS archs) or requested
|
||||
if test "x${use_jamvm}" = "xyes"; then
|
||||
if test "x${hotspot_port}" = "xyes"; then
|
||||
ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
|
||||
ewarn 'If so, please rebuild with USE="-jamvm"'
|
||||
fi
|
||||
ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
|
||||
jamvm_config="--enable-jamvm"
|
||||
fi
|
||||
|
||||
# Turn on CACAO if needed (non-HS archs) or requested
|
||||
if test "x${use_cacao}" = "xyes"; then
|
||||
if test "x${hotspot_port}" = "xyes"; then
|
||||
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
|
||||
ewarn 'If so, please rebuild with USE="-cacao"'
|
||||
fi
|
||||
ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
|
||||
cacao_config="--enable-cacao"
|
||||
fi
|
||||
|
||||
# Turn on Zero if needed (non-HS/CACAO archs) or requested
|
||||
if test "x${use_zero}" = "xyes"; then
|
||||
if test "x${hotspot_port}" = "xyes"; then
|
||||
ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
|
||||
fi
|
||||
zero_config="--enable-zero"
|
||||
fi
|
||||
|
||||
# https://bugs.openjdk.java.net/browse/JDK-8067132
|
||||
export DISTRIBUTION_PATCHES="${SLOT}-ccache.patch"
|
||||
ln -snf "${FILESDIR}"/${SLOT}-ccache.patch . || die
|
||||
|
||||
# IcedTea itself doesn't handle ccache yet.
|
||||
if has ccache ${FEATURES}; then
|
||||
ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
|
||||
export enable_ccache=yes
|
||||
else
|
||||
export enable_ccache=no
|
||||
fi
|
||||
|
||||
config+=" --with-parallel-jobs=$(makeopts_jobs)"
|
||||
|
||||
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
|
||||
|
||||
econf ${config} \
|
||||
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
|
||||
--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
|
||||
--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
|
||||
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
|
||||
--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
|
||||
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
|
||||
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
|
||||
--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
|
||||
--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
|
||||
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
|
||||
--with-jdk-home="$(java-config -O)" \
|
||||
--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
|
||||
--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
|
||||
--with-pkgversion="Gentoo ${PF}" \
|
||||
--disable-downloading --disable-Werror --disable-tests \
|
||||
--enable-system-lcms --enable-system-jpeg \
|
||||
--enable-system-zlib --disable-systemtap-tests \
|
||||
$(use_enable !headless-awt system-gif) \
|
||||
$(use_enable !headless-awt system-png) \
|
||||
$(use_enable !debug optimizations) \
|
||||
$(use_enable doc docs) \
|
||||
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
|
||||
$(use_enable sunec) \
|
||||
${zero_config} ${cacao_config} ${jamvm_config}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# OpenJDK is quite picky about ccache and dies if you attempt to use
|
||||
# it via wrapper symlinks like Gentoo normally does.
|
||||
PATH=$(sed 's#[^:]*/ccache/bin:##g' <<< "${PATH}") emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Use Xvfb for tests
|
||||
unset DISPLAY
|
||||
|
||||
Xemake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
|
||||
local ddest="${ED}${dest#/}"
|
||||
|
||||
if ! use alsa; then
|
||||
rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
|
||||
fi
|
||||
|
||||
# Ensures Headless-AwtGraphicsEnvironment is used.
|
||||
# Hack; we should get IcedTea to support passing --disable-headful
|
||||
if use headless-awt; then
|
||||
rm -vr "${ddest}"/jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
|
||||
"${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die
|
||||
fi
|
||||
|
||||
if ! use examples; then
|
||||
rm -r "${ddest}"/demo "${ddest}"/sample || die
|
||||
fi
|
||||
|
||||
if ! use source; then
|
||||
rm -v "${ddest}"/src.zip || die
|
||||
fi
|
||||
|
||||
# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
|
||||
if use webstart || use nsplugin; then
|
||||
dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
|
||||
dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
|
||||
fi
|
||||
if use webstart; then
|
||||
dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
|
||||
dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
|
||||
fi
|
||||
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
|
||||
|
||||
# Fix the permissions.
|
||||
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
|
||||
|
||||
# We need to generate keystore - bug #273306
|
||||
einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
|
||||
mkdir "${T}/certgen" && cd "${T}/certgen" || die
|
||||
cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
|
||||
for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
|
||||
openssl x509 -text -in "${c}" >> all.crt || die
|
||||
done
|
||||
./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
|
||||
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
|
||||
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
|
||||
|
||||
set_java_env "${FILESDIR}/icedtea.env"
|
||||
java-vm_sandbox-predict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
pkg_preinst() { gnome2_icon_savelist; }
|
||||
pkg_postinst() { gnome2_icon_cache_update; }
|
||||
pkg_postrm() { gnome2_icon_cache_update; }
|
||||
@ -1 +0,0 @@
|
||||
DIST go1.4.3.src.tar.gz 10875170 SHA256 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 SHA512 12bade4bce9aa4b34e2b9495ae65a1fc6a2449b3a43bc4de85c8b87ba223c2f999b2f37c1e2fe1188d8521118b5e5357d27afb8b85c0b8ebb4503d4125d25273 WHIRLPOOL 1a869385e63343bc54a950ca965a4d11ca072e6551d1189ef4e2e4da2a488a1ef70b59296d65af0c061f63606b78f73399f25040e02132e56a00189f1aae20e3
|
||||
@ -1,85 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
export CTARGET=${CTARGET:-${CHOST}}
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
|
||||
# Upstream only supports go on amd64, arm and x86 architectures.
|
||||
KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
|
||||
|
||||
DESCRIPTION="Version of go compiler used for bootstrapping"
|
||||
HOMEPAGE="http://www.golang.org"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
# The go tools should not cause the multilib-strict check to fail.
|
||||
QA_MULTILIB_PATHS="usr/lib/go1.4/pkg/tool/.*/.*"
|
||||
|
||||
# The go language uses *.a files which are _NOT_ libraries and should not be
|
||||
# stripped. The test data objects should also be left alone and unstripped.
|
||||
STRIP_MASK="/usr/lib/go1.4/pkg/*.a
|
||||
/usr/lib/go1.4/src/debug/elf/testdata/*
|
||||
/usr/lib/go1.4/src/debug/dwarf/testdata/*
|
||||
/usr/lib/go1.4/src/runtime/race/*.syso"
|
||||
|
||||
S="${WORKDIR}"/go
|
||||
|
||||
src_prepare()
|
||||
{
|
||||
sed -i -e 's/"-Werror",//g' src/cmd/dist/build.c
|
||||
}
|
||||
|
||||
src_compile()
|
||||
{
|
||||
export GOROOT_FINAL="${EPREFIX}"/usr/lib/go1.4
|
||||
export GOROOT="$(pwd)"
|
||||
export GOBIN="${GOROOT}/bin"
|
||||
if [[ $CTARGET = armv5* ]]
|
||||
then
|
||||
export GOARM=5
|
||||
fi
|
||||
tc-export CC
|
||||
|
||||
cd src
|
||||
./make.bash || die "build failed"
|
||||
}
|
||||
|
||||
src_test()
|
||||
{
|
||||
cd src
|
||||
PATH="${GOBIN}:${PATH}" \
|
||||
./run.bash --no-rebuild --banner || die "tests failed"
|
||||
}
|
||||
|
||||
src_install()
|
||||
{
|
||||
dodir /usr/lib/go1.4
|
||||
exeinto /usr/lib/go1.4/bin
|
||||
doexe bin/*
|
||||
insinto /usr/lib/go1.4
|
||||
doins -r lib pkg src
|
||||
fperms -R +x /usr/lib/go1.4/pkg/tool
|
||||
}
|
||||
|
||||
pkg_postinst()
|
||||
{
|
||||
# If the go tool sees a package file timestamped older than a dependancy it
|
||||
# will rebuild that file. So, in order to stop go from rebuilding lots of
|
||||
# packages for every build we need to fix the timestamps. The compiler and
|
||||
# linker are also checked - so we need to fix them too.
|
||||
ebegin "fixing timestamps to avoid unnecessary rebuilds"
|
||||
tref="usr/lib/go1.4/pkg/*/runtime.a"
|
||||
find "${EROOT}"usr/lib/go1.4 -type f \
|
||||
-exec touch -r "${EROOT}"${tref} {} \;
|
||||
eend $?
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>williamh@gentoo.org</email>
|
||||
<name>William Hubbs</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
This package is only necessary until gccgo supports go-1.4. It
|
||||
will be removed as soon as stable gcc supports this.
|
||||
It is here so that >=dev-lang/go 1.5 can use it to bootstrap.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -1,2 +1,3 @@
|
||||
DIST pocl-0.11.tar.gz 1561743 SHA256 24bb801fb87d104b66faaa95d1890776fdeabb37ad1b12fb977281737c7f29bb SHA512 052cbac36a12a5b015779740c45b64adde5fa58a090f298b69de1df3ac9875d7bfc6dfe9f7ae95d14d974d7b44dc64e53ce6ad3a9b8e74708d546ef6e1032151 WHIRLPOOL 860a87904408eb7394e126bf5c8cab619d8f1d48a57440e9d73f585c5eaa1a70e53c5843f4ffbaa742447cd0e8ebf9c11fc0917357f6af203ecb1c3c48c0fa87
|
||||
DIST pocl-0.12.tar.gz 1741325 SHA256 5160d7a59721e6a7d0fc85868381c0afceaa7c07b9956c9be1e3b51e80c29f76 SHA512 3c0d3377a866e8bc7e3e911598b8b50ce473e545586c8755ec22f5bf0e5cf55fdebb0eb3fa521521a7ea2919b1c985d04531fcdad18997250c02de852b80e9ee WHIRLPOOL c7ab4bde1d7a0baef8bf00ea6bd8dff5c4e4c893da918c8ed7fb84f7247d9ea6c5adb78fb560132e564a4a49cba3286790abce70723bfdcf603727e5c62ff972
|
||||
DIST pocl-0.13.tar.gz 1901208 SHA256 a17f37d8f26819c0c8efc6de2b57f67a0c8a81514fc9cd5005434e49d67499f9 SHA512 1892a6167bb5d48acaa79de4a9a76355c624e01a3bec31599947d6972eddcfd0b7523d61a3bd08018a30e34ab5a1b225a7ca2feaa2c2f6fcf03403fb887a6c0d WHIRLPOOL 5e56bff8471750a143dc735b435f8cbc111d624f732c541843e3b230f2675a089c6db4a62cfa3a0cd478abb56ba98c7a512c10f5e8f79f84e8e582248b5edfc5
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="PortableCL: opensource implementation of the OpenCL standard"
|
||||
HOMEPAGE="http://portablecl.org/"
|
||||
SRC_URI="http://portablecl.org/downloads/${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="MIT"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/ocl-icd
|
||||
>=sys-devel/llvm-3.7[clang]
|
||||
sys-apps/hwloc
|
||||
>=app-eselect/eselect-opencl-1.1.0-r4"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_pretend() {
|
||||
# Needs an OpenCL 1.2 ICD, mesa and nvidia are invalid
|
||||
# Maybe ati works, feel free to add/fix if you can test
|
||||
if [[ $(eselect opencl show) == 'ocl-icd' ]]; then
|
||||
einfo "Valid OpenCL ICD set"
|
||||
else
|
||||
eerror "Please use a supported ICD:"
|
||||
eerror "eselect opencl set ocl-icd"
|
||||
die "OpenCL ICD not set to a supported value"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
eautoreconf
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST libtasn1-4.5.tar.gz 1850279 SHA256 89b3b5dce119273431544ecb305081f3530911001bb12e5d76588907edb71bda SHA512 9319c7109b006f6f1f52c5cc0ff4b076db0037fb977535e04980dc3a9b3195ef20a451f04771d0eff1d1a104557cc14ccd5147f82e4229230d6539046e7f5108 WHIRLPOOL 9a3673f576f0ff44889c00f4c24e3f2d9b27f0be1d53058b292ed56f89b2b4efbd0ac0f9721daa0ed1116b541146e86b8f42d9e8857bdc9d0ba8bacb5415a9dd
|
||||
DIST libtasn1-4.7.tar.gz 1851611 SHA256 a40780dc93fc6d819170240e8ece25352058a85fd1d2347ce0f143667d8f11c9 SHA512 9e93264bfad250d88c528550db4731d07c5c1b2ec319b892e9b536dc3d46b2a4166241ebf3470127c4f662067b7dabaa407ce1f16bdf05ee31495881eefe5572 WHIRLPOOL e4acb580a80f1cecc1aafffe633568503e7d4596d4ebe851a74f7d00b8c6a391215d793afa8fd84f923b48ca391cf61df585a8336186e0e4cc092e384aad2620
|
||||
DIST libtasn1-4.8.tar.gz 1859924 SHA256 fa802fc94d79baa00e7397cedf29eb6827d4bd8b4dd77b577373577c93a8c513 SHA512 22a0d1b2fc57efd18aa23ea720f915ec0c31bd2f60653181b0537d3d7c3c3262cef3a76e3be03fdb7d7cd5a6b4156a1033b156e56717bfa37a32f176692319f3 WHIRLPOOL 630d03af08bec84da952a8a3cd8be2402e46d34f19bf05373f0791c6a4a500a2ff168e2aca2704ea28591b64bfdc5e56fa87ab807949201da46522a0b6b2bff3
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit multilib-minimal
|
||||
|
||||
DESCRIPTION="ASN.1 library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libtasn1/"
|
||||
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3 LGPL-2.1"
|
||||
SLOT="0/6" # subslot = libtasn1 soname version
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="doc static-libs"
|
||||
|
||||
DEPEND=">=dev-lang/perl-5.6
|
||||
sys-apps/help2man
|
||||
virtual/yacc"
|
||||
RDEPEND="
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20131008-r16
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
)"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README THANKS )
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs
|
||||
[[ "${VALGRIND_TESTS}" == "0" ]] && myeconfargs+=( --disable-valgrind-tests )
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
if use doc ; then
|
||||
dodoc doc/libtasn1.pdf
|
||||
dohtml doc/reference/html/*
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST qtkeychain-0.5.0.tar.gz 18422 SHA256 e62d7ae9c8ae04784d8a5d0f213aaa22f1c02427e800ce88739e997f499bb514 SHA512 abc9d27b318a984c95b55f821f8bba7d8f34e6316958cf41b44aa4451371e5f629f17b9a0d1356cd6455f19979d562157a260f835c8f037037b0ac7bf64b94e5 WHIRLPOOL b3c99c863390b8c9e807a17783ca95640a468d57eec35e197412a46031aae06433e06c3274973e7876192a654e09cba6bd92512baf8a3500052a3de9d1a50496
|
||||
DIST qtkeychain-0.6.2.tar.gz 18859 SHA256 ae13459234feeeab3a154457319d9b26ee9600973443517c77e055838ebae63c SHA512 be668c9730b331071cefff0b6d640e7130bd6b029e56aa4b1fa709d118d4db18146869cdd013df2f5348da32ec1101646f2df0bfa8f0790ec9542f9063f0b195 WHIRLPOOL beed71a48c18848a01e1fe57a7ed2d641e17907a792fdce15f3e6dc4c40218376c5ed04d608c2950c1fb7a60f7d9e0e9ee30e72d400e7e7031fa33cc35872126
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils multibuild
|
||||
|
||||
DESCRIPTION="Qt API for storing passwords securely"
|
||||
HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
|
||||
SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+qt4 qt5"
|
||||
|
||||
REQUIRED_USE="|| ( qt4 qt5 )"
|
||||
|
||||
RDEPEND="
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtdbus:5
|
||||
)
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtdbus:4
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
qt5? ( dev-qt/linguist-tools:5 )
|
||||
"
|
||||
|
||||
DOCS=( ChangeLog ReadMe.txt )
|
||||
|
||||
pkg_setup() {
|
||||
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
myconfigure() {
|
||||
if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
|
||||
local mycmakeargs=(-DBUILD_WITH_QT4=ON)
|
||||
fi
|
||||
if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
|
||||
local mycmakeargs=(-DBUILD_WITH_QT4=OFF)
|
||||
fi
|
||||
|
||||
mycmakeargs+=(
|
||||
-DQTKEYCHAIN_STATIC=OFF
|
||||
-DBUILD_TRANSLATIONS=ON
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
multibuild_foreach_variant myconfigure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
multibuild_foreach_variant cmake-utils_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
multibuild_foreach_variant cmake-utils_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
multibuild_foreach_variant cmake-utils_src_install
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=XAOC
|
||||
MODULE_VERSION=1.224
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Layout and render international text"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
>=dev-perl/glib-perl-1.220.0
|
||||
>=dev-perl/Cairo-1.0.0
|
||||
>=x11-libs/pango-1.0.0
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=dev-perl/ExtUtils-Depends-0.300.0
|
||||
>=dev-perl/extutils-pkgconfig-1.30.0
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
perl-module_src_prepare
|
||||
sed -i -e "s:exit 0:exit 1:g" "${S}"/Makefile.PL || die "sed failed"
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST botocore-1.3.22.tar.gz 2349601 SHA256 02a6d320b09179bc5dcbafd4be732d9431bfebf5bed6d6b6508eca96b599a399 SHA512 7b349a78c83051a29993ce00a11ecfa4734425c3ed27ce3e405140e19017b5c670d857ea489ea1f6f3ec767b3e4704547565b2ec67f5d7001a0cc30ff2a39de7 WHIRLPOOL 98c5e7488c6d1fe5c3e3484c770f8b346508359c5d174e5660f10ea62b054f442e3d15cc716ddd5acc42f1af0a10463c1923de138338175f1dcba9ced283c8ee
|
||||
DIST botocore-1.4.5.tar.gz 2415867 SHA256 d83d6623d9eba2d2e2474c35b6180809d3f4c36321006a49a8d1dd6f652a93c3 SHA512 275d9a44128137e387955a374af53227262c3faa6327bd93f58c7884666a05b44b90a9e8a06bdcfacd656a30a3694d337a09fc22ea623d7519a6f15ff047f705 WHIRLPOOL 3ad0898b872bd0f99293e36bffffe3e514da608c480eb068d9e098fa76ff68897088865249d143b82df021c71b00a63305bf017703cedd52a2665864487d6c2d
|
||||
DIST botocore-1.4.7.tar.gz 2422444 SHA256 0c39162434ef65f16eb0ee1e1ef1e809cc2927b0ed89f437e1609834868aa469 SHA512 7c280064fdfcc74a29cd39bc48279453893350430c65a355a247d1fac6bf8fd36a377144ac0232e081f4a14120348a61d57cd1dc7cd114658fd4742d4ecedfae WHIRLPOOL 1a0753e37047958208655476684ade71d280bad9f473c04c714cd78f08f0fca0e3e8a3599fb59c0c2d6d58c22a4690799e3548789010590856fc31d5d45c15e7
|
||||
DIST botocore-1.4.8.tar.gz 2445498 SHA256 47bcd9bdcde8661f79a031da68f21bd86cc5ecf07cec5cd1de0af114911d1806 SHA512 80d87b70eb2d70ace91e95746cb9e15f4435e12d141769764a7f82fbb03a1ce2c85266cee93499ee26f343bfcc700dfde7e6e5ec3af9b8ab0a99a8cb9997d61c WHIRLPOOL 7b39ad4e451fcd4ed2b58da709474983be9305c4e4b15ca42ea1c46aa5f4874edc7472cb5b6935dec6d356b3e693658168940f82645ff95396264eec72e904ac
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a276c123198fdafc3659280b38 SHA512 bf00b19e0ab56e5c0e8459234d09722ca504ecd933bfba61cb4ab4805410f53f6ad6083f2e964ef5a6eded2ea05aa01a89c27621064386bae145c7258ed996ad WHIRLPOOL bd7ff4579f924e02d18581b1aca00790dcb84afda03e4cde70b349bfdb4ad43aa2e06da2bcbe780f6074d98f9af9b14fb9d2ab4da9265e56b73288902c9ede7a
|
||||
DIST docker-py-1.7.0.tar.gz 95003 SHA256 13193dff1e29e0f3bfa8a51751a08eac8d56b3b7d14c4c2c9b7a56647303166b SHA512 98296c2bcc567caae6178599470999ee97b6e9648096a09790912e92191b88b2affaec5fb8dbe3b9070015ddb198fe8b9c3210d1a450ce91e620793d19da7b0c WHIRLPOOL 483f85e598d601346e933645819c78639adff1f1c2d0d65e7f22c71412d85442c74e1690b8457a372b4ab2dc0d1c56e4a30b44edc67bb150a16f2bb95aae1462
|
||||
DIST docker-py-1.7.2.tar.gz 96062 SHA256 695c6e5dba8fbc191e3eb15889ba5353a2d44b0d52467656ced4e092c439be90 SHA512 1fa5e40b07044145fcdb5b1231b4c852f8df4d2f0feaecc386eb82efd71e598afd982104de475fce6eb6b68a6a8fb320451466bcc39ae96c43cf8c5403c0588f WHIRLPOOL ae0246ec188218d1b5b9e6337c484eafc59b2ce36dc5be61b6e54d281d84c02c00fd6c62527fb1dfa2fd646b778efcee014261211687548a229724e18dadc40b
|
||||
DIST docker-py-1.8.0_rc2.tar.gz 100120 SHA256 5176c543343a582f2f7a461560a7c759d002b2dceb7552f542d7d1e0fce3cb05 SHA512 f7924015bc267acb095a9f21d151afd56d787a5d26dcc8c285d81c4e5af8a1027c7f166b8178e3e821a3b2fe541b51121c825ab59591b97bea8eb8a3fe3d7a0f WHIRLPOOL 451fea912c3cdd6bcaf7e29431719c39d7fea9bb03b7b94fbecf493bc28713d97e1438ee6ce8c0fb6977739061c25a87b29e5924e087e8613fe1f115b8000809
|
||||
DIST docker-py-1.8.0_rc5.tar.gz 102470 SHA256 0cf741f17233c8aa494c61b053d032d8d296fbc3f11586b1e5efad31fdb46de1 SHA512 1490b913fdac35e226d72f8e926405fde50a249189ccdfe35ae7e5f805fbcb5dee9722666b7d7b3fd23481508f9bfead9a1e231abe49a997c2db370568e8b40f WHIRLPOOL 2a48da6d79a8df59b0cd94a69844bc3d5a048285232faf6f2e118a52bb1bfddaa74b69334fcdb204b7d0be862dfe07ef63c3fb61a4b4fa8e18aba5c8c3be1910
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST radon-1.2.1.tar.gz 1633366 SHA256 bacc94a4a5c1a3e9410944e8e4e0f0aaf7dcf066c9b35bd92ac8eba5d47429fa SHA512 5676695344b7cf574abd9079ee3856debdf3ac4bda4a1c52e00406e2bbb71ad74f320f43638887e30db073fd623070a97fc44c031eec13588e953b33b549e2bf WHIRLPOOL 2ab535d0fe0b56b538dbe389b68e522468611f25c797c69343f4da700ae6129dc725051998238f0f136c45382f29887cdccc899aeaab000796f22a9962d40505
|
||||
DIST radon-1.2.2.tar.gz 3468244 SHA256 3cab798af062632ad275092c537e409f8948c19034e98d3ab243ce455b4eee9d SHA512 2bd424ca81fd55d1bf444e7b2a228bd11ee23a7f77cad488fa45e8ce888282373f1729f7f00ca2f19838e10bbc1dabb1602f5bbac396702b52309a60671ef0a7 WHIRLPOOL 46e549bd9d29cd7d54a4e9746ea67f541919fdb90769f1cb3b70b51420b85bacac024b6bc0c16f25f4257652f76d750892bf2eefb146ea0ae76ef7718de11781
|
||||
DIST radon-1.3.1.tar.gz 3472429 SHA256 292afbb0e4e489d0b52ea6ce6e34008f2c62e359969d9ef5967ffbd18ae210ba SHA512 21088696f29479ae188064ee3864ae8fdee3687b322f2b60ea8deeafca93e582b37b739e2251da6cd47c18a67fbb527acb6293233652dc8993224ba7cc471d8c WHIRLPOOL 32806fd18bfd5f26148cc78f412179c4f5395d4af1548a61851b957d89eddaef466fff220231fbb17c3f41e0be15cb4a3d9196af67811edadf2b0b67e0f28ee6
|
||||
DIST radon-1.3.2.tar.gz 3454351 SHA256 2f8f70f9d445ddf9327c750a36ecd0231ced8bc80271333a980368ec282ab69d SHA512 60857e82742c2d1ecb2ddf9a1ffdd23066ca5ad4939ee7afe07b0309385000fb7ba8d69ae58b00174f0ec2f758ed40ccf0677e56e2904fa6d5220a4bb6d31e21 WHIRLPOOL 4aba7ab2a831ed693349f42b9371c1af9f3192e7f93f6e660d19d1d9b9fd0f5c4d91ef54be53a1d333d4b65a0d91586de10050117162ac090d18477e7dd8a8c7
|
||||
|
||||
@ -0,0 +1 @@
|
||||
DIST typing-3.5.0.1.tar.gz 44955 SHA256 b247d3ffe4228bebf319cc6670535eca472ad65a96d681c41cd67b90a686d942 SHA512 abd638f243b40bcb002fa94cfe64df29a454a3874edc629ab43e79b10149a18a29d8200ce0574bf1e920461e58f4736905f04d231c3cf045bb6a91ad12d4c53e WHIRLPOOL 8d7f3fc04d3aec17a492f3c405fa6edd55be8431c266a8a3de5a31d61711835a0eaf11b3cbda9089165d69476e948d810bb233acac199ea9350579c315b96037
|
||||
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>alunduil@gentoo.org</email>
|
||||
<name>Alex Brandt</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Type Hints for Python"
|
||||
HOMEPAGE="https://docs.python.org/3.5/library/typing.html"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="PSF-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
python_test() {
|
||||
"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST wrapt-1.10.5.tar.gz 119157 SHA256 4fd82193b23f60e1a39f3e10c81143c1e29e26cd5fc9afe1a7dc0f5e4b4a67d7 SHA512 450b32eea67774081d23c0e020ed7eea3c8ac458925a16cd606a4f95ee5b7631bda5ff00ceb914e9ccc28a5e0a7302534b6711bb23d637c77327a8a9d228cb55 WHIRLPOOL 7cfa9477f525e60f16a7b1689ba43b327192837bea34e96977442b9cd143a63fafdfa7d0b3895c93052b0e6f426e76fa439b155ee4e481dd5e922c529676691c
|
||||
DIST wrapt-1.10.6-r1.tar.gz 120259 SHA256 b540e23753d3f7017ec0d38f16daf77f9e9cf170d5040abc3d87573ba20fc4f3 SHA512 658c780971dddf444070b9d30a8ac7c08ee0088b8f4378bcc9c22126608e52b338dc00969b08828b0318070abcf0e875bc2b7c6228a71fbbca362033088b4314 WHIRLPOOL 7aed77677a1448d6b3795be7fb56989be98a691a7470096adf45002ca124a99b5cab3e42b319493b4c8300684e488a07cf96d1c5a01e9fc9f181f765a0542254
|
||||
DIST wrapt-1.10.6.tar.gz 25134 SHA256 9576869bb74a43cbb36ee39dc3584e6830b8e5c788e83edf0a397eba807734ab SHA512 d0c326fd401bc84656d69ec5da446b459f5596873a1ec01d616bebcc3d11237949eaafcfdf5de78e43f59927a0eaeee3da3f462975fa46fa22fd6c1593509e04 WHIRLPOOL 2d3c56d0a6e9e9af0a59708ce70190097da2459d80bdaa8d8f884a849905b44cdfb6bedb412ccd1e74be1e975492309a398e05d4b6c61a6852d3cd125230846a
|
||||
DIST wrapt-1.10.7.tar.gz 120316 SHA256 50ad31f01761410b192ce054aebcb61c54dbd493446440214356635874ecafca SHA512 ca694963860e22d6fe05fdd679f25c7d2fb01a3a635f9744dd2034c7468563f299442a3a60f4385e049b15f04bc86c7c0a6d0501bf274a87cdcd786fd46efeee WHIRLPOOL 659226504f1711749dae0228a9de07bebd04d2c4dd4b8696095eb7e76c6e1a7e991ea5a08188d93abe14c8a7e9b69b0d4ea04945fcf8349dd1f397870e39cab1
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 pypy )
|
||||
|
||||
inherit distutils-r1 vcs-snapshot
|
||||
|
||||
DESCRIPTION="Module for decorators, wrappers and monkey patching"
|
||||
HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
|
||||
SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
DEPEND="
|
||||
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
|
||||
doc? (
|
||||
dev-python/sphinx[${PYTHON_USEDEP}]
|
||||
dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
RDEPEND=""
|
||||
|
||||
python_compile_all() {
|
||||
use doc && emake -C docs html
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
local WRAPT_EXTENSIONS=true
|
||||
|
||||
distutils-r1_python_compile
|
||||
}
|
||||
|
||||
python_test() {
|
||||
py.test -vv || die "tests failed under ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( docs/_build/html/. )
|
||||
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST="spec"
|
||||
RUBY_FAKEGEM_EXTRADOC="README.txt"
|
||||
|
||||
inherit multilib ruby-fakegem
|
||||
|
||||
DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
|
||||
HOMEPAGE="https://toland.github.com/patron/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
#ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
|
||||
|
||||
DEPEND+=" net-misc/curl"
|
||||
RDEPEND+=" net-misc/curl"
|
||||
|
||||
# Tests require a live web service that is not included in the distribution.
|
||||
RESTRICT="test"
|
||||
|
||||
each_ruby_configure() {
|
||||
${RUBY} -Cext/patron extconf.rb || die
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
emake -Cext/patron V=1
|
||||
cp ext/patron/session_ext$(get_modname) lib/patron/ || die "Unable to cp shared object file"
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
|
||||
RUBY_FAKEGEM_EXTRADOC="README.md"
|
||||
|
||||
inherit multilib ruby-fakegem
|
||||
|
||||
DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
|
||||
HOMEPAGE="https://toland.github.com/patron/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND+=" net-misc/curl"
|
||||
RDEPEND+=" net-misc/curl"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# Fix Rakefile
|
||||
sed -i -e 's:rake/rdoctask:rdoc/task:' \
|
||||
-e 's/README.txt/README.md/' \
|
||||
-e '/bundler/I s:^:#:' \
|
||||
-e '/extensiontask/ s:^:#:' \
|
||||
-e '/ExtensionTask/,/^end/ s:^:#:' \
|
||||
Rakefile || die
|
||||
|
||||
# Avoid specs with failures. We were not running any specs before.
|
||||
rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || die
|
||||
}
|
||||
|
||||
each_ruby_configure() {
|
||||
${RUBY} -Cext/patron extconf.rb || die
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
emake -Cext/patron V=1
|
||||
cp ext/patron/session_ext$(get_modname) lib/patron/ || die "Unable to cp shared object file"
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST bcc-0.1.8.tar.gz 694032 SHA256 7535d0dec063454a858337dd07211ad2a207f8fa5665a3fad166f38415e50d70 SHA512 d5a0ba306043f8601c7e358546a57e518f2843228dbeca71d483385b00505af46c89eb92437955e9c325d9b326314101b344e8ca4930bca4161614ca1c893301 WHIRLPOOL 198bdcd72b1a701f8a73fa3ede9385dff2cc0869859962841187692838e002cb78a753f128084d67450d5aeb01034b873268188cecf4af188a5db7a67e676b50
|
||||
@ -0,0 +1,50 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5} )
|
||||
|
||||
inherit cmake-utils linux-info python-single-r1 python-utils-r1
|
||||
|
||||
DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
|
||||
HOMEPAGE="https://iovisor.github.io/bcc/"
|
||||
EGIT_COMMIT="v${PV}"
|
||||
SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
RESTRICT="test"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND=">=sys-devel/llvm-3.7:=[clang]
|
||||
${PYTHON_DEPS}"
|
||||
DEPEND="${RDEPEND}"
|
||||
S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
|
||||
~BPF_JIT ~HAVE_BPF_JIT ~BPF_EVENTS"
|
||||
|
||||
check_extra_config
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DREVISION=${PV%%_*}
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
python_fix_shebang "${ED}"
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST weka-3-6-12.zip 24335916 SHA256 504f8ccc0915cd6664eb6aff74bcf5b3796dbdd55917e0b37c3d976cc38eb069 SHA512 4301e1c2a751e26ff8d860e24e54e71511276f8cb90020c935595aaaab547f8614381ca8087b83a670d13ef0ff3fa13084f4984b9249e16042703ef9f43c0bd1 WHIRLPOOL 0c09e8c476f69ae0b13ebdd03ca220ffebd0aa0369597fc3424d7e71be81acb817e46a725d42d56d9679e032e414d9533eb79f03393f2b93b740cb44ed86b91a
|
||||
DIST weka-3-6-6.zip 22444607 SHA256 a548bea251b7e774427158cfbd52f2d22706cebde1bde703748f3c7df4519e1c SHA512 e06e4a2b213fb161255d3c5ab3dfa4e176ddfc40ff8261608957d2fcd101eddde2cec789bf15f99d2c75156a4b5c42e28a1702d27ac8c09967a54f8321781f6e WHIRLPOOL 412759cdd2c8ef24c39171926f299c658057f72ebba32b492812d1f63a10c15430f559997a991b57aa411d3f752ef949bc7761116640931ca0b707a007a3266e
|
||||
DIST weka-3-7-13.zip 42159458 SHA256 8d856d52be9964da580e7d396deecb03b83016f5b218c3159a40d2d4df38ecb5 SHA512 aa15b857d3b3b35720468206e42a157cc8c63d6bf3f4fdda93845da7e4e4ffca0201b2b92056486a2245681f7e0052dc75959194be954d84b391e812bd49ce5e WHIRLPOOL 2fb4f56de6321d6edd96752c57a5a90eabbabd0e7be6c2ec3e2c2517dc92df6a74d9c27b50524c537035f8c313a09db71fc9ba0a0c8f19352c15138d7f88047e
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
--- a/build.xml 2016-04-11 16:45:18.592385569 +0200
|
||||
+++ b/build.xml 2016-04-11 16:48:01.756389582 +0200
|
||||
@@ -603,13 +603,6 @@
|
||||
<include name="**/*.default"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
- <rmic base="${build}/classes"
|
||||
- classname="weka.experiment.RemoteEngine"/>
|
||||
- <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
|
||||
- <patternset>
|
||||
- <include name="java_cup/runtime/**/*"/>
|
||||
- </patternset>
|
||||
- </unzip>
|
||||
<unzip src="${lib}/packageManager.jar" dest="${build}/classes">
|
||||
<patternset>
|
||||
<include name="org/**/*"/>
|
||||
@ -0,0 +1,66 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="6"
|
||||
|
||||
JAVA_PKG_IUSE="source"
|
||||
|
||||
inherit java-pkg-2 java-ant-2 versionator
|
||||
|
||||
MY_P="${PN}-$(replace_all_version_separators '-')"
|
||||
DESCRIPTION="A Java data mining package"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
|
||||
HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
DEPEND=">=virtual/jdk-1.6
|
||||
app-arch/unzip
|
||||
>=dev-java/javacup-0.11a_beta20060608:0"
|
||||
RDEPEND=">=virtual/jre-1.6
|
||||
>=dev-java/javacup-0.11a_beta20060608:0"
|
||||
IUSE=""
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=("${FILESDIR}"/${P}-build.xml.patch)
|
||||
|
||||
EANT_BUILD_TARGET="exejar"
|
||||
EANT_DOC_TARGET="docs"
|
||||
JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
|
||||
|
||||
weka_get_max_memory() {
|
||||
if use amd64; then
|
||||
echo 512m
|
||||
else
|
||||
echo 256m
|
||||
fi
|
||||
}
|
||||
|
||||
java_prepare() {
|
||||
unzip -qq "${PN}-src.jar" -d . || die "Failed to unpack the source"
|
||||
rm -v weka.jar || die
|
||||
rm -rf doc || die
|
||||
java-pkg_jar-from --into lib javacup
|
||||
|
||||
sed -i -e "s/256m/$(weka_get_max_memory)/g" build.xml || die
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar dist/${PN}.jar
|
||||
java-pkg_dolauncher weka --main "${PN}.gui.GUIChooser"
|
||||
|
||||
# Really need a virtual to list all available drivers and pull the ones
|
||||
# instaled
|
||||
java-pkg_register-optional-dependency hsqldb,jdbc-mysql,mckoi-1
|
||||
|
||||
use source && java-pkg_dosrc src/main/java/weka/
|
||||
|
||||
dodoc README || die
|
||||
|
||||
dodir /usr/share/${PN}/data/
|
||||
insinto /usr/share/${PN}/data/
|
||||
doins data/*
|
||||
}
|
||||
@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
KDE_HANDBOOK="forceoptional"
|
||||
inherit kde5
|
||||
|
||||
DESCRIPTION="Small utility which bothers you at certain intervals"
|
||||
HOMEPAGE="https://userbase.kde.org/RSIBreak"
|
||||
if [[ ${KDE_BUILD_TYPE} != live ]]; then
|
||||
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
COMMON_DEPEND="
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kdbusaddons)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kiconthemes)
|
||||
$(add_frameworks_dep kidletime)
|
||||
$(add_frameworks_dep knotifications)
|
||||
$(add_frameworks_dep knotifyconfig)
|
||||
$(add_frameworks_dep ktextwidgets)
|
||||
$(add_frameworks_dep kwidgetsaddons)
|
||||
$(add_frameworks_dep kwindowsystem)
|
||||
$(add_frameworks_dep kxmlgui)
|
||||
dev-qt/qtdbus:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtx11extras:5
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
sys-devel/gettext
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!kde-misc/rsibreak:4
|
||||
"
|
||||
@ -1 +0,0 @@
|
||||
DIST liblxqt-mount-0.9.0.tar.xz 16688 SHA256 c89ddce16a67831bf8975bc40f95729cb5069105b969f2c8abfb8ab0116dbf5d SHA512 0ce5a8f12488590a094489dd7b0cc6ae74a863571e5af9ab651e6a412dda8bb3b12505306093626f13c688a01576bfcfda084e0e25180b3b0e909119d707048c WHIRLPOOL 9034f9f3008ce6f63aa5d8e71c415f96bfd61c41ac390ac6ad2dc2aeb41d09cf590e1b6759ba0bccb20eca4e35c7ecf57170428a3de1b31c9e244aef34735e0e
|
||||
@ -1,30 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="LXQt library for removable media and devices"
|
||||
HOMEPAGE="http://lxqt.org/"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
|
||||
else
|
||||
SRC_URI="http://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1+"
|
||||
SLOT="0"
|
||||
IUSE="+udisks"
|
||||
|
||||
DEPEND="dev-qt/qtcore:5
|
||||
dev-qt/qtdbus:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/linguist-tools:5
|
||||
~lxqt-base/liblxqt-${PV}
|
||||
virtual/udev"
|
||||
RDEPEND="${DEPEND}
|
||||
udisks? ( sys-fs/udisks )"
|
||||
@ -1 +0,0 @@
|
||||
DIST lxqt-config-randr-0.7.0.tar.xz 58376 SHA256 aa58f622aac3ab542838f3a3ae981dff3fc4b16f90f5a2bc6efcd3f9383fedf0 SHA512 0859718467a32705f0bc9321c28ffe6730215920dd8e64d79af585cc6fe9fc7693ca327591b278eec2bb9fde2048c024a8abf852baab4570977e7a4c5009e1d5 WHIRLPOOL d836c7c938c7df3f110a370066fc177f948f3c8aebd8db7f1fc564d5d06809e27f49325f22394218f2f039d539fc375eca6a4e8f560e9708443833d20e501001
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="LXQt monitor configuration"
|
||||
HOMEPAGE="http://lxqt.org/"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
|
||||
else
|
||||
SRC_URI="http://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
S=${WORKDIR}
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1+"
|
||||
SLOT="0"
|
||||
|
||||
CDEPEND="dev-libs/glib:2
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
x11-libs/libX11
|
||||
x11-libs/libXrandr"
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
RDEPEND="${CDEPEND}
|
||||
x11-apps/xrandr"
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MY_PN=Image-ExifTool
|
||||
MY_P=${MY_PN}-${PV}
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Read and write meta information in image, audio and video files"
|
||||
HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
|
||||
SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
|
||||
IUSE="doc"
|
||||
|
||||
SRC_TEST="do"
|
||||
|
||||
src_install() {
|
||||
perl-module_src_install
|
||||
use doc && dohtml -r html/
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST fontconfig-2.11.1.tar.bz2 1516095 SHA256 dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149 WHIRLPOOL 45009a1e0fcbbe2f532c6f642a0d57af35af3f6abfb50098c89fe39c71da96597078eb4babdd80a713ef4456e07481d70def7c1c18b7314452136d5b30a4858b
|
||||
DIST fontconfig-2.11.93.tar.bz2 1565609 SHA256 381e7c14c7a8bc268a9c07589837f0ea24139abc15f46171b7f94751c969a0af SHA512 68e1728884e4c1bc236cd164fe0b8912c194e8b69bcbffdb3bc8a718737e640061d01a543d90d4198fb2a2d2df0d36b40fac40a27d9845579e1893428d3a22bd WHIRLPOOL b596c1e015e48945158d9d8ffe5e1bf91e6912ac9187fefa829960897fba5c9810ff73ec5ea255b6ca490adb768bd20a50ca0eda41763824cd59b180071600f2
|
||||
DIST fontconfig-2.11.94.tar.bz2 1567540 SHA256 d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df SHA512 ab0639afbe37c46197aa31178f928a000e0662edf794bcd421e396bae2298edc23851ff58deeb448cc14ac1206683494817a64a75ab9f7bb9bce6321ccf5c1f2 WHIRLPOOL cb4df2eafa2748ad51efde09225ccb5ec5e1154c0b2b1074aa6151c289d8f44dd14ed641ef092db5f8f2b986afed8d64167f6d2da9bd7afb3f2dab725a0434d4
|
||||
DIST fontconfig-2.11.95.tar.bz2 1591200 SHA256 7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89 SHA512 e3d7696814b585512bbe191ae4e5a4fe5a645895b4b1f5783dc575efe3f0a2b725daa48eb9c43168d2cd2fc752bf114be41c58a4ae81f2db49f431984e134b54 WHIRLPOOL 5c3b084dc2dcd8b0b7c6bf9b71903973a58a31110c5cb7a6ed90822a520dca9e997a2e6a4283ffadbb6fe1d8f1005148f6eeb022b86a22222a47bac807a25677
|
||||
|
||||
@ -1,152 +0,0 @@
|
||||
From 18bf57c70aafcad031c0b43756b754dcaf6a756a Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Freundt <hroptatyr@fresse.org>
|
||||
Date: Sun, 07 Apr 2013 00:02:58 +0000
|
||||
Subject: build-chain, replace INCLUDES directive by AM_CPPFLAGS
|
||||
|
||||
As of automake-13.1 the INCLUDES directive is no longer supported.
|
||||
An automake run will return with an error.
|
||||
|
||||
This changeset simply follows automake's advice to replace INCLUDES
|
||||
by AM_CPPFLAGS.
|
||||
---
|
||||
diff --git a/Tools.mk b/Tools.mk
|
||||
index 56766da..f0fa0ec 100644
|
||||
--- a/Tools.mk
|
||||
+++ b/Tools.mk
|
||||
@@ -32,7 +32,7 @@ TOOL=./$(DIR)$(EXEEXT_FOR_BUILD)
|
||||
|
||||
EXTRA_DIST = $(TARG) $(TMPL) $(TSRC) $(DIST)
|
||||
|
||||
-INCLUDES = \
|
||||
+AM_CPPFLAGS = \
|
||||
-I$(builddir) \
|
||||
-I$(srcdir) \
|
||||
-I$(top_builddir)/src \
|
||||
@@ -43,7 +43,7 @@ INCLUDES = \
|
||||
$(WARN_CFLAGS)
|
||||
|
||||
$(TOOL): $(TSRC) $(ALIAS_FILES)
|
||||
- $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(INCLUDES)
|
||||
+ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS)
|
||||
|
||||
$(TARG): $(TMPL) $(TSRC) $(DEPS)
|
||||
$(AM_V_GEN) $(MAKE) $(TOOL) && \
|
||||
diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
|
||||
index 7f7d1b1..0e10786 100644
|
||||
--- a/fc-cache/Makefile.am
|
||||
+++ b/fc-cache/Makefile.am
|
||||
@@ -36,7 +36,7 @@ uninstall-local:
|
||||
-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
|
||||
endif
|
||||
|
||||
-INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
|
||||
+AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
|
||||
|
||||
bin_PROGRAMS=fc-cache
|
||||
|
||||
diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
|
||||
index b426723..04c1cc4 100644
|
||||
--- a/fc-cat/Makefile.am
|
||||
+++ b/fc-cat/Makefile.am
|
||||
@@ -27,7 +27,7 @@ FC_CAT_SRC=${top_srcdir}/fc-cat
|
||||
|
||||
SGML = ${FC_CAT_SRC}/fc-cat.sgml
|
||||
|
||||
-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
|
||||
+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
|
||||
|
||||
bin_PROGRAMS=fc-cat
|
||||
|
||||
diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
|
||||
index b2c499d..c58540e 100644
|
||||
--- a/fc-list/Makefile.am
|
||||
+++ b/fc-list/Makefile.am
|
||||
@@ -29,7 +29,7 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml
|
||||
|
||||
bin_PROGRAMS=fc-list
|
||||
|
||||
-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
|
||||
+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
|
||||
|
||||
BUILT_MANS=fc-list.1
|
||||
|
||||
diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am
|
||||
index 0e9e8fd..84afb8b 100644
|
||||
--- a/fc-match/Makefile.am
|
||||
+++ b/fc-match/Makefile.am
|
||||
@@ -29,7 +29,7 @@ FC_MATCH_SRC=${top_srcdir}/fc-match
|
||||
|
||||
SGML = ${FC_MATCH_SRC}/fc-match.sgml
|
||||
|
||||
-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
|
||||
+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
|
||||
|
||||
BUILT_MANS=fc-match.1
|
||||
|
||||
diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am
|
||||
index 92b0433..c456247 100644
|
||||
--- a/fc-pattern/Makefile.am
|
||||
+++ b/fc-pattern/Makefile.am
|
||||
@@ -29,7 +29,7 @@ FC_PATTERN_SRC=${top_srcdir}/fc-pattern
|
||||
|
||||
SGML = ${FC_PATTERN_SRC}/fc-pattern.sgml
|
||||
|
||||
-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
|
||||
+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
|
||||
|
||||
BUILT_MANS=fc-pattern.1
|
||||
|
||||
diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am
|
||||
index b3ea1e6..73b3f11 100644
|
||||
--- a/fc-query/Makefile.am
|
||||
+++ b/fc-query/Makefile.am
|
||||
@@ -29,7 +29,7 @@ FC_QUERY_SRC=${top_srcdir}/fc-query
|
||||
|
||||
SGML = ${FC_QUERY_SRC}/fc-query.sgml
|
||||
|
||||
-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
|
||||
+AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
|
||||
|
||||
BUILT_MANS=fc-query.1
|
||||
|
||||
diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am
|
||||
index 2063405..471a42f 100644
|
||||
--- a/fc-scan/Makefile.am
|
||||
+++ b/fc-scan/Makefile.am
|
||||
@@ -29,7 +29,7 @@ FC_SCAN_SRC=${top_srcdir}/fc-scan
|
||||
|
||||
SGML = ${FC_SCAN_SRC}/fc-scan.sgml
|
||||
|
||||
-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
|
||||
+AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
|
||||
|
||||
BUILT_MANS=fc-scan.1
|
||||
|
||||
diff --git a/fc-validate/Makefile.am b/fc-validate/Makefile.am
|
||||
index 54edec2..782cead 100644
|
||||
--- a/fc-validate/Makefile.am
|
||||
+++ b/fc-validate/Makefile.am
|
||||
@@ -29,7 +29,7 @@ FC_VALIDATE_SRC=${top_srcdir}/fc-validate
|
||||
|
||||
SGML = ${FC_VALIDATE_SRC}/fc-validate.sgml
|
||||
|
||||
-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
|
||||
+AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
|
||||
|
||||
BUILT_MANS=fc-validate.1
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 9fd7dd8..066cc03 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -70,7 +70,7 @@ uninstall-ms-import-lib:
|
||||
|
||||
endif
|
||||
|
||||
-INCLUDES = \
|
||||
+AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/src \
|
||||
$(FREETYPE_CFLAGS) \
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,21 +0,0 @@
|
||||
From 9299155b5247255d6b6687448173056c3ca8d09b Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Tue, 09 Apr 2013 02:34:35 +0000
|
||||
Subject: Ensure closing fp on error
|
||||
|
||||
---
|
||||
diff --git a/src/fchash.c b/src/fchash.c
|
||||
index 827b20f..4ea5f37 100644
|
||||
--- a/src/fchash.c
|
||||
+++ b/src/fchash.c
|
||||
@@ -220,7 +220,7 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
|
||||
|
||||
ret = FcHashInitSHA256Digest ();
|
||||
if (!ret)
|
||||
- return NULL;
|
||||
+ goto bail0;
|
||||
|
||||
while (!feof (fp))
|
||||
{
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,143 +0,0 @@
|
||||
From 03216ccf4ca0808f9c7b9513efcaeb7f4058b575 Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Wed, 10 Apr 2013 09:41:22 +0000
|
||||
Subject: Bug 63329 - make check fails: .. contents:: :depth: 2
|
||||
|
||||
Add back FcHashGetSHA256DigestFromFile() and fall back to it
|
||||
when font isn't SFNT-based font because FT_Load_Sfnt_Table
|
||||
fails with FT_Err_Invalid_Face_Handle.
|
||||
---
|
||||
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
|
||||
index 22064b3..5e8990d 100644
|
||||
--- a/src/fcfreetype.c
|
||||
+++ b/src/fcfreetype.c
|
||||
@@ -1666,17 +1666,29 @@ FcFreeTypeQueryFace (const FT_Face face,
|
||||
goto bail1;
|
||||
|
||||
err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
|
||||
- if (err != FT_Err_Ok)
|
||||
- goto bail1;
|
||||
- alen = (len + 63) & ~63;
|
||||
- fontdata = malloc (alen);
|
||||
- if (!fontdata)
|
||||
- goto bail1;
|
||||
- err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
|
||||
- if (err != FT_Err_Ok)
|
||||
+ if (err == FT_Err_Ok)
|
||||
+ {
|
||||
+ alen = (len + 63) & ~63;
|
||||
+ fontdata = malloc (alen);
|
||||
+ if (!fontdata)
|
||||
+ goto bail1;
|
||||
+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
|
||||
+ if (err != FT_Err_Ok)
|
||||
+ goto bail1;
|
||||
+ memset (&fontdata[len], 0, alen - len);
|
||||
+ hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
|
||||
+ }
|
||||
+ else if (err == FT_Err_Invalid_Face_Handle)
|
||||
+ {
|
||||
+ /* font may not support SFNT. falling back to
|
||||
+ * read the font data from file directly
|
||||
+ */
|
||||
+ hashstr = FcHashGetSHA256DigestFromFile (file);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
goto bail1;
|
||||
- memset (&fontdata[len], 0, alen - len);
|
||||
- hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
|
||||
+ }
|
||||
if (!hashstr)
|
||||
goto bail1;
|
||||
if (!FcPatternAddString (pat, FC_HASH, hashstr))
|
||||
diff --git a/src/fchash.c b/src/fchash.c
|
||||
index 1ef1e16..92585a6 100644
|
||||
--- a/src/fchash.c
|
||||
+++ b/src/fchash.c
|
||||
@@ -204,6 +204,68 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
|
||||
}
|
||||
|
||||
FcChar8 *
|
||||
+FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
|
||||
+{
|
||||
+ FILE *fp = fopen ((const char *)filename, "rb");
|
||||
+ char ibuf[64];
|
||||
+ FcChar32 *ret;
|
||||
+ size_t len;
|
||||
+ struct stat st;
|
||||
+
|
||||
+ if (!fp)
|
||||
+ return NULL;
|
||||
+
|
||||
+ if (FcStat (filename, &st))
|
||||
+ goto bail0;
|
||||
+
|
||||
+ ret = FcHashInitSHA256Digest ();
|
||||
+ if (!ret)
|
||||
+ goto bail0;
|
||||
+
|
||||
+ while (!feof (fp))
|
||||
+ {
|
||||
+ if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64)
|
||||
+ {
|
||||
+ long v;
|
||||
+
|
||||
+ /* add a padding */
|
||||
+ memset (&ibuf[len], 0, 64 - len);
|
||||
+ ibuf[len] = 0x80;
|
||||
+ if ((64 - len) < 9)
|
||||
+ {
|
||||
+ /* process a block once */
|
||||
+ FcHashComputeSHA256Digest (ret, ibuf);
|
||||
+ memset (ibuf, 0, 64);
|
||||
+ }
|
||||
+ /* set input size at the end */
|
||||
+ v = (long)st.st_size * 8;
|
||||
+ ibuf[63 - 0] = v & 0xff;
|
||||
+ ibuf[63 - 1] = (v >> 8) & 0xff;
|
||||
+ ibuf[63 - 2] = (v >> 16) & 0xff;
|
||||
+ ibuf[63 - 3] = (v >> 24) & 0xff;
|
||||
+ ibuf[63 - 4] = (v >> 32) & 0xff;
|
||||
+ ibuf[63 - 5] = (v >> 40) & 0xff;
|
||||
+ ibuf[63 - 6] = (v >> 48) & 0xff;
|
||||
+ ibuf[63 - 7] = (v >> 56) & 0xff;
|
||||
+ FcHashComputeSHA256Digest (ret, ibuf);
|
||||
+ break;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ FcHashComputeSHA256Digest (ret, ibuf);
|
||||
+ }
|
||||
+ }
|
||||
+ fclose (fp);
|
||||
+
|
||||
+ return FcHashSHA256ToString (ret);
|
||||
+
|
||||
+bail0:
|
||||
+ fclose (fp);
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+FcChar8 *
|
||||
FcHashGetSHA256DigestFromMemory (const char *fontdata,
|
||||
size_t length)
|
||||
{
|
||||
diff --git a/src/fcint.h b/src/fcint.h
|
||||
index a662dbf..8919958 100644
|
||||
--- a/src/fcint.h
|
||||
+++ b/src/fcint.h
|
||||
@@ -818,6 +818,10 @@ FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s);
|
||||
FcPrivate FcChar8 *
|
||||
FcHashGetSHA256Digest (const FcChar8 *input_strings,
|
||||
size_t len);
|
||||
+
|
||||
+FcPrivate FcChar8 *
|
||||
+FcHashGetSHA256DigestFromFile (const FcChar8 *filename);
|
||||
+
|
||||
FcPrivate FcChar8 *
|
||||
FcHashGetSHA256DigestFromMemory (const char *fontdata,
|
||||
size_t length);
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,157 +0,0 @@
|
||||
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
|
||||
index 8a037c0..5e8990d 100644
|
||||
--- a/src/fcfreetype.c
|
||||
+++ b/src/fcfreetype.c
|
||||
@@ -1104,7 +1104,10 @@ FcFreeTypeQueryFace (const FT_Face face,
|
||||
char psname[256];
|
||||
const char *tmp;
|
||||
|
||||
- FcChar8 *hashstr;
|
||||
+ FcChar8 *hashstr = NULL;
|
||||
+ char *fontdata = NULL;
|
||||
+ FT_Error err;
|
||||
+ FT_ULong len = 0, alen;
|
||||
|
||||
pat = FcPatternCreate ();
|
||||
if (!pat)
|
||||
@@ -1662,12 +1665,34 @@ FcFreeTypeQueryFace (const FT_Face face,
|
||||
if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative))
|
||||
goto bail1;
|
||||
|
||||
- hashstr = FcHashGetSHA256DigestFromFile (file);
|
||||
+ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
|
||||
+ if (err == FT_Err_Ok)
|
||||
+ {
|
||||
+ alen = (len + 63) & ~63;
|
||||
+ fontdata = malloc (alen);
|
||||
+ if (!fontdata)
|
||||
+ goto bail1;
|
||||
+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
|
||||
+ if (err != FT_Err_Ok)
|
||||
+ goto bail1;
|
||||
+ memset (&fontdata[len], 0, alen - len);
|
||||
+ hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
|
||||
+ }
|
||||
+ else if (err == FT_Err_Invalid_Face_Handle)
|
||||
+ {
|
||||
+ /* font may not support SFNT. falling back to
|
||||
+ * read the font data from file directly
|
||||
+ */
|
||||
+ hashstr = FcHashGetSHA256DigestFromFile (file);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ goto bail1;
|
||||
+ }
|
||||
if (!hashstr)
|
||||
goto bail1;
|
||||
if (!FcPatternAddString (pat, FC_HASH, hashstr))
|
||||
goto bail1;
|
||||
- free (hashstr);
|
||||
|
||||
/*
|
||||
* Compute the unicode coverage for the font
|
||||
@@ -1756,6 +1781,10 @@ FcFreeTypeQueryFace (const FT_Face face,
|
||||
bail2:
|
||||
FcCharSetDestroy (cs);
|
||||
bail1:
|
||||
+ if (hashstr)
|
||||
+ free (hashstr);
|
||||
+ if (fontdata)
|
||||
+ free (fontdata);
|
||||
FcPatternDestroy (pat);
|
||||
bail0:
|
||||
return NULL;
|
||||
diff --git a/src/fchash.c b/src/fchash.c
|
||||
index 827b20f..92585a6 100644
|
||||
--- a/src/fchash.c
|
||||
+++ b/src/fchash.c
|
||||
@@ -220,7 +220,7 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
|
||||
|
||||
ret = FcHashInitSHA256Digest ();
|
||||
if (!ret)
|
||||
- return NULL;
|
||||
+ goto bail0;
|
||||
|
||||
while (!feof (fp))
|
||||
{
|
||||
@@ -261,5 +261,60 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
|
||||
|
||||
bail0:
|
||||
fclose (fp);
|
||||
+
|
||||
return NULL;
|
||||
}
|
||||
+
|
||||
+FcChar8 *
|
||||
+FcHashGetSHA256DigestFromMemory (const char *fontdata,
|
||||
+ size_t length)
|
||||
+{
|
||||
+ char ibuf[64];
|
||||
+ FcChar32 *ret;
|
||||
+ size_t i = 0;
|
||||
+
|
||||
+ ret = FcHashInitSHA256Digest ();
|
||||
+ if (!ret)
|
||||
+ return NULL;
|
||||
+
|
||||
+ while (i <= length)
|
||||
+ {
|
||||
+ if ((length - i) < 64)
|
||||
+ {
|
||||
+ long v;
|
||||
+ size_t n;
|
||||
+
|
||||
+ /* add a padding */
|
||||
+ n = length - i;
|
||||
+ if (n > 0)
|
||||
+ memcpy (ibuf, &fontdata[i], n);
|
||||
+ memset (&ibuf[n], 0, 64 - n);
|
||||
+ ibuf[n] = 0x80;
|
||||
+ if ((64 - n) < 9)
|
||||
+ {
|
||||
+ /* process a block once */
|
||||
+ FcHashComputeSHA256Digest (ret, ibuf);
|
||||
+ memset (ibuf, 0, 64);
|
||||
+ }
|
||||
+ /* set input size at the end */
|
||||
+ v = length * 8;
|
||||
+ ibuf[63 - 0] = v & 0xff;
|
||||
+ ibuf[63 - 1] = (v >> 8) & 0xff;
|
||||
+ ibuf[63 - 2] = (v >> 16) & 0xff;
|
||||
+ ibuf[63 - 3] = (v >> 24) & 0xff;
|
||||
+ ibuf[63 - 4] = (v >> 32) & 0xff;
|
||||
+ ibuf[63 - 5] = (v >> 40) & 0xff;
|
||||
+ ibuf[63 - 6] = (v >> 48) & 0xff;
|
||||
+ ibuf[63 - 7] = (v >> 56) & 0xff;
|
||||
+ FcHashComputeSHA256Digest (ret, ibuf);
|
||||
+ break;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ FcHashComputeSHA256Digest (ret, &fontdata[i]);
|
||||
+ }
|
||||
+ i += 64;
|
||||
+ }
|
||||
+
|
||||
+ return FcHashSHA256ToString (ret);
|
||||
+}
|
||||
diff --git a/src/fcint.h b/src/fcint.h
|
||||
index c45075e..8919958 100644
|
||||
--- a/src/fcint.h
|
||||
+++ b/src/fcint.h
|
||||
@@ -818,9 +818,14 @@ FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s);
|
||||
FcPrivate FcChar8 *
|
||||
FcHashGetSHA256Digest (const FcChar8 *input_strings,
|
||||
size_t len);
|
||||
+
|
||||
FcPrivate FcChar8 *
|
||||
FcHashGetSHA256DigestFromFile (const FcChar8 *filename);
|
||||
|
||||
+FcPrivate FcChar8 *
|
||||
+FcHashGetSHA256DigestFromMemory (const char *fontdata,
|
||||
+ size_t length);
|
||||
+
|
||||
/* fcinit.c */
|
||||
FcPrivate FcConfig *
|
||||
FcInitLoadOwnConfig (FcConfig *config);
|
||||
@ -1,144 +0,0 @@
|
||||
From c93a8b8b54afe33e5ecf9870723543cb4058fa94 Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Tue, 09 Apr 2013 03:46:30 +0000
|
||||
Subject: Obtain fonts data via FT_Face instead of opening a file directly
|
||||
|
||||
---
|
||||
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
|
||||
index 8a037c0..1eecfdb 100644
|
||||
--- a/src/fcfreetype.c
|
||||
+++ b/src/fcfreetype.c
|
||||
@@ -1662,7 +1662,7 @@ FcFreeTypeQueryFace (const FT_Face face,
|
||||
if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative))
|
||||
goto bail1;
|
||||
|
||||
- hashstr = FcHashGetSHA256DigestFromFile (file);
|
||||
+ hashstr = FcHashGetSHA256DigestFromFace (face);
|
||||
if (!hashstr)
|
||||
goto bail1;
|
||||
if (!FcPatternAddString (pat, FC_HASH, hashstr))
|
||||
diff --git a/src/fchash.c b/src/fchash.c
|
||||
index 4ea5f37..043d94b 100644
|
||||
--- a/src/fchash.c
|
||||
+++ b/src/fchash.c
|
||||
@@ -29,6 +29,9 @@
|
||||
#include "fcint.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
+#include <ft2build.h>
|
||||
+#include FT_TRUETYPE_TABLES_H
|
||||
+#include FT_TRUETYPE_TAGS_H
|
||||
|
||||
#define ROTRN(w, v, n) ((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n)))
|
||||
#define ROTR32(v, n) ROTRN(32, v, n)
|
||||
@@ -204,41 +207,50 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
|
||||
}
|
||||
|
||||
FcChar8 *
|
||||
-FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
|
||||
+FcHashGetSHA256DigestFromFace (const FT_Face face)
|
||||
{
|
||||
- FILE *fp = fopen ((const char *)filename, "rb");
|
||||
- char ibuf[64];
|
||||
+ char ibuf[64], *buf = NULL;
|
||||
FcChar32 *ret;
|
||||
- size_t len;
|
||||
- struct stat st;
|
||||
+ FT_Error err;
|
||||
+ FT_ULong len = 0, alen, i = 0;
|
||||
|
||||
- if (!fp)
|
||||
+ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
|
||||
+ if (err != FT_Err_Ok)
|
||||
return NULL;
|
||||
-
|
||||
- if (FcStat (filename, &st))
|
||||
+ alen = (len + 63) & ~63;
|
||||
+ buf = malloc (alen);
|
||||
+ if (!buf)
|
||||
+ return NULL;
|
||||
+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len);
|
||||
+ if (err != FT_Err_Ok)
|
||||
goto bail0;
|
||||
+ memset (&buf[len], 0, alen - len);
|
||||
|
||||
ret = FcHashInitSHA256Digest ();
|
||||
if (!ret)
|
||||
goto bail0;
|
||||
|
||||
- while (!feof (fp))
|
||||
+ while (i <= len)
|
||||
{
|
||||
- if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64)
|
||||
+ if ((len - i) < 64)
|
||||
{
|
||||
long v;
|
||||
+ int n;
|
||||
|
||||
/* add a padding */
|
||||
- memset (&ibuf[len], 0, 64 - len);
|
||||
- ibuf[len] = 0x80;
|
||||
- if ((64 - len) < 9)
|
||||
+ n = len - i;
|
||||
+ if (n > 0)
|
||||
+ memcpy (ibuf, &buf[i], n);
|
||||
+ memset (&ibuf[n], 0, 64 - n);
|
||||
+ ibuf[n] = 0x80;
|
||||
+ if ((64 - n) < 9)
|
||||
{
|
||||
/* process a block once */
|
||||
FcHashComputeSHA256Digest (ret, ibuf);
|
||||
memset (ibuf, 0, 64);
|
||||
}
|
||||
/* set input size at the end */
|
||||
- v = (long)st.st_size * 8;
|
||||
+ v = len * 8;
|
||||
ibuf[63 - 0] = v & 0xff;
|
||||
ibuf[63 - 1] = (v >> 8) & 0xff;
|
||||
ibuf[63 - 2] = (v >> 16) & 0xff;
|
||||
@@ -252,14 +264,18 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
|
||||
}
|
||||
else
|
||||
{
|
||||
- FcHashComputeSHA256Digest (ret, ibuf);
|
||||
+ FcHashComputeSHA256Digest (ret, &buf[i]);
|
||||
}
|
||||
+ i += 64;
|
||||
}
|
||||
- fclose (fp);
|
||||
+ if (buf)
|
||||
+ free (buf);
|
||||
|
||||
return FcHashSHA256ToString (ret);
|
||||
|
||||
bail0:
|
||||
- fclose (fp);
|
||||
+ if (buf)
|
||||
+ free (buf);
|
||||
+
|
||||
return NULL;
|
||||
}
|
||||
diff --git a/src/fcint.h b/src/fcint.h
|
||||
index c45075e..703b983 100644
|
||||
--- a/src/fcint.h
|
||||
+++ b/src/fcint.h
|
||||
@@ -47,6 +47,8 @@
|
||||
#include "fcdeprecate.h"
|
||||
#include "fcmutex.h"
|
||||
#include "fcatomic.h"
|
||||
+#include <ft2build.h>
|
||||
+#include FT_FREETYPE_H
|
||||
|
||||
#ifndef FC_CONFIG_PATH
|
||||
#define FC_CONFIG_PATH "fonts.conf"
|
||||
@@ -819,7 +821,7 @@ FcPrivate FcChar8 *
|
||||
FcHashGetSHA256Digest (const FcChar8 *input_strings,
|
||||
size_t len);
|
||||
FcPrivate FcChar8 *
|
||||
-FcHashGetSHA256DigestFromFile (const FcChar8 *filename);
|
||||
+FcHashGetSHA256DigestFromFace (const FT_Face face);
|
||||
|
||||
/* fcinit.c */
|
||||
FcPrivate FcConfig *
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,177 +0,0 @@
|
||||
From fc5a589abad0e8285f7d95007ebda76536e8fa7d Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Tue, 09 Apr 2013 08:18:43 +0000
|
||||
Subject: Revert the previous change and rework to not export freetype API outside fcfreetype.c
|
||||
|
||||
---
|
||||
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
|
||||
index 1eecfdb..22064b3 100644
|
||||
--- a/src/fcfreetype.c
|
||||
+++ b/src/fcfreetype.c
|
||||
@@ -1104,7 +1104,10 @@ FcFreeTypeQueryFace (const FT_Face face,
|
||||
char psname[256];
|
||||
const char *tmp;
|
||||
|
||||
- FcChar8 *hashstr;
|
||||
+ FcChar8 *hashstr = NULL;
|
||||
+ char *fontdata = NULL;
|
||||
+ FT_Error err;
|
||||
+ FT_ULong len = 0, alen;
|
||||
|
||||
pat = FcPatternCreate ();
|
||||
if (!pat)
|
||||
@@ -1662,12 +1665,22 @@ FcFreeTypeQueryFace (const FT_Face face,
|
||||
if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative))
|
||||
goto bail1;
|
||||
|
||||
- hashstr = FcHashGetSHA256DigestFromFace (face);
|
||||
+ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
|
||||
+ if (err != FT_Err_Ok)
|
||||
+ goto bail1;
|
||||
+ alen = (len + 63) & ~63;
|
||||
+ fontdata = malloc (alen);
|
||||
+ if (!fontdata)
|
||||
+ goto bail1;
|
||||
+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
|
||||
+ if (err != FT_Err_Ok)
|
||||
+ goto bail1;
|
||||
+ memset (&fontdata[len], 0, alen - len);
|
||||
+ hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
|
||||
if (!hashstr)
|
||||
goto bail1;
|
||||
if (!FcPatternAddString (pat, FC_HASH, hashstr))
|
||||
goto bail1;
|
||||
- free (hashstr);
|
||||
|
||||
/*
|
||||
* Compute the unicode coverage for the font
|
||||
@@ -1756,6 +1769,10 @@ FcFreeTypeQueryFace (const FT_Face face,
|
||||
bail2:
|
||||
FcCharSetDestroy (cs);
|
||||
bail1:
|
||||
+ if (hashstr)
|
||||
+ free (hashstr);
|
||||
+ if (fontdata)
|
||||
+ free (fontdata);
|
||||
FcPatternDestroy (pat);
|
||||
bail0:
|
||||
return NULL;
|
||||
diff --git a/src/fchash.c b/src/fchash.c
|
||||
index 043d94b..1ef1e16 100644
|
||||
--- a/src/fchash.c
|
||||
+++ b/src/fchash.c
|
||||
@@ -29,9 +29,6 @@
|
||||
#include "fcint.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
-#include <ft2build.h>
|
||||
-#include FT_TRUETYPE_TABLES_H
|
||||
-#include FT_TRUETYPE_TAGS_H
|
||||
|
||||
#define ROTRN(w, v, n) ((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n)))
|
||||
#define ROTR32(v, n) ROTRN(32, v, n)
|
||||
@@ -207,40 +204,28 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
|
||||
}
|
||||
|
||||
FcChar8 *
|
||||
-FcHashGetSHA256DigestFromFace (const FT_Face face)
|
||||
+FcHashGetSHA256DigestFromMemory (const char *fontdata,
|
||||
+ size_t length)
|
||||
{
|
||||
- char ibuf[64], *buf = NULL;
|
||||
+ char ibuf[64];
|
||||
FcChar32 *ret;
|
||||
- FT_Error err;
|
||||
- FT_ULong len = 0, alen, i = 0;
|
||||
-
|
||||
- err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
|
||||
- if (err != FT_Err_Ok)
|
||||
- return NULL;
|
||||
- alen = (len + 63) & ~63;
|
||||
- buf = malloc (alen);
|
||||
- if (!buf)
|
||||
- return NULL;
|
||||
- err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len);
|
||||
- if (err != FT_Err_Ok)
|
||||
- goto bail0;
|
||||
- memset (&buf[len], 0, alen - len);
|
||||
+ size_t i = 0;
|
||||
|
||||
ret = FcHashInitSHA256Digest ();
|
||||
if (!ret)
|
||||
- goto bail0;
|
||||
+ return NULL;
|
||||
|
||||
- while (i <= len)
|
||||
+ while (i <= length)
|
||||
{
|
||||
- if ((len - i) < 64)
|
||||
+ if ((length - i) < 64)
|
||||
{
|
||||
long v;
|
||||
- int n;
|
||||
+ size_t n;
|
||||
|
||||
/* add a padding */
|
||||
- n = len - i;
|
||||
+ n = length - i;
|
||||
if (n > 0)
|
||||
- memcpy (ibuf, &buf[i], n);
|
||||
+ memcpy (ibuf, &fontdata[i], n);
|
||||
memset (&ibuf[n], 0, 64 - n);
|
||||
ibuf[n] = 0x80;
|
||||
if ((64 - n) < 9)
|
||||
@@ -250,7 +235,7 @@ FcHashGetSHA256DigestFromFace (const FT_Face face)
|
||||
memset (ibuf, 0, 64);
|
||||
}
|
||||
/* set input size at the end */
|
||||
- v = len * 8;
|
||||
+ v = length * 8;
|
||||
ibuf[63 - 0] = v & 0xff;
|
||||
ibuf[63 - 1] = (v >> 8) & 0xff;
|
||||
ibuf[63 - 2] = (v >> 16) & 0xff;
|
||||
@@ -264,18 +249,10 @@ FcHashGetSHA256DigestFromFace (const FT_Face face)
|
||||
}
|
||||
else
|
||||
{
|
||||
- FcHashComputeSHA256Digest (ret, &buf[i]);
|
||||
+ FcHashComputeSHA256Digest (ret, &fontdata[i]);
|
||||
}
|
||||
i += 64;
|
||||
}
|
||||
- if (buf)
|
||||
- free (buf);
|
||||
|
||||
return FcHashSHA256ToString (ret);
|
||||
-
|
||||
-bail0:
|
||||
- if (buf)
|
||||
- free (buf);
|
||||
-
|
||||
- return NULL;
|
||||
}
|
||||
diff --git a/src/fcint.h b/src/fcint.h
|
||||
index 703b983..a662dbf 100644
|
||||
--- a/src/fcint.h
|
||||
+++ b/src/fcint.h
|
||||
@@ -47,8 +47,6 @@
|
||||
#include "fcdeprecate.h"
|
||||
#include "fcmutex.h"
|
||||
#include "fcatomic.h"
|
||||
-#include <ft2build.h>
|
||||
-#include FT_FREETYPE_H
|
||||
|
||||
#ifndef FC_CONFIG_PATH
|
||||
#define FC_CONFIG_PATH "fonts.conf"
|
||||
@@ -821,7 +819,8 @@ FcPrivate FcChar8 *
|
||||
FcHashGetSHA256Digest (const FcChar8 *input_strings,
|
||||
size_t len);
|
||||
FcPrivate FcChar8 *
|
||||
-FcHashGetSHA256DigestFromFace (const FT_Face face);
|
||||
+FcHashGetSHA256DigestFromMemory (const char *fontdata,
|
||||
+ size_t length);
|
||||
|
||||
/* fcinit.c */
|
||||
FcPrivate FcConfig *
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,73 +0,0 @@
|
||||
From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Mon, 01 Apr 2013 09:16:28 +0000
|
||||
Subject: Bug 62980 - matching native fonts with even :lang=en
|
||||
|
||||
Fix the matcher modified by 4eab908c8679a797ac7016b77a93ee41bb11b0fc
|
||||
to deal with both strong and weak of FC_LANG as the same location in the score
|
||||
---
|
||||
diff --git a/src/fcmatch.c b/src/fcmatch.c
|
||||
index 68f39ae..2d7b798 100644
|
||||
--- a/src/fcmatch.c
|
||||
+++ b/src/fcmatch.c
|
||||
@@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy {
|
||||
#undef FC_OBJECT
|
||||
|
||||
#undef PRI1
|
||||
-#define PRI1(n) \
|
||||
- PRI_ ## n ## _STRONG, \
|
||||
- PRI_ ## n ## _WEAK
|
||||
+#define PRI1(n) \
|
||||
+ PRI_ ## n, \
|
||||
+ PRI_ ## n ## _STRONG = PRI_ ## n, \
|
||||
+ PRI_ ## n ## _WEAK = PRI_ ## n
|
||||
|
||||
typedef enum _FcMatcherPriority {
|
||||
PRI1(HASH),
|
||||
@@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority {
|
||||
PRI1(FOUNDRY),
|
||||
PRI1(CHARSET),
|
||||
PRI_FAMILY_STRONG,
|
||||
- PRI_LANG_STRONG,
|
||||
PRI_POSTSCRIPT_NAME_STRONG,
|
||||
- PRI_LANG_WEAK,
|
||||
+ PRI1(LANG),
|
||||
PRI_FAMILY_WEAK,
|
||||
PRI_POSTSCRIPT_NAME_WEAK,
|
||||
PRI1(SPACING),
|
||||
@@ -910,8 +910,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED,
|
||||
* If this node matches any language, go check
|
||||
* which ones and satisfy those entries
|
||||
*/
|
||||
- if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 ||
|
||||
- nodeps[f]->score[PRI_LANG_WEAK] < 2000)
|
||||
+ if (nodeps[f]->score[PRI_LANG] < 2000)
|
||||
{
|
||||
for (i = 0; i < nPatternLang; i++)
|
||||
{
|
||||
@@ -935,13 +934,6 @@ FcFontSetSort (FcConfig *config FC_UNUSED,
|
||||
}
|
||||
patternLangSat[i] = FcTrue;
|
||||
satisfies = FcTrue;
|
||||
- /* adjust score to ensure it's not more than 10000.0
|
||||
- * which would means the lang didn't satisfy the requirements
|
||||
- */
|
||||
- if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0)
|
||||
- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
|
||||
- if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0)
|
||||
- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED,
|
||||
}
|
||||
if (!satisfies)
|
||||
{
|
||||
- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
|
||||
- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
|
||||
+ nodeps[f]->score[PRI_LANG] = 10000.0;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,164 +0,0 @@
|
||||
From f6244d2cf231e1dc756f3e941e61b9bf124879bb Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Wed, 08 May 2013 02:57:49 +0000
|
||||
Subject: Use the glob matching for filename
|
||||
|
||||
Regex is expensive to compare filenames. we already have the glob matching
|
||||
and it works enough in this case.
|
||||
|
||||
Prior to this change, renaming FcConfigGlobMatch() to FcStrGlobMatch() and moving to fcstr.c
|
||||
---
|
||||
diff --git a/src/fccfg.c b/src/fccfg.c
|
||||
index 7da50b5..fcdf73e 100644
|
||||
--- a/src/fccfg.c
|
||||
+++ b/src/fccfg.c
|
||||
@@ -2211,57 +2211,13 @@ FcConfigGlobAdd (FcConfig *config,
|
||||
}
|
||||
|
||||
static FcBool
|
||||
-FcConfigGlobMatch (const FcChar8 *glob,
|
||||
- const FcChar8 *string)
|
||||
-{
|
||||
- FcChar8 c;
|
||||
-
|
||||
- while ((c = *glob++))
|
||||
- {
|
||||
- switch (c) {
|
||||
- case '*':
|
||||
- /* short circuit common case */
|
||||
- if (!*glob)
|
||||
- return FcTrue;
|
||||
- /* short circuit another common case */
|
||||
- if (strchr ((char *) glob, '*') == 0)
|
||||
- {
|
||||
- size_t l1, l2;
|
||||
-
|
||||
- l1 = strlen ((char *) string);
|
||||
- l2 = strlen ((char *) glob);
|
||||
- if (l1 < l2)
|
||||
- return FcFalse;
|
||||
- string += (l1 - l2);
|
||||
- }
|
||||
- while (*string)
|
||||
- {
|
||||
- if (FcConfigGlobMatch (glob, string))
|
||||
- return FcTrue;
|
||||
- string++;
|
||||
- }
|
||||
- return FcFalse;
|
||||
- case '?':
|
||||
- if (*string++ == '\0')
|
||||
- return FcFalse;
|
||||
- break;
|
||||
- default:
|
||||
- if (*string++ != c)
|
||||
- return FcFalse;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- return *string == '\0';
|
||||
-}
|
||||
-
|
||||
-static FcBool
|
||||
FcConfigGlobsMatch (const FcStrSet *globs,
|
||||
const FcChar8 *string)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < globs->num; i++)
|
||||
- if (FcConfigGlobMatch (globs->strs[i], string))
|
||||
+ if (FcStrGlobMatch (globs->strs[i], string))
|
||||
return FcTrue;
|
||||
return FcFalse;
|
||||
}
|
||||
diff --git a/src/fcint.h b/src/fcint.h
|
||||
index 8919958..65bf333 100644
|
||||
--- a/src/fcint.h
|
||||
+++ b/src/fcint.h
|
||||
@@ -1090,6 +1090,10 @@ FcPrivate int
|
||||
FcStrMatchIgnoreCaseAndDelims (const FcChar8 *s1, const FcChar8 *s2, const FcChar8 *delims);
|
||||
|
||||
FcPrivate FcBool
|
||||
+FcStrGlobMatch (const FcChar8 *glob,
|
||||
+ const FcChar8 *string);
|
||||
+
|
||||
+FcPrivate FcBool
|
||||
FcStrUsesHome (const FcChar8 *s);
|
||||
|
||||
FcPrivate FcChar8 *
|
||||
diff --git a/src/fcmatch.c b/src/fcmatch.c
|
||||
index 2d7b798..84c9a9a 100644
|
||||
--- a/src/fcmatch.c
|
||||
+++ b/src/fcmatch.c
|
||||
@@ -196,12 +196,10 @@ FcCompareFilename (FcValue *v1, FcValue *v2)
|
||||
return 0.0;
|
||||
else if (FcStrCmpIgnoreCase (s1, s2) == 0)
|
||||
return 1.0;
|
||||
- else if (FcStrRegexCmp (s2, s1))
|
||||
+ else if (FcStrGlobMatch (s1, s2))
|
||||
return 2.0;
|
||||
- else if (FcStrRegexCmpIgnoreCase (s2, s1))
|
||||
- return 3.0;
|
||||
else
|
||||
- return 4.0;
|
||||
+ return 3.0;
|
||||
}
|
||||
|
||||
#define PRI_NULL(n) \
|
||||
diff --git a/src/fcstr.c b/src/fcstr.c
|
||||
index 339a346..3a32031 100644
|
||||
--- a/src/fcstr.c
|
||||
+++ b/src/fcstr.c
|
||||
@@ -459,6 +459,50 @@ FcStrMatchIgnoreCaseAndDelims (const FcChar8 *s1, const FcChar8 *s2, const FcCha
|
||||
return w1.src - s1 - 1;
|
||||
}
|
||||
|
||||
+FcBool
|
||||
+FcStrGlobMatch (const FcChar8 *glob,
|
||||
+ const FcChar8 *string)
|
||||
+{
|
||||
+ FcChar8 c;
|
||||
+
|
||||
+ while ((c = *glob++))
|
||||
+ {
|
||||
+ switch (c) {
|
||||
+ case '*':
|
||||
+ /* short circuit common case */
|
||||
+ if (!*glob)
|
||||
+ return FcTrue;
|
||||
+ /* short circuit another common case */
|
||||
+ if (strchr ((char *) glob, '*') == 0)
|
||||
+ {
|
||||
+ size_t l1, l2;
|
||||
+
|
||||
+ l1 = strlen ((char *) string);
|
||||
+ l2 = strlen ((char *) glob);
|
||||
+ if (l1 < l2)
|
||||
+ return FcFalse;
|
||||
+ string += (l1 - l2);
|
||||
+ }
|
||||
+ while (*string)
|
||||
+ {
|
||||
+ if (FcStrGlobMatch (glob, string))
|
||||
+ return FcTrue;
|
||||
+ string++;
|
||||
+ }
|
||||
+ return FcFalse;
|
||||
+ case '?':
|
||||
+ if (*string++ == '\0')
|
||||
+ return FcFalse;
|
||||
+ break;
|
||||
+ default:
|
||||
+ if (*string++ != c)
|
||||
+ return FcFalse;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ return *string == '\0';
|
||||
+}
|
||||
+
|
||||
const FcChar8 *
|
||||
FcStrStrIgnoreCase (const FcChar8 *s1, const FcChar8 *s2)
|
||||
{
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,21 +0,0 @@
|
||||
From 320283cd70ae31ce46b03e0c5da55412089ce953 Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Thu, 16 Jan 2014 10:30:35 +0000
|
||||
Subject: Bug 73686 - confdir is not set correctly in fontconfig.pc
|
||||
|
||||
---
|
||||
diff --git a/fontconfig.pc.in b/fontconfig.pc.in
|
||||
index 6e112bb..fa00a72 100644
|
||||
--- a/fontconfig.pc.in
|
||||
+++ b/fontconfig.pc.in
|
||||
@@ -5,7 +5,7 @@ includedir=@includedir@
|
||||
sysconfdir=@sysconfdir@
|
||||
localstatedir=@localstatedir@
|
||||
PACKAGE=@PACKAGE@
|
||||
-confdir=@baseconfigdir@
|
||||
+confdir=@BASECONFIGDIR@
|
||||
cachedir=@fc_cachedir@
|
||||
|
||||
Name: Fontconfig
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,57 +0,0 @@
|
||||
|
||||
test/test-migration.c | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
New commits:
|
||||
commit 76ea9af816a50c6bb0b3dc2960460a90fadd9cdb
|
||||
Author: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Tue Oct 22 15:00:29 2013 +0900
|
||||
|
||||
Use stat() if there are no d_type in struct dirent
|
||||
|
||||
Reported by Thomas Klausner
|
||||
|
||||
diff --git a/test/test-migration.c b/test/test-migration.c
|
||||
index a0ab839..9709651 100644
|
||||
--- a/test/test-migration.c
|
||||
+++ b/test/test-migration.c
|
||||
@@ -4,6 +4,11 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <dirent.h>
|
||||
+#ifndef HAVE_STRUCT_DIRENT_D_TYPE
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
#include <fontconfig/fontconfig.h>
|
||||
|
||||
FcBool
|
||||
@@ -36,6 +41,9 @@ unlink_dirs(const char *dir)
|
||||
size_t len = strlen (dir);
|
||||
char *n = NULL;
|
||||
FcBool ret = FcTrue;
|
||||
+#ifndef HAVE_STRUCT_DIRENT_D_TYPE
|
||||
+ struct stat statb;
|
||||
+#endif
|
||||
|
||||
if (!d)
|
||||
return FcFalse;
|
||||
@@ -53,7 +61,17 @@ unlink_dirs(const char *dir)
|
||||
strcpy (n, dir);
|
||||
n[len] = '/';
|
||||
strcpy (&n[len + 1], e->d_name);
|
||||
+#ifdef HAVE_STRUCT_DIRENT_D_TYPE
|
||||
if (e->d_type == DT_DIR)
|
||||
+#else
|
||||
+ if (stat (n, &statb) == -1)
|
||||
+ {
|
||||
+ fprintf (stderr, "E: %s\n", n);
|
||||
+ ret = FcFalse;
|
||||
+ break;
|
||||
+ }
|
||||
+ if (S_ISDIR (statb.st_mode))
|
||||
+#endif
|
||||
{
|
||||
if (!unlink_dirs (n))
|
||||
{
|
||||
@ -1,63 +0,0 @@
|
||||
|
||||
configure.ac | 2 +-
|
||||
test/test-migration.c | 15 ++++++++++++++-
|
||||
2 files changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
New commits:
|
||||
commit 65872e9e46d17e4461c3a891ef23abe156005e04
|
||||
Author: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Thu Oct 24 19:35:26 2013 +0900
|
||||
|
||||
Fix a build issue on Solaris 10
|
||||
|
||||
Use own mkdtemp implementation if not available.
|
||||
|
||||
Reported by Thomas Klausner and Jörn Clausen
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c3743f4..4478914 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -148,7 +148,7 @@ AC_TYPE_PID_T
|
||||
# Checks for library functions.
|
||||
AC_FUNC_VPRINTF
|
||||
AC_FUNC_MMAP
|
||||
-AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat])
|
||||
+AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat])
|
||||
|
||||
dnl AC_CHECK_FUNCS doesn't check for header files.
|
||||
dnl posix_fadvise() may be not available in older libc.
|
||||
diff --git a/test/test-migration.c b/test/test-migration.c
|
||||
index 9709651..f127e27 100644
|
||||
--- a/test/test-migration.c
|
||||
+++ b/test/test-migration.c
|
||||
@@ -11,6 +11,19 @@
|
||||
#endif
|
||||
#include <fontconfig/fontconfig.h>
|
||||
|
||||
+#ifdef HAVE_MKDTEMP
|
||||
+#define fc_mkdtemp mkdtemp
|
||||
+#else
|
||||
+char *
|
||||
+fc_mkdtemp (char *template)
|
||||
+{
|
||||
+ if (!mktemp (template) || mkdir (template, 0700))
|
||||
+ return NULL;
|
||||
+
|
||||
+ return template;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
FcBool
|
||||
mkdir_p(const char *dir)
|
||||
{
|
||||
@@ -107,7 +120,7 @@ int
|
||||
main(void)
|
||||
{
|
||||
char template[32] = "fontconfig-XXXXXXXX";
|
||||
- char *tmp = mkdtemp (template);
|
||||
+ char *tmp = fc_mkdtemp (template);
|
||||
size_t len = strlen (tmp), xlen, dlen;
|
||||
char xdg[256], confd[256], fn[256], nfn[256], ud[256], nud[256];
|
||||
int ret = -1;
|
||||
|
||||
@ -1,109 +0,0 @@
|
||||
From c965c9f67759585909fa03236bad826de85bd39c Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Mon, 23 Mar 2015 13:30:59 +0900
|
||||
Subject: Bug 89617 - FcConfigAppFontAddFile() returns false on any font file
|
||||
|
||||
Prior to the change of 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb
|
||||
FcConfigAppFontAddFile() always returned FcTrue no matter what
|
||||
fonts was added. after that, it always returned FcFalse because
|
||||
adding a font doesn't add any subdirs with FcFileScanConfig().
|
||||
so changing that to simply ignore it.
|
||||
|
||||
Also fixing it to return FcFalse if non-fonts was added, i.e.
|
||||
FcFreeTypeQuery() fails.
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=89617
|
||||
|
||||
diff --git a/src/fccfg.c b/src/fccfg.c
|
||||
index b92270b..5467493 100644
|
||||
--- a/src/fccfg.c
|
||||
+++ b/src/fccfg.c
|
||||
@@ -2227,7 +2227,9 @@ FcConfigAppFontAddFile (FcConfig *config,
|
||||
FcStrSetDestroy (subdirs);
|
||||
return FcFalse;
|
||||
}
|
||||
- if ((sublist = FcStrListCreate (subdirs)))
|
||||
+ if (subdirs->num == 0)
|
||||
+ ret = FcTrue;
|
||||
+ else if ((sublist = FcStrListCreate (subdirs)))
|
||||
{
|
||||
while ((subdir = FcStrListNext (sublist)))
|
||||
{
|
||||
diff --git a/src/fcdir.c b/src/fcdir.c
|
||||
index 00dee72..2e7f0dc 100644
|
||||
--- a/src/fcdir.c
|
||||
+++ b/src/fcdir.c
|
||||
@@ -136,6 +136,8 @@ FcFileScanFontConfig (FcFontSet *set,
|
||||
ret = FcFalse;
|
||||
}
|
||||
}
|
||||
+ else
|
||||
+ ret = FcFalse;
|
||||
id++;
|
||||
} while (font && ret && id < count);
|
||||
return ret;
|
||||
diff --git a/test/Makefile.am b/test/Makefile.am
|
||||
index f270b50..bf1ec24 100644
|
||||
--- a/test/Makefile.am
|
||||
+++ b/test/Makefile.am
|
||||
@@ -24,6 +24,13 @@ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
|
||||
# to meaningfully test anything, and we are not installed yet.
|
||||
#TESTS += test-pthread
|
||||
endif
|
||||
+check_PROGRAMS += test-bz89617
|
||||
+test_bz89617_CFLAGS = \
|
||||
+ -DSRCDIR="\"$(abs_srcdir)\""
|
||||
+
|
||||
+test_bz89617_LDADD = $(top_builddir)/src/libfontconfig.la
|
||||
+TESTS += test-bz89617
|
||||
+
|
||||
noinst_PROGRAMS = $(check_PROGRAMS)
|
||||
|
||||
if !OS_WIN32
|
||||
diff --git a/test/test-bz89617.c b/test/test-bz89617.c
|
||||
new file mode 100644
|
||||
index 0000000..389f470
|
||||
--- /dev/null
|
||||
+++ b/test/test-bz89617.c
|
||||
@@ -0,0 +1,38 @@
|
||||
+/*
|
||||
+ * fontconfig/test/test-bz89617.c
|
||||
+ *
|
||||
+ * Copyright © 2000 Keith Packard
|
||||
+ * Copyright © 2015 Akira TAGOH
|
||||
+ *
|
||||
+ * Permission to use, copy, modify, distribute, and sell this software and its
|
||||
+ * documentation for any purpose is hereby granted without fee, provided that
|
||||
+ * the above copyright notice appear in all copies and that both that
|
||||
+ * copyright notice and this permission notice appear in supporting
|
||||
+ * documentation, and that the name of the author(s) not be used in
|
||||
+ * advertising or publicity pertaining to distribution of the software without
|
||||
+ * specific, written prior permission. The authors make no
|
||||
+ * representations about the suitability of this software for any purpose. It
|
||||
+ * is provided "as is" without express or implied warranty.
|
||||
+ *
|
||||
+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
+ * PERFORMANCE OF THIS SOFTWARE.
|
||||
+ */
|
||||
+#include <stdio.h>
|
||||
+#include <fontconfig/fontconfig.h>
|
||||
+
|
||||
+int
|
||||
+main (void)
|
||||
+{
|
||||
+ FcConfig *config = FcConfigGetCurrent ();
|
||||
+
|
||||
+ if (!FcConfigAppFontAddFile (config, SRCDIR "/4x6.pcf") ||
|
||||
+ FcConfigAppFontAddFile (config, "/dev/null"))
|
||||
+ return 1;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
From 7bc07cf6c2a5685ab95f146f5af2b3bcd5f5864d Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Mon, 30 Mar 2015 15:18:44 +0900
|
||||
Subject: Fix SIGFPE
|
||||
|
||||
|
||||
diff --git a/src/fcrange.c b/src/fcrange.c
|
||||
index 37cf067..9b1b67b 100644
|
||||
--- a/src/fcrange.c
|
||||
+++ b/src/fcrange.c
|
||||
@@ -204,7 +204,7 @@ FcRangeHash (const FcRange *r)
|
||||
{
|
||||
FcRange c = FcRangeCanonicalize (r);
|
||||
int b = (int) (c.u.d.begin * 100);
|
||||
- int e = (int) (c.u.d.end * 100);
|
||||
+ int e = FcDoubleCmpEQ (c.u.d.end, DBL_MAX) ? INT_MAX : (int) (c.u.d.end * 100);
|
||||
|
||||
return b ^ (b << 1) ^ (e << 9);
|
||||
}
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
From 7301f2f02816c5d44ee75dd0689c806c5aabdbda Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Mon, 23 Mar 2015 13:18:49 +0900
|
||||
Subject: Remove the dead code
|
||||
|
||||
|
||||
diff --git a/src/fcdir.c b/src/fcdir.c
|
||||
index 593382f..00dee72 100644
|
||||
--- a/src/fcdir.c
|
||||
+++ b/src/fcdir.c
|
||||
@@ -136,8 +136,6 @@ FcFileScanFontConfig (FcFontSet *set,
|
||||
ret = FcFalse;
|
||||
}
|
||||
}
|
||||
- else if (font)
|
||||
- FcPatternDestroy (font);
|
||||
id++;
|
||||
} while (font && ret && id < count);
|
||||
return ret;
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- configure.in.old 2006-03-31 18:31:26.000000000 +0200
|
||||
+++ configure.in 2006-03-31 18:44:47.000000000 +0200
|
||||
@@ -407,7 +407,11 @@
|
||||
# Let people not build/install docs if they don't have docbook
|
||||
#
|
||||
|
||||
-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
|
||||
+AC_ARG_ENABLE(docbook, [ --disable-docbook Don't build documentation],,)
|
||||
+
|
||||
+if test x$enable_docbook != xno; then
|
||||
+ AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
|
||||
+fi
|
||||
|
||||
AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
http://bugs.freedesktop.org/19128
|
||||
http://bugs.gentoo.org/303591
|
||||
http://bugzilla.redhat.com/468565
|
||||
http://bugzilla.gnome.org/502664
|
||||
|
||||
--- a/conf.d/30-urw-aliases.conf
|
||||
+++ b/conf.d/30-urw-aliases.conf
|
||||
@@ -29,6 +29,10 @@
|
||||
<family>Zapf Dingbats</family>
|
||||
<accept><family>Dingbats</family></accept>
|
||||
</alias>
|
||||
+ <alias binding="same">
|
||||
+ <family>ZapfDingbats</family>
|
||||
+ <accept><family>Dingbats</family></accept>
|
||||
+ </alias>
|
||||
<match target="pattern">
|
||||
<test name="family">
|
||||
<string>Symbol</string>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue