[74224] trunk/dports/kde/kdelibs4
snc at macports.org
snc at macports.org
Tue Dec 7 19:33:40 PST 2010
Revision: 74224
http://trac.macports.org/changeset/74224
Author: snc at macports.org
Date: 2010-12-07 19:33:34 -0800 (Tue, 07 Dec 2010)
Log Message:
-----------
kdelibs4:
* skip archcheck on aspell dictionary
* add patches to facility correct include paths
* cleanup configure.args
* builds universally (thanks to libgphoto2)
Modified Paths:
--------------
trunk/dports/kde/kdelibs4/Portfile
Added Paths:
-----------
trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindPhonon.cmake.diff
trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindQt4.cmake.diff
trunk/dports/kde/kdelibs4/files/patch-dont-create-empty-config-dirs.diff
Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile 2010-12-08 02:28:08 UTC (rev 74223)
+++ trunk/dports/kde/kdelibs4/Portfile 2010-12-08 03:33:34 UTC (rev 74224)
@@ -20,8 +20,7 @@
depends_build-append port:flex port:gmake
-depends_lib-append \
- port:bzip2 port:zlib \
+depends_lib-append port:bzip2 port:zlib \
port:soprano port:cyrus-sasl2 \
port:strigi port:gettext \
port:pcre port:shared-mime-info \
@@ -39,32 +38,40 @@
port:docbook-xsl port:grantlee \
port:shared-desktop-ontologies
+# the aspell dictionaries are just files
+depends_skip_archcheck aspell-dict-en
+
conflicts kdelibs3
patchfiles add-bundles-to-path.patch \
default-kde4-xdg-menu-prefix.patch \
workaround-kdeinit4-crash.patch \
- patch-cmake-modules-FindKDE4-Internal.cmake.diff
+ patch-cmake-modules-FindKDE4-Internal.cmake.diff \
+ patch-cmake-modules-FindPhonon.cmake.diff \
+ patch-cmake-modules-FindQt4.cmake.diff
-patch.dir ${workpath}/${distname}
+# patch.dir ${workpath}/${distname}
patch.pre_args -p1
-
+# explicitly define certain headers and libraries, to avoid
+# conflicts with those installed into system paths by the user.
configure.args-append -DWITH_ENCHANT=ON \
-DWITH_Soprano=ON \
-DWITH_Avahi=ON \
-DKDE_DEFAULT_HOME=Library/Preferences/KDE \
- -DWITH_HSPELL:BOOL=OFF \
+ -DWITH_HSPELL=OFF \
-DDOCBOOKXSL_DIR=${prefix}/share/xml/ \
${qt_cmake_defines} \
- -DLIBXSLT_INCLUDE_DIR=${prefix}/include/ \
- -DLIBXSLT_LIBRARIES=${prefix}/lib/libxslt.dylib \
- -DLIBEXSLT_LIBRARIES=${prefix}/lib/libexslt.dylib \
+ -DGIF_INCLUDE_DIR=${prefix}/include \
-DJASPER_INCLUDE_DIR=${prefix}/include \
+ -DJPEG_INCLUDE_DIR=${prefix}/include \
+ -DLIBINTL_INCLUDE_DIR=${prefix}/include \
+ -DLIBXSLT_INCLUDE_DIR=${prefix}/include \
+ -DPNG_PNG_INCLUDE_DIR=${prefix}/include \
-DJASPER_LIBRARY=${prefix}/lib/libjasper.dylib \
-DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
- -DPNG_PNG_INCLUDE_DIR=${prefix}/include \
- -DQT_PNG_LIBRARY=${prefix}/lib/libpng.dylib \
+ -DLIBXSLT_LIBRARIES=${prefix}/lib/libxslt.dylib \
+ -DLIBEXSLT_LIBRARIES=${prefix}/lib/libexslt.dylib \
-DWITH_FAM=OFF
if { [file exists ${destroot}${prefix}/lib/kde4/kspell_aspell.so] } {
@@ -77,7 +84,5 @@
"
}
-universal_variant no
-
livecheck.url http://kde.mirrors.hoobly.com/stable/latest/src/
livecheck.regex kdelibs-(\\d+\\.\\d+\\.\\d+)
Added: trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindPhonon.cmake.diff
===================================================================
--- trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindPhonon.cmake.diff (rev 0)
+++ trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindPhonon.cmake.diff 2010-12-08 03:33:34 UTC (rev 74224)
@@ -0,0 +1,33 @@
+--- kdelibs-4.5.4/cmake/modules/FindPhonon.cmake.orig 2010-11-23 15:53:43.000000000 -0500
++++ kdelibs-4.5.4/cmake/modules/FindPhonon.cmake 2010-11-23 15:54:39.000000000 -0500
+@@ -21,9 +21,16 @@
+ set(PHONON_VERSION "${CMAKE_MATCH_1}")
+ endmacro(_phonon_find_version)
+
++MESSAGE(STATUS "Looking for Phonon")
++message(STATUS " -> KDE4_INCLUDE_INSTALL_DIR is ${KDE4_INCLUDE_INSTALL_DIR}")
++message(STATUS " -> KDE4_LIB_INSTALL_DIR is ${KDE4_LIB_INSTALL_DIR}")
++message(STATUS " -> INCLUDE_INSTALL_DIR is ${INCLUDE_INSTALL_DIR}")
++message(STATUS " -> QT_LIBRARY_DIR is ${QT_LIBRARY_DIR}")
++message(STATUS " -> QT_INCLUDE_DIR is ${QT_INCLUDE_DIR}")
++
+ # the dirs listed with HINTS are searched before the default sets of dirs
+-find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
+-find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
++find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+ set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
+@@ -31,6 +38,11 @@
+ _phonon_find_version()
+ endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+
++MESSAGE(STATUS "Results of Search for Phonon")
++MESSAGE(STATUS " -> PHONON_VERSION is ${PHONON_VERSION}")
++MESSAGE(STATUS " -> PHONON_INCLUDE_DIR is ${PHONON_INCLUDE_DIR}")
++MESSAGE(STATUS " -> PHONON_LIBRARY is ${PHONON_LIBRARY}")
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Phonon DEFAULT_MSG PHONON_INCLUDE_DIR PHONON_LIBRARY)
+
Added: trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindQt4.cmake.diff
===================================================================
--- trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindQt4.cmake.diff (rev 0)
+++ trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindQt4.cmake.diff 2010-12-08 03:33:34 UTC (rev 74224)
@@ -0,0 +1,18 @@
+--- kdelibs-4.5.4/cmake/modules/FindQt4.cmake.orig 2010-11-23 15:17:37.000000000 -0500
++++ kdelibs-4.5.4/cmake/modules/FindQt4.cmake 2010-11-23 15:30:23.000000000 -0500
+@@ -1178,7 +1178,14 @@
+ QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
+ SET( QT4_FOUND "YES" )
+ IF( NOT Qt4_FIND_QUIETLY)
+- MESSAGE(STATUS "Found Qt-Version ${QTVERSION} (using ${QT_QMAKE_EXECUTABLE})")
++ MESSAGE(STATUS "Found Qt-Version ${QTVERSION}")
++ MESSAGE(STATUS " -> QT_QMAKE_EXECUTABLE is ${QT_QMAKE_EXECUTABLE}")
++ MESSAGE(STATUS " -> QT_INCLUDE_DIR is ${QT_INCLUDE_DIR}")
++ MESSAGE(STATUS " -> QT_QTCORE_INCLUDE_DIR is ${QT_QTCORE_INCLUDE_DIR}")
++ MESSAGE(STATUS " -> QT_BINARY_DIR is ${QT_BINARY_DIR}")
++ MESSAGE(STATUS " -> QT_LIBRARY_DIR is ${QT_LIBRARY_DIR}")
++ MESSAGE(STATUS " -> QT_PLUGINS_DIR is ${QT_PLUGINS_DIR}")
++ MESSAGE(STATUS " -> QT_MKSPECS_DIR is ${QT_MKSPECS_DIR}")
+ ENDIF( NOT Qt4_FIND_QUIETLY)
+ ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
+ QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
Added: trunk/dports/kde/kdelibs4/files/patch-dont-create-empty-config-dirs.diff
===================================================================
--- trunk/dports/kde/kdelibs4/files/patch-dont-create-empty-config-dirs.diff (rev 0)
+++ trunk/dports/kde/kdelibs4/files/patch-dont-create-empty-config-dirs.diff 2010-12-08 03:33:34 UTC (rev 74224)
@@ -0,0 +1,11 @@
+--- kdelibs/kdecore/config/kconfig.cpp 2010/10/21 23:07:41 1188301
++++ kdelibs/kdecore/config/kconfig.cpp 2010/10/21 23:10:49 1188302
+@@ -59,7 +59,7 @@
+ bFileImmutable(false), bForceGlobal(false), bSuppressGlobal(false),
+ componentData(componentData_), configState(KConfigBase::NoAccess)
+ {
+- sGlobalFileName = componentData.dirs()->saveLocation("config") + QLatin1String("kdeglobals");
++ sGlobalFileName = componentData.dirs()->saveLocation("config", QString(), false) + QLatin1String("kdeglobals");
+
+ static int use_etc_kderc = -1;
+ if (use_etc_kderc < 0)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101207/d7daf42d/attachment.html>
More information about the macports-changes
mailing list