Skip to contentSkip to conversation

glade3: move from oe to gnome layer

PATCH New Armin Kuster 1 participant 3 messages Mar 6, 2018

lore
Share & tools
lore

Armin Kuster

author
#0 lore raw

PATCH 1/3 glade3: move from oe to gnome layer

Signed-off-by Armin Kuster <[email protected]>
---
 .../0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch       | 0
 .../glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch   | 0
 .../recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch            | 0
 meta-gnome/recipes-devtools/glade/glade3_%.bbappend                     | 1 -
 {meta-oe => meta-gnome}/recipes-devtools/glade/glade3_3.8.5.bb          | 2 +-
 5 files changed, 1 insertion(+), 2 deletions(-)
 rename {meta-oe => meta-gnome}/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch (100%)
 rename {meta-oe => meta-gnome}/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch (100%)
 rename {meta-oe => meta-gnome}/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch (100%)
 delete mode 100644 meta-gnome/recipes-devtools/glade/glade3_%.bbappend
 rename {meta-oe => meta-gnome}/recipes-devtools/glade/glade3_3.8.5.bb (97%)
meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch renamed from meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch
rename to meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch
meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch renamed from meta-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch
rename to meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch
meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch renamed from meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch
rename to meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch
meta-gnome/recipes-devtools/glade/glade3_%.bbappend deleted +0 -1
deleted file mode 100644
index 3abacfb..0000000
@@ -1 +0,0 @@
-PACKAGECONFIG ??= "gnome"
meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb renamed from meta-oe/recipes-devtools/glade/glade3_3.8.5.bb +1 -1
similarity index 97%
rename from meta-oe/recipes-devtools/glade/glade3_3.8.5.bb
rename to meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb
index c4f6000..69162bd 100644
@@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ?= "gnome"
 PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui"
 
 FILES_${PN} += "${datadir}/icons"
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/3 meta-gnome: layer.conf remove gtk depends

commit ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 removed gnome-disk-utility so AVAHI_GTK_pn-avahi-ui = "gtk gtk3" is no longer needed

Signed-off-by Armin Kuster <[email protected]>
---
 meta-gnome/conf/layer.conf | 2 --
 1 file changed, 2 deletions(-)
meta-gnome/conf/layer.conf +0 -2
index a138818..fb89c14 100644
@@ -13,5 +13,3 @@ BBFILE_PRIORITY_gnome-layer = "7"
 LAYERVERSION_gnome-layer = "1"
 
 LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer"
-
-AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 3/3 usermode: require pam in DISTRO_FEATURES

In reply to Armin Kuster
Signed-off-by Armin Kuster <[email protected]>
---
 meta-gnome/recipes-support/usermode/usermode_1.111.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-gnome/recipes-support/usermode/usermode_1.111.bb +2 -1
index c2d7328..0f88040 100644
@@ -23,7 +23,8 @@ SRC_URI[sha256sum] = "3dd0b9639b5bd396b7ea5fada6aaa694dbfdaa3ad06eb95a6eabcdfd02
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-inherit autotools gettext pkgconfig
+inherit distro_features_check autotools gettext pkgconfig
 
 EXTRA_OEMAKE += "INSTALL='install -p'"
 
+REQUIRED_DISTRO_FEATURES = "pam"
Signature · 1 line
2.7.4