Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kraft for openSUSE:Factory checked in at 2024-10-06 17:52:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kraft (Old) and /work/SRC/openSUSE:Factory/.kraft.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kraft" Sun Oct 6 17:52:42 2024 rev:25 rq:1205819 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kraft/kraft.changes 2024-05-13 01:15:44.147261272 +0200 +++ /work/SRC/openSUSE:Factory/.kraft.new.19354/kraft.changes 2024-10-06 17:52:54.419436240 +0200 @@ -1,0 +2,10 @@ +Tue Oct 1 19:07:43 UTC 2024 - Klaas Freitag <[email protected]> + +- Update to upstream version 1.2.2 + + * Regular service release to fix bugs + * Fix #242: Do not push item types (Demand) to followup docs + * Fix #241: Allow negative item sums + * Changes to fix CI + +------------------------------------------------------------------- Old: ---- kraft-1.2.1.tar.xz New: ---- kraft-1.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kraft.spec ++++++ --- /var/tmp/diff_new_pack.0INlmH/_old 2024-10-06 17:52:55.115465164 +0200 +++ /var/tmp/diff_new_pack.0INlmH/_new 2024-10-06 17:52:55.115465164 +0200 @@ -28,7 +28,7 @@ %endif %bcond_with qpdfview Name: kraft -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: KDE software to manage office documents in the office License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ kraft-1.2.1.tar.xz -> kraft-1.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kraft-1.2.1/.github/workflows/main.yml new/kraft-1.2.2/.github/workflows/main.yml --- old/kraft-1.2.1/.github/workflows/main.yml 2024-05-05 22:24:03.000000000 +0200 +++ new/kraft-1.2.2/.github/workflows/main.yml 2024-10-01 21:03:30.000000000 +0200 @@ -5,7 +5,7 @@ jobs: appimage-build: runs-on: ubuntu-latest - container: opensuse/leap:15.2 + container: opensuse/leap:15.3 steps: # need to install Git >= 2.18 before checkout according to GitHub actions # we can just install all the dependencies beforehand, though @@ -36,20 +36,21 @@ libQt5Sql5-mysql \ libqt5-qtdeclarative-tools - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive fetch-depth: 0 - name: Build AppImage run: | + git config --global --add safe.directory /__w/kraft/kraft export APPIMAGE_EXTRACT_AND_RUN=1 wget https://github.com/TheAssassin/appimagecraft/releases/download/continuous/appimagecraft-x86_64.AppImage chmod +x appimagecraft-x86_64.AppImage ./appimagecraft-x86_64.AppImage - name: Archive artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: if-no-files-found: error name: AppImage @@ -63,7 +64,7 @@ runs-on: ubuntu-20.04 steps: - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: Inspect directory after downloading artifacts run: ls -alFR - name: Create release and upload artifacts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kraft-1.2.1/src/addressprovider_akonadi.cpp new/kraft-1.2.2/src/addressprovider_akonadi.cpp --- old/kraft-1.2.1/src/addressprovider_akonadi.cpp 2024-05-05 22:24:03.000000000 +0200 +++ new/kraft-1.2.2/src/addressprovider_akonadi.cpp 2024-10-01 21:03:30.000000000 +0200 @@ -44,6 +44,7 @@ #include <Akonadi/ItemFetchScope> #include <Akonadi/EntityDisplayAttribute> #include <Akonadi/Control> +#include <Akonadi/ServerManager> #else #include <AkonadiCore/ItemFetchJob> #include <AkonadiCore/ItemFetchScope> @@ -54,6 +55,7 @@ #include <AkonadiCore/ItemFetchScope> #include <AkonadiCore/entitydisplayattribute.h> #include <AkonadiCore/control.h> +#include <AkonadiCore/servermanager.h> #endif using namespace Akonadi; @@ -73,7 +75,11 @@ { _akonadiUp = false; #ifdef HAVE_AKONADI - if ( !Akonadi::Control::start( ) ) { + if ( Akonadi::ServerManager::state() == Akonadi::ServerManager::Broken ) { + // should be handled in Akonadi::Control::start(). + // See https://invent.kde.org/pim/akonadi/-/merge_requests/189 + qDebug() << "Akonadi broken: " << Akonadi::ServerManager::brokenReason(); + } else if ( !Akonadi::Control::start( ) ) { qDebug() << "Failed to start Akonadi!"; } else { mSession = new Akonadi::Session( "KraftSession" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kraft-1.2.1/src/calctemplate.ui new/kraft-1.2.2/src/calctemplate.ui --- old/kraft-1.2.1/src/calctemplate.ui 2024-05-05 22:24:03.000000000 +0200 +++ new/kraft-1.2.2/src/calctemplate.ui 2024-10-01 21:03:30.000000000 +0200 @@ -39,10 +39,10 @@ <item> <spacer name="spacer4"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> + <enum>QSizePolicy::Policy::Expanding</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -108,7 +108,7 @@ <item row="0" column="2"> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -128,7 +128,7 @@ <item row="1" column="2"> <spacer name="horizontalSpacer_2"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -276,10 +276,10 @@ <item> <spacer name="spacer5_2"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> + <enum>QSizePolicy::Policy::Expanding</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -397,10 +397,10 @@ <item> <spacer name="spacer6"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> + <enum>QSizePolicy::Policy::Expanding</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -518,10 +518,10 @@ <item> <spacer name="spacer5_2_2"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> + <enum>QSizePolicy::Policy::Expanding</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -552,14 +552,14 @@ <item row="0" column="0"> <widget class="QRadioButton" name="m_rbManual"> <property name="text"> - <string>&Manual Price</string> + <string>Manua&l Price</string> </property> </widget> </item> <item row="0" column="3"> <widget class="QRadioButton" name="m_rbCalculation"> <property name="text"> - <string>Calculated Price</string> + <string>&Calculated Price</string> </property> <property name="shortcut"> <string/> @@ -568,6 +568,9 @@ </item> <item row="1" column="0" colspan="2"> <widget class="QDoubleSpinBox" name="m_manualPriceVal"> + <property name="minimum"> + <double>-99999.000000000000000</double> + </property> <property name="maximum"> <double>99999.000000000000000</double> </property> @@ -585,7 +588,7 @@ <item row="1" column="2"> <spacer name="horizontalSpacer_3"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -603,7 +606,7 @@ <string comment="KDE::DoNotExtract">textLabel2</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="wordWrap"> <bool>false</bool> @@ -626,7 +629,7 @@ <string comment="KDE::DoNotExtract">textLabel2</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="wordWrap"> <bool>false</bool> @@ -649,7 +652,7 @@ <string comment="KDE::DoNotExtract">textLabel2</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="wordWrap"> <bool>false</bool> @@ -668,7 +671,7 @@ <string/> </property> <property name="text"> - <string>Profit:</string> + <string>&Profit:</string> </property> <property name="wordWrap"> <bool>false</bool> @@ -681,7 +684,7 @@ <item row="3" column="1"> <widget class="QSpinBox" name="spBenefit"> <property name="buttonSymbols"> - <enum>QAbstractSpinBox::UpDownArrows</enum> + <enum>QAbstractSpinBox::ButtonSymbols::UpDownArrows</enum> </property> <property name="specialValueText"> <string/> @@ -715,7 +718,7 @@ <item row="2" column="1"> <spacer name="verticalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -728,10 +731,10 @@ <item row="3" column="1" colspan="3"> <widget class="QFrame" name="frame"> <property name="frameShape"> - <enum>QFrame::HLine</enum> + <enum>QFrame::Shape::HLine</enum> </property> <property name="frameShadow"> - <enum>QFrame::Raised</enum> + <enum>QFrame::Shadow::Raised</enum> </property> </widget> </item> @@ -739,7 +742,6 @@ <widget class="QLabel" name="m_resPreisName"> <property name="font"> <font> - <weight>75</weight> <bold>true</bold> </font> </property> @@ -747,7 +749,7 @@ <string>Calculated price:</string> </property> <property name="textFormat"> - <enum>Qt::PlainText</enum> + <enum>Qt::TextFormat::PlainText</enum> </property> <property name="wordWrap"> <bool>false</bool> @@ -758,7 +760,6 @@ <widget class="QLabel" name="m_resultPrice"> <property name="font"> <font> - <weight>75</weight> <bold>true</bold> </font> </property> @@ -769,10 +770,10 @@ <string>88.888,88 â¬</string> </property> <property name="textFormat"> - <enum>Qt::PlainText</enum> + <enum>Qt::TextFormat::PlainText</enum> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> </widget> </item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kraft-1.2.1/src/inserttempldialog.cpp new/kraft-1.2.2/src/inserttempldialog.cpp --- old/kraft-1.2.1/src/inserttempldialog.cpp 2024-05-05 22:24:03.000000000 +0200 +++ new/kraft-1.2.2/src/inserttempldialog.cpp 2024-10-01 21:03:30.000000000 +0200 @@ -53,9 +53,6 @@ mBaseWidget->mPriceVal->setSuffix( DefaultProvider::self()->currencySymbol() ); - mBaseWidget->mPriceVal->setMinimum( 0 ); - mBaseWidget->mPriceVal->setMaximum( 100000 ); - mBaseWidget->mPriceVal->setDecimals( 2 ); mBaseWidget->dmAmount->setDecimals( 2 ); mBaseWidget->dmAmount->setRange( 0, 100000 ); mBaseWidget->dmAmount->setSingleStep( 1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kraft-1.2.1/src/inserttmplbase.ui new/kraft-1.2.2/src/inserttmplbase.ui --- old/kraft-1.2.1/src/inserttmplbase.ui 2024-05-05 22:24:03.000000000 +0200 +++ new/kraft-1.2.2/src/inserttmplbase.ui 2024-10-01 21:03:30.000000000 +0200 @@ -22,7 +22,6 @@ <property name="font"> <font> <pointsize>18</pointsize> - <weight>75</weight> <bold>true</bold> </font> </property> @@ -30,7 +29,7 @@ <string>Create Item from Template</string> </property> <property name="textFormat"> - <enum>Qt::PlainText</enum> + <enum>Qt::TextFormat::PlainText</enum> </property> <property name="wordWrap"> <bool>false</bool> @@ -85,6 +84,9 @@ </item> <item> <widget class="QDoubleSpinBox" name="mPriceVal"> + <property name="minimum"> + <double>-999999.989999999990687</double> + </property> <property name="maximum"> <double>999999.989999999990687</double> </property> @@ -93,10 +95,10 @@ <item> <spacer name="spacer2"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> + <enum>QSizePolicy::Policy::Expanding</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -129,10 +131,10 @@ <item> <spacer name="spacer1"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Preferred</enum> + <enum>QSizePolicy::Policy::Preferred</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -150,7 +152,7 @@ <item> <widget class="QGroupBox" name="mKeepGroup"> <property name="title"> - <string>Keep this item as template for future documents</string> + <string>Keep &this item as template for future documents</string> </property> <property name="checkable"> <bool>true</bool> @@ -186,10 +188,10 @@ <item> <spacer name="spacer3"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Preferred</enum> + <enum>QSizePolicy::Policy::Preferred</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -216,7 +218,7 @@ <item row="2" column="1" colspan="2"> <widget class="QDialogButtonBox" name="mButtonBox"> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> </property> </widget> </item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kraft-1.2.1/src/kraftview.cpp new/kraft-1.2.2/src/kraftview.cpp --- old/kraft-1.2.1/src/kraftview.cpp 2024-05-05 22:24:03.000000000 +0200 +++ new/kraft-1.2.2/src/kraftview.cpp 2024-10-01 21:03:30.000000000 +0200 @@ -885,9 +885,10 @@ DocType docType( newType ); PositionViewWidgetListIterator it( mPositionWidgetList ); + bool allow = docType.allowAlternative() || docType.allowDemand(); while( it.hasNext() ) { PositionViewWidget *w = it.next(); - w->slotEnableKindMenu( docType.allowAlternative() ); + w->slotEnableKindMenu(allow); w->slotShowPrice(docType.pricesVisible()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kraft-1.2.1/src/portal.cpp new/kraft-1.2.2/src/portal.cpp --- old/kraft-1.2.1/src/portal.cpp 2024-05-05 22:24:03.000000000 +0200 +++ new/kraft-1.2.2/src/portal.cpp 2024-10-01 21:03:30.000000000 +0200 @@ -575,7 +575,23 @@ delete copyDoc; } - DocGuardedPtr doc = DocumentMan::self()->createDocument(wiz.docType(), locId, posToCopy); + // Check if the new document type allows demand- or alternative items. If not, remove the + // attributes of the items, otherwise it can not be edited any more + // see https://github.com/dragotin/kraft/issues/242 + DocType newDocType = wiz.docType(); + bool allowKind = newDocType.allowAlternative() || newDocType.allowDemand(); + if (!allowKind) { + for(DocPositionBase *dp:posToCopy) { + AttributeMap attribs = dp->attributes(); + + if (attribs.hasAttribute("kind")) { + attribs.remove("kind"); + dp->setAttributeMap(attribs); + } + } + } + + DocGuardedPtr doc = DocumentMan::self()->createDocument(newDocType.name(), locId, posToCopy); doc->setDate( wiz.date() ); doc->setWhiteboard( wiz.whiteboard() ); createView( doc ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kraft-1.2.1/src/version.h.in new/kraft-1.2.2/src/version.h.in --- old/kraft-1.2.1/src/version.h.in 2024-05-05 22:24:03.000000000 +0200 +++ new/kraft-1.2.2/src/version.h.in 2024-10-01 21:03:30.000000000 +0200 @@ -4,7 +4,7 @@ namespace Version { // Static content. Maintain values here. - inline QString number() { return QStringLiteral("1.2.1"); } + inline QString number() { return QStringLiteral("1.2.2"); } inline QString codeName() { return QStringLiteral("Lynoel"); } inline int dbSchemaVersion() { return 24; }
