[122038] trunk/dports/kde/kdelibs4
nicos at macports.org
nicos at macports.org
Sun Jul 13 04:29:03 PDT 2014
Revision: 122038
https://trac.macports.org/changeset/122038
Author: nicos at macports.org
Date: 2014-07-13 04:29:03 -0700 (Sun, 13 Jul 2014)
Log Message:
-----------
kdelibs4: remove old patches, comment on used patch, add a patch to avoid crashes happening at CFRelease level (ticket #44258)
Modified Paths:
--------------
trunk/dports/kde/kdelibs4/Portfile
Added Paths:
-----------
trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch
Removed Paths:
-------------
trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindPhonon.cmake.diff
trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindQt4.cmake.diff
Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile 2014-07-13 11:19:30 UTC (rev 122037)
+++ trunk/dports/kde/kdelibs4/Portfile 2014-07-13 11:29:03 UTC (rev 122038)
@@ -6,7 +6,7 @@
name kdelibs4
version 4.12.5
-revision 2
+revision 3
categories kde kde4
maintainers nicos
license LGPL-2+ GPL-2+ BSD
@@ -53,16 +53,24 @@
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-FindPhonon.cmake.diff \
- patch-cmake-modules-FindQt4.cmake.diff \
- patch-cmake-modules-KDE4Macros.cmake.diff \
- patch-removeFindFlex.diff \
- patch-kapplications-raster.diff
+#workaround-kdeinit4-crash: Mac-specific patch developed by Macports to circumvent some crashes.
+#avoid-kwindowinfo-destructor: Prevent sending null pointer to CFRelease (see ticket #44258)
+#default-kde4-xdg-menu-prefix: solves a conflict with a file from gnome-menus (see ticket #18914)
+#add-bundles-to-path: improve support for KIO slaves by adding a search path
+#kapplications-raster: ensures that kde applications start in raster (faster) mode, but also provides a switch for non-working applications
+#removeFindFlex: remove FindFlex.cmake which may hide the working one of cmake (ticket #44119)
+#patch-cmake-modules-FindKDE4-Internal.cmake: Fixes zlib detection (see ticket #24128)
+#patch-cmake-modules-KDE4Macros.cmake: Ensures that compiled objects are properly detected during build (see ticket #43720)
+patchfiles workaround-kdeinit4-crash.patch \
+ avoid-kwindowinfo-destructor.patch \
+ default-kde4-xdg-menu-prefix.patch \
+ add-bundles-to-path.patch \
+ patch-kapplications-raster.diff \
+ patch-removeFindFlex.diff \
+ patch-cmake-modules-FindKDE4-Internal.cmake.diff \
+ patch-cmake-modules-KDE4Macros.cmake.diff
+
patch.pre_args -p1
# explicitly define certain headers and libraries, to avoid
Added: trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch
===================================================================
--- trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch (rev 0)
+++ trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch 2014-07-13 11:29:03 UTC (rev 122038)
@@ -0,0 +1,14 @@
+--- kdelibs-4.12.5/kdeui/windowmanagement/kwindowinfo_mac.cpp.orig 2014-07-06 11:45:50.000000000 +0200
++++ kdelibs-4.12.5/kdeui/windowmanagement/kwindowinfo_mac.cpp 2014-07-06 11:51:19.000000000 +0200
+@@ -51,7 +51,10 @@
+
+ KWindowInfo::Private::~Private()
+ {
+- CFRelease(m_axWin);
++ // RJVB 20140706: the argument to CFRelease may not be a NULL pointer
++ if( m_axWin ){
++ CFRelease(m_axWin);
++ }
+ }
+
+ void KWindowInfo::Private::updateData()
Deleted: trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindPhonon.cmake.diff
===================================================================
--- trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindPhonon.cmake.diff 2014-07-13 11:19:30 UTC (rev 122037)
+++ trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindPhonon.cmake.diff 2014-07-13 11:29:03 UTC (rev 122038)
@@ -1,33 +0,0 @@
---- 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)
-
Deleted: trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindQt4.cmake.diff
===================================================================
--- trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindQt4.cmake.diff 2014-07-13 11:19:30 UTC (rev 122037)
+++ trunk/dports/kde/kdelibs4/files/patch-cmake-modules-FindQt4.cmake.diff 2014-07-13 11:29:03 UTC (rev 122038)
@@ -1,18 +0,0 @@
---- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140713/2e9428a3/attachment-0001.html>
More information about the macports-changes
mailing list