diff options
Diffstat (limited to 'testing/source/vtown/kde/patch/krename/krename.taglib.diff')
| -rw-r--r-- | testing/source/vtown/kde/patch/krename/krename.taglib.diff | 191 |
1 files changed, 191 insertions, 0 deletions
diff --git a/testing/source/vtown/kde/patch/krename/krename.taglib.diff b/testing/source/vtown/kde/patch/krename/krename.taglib.diff new file mode 100644 index 000000000..a1b8a11db --- /dev/null +++ b/testing/source/vtown/kde/patch/krename/krename.taglib.diff @@ -0,0 +1,191 @@ +diff -u -r --new-file krename-5.0.0.orig/cmake/modules/FindTaglib.cmake krename-5.0.0/cmake/modules/FindTaglib.cmake +--- krename-5.0.0.orig/cmake/modules/FindTaglib.cmake 2018-02-13 01:23:49.000000000 -0600 ++++ krename-5.0.0/cmake/modules/FindTaglib.cmake 2020-09-28 15:48:03.025045769 -0500 +@@ -1,84 +1,90 @@ +-# - Try to find the Taglib library +-# Once done this will define ++#.rst: ++# FindTaglib ++#----------- + # +-# TAGLIB_FOUND - system has the taglib library +-# TAGLIB_CFLAGS - the taglib cflags +-# TAGLIB_LIBRARIES - The libraries needed to use taglib +- +-# Copyright (c) 2006, Laurent Montel, <montel@kde.org> ++# Try to find the Taglib library. + # +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +- +-if(NOT TAGLIB_MIN_VERSION) +- set(TAGLIB_MIN_VERSION "1.4") +-endif(NOT TAGLIB_MIN_VERSION) +- +-if(NOT WIN32) +- find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS +- ${BIN_INSTALL_DIR} +- ) +-endif(NOT WIN32) +- +-#reset vars +-set(TAGLIB_LIBRARIES) +-set(TAGLIB_CFLAGS) +- +-# if taglib-config has been found +-if(TAGLIBCONFIG_EXECUTABLE) +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) ++# This will define the following variables: ++# ++# ``Taglib_FOUND`` ++# True if the system has the taglib library of at least the minimum ++# version specified by the version parameter to find_package() ++# ``Taglib_INCLUDE_DIRS`` ++# The taglib include dirs for use with target_include_directories ++# ``Taglib_LIBRARIES`` ++# The taglib libraries for use with target_link_libraries() ++# ``Taglib_VERSION`` ++# The version of taglib that was found ++# ++# If ``Taglib_FOUND is TRUE, it will also define the following imported ++# target: ++# ++# ``Taglib::Taglib`` ++# The Taglib library ++# ++# Since 5.72.0 ++# ++# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org> ++# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org> ++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org> ++# SPDX-License-Identifier: BSD-3-Clause + +- if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") +- set(TAGLIB_FOUND FALSE) +- else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") ++find_package(PkgConfig QUIET) + +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) ++pkg_search_module(PC_TAGLIB QUIET taglib) + +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) ++find_path(Taglib_INCLUDE_DIRS ++ NAMES tag.h ++ PATH_SUFFIXES taglib ++ HINTS ${PC_TAGLIB_INCLUDEDIR} ++) + +- if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) +- set(TAGLIB_FOUND TRUE) +- message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") +- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) +- string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") +- endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) ++find_library(Taglib_LIBRARIES ++ NAMES tag ++ HINTS ${PC_TAGLIB_LIBDIR} ++) + +-else(TAGLIBCONFIG_EXECUTABLE) ++set(Taglib_VERSION ${PC_TAGLIB_VERSION}) + +- include(FindLibraryWithDebug) +- include(FindPackageHandleStandardArgs) ++if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION) ++ if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h") ++ file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H) ++ ++ string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H}) ++ string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H}) ++ string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H}) ++ ++ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}") ++ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}") ++ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}") ++ ++ set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}") ++ endif() ++endif() ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Taglib ++ FOUND_VAR ++ Taglib_FOUND ++ REQUIRED_VARS ++ Taglib_LIBRARIES ++ Taglib_INCLUDE_DIRS ++ VERSION_VAR ++ Taglib_VERSION ++) ++ ++if (Taglib_FOUND AND NOT TARGET Taglib::Taglib) ++ add_library(Taglib::Taglib UNKNOWN IMPORTED) ++ set_target_properties(Taglib::Taglib PROPERTIES ++ IMPORTED_LOCATION "${Taglib_LIBRARIES}" ++ INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}" ++ ) ++endif() + +- find_path(TAGLIB_INCLUDES +- NAMES +- tag.h +- PATH_SUFFIXES taglib +- PATHS +- ${KDE4_INCLUDE_DIR} +- ${INCLUDE_INSTALL_DIR} +- ) ++mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS) + +- find_library_with_debug(TAGLIB_LIBRARIES +- WIN32_DEBUG_POSTFIX d +- NAMES tag +- PATHS +- ${KDE4_LIB_DIR} +- ${LIB_INSTALL_DIR} +- ) +- +- find_package_handle_standard_args(Taglib DEFAULT_MSG +- TAGLIB_INCLUDES TAGLIB_LIBRARIES) +-endif(TAGLIBCONFIG_EXECUTABLE) +- +- +-if(TAGLIB_FOUND) +- if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +- message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") +- endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +-else(TAGLIB_FOUND) +- if(Taglib_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find Taglib") +- endif(Taglib_FIND_REQUIRED) +-endif(TAGLIB_FOUND) ++include(FeatureSummary) ++set_package_properties(Taglib PROPERTIES ++ URL "https://taglib.org/" ++ DESCRIPTION "A library for reading and editing the meta-data of audio formats" ++) +diff -u -r --new-file krename-5.0.0.orig/src/CMakeLists.txt krename-5.0.0/src/CMakeLists.txt +--- krename-5.0.0.orig/src/CMakeLists.txt 2018-02-13 01:23:49.000000000 -0600 ++++ krename-5.0.0/src/CMakeLists.txt 2020-09-28 15:51:35.779050528 -0500 +@@ -6,10 +6,6 @@ + ${CMAKE_CURRENT_BINARY_DIR} + ) + +-if(TAGLIB_FOUND) +- include_directories(${TAGLIB_INCLUDES}) +-endif() +- + if(EXIV2_FOUND) + include_directories(${EXIV2_INCLUDE_DIR}) + endif() +@@ -128,7 +124,7 @@ + ) + if(TAGLIB_FOUND) + target_link_libraries(krename +- ${TAGLIB_LIBRARIES} ++ Taglib::Taglib + ) + endif() + if(EXIV2_FOUND) |