diff --git a/srcpkgs/bk/patches/size_t.patch b/srcpkgs/bk/patches/size_t.patch new file mode 100644 index 00000000000..23dcfd76587 --- /dev/null +++ b/srcpkgs/bk/patches/size_t.patch @@ -0,0 +1,22 @@ +--- src/slib.c.orig ++++ src/slib.c +@@ -14921,7 +14921,7 @@ + * Makefile). + */ + extern struct kwval *kw2val_lookup(register const char *str, +- register unsigned int len); ++ register size_t len); + #include "kw2val_lookup.c" + + #define notKeyword -1 +--- src/cmd.pl.orig ++++ src/cmd.pl +@@ -63,7 +63,7 @@ + u8 remote:1; /* always allowed as a remote command */ + } CMD; + +-CMD *cmd_lookup(const char *str, unsigned int len); ++CMD *cmd_lookup(const char *str, size_t len); + + END + diff --git a/srcpkgs/bk/template b/srcpkgs/bk/template index b75b45ab1c1..e6efc252d14 100644 --- a/srcpkgs/bk/template +++ b/srcpkgs/bk/template @@ -1,19 +1,16 @@ # Template file for 'bitkeeper' pkgname=bk -version=7.3ce.1 -revision=2 -wrksrc="bk-7.3.1ce" +version=7.3.2 +revision=1 hostmakedepends="gperf groff perl bison pkg-config" makedepends="libXft-devel libtomcrypt-devel libtommath-devel pcre-devel lz4-devel" # bundles: tcl tk short_desc="BitKeeper Distributed Source Control System" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Apache-2.0" -homepage="https://www.bitkeeper.org/" -distfiles="https://www.bitkeeper.org/downloads/${version}ce/${pkgname}-${version}ce.src.tar.gz" -# XXX call next version just "7.4" -distfiles="https://www.bitkeeper.org/downloads/7.3.1ce/${pkgname}-7.3.1ce.src.tar.gz" -checksum=8784fe01722ebac7d93854c25a3aa203ec2751d90d06b036003868f2d8e6d250 +homepage="http://www.bitkeeper.org/" +distfiles="http://www.bitkeeper.org/downloads/${version}/${pkgname}-${version}.src.tar.gz" +checksum=833bf095a1f9c2be435fddbb3ffe10dadfad1853127b97892f1a81c884d4fe1d # Needs reworking of the build system. nocross=yes @@ -21,6 +18,8 @@ nocross=yes post_extract() { # For musl: sed -i '1i#define __DEFINED_FILE' src/libc/stdio_remap.h + # For glibc: + sed -i '1i#define __FILE_defined' src/libc/stdio_remap.h sed -i 's/__linux__/__GLIBC__/' src/libc/utils/stackdump.c } do_build() {