From owner-svn-ports-all@freebsd.org  Sun Apr 30 20:20:33 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91867D57D5E;
 Sun, 30 Apr 2017 20:20:33 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 63555867;
 Sun, 30 Apr 2017 20:20:33 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3UKKWKw046621;
 Sun, 30 Apr 2017 20:20:32 GMT (envelope-from tcberner@FreeBSD.org)
Received: (from tcberner@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3UKKWKL046620;
 Sun, 30 Apr 2017 20:20:32 GMT (envelope-from tcberner@FreeBSD.org)
Message-Id: <201704302020.v3UKKWKL046620@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tcberner set sender to
 tcberner@FreeBSD.org using -f
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Sun, 30 Apr 2017 20:20:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r439841 - head/editors/calligra/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Apr 2017 20:20:33 -0000

Author: tcberner
Date: Sun Apr 30 20:20:32 2017
New Revision: 439841
URL: https://svnweb.freebsd.org/changeset/ports/439841

Log:
  Fix linking against jpeg.
  
  As ${LOCALBASE}/lib is was not unconditionally part of the linker flags (only if
  POSTGRES option was selected), linking of calligra could fail with
  	 /usr/bin/ld: cannot find -ljpeg
  
  Fix it, by using ${JPEG_LIBRARY} as provided by cmake.
  
  PR:		218726
  Approved by:	rakuco (mentor)

Added:
  head/editors/calligra/files/
  head/editors/calligra/files/patch-filters_karbon_pdf_CMakeLists.txt   (contents, props changed)

Added: head/editors/calligra/files/patch-filters_karbon_pdf_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/calligra/files/patch-filters_karbon_pdf_CMakeLists.txt	Sun Apr 30 20:20:32 2017	(r439841)
@@ -0,0 +1,11 @@
+--- filters/karbon/pdf/CMakeLists.txt.orig	2017-04-19 08:08:55 UTC
++++ filters/karbon/pdf/CMakeLists.txt
+@@ -10,7 +10,7 @@ kde4_add_plugin(calligra_filter_pdf2svg 
+ 
+ target_link_libraries(calligra_filter_pdf2svg komain ${POPPLER_LIBRARY} ${POPPLER_CORE_LIBRARY})
+ if(JPEG_FOUND)
+-    target_link_libraries(calligra_filter_pdf2svg jpeg)
++    target_link_libraries(calligra_filter_pdf2svg ${JPEG_LIBRARY})
+ endif()
+ if(OPENJPEG_FOUND)
+     target_link_libraries(calligra_filter_pdf2svg ${OPENJPEG_LIBRARIES})