rdieter pushed to digikam (epel7). ".spec cleanup, drop old/unused patch"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 19:42:57 UTC 2015
From 8092681f5b26adaa06076aa5a8de734863095e6d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 30 Jun 2014 08:34:44 -0500
Subject: .spec cleanup, drop old/unused patch
diff --git a/digikam-3.1.0-opencv20.patch b/digikam-3.1.0-opencv20.patch
deleted file mode 100644
index ee613c6..0000000
--- a/digikam-3.1.0-opencv20.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -up digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h.opencv20 digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h
---- digikam-3.1.0/core/digikam/utils/libopencv.h.opencv20 2013-03-11 03:24:28.000000000 -0500
-+++ digikam-3.1.0/core/digikam/utils/libopencv.h 2013-03-24 20:15:32.499498390 -0500
-@@ -28,7 +28,7 @@
-
- // OpenCV includes
-
--#include <opencv2/core/version.hpp>
-+#include <cvver.h>
-
- #define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
- #define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
-diff -up digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h.opencv20 digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h
---- digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h.opencv20 2013-03-11 03:24:07.000000000 -0500
-+++ digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h 2013-03-24 20:05:41.132932117 -0500
-@@ -35,7 +35,7 @@
-
- // OpenCV includes
-
--#include <opencv2/core/version.hpp>
-+#include <cvver.h>
-
- #define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
- #define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
-diff -up digikam-3.1.0/extra/libkface/libkface/database.cpp.opencv20 digikam-3.1.0/extra/libkface/libkface/database.cpp
---- digikam-3.1.0/extra/libkface/libkface/database.cpp.opencv20 2013-03-11 03:24:20.000000000 -0500
-+++ digikam-3.1.0/extra/libkface/libkface/database.cpp 2013-03-24 20:05:41.132932117 -0500
-@@ -80,7 +80,7 @@ public:
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -108,7 +108,7 @@ public:
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -148,7 +148,7 @@ Database::Database(InitFlags flags, cons
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -190,7 +190,7 @@ QList<Face> Database::detectFaces(const
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -231,7 +231,7 @@ bool Database::updateFaces(QList<Face>&
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -278,7 +278,7 @@ QList<double> Database::recognizeFaces(Q
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-diff -up digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp.opencv20 digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp
---- digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp.opencv20 2013-03-11 03:24:20.000000000 -0500
-+++ digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp 2013-03-24 20:05:41.132932117 -0500
-@@ -94,7 +94,7 @@ IplImage* KFaceUtils::QImage2GrayscaleIp
- }
- catch (cv::Exception& e)
- {
-- kError() << "Cannot allocate IplImage:" << e.what();
-+ kError() << "Cannot allocate IplImage:" << e.code;
- return 0;
- }
- catch(...)
-@@ -132,7 +132,7 @@ IplImage* KFaceUtils::Data2GrayscaleIplI
- }
- catch (cv::Exception& e)
- {
-- kError() << "Cannot allocate IplImage:" << e.what();
-+ kError() << "Cannot allocate IplImage:" << e.code;
- return 0;
- }
- catch(...)
-@@ -229,7 +229,7 @@ QImage KFaceUtils::IplImage2QImage(const
- }
- catch (cv::Exception& e)
- {
-- kError() << "Cannot convert OpenCV Image to QImage:" << e.what();
-+ kError() << "Cannot convert OpenCV Image to QImage:" << e.code;
- }
- catch(...)
- {
-diff -up digikam-3.1.0/extra/libkface/libkface/libopencv.h.opencv20 digikam-3.1.0/extra/libkface/libkface/libopencv.h
---- digikam-3.1.0/extra/libkface/libkface/libopencv.h.opencv20 2013-03-11 03:24:20.000000000 -0500
-+++ digikam-3.1.0/extra/libkface/libkface/libopencv.h 2013-03-24 20:05:41.133932105 -0500
-@@ -28,7 +28,7 @@
-
- // OpenCV includes
-
--#include <opencv2/core/version.hpp>
-+#include <cvver.h>
-
- #define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
- #define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
diff --git a/digikam.spec b/digikam.spec
index 7105cd7..ead630e 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -17,10 +17,7 @@ Source0: http://download.kde.org/%{?pre:un}stable/digikam/digikam-%{version}%{?p
# TODO: upstream me
Source1: digikam-import.desktop
-
## upstreamable patches
-# fix build against opencv-2.0
-Patch51: digikam-3.1.0-opencv20.patch
## upstream patches
@@ -227,17 +224,12 @@ BuildArch: noarch
%prep
%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
-%if 0%{?rhel} == 6
-%patch51 -p1 -b .opencv20
-%endif
-
# don't use bundled/old FindKipi.cmake in favor of kdelibs' version
# see http:/bugs.kde.org/307213
-mv cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
+mv -f cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
%build
-
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} -DENABLE_LCMS2=ON ..
@@ -247,8 +239,6 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf %{buildroot}
-
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
desktop-file-install --vendor="" \
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/digikam.git/commit/?h=epel7&id=8092681f5b26adaa06076aa5a8de734863095e6d
More information about the scm-commits
mailing list