<!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>[133829] trunk/dports/office/charm</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/133829">133829</a></dd>
<dt>Author</dt> <dd>mk@macports.org</dd>
<dt>Date</dt> <dd>2015-03-12 12:38:42 -0700 (Thu, 12 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>charm: update to latest git faaf49e9 (which fixes some Cocoa issues)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsofficecharmPortfile">trunk/dports/office/charm/Portfile</a></li>
<li><a href="#trunkdportsofficecharmfilesadapttoosxmacportspatch">trunk/dports/office/charm/files/adapt-to-osx-macports.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsofficecharmPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/office/charm/Portfile (133828 => 133829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/charm/Portfile 2015-03-12 18:34:54 UTC (rev 133828)
+++ trunk/dports/office/charm/Portfile 2015-03-12 19:38:42 UTC (rev 133829)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx">
</span><del>-github.setup KDAB Charm aca5faf6
</del><ins>+github.setup KDAB Charm faaf49e9
</ins><span class="cx">
</span><span class="cx"> # The last release version is too old:
</span><span class="cx"> #github.setup KDAB Charm 1.8.0
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx">
</span><span class="cx"> name charm
</span><span class="cx"> version 1.8.0
</span><ins>+revision 20150312
</ins><span class="cx"> maintainers gmail.com:rjvbertin mk openmaintainer
</span><span class="cx"> categories office
</span><span class="cx"> license GPL-2+ LGPL-2.1+
</span><span class="lines">@@ -37,9 +38,9 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append -DCharm_VERSION="${version}-${github.version}" -DBIN_INSTALL_DIR:PATH=${qt_apps_dir}
</span><span class="cx">
</span><del>-# aca5faf6
-checksums rmd160 c0f938504705477a751f4be7f28220de261a1e56 \
- sha256 1651dc8fb4c5100c96137e1fe076ce86a89b98b2e81e652a4fae1b8a5c5860f7
</del><ins>+# faaf49e9
+checksums rmd160 50e87a81e853c81ea0d538f7a165570d0e9f2ac0 \
+ sha256 f49b485e0bd072f3564420859d0114538a3d321cd2f9c1a124d488aefbea8424
</ins><span class="cx">
</span><span class="cx"> # 1.8.0
</span><span class="cx"> #checksums rmd160 95fca2fd3236f8d39bf9e67b5ca43e3466f6c205 \
</span></span></pre></div>
<a id="trunkdportsofficecharmfilesadapttoosxmacportspatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/office/charm/files/adapt-to-osx-macports.patch (133828 => 133829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/charm/files/adapt-to-osx-macports.patch 2015-03-12 18:34:54 UTC (rev 133828)
+++ trunk/dports/office/charm/files/adapt-to-osx-macports.patch 2015-03-12 19:38:42 UTC (rev 133829)
</span><span class="lines">@@ -1,21 +1,22 @@
</span><span class="cx"> diff --git Charm/ApplicationCore.cpp Charm/ApplicationCore.cpp
</span><del>-index 17cd0fe..964d098 100644
</del><ins>+index bf4832f..29f6a81 100644
</ins><span class="cx"> --- Charm/ApplicationCore.cpp
</span><span class="cx"> +++ Charm/ApplicationCore.cpp
</span><del>-@@ -158,10 +158,12 @@ ApplicationCore::ApplicationCore( QObject* parent )
- SLOT( slotQuitApplication() ) );
</del><ins>+@@ -173,11 +173,13 @@ ApplicationCore::ApplicationCore( QObject* parent )
+ SLOT(slotQuitApplication()) );
</ins><span class="cx">
</span><span class="cx"> m_actionAboutDialog.setText( tr( "About Charm" ) );
</span><span class="cx"> + m_actionAboutDialog.setMenuRole(QAction::AboutRole);
</span><del>- connect( &m_actionAboutDialog, SIGNAL( triggered() ),
- &mainView(), SLOT( slotAboutDialog() ) );
</del><ins>+ connect( &m_actionAboutDialog, SIGNAL(triggered()),
+ &mainView(), SLOT(slotAboutDialog()) );
</ins><span class="cx">
</span><span class="cx"> m_actionPreferences.setText( tr( "Preferences" ) );
</span><ins>+ m_actionPreferences.setIcon( Data::configureIcon() );
</ins><span class="cx"> + m_actionPreferences.setMenuRole(QAction::PreferencesRole);
</span><del>- m_actionPreferences.setIcon( Data::configureIcon() );
- connect( &m_actionPreferences, SIGNAL( triggered( bool ) ),
- &mainView(), SLOT( slotEditPreferences( bool ) ) );
-@@ -260,7 +262,7 @@ void ApplicationCore::createWindowMenu( QMenuBar *menuBar )
</del><ins>+ connect( &m_actionPreferences, SIGNAL(triggered(bool)),
+ &mainView(), SLOT(slotEditPreferences(bool)) );
+ m_actionPreferences.setEnabled( true );
+@@ -275,7 +277,7 @@ void ApplicationCore::createWindowMenu( QMenuBar *menuBar )
</ins><span class="cx"> menu->addAction( &m_actionActivityReport );
</span><span class="cx"> menu->addAction( &m_actionWeeklyTimesheetReport );
</span><span class="cx"> menu->addAction( &m_actionMonthlyTimesheetReport );
</span><span class="lines">@@ -24,7 +25,7 @@
</span><span class="cx"> menu->addSeparator();
</span><span class="cx"> #endif
</span><span class="cx"> menu->addAction( &m_actionPreferences );
</span><del>-@@ -277,7 +279,7 @@ void ApplicationCore::createFileMenu( QMenuBar *menuBar )
</del><ins>+@@ -292,7 +294,7 @@ void ApplicationCore::createFileMenu( QMenuBar *menuBar )
</ins><span class="cx"> menu->addAction( &m_actionSyncTasks );
</span><span class="cx"> menu->addAction( &m_actionImportTasks );
</span><span class="cx"> menu->addAction( &m_actionExportTasks );
</span><span class="lines">@@ -34,10 +35,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> menu->addAction( &m_actionQuit );
</span><span class="cx"> diff --git Charm/Charm.cpp Charm/Charm.cpp
</span><del>-index 4872e3a..951ba5a 100644
</del><ins>+index cc05cbe..19e03f7 100644
</ins><span class="cx"> --- Charm/Charm.cpp
</span><span class="cx"> +++ Charm/Charm.cpp
</span><del>-@@ -13,9 +13,10 @@
</del><ins>+@@ -38,9 +38,10 @@
</ins><span class="cx">
</span><span class="cx"> static ApplicationCore* createApplicationCore()
</span><span class="cx"> {
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx"> return new ApplicationCore;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@@ -46,6 +47,9 @@ int main ( int argc, char** argv )
</del><ins>+@@ -71,6 +72,9 @@ int main ( int argc, char** argv )
</ins><span class="cx">
</span><span class="cx"> try {
</span><span class="cx"> QApplication app( argc, argv );
</span><span class="lines">@@ -62,10 +63,10 @@
</span><span class="cx"> QObject::connect( &app, SIGNAL(commitDataRequest(QSessionManager&)), core.data(), SLOT(commitData(QSessionManager&)) );
</span><span class="cx"> QObject::connect( &app, SIGNAL(saveStateRequest(QSessionManager&)), core.data(), SLOT(saveState(QSessionManager&)) );
</span><span class="cx"> diff --git Charm/Data.cpp Charm/Data.cpp
</span><del>-index ad8abfa..a7778b1 100644
</del><ins>+index b5cf19e..b823d09 100644
</ins><span class="cx"> --- Charm/Data.cpp
</span><span class="cx"> +++ Charm/Data.cpp
</span><del>-@@ -18,7 +18,7 @@ const QIcon& Data::charmTrayIcon()
</del><ins>+@@ -46,7 +46,7 @@ const QIcon& Data::charmTrayIcon()
</ins><span class="cx"> // On X11: pure-Qt apps get 22x22 from QSystemTrayIcon.
</span><span class="cx"> // KDE apps seem to get 24x24 in KSystemTrayIcon via KIconLoader, which is actually better.
</span><span class="cx">
</span><span class="lines">@@ -74,7 +75,7 @@
</span><span class="cx"> static const QString iconPath = QLatin1String(":/Charm/charmtray_mac.png");
</span><span class="cx"> #else
</span><span class="cx"> static const QString iconPath = QLatin1String(":/Charm/charmtray22.png");
</span><del>-@@ -37,7 +37,7 @@ const QIcon& Data::charmTrayActiveIcon()
</del><ins>+@@ -65,7 +65,7 @@ const QIcon& Data::charmTrayActiveIcon()
</ins><span class="cx"> // On X11: pure-Qt apps get 22x22 from QSystemTrayIcon.
</span><span class="cx"> // KDE apps seem to get 24x24 in KSystemTrayIcon via KIconLoader, which is actually better.
</span><span class="cx">
</span><span class="lines">@@ -84,10 +85,10 @@
</span><span class="cx"> #else
</span><span class="cx"> static const QString iconPath = QLatin1String(":/Charm/charmtrayactive22.png");
</span><span class="cx"> diff --git Charm/Idle/IdleDetector.cpp Charm/Idle/IdleDetector.cpp
</span><del>-index 131e76e..47c575c 100644
</del><ins>+index 4da8dd3..6380bb7 100644
</ins><span class="cx"> --- Charm/Idle/IdleDetector.cpp
</span><span class="cx"> +++ Charm/Idle/IdleDetector.cpp
</span><del>-@@ -20,7 +20,7 @@ IdleDetector::IdleDetector( QObject* parent )
</del><ins>+@@ -46,7 +46,7 @@ IdleDetector::IdleDetector( QObject* parent )
</ins><span class="cx"> IdleDetector* IdleDetector::createIdleDetector( QObject* parent )
</span><span class="cx"> {
</span><span class="cx"> #ifdef CHARM_IDLE_DETECTION
</span><span class="lines">@@ -97,10 +98,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> diff --git Charm/Widgets/CharmWindow.cpp Charm/Widgets/CharmWindow.cpp
</span><del>-index 375aedc..8bd7657 100644
</del><ins>+index 565d751..dcb9fcb 100644
</ins><span class="cx"> --- Charm/Widgets/CharmWindow.cpp
</span><span class="cx"> +++ Charm/Widgets/CharmWindow.cpp
</span><del>-@@ -85,7 +85,7 @@ void CharmWindow::setWindowNumber( int number )
</del><ins>+@@ -108,7 +108,7 @@ void CharmWindow::setWindowNumber( int number )
</ins><span class="cx"> delete m_shortcut;
</span><span class="cx"> m_shortcut = new QShortcut( this );
</span><span class="cx"> QKeySequence sequence( tr( "Ctrl+%1" ).arg( number ) );
</span><span class="lines">@@ -110,10 +111,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> m_shortcut->setContext( Qt::ApplicationShortcut );
</span><span class="cx"> diff --git Charm/Widgets/EventView.cpp Charm/Widgets/EventView.cpp
</span><del>-index 2fb9ef4..2eae8aa 100644
</del><ins>+index e295d9d..76a4789 100644
</ins><span class="cx"> --- Charm/Widgets/EventView.cpp
</span><span class="cx"> +++ Charm/Widgets/EventView.cpp
</span><del>-@@ -96,7 +96,7 @@ EventView::EventView( QToolBar* toolBar, QWidget* parent )
</del><ins>+@@ -119,7 +119,7 @@ EventView::EventView( QToolBar* toolBar, QWidget* parent )
</ins><span class="cx"> m_actionDeleteEvent.setText( tr( "Delete Event..." ) );
</span><span class="cx"> QList<QKeySequence> deleteShortcuts;
</span><span class="cx"> deleteShortcuts << QKeySequence::Delete;
</span></span></pre>
</div>
</div>
</body>
</html>