Poppler rebuild.

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -29,3 +29,9 @@ inkscape.tar.bz2
 /inkscape-1.0rc1_2020-04-09_09960d6f05.tar.xz
 /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
+/inkscape-1.1.1.tar.xz
+/inkscape-1.1.2.tar.xz
+/inkscape-1.2_2022-05-15_dc2aedaf03.tar.xz
+/inkscape-1.2.1.tar.xz

inkscape-appdata.patch

@@ -1,25 +0,0 @@
-From 16f50bf4c4df921b9e816e09971c4f9aa9bb8ade Mon Sep 17 00:00:00 2001
-From: Marc Jeanmougin <marc@jeanmougin.fr>
-Date: Tue, 8 Sep 2020 00:59:36 +0200
-Subject: [PATCH] Fix appdata
-
----
- org.inkscape.Inkscape.appdata.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/org.inkscape.Inkscape.appdata.xml.in b/org.inkscape.Inkscape.appdata.xml.in
-index a99ecddb20..e1febd5034 100644
---- a/org.inkscape.Inkscape.appdata.xml.in
-+++ b/org.inkscape.Inkscape.appdata.xml.in
-@@ -39,7 +39,7 @@
-     </screenshot>
-   </screenshots>
-   <releases>
--    <release version="1.0" date="2020-09-07">
-+    <release version="1.0.1" date="2020-09-07">
-       <description>
-         <p>Inkscape 1.0.1</p>
-         <ul>
--- 
-2.26.2
-

inkscape-gcc11.patch

@@ -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<Input *>(in_plug)->get_extension();
-+            gchar const *ext = dynamic_cast<Input &>(*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<Output *>(in_plug)->get_extension();
-+            gchar const *ext = dynamic_cast<Output &>(*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<Inkscape::Selection*>(this))
--        return dynamic_cast<Inkscape::Selection*>(this)->_emitChanged(persist_selection_context);
-+        return dynamic_cast<Inkscape::Selection&>(*this)._emitChanged(persist_selection_context);
- }
- 
- void ObjectSet::setReprList(std::vector<XML::Node*> const &list) {
-@@ -257,7 +257,7 @@ void ObjectSet::setReprList(std::vector<XML::Node*> const &list) {
-     }
-     _emitSignals();
-     if(dynamic_cast<Inkscape::Selection*>(this))
--        return dynamic_cast<Inkscape::Selection*>(this)->_emitChanged();//
-+        return dynamic_cast<Inkscape::Selection&>(*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<SPItem *>(dt->currentLayer())->isLocked()) ||
-+        if ( (onlysensitive && dynamic_cast<SPItem &>(*dt->currentLayer()).isLocked()) ||
-              (onlyvisible && dt->itemIsHidden(dynamic_cast<SPItem *>(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<SPItem *>(doc->getObjectByRepr(current->parent()))->i2doc_affine();
-+            item_t *= dynamic_cast<SPItem &>(*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<SPUse *>(original)) {
--            original = dynamic_cast<SPUse *>(original)->get_original();
-+            original = dynamic_cast<SPUse &>(*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<SPTextPath *>(item->firstChild())) ));
- 
-         // ...both a flowtext and its frame?
--        bool transform_flowtext_with_frame = (dynamic_cast<SPFlowtext *>(item) && includes( dynamic_cast<SPFlowtext *>(item)->get_frame(nullptr))); // (only the first frame is checked so far)
-+        bool transform_flowtext_with_frame = (dynamic_cast<SPFlowtext *>(item) && includes(
-+dynamic_cast<SPFlowtext &>(*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<SPOffset *>(item) && dynamic_cast<SPOffset *>(item)->sourceHref) && includes( sp_offset_get_source(dynamic_cast<SPOffset *>(item)) );
-@@ -2048,19 +2049,21 @@ std::vector<SPItem*> sp_get_same_fill_or_stroke_color(SPItem *sel, std::vector<S
-                     (type == SP_FILL_COLOR) ? iter->style->getFillPaintServer() : iter->style->getStrokePaintServer();
- 
-                 if ((dynamic_cast<SPLinearGradient *>(sel_server) || dynamic_cast<SPRadialGradient *>(sel_server) ||
--                     (dynamic_cast<SPGradient *>(sel_server) && dynamic_cast<SPGradient *>(sel_server)->getVector()->isSwatch()))
-+                     (dynamic_cast<SPGradient *>(sel_server) && dynamic_cast<SPGradient
-+&>(*sel_server).getVector()->isSwatch()))
-                     &&
-                     (dynamic_cast<SPLinearGradient *>(iter_server) || dynamic_cast<SPRadialGradient *>(iter_server) ||
--                     (dynamic_cast<SPGradient *>(iter_server) && dynamic_cast<SPGradient *>(iter_server)->getVector()->isSwatch()))) {
--                    SPGradient *sel_vector = dynamic_cast<SPGradient *>(sel_server)->getVector();
--                    SPGradient *iter_vector = dynamic_cast<SPGradient *>(iter_server)->getVector();
-+                     (dynamic_cast<SPGradient *>(iter_server) && dynamic_cast<SPGradient
-+&>(*iter_server).getVector()->isSwatch()))) {
-+                    SPGradient *sel_vector = dynamic_cast<SPGradient &>(*sel_server).getVector();
-+                    SPGradient *iter_vector = dynamic_cast<SPGradient &>(*iter_server).getVector();
-                     if (sel_vector == iter_vector) {
-                         match = true;
-                     }
- 
-                 } else if (dynamic_cast<SPPattern *>(sel_server) && dynamic_cast<SPPattern *>(iter_server)) {
--                    SPPattern *sel_pat = dynamic_cast<SPPattern *>(sel_server)->rootPattern();
--                    SPPattern *iter_pat = dynamic_cast<SPPattern *>(iter_server)->rootPattern();
-+                    SPPattern *sel_pat = dynamic_cast<SPPattern &>(*sel_server).rootPattern();
-+                    SPPattern *iter_pat = dynamic_cast<SPPattern &>(*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<SPText *>(text)->remove_newlines();
-+        dynamic_cast<SPText &>(*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<SPGroup *>(cmobj)->scaleChildItemsRec(
-+            dynamic_cast<SPGroup &>(*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<Inkscape::Extension::Output *>(extension)->get_extension()).casefold() == ext ) return;
-+    if (extension && Glib::ustring(dynamic_cast<Inkscape::Extension::Output &>(*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<Gtk::CellRendererText*>(
--                    _tree.get_column_cell_renderer(i))->signal_edited().connect(
-+                dynamic_cast<Gtk::CellRendererText&>(
-+                    *_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<const AttrWidget*>(w)->get_as_attribute();
-+            return dynamic_cast<const AttrWidget&>(*w).get_as_attribute();
-     }
- 
-     void clear_store()
-@@ -2571,7 +2571,7 @@ void FilterEffectsDialog::PrimitiveList::on_drag_end(const Glib::RefPtr<Gdk::Dra
- bool FilterEffectsDialog::PrimitiveList::on_scroll_timeout()
- {
-     if(_autoscroll_y) {
--        auto a = dynamic_cast<Gtk::ScrolledWindow*>(get_parent())->get_vadjustment();
-+        auto a = dynamic_cast<Gtk::ScrolledWindow&>(*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<Gtk::ScrolledWindow*>(get_parent())->get_hadjustment();
-+        auto a_h = dynamic_cast<Gtk::ScrolledWindow&>(*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<Gdk::Pixbuf> PaintServersDialog::get_pixbuf(SPDocument *document, G
-     preview_document->getRoot()->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
-     preview_document->ensureUpToDate();
- 
--    Geom::OptRect dbox = dynamic_cast<SPItem *>(rect)->visualBounds();
-+    Geom::OptRect dbox = dynamic_cast<SPItem &>(*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<Gtk::CellRendererText*>( _GlyphsList.get_column_cell_renderer(0))->signal_edited().connect(
-+    dynamic_cast<Gtk::CellRendererText&>( *_GlyphsList.get_column_cell_renderer(0)).signal_edited().connect(
-         sigc::mem_fun(*this, &SvgFontsDialog::glyph_name_edit));
- 
--    dynamic_cast<Gtk::CellRendererText*>( _GlyphsList.get_column_cell_renderer(1))->signal_edited().connect(
-+    dynamic_cast<Gtk::CellRendererText&>( *_GlyphsList.get_column_cell_renderer(1)).signal_edited().connect(
-         sigc::mem_fun(*this, &SvgFontsDialog::glyph_unicode_edit));
- 
--    dynamic_cast<Gtk::CellRendererText*>( _GlyphsList.get_column_cell_renderer(2))->signal_edited().connect(
-+    dynamic_cast<Gtk::CellRendererText&>( *_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<Gtk::ToggleButton *>(child)->set_active(active);
-+                dynamic_cast<Gtk::ToggleButton &>(*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<Gtk::ToggleButton *>(child)->set_active(active);
-+                dynamic_cast<Gtk::ToggleButton &>(*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<SpinButtonToolItem *>(tool_item)) {
-                     // (1) The tool item is a SpinButtonToolItem, in which case, we just pass
-                     //     focus to its spin-button
--                    dynamic_cast<SpinButtonToolItem *>(tool_item)->grab_button_focus();
-+                    dynamic_cast<SpinButtonToolItem &>(*tool_item).grab_button_focus();
-                     handled = true;
-                 }
-                 else if(dynamic_cast<Gtk::SpinButton *>(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<Gtk::Widget*> ch = Glib::wrap(GTK_CONTAINER(aux_toolbox))->get_children();
-             for (auto i:ch) {
-                 if (GTK_IS_CONTAINER(i->gobj())) {
--                    std::vector<Gtk::Widget*> grch = dynamic_cast<Gtk::Container*>(i)->get_children();
-+                    std::vector<Gtk::Widget*> grch = dynamic_cast<Gtk::Container&>(*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<const Inkscape::XML::TextNode *>(repr)->is_CData() ) {
-+            if( dynamic_cast<const Inkscape::XML::TextNode &>(*repr).is_CData() ) {
-                 // Preserve CDATA sections, not converting '&' to &amp;, etc.
-                 out.printf( "<![CDATA[%s]]>", repr->content() );
-             } else {

inkscape.spec

@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           inkscape
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.2.1
+Release:        3%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 # Inkscape tags their releases with underscores and in ALLCAPS
@@ -10,17 +10,17 @@ Summary:        Vector-based drawing program using SVG
 
 License:        GPLv2+ and CC-BY
 URL:            https://inkscape.org/
-Source0:        https://inkscape.org/gallery/item/21571/inkscape-1.0.1.tar.xz
+Source0:        https://inkscape.org/gallery/item/34673/inkscape-1.2.1.tar.xz
 
 # Fedora Color Palette, GIMP format, CC-BY 3.0
 Source2:	Fedora-Color-Palette.gpl
 
-Patch1:         inkscape-gcc11.patch
-# Backported from upstream
-Patch2:         inkscape-appdata.patch
-
 Provides: bundled(libcroco)
-Provides: bundled(libgdl)
+Provides: bundled(autotrace)
+Provides: bundled(libdepixelize)
+Provides: bundled(libuemf)
+Provides: bundled(adaptagrams)
+Provides: bundled(lib2geom)
 
 BuildRequires:  gcc-c++
 BuildRequires:  aspell-devel aspell-en
@@ -32,12 +32,11 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  double-conversion-devel
 BuildRequires:  freetype-devel
 BuildRequires:  gc-devel >= 6.4
-BuildRequires:  gdlmm-devel
+BuildRequires:  libgdl-devel
 BuildRequires:  gettext
 BuildRequires:  gsl-devel
 BuildRequires:  gtkmm30-devel
-BuildRequires:  gtkspell3-devel
-%if ! 0%{?flatpak}
+%if ! 0%{?flatpak} && ! (0%{?rhel} >= 8)
 BuildRequires:  ImageMagick-c++-devel
 %endif
 BuildRequires:  intltool
@@ -61,6 +60,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
@@ -75,7 +75,8 @@ Requires:       python3
 Requires:       python3-lxml
 Requires:       python3-numpy
 Requires:       python3-scour
-
+Requires:       python3-appdirs
+Requires:       python3-cssselect
 # Weak dependencies for the LaTeX plugin
 Suggests:       pstoedit
 Suggests:       tex(latex)
@@ -112,7 +113,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
 
 
 %prep
-%autosetup -n inkscape-1.0.1_2020-09-07_3bc2e813f5 -p1
+%autosetup -n inkscape-1.2.1_2022-07-14_9c6d41e410 -p1
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
 find . -name CMakeLists.txt | xargs sed -i 's|COMMAND python |COMMAND %{__python3} |g'
 
@@ -129,37 +130,24 @@ find . -name '*.h' | xargs chmod -x
 dos2unix -k -q share/extensions/*.py
 
 %build
-#export CFLAGS="${CFLAGS:--O2 -g -pipe -Wall -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection}"
-#export CXXFLAGS="${CXXFLAGS:--O2 -g -pipe -Wall -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection}"
-#export FFLAGS="${FFLAGS:--O2 -g -pipe -Wall -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I/usr/lib64/gfortran/modules}"
-#export FCFLAGS="${FCFLAGS:--O2 -g -pipe -Wall -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I/usr/lib64/gfortran/modules}"
-#export LDFLAGS="${LDFLAGS:--Wl,-z,relro   -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld}"
-sed -i /FORTIFY_SOURCE/d CMakeLists.txt
-cmake \
-        -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
-        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
-        -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \
+%cmake3 \
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \
-        -DLIB_INSTALL_DIR:PATH=%{_libdir} \
-        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
-        -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \
-%if "lib64" == "lib64" 
-        -DLIB_SUFFIX=64 \
-%endif 
-        -DBUILD_SHARED_LIBS:BOOL=OFF .
-
-%make_build
+        -DBUILD_SHARED_LIBS:BOOL=OFF
+%cmake_build
 
 
 %install
-%make_install
+%cmake_install
 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%{_libdir}/pkgconfig/2geom.pc
+
 # Install Fedora Color Pallette
 install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/
 
@@ -186,10 +174,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
 %{_datadir}/inkscape/attributes
 %{_datadir}/inkscape/branding
 %{_datadir}/inkscape/extensions
-%if 0%{?flatpak}
-# Pulls in ruby
-%exclude %{_datadir}/inkscape/extensions/simplepath.rb
-%endif
 %{_datadir}/inkscape/filters
 %{_datadir}/inkscape/fonts
 %{_datadir}/inkscape/icons
@@ -207,7 +191,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
@@ -226,6 +212,90 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
 
 
 %changelog
+* Tue Aug 02 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.2.1-3
+- Poppler rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 14 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.2.1-1
+- 1.2.1
+
+* Mon May 23 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.2-2
+- Add missing Requires on python3-cssselect
+
+* Tue May 17 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.2-1
+- 1.2
+
+* Tue May 17 2022 Sérgio Basto <sergio@serjux.com> - 1.1.2-4
+- ImageMagick is not intended to be on RHEL >= 8 (just on EPEL)
+
+* Wed May 11 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.1.2-3
+- ImageMagick build.
+
+* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 1.1.2-2
+- Rebuilt for Boost 1.78
+
+* Sun Feb 06 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.1.2-1
+- 1.1.2
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jan 13 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.1.1-3
+- Poppler rebuild, with upstream patches.
+
+* Wed Nov 10 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.1.1-2
+- Patch for Pango multiline issue.
+
+* Thu Nov 04 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.1.1-1
+- 1.1.1
+
+* Wed Aug 18 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.1-10
+- Cmake cleanup, BZ 1995130
+
+* Thu Aug 12 2021 Björn Esser <besser82@fedoraproject.org> - 1.1-9
+- poppler rebuild, again
+
+* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 1.1-8
+- Rebuilt for Boost 1.76
+
+* Mon Aug 02 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.1-7
+- poppler rebuild.
+
+* Tue Jul 27 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.1-6
+- poppler rebuild.
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 14 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.1-4
+- Enable gspell.
+
+* Wed May 26 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.1-3
+- Require python3-appdirs
+
+* Tue May 25 2021 Kalev Lember <klember@redhat.com> - 1.1-2
+- Don't install development files for bundled 2geom
+
+* Mon May 24 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.1-1
+- 1.1
+
+* Thu Feb 11 2021 Jan Horak <jhorak@redhat.com> - 1.0.2-2
+- Added missing bundled source, removed libgdlmm depencency
+
+* Mon Feb 01 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.0.2-1
+- 1.0.2
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 12 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.0.1-4
+- Poppler rebuild.
+
+* Mon Jan 04 2021 Tomas Popela <tpopela@redhat.com> - 1.0.1-3
+- Don't build with ImageMagick support in ELN/RHEL
+
 * Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 1.0.1-2
 - Fix appdata 1.0.1 release info
 

sources

@@ -1 +1 @@
-SHA512 (inkscape-1.0.1.tar.xz) = 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
+SHA512 (inkscape-1.2.1.tar.xz) = 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521