Skip to content

Commit

Permalink
mime-xdg,mime: Do not add shared-mime-info and desktop-file-utils to …
Browse files Browse the repository at this point in the history 
…deps

These should be enough to be added to rdeps, otherwise allarch recipes
which inherit these classes starts to misbehave as they now have direct
dependencies on target specific packages

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@gmail.com>
  • Loading branch information
@kraj
kraj committed Feb 20, 2020
1 parent 183403b commit 5605a9c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion meta/classes/mime-xdg.bbclass
View file
Expand Up @@ -3,7 +3,6 @@
# 'MimeType' in *.desktop files
#

DEPENDS += "desktop-file-utils"
PACKAGE_WRITE_DEPS += "desktop-file-utils-native"
DESKTOPDIR = "${datadir}/applications"

Expand Down
1 change: 0 additions & 1 deletion meta/classes/mime.bbclass
View file
Expand Up @@ -2,7 +2,6 @@
# This class is used by recipes installing mime types
#

DEPENDS += "${@bb.utils.contains('BPN', 'shared-mime-info', '', 'shared-mime-info', d)}"
PACKAGE_WRITE_DEPS += "shared-mime-info-native"
MIMEDIR = "${datadir}/mime"

Expand Down

2 comments on commit 5605a9c

@schnitzeltony
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remember exactly but doesn't this cause errors? Think that was the reason I added them in DEPENDS. Did you run these changes on autobuilder?

If it works I do not see reasons to keep the DEPENDs

@kraj
Copy link
Author

@kraj kraj commented on 5605a9c Feb 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes it causes an QA warning about shared-mime-info being in rdeps but not in deps. So I guess, if we are addiing DEPENDencies on target packages then we can not inherit mimeinfo or mimeinfo-xdg along with allarch, perhaps this combination should be flagged as conflict.

Please sign in to comment.