Hello community, here is the log from the commit of package xylib for openSUSE:Factory checked in at 2020-09-15 16:27:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xylib (Old) and /work/SRC/openSUSE:Factory/.xylib.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xylib" Tue Sep 15 16:27:26 2020 rev:6 rq:834145 version:1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/xylib/xylib.changes 2017-02-07 12:04:03.312633112 +0100 +++ /work/SRC/openSUSE:Factory/.xylib.new.4249/xylib.changes 2020-09-15 16:27:42.178563058 +0200 @@ -1,0 +2,7 @@ +Sun Sep 13 16:20:52 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Add upstream patch to fix build with recent Boost versions: + * 0001-BOOST_BIG_ENDIAN-was-deprecated-and-replaced-by-BOOS.patch +- Spec cleanup + +------------------------------------------------------------------- New: ---- 0001-BOOST_BIG_ENDIAN-was-deprecated-and-replaced-by-BOOS.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xylib.spec ++++++ --- /var/tmp/diff_new_pack.PLh0pt/_old 2020-09-15 16:27:43.774564585 +0200 +++ /var/tmp/diff_new_pack.PLh0pt/_new 2020-09-15 16:27:43.778564589 +0200 @@ -1,7 +1,7 @@ # # spec file for package xylib # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,31 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define somajor 4 Name: xylib Version: 1.5 Release: 0 -%define somajor 4 Summary: Library for reading x-y data from several file formats -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: http://xylib.sourceforge.net/ +URL: http://xylib.sourceforge.net/ Source: https://github.com/wojdyr/xylib/releases/download/v%{version}/%{name}-%{version}.tar.bz2 -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif +Patch0: 0001-BOOST_BIG_ENDIAN-was-deprecated-and-replaced-by-BOOS.patch +BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: libbz2-devel -%if 0%{?suse_version} >= 1320 +BuildRequires: libboost_headers-devel +BuildRequires: pkgconfig BuildRequires: wxWidgets-devel >= 3 -%endif -BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(zlib) %description C++ library for reading files that contain x-y data from powder diffraction, @@ -91,7 +87,6 @@ - χPLOT CHI_ - Ron Unwin's Spectra XPS format (VGX-900 compatible) -%if 0%{?suse_version} >= 1320 %package -n xyconvert Summary: GUI converter of files in formats supported by xylib Group: Productivity/Scientific/Other @@ -118,47 +113,39 @@ *(only 1-D data is supported)* - χPLOT CHI_ - Ron Unwin's Spectra XPS format (VGX-900 compatible) -%endif %prep -%setup -q +%autosetup -p1 %build +autoreconf -f %configure \ - %if 0%{?suse_version} < 1320 - --without-gui \ - %endif --disable-static -make %{?_smp_mflags} +%make_build %install %make_install -rm %{buildroot}/%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print %post -n libxy%{somajor} -p /sbin/ldconfig %postun -n libxy%{somajor} -p /sbin/ldconfig %files -n libxy%{somajor} -%defattr(-,root,root) -%doc README.rst COPYING +%license COPYING +%doc README.rst %{_libdir}/libxy.so.%{somajor}* %files devel -%defattr(-,root,root) %doc sample-urls %{_includedir}/* %{_libdir}/libxy.so %files -n xyconv -%defattr(-,root,root) %{_bindir}/xyconv -%{_mandir}/man1/xyconv.1.gz +%{_mandir}/man1/xyconv.1%{?ext_man} -%if 0%{?suse_version} >= 1320 %files -n xyconvert -%defattr(-,root,root) %{_bindir}/xyconvert -%endif %changelog ++++++ 0001-BOOST_BIG_ENDIAN-was-deprecated-and-replaced-by-BOOS.patch ++++++ >From d0848c1c99339c111b29827e1c0b0acb16a5ad76 Mon Sep 17 00:00:00 2001 From: Marcin Wojdyr <woj...@gmail.com> Date: Sun, 13 Sep 2020 13:30:16 +0200 Subject: [PATCH] BOOST_BIG_ENDIAN was deprecated and replaced by BOOST_ENDIAN_BIG_BYTE --- configure.ac | 2 -- xylib/util.cpp | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index c00d964..3c54c08 100644 --- a/configure.ac +++ b/configure.ac @@ -68,8 +68,6 @@ AC_CHECK_HEADER([climits], [], [AC_MSG_ERROR([Could not find necessary C++ libs headers])]) AC_CHECK_HEADER([boost/cstdint.hpp], [], [AC_MSG_ERROR([Could not find necessary Boost headers])]) -AC_CHECK_HEADER([boost/detail/endian.hpp], [], - [AC_MSG_ERROR([Could not find necessary Boost headers])]) AC_CHECK_HEADER([boost/spirit/version.hpp], [], [AC_MSG_ERROR([Boost::Spirit headers were not found.])]) AC_CHECK_HEADER([boost/tokenizer.hpp], [], diff --git a/xylib/util.cpp b/xylib/util.cpp index 5cc1118..fa50e14 100644 --- a/xylib/util.cpp +++ b/xylib/util.cpp @@ -10,11 +10,20 @@ #include <limits> #include <cassert> #include <cerrno> -#include <boost/detail/endian.hpp> +#include <boost/version.hpp> #include <boost/cstdint.hpp> + +#if BOOST_VERSION >= 106500 +#include <boost/predef/other/endian.h> +#if !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_BIG_BYTE +# error "Unknown endianness" +#endif +#else +#include <boost/detail/endian.hpp> #if !defined(BOOST_LITTLE_ENDIAN) && !defined(BOOST_BIG_ENDIAN) -#error "Unknown endianness" +# error "Unknown endianness" +#endif #endif using namespace std; @@ -71,7 +80,8 @@ void my_read(istream &f, char *buf, int len) // change the byte-order from "little endian" to host endian // ptr: pointer to the data, size - size in bytes -#if defined(BOOST_BIG_ENDIAN) +#if defined(BOOST_BIG_ENDIAN) || \ + (defined(BOOST_ENDIAN_BIG_BYTE) && BOOST_ENDIAN_BIG_BYTE) void le_to_host(void *ptr, int size) { char *p = (char*) ptr; -- 2.28.0
