Fix the patch

This commit is contained in:
Hedayat Vatankhah 2019-01-10 02:30:09 +03:30
parent 59a7d0f3e5
commit 41327a2ff0
1 changed files with 9 additions and 5 deletions

View File

@ -1,12 +1,16 @@
diff -up kid3-3.7.0/src/plugins/taglibmetadata/cmake/modules/FindTagLib.cmake.fixtaglibfinder kid3-3.7.0/src/plugins/taglibmetadata/cmake/modules/FindTagLib.cmake
--- kid3-3.7.0/src/plugins/taglibmetadata/cmake/modules/FindTagLib.cmake.fixtaglibfinder 2019-01-10 02:26:00.919524813 +0330
+++ kid3-3.7.0/src/plugins/taglibmetadata/cmake/modules/FindTagLib.cmake 2019-01-10 02:26:18.557339294 +0330
@@ -28,7 +28,7 @@ else()
--- kid3-3.7.0/src/plugins/taglibmetadata/cmake/modules/FindTagLib.cmake.fixtaglibfinder 2019-01-10 02:29:14.103492874 +0330
+++ kid3-3.7.0/src/plugins/taglibmetadata/cmake/modules/FindTagLib.cmake 2019-01-10 02:29:30.004325623 +0330
@@ -28,10 +28,9 @@ else()
if(NOT ${TAGLIB_VERSION} VERSION_LESS 1.9.1)
# Extract library name and path from TAGLIB_LDFLAGS, which has
# the format "-L/usr/lib -ltag"
- string(REGEX MATCH "-L *([^ ]+) +-l *([^ ]+)" _match ${TAGLIB_LDFLAGS})
+ string(REGEX MATCH "-l *([^ ]+)" _match ${TAGLIB_LDFLAGS})
if(_match)
find_library(TAGLIB_LIBRARY NAMES ${CMAKE_MATCH_2}
HINTS ${CMAKE_MATCH_1}
- find_library(TAGLIB_LIBRARY NAMES ${CMAKE_MATCH_2}
- HINTS ${CMAKE_MATCH_1}
+ find_library(TAGLIB_LIBRARY NAMES ${CMAKE_MATCH_1}
NO_CMAKE_FIND_ROOT_PATH)
endif()
# Extract include path from TAGLIB_CFLAGS, which has the format