diff options
| author | Andreas Müller <schnitzeltony@gmail.com> | 2019-05-06 01:28:26 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-05-05 23:22:39 -0700 |
| commit | 69b8d6804befd7c13c909e1a613e11bf2b412ce2 (patch) | |
| tree | 950c288a970568e721962645ed98a4ad86af5229 | |
| parent | 09ddcc536df7776c4180dfd523ed606a71f7526e (diff) | |
| download | meta-openembedded-69b8d6804befd7c13c909e1a613e11bf2b412ce2.tar.gz | |
evince: add patch to fix build with recent gobject-introspection
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>
| -rw-r--r-- | meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch | 33 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/evince/evince_3.28.2.bb | 12 |
2 files changed, 40 insertions, 5 deletions
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 @@ | |||
| 1 | From 0cdce687d3edfa5ac0fd19539ba1815d039026d5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com> | ||
| 3 | Date: Fri, 7 Sep 2018 22:34:29 +0200 | ||
| 4 | Subject: [PATCH] libview: Remove EvDocumentModel get type function declaration | ||
| 5 | |||
| 6 | The EvDocumentModel class declares the `ev_document_model_get_type` | ||
| 7 | function as part of the `GObject` boilerplate code. | ||
| 8 | |||
| 9 | However, this declaration is not necessary and also causes a warning | ||
| 10 | when introspection data file, `EvinceView-3.0.gir`, is generated. | ||
| 11 | |||
| 12 | Upstream-Status: Applied [1] | ||
| 13 | |||
| 14 | |||
| 15 | --- | ||
| 16 | libview/ev-document-model.h | 1 - | ||
| 17 | 1 file changed, 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/libview/ev-document-model.h b/libview/ev-document-model.h | ||
| 20 | index 784e27d6..6a99e43a 100644 | ||
| 21 | --- a/libview/ev-document-model.h | ||
| 22 | +++ b/libview/ev-document-model.h | ||
| 23 | @@ -54,7 +54,6 @@ typedef enum { | ||
| 24 | EV_PAGE_LAYOUT_AUTOMATIC | ||
| 25 | } EvPageLayout; | ||
| 26 | |||
| 27 | -GType ev_document_model_get_type (void) G_GNUC_CONST; | ||
| 28 | EvDocumentModel *ev_document_model_new (void); | ||
| 29 | EvDocumentModel *ev_document_model_new_with_document (EvDocument *document); | ||
| 30 | |||
| 31 | -- | ||
| 32 | 2.20.1 | ||
| 33 | |||
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 | |||
| 6 | 6 | ||
| 7 | inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd | 7 | inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd |
| 8 | 8 | ||
| 9 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ | 9 | SRC_URI = " \ |
| 10 | file://0001-help-remove-YELP-macro.patch \ | 10 | ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ |
| 11 | file://0001-Add-format-attribute-to-_synctex_malloc.patch \ | 11 | file://0001-help-remove-YELP-macro.patch \ |
| 12 | file://0001-add-a-formatting-attribute-check.patch \ | 12 | file://0001-Add-format-attribute-to-_synctex_malloc.patch \ |
| 13 | " | 13 | file://0001-add-a-formatting-attribute-check.patch \ |
| 14 | file://0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch \ | ||
| 15 | " | ||
| 14 | SRC_URI[archive.md5sum] = "66aa1766eaaa37536e48def11a0e67a3" | 16 | SRC_URI[archive.md5sum] = "66aa1766eaaa37536e48def11a0e67a3" |
| 15 | SRC_URI[archive.sha256sum] = "0955d22d85c9f6d322b6cbb464f1cc4c352db619017ec95dad4cc5c3440f73e1" | 17 | SRC_URI[archive.sha256sum] = "0955d22d85c9f6d322b6cbb464f1cc4c352db619017ec95dad4cc5c3440f73e1" |
| 16 | 18 | ||
