diff options
Diffstat (limited to 'meta-openembedded/meta-gnome')
17 files changed, 95 insertions, 238 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch b/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch deleted file mode 100644 index 03cb762ce..000000000 --- a/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fcf29abe59607b5791f9de18ddb86b9ae3c9b7cc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Aug 2017 23:50:05 -0700 -Subject: [PATCH] Add G_GNUC_PRINTF on functions with format strings - -This allows compilation with clang without errors, even when --Wformat-nonliteral is active (as long as there are no real cases of -non literal formatting). - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gladeui/glade-command.c | 4 ++-- - gladeui/glade-utils.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c -index 9819766..4ac40ee 100644 ---- a/gladeui/glade-command.c -+++ b/gladeui/glade-command.c -@@ -266,7 +266,7 @@ glade_command_collapse (GladeCommand *command, - * - * Marks the begining of a group. - */ --void -+G_GNUC_PRINTF(1, 2) void - glade_command_push_group (const gchar *fmt, ...) - { - va_list args; -@@ -655,7 +655,7 @@ glade_command_set_properties_list (GladeProject *project, GList *props) - - multiple = g_list_length (me->sdata) > 1; - if (multiple) -- glade_command_push_group (cmd->description); -+ glade_command_push_group ("%s", cmd->description); - - - glade_command_check_group (GLADE_COMMAND (me)); -diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c -index ae52501..c51ae59 100644 ---- a/gladeui/glade-utils.c -+++ b/gladeui/glade-utils.c -@@ -197,7 +197,7 @@ glade_utils_get_pspec_from_funcname (const gchar *funcname) - * selected "OK", True if the @type was GLADE_UI_YES_OR_NO and - * the user selected "YES"; False otherwise. - */ --gint -+G_GNUC_PRINTF(4, 5) gint - glade_util_ui_message (GtkWidget *parent, - GladeUIMessageType type, - GtkWidget *widget, -@@ -320,7 +320,7 @@ remove_message_timeout (FlashInfo * fi) - * - * Flash a temporary message on the statusbar. - */ --void -+G_GNUC_PRINTF(3, 4) void - glade_util_flash_message (GtkWidget *statusbar, guint context_id, gchar *format, ...) - { - va_list args; --- -2.14.1 - diff --git a/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch deleted file mode 100644 index 1b24c39ce..000000000 --- a/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 25 Sep 2012 10:28:33 +0200 -Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -same approach as used used in gnome-disk-utility: - -In cross environment we have to prepend the sysroot to the path found by -pkgconfig since the path returned from pkgconfig does not have sysroot prefixed -it ends up using the files from host system. Now usually people have gnome installed -so the build succeeds but if you dont have gnome installed on build host then -it wont find the files on host system and packages using gnome-doc-utils wont -compile. - -This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR -will be empty - -Upstream-Status: pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - gnome-doc-utils.make | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make -index 42d9df3..f71bbfa 100644 ---- a/gnome-doc-utils.make -+++ b/gnome-doc-utils.make -@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ - _xml2po ?= `which xml2po` - _xml2po_mode = $(if $(DOC_ID),mallard,docbook) - --_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` --_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` --_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl --_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl --_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl -+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` -+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl - - if ENABLE_SK - _ENABLE_SK = true --- -1.7.6.5 - diff --git a/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch b/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch deleted file mode 100644 index f735ff819..000000000 --- a/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5aa3d2abb905fa8594f6c6572a87809da54c9342 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Mon, 5 Sep 2016 11:25:27 +0200 -Subject: [PATCH] fix gcc-6 build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - gladeui/glade-editor-property.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c -index a0c1039..5e9ac38 100644 ---- a/gladeui/glade-editor-property.c -+++ b/gladeui/glade-editor-property.c -@@ -2703,6 +2703,8 @@ glade_eprop_object_view (gboolean radio) - } - - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - static gchar * - glade_eprop_object_dialog_title (GladeEditorProperty *eprop) - { -@@ -2731,6 +2733,7 @@ glade_eprop_object_dialog_title (GladeEditorProperty *eprop) - return g_strdup_printf (format, g_type_name - (eprop->klass->pspec->value_type)); - } -+#pragma GCC diagnostic pop - - - gboolean --- -2.5.5 - diff --git a/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb b/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb deleted file mode 100644 index c3da3e9b9..000000000 --- a/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Glade - A User Interface Designer" -HOMEPAGE = "http://www.gnu.org/software/gnash" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ - file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ - file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native" - -inherit distro_features_check autotools pkgconfig pythonnative gtk-icon-cache - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ - file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \ - file://0002-fix-gcc-6-build.patch \ - file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \ - " -SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f" -SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735" - -EXTRA_OECONF += "--disable-scrollkeeper" - -FILES_${PN} += "${datadir}/icons" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb b/meta-openembedded/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb deleted file mode 100644 index 57a8720f2..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb +++ /dev/null @@ -1,18 +0,0 @@ -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils" -DESCRIPTION = "desktop-file-utils contains a few command line utilities for working with desktop entries:" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "glib-2.0" - -PR = "r1" - -SRC_URI = "http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.bz2" -SRC_URI[md5sum] = "d966b743eb394650f98d5dd56b9aece1" -SRC_URI[sha256sum] = "d9449956c1c8caa75281a3322b2bb433db42610942f0ceeaa65ccd9636c04231" - -inherit autotools pkgconfig - -CACHED_CONFIGUREVARS += "ac_cv_prog_EMACS=no" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch new file mode 100644 index 000000000..dcc4a4e9c --- /dev/null +++ b/meta-openembedded/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?= <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 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb index 01f581a35..d2885906f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb +++ b/meta-openembedded/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" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb index ffd7dcea4..0acbb2117 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb @@ -27,6 +27,7 @@ DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startu inherit distro_features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" +GTKDOC_MESON_OPTION = "gtk_doc" EXTRA_OEMESON = "-Ddesktop_docs=false" PACKAGES =+ "libgnome-desktop3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb index e7dc0f865..7dabd1e39 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb @@ -13,9 +13,12 @@ do_install() { install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-2.0/styles/ install -d ${D}${datadir}/gtksourceview-3.0/styles install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-3.0/styles/ + install -d ${D}${datadir}/gtksourceview-4/styles + install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-4/styles/ } FILES_${PN} = " \ ${datadir}/gtksourceview-2.0/styles \ ${datadir}/gtksourceview-3.0/styles \ + ${datadir}/gtksourceview-4/styles \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb new file mode 100644 index 000000000..10deaffb8 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Portable C library for multiline text editing" +HOMEPAGE = "http://projects.gnome.org/gtksourceview/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" + +PNAME = "gtksourceview" + +S = "${WORKDIR}/${PNAME}-${PV}" + +inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.2/${PNAME}-${PV}.tar.xz" +SRC_URI[md5sum] = "c9e6913c2fd30ca2fcdd71482faf8b99" +SRC_URI[sha256sum] = "c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675" + +FILES_${PN} += "${datadir}/gtksourceview-4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb index df9fd50ea..7caee2771 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb @@ -63,14 +63,14 @@ PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" do_install_append() { # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d # After rebuilds (not from scracth) it can happen that the executables in # libexec ar missing executable permission flag. Not sure but it came up # during transition to meson. Looked into build files and logs but could # not find suspicious - for exe in `find ${D}/${libexec}`; do + for exe in `find ${D}/${libexecdir}`; do chmod +x $exe done } diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.30.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.30.0.bb deleted file mode 100644 index 9cee9c967..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.30.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -BPN = "libwnck" - -SECTION = "x11/libs" -DEPENDS = "intltool-native gnome-common-native gtk+3 gdk-pixbuf-native libxres" - -PACKAGECONFIG ??= "startup-notification" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -inherit gnomebase gobject-introspection gtk-doc gettext - -SRC_URI[archive.md5sum] = "60109c2ab0b07da1099ee57980054de1" -SRC_URI[archive.sha256sum] = "ac6d0d2646aa80676d3066651e73abb7bff7ed79be238c9b21a0083e2adc3439" - -inherit distro_features_check -# libxres means x11 only -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.32.0.bb new file mode 100644 index 000000000..e4829ea8c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.32.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Window navigation construction toolkit" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +BPN = "libwnck" + +SECTION = "x11/libs" +DEPENDS = "intltool-native gnome-common-native gtk+3 gdk-pixbuf-native libxres" + +PACKAGECONFIG ??= "startup-notification" +PACKAGECONFIG[startup-notification] = "-Dstartup_notification=enabled,-Dstartup_notification=disabled,startup-notification" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +inherit gnomebase gobject-introspection gtk-doc gettext distro_features_check + +SRC_URI[archive.md5sum] = "89dbe5a1843fd3745b8b64b34a2ef55d" +SRC_URI[archive.sha256sum] = "9595835cf28d0fc6af5526a18f77f2fcf3ca8c09e36741bb33915b6e69b8e3ca" + +# libxres means x11 only +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch deleted file mode 100644 index 136d89341..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: wv-1.2.0/wv-1.0.pc.in -=================================================================== ---- wv-1.2.0.orig/wv-1.0.pc.in 2008-03-19 22:25:18.000000000 +0000 -+++ wv-1.2.0/wv-1.0.pc.in 2008-03-19 22:26:32.000000000 +0000 -@@ -6,5 +6,6 @@ - Name: wvWare - Description: Word Document Filter library and utilities - Version: @VERSION@ --Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm --Cflags: -I${includedir}/wv @GSF_CFLAGS@ -+Requires: libgsf-1 -+Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm -+Cflags: -I${includedir}/wv diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch index a8c5bc796..a8c5bc796 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch index 2fc3f367f..2fc3f367f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb index 03ee5b4ac..72b8508a2 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb @@ -5,14 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f" DEPENDS = "libgsf glib-2.0 libpng" -SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \ - file://pkgconfig.patch \ +SRC_URI = "https://www.abisource.com/downloads/wv/${PV}/${BP}.tar.gz \ file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \ file://0001-wvRTF.c-Specify-print-format-in-rtf_output.patch \ " -SRC_URI[md5sum] = "c1861c560491f121e12917fa76970ac5" -SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6" +SRC_URI[md5sum] = "dbccf2e9f747e50c913b7e3d126b73f7" +SRC_URI[sha256sum] = "4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d" inherit autotools pkgconfig |