CVS commit: pkgsrc/graphics/graphite2

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Jan 24 13:42:55 UTC 2019

Modified Files:
        pkgsrc/graphics/graphite2: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/graphite2/patches: patch-src_CMakeLists.txt

Log Message:
graphite2: install the libtool .la file and use it instead of .so files

Should fix build on Linux and maybe Darwin also. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/graphite2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/graphite2/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/graphite2/distinfo
cvs rdiff -u -r0 -r1.6 \
    pkgsrc/graphics/graphite2/patches/patch-src_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/graphite2/Makefile
diff -u pkgsrc/graphics/graphite2/Makefile:1.8 pkgsrc/graphics/graphite2/Makefile:1.9
--- pkgsrc/graphics/graphite2/Makefile:1.8      Wed Mar  7 11:14:03 2018
+++ pkgsrc/graphics/graphite2/Makefile  Thu Jan 24 13:42:55 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2018/03/07 11:14:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2019/01/24 13:42:55 tnn Exp $
 
 DISTNAME=      graphite2-1.3.11
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=silgraphite/}
 EXTRACT_SUFX=  .tgz

Index: pkgsrc/graphics/graphite2/PLIST
diff -u pkgsrc/graphics/graphite2/PLIST:1.3 pkgsrc/graphics/graphite2/PLIST:1.4
--- pkgsrc/graphics/graphite2/PLIST:1.3 Tue Jan 26 13:56:23 2016
+++ pkgsrc/graphics/graphite2/PLIST     Thu Jan 24 13:42:55 2019
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2016/01/26 13:56:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/01/24 13:42:55 tnn Exp $
 bin/gr2fonttest
 include/graphite2/Font.h
 include/graphite2/Log.h
 include/graphite2/Segment.h
 include/graphite2/Types.h
-lib/libgraphite2.so
-lib/libgraphite2.so.3
-lib/libgraphite2.so.3.0.1
+lib/libgraphite2.la
 lib/pkgconfig/graphite2.pc
 share/graphite2/graphite2-release.cmake
 share/graphite2/graphite2.cmake

Index: pkgsrc/graphics/graphite2/distinfo
diff -u pkgsrc/graphics/graphite2/distinfo:1.9 pkgsrc/graphics/graphite2/distinfo:1.10
--- pkgsrc/graphics/graphite2/distinfo:1.9      Wed Mar  7 11:14:03 2018
+++ pkgsrc/graphics/graphite2/distinfo  Thu Jan 24 13:42:55 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2018/03/07 11:14:03 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2019/01/24 13:42:55 tnn Exp $
 
 SHA1 (graphite2-1.3.11.tgz) = 26b70897bac68868d964ef70002c384ec10b6572
 RMD160 (graphite2-1.3.11.tgz) = fa10a176d3e53d9d464384c828fc86e4bb2fb675
 SHA512 (graphite2-1.3.11.tgz) = fd5e997a30492a7668ad7afd78889e40cb37195cb8e11f42817ee00901b699d6a591e8230bf7a40abd1b218ae26588948a92b23e48c9fd03164fd5e2f4031afe
 Size (graphite2-1.3.11.tgz) = 4236760 bytes
+SHA1 (patch-src_CMakeLists.txt) = 97dad5f29114b9545eeb0a6fd6739103df9fb21b

Added files:

Index: pkgsrc/graphics/graphite2/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/graphite2/patches/patch-src_CMakeLists.txt:1.6
--- /dev/null   Thu Jan 24 13:42:55 2019
+++ pkgsrc/graphics/graphite2/patches/patch-src_CMakeLists.txt  Thu Jan 24 13:42:55 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.6 2019/01/24 13:42:55 tnn Exp $
+
+Always install the libtool .la file.
+
+--- src/CMakeLists.txt.orig    2018-03-05 04:05:42.000000000 +0000
++++ src/CMakeLists.txt
+@@ -159,6 +159,12 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Wind
+         COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING")
+ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ 
++if  (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
++    target_link_libraries(graphite2 c)
++    include(Graphite)
++    set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
++    CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
++endif (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ 
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
+ install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)