Changeset 133829 for trunk/dports/office


Ignore:
Timestamp:
Mar 12, 2015, 7:38:42 PM (3 years ago)
Author:
mk@…
Message:

charm: update to latest git faaf49e9 (which fixes some Cocoa issues)

Location:
trunk/dports/office/charm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/office/charm/Portfile

    r131903 r133829  
    66PortGroup           cmake 1.0
    77
    8 github.setup        KDAB Charm aca5faf6
     8github.setup        KDAB Charm faaf49e9
    99
    1010# The last release version is too old:
     
    1414name                charm
    1515version             1.8.0
     16revision            20150312
    1617maintainers         gmail.com:rjvbertin mk openmaintainer
    1718categories          office
     
    3839configure.args-append   -DCharm_VERSION="${version}-${github.version}" -DBIN_INSTALL_DIR:PATH=${qt_apps_dir}
    3940
    40 # aca5faf6
    41 checksums           rmd160  c0f938504705477a751f4be7f28220de261a1e56 \
    42                     sha256  1651dc8fb4c5100c96137e1fe076ce86a89b98b2e81e652a4fae1b8a5c5860f7
     41# faaf49e9
     42checksums           rmd160  50e87a81e853c81ea0d538f7a165570d0e9f2ac0 \
     43                    sha256  f49b485e0bd072f3564420859d0114538a3d321cd2f9c1a124d488aefbea8424
    4344
    4445# 1.8.0
  • trunk/dports/office/charm/files/adapt-to-osx-macports.patch

    r131841 r133829  
    11diff --git Charm/ApplicationCore.cpp Charm/ApplicationCore.cpp
    2 index 17cd0fe..964d098 100644
     2index bf4832f..29f6a81 100644
    33--- Charm/ApplicationCore.cpp
    44+++ Charm/ApplicationCore.cpp
    5 @@ -158,10 +158,12 @@ ApplicationCore::ApplicationCore( QObject* parent )
    6               SLOT( slotQuitApplication() ) );
     5@@ -173,11 +173,13 @@ ApplicationCore::ApplicationCore( QObject* parent )
     6              SLOT(slotQuitApplication()) );
    77 
    88     m_actionAboutDialog.setText( tr( "About Charm" ) );
    99+    m_actionAboutDialog.setMenuRole(QAction::AboutRole);
    10      connect( &m_actionAboutDialog, SIGNAL( triggered() ),
    11               &mainView(),  SLOT( slotAboutDialog() ) );
     10     connect( &m_actionAboutDialog, SIGNAL(triggered()),
     11              &mainView(),  SLOT(slotAboutDialog()) );
    1212 
    1313     m_actionPreferences.setText( tr( "Preferences" ) );
     14     m_actionPreferences.setIcon( Data::configureIcon() );
    1415+    m_actionPreferences.setMenuRole(QAction::PreferencesRole);
    15      m_actionPreferences.setIcon( Data::configureIcon() );
    16      connect( &m_actionPreferences, SIGNAL( triggered( bool ) ),
    17               &mainView(),  SLOT( slotEditPreferences( bool ) ) );
    18 @@ -260,7 +262,7 @@ void ApplicationCore::createWindowMenu( QMenuBar *menuBar )
     16     connect( &m_actionPreferences, SIGNAL(triggered(bool)),
     17              &mainView(),  SLOT(slotEditPreferences(bool)) );
     18     m_actionPreferences.setEnabled( true );
     19@@ -275,7 +277,7 @@ void ApplicationCore::createWindowMenu( QMenuBar *menuBar )
    1920     menu->addAction( &m_actionActivityReport );
    2021     menu->addAction( &m_actionWeeklyTimesheetReport );
     
    2526 #endif
    2627     menu->addAction( &m_actionPreferences );
    27 @@ -277,7 +279,7 @@ void ApplicationCore::createFileMenu( QMenuBar *menuBar )
     28@@ -292,7 +294,7 @@ void ApplicationCore::createFileMenu( QMenuBar *menuBar )
    2829     menu->addAction( &m_actionSyncTasks );
    2930     menu->addAction( &m_actionImportTasks );
     
    3536     menu->addAction( &m_actionQuit );
    3637diff --git Charm/Charm.cpp Charm/Charm.cpp
    37 index 4872e3a..951ba5a 100644
     38index cc05cbe..19e03f7 100644
    3839--- Charm/Charm.cpp
    3940+++ Charm/Charm.cpp
    40 @@ -13,9 +13,10 @@
     41@@ -38,9 +38,10 @@
    4142 
    4243 static ApplicationCore* createApplicationCore()
     
    5253 }
    5354 
    54 @@ -46,6 +47,9 @@ int main ( int argc, char** argv )
     55@@ -71,6 +72,9 @@ int main ( int argc, char** argv )
    5556 
    5657     try {
     
    6364         QObject::connect( &app, SIGNAL(saveStateRequest(QSessionManager&)), core.data(), SLOT(saveState(QSessionManager&)) );
    6465diff --git Charm/Data.cpp Charm/Data.cpp
    65 index ad8abfa..a7778b1 100644
     66index b5cf19e..b823d09 100644
    6667--- Charm/Data.cpp
    6768+++ Charm/Data.cpp
    68 @@ -18,7 +18,7 @@ const QIcon& Data::charmTrayIcon()
     69@@ -46,7 +46,7 @@ const QIcon& Data::charmTrayIcon()
    6970     // On X11: pure-Qt apps get 22x22 from QSystemTrayIcon.
    7071     // KDE apps seem to get 24x24 in KSystemTrayIcon via KIconLoader, which is actually better.
     
    7576 #else
    7677     static const QString iconPath = QLatin1String(":/Charm/charmtray22.png");
    77 @@ -37,7 +37,7 @@ const QIcon& Data::charmTrayActiveIcon()
     78@@ -65,7 +65,7 @@ const QIcon& Data::charmTrayActiveIcon()
    7879     // On X11: pure-Qt apps get 22x22 from QSystemTrayIcon.
    7980     // KDE apps seem to get 24x24 in KSystemTrayIcon via KIconLoader, which is actually better.
     
    8586     static const QString iconPath = QLatin1String(":/Charm/charmtrayactive22.png");
    8687diff --git Charm/Idle/IdleDetector.cpp Charm/Idle/IdleDetector.cpp
    87 index 131e76e..47c575c 100644
     88index 4da8dd3..6380bb7 100644
    8889--- Charm/Idle/IdleDetector.cpp
    8990+++ Charm/Idle/IdleDetector.cpp
    90 @@ -20,7 +20,7 @@ IdleDetector::IdleDetector( QObject* parent )
     91@@ -46,7 +46,7 @@ IdleDetector::IdleDetector( QObject* parent )
    9192 IdleDetector* IdleDetector::createIdleDetector( QObject* parent )
    9293 {
     
    9899 
    99100diff --git Charm/Widgets/CharmWindow.cpp Charm/Widgets/CharmWindow.cpp
    100 index 375aedc..8bd7657 100644
     101index 565d751..dcb9fcb 100644
    101102--- Charm/Widgets/CharmWindow.cpp
    102103+++ Charm/Widgets/CharmWindow.cpp
    103 @@ -85,7 +85,7 @@ void CharmWindow::setWindowNumber( int number )
     104@@ -108,7 +108,7 @@ void CharmWindow::setWindowNumber( int number )
    104105     delete m_shortcut;
    105106     m_shortcut = new QShortcut( this );
     
    111112     m_shortcut->setContext( Qt::ApplicationShortcut );
    112113diff --git Charm/Widgets/EventView.cpp Charm/Widgets/EventView.cpp
    113 index 2fb9ef4..2eae8aa 100644
     114index e295d9d..76a4789 100644
    114115--- Charm/Widgets/EventView.cpp
    115116+++ Charm/Widgets/EventView.cpp
    116 @@ -96,7 +96,7 @@ EventView::EventView( QToolBar* toolBar, QWidget* parent )
     117@@ -119,7 +119,7 @@ EventView::EventView( QToolBar* toolBar, QWidget* parent )
    117118     m_actionDeleteEvent.setText( tr( "Delete Event..." ) );
    118119     QList<QKeySequence> deleteShortcuts;
Note: See TracChangeset for help on using the changeset viewer.