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

Accepting request 40173 from KDE:KDE4:Factory:Desktop

Browse Source 
Copy from KDE:KDE4:Factory:Desktop/digikam based on submit request 40173 from user llunak

OBS-URL: https://build.opensuse.org/request/show/40173
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=45
This commit is contained in:
OBS User autobuild 2010-05-17 23:47:43 +00:00 committed by Git OBS Bridge
parent 86d7c3c81f
commit 7b5f5fd37e
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
digikam-buildtime.patch Normal file
View File

@ -0,0 +1,25 @@
Index: libs/3rdparty/cimg/CImg.h
===================================================================
--- libs/3rdparty/cimg/CImg.h.orig
+++ libs/3rdparty/cimg/CImg.h
@@ -5669,7 +5669,7 @@ namespace cimg_library {
if (usage) {
cimg_std::fprintf(cimg_stdout,"\n %s%s%s",cimg::t_red,cimg::basename(argv[0]),cimg::t_normal);
cimg_std::fprintf(cimg_stdout," : %s",usage);
- cimg_std::fprintf(cimg_stdout," (%s, %s)\n\n",__DATE__,__TIME__);
+ cimg_std::fprintf(cimg_stdout,"\n\n");
}
if (defaut) cimg_std::fprintf(cimg_stdout,"%s\n",defaut);
}
@@ -5755,9 +5755,9 @@ namespace cimg_library {
**/
inline void info() {
char tmp[1024] = { 0 };
- cimg_std::fprintf(cimg_stdout,"\n %sCImg Library %u.%u.%u%s, compiled %s ( %s ) with the following flags :\n\n",
+ cimg_std::fprintf(cimg_stdout,"\n %sCImg Library %u.%u.%u%s, compiled with the following flags :\n\n",
cimg::t_red,cimg_version/100,(cimg_version/10)%10,cimg_version%10,
- cimg::t_normal,__DATE__,__TIME__);
+ cimg::t_normal);
cimg_std::fprintf(cimg_stdout," > Operating System : %s%-13s%s %s('cimg_OS'=%d)%s\n",
cimg::t_bold,

5
digikam.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 10 17:54:14 UTC 2010 - cmorve69@yahoo.es
- Remove build time references so build-compare can do its work
-------------------------------------------------------------------
Mon Mar 29 21:03:34 UTC 2010 - wstephenson@novell.com

6
digikam.spec
View File

@ -27,11 +27,12 @@ License: GPLv2+
Group: Productivity/Graphics/Viewers
Summary: A KDE Photo Manager
Version: 1.2.0
Release: 1
Release: 2
%define tar_version 1.2.0
Source0: %name-%{tar_version}.tar.bz2
Source1: %{name}-docs.tar.bz2
Patch0: r1109177.diff
Patch1: %{name}-buildtime.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
%kde4_pimlibs_requires
@ -100,6 +101,9 @@ Authors:
%prep
%setup -q -n %name-%{tar_version} -a 1
%patch0
%patch1
FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" digikam/version.h.cmake
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
echo "add_subdirectory( doc-translations )" >> CMakeLists.txt