libraries/id3lib: use patches from Slackware-current

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

18 files changed, 17 insertions, 230 deletions

diff --git a/libraries/id3lib/README b/libraries/id3lib/README
index 5f549353c1..f809127d2d 100644
--- a/libraries/id3lib/README
+++ b/libraries/id3lib/README
@@ -7,4 +7,4 @@ Features include identification of valid tags, automatic size
 conversions, (re)synchronisation of tag frames, seamless tag
 (de)compression, and optional padding facilities.
 
-This SlackBuild applies all patches provided by Debian team.
+This SlackBuild applies several patches provided by Debian team.
diff --git a/libraries/id3lib/id3lib.SlackBuild b/libraries/id3lib/id3lib.SlackBuild
index 6648f4bed7..9c036b3e4a 100644
--- a/libraries/id3lib/id3lib.SlackBuild
+++ b/libraries/id3lib/id3lib.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM=id3lib
 VERSION=${VERSION:-3.8.3}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -72,13 +72,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Apply all available patches provided by Debian
-# https://sources.debian.org/patches/id3lib3.8.3/3.8.3-16.2/
-find $CWD/patches/ -type f | sort -n |
-    while read patch; do patch -p1 -i $patch; done
+# Apply patches from Slackware-current:
+patch -p1 -i $CWD/patches/id3lib.cppheaders.patch
+patch -p1 -i $CWD/patches/id3lib.manpages.patch
+patch -p1 -i $CWD/patches/id3lib.utf8_writing.patch
+patch -p1 -i $CWD/patches/id3lib.mkstemp.patch
+patch -p1 -i $CWD/patches/id3lib.c_wrapper.patch
+patch -p1 -i $CWD/patches/id3lib.nullpointer_check.patch
+patch -p1 -i $CWD/patches/id3lib.vbr_stack_smash.patch
 
 # iomanip.h is obsolete; use the standard C++ header:
-sed -i "s%iomanip.h%iomanip%g" configure
+sed -e "s%iomanip.h%iomanip%g" -i configure
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/libraries/id3lib/patches/00-add-libz-to-compilation.patch b/libraries/id3lib/patches/00-add-libz-to-compilation.patch
deleted file mode 100644
index e937877364..0000000000
--- a/libraries/id3lib/patches/00-add-libz-to-compilation.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch was first introduced in version 3.8.3-3
-
-It fixes http://bugs.debian.org/208672
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -74,6 +74,8 @@
- 
- if ID3_NEEDZLIB
- LDADD        = $(top_builddir)/zlib/src/libz.la
-+else
-+libid3_la_LIBADD  = -lz
- endif
- 
- libid3_la_LDFLAGS = \
diff --git a/libraries/id3lib/patches/05-create-m4-directory.patch b/libraries/id3lib/patches/05-create-m4-directory.patch
deleted file mode 100644
index d8111205eb..0000000000
--- a/libraries/id3lib/patches/05-create-m4-directory.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Create a local m4 subdirectory
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,6 +12,8 @@
- # require automake 1.5
- AUTOMAKE_OPTIONS = 1.5
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- EXTRA_DIST =                    \
-         HISTORY                 \
-         config.h.win32          \
diff --git a/libraries/id3lib/patches/10-foo-with-configure.in.patch b/libraries/id3lib/patches/10-foo-with-configure.in.patch
deleted file mode 100644
index e75689682c..0000000000
--- a/libraries/id3lib/patches/10-foo-with-configure.in.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -17,6 +17,8 @@
- # init autoconf (and check for presence fo reconf)
- AC_INIT(reconf)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
- ID3LIB_NAME=id3lib
- 
- dnl The following has been adapted from glib (http://www.gtk.org)
-@@ -87,14 +89,14 @@
- 
- AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
- 
-+dnl Initialize maintainer mode
-+AM_MAINTAINER_MODE
-+
- AC_ISC_POSIX
- 
- dnl Initialize libtool
- AM_PROG_LIBTOOL
- 
--dnl Initialize maintainer mode
--AM_MAINTAINER_MODE
--
- #AC_CANONICAL_HOST
- 
- dnl figure debugging default, prior to $ac_help setup
diff --git a/libraries/id3lib/patches/15-fix-headers-of-main-functions.patch b/libraries/id3lib/patches/15-fix-headers-of-main-functions.patch
deleted file mode 100644
index 48e01d145f..0000000000
--- a/libraries/id3lib/patches/15-fix-headers-of-main-functions.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-This patch fixes some function headers in demo code used during 'make check'
---- a/examples/demo_info.cpp
-+++ b/examples/demo_info.cpp
-@@ -309,7 +309,7 @@
- 
- #define DEBUG
- 
--int main( unsigned int argc, char * const argv[])
-+int main(int argc, char * const argv[])
- {
-   ID3D_INIT_DOUT();
- 
---- a/examples/demo_convert.cpp
-+++ b/examples/demo_convert.cpp
-@@ -84,7 +84,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main(int argc, char * const argv[])
- {
-   flags_t ulFlag = ID3TT_ALL;
-   gengetopt_args_info args;
---- a/examples/demo_copy.cpp
-+++ b/examples/demo_copy.cpp
-@@ -81,7 +81,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main(int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
---- a/examples/demo_tag.cpp
-+++ b/examples/demo_tag.cpp
-@@ -46,7 +46,7 @@
-     os << "v2";
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main(int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
diff --git a/libraries/id3lib/patches/31-fix-utf16-stringlists.patch b/libraries/id3lib/patches/31-fix-utf16-stringlists.patch
deleted file mode 100644
index 3582238743..0000000000
--- a/libraries/id3lib/patches/31-fix-utf16-stringlists.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-This patch fixes tag corruption after pipe characters.
-
-Author: Urs Fleisch <urs.fleisch@gmail.com>
-Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680915
---- a/src/io_helpers.cpp
-+++ b/src/io_helpers.cpp
-@@ -373,10 +373,17 @@
-     //}
-     // Right code
-     unsigned char *pdata = (unsigned char *) data.c_str();
-+    unicode_t lastCh = BOM;
-     for (size_t i = 0; i < size; i += 2)
-     {
-       unicode_t ch = (pdata[i] << 8) | pdata[i+1];
-+      if (lastCh == 0 && ch != BOM)
-+      {
-+        // Last character was NULL, so start next string with BOM.
-+        writer.writeChars((const unsigned char*) &BOM, 2);
-+      }
-       writer.writeChars((const unsigned char*) &ch, 2);
-+      lastCh = ch;
-     }
-     // End patch
-   }
diff --git a/libraries/id3lib/patches/50-remove-outdated-check.patch b/libraries/id3lib/patches/50-remove-outdated-check.patch
deleted file mode 100644
index 386da2771b..0000000000
--- a/libraries/id3lib/patches/50-remove-outdated-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-We don't actually need iomanip.h
---- a/configure.in
-+++ b/configure.in
-@@ -227,7 +227,6 @@
- )
- AC_CHECK_HEADERS(               \
-   string                        \
--  iomanip.h                     \
-   ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
- )
- 
diff --git a/libraries/id3lib/patches/60-fix_make_check.patch b/libraries/id3lib/patches/60-fix_make_check.patch
deleted file mode 100644
index e2bb1b0518..0000000000
--- a/libraries/id3lib/patches/60-fix_make_check.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-This patch fixes some function headers and imports in order for 'make check'
-to work.
-
-It was first introduced in version 3.8.3-9
-diff -Naur id3lib-3.8.3.orig/examples/findeng.cpp id3lib-3.8.3/examples/findeng.cpp
---- id3lib-3.8.3.orig/examples/findeng.cpp	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/examples/findeng.cpp	2009-12-10 00:58:12.173795997 +0100
-@@ -9,7 +9,7 @@
- using std::cout;
- using std::endl;
- 
--int main(unsigned argc, char* argv[])
-+int main(int argc, char* argv[])
- {
-   ID3D_INIT_DOUT();
-   ID3D_INIT_WARNING();
-diff -Naur id3lib-3.8.3.orig/examples/findstr.cpp id3lib-3.8.3/examples/findstr.cpp
---- id3lib-3.8.3.orig/examples/findstr.cpp	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/examples/findstr.cpp	2009-12-10 00:57:48.036819825 +0100
-@@ -9,7 +9,7 @@
- using std::cout;
- using std::endl;
- 
--int main(unsigned argc, char* argv[])
-+int main(int argc, char* argv[])
- {
-   ID3D_INIT_DOUT();
-   ID3D_INIT_WARNING();
-diff -Naur id3lib-3.8.3.orig/examples/test_io.cpp id3lib-3.8.3/examples/test_io.cpp
---- id3lib-3.8.3.orig/examples/test_io.cpp	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/examples/test_io.cpp	2009-12-10 00:57:03.612111640 +0100
-@@ -11,6 +11,9 @@
- #include <id3/io_strings.h>
- #include <id3/utils.h>
- 
-+using std::cin;
-+using std::hex;
-+using std::dec;
- using std::cout;
- using std::endl;
- using std::cerr;
-@@ -18,7 +21,7 @@
- using namespace dami;
- 
- int
--main(size_t argc, const char** argv)
-+main(int argc, const char** argv)
- {
-   ID3D_INIT_DOUT();
-   ID3D_INIT_WARNING();
diff --git a/libraries/id3lib/patches/62-remove-remote-icons.patch b/libraries/id3lib/patches/62-remove-remote-icons.patch
deleted file mode 100644
index 6d929953f2..0000000000
--- a/libraries/id3lib/patches/62-remove-remote-icons.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This patch removes two icons from the documentation which would be loaded from
-remote servers, thereby exposing the reader's IP address to potential tracking
-(lintian keywords privacy-breach-logo and privacy-breach-w3c-valid-html).
-
-Author: Stefan Ott <stefan@ott.net>
---- a/doc/index.html
-+++ b/doc/index.html
-@@ -427,24 +427,5 @@
-         </td>
-       </tr>
-     </table>
--    
--    <br><br>
--    
--    <table align="center" width="80%" border="0">
--      <tr>
--        <td align="left">
--          <a href="http://sourceforge.net">
--            <IMG src="http://sourceforge.net/sflogo.php?group_id=979&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net"></A>
--        </td>
--        <td align="right">
--
--          <a href="http://validator.w3.org/check/referer">
--            <img border=0
--              src="http://validator.w3.org/images/vh401"
--              alt="Valid HTML 4.01!" height=31 width=88></a>
--        </td>
--      </tr>
--    </table>
--    <br>
-   </body>
- </html>
diff --git a/libraries/id3lib/patches/60-add-c-wrapper-functions.patch b/libraries/id3lib/patches/id3lib.c_wrapper.patch
index d72e81c0ec..d72e81c0ec 100644
--- a/libraries/id3lib/patches/60-add-c-wrapper-functions.patch
+++ b/libraries/id3lib/patches/id3lib.c_wrapper.patch
diff --git a/libraries/id3lib/patches/10-fix-compilation-with-cpp-headers.patch b/libraries/id3lib/patches/id3lib.cppheaders.patch
index a9b45ab02c..a9b45ab02c 100644
--- a/libraries/id3lib/patches/10-fix-compilation-with-cpp-headers.patch
+++ b/libraries/id3lib/patches/id3lib.cppheaders.patch
diff --git a/libraries/id3lib/patches/20-create-manpages.patch b/libraries/id3lib/patches/id3lib.manpages.patch
index cebf3d4d40..cebf3d4d40 100644
--- a/libraries/id3lib/patches/20-create-manpages.patch
+++ b/libraries/id3lib/patches/id3lib.manpages.patch
diff --git a/libraries/id3lib/patches/40-deal-with-mkstemp.patch b/libraries/id3lib/patches/id3lib.mkstemp.patch
index 36c84179fc..36c84179fc 100644
--- a/libraries/id3lib/patches/40-deal-with-mkstemp.patch
+++ b/libraries/id3lib/patches/id3lib.mkstemp.patch
diff --git a/libraries/id3lib/patches/60-id3lib-missing-nullpointer-check.patch b/libraries/id3lib/patches/id3lib.nullpointer_check.patch
index d4ca5d292f..d4ca5d292f 100644
--- a/libraries/id3lib/patches/60-id3lib-missing-nullpointer-check.patch
+++ b/libraries/id3lib/patches/id3lib.nullpointer_check.patch
diff --git a/libraries/id3lib/patches/30-fix-utf16.patch b/libraries/id3lib/patches/id3lib.utf8_writing.patch
index 3d3f50fed6..3d3f50fed6 100644
--- a/libraries/id3lib/patches/30-fix-utf16.patch
+++ b/libraries/id3lib/patches/id3lib.utf8_writing.patch
diff --git a/libraries/id3lib/patches/61-fix_vbr_stack_smash.patch b/libraries/id3lib/patches/id3lib.vbr_stack_smash.patch
index 9bf33e9787..9bf33e9787 100644
--- a/libraries/id3lib/patches/61-fix_vbr_stack_smash.patch
+++ b/libraries/id3lib/patches/id3lib.vbr_stack_smash.patch
diff --git a/libraries/id3lib/slack-desc b/libraries/id3lib/slack-desc
index d318cdf99c..2d363781b1 100644
--- a/libraries/id3lib/slack-desc
+++ b/libraries/id3lib/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 id3lib: id3lib (ID3 tag manipulation library)
 id3lib:
-id3lib: This package provides a software library for manipulating ID3v1
-id3lib: and ID3v2 tags. It provides a convenient interface for software
-id3lib: developers to include standards-compliant ID3v1/2 tagging
-id3lib: capabilities in their applications.
-id3lib:
+id3lib: This package provides a library for manipulating ID3v1 and ID3v2 tags.
 id3lib: Features include identification of valid tags, automatic size
 id3lib: conversions, (re)synchronisation of tag frames, seamless tag
-id3lib: (de)compression, and optional padding facilities.
+id3lib: (de)compression, and optional padding facilities. Additionally, it can
+id3lib: display mp3 header info such as bitrate.
+id3lib:
+id3lib: Homepage: http://id3lib.sourceforge.net/
+id3lib:
 id3lib: