Skip to contentSkip to conversation

libnotify: Make gtk+3 dependency optional

PATCH Superseded Mike Crowe 4 participants 6 messages May 13, 2021

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Mike Crowe

author
#0 lore raw

PATCH 1/1 libnotify: Make gtk+3 dependency optional

libnotify only requires gtk+3 for its tests. Let's disable them by default.

---
 meta/recipes-gnome/libnotify/libnotify_0.7.9.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-gnome/libnotify/libnotify_0.7.9.bb +4 -3
index bbbd72193e..819cb304f7 100644
@@ -9,15 +9,16 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
-DEPENDS = "dbus gtk+3 glib-2.0"
+DEPENDS = "dbus glib-2.0 gdk-pixbuf"
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[gtk+] = "--enable-tests,--disable-tests,,gtk+3"
 
 GNOMEBASEBUILDCLASS = "meson"
 GTKDOC_MESON_OPTION = "gtk_doc"
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
 inherit gnomebase gtk-doc features_check gobject-introspection
-# depends on gtk+3
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 SRC_URI[archive.md5sum] = "ccd9c53364174cc8d13e18a1988faa76"
 SRC_URI[archive.sha256sum] = "66c0517ed16df7af258e83208faaf5069727dfd66995c4bbc51c16954d674761"
Signature · 1 line
2.30.2
#1 lore raw
Quoted 2 lines · Mike Crowe via lists.openembedded.org

+PACKAGECONFIG[gtk+] = "--enable-tests,--disable-tests,,gtk+3"

Was the --enable-tests scenario tested? Specifying gtk+3 after two ,,s seems weird.

Alex

author
#2 lore raw
Quoted 8 lines · Alexander Kanavin
Quoted 2 lines · Mike Crowe via lists.openembedded.org

+PACKAGECONFIG[gtk+] = "--enable-tests,--disable-tests,,gtk+3"

Was the --enable-tests scenario tested? Specifying gtk+3 after two ,,s seems weird.

You're right. That does look odd. This is actually an old patch I hoovered up after upgrading and didn't retest it. I'll do some more testing...

Mike.

#3 lore raw
In reply to Alexander Kanavin
Quoted 6 lines · Alexander Kanavin

On Thu, 13 May 2021 at 16:36, Mike Crowe via lists.openembedded.org <http://lists.openembedded.org> <[email protected] <mailto:[email protected]>> wrote:

    +PACKAGECONFIG[gtk+] = "--enable-tests,--disable-tests,,gtk+3"

Was the --enable-tests scenario tested? Specifying gtk+3 after two ,,s seems weird.

it is valid if tests need gtk+3 at runtime, but not during build time, in that case you only create rdep as above.

Quoted 6 lines

Alex

#4 lore raw
In reply to Alexander Kanavin
Quoted 7 lines · Alexander Kanavin
Quoted 2 lines · Mike Crowe via lists.openembedded.org

+PACKAGECONFIG[gtk+] = "--enable-tests,--disable-tests,,gtk+3"

Was the --enable-tests scenario tested? Specifying gtk+3 after two ,,s seems weird.

It means to add a runtime (RDEPENDS) rather than DEPENDS. There are options for positions 5 and 6 too if I remember rightly.

Cheers,

Richard

author
#5 lore raw
Quoted 11 lines · Richard Purdie
Quoted 7 lines · Alexander Kanavin
Quoted 2 lines · Mike Crowe via lists.openembedded.org

+PACKAGECONFIG[gtk+] = "--enable-tests,--disable-tests,,gtk+3"

Was the --enable-tests scenario tested? Specifying gtk+3 after two ,,s seems weird.

It means to add a runtime (RDEPENDS) rather than DEPENDS. There are options for positions 5 and 6 too if I remember rightly.

Yes, but it should have been a build dependency. :( Alexander was correct to draw attention to it. It turns out that the whole line is wrong because I failed to spot that master is now using Meson too. :(

A better patch will be arriving shortly.

Thanks.

Mike.