diff --git a/inkscape-0.91.tar.bz2 b/inkscape-0.91.tar.bz2 deleted file mode 100644 index e12a740..0000000 --- a/inkscape-0.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b -size 25858909 diff --git a/inkscape-0.92.0.tar.bz2 b/inkscape-0.92.0.tar.bz2 new file mode 100644 index 0000000..135707e --- /dev/null +++ b/inkscape-0.92.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8b4c159a00448d465384533e5a70d3f33e5f9c6b74c76ea5d636ddd6dd7ba56 +size 30827883 diff --git a/inkscape-appdata.patch b/inkscape-appdata.patch deleted file mode 100644 index 673c2e7..0000000 --- a/inkscape-appdata.patch +++ /dev/null @@ -1,82 +0,0 @@ -Index: inkscape-0.91/Makefile.am -=================================================================== ---- inkscape-0.91.orig/Makefile.am -+++ inkscape-0.91/Makefile.am -@@ -11,6 +11,11 @@ Graphics_in_files = inkscape.desktop.in - Graphics_DATA = $(Graphics_in_files:.desktop.in=.desktop) - @INTLTOOL_DESKTOP_RULE@ - -+Metainfodir = $(datadir)/appdata -+Metainfo_in_files = inkscape.appdata.xml.in -+Metainfo_DATA = $(Metainfo_in_files:.appdata.xml.in=.appdata.xml) -+@INTLTOOL_XML_RULE@ -+ - ## dist-hook: - ## mkdir $(distdir)/samples - ## cp $(srcdir)/samples/*svg $(distdir)/samples -@@ -32,6 +37,7 @@ man_MANS = \ - EXTRA_DIST = \ - acinclude.m4 \ - fix-roff-punct \ -+ inkscape.appdata.xml.in \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ -Index: inkscape-0.91/po/POTFILES.in -=================================================================== ---- inkscape-0.91.orig/po/POTFILES.in -+++ inkscape-0.91/po/POTFILES.in -@@ -2,6 +2,7 @@ - # Please keep this file sorted alphabetically. - # Generated by ./generate_POTFILES.sh at Thu Apr 10 00:15:41 CEST 2014 - [encoding: UTF-8] -+inkscape.appdata.xml.in - inkscape.desktop.in - share/filters/filters.svg.h - share/palettes/palettes.h -Index: inkscape-0.91/inkscape.appdata.xml.in -=================================================================== ---- /dev/null -+++ inkscape-0.91/inkscape.appdata.xml.in -@@ -0,0 +1,41 @@ -+ -+ -+ inkscape.desktop -+ CC0-1.0 -+ <_name>Inkscape SVG Vector Illustrator -+ GPL-2.0 and LGPL-2.1 -+ <_summary>Create and edit Scalable Vector Graphics images -+ http://www.inkscape.org/ -+ -+ <_p>Inkscape is an open source drawing tool with capabilities similar to -+Illustrator, Freehand, and CorelDraw that uses the W3C standard scalable -+vector graphics format (SVG). Some supported SVG features include -+basic shapes, paths, text, markers, clones, alpha blending, transforms, -+gradients, and grouping. In addition, Inkscape supports Creative Commons -+meta-data, node-editing, layers, complex path operations, text-on-path, -+and SVG XML editing. It also imports several formats like EPS, Postscript, -+JPEG, PNG, BMP, and TIFF and exports PNG as well as multiple vector-based -+formats. -+ -+ <_p>Inkscape's main motivations are to provide the Open Source community -+with a fully W3C compliant XML, SVG, and CSS2 drawing tool emphasizing a -+lightweight core with powerful features added as extensions, and the -+establishment of a friendly, open, community-oriented development -+processes. -+ -+ -+ -+ https://media.inkscape.org/media/resources/file/Voronoi-and-dulaney.png -+ The new (since version 0.91) Voronoi/Delaunay Triangulation plugin -+ -+ -+ https://media.inkscape.org/media/resources/file/inkscape-0.48-ferrari.png -+ Illustration of a Ferrari by Gilles Pinard done by hand without any tracing -+ -+ -+ https://media.inkscape.org/media/resources/file/inkscape-0.48-blur.png -+ Gaussian Blur filter using multi-threading processing -+ -+ -+ inkscape-devel@lists.sourceforge.net -+ diff --git a/inkscape-cache-fix.patch b/inkscape-cache-fix.patch deleted file mode 100644 index f8af122..0000000 --- a/inkscape-cache-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- inkscape-0.91/src/display/drawing.cpp.orig 2016-03-23 14:16:14.176248123 +0100 -+++ inkscape-0.91/src/display/drawing.cpp 2016-03-23 14:17:52.900328062 +0100 -@@ -210,9 +210,9 @@ - } - - std::set to_cache; -- for (i = _candidate_items.begin(); i != _candidate_items.end(); ++i) { -- i->item->setCached(true); -- to_cache.insert(i->item); -+ for (CandidateList::iterator j = _candidate_items.begin(); j != i; ++j) { -+ j->item->setCached(true); -+ to_cache.insert(j->item); - } - // Everything which is now in _cached_items but not in to_cache must be uncached - // Note that calling setCached on an item modifies _cached_items diff --git a/inkscape-packages.patch b/inkscape-packages.patch index edb6a56..e1bcb06 100644 --- a/inkscape-packages.patch +++ b/inkscape-packages.patch @@ -13,12 +13,12 @@ =================================================================== --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py -@@ -106,7 +106,7 @@ def uutounit(val, unit): - from lxml import etree - except Exception, e: +@@ -114,9 +114,7 @@ def uutounit(val, unit): + except ImportError as e: localize() -- errormsg(_("The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension. Please download and install the latest version from http://cheeseshop.python.org/pypi/lxml/, or install it through your package manager by a command like: sudo apt-get install python-lxml\n\nTechnical details:\n%s" % (e,))) -+ errormsg(_("The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension. Please download and install it through your package manager by a command like: sudo zypper install python-lxml\n\nTechnical details:\n%s" % (e,))) + errormsg(_("The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension." +- "Please download and install the latest version from http://cheeseshop.python.org/pypi/lxml/, " +- "or install it through your package manager by a command like: sudo apt-get install " +- "python-lxml\n\nTechnical details:\n%s" % (e, ))) ++ "Please download and install it through your package manager by a command like: sudo zypper install python-lxml\n\nTechnical details:\n%s" % (e,))) sys.exit() - - def check_inkbool(option, opt, value): diff --git a/inkscape-remove-datetime.patch b/inkscape-remove-datetime.patch deleted file mode 100644 index db71765..0000000 --- a/inkscape-remove-datetime.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: inkscape-0.48.0/src/main.cpp -=================================================================== ---- inkscape-0.48.0.orig/src/main.cpp -+++ inkscape-0.48.0/src/main.cpp -@@ -1894,7 +1894,7 @@ sp_process_args(poptContext ctx) - break; - } - case SP_ARG_VERSION: { -- printf("Inkscape %s (%s)\n", Inkscape::version_string, __DATE__); -+ printf("Inkscape %s\n", Inkscape::version_string); - exit(0); - break; - } diff --git a/inkscape.changes b/inkscape.changes index 9444b6a..e19cef8 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Feb 1 11:29:05 UTC 2017 - adam.majer@suse.de + +- use individual libboost-*-devel packages instead of boost-devel + +------------------------------------------------------------------- +Mon Jan 9 21:08:34 UTC 2017 - robby.engelmann@igfs-ev.de + +- update to version 0.92: + + Mesh Gradients are now supported. + + Many SVG2 and CSS3 properties are now supported (e.g. paint-order, mix-blend-mode). Not all are available from the GUI. + + The new Object dialog allows to select, label, hide and lock any object in the drawing from a dialog that lists them all + + Selection sets make it possible to 'group' objects together regardless of document structure + + Several new path effects have been added, among them Envelope/Perspective, Lattice Deformation, Mirror and Rotate Copies + + There are several new extensions (e.g. a seamless pattern extension) and a new filter (colorblindness simulation) included in the release, many old extensions have been updated or got new features + + Spray tool and measure tool received a set of nifty new features + + Interactive smoothing for lines created with the Pencil tool + + BSplines (and more) are available for the Pen tool + + Checkerboard background can be used to more easily see object transparencies + + see http://wiki.inkscape.org/wiki/index.php/Release_notes/0.92 for full changelog +- Drop upstream included patches: + + inkscape-remove-datetime.patch + + inkscape-cache-fix.patch + + inkscape-appdata.patch +- Rebased patch + + inkscape-packages.patch + ------------------------------------------------------------------- Tue Jul 26 07:00:52 UTC 2016 - badshah400@gmail.com diff --git a/inkscape.spec b/inkscape.spec index b99b1ea..7db2d4a 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -17,7 +17,7 @@ Name: inkscape -Version: 0.91 +Version: 0.92.0 Release: 0 Summary: Vector Illustration Program License: GPL-2.0 and LGPL-2.1 @@ -27,18 +27,16 @@ Source: https://inkscape.global.ssl.fastly.net/media/resources/file/%{na # openSUSE palette file Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.sh -# PATCH-FEATURE-OPENSUSE inkscape-remove-datetime.patch vuntz@novell.com -- Do not put date/time in the compiled binary (needed for build-compare) -Patch0: inkscape-remove-datetime.patch # PATCH-FIX-OPENSUSE inkscape-packages.patch sbrabec@suse.cz -- Suggest packages instead of compilation from source. -Patch1: inkscape-packages.patch -# PATCH-FIX-UPSTREAM inkscape-cache-fix.patch bnc#972343 aeszter@gwdg.de -- fix cache size -Patch2: inkscape-cache-fix.patch -# PATCH-FIX-UPSTREAM inkscape-appdata.patch badshah400@gmail.com -- Add, translate and install appdata for inkscape, patch sent upstream -Patch3: inkscape-appdata.patch +Patch0: inkscape-packages.patch BuildRequires: aspell-devel BuildRequires: autoconf BuildRequires: automake +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else BuildRequires: boost-devel +%endif BuildRequires: fdupes BuildRequires: gc-devel BuildRequires: gcc-c++ @@ -165,12 +163,9 @@ Inkscape is a vector illustration program for the GNOME desktop. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build -autoreconf +./autogen.sh RPM_OPT_FLAGS="%{optflags}" %ifarch %{arm} export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" @@ -238,7 +233,6 @@ rm %{name}.man-lang.tmp %files -f inkscape.lst -f %{name}.man-lang %defattr(-,root,root) -%doc AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README* TRANSLATORS %{_bindir}/* %{_datadir}/applications/inkscape.desktop %{_datadir}/icons/hicolor/*/apps/inkscape.png @@ -263,6 +257,9 @@ rm %{name}.man-lang.tmp %{_datadir}/inkscape/extensions/fontfix.conf %{_datadir}/inkscape/extensions/ink2canvas/* %{_datadir}/inkscape/extensions/inkscape.extension.rng +%{_datadir}/inkscape/extensions/seamless_pattern.svg +%{_datadir}/inkscape/extensions/test +%{_datadir}/inkscape/extensions/test/svg %{_datadir}/inkscape/attributes/ %{_datadir}/inkscape/branding/ %doc %{_mandir}/man?/*.*