cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make recent Cantor versions pick up R without help of LD_LIBRARY_PATH hack.

Browse Source
This commit is contained in:
zhuk 2015-05-02 09:48:12 +00:00
parent e2f35e7d02
commit 614cc6fdea
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/kde4/cantor/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2015/03/27 08:16:19 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.9 2015/05/02 09:48:12 zhuk Exp $
COMMENT = KDE mathematical applications COMMENT = KDE mathematical applications
DISTNAME = cantor-${MODKDE4_VERSION} DISTNAME = cantor-${MODKDE4_VERSION}
REVISION = 0 REVISION = 1
# Bogus message about "backend /usr/local/bin/latex" at startup when no # Bogus message about "backend /usr/local/bin/latex" at startup when no
# backend is choosen on the command line. # backend is choosen on the command line.

22
x11/kde4/cantor/patches/patch-src_backends_R_CMakeLists_txt Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_backends_R_CMakeLists_txt,v 1.1 2015/05/02 09:48:12 zhuk Exp $
--- src/backends/R/CMakeLists.txt.orig Sat May 2 11:56:43 2015
+++ src/backends/R/CMakeLists.txt Sat May 2 12:32:12 2015
@@ -1,5 +1,5 @@
-include_directories(${R_INCLUDEDIR})
-LINK_DIRECTORIES(${R_SHAREDLIBDIR})
+include_directories(${R_INCLUDE_DIR})
+LINK_DIRECTORIES(${R_SHARED_LIB_DIR})
add_subdirectory(rserver)
@@ -21,8 +21,8 @@ QT4_ADD_DBUS_INTERFACE(RBackend_SRCS ${network_xml} rs
kde4_add_ui_files(RBackend_SRCS settings.ui)
kde4_add_plugin( cantor_rbackend ${RBackend_SRCS} )
-set_target_properties( cantor_rbackend PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
-target_link_libraries( cantor_rbackend ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} cantorlibs ${R_USED_LIBS})
+set_target_properties( cantor_rbackend PROPERTIES INSTALL_RPATH_USE_LINK_PATH true)
+target_link_libraries( cantor_rbackend ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} cantorlibs ${R_LIBRARIES})
install( FILES rbackend.desktop DESTINATION ${SERVICES_INSTALL_DIR}/cantor)
install(TARGETS cantor_rbackend DESTINATION ${PLUGIN_INSTALL_DIR})

12
x11/kde4/cantor/patches/patch-src_backends_R_rserver_CMakeLists_txt Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_backends_R_rserver_CMakeLists_txt,v 1.1 2015/05/02 09:48:12 zhuk Exp $
--- src/backends/R/rserver/CMakeLists.txt.orig Sat May 2 12:39:18 2015
+++ src/backends/R/rserver/CMakeLists.txt Sat May 2 12:39:54 2015
@@ -17,7 +17,7 @@ add_custom_target(renvvars COMMAND ${R_EXECUTABLE} --s
add_custom_target(rautoloads COMMAND ${R_EXECUTABLE} --slave --file=${CMAKE_CURRENT_SOURCE_DIR}/tools/autoloads.r > ${CMAKE_CURRENT_BINARY_DIR}/rautoloads.h )
kde4_add_executable( cantor_rserver ${RServer_SRCS} )
-set_target_properties( cantor_rserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
+set_target_properties( cantor_rserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH true)
target_link_libraries( cantor_rserver ${KDE4_KDEUI_LIBS} cantorlibs ${R_LIBRARIES} ${KDE4_KIO_LIBS})
add_dependencies(cantor_rserver renvvars rautoloads)