From 4e127f03fb947aa93d216f042cd87e3dc78af105 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 4 Jul 2021 08:16:53 +0200 Subject: update to 8.11.2 drop patch merged (and improved) upstream --- compat_reports/8.11.1_to_8.11.2/compat_report.html | 555 +++++++++++++++++++++ libvips.xml | 2 +- vips-lib64.patch | 22 - vips.spec | 10 +- 4 files changed, 561 insertions(+), 28 deletions(-) create mode 100644 compat_reports/8.11.1_to_8.11.2/compat_report.html delete mode 100644 vips-lib64.patch diff --git a/compat_reports/8.11.1_to_8.11.2/compat_report.html b/compat_reports/8.11.1_to_8.11.2/compat_report.html new file mode 100644 index 0000000..fd9369c --- /dev/null +++ b/compat_reports/8.11.1_to_8.11.2/compat_report.html @@ -0,0 +1,555 @@ + + + + + + + + + +libvips: 8.11.1 to 8.11.2 compatibility report + + + +

API compatibility report for the libvips library between 8.11.1 and 8.11.2 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibvips
Version #18.11.1
Version #28.11.2
Archx86_64
GCC Version10
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files1
Total Libraries1
Total Symbols / Types1121 / 218
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
+ +

Header Files  1 

+
+vips.h
+
+
to the top
+

Libraries  1 

+
+libvips.so.42.13.0
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibvips
Version #18.11.1
Version #28.11.2
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files1
Total Libraries1
Total Symbols / Types1131 / 218
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low4
+ + +

Problems with Constants, Low Severity  4 

+version.h
+ +[+] VIPS_LIBRARY_REVISION +
+ + + +[+] VIPS_MICRO_VERSION +
+ + + +[+] VIPS_VERSION +
+ + + +[+] VIPS_VERSION_STRING +
+ + +
+to the top
+

Header Files  1 

+
+vips.h
+
+
to the top
+

Libraries  1 

+
+libvips.so.42.13.0
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/libvips.xml b/libvips.xml index a052901..5afa27b 100644 --- a/libvips.xml +++ b/libvips.xml @@ -9,7 +9,7 @@ -8.11.1 +8.11.2 diff --git a/vips-lib64.patch b/vips-lib64.patch deleted file mode 100644 index 4527607..0000000 --- a/vips-lib64.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ea48b6a482f4e85c967593fc8dc523e3d10a7067 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 15 Jun 2021 15:17:35 +0200 -Subject: [PATCH] use /lib64 instead of /lib when needed - ---- - libvips/iofuncs/init.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c -index 74f9cdd93..b7b9e8e0b 100644 ---- a/libvips/iofuncs/init.c -+++ b/libvips/iofuncs/init.c -@@ -1215,6 +1215,8 @@ vips_guess_libdir( const char *argv0, const char *env_name ) - */ - if( strcmp( prefix, VIPS_PREFIX ) == 0 ) - libdir = VIPS_LIBDIR; -+ else if ( strstr(VIPS_LIBDIR, "/lib64") ) -+ libdir = g_strdup_printf( "%s/lib64", prefix ); - else - libdir = g_strdup_printf( "%s/lib", prefix ); - diff --git a/vips.spec b/vips.spec index 578caea..e756243 100644 --- a/vips.spec +++ b/vips.spec @@ -8,7 +8,7 @@ # Please preserve changelog entries # %global vips_version_base 8.11 -%global vips_version %{vips_version_base}.1 +%global vips_version %{vips_version_base}.2 %global vips_soname_major 42 #global vips_prever rc1 %global vips_tarver %{vips_version}%{?vips_prever:-%{vips_prever}} @@ -68,9 +68,6 @@ License: LGPLv2+ URL: https://libvips.github.io/libvips/ Source0: https://github.com/libvips/libvips/releases/download/v%{vips_version}%{?vips_prever:-%{vips_prever}}/vips-%{vips_tarver}.tar.gz -# https://github.com/libvips/libvips/pull/2308 -Patch0: vips-lib64.patch - BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fftw3) @@ -247,7 +244,6 @@ The %{name}-magick-gm contains the magick module using GraphicsMagick. %prep %setup -q -n vips-%{vips_version} -%patch0 -p1 # make the version string consistent for multiarch export FAKE_BUILD_DATE=$(date -r %{SOURCE0}) @@ -373,6 +369,10 @@ sed -e 's:/usr/bin/python:%{_bindir}/python3:' -i %{buildroot}/%{_bindir}/vipspr %changelog +* Sun Jul 4 2021 Remi Collet - 8.11.2-1 +- update to 8.11.2 +- drop patch merged (and improved) upstream + * Tue Jun 15 2021 Remi Collet - 8.11.1-1 - update to 8.11.1 -- cgit