Patchwork [meta-oe,meta-efl,4/6] epdfview: fix build with glib-2.32

login
register
mail settings
Submitter Martin Jansa
Date April 30, 2012, 6:31 a.m.
Message ID <34f0d3bce05751b1328ab39ff45a9f16381cd3cf.1335766581.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/26595/
State Accepted
Commit dd947fb02c9cb2cfaa6ef681210a42ef07fc6f82
Headers show

Comments

Martin Jansa - April 30, 2012, 6:31 a.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch |   12 ++++++++++++
 meta-efl/recipes-efl/efl/epdfview_0.1.8.bb        |    6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch

Patch

diff --git a/meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch b/meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch
new file mode 100644
index 0000000..e08584c
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch
@@ -0,0 +1,12 @@ 
+diff -uNr epdfview-0.1.8.orig/src/gtk/StockIcons.h epdfview-0.1.8/src/gtk/StockIcons.h
+--- epdfview-0.1.8.orig/src/gtk/StockIcons.h	2011-05-28 12:24:57.000000000 +0200
++++ epdfview-0.1.8/src/gtk/StockIcons.h	2012-04-30 07:48:08.528285594 +0200
+@@ -18,8 +18,6 @@
+ #if !defined (__STOCK_ICONS_H__)
+ #define __STOCK_ICONS_H__
+ 
+-#include <glib/gmacros.h>
+-
+ G_BEGIN_DECLS
+ 
+ // ePDFView stock icons.
diff --git a/meta-efl/recipes-efl/efl/epdfview_0.1.8.bb b/meta-efl/recipes-efl/efl/epdfview_0.1.8.bb
index 5f6bbf4..c16137e 100644
--- a/meta-efl/recipes-efl/efl/epdfview_0.1.8.bb
+++ b/meta-efl/recipes-efl/efl/epdfview_0.1.8.bb
@@ -5,12 +5,14 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 SECTION = "x11/applications"
 DEPENDS = "gtk+ poppler"
 
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "--without-cups"
 
 inherit autotools gettext
 
-SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2"
+SRC_URI = "http://www.emma-soft.com/projects/${BPN}/chrome/site/releases/${BP}.tar.bz2 \
+  file://glib-2.32.patch \
+"
 SRC_URI[md5sum] = "e50285b01612169b2594fea375f53ae4"
 SRC_URI[sha256sum] = "948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0"