Skip to contentSkip to conversation

gcr: Add support for building without x11

PATCH Superseded Andrei Gherzan 3 participants 6 messages Mar 4, 2021 – Mar 5, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gcr: Add support for building without x11

From: Andrei Gherzan <[email protected]>

---
 meta/recipes-gnome/gcr/gcr_3.38.1.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-gnome/gcr/gcr_3.38.1.bb +4 -3
index fe80439b00..292f5b5655 100644
@@ -8,7 +8,7 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
-DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt gnupg-native \
+DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \
            ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
 
 CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'"
@@ -16,11 +16,12 @@ CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'"
 GNOMEBASEBUILDCLASS = "meson"
 GTKDOC_MESON_OPTION = "gtk_doc"
 inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
-# depends on gtk+3, but also x11 through gtk+-x11
-REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI[archive.sha256sum] = "17fcaf9c4a93a65fb1c72b82643bb102c13344084687d5886ea66313868d9ec9"
 
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
+PACKAGECONFIG[gtk+] = ",--without-gtk,gtk+3"
+
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/gcr-3 \
Signature · 1 line
2.30.1
#1 lore raw

PATCH 2/2 epiphany: Add package configuration for building in developer mode

From: Andrei Gherzan <[email protected]>

---
 meta/recipes-gnome/epiphany/epiphany_3.38.2.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-gnome/epiphany/epiphany_3.38.2.bb +3 -0
index 7fedc43a99..8e697b4a44 100644
@@ -21,5 +21,8 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}
            "
 SRC_URI[archive.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d"
 
+# Developer mode enables debugging
+PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true"
+
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
Signature · 1 line
2.30.1
#2 lore raw

Re: [OE-core] [PATCH 2/2] epiphany: Add package configuration for building in developer mode

Quoted 13 lines · Andrei Gherzan

From: Andrei Gherzan <[email protected]>

---
 meta/recipes-gnome/epiphany/epiphany_3.38.2.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-gnome/epiphany/epiphany_3.38.2.bb +0 -0
index 7fedc43a99..8e697b4a44 100644

meta/recipes-gnome/epiphany/epiphany_3.38.2.bb SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV} · line 25

Quoted 5 lines
meta/recipes-gnome/epiphany/epiphany_3.38.2.bb +2 -0
@@ -21,5 +21,8 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}
            "
 SRC_URI[archive.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d"
 
+# Developer mode enables debugging
+PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true"

add else case to define it to false as well.

Quoted 9 lines
meta/recipes-gnome/epiphany/epiphany_3.38.2.bb +1 -1
+
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
--

2.30.1

#3 lore raw

Re: [OE-core] [PATCH 2/2] epiphany: Add package configuration for building in developer mode

Hi,

Quoted 17 lines · Khem Raj
Quoted 16 lines · Andrei Gherzan

From: Andrei Gherzan <[email protected]>

---
 meta/recipes-gnome/epiphany/epiphany_3.38.2.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-gnome/epiphany/epiphany_3.38.2.bb +0 -0
index 7fedc43a99..8e697b4a44 100644
@@ -21,5 +21,8 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}
            "
 SRC_URI[archive.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d"
 
Quoted 4 lines

meta/recipes-gnome/epiphany/epiphany_3.38.2.bb SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV} · line 25

Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_3.38.2.bb +2 -0
+# Developer mode enables debugging
+PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true"

add else case to define it to false as well.

Thanks. Sent v2.

---
Andrei

#4 lore raw
In reply to Andrei Gherzan
Quoted 10 lines · Andrei Gherzan

GNOMEBASEBUILDCLASS = "meson"
GTKDOC_MESON_OPTION = "gtk_doc"
inherit gnomebase gtk-icon-cache gtk-doc features_check
upstream-version-is-even vala gobject-introspection gettext mime mime-xdg

meta/recipes-gnome/gcr/gcr_3.38.1.bb +0 -2
-# depends on gtk+3, but also x11 through gtk+-x11
-REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI[archive.sha256sum] =

"17fcaf9c4a93a65fb1c72b82643bb102c13344084687d5886ea66313868d9ec9"

Quoted 4 lines

+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
+PACKAGECONFIG[gtk+] = ",--without-gtk,gtk+3"

This does not look like a meson option, and needs a on-setting as well. Please test the new options both ways.

Alex

#5 lore raw
Quoted 7 lines · Alexander Kanavin
Quoted 6 lines · Andrei Gherzan

GNOMEBASEBUILDCLASS = "meson"
GTKDOC_MESON_OPTION = "gtk_doc"
inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg

meta/recipes-gnome/gcr/gcr_3.38.1.bb +0 -2
-# depends on gtk+3, but also x11 through gtk+-x11
-REQUIRED_DISTRO_FEATURES = "x11"
Quoted 6 lines

meta/recipes-gnome/gcr/gcr_3.38.1.bb CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'" · line 23

Quoted 4 lines

SRC_URI[archive.sha256sum] = "17fcaf9c4a93a65fb1c72b82643bb102c13344084687d5886ea66313868d9ec9"

meta/recipes-gnome/gcr/gcr_3.38.1.bb +2 -0
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
+PACKAGECONFIG[gtk+] = ",--without-gtk,gtk+3"

This does not look like a meson option, and needs a on-setting as well. Please test the new options both ways.

Thanks. Sent v2.

---
Andrei