[129725] trunk/dports/kde/kdelibs4
nicos at macports.org
nicos at macports.org
Fri Dec 19 05:45:56 PST 2014
Revision: 129725
https://trac.macports.org/changeset/129725
Author: nicos at macports.org
Date: 2014-12-19 05:45:56 -0800 (Fri, 19 Dec 2014)
Log Message:
-----------
kdelibs4: update to 4.14.3
remove conflicts with obsolete port
Modified Paths:
--------------
trunk/dports/kde/kdelibs4/Portfile
Removed Paths:
-------------
trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch
trunk/dports/kde/kdelibs4/files/patch-fixKCrash.diff
Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile 2014-12-19 11:45:22 UTC (rev 129724)
+++ trunk/dports/kde/kdelibs4/Portfile 2014-12-19 13:45:56 UTC (rev 129725)
@@ -5,8 +5,7 @@
PortGroup kde4 1.1
name kdelibs4
-version 4.13.3
-revision 1
+version 4.14.3
categories kde kde4
maintainers nicos
license LGPL-2+ GPL-2+ BSD
@@ -18,8 +17,8 @@
use_xz yes
distname kdelibs-${version}
-checksums rmd160 8db76ec77ed09d180223fb3a37b38e8ca8798d75 \
- sha256 d291b4bc159a3f686ad93ff3dfbe90a0a7e33600357e8390c84154ec050efc82
+checksums rmd160 f0dd628eec72c52f4dd8426a2de47d75e629ff31 \
+ sha256 f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e
#No binary links to openssl libraries, apart from libkio.dylib at
#runtime if required. As libkio.dylib code is purely LGPL, there is no
@@ -50,27 +49,21 @@
# the aspell dictionaries are just files
depends_skip_archcheck aspell-dict-en
-conflicts kdelibs3
-
#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)
#cmake-modules-FindKDE4-Internal.cmake: Fixes zlib detection (see ticket #24128)
-#fixKCrash: Fix issues in the KDE reporting system on OSX (see https://git.reviewboard.kde.org/r/119497/, committed upstream)
#nativeDialogs: Use native mac dialogs (see https://reviewboard.kde.org/r/119243/)
#KdePreferences: Handles menus to be closer to standard Mac layout (see https://reviewboard.kde.org/r/120149/)
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-fixKCrash.diff \
patch-KdePreferences.diff
#Deactivated as of ticket #45373
# patch-nativeDialogs.diff
Deleted: trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch
===================================================================
--- trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch 2014-12-19 11:45:22 UTC (rev 129724)
+++ trunk/dports/kde/kdelibs4/files/avoid-kwindowinfo-destructor.patch 2014-12-19 13:45:56 UTC (rev 129725)
@@ -1,14 +0,0 @@
---- 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-fixKCrash.diff
===================================================================
--- trunk/dports/kde/kdelibs4/files/patch-fixKCrash.diff 2014-12-19 11:45:22 UTC (rev 129724)
+++ trunk/dports/kde/kdelibs4/files/patch-fixKCrash.diff 2014-12-19 13:45:56 UTC (rev 129725)
@@ -1,41 +0,0 @@
-diff -ur kdelibs-4.13.3-orig/kdeui/util/kcrash.cpp kdelibs-4.13.3/kdeui/util/kcrash.cpp
---- kdelibs-4.13.3-orig/kdeui/util/kcrash.cpp 2014-07-11 15:42:13.000000000 +0900
-+++ kdelibs-4.13.3/kdeui/util/kcrash.cpp 2014-09-20 15:20:58.000000000 +0900
-@@ -313,7 +313,13 @@
- crashRecursionCounter++;
- }
-
--#if !defined(Q_OS_WIN)
-+ // On Apple OS X, closing all FDs now will cause a second (SIGILL) crash,
-+ // ending with "Unable to start Dr. Konqi". This is because the libdispatch
-+ // library, which can manage multi-threading, has some FDs of its own.
-+ //
-+ // Note: KCrash closes FDs unconditionally later on if it forks to Dr Konqi
-+ // and this program's FDs do not matter if kdeinit starts Dr Konqi.
-+#if !defined(Q_OS_WIN) and !defined(Q_OS_MAC)
- if (!(s_flags & KeepFDs))
- closeAllFDs();
- # if defined(Q_WS_X11)
-@@ -520,9 +526,12 @@
- // This is done because it is dangerous to use fork() in the crash handler
- // (there can be functions registered to be performed before fork(), for example handling
- // of malloc locking, which doesn't work when malloc crashes because of heap corruption).
-+#ifndef Q_OS_MAC
-+ // Fails on Apple OSX+KDE4, because kdeinit4 is using the wrong socket name.
- if (!(s_flags & AlwaysDirectly)) {
- startDirectly = !startProcessInternal(argc, argv, waitAndExit, false);
- }
-+#endif
-
- // If we can't reach kdeinit, we can still at least try to fork()
- if (startDirectly) {
-@@ -805,7 +814,8 @@
-
- server.sun_family = AF_UNIX;
- strcpy(server.sun_path, sock_file);
-- printf("sock_file=%s\n", sock_file);
-+ // Use stderr, to make the message visible on the Apple OS X Console log.
-+ fprintf(stderr, "KCrash: Connect sock_file=%s\n", sock_file);
- socklen = sizeof(server);
- if(connect(s, (struct sockaddr *)&server, socklen) == -1)
- {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141219/b005eab5/attachment-0001.html>
More information about the macports-changes
mailing list