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

Fix linking.

Browse Source
This commit is contained in:
zhuk 2014-01-15 16:21:56 +00:00
parent 447e172a8c
commit c8c27fc159
3 changed files with 75 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/kde4/ruby-qt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2013/12/08 19:13:34 zhuk Exp $
# $OpenBSD: Makefile,v 1.9 2014/01/15 16:21:56 zhuk Exp $
BROKEN-hppa = relocation error
CATEGORIES = devel lang/ruby x11/kde4
@ -6,10 +6,11 @@ COMMENT = Ruby bindings for Qt4
DISTNAME = qtruby-${MODKDE4_VERSION}
PKGNAME = qt4-${MODKDE4_VERSION}
HOMEPAGE = http://techbase.kde.org/Development/Languages/Ruby
REVISION = 0
SHARED_LIBS = qtruby4shared 51.0 # 2.0
WANTLIB = c m stdc++ ${MODRUBY_WANTLIB}
WANTLIB = c m pthread stdc++ ${MODRUBY_WANTLIB}
WANTLIB += lib/qt4/QtDBus lib/qt4/QtDeclarative lib/qt4/QtGui
WANTLIB += lib/qt4/QtNetwork lib/qt4/QtScript lib/qt4/QtWebKit
WANTLIB += lib/qt4/QtXml

16
x11/kde4/ruby-qt/patches/patch-modules_qscintilla_CMakeLists_txt Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-modules_qscintilla_CMakeLists_txt,v 1.1 2014/01/15 16:21:56 zhuk Exp $
Fix linking.
--- modules/qscintilla/CMakeLists.txt.orig Wed Jan 15 20:04:30 2014
+++ modules/qscintilla/CMakeLists.txt Wed Jan 15 20:04:39 2014
@@ -4,9 +4,9 @@ INCLUDE_DIRECTORIES (${QT_INCLUDES})
set(rubyqsci_LIBRARY_SRC qscintilla.cpp qscintillahandlers.cpp)
add_library(rubyqscintilla MODULE ${rubyqsci_LIBRARY_SRC})
target_link_libraries(rubyqscintilla
- ${QSCINTILLA_LIBRARIES}
- ${SMOKE_QSCI_LIBRARY}
qtruby4shared
+ ${SMOKE_QSCI_LIBRARY}
+ ${QSCINTILLA_LIBRARIES}
)
set_target_properties(rubyqscintilla PROPERTIES PREFIX "" OUTPUT_NAME qscintilla)
install(TARGETS rubyqscintilla DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})

56
x11/kde4/ruby-qt/patches/patch-src_CMakeLists_txt Normal file
View File

@ -0,0 +1,56 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.1 2014/01/15 16:21:56 zhuk Exp $
Fix linking.
--- src/CMakeLists.txt.orig Wed Jan 15 19:59:51 2014
+++ src/CMakeLists.txt Wed Jan 15 20:03:30 2014
@@ -31,11 +31,6 @@ add_library(qtruby4shared SHARED ${qtrubyshared_LIB_SR
add_library(qtruby4 MODULE ${qtruby_LIB_SRCS})
target_link_libraries( qtruby4shared
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${RUBY_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
- ${SMOKE_BASE_LIBRARY}
${SMOKE_QTCORE_LIBRARY}
${SMOKE_QTGUI_LIBRARY}
${SMOKE_QTXML_LIBRARY}
@@ -43,14 +38,16 @@ target_link_libraries( qtruby4shared
${SMOKE_QTSQL_LIBRARY}
${SMOKE_QTNETWORK_LIBRARY}
${SMOKE_QTDBUS_LIBRARY}
- ${SMOKE_QTSVG_LIBRARY} )
+ ${SMOKE_QTSVG_LIBRARY}
+ ${SMOKE_BASE_LIBRARY}
+ ${QT_QTNETWORK_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${RUBY_LIBRARY}
+ )
target_link_libraries( qtruby4
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
- ${RUBY_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
+ qtruby4shared
${SMOKE_QTCORE_LIBRARY}
${SMOKE_QTGUI_LIBRARY}
${SMOKE_QTXML_LIBRARY}
@@ -59,9 +56,14 @@ target_link_libraries( qtruby4
${SMOKE_QTNETWORK_LIBRARY}
${SMOKE_QTDBUS_LIBRARY}
${SMOKE_QTSVG_LIBRARY}
- qtruby4shared )
+ ${QT_QTNETWORK_LIBRARY}
+ ${QT_QTDBUS_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${RUBY_LIBRARY}
+ )
-# target_link_libraries(qtrubyinternal ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+# target_link_libraries(qtrubyinternal ${QT_QTNETWORK_LIBRARY} ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY})
set_target_properties(qtruby4 PROPERTIES PREFIX "")
set_target_properties(qtruby4shared PROPERTIES VERSION 2.0.0 SOVERSION 2)