diff --git a/.gitattributes b/.gitattributes index 5f0b8b6..1bd5809 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,4 +22,4 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns -Sigil_User_Guide.epub filter=lfs diff=lfs merge=lfs -text +Sigil_User_Guide_2019.06.25.epub filter=lfs diff=lfs merge=lfs -text diff --git a/0.9.10.tar.gz b/0.9.10.tar.gz deleted file mode 100644 index e3295dd..0000000 --- a/0.9.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:294954c4c2b3f1f9348d4f1bff18edebaba44afae901be3900154778b2f877ed -size 19100153 diff --git a/0.9.15.tar.gz b/0.9.15.tar.gz new file mode 100644 index 0000000..1a226b3 --- /dev/null +++ b/0.9.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d05c59c61ff8a7ec77d7f9cbce33cccf0fe7b7846f92bbfc92dad62c40f22e3d +size 21230431 diff --git a/Sigil_User_Guide.epub b/Sigil_User_Guide.epub deleted file mode 100644 index b0cbff0..0000000 --- a/Sigil_User_Guide.epub +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d6af3abc1ee41a184f773126e1610a76fed077bfc1a5b65694588a37445a9c1 -size 7232055 diff --git a/Sigil_User_Guide_2019.06.25.epub b/Sigil_User_Guide_2019.06.25.epub new file mode 100644 index 0000000..1773085 --- /dev/null +++ b/Sigil_User_Guide_2019.06.25.epub @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1db1042fdd1d2f8ecea7b559639ad59e152624f96d428ecbd2b943eba8cd653 +size 10147299 diff --git a/sigil.changes b/sigil.changes index bf4bc47..852ca37 100644 --- a/sigil.changes +++ b/sigil.changes @@ -1,3 +1,130 @@ +------------------------------------------------------------------- +Wed Jul 3 14:49:14 UTC 2019 - ecsos@opensuse.org + +- Update to 0.9.15 + A Beta Release of Sigil ported to QtWebEngine to replace QtWebKit + + * New Features + - ported to use QtWebEngine (based on Chromium) to replace + QtWebkit + - QtWebEngine plugs many major memory leaks. + Memory footprint should stay low to moderate. + - QtWebEngine has ongoing security and support patches from + Qt/Google/Chromium + - removes the broken/deprecated BookView Editor that relied on + QtWebKit + - created PageEdit app (that uses QtWebEngine) that replaces + much BookView functionality + (see https://github.com/Sigil-Ebook/PageEdit) + - allows the user to control use of javascript and remote + access by epubs when editing to improve overall security + - adds action to launch one preferred external xhtml editor via + shortcut or icon + (can be used to fast launch PageEdit app or any other xhtml + open-with editor) + - adds 5 more plugin quicklaunch buttons to main menu for + a total of 10 (with all new icons! Thanks so much Becky!) + + It also includes all of the fixes and updates from Sigil-0.9.14. + + Be aware that Sigil-0.9.15 still enforces the need for epub3 to + have and support an NCX so that it generates as backward + a compatible epub as possible. This may be relaxed in future + releases. + +- Changes from 0.9.14 + This Sigil release is primarily to address performance issues and + memory leaks, but there are a still some new features and other + bug fixes as described below. + + * Bug Fixes + - flush all changes to disk before creating a Report so that + files sizes are correct + - stop writing python bytecode to Program Files on Windows + - remember cover semantics if cover image replaced by Add + Existing... + - fix issues with the Plugin Framework documentation epub + - more memory leaks plugged + - minor code cleanups + * New Features + - updated to Qt 5.12.3 with Annulen Webkit 5.212 with extra + QtCursor memory leak fixes + - updated to Python 3.7.2 + - updated build docs for macOS, Linux and Windows + - build system now uses GNUInstallDirs to determine the best + installation libdir on Linux + - updated desktop integration for Linux + - reduce PCRE cache size to help lower memory footprint + - improve mapping of hunspell dictionary names to actual + language names (thanks BeckyDTP) + - add warning during import if unmanifested files exist in the + epub zip archive + - no longer requires use of non-breaking space entities + (or any entities at all!) + - special spaces are now visisble via syntax highlighting in + CodeView + - dropping epubs on Sigil.app no longer opens an extra empty + epub on macOS + - reload Preview only when needed to help prevent screen + flicker and lower memory use + - enabled Windows automated builds using Apppveyor + - Windows releases now compiled with Visual Studio 2017 + - characters in HTML files report now uses gumbo for speed + - allow user's custom plugin icons to survive a plugin update + + Sigil 0.9.14 will mark the last version that uses QtWebKit, + and will be the last version to support editing in BookView. + (https://github.com/Sigil-Ebook/Sigil/wiki#sigil-moving-to-qtwebengine) + + Be aware that Sigil-0.9.14 still enforces the need for epub3 + to have and support an NCX so that it generates as backward + a compatible epub as possible. + This may be relaxed in future releases. + +------------------------------------------------------------------- +Sat Apr 6 10:22:55 UTC 2019 - ecsos@opensuse.org + +- Update to 0.9.13 + * Bug Fixes + - Revert change of INI encoding to utf-8 as QSettings very + broken under utf-8 (commit 5484463) + - Ensure all url attributes in shape-outside properties in + CSS stylesheets get updated (commit de7b09f) + - Workaround for lost cursor in qlineedit Qt bug (issue #398) + (commit a8acab7) + - Workaround missing File New, Open, Quit menus in Mac menubar + if windows closed (commit 660a8aa) + - Remove Icon from Tab for macOS only to workaround Qt bug + (commit 5c91924) + - Plug some memory leaks (commits: 85f78d7, cb9b833, 614d601, + bf2f2f4, ebfb613, 4qa8f33) + - Backport Qt 5.12alpha fix to prevent heap corruption due + to qwidget next focus pointers (commit f5c7284) + - Plug macOS memory leaks when closing a main window + (commit fbf9015) + - Put back quote in tag name bug fix lost in recent changes + (commit ebd8c7c) + - Disable Netscape Plugins being used in BookView and Preview + Window (commit 79314ea) + - Use custom version of qtwebkit with Qt 5.5 memory leak fix + added back and no load plugins if disabled + (see commits 94a28d7, 9f7ebba, and 4b968a9) + * New Features + - Add filename to tab tooltip (commit 27f8db7) + - Clear memory caches when Preview changes to keep memory + footprint smaller (commit 87b9247) + - Update to MathJax 2.75, adds support for mathml mlongdiv, + mstack, mcarries (commit 568aba5) + - Reduce memory footprint by letting worker threads expire + (commit c1ee7ea) + - Reduce memory footprint by properly setting web page caches + (commit 9f07cbe) + + Be aware that Sigil-0.9.13 still enforces the need for epub3 + to have and support an NCX so that it generates as backward + a compatible epub as possible. This may be relaxed in future + releases. + ------------------------------------------------------------------- Fri Sep 21 18:47:29 UTC 2018 - Bernhard Wiedemann diff --git a/sigil.spec b/sigil.spec index f9f1536..9ac2a0a 100644 --- a/sigil.spec +++ b/sigil.spec @@ -1,7 +1,7 @@ # # spec file for package sigil # -# 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,12 +12,14 @@ # 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 sigil_doc_version 2019.06.25 + Name: sigil -Version: 0.9.10 +Version: 0.9.15 Release: 0 Summary: WYSIWYG Ebook Editor License: GPL-3.0-only @@ -25,7 +27,7 @@ Group: Productivity/Other Url: http://sigil-ebook.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: https://github.com/Sigil-Ebook/Sigil/archive/%{version}.tar.gz -Source1: https://github.com/Sigil-Ebook/Sigil/raw/master/docs/Sigil_User_Guide.epub +Source1: https://github.com/Sigil-Ebook/Sigil/raw/master/docs/Sigil_User_Guide_%{sigil_doc_version}.epub Source2: %{name}.desktop # PATCH-FIX-OPENSUSE Disabled __DATE__ and __TIME__ which is replaced later in pre section Patch0: %{name}-gt-0.9.0-Dialogs-About.cpp.patch @@ -35,6 +37,7 @@ BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hunspell-devel +# upstream use Qt 5.12.3 BuildRequires: libqt5-qtbase-devel >= 5.4.2 BuildRequires: libqt5-qtlocation-devel >= 5.4.2 BuildRequires: libstdc++-devel @@ -53,29 +56,36 @@ BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5WebChannel) -BuildRequires: pkgconfig(Qt5WebKit) +#BuildRequires: pkgconfig(Qt5WebKit) +BuildRequires: pkgconfig(Qt5WebEngine) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5XmlPatterns) # not need for build, only check for exists -BuildRequires: python3-html5lib +# upstream use for python3-Pillow 5.4.1 +BuildRequires: python3-Pillow +BuildRequires: python3-chardet >= 3.0.4 +BuildRequires: python3-cssselect >= 1.0.3 +BuildRequires: python3-cssutils >= 1.0.2 +BuildRequires: python3-html5lib >= 1.0.1 +# upstream use for python3-lxml 4.2.6 BuildRequires: python3-lxml +# upstream use for python3-qt5 5.12 +BuildRequires: python3-qt5 +# upstream use for python3-regex 2018.11.12 +BuildRequires: python3-regex +# upstream use for python3-six 1.12.0 BuildRequires: python3-six BuildRequires: python3-tk -#BuildRequires: python3-regex -BuildRequires: python3-Pillow -BuildRequires: python3-cssselect -BuildRequires: python3-cssutils -#BuildRequires: python3-chardet -Requires: python3-html5lib -Requires: python3-lxml -Requires: python3-six -Requires: python3-tk -#Requires: python3-regex Requires: python3-Pillow +Requires: python3-chardet Requires: python3-cssselect Requires: python3-cssutils -#Requires: python3-chardet +Requires: python3-html5lib +Requires: python3-lxml +Requires: python3-regex +Requires: python3-six +Requires: python3-tk %description Sigil is an editor for the EPUB format. It is designed for WYSIWYG @@ -105,6 +115,8 @@ find . -type f -name About.cpp -exec sed -i "s/@DATE@/$_date/;s/@TIME@/$_time/g" sed -i 's/\r//' ChangeLog.txt README.md COPYING.txt dos2unix src/Resource_Files/python3lib/meta*.py dos2unix src/Resource_Files/python3lib/opf_*.py +# rpmlint: +find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python3|#!\/usr\/bin\/python3|g' {} + find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python|#!\/usr\/bin\/python3|g' {} + %build @@ -134,9 +146,14 @@ install -m644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.deskt %suse_update_desktop_file %name %fdupes -s %buildroot +# fix rpmlint: non-executable-script +pushd %{buildroot}%{_datadir} +grep -lr "/usr/bin/python" | xargs chmod +x +popd + %files %defattr(-,root,root) -%doc ChangeLog.txt README.md COPYING.txt Sigil_User_Guide.epub +%doc ChangeLog.txt README.md COPYING.txt Sigil_User_Guide_%{sigil_doc_version}.epub %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %dir %{_datadir}/icons/hicolor/ @@ -159,10 +176,9 @@ install -m644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.deskt %{_datadir}/%{name}/*dictionaries/* %{_datadir}/%{name}/examples %{_datadir}/%{name}/python3lib -%dir %{_datadir}/%{name}/polyfills -%{_datadir}/%{name}/polyfills/MathJax.js +%{_datadir}/%{name}/polyfills %{_datadir}/%{name}/plugin_launchers -%dir /usr/lib/%name -/usr/lib/%{name}/* +%dir %{_libdir}/%name +%{_libdir}/%{name}/* %changelog