commit c1037667b32b81c7842a97159048f1550e339310
Author: Jakub Bogusz <[email protected]>
Date: Mon Oct 20 21:31:23 2014 +0200
- added evas patch (fixes build with evas 1.8+)
exact-image-evas.patch | 24 ++++++++++++++++++++++++
exact-image.spec | 2 ++
2 files changed, 26 insertions(+)
---
diff --git a/exact-image.spec b/exact-image.spec
index 8b45dea..a5c5fde 100644
--- a/exact-image.spec
+++ b/exact-image.spec
@@ -24,6 +24,7 @@ Source0:
http://dl.exactcode.de/oss/exact-image/%{name}-%{version}.tar.bz2
Patch0: %{name}-libs.patch
Patch1: exactimage_0.8.5-1.patch
Patch2: %{name}-giflib.patch
+Patch3: %{name}-evas.patch
URL: http://www.exactcode.de/site/open_source/exactimage/
BuildRequires: OpenEXR-devel >= 1.2.0
BuildRequires: agg-devel >= 2.3
@@ -64,6 +65,7 @@ ImageMagick.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
./configure \
diff --git a/exact-image-evas.patch b/exact-image-evas.patch
new file mode 100644
index 0000000..8702371
--- /dev/null
+++ b/exact-image-evas.patch
@@ -0,0 +1,24 @@
+As of Evas 1.8+ Evas and Evas_Object are both typedefs of Eo, so it
+cannot be the only difference when overloading methods.
+--- exact-image-0.8.9/gfx/X11Helper.cc.orig 2008-04-13 00:47:54.000000000
+0200
++++ exact-image-0.8.9/gfx/X11Helper.cc 2014-10-20 20:58:10.167286633 +0200
+@@ -124,7 +124,7 @@ Visual* X11Window::ColorVisual (Display*
+ return xgwa.visual;
+ }
+
+-Evas_Object* X11Window::CaptureIntoEvasImage (Evas* evas,
++Evas_Object* X11Window::getCapturedEvasImage (Evas* evas,
+ Display* dpy,
+ Window window,
+ int x, int y, int w, int h)
+--- exact-image-0.8.9/gfx/X11Helper.hh.orig 2006-03-04 19:38:53.000000000
+0100
++++ exact-image-0.8.9/gfx/X11Helper.hh 2014-10-20 20:58:02.583953614 +0200
+@@ -74,7 +74,7 @@ class X11Window
+ static int Depth (Display* dpy, Window window);
+ static Visual* ColorVisual (Display* dpy, Window window);
+
+- static Evas_Object* CaptureIntoEvasImage (Evas* evas,
++ static Evas_Object* getCapturedEvasImage (Evas* evas,
+ Display* dpy,
+ Window window,
+ int x, int y, int w, int h);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/exact-image.git/commitdiff/c1037667b32b81c7842a97159048f1550e339310
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
