wok-next rev 21086

Up: lz4 (1.8.3), posixovl (1.3), subversion (1.11.0), talloc (2.1.14), upx (3.95), vala (0.42.4). Add utf8proc.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Dec 25 22:17:47 2018 +0200 (2018-12-25)
parents 7c5d038be95b
children 0f2575775b2d
files lz4/receipt posixovl/receipt subversion/receipt talloc/receipt upx/receipt utf8proc/receipt utf8proc/stuff/libutf8proc.pc.in vala/receipt vala/stuff/patches/series vala/stuff/patches/vala-0.42.3-avoid_graphviz-1.patch
line diff
     1.1 --- a/lz4/receipt	Tue Dec 25 19:30:28 2018 +0200
     1.2 +++ b/lz4/receipt	Tue Dec 25 22:17:47 2018 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="lz4"
     1.7 -VERSION="1.8.2"
     1.8 +VERSION="1.8.3"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="High speed lossless compressor"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -10,8 +10,14 @@
    1.13  
    1.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.15  WGET_URL="$GITHUB/lz4/lz4/tarball/v$VERSION"
    1.16 +TARBALL_SHA1="dc65188bccd33fa203b1a9ea3de77a060de3d4e7"
    1.17  
    1.18 -SPLIT="$PACKAGE-lib $PACKAGE-dev"
    1.19 +SPLIT="lib$PACKAGE $PACKAGE $PACKAGE-dev"
    1.20 +
    1.21 +DEPENDS_liblz4=" "
    1.22 +DEPENDS_std=" "
    1.23 +
    1.24 +CAT_liblz4="base-system|shared library"
    1.25  
    1.26  compile_rules() {
    1.27  	export AR="$HOST_SYSTEM-ar"
    1.28 @@ -19,20 +25,4 @@
    1.29  	make PREFIX=/usr DESTDIR=$install install
    1.30  }
    1.31  
    1.32 -genpkg_rules() {
    1.33 -	case $PACKAGE in
    1.34 -		lz4)
    1.35 -			copy lz4 unlz4 lz4cat
    1.36 -			DEPENDS=" "
    1.37 -			TAGS="compression"
    1.38 -			;;
    1.39 -		*-lib)
    1.40 -			copy *.so*
    1.41 -			CAT="base-system|shared library"
    1.42 -			DEPENDS=" "
    1.43 -			;;
    1.44 -		*-dev)
    1.45 -			copy @dev
    1.46 -			;;
    1.47 -	esac
    1.48 -}
    1.49 +PROVIDE_liblz4="lz4-lib"
     2.1 --- a/posixovl/receipt	Tue Dec 25 19:30:28 2018 +0200
     2.2 +++ b/posixovl/receipt	Tue Dec 25 22:17:47 2018 +0200
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="posixovl"
     2.7 -VERSION="1.2"
     2.8 +VERSION="1.3"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="FUSE file system that provides POSIX functionality"
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12 @@ -10,24 +10,18 @@
    2.13  
    2.14  TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.15  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    2.16 +TARBALL_SHA1="c6b868f5a0b3ff0d316759214fe69dbd1fec694b"
    2.17  
    2.18 -BUILD_DEPENDS="autoconf automake fuse2-dev attr-dev"
    2.19 +BUILD_DEPENDS="fuse2-dev attr-dev"
    2.20 +DEPENDS="fuse2"
    2.21 +
    2.22 +TAGS="filesystem"
    2.23  
    2.24  compile_rules() {
    2.25 -	mv $PACKAGE $src 2>/dev/null
    2.26 -	cd $src
    2.27 -	grep -q 'else if (!S_ISREG' posixovl.c ||
    2.28 -	sed -i 's/if (!S_ISREG/if (S_ISLNK(cb->ll.mode))\n\t\tcb->sb.st_size = strlen(cb->ll.target);\n\telse &/' posixovl.c
    2.29 -	sed -i 's/cb->ll.size/0/' posixovl.c
    2.30 -
    2.31 -	sh autogen.sh
    2.32  	./configure $CONFIGURE_ARGS &&
    2.33  	make &&
    2.34 -	make install
    2.35 +	make install || return 1
    2.36 +
    2.37 +	cook_pick_manpages posixovl.1
    2.38 +	cook_pick_docs format.txt
    2.39  }
    2.40 -
    2.41 -genpkg_rules() {
    2.42 -	copy sbin/
    2.43 -	DEPENDS="fuse2"
    2.44 -	TAGS="filesystem"
    2.45 -}
     3.1 --- a/subversion/receipt	Tue Dec 25 19:30:28 2018 +0200
     3.2 +++ b/subversion/receipt	Tue Dec 25 22:17:47 2018 +0200
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt v2.
     3.5  
     3.6  PACKAGE="subversion"
     3.7 -VERSION="1.9.7"
     3.8 +VERSION="1.11.0"
     3.9  CATEGORY="development"
    3.10  SHORT_DESC="Subversion Source Code Management access"
    3.11  MAINTAINER="devel@slitaz.org"
    3.12 @@ -11,10 +11,16 @@
    3.13  
    3.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.15  WGET_URL="https://archive.apache.org/dist/subversion/$TARBALL"
    3.16 +TARBALL_SHA1="48cbb5d2604cba571b23dffc05c8d479026f7f5e"
    3.17  
    3.18  BUILD_DEPENDS="apr-dev apr-util-dev serf-dev cyrus-sasl-dev dbus-dev \
    3.19 -gettext-dev libmagic-dev python-dev"
    3.20 -SPLIT="libsvn $PACKAGE $PACKAGE-dev"
    3.21 +gettext-dev libmagic-dev python-dev lz4-dev utf8proc-dev"
    3.22 +SPLIT="lib$PACKAGE $PACKAGE $PACKAGE-dev"
    3.23 +
    3.24 +DEPENDS_libsubversion="apr apr-util expat libmagic libsasl libsqlite3 serf zlib"
    3.25 +DEPENDS_std="apr apr-util libsasl libsvn"
    3.26 +DEPENDS_dev="libsvn $PACKAGE apr-dev apr-util-dev cyrus-sasl-dev expat-dev \
    3.27 +libmagic-dev serf-dev sqlite3-dev zlib-dev"
    3.28  
    3.29  compile_rules() {
    3.30  	./configure \
    3.31 @@ -28,23 +34,4 @@
    3.32  	cook_pick_docs doc/*
    3.33  }
    3.34  
    3.35 -genpkg_rules() {
    3.36 -	case $PACKAGE in
    3.37 -		libsvn)
    3.38 -			copy *.so*
    3.39 -			CAT="libdevel|library"
    3.40 -			DEPENDS="apr apr-util expat libmagic libsasl libsqlite3 serf zlib"
    3.41 -			;;
    3.42 -		subversion)
    3.43 -			copy @std @rm
    3.44 -			DEPENDS="apr apr-util libsasl libsvn"
    3.45 -			;;
    3.46 -		*-dev)
    3.47 -			copy @dev
    3.48 -			DEPENDS="libsvn subversion \
    3.49 -			apr-dev apr-util-dev cyrus-sasl-dev expat-dev libmagic-dev \
    3.50 -			serf-dev sqlite3-dev zlib-dev"
    3.51 -			;;
    3.52 -	esac
    3.53 -}
    3.54 -
    3.55 +PROVIDE_libsubversion="libsvn"
     4.1 --- a/talloc/receipt	Tue Dec 25 19:30:28 2018 +0200
     4.2 +++ b/talloc/receipt	Tue Dec 25 22:17:47 2018 +0200
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt v2.
     4.5  
     4.6  PACKAGE="talloc"
     4.7 -VERSION="2.1.11"
     4.8 +VERSION="2.1.14"
     4.9  CATEGORY="system-tools"
    4.10  SHORT_DESC="Hierarchical pool based memory allocator with destructors"
    4.11  MAINTAINER="devel@slitaz.org"
    4.12 @@ -11,28 +11,17 @@
    4.13  
    4.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    4.15  WGET_URL="https://www.samba.org/ftp/talloc/$TARBALL"
    4.16 +TARBALL_SHA1="9d563b768148b620bdae1c97b36cfc30928a1044"
    4.17  
    4.18  BUILD_DEPENDS="python-dev docbook-xsl"
    4.19  SPLIT="$PACKAGE-python $PACKAGE $PACKAGE-dev"
    4.20  
    4.21 +COPY_python="python*/ libpytalloc*"
    4.22 +CAT_python="development|Python bindings"
    4.23 +DEPENDS_python="$PACKAGE python"
    4.24 +
    4.25  compile_rules() {
    4.26  	./configure --prefix=/usr &&
    4.27  	make &&
    4.28  	make install
    4.29  }
    4.30 -
    4.31 -genpkg_rules() {
    4.32 -	case $PACKAGE in
    4.33 -		talloc-python)
    4.34 -			copy python*/ libpytalloc*
    4.35 -			CAT="development|Python bindings"
    4.36 -			DEPENDS="talloc python"
    4.37 -			;;
    4.38 -		talloc)
    4.39 -			copy @std @rm
    4.40 -			;;
    4.41 -		talloc-dev)
    4.42 -			copy @dev
    4.43 -			;;
    4.44 -	esac
    4.45 -}
     5.1 --- a/upx/receipt	Tue Dec 25 19:30:28 2018 +0200
     5.2 +++ b/upx/receipt	Tue Dec 25 22:17:47 2018 +0200
     5.3 @@ -1,37 +1,28 @@
     5.4  # SliTaz package receipt v2.
     5.5  
     5.6  PACKAGE="upx"
     5.7 -VERSION="3.94"
     5.8 +VERSION="3.95"
     5.9  CATEGORY="system-tools"
    5.10  SHORT_DESC="Ultimate Packer for eXecutables (free version using UCL compression)"
    5.11 -MAINTAINER="devl547@gmail.com"
    5.12 +MAINTAINER="devel@slitaz.org"
    5.13  LICENSE="GPL2"
    5.14  WEB_SITE="https://upx.github.io/"
    5.15  
    5.16 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    5.17 -WGET_URL="https://github.com/upx/upx/archive/v$VERSION.tar.gz"
    5.18 -TARBALL2="upx-lzma-sdk-$VERSION.tar.gz"
    5.19 -WGET_URL2="https://github.com/upx/upx-lzma-sdk/archive/v$VERSION.tar.gz"
    5.20 +TARBALL="$PACKAGE-$VERSION-src.tar.xz"
    5.21 +WGET_URL="https://github.com/upx/upx/releases/download/v$VERSION/$TARBALL"
    5.22 +TARBALL_SHA1="2f69002bd6012011c90732e8da96c366157e51e9"
    5.23  
    5.24  BUILD_DEPENDS="ucl-dev zlib-dev perl"
    5.25 +DEPENDS="ucl zlib"
    5.26  
    5.27  compile_rules() {
    5.28 -	[ -s $SRC/$TARBALL2 ] ||
    5.29 -		wget -O $SRC/$TARBALL2 $WGET_URL2
    5.30 -	tar -xf $SRC/$TARBALL2
    5.31 -	rm -r $src/src/lzma-sdk
    5.32 -	mv    $src/$(basename $TARBALL2 .tar.gz) $src/src/lzma-sdk
    5.33 +	make \
    5.34 +		UPX_LZMA_VERSION=0x465 \
    5.35 +		UPX_LZMADIR="$src" \
    5.36 +		CHECK_WHITESPACE=/bin/true \
    5.37 +		all || return 1
    5.38  
    5.39 -	make CHECK_WHITESPACE=/bin/true all || return 1
    5.40 -
    5.41 -	mkdir -p $install/usr/bin $install/usr/share/man/man1
    5.42 -	cp -a $src/src/upx.out $install/usr/bin/upx
    5.43 -	cp -a $src/doc $install/usr/share
    5.44 -	rm $install/usr/share/doc/Makefile
    5.45 -	mv $install/usr/share/doc/upx.1 $install/usr/share/man/man1
    5.46 +	install -Dm755 src/upx.out $install/usr/bin/upx
    5.47 +	cook_pick_manpages doc/upx.1
    5.48 +	cook_pick_docs doc/*.txt doc/*.html doc/*.doc
    5.49  }
    5.50 -
    5.51 -genpkg_rules() {
    5.52 -	copy upx
    5.53 -	DEPENDS="ucl zlib"
    5.54 -}
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/utf8proc/receipt	Tue Dec 25 22:17:47 2018 +0200
     6.3 @@ -0,0 +1,37 @@
     6.4 +# SliTaz package receipt v2.
     6.5 +
     6.6 +PACKAGE="utf8proc"
     6.7 +VERSION="2.2.0"
     6.8 +CATEGORY="libs"
     6.9 +SHORT_DESC="Library for processing UTF-8 encoded Unicode strings"
    6.10 +MAINTAINER="al.bobylev@gmail.com"
    6.11 +LICENSE="MIT"
    6.12 +WEB_SITE="https://juliastrings.github.io/utf8proc/"
    6.13 +
    6.14 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    6.15 +WGET_URL="https://github.com/JuliaStrings/utf8proc/archive/v$VERSION.tar.gz"
    6.16 +TARBALL_SHA1="476efd08dbff38c63f01bb9176905edb09384e63"
    6.17 +
    6.18 +BUILD_DEPENDS="cmake ninja"
    6.19 +SPLIT="$PACKAGE-dev"
    6.20 +
    6.21 +compile_rules() {
    6.22 +	sed "s|@VERSION@|$VERSION|" $stuff/libutf8proc.pc.in > libutf8proc.pc
    6.23 +
    6.24 +	mkdir build
    6.25 +	cd    build
    6.26 +
    6.27 +	cmake \
    6.28 +		-DCMAKE_INSTALL_PREFIX=/usr \
    6.29 +		-DBUILD_SHARED_LIBS=ON \
    6.30 +		-G Ninja \
    6.31 +		.. &&
    6.32 +	ninja &&
    6.33 +	ninja install || return 1
    6.34 +
    6.35 +	cd ..
    6.36 +	install -Dm644 utf8proc.h     $install/usr/include/utf8proc.h
    6.37 +	install -Dm644 libutf8proc.pc $install/usr/lib/pkgconfig/libutf8proc.pc
    6.38 +
    6.39 +	cook_pick_docs *.md
    6.40 +}
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/utf8proc/stuff/libutf8proc.pc.in	Tue Dec 25 22:17:47 2018 +0200
     7.3 @@ -0,0 +1,10 @@
     7.4 +prefix=/usr
     7.5 +exec_prefix=${prefix}
     7.6 +libdir=${exec_prefix}/lib
     7.7 +includedir=${prefix}/include
     7.8 +
     7.9 +Name: libutf8proc
    7.10 +Description: UTF8 processing
    7.11 +Version: @VERSION@
    7.12 +Libs: -L${libdir} -lutf8proc
    7.13 +Cflags: -I${includedir} -DUTF8PROC_EXPORTS
     8.1 --- a/vala/receipt	Tue Dec 25 19:30:28 2018 +0200
     8.2 +++ b/vala/receipt	Tue Dec 25 22:17:47 2018 +0200
     8.3 @@ -1,7 +1,7 @@
     8.4  # SliTaz package receipt v2.
     8.5  
     8.6  PACKAGE="vala"
     8.7 -VERSION="0.40.3"
     8.8 +VERSION="0.42.4"
     8.9  CATEGORY="development"
    8.10  SHORT_DESC="Compiler for the GObject type system"
    8.11  MAINTAINER="devel@slitaz.org"
    8.12 @@ -11,13 +11,18 @@
    8.13  
    8.14  TARBALL="$PACKAGE-$VERSION.tar.xz"
    8.15  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    8.16 +TARBALL_SHA1="9b1b0c282e895d2e979749cf991805d5fba09032"
    8.17  
    8.18  BUILD_DEPENDS="automake libtool glib-dev libxslt-dev"
    8.19 +SPLIT="$PACKAGE-common $PACKAGE" # arch-less split
    8.20 +
    8.21 +COPY_common="@dev vapi/"
    8.22 +
    8.23 +DEPENDS_std="$PACKAGE-common glib-dev"
    8.24 +
    8.25 +TAGS_std="compiler"
    8.26  
    8.27  compile_rules() {
    8.28 -	# if graphviz is not installed
    8.29 -	sed -i '115d; 121,137d; 139,140d' configure.ac
    8.30 -	sed -i '/valadoc/d' Makefile.am
    8.31  	ACLOCAL= autoreconf -fiv
    8.32  
    8.33  	./configure $CONFIGURE_ARGS &&
    8.34 @@ -25,9 +30,3 @@
    8.35  	make &&
    8.36  	make install
    8.37  }
    8.38 -
    8.39 -genpkg_rules() {
    8.40 -	copy @std @dev
    8.41 -	DEPENDS="glib-dev"
    8.42 -	TAGS="compiler"
    8.43 -}
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/vala/stuff/patches/series	Tue Dec 25 22:17:47 2018 +0200
     9.3 @@ -0,0 +1,2 @@
     9.4 +# from BLFS
     9.5 +vala-0.42.3-avoid_graphviz-1.patch
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/vala/stuff/patches/vala-0.42.3-avoid_graphviz-1.patch	Tue Dec 25 22:17:47 2018 +0200
    10.3 @@ -0,0 +1,61 @@
    10.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
    10.5 +Date: 2018-09-28
    10.6 +Initial Package Version: 2.7.8
    10.7 +Upstream Status: BLFS-specific
    10.8 +Origin: BLFS
    10.9 +Description: For a while we have been using a sed to allow graphviz
   10.10 +to be treated as optional instead of required. With new releases it
   10.11 +becomes hard to determine what changes to make so that the sed will
   10.12 +do the right thing. In this case a patch shows what we want to
   10.13 +achieve, and often (e.g. from 0.40.8 to 0.42.0) applies with only
   10.14 +an offset.
   10.15 +
   10.16 +diff -Naur vala-0.42.0.orig/configure.ac vala-0.42.0/configure.ac
   10.17 +--- vala-0.42.0.orig/configure.ac	2018-08-20 17:17:35.000000000 +0100
   10.18 ++++ vala-0.42.0/configure.ac	2018-09-28 20:21:07.645337464 +0100
   10.19 +@@ -119,32 +119,12 @@
   10.20 + AC_SUBST(GMODULE_CFLAGS)
   10.21 + AC_SUBST(GMODULE_LIBS)
   10.22 + 
   10.23 +-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
   10.24 + AC_MSG_CHECKING([for CGRAPH])
   10.25 + cgraph_tmp_LIBADD="$LIBADD"
   10.26 + cgraph_tmp_CFLAGS="$CFLAGS"
   10.27 + LIBADD="$LIBADD $LIBGVC_LIBS"
   10.28 + CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
   10.29 +-AC_RUN_IFELSE(
   10.30 +-	[AC_LANG_SOURCE([
   10.31 +-		#include <gvc.h>
   10.32 +-
   10.33 +-		int main(void) {
   10.34 +-			#ifdef WITH_CGRAPH
   10.35 +-				return 0;
   10.36 +-			#else
   10.37 +-				return -1;
   10.38 +-			#endif
   10.39 +-		}
   10.40 +-	])], [
   10.41 +-		AC_MSG_RESULT([yes])
   10.42 +-		VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
   10.43 +-		have_cgraph=yes
   10.44 +-	], [
   10.45 +-		AC_MSG_RESULT([no])
   10.46 + 		have_cgraph=no
   10.47 +-	]
   10.48 +-)
   10.49 + LIBADD="$cgraph_tmp_LIBADD"
   10.50 + CFLAGS="$cgraph_tmp_CFLAGS"
   10.51 + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
   10.52 +diff -Naur vala-0.42.0.orig/configure.ac.orig vala-0.42.0/configure.ac.orig
   10.53 +diff -Naur vala-0.42.0.orig/Makefile.am vala-0.42.0/Makefile.am
   10.54 +--- vala-0.42.0.orig/Makefile.am	2018-08-20 17:17:34.000000000 +0100
   10.55 ++++ vala-0.42.0/Makefile.am	2018-09-28 20:21:07.645337464 +0100
   10.56 +@@ -13,8 +13,6 @@
   10.57 + 	doc \
   10.58 + 	gobject-introspection \
   10.59 + 	vapigen \
   10.60 +-	libvaladoc \
   10.61 +-	valadoc \
   10.62 + 	$(NULL)
   10.63 + 
   10.64 + if ENABLE_UNVERSIONED