Make sure libokularcore.so is picked up from the right directory.

Bump dependers as the run-time linker search path changes, too.
This commit is contained in:
zhuk 2013-10-15 07:59:24 +00:00
parent dbd7b3f9d4
commit 286fa916b7
5 changed files with 19 additions and 14 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2013/08/24 17:33:38 zhuk Exp $
# $OpenBSD: Makefile,v 1.4 2013/10/15 07:59:25 zhuk Exp $
COMMENT = KDE mobipocket plugins for Strigi, Okular and thumbnails
DISTNAME = kdegraphics-mobipocket-${MODKDE4_VERSION}
REVISION = 0
REVISION = 1
WANTLIB = m pthread stdc++
WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2013/08/24 17:33:44 zhuk Exp $
# $OpenBSD: Makefile,v 1.6 2013/10/15 07:59:25 zhuk Exp $
COMMENT = KDE bindings for Ruby
DISTNAME = korundum-${MODKDE4_VERSION}
REVISION = 0
REVISION = 2
WANTLIB = c m pthread stdc++ ${MODRUBY_WANTLIB}
WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg
@ -31,7 +31,7 @@ WANTLIB += qtruby4shared soprano
MODULES = lang/ruby
MODKDE4_USE = libs pim
MODRUBY_REV = 1.9
MODRUBY_REV = 2.0
MODRUBY_ADJ_FILES = *.rb
CONFIGURE_ARGS = -DRUBY_EXECUTABLE=${RUBY}

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2013/08/24 17:33:51 zhuk Exp $
# $OpenBSD: Makefile,v 1.7 2013/10/15 07:59:24 zhuk Exp $
COMMENT = KDE document viewer
DISTNAME = okular-${MODKDE4_VERSION}
REVISION = 0
REVISION = 1
SHARED_LIBS = okularcore 50.0 # 1.7

View File

@ -1,12 +1,17 @@
$OpenBSD: patch-OkularConfig_cmake,v 1.1.1.1 2013/04/24 18:34:39 zhuk Exp $
--- OkularConfig.cmake.orig Thu Feb 7 22:31:16 2013
+++ OkularConfig.cmake Thu Feb 7 22:32:35 2013
@@ -7,7 +7,7 @@ get_filename_component( _okularBaseDir ${_okularBaseD
$OpenBSD: patch-OkularConfig_cmake,v 1.2 2013/10/15 07:59:25 zhuk Exp $
--- OkularConfig.cmake.orig Fri Jun 28 21:37:20 2013
+++ OkularConfig.cmake Mon Oct 14 22:57:13 2013
@@ -7,11 +7,11 @@ get_filename_component( _okularBaseDir ${_okularBaseD
# find the full paths to the library and the includes:
find_path(OKULAR_INCLUDE_DIR okular/core/document.h
- HINTS ${_okularBaseDir}/include
+ HINTS ${_okularBaseDir}/include ${KDE4_INCLUDE_DIR}
+ HINTS ${KDE4_INCLUDE_DIR} ${_okularBaseDir}/include
NO_DEFAULT_PATH)
find_library(OKULAR_CORE_LIBRARY okularcore
- HINTS ${_okularBaseDir}/lib
+ HINTS ${KDE4_LIB_DIR} ${_okularBaseDir}/lib
NO_DEFAULT_PATH)
set(OKULAR_LIBRARIES ${OKULAR_CORE_LIBRARY})

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2013/10/14 13:42:52 zhuk Exp $
# $OpenBSD: Makefile,v 1.6 2013/10/15 07:59:26 zhuk Exp $
CATEGORIES = devel
COMMENT = introspective wrappers around KDE
DISTNAME = smokekde-${MODKDE4_VERSION}
REVISION = 0
REVISION = 1
SHARED_LIBS = smokeakonadi 50.0 # 3.0
#SHARED_LIBS += smokeattica 50.0 # 3.0