remove uneeded files

4 files changed, 2 insertions, 155 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aaa853fe4b45..d98e0ee865ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = kid3-cli
 	pkgdesc = An MP3, Ogg/Vorbis and FLAC tag editor, CLI version
 	pkgver = 3.6.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://kid3.sourceforge.net/
-	changelog = kid3.changelog
 	arch = i686
 	arch = x86_64
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 29b26295eaa5..3806beffe701 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kid3-cli
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, CLI version"
 arch=(i686 x86_64)
 url="http://kid3.sourceforge.net/"
@@ -14,7 +14,6 @@ makedepends=(ninja chromaprint id3lib taglib libmp4v2 qt5-tools
              hicolor-icon-theme docbook-xsl extra-cmake-modules python)
 conflicts=(kid3-kde kid3-qt)
 provides=(kid3)
-changelog=${pkgname/-cli/}.changelog
 source=(http://downloads.sourceforge.net/${pkgname/-cli/}/${pkgname/-cli/}-$pkgver.tar.gz)
 sha256sums=('4644b2955265920d78c0d689545603a59e5020e98319be74c5b141f5a46976ad')
 
diff --git a/fix-build-with-chromaprint-1.4.patch b/fix-build-with-chromaprint-1.4.patch
deleted file mode 100644
index caa70bc09933..000000000000
--- a/fix-build-with-chromaprint-1.4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 305e5536b889e6e1609b2a8e27f2a04d97f2a7ad Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch@users.sourceforge.net>
-Date: Fri, 9 Dec 2016 07:54:19 +0100
-Subject: Fix building with Chromaprint 1.4, [bugs:#146].
-
-
-diff --git a/src/plugins/acoustidimport/fingerprintcalculator.cpp b/src/plugins/acoustidimport/fingerprintcalculator.cpp
-index 840efae..00d12e0 100644
---- a/src/plugins/acoustidimport/fingerprintcalculator.cpp
-+++ b/src/plugins/acoustidimport/fingerprintcalculator.cpp
-@@ -26,7 +26,6 @@
- 
- #define __STDC_CONSTANT_MACROS
- #include "fingerprintcalculator.h"
--#include <chromaprint.h>
- #include "config.h"
- #include "abstractfingerprintdecoder.h"
- 
-@@ -94,7 +93,9 @@ void FingerprintCalculator::startChromaprint(int sampleRate, int channelCount)
-  */
- void FingerprintCalculator::feedChromaprint(QByteArray data)
- {
--  if (!::chromaprint_feed(m_chromaprintCtx, data.data(), data.size() / 2)) {
-+  if (!::chromaprint_feed(m_chromaprintCtx,
-+                          reinterpret_cast<int16_t*>(data.data()),
-+                          data.size() / 2)) {
-     m_decoder->stop();
-     emit finished(QString(), 0, FingerprintCalculationFailed);
-   }
-diff --git a/src/plugins/acoustidimport/fingerprintcalculator.h b/src/plugins/acoustidimport/fingerprintcalculator.h
-index dea2f2f..596409b 100644
---- a/src/plugins/acoustidimport/fingerprintcalculator.h
-+++ b/src/plugins/acoustidimport/fingerprintcalculator.h
-@@ -29,6 +29,7 @@
- 
- #include <QObject>
- #include <QString>
-+#include <chromaprint.h>
- 
- class AbstractFingerprintDecoder;
- 
-@@ -110,7 +111,7 @@ private slots:
-   void finishChromaprint(int duration);
- 
- private:
--  void** m_chromaprintCtx;
-+  ChromaprintContext* m_chromaprintCtx;
-   AbstractFingerprintDecoder* m_decoder;
- };
- 
diff --git a/kid3.changelog b/kid3.changelog
deleted file mode 100644
index b5af3e2562fc..000000000000
--- a/kid3.changelog
+++ /dev/null
@@ -1,101 +0,0 @@
-2016-08-24 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.4.2-1
-
-2016-07-03 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.4.1-2 ffmpeg 3.1 rebuild
-
-2016-06-23 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.4.1-1
-
-2016-04-30 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.4.0-2 pacman hooks rebuild
-
-2016-04-23 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.4.0-1
-
-2016-03-15 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.3.2-1
-
-2016-02-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.3.1-3 chromaprint 1.3.1 rebuild
-
-2016-02-16 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.3.1-2 ffmpeg 3.0 rebuild
-
-2015-12-20 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.3.1-1
-
-2015-10-21 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.3.0-3 FS#46601 fix
-
-2015-10-03 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.3.0-2 QT5 version
-
-2015-10-03 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.3.0-1
-
-2015-05-12 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.2.1-1
-
-2015-03-30 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.2.0-1
-
-2014-11-11 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.1.2-1
-
-2014-05-25 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.1-2 FS#40121 fixed
-
-2014-04-25 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.1-1
-
-2013-12-02 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.0.2-2 FS#37642 fixed, package split
-
-2013-12-02 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.0.2-1
-
-2013-11-02 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 3.0.1-1
-
-2013-03-12 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 2.3-1
-
-2012-12-16 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 2.2.1-1
-
-2012-10-28 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 2.2-1
-
-2012-06-03 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 2.1-4 ffmpeg 0.11 rebuild
-
-2012-05-12 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 2.1-1
-
-2011-11-20 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 2.0.1-1
-
-2011-09-09 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 2.0-1
-
-2011-02-19 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* kid3 1.6
-
-2010-09-27 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* Update to major release v1.5
-
-2010-03-13 Andrea Scarpino <andrea@archlinux.org>
-	* Update to major release v1.4
-	* MP4V2 enabled
-	* Cleanup dependencies
-
-2010-01-01 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* Update to major release v1.3
-	* MP4V2 disabled, package in [extra] needs to be updated to be used with kid3
-
-2009-04-29 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* Update to major release v1.2
-
-2008-10-25 Jaroslav Lichtblau <svetlemodry@archlinux.org>
-	* Update to major release v1.1