[packages/digikam] - fix build
arekm
arekm at pld-linux.org
Sun Jul 29 14:29:32 CEST 2012
commit 3847bb61df819c32441cd8c90bfe8fbb0b88bc0b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Jul 29 14:29:27 2012 +0200
- fix build
digikam-build.patch | 20 ++++++++++++++++++++
digikam-link.patch | 10 ----------
digikam.spec | 5 ++++-
3 files changed, 24 insertions(+), 11 deletions(-)
---
diff --git a/digikam-build.patch b/digikam-build.patch
new file mode 100644
index 0000000..2e8102b
--- /dev/null
+++ b/digikam-build.patch
@@ -0,0 +1,20 @@
+--- digikam-2.7.0/extra/kipi-plugins/vkontakte/vkapi.cpp~ 2012-07-08 01:24:25.000000000 +0200
++++ digikam-2.7.0/extra/kipi-plugins/vkontakte/vkapi.cpp 2012-07-29 13:30:18.680442679 +0200
+@@ -18,6 +18,8 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
++#include <stdio.h>
++
+ #include "vkapi.moc"
+
+ // Qt includes
+@@ -60,7 +62,7 @@
+ return m_accessToken;
+ }
+
+-#include <stdio.h>
++//#include <stdio.h>
+
+ void VkAPI::startAuthentication(bool forceLogout)
+ {
diff --git a/digikam.spec b/digikam.spec
index bfab439..5c8834e 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -11,6 +11,7 @@ License: GPL
Group: X11/Applications/Graphics
Source0: http://downloads.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
# Source0-md5: 428e5234fa4daa6f154bf23c63787bdd
+Patch0: %{name}-build.patch
URL: http://www.digikam.org/
BuildRequires: Qt3Support-devel >= %{qtver}
BuildRequires: QtCore-devel >= %{qtver}
@@ -27,7 +28,7 @@ BuildRequires: kde4-kdelibs-devel >= %{kdever}
BuildRequires: kde4-kdepimlibs-devel >= %{kdever}
BuildRequires: lcms-devel
BuildRequires: lensfun-devel
-BuildRequires: libf2c-devel
+BuildRequires: libf2c-devel >= 20110801
BuildRequires: libgphoto2-devel
BuildRequires: kde4-libkdcraw-devel >= %{kdever}
BuildRequires: kde4-libkdeedu-devel >= %{kdever}
@@ -75,6 +76,7 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
%prep
%setup -q
+%patch0 -p1
%build
install -d build
@@ -165,6 +167,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/apps/digikam/queuemgrwindowui.rc
%{_datadir}/apps/digikam/tips
%{_datadir}/apps/gpssync
+%{_datadir}/apps/kipi
%{_datadir}/apps/kipiplugin_*
%{_datadir}/apps/libkface
%{_datadir}/apps/libkgeomap
More information about the pld-cvs-commit
mailing list