mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
Merge updates from master
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST djvulibre-3.5.29.tar.gz 3716911 BLAKE2B e811fc22f92182d275715c0c07a691c044e2040d196d4672b4934c29a9237e14f5acd68bafc6ebd49db5fba59414b736345e35c4a17600591e9d01a5ba570c79 SHA512 701745aa8d93e596d39fa0e772d575bd530efdb120fd02449eddac2a98b08afef8a1fa099cb6354cef23304dcec4323722299ecb64c2ac33056b45a5074c51f1
|
||||
DIST djvulibre-3.5.30.tar.gz 3721274 BLAKE2B 6a6cca5d22ba849c3c95e56a0acffc7c86ab7daf22a5643f7df7ba7dffe8609e6e1bbb7bf81996d90595bd4b82fc83ea2f8f560f338d3f778edd91c6ea68ceed SHA512 b68291cd844d9f3b92acae39014a7f3c1b3e8f024053a79f527fa322683ac3d09d170cae8d4dc409249cc9d9feb3ec692cfeea22c9795a64c9418a92d22dc95c
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic optfeature xdg
|
||||
|
||||
MY_P="${PN}libre-${PV#*_p}"
|
||||
DESCRIPTION="DjVu viewers, encoders and utilities"
|
||||
HOMEPAGE="https://djvu.sourceforge.net/"
|
||||
SRC_URI="https://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
|
||||
S="${WORKDIR}/${MY_P%%.3}"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
|
||||
IUSE="debug doc jpeg tiff xml"
|
||||
|
||||
RDEPEND="
|
||||
jpeg? ( media-libs/libjpeg-turbo:= )
|
||||
tiff? ( media-libs/tiff:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
# inkscape/rsvg-convert are used to generate icons at build-time only
|
||||
BDEPEND="
|
||||
app-arch/unzip
|
||||
|| ( gnome-base/librsvg media-gfx/inkscape )
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
use debug && append-cppflags -DRUNTIME_DEBUG_ONLY
|
||||
|
||||
local myeconfargs=(
|
||||
$(use_enable xml xmltools)
|
||||
$(use_with jpeg)
|
||||
$(use_with tiff)
|
||||
|
||||
# We install all desktop files by hand
|
||||
--disable-desktopfiles
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
|
||||
use doc && dodoc -r doc
|
||||
|
||||
# Install desktop files.
|
||||
cd desktopfiles || die
|
||||
local i
|
||||
for i in {22,32,48,64}; do
|
||||
insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
|
||||
newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
|
||||
done
|
||||
|
||||
insinto /usr/share/mime/packages
|
||||
doins djvulibre-mime.xml
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
|
||||
optfeature "djviewer or browser plugin" app-text/djview
|
||||
}
|
||||
@@ -1,2 +1 @@
|
||||
DIST tcllib-1.21.tar.xz 6467488 BLAKE2B 1faad78a263d9ef02d8d178bd329510a76db7b13d8ae636389877b25e1f1d125a6018ee9238cf3d8dbc04957d2e589669dc743c1f9e5823f28976ef73f8ce2e5 SHA512 0c8c333e1fd30237dbe40842082fd2da5141c50fc29c1a82960ce32b6780247b412ddfd1fe1e4414513dc77d6833611a46e07ca4137f13a51c7fea9fb81cef5b
|
||||
DIST tcllib-2.0.tar.xz 14872556 BLAKE2B 804775438d69b569f59c8da842d51c74deecec0ec8591989a8094fd332585c833ddffb33f636c134207a231192088c09b431864b6d52449066d5997377e63ae3 SHA512 b637548359475368135ce68ed39a0c75c276bf91412c68f357e45f833d52a070d8e952edecfa1c94aa927f92c88c586086fce517d201eb72746751d146e30103
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
--- a/modules/devtools/testutilities.tcl 2020-04-16 21:57:11.915653960 +0200
|
||||
+++ b/modules/devtools/testutilities.tcl 2020-04-16 22:11:05.621829465 +0200
|
||||
@@ -229,6 +229,10 @@
|
||||
::tcltest::testConstraint tcl8.6plus \
|
||||
[expr {[package vsatisfies [package provide Tcl] 8.6]}]
|
||||
|
||||
+ ::tcltest::testConstraint tcl8.6.8 \
|
||||
+ [expr { [package vsatisfies [package provide Tcl] 8.6.8] &&
|
||||
+ ![package vsatisfies [package provide Tcl] 8.6.9]}]
|
||||
+
|
||||
::tcltest::testConstraint tcl8.6not10 \
|
||||
[expr { [package vsatisfies [package provide Tcl] 8.6] &&
|
||||
![package vsatisfies [package provide Tcl] 8.6.10]}]
|
||||
--- a/modules/hook/hook.test 2020-04-16 21:59:22.708326030 +0200
|
||||
+++ b/modules/hook/hook.test 2020-04-16 22:09:18.055740312 +0200
|
||||
@@ -436,6 +436,7 @@
|
||||
} -cleanup {
|
||||
cleanup
|
||||
} -result [tcltest::byConstraint {
|
||||
+ tcl8.6.8 {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}
|
||||
tcl8.6.10plus {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}
|
||||
tcl8.6not10 {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {call S1 <H1>}} -errorcode NONE}}}
|
||||
tcl8.5minus {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorcode NONE}}}
|
||||
@@ -452,6 +453,7 @@
|
||||
} -cleanup {
|
||||
cleanup
|
||||
} -result [tcltest::byConstraint {
|
||||
+ tcl8.6.8 {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}}
|
||||
tcl8.6.10plus {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}}
|
||||
tcl8.6not10 {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {call S1 <H1>}} -errorcode NONE}}}}
|
||||
tcl8.5minus {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorcode NONE}}}}
|
||||
--- a/modules/http/autoproxy.test 2020-04-16 22:48:04.645153193 +0200
|
||||
+++ b/modules/http/autoproxy.test 2020-04-16 22:48:30.710701582 +0200
|
||||
@@ -179,20 +179,6 @@
|
||||
autoproxy::configure -tls_package dummy
|
||||
} -result "Invalid TLS package option 'dummy'. Must be 'tls' or 'twapi'" -returnCodes error
|
||||
|
||||
-test autoproxy-2.0.0 "autoproxy::tls_socket (tls) with proxy" -constraints {
|
||||
- have_tls
|
||||
-} -setup {
|
||||
- packageReset
|
||||
- package require http
|
||||
- autoproxy::configure -proxy_host $proxy_host -proxy_port $proxy_port
|
||||
-} -body {
|
||||
- http::register https 443 autoproxy::tls_socket
|
||||
- set tok [http::geturl https://www.example.com]
|
||||
- http::status $tok
|
||||
-} -cleanup {
|
||||
- http::cleanup $tok
|
||||
-} -result ok
|
||||
-
|
||||
test autoproxy-2.0.1 "autoproxy::tls_socket (twapi) with proxy" -constraints {
|
||||
have_twapi
|
||||
} -setup {
|
||||
@@ -202,20 +188,6 @@
|
||||
} -body {
|
||||
http::register https 443 autoproxy::tls_socket
|
||||
set tok [http::geturl https://www.example.com]
|
||||
- http::status $tok
|
||||
-} -cleanup {
|
||||
- http::cleanup $tok
|
||||
-} -result ok
|
||||
-
|
||||
-test autoproxy-2.1.0 "autoproxy::tls_socket (tls) without proxy" -constraints {
|
||||
- have_tls
|
||||
-} -setup {
|
||||
- packageReset
|
||||
- package require http
|
||||
- autoproxy::configure -proxy_host "" -proxy_port $proxy_port
|
||||
-} -body {
|
||||
- http::register https 443 autoproxy::tls_socket
|
||||
- set tok [http::geturl https://www.example.com]
|
||||
http::status $tok
|
||||
} -cleanup {
|
||||
http::cleanup $tok
|
||||
--- a/modules/string/token_shell.test 2020-04-17 08:40:44.813030086 +0200
|
||||
+++ b/modules/string/token_shell.test 2020-04-17 08:44:03.066752545 +0200
|
||||
@@ -26,6 +26,7 @@
|
||||
test string-token-shell-1.0 "string token shell, wrong#args, not enough" -body {
|
||||
string token shell
|
||||
} -returnCodes error -result [tcltest::byConstraint {
|
||||
+ tcl8.6.8 {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
|
||||
tcl8.6.10plus {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
|
||||
tcl8.6not10 {wrong # args: should be "shell ?-indices? ?-partial? ?--? text"}
|
||||
tcl8.5minus {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
|
||||
@@ -34,6 +35,7 @@
|
||||
test string-token-shell-1.1 "string token shell, wrong#args, too many" -body {
|
||||
string token shell T X
|
||||
} -returnCodes error -result [tcltest::byConstraint {
|
||||
+ tcl8.6.8 {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
|
||||
tcl8.6.10plus {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
|
||||
tcl8.6not10 {wrong # args: should be "shell ?-indices? ?-partial? ?--? text"}
|
||||
tcl8.5minus {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
|
||||
@@ -46,6 +48,7 @@
|
||||
test string-token-shell-1.3 "string token shell, wrong#args, too many" -body {
|
||||
string token shell -- T X
|
||||
} -returnCodes error -result [tcltest::byConstraint {
|
||||
+ tcl8.6.8 {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
|
||||
tcl8.6.10plus {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
|
||||
tcl8.6not10 {wrong # args: should be "shell ?-indices? ?-partial? ?--? text"}
|
||||
tcl8.5minus {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
|
||||
@@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit virtualx
|
||||
|
||||
DESCRIPTION="Tcl Standard Library"
|
||||
HOMEPAGE="http://www.tcl.tk/software/tcllib/"
|
||||
SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="examples"
|
||||
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/tcl:0=
|
||||
dev-tcltk/tdom
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=(
|
||||
ChangeLog DESCRIPTION.txt README.md devdoc/README.developer
|
||||
devdoc/critcl-tcllib.txt devdoc/dirlayout_install.txt
|
||||
devdoc/indexing.txt
|
||||
)
|
||||
HTML_DOCS=( idoc/www )
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-test.patch )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
rm modules/httpd/httpd.test || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
USER= virtx emake test_batch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use examples ; then
|
||||
for f in $(find examples -type f); do
|
||||
docinto $(dirname $f)
|
||||
dodoc $f
|
||||
done
|
||||
fi
|
||||
}
|
||||
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MYP}
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ppc ~sparc x86"
|
||||
KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
|
||||
IUSE="debug threads"
|
||||
|
||||
DEPEND="
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
DIST tdom-0.9.3-src.tgz 1319804 BLAKE2B 8b4c50407eaf28c002ec8399d44881b91bef346dca75370c27e06266a5fa90900528a01fc8310d8a250f551e3a627d0d2965a2e85ef8a9132010f7718e5549ce SHA512 71a589465f84721f222b6312f51ee564d11d88a82000a0e5cc1dab4653bffd57347a39936590b62a580e9df59d7266ff3ae4295fe91ff4b9e58f012e80b0cb3e
|
||||
DIST tdom-0.9.5-src.tgz 1512934 BLAKE2B 4e706d5378f2421fc21742327fe40ac106488c7523f33e90261d05c3969797fa35d7e5f785346c9a83fa6aadeff53a9e11a710d4ce32c38db332018b9e997c49 SHA512 84b35ec00744d04f184638b95d6b34f008087f48852a8734ce17c491f6d4c5f1208a8dcc041b5a3bf0253af41ab91677ab2b2d978d00807c687585e41c909979
|
||||
DIST tdom-0.9.6-src.tgz 1530711 BLAKE2B 05e880c5a57f28d7e6877533d469128c10890252f18103dbcd43adf93737b5974d06e114388c7df68253290f258aa4707dbde1ae853dbd76ed6e15851c28a4ff SHA512 ade285ea5c4e582fff7f52caf1292c1be8c59a6d7bae41cfbdb55b50a742d975c8ea7291c64cab060bf6668c45b7585e4f3b565c235575eaa7bd46a98c6ca23d
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools dot-a flag-o-matic
|
||||
|
||||
MY_P="tDOM-${PV}"
|
||||
|
||||
DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
|
||||
HOMEPAGE="https://core.tcl.tk/tdom/"
|
||||
SRC_URI="https://tdom.org/downloads/${P}-src.tgz"
|
||||
|
||||
LICENSE="MPL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="threads"
|
||||
|
||||
DEPEND="
|
||||
dev-lang/tcl:0=
|
||||
dev-libs/expat"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}"/${P}-src
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.9.2-useCC.patch
|
||||
"${FILESDIR}"/${P}-expat.patch
|
||||
)
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
opendir64 readdir64 rewinddir64 closedir64 stat64 # used to test for Large File Support
|
||||
arc4random_buf arc4random # used for BSD
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
append-libs -lm
|
||||
sed \
|
||||
-e 's:-O2::g' \
|
||||
-e 's:-pipe::g' \
|
||||
-e 's:-fomit-frame-pointer::g' \
|
||||
-e '/SHLIB_LD_LIBS/s:\"$: ${TCL_LIB_FLAG}":g' \
|
||||
-i tclconfig/tcl.m4 || die
|
||||
mv extensions/tnc/configure.{in,ac} || die
|
||||
mv extensions/example/configure.{in,ac} || die
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
lto-guarantee-fat
|
||||
local myeconfargs=(
|
||||
$(use_enable threads)
|
||||
--enable-shared
|
||||
--with-tcl="${EPREFIX}"/usr/$(get_libdir)
|
||||
)
|
||||
|
||||
cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs} \
|
||||
--disable-tdomalloc --with-expat
|
||||
cd "${S}"/extensions/tdomhtml && econf
|
||||
cd "${S}"/extensions/tnc && econf ${myeconfargs}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local dir
|
||||
|
||||
for dir in "${S}"/unix "${S}"/extensions/tnc; do
|
||||
pushd ${dir} > /dev/null
|
||||
emake
|
||||
popd > /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd unix && default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dir
|
||||
|
||||
dodoc CHANGES ChangeLog README*
|
||||
|
||||
for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
|
||||
pushd ${dir} > /dev/null
|
||||
emake DESTDIR="${D}" install
|
||||
popd > /dev/null
|
||||
done
|
||||
strip-lto-bytecode
|
||||
}
|
||||
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-src
|
||||
|
||||
LICENSE="MPL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="threads"
|
||||
|
||||
DEPEND="
|
||||
|
||||
@@ -1,5 +1,2 @@
|
||||
DIST Img-1.4.16-Source.tar.gz 12129708 BLAKE2B 5da76a42a1643d759d765ade01a8a9e9782cba21d30f5ec95693364d80aca32fa54f610081833d44bf5723e6901d7577e93bd4d4285880e855e835ae6a901f4b SHA512 622549749d41c7c026053cf82b4c434602ff541b9ee7f6f15c2450fcf3cfb34eb8277432267c78adc3dcc60e53fa2d84b7cf98c5fd5a6c3cfbcf0f60746cd227
|
||||
DIST Img-1.4.17.tar.gz 11974054 BLAKE2B 84c4e846f4b1e5b68998aaf75dac7911fe99806414e002ef7deeb88e3381118e99b256c6dd9c42e33947aa7695dc22de82dad3929bf46d47bbfa0aa47a3a620c SHA512 8c5e761f233ed2cc4b82a106aa435c23e0d8e49b4aaf936698e08de1abd0955927a0a72802311364eded6f472a3b5f6cf5ea07f220fb9396d75a27ee55f7be93
|
||||
DIST Img-2.0.1.tar.gz 12312476 BLAKE2B 0cd63fefc7508d06438bff5762a1ca4a32148c17f5fc839fa23126626cb406abd2d52c8692421717c93cc89fd3c3f8562ff8bc736ce0fc754fdf3ccd525252c5 SHA512 b025fb8fc8fabe83ac7cdc6ce2e03fb9219cad92438bd6bb809dba14b95058ecbb61b274f009d824a4067c3be828c98e0b5b1b8305fb21590c266257502574fb
|
||||
DIST Img-2.1.0.tar.gz 12335560 BLAKE2B 742986c27354daaf9feacfcde1b877a884a10b50cf03d92594009674c757d25d113b26cd67f7449935a792bf16950d6fbbc245f8da5c626eb6f08d6749ca02c6 SHA512 b456551feaaa1e18f5ade92a76ddaeac439783d0799b535f64b24ad93129d5029fc3157dea951d815aefed1841e285f3272fbe5e22b26488425b47114a8e7a6d
|
||||
DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6 SHA512 8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools edos2unix prefix toolchain-funcs virtualx
|
||||
|
||||
MYP=Img-${PV}
|
||||
|
||||
DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
|
||||
HOMEPAGE="http://tkimg.sourceforge.net/"
|
||||
SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}-Source.tar.gz
|
||||
https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-patchset-1.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ppc x86"
|
||||
IUSE="doc test static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/tk:=
|
||||
dev-tcltk/tcllib
|
||||
media-libs/tiff:=
|
||||
media-libs/libpng:0=
|
||||
virtual/zlib:=
|
||||
x11-libs/libX11
|
||||
media-libs/libjpeg-turbo:="
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
x11-apps/xhost
|
||||
media-fonts/font-misc-misc
|
||||
media-fonts/font-cursor-misc )"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
S="${WORKDIR}/${MYP}"
|
||||
|
||||
PATCHES=(
|
||||
"${WORKDIR}"/patchset-1
|
||||
"${FILESDIR}"/${PN}-1.4.15-gcc11.patch
|
||||
)
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
opendir64 rewinddir64 closedir64 stat64 # used on AIX
|
||||
glBegin # used to test for openGL support
|
||||
glutMainLoop # used to test for glut support
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
edos2unix \
|
||||
libjpeg/jpegtclDecls.h \
|
||||
zlib/zlibtclDecls.h \
|
||||
libpng/pngtclDecls.h \
|
||||
tiff/tiffZip.c \
|
||||
tiff/tiffPixar.c \
|
||||
libtiff/tifftclDecls.h
|
||||
|
||||
# libtiff/jpeg unbundle is problematic
|
||||
rm ../patchset-1/tkimg-1.4.12-tiff.patch || die
|
||||
rm ../patchset-1/tkimg-1.4.10-jpeg.patch || die
|
||||
|
||||
default
|
||||
|
||||
echo "unknown" > manifest.uuid || die
|
||||
|
||||
find compat/libtiff/config -name ltmain.sh -delete || die
|
||||
sed -i \
|
||||
-e 's:"--with-CC=$TIFFCC"::' \
|
||||
libtiff/configure.ac || die
|
||||
|
||||
eautoreconf
|
||||
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
|
||||
ppm ps sgi sun tga tiff window xbm xpm dted raw flir compat/libtiff ; do
|
||||
(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
|
||||
done
|
||||
|
||||
eprefixify */*.h
|
||||
tc-export AR
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e "/PACKAGE_/d" \
|
||||
libtiff/libtiff/tif_config.h \
|
||||
|| die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local l bl
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
INSTALL_ROOT="${D}" \
|
||||
install
|
||||
|
||||
if ! use static-libs; then
|
||||
find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
|
||||
fi
|
||||
|
||||
# Make library links
|
||||
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
|
||||
bl=$(basename ${l})
|
||||
dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
|
||||
done
|
||||
|
||||
dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
|
||||
|
||||
if use doc; then
|
||||
docompress -x usr/share/doc/${PF}/demo.tcl
|
||||
dodoc demo.tcl
|
||||
docinto html
|
||||
dodoc -r doc/*
|
||||
fi
|
||||
}
|
||||
@@ -1,117 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools edos2unix prefix toolchain-funcs virtualx
|
||||
|
||||
MYP=Img-${PV}
|
||||
|
||||
DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
|
||||
HOMEPAGE="http://tkimg.sourceforge.net/"
|
||||
SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
|
||||
https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-patchset-1.tar.gz"
|
||||
|
||||
S="${WORKDIR}/${MYP}"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
|
||||
IUSE="doc test static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/tk:=
|
||||
dev-tcltk/tcllib
|
||||
media-libs/tiff:=
|
||||
media-libs/libpng:0=
|
||||
virtual/zlib:=
|
||||
x11-libs/libX11
|
||||
media-libs/libjpeg-turbo:="
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
x11-apps/xhost
|
||||
media-fonts/font-misc-misc
|
||||
media-fonts/font-cursor-misc )"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${WORKDIR}"/patchset-1
|
||||
"${FILESDIR}"/${PN}-1.4.15-gcc11.patch
|
||||
)
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
opendir64 rewinddir64 closedir64 stat64 # used on AIX
|
||||
glBegin # used to test for openGL support
|
||||
glutMainLoop # used to test for glut support
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
edos2unix \
|
||||
zlib/zlibtclDecls.h \
|
||||
libpng/pngtclDecls.h \
|
||||
tiff/tiffZip.c
|
||||
|
||||
# libtiff/jpeg unbundle is problematic
|
||||
rm ../patchset-1/tkimg-1.4.12-tiff.patch || die
|
||||
rm ../patchset-1/tkimg-1.4.10-jpeg.patch || die
|
||||
|
||||
default
|
||||
|
||||
echo "unknown" > manifest.uuid || die
|
||||
|
||||
find compat/libtiff/config -name ltmain.sh -delete || die
|
||||
sed -i \
|
||||
-e 's:"--with-CC=$TIFFCC"::' \
|
||||
libtiff/configure.ac || die
|
||||
|
||||
# eautoreconf
|
||||
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
|
||||
ppm ps sgi sun tga tiff window xbm xpm dted raw flir compat/libtiff ; do
|
||||
(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
|
||||
done
|
||||
|
||||
eprefixify */*.h
|
||||
tc-export AR
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e "/PACKAGE_/d" \
|
||||
libtiff/libtiff/tif_config.h \
|
||||
|| die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local l bl
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
INSTALL_ROOT="${D}" \
|
||||
install
|
||||
|
||||
if ! use static-libs; then
|
||||
find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
|
||||
fi
|
||||
|
||||
# Make library links
|
||||
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
|
||||
bl=$(basename ${l})
|
||||
dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
|
||||
done
|
||||
|
||||
dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
|
||||
|
||||
if use doc; then
|
||||
docompress -x usr/share/doc/${PF}/demo.tcl
|
||||
dodoc demo.tcl
|
||||
docinto html
|
||||
dodoc -r doc/*
|
||||
fi
|
||||
}
|
||||
@@ -1,119 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools edos2unix prefix toolchain-funcs virtualx
|
||||
|
||||
MYP=Img-${PV}
|
||||
|
||||
DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
|
||||
HOMEPAGE="http://tkimg.sourceforge.net/"
|
||||
SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
|
||||
https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-patchset-1.tar.gz"
|
||||
|
||||
S="${WORKDIR}/${MYP}"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
|
||||
IUSE="doc test static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/tk:=
|
||||
dev-tcltk/tcllib
|
||||
media-libs/tiff:=
|
||||
media-libs/libpng:0=
|
||||
virtual/zlib:=
|
||||
x11-libs/libX11
|
||||
media-libs/libjpeg-turbo:="
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
x11-apps/xhost
|
||||
media-fonts/font-misc-misc
|
||||
media-fonts/font-cursor-misc )"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${WORKDIR}"/patchset-1
|
||||
"${FILESDIR}"/${PN}-1.4.15-gcc11.patch
|
||||
)
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
opendir64 rewinddir64 closedir64 stat64 # used on AIX
|
||||
glBegin # used to test for openGL support
|
||||
glutMainLoop # used to test for glut support
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
edos2unix \
|
||||
zlib/zlibtclDecls.h \
|
||||
libpng/pngtclDecls.h \
|
||||
tiff/tiffZip.c
|
||||
|
||||
# libtiff/jpeg unbundle is problematic
|
||||
rm ../patchset-1/tkimg-1.4.12-tiff.patch || die
|
||||
rm ../patchset-1/tkimg-1.4.10-jpeg.patch || die
|
||||
rm ../patchset-1/tkimg-1.4.13-test.patch || die
|
||||
|
||||
default
|
||||
|
||||
echo "unknown" > manifest.uuid || die
|
||||
|
||||
find compat/libtiff/config -name ltmain.sh -delete || die
|
||||
sed -i \
|
||||
-e 's:"--with-CC=$TIFFCC"::' \
|
||||
libtiff/configure.ac || die
|
||||
|
||||
eautoreconf
|
||||
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
|
||||
ppm ps sgi sun tga tiff window xbm xpm dted raw flir compat/libtiff ; do
|
||||
(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
|
||||
done
|
||||
|
||||
eprefixify */*.h
|
||||
tc-export AR
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e "/PACKAGE_/d" \
|
||||
libtiff/libtiff/tif_config.h \
|
||||
|| die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake collate
|
||||
TCLLIBPATH="$(pwd)/Img/exec_prefix/lib/Img" virtx default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local l bl
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
INSTALL_ROOT="${D}" \
|
||||
install
|
||||
|
||||
if ! use static-libs; then
|
||||
find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
|
||||
fi
|
||||
|
||||
# Make library links
|
||||
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
|
||||
bl=$(basename ${l})
|
||||
dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
|
||||
done
|
||||
|
||||
dodoc README.md
|
||||
|
||||
if use doc; then
|
||||
docompress -x usr/share/doc/${PF}/demo.tcl
|
||||
dodoc demo.tcl
|
||||
docinto html
|
||||
dodoc -r doc/*
|
||||
fi
|
||||
}
|
||||
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MYP}"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ppc x86"
|
||||
KEYWORDS="amd64 arm64 ~ppc x86"
|
||||
IUSE="doc test static-libs"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
DIST latex2html-2021.2.tar.gz 1139791 BLAKE2B 4fa9b45a33dbfb5c9e3bb45ebab19edb5d7a1d9c882ab30e75afbda7ad902cf519403b685f1f30b69b3d6ec976aa72b3065851b6d24b00c2e626e496ea8afd79 SHA512 b8d742b427e833f732457194cc60c043f750d202c46fb0d1d4e46df8e6d4dabacb5b474084aec46aa4eed68ee0249f3c0b053b5446401d09034e7f59148ad18a
|
||||
DIST latex2html-2022.tar.gz 1140425 BLAKE2B fffe35d95c3934f428bf18833536a70b42fd12890d5b305976167b5957a0c370ac613d7d6fb675527d5b41ea25eb88bb982ec2a5e71c4d87ec559b1a8e781010 SHA512 a8b35868bc317e52614dc8d748e5d5334b81f068769aa8973b10708b2c8ac15129e2844f4fdb0def7ec14a9557257bb8962962280717b4d04c16ab9e760bb089
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From ea0ae1cf6789cf8f29bf07406ef6e91918b6bfc3 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew White <mehw.is.me@inventati.org>
|
||||
Date: Wed, 10 Nov 2021 00:32:14 +0000
|
||||
Subject: [PATCH] fix pnmcrop duplicated -sides option (aka PNMCROPOPT)
|
||||
|
||||
If the variable PNMCROPOPT is defined as "-sides" via config/config.pl
|
||||
in pstoimg.bin, calling `pnmcrop -bot -sides $PNMCROPOPT` will give an
|
||||
error, due to the duplicated option.
|
||||
---
|
||||
pstoimg.pin | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pstoimg.pin b/pstoimg.pin
|
||||
index 2c4f3e4..588b987 100755
|
||||
--- a/pstoimg.pin
|
||||
+++ b/pstoimg.pin
|
||||
@@ -1300,9 +1300,9 @@ sub crop_scale_etc {
|
||||
my $edge = $1;
|
||||
my $croparg = '';
|
||||
if($edge =~ /b/i) {
|
||||
- $croparg = "-bot -sides $PNMCROPOPT ";
|
||||
+ $croparg = "-bot -sides ";
|
||||
} elsif($edge =~ /[tlr]/i) {
|
||||
- $croparg = "-$edge -sides $PNMCROPOPT ";
|
||||
+ $croparg = "-$edge -sides ";
|
||||
} elsif($edge =~ /s/i) {
|
||||
#RRM: shave at most 1-2 rows of white from the bottom
|
||||
#if @pipes@
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Convertor written in Perl that converts LaTeX documents to HTML"
|
||||
HOMEPAGE="https://www.latex2html.org/"
|
||||
SRC_URI="https://github.com/latex2html/latex2html/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 ~x64-macos ~x64-solaris"
|
||||
IUSE="gif png"
|
||||
|
||||
DEPEND="
|
||||
app-text/ghostscript-gpl
|
||||
virtual/latex-base
|
||||
>=media-libs/netpbm-10.86.24
|
||||
dev-lang/perl
|
||||
gif? ( media-libs/giflib )
|
||||
png? ( media-libs/libpng:0 )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2021.2-fix-PNMCROPOPT.patch
|
||||
"${FILESDIR}"/${PN}-2021.2-respect-DESTDIR.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i -e 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
use gif || use png || myconf+=" --disable-images"
|
||||
|
||||
econf \
|
||||
--libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
|
||||
--shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
|
||||
--enable-pk \
|
||||
--enable-eps \
|
||||
--enable-reverse \
|
||||
--enable-pipes \
|
||||
--enable-paths \
|
||||
--enable-wrapper \
|
||||
--with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \
|
||||
--without-mktexlsr \
|
||||
$(use_enable gif) \
|
||||
$(use_enable png) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
# make /usr/share/latex2html sticky
|
||||
keepdir /usr/share/latex2html
|
||||
|
||||
# clean the perl scripts up to remove references to the sandbox
|
||||
local dir="${ED}/usr/$(get_libdir)/latex2html"
|
||||
if use png || use gif; then
|
||||
# pstoimg isn't built unless gif or png useflags are enabled
|
||||
sed -i -e "s:${T}:/tmp:g" "${dir}"/pstoimg.pl || die
|
||||
fi
|
||||
|
||||
sed -i -e "s:${S}::g" "${dir}"/latex2html.pl || die
|
||||
sed -i -e "s:${T}:/tmp:g" "${dir}"/cfgcache.pm || die
|
||||
sed -i -e "s:${T}:/tmp:g" "${dir}"/l2hconf.pm || die
|
||||
|
||||
dodoc BUGS Changes FAQ MANIFEST README.md TODO
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
"${EROOT}"/usr/bin/mktexlsr
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
"${EROOT}"/usr/bin/mktexlsr
|
||||
}
|
||||
@@ -1,5 +1,2 @@
|
||||
DIST fossil-src-2.21.tar.gz 6703622 BLAKE2B fcc74ed5e3eec34f044624b128b8933b54d1cea99a212a1423e369fc469af4634f469f8c9c20af768c41edc9f1ec2592a074f87dadd5b9b90805906451268f0e SHA512 22534eb632f485de895b291a35325efe9bfd13ec0df84e94afe822593489ecdb2998352dcd501123d8d4c426a40bd4ff43190b50fb849392f886dd94bee42bf3
|
||||
DIST fossil-src-2.22.tar.gz 6730858 BLAKE2B 3f0108dfb5802c61d107a6318acd11061c8311f112376c8c96645d6b0de1441b3ec745fcb2e2ec3888ed15ca89f4a2af535f61edcc6f4b5944d81d381f522935 SHA512 99a456301ae4ac72449985ff3b8b2139b805ff84e27ffe4325bad0c90643dd51c655b0210cbfa290a621e33e42e1e35b75a6cdc1beb093221d2b5d23d64591bc
|
||||
DIST fossil-src-2.24-r1.tar.gz 6904302 BLAKE2B 9b4a37663721d512d6fa8f6f74f69b65d569c10bd85e1187aa2a1c9e02b730855ebe261760223e7a6249bc20d4cfc44d61a302b5a8f664411ee16105d3d864d9 SHA512 7fc7de7d947b0946866df38c6cb2215f6452d31903cae6470bb4a692816b2803eb66ea372280256e5cd00759e4d02a0ae459de2f56f39af10e873579d53d33ee
|
||||
DIST fossil-src-2.26-r1.tar.gz 7149081 BLAKE2B 4d902844049ff2d54fd927b577de37f9d74f3f3e6eff90d58d5a74c2988d1195e547b24b246e9dc0713e4ed6f91f252e1496b7f4d4164520f3a00311db946158 SHA512 356a3b51adde40aedb094743eb978b78961c4216152000ecd800e22b69f1e3a11330259b627628fb6e9a594b1969f0351a73af717b500b4f12d109108fa82b61
|
||||
DIST fossil-src-2.27.tar.gz 7181357 BLAKE2B b7e69329e35973532f6b14b2b19f1e8da99855f2c7f6818c5e610b533610c9ef3fa240e26e51b9290885cc3e97d0e3f36eb63675304e9644658a069a9fd902b4 SHA512 39a43d769212f5ecb891eef215054ed418f1e9da81abfd79d7e307b000adec8054675ca7b9a640fd78c327f50cd4e21285954ddc3b3c85967d9b511235bc8092
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
Index: test/utf.test
|
||||
==================================================================
|
||||
--- test/utf.test
|
||||
+++ test/utf.test
|
||||
@@ -17609,25 +17609,25 @@
|
||||
Has flag LOOK_LONG: no
|
||||
Has flag LOOK_INVALID: no
|
||||
Has flag LOOK_ODD: no
|
||||
Has flag LOOK_SHORT: no}
|
||||
|
||||
-utf-check 1179 utf-check-1179-2-129-1.jnk \
|
||||
-{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
|
||||
-Starts with UTF-8 BOM: no
|
||||
-Starts with UTF-16 BOM: yes
|
||||
-Looks like UTF-8: yes
|
||||
-Has flag LOOK_NUL: no
|
||||
-Has flag LOOK_CR: no
|
||||
-Has flag LOOK_LONE_CR: no
|
||||
-Has flag LOOK_LF: no
|
||||
-Has flag LOOK_LONE_LF: no
|
||||
-Has flag LOOK_CRLF: no
|
||||
-Has flag LOOK_LONG: no
|
||||
-Has flag LOOK_INVALID: yes
|
||||
-Has flag LOOK_ODD: no
|
||||
-Has flag LOOK_SHORT: no}
|
||||
+#utf-check 1179 utf-check-1179-2-129-1.jnk \
|
||||
+#{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
|
||||
+#Starts with UTF-8 BOM: no
|
||||
+#Starts with UTF-16 BOM: yes
|
||||
+#Looks like UTF-8: yes
|
||||
+#Has flag LOOK_NUL: no
|
||||
+#Has flag LOOK_CR: no
|
||||
+#Has flag LOOK_LONE_CR: no
|
||||
+#Has flag LOOK_LF: no
|
||||
+#Has flag LOOK_LONE_LF: no
|
||||
+#Has flag LOOK_CRLF: no
|
||||
+#Has flag LOOK_LONG: no
|
||||
+#Has flag LOOK_INVALID: yes
|
||||
+#Has flag LOOK_ODD: no
|
||||
+#Has flag LOOK_SHORT: no}
|
||||
|
||||
utf-check 1180 utf-check-1180-2-130-0.jnk \
|
||||
{File "%TEMP%/utf-check-1180-2-130-0.jnk" has 4 bytes.
|
||||
Starts with UTF-8 BOM: no
|
||||
Starts with UTF-16 BOM: yes
|
||||
@@ -24121,41 +24121,41 @@
|
||||
Has flag LOOK_LONG: no
|
||||
Has flag LOOK_INVALID: yes
|
||||
Has flag LOOK_ODD: no
|
||||
Has flag LOOK_SHORT: no}
|
||||
|
||||
-utf-check 1586 utf-check-1586-3-128-0.jnk \
|
||||
-{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
|
||||
-Starts with UTF-8 BOM: no
|
||||
-Starts with UTF-16 BOM: reversed
|
||||
-Looks like UTF-16: no
|
||||
-Has flag LOOK_NUL: yes
|
||||
-Has flag LOOK_CR: no
|
||||
-Has flag LOOK_LONE_CR: no
|
||||
-Has flag LOOK_LF: no
|
||||
-Has flag LOOK_LONE_LF: no
|
||||
-Has flag LOOK_CRLF: no
|
||||
-Has flag LOOK_LONG: no
|
||||
-Has flag LOOK_INVALID: no
|
||||
-Has flag LOOK_ODD: no
|
||||
-Has flag LOOK_SHORT: no}
|
||||
-
|
||||
-utf-check 1587 utf-check-1587-3-128-1.jnk \
|
||||
-{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
|
||||
-Starts with UTF-8 BOM: no
|
||||
-Starts with UTF-16 BOM: reversed
|
||||
-Looks like UTF-8: no
|
||||
-Has flag LOOK_NUL: yes
|
||||
-Has flag LOOK_CR: no
|
||||
-Has flag LOOK_LONE_CR: no
|
||||
-Has flag LOOK_LF: no
|
||||
-Has flag LOOK_LONE_LF: no
|
||||
-Has flag LOOK_CRLF: no
|
||||
-Has flag LOOK_LONG: no
|
||||
-Has flag LOOK_INVALID: yes
|
||||
-Has flag LOOK_ODD: no
|
||||
-Has flag LOOK_SHORT: no}
|
||||
+#utf-check 1586 utf-check-1586-3-128-0.jnk \
|
||||
+#{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
|
||||
+#Starts with UTF-8 BOM: no
|
||||
+#Starts with UTF-16 BOM: reversed
|
||||
+#Looks like UTF-16: no
|
||||
+#Has flag LOOK_NUL: yes
|
||||
+#Has flag LOOK_CR: no
|
||||
+#Has flag LOOK_LONE_CR: no
|
||||
+#Has flag LOOK_LF: no
|
||||
+#Has flag LOOK_LONE_LF: no
|
||||
+#Has flag LOOK_CRLF: no
|
||||
+#Has flag LOOK_LONG: no
|
||||
+#Has flag LOOK_INVALID: no
|
||||
+#Has flag LOOK_ODD: no
|
||||
+#Has flag LOOK_SHORT: no}
|
||||
+
|
||||
+#utf-check 1587 utf-check-1587-3-128-1.jnk \
|
||||
+#{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
|
||||
+#Starts with UTF-8 BOM: no
|
||||
+#Starts with UTF-16 BOM: reversed
|
||||
+#Looks like UTF-8: no
|
||||
+#Has flag LOOK_NUL: yes
|
||||
+#Has flag LOOK_CR: no
|
||||
+#Has flag LOOK_LONE_CR: no
|
||||
+#Has flag LOOK_LF: no
|
||||
+#Has flag LOOK_LONE_LF: no
|
||||
+#Has flag LOOK_CRLF: no
|
||||
+#Has flag LOOK_LONG: no
|
||||
+#Has flag LOOK_INVALID: yes
|
||||
+#Has flag LOOK_ODD: no
|
||||
+#Has flag LOOK_SHORT: no}
|
||||
|
||||
utf-check 1588 utf-check-1588-3-129-0.jnk \
|
||||
{File "%TEMP%/utf-check-1588-3-129-0.jnk" has 6 bytes.
|
||||
Starts with UTF-8 BOM: no
|
||||
Starts with UTF-16 BOM: no
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
Index: test/json.test
|
||||
==================================================================
|
||||
--- test/json.test
|
||||
+++ test/json.test
|
||||
@@ -107,11 +107,11 @@
|
||||
set request [subst {POST $url HTTP/1.0\r
|
||||
Host: localhost\r
|
||||
User-Agent: Fossil-Test\r
|
||||
Cookie: $cookie\r
|
||||
Content-Type: application/json
|
||||
-Content-Length $len
|
||||
+Content-Length: $len
|
||||
\r
|
||||
$data}]
|
||||
} else {
|
||||
set request [subst {GET $url HTTP/1.0\r
|
||||
Host: localhost\r
|
||||
|
||||
@@ -1,187 +0,0 @@
|
||||
Index: test/amend.test
|
||||
==================================================================
|
||||
--- test/amend.test
|
||||
+++ test/amend.test
|
||||
@@ -313,10 +313,11 @@
|
||||
}
|
||||
foreach res [lsort -nocase $result] {
|
||||
append t2exp "sym-$res*"
|
||||
}
|
||||
eval fossil amend $HASH $tags
|
||||
+ set t1exp [string trimleft $t1exp ,]
|
||||
test amend-tag-$tc.1 {[string match "*hash:*$HASH*tags:*$t1exp*" $RESULT]}
|
||||
fossil tag ls --raw $HASH
|
||||
test amend-tag-$tc.2 {[string match $t2exp $RESULT]}
|
||||
fossil timeline -n 1
|
||||
test amend-tag-$tc.3 {[string match $t3exp $RESULT]}
|
||||
|
||||
Index: test/merge5.test
|
||||
==================================================================
|
||||
--- test/merge5.test
|
||||
+++ test/merge5.test
|
||||
@@ -23,11 +23,11 @@
|
||||
}
|
||||
protOut {
|
||||
fossil sqlite3 --no-repository reacts badly to SQL dumped from
|
||||
repositories created from fossil older than version 2.0.
|
||||
}
|
||||
-test merge5-sqlite3-issue false knownBug
|
||||
+#test merge5-sqlite3-issue false knownBug
|
||||
test_cleanup_then_return
|
||||
|
||||
# Verify the results of a check-out
|
||||
#
|
||||
proc checkout-test {testid expected_content} {
|
||||
|
||||
Index: test/stash.test
|
||||
==================================================================
|
||||
--- test/stash.test
|
||||
+++ test/stash.test
|
||||
@@ -168,14 +168,14 @@
|
||||
|
||||
########
|
||||
# fossil stash show|cat ?STASHID? ?DIFF-OPTIONS?
|
||||
# fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS?
|
||||
|
||||
-fossil stash show
|
||||
-test stash-1-show {[normalize_result] eq $diff_stash_1}
|
||||
-fossil stash diff
|
||||
-test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
|
||||
+#fossil stash show
|
||||
+#test stash-1-show {[normalize_result] eq $diff_stash_1}
|
||||
+#fossil stash diff
|
||||
+#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
|
||||
|
||||
########
|
||||
# fossil stash pop
|
||||
|
||||
stash-test 2 pop {
|
||||
@@ -206,16 +206,16 @@
|
||||
# fossil: ./src/delta.c:231: checksum: Assertion '...' failed.
|
||||
# Should be triggered by this stash-WY-1 test.
|
||||
fossil checkout --force c1
|
||||
fossil clean
|
||||
fossil mv --soft f1 f1new
|
||||
-stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
|
||||
- REVERT f1
|
||||
- DELETE f1new
|
||||
-} -changes {
|
||||
-} -addremove {
|
||||
-} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
|
||||
+#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
|
||||
+# REVERT f1
|
||||
+# DELETE f1new
|
||||
+#} -changes {
|
||||
+#} -addremove {
|
||||
+#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
|
||||
# TODO: add tests that verify the saved stash is sensible. Possibly
|
||||
# by applying it and checking results. But until the SQLITE_CONSTRAINT
|
||||
# error is fixed, there is nothing stashed to test.
|
||||
|
||||
|
||||
@@ -296,16 +296,17 @@
|
||||
}] -changes {
|
||||
RENAMED f2 -> f2n
|
||||
} -addremove {
|
||||
} -exists {f1 f2n} -notexists {f2}
|
||||
|
||||
-stash-test 3-2 {save -m f2n} {
|
||||
- REVERT f2
|
||||
- DELETE f2n
|
||||
-} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
|
||||
+fossil stash save -m f2n
|
||||
+#stash-test 3-2 {save -m f2n} {
|
||||
+# REVERT f2
|
||||
+# DELETE f2n
|
||||
+#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
|
||||
fossil stash show
|
||||
-test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
|
||||
+#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
|
||||
test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
|
||||
stash-test 3-2-pop {pop} {
|
||||
UPDATE f1
|
||||
UPDATE f2n
|
||||
} -changes {
|
||||
|
||||
Index: test/tester.tcl
|
||||
==================================================================
|
||||
--- test/tester.tcl
|
||||
+++ test/tester.tcl
|
||||
@@ -308,10 +308,11 @@
|
||||
comment-format \
|
||||
crlf-glob \
|
||||
crnl-glob \
|
||||
default-csp \
|
||||
default-perms \
|
||||
+ default-skin \
|
||||
diff-binary \
|
||||
diff-command \
|
||||
dont-commit \
|
||||
dont-push \
|
||||
dotfiles \
|
||||
|
||||
Index: test/utf.test
|
||||
==================================================================
|
||||
--- test/utf.test
|
||||
+++ test/utf.test
|
||||
@@ -35,11 +35,11 @@
|
||||
set i 1
|
||||
foreach {fileName result} $args {
|
||||
set fileName [file join $tempPath $fileName]
|
||||
fossil test-looks-like-utf $fileName
|
||||
set result [string map [list %TEMP% $tempPath \r\n \n] $result]
|
||||
- # if {$::RESULT ne $result} {puts stdout $::RESULT}
|
||||
+ # if {$::RESULT ne $result} {puts stdout $::RESULT; exit}
|
||||
test utf-check-$testname.$i {$::RESULT eq $result}
|
||||
incr i
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17613,12 +17613,12 @@
|
||||
|
||||
utf-check 1179 utf-check-1179-2-129-1.jnk \
|
||||
{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
|
||||
Starts with UTF-8 BOM: no
|
||||
Starts with UTF-16 BOM: yes
|
||||
-Looks like UTF-8: no
|
||||
-Has flag LOOK_NUL: yes
|
||||
+Looks like UTF-8: yes
|
||||
+Has flag LOOK_NUL: no
|
||||
Has flag LOOK_CR: no
|
||||
Has flag LOOK_LONE_CR: no
|
||||
Has flag LOOK_LF: no
|
||||
Has flag LOOK_LONE_LF: no
|
||||
Has flag LOOK_CRLF: no
|
||||
@@ -24124,27 +24124,27 @@
|
||||
Has flag LOOK_SHORT: no}
|
||||
|
||||
utf-check 1586 utf-check-1586-3-128-0.jnk \
|
||||
{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
|
||||
Starts with UTF-8 BOM: no
|
||||
-Starts with UTF-16 BOM: no
|
||||
-Looks like UTF-8: no
|
||||
+Starts with UTF-16 BOM: reversed
|
||||
+Looks like UTF-16: no
|
||||
Has flag LOOK_NUL: yes
|
||||
Has flag LOOK_CR: no
|
||||
Has flag LOOK_LONE_CR: no
|
||||
Has flag LOOK_LF: no
|
||||
Has flag LOOK_LONE_LF: no
|
||||
Has flag LOOK_CRLF: no
|
||||
Has flag LOOK_LONG: no
|
||||
-Has flag LOOK_INVALID: yes
|
||||
+Has flag LOOK_INVALID: no
|
||||
Has flag LOOK_ODD: no
|
||||
Has flag LOOK_SHORT: no}
|
||||
|
||||
utf-check 1587 utf-check-1587-3-128-1.jnk \
|
||||
{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
|
||||
Starts with UTF-8 BOM: no
|
||||
-Starts with UTF-16 BOM: no
|
||||
+Starts with UTF-16 BOM: reversed
|
||||
Looks like UTF-8: no
|
||||
Has flag LOOK_NUL: yes
|
||||
Has flag LOOK_CR: no
|
||||
Has flag LOOK_LONE_CR: no
|
||||
Has flag LOOK_LF: no
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_TAG="f9aa474081f0618c76f4c2f4d6f0277a3fd480aa185d7da0b8b61b00fad1aa78"
|
||||
|
||||
DESCRIPTION="Simple, high-reliability, source control management, and more"
|
||||
HOMEPAGE="https://www.fossil-scm.org/home"
|
||||
SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
|
||||
IUSE="debug fusefs json system-sqlite +ssl static tcl tcl-stubs
|
||||
tcl-private-stubs th1-docs th1-hooks"
|
||||
|
||||
# Please check sqlite minimum version on every release. This can be done with:
|
||||
# ./configure --print-minimum-sqlite-version
|
||||
RDEPEND="
|
||||
virtual/zlib:=
|
||||
|| (
|
||||
sys-libs/readline:0
|
||||
dev-libs/libedit
|
||||
)
|
||||
system-sqlite? ( >=dev-db/sqlite-3.38.0:3 )
|
||||
ssl? ( dev-libs/openssl:0= )
|
||||
tcl? ( dev-lang/tcl:0= )
|
||||
"
|
||||
|
||||
# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
|
||||
DEPEND="${RDEPEND}
|
||||
!tcl? (
|
||||
|| (
|
||||
dev-lang/tcl:*
|
||||
dev-lang/jimtcl:*
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
# Tests can't be run from the build directory
|
||||
RESTRICT="test"
|
||||
|
||||
PATCHES=(
|
||||
# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
|
||||
"${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch
|
||||
)
|
||||
|
||||
S="${WORKDIR}/fossil-src-${PV}"
|
||||
|
||||
src_configure() {
|
||||
# this is not an autotools situation so don't make it seem like one
|
||||
# --with-tcl: works
|
||||
# --without-tcl: dies
|
||||
local myconf="--with-openssl=$(usex ssl auto none)"
|
||||
use debug && myconf+=' --fossil-debug'
|
||||
use json && myconf+=' --json'
|
||||
use system-sqlite && myconf+=' --disable-internal-sqlite'
|
||||
use static && myconf+=' --static'
|
||||
use tcl && myconf+=' --with-tcl=1'
|
||||
use fusefs || myconf+=' --disable-fusefs'
|
||||
|
||||
local u useflags
|
||||
useflags=( tcl-stubs tcl-private-stubs th1-docs th1-hooks )
|
||||
for u in ${useflags[@]} ; do
|
||||
use ${u} && myconf+=" --with-${u}"
|
||||
done
|
||||
|
||||
tc-export CC CXX
|
||||
CC_FOR_BUILD=${CC} ./configure ${myconf} || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin fossil
|
||||
}
|
||||
@@ -1,81 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_TAG="66ee0beb9b47d827bde533fe6a1fb2ead4ceb1936468881b4fb621bd6bdfd862"
|
||||
|
||||
DESCRIPTION="Simple, high-reliability, source control management, and more"
|
||||
HOMEPAGE="https://www.fossil-scm.org/home"
|
||||
SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm ppc ppc64 ~riscv x86"
|
||||
IUSE="debug fusefs json system-sqlite +ssl static tcl tcl-stubs
|
||||
tcl-private-stubs test th1-docs th1-hooks"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# Please check sqlite minimum version on every release. This can be done with:
|
||||
# ./configure --print-minimum-sqlite-version
|
||||
RDEPEND="
|
||||
virtual/zlib:=
|
||||
|| (
|
||||
sys-libs/readline:0
|
||||
dev-libs/libedit
|
||||
)
|
||||
system-sqlite? ( >=dev-db/sqlite-3.38.0:3 )
|
||||
ssl? ( dev-libs/openssl:0= )
|
||||
tcl? ( dev-lang/tcl:0= )
|
||||
"
|
||||
|
||||
# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
|
||||
DEPEND="${RDEPEND}
|
||||
!tcl? (
|
||||
|| (
|
||||
dev-lang/tcl:*
|
||||
dev-lang/jimtcl:*
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
BDEPEND="test? ( dev-lang/tcl )"
|
||||
|
||||
PATCHES=(
|
||||
# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
|
||||
"${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch
|
||||
)
|
||||
|
||||
S="${WORKDIR}/fossil-src-${PV}"
|
||||
|
||||
src_configure() {
|
||||
# this is not an autotools situation so don't make it seem like one
|
||||
# --with-tcl: works
|
||||
# --without-tcl: dies
|
||||
local myconf="--with-openssl=$(usex ssl auto none)"
|
||||
use debug && myconf+=' --fossil-debug'
|
||||
use json && myconf+=' --json'
|
||||
use system-sqlite && myconf+=' --disable-internal-sqlite'
|
||||
use static && myconf+=' --static'
|
||||
use tcl && myconf+=' --with-tcl=1'
|
||||
use fusefs || myconf+=' --disable-fusefs'
|
||||
|
||||
local u useflags
|
||||
useflags=( tcl-stubs tcl-private-stubs th1-docs th1-hooks )
|
||||
for u in ${useflags[@]} ; do
|
||||
use ${u} && myconf+=" --with-${u}"
|
||||
done
|
||||
|
||||
tc-export CC CXX
|
||||
CC_FOR_BUILD=${CC} ./configure ${myconf} || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin fossil
|
||||
}
|
||||
@@ -1,94 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_TAG="8be0372c1051043761320c8ea8669c3cf320c406e5fe18ad36b7be5f844ca73b"
|
||||
|
||||
DESCRIPTION="Simple, high-reliability, source control management, and more"
|
||||
HOMEPAGE="https://www.fossil-scm.org/home"
|
||||
|
||||
# Arrow can be dropped with next version. Needed to resolve
|
||||
# https://bugs.gentoo.org/931862
|
||||
SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz -> fossil-src-${PV}-r1.tar.gz"
|
||||
|
||||
S="${WORKDIR}/fossil-src-${PV}"
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm ppc ppc64 ~riscv x86"
|
||||
IUSE="debug fusefs json system-sqlite +ssl static tcl tcl-stubs
|
||||
tcl-private-stubs test th1-docs th1-hooks"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# Please check sqlite minimum version on every release. This can be done with:
|
||||
# ./configure --print-minimum-sqlite-version
|
||||
RDEPEND="
|
||||
virtual/zlib:=
|
||||
|| (
|
||||
sys-libs/readline:0
|
||||
dev-libs/libedit
|
||||
)
|
||||
system-sqlite? ( >=dev-db/sqlite-3.38.0:3 )
|
||||
ssl? ( dev-libs/openssl:0= )
|
||||
tcl? ( dev-lang/tcl:0= )
|
||||
"
|
||||
|
||||
# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
|
||||
DEPEND="${RDEPEND}
|
||||
!tcl? (
|
||||
|| (
|
||||
dev-lang/tcl:*
|
||||
dev-lang/jimtcl:*
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-lang/tcl
|
||||
!riscv? ( json? ( dev-tcltk/tcllib ) )
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
|
||||
"${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
eapply -p0 -- \
|
||||
"${FILESDIR}"/fossil-2.24-test-fixes.patch \
|
||||
"${FILESDIR}"/fossil-2.24-disable-utf8-tests-1179-1586-1587.patch \
|
||||
"${FILESDIR}"/fossil-2.24-fix-json-test-content-length.patch
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# this is not an autotools situation so don't make it seem like one
|
||||
# --with-tcl: works
|
||||
# --without-tcl: dies
|
||||
local myconf="--with-openssl=$(usex ssl auto none)"
|
||||
use debug && myconf+=' --fossil-debug'
|
||||
use json && myconf+=' --json'
|
||||
use system-sqlite && myconf+=' --disable-internal-sqlite'
|
||||
use static && myconf+=' --static'
|
||||
use tcl && myconf+=' --with-tcl=1'
|
||||
use fusefs || myconf+=' --disable-fusefs'
|
||||
|
||||
local u useflags
|
||||
useflags=( tcl-stubs tcl-private-stubs th1-docs th1-hooks )
|
||||
for u in ${useflags[@]} ; do
|
||||
use ${u} && myconf+=" --with-${u}"
|
||||
done
|
||||
|
||||
tc-export CC CXX
|
||||
CC_FOR_BUILD=${CC} ./configure ${myconf} || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin fossil
|
||||
doman fossil.1
|
||||
}
|
||||
@@ -17,7 +17,7 @@ SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz -
|
||||
S="${WORKDIR}/fossil-src-${PV}"
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86"
|
||||
KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
|
||||
IUSE="debug fusefs json system-sqlite +ssl static tcl tcl-stubs
|
||||
tcl-private-stubs test th1-docs th1-hooks"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
@@ -1,251 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{12..13} )
|
||||
inherit cmake desktop python-single-r1 virtualx xdg-utils
|
||||
|
||||
DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
|
||||
HOMEPAGE="https://www.gnuradio.org/"
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0/${PV}"
|
||||
|
||||
if [[ ${PV} =~ "9999" ]]; then
|
||||
EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
|
||||
EGIT_BRANCH="maint-3.10"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="amd64 ~arm ~riscv ~x86"
|
||||
fi
|
||||
|
||||
IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq"
|
||||
|
||||
#RESTRICT="!test? ( test )"
|
||||
# Tests are pulling in the installed python libs and breaking
|
||||
# https://github.com/gnuradio/gnuradio/issues/7568
|
||||
RESTRICT="test"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
alsa? ( audio )
|
||||
analog? ( filter )
|
||||
audio? ( || ( alsa oss jack portaudio ) )
|
||||
channels? ( filter analog qt5 )
|
||||
digital? ( filter analog )
|
||||
dtv? ( filter analog fec )
|
||||
jack? ( audio )
|
||||
modtool? ( utils )
|
||||
oss? ( audio )
|
||||
portaudio? ( audio )
|
||||
qt5? ( filter )
|
||||
test? ( channels )
|
||||
trellis? ( analog digital )
|
||||
uhd? ( filter analog )
|
||||
vocoder? ( filter analog )
|
||||
wavelet? ( analog )
|
||||
"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
$(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]')
|
||||
dev-libs/gmp:=
|
||||
dev-libs/log4cpp:=
|
||||
$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
|
||||
dev-libs/spdlog:=
|
||||
dev-libs/libfmt:=
|
||||
sci-libs/fftw:3.0=
|
||||
sci-libs/volk:=
|
||||
media-libs/libsndfile
|
||||
sys-libs/libunwind
|
||||
alsa? ( media-libs/alsa-lib:= )
|
||||
ctrlport? (
|
||||
$(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]')
|
||||
)
|
||||
fec? (
|
||||
sci-libs/gsl:=
|
||||
$(python_gen_cond_dep 'dev-python/scipy[${PYTHON_USEDEP}]')
|
||||
)
|
||||
filter? (
|
||||
$(python_gen_cond_dep 'dev-python/scipy[${PYTHON_USEDEP}]')
|
||||
qt5? ( $(python_gen_cond_dep 'dev-python/pyqtgraph[qt5,${PYTHON_USEDEP}]') )
|
||||
)
|
||||
grc? (
|
||||
$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]')
|
||||
x11-libs/gtk+:3[introspection]
|
||||
x11-libs/pango[introspection]
|
||||
)
|
||||
iio? (
|
||||
net-libs/libiio:=
|
||||
net-libs/libad9361-iio:=
|
||||
)
|
||||
jack? ( virtual/jack )
|
||||
portaudio? ( >=media-libs/portaudio-19_pre )
|
||||
qt5? (
|
||||
$(python_gen_cond_dep 'dev-python/pyqt5[opengl,${PYTHON_USEDEP}]')
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
x11-libs/qwt:6=[qt5(-)]
|
||||
dev-qt/qtwidgets:5
|
||||
)
|
||||
soapy? (
|
||||
net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}]
|
||||
)
|
||||
sdl? ( >=media-libs/libsdl-1.2.0 )
|
||||
trellis? ( dev-python/scipy )
|
||||
uhd? (
|
||||
>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
|
||||
)
|
||||
utils? (
|
||||
$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
|
||||
dev-python/click-plugins[${PYTHON_USEDEP}]
|
||||
dev-python/mako[${PYTHON_USEDEP}]
|
||||
dev-python/matplotlib[${PYTHON_USEDEP}]')
|
||||
)
|
||||
vocoder? (
|
||||
media-sound/gsm
|
||||
>=media-libs/codec2-0.8.1:=
|
||||
)
|
||||
wavelet? (
|
||||
sci-libs/gsl:=
|
||||
sci-libs/lapack
|
||||
)
|
||||
zeromq? ( >=net-libs/zeromq-2.1.11:= )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
>=app-text/doxygen-1.5.7.1
|
||||
<dev-libs/mathjax-3
|
||||
)
|
||||
grc? ( x11-misc/xdg-utils )
|
||||
modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') )
|
||||
oss? ( virtual/os-headers )
|
||||
test? (
|
||||
>=dev-util/cppunit-1.9.14
|
||||
dev-python/pyzmq
|
||||
)
|
||||
zeromq? ( net-libs/cppzmq )
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-boost-1.89.patch" ) # bug 969063
|
||||
|
||||
src_prepare() {
|
||||
xdg_environment_reset #534582
|
||||
|
||||
use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
|
||||
use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
|
||||
use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
|
||||
use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DENABLE_DEFAULT=OFF
|
||||
-DENABLE_GNURADIO_RUNTIME=ON
|
||||
-DENABLE_PYTHON=ON
|
||||
-DENABLE_GR_BLOCKS=ON
|
||||
-DENABLE_GR_ANALOG="$(usex analog ON OFF)"
|
||||
-DENABLE_GR_AUDIO=ON
|
||||
-DENABLE_GR_CHANNELS="$(usex channels ON OFF)"
|
||||
-DENABLE_GR_CTRLPORT="$(usex ctrlport ON OFF)"
|
||||
-DENABLE_GR_DIGITAL="$(usex digital ON OFF)"
|
||||
-DENABLE_DOXYGEN="$(usex doc ON OFF)"
|
||||
-DENABLE_GR_DTV="$(usex dtv ON OFF)"
|
||||
-DENABLE_GR_FEC="$(usex fec ON OFF)"
|
||||
-DENABLE_GR_FFT=ON
|
||||
-DENABLE_GR_FILTER="$(usex filter ON OFF)"
|
||||
-DENABLE_GRC="$(usex grc ON OFF)"
|
||||
-DENABLE_GR_IIO="$(usex iio ON OFF)"
|
||||
-DENABLE_GR_MODTOOL="$(usex modtool ON OFF)"
|
||||
-DENABLE_GR_BLOCKTOOL="$(usex modtool ON OFF)"
|
||||
-DENABLE_GR_NETWORK="$(usex network ON OFF)"
|
||||
-DENABLE_GR_PDU=ON
|
||||
-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters ON OFF)"
|
||||
-DENABLE_TESTING="$(usex test ON OFF)"
|
||||
-DENABLE_GR_QTGUI="$(usex qt5 ON OFF)"
|
||||
-DENABLE_GR_SOAPY="$(usex soapy ON OFF)"
|
||||
-DENABLE_GR_TRELLIS="$(usex trellis ON OFF)"
|
||||
-DENABLE_GR_UHD="$(usex uhd ON OFF)"
|
||||
-DENABLE_GR_UTILS="$(usex utils ON OFF)"
|
||||
-DENABLE_GR_VIDEO_SDL="$(usex sdl ON OFF)"
|
||||
-DENABLE_GR_VOCODER="$(usex vocoder ON OFF)"
|
||||
-DENABLE_GR_WAVELET="$(usex wavelet ON OFF)"
|
||||
-DENABLE_GR_ZEROMQ="$(usex zeromq ON OFF)"
|
||||
-DSYSCONFDIR="${EPREFIX}"/etc
|
||||
-DPYTHON_EXECUTABLE="${PYTHON}"
|
||||
-DGR_PYTHON_DIR="$(python_get_sitedir)"
|
||||
-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
|
||||
-DMATHJAX2_ROOT="${EPREFIX}/usr/share/mathjax"
|
||||
)
|
||||
# replace -DSYSCONFDIR in 3.10.13.0
|
||||
#-DGR_CONF_DIR="${EPREFIX}"/etc
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
if use examples ; then
|
||||
dodir /usr/share/doc/${PF}/
|
||||
mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
else
|
||||
# It seems that the examples are always installed
|
||||
rm -rf "${ED}"/usr/share/${PN}/examples || die
|
||||
fi
|
||||
|
||||
if use doc || use examples; then
|
||||
#this doesn't appear useful
|
||||
rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
|
||||
fi
|
||||
|
||||
# Remove duplicated icons, MIME and desktop files and installation script
|
||||
rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
|
||||
rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
|
||||
|
||||
# Install icons, menu items and mime-types for GRC
|
||||
if use grc ; then
|
||||
local fd_path="${S}/grc/scripts/freedesktop"
|
||||
insinto /usr/share/mime/packages
|
||||
doins "${fd_path}/${PN}-grc.xml"
|
||||
|
||||
domenu "${fd_path}/${PN}-grc.desktop"
|
||||
for size in 16 24 32 48 64 128 256; do
|
||||
newicon -s $size "${fd_path}/"grc-icon-$size.png ${PN}-grc.png
|
||||
done
|
||||
fi
|
||||
|
||||
python_fix_shebang "${ED}"
|
||||
# Remove incorrectly byte-compiled Python files and replace
|
||||
find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
|
||||
python_optimize
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# skip test which needs internet (metainfo_test)
|
||||
virtx cmake_src_test -E 'metainfo_test' --output-on-failure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use grc ; then
|
||||
xdg_desktop_database_update
|
||||
xdg_icon_cache_update
|
||||
xdg_mimeinfo_database_update
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
if use grc ; then
|
||||
xdg_desktop_database_update
|
||||
xdg_icon_cache_update
|
||||
xdg_mimeinfo_database_update
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user