CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

evince: add patch to fix build with recent gobject-introspection

Browse Source 
gobject-introspection torned some warnings to errors. That caused:

| ../../evince-3.28.2/libview/ev-document-model.h:57: Fatal: EvinceView: Namespace conflict for 'document_model_get_type'

Have tried to fix evince by update to 3.28.5 and 3.32.0 but that causes nasty
gettext errors which I was not able to fix yet.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Andreas Müller 2019-05-06 01:28:26 +02:00 committed by Armin Kuster
parent b58af98c6c
commit 26e6bf0f26
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch Normal file
View File

@ -0,0 +1,33 @@
From 0cdce687d3edfa5ac0fd19539ba1815d039026d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Fri, 7 Sep 2018 22:34:29 +0200
Subject: [PATCH] libview: Remove EvDocumentModel get type function declaration
The EvDocumentModel class declares the `ev_document_model_get_type`
function as part of the `GObject` boilerplate code.
However, this declaration is not necessary and also causes a warning
when introspection data file, `EvinceView-3.0.gir`, is generated.
Upstream-Status: Applied [1]
---
libview/ev-document-model.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/libview/ev-document-model.h b/libview/ev-document-model.h
index 784e27d6..6a99e43a 100644
--- a/libview/ev-document-model.h
+++ b/libview/ev-document-model.h
@@ -54,7 +54,6 @@ typedef enum {
EV_PAGE_LAYOUT_AUTOMATIC
} EvPageLayout;
-GType ev_document_model_get_type (void) G_GNUC_CONST;
EvDocumentModel *ev_document_model_new (void);
EvDocumentModel *ev_document_model_new_with_document (EvDocument *document);
--
2.20.1

12
meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
View File

@ -6,11 +6,13 @@ DEPENDS = "gtk+3 libsecret ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-d
inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0001-help-remove-YELP-macro.patch \
file://0001-Add-format-attribute-to-_synctex_malloc.patch \
file://0001-add-a-formatting-attribute-check.patch \
"
SRC_URI = " \
${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0001-help-remove-YELP-macro.patch \
file://0001-Add-format-attribute-to-_synctex_malloc.patch \
file://0001-add-a-formatting-attribute-check.patch \
file://0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch \
"
SRC_URI[archive.md5sum] = "66aa1766eaaa37536e48def11a0e67a3"
SRC_URI[archive.sha256sum] = "0955d22d85c9f6d322b6cbb464f1cc4c352db619017ec95dad4cc5c3440f73e1"