<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[129342] trunk/dports/kde/baloo</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/129342">129342</a></dd>
<dt>Author</dt> <dd>mk@macports.org</dd>
<dt>Date</dt> <dd>2014-12-10 12:12:46 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>baloo: add upstream patch (fixes #45317)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdebalooPortfile">trunk/dports/kde/baloo/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportskdebaloofilespatchbaloo_file_indexermakeagentsdiff">trunk/dports/kde/baloo/files/patch-baloo_file_indexer-make-agents.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdebalooPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/baloo/Portfile (129341 => 129342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/baloo/Portfile 2014-12-10 18:43:49 UTC (rev 129341)
+++ trunk/dports/kde/baloo/Portfile 2014-12-10 20:12:46 UTC (rev 129342)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name baloo
</span><span class="cx"> version 4.13.3
</span><ins>+revision 1
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> maintainers nicos openmaintainer
</span><span class="cx"> license {LGPL-2 LGPL-2.1+ GPL-2+}
</span><span class="lines">@@ -26,7 +27,8 @@
</span><span class="cx"> port:qjson
</span><span class="cx">
</span><span class="cx"> patchfiles patch-xapiandatabase.diff \
</span><del>- patch-executables.diff
</del><ins>+ patch-executables.diff \
+ patch-baloo_file_indexer-make-agents.diff
</ins><span class="cx">
</span><span class="cx"> startupitem.create yes
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportskdebaloofilespatchbaloo_file_indexermakeagentsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/baloo/files/patch-baloo_file_indexer-make-agents.diff (0 => 129342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/baloo/files/patch-baloo_file_indexer-make-agents.diff (rev 0)
+++ trunk/dports/kde/baloo/files/patch-baloo_file_indexer-make-agents.diff 2014-12-10 20:12:46 UTC (rev 129342)
</span><span class="lines">@@ -0,0 +1,161 @@
</span><ins>+diff --git src/file/CMakeLists.txt src/file/CMakeLists.txt
+index 49a34dd..262e45f 100644
+--- src/file/CMakeLists.txt
++++ src/file/CMakeLists.txt
+@@ -59,6 +59,12 @@ target_link_libraries(baloo_file
+ balooxapian
+ )
+
++if (APPLE)
++ set_target_properties(baloo_file PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
++ set_target_properties(baloo_file PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.baloo.file")
++ set_target_properties(baloo_file PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Baloo File Daemon service")
++endif (APPLE)
++
+ install(TARGETS baloo_file ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES baloo_file.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
+ install(FILES org.kde.baloo.file.indexer.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+diff --git src/file/Info.plist.template src/file/Info.plist.template
+new file mode 100644
+index 0000000..c39ddb9
+--- /dev/null
++++ src/file/Info.plist.template
+@@ -0,0 +1,36 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++ <key>CFBundleDevelopmentRegion</key>
++ <string>English</string>
++ <key>CFBundleExecutable</key>
++ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
++ <key>CFBundleGetInfoString</key>
++ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
++ <key>CFBundleIconFile</key>
++ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
++ <key>CFBundleIdentifier</key>
++ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
++ <key>CFBundleInfoDictionaryVersion</key>
++ <string>6.0</string>
++ <key>CFBundleLongVersionString</key>
++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
++ <key>CFBundleName</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
++ <key>CFBundlePackageType</key>
++ <string>APPL</string>
++ <key>CFBundleShortVersionString</key>
++ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
++ <key>CFBundleVersion</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
++ <key>CSResourcesFileMapped</key>
++ <true/>
++ <key>LSRequiresCarbon</key>
++ <true/>
++ <key>LSUIElement</key>
++ <string>1</string>
++ <key>NSHumanReadableCopyright</key>
++ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
++</dict>
++</plist>
+diff --git src/file/extractor/CMakeLists.txt src/file/extractor/CMakeLists.txt
+index 31efc6a..7cb0596 100644
+--- src/file/extractor/CMakeLists.txt
++++ src/file/extractor/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(EXTRACTOR_SRCS
+ ../fileexcludefilters.cpp
+ )
+
+-kde4_add_executable(baloo_file_extractor ${EXTRACTOR_SRCS})
++kde4_add_executable(baloo_file_extractor NOGUI ${EXTRACTOR_SRCS})
+
+ target_link_libraries(baloo_file_extractor
+ ${QT_QTSQL_LIBRARY}
+diff --git src/file/extractor/main.cpp src/file/extractor/main.cpp
+index 4be2c24..30c26d8 100644
+--- src/file/extractor/main.cpp
++++ src/file/extractor/main.cpp
+@@ -71,7 +71,7 @@ int main(int argc, char* argv[])
+ return 1;
+ }
+
+- QApplication app(argc, argv);
++ QApplication app(argc, argv, false);
+ KComponentData data(aboutData, KComponentData::RegisterAsMainComponent);
+
+ Baloo::App appObject;
+diff --git src/file/priority.cpp src/file/priority.cpp
+index 1c4e568..a657d32 100644
+--- src/file/priority.cpp
++++ src/file/priority.cpp
+@@ -75,6 +75,12 @@ bool lowerIOPriority()
+ }
+ }
+ return true;
++#elif defined(Q_OS_MAC)
++ if (setiopolicy_np( IOPOL_TYPE_DISK, IOPOL_SCOPE_PROCESS, IOPOL_THROTTLE ) < 0 ) {
++ qDebug( "cannot set io scheduling to IOPOL_THROTTLE (%s).\n", strerror(errno) );
++ return false;
++ }
++ return true;
+ #else
+ return false;
+ #endif
+diff --git src/pim/agent/CMakeLists.txt src/pim/agent/CMakeLists.txt
+index cd19027..6fc7548 100644
+--- src/pim/agent/CMakeLists.txt
++++ src/pim/agent/CMakeLists.txt
+@@ -33,6 +33,12 @@ target_link_libraries(akonadi_baloo_indexer
+ balooxapian
+ )
+
++if (APPLE)
++ set_target_properties(akonadi_baloo_indexer PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
++ set_target_properties(akonadi_baloo_indexer PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.akonadi.baloo.indexer")
++ set_target_properties(akonadi_baloo_indexer PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Baloo Indexing Agent")
++endif (APPLE)
++
+ install(TARGETS akonadi_baloo_indexer ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES akonadibalooindexingagent.desktop
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
+diff --git src/pim/agent/Info.plist.template src/pim/agent/Info.plist.template
+new file mode 100644
+index 0000000..c39ddb9
+--- /dev/null
++++ src/pim/agent/Info.plist.template
+@@ -0,0 +1,36 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++ <key>CFBundleDevelopmentRegion</key>
++ <string>English</string>
++ <key>CFBundleExecutable</key>
++ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
++ <key>CFBundleGetInfoString</key>
++ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
++ <key>CFBundleIconFile</key>
++ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
++ <key>CFBundleIdentifier</key>
++ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
++ <key>CFBundleInfoDictionaryVersion</key>
++ <string>6.0</string>
++ <key>CFBundleLongVersionString</key>
++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
++ <key>CFBundleName</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
++ <key>CFBundlePackageType</key>
++ <string>APPL</string>
++ <key>CFBundleShortVersionString</key>
++ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
++ <key>CFBundleVersion</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
++ <key>CSResourcesFileMapped</key>
++ <true/>
++ <key>LSRequiresCarbon</key>
++ <true/>
++ <key>LSUIElement</key>
++ <string>1</string>
++ <key>NSHumanReadableCopyright</key>
++ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
++</dict>
++</plist>
</ins></span></pre>
</div>
</div>
</body>
</html>