[110986] trunk/dports/kde/kmymoney4-devel

[mk at macports.org]

Revision: 110986
          https://trac.macports.org/changeset/110986
Author:   mk at macports.org
Date:     2013-09-12 16:10:40 -0700 (Thu, 12 Sep 2013)
Log Message:
-----------
kmymoney4-devel: update to latest git version, allow building also with port aqbanking5-devel, remove x11-related variants

Modified Paths:
--------------
    trunk/dports/kde/kmymoney4-devel/Portfile

Removed Paths:
-------------
    trunk/dports/kde/kmymoney4-devel/files/online-balance-difference_highlight.patch.diff

Modified: trunk/dports/kde/kmymoney4-devel/Portfile
===================================================================
--- trunk/dports/kde/kmymoney4-devel/Portfile	2013-09-12 22:35:16 UTC (rev 110985)
+++ trunk/dports/kde/kmymoney4-devel/Portfile	2013-09-12 23:10:40 UTC (rev 110986)
@@ -8,10 +8,10 @@
 
 fetch.type          git
 git.url             git://anongit.kde.org/kmymoney
-git.branch          05f21db8a54fa47ce69360addd2eceb482f7a0e9
+git.branch          ea3250bdde4c0ce4fff7aa5a61cdafc3e7d0ebe2
 
 name                kmymoney4-devel
-version             4.6-20130902
+version             4.6-20130913
 
 categories          kde kde4 finance
 maintainers         mk pixilla openmaintainer
@@ -33,7 +33,7 @@
 build.asroot        yes
 
 depends_lib-append  port:libofx \
-                    port:aqbanking5 \
+                    path:lib/libaqbanking.dylib:aqbanking5 \
                     port:kde4-runtime \
                     port:kdepimlibs4 \
                     port:oxygen-icons \
@@ -52,9 +52,3 @@
 	configure.args-append  -DCMAKE_BUILD_TYPE=Debugfull
 }
 
-#default_variants +no_x11 +no_gtk
-
-variant no_x11 description {build without X11 to avoid unneeded dependencies} {}
-
-variant no_gtk description {build without GTK support to ensure avahi gets build without it, thus avoiding X11 dependencies} {}
-

Deleted: trunk/dports/kde/kmymoney4-devel/files/online-balance-difference_highlight.patch.diff
===================================================================
--- trunk/dports/kde/kmymoney4-devel/files/online-balance-difference_highlight.patch.diff	2013-09-12 22:35:16 UTC (rev 110985)
+++ trunk/dports/kde/kmymoney4-devel/files/online-balance-difference_highlight.patch.diff	2013-09-12 23:10:40 UTC (rev 110986)
@@ -1,80 +0,0 @@
-diff --git a/kmymoney/widgets/register.cpp b/kmymoney/widgets/register.cpp
-index 39d991c..267326b 100644
---- a/kmymoney/widgets/register.cpp
-+++ b/kmymoney/widgets/register.cpp
-@@ -58,6 +58,7 @@
- #include "stdtransactionmatched.h"
- #include "scheduledtransaction.h"
- #include "kmymoneyglobalsettings.h"
-+#include "../mymoney/mymoneyfile.h"
- 
- const int LinesPerMemo = 3;
- 
-@@ -234,7 +235,8 @@ bool ItemPtrVector::item_cmp(RegisterItem* i1, RegisterItem* i2)
- GroupMarker::GroupMarker(Register *parent, const QString& txt) :
-     RegisterItem(parent),
-     m_txt(txt),
--    m_showDate(false)
-+    m_showDate(false),
-+    m_erroneous(false)
- {
-   int h;
-   if (m_parent) {
-@@ -284,7 +286,7 @@ void GroupMarker::paintRegisterCell(QPainter *painter, QStyleOptionViewItemV4 &o
-   cellRect.setWidth(m_parent->viewport()->width());
-   cellRect.setHeight(m_parent->rowHeight(index.row()));
- 
--  option.palette.setColor(QPalette::Base, KMyMoneyGlobalSettings::groupMarkerColor());
-+  option.palette.setColor(QPalette::Base, isErroneous() ? KMyMoneyGlobalSettings::listErronousTransactionColor() : KMyMoneyGlobalSettings::groupMarkerColor());
- 
-   QBrush backgroundBrush(option.palette.color(QPalette::Base));
-   painter->fillRect(cellRect, backgroundBrush);
-@@ -292,7 +294,7 @@ void GroupMarker::paintRegisterCell(QPainter *painter, QStyleOptionViewItemV4 &o
-   painter->drawLine(cellRect.x(), cellRect.height() - 1, cellRect.width(), cellRect.height() - 1);
- 
-   // now write the text
--  painter->setPen(option.palette.color(QPalette::Text));
-+  painter->setPen(option.palette.color( isErroneous() ? QPalette::HighlightedText : QPalette::Text ));
-   QFont font = painter->font();
-   font.setBold(true);
-   painter->setFont(font);
-@@ -2013,7 +2015,12 @@ void Register::addGroupMarkers(void)
-           if (m_account.accountGroup() == MyMoneyAccount::Liability)
-             balance = -balance;
-           QString txt = i18n("Online Statement Balance: %1", balance.formatMoney(m_account.fraction()));
--          new KMyMoneyRegister::StatementGroupMarker(this, KMyMoneyRegister::Deposit, QDate::fromString(m_account.value("lastImportedTransactionDate"), Qt::ISODate), txt);
-+
-+          MyMoneyMoney accBalance = MyMoneyFile::instance()->balance(m_account.id(), QDate::fromString(m_account.value("lastImportedTransactionDate")));
-+
-+          KMyMoneyRegister::StatementGroupMarker *p=new KMyMoneyRegister::StatementGroupMarker(this, KMyMoneyRegister::Deposit, QDate::fromString(m_account.value("lastImportedTransactionDate"), Qt::ISODate), txt);
-+
-+          if(balance != accBalance) p->setErroneous();
-         }
- 
-         new KMyMoneyRegister::FancyDateGroupMarker(this, thisYear, i18n("This year"));
-diff --git a/kmymoney/widgets/register.h b/kmymoney/widgets/register.h
-index 8cd1a32..8c5a8ee 100644
---- a/kmymoney/widgets/register.h
-+++ b/kmymoney/widgets/register.h
-@@ -156,12 +156,21 @@ public:
-     return 0;
-   }
- 
-+  void setErroneous(bool condition=true) {
-+    m_erroneous = condition;
-+  }
-+  bool isErroneous(void) const {
-+    return m_erroneous;
-+  }
-+
- protected:
-   QString                  m_txt;
-   bool                     m_showDate;
- 
-   static QPixmap*          m_bg;
-   static int               m_bgRefCnt;
-+
-+  bool                     m_erroneous;
- };
- 
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130912/24d95423/attachment.html>