cairo-1.17.6-1

c/cairo/cairo-vl.spec

@@ -3,44 +3,40 @@
 Summary:	Cairo - multi-platform 2D graphics library.
 Summary(ja):	Cairo - マルチプラットフォーム 2D グラフィックスライブラリ
 Name:		cairo
-Version:	1.16.0
-Release:	2%{?_dist_release}
+Version:	1.17.6
+Release:	1%{?_dist_release}
 Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
 License:	LGPL/MPL
 URL:		https://cairographics.org/
-Source0:	https://cairographics.org/releases/%{name}-%{version}.tar.xz
-# don't use serverside gradients, most drivers don't handle those and are
-# really slow, should workaround performances issues for ati, nouveau and nvidia
-# https://launchpad.net/ubuntu/maverick/+source/cairo/1.10.0-1ubuntu1
-Patch1:		cairo-1.10.0-dont_use_server_side_gradients.patch
+%define		shortver %(echo %{version} | cut -d. -f1-2)
+Source0:	https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 # https://gitlab.freedesktop.org/cairo/cairo/merge_requests/1
-Patch4:		0001-Set-default-LCD-filter-to-FreeType-s-default.patch
-# https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5
-Patch5:		0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
-# https://github.com/matthiasclasen/cairo/commit/79ad01724161502e8d9d2bd384ff1f0174e5df6e
-Patch6:		cairo-composite_color_glyphs.patch
+Patch1:		0001-Set-default-LCD-filter-to-FreeType-s-default.patch
+# https://gitlab.freedesktop.org/cairo/cairo/-/issues/547
+Patch2:		cairo-1.17.6-meson-fixes.patch
 
 # security fixes
-Patch1000:	CVE-2020-35492.patch
+# none
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
+BuildRequires: meson
 BuildRequires: pkgconfig
+BuildRequires: expat-devel
 BuildRequires: pixman-devel
-BuildRequires: glib2-devel
-BuildRequires: libpng-devel
 BuildRequires: freetype2-devel
 BuildRequires: fontconfig-devel
+BuildRequires: glib2-devel
+BuildRequires: libpng-devel
+BuildRequires: librsvg2-devel
 BuildRequires: libX11-devel
 BuildRequires: libXrender-devel
 BuildRequires: gtk-doc
-BuildRequires: librsvg2-devel
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libEGL-devel
-BuildRequires: git
 
 BuildConflicts: XOrg-compat70-devel
 
@@ -128,31 +124,29 @@ This package contains tools for working with the cairo graphics library.
 
 
 %prep
-%autosetup -S git -p1
-./autogen.sh
+%autosetup -p1
 
 
 %build
-%configure --disable-static \
-	   --enable-gtk-doc \
-	   --enable-xlib \
-	   --enable-ft \
-	   --enable-ps \
-	   --enable-pdf \
-	   --enable-svg \
-	   --enable-tee \
-	   --enable-gobject \
-	   --enable-gl
-
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags}
+	
+%meson \
+  -Dfreetype=enabled \
+  -Dfontconfig=enabled \
+  -Dglib=enabled \
+  -Dgtk_doc=true \
+  -Dspectre=disabled \
+  -Dsymbol-lookup=disabled \
+  -Dtee=enabled \
+  -Dtests=disabled \
+  -Dxcb=enabled \
+  -Dxlib=enabled \
+  -Dxml=disabled
+
+%meson_build
 
 
 %install
-%makeinstall
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+%meson_install
 
 
 %if %{with check}
@@ -162,13 +156,12 @@ make check
 
 
 %files 
-%defattr(-,root,root,-)
 %license COPYING COPYING-*
-%doc AUTHORS BUGS ChangeLog NEWS README
+%doc AUTHORS BIBLIOGRAPHY BUGS NEWS README
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root,-)
+%doc ChangeLog PORTING_GUIDE
 %{_libdir}/lib*.so
 %{_includedir}/*
 %{_libdir}/pkgconfig/*.pc
@@ -176,19 +169,21 @@ make check
 %{_datadir}/gtk-doc/html/cairo
 
 %files tools
-%defattr(-,root,root,-)
 %{_bindir}/cairo-trace
 %{_bindir}/cairo-sphinx
 %{_libdir}/cairo
 
 %if %{build_compat32}
 %files -n compat32-%{name}
-%defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 %endif
 
 
 %changelog
+* Thu Aug 11 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.17.6-1
+- dropped Patch1,5,6 and 1000.
+- renumberd Patch4 to 1.
+
 * Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.0-1
 - imported Patch1000 from upstream to fix CVE-2020-35492.
 - dropped ldconfig scriptlets.