Skip to contentSkip to conversation

sigrok-cli: Inherit mime-xdg

PATCH In review Khem Raj 2 participants 8 messages Feb 16, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/7 sigrok-cli: Inherit mime-xdg

Fixes
WARNING: sigrok-cli-0.7.1-r0 do_package_qa: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg

---
 meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb +1 -1
index 2293f142b3..369e2f6f4a 100644
@@ -10,7 +10,7 @@ PACKAGECONFIG[decode] = "--with-libsigrokdecode,--without-libsigrokdecode,libsig
 
 PACKAGECONFIG ??= "decode"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig mime-xdg
 
 SRC_URI = "http://sigrok.org/download/source/sigrok-cli/sigrok-cli-${PV}.tar.gz"
 SRC_URI[md5sum] = "3f45ce664bad529d8b3f78a61b017d75"
Signature · 1 line
2.25.0
author
#1 lore raw

PATCH 2/7 libsigrok: inherit mime

Fixes
libsigrok-0.5.2: package contains mime types but does not inhert mime: libsigrok path '/work/aarch64-yoe-linux/libsigrok/0.5.2-r0/packages-split/libsigrok/usr/share/mime/packages/vnd.sigrok.session.xml' [mime]

---
 meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb +1 -1
index 35e59d6d7d..e8c36a81d7 100644
@@ -15,7 +15,7 @@ PACKAGECONFIG[hidapi] = "--with-libhidapi,--without-libhidapi,hidapi"
 
 PACKAGECONFIG ??= "serialport ftdi usb"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig mime
 
 SRC_URI = "http://sigrok.org/download/source/libsigrok/libsigrok-${PV}.tar.gz"
 
Signature · 1 line
2.25.0
author
#2 lore raw

PATCH 3/7 joe: Inherit mime-xdg

In reply to Khem Raj

Fixes
joe-4.6: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: joe path '/work/aarch64-yoe-linux/joe/4.6-r0/packages-split/joe/usr/share/applications/jpico.desktop'

---
 meta-oe/recipes-support/joe/joe_4.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/joe/joe_4.6.bb +1 -1
index b79e028f30..674736a68a 100644
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
 PACKAGECONFIG ??= "curses"
 PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo"
 
-inherit autotools-brokensep
+inherit autotools-brokensep mime-xdg
 
 SRC_URI[md5sum] = "9017484e6116830d846678b625ea5c43"
 SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de"
Signature · 1 line
2.25.0
author
#3 lore raw

PATCH 4/7 remmina: Inherit mime-xdg

In reply to Khem Raj

Fixes
remmina-1.3.6: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: remmina path '/work/aarch64-yoe-linux/remmina/1.3.6-r0/packages-split/remmina/usr/share/applications/remmina-file.desktop'

---
 meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/remmina/remmina_1.3.6.bb +1 -1
index 14fbc94b21..f9963ff65e 100644
@@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea5
 
 S = "${WORKDIR}/Remmina-v${PV}"
 
-inherit cmake features_check
+inherit cmake features_check mime-xdg
 
 # depends on avahi-ui with this restriction
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
Signature · 1 line
2.25.0
author
#4 lore raw

PATCH 5/7 sysprof: Inherit mime and mime-xdg

In reply to Khem Raj

Use += for depends to not override prior ones

Fixes
sysprof-3.34.1: package contains mime types but does not inhert mime: sysprof path '/work/aarch64-yoe-linux/sysprof/3.34.1-r0/packages-split/sysprof/usr/share/mime/packages/sysprof-mime.xml' [mime] sysprof-3.34.1: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: sysprof path '/work/aarch64-yoe-linux/sysprof/3.34.1-r0/packages-split/sysprof/usr/share/applications/org.gnome.Sysprof3.desktop' [mime-xdg]

Cc Andreas Müller <[email protected]>
---
 meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb +2 -2
index 1e530efb17..ad69ab68c3 100644
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607"
 
 GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase gettext systemd upstream-version-is-even gsettings
+inherit gnomebase gettext systemd upstream-version-is-even gsettings mime mime-xdg
 
-DEPENDS = "glib-2.0 libxml2-native glib-2.0-native"
+DEPENDS += "glib-2.0 libxml2-native glib-2.0-native"
 
 SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629"
 SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0"
Signature · 1 line
2.25.0
author
#5 lore raw

PATCH 6/7 gtkwave: Inherit mime and mime-xdg

In reply to Khem Raj

Use += for depends to not override prior ones

Fixes
gtkwave-3.3.103: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: gtkwave path '/work/aarch64-yoe-linux/gtkwave/3.3.103-r0/packages-split/gtkwave/usr/share/applications/gtkwave.desktop' [mime-xdg]

---
 meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb +3 -3
index 286d9aa6a1..fec3c7ce1a 100644
@@ -10,9 +10,9 @@ SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz"
 SRC_URI[md5sum] = "5a9a5913f9a02a333b2b23626f153fd7"
 SRC_URI[sha256sum] = "c325abf7cf26c53309a67c0ecaaf196774fa982a717a102c599ac8a516eeeaf7"
 
-inherit pkgconfig autotools gettext texinfo
-DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0"
-RDEPENDS_${PN} = "tk-lib"
+inherit pkgconfig autotools gettext texinfo mime mime-xdg
+DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0"
+RDEPENDS_${PN} += "tk-lib"
 
 # depends on gtk+ which has this restriction
 inherit features_check
Signature · 1 line
2.25.0
author
#6 lore raw

PATCH 7/7 gimp: Depend on libexecinfo for musl

In reply to Khem Raj

musl does not have internal backtrace implementation like glibc but we can use external library

Cc Andreas Müller <[email protected]>
---
 meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 1 +
 1 file changed, 1 insertion(+)
meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb +1 -0
index 045958d0a6..30f0579e2d 100644
@@ -29,6 +29,7 @@ DEPENDS = " \
     libmng \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \
 "
+DEPENDS_append_libc-musl = " libexecinfo"
 
 inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg
 
Signature · 1 line
2.25.0
#7 lore raw

✗ patchtest: failure for "[meta-oe] sigrok-cli: Inherit ..." and 6 more

In reply to Khem Raj

== Series Details ==

Series: "[meta-oe] sigrok-cli: Inherit ..." and 6 more
Revision: 1
URL : https://patchwork.openembedded.org/series/22700/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Patch            [meta-oe,1/7] sigrok-cli: Inherit mime-xdg
 Issue             Series sent to the wrong mailing list [test_target_mailing_list] 
  Suggested fix    Check the project's README (meta-oe,1/7) and send the patch to the indicated list

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at c9b5802bbe)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe