diff --git a/fix-image-argb.patch b/fix-image-argb.patch new file mode 100644 index 0000000..aa3d66c --- /dev/null +++ b/fix-image-argb.patch @@ -0,0 +1,23 @@ +Index: b/src/cpp/image.cpp +=================================================================== +--- a/src/cpp/image.cpp ++++ b/src/cpp/image.cpp +@@ -93,7 +93,11 @@ PYBIND11_MODULE(image, m) + .value("bgr24", image::format_enum::format_bgr24) + #endif + .export_values() ++#if PYBIND11_VERSION_MAJOR >= 2 && PYBIND11_VERSION_MINOR >= 6 ++ .def("__str__", &format_to_str, "Image format used by PIL converters.", py::prepend()); ++#else + .def("__str__", &format_to_str, "Image format used by PIL converters."); ++#endif + + py::class_(m, "image", py::buffer_protocol()) + .def(py::init<>()) +@@ -114,4 +118,4 @@ PYBIND11_MODULE(image, m) + m.def("supported_image_formats", &image::image::supported_image_formats); + } + +-} // namespace poppler +\ No newline at end of file ++} // namespace poppler diff --git a/python-python-poppler.changes b/python-python-poppler.changes index 6885771..3745fd5 100644 --- a/python-python-poppler.changes +++ b/python-python-poppler.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 22 01:19:20 UTC 2021 - Hans-Peter Jansen + +- Add fix-image-argb.patch to fix image formatting with + pybind11 >= 2.6.0 + ------------------------------------------------------------------- Tue Oct 6 10:45:50 UTC 2020 - Hans-Peter Jansen diff --git a/python-python-poppler.spec b/python-python-poppler.spec index 68fc544..3c93cf2 100644 --- a/python-python-poppler.spec +++ b/python-python-poppler.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-poppler # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2020 LISA GmbH ,Bingen, Germany # # All modifications and additions to the file contributed by third parties @@ -27,17 +27,19 @@ License: GPL-2.0-only Group: Development/Libraries/Python URL: https://github.com/cbrunet/python-poppler Source: python-poppler-%{version}.tar.xz +Source1: series Patch: use-system-pybind11.patch -BuildRequires: python3 +Patch1: fix-image-argb.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module pybind11-devel} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} -BuildRequires: pkg-config BuildRequires: c++_compiler BuildRequires: cmake BuildRequires: fdupes +BuildRequires: pkg-config BuildRequires: python-rpm-macros +BuildRequires: python3 BuildRequires: pkgconfig(poppler) # some tests require this this BuildRequires: poppler-data @@ -72,7 +74,7 @@ export CXXFLAGS="%{optflags}" %files %{python_files} %license LICENSE.txt -%doc README.md +%doc README.md %{python_sitearch}/ %changelog diff --git a/series b/series new file mode 100644 index 0000000..0448890 --- /dev/null +++ b/series @@ -0,0 +1,2 @@ +use-system-pybind11.patch +fix-image-argb.patch