Add back pkgconfig patch lost in the previous commit
What the patch did was to move libstdc++ to private section, so that other packages that depend on LibRaw wouldn't be required to link against libstdc++. This should fix shotwell to build against LibRaw again.
This commit is contained in:
parent
5339034680
commit
5b3b91134a
26
LibRaw-pkgconfig.patch
Normal file
26
LibRaw-pkgconfig.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
--- LibRaw-0.20-Beta1/libraw.pc.in~ 2020-05-13 14:22:12.656424311 +0200
|
||||||
|
+++ LibRaw-0.20-Beta1/libraw.pc.in 2020-05-13 14:22:27.481441569 +0200
|
||||||
|
@@ -5,7 +5,8 @@
|
||||||
|
|
||||||
|
Name: libraw
|
||||||
|
Description: Raw image decoder library (non-thread-safe)
|
||||||
|
-Requires: @PACKAGE_REQUIRES@
|
||||||
|
+Requires.private: @PACKAGE_REQUIRES@
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
|
||||||
|
+Libs: -L${libdir} -lraw@PC_OPENMP@
|
||||||
|
+Libs.private: -lstdc++
|
||||||
|
Cflags: -I${includedir}/libraw -I${includedir}
|
||||||
|
--- LibRaw-0.20-Beta1/libraw_r.pc.in~ 2020-05-13 14:22:18.034430572 +0200
|
||||||
|
+++ LibRaw-0.20-Beta1/libraw_r.pc.in 2020-05-13 14:22:27.481441569 +0200
|
||||||
|
@@ -5,7 +5,8 @@
|
||||||
|
|
||||||
|
Name: libraw
|
||||||
|
Description: Raw image decoder library (thread-safe)
|
||||||
|
-Requires: @PACKAGE_REQUIRES@
|
||||||
|
+Requires.private: @PACKAGE_REQUIRES@
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
|
||||||
|
+Libs: -L${libdir} -lraw_r@PC_OPENMP@
|
||||||
|
+Libs.private: -lstdc++
|
||||||
|
Cflags: -I${includedir}/libraw -I${includedir}
|
@ -7,7 +7,7 @@
|
|||||||
Summary: Library for reading RAW files obtained from digital photo cameras
|
Summary: Library for reading RAW files obtained from digital photo cameras
|
||||||
Name: LibRaw
|
Name: LibRaw
|
||||||
Version: 0.20
|
Version: 0.20
|
||||||
Release: 0.beta1%{?dist}
|
Release: 0.beta1%{?dist}.1
|
||||||
License: BSD and (CDDL or LGPLv2)
|
License: BSD and (CDDL or LGPLv2)
|
||||||
URL: http://www.libraw.org
|
URL: http://www.libraw.org
|
||||||
|
|
||||||
@ -19,6 +19,7 @@ BuildRequires: autoconf automake libtool
|
|||||||
|
|
||||||
#Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz
|
#Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz
|
||||||
Source0: http://github.com/LibRaw/LibRaw/archive/%{version}-Beta1.tar.gz
|
Source0: http://github.com/LibRaw/LibRaw/archive/%{version}-Beta1.tar.gz
|
||||||
|
Patch0: LibRaw-pkgconfig.patch
|
||||||
Provides: bundled(dcraw) = 9.25
|
Provides: bundled(dcraw) = 9.25
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -53,7 +54,7 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
LibRaw sample programs
|
LibRaw sample programs
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qn %{name}-%{version}-Beta1
|
%autosetup -p1 -n %{name}-%{version}-Beta1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -if
|
autoreconf -if
|
||||||
@ -115,6 +116,9 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 13 2020 Kalev Lember <klember@redhat.com> - 0.20-0.beta1.1
|
||||||
|
- Add back pkgconfig patch lost in the previous commit
|
||||||
|
|
||||||
* Thu May 07 2020 Gwyn Ciesla <gwync@protonmail.com> - 0.20-0.beta1
|
* Thu May 07 2020 Gwyn Ciesla <gwync@protonmail.com> - 0.20-0.beta1
|
||||||
- 0.20 Beta 1
|
- 0.20 Beta 1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user