wok-next rev 20964

Micro-updates
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Sep 10 00:52:53 2018 +0300 (2018-09-10)
parents d59f3b205c9c
children 3460c1bb1b40
files ccache/receipt cdrdao/receipt cdrdao/stuff/patches/cdrdao-1.2.3-bitrate_table.patch cdrdao/stuff/patches/cdrdao-1.2.3-stat.patch cdrdao/stuff/patches/cdrdao-1.2.3-version.patch cdrdao/stuff/patches/cdrdao-1.2.4-desktop.patch cdrdao/stuff/patches/series cmake/receipt curl/receipt docbook-xsl/receipt
line diff
     1.1 --- a/ccache/receipt	Sat Sep 08 15:02:14 2018 +0300
     1.2 +++ b/ccache/receipt	Mon Sep 10 00:52:53 2018 +0300
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="ccache"
     1.7 -VERSION="3.4.2"
     1.8 +VERSION="3.4.3"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Compiler cache"
    1.11  MAINTAINER="erjo@slitaz.org"
     2.1 --- a/cdrdao/receipt	Sat Sep 08 15:02:14 2018 +0300
     2.2 +++ b/cdrdao/receipt	Mon Sep 10 00:52:53 2018 +0300
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="cdrdao"
     2.7 -VERSION="1.2.3"
     2.8 +VERSION="1.2.4"
     2.9  CATEGORY="multimedia"
    2.10  SHORT_DESC="Records audio/data CD-Rs using TOC files"
    2.11  MAINTAINER="jozee@slitaz.org"
    2.12 @@ -11,43 +11,24 @@
    2.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.14  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    2.15  
    2.16 -BUILD_DEPENDS="lame-dev libmad-dev libvorbis-dev libao-dev libao libogg-dev \
    2.17 -gconf"
    2.18 +BUILD_DEPENDS="gconf lame-dev libvorbis-dev libmad-dev libao-dev"
    2.19 +# libsigc++-dev gtkmm-dev libgnomeuimm-dev
    2.20  SPLIT="cdrdao-utils"
    2.21  
    2.22  compile_rules() {
    2.23 -	for i in trackdb/*.cc ; do
    2.24 -		grep -q string.h $i && continue
    2.25 -		grep -q util.h $i || continue
    2.26 -		sed -i 's/"util.h"/&\n#include <string.h>/' $i
    2.27 -	done
    2.28 -	find -name '*.c' | xargs sed -i -e 's/getline/get_line/' \
    2.29 -		-e 's/fexecve/fexec_ve/' scsilib/include/schily.h
    2.30 -	grep -qs 'define u8' scsilib/libscg/scsi-linux-sg.c ||
    2.31 -	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
    2.32 -		scsilib/libscg/scsi-linux-sg.c
    2.33 -	export CXXFLAGS="-Wno-narrowing"
    2.34 -
    2.35 -	./configure \
    2.36 -		--prefix=/usr \
    2.37 -		--with-lame \
    2.38 -		$CONFIGURE_ARGS &&
    2.39 -	make -j1 &&
    2.40 -	make DESTDIR=$DESTDIR install
    2.41 +	./configure $CONFIGURE_ARGS &&
    2.42 +	make &&
    2.43 +	make install
    2.44  }
    2.45  
    2.46  genpkg_rules() {
    2.47  	case $PACKAGE in
    2.48  		cdrdao)
    2.49 -			mkdir -p $fs/usr/bin
    2.50 -			cp -a $install/usr/bin/cdrdao $fs/usr/bin
    2.51 -			cp -a $install/usr/share $fs/usr
    2.52 +			copy cdrdao cdrdao/
    2.53  			DEPENDS="libao libmad libvorbis"
    2.54  			;;
    2.55  		cdrdao-utils)
    2.56 -			mkdir -p $fs/usr/bin
    2.57 -			cp -a $install/usr/bin/ $fs/usr
    2.58 -			rm $fs/usr/bin/cdrdao
    2.59 +			copy @std @rm
    2.60  			CAT="multimedia|extra utilities"
    2.61  			DEPENDS="lame libao libmad libvorbis"
    2.62  			;;
     3.1 --- a/cdrdao/stuff/patches/cdrdao-1.2.3-bitrate_table.patch	Sat Sep 08 15:02:14 2018 +0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,24 +0,0 @@
     3.4 ---- a/utils/toc2mp3.cc
     3.5 -+++ b/utils/toc2mp3.cc
     3.6 -@@ -143,8 +143,8 @@
     3.7 - 
     3.8 -   message(0, "LAME encoder version: %s", get_lame_version());
     3.9 -   message(0, "Supported bit rates: ");
    3.10 --  for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) {
    3.11 --    message(0, "%d ", bitrate_table[1][i]);
    3.12 -+  for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) {
    3.13 -+    message(0, "%d ", lame_get_bitrate(1, i));
    3.14 -   }
    3.15 -   message(0, "");
    3.16 - }
    3.17 -@@ -238,8 +238,8 @@
    3.18 -   lame_global_flags *lf;
    3.19 -   int bitrateOk = 0;
    3.20 - 
    3.21 --  for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) {
    3.22 --    if (bitrate == bitrate_table[1][i])
    3.23 -+  for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) {
    3.24 -+    if (bitrate == lame_get_bitrate(1, i))
    3.25 -       bitrateOk = 1;
    3.26 -   }
    3.27 - 
     4.1 --- a/cdrdao/stuff/patches/cdrdao-1.2.3-stat.patch	Sat Sep 08 15:02:14 2018 +0300
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,13 +0,0 @@
     4.4 -diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc
     4.5 ---- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat	2010-01-20 20:11:36.000000000 +0100
     4.6 -+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc	2010-01-20 20:14:07.000000000 +0100
     4.7 -@@ -19,6 +19,9 @@
     4.8 - 
     4.9 - #include <config.h>
    4.10 - 
    4.11 -+#include <sys/types.h>
    4.12 -+#include <sys/stat.h>
    4.13 -+
    4.14 - #include <stdio.h>
    4.15 - #include <fcntl.h>
    4.16 - #include <unistd.h>
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/cdrdao/stuff/patches/cdrdao-1.2.3-version.patch	Mon Sep 10 00:52:53 2018 +0300
     5.3 @@ -0,0 +1,11 @@
     5.4 +--- cdrdao/dao/main.cc~	2009-04-16 15:34:27.000000000 +0200
     5.5 ++++ cdrdao/dao/main.cc	2009-04-16 15:34:38.000000000 +0200
     5.6 +@@ -207,7 +207,7 @@
     5.7 + 
     5.8 + static void printVersion()
     5.9 + {
    5.10 +-  log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas@daneb.de>",
    5.11 ++  log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas@daneb.de>",
    5.12 + 	  VERSION);
    5.13 + 
    5.14 +   std::list<std::string> list;
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/cdrdao/stuff/patches/cdrdao-1.2.4-desktop.patch	Mon Sep 10 00:52:53 2018 +0300
     6.3 @@ -0,0 +1,7 @@
     6.4 +--- a/gcdmaster/gcdmaster.desktop
     6.5 ++++ b/gcdmaster/gcdmaster.desktop
     6.6 +@@ -7,3 +7,4 @@
     6.7 + Type=Application
     6.8 + StartupNotify=true
     6.9 + Categories=GNOME;GTK;AudioVideo;
    6.10 ++MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc;
     7.1 --- a/cdrdao/stuff/patches/series	Sat Sep 08 15:02:14 2018 +0300
     7.2 +++ b/cdrdao/stuff/patches/series	Mon Sep 10 00:52:53 2018 +0300
     7.3 @@ -1,4 +1,4 @@
     7.4 -cdrdao-1.2.3-stat.patch
     7.5 +# from Alt Linux: http://www.sisyphus.ru/en/srpm/Sisyphus/cdrdao
     7.6 +cdrdao-1.2.3-version.patch
     7.7  
     7.8 -# from https://bugs.gentoo.org/635014
     7.9 -cdrdao-1.2.3-bitrate_table.patch
    7.10 +cdrdao-1.2.4-desktop.patch
     8.1 --- a/cmake/receipt	Sat Sep 08 15:02:14 2018 +0300
     8.2 +++ b/cmake/receipt	Mon Sep 10 00:52:53 2018 +0300
     8.3 @@ -1,7 +1,7 @@
     8.4  # SliTaz package receipt v2.
     8.5  
     8.6  PACKAGE="cmake"
     8.7 -VERSION="3.12.1"
     8.8 +VERSION="3.12.2"
     8.9  CATEGORY="development"
    8.10  SHORT_DESC="Cross-platform build system generator"
    8.11  MAINTAINER="pankso@slitaz.org"
     9.1 --- a/curl/receipt	Sat Sep 08 15:02:14 2018 +0300
     9.2 +++ b/curl/receipt	Mon Sep 10 00:52:53 2018 +0300
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt v2.
     9.5  
     9.6  PACKAGE="curl"
     9.7 -VERSION="7.61.0"
     9.8 +VERSION="7.61.1"
     9.9  CATEGORY="network"
    9.10  SHORT_DESC="Tool and libs for transferring files with URL syntax"
    9.11  MAINTAINER="pankso@slitaz.org"
    10.1 --- a/docbook-xsl/receipt	Sat Sep 08 15:02:14 2018 +0300
    10.2 +++ b/docbook-xsl/receipt	Mon Sep 10 00:52:53 2018 +0300
    10.3 @@ -1,16 +1,16 @@
    10.4  # SliTaz package receipt v2.
    10.5  
    10.6  PACKAGE="docbook-xsl"
    10.7 -VERSION="1.79.1"
    10.8 +VERSION="1.79.2"
    10.9  CATEGORY="development"
   10.10  SHORT_DESC="DocBook XSL stylesheets"
   10.11  MAINTAINER="paul@slitaz.org"
   10.12  LICENSE="MIT"
   10.13 -WEB_SITE="http://docbook.sourceforge.net/"
   10.14 -LFS="http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-xsl.html"
   10.15 +WEB_SITE="https://github.com/docbook/xslt10-stylesheets"
   10.16 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html"
   10.17  
   10.18  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   10.19 -WGET_URL="$SF_MIRROR/docbook/$TARBALL"
   10.20 +WGET_URL="https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$VERSION/$TARBALL"
   10.21  
   10.22  compile_rules() {
   10.23  	mkdir -p $install/usr/share/xml/docbook/stylesheet/docbook-xsl/