inkscape-1.2.1-1

i/inkscape/inkscape-vl.spec

@@ -1,26 +1,20 @@
-%global page_id  23820
-%global src_suffix 2021-01-15_e86c870879
+%global src_suffix 2022-07-14_9c6d41e410
 
 Name:           inkscape
 Summary:        A Vector Drawing Application
 Summary(ja):    ベクター描画アプリケーション
-Version:        1.0.2
-Release:        2%{?_dist_release}
+Version:        1.2.1
+Release:        1%{?_dist_release}
 Group:          graphics
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPLv2+
 URL:            https://inkscape.org/
-Source0:        https://inkscape.org/ja/gallery/item/%{page_id}/inkscape-%{version}.tar.xz
+Source0:        https://media.inkscape.org/dl/resources/file/inkscape-%{version}.tar.xz
 
-# # to fix compile error with poppler>=0.58
-# Patch1000:  poppler-0.58.x.patch
-# Patch1001:  poppler-0.58.x-autotools.patch
-
-# # to fix compile error with poppler>=0.76.0
-# https://gitlab.com/inkscape/inkscape/issues/220
-#Patch1002:  poppler-0.76.x.patch
+# to build with poppler-22.09.0
+Patch1000:      poppler-22.09.0.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -36,6 +30,7 @@ BuildRequires: gtkmm3-devel
 BuildRequires: ImageMagick-c++-devel
 BuildRequires: lcms2-devel
 BuildRequires: libboost-devel
+BuildRequires: libboost-filesystem
 BuildRequires: libexif-devel
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libpng-devel >= 1.2.0
@@ -71,10 +66,7 @@ Linux/Unix/Windows/Mac で動作します。
 
 %prep
 %setup -q -n %{name}-%{version}_%{src_suffix}
-
-# %patch1000 -p1
-# %patch1001 -p1
-#patch1002 -p1 -b .poppler0.76.x
+%autopatch -p1
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
@@ -88,30 +80,27 @@ dos2unix -k -q share/extensions/*.py
 
 
 %build
-cmake \
-        -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
-        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
-        -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \
+%cmake \
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \
-        -DLIB_INSTALL_DIR:PATH=%{_libdir} \
-        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
-        -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \
 %if "%{_lib}" == "lib64" 
         -DLIB_SUFFIX=64 \
 %endif 
-        -DBUILD_SHARED_LIBS:BOOL=OFF .
+        -DBUILD_SHARED_LIBS:BOOL=OFF
 
-make %{?_smp_mflags}
+%cmake_build
 
 
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot}
+%cmake_install
 find %{buildroot} -type f -name 'lib*.a' -delete
 
+# Don't install development files for bundled libraries
+rm -r $RPM_BUILD_ROOT%{_includedir}/2geom-1.1.0/
+rm -r $RPM_BUILD_ROOT%{_libdir}/cmake/2Geom
+rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/2geom.pc
+
 rm -f %{buildroot}%{_datadir}/icons/hicolor/icon-theme.cache
 
 %find_lang %{name} --with-man
@@ -125,22 +114,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/doc/inkscape/copyright
 rm -rf %{buildroot}
 
 
-%post 
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    update-desktop-database -q &> /dev/null
-    touch --no-create %{_iconsdir}/icons/hicolor &> /dev/null
-    gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
-fi
-
-%posttrans
-update-desktop-database -q &> /dev/null
-gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
-
-
 %files -f %{name}.lang -f inkview.lang
 %defattr(-, root, root)
 %license COPYING
@@ -151,6 +124,7 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %{_datadir}/metainfo/org.inkscape.Inkscape.appdata.xml
 %{_datadir}/applications/org.inkscape.Inkscape.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.svg
 %{_mandir}/man1/*
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
@@ -158,6 +132,9 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Sun Sep 11 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.1-1
+- new upstream release.
+
 * Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.2-2
 - rebuilt with poppler-21.03.0.