From 818923c8ae18cada00c6d8c0a39f9cc7c00278d4bdb1c9c0c6fa3babf073be9a Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 22 Mar 2018 05:58:26 +0000 Subject: [PATCH] Accepting request 589797 from home:wolfi323:branches:KDE:Extra - Update to 3.1.0: * General + Bump soname for the libraries to separate from incompatible 3.0.x versions * New features + Add social buttons to Kexi menu + Make KEXI examples be built and installed by default as it's likely expected by users + Add support for setting character encoding for source database to Import Table Assistant * Bug fixes + Fix location of example dir + Mark and install Kexi example file as read-only on all platforms + Fix crash when global search box is used after re-opening another project + Add MainWindow/GlobalSearchBoxEnabled (bool) option that controls display of the global search box (kde#390794) + Disable compacting action if project is not open as we do not support this case for now + Do not display "clear" icons in read-only line edits of Database connection widget + Import table assistant: allow to move back and change source connection, react on double clicking + Do not display empty message when starting without plugins, inform users about the status (kde#389844) + Do not disable contents of "Your contributions" page (part of the Welcome page) + CSV import assistant: switch back to checkboxes from command link buttons + CSV import assistant: fix layout of delimiter widget + CSV import assistant: Improve getting filename selection from the new file requester + CSV import assistant: Single click on file requester's item moves to next page + Fix broken CSV import (kde#386102) + Rework the KexiFileRequester to use a simple and light QTreeView + Update mime types info when needed + Fix "wait" cursors + Fix crash when deleting or renaming a table (kde#379078) + Table Designer: don't warn about non-existing table or query when lookup fields are cleared + Table view's combo box editor: delete the combo button when needed, this fixes possible crash when user clicks the non-deleted button + Fix possible crash when table view containing combo boxes is re-used (kde#389029) + Fix recent dirs handling for file widgets (bug from Kexi 3.0.x), move recent start/recent dirs handling to KexiUtils + Forms: Fix double moving forward/backward on tab/backtab key press + Before physical altering or deleting table ask the user to close depending table/query/report/form (kde#371896) + Queries: Synchronize the "dirty" flag between Design and Text views + SQL designer: remove possible memory leak if the parsed query object is still present on destruction + Queries: fix possible crash in data view when the query design changes in a design view + Queries: after parsing the SQL only assume the query changed if the SQL differs from the previous SQL + Fix memory leak in Project data object (list of auto-open objects) + Fix detection of single-click mode for XFCE + Reports: Make jumping to specific page possible + Reports: Keep information about type of data source (table or query). Detects if needed. (kde#385071) * Optimizations + Improve memory management of raw SQL execution and preparing * Improvements + Set Cancel as default for critical question message boxes + Use Delete verb rather than Remove for consistency + Don't use empty space by object tabs (like in web browsers) + Backport experimental scripting in Kexi + Add config file setting to force the use of KFileWidgets or simple file requesters independently of the desktop + Detect whether native operating system's dialogs should be used + Query Designer: Improve "The query you entered is incorrect. Do you want to cancel any changes made to this SQL text?" question + Query Designer: Improve "Do you want to save invalid query?" question + Import Table assistant: improve appearance of the "Finish" page and logic for buttons + Project Import assistant: support single-click accepting of source databases if needed + Translations and typo fixes + Add option to build without KFileWidget, default on Windows + Connection selector widget: select Next step on double click, don't select on highlighting + Add location edit and file filter combo work in KexiFileRequester, add filename completion + Reports: Remove traces of "external data" support, this is not supported since Kexi 2.3 + Reports: Remove no longer necessary "Set Data" button from the data source tab * Docs and examples + Fix and update Simple_Database.kexi example - Add Install-the-application-icons.patch from upstream, this makes it unnecessary to manually copy an application icon to the hicolor theme in %install - Add fix-build-with-qt5.6.patch to make it compile on Leap 42 OBS-URL: https://build.opensuse.org/request/show/589797 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kexi?expand=0&rev=10 --- Install-the-application-icons.patch | 29 ++++++++ fix-build-with-qt5.6.patch | 59 +++++++++++++++ kexi-3.0.2.tar.xz | 3 - kexi-3.1.0.tar.xz | 3 + kexi.changes | 108 ++++++++++++++++++++++++++++ kexi.spec | 31 ++++---- 6 files changed, 217 insertions(+), 16 deletions(-) create mode 100644 Install-the-application-icons.patch create mode 100644 fix-build-with-qt5.6.patch delete mode 100644 kexi-3.0.2.tar.xz create mode 100644 kexi-3.1.0.tar.xz diff --git a/Install-the-application-icons.patch b/Install-the-application-icons.patch new file mode 100644 index 0000000..5ed051a --- /dev/null +++ b/Install-the-application-icons.patch @@ -0,0 +1,29 @@ +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 new file mode 100644 index 0000000..5ec21e2 --- /dev/null +++ b/fix-build-with-qt5.6.patch @@ -0,0 +1,59 @@ +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.0.2.tar.xz b/kexi-3.0.2.tar.xz deleted file mode 100644 index 20010d2..0000000 --- a/kexi-3.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8eaea8ba6b833d9413a05496c9099d278f0ea410cf7d2af42bfdf9125d945bba -size 3676556 diff --git a/kexi-3.1.0.tar.xz b/kexi-3.1.0.tar.xz new file mode 100644 index 0000000..c397fe9 --- /dev/null +++ b/kexi-3.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d55cd4af177bcb060673a0977d52bc91cc2dd1b1420d008a78f9783312152fb +size 3028492 diff --git a/kexi.changes b/kexi.changes index cb62289..b1de127 100644 --- a/kexi.changes +++ b/kexi.changes @@ -1,3 +1,111 @@ +------------------------------------------------------------------- +Tue Mar 20 11:28:47 UTC 2018 - wbauer@tmo.at + +- Update to 3.1.0: + * General + + Bump soname for the libraries to separate from incompatible + 3.0.x versions + * New features + + Add social buttons to Kexi menu + + Make KEXI examples be built and installed by default as it's + likely expected by users + + Add support for setting character encoding for source + database to Import Table Assistant + * Bug fixes + + Fix location of example dir + + Mark and install Kexi example file as read-only on all + platforms + + Fix crash when global search box is used after re-opening + another project + + Add MainWindow/GlobalSearchBoxEnabled (bool) option that + controls display of the global search box (kde#390794) + + Disable compacting action if project is not open as we do not + support this case for now + + Do not display "clear" icons in read-only line edits of + Database connection widget + + Import table assistant: allow to move back and change source + connection, react on double clicking + + Do not display empty message when starting without plugins, + inform users about the status (kde#389844) + + Do not disable contents of "Your contributions" page (part of + the Welcome page) + + CSV import assistant: switch back to checkboxes from command + link buttons + + CSV import assistant: fix layout of delimiter widget + + CSV import assistant: Improve getting filename selection from + the new file requester + + CSV import assistant: Single click on file requester's item + moves to next page + + Fix broken CSV import (kde#386102) + + Rework the KexiFileRequester to use a simple and light + QTreeView + + Update mime types info when needed + + Fix "wait" cursors + + Fix crash when deleting or renaming a table (kde#379078) + + Table Designer: don't warn about non-existing table or query + when lookup fields are cleared + + Table view's combo box editor: delete the combo button when + needed, this fixes possible crash when user clicks the + non-deleted button + + Fix possible crash when table view containing combo boxes is + re-used (kde#389029) + + Fix recent dirs handling for file widgets (bug from Kexi + 3.0.x), move recent start/recent dirs handling to KexiUtils + + Forms: Fix double moving forward/backward on tab/backtab key + press + + Before physical altering or deleting table ask the user to + close depending table/query/report/form (kde#371896) + + Queries: Synchronize the "dirty" flag between Design and Text + views + + SQL designer: remove possible memory leak if the parsed query + object is still present on destruction + + Queries: fix possible crash in data view when the query + design changes in a design view + + Queries: after parsing the SQL only assume the query changed + if the SQL differs from the previous SQL + + Fix memory leak in Project data object (list of auto-open + objects) + + Fix detection of single-click mode for XFCE + + Reports: Make jumping to specific page possible + + Reports: Keep information about type of data source (table or + query). Detects if needed. (kde#385071) + * Optimizations + + Improve memory management of raw SQL execution and preparing + * Improvements + + Set Cancel as default for critical question message boxes + + Use Delete verb rather than Remove for consistency + + Don't use empty space by object tabs (like in web browsers) + + Backport experimental scripting in Kexi + + Add config file setting to force the use of KFileWidgets or + simple file requesters independently of the desktop + + Detect whether native operating system's dialogs should be + used + + Query Designer: Improve "The query you entered is incorrect. + Do you want to cancel any changes made to this SQL text?" + question + + Query Designer: Improve "Do you want to save invalid query?" + question + + Import Table assistant: improve appearance of the "Finish" + page and logic for buttons + + Project Import assistant: support single-click accepting of + source databases if needed + + Translations and typo fixes + + Add option to build without KFileWidget, default on Windows + + Connection selector widget: select Next step on double click, + don't select on highlighting + + Add location edit and file filter combo work in + KexiFileRequester, add filename completion + + Reports: Remove traces of "external data" support, this is + not supported since Kexi 2.3 + + Reports: Remove no longer necessary "Set Data" button from + the data source tab + * Docs and examples + + Fix and update Simple_Database.kexi example +- Add Install-the-application-icons.patch from upstream, this makes + it unnecessary to manually copy an application icon to the + hicolor theme in %install +- Add fix-build-with-qt5.6.patch to make it compile on Leap 42 + ------------------------------------------------------------------- Sat Aug 12 13:18:58 UTC 2017 - wbauer@tmo.at diff --git a/kexi.spec b/kexi.spec index 92d6574..feb96e7 100644 --- a/kexi.spec +++ b/kexi.spec @@ -1,7 +1,7 @@ # # spec file for package kexi # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -16,15 +16,19 @@ # %bcond_without lang - +%define soVersion 3.1 Name: kexi -Version: 3.0.2 +Version: 3.1.0 Release: 0 License: GPL-2.0+ and LGPL-2.1+ and GFDL-1.2 Summary: Database Application 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 BuildRequires: breeze5-icons BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) @@ -96,6 +100,8 @@ This package contains a Spreadsheet-to-Kexi-table import plugin. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build # install translations to %{_kf5_localedir} so they don't clash with the kexi translations in calligra-l10n (KDE4 based) @@ -107,17 +113,14 @@ This package contains a Spreadsheet-to-Kexi-table import plugin. cd build %kf5_makeinstall -mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps -cp %{_kf5_iconsdir}/breeze/apps/48/calligrakexi.svg %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps/ - -%suse_update_desktop_file -r org.kde.kexi Qt KDE Office Database +%suse_update_desktop_file -r org.kde.kexi-%{soVersion} Qt KDE Office Database #Remove unwanted development files for i in dataviewcommon formutils extendedwidgets relationsview main migrate utils guiutils datatable core undo do - rm %{buildroot}%{_kf5_libdir}/libkexi${i}.so + rm %{buildroot}%{_kf5_libdir}/libkexi${i}%{soVersion}.so done -rm %{buildroot}%{_kf5_libdir}/libkformdesigner.so +rm %{buildroot}%{_kf5_libdir}/libkformdesigner%{soVersion}.so %post -p /sbin/ldconfig @@ -126,12 +129,14 @@ rm %{buildroot}%{_kf5_libdir}/libkformdesigner.so %files %defattr(-,root,root,-) %doc AUTHORS README.md COPYING COPYING.* -%{_bindir}/kexi +%{_bindir}/kexi-%{soVersion} %{_libdir}/libkexi*.so* -%{_libdir}/libkformdesigner.so* +%{_libdir}/libkformdesigner%{soVersion}.so* %dir %{_kf5_appstreamdir} -%{_kf5_appstreamdir}/org.kde.kexi.appdata.xml -%{_kf5_applicationsdir}/org.kde.kexi.desktop +%{_kf5_appstreamdir}/org.kde.kexi-%{soVersion}.appdata.xml +%{_kf5_applicationsdir}/org.kde.kexi-%{soVersion}.desktop +%dir %{_kf5_iconsdir}/hicolor/1024x1024 +%dir %{_kf5_iconsdir}/hicolor/1024x1024/apps %{_kf5_iconsdir}/hicolor/*/*/* %{_kf5_sharedir}/kexi/ %{_kf5_plugindir}/kexi/