Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2018-04-27 16:00:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape" Fri Apr 27 16:00:47 2018 rev:94 rq:601077 version:0.92.3 Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2018-03-12 12:05:55.335925844 +0100 +++ /work/SRC/openSUSE:Factory/.inkscape.new/inkscape.changes 2018-04-27 16:00:52.420888707 +0200 @@ -1,0 +2,31 @@ +Wed Apr 25 02:38:43 UTC 2018 - [email protected] + +- Omit translations from appdata on Leap 42.x/SLE12, merging + translations in XML requires msgfmt >= 0.19.7 + +------------------------------------------------------------------- +Tue Apr 24 17:41:35 UTC 2018 - [email protected] + +- Update to 0.92.3, a stability and bugfix release + * new CLI options --export-area-{drawing,page}, --export-margin + * Text tool, switching between RTL/LTR writing + * Circle/Ellipse tool, toolbar fields for Rx, Ry radius + * PDF+LaTeX export, basic linespacing support + * Preferences option for number of rendering tiles + * Various bug fixes, for details see: + https://inkscape.org/en/release/0.92.3/ +- Drop obsolete inkscape-poppler058-fix.patch +- Use cmake instead of autoconf + * Add build_internal_libraries_as_static.patch + * Add fix_install_targets.patch +- Spec file cleanup + * Remove conditionals for EOLed distributions + * Remove ghostscript-fonts-std dependency + * Add libjpeg build dependency + * Do not package extension unittests + * Move all extensions with ghostscript or pstoedit dependency + to extensions-extra subpackage +- Correct License, original inkscape code is GPL-2.0 or later, but + the binary contains code from Gimp (GPL-3.0), see COPYING + +------------------------------------------------------------------- Old: ---- inkscape-0.92.2.tar.bz2 inkscape-poppler058-fix.patch New: ---- build_internal_libraries_as_static.patch fix_install_targets.patch inkscape-0.92.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.biEMtk/_old 2018-04-27 16:00:53.640843934 +0200 +++ /var/tmp/diff_new_pack.biEMtk/_new 2018-04-27 16:00:53.640843934 +0200 @@ -1,7 +1,7 @@ # # spec file for package inkscape # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,29 +17,30 @@ Name: inkscape -Version: 0.92.2 +Version: 0.92.3 Release: 0 Summary: Vector Illustration Program -License: GPL-2.0 and LGPL-2.1 +License: GPL-3.0 Group: Productivity/Graphics/Vector Editors Url: http://www.inkscape.org/ -Source: https://inkscape.global.ssl.fastly.net/media/resources/file/%{name}-%{version}.tar.bz2 +Source: https://media.inkscape.org/dl/resources/file/%{name}-%{version}.tar.bz2 # openSUSE palette file Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.sh # PATCH-FIX-OPENSUSE inkscape-packages.patch [email protected] -- Suggest packages instead of compilation from source. Patch0: inkscape-packages.patch -# PATCH-FIX-UPSTREAM inkscape-poppler058-fix.patch lp#1715820 [email protected] -- Adapt to poppler 0.58 -Patch1: inkscape-poppler058-fix.patch +# PATCH-FIX-OPENSUSE build_internal_libraries_as_static.patch -- Avoid problems with dynamic library default from %%cmake macro +Patch1: build_internal_libraries_as_static.patch +# PATCH-FIX-OPENSUSE fix_install_targets.patch -- use correct libdir etc. +Patch2: fix_install_targets.patch -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gtkspell-devel %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif +BuildRequires: cmake BuildRequires: fdupes BuildRequires: gc-devel BuildRequires: gcc-c++ @@ -61,17 +62,13 @@ BuildRequires: python2-xml BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(libexif) -%if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(libcdr-0.1) -BuildRequires: pkgconfig(libvisio-0.1) -%endif +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(librevenge-0.0) +BuildRequires: pkgconfig(libvisio-0.1) BuildRequires: pkgconfig(libwpg-0.3) -Requires: %{_bindir}/gs -Requires: ghostscript-fonts-std -Requires: gzip -Requires: pstoedit Requires: python-gtk Recommends: %{name}-lang Recommends: python-lxml @@ -79,7 +76,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-extra Summary: Vector Illustration Program - Extra Extensions @@ -91,17 +88,17 @@ Requires: python-xml # for cdr and wmf modules Recommends: yudit +# dxf_output.inx, eqtexsvg.inx: +Requires: pstoedit Enhances: %{name} # python-xml is already likely installed, so the big dependency is python-lxml. Hence this supplements. Supplements: packageand(%{name}:python-lxml) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/inkex.py %description extensions-extra Extra extensions for Inkscape. Recommended for everybody who wants to use Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-dia Summary: Vector Illustration Program - Dia Import Extension @@ -110,13 +107,11 @@ Requires: dia Enhances: %{name} Supplements: packageand(%{name}:dia) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/dia.inx %description extensions-dia Dia import extension for Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-fig Summary: Vector Illustration Program - Fig Import Extension @@ -125,30 +120,25 @@ Requires: transfig Enhances: %{name} Supplements: packageand(%{name}:transfig) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/fig_input.inx %description extensions-fig Fig family (XFig, Figurine, JFig, WinFig,...) import extension for Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-gimp Summary: Vector Illustration Program - The GIMP Extensions Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version} -Requires: gimp-2.0 +Requires: gimp Enhances: %{name} Supplements: packageand(%{name}:gimp) -Supplements: packageand(%{name}:gimp-2.0) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/gimp_xcf.inx %description extensions-gimp The GIMP import and export extensions for Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %package extensions-skencil Summary: Vector Illustration Program - Skencil Import Extension @@ -157,13 +147,11 @@ Requires: skencil Enhances: %{name} Supplements: packageand(%{name}:skencil) -# Package in openSUSE <= 11.0 and SLED <= 10 -Provides: %{name}:%{_datadir}/inkscape/extensions/sk_input.inx %description extensions-skencil Skencil import extension for Inkscape. -Inkscape is a vector illustration program for the GNOME desktop. +Inkscape is a professional vector graphics editor. %lang_package @@ -171,27 +159,30 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build -./autogen.sh -RPM_OPT_FLAGS="%{optflags}" %ifarch %{arm} export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif -export CFLAGS="%{optflags} -fno-strict-aliasing" -# This (-std=c++11) is still needed with gcc6 until this is fixed: -# https://bugs.launchpad.net/inkscape/+bug/1488079 -export CXXFLAGS="%{optflags} -std=c++11 -fno-strict-aliasing" - -%configure\ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-strict-build +%cmake +%{make_jobs} -make %{?_smp_mflags} +# Unmangle XML and merge translations +# Currently missing from CMake build (https://bugs.launchpad.net/inkscape/+bug/1710337) +(cd .. +sed -ie 's:<_:<:g; s:</_:</:g' inkscape.appdata.xml.in +# msgfmt --xml ... is available since 0.19.7 +%if 0%{?suse_version} >= 1500 +msgfmt --xml -d ./po/ --template inkscape.appdata.xml.in -o inkscape.appdata.xml +%else +cp inkscape.appdata.xml.in inkscape.appdata.xml +%endif +) %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%cmake_install + rm -rf %{buildroot}%{_datadir}/locale/en_US@piglatin rm -rf %{buildroot}%{_datadir}/inkscape/filters/filters.svg.h rm -rf %{buildroot}%{_datadir}/inkscape/patterns/patterns.svg.h @@ -205,6 +196,8 @@ rm -rf %{buildroot}%{_datadir}/inkscape/extensions/simplepath.rb # only required on Windows rm -rf %{buildroot}%{_datadir}/inkscape/extensions/print_win32_vector.* +# packaging/distribution info +rm -rf %{buildroot}%{_datadir}/inkscape/extensions/README install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/inkscape/palettes @@ -212,22 +205,27 @@ %find_lang %{name} %{?no_lang_C} +# split extensions bash %{SOURCE2} %{buildroot}%{_datadir}/inkscape/extensions "%%{_datadir}/inkscape/extensions/" sed -i -e "1 s,#! */usr/bin/env python,#!/usr/bin/python2," %{buildroot}%{_datadir}/inkscape/extensions/*.py -# Localized man pages -for man in %{buildroot}%{_mandir}/*/man1/*; do - LOCALE=`echo $man | sed "s:.*%{_mandir}/\([^/]*\)/man1/.*:\1:g"` +# Localized man pages, correct install path +for man in %{buildroot}%{_mandir}/man1/inkscape.*.1; do + LOCALE=`echo $man | sed "s:.*%{_mandir}/man1/.*\.\([a-zA-Z_]\+\)\.1:\1:g"` + mkdir -m755 -p %{buildroot}%{_mandir}/$LOCALE/man1 + mv $man %{buildroot}%{_mandir}/$LOCALE/man1/%{name}.1 echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE" >> %{name}.man-lang.tmp echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang.tmp - echo "%%lang($LOCALE) %%doc /${man##%{buildroot}}*" >> %{name}.man-lang.tmp + echo "%%lang($LOCALE) %%doc %%{_mandir}/$LOCALE/man1/inkscape.1*" >> %{name}.man-lang.tmp done sort -u %{name}.man-lang.tmp > %{name}.man-lang rm %{name}.man-lang.tmp -%fdupes %{buildroot} -%if 0%{?suse_version} > 1130 +# Install appdata +install -D -m 0644 inkscape.appdata.xml %{buildroot}%{_datadir}/metainfo/inkscape.appdata.xml + +%fdupes %{buildroot} %post %desktop_database_post @@ -236,7 +234,6 @@ %postun %desktop_database_postun %icon_theme_cache_postun -%endif # We can't really move the localized manpages to the lang package, since they'd # create a conflict between the lang subpackage and bundles @@ -244,10 +241,11 @@ %files -f inkscape.lst -f %{name}.man-lang %defattr(-,root,root) %{_bindir}/* +%{_libdir}/libinkscape_base.so %{_datadir}/applications/inkscape.desktop %{_datadir}/icons/hicolor/*/apps/inkscape.png -%dir %{_datadir}/appdata -%{_datadir}/appdata/inkscape.appdata.xml +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/inkscape.appdata.xml %dir %{_datadir}/inkscape %{_datadir}/inkscape/[cf-z]* %{_datadir}/inkscape/examples @@ -256,7 +254,6 @@ %{_datadir}/inkscape/extensions/xaml2svg %{_datadir}/inkscape/extensions/*.xsl* %{_datadir}/inkscape/extensions/colors.xml -%{_datadir}/inkscape/extensions/ps2* %{_datadir}/inkscape/extensions/Poly3DObjects/ %{_datadir}/inkscape/extensions/alphabet_soup/ %{_datadir}/inkscape/extensions/inkweb.js @@ -268,29 +265,34 @@ %{_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?/*.* # exclude extensions that go in other packages: %exclude %{_datadir}/inkscape/extensions/Barcode +%exclude %{_datadir}/inkscape/extensions/ps2pdf-ext.py +%exclude %{_datadir}/inkscape/extensions/ps_input.inx +%exclude %{_datadir}/inkscape/extensions/eps_input.inx %exclude %{_datadir}/inkscape/extensions/cdr* %exclude %{_datadir}/inkscape/extensions/wmf* %exclude %{_datadir}/inkscape/extensions/dia* %exclude %{_datadir}/inkscape/extensions/fig* %exclude %{_datadir}/inkscape/extensions/*gimp* %exclude %{_datadir}/inkscape/extensions/sk* +%exclude %{_datadir}/inkscape/extensions/*dxf* # this one is in extras, manually added there due to large dependencies on ghostscript %exclude %{_datadir}/inkscape/extensions/ps2pdf-ext.py %files extensions-extra -f inkscape-extensions-extra.lst %defattr(-,root,root) %{_datadir}/inkscape/extensions/Barcode -%{_datadir}/inkscape/extensions/cdr* # ps2pdf-ext is a wrapper around ps2pdf binary (part of ghostscript) +%{_datadir}/inkscape/extensions/ps_input.inx +%{_datadir}/inkscape/extensions/eps_input.inx %{_datadir}/inkscape/extensions/ps2pdf-ext.py -%{_datadir}/inkscape/extensions/wmf* +# ps2dxf is a wrapper around pstoedit +%{_datadir}/inkscape/extensions/dxf_output.inx +%{_datadir}/inkscape/extensions/ps2dxf.sh # This extensions seems erronous being copied in here too. %exclude %{_datadir}/inkscape/extensions/*gimp* %exclude %{_datadir}/inkscape/extensions/sk* ++++++ build_internal_libraries_as_static.patch ++++++ --- inkscape-0.92.3/CMakeScripts/HelperMacros.cmake_orig 2018-04-24 21:00:20.000562424 +0200 +++ inkscape-0.92.3/CMakeScripts/HelperMacros.cmake 2018-04-24 21:00:30.300534272 +0200 @@ -29,7 +29,7 @@ name sources) - add_library(${name} ${sources}) + add_library(${name} STATIC ${sources}) # works fine without having the includes # listed is helpful for IDE's (QtCreator/MSVC) ++++++ fix_install_targets.patch ++++++ --- inkscape-0.92.3/CMakeScripts/HelperMacros.cmake_orig 2018-04-24 21:28:19.299976294 +0200 +++ inkscape-0.92.3/CMakeScripts/HelperMacros.cmake 2018-04-24 21:00:30.300534272 +0200 @@ -37,7 +37,7 @@ # static libraries are probably not useful on Windows # (if we ever build shared libraries those would use the RUNTIME target and we might have to revisit this) - if(NOT WIN32) + if(0) install(TARGETS ${name} LIBRARY DESTINATION lib/inkscape ARCHIVE DESTINATION lib/inkscape --- inkscape-0.92.3/src/CMakeLists.txt_orig 2018-04-24 21:21:17.069106797 +0200 +++ inkscape-0.92.3/src/CMakeLists.txt 2018-04-24 21:26:42.844223886 +0200 @@ -575,9 +575,8 @@ inkscape_base inkscape inkview - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/inkscape - ARCHIVE DESTINATION lib/inkscape) + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) else() install(TARGETS inkscape_base ++++++ inkscape-0.92.2.tar.bz2 -> inkscape-0.92.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/inkscape/inkscape-0.92.2.tar.bz2 /work/SRC/openSUSE:Factory/.inkscape.new/inkscape-0.92.3.tar.bz2 differ: char 11, line 1
