diff options
| author | jhale <jhale@FreeBSD.org> | 2016-01-03 21:41:37 +0800 |
|---|---|---|
| committer | jhale <jhale@FreeBSD.org> | 2016-01-03 21:41:37 +0800 |
| commit | f1ef07d6db0c6d81c88a37473ff2560c5f815137 (patch) | |
| tree | ce489929b74ad233f23c5c58144604c9c5a511a2 /x11 | |
| parent | c8d26c57513b75f33f95c0548aee0f1705a708e5 (diff) | |
| download | freebsd-ports-gnome-f1ef07d6db0c6d81c88a37473ff2560c5f815137.tar.gz freebsd-ports-gnome-f1ef07d6db0c6d81c88a37473ff2560c5f815137.tar.zst freebsd-ports-gnome-f1ef07d6db0c6d81c88a37473ff2560c5f815137.zip | |
- Add upstream patch to fix taglib version detection
- Bump PORTREVISION as FindTaglib.cmake is modified
Reported by: pkg-fallout
Obtained from: https://quickgit.kde.org/?p=kdelibs.git&a=commit&h=967fc70300d5c2ae34d39b61757b717f6fca8805
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdelibs4/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-git_967fc70 | 35 |
2 files changed, 36 insertions, 1 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 0ee8bcec117d..c469d1ed29ac 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -3,7 +3,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/x11/kdelibs4/files/patch-git_967fc70 b/x11/kdelibs4/files/patch-git_967fc70 new file mode 100644 index 000000000000..7c1a60cb473d --- /dev/null +++ b/x11/kdelibs4/files/patch-git_967fc70 @@ -0,0 +1,35 @@ +From: Rex Dieter <rdieter@math.unl.edu> +Date: Sat, 07 Nov 2015 12:54:26 +0000 +Subject: FindTaglib.cmake: fix version detection for 1.10 +X-Git-Tag: v4.14.15 +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=967fc70300d5c2ae34d39b61757b717f6fca8805 +--- +FindTaglib.cmake: fix version detection for 1.10 +--- + + +--- cmake/modules/FindTaglib.cmake ++++ cmake/modules/FindTaglib.cmake +@@ -29,10 +29,10 @@ + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) + +- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) + message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") + set(TAGLIB_FOUND FALSE) +- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + +@@ -43,7 +43,7 @@ + message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") + endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") +- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) + mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) + + else(TAGLIBCONFIG_EXECUTABLE) + |