[111423] trunk/dports/kde/okular

[nicos at macports.org]

Revision: 111423
          https://trac.macports.org/changeset/111423
Author:   nicos at macports.org
Date:     2013-09-20 23:41:02 -0700 (Fri, 20 Sep 2013)
Log Message:
-----------
okular: disable non-compilable tests (fix for ticket #40530)

Modified Paths:
--------------
    trunk/dports/kde/okular/Portfile
    trunk/dports/kde/okular/files/patch-OkularPart.diff

Modified: trunk/dports/kde/okular/Portfile
===================================================================
--- trunk/dports/kde/okular/Portfile	2013-09-21 02:38:26 UTC (rev 111422)
+++ trunk/dports/kde/okular/Portfile	2013-09-21 06:41:02 UTC (rev 111423)
@@ -6,6 +6,7 @@
 
 name                okular
 version             4.11.1
+revision            1
 categories          kde kde4
 license             GPL-2+ LGPL-2+
 maintainers         nicos openmaintainer
@@ -21,6 +22,7 @@
 checksums           rmd160  7251f82de01321602186a2c8b4f8e3926c16f439 \
                     sha256  c32d7316e6921863664e8632457e733738db6a4e1ee1940a68c97ff4f9ebb0d9
 
+#parttest cannot link to okularpart on Mac, as it is a bundle (.so) file
 patchfiles          patch-OkularPart.diff
 
 #Binaries do not link to openssl, nor use the ssl backend of kdelibs4

Modified: trunk/dports/kde/okular/files/patch-OkularPart.diff
===================================================================
--- trunk/dports/kde/okular/files/patch-OkularPart.diff	2013-09-21 02:38:26 UTC (rev 111422)
+++ trunk/dports/kde/okular/files/patch-OkularPart.diff	2013-09-21 06:41:02 UTC (rev 111423)
@@ -1,12 +1,13 @@
---- CMakeLists.txt.orig	2013-09-14 13:15:11.000000000 +0900
-+++ CMakeLists.txt	2013-09-14 13:15:15.000000000 +0900
-@@ -204,7 +204,8 @@
+--- tests/CMakeLists.txt.orig	2013-09-21 15:32:12.000000000 +0900
++++ tests/CMakeLists.txt	2013-09-21 15:32:20.000000000 +0900
+@@ -3,8 +3,8 @@
+ kde4_add_unit_test( shelltest shelltest.cpp ../shell/shellutils.cpp )
+ target_link_libraries( shelltest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
  
- qt4_add_dbus_interfaces(okularpart_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
+-kde4_add_unit_test( parttest parttest.cpp )
+-target_link_libraries( parttest ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularpart okularcore )
++#kde4_add_unit_test( parttest parttest.cpp )
++#target_link_libraries( parttest ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularpart okularcore )
  
--kde4_add_plugin(okularpart ${okularpart_SRCS})
-+#kde4_add_plugin(okularpart ${okularpart_SRCS})
-+kde4_add_library(okularpart SHARED ${okularpart_SRCS})
- 
- target_link_libraries(okularpart okularcore ${KDE4_KPARTS_LIBS} ${KDE4_KPRINTUTILS_LIBS} ${MATH_LIB} ${QIMAGEBLITZ_LIBRARIES} ${KDE4_PHONON_LIBRARY} ${KDE4_SOLID_LIBRARY})
- 
+ kde4_add_unit_test( documenttest documenttest.cpp )
+ target_link_libraries( documenttest ${KDE4_KDECORE_LIBS} ${KDE4_THREADWEAVER_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130920/02c9218d/attachment.html>