wok-next rev 21015

Small updates
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Oct 15 14:02:33 2018 +0300 (2018-10-15)
parents 8b193d73523f
children 71ba95d2422e
files liblinear/receipt libmbim/receipt libmediainfo/receipt libzen/receipt mediainfo/receipt tinyxml/receipt tinyxml/stuff/patches/series tinyxml/stuff/patches/tinyxml-2.6.1-entity.patch tinyxml/stuff/patches/tinyxml-2.6.2-defineSTL.patch tinyxml/stuff/tinyxml.pc tinyxml2/receipt
line diff
     1.1 --- a/liblinear/receipt	Sun Oct 14 11:28:22 2018 +0300
     1.2 +++ b/liblinear/receipt	Mon Oct 15 14:02:33 2018 +0300
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="liblinear"
     1.7 -VERSION="2.20"
     1.8 +VERSION="220"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="A Library for Large Linear Classification"
    1.11  MAINTAINER="al.bobylev@gmail.com"
    1.12 @@ -9,10 +9,10 @@
    1.13  WEB_SITE="https://github.com/cjlin1/liblinear/"
    1.14  LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/liblinear.html"
    1.15  
    1.16 -TARBALL="$PACKAGE-${VERSION//./}.tar.gz"
    1.17 -WGET_URL="https://github.com/cjlin1/liblinear/archive/v${VERSION//./}/$TARBALL"
    1.18 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.19 +WGET_URL="https://github.com/cjlin1/liblinear/archive/v$VERSION/$TARBALL"
    1.20  
    1.21 -SPLIT="liblinear-dev"
    1.22 +SPLIT="$PACKAGE-dev"
    1.23  
    1.24  compile_rules() {
    1.25  	make lib || return 1
     2.1 --- a/libmbim/receipt	Sun Oct 14 11:28:22 2018 +0300
     2.2 +++ b/libmbim/receipt	Mon Oct 15 14:02:33 2018 +0300
     2.3 @@ -1,19 +1,19 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="libmbim"
     2.7 -VERSION="1.16.0"
     2.8 +VERSION="1.16.2"
     2.9  CATEGORY="libs"
    2.10  SHORT_DESC="MBIM modem protocol helper library"
    2.11  MAINTAINER="al.bobylev@gmail.com"
    2.12  LICENSE="GPL2"
    2.13  WEB_SITE="https://www.freedesktop.org/wiki/Software/libmbim/"
    2.14 -LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libmbim.html"
    2.15 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libmbim.html"
    2.16  
    2.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.18  WGET_URL="https://www.freedesktop.org/software/libmbim/$TARBALL"
    2.19  
    2.20  BUILD_DEPENDS="glib-dev libgudev-dev help2man"
    2.21 -SPLIT="libmbim-dev"
    2.22 +SPLIT="$PACKAGE-dev"
    2.23  
    2.24  compile_rules() {
    2.25  	./configure \
    2.26 @@ -26,13 +26,7 @@
    2.27  
    2.28  genpkg_rules() {
    2.29  	case $PACKAGE in
    2.30 -		libmbim)
    2.31 -			copy @std
    2.32 -			DEPENDS=""
    2.33 -			;;
    2.34 -		*-dev)
    2.35 -			copy @dev
    2.36 -			DEPENDS=""
    2.37 -			;;
    2.38 +		libmbim) copy @std;;
    2.39 +		*-dev)   copy @dev;;
    2.40  	esac
    2.41  }
     3.1 --- a/libmediainfo/receipt	Sun Oct 14 11:28:22 2018 +0300
     3.2 +++ b/libmediainfo/receipt	Mon Oct 15 14:02:33 2018 +0300
     3.3 @@ -1,46 +1,42 @@
     3.4  # SliTaz package receipt v2.
     3.5  
     3.6  PACKAGE="libmediainfo"
     3.7 -VERSION="0.7.79"
     3.8 +VERSION="18.08.1"
     3.9  CATEGORY="libs"
    3.10  SHORT_DESC="Library reading metadata from media files"
    3.11  MAINTAINER="al.bobylev@gmail.com"
    3.12 -LICENSE="zlib/libpng"
    3.13 +LICENSE="BSD"
    3.14  WEB_SITE="http://mediaarea.net/"
    3.15  
    3.16  TARBALL="${PACKAGE}_$VERSION.tar.xz"
    3.17  WGET_URL="${WEB_SITE}download/source/$PACKAGE/$VERSION/$TARBALL"
    3.18  
    3.19 -BUILD_DEPENDS="libzen libtool automake autoconf curl-dev libmms-dev"
    3.20 -SPLIT="libmediainfo-dev"
    3.21 +BUILD_DEPENDS="cmake libzen-dev zlib-dev tinyxml2-dev curl-dev"
    3.22 +SPLIT="$PACKAGE-dev"
    3.23  
    3.24  compile_rules() {
    3.25 -	cd Project/GNU/Library
    3.26 -	./autogen.sh
    3.27 -	./configure \
    3.28 -		--enable-shared \
    3.29 -		--enable-minimize-size \
    3.30 -		--with-libcurl \
    3.31 -		--with-libmms \
    3.32 -		$CONFIGURE_ARGS &&
    3.33 +	rm -r Project/MS* Project/zlib Source/ThirdParty/tinyxml2
    3.34 +
    3.35 +	cd Project/CMake
    3.36 +	cmake \
    3.37 +		-DCMAKE_BUILD_TYPE=Release \
    3.38 +		-DCMAKE_INSTALL_PREFIX=/usr \
    3.39 +		-DCMAKE_VERBOSE_MAKEFILE=ON \
    3.40 +		-DBUILD_SHARED_LIBS=ON \
    3.41 +		&&
    3.42  	make &&
    3.43 -	make install || return 1
    3.44 -
    3.45 -	install -Dm755 libmediainfo-config $install/usr/bin/libmediainfo-config
    3.46 -	sed \
    3.47 -		-e "s|$src/Project/GNU/Library|/usr/lib|" \
    3.48 -		-e 's|.libs||' \
    3.49 -		-i $install/usr/bin/libmediainfo-config
    3.50 +	make install
    3.51  }
    3.52  
    3.53  genpkg_rules() {
    3.54  	case $PACKAGE in
    3.55  		libmediainfo)
    3.56  			copy @std
    3.57 -			DEPENDS="libcurl libmms"
    3.58 +			DEPENDS="libcurl libzen tinyxml2 zlib"
    3.59  			;;
    3.60  		*-dev)
    3.61  			copy @dev
    3.62 +			DEPENDS="libmediainfo curl-dev libzen-dev zlib-dev"
    3.63  			;;
    3.64  	esac
    3.65  }
     4.1 --- a/libzen/receipt	Sun Oct 14 11:28:22 2018 +0300
     4.2 +++ b/libzen/receipt	Mon Oct 15 14:02:33 2018 +0300
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt v2.
     4.5  
     4.6  PACKAGE="libzen"
     4.7 -VERSION="0.4.32"
     4.8 +VERSION="0.4.37"
     4.9  CATEGORY="development"
    4.10  SHORT_DESC="ZenLib - small C++ derivative class to have a simpler life"
    4.11  MAINTAINER="al.bobylev@gmail.com"
    4.12 @@ -11,21 +11,24 @@
    4.13  TARBALL="${PACKAGE}_$VERSION.tar.bz2"
    4.14  WGET_URL="${WEB_SITE}download/source/$PACKAGE/$VERSION/$TARBALL"
    4.15  
    4.16 -BUILD_DEPENDS="libtool"
    4.17 +BUILD_DEPENDS="cmake"
    4.18 +SPLIT="$PACKAGE-dev"
    4.19  
    4.20  compile_rules() {
    4.21 -	cd Project/GNU/Library
    4.22 -	./autogen.sh
    4.23 -	./configure $CONFIGURE_ARGS &&
    4.24 +	cd Project/CMake
    4.25 +	cmake \
    4.26 +		-DCMAKE_BUILD_TYPE=Release \
    4.27 +		-DCMAKE_INSTALL_PREFIX=/usr \
    4.28 +		-DLIB_INSTALL_DIR=/usr/lib \
    4.29 +		-DCMAKE_VERBOSE_MAKEFILE=ON \
    4.30 +		&&
    4.31  	make &&
    4.32 -	make install || return 1
    4.33 -
    4.34 -	sed \
    4.35 -		-e "s|$src/Project/GNU/Library|/usr/lib|" \
    4.36 -		-e 's|/.libs||' \
    4.37 -		-i $install/usr/bin/libzen-config
    4.38 +	make install
    4.39  }
    4.40  
    4.41  genpkg_rules() {
    4.42 -	copy @dev
    4.43 +	case $PACKAGE in
    4.44 +		libzen) copy @std;;
    4.45 +		*-dev)  copy @dev;;
    4.46 +	esac
    4.47  }
     5.1 --- a/mediainfo/receipt	Sun Oct 14 11:28:22 2018 +0300
     5.2 +++ b/mediainfo/receipt	Mon Oct 15 14:02:33 2018 +0300
     5.3 @@ -1,29 +1,29 @@
     5.4 -# SliTaz package receipt.
     5.5 +# SliTaz package receipt v2.
     5.6  
     5.7  PACKAGE="mediainfo"
     5.8 -VERSION="0.7.79"
     5.9 +VERSION="18.08.1"
    5.10  CATEGORY="utilities"
    5.11  SHORT_DESC="Command-line utility for reading information from media files"
    5.12  MAINTAINER="al.bobylev@gmail.com"
    5.13  LICENSE="BSD"
    5.14  WEB_SITE="http://mediaarea.net/"
    5.15 +
    5.16  TARBALL="${PACKAGE}_$VERSION.tar.xz"
    5.17  WGET_URL="${WEB_SITE}download/source/$PACKAGE/$VERSION/$TARBALL"
    5.18  
    5.19 -DEPENDS="libmediainfo"
    5.20 -BUILD_DEPENDS="libtool automake autoconf libzen libmediainfo-dev curl-dev \
    5.21 -libmms-dev"
    5.22 +BUILD_DEPENDS="libtool automake libzen-dev libmediainfo-dev"
    5.23  
    5.24 -# Rules to configure and make the package.
    5.25 -compile_rules()
    5.26 -{
    5.27 +compile_rules() {
    5.28 +	rm -r Project/MS*
    5.29 +
    5.30  	cd Project/GNU/CLI
    5.31 -	./autogen.sh
    5.32 -	./configure $CONFIGURE_ARGS && make && make install
    5.33 +	./autogen.sh &&
    5.34 +	./configure $CONFIGURE_ARGS &&
    5.35 +	make &&
    5.36 +	make install
    5.37  }
    5.38  
    5.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
    5.40 -genpkg_rules()
    5.41 -{
    5.42 -	cp -a $install/* $fs
    5.43 +genpkg_rules() {
    5.44 +	copy @std
    5.45 +	DEPENDS="libmediainfo libzen"
    5.46  }
     6.1 --- a/tinyxml/receipt	Sun Oct 14 11:28:22 2018 +0300
     6.2 +++ b/tinyxml/receipt	Mon Oct 15 14:02:33 2018 +0300
     6.3 @@ -1,32 +1,43 @@
     6.4 -# SliTaz package receipt.
     6.5 +# SliTaz package receipt v2.
     6.6  
     6.7  PACKAGE="tinyxml"
     6.8  VERSION="2.6.2"
     6.9  CATEGORY="system-tools"
    6.10 -SHORT_DESC="TinyXML is a simple, small, C++ XML parser."
    6.11 -MAINTAINER="pankso@slitaz.org"
    6.12 +SHORT_DESC="A simple, small, C++ XML parser"
    6.13 +MAINTAINER="al.bobylev@gmail.com"
    6.14  LICENSE="GPL2"
    6.15 -TARBALL="${PACKAGE}_${VERSION//./_}.zip"
    6.16  WEB_SITE="http://www.grinninglizard.com/tinyxml/"
    6.17 -WGET_URL="$SF_MIRROR/project/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
    6.18  
    6.19 -# Rules to configure and make the package.
    6.20 -compile_rules()
    6.21 -{
    6.22 -	mkdir -p $install/usr/lib $install/usr/bin
    6.23 +TARBALL="${PACKAGE}_${VERSION//./_}.tar.gz"
    6.24 +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    6.25 +
    6.26 +SPLIT="$PACKAGE-dev"
    6.27 +
    6.28 +compile_rules() {
    6.29 +	sed -i -e '/^TINYXML_USE_STL/ s|=.*|=YES|' \
    6.30 +		-e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile
    6.31 +
    6.32  	make &&
    6.33 -	${HOST_SYSTEM}-g++ -m32 -fPIC "$CXXFLAGS" -shared \
    6.34 -		-o $install/usr/lib/libtinyxml.so.0.$VERSION \
    6.35 -		-Wl,-soname,libtinyxml.so.0 $(ls *.o | grep -v xmltest)
    6.36 -	cp xmltest $install/usr/bin
    6.37 +	g++ -fPIC $CXXFLAGS -shared -o libtinyxml.so.0.$VERSION \
    6.38 +		-Wl,-soname,libtinyxml.so.0 $(ls *.o | grep -v xmltest) || return 1
    6.39 +
    6.40 +	install -Dm755 libtinyxml.so.0.$VERSION $install/usr/lib/libtinyxml.so.0.$VERSION
    6.41 +	ln -s libtinyxml.so.0.$VERSION $install/usr/lib/libtinyxml.so.0
    6.42 +	ln -s libtinyxml.so.0          $install/usr/lib/libtinyxml.so
    6.43 +
    6.44 +	install -Dm644 tinyxml.h         $install/usr/include/tinyxml.h
    6.45 +	install -Dm644 tinystr.h         $install/usr/include/tinystr.h
    6.46 +	install -Dm644 $stuff/tinyxml.pc $install/usr/lib/pkgconfig/tinyxml.pc
    6.47 +
    6.48 +	install -Dm755 xmltest $install/usr/bin/xmltest
    6.49 +
    6.50 +	cook_pick_docs docs/*
    6.51  }
    6.52  
    6.53 -# Rules to gen a SliTaz package suitable for Tazpkg.
    6.54 -genpkg_rules()
    6.55 -{
    6.56 -	cp -a $install/. $fs/.
    6.57 -	cd  $fs/usr/lib
    6.58 -	ln -s libtinyxml.so.0.$VERSION libtinyxml.so.0
    6.59 -	ln -s libtinyxml.so.0.$VERSION libtinyxml.so
    6.60 +genpkg_rules() {
    6.61 +	case $PACKAGE in
    6.62 +		tinyxml) copy @std;;
    6.63 +		*-dev)   copy @dev;;
    6.64 +	esac
    6.65  }
    6.66  
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/tinyxml/stuff/patches/series	Mon Oct 15 14:02:33 2018 +0300
     7.3 @@ -0,0 +1,4 @@
     7.4 +# From Arch Linux:
     7.5 +# https://git.alpinelinux.org/cgit/aports/tree/main/tinyxml
     7.6 +tinyxml-2.6.2-defineSTL.patch
     7.7 +tinyxml-2.6.1-entity.patch
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/tinyxml/stuff/patches/tinyxml-2.6.1-entity.patch	Mon Oct 15 14:02:33 2018 +0300
     8.3 @@ -0,0 +1,64 @@
     8.4 +? entity.patch
     8.5 +Index: tinyxml.cpp
     8.6 +===================================================================
     8.7 +RCS file: /cvsroot/tinyxml/tinyxml/tinyxml.cpp,v
     8.8 +retrieving revision 1.105
     8.9 +diff -u -r1.105 tinyxml.cpp
    8.10 +--- a/tinyxml.cpp	5 Jun 2010 19:06:57 -0000	1.105
    8.11 ++++ b/tinyxml.cpp	19 Jul 2010 21:24:16 -0000
    8.12 +@@ -57,30 +57,7 @@
    8.13 + 	{
    8.14 + 		unsigned char c = (unsigned char) str[i];
    8.15 + 
    8.16 +-		if (    c == '&' 
    8.17 +-		     && i < ( (int)str.length() - 2 )
    8.18 +-			 && str[i+1] == '#'
    8.19 +-			 && str[i+2] == 'x' )
    8.20 +-		{
    8.21 +-			// Hexadecimal character reference.
    8.22 +-			// Pass through unchanged.
    8.23 +-			// &#xA9;	-- copyright symbol, for example.
    8.24 +-			//
    8.25 +-			// The -1 is a bug fix from Rob Laveaux. It keeps
    8.26 +-			// an overflow from happening if there is no ';'.
    8.27 +-			// There are actually 2 ways to exit this loop -
    8.28 +-			// while fails (error case) and break (semicolon found).
    8.29 +-			// However, there is no mechanism (currently) for
    8.30 +-			// this function to return an error.
    8.31 +-			while ( i<(int)str.length()-1 )
    8.32 +-			{
    8.33 +-				outString->append( str.c_str() + i, 1 );
    8.34 +-				++i;
    8.35 +-				if ( str[i] == ';' )
    8.36 +-					break;
    8.37 +-			}
    8.38 +-		}
    8.39 +-		else if ( c == '&' )
    8.40 ++		if ( c == '&' )
    8.41 + 		{
    8.42 + 			outString->append( entity[0].str, entity[0].strLength );
    8.43 + 			++i;
    8.44 +Index: xmltest.cpp
    8.45 +===================================================================
    8.46 +RCS file: /cvsroot/tinyxml/tinyxml/xmltest.cpp,v
    8.47 +retrieving revision 1.89
    8.48 +diff -u -r1.89 xmltest.cpp
    8.49 +--- a/xmltest.cpp	5 Jun 2010 17:41:52 -0000	1.89
    8.50 ++++ b/xmltest.cpp	19 Jul 2010 21:24:16 -0000
    8.51 +@@ -1340,6 +1340,16 @@
    8.52 + 		}*/
    8.53 + 	}
    8.54 + 
    8.55 ++	#ifdef TIXML_USE_STL
    8.56 ++	{
    8.57 ++		TiXmlDocument xml;
    8.58 ++		xml.Parse("<foo>foo&amp;#xa+bar</foo>");
    8.59 ++		std::string str;
    8.60 ++		str << xml;
    8.61 ++		XmlTest( "Entity escaping", "<foo>foo&amp;#xa+bar</foo>", str.c_str() );
    8.62 ++	}
    8.63 ++	#endif
    8.64 ++
    8.65 + 	/*  1417717 experiment
    8.66 + 	{
    8.67 + 		TiXmlDocument xml;
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/tinyxml/stuff/patches/tinyxml-2.6.2-defineSTL.patch	Mon Oct 15 14:02:33 2018 +0300
     9.3 @@ -0,0 +1,12 @@
     9.4 +diff -up tinyxml/tinyxml.h~ tinyxml/tinyxml.h
     9.5 +--- tinyxml/tinyxml.h~	2007-11-30 22:39:36.000000000 +0100
     9.6 ++++ tinyxml/tinyxml.h	2007-11-30 22:39:36.000000000 +0100
     9.7 +@@ -26,6 +26,8 @@ distribution.
     9.8 + #ifndef TINYXML_INCLUDED
     9.9 + #define TINYXML_INCLUDED
    9.10 + 
    9.11 ++#define TIXML_USE_STL 1
    9.12 ++
    9.13 + #ifdef _MSC_VER
    9.14 + #pragma warning( push )
    9.15 + #pragma warning( disable : 4530 )
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/tinyxml/stuff/tinyxml.pc	Mon Oct 15 14:02:33 2018 +0300
    10.3 @@ -0,0 +1,10 @@
    10.4 +prefix=/usr
    10.5 +exec_prefix=${prefix}
    10.6 +libdir=${exec_prefix}/lib
    10.7 +includedir=${prefix}/include
    10.8 +
    10.9 +Name: TinyXml
   10.10 +Description: A simple, small, C++ XML parser
   10.11 +Version: 2.6.2
   10.12 +Libs: -L${libdir} -ltinyxml
   10.13 +Cflags: -I${includedir}
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/tinyxml2/receipt	Mon Oct 15 14:02:33 2018 +0300
    11.3 @@ -0,0 +1,38 @@
    11.4 +# SliTaz package receipt v2.
    11.5 +
    11.6 +PACKAGE="tinyxml2"
    11.7 +VERSION="6.2.0"
    11.8 +CATEGORY="system-tools"
    11.9 +SHORT_DESC="Simple XML parser made for easy integration"
   11.10 +MAINTAINER="al.bobylev@gmail.com"
   11.11 +LICENSE="GPL2"
   11.12 +WEB_SITE="http://www.grinninglizard.com/tinyxml2/"
   11.13 +
   11.14 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   11.15 +WGET_URL="https://github.com/leethomason/tinyxml2/archive/$VERSION.tar.gz"
   11.16 +
   11.17 +BUILD_DEPENDS="cmake ninja"
   11.18 +SPLIT="$PACKAGE-dev"
   11.19 +
   11.20 +compile_rules() {
   11.21 +	mkdir build
   11.22 +	cd    build
   11.23 +	cmake  \
   11.24 +		-DCMAKE_INSTALL_PREFIX=/usr \
   11.25 +		-DCMAKE_INSTALL_LIBDIR=lib \
   11.26 +		-DCMAKE_BUILD_TYPE=Release \
   11.27 +		-G Ninja \
   11.28 +		.. &&
   11.29 +	ninja &&
   11.30 +	ninja install || return 1
   11.31 +
   11.32 +	cook_pick_docs $src/docs/*
   11.33 +}
   11.34 +
   11.35 +genpkg_rules() {
   11.36 +	case $PACKAGE in
   11.37 +		tinyxml2) copy @std;;
   11.38 +		*-dev)    copy @dev;;
   11.39 +	esac
   11.40 +}
   11.41 +