diff --git a/2790.patch b/2790.patch deleted file mode 100644 index a6efe98..0000000 --- a/2790.patch +++ /dev/null @@ -1,65 +0,0 @@ -From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001 -From: Harald van Dijk -Date: Wed, 17 Feb 2021 09:13:49 +0000 -Subject: [PATCH] Fix build with glib 2.67.3. - -As of glib 2.67.3, can no longer be included in extern "C" -blocks. It was indirectly included by both "types.h" and "color.h". -"types.h" already does not need to be wrapped in an extern "C" block, -"color.h" does but can be modified not to, so with that changed they can -be moved out. ---- - src/3rdparty/autotrace/autotrace.h | 6 +++--- - src/3rdparty/autotrace/color.h | 7 +++++++ - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h -index 2ce6f272a9..e56be9a74c 100644 ---- a/src/3rdparty/autotrace/autotrace.h -+++ b/src/3rdparty/autotrace/autotrace.h -@@ -23,6 +23,9 @@ - - #include - -+#include "types.h" -+#include "color.h" -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ -@@ -35,9 +38,6 @@ extern "C" { - * Typedefs - * ===================================================================== */ - --#include "types.h" --#include "color.h" -- - /* Third degree is the highest we deal with. */ - enum _at_polynomial_degree { - AT_LINEARTYPE = 1, -diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h -index e50ab30ae0..88651db9f7 100644 ---- a/src/3rdparty/autotrace/color.h -+++ b/src/3rdparty/autotrace/color.h -@@ -24,6 +24,10 @@ - #include - #include - -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ - typedef struct _at_color at_color; - struct _at_color { - guint8 r; -@@ -43,4 +47,7 @@ void at_color_free(at_color * color); - GType at_color_get_type(void); - #define AT_TYPE_COLOR (at_color_get_type ()) - -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ - #endif /* not AT_COLOR_H */ --- -GitLab - diff --git a/inkscape-1.0.2.tar.xz b/inkscape-1.0.2.tar.xz deleted file mode 100644 index 93216a8..0000000 --- a/inkscape-1.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a -size 32421620 diff --git a/inkscape-1.1.tar.xz b/inkscape-1.1.tar.xz new file mode 100644 index 0000000..70cf8b3 --- /dev/null +++ b/inkscape-1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6 +size 34203156 diff --git a/inkscape.changes b/inkscape.changes index 11f44fb..8567213 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Thu Jun 17 16:41:27 UTC 2021 - Antonio Larrosa + +- Use gcc10-c++ to build in Leap. gcc7 is too old. + +------------------------------------------------------------------- +Mon Jun 14 16:40:47 UTC 2021 - Antonio Larrosa + +- Update to 1.1 + * A Welcome dialog, where the look of Inkscape can be selected, + and some choices for the new document's size or file to open + are available + * A Command palette that opens when the ? key is pressed and + that allows to search and use many functions without having to + use a keyboard shortcut or going through the menus + * It is now possible to copy, cut and paste parts of paths with + the Node tool + * The dialog docking system has been rewritten, which resolves + many issues with Inkscape's docked dialogs and allows you to + dock dialogs on either side of the screen + * New Outline Overlay mode that displays object outlines while + also showing their real colors + * Preferences options are now easier to find by using the new + search field + * It is no longer necessary to remember to click on 'Export' in + the PNG Export dialog, as the exporting will already happen + after the click on 'Save' in the file selection dialog. + * Export as JPG, TIFF, optimized PNG and WebP directly from + Inkscape + * When pasting a copied object, Inkscape now pastes it directly + on top of the currently selected object by default + * An extension for updating extensions and installing additional + extensions, called the Extension Manager (currently in beta + stage) + * To learn more, see the full release notes for Inkscape 1.1 at + https://media.inkscape.org/media/doc/release_notes/1.1/Inkscape_1.1.html +- Move dependencies from gtkspell to gspell and from Magic++ + (which was not used since inkscape requires an old version of + ImageMagick if that library is used) to GraphicsMagic++, also + add BuildRequires for dbus, readline, libcdr and + libboost_filesystem-devel +- Drop patch which is already included by upstream: + * 2790.patch + ------------------------------------------------------------------- Fri Mar 26 08:27:20 UTC 2021 - Dominique Leuenberger diff --git a/inkscape.spec b/inkscape.spec index 087e1ba..be3ea3a 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -16,9 +16,9 @@ # -%define _version 1.0.2_2021-01-15_e86c870879 +%define _version 1.1_2021-05-24_c4e8f9ed74 Name: inkscape -Version: 1.0.2 +Version: 1.1 Release: 0 Summary: Vector Illustration Program License: GPL-3.0-only @@ -27,14 +27,17 @@ Source: https://media.inkscape.org/dl/resources/file/%{name}-%{version}. # openSUSE palette file Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.py -# PATCH-FIX-UPSTREAM 2790.patch dimstar@opensuse.org -- Fix build against glib 2.67.3 -Patch0: https://gitlab.com/inkscape/inkscape/-/merge_requests/2790.patch BuildRequires: cmake BuildRequires: double-conversion-devel BuildRequires: fdupes BuildRequires: gc-devel +%if 0%{suse_version} < 1550 +BuildRequires: gcc10-c++ +%else BuildRequires: gcc-c++ +%endif BuildRequires: intltool +BuildRequires: libboost_filesystem-devel BuildRequires: libboost_headers-devel BuildRequires: liblcms2-devel BuildRequires: libpoppler-glib-devel @@ -47,12 +50,17 @@ BuildRequires: potrace-devel BuildRequires: python3-devel BuildRequires: python3-gobject-devel BuildRequires: python3-xml +BuildRequires: readline-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Magick++) +BuildRequires: pkgconfig(2geom) +BuildRequires: pkgconfig(GraphicsMagick++) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gdl-3.0) BuildRequires: pkgconfig(gsl) +BuildRequires: pkgconfig(gspell-1) BuildRequires: pkgconfig(gtkmm-3.0) -BuildRequires: pkgconfig(gtkspell3-3.0) +BuildRequires: pkgconfig(libcdr-0.1) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpng) @@ -138,10 +146,15 @@ Inkscape is a vector graphics editor. %ifarch %{arm} export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif +%if 0%{suse_version} < 1550 +export CXX=g++-10 +%endif %cmake \ -GNinja \ -DINKSCAPE_INSTALL_LIBDIR=%{_libdir} \ - -DWITH_MANPAGE_COMPRESSION=OFF + -DWITH_MANPAGE_COMPRESSION=OFF \ + -DWITH_DBUS=ON \ + %{nil} %ninja_build %install @@ -149,16 +162,14 @@ export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" # Only useful for translators. rm %{buildroot}%{_datadir}/inkscape/extensions/genpofiles.sh -# Only required on Windows. -rm %{buildroot}%{_datadir}/inkscape/extensions/print_win32_vector.* # Packaging/distribution info. -rm %{buildroot}%{_datadir}/inkscape/extensions/{LICENSE.txt,MANIFEST.in,README.md,STYLEGUIDE.md} +rm %{buildroot}%{_datadir}/inkscape/extensions/{LICENSE.txt,MANIFEST.in,README.md,STYLEGUIDE.md,TESTING.md} # Test framework. rm %{buildroot}%{_datadir}/inkscape/extensions/setup.{cfg,py} \ %{buildroot}%{_datadir}/inkscape/extensions/tox.ini \ %{buildroot}%{_datadir}/inkscape/extensions/.pylintrc \ %{buildroot}%{_datadir}/inkscape/extensions/doxygen-main.dox -rm -r %{buildroot}%{_datadir}/inkscape/extensions/.pytest_cache +rm -rf %{buildroot}%{_datadir}/inkscape/extensions/.pytest_cache install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/inkscape/palettes/ @@ -177,9 +188,12 @@ python3 %{SOURCE2} %{buildroot}%{_datadir}/inkscape/extensions "%%{_datadir}/ink %files -f inkscape.lst %{_bindir}/* -%{_libdir}/lib%{name}_base.so +%dir %{_libdir}/inkscape +%{_libdir}/inkscape/lib%{name}_base.so %{_datadir}/applications/*Inkscape.desktop %{_datadir}/icons/hicolor/*/apps/*Inkscape.png +%{_datadir}/icons/hicolor/*/apps/*Inkscape.svg +%{_datadir}/icons/hicolor/*/apps/*Inkscape-symbolic.svg %{_datadir}/metainfo/*Inkscape.appdata.xml %dir %{_datadir}/inkscape/ %{_datadir}/inkscape/[cdf-z]* @@ -199,6 +213,7 @@ python3 %{SOURCE2} %{buildroot}%{_datadir}/inkscape/extensions "%%{_datadir}/ink %{_datadir}/inkscape/extensions/fontfix.conf %{_datadir}/inkscape/extensions/inkscape.extension.rng %{_datadir}/inkscape/extensions/seamless_pattern.svg +%{_datadir}/inkscape/extensions/raster_output_jpg.svg %{_datadir}/inkscape/attributes/ %{_datadir}/inkscape/branding/ %dir %{_datadir}/bash-completion/