Accepting request 80019 from KDE:Distro:Factory

- Add digikam-link-order.patch: fix library link order,
   bko #258931

OBS-URL: https://build.opensuse.org/request/show/80019
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=73
This commit is contained in:
Sascha Peilicke 2011-08-30 08:42:03 +00:00 committed by Git OBS Bridge
parent d19f81771a
commit cd0ca2d0a8
3 changed files with 28 additions and 1 deletions

18
digikam-link-order.patch Normal file
View File

@ -0,0 +1,18 @@
--- core/digikam/CMakeLists.txt 2011-07-28 01:28:25.000000000 +0200
+++ core/digikam/CMakeLists.txt 2011-08-26 10:10:07.010025844 +0200
@@ -278,13 +278,14 @@
${STRIGI_LIBRARIES}
${LCMS_LIBRARIES}
- ${GPHOTO2_LIBRARIES}
digikamcore
digikamdatabase
advancedrename
queuemanager
cameragui
+
+ ${GPHOTO2_LIBRARIES}
)
IF (NOT WIN32 AND GPHOTO2_FOUND)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 26 08:18:51 UTC 2011 - idonmez@novell.com
- Add digikam-link-order.patch: fix library link order,
bko #258931
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 8 22:40:46 UTC 2011 - asterios.dramis@gmail.com Mon Aug 8 22:40:46 UTC 2011 - asterios.dramis@gmail.com

View File

@ -31,6 +31,8 @@ Patch0: digikam-buildtime.patch
Patch1: add_mimetype_bnc629393.diff Patch1: add_mimetype_bnc629393.diff
# PATCH-FIX-OPENSUSE digikam-external-libs.patch -- Compile with external libs # PATCH-FIX-OPENSUSE digikam-external-libs.patch -- Compile with external libs
Patch2: digikam-external-libs.patch Patch2: digikam-external-libs.patch
# PATCH-FIX-UPSTREAM digikam-link-order.patch bko #258931 idoenmez@suse.de -- Fix library link order
Patch3: digikam-link-order.patch
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: fdupes BuildRequires: fdupes
@ -42,8 +44,8 @@ BuildRequires: libkde4-devel
BuildRequires: libkdepimlibs4-devel BuildRequires: libkdepimlibs4-devel
BuildRequires: libkexiv2-devel BuildRequires: libkexiv2-devel
BuildRequires: libkface-devel BuildRequires: libkface-devel
BuildRequires: libkipi-devel
BuildRequires: libkgeomap-devel BuildRequires: libkgeomap-devel
BuildRequires: libkipi-devel
BuildRequires: liblcms-devel BuildRequires: liblcms-devel
BuildRequires: liblqr-devel BuildRequires: liblqr-devel
BuildRequires: libsoprano-devel BuildRequires: libsoprano-devel
@ -74,6 +76,7 @@ rm po/*/kipi*
%patch0 %patch0
%patch1 %patch1
%patch2 %patch2
%patch3
# Remove build time references so build-compare can do its work # Remove build time references so build-compare can do its work
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')