- updated to 0.92.1

- removed obsolete ldl,types,drop-wait-for-targets patches
- added man patch (fix sk man installation)
- added gtk3 patch (fix gtkspell3 detection)

diff --git a/inkscape-0.48.2-types.patch b/inkscape-0.48.2-types.patch
deleted file mode 100644 (file)
index ad761e3..0000000
--- a/inkscape-0.48.2-types.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Lubomir Rintel <lkundrak@v3.sk>
-
-https://bugzilla.redhat.com/show_bug.cgi?id=458845
-
-Index: inkscape-0.48.2/inkscape.desktop.in
-===================================================================
---- inkscape-0.48.2.orig/inkscape.desktop.in
-+++ inkscape-0.48.2/inkscape.desktop.in
-@@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphi
- _Comment=Create and edit Scalable Vector Graphics images
- Type=Application
- Categories=Graphics;VectorGraphics;GTK;
--MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
-+MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;
- Exec=inkscape %F
- TryExec=inkscape
- Terminal=false

diff --git a/inkscape-0.91-drop-wait-for-targets.patch b/inkscape-0.91-drop-wait-for-targets.patch
deleted file mode 100644 (file)
index aefa0fd..0000000
--- a/inkscape-0.91-drop-wait-for-targets.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-=== modified file 'src/ui/clipboard.cpp'
---- src/ui/clipboard.cpp       2016-04-02 15:15:43 +0000
-+++ src/ui/clipboard.cpp       2016-04-07 16:30:32 +0000
-@@ -146,8 +146,6 @@
-     void _setClipboardColor(guint32);
-     void _userWarn(SPDesktop *, char const *);
- 
--    void _inkscape_wait_for_targets(std::list<Glib::ustring> &);
--
-     // private properites
-     SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it
-     Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node
-@@ -1302,9 +1300,7 @@
-  */
- Glib::ustring ClipboardManagerImpl::_getBestTarget()
- {
--    // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets()
--    std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets();
--    _inkscape_wait_for_targets(targets);
-+    std::list<Glib::ustring> targets = _clipboard->wait_for_targets();
- 
-     // clipboard target debugging snippet
-     /*
-@@ -1456,39 +1452,6 @@
-     desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg);
- }
- 
--
--// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see
--//
--// https://bugs.launchpad.net/inkscape/+bug/296778
--// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html
--//
--// for details. Until this has been fixed upstream we will use our own implementation
--// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc.
--void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets)
--{
--    //Get a newly-allocated array of atoms:
--    GdkAtom* targets = NULL;
--    gint n_targets = 0;
--    gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets );
--    if (!test || (targets == NULL)) {
--        return;
--    }
--
--    //Add the targets to the C++ container:
--    for (int i = 0; i < n_targets; i++)
--    {
--        //Convert the atom to a string:
--        gchar* const atom_name = gdk_atom_name(targets[i]);
--
--        Glib::ustring target;
--        if (atom_name) {
--            target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
--        }
--
--        listTargets.push_back(target);
--    }
--}
--
- /* #######################################
-           ClipboardManager class
-    ####################################### */
-

diff --git a/inkscape-gtk3.patch b/inkscape-gtk3.patch
new file mode 100644 (file)
index 0000000..2170042
--- /dev/null
+++ b/inkscape-gtk3.patch
@@ -0,0 +1,13 @@
+--- inkscape-0.92.1/configure.ac.orig  2017-06-28 19:16:17.655179973 +0200
++++ inkscape-0.92.1/configure.ac       2017-06-28 20:40:42.491788807 +0200
+@@ -723,8 +723,8 @@
+ if test "x$enable_gtk3" = "xyes"; then
+ 
+       ink_spell_pkg=
+-      if pkg-config --exists gtkspell-3.0; then
+-              ink_spell_pkg=gtkspell-3.0
++      if pkg-config --exists gtkspell3-3.0; then
++              ink_spell_pkg=gtkspell3-3.0
+               AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
+       fi
+ 

diff --git a/inkscape-ldl.patch b/inkscape-ldl.patch
deleted file mode 100644 (file)
index b1a2484..0000000
--- a/inkscape-ldl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN inkscape-0.47/configure.ac inkscape-0.47.new//configure.ac
---- inkscape-0.47/configure.ac 2009-11-16 21:45:59.000000000 +0100
-+++ inkscape-0.47.new//configure.ac    2010-07-29 11:08:54.786331341 +0200
-@@ -849,6 +849,11 @@
- dnl AM_CONDITIONAL(ENABLE_LIBINKSCAPE, test "x$splib" != "xno")
- dnl
- 
-+dnl ******************************
-+dnl   add -ldl
-+dnl ******************************
-+INKSCAPE_LIBS="$INKSCAPE_LIBS -ldl"
-+
- AC_SUBST(INKSCAPE_CFLAGS)
- AC_SUBST(INKSCAPE_LIBS)
- 

diff --git a/inkscape-man.patch b/inkscape-man.patch
new file mode 100644 (file)
index 0000000..485a2c0
--- /dev/null
+++ b/inkscape-man.patch
@@ -0,0 +1,11 @@
+--- inkscape-0.92.1/Makefile.am.orig   2017-06-28 19:16:17.528513308 +0200
++++ inkscape-0.92.1/Makefile.am        2017-06-28 20:00:24.095149758 +0200
+@@ -621,7 +621,7 @@
+ manja_DATA = inkscape.ja.1
+ manjadir = $(mandir)/ja/man1
+ 
+-mansk_DATA = inkscape.ja.1
++mansk_DATA = inkscape.sk.1
+ manskdir = $(mandir)/sk/man1
+ 
+ manzhtw_DATA = inkscape.zh_TW.1

diff --git a/inkscape.spec b/inkscape.spec
index 92a312a51ce877683a3454bc751d014dddde4726..53d7c056995795baf5382142754bd471eb85539c 100644 (file)
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,79 +1,94 @@
 #
-# TODO: check why build requires libselinux-devel (because of some gnome* stuff)
-#
 # Conditional build
-%bcond_without xft             # Don't use xft scalable font database
+%bcond_with    dbus            # DBus interface
+%bcond_with    gtk3            # GTK+ 3 interface [experimental]
 %bcond_without gnomevfs        # Don't use gnome vfs for loading files
-%bcond_without mmx             # Force building without MMX optimazation (Default: auto-detect)
-%bcond_with    inkboard        # Enable inkboard support
 %bcond_with    relocation      # Enable binary relocation support
 #
 
-# just set it nil when non-preview arrives
-%define beta %{nil}
-
 Summary:       Scalable vector graphics editor
 Summary(pl.UTF-8):     Edytor skalowalnej grafiki wektorowej
 Name:          inkscape
-Version:       0.91
-Release:       13
+Version:       0.92.1
+Release:       1
 License:       GPL v2+, LGPL v2.1+
 Group:         X11/Applications/Graphics
-#Source0:      http://downloads.sourceforge.net/inkscape/%{name}-%{version}%{beta}.tar.bz2
-Source0:       https://inkscape.org/en/gallery/item/3860/%{name}-%{version}%{beta}.tar.bz2
-# Source0-md5: 278dfa4514adcde23546370ec2c84581
-# workaround for https://bugs.launchpad.net/inkscape/+bug/487038
-Patch0:                %{name}-ldl.patch
-Patch1:                %{name}-0.48.2-types.patch
-Patch2:                %{name}-0.91-drop-wait-for-targets.patch
+Source0:       https://media.inkscape.org/dl/resources/file/%{name}-%{version}.tar_XlpI7qT.bz2?forcefilenamehack/%{name}-%{version}.tar.bz2
+# Source0-md5: db2eb2a566cf35ff949fc9ccb172889a
+Patch0:                %{name}-man.patch
+Patch1:                %{name}-gtk3.patch
 URL:           http://www.inkscape.org/
 BuildRequires: ImageMagick-c++-devel
 BuildRequires: aspell-devel
-BuildRequires: autoconf >= 2.59-3
+BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.9.4-2
 BuildRequires: boost-devel >= 1.36
-BuildRequires: cairo-devel >= 1.8.0
+BuildRequires: cairo-devel >= 1.10
+BuildRequires: cairomm-devel >= 1.9.8
+%{?with_dbus:BuildRequires:    dbus-glib-devel}
 BuildRequires: freetype-devel >= 2.0
-BuildRequires: gc-devel >= 6.4
-BuildRequires: gettext-tools
-BuildRequires: glibmm-devel >= 2.16.0
+BuildRequires: gc-devel >= 7.2
+BuildRequires: gettext-tools >= 0.17
+BuildRequires: glib2-devel >= 1:2.28
+BuildRequires: glibmm-devel >= 2.28
 %{?with_gnomevfs:BuildRequires:        gnome-vfs2-devel >= 2.15.2}
 BuildRequires: gsl-devel
-BuildRequires: gtk+2-devel >= 2:2.14.0
-BuildRequires: gtkmm-devel >= 2.10.0
-BuildRequires: gtkspell-devel >= 2.0.11
-BuildRequires: intltool >= 0.35.0
+BuildRequires: intltool >= 0.40.0
 BuildRequires: lcms2-devel >= 2
+BuildRequires: libcdr-devel >= 0.1
+BuildRequires: libexif-devel
 BuildRequires: libgomp-devel
+BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel >= 1.2
+BuildRequires: librevenge-devel
 BuildRequires: libsigc++-devel >= 2.0.17
-BuildRequires: libstdc++-devel >= 6:4.2.2-2
-BuildRequires: libtool
+BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: libtool >= 2:2.2
+BuildRequires: libvisio-devel >= 0.1
 BuildRequires: libwpd-devel >= 0.9
-BuildRequires: libwpg-devel >= 0.2
+BuildRequires: libwpg-devel >= 0.3
 BuildRequires: libxml2-devel >= 1:2.6.26
 BuildRequires: libxslt-devel >= 1.1.17
-%{?with_inkboard:BuildRequires:        loudmouth-devel >= 1.0.3}
+BuildRequires: pango-devel >= 1:1.24
 BuildRequires: pkgconfig
-BuildRequires: poppler-glib-devel >= 0.20.0
+BuildRequires: poppler-glib-devel >= 0.29.0
 BuildRequires: popt-devel
+BuildRequires: potrace-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
-%{?with_xft:BuildRequires:     xorg-lib-libXft-devel}
 BuildRequires: zlib-devel
+%if %{with gtk3}
+BuildRequires: gdl-devel >= 3.6
+BuildRequires: gtk+3-devel >= 3.8
+BuildRequires: gtkmm3-devel >= 3.10
+BuildRequires: gtkspell3-devel >= 3.0
+%else
+BuildRequires: gtk+2-devel >= 2:2.24
+BuildRequires: gtkmm-devel >= 2.24
+BuildRequires: gtkspell-devel >= 2.0.11
+%endif
 Requires(post,postun): desktop-file-utils
-Requires:      cairo >= 1.8.0
-Requires:      gc >= 6.4
-Requires:      glibmm >= 2.16.0
+Requires:      cairo >= 1.10
+Requires:      cairomm >= 1.9.8
+Requires:      gc >= 7.2
+Requires:      glib2 >= 1:2.28
+Requires:      glibmm >= 2.28
 %{?with_gnomevfs:Requires:     gnome-vfs2 >= 2.15.2}
-Requires:      gtk+2 >= 2:2.14.0
-Requires:      gtkmm >= 2.24.0
-Requires:      gtkspell >= 2.0.11
 Requires:      libsigc++ >= 2.0.17
 Requires:      libxml2 >= 1:2.6.26
 Requires:      libxslt >= 1.1.17
+Requires:      pango >= 1:1.24
 Requires:      perl-XML-XQL
-Requires:      poppler-glib >= 0.20.0
+Requires:      poppler-glib >= 0.29.0
+%if %{with gtk3}
+Requires:      gdl >= 3.6
+Requires:      gtk+3 >= 3.8
+Requires:      gtkmm3 >= 3.10
+%else
+Requires:      gtk+2 >= 2:2.24
+Requires:      gtkmm >= 2.24
+Requires:      gtkspell >= 2.0.11
+%endif
 Suggests:      python-lxml
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
@@ -88,27 +103,26 @@ Inkscape jest programem do przeglądania, tworzenia i edycji
 dwuwymiarowej grafiki wektorowej.
 
 %prep
-%setup -q -n %{name}-%{version}%{beta}
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
+
+%{__sed} -i -e 's,po/Makefile.in,,' configure.ac
 
 %build
 %{__libtoolize}
-%{__glib_gettextize}
+%{__gettextize}
 %{__intltoolize}
 %{__aclocal}
+%{__autoconf}
 %{__autoheader}
 %{__automake}
-%{__autoconf}
-CXXFLAGS="%{rpmcxxflags} -std=c++11"
 %configure \
-       --disable-silent-rules \
-       %{!?with_xft: --without-xft} \
-       %{!?with_gnomevfs:--without-gnome-vfs} \
-       %{!?with_mmx:--disable-mmx} \
        %{?with_relocation:--enable-binreloc} \
-       %{?with_inkboard:--enable-inkboard}
+       %{?with_dbus:--enable-dbusapi} \
+       %{?with_gtk3:--enable-gtk3-experimental} \
+       --disable-silent-rules \
+       %{!?with_gnomevfs:--without-gnome-vfs}
 
 %{__make}
 
@@ -118,14 +132,28 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{bn_BD,en_US@piglatin}
+# localized manuals cleanup
+for manlang in de el fr ja sk zh_TW ; do
+       %{__mv} $RPM_BUILD_ROOT%{_mandir}/${manlang}/man1/{inkscape.${manlang}.1,inkscape.1}
+       %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/inkscape.${manlang}.1
+done
+
+# unify locale name, overwrite outdated bn
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{bn_BD,bn}/LC_MESSAGES/inkscape.mo
+# joke language, unsupported
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/en_US@piglatin
+# unify names
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ks@aran,ks}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ks@deva,ks@devanagari}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sd@deva,sd@devanagari}
+# unsupported variants
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{kok@latin,mni@beng,sat@deva}
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 %update_desktop_database_post
 
@@ -136,48 +164,47 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TRANSLATORS doc/HACKING.txt
 %lang(ca) %doc README.ca.txt
-%lang(de) %doc README.de.txt
+%lang(de) %doc README.de.txt doc/HACKING.de.txt
 %lang(es) %doc README.es.txt
-%lang(fr) %doc README.fr.txt
-%lang(it) %doc README.it.txt
-%lang(pt_BR) %doc README.it.txt
-%lang(sk) %doc README.it.txt
-%lang(sr) %doc README.it.txt
-%lang(de) %doc doc/HACKING.de.txt
-%lang(fr) %doc doc/HACKING.fr.txt
-%lang(it) %doc doc/HACKING.it.txt
-%lang(pt_BR) %doc doc/HACKING.it.txt
+%lang(fr) %doc README.fr.txt doc/HACKING.fr.txt
+%lang(it) %doc README.it.txt doc/HACKING.it.txt
+%lang(pt_BR) %doc README.pt_BR.txt doc/HACKING.pt_BR.txt
+%lang(sk) %doc README.sk.txt
+%lang(sr) %doc README.sr.txt
 %attr(755,root,root) %{_bindir}/inkscape
 %attr(755,root,root) %{_bindir}/inkview
 %dir %{_datadir}/inkscape
 %{_datadir}/inkscape/[!e]*
 %{_datadir}/inkscape/examples
 %dir %{_datadir}/inkscape/extensions
-%{_datadir}/inkscape/extensions/Poly3DObjects/
-%{_datadir}/inkscape/extensions/alphabet_soup/
+%dir %{_datadir}/inkscape/extensions/Barcode
+%attr(755,root,root) %{_datadir}/inkscape/extensions/Barcode/*.py
+%{_datadir}/inkscape/extensions/Poly3DObjects
+%{_datadir}/inkscape/extensions/alphabet_soup
+%dir %{_datadir}/inkscape/extensions/ink2canvas
+%attr(755,root,root) %{_datadir}/inkscape/extensions/ink2canvas/*.py
+%{_datadir}/inkscape/extensions/test
+%{_datadir}/inkscape/extensions/xaml2svg
+%attr(755,root,root) %{_datadir}/inkscape/extensions/*.pl
+%attr(755,root,root) %{_datadir}/inkscape/extensions/*.py
+%attr(755,root,root) %{_datadir}/inkscape/extensions/*.rb
+%attr(755,root,root) %{_datadir}/inkscape/extensions/*.sh
 %{_datadir}/inkscape/extensions/*.inx
 %{_datadir}/inkscape/extensions/*.js
+%{_datadir}/inkscape/extensions/*.svg
 %{_datadir}/inkscape/extensions/*.xml
 %{_datadir}/inkscape/extensions/*.xsl
 %{_datadir}/inkscape/extensions/*.xslt
-%attr(755,root,root) %{_datadir}/inkscape/extensions/*.pl
-%attr(755,root,root) %{_datadir}/inkscape/extensions/*.py
-%attr(755,root,root) %{_datadir}/inkscape/extensions/*.rb
-%attr(755,root,root) %{_datadir}/inkscape/extensions/*.sh
-%dir %{_datadir}/inkscape/extensions/ink2canvas
-%attr(755,root,root) %{_datadir}/inkscape/extensions/ink2canvas/*.py
-%dir %{_datadir}/inkscape/extensions/Barcode
-%attr(755,root,root) %{_datadir}/inkscape/extensions/Barcode/*.py
-%dir %{_datadir}/inkscape/extensions/xaml2svg
-%{_datadir}/inkscape/extensions/xaml2svg/*.xsl
 %{_datadir}/inkscape/extensions/fontfix.conf
 %{_datadir}/inkscape/extensions/inkscape.extension.rng
-%{_datadir}/inkscape/extensions/jessyInk_video.svg
-%{_mandir}/man1/*.1*
-%lang(el) %{_mandir}/el/man1/*.1*
-%lang(fr) %{_mandir}/fr/man1/*.1*
-%lang(ja) %{_mandir}/ja/man1/*.1*
-%lang(sk) %{_mandir}/sk/man1/*.1*
-%lang(zh_TW) %{_mandir}/zh_TW/man1/*.1*
+%{_datadir}/appdata/inkscape.appdata.xml
 %{_iconsdir}/hicolor/*/apps/inkscape.png
 %{_desktopdir}/inkscape.desktop
+%{_mandir}/man1/inkscape.1*
+%{_mandir}/man1/inkview.1*
+%lang(de) %{_mandir}/de/man1/inkscape.1*
+%lang(el) %{_mandir}/el/man1/inkscape.1*
+%lang(fr) %{_mandir}/fr/man1/inkscape.1*
+%lang(ja) %{_mandir}/ja/man1/inkscape.1*
+%lang(sk) %{_mandir}/sk/man1/inkscape.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/inkscape.1*