diff options
| -rw-r--r-- | audio/kid3/Makefile | 5 | ||||
| -rw-r--r-- | audio/kid3/PLIST | 6 | ||||
| -rw-r--r-- | audio/kid3/distinfo | 12 | ||||
| -rw-r--r-- | audio/kid3/patches/patch-CMakeLists.txt | 75 |
4 files changed, 47 insertions, 51 deletions
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile index eb70805ec43..aa283dbed5b 100644 --- a/audio/kid3/Makefile +++ b/audio/kid3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.71 2016/12/12 10:15:50 wiz Exp $ +# $NetBSD: Makefile,v 1.72 2017/01/01 14:01:49 wiz Exp $ -DISTNAME= kid3-3.3.0 -PKGREVISION= 10 +DISTNAME= kid3-3.4.3 CATEGORIES= kde audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kid3/} diff --git a/audio/kid3/PLIST b/audio/kid3/PLIST index e3cf8cb5717..c18e0fb909c 100644 --- a/audio/kid3/PLIST +++ b/audio/kid3/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.9 2015/11/01 09:13:16 adam Exp $ +@comment $NetBSD: PLIST,v 1.10 2017/01/01 14:01:49 wiz Exp $ bin/kid3-cli bin/kid3-qt lib/kid3/libkid3-core.so -lib/kid3/libkid3-core.so.3.3.0 +lib/kid3/libkid3-core.so.${PKGVERSION} lib/kid3/libkid3-gui.so -lib/kid3/libkid3-gui.so.3.3.0 +lib/kid3/libkid3-gui.so.${PKGVERSION} lib/kid3/plugins/imports/Kid3/Kid3Script.qml lib/kid3/plugins/imports/Kid3/libkid3qml.so lib/kid3/plugins/imports/Kid3/qmldir diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo index 61a129f7381..74ad6f14e8c 100644 --- a/audio/kid3/distinfo +++ b/audio/kid3/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.12 2016/12/19 09:20:10 wiz Exp $ +$NetBSD: distinfo,v 1.13 2017/01/01 14:01:49 wiz Exp $ -SHA1 (kid3-3.3.0.tar.gz) = 5d9d02b2063b87023459fea0283444052978329e -RMD160 (kid3-3.3.0.tar.gz) = 2442e95724a71fcd63f6de5dba0d689c4acec8b4 -SHA512 (kid3-3.3.0.tar.gz) = 42b238c2cc7023477606419a13bb677b8bfcc044a78ec36b8fa96db40ece8a2e623c581a2274d319c760fa6e101625dd282e1c7a39a63b8a2c6f0b1265be6eca -Size (kid3-3.3.0.tar.gz) = 1258378 bytes -SHA1 (patch-CMakeLists.txt) = 81e4ee22279dd9acf0619380f3b41e8316f7c2ea +SHA1 (kid3-3.4.3.tar.gz) = 29436bfe5ce6d080d962766392171f1f8e6035c5 +RMD160 (kid3-3.4.3.tar.gz) = 6a2706cc9d970e29ec804b25f70a4394f2a1922c +SHA512 (kid3-3.4.3.tar.gz) = 4df64bd23cca7ca58d62f046c885df859c7e27fbfb6da5121df78d5123314d45ae59619cfb4bf629143414f103a240c89a5d557614b2899a6cf373fb0755acbe +Size (kid3-3.4.3.tar.gz) = 1360042 bytes +SHA1 (patch-CMakeLists.txt) = a52261fd6c043969afcf7dbc2e71a52c0dc33716 SHA1 (patch-src_plugins_acoustidimport_fingerprintcalculator.cpp) = 8ef550096f4a89c6074b94bb467832dfb2f1c98f SHA1 (patch-src_plugins_acoustidimport_fingerprintcalculator.h) = 9b9815db812d38eac65cc6c153c58ca86acd8dec diff --git a/audio/kid3/patches/patch-CMakeLists.txt b/audio/kid3/patches/patch-CMakeLists.txt index 0120efea112..88bd93e8282 100644 --- a/audio/kid3/patches/patch-CMakeLists.txt +++ b/audio/kid3/patches/patch-CMakeLists.txt @@ -1,28 +1,31 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2015/11/01 09:14:26 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2017/01/01 14:01:49 wiz Exp $ On Darwin, avoid app bundle creation. ---- CMakeLists.txt.orig 2015-09-30 06:40:08.000000000 +0000 +--- CMakeLists.txt.orig 2016-10-26 18:44:43.000000000 +0000 +++ CMakeLists.txt -@@ -49,13 +49,13 @@ set(WITH_QAUDIODECODER OFF CACHE BOOL "f - set(WITH_PHONON ON CACHE BOOL "build with Phonon") - set(WITH_GCC_PCH OFF CACHE BOOL "enable precompiled headers") - set(WITH_NO_MANCOMPRESS OFF CACHE BOOL "disable compressed manpages") +@@ -58,16 +58,16 @@ else (ANDROID) + set(WITH_CHROMAPRINT ON CACHE BOOL "build with Chromaprint") + set(WITH_PHONON ON CACHE BOOL "build with Phonon") + endif (ANDROID) -if (APPLE OR WIN32) -+if (ELPPA OR WIN32) ++if (EPPLA OR WIN32) set(WITH_DBUS OFF CACHE BOOL "build with QtDBus") set(WITH_APPS "Qt;CLI" CACHE STRING "build applications (Qt;CLI;Test)") + elseif (ANDROID) + set(WITH_DBUS OFF CACHE BOOL "build with QtDBus") + set(WITH_APPS "Qml" CACHE STRING "build applications (Qml;Qt;CLI;Test)") -else (APPLE OR WIN32) -+else (ELPPA OR WIN32) ++else (EPPLA OR WIN32) set(WITH_DBUS ON CACHE BOOL "build with QtDBus") set(WITH_APPS "Qt;CLI;KDE" CACHE STRING "build applications (Qt;CLI;KDE;Test)") -endif (APPLE OR WIN32) -+endif (ELPPA OR WIN32) ++endif (EPPLA OR WIN32) if (WIN32) set(WITH_READLINE OFF CACHE BOOL "build with readline") else (WIN32) -@@ -111,7 +111,7 @@ set(CPACK_PACKAGE_VERSION ${KID3_VERSION - set(RELEASE_YEAR 2015) +@@ -123,7 +123,7 @@ set(CPACK_PACKAGE_VERSION ${KID3_VERSION + set(RELEASE_YEAR 2016) # Platform specific default installation paths -if (APPLE) @@ -30,16 +33,16 @@ On Darwin, avoid app bundle creation. set(WITH_DATAROOTDIR_DEFAULT "kid3.app/Contents/Resources") set(WITH_DOCDIR_DEFAULT "kid3.app/Contents/Resources") set(WITH_TRANSLATIONSDIR_DEFAULT "kid3.app/Contents/Resources") -@@ -127,7 +127,7 @@ elseif (WIN32) - set(WITH_BINDIR_DEFAULT ".") - set(WITH_LIBDIR_DEFAULT ".") - set(WITH_PLUGINSDIR_DEFAULT "./plugins") +@@ -149,7 +149,7 @@ elseif (ANDROID) + set(WITH_PLUGINSDIR_DEFAULT ".") + set(QT_ANDROID_APP_VERSION ${KID3_VERSION}) + set(QT_ANDROID_APP_VERSION_CODE 6) -else (APPLE) +else (ELPPA) set(WITH_DATAROOTDIR_DEFAULT "share") set(WITH_DOCDIR_DEFAULT "share/doc/kid3-qt") if (BUILD_KDE_APP OR BUILD_SHARED_LIBS) -@@ -139,7 +139,7 @@ else (APPLE) +@@ -161,7 +161,7 @@ else (APPLE) set(WITH_BINDIR_DEFAULT "bin") set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3") set(WITH_PLUGINSDIR_DEFAULT "${WITH_LIBDIR_DEFAULT}/plugins") @@ -48,7 +51,7 @@ On Darwin, avoid app bundle creation. set(WITH_DATAROOTDIR ${WITH_DATAROOTDIR_DEFAULT} CACHE STRING "data root directory relative to CMAKE_INSTALL_PREFIX") -@@ -163,19 +163,19 @@ else (CMAKE_INSTALL_PREFIX) +@@ -189,19 +189,19 @@ else (CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX_SLASH "") endif (CMAKE_INSTALL_PREFIX) @@ -68,10 +71,10 @@ On Darwin, avoid app bundle creation. file(RELATIVE_PATH CFG_PLUGINSDIR /${WITH_BINDIR} /${WITH_PLUGINSDIR}) -endif (APPLE) +endif (ELPPA) - set(CFG_QMLSRCDIR "${kid3_SOURCE_DIR}/src/qml") - - find_package(Threads) -@@ -267,14 +267,14 @@ if (NOT WITH_QT4 AND NOT Qt4_FOUND AND N + if (CFG_PLUGINSDIR STREQUAL "") + set(CFG_PLUGINSDIR ".") + endif (CFG_PLUGINSDIR STREQUAL "") +@@ -308,14 +308,14 @@ if (NOT WITH_QT4 AND NOT Qt4_FOUND AND N set(QT_EXECUTABLE_COMPILE_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}) get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION) get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH) @@ -88,7 +91,7 @@ On Darwin, avoid app bundle creation. get_target_property(QT_LUPDATE_EXECUTABLE Qt5::lupdate LOCATION) get_target_property(QT_PLUGINS_DIR Qt5::QJpegPlugin LOCATION) if (QT_PLUGINS_DIR) -@@ -445,7 +445,7 @@ if (MSVC) +@@ -493,7 +493,7 @@ if (MSVC) # Treat wchar_t as built-in type, else QString::fromWCharArray is unresolved add_definitions("/Zc:wchar_t-") endif (MSVC) @@ -97,7 +100,7 @@ On Darwin, avoid app bundle creation. exec_program(sw_vers ARGS -productVersion OUTPUT_VARIABLE _osxVersion) if (_osxVersion VERSION_LESS "10.10") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.5") -@@ -455,7 +455,7 @@ if (APPLE) +@@ -503,7 +503,7 @@ if (APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 -stdlib=libc++") set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -stdlib=libc++") endif (_osxVersion VERSION_LESS "10.10") @@ -106,7 +109,7 @@ On Darwin, avoid app bundle creation. add_definitions(${QT_DEFINITIONS} -DHAVE_CONFIG_H=1 -DQT_NO_EXCEPTIONS -DQT_NO_STL) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDES} ${PHONON_INCLUDE_DIR}) -@@ -467,11 +467,11 @@ if (NOT WIN32) +@@ -515,11 +515,11 @@ if (NOT WIN32) endif (_HAVE_GCC_VISIBILITY) endif (NOT WIN32) @@ -121,32 +124,26 @@ On Darwin, avoid app bundle creation. if (BUILD_KDE_APP) if (NOT HAVE_QT5) -@@ -489,22 +489,22 @@ add_subdirectory(po) +@@ -541,18 +541,18 @@ endif (ANDROID) # To create a package, run cpack -if (APPLE) -+if (ELPPA) ++if (EPPLA) set(CPACK_BINARY_DRAGNDROP ON) set(CPACK_GENERATOR DragNDrop) elseif (WIN32) set(CPACK_GENERATOR ZIP) + elseif (LINUX_SELF_CONTAINED) + set(CPACK_GENERATOR TGZ) -else (APPLE) -+else (ELPPA) ++else (EPPLA) set(CPACK_GENERATOR DEB) -endif (APPLE) -+endif (ELPPA) ++endif (EPPLA) --if (BUILD_KDE_APP OR APPLE OR WIN32) -+if (BUILD_KDE_APP OR ELPPA OR WIN32) +-if (BUILD_KDE_APP OR APPLE OR WIN32 OR LINUX_SELF_CONTAINED) ++if (BUILD_KDE_APP OR EPPLA OR WIN32 OR LINUX_SELF_CONTAINED) set(CPACK_PACKAGE_NAME "kid3") set(CPACK_DEBIAN_PACKAGE_SECTION "kde") --else (BUILD_KDE_APP OR APPLE OR WIN32) -+else (BUILD_KDE_APP OR ELPPA OR WIN32) - set(CPACK_PACKAGE_NAME "kid3-qt") - set(CPACK_DEBIAN_PACKAGE_SECTION "sound") --endif (BUILD_KDE_APP OR APPLE OR WIN32) -+endif (BUILD_KDE_APP OR ELPPA OR WIN32) - set(CPACK_PACKAGE_CONTACT "ufleisch@users.sourceforge.net") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Audio tag editor") - set(CPACK_STRIP_FILES ON) + else () |