diff --git a/sigil-2.0.1.tar.gz b/sigil-2.0.1.tar.gz deleted file mode 100644 index d424c17..0000000 --- a/sigil-2.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af6da67d939276fb6d8dff4da2926d265565fab58d870f66b3b2e8b3125bd0a8 -size 26778961 diff --git a/sigil-2.0.2.tar.gz b/sigil-2.0.2.tar.gz new file mode 100644 index 0000000..e9aad8b --- /dev/null +++ b/sigil-2.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5eaf300dc8307ca0765f9d32d9136e143ca7bcf9e65049499512fdea588e285 +size 26683849 diff --git a/sigil.changes b/sigil.changes index 4607b77..d490e3b 100644 --- a/sigil.changes +++ b/sigil.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Jan 17 12:01:46 UTC 2024 - ecsos + +- Switch to Qt6. +- Clean up Qt BuildRequires. + +------------------------------------------------------------------- +Tue Jan 16 15:52:19 UTC 2024 - ecsos + +- Update to 2.0.2 + - fix incorrect clip tool button insertion point due to null activeWindow value + - fix Windows multiple screen issues when not properly identified (Qt6.5.2 patch fix) + - fix Mac Accessibility related crashes when using non-native QFileDialog (Qt 6.5.2 patch fix) + - workaround MacOS QMessageBox loss of focus Qt 6.5.X bug without hurting other platforms + - fix pretty print mend not formatting mathml + - fix Accessibility related crashes in QFontComboBox (Qt 6.5.2 patch fix) + - prevent crashing if user mistakenly tries to delete entire ncx in CodeView + - harden delete unused styles to trailing whitespace in class names + - fix unrecognized media-types application/xml and text/xml + - fix cursor just before end tag bug in align justify, centre, right + - fix crash when all metadata removed by user in MetaEditor + - fix macOS min in Info.plist to be the actual 11.0 + - update Windows and macOS installers to use Qt6.5.3 + ------------------------------------------------------------------- Wed Aug 23 05:32:42 UTC 2023 - ecsos diff --git a/sigil.spec b/sigil.spec index f0d16e9..dcde190 100644 --- a/sigil.spec +++ b/sigil.spec @@ -18,7 +18,7 @@ %define sigil_doc_version 2022.05.17 Name: sigil -Version: 2.0.1 +Version: 2.0.2 Release: 0 Summary: WYSIWYG Ebook Editor License: GPL-3.0-only @@ -34,15 +34,20 @@ BuildRequires: boost-devel BuildRequires: cmake >= 3.0 BuildRequires: dos2unix BuildRequires: fdupes +%if 0%{?suse_version} <= 1600 +BuildRequires: gcc12 +BuildRequires: gcc12-c++ +%else +BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: libqt5-qtbase-devel >= 5.12.0 -BuildRequires: libqt5-qtlocation-devel >= 5.12.0 +%endif BuildRequires: libstdc++-devel BuildRequires: libxerces-c-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: make BuildRequires: pkgconfig +BuildRequires: qt6-base-devel >= 6.2.0 # not need for build, only check for exists # upstream use for python3-Pillow 7.1.2 BuildRequires: python3-Pillow >= 5.0.0 @@ -77,17 +82,17 @@ BuildRequires: python3-tk BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: zlib-devel -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5WebChannel) -BuildRequires: pkgconfig(Qt5WebEngine) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: pkgconfig(Qt5XmlPatterns) +BuildRequires: pkgconfig(Qt6Concurrent) +BuildRequires: pkgconfig(Qt6Core5Compat) +BuildRequires: pkgconfig(Qt6Linguist) +BuildRequires: pkgconfig(Qt6Network) +BuildRequires: pkgconfig(Qt6PrintSupport) +BuildRequires: pkgconfig(Qt6Svg) +BuildRequires: pkgconfig(Qt6UiTools) +BuildRequires: pkgconfig(Qt6WebEngineCore) +BuildRequires: pkgconfig(Qt6WebEngineWidgets) +BuildRequires: pkgconfig(Qt6Widgets) +BuildRequires: pkgconfig(Qt6Xml) BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libusb-1.0) @@ -139,6 +144,10 @@ find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python3|#!\/usr\/bin\/python find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python|#!\/usr\/bin\/python3|g' {} + %build +%if 0%{?suse_version} <= 1600 +export CC=gcc-12 +export CXX=g++-12 +%endif export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS"