From 7036bcbc6bd01b9a0eaa468bcfb0368d7e2b3e2ec73fb0c0188ca864bcb9fb5a Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Wed, 15 Aug 2018 14:43:28 +0000 Subject: [PATCH 1/2] Accepting request 629414 from home:ecsos - update to 0.9.10 * Bug Fixes - Fix signal handling to prevent double launch of plugins immediately after plugin installed - Fixed incorrect named entity tooltips for many of the Insert-> Special Characters - Fixed lack of recognition of woff2 fonts inside Sigil and for plugins - Fix segfault when .xml is first file in BookBrowser and add new html or split at cursor is invoked - Fix bug that allowed multiple audio/video tabs of the same resource to be opened - Fix plugin related bug when adding/removing last xhtml file - Fix Text Direction setting inside body to use structural dir attribute under epub3 - Fix duplicate group-position property in epub3 MetaData Editor - Use absolute path references when first opening Sigil with an ebook so that Open Recent works better - Fix "issue" in handling self-closing script tags in head (similar issue that we had with self-closing title tags) - Fix issue converting Qt Strings to their Python equivalent when outside the BMP - Fix issue with trying to add existing html files when names clash due to case insensitive file systems - Fix crash bug after styling text in BookView and immediately going to CodeView without moving cursor - Fix crash bugs after deleting resources contained in a Report in the BookBrowser - Fix bug that destroys nav if left in unparseable state by user even temporarily - Fix bug that moved cursor to beginning of tag block when save is done in CodeView * New Features - allow plugins to supply their own icon (plugin.png 48x48) for use on the Quick Launch Toolbar icons - extend plugin interface to include the status of the epub inside Sigil (modified or saved) - extend plugin interface to include the path to the saved epub file or the null string if never saved - extend Insert->Special Characters to include both a Greek letter panel and a mathematical symbol panel - add support for calibre:series and calibre:series_index to Metadata Editor for epub2 - add support for calibre:title_sort to Metadata Editor for epub2 - add support for clicking internal links in Preview to load the proper destination tab - add support for loading Qt's base translation files if present. Allows buttons on native qt dialogs to - be translated (Windows users may need to manually copy newer qtbase_xx.qm files to Sigil's translation - directory if they didn't exist in Qt5.6.2) - allow user to add custom css rules to Preview/Book View by creating a file called "custom_preview_style.css" - in the Sigil preferences folder (not responsible for custom css and ebook css fighting with each other) - Drop sigil-fix_deprecated_macro.patch because now in upstream. OBS-URL: https://build.opensuse.org/request/show/629414 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/sigil?expand=0&rev=22 --- .gitattributes | 2 +- 0.9.10.tar.gz | 3 ++ 0.9.9.tar.gz | 3 -- Sigil_User_Guide.epub | 3 ++ Sigil_User_Guide_0_7_2.epub | 3 -- sigil-fix_deprecated_macro.patch | 12 ------- sigil.changes | 62 ++++++++++++++++++++++++++++++++ sigil.spec | 9 ++--- 8 files changed, 72 insertions(+), 25 deletions(-) create mode 100644 0.9.10.tar.gz delete mode 100644 0.9.9.tar.gz create mode 100644 Sigil_User_Guide.epub delete mode 100644 Sigil_User_Guide_0_7_2.epub delete mode 100644 sigil-fix_deprecated_macro.patch diff --git a/.gitattributes b/.gitattributes index 51d7027..5f0b8b6 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_0_7_2.epub filter=lfs diff=lfs merge=lfs -text +Sigil_User_Guide.epub filter=lfs diff=lfs merge=lfs -text diff --git a/0.9.10.tar.gz b/0.9.10.tar.gz new file mode 100644 index 0000000..e3295dd --- /dev/null +++ b/0.9.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:294954c4c2b3f1f9348d4f1bff18edebaba44afae901be3900154778b2f877ed +size 19100153 diff --git a/0.9.9.tar.gz b/0.9.9.tar.gz deleted file mode 100644 index 2d900ef..0000000 --- a/0.9.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12c1ace50598aef0a5e1397da3fdcd9c5ed9eba753c476d0ee5ab00a5d2d3764 -size 18675046 diff --git a/Sigil_User_Guide.epub b/Sigil_User_Guide.epub new file mode 100644 index 0000000..b0cbff0 --- /dev/null +++ b/Sigil_User_Guide.epub @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d6af3abc1ee41a184f773126e1610a76fed077bfc1a5b65694588a37445a9c1 +size 7232055 diff --git a/Sigil_User_Guide_0_7_2.epub b/Sigil_User_Guide_0_7_2.epub deleted file mode 100644 index 684b3f8..0000000 --- a/Sigil_User_Guide_0_7_2.epub +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:322e1732ea04849d768bfd8633ea654f547b78fbc1987f0271effe337df0fa76 -size 7068751 diff --git a/sigil-fix_deprecated_macro.patch b/sigil-fix_deprecated_macro.patch deleted file mode 100644 index b427c64..0000000 --- a/sigil-fix_deprecated_macro.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Pdpru Sigil-0.9.9.orig/src/CMakeLists.txt Sigil-0.9.9/src/CMakeLists.txt ---- Sigil-0.9.9.orig/src/CMakeLists.txt 2017-12-21 17:59:01.000000000 +0100 -+++ Sigil-0.9.9/src/CMakeLists.txt 2018-06-11 08:04:01.700642771 +0200 -@@ -684,7 +684,7 @@ if (MSVC) - endif() - - target_link_libraries( ${PROJECT_NAME} ${QT_MAIN} ${HUNSPELL_LIBRARIES} ${PCRE_LIBRARIES} ${GUMBO_LIBRARIES} ${MINIZIP_LIBRARIES} ${PYTHON_LIBRARIES} ) --qt5_use_modules(${PROJECT_NAME} Widgets Xml XmlPatterns PrintSupport Svg WebKit WebKitWidgets Network Concurrent) -+target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Xml Qt5::XmlPatterns Qt5::PrintSupport Qt5::Svg Qt5::WebKit Qt5::WebKitWidgets Qt5::Network Qt5::Concurrent) - - ############################################################################# - diff --git a/sigil.changes b/sigil.changes index cfc2fa1..b327cf7 100644 --- a/sigil.changes +++ b/sigil.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Wed Aug 15 14:14:36 UTC 2018 - ecsos@opensuse.org + +- update to 0.9.10 + * Bug Fixes + - Fix signal handling to prevent double launch of plugins + immediately after plugin installed + - Fixed incorrect named entity tooltips for many of the + Insert-> Special Characters + - Fixed lack of recognition of woff2 fonts inside Sigil and for + plugins + - Fix segfault when .xml is first file in BookBrowser and add + new html or split at cursor is invoked + - Fix bug that allowed multiple audio/video tabs of the same + resource to be opened + - Fix plugin related bug when adding/removing last xhtml file + - Fix Text Direction setting inside body to use structural dir + attribute under epub3 + - Fix duplicate group-position property in epub3 MetaData + Editor + - Use absolute path references when first opening Sigil with + an ebook so that Open Recent works better + - Fix "issue" in handling self-closing script tags in head + (similar issue that we had with self-closing title tags) + - Fix issue converting Qt Strings to their Python equivalent + when outside the BMP + - Fix issue with trying to add existing html files when names + clash due to case insensitive file systems + - Fix crash bug after styling text in BookView and immediately + going to CodeView without moving cursor + - Fix crash bugs after deleting resources contained in a Report + in the BookBrowser + - Fix bug that destroys nav if left in unparseable state by + user even temporarily + - Fix bug that moved cursor to beginning of tag block when save + is done in CodeView + * New Features + - allow plugins to supply their own icon (plugin.png 48x48) for + use on the Quick Launch Toolbar icons + - extend plugin interface to include the status of the epub + inside Sigil (modified or saved) + - extend plugin interface to include the path to the saved epub + file or the null string if never saved + - extend Insert->Special Characters to include both a Greek + letter panel and a mathematical symbol panel + - add support for calibre:series and calibre:series_index to + Metadata Editor for epub2 + - add support for calibre:title_sort to Metadata Editor for + epub2 + - add support for clicking internal links in Preview to load + the proper destination tab + - add support for loading Qt's base translation files if + present. Allows buttons on native qt dialogs to + - be translated (Windows users may need to manually copy newer + qtbase_xx.qm files to Sigil's translation + - directory if they didn't exist in Qt5.6.2) + - allow user to add custom css rules to Preview/Book View by + creating a file called "custom_preview_style.css" + - in the Sigil preferences folder (not responsible for custom + css and ebook css fighting with each other) +- Drop sigil-fix_deprecated_macro.patch because now in upstream. + ------------------------------------------------------------------- Mon Jun 11 06:06:22 UTC 2018 - ecsos@opensuse.org diff --git a/sigil.spec b/sigil.spec index 886cc47..db3cebe 100644 --- a/sigil.spec +++ b/sigil.spec @@ -17,7 +17,7 @@ Name: sigil -Version: 0.9.9 +Version: 0.9.10 Release: 0 Summary: WYSIWYG Ebook Editor License: GPL-3.0-only @@ -25,12 +25,10 @@ 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_0_7_2.epub +Source1: https://github.com/Sigil-Ebook/Sigil/raw/master/docs/Sigil_User_Guide.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 -# PATCH-FIX-OPENSUSE Change deprecated qt5_use_modules to target_link_libraries -Patch1: %{name}-fix_deprecated_macro.patch BuildRequires: boost-devel BuildRequires: cmake >= 3.0 BuildRequires: dos2unix @@ -90,7 +88,6 @@ specification and create a hierarchical Table of Contents. %setup -q -n Sigil-%{version} sed -i 's/\r//' ChangeLog.txt README.md COPYING.txt %patch0 -p 1 -%patch1 -p 1 %{__cp} -v %{S:1} . %{__cp} -v %{S:2} . # rpmlint @@ -138,7 +135,7 @@ install -m644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.deskt %files %defattr(-,root,root) -%doc ChangeLog.txt README.md COPYING.txt Sigil_User_Guide_0_7_2.epub +%doc ChangeLog.txt README.md COPYING.txt Sigil_User_Guide.epub %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %dir %{_datadir}/icons/hicolor/ From beeeabd38a02489f0a58a05a9fe8f6b55122241abb9cacc99afbce8754e78ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Aug 2018 10:18:03 +0000 Subject: [PATCH 2/2] Accepting request 629509 from home:jengelh:branches:Documentation:Tools - Replace old %__ macros and $RPM_* shell vars. - Use more "xargs -exec +". OBS-URL: https://build.opensuse.org/request/show/629509 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/sigil?expand=0&rev=23 --- sigil.changes | 6 ++++++ sigil.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sigil.changes b/sigil.changes index b327cf7..88e30b7 100644 --- a/sigil.changes +++ b/sigil.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 16 09:10:33 UTC 2018 - jengelh@inai.de + +- Replace old %__ macros and $RPM_* shell vars. +- Use more "xargs -exec +". + ------------------------------------------------------------------- Wed Aug 15 14:14:36 UTC 2018 - ecsos@opensuse.org diff --git a/sigil.spec b/sigil.spec index db3cebe..a627fa7 100644 --- a/sigil.spec +++ b/sigil.spec @@ -88,12 +88,12 @@ specification and create a hierarchical Table of Contents. %setup -q -n Sigil-%{version} sed -i 's/\r//' ChangeLog.txt README.md COPYING.txt %patch0 -p 1 -%{__cp} -v %{S:1} . -%{__cp} -v %{S:2} . +cp -v %{S:1} . +cp -v %{S:2} . # rpmlint dos2unix src/Resource_Files/python3lib/meta*.py dos2unix src/Resource_Files/python3lib/opf_*.py -find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python|#!\/usr\/bin\/python3|g' {} \; +find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python|#!\/usr\/bin\/python3|g' {} + #FIXME MANUAL UPDATE OF DATE REQUIRED HERE!!!! # Fix "Your file uses __DATE and __TIME__ this causes the package to rebuild @@ -104,10 +104,10 @@ find . -type f -exec sed -i -e 's|#!\/usr\/bin\/env python|#!\/usr\/bin\/python3 _date=$(date +"%Y%m%d") _time=$(date +"%H:%M:%S") # Change it: -find . -type f -name 'About.cpp' | xargs sed -i "s/@DATE@/$_date/;s/@TIME@/$_time/g" +find . -type f -name About.cpp -exec sed -i "s/@DATE@/$_date/;s/@TIME@/$_time/g" {} + %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" cmake -G "Unix Makefiles" \