Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Apr 2017 20:20:32 +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: r439841 - head/editors/calligra/files
Message-ID:  <201704302020.v3UKKWKL046620@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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})



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