From 8af1b3526defb5b604a7edb096d594e81cd2a72a Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 6 May 2019 01:28:26 +0200 Subject: evince: add patch to fix build with recent gobject-introspection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- ...ove-EvDocumentModel-get-type-function-dec.patch | 33 ++++++++++++++++++++++ meta-gnome/recipes-gnome/evince/evince_3.28.2.bb | 12 ++++---- 2 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch b/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch new file mode 100644 index 0000000000..dcc4a4e9ca --- /dev/null +++ b/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch @@ -0,0 +1,33 @@ +From 0cdce687d3edfa5ac0fd19539ba1815d039026d5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= +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 + diff --git a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb b/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb index 01f581a35e..d2885906f8 100644 --- a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb +++ b/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb @@ -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" -- cgit 1.2.3-korg