$ git show --format=fuller --patch-with-stat --summary cb15da7e18a3abf0309f6949714c1083758db2e8
commit cb15da7e18a3abf0309f6949714c1083758db2e8
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Wed May 26 01:33:05 2021 +0200
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Wed May 26 01:33:05 2021 +0200
1.1
---
.abf.yml | 2 +-
inkscape-glib-extern.patch | 19 -------------------
inkscape.spec | 30 +++++++++++++++++++++++-------
3 files changed, 24 insertions(+), 27 deletions(-)
delete mode 100644 inkscape-glib-extern.patch
diff --git a/.abf.yml b/.abf.yml
index e9dd851..fec1df8 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
inkscape-icons.tar.bz2: 855b86ea3315a79b0787b0ff8e32e2fde3f6cbb0
- inkscape-1.0.2.tar.xz: 17a1c90f49bc45f4068f35a7986f92399f9c1be5
+ inkscape-1.1.tar.xz: e61dc54dd15c79eeabc9cc04cc8ecaf15ead42b2
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 <stdio.h>
-+#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.spec b/inkscape.spec
index d86a636..628f42a 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -4,19 +4,18 @@
%define Werror_cflags %nil
%define beta %nil
+%define devname %mklibname -d -s 2geom
+
Summary: A vector-based drawing program using SVG
Name: inkscape
-Version: 1.0.2
-Release: 5
+Version: 1.1
+Release: 1
License: GPLv2+
Group: Graphics
Url: http://inkscape.sourceforge.net/
-Source0: https://inkscape.org/gallery/item/21571/%{name}-%{version}.tar.xz
+Source0: https://media.inkscape.org/dl/resources/file/inkscape-%{version}.tar.xz
Source1: %{name}-icons.tar.bz2
Source100: inkscape.rpmlintrc
-# Import Fedora patch to fix build:
-# include/c++/10.2.1/type_traits:119:3: error: templates must have C++ linkage template<typename _B1, typename _B2, typename _B3, typename... _Bn>
-Patch0: inkscape-glib-extern.patch
BuildRequires: desktop-file-utils
BuildRequires: gdk-pixbuf2.0
@@ -73,8 +72,15 @@ Inkscape uses the W3C SVG (= "Scalable Vector Graphics") standard as its
native file format. Therefore, it is a very useful tool for web designers
and can be used as an interchange format for desktop publishing.
+%package -n %{devname}
+Summary: Static library and header files for the 2geom library
+Group: Development/Libraries
+
+%description -n %{devname}
+Static library and header files for the 2geom library
+
%prep
-%autosetup -p1 -a1 -n %{name}-%{version}_2021-01-15_e86c870879
+%autosetup -p1 -a1 -n %{name}-%{version}_2021-05-24_c4e8f9ed74
%cmake \
-DBUILD_STATIC_LIBS:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=OFF \
@@ -98,6 +104,10 @@ desktop-file-install --vendor="" \
%find_lang %{name}
+%if "%{_lib}" != "lib"
+mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_libdir}
+%endif
+
%files -f %{name}.lang
%doc AUTHORS
%{_bindir}/*
@@ -108,3 +118,9 @@ desktop-file-install --vendor="" \
%{_mandir}/*/man1/*
%{_datadir}/metainfo/org.inkscape.Inkscape.appdata.xml
%{_datadir}/bash-completion/completions/inkscape
+
+%files -n %{devname}
+%{_libdir}/lib2geom.a
+%{_libdir}/cmake/2Geom
+%{_includedir}/2geom-*
+%{_libdir}/pkgconfig/2geom.pc