Date: Saturday, July 31, 2021 @ 17:28:41 Author: arojas Revision: 991160
Update to 5.1.2 Modified: kmymoney/trunk/PKGBUILD Deleted: kmymoney/trunk/kmymoney-qsortfilterproxymodel-crash.patch --------------------------------------------+ PKGBUILD | 20 +-- kmymoney-qsortfilterproxymodel-crash.patch | 154 --------------------------- 2 files changed, 7 insertions(+), 167 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-07-31 17:28:35 UTC (rev 991159) +++ PKGBUILD 2021-07-31 17:28:41 UTC (rev 991160) @@ -6,8 +6,8 @@ # Contributor: Todd Maynard <[email protected]> pkgname=kmymoney -pkgver=5.1.1 -pkgrel=2 +pkgver=5.1.2 +pkgrel=1 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" arch=('x86_64') url="https://kmymoney.org/"; @@ -15,22 +15,16 @@ depends=('aqbanking' 'gwenhywfar' 'boost-libs' 'libalkimia' 'sqlcipher' 'qt5-base' 'qgpgme' 'karchive' 'kcoreaddons' 'kconfig' 'kwidgetsaddons' 'ki18n' 'kcompletion' 'kcmutils' 'kitemmodels' 'kitemviews' 'kservice' 'kwallet' 'kiconthemes' 'kxmlgui' 'kidentitymanagement' - 'ktextwidgets' 'knotifications' 'kio' 'kdoctools' 'kholidays' 'kross' 'kactivities' + 'ktextwidgets' 'knotifications' 'kio' 'kholidays' 'kross' 'kactivities' 'kqtquickcharts' 'kdiagram' 'kdewebkit' 'kcontacts' 'libical' 'libakonadi' 'shared-mime-info') -makedepends=('boost' 'extra-cmake-modules' 'doxygen') +makedepends=('boost' 'extra-cmake-modules' 'kdoctools' 'doxygen') optdepends=('perl: for financequote.pl') changelog=$pkgname.changelog -source=(https://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig} - kmymoney-qsortfilterproxymodel-crash.patch) +source=(https://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}) validpgpkeys=('D69A745A55331F44F404D8258D4DE062AA2EB01C') -sha256sums=('df7b9f78e8596f99d28295ca738708f0655ee057789dfd921c7b1bab96578298' - 'SKIP' - 'c21c3c6d2c9af63b7d2dd63b51cd9746a9b3952d2230b19bd59569ce8fb0fe55') +sha256sums=('37bdc4e763a2849b9f739f73e38b389c02bde1c1b1844edcfa7e3ab1d5bf7b3b' + 'SKIP') -prepare() { - patch -d $pkgname-$pkgver -p1 < kmymoney-qsortfilterproxymodel-crash.patch # FS#70367, rebase of de390aed4652a0e9ff0bffcade33827a6283aaa1 -} - build() { cd "${srcdir}"/$pkgname-$pkgver Deleted: kmymoney-qsortfilterproxymodel-crash.patch =================================================================== --- kmymoney-qsortfilterproxymodel-crash.patch 2021-07-31 17:28:35 UTC (rev 991159) +++ kmymoney-qsortfilterproxymodel-crash.patch 2021-07-31 17:28:41 UTC (rev 991160) @@ -1,154 +0,0 @@ -diff --git a/kmymoney/converter/mymoneystatementreader.cpp b/kmymoney/converter/mymoneystatementreader.cpp -index 5de39e146..8a03ebac9 100644 ---- a/kmymoney/converter/mymoneystatementreader.cpp -+++ b/kmymoney/converter/mymoneystatementreader.cpp -@@ -1055,8 +1055,8 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra - filterProxyModel->addAccountGroup(QVector<Account::Type> {Account::Type::Asset, Account::Type::Liability, Account::Type::Equity, Account::Type::Income, Account::Type::Expense}); - - auto const model = Models::instance()->accountsModel(); -- filterProxyModel->setSourceModel(model); - filterProxyModel->setSourceColumns(model->getColumns()); -+ filterProxyModel->setSourceModel(model); - filterProxyModel->sort((int)eAccountsModel::Column::Account); - - QPointer<KMyMoneyAccountCombo> accountCombo = new KMyMoneyAccountCombo(filterProxyModel); -diff --git a/kmymoney/dialogs/kaccountselectdlg.cpp b/kmymoney/dialogs/kaccountselectdlg.cpp -index c051611a6..67cdbe120 100644 ---- a/kmymoney/dialogs/kaccountselectdlg.cpp -+++ b/kmymoney/dialogs/kaccountselectdlg.cpp -@@ -135,8 +135,8 @@ KAccountSelectDlg::KAccountSelectDlg(const eDialogs::Category accountType, const - filterProxyModel->addAccountGroup(accountTypes); - - auto model = Models::instance()->accountsModel(); -- filterProxyModel->setSourceModel(model); - filterProxyModel->setSourceColumns(model->getColumns()); -+ filterProxyModel->setSourceModel(model); - filterProxyModel->sort((int)eAccountsModel::Column::Account); - - d->ui->m_accountSelector->setModel(filterProxyModel); -diff --git a/kmymoney/dialogs/knewaccountdlg.cpp b/kmymoney/dialogs/knewaccountdlg.cpp -index ef5dc84aa..65455982a 100644 ---- a/kmymoney/dialogs/knewaccountdlg.cpp -+++ b/kmymoney/dialogs/knewaccountdlg.cpp -@@ -136,8 +136,8 @@ public: - m_filterProxyModel->addAccountGroup(filterAccountGroup); - m_filterProxyModel->setCurrentAccountId(m_account.id()); - auto const model = Models::instance()->accountsModel(); -- m_filterProxyModel->setSourceModel(model); - m_filterProxyModel->setSourceColumns(model->getColumns()); -+ m_filterProxyModel->setSourceModel(model); - m_filterProxyModel->setDynamicSortFilter(true); - - ui->m_parentAccounts->setModel(m_filterProxyModel); -diff --git a/kmymoney/views/kgloballedgerview_p.h b/kmymoney/views/kgloballedgerview_p.h -index 156a3cd0d..1104910bd 100644 ---- a/kmymoney/views/kgloballedgerview_p.h -+++ b/kmymoney/views/kgloballedgerview_p.h -@@ -283,8 +283,8 @@ public: - m_filterProxyModel = new AccountNamesFilterProxyModel(q); - m_filterProxyModel->addAccountGroup(QVector<eMyMoney::Account::Type> {eMyMoney::Account::Type::Asset, eMyMoney::Account::Type::Liability, eMyMoney::Account::Type::Equity}); - auto const model = Models::instance()->accountsModel(); -- m_filterProxyModel->setSourceModel(model); - m_filterProxyModel->setSourceColumns(model->getColumns()); -+ m_filterProxyModel->setSourceModel(model); - m_filterProxyModel->sort((int)eAccountsModel::Column::Account); - - // create the toolbar frame at the top of the view -diff --git a/kmymoney/views/kinvestmentview_p.h b/kmymoney/views/kinvestmentview_p.h -index 288c76817..5d879d9d4 100644 ---- a/kmymoney/views/kinvestmentview_p.h -+++ b/kmymoney/views/kinvestmentview_p.h -@@ -116,8 +116,8 @@ public: - m_accountsProxyModel->addAccountType(eMyMoney::Account::Type::Investment); - m_accountsProxyModel->setHideEquityAccounts(false); - auto const model = Models::instance()->accountsModel(); -- m_accountsProxyModel->setSourceModel(model); - m_accountsProxyModel->setSourceColumns(model->getColumns()); -+ m_accountsProxyModel->setSourceModel(model); - m_accountsProxyModel->sort((int)eAccountsModel::Column::Account); - ui->m_accountComboBox->setModel(m_accountsProxyModel); - ui->m_accountComboBox->expandAll(); -diff --git a/kmymoney/views/kpayeesview_p.h b/kmymoney/views/kpayeesview_p.h -index 9156b570f..b47779f6a 100644 ---- a/kmymoney/views/kpayeesview_p.h -+++ b/kmymoney/views/kpayeesview_p.h -@@ -157,8 +157,8 @@ public: - m_filterProxyModel->addAccountGroup(QVector<eMyMoney::Account::Type> {eMyMoney::Account::Type::Asset, eMyMoney::Account::Type::Liability, eMyMoney::Account::Type::Income, eMyMoney::Account::Type::Expense, eMyMoney::Account::Type::Equity}); - - auto const model = Models::instance()->accountsModel(); -- m_filterProxyModel->setSourceModel(model); - m_filterProxyModel->setSourceColumns(model->getColumns()); -+ m_filterProxyModel->setSourceModel(model); - m_filterProxyModel->sort((int)eAccountsModel::Column::Account); - ui->comboDefaultCategory->setModel(m_filterProxyModel); - -diff --git a/kmymoney/views/newspliteditor.cpp b/kmymoney/views/newspliteditor.cpp -index 6ba378f4b..edd8a445e 100644 ---- a/kmymoney/views/newspliteditor.cpp -+++ b/kmymoney/views/newspliteditor.cpp -@@ -212,8 +212,8 @@ NewSplitEditor::NewSplitEditor(QWidget* parent, const QString& counterAccountId) - d->accountsModel->addAccountGroup(QVector<eMyMoney::Account::Type> {eMyMoney::Account::Type::Asset, eMyMoney::Account::Type::Liability, eMyMoney::Account::Type::Income, eMyMoney::Account::Type::Expense, eMyMoney::Account::Type::Equity}); - d->accountsModel->setHideEquityAccounts(false); - auto const model = Models::instance()->accountsModel(); -- d->accountsModel->setSourceModel(model); - d->accountsModel->setSourceColumns(model->getColumns()); -+ d->accountsModel->setSourceModel(model); - d->accountsModel->sort((int)eAccountsModel::Column::Account); - d->ui->accountCombo->setModel(d->accountsModel); - -diff --git a/kmymoney/views/newtransactioneditor.cpp b/kmymoney/views/newtransactioneditor.cpp -index 6f52b7a73..39e2eab0a 100644 ---- a/kmymoney/views/newtransactioneditor.cpp -+++ b/kmymoney/views/newtransactioneditor.cpp -@@ -368,8 +368,8 @@ NewTransactionEditor::NewTransactionEditor(QWidget* parent, const QString& accou - - d->accountsModel->addAccountGroup(QVector<eMyMoney::Account::Type> {eMyMoney::Account::Type::Asset, eMyMoney::Account::Type::Liability, eMyMoney::Account::Type::Income, eMyMoney::Account::Type::Expense, eMyMoney::Account::Type::Equity}); - d->accountsModel->setHideEquityAccounts(false); -- d->accountsModel->setSourceModel(model); - d->accountsModel->setSourceColumns(model->getColumns()); -+ d->accountsModel->setSourceModel(model); - d->accountsModel->sort((int)eAccountsModel::Column::Account); - d->ui->accountCombo->setModel(d->accountsModel); - -diff --git a/kmymoney/views/simpleledgerview.cpp b/kmymoney/views/simpleledgerview.cpp -index 3b79e0e2b..44427f112 100644 ---- a/kmymoney/views/simpleledgerview.cpp -+++ b/kmymoney/views/simpleledgerview.cpp -@@ -107,8 +107,8 @@ public: - - accountsModel->setHideEquityAccounts(false); - auto const model = Models::instance()->accountsModel(); -- accountsModel->setSourceModel(model); - accountsModel->setSourceColumns(model->getColumns()); -+ accountsModel->setSourceModel(model); - accountsModel->sort((int)eAccountsModel::Column::Account); - ui->accountCombo->setModel(accountsModel); - -diff --git a/kmymoney/widgets/kmymoneyaccounttreeview.cpp b/kmymoney/widgets/kmymoneyaccounttreeview.cpp -index 12a199c9b..665925ce4 100644 ---- a/kmymoney/widgets/kmymoneyaccounttreeview.cpp -+++ b/kmymoney/widgets/kmymoneyaccounttreeview.cpp -@@ -179,8 +179,8 @@ AccountsViewProxyModel *KMyMoneyAccountTreeView::init(View view) - institutionsModel->setColumnVisibility(column, true); - } - -- d->m_model->setSourceModel(sourceModel); - d->m_model->setSourceColumns(sourceModel->getColumns()); -+ d->m_model->setSourceModel(sourceModel); - d->m_model->setFilterCaseSensitivity(Qt::CaseInsensitive); - d->m_model->setSortLocaleAware(true); - setModel(d->m_model); -diff --git a/kmymoney/wizards/newaccountwizard/khierarchypage.cpp b/kmymoney/wizards/newaccountwizard/khierarchypage.cpp -index d9c83ae73..bd863c2d7 100644 ---- a/kmymoney/wizards/newaccountwizard/khierarchypage.cpp -+++ b/kmymoney/wizards/newaccountwizard/khierarchypage.cpp -@@ -65,8 +65,8 @@ namespace NewAccountWizard - d->m_filterProxyModel->setHideEquityAccounts(!KMyMoneySettings::expertMode()); - d->m_filterProxyModel->addAccountGroup(QVector<Account::Type> {Account::Type::Asset, Account::Type::Liability}); - auto const model = Models::instance()->accountsModel(); -- d->m_filterProxyModel->setSourceModel(model); - d->m_filterProxyModel->setSourceColumns(model->getColumns()); -+ d->m_filterProxyModel->setSourceModel(model); - d->m_filterProxyModel->setDynamicSortFilter(true); - - d->ui->m_parentAccounts->setModel(d->m_filterProxyModel);
