pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 74202 from KDE:Distro:Factory

Browse Source 
Fix compilation with new Marble

OBS-URL: https://build.opensuse.org/request/show/74202
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=67
This commit is contained in:
Sascha Peilicke 2011-06-21 07:57:37 +00:00 committed by Git OBS Bridge
parent c44267c9c8
commit bd59512842
4 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_service:download_url:digikam-1.9.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
size 22866660

45
digikam-marblewidget.patch Normal file
View File

@ -0,0 +1,45 @@
--- /dev/null 2011-06-17 14:42:34.820939556 +0200
+++ cmake/modules/FindMarbleWidget.cmake 2011-06-20 13:50:03.012616343 +0200
@@ -0,0 +1,42 @@
+# - Try to find marblewidget library
+# Once done this will define
+#
+# MARBLEWIDGET_FOUND - system has MARBLEWIDGET library
+# LIBMARBLEWIDGET_INCLUDE_DIR - the LIBMARBLEWIDGET include directory
+# LIBMARBLEWIDGET_LIBRARY - the marblewidget library
+#
+# copyright 2008 by Patrick Spendrin <ps_ml@gmx.de>
+# use this file as you like
+#
+
+if(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)
+
+# Already in cache
+set(MARBLEWIDGET_FOUND TRUE)
+
+else(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)
+find_path(LIBMARBLEWIDGET_INCLUDE_DIR Quaternion.h PATH_SUFFIXES marble)
+
+if (WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+set (LIBRARY_NAME marblewidgetd)
+else(WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+set (LIBRARY_NAME marblewidget)
+endif (WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+find_library(LIBMARBLEWIDGET_LIBRARY ${LIBRARY_NAME})
+
+if(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)
+set(MARBLEWIDGET_FOUND TRUE)
+endif(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)
+
+if(MARBLEWIDGET_FOUND)
+if (NOT MARBLEWIDGET_FIND_QUIETLY)
+message(STATUS "Found Marble: ${LIBMARBLEWIDGET_LIBRARY}")
+endif (NOT MARBLEWIDGET_FIND_QUIETLY)
+else(MARBLEWIDGET_FOUND)
+if(MARBLEWIDGET_FIND_REQUIRED)
+message(FATAL_ERROR "Could NOT find any Marble library")
+endif(MARBLEWIDGET_FIND_REQUIRED)
+endif(MARBLEWIDGET_FOUND)
+
+mark_as_advanced(LIBMARBLEWIDGET_INCLUDE_DIR LIBMARBLEWIDGET_LIBRARY)
+endif(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)

6
digikam.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 20 11:58:14 UTC 2011 - idonmez@novell.com
- Add digikam-marblewidget.patch: provide a FindMarbleWidget.cmake
for compatibility
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 9 11:29:29 UTC 2011 - tittiatcoke@gmail.com Wed Mar 9 11:29:29 UTC 2011 - tittiatcoke@gmail.com

7
digikam.spec
View File

@ -31,9 +31,11 @@ Source1: %{name}-docs.tar.bz2
Patch0: digikam-buildtime.patch Patch0: digikam-buildtime.patch
# PATCH-FIX-UPSTREAM add_mimetype_bnc629393.diff bnc#629393 kde#261627 ctrippe@gmx.net -- Add MimeTypes to desktop file for better integration in GNOME # PATCH-FIX-UPSTREAM add_mimetype_bnc629393.diff bnc#629393 kde#261627 ctrippe@gmx.net -- Add MimeTypes to desktop file for better integration in GNOME
Patch1: add_mimetype_bnc629393.diff Patch1: add_mimetype_bnc629393.diff
# PATCH-FIX-OPENSUSE digikam-marblewidget.patch idoenmez@suse.de -- Provide a FindMarbleWidget.cmake for compatibility
Patch2: digikam-marblewidget.patch
# With the latest version of libjpeg62 in Factory, the version is mentioned in a different file # With the latest version of libjpeg62 in Factory, the version is mentioned in a different file
%if %suse_version > 1140 %if %suse_version > 1140
Patch2: correct_jpeg_lib_version.patch Patch3: correct_jpeg_lib_version.patch
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -112,8 +114,9 @@ Authors:
%setup -q -a 1 %setup -q -a 1
%patch0 %patch0
%patch1 %patch1
%patch2
%if %suse_version > 1140 %if %suse_version > 1140
%patch2 -p0 %patch3 -p0
%endif %endif
# 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 -r %{_sourcedir}/%{name}.changes '+%b %e %Y') FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y')