From d4789079e57068ce33ca9504962b55271740b368a173dd2b082cf313c50fb269 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 11 Apr 2019 14:49:54 +0000 Subject: [PATCH 1/2] Accepting request 693274 from home:wolfi323:branches:KDE:Extra - Update to 3.2.0 * Bug fixes + Add protection against invalid translation of widget names + Startup: Improve display of tried locations for resources lookup and lookup algorithm (kde#391810) + Startup: Add missing translations for "Could not open icon resource file" messages + General: Make certain views work in User mode (kde#396875) + General: Add "All files" filter to file widgets for non-Plasma systems + General: Welcome page: Always display the project file names in addition to captions + General: Welcome page: Add long localized last opening date to project tool tips + General: Welcome page: Show recent project files that start with "." / hidden files + Table View: Make zero values displayed for integer columns (kde#395189) + Table View: Fix validation of values in default input box of table view (kde#395225) + Table and Form View: Fix two-digit year formats issue: do not allow by default (kde#378481) * Years are 4 digits now in tables and forms. On the output INFO message says as explained at https://bugs.kde.org/show_bug.cgi?id=378481#c5. Data entry works based on this new year format. Changes are properly saved to db. Display output e.g. in queries and reports follow this format too. * Set AllowTwoDigitYearFormats=true in kexirc, [General] section to force using 2 digits. + Queries: Fix crash on failed opening of query in Design view + Forms: Fix crash when right-clicking in form data view on widget such as text box (kde#402923) + Reports: Fix crash in data fetching and aggregation scripts in reports (kde#392753) + Reports: Support params in report queries. KEXI now prompts for parameters in queries that use them. (kde#379694) + Import: Fix translation issue in the Database Importing Assistant (kde#399296) + Import: Skip table name if physical table is non-existing, use the new tableNames API in migration (kde#392112) + MS Access import * Fix crash on importing zero-length memo data (long text) * Fix not being able to handle binary objects larger than 16 MiB. Limit is now 256 MiB. * Fix possible crash when importing MDB file having non-latin characters in column names of unexpected length (kde#396984) + Export: Fix crash on exporting tabular data to clipboard (introduced in 3.1.0) (kde#394519) + Export: Fix filename selection for export dialogs and allow to pre-select filename in file dialogs * Improvements + Assistants: properly focus input boxes after moving to other page, make Alt+arrows work for Back/Next, make Enter accept page if applicable + Project type selection in the new project assistant: do not assume user clicked the type button but just focused it + Improve display of Finish buttons of CSV export/import dialogs + New / Import project assistants * Destination file requester is now of Save type * Use Documents location if there are no recent dirs known yet * Better preserve path while updating filename based on project caption * Buildsystem + Install the application icons + Create (and install) rcc files with kexi icons in co-installable dirs + Fix build with Qt 5.11 (missing headers) + Fix build with Qt 5.6 + Fix data install dir for Windows, make icons installed relative to that + Make appdata.xml, app icons and kexi.desktop co-installable + Make KEXI compile for MOBILE productset + Win/Mac: still install copied KEXI files but add the original ones to the binary because the copied ones do not exist yet before ecm_add_app_icon() gets called + CMake: find PostgreSQL 11 - Drop patches merged upstream: * Install-the-application-icons.patch * fix-build-with-qt5.6.patch * Fix-build-with-Qt-511.patch - Use %kf5_find_lang macro to generate the lang package filelist - BuildRequire postgresql-server-devel instead of postgresql-devel on Tumbleweed to fix building the PostgreSQL migration driver - Run spec-cleaner OBS-URL: https://build.opensuse.org/request/show/693274 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kexi?expand=0&rev=14 --- Fix-build-with-Qt-511.patch | 28 --------- Install-the-application-icons.patch | 29 --------- fix-build-with-qt5.6.patch | 59 ------------------ kexi-3.1.0.tar.xz | 3 - kexi-3.2.0.tar.xz | 3 + kexi.changes | 92 +++++++++++++++++++++++++++++ kexi.spec | 43 +++++++------- 7 files changed, 115 insertions(+), 142 deletions(-) delete mode 100644 Fix-build-with-Qt-511.patch delete mode 100644 Install-the-application-icons.patch delete mode 100644 fix-build-with-qt5.6.patch delete mode 100644 kexi-3.1.0.tar.xz create mode 100644 kexi-3.2.0.tar.xz diff --git a/Fix-build-with-Qt-511.patch b/Fix-build-with-Qt-511.patch deleted file mode 100644 index df335ce..0000000 --- a/Fix-build-with-Qt-511.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 1578fcb4a0407cf368edb6ee4605c4ef9e77b6ed -Author: Andreas Sturmlechner -Date: Tue Mar 20 00:06:46 2018 +0100 - - Fix build with Qt 5.11 (missing headers) - - Reviewers: #kexi, staniek - - Reviewed By: #kexi, staniek - - Subscribers: staniek - - Tags: #kexi - - Differential Revision: https://phabricator.kde.org/D11503 - -diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp -index 59e819acc..6568f1b5c 100644 ---- a/src/main/startup/KexiNewProjectAssistant.cpp -+++ b/src/main/startup/KexiNewProjectAssistant.cpp -@@ -48,6 +48,7 @@ - #include - #include - -+#include - #include - #include - #include diff --git a/Install-the-application-icons.patch b/Install-the-application-icons.patch deleted file mode 100644 index 5ed051a..0000000 --- a/Install-the-application-icons.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 12eed3a629a06fe54f52bf0a36b4c8b81f8e5156 Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Mon, 12 Mar 2018 21:47:34 +0100 -Subject: Install the application icons - -The desktop file references the 'kexi' icon, which is looked up in the -icon theme; hence, install the icons as hicolor, so they are used when -the icon theme does not provide an own version. ---- - src/data/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt -index b786a3a..30af648 100644 ---- a/src/data/CMakeLists.txt -+++ b/src/data/CMakeLists.txt -@@ -17,6 +17,9 @@ macro(kexi_add_app_icons source_var) - ) - endif() - ecm_add_app_icon(${source_var} ICONS ${_files}) -+ ecm_install_icons(ICONS ${_files} -+ DESTINATION ${ICON_INSTALL_DIR} -+ THEME hicolor) - list(APPEND ${source_var} ${_files}) - unset(_files) - endmacro() --- -cgit v0.11.2 - diff --git a/fix-build-with-qt5.6.patch b/fix-build-with-qt5.6.patch deleted file mode 100644 index 5ec21e2..0000000 --- a/fix-build-with-qt5.6.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 14dada252f590246ce400e203aed443d33c7462e Mon Sep 17 00:00:00 2001 -From: Jaroslaw Staniek -Date: Wed, 21 Mar 2018 12:47:46 +0100 -Subject: Fix build with Qt 5.6 - -Summary: QOverload<>::of() is new in Qt 5.7, so "emulate" it with static_cast<>() when building against lower Qt versions. - -Test Plan: -Kexi 3.1.0 builds fine now on openSUSE Leap 42.3 with Qt 5.6.2. -Before I got these compiler errors: -``` -/home/abuild/rpmbuild/BUILD/kexi-3.1.0/src/widget/KexiFileRequester.cpp: In member function 'void KexiFileRequester::init()': -/home/abuild/rpmbuild/BUILD/kexi-3.1.0/src/widget/KexiFileRequester.cpp:479:30: error: 'QOverload' was not declared in this scope - connect(d->locationEdit, QOverload<>::of(&KUrlComboBox::returnPressed), - ^ -/home/abuild/rpmbuild/BUILD/kexi-3.1.0/src/widget/KexiFileRequester.cpp:479:40: error: expected primary-expression before '>' token - connect(d->locationEdit, QOverload<>::of(&KUrlComboBox::returnPressed), - ^ -/home/abuild/rpmbuild/BUILD/kexi-3.1.0/src/widget/KexiFileRequester.cpp:479:41: error: '::of' has not been declared - connect(d->locationEdit, QOverload<>::of(&KUrlComboBox::returnPressed), - ^ -``` - -Still builds fine with Qt 5.9.4 and 5.10.0 too... - -Reviewers: staniek, piggz - -Reviewed By: staniek - -Subscribers: #kexi - -Tags: #kexi - -Differential Revision: https://phabricator.kde.org/D11544 ---- - src/widget/KexiFileRequester.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/widget/KexiFileRequester.cpp b/src/widget/KexiFileRequester.cpp -index be45db5..3fd4b7e 100644 ---- a/src/widget/KexiFileRequester.cpp -+++ b/src/widget/KexiFileRequester.cpp -@@ -476,8 +476,13 @@ void KexiFileRequester::init() - d->locationEdit->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength); - connect(d->locationEdit, &KUrlComboBox::editTextChanged, d, - &KexiFileRequester::Private::locationEditTextChanged); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) - connect(d->locationEdit, QOverload<>::of(&KUrlComboBox::returnPressed), - d, &Private::locationEditReturnPressed); -+#else -+ connect(d->locationEdit, static_cast(&KUrlComboBox::returnPressed), -+ d, &Private::locationEditReturnPressed); -+#endif - d->urlCompletion = new KexiUrlCompletion(&d->filterRegExps, &d->filterMimeTypes); - d->locationEdit->setCompletionObject(d->urlCompletion); - d->locationEdit->setAutoDeleteCompletionObject(true); --- -cgit v0.11.2 - diff --git a/kexi-3.1.0.tar.xz b/kexi-3.1.0.tar.xz deleted file mode 100644 index c397fe9..0000000 --- a/kexi-3.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d55cd4af177bcb060673a0977d52bc91cc2dd1b1420d008a78f9783312152fb -size 3028492 diff --git a/kexi-3.2.0.tar.xz b/kexi-3.2.0.tar.xz new file mode 100644 index 0000000..bc15c0e --- /dev/null +++ b/kexi-3.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff +size 3624956 diff --git a/kexi.changes b/kexi.changes index c30540c..f07e9ed 100644 --- a/kexi.changes +++ b/kexi.changes @@ -1,3 +1,95 @@ +------------------------------------------------------------------- +Thu Apr 11 12:09:19 UTC 2019 - wbauer@tmo.at + +- Update to 3.2.0 + * Bug fixes + + Add protection against invalid translation of widget names + + Startup: Improve display of tried locations for resources + lookup and lookup algorithm (kde#391810) + + Startup: Add missing translations for "Could not open icon + resource file" messages + + General: Make certain views work in User mode (kde#396875) + + General: Add "All files" filter to file widgets for + non-Plasma systems + + General: Welcome page: Always display the project file names + in addition to captions + + General: Welcome page: Add long localized last opening date + to project tool tips + + General: Welcome page: Show recent project files that start + with "." / hidden files + + Table View: Make zero values displayed for integer columns + (kde#395189) + + Table View: Fix validation of values in default input box of + table view (kde#395225) + + Table and Form View: Fix two-digit year formats issue: do + not allow by default (kde#378481) + * Years are 4 digits now in tables and forms. On the output + INFO message says as explained at + https://bugs.kde.org/show_bug.cgi?id=378481#c5. Data entry + works based on this new year format. Changes are properly + saved to db. Display output e.g. in queries and reports + follow this format too. + * Set AllowTwoDigitYearFormats=true in kexirc, [General] + section to force using 2 digits. + + Queries: Fix crash on failed opening of query in Design view + + Forms: Fix crash when right-clicking in form data view on + widget such as text box (kde#402923) + + Reports: Fix crash in data fetching and aggregation scripts + in reports (kde#392753) + + Reports: Support params in report queries. KEXI now prompts + for parameters in queries that use them. (kde#379694) + + Import: Fix translation issue in the Database Importing + Assistant (kde#399296) + + Import: Skip table name if physical table is non-existing, + use the new tableNames API in migration (kde#392112) + + MS Access import + * Fix crash on importing zero-length memo data (long text) + * Fix not being able to handle binary objects larger than + 16 MiB. Limit is now 256 MiB. + * Fix possible crash when importing MDB file having non-latin + characters in column names of unexpected length + (kde#396984) + + Export: Fix crash on exporting tabular data to clipboard + (introduced in 3.1.0) (kde#394519) + + Export: Fix filename selection for export dialogs and allow + to pre-select filename in file dialogs + * Improvements + + Assistants: properly focus input boxes after moving to other + page, make Alt+arrows work for Back/Next, make Enter accept + page if applicable + + Project type selection in the new project assistant: do not + assume user clicked the type button but just focused it + + Improve display of Finish buttons of CSV export/import + dialogs + + New / Import project assistants + * Destination file requester is now of Save type + * Use Documents location if there are no recent dirs known + yet + * Better preserve path while updating filename based on + project caption + * Buildsystem + + Install the application icons + + Create (and install) rcc files with kexi icons in + co-installable dirs + + Fix build with Qt 5.11 (missing headers) + + Fix build with Qt 5.6 + + Fix data install dir for Windows, make icons installed + relative to that + + Make appdata.xml, app icons and kexi.desktop co-installable + + Make KEXI compile for MOBILE productset + + Win/Mac: still install copied KEXI files but add the original + ones to the binary because the copied ones do not exist yet + before ecm_add_app_icon() gets called + + CMake: find PostgreSQL 11 +- Drop patches merged upstream: + * Install-the-application-icons.patch + * fix-build-with-qt5.6.patch + * Fix-build-with-Qt-511.patch +- Use %kf5_find_lang macro to generate the lang package filelist +- BuildRequire postgresql-server-devel instead of postgresql-devel + on Tumbleweed to fix building the PostgreSQL migration driver +- Run spec-cleaner + ------------------------------------------------------------------- Sun Jun 3 19:37:31 UTC 2018 - christophe@krop.fr diff --git a/kexi.spec b/kexi.spec index 5b25d58..e3f2d00 100644 --- a/kexi.spec +++ b/kexi.spec @@ -1,7 +1,7 @@ # # spec file for package kexi # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,29 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define soVersion 3.1 +%define soVersion 3.2 %bcond_without lang Name: kexi -Version: 3.1.0 +Version: 3.2.0 Release: 0 Summary: Database Application License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.2-only Group: Productivity/Office/Suite -URL: http://www.kexi-project.org/ -Source0: http://download.kde.org/stable/%{name}/src/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch0: Install-the-application-icons.patch -# PATCH-FIX-UPSTREAM -Patch1: fix-build-with-qt5.6.patch -# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch -Patch2: Fix-build-with-Qt-511.patch +URL: https://www.kexi-project.org/ +Source0: https://download.kde.org/stable/%{name}/src/%{name}-%{version}.tar.xz BuildRequires: breeze5-icons BuildRequires: extra-cmake-modules -BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: karchive-devel BuildRequires: kcodecs-devel @@ -59,7 +52,6 @@ BuildRequires: kxmlgui-devel BuildRequires: libmysqld-devel BuildRequires: marble-devel BuildRequires: mysql-devel -BuildRequires: postgresql-devel BuildRequires: update-desktop-files BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) @@ -71,12 +63,15 @@ BuildRequires: cmake(Qt5WebKit) BuildRequires: cmake(Qt5WebKitWidgets) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) +Recommends: %{name}-lang = %{version} Obsoletes: calligra-kexi < %{version} Provides: calligra-kexi = %{version} # not ported yet Obsoletes: calligra-kexi-spreadsheet-import < %{version} -%if %{with lang} -Recommends: %{name}-lang = %{version} +%if 0%{?suse_version} > 1500 +BuildRequires: postgresql-server-devel +%else +BuildRequires: postgresql-devel %endif %description @@ -96,12 +91,10 @@ programs like MS Access or Filemaker. This package contains a Spreadsheet-to-Kexi-table import plugin. -%if %{with lang} %lang_package -%endif %prep -%autosetup -p1 +%setup -q %build # install translations to %{_kf5_localedir} so they don't clash with the kexi translations in calligra-l10n (KDE4 based) @@ -110,8 +103,11 @@ This package contains a Spreadsheet-to-Kexi-table import plugin. %make_jobs %install -cd build -%kf5_makeinstall +%kf5_makeinstall -C build + +%if %{with lang} +%{kf5_find_lang} +%endif %suse_update_desktop_file -r org.kde.kexi-%{soVersion} Qt KDE Office Database @@ -140,7 +136,8 @@ rm %{buildroot}%{_kf5_libdir}/libkformdesigner%{soVersion}.so %{_kf5_plugindir}/kexi/ %{_kf5_sharedir}/kexi/ -%files lang -%{_kf5_localedir} +%if %{with lang} +%files lang -f %{name}.lang +%endif %changelog From 4ed6f09012c4bce8759faed0e3c3065b95be620c1f192fbb535ddad14ca55db2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 11 Apr 2019 16:35:15 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kexi?expand=0&rev=15 --- kexi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kexi.spec b/kexi.spec index e3f2d00..f3d9f2d 100644 --- a/kexi.spec +++ b/kexi.spec @@ -24,7 +24,7 @@ Release: 0 Summary: Database Application License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.2-only Group: Productivity/Office/Suite -URL: https://www.kexi-project.org/ +URL: http://www.kexi-project.org/ Source0: https://download.kde.org/stable/%{name}/src/%{name}-%{version}.tar.xz BuildRequires: breeze5-icons BuildRequires: extra-cmake-modules