From 2db0a3de8b53c08181dee8de1d1fe8eb924fd11b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sun, 6 Feb 2022 20:20:05 -0600 Subject: [PATCH] 1.1.2 --- .gitignore | 1 + ...abc637ac2d3bc6ff997503b0631ac14e16b5.patch | 26 ----------- ...c21b9cb7b6176a7b36ca24068b148c817e82.patch | 29 ------------ ...bef2245d4e4e977ee9d6776be9a134493515.patch | 46 ------------------- inkscape.spec | 17 ++++--- sources | 2 +- 6 files changed, 12 insertions(+), 109 deletions(-) delete mode 100644 3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch delete mode 100644 5724c21b9cb7b6176a7b36ca24068b148c817e82.patch delete mode 100644 b3dabef2245d4e4e977ee9d6776be9a134493515.patch diff --git a/.gitignore b/.gitignore index 50b5f72..838b944 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ inkscape.tar.bz2 /inkscape-1.0.2.tar.xz /inkscape-1.1.tar.xz /inkscape-1.1.1.tar.xz +/inkscape-1.1.2.tar.xz diff --git a/3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch b/3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch deleted file mode 100644 index e402a2a..0000000 --- a/3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3825abc637ac2d3bc6ff997503b0631ac14e16b5 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 30 Nov 2021 10:11:20 +0000 -Subject: [PATCH] Initializes string with empty string - -src/io/file.h: fix build on gcc-12 ---- - src/io/file.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/io/file.h b/src/io/file.h -index 5d2ec6d86d..eb5c0d8a0f 100644 ---- a/src/io/file.h -+++ b/src/io/file.h -@@ -26,7 +26,7 @@ class RefPtr; - - class SPDocument; - --SPDocument* ink_file_new(const std::string &Template = nullptr); -+SPDocument* ink_file_new(const std::string &Template = ""); - SPDocument* ink_file_open(const Glib::ustring &data); - SPDocument* ink_file_open(const Glib::RefPtr& file, bool *cancelled = nullptr); - --- -GitLab - diff --git a/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch b/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch deleted file mode 100644 index 5d7f480..0000000 --- a/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras -Date: Mon, 1 Nov 2021 21:45:38 +0200 -Subject: [PATCH] Fix build with poppler 21.11.0 - -GfxFont::tag is now of type std::string instead of GooString *. ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index e3d04d544b..feecefa043 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) - } - if (printCommands) { - printf(" font: tag=%s name='%s' %g\n", -+#if POPPLER_CHECK_VERSION(21,11,0) -+ font->getTag().c_str(), -+#else - font->getTag()->getCString(), -+#endif - font->getName() ? font->getName()->getCString() : "???", - args[1].getNum()); - fflush(stdout); --- -GitLab - diff --git a/b3dabef2245d4e4e977ee9d6776be9a134493515.patch b/b3dabef2245d4e4e977ee9d6776be9a134493515.patch deleted file mode 100644 index be10a51..0000000 --- a/b3dabef2245d4e4e977ee9d6776be9a134493515.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b3dabef2245d4e4e977ee9d6776be9a134493515 Mon Sep 17 00:00:00 2001 -From: Tavmjong Bah -Date: Fri, 5 Nov 2021 18:49:43 +0100 -Subject: [PATCH] Remove mandatory break from end of paragraphs, added in Pango - 1.49. This broke Inkscape's multiline text (sodipodi:role = line). - ---- - src/libnrtype/Layout-TNG-Compute.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp -index 16de87d1dd..b7e65f6924 100644 ---- a/src/libnrtype/Layout-TNG-Compute.cpp -+++ b/src/libnrtype/Layout-TNG-Compute.cpp -@@ -1392,7 +1392,7 @@ void Layout::Calculator::_buildPangoItemizationForPara(ParagraphInfo *para) con - } - - TRACE(("whole para: \"%s\"\n", para->text.data())); -- TRACE(("%d input sources used\n", input_index - para->first_input_index)); -+// TRACE(("%d input sources used\n", input_index - para->first_input_index)); - - // Pango Itemize - GList *pango_items_glist = nullptr; -@@ -1429,6 +1429,10 @@ void Layout::Calculator::_buildPangoItemizationForPara(ParagraphInfo *para) con - para->char_attributes.resize(para->text.length() + 1); - pango_get_log_attrs(para->text.data(), para->text.bytes(), -1, nullptr, &*para->char_attributes.begin(), para->char_attributes.size()); - -+ // Fix for Pango 1.49 which changes the end of a paragraph to a mandatory break. -+ // This breaks Inkscape's multiline text (i.e. sodipodi:role line). -+ para->char_attributes[para->text.length()].is_mandatory_break = 0; -+ - TRACE(("end para itemize, direction = %d\n", para->direction)); - } - -@@ -1542,7 +1546,7 @@ unsigned Layout::Calculator::_buildSpansForPara(ParagraphInfo *para) const - unsigned const text_source_bytes = ( text_source->text_end.base() - - text_source->text_begin.base() - - span_start_byte_in_source ); -- TRACE(("New Span\n")); -+ TRACE(("New Unbroken Span\n")); - UnbrokenSpan new_span; - new_span.text_bytes = std::min(text_source_bytes, pango_item_bytes); - new_span.input_stream_first_character = Glib::ustring::const_iterator(text_source->text_begin.base() + span_start_byte_in_source); --- -GitLab - diff --git a/inkscape.spec b/inkscape.spec index 20a8095..6b9f264 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: inkscape -Version: 1.1.1 -Release: 4%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Vector-based drawing program using SVG # Inkscape tags their releases with underscores and in ALLCAPS @@ -10,14 +10,14 @@ Summary: Vector-based drawing program using SVG License: GPLv2+ and CC-BY URL: https://inkscape.org/ -Source0: https://inkscape.org/gallery/item/29255/inkscape-1.1.1.tar.xz +Source0: https://inkscape.org/gallery/item/31668/inkscape-1.1.2.tar.xz # Fedora Color Palette, GIMP format, CC-BY 3.0 Source2: Fedora-Color-Palette.gpl -Patch0: b3dabef2245d4e4e977ee9d6776be9a134493515.patch -Patch1: 5724c21b9cb7b6176a7b36ca24068b148c817e82.patch -Patch2: 3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch +#Patch0: b3dabef2245d4e4e977ee9d6776be9a134493515.patch +#Patch1: 5724c21b9cb7b6176a7b36ca24068b148c817e82.patch +#Patch2: 3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch Provides: bundled(libcroco) Provides: bundled(autotrace) @@ -117,7 +117,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %prep -%autosetup -n inkscape-1.1.1_2021-09-20_3bf5ae0d25 -p1 +%autosetup -n inkscape-1.1.2_2022-02-04_0a00cf5339 -p1 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . find . -name CMakeLists.txt | xargs sed -i 's|COMMAND python |COMMAND %{__python3} |g' @@ -216,6 +216,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc %changelog +* Sun Feb 06 2022 Gwyn Ciesla - 1.1.2-1 +- 1.1.2 + * Thu Jan 20 2022 Fedora Release Engineering - 1.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 13668bf..0506c77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (inkscape-1.1.1.tar.xz) = 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c +SHA512 (inkscape-1.1.2.tar.xz) = 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16