rpms/poppler
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Improve the previous fix

Browse Source 
Resolves: #1915776
This commit is contained in:
Marek Kasik 2021-01-15 10:47:05 +01:00
parent 6500c3a4d1
commit aa62d8b2f3
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
poppler-21.01.0-glib-introspection.patch Normal file
View File

@ -0,0 +1,11 @@
--- poppler-21.01.0/glib/CMakeLists.txt
+++ poppler-21.01.0/glib/CMakeLists.txt
@@ -121,7 +121,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_
# General gir: Reset object-list for introspection & load tool args
set(INTROSPECTION_GIRS)
- set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all")
+ set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all" "--sources-top-dirs=${CMAKE_SOURCE_DIR}" "--sources-top-dirs=${CMAKE_BINARY_DIR}")
set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
# Poppler: Assign package to gir & export keys

13
poppler.spec
View File

@ -1,15 +1,10 @@
%global test_sha 03a4b9eb854a06a83c465e82de601796c458bbe9 %global test_sha 03a4b9eb854a06a83c465e82de601796c458bbe9
%global test_date 2021-01-11 %global test_date 2021-01-11
# We need the same path for all architectures because the path
# is included in introspection file and breaks multilib requirements
# if it is different.
%global _vpath_builddir build
Summary: PDF rendering library Summary: PDF rendering library
Name: poppler Name: poppler
Version: 21.01.0 Version: 21.01.0
Release: 2%{?dist} Release: 3%{?dist}
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
URL: http://poppler.freedesktop.org/ URL: http://poppler.freedesktop.org/
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
@ -24,6 +19,8 @@ Patch1: poppler-0.90.0-position-independent-code.patch
# Bogus volatiles detected by gcc-11 # Bogus volatiles detected by gcc-11
Patch2: %{name}-gcc11.patch Patch2: %{name}-gcc11.patch
Patch3: poppler-21.01.0-glib-introspection.patch
BuildRequires: make BuildRequires: make
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -215,6 +212,10 @@ test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Fri Jan 15 2021 Marek Kasik <mkasik@redhat.com> - 21.01.0-3
- Improve the previous fix
- Resolves: #1915776
* Wed Jan 13 2021 Marek Kasik <mkasik@redhat.com> - 21.01.0-2 * Wed Jan 13 2021 Marek Kasik <mkasik@redhat.com> - 21.01.0-2
- Fix multilib property of poppler-glib - Fix multilib property of poppler-glib
- by using the same build directory for all architectures - by using the same build directory for all architectures