Ticket #27198: kdelibs4-svn_0.diff

files/patch-cmake-modules-FindQt4.cmake.diff

@@ +1 @@
+--- kdelibs-4.5.3/cmake/modules/FindQt4.cmake.orig      2010-11-23 15:17:37.000000000 -0500
++++ kdelibs-4.5.3/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)

files/patch-cmake-modules-FindPhonon.cmake.diff

@@ +1 @@
+--- kdelibs-4.5.3/cmake/modules/FindPhonon.cmake.orig   2010-11-23 15:53:43.000000000 -0500
++++ kdelibs-4.5.3/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)
+ 

Portfile

@@ -21 +21 @@
 
 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 \
@@ -46 +45 @@
                     default-kde4-xdg-menu-prefix.patch \
                     fix-bundle-icons.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
 
 
@@ -66 +67 @@
                         -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 \
                         -DWITH_FAM=OFF
 
 if { [file exists ${destroot}${prefix}/lib/kde4/kspell_aspell.so] } {