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