diff --git a/.gitignore b/.gitignore index d152dd1..a3bcbec 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ inkscape.tar.bz2 /inkscape-1.0_2020-05-01_4035a4fb49.tar.xz /inkscape-1.0.1.tar.xz /inkscape-1.0.2.tar.xz +/inkscape-1.1.tar.xz diff --git a/inkscape-gcc11.patch b/inkscape-gcc11.patch deleted file mode 100644 index 794fc70..0000000 --- a/inkscape-gcc11.patch +++ /dev/null @@ -1,289 +0,0 @@ -diff --git a/src/extension/system.cpp b/src/extension/system.cpp -index 08de0b4..418f5ba 100644 ---- a/src/extension/system.cpp -+++ b/src/extension/system.cpp -@@ -174,7 +174,7 @@ open_internal(Extension *in_plug, gpointer in_data) - // skip all the rest if we already found a function to open it - // since they're ordered by preference now. - if (!*pimod) { -- gchar const *ext = dynamic_cast(in_plug)->get_extension(); -+ gchar const *ext = dynamic_cast(*in_plug).get_extension(); - - gchar *filenamelower = g_utf8_strdown(filename, -1); - gchar *extensionlower = g_utf8_strdown(ext, -1); -@@ -384,7 +384,7 @@ save_internal(Extension *in_plug, gpointer in_data) - // skip all the rest if we already found someone to save it - // since they're ordered by preference now. - if (!*pomod) { -- gchar const *ext = dynamic_cast(in_plug)->get_extension(); -+ gchar const *ext = dynamic_cast(*in_plug).get_extension(); - - gchar *filenamelower = g_utf8_strdown(filename, -1); - gchar *extensionlower = g_utf8_strdown(ext, -1); -diff --git a/src/object/object-set.cpp b/src/object/object-set.cpp -index bf41bb0..dafa2c1 100644 ---- a/src/object/object-set.cpp -+++ b/src/object/object-set.cpp -@@ -242,7 +242,7 @@ void ObjectSet::set(SPObject *object, bool persist_selection_context) { - _clear(); - _add(object); - if(dynamic_cast(this)) -- return dynamic_cast(this)->_emitChanged(persist_selection_context); -+ return dynamic_cast(*this)._emitChanged(persist_selection_context); - } - - void ObjectSet::setReprList(std::vector const &list) { -@@ -257,7 +257,7 @@ void ObjectSet::setReprList(std::vector const &list) { - } - _emitSignals(); - if(dynamic_cast(this)) -- return dynamic_cast(this)->_emitChanged();// -+ return dynamic_cast(*this)._emitChanged();// - } - - -diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp -index 88c5d8d..c4c3788 100644 ---- a/src/selection-chemistry.cpp -+++ b/src/selection-chemistry.cpp -@@ -680,7 +680,7 @@ static void sp_edit_select_all_full(SPDesktop *dt, bool force_all_layers, bool i - - switch (inlayer) { - case PREFS_SELECTION_LAYER: { -- if ( (onlysensitive && dynamic_cast(dt->currentLayer())->isLocked()) || -+ if ( (onlysensitive && dynamic_cast(*dt->currentLayer()).isLocked()) || - (onlyvisible && dt->itemIsHidden(dynamic_cast(dt->currentLayer()))) ) - return; - -@@ -775,7 +775,7 @@ Inkscape::XML::Node* ObjectSet::group() { - Geom::Affine item_t(Geom::identity()); - if (t_str) - sp_svg_transform_read(t_str, &item_t); -- item_t *= dynamic_cast(doc->getObjectByRepr(current->parent()))->i2doc_affine(); -+ item_t *= dynamic_cast(*doc->getObjectByRepr(current->parent())).i2doc_affine(); - // FIXME: when moving both clone and original from a transformed group (either by - // grouping into another parent, or by cut/paste) the transform from the original's - // parent becomes embedded into original itself, and this affects its clones. Fix -@@ -869,7 +869,7 @@ static void ungroup_impl(ObjectSet *set) - - SPItem *original = use; - while (dynamic_cast(original)) { -- original = dynamic_cast(original)->get_original(); -+ original = dynamic_cast(*original).get_original(); - } - - if (groups.find(original) != groups.end()) { -@@ -1651,7 +1651,8 @@ void ObjectSet::applyAffine(Geom::Affine const &affine, bool set_i2d, bool compe - && includes( sp_textpath_get_path_item(dynamic_cast(item->firstChild())) )); - - // ...both a flowtext and its frame? -- bool transform_flowtext_with_frame = (dynamic_cast(item) && includes( dynamic_cast(item)->get_frame(nullptr))); // (only the first frame is checked so far) -+ bool transform_flowtext_with_frame = (dynamic_cast(item) && includes( -+dynamic_cast(*item).get_frame(nullptr))); // (only the first frame is checked so far) - - // ...both an offset and its source? - bool transform_offset_with_source = (dynamic_cast(item) && dynamic_cast(item)->sourceHref) && includes( sp_offset_get_source(dynamic_cast(item)) ); -@@ -2048,19 +2049,21 @@ std::vector sp_get_same_fill_or_stroke_color(SPItem *sel, std::vectorstyle->getFillPaintServer() : iter->style->getStrokePaintServer(); - - if ((dynamic_cast(sel_server) || dynamic_cast(sel_server) || -- (dynamic_cast(sel_server) && dynamic_cast(sel_server)->getVector()->isSwatch())) -+ (dynamic_cast(sel_server) && dynamic_cast(*sel_server).getVector()->isSwatch())) - && - (dynamic_cast(iter_server) || dynamic_cast(iter_server) || -- (dynamic_cast(iter_server) && dynamic_cast(iter_server)->getVector()->isSwatch()))) { -- SPGradient *sel_vector = dynamic_cast(sel_server)->getVector(); -- SPGradient *iter_vector = dynamic_cast(iter_server)->getVector(); -+ (dynamic_cast(iter_server) && dynamic_cast(*iter_server).getVector()->isSwatch()))) { -+ SPGradient *sel_vector = dynamic_cast(*sel_server).getVector(); -+ SPGradient *iter_vector = dynamic_cast(*iter_server).getVector(); - if (sel_vector == iter_vector) { - match = true; - } - - } else if (dynamic_cast(sel_server) && dynamic_cast(iter_server)) { -- SPPattern *sel_pat = dynamic_cast(sel_server)->rootPattern(); -- SPPattern *iter_pat = dynamic_cast(iter_server)->rootPattern(); -+ SPPattern *sel_pat = dynamic_cast(*sel_server).rootPattern(); -+ SPPattern *iter_pat = dynamic_cast(*iter_server).rootPattern(); - if (sel_pat == iter_pat) { - match = true; - } -diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp -index 151be25..cce1642 100644 ---- a/src/text-chemistry.cpp -+++ b/src/text-chemistry.cpp -@@ -134,7 +134,7 @@ text_put_on_path() - - if (SP_IS_TEXT(text)) { - // Replace any new lines (including sodipodi:role="line") by spaces. -- dynamic_cast(text)->remove_newlines(); -+ dynamic_cast(*text).remove_newlines(); - } - - Inkscape::Text::Layout const *layout = te_get_layout(text); -diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp -index cca4172..fe9638e 100644 ---- a/src/ui/clipboard.cpp -+++ b/src/ui/clipboard.cpp -@@ -334,7 +334,7 @@ void ClipboardManagerImpl::copySymbol(Inkscape::XML::Node* symbol, gchar const* - SPObject *cmobj = _clipboardSPDoc->getObjectByRepr(repr); - if (cmobj && !user_symbol) { // convert only stock symbols - if (!Geom::are_near(scale_units, 1.0, Geom::EPSILON)) { -- dynamic_cast(cmobj)->scaleChildItemsRec( -+ dynamic_cast(*cmobj).scaleChildItemsRec( - Geom::Scale(scale_units), Geom::Point(0, SP_ACTIVE_DESKTOP->getDocument()->getHeight().value("px")), - false); - } -diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp -index 5874cac..f119c81 100644 ---- a/src/ui/dialog/filedialogimpl-gtkmm.cpp -+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp -@@ -639,7 +639,7 @@ void FileSaveDialogImplGtk::fileNameChanged() { - Glib::ustring::size_type pos = name.rfind('.'); - if ( pos == Glib::ustring::npos ) return; - Glib::ustring ext = name.substr( pos ).casefold(); -- if (extension && Glib::ustring(dynamic_cast(extension)->get_extension()).casefold() == ext ) return; -+ if (extension && Glib::ustring(dynamic_cast(*extension).get_extension()).casefold() == ext ) return; - if (knownExtensions.find(ext) == knownExtensions.end()) return; - fromCB = true; - fileTypeComboBox.set_active_text(knownExtensions[ext]->get_filetypename(true)); -diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp -index 9b1e130..d1e8efd 100644 ---- a/src/ui/dialog/filter-effects-dialog.cpp -+++ b/src/ui/dialog/filter-effects-dialog.cpp -@@ -477,8 +477,8 @@ private: - - for(int i = 0; i < cols; ++i) { - _tree.append_column_numeric_editable("", _columns.cols[i], "%.2f"); -- dynamic_cast( -- _tree.get_column_cell_renderer(i))->signal_edited().connect( -+ dynamic_cast( -+ *_tree.get_column_cell_renderer(i)).signal_edited().connect( - sigc::mem_fun(*this, &MatrixAttr::rebind)); - } - -@@ -575,7 +575,7 @@ public: - if(w == &_label) - return ""; - else -- return dynamic_cast(w)->get_as_attribute(); -+ return dynamic_cast(*w).get_as_attribute(); - } - - void clear_store() -@@ -2571,7 +2571,7 @@ void FilterEffectsDialog::PrimitiveList::on_drag_end(const Glib::RefPtr(get_parent())->get_vadjustment(); -+ auto a = dynamic_cast(*get_parent()).get_vadjustment(); - double v = a->get_value() + _autoscroll_y; - - if(v < 0) -@@ -2586,7 +2586,7 @@ bool FilterEffectsDialog::PrimitiveList::on_scroll_timeout() - - - if(_autoscroll_x) { -- auto a_h = dynamic_cast(get_parent())->get_hadjustment(); -+ auto a_h = dynamic_cast(*get_parent()).get_hadjustment(); - double h = a_h->get_value() + _autoscroll_x; - - if(h < 0) -diff --git a/src/ui/dialog/paint-servers.cpp b/src/ui/dialog/paint-servers.cpp -index ec49312..2c6852f 100644 ---- a/src/ui/dialog/paint-servers.cpp -+++ b/src/ui/dialog/paint-servers.cpp -@@ -283,7 +283,7 @@ Glib::RefPtr PaintServersDialog::get_pixbuf(SPDocument *document, G - preview_document->getRoot()->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); - preview_document->ensureUpToDate(); - -- Geom::OptRect dbox = dynamic_cast(rect)->visualBounds(); -+ Geom::OptRect dbox = dynamic_cast(*rect).visualBounds(); - - if (!dbox) { - return pixbuf; -diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp -index 000f7ba..0c4bce9 100644 ---- a/src/ui/dialog/svg-fonts-dialog.cpp -+++ b/src/ui/dialog/svg-fonts-dialog.cpp -@@ -826,13 +826,13 @@ Gtk::VBox* SvgFontsDialog::glyphs_tab(){ - glyph_from_path_button.set_label(_("Get curves from selection...")); - glyph_from_path_button.signal_clicked().connect(sigc::mem_fun(*this, &SvgFontsDialog::set_glyph_description_from_selected_path)); - -- dynamic_cast( _GlyphsList.get_column_cell_renderer(0))->signal_edited().connect( -+ dynamic_cast( *_GlyphsList.get_column_cell_renderer(0)).signal_edited().connect( - sigc::mem_fun(*this, &SvgFontsDialog::glyph_name_edit)); - -- dynamic_cast( _GlyphsList.get_column_cell_renderer(1))->signal_edited().connect( -+ dynamic_cast( *_GlyphsList.get_column_cell_renderer(1)).signal_edited().connect( - sigc::mem_fun(*this, &SvgFontsDialog::glyph_unicode_edit)); - -- dynamic_cast( _GlyphsList.get_column_cell_renderer(2))->signal_edited().connect( -+ dynamic_cast( *_GlyphsList.get_column_cell_renderer(2)).signal_edited().connect( - sigc::mem_fun(*this, &SvgFontsDialog::glyph_advance_edit)); - - _glyphs_observer.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::update_glyphs)); -diff --git a/src/ui/widget/ink-flow-box.cpp b/src/ui/widget/ink-flow-box.cpp -index 8485dd9..4b1ebe2 100644 ---- a/src/ui/widget/ink-flow-box.cpp -+++ b/src/ui/widget/ink-flow-box.cpp -@@ -72,7 +72,7 @@ void InkFlowBox::on_toggle(gint pos, Gtk::ToggleButton *tbutton) - bool active = true; - for (auto child : tbutton->get_parent()->get_children()) { - if (tbutton != child) { -- dynamic_cast(child)->set_active(active); -+ dynamic_cast(*child).set_active(active); - active = false; - } - } -@@ -97,7 +97,7 @@ void InkFlowBox::on_global_toggle(Gtk::ToggleButton *tbutton) - bool active = true; - for (auto child : tbutton->get_parent()->get_children()) { - if (tbutton != child) { -- dynamic_cast(child)->set_active(active); -+ dynamic_cast(*child).set_active(active); - active = false; - } - } -diff --git a/src/ui/widget/spin-button-tool-item.cpp b/src/ui/widget/spin-button-tool-item.cpp -index b283939..b8c639c 100644 ---- a/src/ui/widget/spin-button-tool-item.cpp -+++ b/src/ui/widget/spin-button-tool-item.cpp -@@ -207,7 +207,7 @@ SpinButtonToolItem::process_tab(int increment) - if(dynamic_cast(tool_item)) { - // (1) The tool item is a SpinButtonToolItem, in which case, we just pass - // focus to its spin-button -- dynamic_cast(tool_item)->grab_button_focus(); -+ dynamic_cast(*tool_item).grab_button_focus(); - handled = true; - } - else if(dynamic_cast(tool_item->get_child())) { -diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp -index ebeb8ca..c25a217 100644 ---- a/src/widgets/desktop-widget.cpp -+++ b/src/widgets/desktop-widget.cpp -@@ -1848,7 +1848,7 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags) - std::vector ch = Glib::wrap(GTK_CONTAINER(aux_toolbox))->get_children(); - for (auto i:ch) { - if (GTK_IS_CONTAINER(i->gobj())) { -- std::vector grch = dynamic_cast(i)->get_children(); -+ std::vector grch = dynamic_cast(*i).get_children(); - for (auto j:grch) { - - if (!GTK_IS_WIDGET(j->gobj())) // wasn't a widget -diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp -index ac9794e..fc08250 100644 ---- a/src/xml/repr-io.cpp -+++ b/src/xml/repr-io.cpp -@@ -912,7 +912,7 @@ void sp_repr_write_stream( Node *repr, Writer &out, gint indent_level, - { - switch (repr->type()) { - case Inkscape::XML::TEXT_NODE: { -- if( dynamic_cast(repr)->is_CData() ) { -+ if( dynamic_cast(*repr).is_CData() ) { - // Preserve CDATA sections, not converting '&' to &, etc. - out.printf( "", repr->content() ); - } else { diff --git a/inkscape-glib-extern.patch b/inkscape-glib-extern.patch deleted file mode 100644 index 250c375..0000000 --- a/inkscape-glib-extern.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up inkscape-1.0.1_2020-09-07_3bc2e813f5/src/3rdparty/autotrace/autotrace.h.glib-extern inkscape-1.0.1_2020-09-07_3bc2e813f5/src/3rdparty/autotrace/autotrace.h ---- inkscape-1.0.1_2020-09-07_3bc2e813f5/src/3rdparty/autotrace/autotrace.h.glib-extern 2021-02-16 12:59:00.917852141 +0100 -+++ inkscape-1.0.1_2020-09-07_3bc2e813f5/src/3rdparty/autotrace/autotrace.h 2021-02-16 12:59:06.675894640 +0100 -@@ -22,6 +22,7 @@ - #define AUTOTRACE_H - - #include -+#include "types.h" - - #ifdef __cplusplus - extern "C" { -@@ -35,7 +36,6 @@ extern "C" { - * Typedefs - * ===================================================================== */ - --#include "types.h" - #include "color.h" - - /* Third degree is the highest we deal with. */ diff --git a/inkscape-missing-atomic.patch b/inkscape-missing-atomic.patch deleted file mode 100644 index cfbd8ef..0000000 --- a/inkscape-missing-atomic.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up inkscape-1.0.1_2020-09-07_3bc2e813f5/src/ui/tool/node.cpp.missing-atomic inkscape-1.0.1_2020-09-07_3bc2e813f5/src/ui/tool/node.cpp ---- inkscape-1.0.1_2020-09-07_3bc2e813f5/src/ui/tool/node.cpp.missing-atomic 2021-02-16 13:35:58.455184020 +0100 -+++ inkscape-1.0.1_2020-09-07_3bc2e813f5/src/ui/tool/node.cpp 2021-02-16 13:36:11.411279411 +0100 -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -31,6 +32,7 @@ - #include "ui/tools/node-tool.h" - #include "ui/tools-switch.h" - -+ - namespace { - - Inkscape::ControlType nodeTypeToCtrlType(Inkscape::UI::NodeType type) diff --git a/inkscape.spec b/inkscape.spec index b77b55a..e7390db 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: inkscape -Version: 1.0.2 -Release: 6%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Vector-based drawing program using SVG # Inkscape tags their releases with underscores and in ALLCAPS @@ -10,22 +10,17 @@ Summary: Vector-based drawing program using SVG License: GPLv2+ and CC-BY URL: https://inkscape.org/ -Source0: https://inkscape.org/gallery/item/23820/inkscape-1.0.2.tar.xz +Source0: https://inkscape.org/gallery/item/26932/inkscape-1.1.tar.xz # Fedora Color Palette, GIMP format, CC-BY 3.0 Source2: Fedora-Color-Palette.gpl -Patch1: inkscape-gcc11.patch -# Fixes build failures with type_traits:2900:3: error: template with C linkage -Patch3: inkscape-glib-extern.patch -# Fixes: error: field 'rel_error' has incomplete type 'std::atomic' -Patch4: inkscape-missing-atomic.patch - Provides: bundled(libcroco) Provides: bundled(autotrace) Provides: bundled(libdepixelize) Provides: bundled(libuemf) Provides: bundled(adaptagrams) +Provides: bundled(lib2geom) BuildRequires: gcc-c++ BuildRequires: aspell-devel aspell-en @@ -66,6 +61,7 @@ BuildRequires: dbus-glib-devel BuildRequires: libjpeg-devel BuildRequires: libsigc++20-devel BuildRequires: libsoup-devel +BuildRequires: gspell-devel BuildRequires: make # Disable all for now. TODO: Be smarter @@ -117,7 +113,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %prep -%autosetup -n inkscape-1.0.2_2021-01-15_e86c870879 -p1 +%autosetup -n inkscape-1.1_2021-05-24_c4e8f9ed74 -p1 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . find . -name CMakeLists.txt | xargs sed -i 's|COMMAND python |COMMAND %{__python3} |g' @@ -166,6 +162,11 @@ find $RPM_BUILD_ROOT -type f -name 'lib*.a' | xargs rm -f # No skencil anymore rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh +# Don't install development files for bundled libraries +rm -r $RPM_BUILD_ROOT%{_includedir}/2geom-1.1.0/ +rm -r $RPM_BUILD_ROOT%{_libdir}/cmake/2Geom +rm $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/2geom.pc + # Install Fedora Color Pallette install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/ @@ -213,7 +214,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc %{_mandir}/man1/*.1* %exclude %{_mandir}/man1/inkview.1* %{_datadir}/inkscape/tutorials +%{_datadir}/inkscape/themes %{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/hicolor/*/apps/*.svg %{_datadir}/bash-completion/completions/inkscape %files view @@ -232,6 +235,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc %changelog +* Wed Jun 23 2021 Jan Horak - 1.1-1 +- Enable gspell +- Don't install development files for bundled 2geom +- Update to 1.1 + * Wed May 19 2021 Jan Horak - 1.0.2-6 - Resolves: #1958287 Rebuild due to updated poppler diff --git a/sources b/sources index 3c7b3a8..0fa8325 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (inkscape-1.0.2.tar.xz) = f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d +SHA512 (inkscape-1.1.tar.xz) = 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80