wok-next rev 20357
id3lib: v2 & patch; libtool: empty $DEPENDS don't work for the moment; lxqt-panel: add pulseaudio support, separate lxqt-panel-sensors (it needs lm-sensors, bash and many more); add serf for recognizing http protocol in SVN; subversion: up with serf; slim: remake using sets.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Nov 21 12:56:18 2017 +0200 (2017-11-21) |
| parents | ef8195de90bb |
| children | 6ba36b73ef48 |
| files | id3lib-dev/receipt id3lib/receipt id3lib/stuff/id3lib-3.8.3-gcc-4.4.patch id3lib/stuff/patches/00-add-libz-to-compilation.patch id3lib/stuff/patches/05-create-m4-directory.patch id3lib/stuff/patches/10-fix-compilation-with-cpp-headers.patch id3lib/stuff/patches/15-fix-headers-of-main-functions.patch id3lib/stuff/patches/20-create-manpages.patch id3lib/stuff/patches/30-fix-utf16.patch id3lib/stuff/patches/40-deal-with-mkstemp.patch id3lib/stuff/patches/50-remove-outdated-check.patch id3lib/stuff/patches/60-add-c-wrapper-functions.patch id3lib/stuff/patches/60-fix_make_check.patch id3lib/stuff/patches/60-id3lib-missing-nullpointer-check.patch id3lib/stuff/patches/60-spelling.patch id3lib/stuff/patches/61-fix_vbr_stack_smash.patch id3lib/stuff/patches/series libtool/receipt lxqt-panel/receipt serf/receipt slim/receipt subversion/receipt |
line diff
1.1 --- a/id3lib-dev/receipt Sun Nov 19 18:47:25 2017 +0100 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,18 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="id3lib-dev" 1.7 -VERSION="3.8.3" 1.8 -CATEGORY="development" 1.9 -SHORT_DESC="Devel files for id3lib." 1.10 -MAINTAINER="pankso@slitaz.org" 1.11 -LICENSE="GPL2" 1.12 -WANTED="id3lib" 1.13 -WEB_SITE="http://id3lib.sourceforge.net/" 1.14 - 1.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.16 -genpkg_rules() 1.17 -{ 1.18 - mkdir -p $fs/usr/lib 1.19 - cp -a $install/usr/include $fs/usr 1.20 - cp -a $install/usr/lib/*.*a $fs/usr/lib 1.21 -}
2.1 --- a/id3lib/receipt Sun Nov 19 18:47:25 2017 +0100 2.2 +++ b/id3lib/receipt Tue Nov 21 12:56:18 2017 +0200 2.3 @@ -1,34 +1,37 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="id3lib" 2.8 VERSION="3.8.3" 2.9 CATEGORY="multimedia" 2.10 -SHORT_DESC="Library to manipulate ID3v1 and ID3v2 tags." 2.11 +SHORT_DESC="Library to manipulate ID3v1 and ID3v2 tags" 2.12 MAINTAINER="pankso@slitaz.org" 2.13 LICENSE="GPL2" 2.14 +WEB_SITE="http://id3lib.sourceforge.net/" 2.15 + 2.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.17 -WEB_SITE="http://id3lib.sourceforge.net/" 2.18 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 2.19 2.20 -DEPENDS="zlib gcc-lib-base" 2.21 -BUILD_DEPENDS="zlib-dev" 2.22 +BUILD_DEPENDS="patch libtool zlib-dev" 2.23 +SPLIT="id3lib-dev" 2.24 2.25 -# Rules to configure and make the package. 2.26 -compile_rules() 2.27 -{ 2.28 - cd $src 2.29 - patch -p1 -i $stuff/id3lib-$VERSION-gcc-4.4.patch || return 1 2.30 - ./configure \ 2.31 - --prefix=/usr \ 2.32 - $CONFIGURE_ARGS && 2.33 - make && 2.34 - make DESTDIR=$DESTDIR install 2.35 +compile_rules() { 2.36 + libtoolize -fc && 2.37 + aclocal && 2.38 + autoconf && 2.39 + automake --add-missing --copy && 2.40 + 2.41 + ./configure && make && make install 2.42 } 2.43 2.44 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.45 -genpkg_rules() 2.46 -{ 2.47 - mkdir -p $fs/usr/lib 2.48 - cp -a $install/usr/bin $fs/usr 2.49 - cp -a $install/usr/lib/*.so* $fs/usr/lib 2.50 +genpkg_rules() { 2.51 + case $PACKAGE in 2.52 + id3lib) 2.53 + copy @std 2.54 + DEPENDS="zlib" 2.55 + ;; 2.56 + *-dev) 2.57 + copy @dev 2.58 + DEPENDS="id3lib zlib-dev" 2.59 + ;; 2.60 + esac 2.61 }
3.1 --- a/id3lib/stuff/id3lib-3.8.3-gcc-4.4.patch Sun Nov 19 18:47:25 2017 +0100 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,76 +0,0 @@ 3.4 ---- id3lib-3.8.3/configure 2008-05-24 23:39:36.000000000 -0400 3.5 -+++ id3lib-3.8.3/configure 2008-05-24 23:39:57.000000000 -0400 3.6 -@@ -10296,8 +10296,7 @@ 3.7 - 3.8 - for ac_header in \ 3.9 - string \ 3.10 -- iomanip.h \ 3.11 - 3.12 - do 3.13 - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 3.14 - 3.15 ---- id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:46.000000000 -0600 3.16 -+++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:38.000000000 -0600 3.17 -@@ -30,6 +30,7 @@ 3.18 - #define _ID3LIB_STRINGS_H_ 3.19 - 3.20 - #include <string> 3.21 -+#include <cstring> 3.22 - 3.23 - #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) 3.24 - namespace std 3.25 ---- id3lib-3.8.3/include/id3/writers.h 2003-03-01 18:23:00.000000000 -0600 3.26 -+++ id3lib-3.8.3/include/id3/writers.h 2008-03-05 18:23:05.000000000 -0600 3.27 -@@ -30,7 +30,7 @@ 3.28 - 3.29 - #include "id3/writer.h" 3.30 - #include "id3/id3lib_streams.h" 3.31 --//#include <string.h> 3.32 -+#include <string.h> 3.33 - 3.34 - class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer 3.35 - { 3.36 ---- id3lib-3.8.3/examples/demo_convert.cpp 2003-03-01 18:23:00.000000000 -0600 3.37 -+++ id3lib-3.8.3/examples/demo_convert.cpp 2008-03-05 18:26:50.000000000 -0600 3.38 -@@ -84,7 +84,7 @@ 3.39 - } 3.40 - } 3.41 - 3.42 --int main( unsigned int argc, char * const argv[]) 3.43 -+int main( int argc, char * const argv[]) 3.44 - { 3.45 - flags_t ulFlag = ID3TT_ALL; 3.46 - gengetopt_args_info args; 3.47 ---- id3lib-3.8.3/examples/demo_info.cpp 2003-03-01 18:23:00.000000000 -0600 3.48 -+++ id3lib-3.8.3/examples/demo_info.cpp 2008-03-05 18:27:40.000000000 -0600 3.49 -@@ -309,7 +309,7 @@ 3.50 - 3.51 - #define DEBUG 3.52 - 3.53 --int main( unsigned int argc, char * const argv[]) 3.54 -+int main( int argc, char * const argv[]) 3.55 - { 3.56 - ID3D_INIT_DOUT(); 3.57 - 3.58 ---- id3lib-3.8.3/examples/demo_tag.cpp 2003-03-01 18:23:00.000000000 -0600 3.59 -+++ id3lib-3.8.3/examples/demo_tag.cpp 2008-03-05 18:31:20.000000000 -0600 3.60 -@@ -46,7 +46,7 @@ 3.61 - os << "v2"; 3.62 - } 3.63 - 3.64 --int main( unsigned int argc, char * const argv[]) 3.65 -+int main( int argc, char * const argv[]) 3.66 - { 3.67 - int ulFlag = ID3TT_ID3; 3.68 - ID3D_INIT_DOUT(); 3.69 ---- id3lib-3.8.3/examples/demo_copy.cpp 2003-03-01 18:23:00.000000000 -0600 3.70 -+++ id3lib-3.8.3/examples/demo_copy.cpp 2008-03-05 18:32:44.000000000 -0600 3.71 -@@ -81,7 +81,7 @@ 3.72 - } 3.73 - } 3.74 - 3.75 --int main( unsigned int argc, char * const argv[]) 3.76 -+int main( int argc, char * const argv[]) 3.77 - { 3.78 - int ulFlag = ID3TT_ID3; 3.79 - ID3D_INIT_DOUT();
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/id3lib/stuff/patches/00-add-libz-to-compilation.patch Tue Nov 21 12:56:18 2017 +0200 4.3 @@ -0,0 +1,14 @@ 4.4 +This patch was first introduced in version 3.8.3-3 4.5 + 4.6 +It fixes http://bugs.debian.org/208672 4.7 +--- a/src/Makefile.am 4.8 ++++ b/src/Makefile.am 4.9 +@@ -74,6 +74,8 @@ 4.10 + 4.11 + if ID3_NEEDZLIB 4.12 + LDADD = $(top_builddir)/zlib/src/libz.la 4.13 ++else 4.14 ++libid3_la_LIBADD = -lz 4.15 + endif 4.16 + 4.17 + libid3_la_LDFLAGS = \
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/id3lib/stuff/patches/05-create-m4-directory.patch Tue Nov 21 12:56:18 2017 +0200 5.3 @@ -0,0 +1,12 @@ 5.4 +Create a local m4 subdirectory 5.5 +--- a/Makefile.am 5.6 ++++ b/Makefile.am 5.7 +@@ -12,6 +12,8 @@ 5.8 + # require automake 1.5 5.9 + AUTOMAKE_OPTIONS = 1.5 5.10 + 5.11 ++ACLOCAL_AMFLAGS = -I m4 5.12 ++ 5.13 + EXTRA_DIST = \ 5.14 + HISTORY \ 5.15 + config.h.win32 \
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/id3lib/stuff/patches/10-fix-compilation-with-cpp-headers.patch Tue Nov 21 12:56:18 2017 +0200 6.3 @@ -0,0 +1,22 @@ 6.4 +This patch imports the proper C++ headers 6.5 +--- a/include/id3/id3lib_strings.h 6.6 ++++ b/include/id3/id3lib_strings.h 6.7 +@@ -30,6 +30,7 @@ 6.8 + #define _ID3LIB_STRINGS_H_ 6.9 + 6.10 + #include <string> 6.11 ++#include <cstring> 6.12 + 6.13 + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) 6.14 + namespace std 6.15 +--- a/include/id3/writers.h 6.16 ++++ b/include/id3/writers.h 6.17 +@@ -30,7 +30,7 @@ 6.18 + 6.19 + #include "id3/writer.h" 6.20 + #include "id3/id3lib_streams.h" 6.21 +-//#include <string.h> 6.22 ++#include <cstring> 6.23 + 6.24 + class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer 6.25 + {
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/id3lib/stuff/patches/15-fix-headers-of-main-functions.patch Tue Nov 21 12:56:18 2017 +0200 7.3 @@ -0,0 +1,45 @@ 7.4 +This patch fixes some function headers in demo code used during 'make check' 7.5 +--- a/examples/demo_info.cpp 7.6 ++++ b/examples/demo_info.cpp 7.7 +@@ -309,7 +309,7 @@ 7.8 + 7.9 + #define DEBUG 7.10 + 7.11 +-int main( unsigned int argc, char * const argv[]) 7.12 ++int main(int argc, char * const argv[]) 7.13 + { 7.14 + ID3D_INIT_DOUT(); 7.15 + 7.16 +--- a/examples/demo_convert.cpp 7.17 ++++ b/examples/demo_convert.cpp 7.18 +@@ -84,7 +84,7 @@ 7.19 + } 7.20 + } 7.21 + 7.22 +-int main( unsigned int argc, char * const argv[]) 7.23 ++int main(int argc, char * const argv[]) 7.24 + { 7.25 + flags_t ulFlag = ID3TT_ALL; 7.26 + gengetopt_args_info args; 7.27 +--- a/examples/demo_copy.cpp 7.28 ++++ b/examples/demo_copy.cpp 7.29 +@@ -81,7 +81,7 @@ 7.30 + } 7.31 + } 7.32 + 7.33 +-int main( unsigned int argc, char * const argv[]) 7.34 ++int main(int argc, char * const argv[]) 7.35 + { 7.36 + int ulFlag = ID3TT_ID3; 7.37 + ID3D_INIT_DOUT(); 7.38 +--- a/examples/demo_tag.cpp 7.39 ++++ b/examples/demo_tag.cpp 7.40 +@@ -46,7 +46,7 @@ 7.41 + os << "v2"; 7.42 + } 7.43 + 7.44 +-int main( unsigned int argc, char * const argv[]) 7.45 ++int main(int argc, char * const argv[]) 7.46 + { 7.47 + int ulFlag = ID3TT_ID3; 7.48 + ID3D_INIT_DOUT();
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/id3lib/stuff/patches/20-create-manpages.patch Tue Nov 21 12:56:18 2017 +0200 8.3 @@ -0,0 +1,198 @@ 8.4 +This patch adds debian-made man pages 8.5 +--- /dev/null 8.6 ++++ b/doc/man/id3info.1 8.7 +@@ -0,0 +1,31 @@ 8.8 ++.TH ID3INFO 1 "May 2000" local "User Command" 8.9 ++.SH NAME 8.10 ++id3info \- Display id3 tag information. 8.11 ++.SH SYNOPSIS 8.12 ++.B id3info 8.13 ++.RB [ 8.14 ++.I OPTION 8.15 ++.RB ] 8.16 ++.RB [ 8.17 ++.I FILE 8.18 ++.RB ] 8.19 ++.br 8.20 ++.SH DESCRIPTION 8.21 ++.B Id3info 8.22 ++displays both the id3v1 and id3v2 tag information for a file. 8.23 ++Id3info will not differentiate between the two types of tags. 8.24 ++.SH OPTIONS 8.25 ++.TP 8.26 ++.B \-h, \-\-help 8.27 ++Display help and exit 8.28 ++.TP 8.29 ++.B \-v, \-\-version 8.30 ++Display version information and exit 8.31 ++.SH SEE ALSO 8.32 ++id3convert(1), id3tag(1), id3v2(1) 8.33 ++.SH AUTHOR 8.34 ++.B id3lib 8.35 ++was originally designed and implemented by Dirk Mahoney and is 8.36 ++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for 8.37 ++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>. 8.38 ++ 8.39 +--- /dev/null 8.40 ++++ b/doc/man/id3tag.1 8.41 +@@ -0,0 +1,69 @@ 8.42 ++.TH ID3TAG 1 "May 2000" local "User Command" 8.43 ++.SH NAME 8.44 ++id3tag \- Tags an mp3 file with id3v1 and/or id3v2 tags. 8.45 ++.SH SYNOPSIS 8.46 ++.B id3tag 8.47 ++.RB [ 8.48 ++.I OPTION 8.49 ++.RB ] ... 8.50 ++.RB [ 8.51 ++.I FILE 8.52 ++.RB ] ... 8.53 ++.br 8.54 ++.SH DESCRIPTION 8.55 ++.B Id3tag 8.56 ++will render both types of tag by default. Only the last 8.57 ++tag type indicated in the option list will be used. Non- 8.58 ++rendered will remain unchanged in the original file. Will 8.59 ++also parse and convert Lyrics3 v2.0 frames, but will not 8.60 ++render them. 8.61 ++ 8.62 ++.SH OPTIONS 8.63 ++.TP 8.64 ++.B \-1, \-\-v1tag 8.65 ++Render only the id3v1 tag 8.66 ++.TP 8.67 ++.B \-2, \-\-v2tag 8.68 ++Render only the id3v2 tag 8.69 ++.TP 8.70 ++.B \-h, \-\-help 8.71 ++Display help and exit 8.72 ++.TP 8.73 ++.B \-v, \-\-version 8.74 ++Display version information and exit 8.75 ++.TP 8.76 ++.B \-a, \-\-artist ARTIST 8.77 ++Set the artist information 8.78 ++.TP 8.79 ++.B \-s, \-\-song SONG 8.80 ++Set the song title information 8.81 ++.TP 8.82 ++.B \-A, \-\-album ALBUM 8.83 ++Set the album title information 8.84 ++.TP 8.85 ++.B \-c, \-\-comment COMMENT 8.86 ++Set the comment information 8.87 ++.TP 8.88 ++.B \-C, \-\-desc DESCRIPTION 8.89 ++Set the comment description 8.90 ++.TP 8.91 ++.B \-g, \-\-genre num 8.92 ++Set the genre number 8.93 ++.TP 8.94 ++.B \-y, \-\-year num 8.95 ++Set the year 8.96 ++.TP 8.97 ++.B \-t, \-\-track num 8.98 ++Set the track number 8.99 ++.TP 8.100 ++.B \-T, \-\-total num 8.101 ++Set the total number of tracks on the album 8.102 ++ 8.103 ++.SH SEE ALSO 8.104 ++id3convert(1), id3info(1), id3v2(1) 8.105 ++.SH AUTHOR 8.106 ++.B id3lib 8.107 ++was originally designed and implemented by Dirk Mahoney and is 8.108 ++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for 8.109 ++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>. 8.110 ++ 8.111 +--- /dev/null 8.112 ++++ b/doc/man/id3convert.1 8.113 +@@ -0,0 +1,47 @@ 8.114 ++.TH ID3CONVERT 1 "May 2000" local "User Command" 8.115 ++.SH NAME 8.116 ++id3convert \- Converts between id3v1 and id3v2 tags of an mp3 file. 8.117 ++.SH SYNOPSIS 8.118 ++.B id3convert 8.119 ++.RB [ 8.120 ++.I OPTION 8.121 ++.RB ] 8.122 ++.RB [ 8.123 ++.I FILE 8.124 ++.RB ] 8.125 ++.br 8.126 ++.SH DESCRIPTION 8.127 ++.B Id3convert 8.128 ++converts between id3v1 and id3v2 tags of an mp3 file. Id3convert will render 8.129 ++both types of tag by default. Only the last tag type indicated in the option 8.130 ++list will be used. Non-rendered tags will remain unchanged in the original 8.131 ++file. Id3convert will also parse and convert Lyrics3 v2.0 frames, but will 8.132 ++not render them. 8.133 ++ 8.134 ++.SH OPTIONS 8.135 ++.TP 8.136 ++.B \-1, \-\-v1tag 8.137 ++Render only the id3v1 tag 8.138 ++.TP 8.139 ++.B \-2, \-\-v2tag 8.140 ++Render only the id3v2 tag 8.141 ++.TP 8.142 ++.B \-s, \-\-strip 8.143 ++Strip, rather than render, the tags 8.144 ++.TP 8.145 ++.B \-p, \-\-padding 8.146 ++Use padding in the tag 8.147 ++.TP 8.148 ++.B \-h, \-\-help 8.149 ++Display help and exit 8.150 ++.TP 8.151 ++.B \-v, \-\-version 8.152 ++Display version information and exit 8.153 ++ 8.154 ++.SH SEE ALSO 8.155 ++id3tag(1), id3info(1), id3v2(1) 8.156 ++.SH AUTHOR 8.157 ++.B id3lib 8.158 ++was originally designed and implemented by Dirk Mahoney and is 8.159 ++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for 8.160 ++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>. 8.161 +--- /dev/null 8.162 ++++ b/doc/man/id3cp.1 8.163 +@@ -0,0 +1,38 @@ 8.164 ++.TH ID3CP 1 "July 2001" local "User Command" 8.165 ++.SH NAME 8.166 ++id3cp \- Copies tags from one file to another. 8.167 ++.SH SYNOPSIS 8.168 ++.B id3cp 8.169 ++.RB [ 8.170 ++.I OPTION 8.171 ++.RB ] ... 8.172 ++.RB [ 8.173 ++.I SOURCE 8.174 ++.RB ] 8.175 ++.RB [ 8.176 ++.I DEST 8.177 ++.RB ] 8.178 ++.br 8.179 ++.SH DESCRIPTION 8.180 ++.B Id3cp 8.181 ++copies tags from SOURCE to DEST. 8.182 ++.SH OPTIONS 8.183 ++.TP 8.184 ++.B \-1, \-\-v1tag 8.185 ++Render only the id3v1 tag 8.186 ++.TP 8.187 ++.B \-2, \-\-v2tag 8.188 ++Render only the id3v2 tag 8.189 ++.TP 8.190 ++.B \-h, \-\-help 8.191 ++Display help and exit 8.192 ++.TP 8.193 ++.B \-v, \-\-version 8.194 ++Display version information and exit 8.195 ++.SH SEE ALSO 8.196 ++id3convert(1), id3info(1), id3v2(1) 8.197 ++.SH AUTHOR 8.198 ++.B id3lib 8.199 ++was originally designed and implemented by Dirk Mahoney and is 8.200 ++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for 8.201 ++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/id3lib/stuff/patches/30-fix-utf16.patch Tue Nov 21 12:56:18 2017 +0200 9.3 @@ -0,0 +1,38 @@ 9.4 +Patch from 'Spoon' to fix issues with writing certain unicode characters 9.5 +--- a/ChangeLog 9.6 ++++ b/ChangeLog 9.7 +@@ -1,3 +1,8 @@ 9.8 ++2006-02-17 Jerome Couderc 9.9 ++ 9.10 ++ * Patch from Spoon to fix UTF-16 writing bug 9.11 ++ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 9.12 ++ 9.13 + 2003-03-02 Sunday 17:38 Thijmen Klok <thijmen@id3lib.org> 9.14 + 9.15 + * THANKS (1.20): added more people 9.16 +--- a/src/io_helpers.cpp 9.17 ++++ b/src/io_helpers.cpp 9.18 +@@ -363,11 +363,22 @@ 9.19 + // Write the BOM: 0xFEFF 9.20 + unicode_t BOM = 0xFEFF; 9.21 + writer.writeChars((const unsigned char*) &BOM, 2); 9.22 ++ // Patch from Spoon : 2004-08-25 14:17 9.23 ++ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 9.24 ++ // Wrong code 9.25 ++ //for (size_t i = 0; i < size; i += 2) 9.26 ++ //{ 9.27 ++ // unicode_t ch = (data[i] << 8) | data[i+1]; 9.28 ++ // writer.writeChars((const unsigned char*) &ch, 2); 9.29 ++ //} 9.30 ++ // Right code 9.31 ++ unsigned char *pdata = (unsigned char *) data.c_str(); 9.32 + for (size_t i = 0; i < size; i += 2) 9.33 + { 9.34 +- unicode_t ch = (data[i] << 8) | data[i+1]; 9.35 ++ unicode_t ch = (pdata[i] << 8) | pdata[i+1]; 9.36 + writer.writeChars((const unsigned char*) &ch, 2); 9.37 + } 9.38 ++ // End patch 9.39 + } 9.40 + return writer.getCur() - beg; 9.41 + }
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/id3lib/stuff/patches/40-deal-with-mkstemp.patch Tue Nov 21 12:56:18 2017 +0200 10.3 @@ -0,0 +1,54 @@ 10.4 +This patch fixes an issues where temporary files were created in an insecure 10.5 +way. 10.6 + 10.7 +It was first intruduced in version 3.8.3-7 and fixes 10.8 +http://bugs.debian.org/438540 10.9 +--- a/src/tag_file.cpp 10.10 ++++ b/src/tag_file.cpp 10.11 +@@ -242,8 +242,8 @@ 10.12 + strcpy(sTempFile, filename.c_str()); 10.13 + strcat(sTempFile, sTmpSuffix.c_str()); 10.14 + 10.15 +-#if ((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) 10.16 +- // This section is for Windows folk && gcc 3.x folk 10.17 ++#if !defined(HAVE_MKSTEMP) 10.18 ++ // This section is for Windows folk 10.19 + fstream tmpOut; 10.20 + createFile(sTempFile, tmpOut); 10.21 + 10.22 +@@ -257,7 +257,7 @@ 10.23 + tmpOut.write((char *)tmpBuffer, nBytes); 10.24 + } 10.25 + 10.26 +-#else //((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) 10.27 ++#else //!defined(HAVE_MKSTEMP) 10.28 + 10.29 + // else we gotta make a temp file, copy the tag into it, copy the 10.30 + // rest of the old file after the tag, delete the old file, rename 10.31 +@@ -270,7 +270,7 @@ 10.32 + //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file"); 10.33 + } 10.34 + 10.35 +- ofstream tmpOut(fd); 10.36 ++ ofstream tmpOut(sTempFile); 10.37 + if (!tmpOut) 10.38 + { 10.39 + tmpOut.close(); 10.40 +@@ -285,14 +285,14 @@ 10.41 + uchar tmpBuffer[BUFSIZ]; 10.42 + while (file) 10.43 + { 10.44 +- file.read(tmpBuffer, BUFSIZ); 10.45 ++ file.read((char *)tmpBuffer, BUFSIZ); 10.46 + size_t nBytes = file.gcount(); 10.47 +- tmpOut.write(tmpBuffer, nBytes); 10.48 ++ tmpOut.write((char *)tmpBuffer, nBytes); 10.49 + } 10.50 + 10.51 + close(fd); //closes the file 10.52 + 10.53 +-#endif ////((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) 10.54 ++#endif ////!defined(HAVE_MKSTEMP) 10.55 + 10.56 + tmpOut.close(); 10.57 + file.close();
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/id3lib/stuff/patches/50-remove-outdated-check.patch Tue Nov 21 12:56:18 2017 +0200 11.3 @@ -0,0 +1,11 @@ 11.4 +We don't actually need iomanip.h 11.5 +--- a/configure.in 11.6 ++++ b/configure.in 11.7 +@@ -227,7 +227,6 @@ 11.8 + ) 11.9 + AC_CHECK_HEADERS( \ 11.10 + string \ 11.11 +- iomanip.h \ 11.12 + ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) 11.13 + ) 11.14 +
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/id3lib/stuff/patches/60-add-c-wrapper-functions.patch Tue Nov 21 12:56:18 2017 +0200 12.3 @@ -0,0 +1,58 @@ 12.4 +This patch adds C wrapper functions for field encoding. 12.5 + 12.6 +It was first introduced in version 3.8.3-8 and fixes 12.7 +http://bugs.debian.org/281292 12.8 +--- a/include/id3.h 12.9 ++++ b/include/id3.h 12.10 +@@ -104,6 +104,9 @@ 12.11 + ID3_C_EXPORT void CCONV ID3Field_GetBINARY (const ID3Field *field, uchar *buffer, size_t buffLength); 12.12 + ID3_C_EXPORT void CCONV ID3Field_FromFile (ID3Field *field, const char *fileName); 12.13 + ID3_C_EXPORT void CCONV ID3Field_ToFile (const ID3Field *field, const char *fileName); 12.14 ++ ID3_C_EXPORT bool CCONV ID3Field_SetEncoding (ID3Field *field, ID3_TextEnc enc); 12.15 ++ ID3_C_EXPORT ID3_TextEnc CCONV ID3Field_GetEncoding (const ID3Field *field); 12.16 ++ ID3_C_EXPORT bool CCONV ID3Field_IsEncodable (const ID3Field *field); 12.17 + 12.18 + /* field-info wrappers */ 12.19 + ID3_C_EXPORT char* CCONV ID3FrameInfo_ShortName (ID3_FrameID frameid); 12.20 +--- a/src/c_wrapper.cpp 12.21 ++++ b/src/c_wrapper.cpp 12.22 +@@ -681,6 +681,39 @@ 12.23 + } 12.24 + } 12.25 + 12.26 ++ ID3_C_EXPORT bool CCONV 12.27 ++ ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc) 12.28 ++ { 12.29 ++ bool changed = false; 12.30 ++ if (field) 12.31 ++ { 12.32 ++ ID3_CATCH(changed = reinterpret_cast<ID3_Field *>(field)->SetEncoding(enc)); 12.33 ++ } 12.34 ++ return changed; 12.35 ++ } 12.36 ++ 12.37 ++ ID3_C_EXPORT ID3_TextEnc CCONV 12.38 ++ ID3Field_GetEncoding(const ID3Field *field) 12.39 ++ { 12.40 ++ ID3_TextEnc enc = ID3TE_NONE; 12.41 ++ if (field) 12.42 ++ { 12.43 ++ ID3_CATCH(enc = reinterpret_cast<const ID3_Field *>(field)->GetEncoding()); 12.44 ++ } 12.45 ++ return enc; 12.46 ++ } 12.47 ++ 12.48 ++ ID3_C_EXPORT bool CCONV 12.49 ++ ID3Field_IsEncodable(const ID3Field *field) 12.50 ++ { 12.51 ++ bool isEncodable = false; 12.52 ++ if (field) 12.53 ++ { 12.54 ++ ID3_CATCH(isEncodable = reinterpret_cast<const ID3_Field *>(field)->IsEncodable()); 12.55 ++ } 12.56 ++ return isEncodable; 12.57 ++ } 12.58 ++ 12.59 + #ifdef __cplusplus 12.60 + } 12.61 + #endif /* __cplusplus */
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/id3lib/stuff/patches/60-fix_make_check.patch Tue Nov 21 12:56:18 2017 +0200 13.3 @@ -0,0 +1,50 @@ 13.4 +This patch fixes some function headers and imports in order for 'make check' 13.5 +to work. 13.6 + 13.7 +It was first introduced in version 3.8.3-9 13.8 +diff -Naur id3lib-3.8.3.orig/examples/findeng.cpp id3lib-3.8.3/examples/findeng.cpp 13.9 +--- id3lib-3.8.3.orig/examples/findeng.cpp 2003-03-02 01:23:00.000000000 +0100 13.10 ++++ id3lib-3.8.3/examples/findeng.cpp 2009-12-10 00:58:12.173795997 +0100 13.11 +@@ -9,7 +9,7 @@ 13.12 + using std::cout; 13.13 + using std::endl; 13.14 + 13.15 +-int main(unsigned argc, char* argv[]) 13.16 ++int main(int argc, char* argv[]) 13.17 + { 13.18 + ID3D_INIT_DOUT(); 13.19 + ID3D_INIT_WARNING(); 13.20 +diff -Naur id3lib-3.8.3.orig/examples/findstr.cpp id3lib-3.8.3/examples/findstr.cpp 13.21 +--- id3lib-3.8.3.orig/examples/findstr.cpp 2003-03-02 01:23:00.000000000 +0100 13.22 ++++ id3lib-3.8.3/examples/findstr.cpp 2009-12-10 00:57:48.036819825 +0100 13.23 +@@ -9,7 +9,7 @@ 13.24 + using std::cout; 13.25 + using std::endl; 13.26 + 13.27 +-int main(unsigned argc, char* argv[]) 13.28 ++int main(int argc, char* argv[]) 13.29 + { 13.30 + ID3D_INIT_DOUT(); 13.31 + ID3D_INIT_WARNING(); 13.32 +diff -Naur id3lib-3.8.3.orig/examples/test_io.cpp id3lib-3.8.3/examples/test_io.cpp 13.33 +--- id3lib-3.8.3.orig/examples/test_io.cpp 2003-03-02 01:23:00.000000000 +0100 13.34 ++++ id3lib-3.8.3/examples/test_io.cpp 2009-12-10 00:57:03.612111640 +0100 13.35 +@@ -11,6 +11,9 @@ 13.36 + #include <id3/io_strings.h> 13.37 + #include <id3/utils.h> 13.38 + 13.39 ++using std::cin; 13.40 ++using std::hex; 13.41 ++using std::dec; 13.42 + using std::cout; 13.43 + using std::endl; 13.44 + using std::cerr; 13.45 +@@ -18,7 +21,7 @@ 13.46 + using namespace dami; 13.47 + 13.48 + int 13.49 +-main(size_t argc, const char** argv) 13.50 ++main(int argc, const char** argv) 13.51 + { 13.52 + ID3D_INIT_DOUT(); 13.53 + ID3D_INIT_WARNING();
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/id3lib/stuff/patches/60-id3lib-missing-nullpointer-check.patch Tue Nov 21 12:56:18 2017 +0200 14.3 @@ -0,0 +1,12 @@ 14.4 +This patch adds a check for a null pointer 14.5 +--- a/src/header_tag.cpp 14.6 ++++ b/src/header_tag.cpp 14.7 +@@ -54,7 +54,7 @@ 14.8 + { 14.9 + size_t bytesUsed = ID3_TagHeader::SIZE; 14.10 + 14.11 +- if (_info->is_extended) 14.12 ++ if (_info && _info->is_extended) 14.13 + { 14.14 + bytesUsed += _info->extended_bytes; 14.15 + }
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/id3lib/stuff/patches/60-spelling.patch Tue Nov 21 12:56:18 2017 +0200 15.3 @@ -0,0 +1,107 @@ 15.4 +This patch fixes some minor spelling mistakes 15.5 +diff -Naur id3lib-3.8.3.orig//ChangeLog id3lib-3.8.3//ChangeLog 15.6 +--- id3lib-3.8.3.orig//ChangeLog 2010-06-08 05:21:47.817061336 +0200 15.7 ++++ id3lib-3.8.3//ChangeLog 2010-06-08 05:21:05.320811354 +0200 15.8 +@@ -2266,7 +2266,7 @@ 15.9 + * examples/demo_info.cpp (1.19): 15.10 + (PrintInformation): When printing synced lyrics info, now uses a 15.11 + MemoryReader, BinaryNumberReader, and TextReader to extract the 15.12 +- infromation from the binary field. This is a cheat, since these 15.13 ++ information from the binary field. This is a cheat, since these 15.14 + classes aren't normally exposed to folks using the library. 15.15 + Hopefully they will be exposed soon enough for the next major 15.16 + release. 15.17 +diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.html id3lib-3.8.3//doc/id3v2.3.0.html 15.18 +--- id3lib-3.8.3.orig//doc/id3v2.3.0.html 2010-06-08 05:21:47.859810543 +0200 15.19 ++++ id3lib-3.8.3//doc/id3v2.3.0.html 2010-06-08 05:21:05.373811128 +0200 15.20 +@@ -2157,7 +2157,7 @@ 15.21 + 64.Native American 15.22 + 65.Cabaret 15.23 + 66.New Wave 15.24 +- 67.Psychadelic 15.25 ++ 67.Psychedelic 15.26 + 68.Rave 15.27 + 69.Showtunes 15.28 + 70.Trailer 15.29 +@@ -2254,4 +2254,4 @@ 15.30 + Email: <a href="mailto:johan@id3.org">johan@id3.org</a> 15.31 + </p> 15.32 + 15.33 +-</body></html> 15.34 +\ No newline at end of file 15.35 ++</body></html> 15.36 +diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.txt id3lib-3.8.3//doc/id3v2.3.0.txt 15.37 +--- id3lib-3.8.3.orig//doc/id3v2.3.0.txt 2010-06-08 05:21:47.860810639 +0200 15.38 ++++ id3lib-3.8.3//doc/id3v2.3.0.txt 2010-06-08 05:21:05.374811307 +0200 15.39 +@@ -1929,7 +1929,7 @@ 15.40 + 64.Native American 15.41 + 65.Cabaret 15.42 + 66.New Wave 15.43 +- 67.Psychadelic 15.44 ++ 67.Psychedelic 15.45 + 68.Rave 15.46 + 69.Showtunes 15.47 + 70.Trailer 15.48 +diff -Naur id3lib-3.8.3.orig//id3com/id3com.idl id3lib-3.8.3//id3com/id3com.idl 15.49 +--- id3lib-3.8.3.orig//id3com/id3com.idl 2010-06-08 05:21:47.818060988 +0200 15.50 ++++ id3lib-3.8.3//id3com/id3com.idl 2010-06-08 05:21:05.355061546 +0200 15.51 +@@ -179,7 +179,7 @@ 15.52 + /* USER */ ID3_TERMSOFUSE, /**< Terms of use */ 15.53 + /* USLT */ ID3_UNSYNCEDLYRICS, /**< Unsynchronized lyric/text transcription */ 15.54 + /* WCOM */ ID3_WWWCOMMERCIALINFO, /**< Commercial information */ 15.55 +- /* WCOP */ ID3_WWWCOPYRIGHT, /**< Copyright/Legal infromation */ 15.56 ++ /* WCOP */ ID3_WWWCOPYRIGHT, /**< Copyright/Legal information */ 15.57 + /* WOAF */ ID3_WWWAUDIOFILE, /**< Official audio file webpage */ 15.58 + /* WOAR */ ID3_WWWARTIST, /**< Official artist/performer webpage */ 15.59 + /* WOAS */ ID3_WWWAUDIOSOURCE, /**< Official audio source webpage */ 15.60 +diff -Naur id3lib-3.8.3.orig//include/id3/globals.h id3lib-3.8.3//include/id3/globals.h 15.61 +--- id3lib-3.8.3.orig//include/id3/globals.h 2010-06-08 05:21:47.818060988 +0200 15.62 ++++ id3lib-3.8.3//include/id3/globals.h 2010-06-08 05:22:27.395811102 +0200 15.63 +@@ -313,7 +313,7 @@ 15.64 + /* USER */ ID3FID_TERMSOFUSE, /**< Terms of use */ 15.65 + /* USLT */ ID3FID_UNSYNCEDLYRICS, /**< Unsynchronized lyric/text transcription */ 15.66 + /* WCOM */ ID3FID_WWWCOMMERCIALINFO, /**< Commercial information */ 15.67 +- /* WCOP */ ID3FID_WWWCOPYRIGHT, /**< Copyright/Legal infromation */ 15.68 ++ /* WCOP */ ID3FID_WWWCOPYRIGHT, /**< Copyright/Legal information */ 15.69 + /* WOAF */ ID3FID_WWWAUDIOFILE, /**< Official audio file webpage */ 15.70 + /* WOAR */ ID3FID_WWWARTIST, /**< Official artist/performer webpage */ 15.71 + /* WOAS */ ID3FID_WWWAUDIOSOURCE, /**< Official audio source webpage */ 15.72 +@@ -608,7 +608,7 @@ 15.73 + "Native American", //64 15.74 + "Cabaret", //65 15.75 + "New Wave", //66 15.76 +- "Psychadelic", //67 15.77 ++ "Psychedelic", //67 15.78 + "Rave", //68 15.79 + "Showtunes", //69 15.80 + "Trailer", //70 15.81 +@@ -686,7 +686,7 @@ 15.82 + "Christian Rock ", //141 15.83 + "Merengue", //142 15.84 + "Salsa", //143 15.85 +- "Trash Metal", //144 15.86 ++ "Thrash Metal", //144 15.87 + "Anime", //145 15.88 + "JPop", //146 15.89 + "Synthpop" //147 15.90 +diff -Naur id3lib-3.8.3.orig//src/field.cpp id3lib-3.8.3//src/field.cpp 15.91 +--- id3lib-3.8.3.orig//src/field.cpp 2010-06-08 05:21:47.818060988 +0200 15.92 ++++ id3lib-3.8.3//src/field.cpp 2010-06-08 05:21:05.373811128 +0200 15.93 +@@ -719,7 +719,7 @@ 15.94 + // USER ID3FID_TERMSOFUSE Terms of use 15.95 + // USLT ULT ID3FID_UNSYNCEDLYRICS Unsynchronized lyric/text transcription 15.96 + // WCOM WCM ID3FID_WWWCOMMERCIALINFO Commercial information 15.97 +-// WCOP WCM ID3FID_WWWCOPYRIGHT Copyright/Legal infromation 15.98 ++// WCOP WCM ID3FID_WWWCOPYRIGHT Copyright/Legal information 15.99 + // WOAF WCP ID3FID_WWWAUDIOFILE Official audio file webpage 15.100 + // WOAR WAF ID3FID_WWWARTIST Official artist/performer webpage 15.101 + // WOAS WAR ID3FID_WWWAUDIOSOURCE Official audio source webpage 15.102 +@@ -813,7 +813,7 @@ 15.103 + {ID3FID_TERMSOFUSE, "" , "USER", false, false, ID3FD_TermsOfUse, "Terms of use"}, 15.104 + {ID3FID_UNSYNCEDLYRICS, "ULT", "USLT", false, false, ID3FD_GeneralText, "Unsynchronized lyric/text transcription"}, 15.105 + {ID3FID_WWWCOMMERCIALINFO, "WCM", "WCOM", false, false, ID3FD_URL, "Commercial information"}, 15.106 +- {ID3FID_WWWCOPYRIGHT, "WCP", "WCOP", false, false, ID3FD_URL, "Copyright/Legal infromation"}, 15.107 ++ {ID3FID_WWWCOPYRIGHT, "WCP", "WCOP", false, false, ID3FD_URL, "Copyright/Legal information"}, 15.108 + {ID3FID_WWWAUDIOFILE, "WAF", "WOAF", false, false, ID3FD_URL, "Official audio file webpage"}, 15.109 + {ID3FID_WWWARTIST, "WAR", "WOAR", false, false, ID3FD_URL, "Official artist/performer webpage"}, 15.110 + {ID3FID_WWWAUDIOSOURCE, "WAS", "WOAS", false, false, ID3FD_URL, "Official audio source webpage"},
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/id3lib/stuff/patches/61-fix_vbr_stack_smash.patch Tue Nov 21 12:56:18 2017 +0200 16.3 @@ -0,0 +1,19 @@ 16.4 +Description: Fix crashes when reading VBR MP3 file. 16.5 +Bug-Ubuntu: https://launchpad.net/bugs/444466 16.6 +Origin: upstream, http://sourceforge.net/tracker/?func=detail&aid=937707&group_id=979&atid=300979 16.7 +Forwarded: yes 16.8 +Author: Urs Fleisch 16.9 + 16.10 +Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp 16.11 +=================================================================== 16.12 +--- id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp 2009-10-06 23:12:10.381250132 +0200 16.13 ++++ id3lib3.8.3-3.8.3/src/mp3_parse.cpp 2009-10-06 23:14:09.545252591 +0200 16.14 +@@ -465,7 +465,7 @@ 16.15 + // from http://www.xingtech.com/developer/mp3/ 16.16 + 16.17 + const size_t VBR_HEADER_MIN_SIZE = 8; // "xing" + flags are fixed 16.18 +- const size_t VBR_HEADER_MAX_SIZE = 116; // frames, bytes, toc and scale are optional 16.19 ++ const size_t VBR_HEADER_MAX_SIZE = 120; // frames, bytes, toc and scale are optional 16.20 + 16.21 + if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE) 16.22 + {
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/id3lib/stuff/patches/series Tue Nov 21 12:56:18 2017 +0200 17.3 @@ -0,0 +1,14 @@ 17.4 +# from https://www.archlinux.org/packages/extra/x86_64/id3lib/ 17.5 +00-add-libz-to-compilation.patch 17.6 +05-create-m4-directory.patch 17.7 +10-fix-compilation-with-cpp-headers.patch 17.8 +15-fix-headers-of-main-functions.patch 17.9 +20-create-manpages.patch 17.10 +30-fix-utf16.patch 17.11 +40-deal-with-mkstemp.patch 17.12 +60-add-c-wrapper-functions.patch 17.13 +60-fix_make_check.patch 17.14 +60-id3lib-missing-nullpointer-check.patch 17.15 +60-spelling.patch 17.16 +61-fix_vbr_stack_smash.patch 17.17 +50-remove-outdated-check.patch
18.1 --- a/libtool/receipt Sun Nov 19 18:47:25 2017 +0100 18.2 +++ b/libtool/receipt Tue Nov 21 12:56:18 2017 +0200 18.3 @@ -33,7 +33,7 @@ 18.4 libltdl) 18.5 copy *.so* 18.6 CAT="system-tools|library" 18.7 - DEPENDS=" " 18.8 + DEPENDS="glibc-base" 18.9 ;; 18.10 esac 18.11 }
19.1 --- a/lxqt-panel/receipt Sun Nov 19 18:47:25 2017 +0100 19.2 +++ b/lxqt-panel/receipt Tue Nov 21 12:56:18 2017 +0200 19.3 @@ -15,18 +15,16 @@ 19.4 BUILD_DEPENDS="cmake qt5-dev mesa17-dev kwindowsystem-dev liblxqt-dev \ 19.5 lxqt-build-tools lxqt-globalkeys-dev libstatgrab-dev solid-dev menu-cache-dev \ 19.6 lm-sensors-dev libsysstat-dev libdbusmenu-qt-dev xorg-libXcomposite-dev \ 19.7 -xorg-libXrender-dev alsa-lib-dev libxkbcommon-dev xorg-xcb-util-dev" 19.8 -SPLIT="lxqt-panel-dev" 19.9 +xorg-libXrender-dev alsa-lib-dev libxkbcommon-dev xorg-xcb-util-dev \ 19.10 +pulseaudio-dev" 19.11 +SPLIT="lxqt-panel-sensors lxqt-panel lxqt-panel-dev" 19.12 19.13 compile_rules() { 19.14 - sed -i 's|<KF5/KWindowSystem/|<|' \ 19.15 + sed -i.orig 's|<KF5/KWindowSystem/|<|' \ 19.16 plugin-taskbar/lxqttaskgroup.h \ 19.17 plugin-taskbar/lxqttaskgroup.cpp 19.18 - sed -i '/kbdinfo.h/i #undef explicit' \ 19.19 + sed -i.orig '/kbdinfo.h/i #undef explicit' \ 19.20 plugin-kbindicator/src/x11/kbdlayout.cpp 19.21 - # fix undefined variable 19.22 - sed -i "/#define LXQTPANEL_H/a #define LXQT_VERSION \"$VERSION\"" \ 19.23 - panel/lxqtpanel.h 19.24 19.25 mkdir build; cd build 19.26 cmake \ 19.27 @@ -34,7 +32,7 @@ 19.28 -DCMAKE_INSTALL_PREFIX=/usr \ 19.29 -DPULL_TRANSLATIONS=no \ 19.30 -DCMAKE_INSTALL_LIBDIR=lib \ 19.31 - -DVOLUME_USE_PULSEAUDIO=no \ 19.32 + -DVOLUME_USE_PULSEAUDIO=yes \ 19.33 .. && 19.34 make && 19.35 make install 19.36 @@ -42,13 +40,20 @@ 19.37 19.38 genpkg_rules() { 19.39 case $PACKAGE in 19.40 + *-sensors) 19.41 + # separated due to large depends, and because I can't get it work 19.42 + copy libsensors.so sensors.desktop 19.43 + CAT="system-tools|sensors plugin" 19.44 + DEPENDS="lxqt-panel lm-sensors" 19.45 + ;; 19.46 lxqt-panel) 19.47 - copy @std 19.48 + copy @std @rm 19.49 DEPENDS="alsa-lib glib kwindowsystem libdbusmenu-qt liblxqt \ 19.50 - libqtxdg libstatgrab libsysstat libxkbcommon-x11 lm-sensors \ 19.51 - lxqt-globalkeys menu-cache qt5-base qt5-svg qt5-x11extras solid \ 19.52 - xorg-libX11 xorg-libXcomposite xorg-libXdamage xorg-libXext \ 19.53 - xorg-libXfixes xorg-libXrender xorg-libxcb xorg-xcb-util" 19.54 + libqtxdg libstatgrab libsysstat libxkbcommon-x11 libxkbcommon \ 19.55 + lxqt-globalkeys menu-cache pulseaudio qt5-base qt5-svg \ 19.56 + qt5-x11extras solid xorg-libICE xorg-libSM xorg-libX11 \ 19.57 + xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \ 19.58 + xorg-libXrender xorg-libxcb xorg-xcb-util" 19.59 SUGGESTED="qastools xscreensaver" 19.60 ;; 19.61 *-dev)
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/serf/receipt Tue Nov 21 12:56:18 2017 +0200 20.3 @@ -0,0 +1,40 @@ 20.4 +# SliTaz package receipt v2. 20.5 + 20.6 +PACKAGE="serf" 20.7 +VERSION="1.3.9" 20.8 +CATEGORY="libdevel" 20.9 +SHORT_DESC="High-performance asynchronous HTTP client library" 20.10 +MAINTAINER="al.bobylev@gmail.com" 20.11 +LICENSE="Apache" 20.12 +WEB_SITE="https://serf.apache.org/" 20.13 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/serf.html" 20.14 + 20.15 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 20.16 +WGET_URL="https://archive.apache.org/dist/serf/$TARBALL" 20.17 + 20.18 +BUILD_DEPENDS="scons apr-dev apr-util-dev" 20.19 +SPLIT="serf-dev" 20.20 + 20.21 +compile_rules() { 20.22 + sed -i "/Append/s:RPATH=libdir,::" SConstruct && 20.23 + sed -i "/Default/s:lib_static,::" SConstruct && 20.24 + sed -i "/Alias/s:install_static,::" SConstruct && 20.25 + 20.26 + scons PREFIX=/usr && 20.27 + scons PREFIX=/usr install --install-sandbox=$install 20.28 +} 20.29 + 20.30 +genpkg_rules() { 20.31 + case $PACKAGE in 20.32 + serf) 20.33 + copy @std 20.34 + DEPENDS="apr apr-util expat gdbm libcrypto libldap libssl \ 20.35 + util-linux-uuid zlib" 20.36 + ;; 20.37 + *-dev) 20.38 + copy @dev 20.39 + DEPENDS="serf expat-dev gdbm libldap-dev openssl-dev \ 20.40 + util-linux-uuid-dev zlib-dev" 20.41 + ;; 20.42 + esac 20.43 +}
21.1 --- a/slim/receipt Sun Nov 19 18:47:25 2017 +0100 21.2 +++ b/slim/receipt Tue Nov 21 12:56:18 2017 +0200 21.3 @@ -18,11 +18,9 @@ 21.4 BUILD_DEPENDS="cmake xorg-libX11-dev freetype-dev libjpeg-turbo-dev zlib-dev \ 21.5 libpng16-dev fontconfig-dev xorg-libXft-dev xorg-libXrender-dev xorg-libXmu-dev \ 21.6 pam-dev" 21.7 -SPLIT="slim-theme-default slim slim-pam" 21.8 +SPLIT="slim-theme-default slim slim-pam:pam" 21.9 21.10 -# Rules to configure and make the package. 21.11 -compile_rules() 21.12 -{ 21.13 +compile_rules() { 21.14 # Handle cross compilation 21.15 case "$ARCH" in 21.16 i?86) 21.17 @@ -33,61 +31,51 @@ 21.18 LIBS=/cross/$ARCH/sysroot/usr/lib ;; 21.19 esac 21.20 21.21 + case "$SET" in 21.22 + '') SET_ARGS='-DUSE_PAM=no';; 21.23 + pam) SET_ARGS='-DUSE_PAM=yes';; 21.24 + esac 21.25 + 21.26 mkdir build; cd build 21.27 - cp -a $src $src-pam 21.28 cmake \ 21.29 -DCMAKE_INSTALL_PREFIX=/usr \ 21.30 -DX11_Xmu_LIB="$LIBS/libXmu.so" \ 21.31 -DX11_Xft_INCLUDE_PATH=$INCL \ 21.32 -DX11_Xmu_INCLUDE_PATH=$INCL \ 21.33 - -DUSE_PAM=no \ 21.34 + $SET_ARGS \ 21.35 .. && 21.36 make && 21.37 - make DESTDIR=$DESTDIR install || exit 1 21.38 + make install || return 1 21.39 21.40 - cd $src-pam/build 21.41 - cmake \ 21.42 - -DCMAKE_INSTALL_PREFIX=/usr \ 21.43 - -DX11_Xmu_LIB="$LIBS/libXmu.so" \ 21.44 - -DX11_Xft_INCLUDE_PATH=$INCL \ 21.45 - -DX11_Xmu_INCLUDE_PATH=$INCL \ 21.46 - -DUSE_PAM=yes \ 21.47 - .. && 21.48 - make && 21.49 - make DESTDIR=$DESTDIR-pam install || exit 1 21.50 + cp -r $stuff/themes $install/usr/share/slim 21.51 21.52 - for inst in $install $install-pam ; do 21.53 - cp -r $stuff/themes $inst/usr/share/slim 21.54 + # Config file and rc script. 21.55 + cp -a $stuff/etc $install 21.56 21.57 - # Config file and rc script. 21.58 - cp -a $stuff/etc $inst 21.59 + # slim-theme manager & default strings 21.60 + install -m755 $stuff/slim-theme $install/usr/bin/slim-theme 21.61 + install -m644 $stuff/strings $install/usr/share/slim/strings 21.62 21.63 - # slim-theme manager & default strings 21.64 - install -m755 $stuff/slim-theme $inst/usr/bin/slim-theme 21.65 - install -m644 $stuff/strings $inst/usr/share/slim/strings 21.66 - 21.67 - chown -R root:root $inst 21.68 - done 21.69 + chown -R root:root $install 21.70 } 21.71 21.72 # Rules to gen a SliTaz package suitable for Tazpkg. 21.73 genpkg_rules() { 21.74 case $PACKAGE in 21.75 slim-theme-default) 21.76 + copy default/ 21.77 CAT="customization|default theme bundled with SLiM" 21.78 - copy default/ 21.79 DEPENDS="slim slitaz-configs-base" 21.80 ;; 21.81 slim) 21.82 - copy @std 21.83 - remove_already_packed 21.84 + copy @std @rm 21.85 DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \ 21.86 xorg-libXft xorg-libXmu xorg-libXrender zlib" 21.87 CONFIG_FILES="/etc/slim.conf" 21.88 SUGGESTED="slim-theme-default slitaz-configs" 21.89 ;; 21.90 slim-pam) 21.91 - install=$install-pam copy @std 21.92 + copy @std 21.93 rm -rf $fs/usr/share/slim/themes/default 21.94 DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \ 21.95 xorg-libXft xorg-libXmu xorg-libXrender zlib pam"
22.1 --- a/subversion/receipt Sun Nov 19 18:47:25 2017 +0100 22.2 +++ b/subversion/receipt Tue Nov 21 12:56:18 2017 +0200 22.3 @@ -12,7 +12,7 @@ 22.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 22.5 WGET_URL="https://archive.apache.org/dist/subversion/$TARBALL" 22.6 22.7 -BUILD_DEPENDS="apr-dev apr-util-dev cyrus-sasl-dev dbus-dev gettext \ 22.8 +BUILD_DEPENDS="apr-dev apr-util-dev serf-dev cyrus-sasl-dev dbus-dev gettext \ 22.9 libmagic-dev python-dev" 22.10 SPLIT="libsvn subversion subversion-dev" 22.11 22.12 @@ -31,18 +31,18 @@ 22.13 case $PACKAGE in 22.14 libsvn) 22.15 copy *.so* 22.16 - CAT="system-tools|library" 22.17 - DEPENDS="apr apr-util expat libmagic libsasl libsqlite3 \ 22.18 + CAT="libdevel|library" 22.19 + DEPENDS="apr apr-util expat libmagic libsasl libsqlite3 serf \ 22.20 util-linux-uuid zlib" 22.21 ;; 22.22 subversion) 22.23 - copy @std; remove_already_packed 22.24 + copy @std @rm 22.25 DEPENDS="libsvn" 22.26 ;; 22.27 *-dev) 22.28 copy @dev 22.29 DEPENDS="libsvn subversion apr-dev apr-util-dev cyrus-sasl-dev \ 22.30 - expat-dev libmagic-dev cyrus-sasl-dev sqlite3-dev \ 22.31 + expat-dev libmagic-dev cyrus-sasl-dev serf-dev sqlite3-dev \ 22.32 util-linux-uuid-dev zlib-dev" 22.33 ;; 22.34 esac