Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Aug 2019 20:05:27 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r510288 - in head/x11-fm/konqueror: . files
Message-ID:  <201908302005.x7UK5ReG072344@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Fri Aug 30 20:05:27 2019
New Revision: 510288
URL: https://svnweb.freebsd.org/changeset/ports/510288

Log:
  x11-fm/konqueror: fix dependency on www/tidy-html5
  
  - Due to the workaround for the library name conflict between
    www/tidy-html5 (the wanted dependency) and www/tidy-lib,
    the build system was picking up the wrong shared library.
  
  PR:		240210
  Reported by:	Ting-Wei Lan <lantw44@gmail.com>

Added:
  head/x11-fm/konqueror/files/
  head/x11-fm/konqueror/files/patch-plugins_validators_FindLibTidy.cmake   (contents, props changed)
Modified:
  head/x11-fm/konqueror/Makefile

Modified: head/x11-fm/konqueror/Makefile
==============================================================================
--- head/x11-fm/konqueror/Makefile	Fri Aug 30 20:05:27 2019	(r510287)
+++ head/x11-fm/konqueror/Makefile	Fri Aug 30 20:05:27 2019	(r510288)
@@ -2,6 +2,7 @@
 
 PORTNAME=	konqueror
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-fm www kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Added: head/x11-fm/konqueror/files/patch-plugins_validators_FindLibTidy.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/konqueror/files/patch-plugins_validators_FindLibTidy.cmake	Fri Aug 30 20:05:27 2019	(r510288)
@@ -0,0 +1,14 @@
+Look for the renamed libtidy.so from www/tidy-html and not pick up www/tidy-lib
+by mistake
+
+--- plugins/validators/FindLibTidy.cmake.orig	2019-08-30 19:38:08 UTC
++++ plugins/validators/FindLibTidy.cmake
+@@ -28,7 +28,7 @@ endif( NOT LIBTIDY_INCLUDE_DIR )
+ 
+ 
+ 
+-FIND_LIBRARY(LIBTIDY_LIBRARIES NAMES tidy)
++FIND_LIBRARY(LIBTIDY_LIBRARIES NAMES tidy5)
+ 
+ if (LIBTIDY_INCLUDE_DIR AND LIBTIDY_LIBRARIES)
+    set(LIBTIDY_FOUND TRUE)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908302005.x7UK5ReG072344>