Hello community, here is the log from the commit of package kid3 for openSUSE:Factory checked in at 2017-11-09 13:59:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kid3 (Old) and /work/SRC/openSUSE:Factory/.kid3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kid3" Thu Nov 9 13:59:22 2017 rev:18 rq:537963 version:3.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kid3/kid3.changes 2017-06-17 10:23:57.711519648 +0200 +++ /work/SRC/openSUSE:Factory/.kid3.new/kid3.changes 2017-11-09 13:59:22.819655480 +0100 @@ -1,0 +2,15 @@ +Tue Oct 31 16:53:42 UTC 2017 - [email protected] + +- update to version 3.5.1 + * Improved: + + Compatibility of imported and exported CSV files with cells + containing new line characters. + + Do not show unknown frames for ID3v2.3 TDAT, TIME, TYER, + TRDA frames. + + Enable high-DPI scaling for Qt >= 5.6. + + Change AppStream directory from appdata to metainfo. + * Fixed: + + Crash with DSF files having sample rates other than 2822400 + or 5644800. + +------------------------------------------------------------------- Old: ---- kid3-3.5.0.tar.gz kid3-3.5.0.tar.gz.asc New: ---- kid3-3.5.1.tar.gz kid3-3.5.1.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kid3.spec ++++++ --- /var/tmp/diff_new_pack.4BKUTH/_old 2017-11-09 13:59:23.411633913 +0100 +++ /var/tmp/diff_new_pack.4BKUTH/_new 2017-11-09 13:59:23.411633913 +0100 @@ -25,7 +25,7 @@ %endif Name: kid3 -Version: 3.5.0 +Version: 3.5.1 Release: 0 Summary: Efficient ID3 Tag Editor License: GPL-2.0+ @@ -284,7 +284,7 @@ %if %{with build_kde} %files %defattr(-,root,root,-) -%dir %{_datadir}/appdata +%dir %{_datadir}/metainfo %if %{with build_qt5} %{_kf5_bindir}/kid3 %{_kf5_iconsdir}/hicolor/*/apps/kid3.* @@ -296,14 +296,14 @@ %{_kde4_bindir}/kid3 %{_kde4_iconsdir}/hicolor/*/apps/kid3.* %endif -%{_datadir}/appdata/kid3.appdata.xml +%{_datadir}/metainfo/kid3.appdata.xml %endif %files qt %defattr(-,root,root,-) -%dir %{_datadir}/appdata +%dir %{_datadir}/metainfo %{_datadir}/applications/kid3-qt.desktop -%{_datadir}/appdata/kid3-qt.appdata.xml +%{_datadir}/metainfo/kid3-qt.appdata.xml %{_bindir}/kid3-qt %{_datadir}/icons/hicolor/*/apps/kid3-qt.* %{_mandir}/man1/kid3-qt.1%{ext_man} ++++++ kid3-3.5.0.tar.gz -> kid3-3.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/CMakeLists.txt new/kid3-3.5.1/CMakeLists.txt --- old/kid3-3.5.0/CMakeLists.txt 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/CMakeLists.txt 2017-10-30 18:12:24.000000000 +0100 @@ -22,7 +22,7 @@ cmake_minimum_required(VERSION 2.8) if (POLICY CMP0020) - cmake_policy(SET CMP0020 OLD) + cmake_policy(SET CMP0020 NEW) endif (POLICY CMP0020) if (POLICY CMP0045) cmake_policy(SET CMP0045 OLD) @@ -116,7 +116,7 @@ # Version information set(CPACK_PACKAGE_VERSION_MAJOR 3) set(CPACK_PACKAGE_VERSION_MINOR 5) -set(CPACK_PACKAGE_VERSION_PATCH 0) +set(CPACK_PACKAGE_VERSION_PATCH 1) set(KID3_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_PACKAGE_VERSION ${KID3_VERSION}) #set(CPACK_PACKAGE_VERSION "git20170517") @@ -148,7 +148,7 @@ set(WITH_LIBDIR_DEFAULT ".") set(WITH_PLUGINSDIR_DEFAULT ".") set(QT_ANDROID_APP_VERSION ${KID3_VERSION}) - set(QT_ANDROID_APP_VERSION_CODE 9) + set(QT_ANDROID_APP_VERSION_CODE 10) else (APPLE) set(WITH_DATAROOTDIR_DEFAULT "share") set(WITH_DOCDIR_DEFAULT "share/doc/kid3-qt") @@ -358,6 +358,10 @@ # http://stackoverflow.com/questions/8823267/linking-against-older-symbol-version-in-a-so-file set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include ${CMAKE_CURRENT_SOURCE_DIR}/linux/glibc_version_nightmare.h") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include ${CMAKE_CURRENT_SOURCE_DIR}/linux/glibc_version_nightmare.h") + # Use RPATH instead of RUNPATH, the RPATH of the loading executable has to be used, see + # http://blog.qt.io/blog/2011/10/28/rpath-and-runpath/ + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--disable-new-dtags") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--disable-new-dtags") endif () # Check that QT_NO_DEBUG is defined for release configurations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/ChangeLog new/kid3-3.5.1/ChangeLog --- old/kid3-3.5.0/ChangeLog 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/ChangeLog 2017-10-30 18:12:24.000000000 +0100 @@ -1,3 +1,19 @@ +Wed Nov 1 12:36:45 CET 2017 Urs Fleisch <[email protected]> + + * Release 3.5.1 + + * Improved: + + Compatibility of imported and exported CSV files with cells + containing new line characters. + + Do not show unknown frames for ID3v2.3 TDAT, TIME, TYER, TRDA + frames. + + Enable high-DPI scaling for Qt >= 5.6. + + Change AppStream directory from appdata to metainfo. + + * Fixed: + + Crash with DSF files having sample rates other than 2822400 or + 5644800. + Fri Jun 16 15:41:09 CEST 2017 Urs Fleisch <[email protected]> * Release 3.5.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/Doxyfile new/kid3-3.5.1/Doxyfile --- old/kid3-3.5.0/Doxyfile 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/Doxyfile 2017-10-30 18:12:24.000000000 +0100 @@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.5.0 +PROJECT_NUMBER = 3.5.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/buildlibs.sh new/kid3-3.5.1/buildlibs.sh --- old/kid3-3.5.0/buildlibs.sh 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/buildlibs.sh 2017-10-30 18:12:24.000000000 +0100 @@ -51,14 +51,14 @@ compiler="gcc" -qt_version=5.6.2 +qt_version=5.6.3 zlib_version=1.2.8 zlib_patchlevel=5 libogg_version=1.3.2 libogg_patchlevel=1 libvorbis_version=1.3.5 libvorbis_patchlevel=4 -ffmpeg_version=3.2.5 +ffmpeg_version=3.4 ffmpeg_patchlevel=1 #libav_version=11.4 #libav_patchlevel=2 @@ -70,7 +70,7 @@ chromaprint_version=1.4.2 chromaprint_patchlevel=1 mp4v2_version=2.0.0 -mp4v2_patchlevel=5 +mp4v2_patchlevel=6 FLAC_BUILD_OPTION="--enable-debug" ID3LIB_BUILD_OPTION="--enable-debug=minimum" @@ -83,8 +83,8 @@ #CMAKE_BUILD_OPTION="-DCMAKE_BUILD_TYPE=Debug" # Uncomment for a LINUX_SELF_CONTAINED build -#export CC="gcc-4.7" -#export CXX="g++-4.7" +#export CC="gcc-4.8" +#export CXX="g++-4.8" #export CFLAGS="-O2 -fPIC" #export CXXFLAGS="-O2 -fPIC" #AV_BUILD_OPTION="$AV_BUILD_OPTION --enable-pic --extra-ldexeflags=-pie" @@ -258,7 +258,7 @@ fi done cat >mingw.cmake <<EOF -set(QT_PREFIX /windows/Qt/Qt${qt_version}/${qt_version%.?}/mingw49_32) +set(QT_PREFIX /windows/Qt/Qt${qt_version}/${qt_version}/mingw49_32) set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_C_COMPILER ${cross_host}-gcc) @@ -712,6 +712,28 @@ EOF +test -f taglib_CVE-2017-12678.patch || +cat >taglib_CVE-2017-12678.patch <<"EOF" +Index: b/taglib/mpeg/id3v2/id3v2framefactory.cpp +=================================================================== +--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp ++++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp +@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrame + tag->frameList("TDAT").size() == 1) + { + TextIdentificationFrame *tdrc = +- static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front()); ++ dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front()); + UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front()); + +- if(tdrc->fieldList().size() == 1 && ++ if(tdrc && ++ tdrc->fieldList().size() == 1 && + tdrc->fieldList().front().size() == 4 && + tdat->data().size() >= 5) + { +EOF + test -f mp4v2_win32.patch || cat >mp4v2_win32.patch <<"EOF" diff -ruN mp4v2-2.0.0.orig/GNUmakefile.am mp4v2-2.0.0/GNUmakefile.am @@ -2114,6 +2136,7 @@ fi if test "${taglib_version}" = "1.11.1"; then patch -p1 <../source/taglib_mp4shwm.patch + patch -p1 <../source/taglib_CVE-2017-12678.patch fi cd .. fi @@ -2550,7 +2573,6 @@ fi AV_CONFIGURE_OPTIONS="$AV_CONFIGURE_OPTIONS $AV_BUILD_OPTION" ./configure \ - --enable-memalign-hack \ --disable-shared \ --enable-static \ --disable-avdevice \ @@ -2729,7 +2751,7 @@ BUILDPREFIX=\$(cd ..; pwd)/buildroot/usr/local export PKG_CONFIG_PATH=\$BUILDPREFIX/lib/pkgconfig # For a LINUX_SELF_CONTAINED build, change BUILD_SHARED_LIBS, WITH_QML to ON and add -# -G Ninja -DCMAKE_CXX_COMPILER=g++-4.7 -DCMAKE_C_COMPILER=gcc-4.7 -DQT_QMAKE_EXECUTABLE=/opt/Qt5.6.2/5.6/gcc_64/bin/qmake -DLINUX_SELF_CONTAINED=ON -DWITH_READLINE=OFF +# -G Ninja -DCMAKE_CXX_COMPILER=g++-4.8 -DCMAKE_C_COMPILER=gcc-4.8 -DQT_QMAKE_EXECUTABLE=/opt/Qt5.6.3/5.6.3/gcc_64/bin/qmake -DLINUX_SELF_CONTAINED=ON -DWITH_READLINE=OFF cmake -DBUILD_SHARED_LIBS=OFF -DWITH_TAGLIB=OFF -DHAVE_TAGLIB=1 -DTAGLIB_LIBRARIES:STRING="-L\$BUILDPREFIX/lib -ltag -lz" -DTAGLIB_CFLAGS:STRING="-I\$BUILDPREFIX/include/taglib -I\$BUILDPREFIX/include -DTAGLIB_STATIC" -DTAGLIB_VERSION:STRING="${taglib_config_version}" -DWITH_QT5=ON -DWITH_QML=OFF -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g -DID3LIB_LINKOPTION=1 -DFLAC__NO_DLL" -DCMAKE_INCLUDE_PATH=\$BUILDPREFIX/include -DCMAKE_LIBRARY_PATH=\$BUILDPREFIX/lib -DCMAKE_PROGRAM_PATH=\$BUILDPREFIX/bin -DWITH_FFMPEG=ON -DFFMPEG_ROOT=\$BUILDPREFIX -DWITH_MP4V2=ON $CMAKE_BUILD_OPTION -DWITH_GCC_PCH=OFF -DWITH_APPS="Qt;CLI" -DCMAKE_INSTALL_PREFIX= -DWITH_BINDIR=. -DWITH_DATAROOTDIR=. -DWITH_DOCDIR=. -DWITH_TRANSLATIONSDIR=. -DWITH_LIBDIR=. -DWITH_PLUGINSDIR=./plugins ../../kid3 EOF fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/deb/changelog new/kid3-3.5.1/deb/changelog --- old/kid3-3.5.0/deb/changelog 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/deb/changelog 2017-10-30 18:12:24.000000000 +0100 @@ -1,50 +1,78 @@ -kid3 (3.5.0-0) unstable; urgency=low +kid3 (3.5.1-0) unstable; urgency=low * New upstream release. - -- Urs Fleisch <[email protected]> Fri, 16 Jun 2017 15:41:09 +0200 + -- Urs Fleisch <[email protected]> Wed, 01 Nov 2017 12:36:45 +0100 -kid3 (3.4.5-0) unstable; urgency=low +kid3 (3.5.0-2) unstable; urgency=medium + + * Correct URL in Vcs-Svn control field. + * Bump debian/compat to level 10. + * Install appstream metadata to /usr/share/metainfo/. + * Overwrite lintian information vcs-field-uses-insecure-uri. + + -- Patrick Matthäi <[email protected]> Wed, 02 Aug 2017 10:01:05 +0200 + +kid3 (3.5.0-1) unstable; urgency=medium + + * New upstream release. + * Uploading to unstable. + * Bump Standards-Version to 4.0.0 (no changes required). + + -- Patrick Matthäi <[email protected]> Fri, 30 Jun 2017 10:55:36 +0200 + +kid3 (3.4.5-1) experimental; urgency=low * New upstream release. - -- Urs Fleisch <[email protected]> Sat, 18 Feb 2017 19:21:55 +0100 + -- Patrick Matthäi <[email protected]> Fri, 31 Mar 2017 10:13:38 +0200 -kid3 (3.4.4-0) unstable; urgency=low +kid3 (3.4.4-1) unstable; urgency=medium * New upstream release. + - Drop merged patch 01-spelling-error. - -- Urs Fleisch <[email protected]> Fri, 23 Dec 2016 08:33:40 +0100 + -- Patrick Matthäi <[email protected]> Fri, 23 Dec 2016 09:00:02 +0100 -kid3 (3.4.3-0) unstable; urgency=low +kid3 (3.4.3-1) unstable; urgency=medium * New upstream release. + * Fix debian/watch. + * Add patch 01-spelling-error to fix a spelling error. + * Some fixes in debian/copyright. - -- Urs Fleisch <[email protected]> Tue, 1 Nov 2016 20:16:59 +0200 + -- Patrick Matthäi <[email protected]> Wed, 09 Nov 2016 10:31:58 +0100 -kid3 (3.4.2-0) unstable; urgency=low +kid3 (3.4.2-1) unstable; urgency=medium * New upstream release. - -- Urs Fleisch <[email protected]> Wed, 24 Aug 2016 14:44:04 +0200 + -- Patrick Matthäi <[email protected]> Wed, 31 Aug 2016 10:40:42 +0200 -kid3 (3.4.1-0) unstable; urgency=low +kid3 (3.4.1-1) unstable; urgency=medium * New upstream release. + - Remove merged patch 01-spelling-error. - -- Urs Fleisch <[email protected]> Fri, 24 Jun 2016 20:20:20 +0200 + -- Patrick Matthäi <[email protected]> Thu, 07 Jul 2016 10:05:39 +0200 -kid3 (3.4.0-0) unstable; urgency=low +kid3 (3.4.0-1) unstable; urgency=medium * New upstream release. + * Use secure Vcs-Browser URL. + * Bump Standards-Version to 3.9.8 (no changes required). + * Add patch 01-spelling-error to fix a spelling error. + * Remove unused file paragraph from debian/copyright. - -- Urs Fleisch <[email protected]> Sat, 23 Apr 2016 16:30:36 +0200 + -- Patrick Matthäi <[email protected]> Tue, 03 May 2016 12:43:58 +0200 -kid3 (3.3.2-0) unstable; urgency=low +kid3 (3.3.2-1) unstable; urgency=medium * New upstream release. + * Enable full hardening. + * Bump Standards-Version to 3.9.7 (no changes required). - -- Urs Fleisch <[email protected]> Thu, 10 Mar 2016 17:55:29 +0100 + -- Patrick Matthäi <[email protected]> Thu, 17 Mar 2016 19:37:13 +0100 kid3 (3.3.1-2) unstable; urgency=medium @@ -77,12 +105,6 @@ -- Patrick Matthäi <[email protected]> Tue, 12 May 2015 18:56:41 +0200 -kid3 (3.2.0-0) unstable; urgency=low - - * New upstream release. - - -- Urs Fleisch <[email protected]> Fri, 13 Mar 2015 06:36:03 +0100 - kid3 (3.1.2-2) experimental; urgency=low * Add missing kid3-core manpages. Thanks to Achim Bohnet. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/deb/control new/kid3-3.5.1/deb/control --- old/kid3-3.5.0/deb/control 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/deb/control 2017-10-30 18:12:24.000000000 +0100 @@ -32,10 +32,10 @@ pkg-config, libreadline-dev, xsltproc -Standards-Version: 3.9.6 +Standards-Version: 4.0.0 Homepage: http://kid3.sourceforge.net/ Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/kid3/trunk/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/kid3/ +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-kde/kde-extras/kid3/ Package: kid3-core Architecture: any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/deb/copyright new/kid3-3.5.1/deb/copyright --- old/kid3-3.5.0/deb/copyright 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/deb/copyright 2017-10-30 18:12:24.000000000 +0100 @@ -9,14 +9,6 @@ 2004, the VideoLAN team, under the same license License: GPL-2+ -Files: src/plugins/kid3qml/qmlpp.py -Copyright: no-info-found -License: LGPL-2.1 - -Files: src/plugins/taglibmetadata/taglibext/* -Copyright: : 2014,Urs Fleisch -License: MPL-1.1 or LGPL or (v2.1) - Files: src/plugins/taglibmetadata/taglibext/aac/* Copyright: : 2006,Martin Aumueller License: LGPL-2.1 @@ -34,10 +26,6 @@ Copyright: : 2004,Scott Wheeler / : 2006,Aaron VonderHaar License: LGPL-2.1 -Files: src/plugins/taglibmetadata/taglibext/generalencapsulatedobjectframe.h -Copyright: : 2004,Scott Wheeler / : 2006,Aaron VonderHaar -License: MPL-1.1 or LGPL or (v2.1) - Files: src/plugins/taglibmetadata/taglibext/mp2/* Copyright: no-info-found License: LGPL-2.1 @@ -108,21 +96,6 @@ Copyright: 2006-2012, Urs Fleisch License: GPL-2+ -License: (v2.1) - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License version - 2.1 as published by the Free Software Foundation. - . - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, - USA - License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -132,21 +105,6 @@ On Debian systems, the complete text of version 2 of the GNU General Public License can be found in '/usr/share/common-licenses/GPL-2'. -License: LGPL - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License version - 2.1 as published by the Free Software Foundation. - . - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, - USA - License: LGPL-2.1 This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -154,22 +112,3 @@ . On Debian systems, the complete text of version 2.1 of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. - -License: MPL-1.1 - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License version - 2.1 as published by the Free Software Foundation. - . - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA - . - Alternatively, this file is available under the Mozilla Public - License Version 1.1. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/deb/kid3-qt.install new/kid3-3.5.1/deb/kid3-qt.install --- old/kid3-3.5.0/deb/kid3-qt.install 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/deb/kid3-qt.install 2017-10-30 18:12:24.000000000 +0100 @@ -1,5 +1,5 @@ /usr/bin/kid3-qt /usr/share/applications/kid3-qt.desktop -/usr/share/appdata/kid3-qt.appdata.xml +/usr/share/metainfo/kid3-qt.appdata.xml /usr/share/doc/kid3-qt/* /usr/share/icons/hicolor/*/apps/kid3-qt.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/deb/kid3.install new/kid3-3.5.1/deb/kid3.install --- old/kid3-3.5.0/deb/kid3.install 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/deb/kid3.install 2017-10-30 18:12:24.000000000 +0100 @@ -1,5 +1,5 @@ /usr/bin/kid3 -/usr/share/appdata/kid3.appdata.xml +/usr/share/metainfo/kid3.appdata.xml /usr/share/icons/hicolor/*/apps/kid3.* # KDE 5 BEGIN /usr/share/applications/kid3.desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/deb/rules new/kid3-3.5.1/deb/rules --- old/kid3-3.5.0/deb/rules 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/deb/rules 2017-10-30 18:12:24.000000000 +0100 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + # To build with KDE 5: # In dh_auto_configure, add -DWITH_QT5=ON and remove # CONFIG_INSTALL_DIR, DATA_INSTALL_DIR, HTML_INSTALL_DIR, KCFG_INSTALL_DIR. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/deb/source.lintian-overrides new/kid3-3.5.1/deb/source.lintian-overrides --- old/kid3-3.5.0/deb/source.lintian-overrides 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/deb/source.lintian-overrides 2017-10-30 18:12:24.000000000 +0100 @@ -1 +1 @@ -kid3 source: debian-watch-may-check-gpg-signature +kid3 source: vcs-field-uses-insecure-uri vcs-svn svn://anonscm.debian.org/pkg-kde/kde-extras/kid3/trunk/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/deb/watch new/kid3-3.5.1/deb/watch --- old/kid3-3.5.0/deb/watch 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/deb/watch 2017-10-30 18:12:24.000000000 +0100 @@ -1,3 +1,3 @@ version=3 opts=pgpsigurlmangle=s/$/.asc/ \ -http://sf.net/kid3/kid3-(.*)\.tar\.gz debian svn-upgrade +http://sf.net/kid3/kid3-([\d.]*)\.tar\.gz debian svn-upgrade diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/doc/de/index.docbook new/kid3-3.5.1/doc/de/index.docbook --- old/kid3-3.5.0/doc/de/index.docbook 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/doc/de/index.docbook 2017-10-30 18:12:24.000000000 +0100 @@ -27,8 +27,8 @@ </copyright> <legalnotice id="fdl-notice">&FDLNotice;</legalnotice> -<date>2017-06-16</date> -<releaseinfo>3.5.0</releaseinfo> +<date>2017-11-01</date> +<releaseinfo>3.5.1</releaseinfo> <abstract> <para> @@ -1689,7 +1689,7 @@ <guimenu>Extras</guimenu> <guimenuitem>Dateinamenformat anwenden</guimenuitem> </menuchoice></term> -<listitem><para>Wenn <guilabel>Während des Editierens formatieren</guilabel> +<listitem><para>Wenn <guilabel>Format automatisch anwenden</guilabel> im Konfigurationsdialog beim Dateinamenformat deaktiviert ist, kann man mit diesem Menüpunkt <action>die Formatierung auf die Namen der ausgewählten Dateien anwenden</action>. Diese Funktion kann auch angewendet werden, um zu testen, ob die Dateinamen @@ -1707,7 +1707,7 @@ <guimenu>Extras</guimenu> <guimenuitem>Tag-Format anwenden</guimenuitem> </menuchoice></term> -<listitem><para>Wenn <guilabel>Während des Editierens formatieren</guilabel> +<listitem><para>Wenn <guilabel>Format automatisch anwenden</guilabel> im Konfigurationsdialog beim Tag Format deaktiviert ist, kann man mit diesem Menüpunkt <action>die Formatierung auf die Tags der ausgewählten Dateien anwenden</action>. Diese Funktion kann auch angewendet werden, um zu testen, ob die Tags dem @@ -2265,7 +2265,7 @@ <para> <guilabel>Tag Format</guilabel> enthält Einstellungen für das Format der Tags. -Wenn <guilabel>Während dem Editieren formatieren</guilabel> aktiviert ist, +Wenn <guilabel>Format automatisch anwenden</guilabel> aktiviert ist, wird die Eingabe während dem Editieren automatisch formatiert. <guilabel>Groß/Kleinschreibung</guilabel> kann auf <guilabel>Keine Änderungen</guilabel>, <guilabel>Alles Kleinbuchstaben</guilabel>, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/doc/en/index.docbook new/kid3-3.5.1/doc/en/index.docbook --- old/kid3-3.5.0/doc/en/index.docbook 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/doc/en/index.docbook 2017-10-30 18:12:24.000000000 +0100 @@ -27,8 +27,8 @@ </copyright> <legalnotice id="fdl-notice">&FDLNotice;</legalnotice> -<date>2017-06-16</date> -<releaseinfo>3.5.0</releaseinfo> +<date>2017-11-01</date> +<releaseinfo>3.5.1</releaseinfo> <abstract> <para> @@ -1591,7 +1591,7 @@ <guimenu>Tools</guimenu> <guimenuitem>Apply Filename Format</guimenuitem> </menuchoice></term> -<listitem><para>When <guilabel>Format while editing</guilabel> is switched off +<listitem><para>When <guilabel>Automatically apply format</guilabel> is switched off for the filename format in the configuration dialog, this menu item can be used to <action>apply the configured format to the names of the selected files</action>. This can also be used to check whether the file names conform with the configured format @@ -1605,7 +1605,7 @@ <guimenu>Tools</guimenu> <guimenuitem>Apply Tag Format</guimenuitem> </menuchoice></term> -<listitem><para>When <guilabel>Format while editing</guilabel> is switched off +<listitem><para>When <guilabel>Automatically apply format</guilabel> is switched off for the tag format in the configuration dialog, this menu item can be used to <action>apply the configured format to the tags of the selected files</action>. This can also be used to check whether the tags conform with the configured format @@ -2128,7 +2128,7 @@ </para> <para> <guilabel>Tag Format</guilabel> contains options for the format of the tags. -When <guilabel>Format while editing</guilabel> is checked, the format +When <guilabel>Automatically apply format</guilabel> is checked, the format configuration is automatically used while editing text in the line edits. The <guilabel>Case conversion</guilabel> can be set to <guilabel>No changes</guilabel>, <guilabel>All lowercase</guilabel>, <guilabel>All diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/kid3.lsm new/kid3-3.5.1/kid3.lsm --- old/kid3-3.5.0/kid3.lsm 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/kid3.lsm 2017-10-30 18:12:24.000000000 +0100 @@ -1,7 +1,7 @@ Begin4 Title: Kid3 -- Efficient Audio Tagger -Version: 3.5.0 -Entered-date: 2017-06-16 +Version: 3.5.1 +Entered-date: 2017-11-01 Description: Audio tagger to edit ID3v1.1, ID3v2.3, ID3v2.4, Ogg/Vorbis, Opus, DSF FLAC, MPC, APE, MP4/AAC, MP2, Speex, TrueAudio, WavPack, WMA, WAV and AIFF tags, multiple files, generate tags from file names @@ -12,7 +12,7 @@ Home-page: http://kid3.sourceforge.net Alternate-site: http://www.kde-apps.org/content/show.php?content=10415 Primary-site: http://www.sourceforge.net/projects/kid3 - http://prdownloads.sourceforge.net/kid3/kid3-3.5.0.tar.gz?download + http://prdownloads.sourceforge.net/kid3/kid3-3.5.1.tar.gz?download Platform: Linux, Windows. Copying-policy: GPL End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/kid3.spec new/kid3-3.5.1/kid3.spec --- old/kid3-3.5.0/kid3.spec 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/kid3.spec 2017-10-30 18:12:24.000000000 +0100 @@ -6,7 +6,7 @@ License: GPL Group: Applications/Multimedia Summary: Efficient ID3 tag editor -Version: 3.5.0 +Version: 3.5.1 Release: 1%{?dist} URL: http://kid3.sourceforge.net/ Source0: http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz @@ -76,7 +76,7 @@ %doc AUTHORS ChangeLog COPYING LICENSE README %{_bindir}/kid3 %{_datadir}/applications/kde4/*kid3.desktop -%{_datadir}/appdata/kid3.appdata.xml +%{_datadir}/metainfo/kid3.appdata.xml %{_datadir}/icons/hicolor/*x*/apps/kid3.png %{_datadir}/icons/hicolor/scalable/apps/kid3.svgz %{_datadir}/kde4/apps/kid3/ @@ -117,7 +117,7 @@ %doc AUTHORS ChangeLog COPYING LICENSE README %{_bindir}/kid3-qt %{_datadir}/applications/*kid3-qt.desktop -%{_datadir}/appdata/kid3-qt.appdata.xml +%{_datadir}/metainfo/kid3-qt.appdata.xml %{_datadir}/icons/hicolor/*x*/apps/kid3-qt.png %{_datadir}/icons/hicolor/scalable/apps/kid3-qt.svg %{_datadir}/doc/kid3-qt/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/cs.po new/kid3-3.5.1/po/cs.po --- old/kid3-3.5.0/po/cs.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/cs.po 2017-10-30 18:12:24.000000000 +0100 @@ -6,7 +6,7 @@ # Pavel Fric <[email protected]>, 2010, 2011, 2012, 2013, 2014, 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2016-12-23 12:48+0100\n" @@ -2237,8 +2237,8 @@ msgid "&Clear row" msgstr "Vy&prázdnit řádek" -msgid "Format while editing" -msgstr "Formátovat během úprav" +msgid "Automatically apply format" +msgstr "Použít formát automaticky" msgid "Validation" msgstr "Schválení" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/da.po new/kid3-3.5.1/po/da.po --- old/kid3-3.5.0/po/da.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/da.po 2017-10-30 18:12:24.000000000 +0100 @@ -2227,8 +2227,8 @@ msgid "&Clear row" msgstr "R&ens række" -msgid "Format while editing" -msgstr "Formatér imens der redigeres" +msgid "Automatically apply format" +msgstr "Anvend format automatisk" msgid "Validation" msgstr "Validering" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/de.po new/kid3-3.5.1/po/de.po --- old/kid3-3.5.0/po/de.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/de.po 2017-10-30 18:12:24.000000000 +0100 @@ -7,7 +7,7 @@ # Frank Steinmetzger <[email protected]>, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-04-26 23:41+0200\n" @@ -2238,8 +2238,8 @@ msgid "&Clear row" msgstr "Zeile lös&chen" -msgid "Format while editing" -msgstr "Während des Editierens formatieren" +msgid "Automatically apply format" +msgstr "Format automatisch anwenden" msgid "Validation" msgstr "Überprüfung" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/es.po new/kid3-3.5.1/po/es.po --- old/kid3-3.5.0/po/es.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/es.po 2017-10-30 18:12:24.000000000 +0100 @@ -7,7 +7,7 @@ # Urs Fleisch <[email protected]>, 2005, 2006, 2007, 2008, 2009, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-01-15 17:29+0100\n" @@ -2237,8 +2237,8 @@ msgid "&Clear row" msgstr "&Limpiar fila" -msgid "Format while editing" -msgstr "Formatear mientras se edita" +msgid "Automatically apply format" +msgstr "Aplicar formato automáticamente" msgid "Validation" msgstr "Validación" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/et.po new/kid3-3.5.1/po/et.po --- old/kid3-3.5.0/po/et.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/et.po 2017-10-30 18:12:24.000000000 +0100 @@ -5,7 +5,7 @@ # Urs Fleisch <[email protected]>, 2010. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2014-01-23 22:00+0200\n" @@ -2235,8 +2235,8 @@ msgid "&Clear row" msgstr "&Puhasta rida" -msgid "Format while editing" -msgstr "Automaatasendus" +msgid "Automatically apply format" +msgstr "Rakenda vorming automaatselt" msgid "Validation" msgstr "Kontrollimine" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/extract-merge.sh new/kid3-3.5.1/po/extract-merge.sh --- old/kid3-3.5.0/po/extract-merge.sh 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/extract-merge.sh 2017-10-30 18:12:24.000000000 +0100 @@ -2,7 +2,7 @@ BASEDIR="../src" # root of translatable sources PROJECT="kid3" # project name -PROJECTVERSION="3.5.0" # project version +PROJECTVERSION="3.5.1" # project version BUGADDR="http://sourceforge.net/p/kid3/bugs/"; # MSGID-Bugs WDIR=`pwd` # working dir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/fi.po new/kid3-3.5.1/po/fi.po --- old/kid3-3.5.0/po/fi.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/fi.po 2017-10-30 18:12:24.000000000 +0100 @@ -6,7 +6,7 @@ # Ville Skyttä <[email protected]>, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2014-01-25 00:31+0200\n" @@ -2237,8 +2237,8 @@ msgid "&Clear row" msgstr "&Tyhjennä rivi" -msgid "Format while editing" -msgstr "Muotoile muokattaessa" +msgid "Automatically apply format" +msgstr "Ota muutokset käyttöön automaattisesti" msgid "Validation" msgstr "Tarkistus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/fr.po new/kid3-3.5.1/po/fr.po --- old/kid3-3.5.0/po/fr.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/fr.po 2017-10-30 18:12:24.000000000 +0100 @@ -7,7 +7,7 @@ # Urs Fleisch <[email protected]>, 2006, 2007, 2008, 2009, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-01-15 17:32+0100\n" @@ -2237,8 +2237,8 @@ msgid "&Clear row" msgstr "&Effacer ligne" -msgid "Format while editing" -msgstr "Formater pendant l'édition" +msgid "Automatically apply format" +msgstr "Appliquer le format automatiquement" msgid "Validation" msgstr "Validation" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/it.po new/kid3-3.5.1/po/it.po --- old/kid3-3.5.0/po/it.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/it.po 2017-10-30 18:12:24.000000000 +0100 @@ -5,7 +5,7 @@ # Urs Fleisch <[email protected]>, 2008, 2009, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-01-15 17:33+0100\n" @@ -2236,8 +2236,8 @@ msgid "&Clear row" msgstr "&Azzera riga" -msgid "Format while editing" -msgstr "Formattazione durante la modifica" +msgid "Automatically apply format" +msgstr "Applica formato automaticamente" msgid "Validation" msgstr "Convalida" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/kid3.pot new/kid3-3.5.1/po/kid3.pot --- old/kid3-3.5.0/po/kid3.pot 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/kid3.pot 2017-10-30 18:12:24.000000000 +0100 @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -2229,7 +2229,7 @@ msgid "&Clear row" msgstr "" -msgid "Format while editing" +msgid "Automatically apply format" msgstr "" msgid "Validation" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/nl.po new/kid3-3.5.1/po/nl.po --- old/kid3-3.5.0/po/nl.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/nl.po 2017-10-30 18:12:24.000000000 +0100 @@ -6,7 +6,7 @@ # Kenny Verstraete <[email protected]>, 2008, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2017-01-25 21:40+0100\n" @@ -2239,8 +2239,8 @@ msgid "&Clear row" msgstr "Rij &Wissen" -msgid "Format while editing" -msgstr "Opmaak gebruiken tijdens het opslaan van bestanden" +msgid "Automatically apply format" +msgstr "Structuur automatisch toepassen" msgid "Validation" msgstr "Validatie" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/pl.po new/kid3-3.5.1/po/pl.po --- old/kid3-3.5.0/po/pl.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/pl.po 2017-10-30 18:12:24.000000000 +0100 @@ -7,7 +7,7 @@ # Urs Fleisch <[email protected]>, 2008, 2009, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-01-15 17:37+0100\n" @@ -2239,8 +2239,8 @@ msgid "&Clear row" msgstr "W&yczyść wiersz" -msgid "Format while editing" -msgstr "Formatuj podczas edycji" +msgid "Automatically apply format" +msgstr "Automatyczna zastosuj formatowanie" msgid "Validation" msgstr "Sprawdzanie" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/ru.po new/kid3-3.5.1/po/ru.po --- old/kid3-3.5.0/po/ru.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/ru.po 2017-10-30 18:12:24.000000000 +0100 @@ -7,7 +7,7 @@ # "Egor S. Orlov" <[email protected]>, 2003, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-01-15 17:41+0100\n" @@ -2238,8 +2238,8 @@ msgid "&Clear row" msgstr "&Очистить строку" -msgid "Format while editing" -msgstr "Форматировать при редактировании" +msgid "Automatically apply format" +msgstr "Автоматически применить Формат" msgid "Validation" msgstr "Проверка" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/sr.po new/kid3-3.5.1/po/sr.po --- old/kid3-3.5.0/po/sr.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/sr.po 2017-10-30 18:12:24.000000000 +0100 @@ -5,7 +5,7 @@ # Mladen Pejaković <[email protected]>, 2012. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-04-26 23:41+0200\n" @@ -2238,8 +2238,8 @@ msgid "&Clear row" msgstr "О&чисти ред" -msgid "Format while editing" -msgstr "Форматирај при уређивању" +msgid "Automatically apply format" +msgstr "Примени формат аутоматски" msgid "Validation" msgstr "Овера" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/[email protected] new/kid3-3.5.1/po/[email protected] --- old/kid3-3.5.0/po/[email protected] 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/[email protected] 2017-10-30 18:12:24.000000000 +0100 @@ -5,7 +5,7 @@ # Mladen Pejaković <[email protected]>, 2012. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-04-26 23:41+0200\n" @@ -2235,8 +2235,8 @@ msgid "&Clear row" msgstr "О&чисти ред" -msgid "Format while editing" -msgstr "Форматирај при уређивању" +msgid "Automatically apply format" +msgstr "Примијени формат аутоматски" msgid "Validation" msgstr "Овјера" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/[email protected] new/kid3-3.5.1/po/[email protected] --- old/kid3-3.5.0/po/[email protected] 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/[email protected] 2017-10-30 18:12:24.000000000 +0100 @@ -5,7 +5,7 @@ # Mladen Pejaković <[email protected]>, 2012. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-04-26 23:41+0200\n" @@ -2235,8 +2235,8 @@ msgid "&Clear row" msgstr "O&čisti red" -msgid "Format while editing" -msgstr "Formatiraj pri uređivanju" +msgid "Automatically apply format" +msgstr "Primijeni format automatski" msgid "Validation" msgstr "Ovjera" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/[email protected] new/kid3-3.5.1/po/[email protected] --- old/kid3-3.5.0/po/[email protected] 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/[email protected] 2017-10-30 18:12:24.000000000 +0100 @@ -5,7 +5,7 @@ # Mladen Pejaković <[email protected]>, 2012. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-04-26 23:41+0200\n" @@ -2235,8 +2235,8 @@ msgid "&Clear row" msgstr "O&čisti red" -msgid "Format while editing" -msgstr "Formatiraj pri uređivanju" +msgid "Automatically apply format" +msgstr "Primeni format automatski" msgid "Validation" msgstr "Overa" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/tr.po new/kid3-3.5.1/po/tr.po --- old/kid3-3.5.0/po/tr.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/tr.po 2017-10-30 18:12:24.000000000 +0100 @@ -5,7 +5,7 @@ # Urs Fleisch <[email protected]>, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-01-15 17:42+0100\n" @@ -2236,8 +2236,8 @@ msgid "&Clear row" msgstr "Satırı &Temizle" -msgid "Format while editing" -msgstr "Düzenleme şekli" +msgid "Automatically apply format" +msgstr "Otomatik biçimini uygula" msgid "Validation" msgstr "Doğrulama" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/zh_CN.po new/kid3-3.5.1/po/zh_CN.po --- old/kid3-3.5.0/po/zh_CN.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/zh_CN.po 2017-10-30 18:12:24.000000000 +0100 @@ -2234,8 +2234,8 @@ msgid "&Clear row" msgstr "清除列(&C)" -msgid "Format while editing" -msgstr "编辑时格式化" +msgid "Automatically apply format" +msgstr "应用格式自动" msgid "Validation" msgstr "验证" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/po/zh_TW.po new/kid3-3.5.1/po/zh_TW.po --- old/kid3-3.5.0/po/zh_TW.po 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/po/zh_TW.po 2017-10-30 18:12:24.000000000 +0100 @@ -5,7 +5,7 @@ # Urs Fleisch <[email protected]>, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: Kid3 3.5.0\n" +"Project-Id-Version: Kid3 3.5.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"; "POT-Creation-Date: 2017-06-07 21:41+0200\n" "PO-Revision-Date: 2011-01-15 17:43+0100\n" @@ -2239,8 +2239,8 @@ msgid "&Clear row" msgstr "清除列(&C)" -msgid "Format while editing" -msgstr "檔名格式的編輯" +msgid "Automatically apply format" +msgstr "自动格式化" msgid "Validation" msgstr "驗證" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/app/kde/CMakeLists.txt new/kid3-3.5.1/src/app/kde/CMakeLists.txt --- old/kid3-3.5.0/src/app/kde/CMakeLists.txt 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/app/kde/CMakeLists.txt 2017-10-30 18:12:24.000000000 +0100 @@ -17,7 +17,7 @@ install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR}) install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) - install(FILES ../kid3.appdata.xml DESTINATION "${WITH_DATAROOTDIR}/appdata") + install(FILES ../kid3.appdata.xml DESTINATION "${WITH_DATAROOTDIR}/metainfo") install(FILES kid3ui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kid3) else (HAVE_QT5) add_definitions(${KDE4_DEFINITIONS} -DKDE_NO_COMPAT ${KDE4_ENABLE_EXCEPTIONS}) @@ -29,6 +29,6 @@ install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR}) install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) - install(FILES ../kid3.appdata.xml DESTINATION "${WITH_DATAROOTDIR}/appdata") + install(FILES ../kid3.appdata.xml DESTINATION "${WITH_DATAROOTDIR}/metainfo") install(FILES kid3ui.rc DESTINATION ${DATA_INSTALL_DIR}/kid3) endif (HAVE_QT5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/app/kde/mainkde.cpp new/kid3-3.5.1/src/app/kde/mainkde.cpp --- old/kid3-3.5.0/src/app/kde/mainkde.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/app/kde/mainkde.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -85,6 +85,13 @@ */ int main(int argc, char* argv[]) { +#if QT_VERSION >= 0x050100 + // Enable support for high resolution "@2x" images + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif +#if QT_VERSION >= 0x050600 + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif Kid3KdeApplication app(argc, argv); KAboutData aboutData(QStringLiteral("kid3"), QStringLiteral("Kid3"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/app/kid3.appdata.xml new/kid3-3.5.1/src/app/kid3.appdata.xml --- old/kid3-3.5.0/src/app/kid3.appdata.xml 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/app/kid3.appdata.xml 2017-10-30 18:12:24.000000000 +0100 @@ -40,4 +40,5 @@ <url type="help">http://sourceforge.net/p/kid3/discussion/</url> <developer_name>Urs Fleisch</developer_name> <update_contact>ufleisch_at_users.sourceforge.net</update_contact> + <translation type="gettext">kid3</translation> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/app/qt/CMakeLists.txt new/kid3-3.5.1/src/app/qt/CMakeLists.txt --- old/kid3-3.5.0/src/app/qt/CMakeLists.txt 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/app/qt/CMakeLists.txt 2017-10-30 18:12:24.000000000 +0100 @@ -67,7 +67,7 @@ ) add_custom_target("appdata-file" ALL DEPENDS kid3-qt.appdata.xml) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kid3-qt.appdata.xml - DESTINATION "${WITH_DATAROOTDIR}/appdata") + DESTINATION "${WITH_DATAROOTDIR}/metainfo") if (GZIP_PROGRAM) add_custom_command(OUTPUT kid3-qt.svg COMMAND ${GZIP_PROGRAM} -cdn ${CMAKE_CURRENT_SOURCE_DIR}/../hisc-apps-kid3.svgz >kid3-qt.svg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/app/qt/kid3qtapplication.cpp new/kid3-3.5.1/src/app/qt/kid3qtapplication.cpp --- old/kid3-3.5.0/src/app/qt/kid3qtapplication.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/app/qt/kid3qtapplication.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -38,10 +38,6 @@ */ Kid3QtApplication::Kid3QtApplication(int& argc, char** argv) : QApplication(argc, argv) { -#if QT_VERSION >= 0x050100 - // Enable support for high resolution "@2x" images - setAttribute(Qt::AA_UseHighDpiPixmaps); -#endif } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/app/qt/mainqt.cpp new/kid3-3.5.1/src/app/qt/mainqt.cpp --- old/kid3-3.5.0/src/app/qt/mainqt.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/app/qt/mainqt.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -50,6 +50,13 @@ { Q_INIT_RESOURCE(kid3); +#if QT_VERSION >= 0x050100 + // Enable support for high resolution "@2x" images + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif +#if QT_VERSION >= 0x050600 + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif Kid3QtApplication app(argc, argv); app.setApplicationName(QLatin1String("Kid3")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/core/config/importconfig.cpp new/kid3-3.5.1/src/core/config/importconfig.cpp --- old/kid3-3.5.0/src/core/config/importconfig.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/core/config/importconfig.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -209,18 +209,10 @@ m_pictureSourceUrls.append(QLatin1String("http://www.cduniverse.com/sresult.asp?HT_Search_Info=%u{artist}+%u{album}";)); m_pictureSourceNames.append(QLatin1String("Coveralia")); m_pictureSourceUrls.append(QLatin1String("http://www.coveralia.com/mostrar.php?bus=%u{artist}%20%u{album}&bust=2";)); - m_pictureSourceNames.append(QLatin1String("FreeCovers")); - m_pictureSourceUrls.append(QLatin1String("http://www.freecovers.net/search.php?search=%u{artist}+%u{album}&cat=4";)); - m_pictureSourceNames.append(QLatin1String("CoverHunt")); - m_pictureSourceUrls.append(QLatin1String("http://www.coverhunt.com/search/%u{artist}+%u{album}";)); m_pictureSourceNames.append(QLatin1String("SlothRadio")); m_pictureSourceUrls.append(QLatin1String("http://www.slothradio.com/covers/?artist=%u{artist}&album=%u{album}";)); m_pictureSourceNames.append(QLatin1String("Albumart")); m_pictureSourceUrls.append(QLatin1String("http://www.albumart.org/index.php?srchkey=%u{artist}+%u{album}&searchindex=Music";)); - m_pictureSourceNames.append(QLatin1String("Yalp!")); - m_pictureSourceUrls.append(QLatin1String("http://search.yalp.alice.it/search/search.html?txtToSearch=%u{artist}%20%u{album}";)); - m_pictureSourceNames.append(QLatin1String("HMV")); - m_pictureSourceUrls.append(QLatin1String("http://hmv.com/hmvweb/advancedSearch.do?searchType=2&artist=%u{artist}&title=%u{album}";)); m_pictureSourceNames.append(QLatin1String("Custom Source")); m_pictureSourceUrls.append(QLatin1String("")); @@ -232,8 +224,6 @@ QLatin1String("http://images.amazon.com/images/P/\\1.01._SCLZZZZZZZ_.jpg";); m_matchPictureUrlMap[QLatin1String("http://musicbrainz.org/misc/redirects/.*&asin=([A-Z0-9]+).*")] = QLatin1String("http://images.amazon.com/images/P/\\1.01._SCLZZZZZZZ_.jpg";); - m_matchPictureUrlMap[QLatin1String("http://www.freecovers.net/view/(\\d+)/([0-9a-f]+)/.*")] = - QLatin1String("http://www.freecovers.net/preview/\\1/\\2/big.jpg";); m_matchPictureUrlMap[QLatin1String("(http://.*4shared.com/img/.*)")] = QLatin1String("\\1.jpg"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/core/config/useractionsconfig.cpp new/kid3-3.5.1/src/core/config/useractionsconfig.cpp --- old/kid3-3.5.0/src/core/config/useractionsconfig.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/core/config/useractionsconfig.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -143,26 +143,18 @@ #endif if (!upgradeOnly) { m_contextMenuCommands.push_back( - UserActionsConfig::MenuCommand(QLatin1String("Lyrics.com"), QLatin1String("%{browser} http://www.lyrics.com/search.php?what=all&keyword=%u{artist}+%u{title}";))); + UserActionsConfig::MenuCommand(QLatin1String("Lyrics.com"), QLatin1String("%{browser} http://www.lyrics.com/lyrics/%u{artist}+%u{title}";))); m_contextMenuCommands.push_back( UserActionsConfig::MenuCommand(QLatin1String("AZLyrics"), QLatin1String("%{browser} http://search.azlyrics.com/search.php?q=%u{artist}+%u{title}";))); m_contextMenuCommands.push_back( UserActionsConfig::MenuCommand(QLatin1String("Dark Lyrics"), QLatin1String("%{browser} http://www.darklyrics.com/search?q=%u{album}";))); m_contextMenuCommands.push_back( - UserActionsConfig::MenuCommand(QLatin1String("Metro Lyrics"), QLatin1String("%{browser} http://www.metrolyrics.com/search.php?category=artisttitle&search=%u{artist}+%u{title}";))); - m_contextMenuCommands.push_back( UserActionsConfig::MenuCommand(QLatin1String("SongLyrics"), QLatin1String("%{browser} http://www.songlyrics.com/index.php?section=search&searchW=%u{artist}+%u{title}";))); m_contextMenuCommands.push_back( UserActionsConfig::MenuCommand(QLatin1String("LyricsMode"), QLatin1String("%{browser} http://www.lyricsmode.com/search.php?search=%u{artist}+%u{title}";))); m_contextMenuCommands.push_back( - UserActionsConfig::MenuCommand(QLatin1String("Lyrster"), QLatin1String("%{browser} http://www.lyrster.com/songs-lyrics/%u{artist}+%u{title}";))); - m_contextMenuCommands.push_back( UserActionsConfig::MenuCommand(QLatin1String("MP3 Lyrics"), QLatin1String("%{browser} http://mp3lyrics.com/Search/Advanced/?Track=%u{title}&Artist=%u{artist}";))); m_contextMenuCommands.push_back( - UserActionsConfig::MenuCommand(QLatin1String("LRC123"), QLatin1String("%{browser} http://www.lrc123.com/?keyword=%u{artist}+%u{title}&field=all";))); - m_contextMenuCommands.push_back( - UserActionsConfig::MenuCommand(QLatin1String("LyrDB LRC"), QLatin1String("%{browser} http://lyrdb.com/karaoke/index.htm?q=%u{artist}+%u{title}&action=search";))); - m_contextMenuCommands.push_back( UserActionsConfig::MenuCommand(QString(), QLatin1String("@endmenu"))); } #ifdef HAVE_QML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/gui/widgets/formatbox.cpp new/kid3-3.5.1/src/gui/widgets/formatbox.cpp --- old/kid3-3.5.0/src/gui/widgets/formatbox.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/gui/widgets/formatbox.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -45,7 +45,7 @@ FormatBox::FormatBox(const QString& title, QWidget* parent) : QGroupBox(title, parent) { - m_formatEditingCheckBox = new QCheckBox(tr("Format while editing"), + m_formatEditingCheckBox = new QCheckBox(tr("Automatically apply format"), this); m_validationCheckBox = new QCheckBox(tr("Validation"), this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/plugins/acoustidimport/CMakeLists.txt new/kid3-3.5.1/src/plugins/acoustidimport/CMakeLists.txt --- old/kid3-3.5.0/src/plugins/acoustidimport/CMakeLists.txt 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/plugins/acoustidimport/CMakeLists.txt 2017-10-30 18:12:24.000000000 +0100 @@ -142,13 +142,16 @@ add_library(${plugin_TARGET} ${plugin_SRCS} ${plugin_GEN_MOC_SRCS}) target_link_libraries(${plugin_TARGET} kid3-core ${BASIC_LIBRARIES} ${CHROMAPRINT_LIBS}) - if (APPLE AND CMAKE_EXE_LINKER_FLAGS MATCHES "-arch i386") + if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386") # To suppress linker error # ld: illegal text-relocation to non_lazy_ptr in ../libavformat.a # (allformats.o) from _av_register_all in ../libavformat.a(allformats.o) # for architecture i386 + # ld: illegal text-relocation to _cpy8 in /usr/local/lib/libswresample.a + # (audioconvert.o) from _swri_audio_convert_alloc in + # /usr/local/lib/libswresample.a(audioconvert.o) for architecture i386 SET_TARGET_PROPERTIES(${plugin_TARGET} PROPERTIES LINK_FLAGS -Wl,-read_only_relocs,suppress) - endif (APPLE AND CMAKE_EXE_LINKER_FLAGS MATCHES "-arch i386") + endif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386") if (LINUX_SELF_CONTAINED) # To avoid linker error diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp new/kid3-3.5.1/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp --- old/kid3-3.5.0/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -401,10 +401,12 @@ result = reinterpret_cast<int16_t*>(m_dstData[0]); } else { int bytesPerSample = ::av_get_bytes_per_sample(codecCtx.sampleFormat()); - int numSamplesIn = bufferSize / bytesPerSample; + int numSamplesIn = bytesPerSample != 0 ? bufferSize / bytesPerSample : 0; int linesizeIn; - ::av_samples_get_buffer_size(&linesizeIn, codecCtx.channels(), - numSamplesIn / codecCtx.channels(), codecCtx.sampleFormat(), 0); + int numChannels = codecCtx.channels(); + ::av_samples_get_buffer_size(&linesizeIn, numChannels, + numChannels != 0 ? numSamplesIn / numChannels : 0, + codecCtx.sampleFormat(), 0); #ifdef HAVE_AVRESAMPLE #if LIBAVRESAMPLE_VERSION_INT < AV_VERSION_INT(1, 0, 0) numSamplesOut = ::avresample_convert( @@ -472,7 +474,7 @@ int istride[6] = { ::av_get_bytes_per_sample(codecCtx.sampleFormat()) }; #endif int ostride[6] = { 2 }; - int len = bufferSize / istride[0]; + int len = istride[0] != 0 ? bufferSize / istride[0] : 0; if (::av_audio_convert(m_ptr, obuf, ostride, ibuf, istride, len) < 0) { return 0; } @@ -555,7 +557,9 @@ } if (stream->duration != static_cast<int64_t>(AV_NOPTS_VALUE)) { - duration = stream->time_base.num * stream->duration / stream->time_base.den; + duration = stream->time_base.den != 0 + ? stream->time_base.num * stream->duration / stream->time_base.den + : 0; } else if (format.duration() != static_cast<int64_t>(AV_NOPTS_VALUE)) { duration = format.duration() / AV_TIME_BASE; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/plugins/oggflacmetadata/flacfile.cpp new/kid3-3.5.1/src/plugins/oggflacmetadata/flacfile.cpp --- old/kid3-3.5.0/src/plugins/oggflacmetadata/flacfile.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/plugins/oggflacmetadata/flacfile.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -634,7 +634,8 @@ info.valid = true; info.channels = si->get_channels(); info.sampleRate = si->get_sample_rate(); - info.duration = si->get_total_samples() / info.sampleRate; + info.duration = info.sampleRate != 0 + ? si->get_total_samples() / info.sampleRate : 0; info.bitrate = si->get_bits_per_sample() * info.sampleRate; } else { info.valid = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/plugins/taglibmetadata/taglibext/dsf/dsfheader.cpp new/kid3-3.5.1/src/plugins/taglibmetadata/taglibext/dsf/dsfheader.cpp --- old/kid3-3.5.0/src/plugins/taglibmetadata/taglibext/dsf/dsfheader.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/plugins/taglibmetadata/taglibext/dsf/dsfheader.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -239,7 +239,6 @@ d->sampleRate = data.toUInt(offset, false); if (d->sampleRate != 2822400 && d->sampleRate != 5644800) { debug("DSD::Header::parse(): invalid sampling frequency"); - return; } offset += INT_SIZE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/plugins/taglibmetadata/taglibext/dsf/dsfproperties.cpp new/kid3-3.5.1/src/plugins/taglibmetadata/taglibext/dsf/dsfproperties.cpp --- old/kid3-3.5.0/src/plugins/taglibmetadata/taglibext/dsf/dsfproperties.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/plugins/taglibmetadata/taglibext/dsf/dsfproperties.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -82,7 +82,7 @@ int DSFProperties::length() const { - return d->sampleCount / d->sampleRate; + return d->sampleRate != 0 ? d->sampleCount / d->sampleRate : 0; } int DSFProperties::bitrate() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/plugins/taglibmetadata/taglibfile.cpp new/kid3-3.5.1/src/plugins/taglibmetadata/taglibfile.cpp --- old/kid3-3.5.0/src/plugins/taglibmetadata/taglibfile.cpp 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/plugins/taglibmetadata/taglibfile.cpp 2017-10-30 18:12:24.000000000 +0100 @@ -6310,6 +6310,14 @@ it != frameList.end(); ++it) { Frame frame(createFrameFromId3Frame(*it, i++)); + if (frame.getType() == Frame::FT_UnknownFrame) { + TagLib::ByteVector frameID = (*it)->frameID().mid(0, 4); + if (frameID == "TDAT" || frameID == "TIME" || frameID == "TRDA" || + frameID == "TYER") { + // These frames are converted to a TDRC frame by TagLib. + continue; + } + } frames.insert(frame); } } else if ((oggTag = dynamic_cast<TagLib::Ogg::XiphComment*>(m_tag[tagNr])) != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/qml/app/SettingsPage.qml new/kid3-3.5.1/src/qml/app/SettingsPage.qml --- old/kid3-3.5.0/src/qml/app/SettingsPage.qml 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/qml/app/SettingsPage.qml 2017-10-30 18:12:24.000000000 +0100 @@ -163,7 +163,7 @@ name: qsTr("Mark changes") }, SettingsElement { - name: qsTr("Format while editing") + name: qsTr("Automatically apply format") }, SettingsElement { name: qsTr("Case conversion") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/qml/script/ExportCsv.qml new/kid3-3.5.1/src/qml/script/ExportCsv.qml --- old/kid3-3.5.0/src/qml/script/ExportCsv.qml 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/qml/script/ExportCsv.qml 2017-10-30 18:12:24.000000000 +0100 @@ -77,8 +77,11 @@ if (typeof value === "undefined") { value = "" } else { - value = value.replace(/\n/g, "\\n").replace(/\r/g, "\\r"). - replace(/\t/g, "\\t") + if (value.indexOf("\n") !== -1) { + value = '"' + value.replace(/"/g, '""').replace(/\r\n/g, "\n") + + '"' + } + value = value.replace(/\t/g, " ") } if (columnNr > 0) { txt += "\t" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kid3-3.5.0/src/qml/script/ImportCsv.qml new/kid3-3.5.1/src/qml/script/ImportCsv.qml --- old/kid3-3.5.0/src/qml/script/ImportCsv.qml 2017-06-16 13:27:13.000000000 +0200 +++ new/kid3-3.5.1/src/qml/script/ImportCsv.qml 2017-10-30 18:12:24.000000000 +0100 @@ -33,8 +33,8 @@ for (var i = 0; i < columns.length; ++i) { var val = columns[i] if (val.length >= 2 && - val[0] === "\"" && val[val.length - 1] === "\"") { - val = val.substr(1, val.length - 2) + val[0] === '"' && val[val.length - 1] === '"') { + val = val.substr(1, val.length - 2).replace(/""/g, '"') columns[i] = val } } @@ -49,6 +49,28 @@ if (line.length > 0) { var columns = unquoteColumns(line.split("\t")) if (i > 0) { + if (columns.length < names.length && i + 1 < lines.length) { + // The line does not contain all columns, check for continuation. + var lastColumn = columns[columns.length - 1] + if (lastColumn.length > 1 && lastColumn[0] === '"' && + lastColumn[lastColumn.length - 1] !== '"') { + for (var consumed = 0, extendedLine = line; + i + 1 + consumed < lines.length && + columns.length < names.length; + ++consumed) { + extendedLine += "\n" + extendedLine += lines[i + 1 + consumed] + columns = unquoteColumns(extendedLine.split("\t")) + } + if (columns.length === names.length) { + // Continuation OK, apply changes. + lines[i] = extendedLine + lines.splice(i + 1, consumed) + } else { + columns = unquoteColumns(line.split("\t")) + } + } + } if (filePathCol >= 0 && filePathCol < columns.length) { files[columns[filePathCol]] = i - 1 }
![http://images.amazon.com/images/P/\\1.01._SCLZZZZZZZ_.jpg"](http://images.amazon.com/images/P/\\1.01._SCLZZZZZZZ_.jpg"){kind=link}
![http://www.freecovers.net/preview/\\1/\\2/big.jpg"](http://www.freecovers.net/preview/\\1/\\2/big.jpg"){kind=link}