Date: Sun, 3 Jan 2016 13:41:38 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405142 - in head/x11/kdelibs4: . files Message-ID: <201601031341.u03Dfc5G008947@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Sun Jan 3 13:41:37 2016 New Revision: 405142 URL: https://svnweb.freebsd.org/changeset/ports/405142 Log: - 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 Added: head/x11/kdelibs4/files/patch-git_967fc70 (contents, props changed) Modified: head/x11/kdelibs4/Makefile Modified: head/x11/kdelibs4/Makefile ============================================================================== --- head/x11/kdelibs4/Makefile Sun Jan 3 13:21:38 2016 (r405141) +++ head/x11/kdelibs4/Makefile Sun Jan 3 13:41:37 2016 (r405142) @@ -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} Added: head/x11/kdelibs4/files/patch-git_967fc70 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kdelibs4/files/patch-git_967fc70 Sun Jan 3 13:41:37 2016 (r405142) @@ -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) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601031341.u03Dfc5G008947>