root
4 years ago
parent
c014457f53
commit
5c6a94565b
Binary file not shown.
Binary file not shown.
@ -1,5 +1,4 @@
|
||||
DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 566382d83a0230517d22e2630a9cb1aa631d761c914188a4e7fb15eddaedbd25b8a3dffa9893b1b2bbcc31d87a37cbe11b2b50ab0ec94a28f84018685d1b35c8 SHA512 a19d0978eb11071c228462cda496a59721541e57a1d15cb2d0964f287ac2d50b5587fa5bc2b8fe6be2a1f00cbf2e7c3bc59db6494e3e8c1906aa81437b30d073
|
||||
DIST sysstat-12.2.2.tar.gz 1227793 BLAKE2B 7dcfe904aa60e9c61af516e718668a3f8fb9e4274c51a2c9d44b5e56dc6cf27ffb18d44641970f75abe1c1f8a2c5df8b7a7874da8745757f937ccc2ffbfa03d4 SHA512 82f4fb1e78a26275bdc6f6939dd2c75d7822e930992e74c1eaeda65c0e873d88e777a7f315c7b073aaacb6956281b2119448af2ca22ae6e7f1d20c370b01e3e4
|
||||
DIST sysstat-12.3.1.tar.gz 1245248 BLAKE2B 69848c452642be992c7b4af33268c0d6b30f16e5ea44ec13b00ab57e6ec3b498d92b707a53757de9066138a9ee92b995765f44f75f692e1b3c68d829519d53ca SHA512 f67a2dac22748217687bd7f58521c0719754f13298fb5faed8a6d58c2bb1f8620428191d0415e816eea07bb3ca81453e057d03c7db0096430ad7d6ba6b7b611e
|
||||
DIST sysstat-12.3.2.tar.gz 1335057 BLAKE2B e075d0def13cd786dd0c3c49d0770cfe3e946a6b6f500e4364bc30d79fdec08ee8b4c4a2ef3b0188da3435f5921e0b27c8dbd8845a6c6116cba88f8684992674 SHA512 e78feb082a6ccd634f1f1565769b56a6b7aee95853334e73395489445f6f0d96d2b5bdfeacec16f4530be8383ebc3b6b126e7df93abc3e67c409b3791d02e275
|
||||
DIST sysstat-12.3.3.tar.gz 1365214 BLAKE2B bd7969bbade8e4d00fd1c918ee59222d136908d932caabdc042b0ff09fcf9b4462aece256969736b68b0bd0f0138692c1af446000cbe1d0e2d294105b7da7658 SHA512 9bebb36c6bc8d8a105921b43cf458cd4691d2dd29d9534b9bf9b00e2d1dd907e99c4aefb928da75b31c057784be59d0c6fb4420ad8c97b3c2600f5493094ca9a
|
||||
DIST sysstat-12.2.3.tar.gz 1227666 BLAKE2B e78cba586eb8e5f5a971f608ee0df39a20e3af9f02db1778c52bbb09eb4565e29ffb79d68ed00af0142ccbf1120b97825c638b323b53e0b210c96bf808db4aa1 SHA512 d837193b59840b1b1a87f927a4416ba4c688f3b470be00e9ab013b62b2f11e7b963ef4cf521bc42a0a041ea8923e176922ee5b6df56c0612b6646054b048f067
|
||||
DIST sysstat-12.4.0.tar.gz 1375207 BLAKE2B 66a9c15bb4e3b349158c9f7ab37d00c77844f0fd654df1b613141d906d3c89477e581d7143c77ba6952dd2cc7296f0611bc99aeec8e55e8090a488d5a286ee8b SHA512 156cb38bc4cedb68278d9054ce5b477cbdc84d2480ca302988c0fb5427b9f1f823f0939f2bc1c91fa7657b00b29d02d1f58aeafd342eef83b07d79c3f4141be4
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit eutils flag-o-matic systemd toolchain-funcs
|
||||
|
||||
DESCRIPTION="System performance tools for Linux"
|
||||
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="debug nls lm-sensors selinux static"
|
||||
|
||||
CDEPEND="
|
||||
nls? ( virtual/libintl )
|
||||
lm-sensors? ( sys-apps/lm-sensors:= )
|
||||
"
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-sysstat )
|
||||
"
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-11.0.4-cron.patch
|
||||
"${FILESDIR}"/${PN}-11.7.3-flags.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if use nls; then
|
||||
strip-linguas -i nls/
|
||||
local lingua pofile
|
||||
for pofile in nls/*.po; do
|
||||
lingua=${pofile/nls\/}
|
||||
lingua=${lingua/.po}
|
||||
if ! has ${lingua} ${LINGUAS}; then
|
||||
rm "nls/${lingua}.po" || die
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export AR
|
||||
use static && append-ldflags -static
|
||||
|
||||
sa_lib_dir=/usr/lib/sa \
|
||||
conf_dir=/etc \
|
||||
econf \
|
||||
$(use_enable lm-sensors sensors) \
|
||||
$(use_enable nls) \
|
||||
$(usex debug --enable-debuginfo '') \
|
||||
--enable-copy-only \
|
||||
--enable-documentation \
|
||||
--enable-install-cron \
|
||||
--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /var/log/sa
|
||||
|
||||
emake \
|
||||
CHOWN=true \
|
||||
DESTDIR="${D}" \
|
||||
DOC_DIR=/usr/share/doc/${PF} \
|
||||
MANGRPARG='' \
|
||||
install
|
||||
|
||||
dodoc -r contrib/
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}.init.d ${PN}
|
||||
systemd_dounit ${PN}.service
|
||||
|
||||
rm "${D}"/usr/share/doc/${PF}/COPYING || die
|
||||
}
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
DIST FinBiblia-1.1.zip 1484005 BLAKE2B 57ff18669847b161a35ac377983cf6fc18df3a724395e160b0563de50d5e21cce8cfb749ea622554690b195c0e51b623d31caa50eefbfcb2cffe01e3a1ee98e1 SHA512 dd6c384651b3f526e54b1da097205c5ea8c74a697c5b7fa0cbdf2d4d771b140468bc2823bbe886544c484f8f0135162b49fe7184ec1eb4476d1f05f5c834d6db
|
||||
DIST FinBiblia-2.0.zip 1885484 BLAKE2B 53222880dbaa7a34ebdaf19ae1b6478b8b8fd1cf76056425705719456b1b59e14497ff36766a35bfb7feb44e9ed2697e33d81219a0ab70f6b779067fe2a4be19 SHA512 93ebc3b8bd8babaa165cb7767e917434655c1726c3dc4c4cd96dff46f8e845b9ea36cb372f65372493464132a0fee15a6e5f8fdb4d142e2f830540c8b70167f6
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST FinPR-1.2.zip 1514588 BLAKE2B 6858560320280b3d9e043ba7b8778dbcb52c0e9bc0e8aa998c1f999fa729ae80a2d088279b3bb50a27d83bb9a1ef060a4f117130206d35ba336a8f2fdc87d35c SHA512 f0cf531a1f27275e597cfb62a19ea2e88b0098366dc5d1bad564e1bce77a47e41f2806c66e226e3dde877a505a7a7e490bbc76f3a9335b270e04120d65c4cbae
|
||||
DIST FinPR-1.2.2.zip 1514653 BLAKE2B 7fd6f786bf4512851306093f90fc26ee16d3e307e8809353e3fb2e86c2db19098054555a5b60efa4933488929a3d75f0d71d2e94c4ad999d1497ea1cc8bfb838 SHA512 e3796c39cb2a500c2e94c53979c1bab11ba7a60104e67440a2a6b2458775677cdc319198ced5af4b5398fb3e97fd503b372389e687eeffcc2ad23e90ffaa3227
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST FreBBB-1.1.zip 1535395 BLAKE2B 8a9a9d1b60488064e862c58bbd393c2faed1ac3e65f59512fe76fcb8ff7024550575b7d1b429975ec5fcea719231423907cfda2f41765e6429c63f8036cdc42f SHA512 d97227362dad68a40006b07e717abc3aaffdded14bdd950f17ffc42abb20bf6645e2e6e1adb92b372d62edc4218c43ccecdb16c221c60d29a5490d55c29e0066
|
||||
DIST FreBBB-1.3.zip 1578363 BLAKE2B 5175ac1cf66fda314b3e01d72717e35d16f9476315f5f37afcf074734412d4f5a6b71f9154496b1cca410c725af9aead97f10575b1f10823383c3f1ab565d0ae SHA512 71f947a6e78a1edbfc3e59cd045ec06b50767fde5a55d1868d0a3619d7d0506c23aaad9d69586f4327e3793fb02c615ecd29005d416c8b262aceff331ba0447c
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST FreCrampon-1.1.zip 1572977 BLAKE2B 81d710ba5404bc52306c25d714bc7dafce8f8d5d1f71e67a886f1a2322962c6dc3e4b13e62e198637622bafa163e1ca29c033a5d12374ab5ad7ca3d2d7165dfc SHA512 41853b727ed3807527135c83b3f1b9c0e7284cd74cf4bb7841d30712eac4405063b98c1d92cf31d97998982ac5a7b659e77e65d150e31bf017b3290be1e9f20a
|
||||
DIST FreCrampon-3.0.zip 2097817 BLAKE2B 22c47da09251b3f5f187347e8d3f07d63a49232268e1bb2765189d045d5e22b31b570582248ed213079c4ceb602582410b64ea3f76d8c5aec981a3644829a3e5 SHA512 24337f7b718c3aefe7c38ebc44aa98666c5748f493bbf80314a73fa885606f89ee08a48b8cfaa475b32e8ec68eec375c41e91ed61637186bf080e41927655799
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST Geneva1599-1.1.zip 1449107 BLAKE2B fb316611c5b8af0f702615197d3532a463930331b27d581f28b4863b92be65961542ea06b004a968fa066bfc60a28f5d84108fc5cb9cd21e5df92256f044132a SHA512 d89e8616ff06c9f6c1c39ecb7542568e9b3bcdc3c7de1aa38a6ea53a3eb87a9279b1a05f6804c2f3f00e5b47e68be6b01a8a768eac52b21f3c5a99fefe3ab8d5
|
||||
DIST Geneva1599-2.0.zip 1535614 BLAKE2B 16805bc79979363440855f4178f580e8bb48281eee15e480051e770a423e2d147aaa0b3cc391a4eee71fbbe6e34a684efb57cf98b1573ef6a794ca7d47d2a1b5 SHA512 d33af875c7e06074d1ceb5777e863097df0c8b3df9b1637975e5e3e0310dac3ee0e9ec51a3deb82da92ddb154808ad7902db7c1d22aeee68bb5201d1b2a6fc99
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST GerElb1871-1.1.zip 1733446 BLAKE2B 19f682151450fd65cee999aa2c9cc5f9a66fb4923755c11bab819dbf1ef11aa4d969f2c233020892bd8e8f3ba9a645eed88d70f0db40bc5a5f1651992b6d2260 SHA512 293d97bebf074de8cfad1b1cc0d62c47d29378b07c91ece870ab6a0c235a8c36572324d181a014c0b1ce46d56f67935bb17724a5ac4e9b7cf95aa0219a411d1c
|
||||
DIST GerElb1871-1.2.zip 1749307 BLAKE2B b699eec36f3f8294a372d2c23b8dce3e2055b1840b1f57fe2dd9e30ab99531c05046586dead63bb7b7a1c0e68c8b81af40b438d8f3f4860b73a640553d1877e3 SHA512 f5ea9ed51884166f4fcb11d597faa6783040717012c29750d0ac823aa73fb7ac69848404837e5b8e99cde68e57cd202322f40d8557da2b45fc39d4bb52c5815b
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST GerLut1545-1.2.zip 1463147 BLAKE2B 42c144540398634c71731e5277d167c0fe66fbcfd41e198c57709cd7883b3318b862804c061ece2847926d0b72eb18b29c176184be7211e0e502ddb99ecaf844 SHA512 bc58a7661f68936ee035bf89c580da7ee9f0ea678f81f859956f0c7074df39894a91bee4e5032db8d1e6bf4c05744de876e4890b9a85ca8f18a4c33144103fed
|
||||
DIST GerLut1545-2.0.1.zip 1517287 BLAKE2B a33cd85262d0b5900418d72e88e37ec77537e28c41adcabd130c86893f9d88f7a21983685c11b8552e798388bc6787c8482c33d433d76782fdb390915162623e SHA512 d247080dafbc24d57a14becfbef6c3fab8c43bea42085e9bc861bf02cc53e6f13ac0fe03b59e3ca26101b976db6edeaa096cd2941f80fd905cddd18eb362acc5
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST GerSch-1.1.zip 1573735 BLAKE2B d94aea6674c5c4cd7c59803b14c547abe6fd3c877b8cd2e71460b0358068a1516691f80ab783b9d3bad67a2b426ea169eeab1f7b3a92eacd5f82d453c0154b3e SHA512 483647dc8c7b2d691cc18ff58de6709894e04b50a6d9971bf8c2e5924677a73cd0fd4b7131793b9530cbeef6fb7e4456e1161d6861a1e500f9734c3f2160c396
|
||||
DIST GerSch-1.1.1.zip 1573777 BLAKE2B c11422e778ec199c16340c3191b08588ec6e6e25b95563a391da13d32a1aed50e9a6b4eac9519ade2969e850a0ee30ec9754312b0b2877a912f9a2e505b8636e SHA512 68b0a0b1bd084539f22123916c535ce09c3440dafcfd34e5363401294023f026d7246fcafb51b82d5b0b8114aef5b42db6dcb7dc80c5210f6b4b3749a95e60af
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST ItaDio-1.0.zip 1530887 BLAKE2B caef079a979f10dcefc5b3b63f4d3c2455dbcf89241b6afd8186306120f30ed9da51212739d765b98c354038b115be15e3074f6960927762f89a7b5d2cea0868 SHA512 7e2338fa743cd98437015bbd0c52df27999bc70563d7b923b2d23eb60e6f18baa5e272170838662c4f4c20c0d6bb97e4eef4f2460bbedd400ba4be1467ce59a8
|
||||
DIST ItaDio-1.1.zip 1579402 BLAKE2B 604b61130c8b24621ba05c040df61fd2555798c17cd859b248ecc3075a6646059a8f4b2e7f747c5208af81e7fd8ba0f5d53fc0cec8bda4b7b87937e789f5deed SHA512 560f19983f51d80e995e01abefe19455ebe3ae00b461930d58385621d1836f39e93bb9da973043f81fa3608cce48832cba556c337936e7c41ade01968d045c70
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST ItaRive-1.0.zip 1528624 BLAKE2B a1dabd9a299b89b2b4bbc1449a807de407610b50c893abf8ae6945322171b23b1247557735f54f281dc7b6dd4a2589a6a492f2dc5c98f9eec35931ae04e2f197 SHA512 8dbbd97f4a35ec5493dc335ff280ae18054c539d5fe30096b857dd61ab566768f945176c013d57658851826d3874ae944fde111d4c9e89c875dfc55dbd569dc6
|
||||
DIST ItaRive-1.1.zip 1575958 BLAKE2B 7f5071ddf807e37c9b3f4264ce6d2e5936dd09a0e22a07984773c8850d5b059197c402b8d8bf6a074e38f856904d03de6fef3f6097ea523fed6b4a15ab706cf6 SHA512 7f845fc9a2d8b248df22de2590971804944e2c6dd17ad5c1a711037ec200e95ae1b1b13cdc7433bb9630c91c04af605465169c9b2cd5b06adee4cfce92656162
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST JPS-1.2.zip 1086344 BLAKE2B 0d9875acda95a2fc204b9b21ee8828c89bf3d915f7d65543eef27f4ab17d3aa9ba3deb9b909601a6e4ba92aeb4a4e6fa7e9299cbdd4ac323e3692370206ffbb3 SHA512 fcc9dc8b552aa5074aab74086d2e3dd8f12b5419d1d9208bb3ea4bc86117bac5d69e3d3ef118d507317aa076ae1480774973d30904234cc6d478822b324c1844
|
||||
DIST JPS-2.1.zip 1157711 BLAKE2B 888d81775a0f933dec64ee83b204dd70b3ee94261cb0387475bd564521445ce75db74e2708ea04d3772a13caad3d95d01e4e588bb7fa60669bdb8e50691fb226 SHA512 78ee5dda684a2617b5749a4dbc9174cffc59addfe6ff988504de711e1b66da9c74bb0084b9c02e40f525c86a7dfc44a187d17b2ed7e68b769b81e941e17e3f7d
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST LITV-1.3.zip 1435344 BLAKE2B c60241f414a5cc9b747029d65dd79fae0634cf616f5a0af5d0213b9ba171b5677870bf52b4a529b3d59c1193783551f465efd72ff22cee35005e0f59d92fb943 SHA512 9aea030c96277bc591dac7bb45230c2ea006dbd241b2ada7be086a350ab0c5de8face5153c99d46ed35ecb00956f327cb1c7db0ed6f6d4c8ae0334085e6974b2
|
||||
DIST LITV-1.4.zip 1449901 BLAKE2B 34cc315144dd09f4b850fc5b1414fe20bc44d0880d08681435c6a6049d450853f06b5a7bb16789c52747706bea8b2ae1a0d05d95d3f32623ee8d2e640709a187 SHA512 fd1a70df91d08c048c8689ccd77e9f77dc53300543aa2a9ae6c413b04c31724dd8b088008b9f7087600200d881397a7b82ac9af5813becd53eb5041d6979de5b
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST MKJV-1.3.zip 1429038 BLAKE2B 50b781f6d6cf9a792eb353c8022a454a3da3cfe0e14facc4fda53f6e4b619f0f07e341258bcd258f9b3291ea7e67542f23c82ff1b9b08950272b80bf41f2b5d5 SHA512 2a6efa4f270cb783e122a73f1c66795237edd73da030b00654ae2e4ad43dc11ed4b9c59fbc0f64a9c3528bbc5f87ecdab207b24406a77714c7fd642e9e0613b4
|
||||
DIST MKJV-1.4.zip 1443590 BLAKE2B e4650b622ba7dccfa1443e2bcdd40933290fb670ddb32ddd84f4ecca89adc9edd06ca4b0a805ae462ee1c7e6ed10b312cabd8e8643c7911ee11758be43605934 SHA512 7f0c88f76b28f03c705f122289e574a3906a11847fde0f0737cfb7f7adc04cbe68cb9d501c854734fb4fc949528c5136aa75a68eda7ed3e8c3807e10ee09cfd6
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST Norsk-1.5.zip 1418861 BLAKE2B e915b99acbc957b07a1a562c4eb6fee50e9ac3f5a81564676b18693ab43ef494c355e9a150955d0ec3d83df9618dda41e94e4691b80200d0d159d89ead79fe77 SHA512 8244cffd408f286d6b7cac59b1f40d208aabc50b1728c993bc95dab0808b0d866f30710b13b63dd70cc1e8f36cb6fd4a8ba787688b4eb632784139cf25542c43
|
||||
DIST Norsk-2.0.zip 1509279 BLAKE2B e6819ad66b3925b8844061a60989b8d17e0dfd85807f9042fcd0db610f57aadf5442511fa5e494bb7c31253c49e03f5e087eeb9e2b76b907864b30abbe1fc97c SHA512 5793934f37deb1ee8fe9a6916741f99ce24dfd8bb6d1d3cba851b2d7e9882949a6548fcdd8f7a6add0002ce93f7c0f0fd4e0b8b6eec7959df43e7aa7b0caf27b
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST Peshitta-1.1.zip 308669 BLAKE2B 7a66088615c3180f45300d2ed7ede4dd1b26d0e6c542981b002e8f18982afdbb74463bb37df88cc7b483ca95dd3584364d0953aea44e25cdd3964018ea5a3a8e SHA512 0d25a25c65421f5538be69991d56c0cad3ac749dc3e85dd4004b029827a3d6796c5e713975c2af88820f97d672925443ebe05ca61c0f2f379f6dc3dd4271b5b0
|
||||
DIST Peshitta-2.0.zip 324100 BLAKE2B ba109b5fbb1ab09c34d8667bd1a0deda3669096f84bcee394ac438517f80ba9f223c4744b9acd851c8ffc6d1690f803bbc198e17525852b1fb1e1ef8e4731fa7 SHA512 af21f0e6fe15a585f82bbc5b29d659612bda5cacbc32739a708a986733c913b70f1197b03d0d97b9e5c0a5f13aefd0d4f932259776511fc9a4a87c6d757f70a0
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST Rotherham-1.6.zip 1579317 BLAKE2B d1d1bb11fd28a55c39dd211c5f15387d9512ef33bf95eec226e634d1a2bc59aff6fa024993c1e93409d1dc8b3ef07cb233527a88da5a5aa699cfb1d4d019151d SHA512 6a5122884fade9bfa8ce4430a35da5cf0593cafd1d6ed380b9c6455ea6033345d06a99e770cf1d823b3f88dc294550b52063ebc660bad10f1c8211675ac424e6
|
||||
DIST Rotherham-1.7.zip 1682887 BLAKE2B bfa0399059943adefefa442b00005e197c4bb9595c9868e48f3d2c5124e179a97bd7e6462debe86c24b1869af0ebc18c54af54265ef9676eab5a1b12e78f342b SHA512 bb192b47eaee4a81e1f643c3e29c5b94664beb5e7eb794f148f52a951425198fc41183dedd526a40d1854967f37cbebb264946b158227749509e55ad69dec2b8
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST RusMakarij-1.1.zip 308240 BLAKE2B e3b4a6aebec982e27d7da3af7d378cfbe3657e8796eedcc6c4551e425fef647acf284d86b227c1c3cda7df8728025d188793d9432101b60a434fde3195419c3c SHA512 88446e27cf2a8a4533a55692a0bdf4b8560be8124190a85f39a460b09927f8150ff773ea81c3429528f8012f6369ab8e4de4f1cabc2a9836f2a3376d9288e000
|
||||
DIST RusMakarij-2.0.zip 312568 BLAKE2B d60b79beacbbe98ce28f008030c03ccb09b18102171af206f1f5794edfa78ae84cc81f9da140989e7d267d264400074412b18807fb194c7035def6ad813a30a5 SHA512 0b3bc4d40df6af1d8d3a23785df396c7d784b6895735e215b3428156f3edc28bada41539d9d2c8b2816fa63c1e4ba57b6bf501cabda2a30e8cda2ecd7083fdb1
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST SpaRV-1.5.zip 1469089 BLAKE2B baec9ee474723ff6ff8c9ae7c8c31c6dcd7d6e055f149a93d9cb73bd0d469e2ac31c7c2290a3fccea317679d6263a900d5a4a487f1a06d32e5da84cbf0451f2c SHA512 99fbd0021e1e3a335068f786631bd173d7bc8f21430f7f04bba08e27f9734e0cbbedbcc7c6971368d0e009f1e2fd82536201fce686f9e4bb77d1e44fb3caad1c
|
||||
DIST SpaRV-1.6.zip 1548827 BLAKE2B cc1c3f5dd366e9e7bf33f4d15bd5b5e561ce9d1b5bb7b9d6d95f9759c9566fdde7a74fe8522312f4f24f5c1544913677827edc7effd983fe681600c744db9668 SHA512 f6674d42f01a02b8593bf293c334bc10736c77ba6a4e2671bfa69fd7c92524f61591b62f831aa615216c7a1a195f926a8b811688fc2daac7432c87861ada5913
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST SpaVNT-1.2.zip 367883 BLAKE2B 1efcfee3c84064b0c73e428650051c973cc45dd0663f185305a05151e41b14f8b3483a91521ce77919aeb7b71c17a6490045b8e31447ff4032a10f228805df4f SHA512 5dc5449963060216dac25bcd947ee50b3141e512e608868f427ef09001e82b5bd55a457e494a29e38cf73580ab2e188cf674fe4a4a26b4308be092c7faf2cd24
|
||||
DIST SpaVNT-1.2.1.zip 367945 BLAKE2B 322cd91b9520c1d0e89d6a2f5500a7fbcf9bfa608e1d927f94d9c83d9eabdb222d733eff9e6762be7081928f680af7814586252fa610364c3197404f752bbe29 SHA512 5341edd4427899d57413e8d595cb22fd4d29f21864d2a41a1a4285f26e26b0bef7b0ba257c8ca2514d5ed84dcb0b72edf5d3222fc00b2ae63aaeaf8dd8e20e01
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST TR-1.2.zip 1273411 BLAKE2B 6e1705522b53d76ef35f45e7e6159342138f34e9c855da64bc4add705a67aac7431035f93f7717d437214b4c9418b4516c2d9fbf347eafd9f0e03e3a5f12f0f8 SHA512 0bae1092a1afadd2a3d7d65cd1d981be4bcca4e6e4e3f6323a9abd337e006d65893a9735e013a906c63a94473ca4028eeecfe26b16942d4fb1a128c8540684f1
|
||||
DIST TR-2.4.zip 968375 BLAKE2B b24326bca58bc0adb0f10071f278ffc3b08a4d4197eacdbf00c2cfc34d3511d99daf3b78b0e964fdda204d897a5fd50eadb4ec865f5d858ed3e365d581eac9d1 SHA512 3b2527e66148b6d115259e6c84253c6b883b0cc7081f9ba53cf7584af21e72bb5e091f1bcc270229b4bb717273eebd0cb10572ab732e907509faa62e2ba7a238
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST Tisch-1.3.zip 394774 BLAKE2B 6339167ed661c75120dcbd8608c2aa77535ca8f2c8f582754cc28a5f50016789efc6903791630a3160313899418c6bc00084fc7660bcae7529964a4955e4b7e7 SHA512 0c6e83f9c392fb32c23660012e23229d15be079808679c3bd2d8985bba06af22ecd8297e796e095c0590f8b4894c9900f3daabb4061562ab62d4516878eb556a
|
||||
DIST Tisch-2.5.zip 1480224 BLAKE2B 8fcc55bf16bf383bae2ae61d5b7021470fe5770f669ac6efbb5aff2b894d4cfe1710f5883b3445ee9292dae0ee460f96270ece80e8e54effdd1de683999e744f SHA512 48037098f556694fd0ad0fbc103039df529d984672faca77e8fad4e4abec0cb61bde4cad3c6a8e0f0297b3d2fad184491671d6427b07047c757c5cabc8d1943a
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST UKJV-1.1.zip 1584221 BLAKE2B cd9dd0cef2416ca4a871807d71de5096f9fecb42cfdfd228f09ec1fd05f7c193cd972e67f6c5d3bc8b981d082c88aaa3d535ccf3c82045127c574896a2a2fc14 SHA512 1869a1b165d187bf0f1a11dd1ee032553576dcb7cd0f13707e6aa1956e0b9122b404751cded28be5d4a23c62420bdafeeb0c4af7426f5142a74246f28337614e
|
||||
DIST UKJV-1.1.1.zip 1584279 BLAKE2B e9fcad269272293a3f43d58b74fe10c9693e2bc4734bf6dd7e904b8b908fcf0974ccdbf12a080059f07501c3d0daf7e139f4101439893818f355af1e0806ab4e SHA512 d3dbbb07545f039637705062533a8c9fe68d6b06f4f175b6b435c63f8778fc30dc46ddc4036a58477a55934bedcd55695478fe93b1650f0786461a92d2b7d133
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST Ukrainian-1.3.zip 1719068 BLAKE2B 28370fb5295cd686810a42a5dde13060bec4ab9ec7e4d44016115db2b2ef1650d1a092d0d34a69a44783de3890311aa5d46e85497ddfb300dc0f000caa0b8cc5 SHA512 de2f5ce9096a6d7f33a38a88976db064a318960000c0e1540c3857c872ca5d902e8cca354014ec83167e9d7b1c89c468dff5359635b1e72b70366ab1b5e61c15
|
||||
DIST Ukrainian-1.4.zip 1763758 BLAKE2B dcc12d53abf7fd98f31a244aed9f49c7016fc8eb0dec53c2afe0fcbe5acf3933c66509c5c7eacb7900c06242ff7c5e8ff338f2d5060564d5215734238b1f6c0b SHA512 fa78ecbf167364fb79b6fe1afc74974c5248a6a0d16799ebbb65f954e9e6e6d5340ffff534d66ddd358b1386dc74cfd59c117bc979a198ff04383ea031fb3968
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST WHNU-1.10.zip 1281295 BLAKE2B 46e097d1c5de75565f1af3291bf47c8deb915da8338a56ef302dfa53c62780886e595210309b349da1e849301065836d7f737c23570794b8c67898b49b9e9ffc SHA512 c241ef99837c0e09e9b5192b134b2d61bc2fa6bbe8dd06661ec56fc7a9bc236adffe4fdad894db966884296f254858d92dc7b0bfcede19d902becf54dc1a6949
|
||||
DIST WHNU-2.4.zip 975858 BLAKE2B 870b87b3250a5aa8aed4c9a26f11f78460177e1ac49c399580747c9ec459ac76cd7a51266ca68d6cfa879c5435ab393bd0414660cfaf876ae1527bed625a32d5 SHA512 46390bf6c2a9344b98cfb43f096d3d476d6fa4d40e66bc070e8cb5a5efee71e7265c8ff9c42a1eaee458e912618fc843a4b28ebb239d2f09e3ba9f51353d2ad5
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST WLC-1.4.zip 2017282 BLAKE2B faccf4c8cacdbe60fe8bbfbef254ff2b5e5469c78b0390d6a6f1d2b1b45ec171d1dfc6055aae200c811d384c8683abc2f33d663cc40bb42510ae31d23c3df75e SHA512 71c45b2d5d30fb50ceda827464fe5d50350827b37b23b439341f61895f759de86edd1d77ffa26fc6e3acf0cf7759e7ae28645c360a2b14deeb9442e51aa9184a
|
||||
DIST WLC-1.9.zip 2165983 BLAKE2B 5373681d2935a3ecf750efca110b53d4764dff3bbc972f20d26ae2f31de816e90363051ffee425e79b3c63a1f73901533befe01e3292739938b8faf1d3843074 SHA512 c5c35a39b27b23684448840c2605964fa201b718e018c7c7ef26276679b06f57a77f062596d95a60d86ac4ac4f87fa8e55c65c1cd635a640aa7d79c6fbe2e725
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST Wulfila-1.0.zip 238923 BLAKE2B 3c496bc16881ecd1164678bc6cf4bcbc8bc2185af1cea961138e01fead350d31e076047d846d0b1ef23971ae934cc2f292c69bf454e0254fe41321817f5d553f SHA512 fcec30f54bdd95c77d2737f270909354fc1500196dd05d6a8aa02bf4b1b6ba61eef946ebbe523b90b1d5fb2c77ddd6f9b1e101949b7050bc4068cd9e2a9f8067
|
||||
DIST Wulfila-1.0.1.zip 239022 BLAKE2B a085ad5d8ddc4d2101cc582fb6f1e860bd00fe362b7db5d378c0dbcbf0e3691117e9b5737b40eeb3cf4a5662fb184ff0ccecdccfd115be775050d14d502f7901 SHA512 84ab398110546c31e8743cb99b310e35ffc26e022ce385dc54642b31838b4bd01ea586e40dcb5325cc21b408ed723ed49f0b0effab5e4c3342412bda23941326
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST Wycliffe-1.0.zip 421695 BLAKE2B d73da0fdef44c07265361d595a9c5d1464a3e3cc63d8857347f4aebd93b8d8ef73b9472af3b56ff9aa45ff250342556cfac82501085d31955880dad655faf70a SHA512 b67518357da85f64822f0ebd9a70a1f8a59363701d26ac808e3c745ec40eb3fb092848acad41ef2757d3de27ad06815ebd2a865ae991e563f07283e41e7fc9c4
|
||||
DIST Wycliffe-2.3.zip 1724021 BLAKE2B 3f9792967beba5af842a10f2eb375bd772dd2b5a0eadaed28d5d1d6ea4bf88fe3aa508624ae7a77892d0d15cf755e4feafbb73146548848e5df92af5d6185aa5 SHA512 1d4a4fbbb1f593cbb4d7bcc2beb216f3f832483dd371677114e63727bffb5d826084cb3b1d4de70c82d1518a260871b50a9991165d4e27c22bfbe0c7f6be0ae9
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,342 @@
|
||||
From 4b7f7a30c9ec593d68186b1dfef44d4e2bda735b Mon Sep 17 00:00:00 2001
|
||||
From: Benno Schulenberg <bensberg@telfort.nl>
|
||||
Date: Mon, 22 Jun 2020 08:39:59 +0200
|
||||
Subject: [PATCH] build: fix compilation when configured with
|
||||
--disable-speller
|
||||
|
||||
Move two functions that are used by the formatter too
|
||||
to between the proper #ifdef.
|
||||
|
||||
Problem existed since commit 8089f5ad from a month ago.
|
||||
|
||||
Backported to v4.9.3
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
---
|
||||
src/text.c | 302 ++++++++++++++++++++++++++---------------------------
|
||||
1 file changed, 151 insertions(+), 151 deletions(-)
|
||||
|
||||
diff --git a/src/text.c b/src/text.c
|
||||
index 93ad3704..c7690fd0 100644
|
||||
--- a/src/text.c
|
||||
+++ b/src/text.c
|
||||
@@ -2011,8 +2011,159 @@ void construct_argument_list(char ***arguments, char *command, char *filename)
|
||||
(*arguments)[count - 2] = filename;
|
||||
(*arguments)[count - 1] = NULL;
|
||||
}
|
||||
+
|
||||
+/* Open the specified file, and if that succeeds, remove the text of the marked
|
||||
+ * region or of the entire buffer and read the file contents into its place. */
|
||||
+bool replace_buffer(const char *filename, undo_type action, const char *operation)
|
||||
+{
|
||||
+ linestruct *was_cutbuffer = cutbuffer;
|
||||
+ int descriptor;
|
||||
+ FILE *stream;
|
||||
+
|
||||
+ descriptor = open_file(filename, FALSE, &stream);
|
||||
+
|
||||
+ if (descriptor < 0)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ cutbuffer = NULL;
|
||||
+
|
||||
+#ifndef NANO_TINY
|
||||
+ add_undo(COUPLE_BEGIN, operation);
|
||||
+
|
||||
+ /* Cut either the marked region or the whole buffer. */
|
||||
+ add_undo(action, NULL);
|
||||
+#endif
|
||||
+ do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
|
||||
+#ifndef NANO_TINY
|
||||
+ update_undo(action);
|
||||
#endif
|
||||
|
||||
+ /* Discard what was cut. */
|
||||
+ free_lines(cutbuffer);
|
||||
+ cutbuffer = was_cutbuffer;
|
||||
+
|
||||
+ /* Insert the spell-checked file into the cleared area. */
|
||||
+ read_file(stream, descriptor, filename, TRUE);
|
||||
+
|
||||
+#ifndef NANO_TINY
|
||||
+ add_undo(COUPLE_END, operation);
|
||||
+#endif
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+/* Execute the given program, with the given temp file as last argument. */
|
||||
+const char *treat(char *tempfile_name, char *theprogram, bool spelling)
|
||||
+{
|
||||
+ ssize_t lineno_save = openfile->current->lineno;
|
||||
+ size_t current_x_save = openfile->current_x;
|
||||
+ size_t pww_save = openfile->placewewant;
|
||||
+ bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
|
||||
+ struct stat fileinfo;
|
||||
+ long timestamp_sec, timestamp_nsec;
|
||||
+ static char **arguments = NULL;
|
||||
+ pid_t thepid;
|
||||
+ int program_status;
|
||||
+ bool replaced = FALSE;
|
||||
+
|
||||
+ /* Get the timestamp and the size of the temporary file. */
|
||||
+ stat(tempfile_name, &fileinfo);
|
||||
+ timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
|
||||
+ timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
|
||||
+
|
||||
+ /* If the number of bytes to check is zero, get out. */
|
||||
+ if (fileinfo.st_size == 0)
|
||||
+ return NULL;
|
||||
+
|
||||
+ /* Exit from curses mode to give the program control of the terminal. */
|
||||
+ endwin();
|
||||
+
|
||||
+ construct_argument_list(&arguments, theprogram, tempfile_name);
|
||||
+
|
||||
+ /* Fork a child process and run the given program in it. */
|
||||
+ if ((thepid = fork()) == 0) {
|
||||
+ execvp(arguments[0], arguments);
|
||||
+
|
||||
+ /* Terminate the child if the program is not found. */
|
||||
+ exit(9);
|
||||
+ } else if (thepid < 0)
|
||||
+ return _("Could not fork");
|
||||
+
|
||||
+ /* Block SIGWINCHes while waiting for the program to end,
|
||||
+ * so nano doesn't get pushed past the wait(). */
|
||||
+ block_sigwinch(TRUE);
|
||||
+ wait(&program_status);
|
||||
+ block_sigwinch(FALSE);
|
||||
+
|
||||
+ /* Restore the terminal state and reenter curses mode. */
|
||||
+ terminal_init();
|
||||
+ doupdate();
|
||||
+
|
||||
+ if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
|
||||
+ statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
|
||||
+ return NULL;
|
||||
+ } else if (WEXITSTATUS(program_status) != 0)
|
||||
+ statusline(ALERT, _("Program '%s' complained"), arguments[0]);
|
||||
+
|
||||
+ /* Stat the temporary file again. */
|
||||
+ stat(tempfile_name, &fileinfo);
|
||||
+
|
||||
+ /* When the temporary file wasn't touched, say so and leave. */
|
||||
+ if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
|
||||
+ (long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
|
||||
+ statusbar(_("Nothing changed"));
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+#ifndef NANO_TINY
|
||||
+ /* Replace the marked text (or entire text) with the corrected text. */
|
||||
+ if (spelling && openfile->mark) {
|
||||
+ ssize_t was_mark_lineno = openfile->mark->lineno;
|
||||
+ bool upright = mark_is_before_cursor();
|
||||
+
|
||||
+ replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
|
||||
+
|
||||
+ /* Adjust the end point of the marked region for any change in
|
||||
+ * length of the region's last line. */
|
||||
+ if (upright)
|
||||
+ current_x_save = openfile->current_x;
|
||||
+ else
|
||||
+ openfile->mark_x = openfile->current_x;
|
||||
+
|
||||
+ /* Restore the mark. */
|
||||
+ openfile->mark = line_from_number(was_mark_lineno);
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
+ openfile->current = openfile->filetop;
|
||||
+ openfile->current_x = 0;
|
||||
+
|
||||
+ replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
|
||||
+ /* TRANSLATORS: The next two go with Undid/Redid messages. */
|
||||
+ (spelling ? N_("spelling correction") : N_("formatting")));
|
||||
+ }
|
||||
+
|
||||
+ /* Go back to the old position. */
|
||||
+ goto_line_posx(lineno_save, current_x_save);
|
||||
+ if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
|
||||
+ openfile->current_x = strlen(openfile->current->data);
|
||||
+
|
||||
+#ifndef NANO_TINY
|
||||
+ if (replaced)
|
||||
+ update_undo(COUPLE_END);
|
||||
+#endif
|
||||
+
|
||||
+ openfile->placewewant = pww_save;
|
||||
+ adjust_viewport(STATIONARY);
|
||||
+
|
||||
+ if (spelling)
|
||||
+ statusbar(_("Finished checking spelling"));
|
||||
+ else
|
||||
+ statusbar(_("Buffer has been processed"));
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+#endif /* ENABLE_SPELLER || ENABLE_COLOR */
|
||||
+
|
||||
#ifdef ENABLE_SPELLER
|
||||
/* Let the user edit the misspelled word. Return FALSE if the user cancels. */
|
||||
bool fix_spello(const char *word)
|
||||
@@ -2307,157 +2458,6 @@ const char *do_int_speller(const char *tempfile_name)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-/* Open the specified file, and if that succeeds, remove the text of the marked
|
||||
- * region or of the entire buffer and read the file contents into its place. */
|
||||
-bool replace_buffer(const char *filename, undo_type action, const char *operation)
|
||||
-{
|
||||
- linestruct *was_cutbuffer = cutbuffer;
|
||||
- int descriptor;
|
||||
- FILE *stream;
|
||||
-
|
||||
- descriptor = open_file(filename, FALSE, &stream);
|
||||
-
|
||||
- if (descriptor < 0)
|
||||
- return FALSE;
|
||||
-
|
||||
- cutbuffer = NULL;
|
||||
-
|
||||
-#ifndef NANO_TINY
|
||||
- add_undo(COUPLE_BEGIN, operation);
|
||||
-
|
||||
- /* Cut either the marked region or the whole buffer. */
|
||||
- add_undo(action, NULL);
|
||||
-#endif
|
||||
- do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
|
||||
-#ifndef NANO_TINY
|
||||
- update_undo(action);
|
||||
-#endif
|
||||
-
|
||||
- /* Discard what was cut. */
|
||||
- free_lines(cutbuffer);
|
||||
- cutbuffer = was_cutbuffer;
|
||||
-
|
||||
- /* Insert the spell-checked file into the cleared area. */
|
||||
- read_file(stream, descriptor, filename, TRUE);
|
||||
-
|
||||
-#ifndef NANO_TINY
|
||||
- add_undo(COUPLE_END, operation);
|
||||
-#endif
|
||||
- return TRUE;
|
||||
-}
|
||||
-
|
||||
-/* Execute the given program, with the given temp file as last argument. */
|
||||
-const char *treat(char *tempfile_name, char *theprogram, bool spelling)
|
||||
-{
|
||||
- ssize_t lineno_save = openfile->current->lineno;
|
||||
- size_t current_x_save = openfile->current_x;
|
||||
- size_t pww_save = openfile->placewewant;
|
||||
- bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
|
||||
- struct stat fileinfo;
|
||||
- long timestamp_sec, timestamp_nsec;
|
||||
- static char **arguments = NULL;
|
||||
- pid_t thepid;
|
||||
- int program_status;
|
||||
- bool replaced = FALSE;
|
||||
-
|
||||
- /* Get the timestamp and the size of the temporary file. */
|
||||
- stat(tempfile_name, &fileinfo);
|
||||
- timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
|
||||
- timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
|
||||
-
|
||||
- /* If the number of bytes to check is zero, get out. */
|
||||
- if (fileinfo.st_size == 0)
|
||||
- return NULL;
|
||||
-
|
||||
- /* Exit from curses mode to give the program control of the terminal. */
|
||||
- endwin();
|
||||
-
|
||||
- construct_argument_list(&arguments, theprogram, tempfile_name);
|
||||
-
|
||||
- /* Fork a child process and run the given program in it. */
|
||||
- if ((thepid = fork()) == 0) {
|
||||
- execvp(arguments[0], arguments);
|
||||
-
|
||||
- /* Terminate the child if the program is not found. */
|
||||
- exit(9);
|
||||
- } else if (thepid < 0)
|
||||
- return _("Could not fork");
|
||||
-
|
||||
- /* Block SIGWINCHes while waiting for the program to end,
|
||||
- * so nano doesn't get pushed past the wait(). */
|
||||
- block_sigwinch(TRUE);
|
||||
- wait(&program_status);
|
||||
- block_sigwinch(FALSE);
|
||||
-
|
||||
- /* Restore the terminal state and reenter curses mode. */
|
||||
- terminal_init();
|
||||
- doupdate();
|
||||
-
|
||||
- if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
|
||||
- statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
|
||||
- return NULL;
|
||||
- } else if (WEXITSTATUS(program_status) != 0)
|
||||
- statusline(ALERT, _("Program '%s' complained"), arguments[0]);
|
||||
-
|
||||
- /* Stat the temporary file again. */
|
||||
- stat(tempfile_name, &fileinfo);
|
||||
-
|
||||
- /* When the temporary file wasn't touched, say so and leave. */
|
||||
- if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
|
||||
- (long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
|
||||
- statusbar(_("Nothing changed"));
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
-#ifndef NANO_TINY
|
||||
- /* Replace the marked text (or entire text) with the corrected text. */
|
||||
- if (spelling && openfile->mark) {
|
||||
- ssize_t was_mark_lineno = openfile->mark->lineno;
|
||||
- bool upright = mark_is_before_cursor();
|
||||
-
|
||||
- replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
|
||||
-
|
||||
- /* Adjust the end point of the marked region for any change in
|
||||
- * length of the region's last line. */
|
||||
- if (upright)
|
||||
- current_x_save = openfile->current_x;
|
||||
- else
|
||||
- openfile->mark_x = openfile->current_x;
|
||||
-
|
||||
- /* Restore the mark. */
|
||||
- openfile->mark = line_from_number(was_mark_lineno);
|
||||
- } else
|
||||
-#endif
|
||||
- {
|
||||
- openfile->current = openfile->filetop;
|
||||
- openfile->current_x = 0;
|
||||
-
|
||||
- replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
|
||||
- /* TRANSLATORS: The next two go with Undid/Redid messages. */
|
||||
- (spelling ? N_("spelling correction") : N_("formatting")));
|
||||
- }
|
||||
-
|
||||
- /* Go back to the old position. */
|
||||
- goto_line_posx(lineno_save, current_x_save);
|
||||
- if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
|
||||
- openfile->current_x = strlen(openfile->current->data);
|
||||
-
|
||||
-#ifndef NANO_TINY
|
||||
- if (replaced)
|
||||
- update_undo(COUPLE_END);
|
||||
-#endif
|
||||
-
|
||||
- openfile->placewewant = pww_save;
|
||||
- adjust_viewport(STATIONARY);
|
||||
-
|
||||
- if (spelling)
|
||||
- statusbar(_("Finished checking spelling"));
|
||||
- else
|
||||
- statusbar(_("Buffer has been processed"));
|
||||
-
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
/* Spell check the current file. If an alternate spell checker is
|
||||
* specified, use it. Otherwise, use the internal spell checker. */
|
||||
void do_spell(void)
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
From a98f48b4e82db7d30aa04925fb28344f5bce8c7c Mon Sep 17 00:00:00 2001
|
||||
From: Benno Schulenberg <bensberg@telfort.nl>
|
||||
Date: Mon, 22 Jun 2020 14:00:23 +0200
|
||||
Subject: [PATCH] build: fix compilation for --enable-tiny --enable-color
|
||||
--enable-nanorc
|
||||
|
||||
Backported to v4.9.3
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
---
|
||||
src/nano.c | 2 +-
|
||||
src/text.c | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/nano.c b/src/nano.c
|
||||
index be80a073..3ac81ba4 100644
|
||||
--- a/src/nano.c
|
||||
+++ b/src/nano.c
|
||||
@@ -1079,7 +1079,7 @@ RETSIGTYPE do_continue(int signal)
|
||||
ungetch(KEY_FLUSH);
|
||||
}
|
||||
|
||||
-#if !defined(NANO_TINY) || defined(ENABLE_SPELLER)
|
||||
+#if !defined(NANO_TINY) || defined(ENABLE_SPELLER) || defined(ENABLE_COLOR)
|
||||
/* Block or unblock the SIGWINCH signal, depending on the blockit parameter. */
|
||||
void block_sigwinch(bool blockit)
|
||||
{
|
||||
diff --git a/src/text.c b/src/text.c
|
||||
index c7690fd0..32727946 100644
|
||||
--- a/src/text.c
|
||||
+++ b/src/text.c
|
||||
@@ -2032,10 +2032,10 @@ bool replace_buffer(const char *filename, undo_type action, const char *operatio
|
||||
|
||||
/* Cut either the marked region or the whole buffer. */
|
||||
add_undo(action, NULL);
|
||||
-#endif
|
||||
do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
|
||||
-#ifndef NANO_TINY
|
||||
update_undo(action);
|
||||
+#else
|
||||
+ do_snip(FALSE, TRUE, FALSE, FALSE);
|
||||
#endif
|
||||
|
||||
/* Discard what was cut. */
|
||||
--
|
||||
2.28.0
|
||||
|
||||
Binary file not shown.
@ -1,22 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
DESCRIPTION="Manages the /bin/sh (POSIX shell) symlink"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="app-eselect/eselect-lib-bin-symlink"
|
||||
|
||||
S=${FILESDIR}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/eselect/modules
|
||||
newins sh.eselect-${PVR} sh.eselect
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
DESCRIPTION="Manage /bin/sh (POSIX shell) implementations"
|
||||
MAINTAINER="mgorny@gentoo.org"
|
||||
VERSION="0.4"
|
||||
|
||||
SYMLINK_PATH=/bin/sh
|
||||
SYMLINK_TARGETS=( bash dash posh mksh )
|
||||
SYMLINK_DESCRIPTION='POSIX shell'
|
||||
SYMLINK_CRUCIAL=1
|
||||
|
||||
inherit bin-symlink
|
||||
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST ddcutil-0.9.1.tar.gz 656853 BLAKE2B e4f11253176587cb5ee3c9647a01ab04d5a92ce4ca7a4098378318fc069e635e43c3716ace316498f64ceaaa00aa90db3b5f409b74b8d7089a7c25254c0e360d SHA512 b2d5866606a4bc081d89180e910822f2a2a653a2782e3df582536ddc86c7d3dc02309dbb41f8d566f6ebdc5d82d3aa11792a04c28b3d83552b024dfd59891fda
|
||||
DIST ddcutil-0.9.5.tar.gz 681534 BLAKE2B 6746c239738d4f8eb7fe56323816fadee9b8fa9ad2b66a8242782e0b2688182c0140b40b9eddb3b54ad32c7ff7d1f0cf9a28c5477a48d90cc39431ed82f5d443 SHA512 6249ebdbb398ad5a6c32f3891be8bf5328114b1ed08afd75adf4b67f10a40f19451e188ce5cd88b3153a18f317e394146a34258a7d2298f126be227d7e1c25e8
|
||||
DIST ddcutil-0.9.9.tar.gz 725207 BLAKE2B ad7b0b35ad4c2dae21da066e4194209579d774ded10f2dc0d8d7d3d94e70d5893c3d1f772b86ea01be510cfb8d51a657178228d028ca34ab20d344e86e0581d2 SHA512 f7b2b961c6b76ef59f336290b494cdd331556848de881d57e5240075d50733030df4c47131070f1276907d712a45f60dad6bebaa052a66621b8b5517ff293c21
|
||||
|
||||
@ -0,0 +1,114 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools flag-o-matic linux-info udev user
|
||||
|
||||
DESCRIPTION="Program for querying and changing monitor settings"
|
||||
HOMEPAGE="http://www.ddcutil.com/"
|
||||
SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
|
||||
REQUIRED_USE="drm? ( X )"
|
||||
|
||||
RDEPEND="dev-libs/glib:2
|
||||
sys-apps/i2c-tools
|
||||
virtual/udev
|
||||
drm? ( x11-libs/libdrm )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
|
||||
usb-monitor? (
|
||||
dev-libs/hidapi
|
||||
virtual/libusb:1
|
||||
sys-apps/usbutils
|
||||
)
|
||||
X? (
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libX11
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_pretend() {
|
||||
# This program needs /dev/ic2-* devices to communicate with the monitor.
|
||||
CONFIG_CHECK="~I2C_CHARDEV"
|
||||
ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
|
||||
if use usb-monitor; then
|
||||
CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
|
||||
ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
|
||||
ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
|
||||
fi
|
||||
|
||||
# Now do the actual checks setup above
|
||||
check_extra_config
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
sed -i -e "s#usr/local/bin#usr/bin#" data/etc/udev/rules.d/45-ddcutil-usb.rules || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Bug 607818.
|
||||
replace-flags -O3 -O2
|
||||
|
||||
local myeconfargs=(
|
||||
$(use_enable drm)
|
||||
$(use_enable usb-monitor usb)
|
||||
$(use_enable X x11)
|
||||
--enable-lib
|
||||
# Please read upstream's note about the original purpose of these flags before re-enabling them:
|
||||
# https://github.com/rockowitz/ddcutil/issues/128
|
||||
# As of 0.9.9 the following no longer compile:
|
||||
# Python3 & CFFI is already broken as of Python 3.7, with future removal;
|
||||
# SWIG : Python3.7 breakage as well PyFileObject vs PyCodeObject
|
||||
--disable-cffi
|
||||
--disable-cython
|
||||
--disable-swig
|
||||
$(use_enable introspection)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
if use user-permissions; then
|
||||
udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
|
||||
if use usb-monitor; then
|
||||
udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use user-permissions; then
|
||||
enewgroup i2c
|
||||
einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
|
||||
einfo "users to the i2c group: usermod -aG i2c user"
|
||||
einfo "Restart the computer or reload the i2c-dev module to activate"
|
||||
einfo "the new udev rule."
|
||||
einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
|
||||
|
||||
if use usb-monitor; then
|
||||
enewgroup video
|
||||
einfo "To allow non-root users access to USB monitors, add those users"
|
||||
einfo "to the video group: usermod -aG video user"
|
||||
einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
|
||||
einfo "the monitor to activate the new udev rule."
|
||||
einfo "For more information read: http://www.ddcutil.com/usb/"
|
||||
fi
|
||||
|
||||
udev_reload
|
||||
fi
|
||||
|
||||
if use video_cards_nvidia; then
|
||||
ewarn "Please read the following webpage on proper usage with the nVidia "
|
||||
ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b2a5c874c3fa4030ab5a8a16759ee289609d428a3fc1338078cd73d234060354513be88c184d5a6bbec545d SHA512 99904b1a38b8a05ff7bf7c265aa463a56ea3aa6c77dd844dc2d154faae5460e3535f4e9799e8863fda256ee6cd374e051ed98193c9b1fc52dc30c9c2655010cd
|
||||
DIST gemato-14.4.tar.gz 72630 BLAKE2B c8956b979d7c8629e245ba339e8ee707cd51ffe545a85c712c31b97ee2aaabef7a4964cac46c9cd8c4954c33529623293a94a26ae40b578a6b640aab15d47835 SHA512 0b514e4ff7773eefd2d9adc063a4fbc6a1e7d9ea3dfa783b1d5a8e6ec1e482533a8c70cd5e200a8b9671161d77e14254ad14aee6659e3c96eb9be3bbedcf11af
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
|
||||
PYTHON_REQ_USE='threads(+)'
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Stand-alone Manifest generation & verification tool"
|
||||
HOMEPAGE="https://github.com/mgorny/gemato"
|
||||
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
|
||||
IUSE="+gpg tools"
|
||||
|
||||
RDEPEND="
|
||||
gpg? ( app-crypt/gnupg )"
|
||||
|
||||
distutils_enable_tests setup.py
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
|
||||
if use tools; then
|
||||
exeinto /usr/share/gemato
|
||||
doexe utils/*.{bash,py}
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -1,5 +1,6 @@
|
||||
DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f87d9a8f645b5af8342da90337202b0247b07dccd8995f55bb965b5c2bbdddc24b55b6e92e899f91d5dec19c10ddea8fcc42c8ed3d74ee90eb09d6 SHA512 b0652c3277b8390f47039366380fceacfd3cd9014fe42306a947f6749c6192657b77e3d832044828bea06c43f1f5e745e6b4ff8dd24efc73d9ad5261c4c73a5e
|
||||
DIST calibre-4.20.0.tar.xz 36997620 BLAKE2B 28ee9539eda96809004f4c276c8dceba119122379867f4b9235ad52a3ec68337330c4cbc2e715462f27ea0c3a0c8470609a50273db49a69f69a60e7fbcef11a5 SHA512 97e33c0a4a53c0b799ed76fde6327570d3e6356a812836d204ce0e6f5273715e274fdf2e987a0446b61ce6aceb4ce5cfda9c0cb8a2f2871efd83b76acbc43820
|
||||
DIST calibre-4.21.0.tar.xz 36937392 BLAKE2B 7797e1b99eefa795a84a1ce913b7739ce6961d58ea28c68e3f5a1b756bbec20c206bd7cab25f1ffacc33f39fed2cc4acf99b5bb90ba88b0607987801770d8b30 SHA512 d2e711d2dec77b41a7930cfd39a7597d1b56fdd57bad44686efdf4be66321565622f42e20dfd844c90cc5f2d6625c17b4e8997b9b4592648af1664fda341bf27
|
||||
DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b6736be01f55874951a9a0c81a70c82e23e723db1d81d13917eaf615e65752a100fbc1cb43bdca0b3c4543e3b17cf43 SHA512 b9db1c72cf010c25563e3f86a75478ac872249034b3c8b09bb8f0c2519487bb78dea821c9e45564fb645d17431bbee96459a28ee036e57830faedea4cd94b423
|
||||
DIST calibre-4.9.1-bug-731786.patch 1069 BLAKE2B 8b57fb89c9ec2d3a435fbc90f514d45468ceb96b46428efd5d2084cc9bb6137b49dd90dc2f7e574b6d8b8d536728392863046b068c39c8f9bcc3ae23678ac590 SHA512 acd158923bb369270155b3032b033a8387bcb53d1b0ea3e2c0724a40ec0cff6add5fca85649caaf37db0a0878fc3dafacc98b2b641cf10a8d58dc719642c6be5
|
||||
DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
|
||||
|
||||
@ -0,0 +1,274 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6..8} )
|
||||
PYTHON_REQ_USE="sqlite,ssl"
|
||||
|
||||
inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
|
||||
|
||||
DESCRIPTION="Ebook management application"
|
||||
HOMEPAGE="https://calibre-ebook.com/"
|
||||
SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="
|
||||
GPL-3+
|
||||
GPL-3
|
||||
GPL-2+
|
||||
GPL-2
|
||||
GPL-1+
|
||||
LGPL-3+
|
||||
LGPL-2.1+
|
||||
LGPL-2.1
|
||||
BSD
|
||||
MIT
|
||||
Old-MIT
|
||||
Apache-2.0
|
||||
public-domain
|
||||
|| ( Artistic GPL-1+ )
|
||||
CC-BY-3.0
|
||||
OFL-1.1
|
||||
PSF-2
|
||||
"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
SLOT="0"
|
||||
IUSE="ios +udisks"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
COMMON_DEPEND="${PYTHON_DEPS}
|
||||
>=app-text/hunspell-1.7:=
|
||||
>=app-text/podofo-0.9.6_pre20171027:=
|
||||
>=app-text/poppler-0.26.5[qt5]
|
||||
>=dev-libs/chmlib-0.40:=
|
||||
dev-libs/glib:2=
|
||||
dev-libs/hyphen:=
|
||||
>=dev-libs/icu-57.1:=
|
||||
dev-libs/libinput:=
|
||||
>=dev-libs/dbus-glib-0.106
|
||||
>=sys-apps/dbus-1.10.8
|
||||
$(python_gen_cond_dep '
|
||||
>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
|
||||
dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
|
||||
dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
|
||||
>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
|
||||
dev-python/regex[${PYTHON_MULTI_USEDEP}]
|
||||
dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
|
||||
')
|
||||
dev-qt/qtcore:5=
|
||||
dev-qt/qtdbus:5=
|
||||
dev-qt/qtgui:5=[jpeg]
|
||||
>=dev-qt/qtwebengine-5.12
|
||||
dev-qt/qtwidgets:5=
|
||||
dev-util/desktop-file-utils
|
||||
dev-util/gtk-update-icon-cache
|
||||
media-fonts/liberation-fonts
|
||||
media-libs/fontconfig:=
|
||||
>=media-libs/freetype-2:=
|
||||
>=media-libs/libmtp-1.1.11:=
|
||||
>=media-libs/libwmf-0.2.8
|
||||
>=media-gfx/optipng-0.7.6
|
||||
>=sys-libs/zlib-1.2.11:=
|
||||
virtual/libusb:1=
|
||||
x11-libs/libxkbcommon:=
|
||||
x11-libs/libX11:=
|
||||
x11-libs/libXext:=
|
||||
x11-libs/libXrender:=
|
||||
x11-misc/shared-mime-info
|
||||
>=x11-misc/xdg-utils-1.0.2-r2
|
||||
ios? (
|
||||
>=app-pda/usbmuxd-1.0.8
|
||||
>=app-pda/libimobiledevice-1.2.0
|
||||
)
|
||||
udisks? ( virtual/libudev )"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
udisks? ( sys-fs/udisks:2 )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
$(python_gen_cond_dep '
|
||||
>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
|
||||
dev-python/sip[${PYTHON_MULTI_USEDEP}]
|
||||
')
|
||||
>=virtual/podofo-build-0.9.6_pre20171027
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_pretend() {
|
||||
if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
|
||||
eerror "Calibre cannot be built with this version of gcc."
|
||||
eerror "You need at least gcc-6.0"
|
||||
die "Your C compiler is too old for this package."
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# no_updates: do not annoy user with "new version is availible all the time
|
||||
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
|
||||
eapply \
|
||||
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
|
||||
"${FILESDIR}/${PN}-disable_plugins.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix outdated version constant.
|
||||
#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
|
||||
# -i src/calibre/constants.py || \
|
||||
# die "sed failed to patch constants.py"
|
||||
|
||||
# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
|
||||
# calls xdg-* (bug #258938).
|
||||
sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
|
||||
-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
|
||||
-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
|
||||
-e "s|, PreserveMIMEDefaults():|:|" \
|
||||
-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
|
||||
-e "s|cmd\[2\]|cmd[4]|" \
|
||||
-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
|
||||
-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
|
||||
-i src/calibre/linux.py || die "sed failed to patch linux.py"
|
||||
|
||||
# Disable unnecessary privilege dropping for bug #287067.
|
||||
sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
|
||||
-i setup/install.py || die "sed failed to patch install.py"
|
||||
|
||||
sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
|
||||
\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
|
||||
'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
|
||||
'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
|
||||
'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
|
||||
'-i', 'Makefile'])" \
|
||||
-i setup/build.py || die "sed failed to patch build.py"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# calibre works with python 3, so remove the python 2 constraint
|
||||
export CALIBRE_PY3_PORT=1
|
||||
|
||||
# Bypass kbuildsycoca and update-mime-database in order to
|
||||
# avoid sandbox violations if xdg-mime tries to call them.
|
||||
cat - > "${T}/kbuildsycoca" <<-EOF
|
||||
#!${BASH}
|
||||
echo $0 : $@
|
||||
exit 0
|
||||
EOF
|
||||
|
||||
cp "${T}"/{kbuildsycoca,update-mime-database} || die
|
||||
chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
|
||||
|
||||
export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
|
||||
|
||||
# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
|
||||
# violation with kbuildsycoca as in bug #287067, comment #13.
|
||||
export -n DISPLAY
|
||||
|
||||
# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
|
||||
# File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
|
||||
# return _parse_localename(localename)
|
||||
# File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
|
||||
# raise ValueError, 'unknown locale: %s' % localename
|
||||
#ValueError: unknown locale: 46
|
||||
export -n LANG LANGUAGE ${!LC_*}
|
||||
export LC_ALL=C.utf8 #709682
|
||||
|
||||
# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
|
||||
# variables to point to our fake temporary $HOME.
|
||||
export HOME="${T}/fake_homedir"
|
||||
export XDG_CONFIG_HOME="${HOME}/.config"
|
||||
export XDG_DATA_HOME="${HOME}/.local/share"
|
||||
export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
|
||||
mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
|
||||
|
||||
tc-export CC CXX
|
||||
# Bug #334243 - respect LDFLAGS when building extensions
|
||||
export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
|
||||
local libdir=$(get_libdir)
|
||||
[[ -n $libdir ]] || die "get_libdir returned an empty string"
|
||||
|
||||
addpredict /dev/dri #665310
|
||||
|
||||
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
|
||||
"${PYTHON}" setup.py install \
|
||||
--root="${D}" \
|
||||
--prefix="${EPREFIX}/usr" \
|
||||
--libdir="${EPREFIX}/usr/${libdir}" \
|
||||
--staging-root="${ED}/usr" \
|
||||
--staging-libdir="${ED}/usr/${libdir}" || die
|
||||
|
||||
rm "${ED}/usr/share/applications/defaults.list" || die
|
||||
find "${ED}"/usr/share -type d -empty -delete
|
||||
|
||||
cd "${ED}"/usr/share/calibre/fonts/liberation || die
|
||||
local x
|
||||
for x in * ; do
|
||||
[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
|
||||
ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
|
||||
done
|
||||
|
||||
einfo "Converting python shebangs"
|
||||
python_fix_shebang --force "${ED}"
|
||||
|
||||
einfo "Compiling python modules"
|
||||
python_optimize "${ED}"/usr/lib/calibre
|
||||
|
||||
newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
|
||||
newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
|
||||
|
||||
bashcomp_alias calibre \
|
||||
lrfviewer \
|
||||
calibre-debug \
|
||||
ebook-meta \
|
||||
calibre-server \
|
||||
ebook-viewer \
|
||||
ebook-polish \
|
||||
fetch-ebook-metadata \
|
||||
lrf2lrs \
|
||||
ebook-convert \
|
||||
ebook-edit \
|
||||
calibre-smtp \
|
||||
ebook-device
|
||||
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Indentify stray directories from upstream's "Binary install"
|
||||
# method (see bug 622728).
|
||||
CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
|
||||
CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
|
||||
printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
|
||||
local x
|
||||
for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
|
||||
if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
|
||||
elog "Purging '${x}'"
|
||||
rm -rf "${x}"
|
||||
fi
|
||||
done
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,94 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eapi7-ver java-vm-2
|
||||
|
||||
abi_uri() {
|
||||
echo "${2-$1}? (
|
||||
https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
|
||||
)"
|
||||
}
|
||||
|
||||
MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
|
||||
SLOT="$(ver_cut 1)"
|
||||
|
||||
DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
|
||||
HOMEPAGE="https://adoptopenjdk.net"
|
||||
SRC_URI="
|
||||
$(abi_uri arm)
|
||||
$(abi_uri ppc64le ppc64)
|
||||
$(abi_uri x64 amd64)
|
||||
"
|
||||
|
||||
LICENSE="GPL-2-with-classpath-exception"
|
||||
KEYWORDS="~amd64 ~arm ~ppc64"
|
||||
|
||||
IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
|
||||
|
||||
RDEPEND="
|
||||
media-libs/fontconfig:1.0
|
||||
media-libs/freetype:2
|
||||
>=sys-apps/baselayout-java-0.1.0-r1
|
||||
>=sys-libs/glibc-2.2.5:*
|
||||
sys-libs/zlib
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
arm? ( dev-libs/libffi-compat:6 )
|
||||
cups? ( net-print/cups )
|
||||
selinux? ( sec-policy/selinux-java )
|
||||
!headless-awt? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXtst
|
||||
)
|
||||
"
|
||||
|
||||
PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
|
||||
nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
|
||||
|
||||
RESTRICT="preserve-libs strip"
|
||||
QA_PREBUILT="*"
|
||||
|
||||
S="${WORKDIR}/jdk${MY_PV}"
|
||||
|
||||
src_install() {
|
||||
local dest="/opt/${P}"
|
||||
local ddest="${ED%/}/${dest#/}"
|
||||
|
||||
rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
|
||||
|
||||
# this does not exist on arm64 hence -f
|
||||
rm -fv jre/lib/*/libfreetype.so* || die
|
||||
|
||||
if ! use alsa ; then
|
||||
rm -v jre/lib/*/libjsoundalsa.so* || die
|
||||
fi
|
||||
|
||||
if ! use examples ; then
|
||||
rm -vr sample || die
|
||||
fi
|
||||
|
||||
if use headless-awt ; then
|
||||
rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
|
||||
{,jre/}bin/policytool bin/appletviewer || die
|
||||
fi
|
||||
|
||||
if ! use source ; then
|
||||
rm -v src.zip || die
|
||||
fi
|
||||
|
||||
rm -v jre/lib/security/cacerts || die
|
||||
dosym ../../../../../etc/ssl/certs/java/cacerts \
|
||||
"${dest}"/jre/lib/security/cacerts
|
||||
|
||||
dodir "${dest}"
|
||||
cp -pPR * "${ddest}" || die
|
||||
|
||||
java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
java-vm_revdep-mask
|
||||
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
|
||||
}
|
||||
@ -0,0 +1,226 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
|
||||
|
||||
# we need latest -ga tag from hg, but want to keep build number as well
|
||||
# as _p component of the gentoo version string.
|
||||
|
||||
MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)
|
||||
|
||||
BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
|
||||
|
||||
DESCRIPTION="Open source implementation of the Java programming language"
|
||||
HOMEPAGE="https://openjdk.java.net"
|
||||
SRC_URI="
|
||||
${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
|
||||
${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
|
||||
${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
|
||||
${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
|
||||
${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
|
||||
${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
|
||||
${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
|
||||
${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
|
||||
"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="$(ver_cut 1)"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart"
|
||||
|
||||
COMMON_DEPEND="
|
||||
media-libs/freetype:2=
|
||||
media-libs/giflib:0/7
|
||||
sys-libs/zlib
|
||||
"
|
||||
# Many libs are required to build, but not to run, make is possible to remove
|
||||
# by listing conditionally in RDEPEND unconditionally in DEPEND
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
>=sys-apps/baselayout-java-0.1.0-r1
|
||||
!headless-awt? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
)
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
cups? ( net-print/cups )
|
||||
selinux? ( sec-policy/selinux-java )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
app-arch/zip
|
||||
media-libs/alsa-lib
|
||||
net-print/cups
|
||||
x11-base/xorg-proto
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
|| (
|
||||
dev-java/openjdk-bin:${SLOT}
|
||||
dev-java/icedtea-bin:${SLOT}
|
||||
dev-java/openjdk:${SLOT}
|
||||
dev-java/icedtea:${SLOT}
|
||||
)
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
|
||||
nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
|
||||
|
||||
# The space required to build varies wildly depending on USE flags,
|
||||
# ranging from 2GB to 16GB. This function is certainly not exact but
|
||||
# should be close enough to be useful.
|
||||
openjdk_check_requirements() {
|
||||
local M
|
||||
M=2048
|
||||
M=$(( $(usex debug 3 1) * $M ))
|
||||
M=$(( $(usex jbootstrap 2 1) * $M ))
|
||||
M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
|
||||
|
||||
CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
openjdk_check_requirements
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
openjdk_check_requirements
|
||||
|
||||
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
|
||||
JAVA_PKG_WANT_SOURCE="${SLOT}"
|
||||
JAVA_PKG_WANT_TARGET="${SLOT}"
|
||||
|
||||
java-vm-2_pkg_setup
|
||||
java-pkg-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
chmod +x configure || die
|
||||
local repo
|
||||
for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
|
||||
ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
|
||||
done
|
||||
# new warnings in new gcc https://bugs.gentoo.org/685426
|
||||
sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
|
||||
hotspot/make/linux/makefiles/gcc.make || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# general build info found here:
|
||||
#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
|
||||
|
||||
# Work around stack alignment issue, bug #647954.
|
||||
use x86 && append-flags -mincoming-stack-boundary=2
|
||||
|
||||
# Work around -fno-common ( GCC10 default ), bug #706638
|
||||
append-flags -fcommon
|
||||
|
||||
local myconf=(
|
||||
--disable-ccache
|
||||
--enable-unlimited-crypto
|
||||
--with-boot-jdk="${JDK_HOME}"
|
||||
--with-extra-cflags="${CFLAGS}"
|
||||
--with-extra-cxxflags="${CXXFLAGS}"
|
||||
--with-extra-ldflags="${LDFLAGS}"
|
||||
--with-giflib=system
|
||||
--with-jtreg=no
|
||||
--with-jobs=1
|
||||
--with-num-cores=1
|
||||
--with-update-version="$(ver_cut 2)"
|
||||
--with-build-number="b$(ver_cut 4)"
|
||||
--with-milestone="fcs" # magic variable that means "release version"
|
||||
--with-vendor-name="Gentoo"
|
||||
--with-vendor-url="https://gentoo.org"
|
||||
--with-vendor-bug-url="https://bugs.gentoo.org"
|
||||
--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
|
||||
--with-zlib=system
|
||||
--with-native-debug-symbols=$(usex debug internal none)
|
||||
$(usex headless-awt --disable-headful '')
|
||||
)
|
||||
|
||||
# PaX breaks pch, bug #601016
|
||||
if use pch && ! host-is-pax; then
|
||||
myconf+=( --enable-precompiled-headers )
|
||||
else
|
||||
myconf+=( --disable-precompiled-headers )
|
||||
fi
|
||||
|
||||
(
|
||||
unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
|
||||
CFLAGS= CXXFLAGS= LDFLAGS= \
|
||||
CONFIG_SITE=/dev/null \
|
||||
econf "${myconf[@]}"
|
||||
)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local myemakeargs=(
|
||||
JOBS=$(makeopts_jobs)
|
||||
LOG=debug
|
||||
$(usex doc docs '')
|
||||
$(usex jbootstrap bootcycle-images images)
|
||||
)
|
||||
emake "${myemakeargs[@]}" -j1 #nowarn
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
|
||||
local ddest="${ED%/}/${dest#/}"
|
||||
|
||||
cd "${S}"/build/*-release/images/j2sdk-image || die
|
||||
|
||||
if ! use alsa; then
|
||||
rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
|
||||
fi
|
||||
|
||||
# stupid build system does not remove that
|
||||
if use headless-awt ; then
|
||||
rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
|
||||
{,jre/}bin/policytool bin/appletviewer || die
|
||||
fi
|
||||
|
||||
if ! use examples ; then
|
||||
rm -vr demo/ || die
|
||||
fi
|
||||
|
||||
if ! use source ; then
|
||||
rm -v src.zip || die
|
||||
fi
|
||||
|
||||
dodir "${dest}"
|
||||
cp -pPR * "${ddest}" || die
|
||||
|
||||
dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
|
||||
|
||||
java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
java-vm_revdep-mask
|
||||
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
|
||||
|
||||
if use doc ; then
|
||||
docinto html
|
||||
dodoc -r "${S}"/build/*-release/docs/*
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
java-vm-2_pkg_postinst
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue