* [PATCH 01/19] itstool: rework native shebang and add class to make native itstool work
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 02/19] yelp-tools: use itstools.bbclass Andreas Müller
` (17 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
itstool was reworked in [1] to not use host's python. This patch introduced the
'-S' option for coreutils's env [2]. Unfortunately that option is relatively
young [3] and elder build-host don't support it [4].
The only way to get around this is:
* remove '-S' and -s' from native shebang
* add a class itstool.bbclass. This class depends itstool-native and creates a
valid python3 runtime environment. Most notable in the environment is
export PYTHONNOUSERSITE = "1"
which does same as '-s' option: force python to avoid adding (host) user sites.
[1] http://cgit.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/itstool/itstool/0001-Don-t-use-build-time-hardcoded-python-binary-path.patch?id=e5ac325b7974a346b218d1f43b92d06f5b0dd078
[2] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/itstool/itstool/0001-Don-t-use-build-time-hardcoded-python-binary-path.patch
[3] https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30
[4] https://errors.yoctoproject.org/Errors/Details/274743/
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-oe/classes/itstool.bbclass | 5 +++
...-build-time-hardcoded-python-binary-.patch | 35 +++++++++++++++++++
...d-time-hardcoded-python-binary-path.patch} | 0
.../recipes-support/itstool/itstool_2.0.6.bb | 6 ++--
4 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/classes/itstool.bbclass
create mode 100644 meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch
rename meta-oe/recipes-support/itstool/itstool/{0001-Don-t-use-build-time-hardcoded-python-binary-path.patch => 0002-Don-t-use-build-time-hardcoded-python-binary-path.patch} (100%)
diff --git a/meta-oe/classes/itstool.bbclass b/meta-oe/classes/itstool.bbclass
new file mode 100644
index 000000000..45e3fb839
--- /dev/null
+++ b/meta-oe/classes/itstool.bbclass
@@ -0,0 +1,5 @@
+# helper class to prepare correct environment for native itstool
+
+inherit python3native
+
+DEPENDS_append = " itstool-native"
diff --git a/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch b/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch
new file mode 100644
index 000000000..19a858bd7
--- /dev/null
+++ b/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch
@@ -0,0 +1,35 @@
+From 335ef14fc801c9dfbe7e5692dc71cfbe72049d2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 27 Oct 2019 16:38:52 +0100
+Subject: [PATCH] Native: Don't use build time hardcoded python binary path.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is same patch as used for target build except that we do not use the
+'-S' and '-s' option because '-S' is relatively young [1] and elder build-host
+don't support it [2]
+
+[1] https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30
+[2] https://errors.yoctoproject.org/Errors/Details/274743/
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ itstool.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/itstool.in b/itstool.in
+index e64cd34..05d264f 100755
+--- a/itstool.in
++++ b/itstool.in
+@@ -1,4 +1,4 @@
+-#!@PYTHON@ -s
++#!/usr/bin/env python3
+ #
+ # Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org>
+ #
+--
+2.21.0
+
diff --git a/meta-oe/recipes-support/itstool/itstool/0001-Don-t-use-build-time-hardcoded-python-binary-path.patch b/meta-oe/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch
similarity index 100%
rename from meta-oe/recipes-support/itstool/itstool/0001-Don-t-use-build-time-hardcoded-python-binary-path.patch
rename to meta-oe/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch
diff --git a/meta-oe/recipes-support/itstool/itstool_2.0.6.bb b/meta-oe/recipes-support/itstool/itstool_2.0.6.bb
index b4b37aa01..8290c5e58 100644
--- a/meta-oe/recipes-support/itstool/itstool_2.0.6.bb
+++ b/meta-oe/recipes-support/itstool/itstool_2.0.6.bb
@@ -7,8 +7,10 @@ inherit autotools python3native
DEPENDS = "libxml2-native"
-SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2 \
- file://0001-Don-t-use-build-time-hardcoded-python-binary-path.patch"
+SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2"
+SRC_URI_append_class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch"
+SRC_URI_append_class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch"
+
SRC_URI[md5sum] = "4306eeba4f4aee6b393d14f9c3c57ca1"
SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 02/19] yelp-tools: use itstools.bbclass
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
2019-10-27 23:35 ` [PATCH 01/19] itstool: rework native shebang and add class to make native itstool work Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 03/19] yelp-xsl: use itstool.bbclass Andreas Müller
` (16 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb b/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb
index 6a6397cee..af2bab380 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \
file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
"
-inherit gnomebase
+inherit gnomebase itstool
DEPENDS += " \
libxslt-native \
libxml2-native \
- itstool-native \
yelp-xsl \
"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 03/19] yelp-xsl: use itstool.bbclass
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
2019-10-27 23:35 ` [PATCH 01/19] itstool: rework native shebang and add class to make native itstool work Andreas Müller
2019-10-27 23:35 ` [PATCH 02/19] yelp-tools: use itstools.bbclass Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 04/19] yelp: " Andreas Müller
` (15 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb
index 17994414e..20052cf16 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb
@@ -6,13 +6,16 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \
"
-inherit gnomebase gettext
+inherit gnomebase gettext itstool
-DEPENDS += "libxml2 itstool-native"
+DEPENDS += "libxml2"
SRC_URI[archive.md5sum] = "f8c4e777aee8b055251c333ef48a0cd0"
SRC_URI[archive.sha256sum] = "e8063aee67d1df634f3d062f1c28130b2dabb3c0c66396b1af90388f34e14ee2"
-RDEPENDS_${PN} += "libxml2 itstool"
+RDEPENDS_${PN}_append_class-target = " libxml2 itstool"
+
+# ensure our native consumers are forced to inherit itstool
+RDEPENDS_${PN}_append_class-native = " libxml2"
BBCLASSEXTEND = "native"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 04/19] yelp: use itstool.bbclass
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (2 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 03/19] yelp-xsl: use itstool.bbclass Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 05/19] gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles' Andreas Müller
` (14 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb b/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb
index 13c4e52bf..f6311965e 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \
"
-inherit gnomebase autotools-brokensep gsettings gettext gtk-doc
+inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc
SRC_URI[archive.md5sum] = "776e29bd16424c8712cbf340cfe6429b"
SRC_URI[archive.sha256sum] = "e3d6527c5963d73206891b32f1f23363164be57de248555513bd0be77a7bd045"
@@ -12,7 +12,6 @@ SRC_URI[archive.sha256sum] = "e3d6527c5963d73206891b32f1f23363164be57de248555513
DEPENDS += " \
libxml2-native \
glib-2.0-native \
- itstool-native \
gtk+3 \
appstream-glib \
libxslt \
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 05/19] gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles'
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (3 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 04/19] yelp: " Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 06/19] zenity: rework recipe Andreas Müller
` (13 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Now that we can build gnome help files, let our users decide what to do with
them:
if 'helpfiles' not in DISTRO_FEATURES
delete all help contents during install
else
if PACKAGE_NO_HELP_SPLIT == 1
pack all help files to ${PN}-help
else
pack help files to ${PN}-help-<lingua>
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-gnome/classes/gnome-help.bbclass | 69 +++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
create mode 100644 meta-gnome/classes/gnome-help.bbclass
diff --git a/meta-gnome/classes/gnome-help.bbclass b/meta-gnome/classes/gnome-help.bbclass
new file mode 100644
index 000000000..967091ba4
--- /dev/null
+++ b/meta-gnome/classes/gnome-help.bbclass
@@ -0,0 +1,69 @@
+# Class to pack gnome help files or delete them during install
+# There are the following cases:
+#
+# if 'helpfiles' not in DISTRO_FEATURES
+# delete all help contants during install
+# else
+# if PACKAGE_NO_HELP_SPLIT == 1
+# pack all help files to ${PN}-help
+# else
+# pack all help files to ${PN}-help-<lingua>
+
+FILES_${PN}-help = "${datadir}/*/translations"
+
+# Dummy to get yelp build & PACKAGE_NO_HELP_SPLIT set 1
+PACKAGES_append = " ${PN}-help"
+FILES_${PN}-help = "${datadir}/help"
+RRECOMMENDS_${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}"
+
+do_install_append() {
+ if ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','false','true',d)}; then
+ rm -rf ${D}${datadir}/help/*
+ fi
+}
+
+python gnome_do_split_help() {
+ if bb.utils.contains('DISTRO_FEATURES', 'helpfiles', False, True, d):
+ return
+
+ if (d.getVar('PACKAGE_NO_HELP_SPLIT') == '1'):
+ # all help files go to ${
+ bb.debug(1, "package requested not splitting help-files")
+ return
+
+ packages = (d.getVar('PACKAGES') or "").split()
+ datadir = d.getVar('datadir')
+ dvar = d.getVar('PKGD')
+ pn = d.getVar('PN')
+
+ if pn + '-help' in packages:
+ packages.remove(pn + '-help')
+
+ helpdir = os.path.join(dvar + datadir, 'help')
+
+ if not cpath.isdir(helpdir):
+ bb.warn("No help files in this package - remove gnome-help from inherit?")
+ return
+
+ helps = os.listdir(helpdir)
+
+ summary = d.getVar('SUMMARY') or pn
+ description = d.getVar('DESCRIPTION') or ""
+ locale_section = d.getVar('LOCALE_SECTION')
+ mlprefix = d.getVar('MLPREFIX') or ""
+ for l in sorted(helps):
+ ln = legitimize_package_name(l)
+ pkg = pn + '-help-' + ln
+ packages.append(pkg)
+ d.setVar('FILES_' + pkg, os.path.join(datadir, 'help', l))
+ d.setVar('RRECOMMENDS_' + pkg, '%syelp' % mlprefix)
+ d.setVar('SUMMARY_' + pkg, '%s - %s help' % (summary, l))
+ d.setVar('DESCRIPTION_' + pkg, '%s This package contains language help files for the %s locale.' % (description, l))
+ if locale_section:
+ d.setVar('SECTION_' + pkg, locale_section)
+
+ d.setVar('PACKAGES', ' '.join(packages))
+}
+
+PACKAGESPLITFUNCS_prepend = "gnome_do_split_help "
+
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 06/19] zenity: rework recipe
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (4 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 05/19] gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles' Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 07/19] colord: initial add 1.4.4 Andreas Müller
` (12 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
* "xz" is default for GNOME_COMPRESS_TYPE
* instead of patching away help-files, build them and let users decide if and
how to pack them by inheriting gnome-help.bbclass
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../0001-build-don-t-generate-manual.patch | 50 -------------------
.../recipes-gnome/zenity/zenity_3.32.0.bb | 12 ++---
2 files changed, 5 insertions(+), 57 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch
diff --git a/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch b/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch
deleted file mode 100644
index 488548667..000000000
--- a/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 38eeb345fdfca0298b11427aa942b68e627ba10e Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
-Date: Thu, 12 Sep 2019 13:14:55 +0200
-Subject: [PATCH] build: don't generate manual
-
-We don't have yelp in yocto and even if we did it would pull in
-webkitgtk just to generate help. Just remove the manual generation
-altogether.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
----
- Makefile.am | 3 +--
- configure.ac | 5 -----
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 81ae6a7..bd073dd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,8 +4,7 @@ AM_CPPFLAGS = src
- SUBDIRS = \
- src \
- po \
-- data \
-- help
-+ data
-
- EXTRA_DIST = \
- autogen.sh \
-diff --git a/configure.ac b/configure.ac
-index 5dccdb0..f88b2c0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -115,11 +115,6 @@ GETTEXT_PACKAGE=zenity
- AC_SUBST([GETTEXT_PACKAGE])
- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain])
-
--# *******************************
--# User manual
--# *******************************
--YELP_HELP_INIT
--
- # *******************************
-
- AC_SUBST([AM_CPPFLAGS])
---
-2.21.0
-
diff --git a/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb
index 295288bfb..0384a5c5c 100644
--- a/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb
+++ b/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb
@@ -4,19 +4,17 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-inherit distro_features_check gnomebase gettext
+inherit gnomebase itstool gnome-help distro_features_check gettext
-DEPENDS = "gtk+3"
+DEPENDS = " \
+ yelp-tools-native \
+ gtk+3 \
+"
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
- file://0001-build-don-t-generate-manual.patch \
-"
-
SRC_URI[archive.md5sum] = "ba2b2a13248773b4ec0fd323d95e6d5a"
SRC_URI[archive.sha256sum] = "e786e733569c97372c3ef1776e71be7e7599ebe87e11e8ad67dcc2e63a82cd95"
-GNOME_COMPRESS_TYPE="xz"
do_install_append() {
# Remove gdialog compatibility helper - we don't want to pull in perl
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 07/19] colord: initial add 1.4.4
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (5 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 06/19] zenity: rework recipe Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-28 20:08 ` Khem Raj
2019-10-27 23:35 ` [PATCH 08/19] colord-gtk: initial add 0.2.0 Andreas Müller
` (11 subsequent siblings)
18 siblings, 1 reply; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
* It is a dependency for upcoming gnome-settings-daemon
* It is used by GNOME and KDE [1] so move it to meta-oe
* Getting it to build was a bit tricky. Udev (systemd) is a mandatory
dependency and for native we do not support build. To get around native build
was stripped down to what's necessary only. Native build is done with the
help of configuration in recipe and (old-school) Makefile. This solution was
chosen to avoid massive patching of meson build which tends to be a
maintenance burden (as experienced at KDE recipes in meta-qt5-extra).
[1] https://www.freedesktop.org/software/colord/intro.html
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-support/colord/colord-native.bb | 64 +++++++
...n-cd_icc_create_from_edid-to-avoid-u.patch | 166 ++++++++++++++++++
.../colord/colord-native/Makefile | 48 +++++
meta-oe/recipes-support/colord/colord.bb | 45 +++++
meta-oe/recipes-support/colord/colord.inc | 13 ++
...Run-native-cd_idt8-cd_create_profile.patch | 59 +++++++
6 files changed, 395 insertions(+)
create mode 100644 meta-oe/recipes-support/colord/colord-native.bb
create mode 100644 meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
create mode 100644 meta-oe/recipes-support/colord/colord-native/Makefile
create mode 100644 meta-oe/recipes-support/colord/colord.bb
create mode 100644 meta-oe/recipes-support/colord/colord.inc
create mode 100644 meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb
new file mode 100644
index 000000000..845041cc4
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord-native.bb
@@ -0,0 +1,64 @@
+require ${BPN}.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:"
+
+inherit meson native
+
+DEPENDS += " \
+ meson-native \
+ glib-2.0-native \
+ lcms-native \
+"
+
+SRC_URI += " \
+ file://0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch \
+ file://Makefile;subdir=${BPN}-${PV} \
+"
+
+do_configure() {
+ # we expect meson to fail - but before it extracts project's version in log file
+ meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON} > /dev/null 2>&1 || true
+
+ # extract and split version
+ version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
+ major=`echo $version | cut -d. -f1`
+ minor=`echo $version | cut -d. -f2`
+ micro=`echo $version | cut -d. -f3`
+ echo "Project version: $major.$minor.$micro"
+
+ # extract project name
+ proj_name=`grep 'Project name:' ${B}/meson-logs/meson-log.txt | sed 's|Project name: ||'`
+
+ # create cd-version.h
+ mkdir -p ${B}/colord
+ sed ${S}/lib/colord/cd-version.h.in \
+ -e 's:@CD_MAJOR_VERSION_PRIVATE@:1:g' \
+ -e 's:@CD_MINOR_VERSION_PRIVATE@:4:g' \
+ -e 's:@CD_MICRO_VERSION_PRIVATE@:4:g' \
+ > ${B}/colord/cd-version.h
+
+ # create config.h based on target build and add what's necessary only
+ localedir=`echo ${datadir}/locale | sed 's:${prefix}/::g'`
+ echo "#define LOCALEDIR \"$localedir\"" >> ${B}/config.h
+ echo "#define GETTEXT_PACKAGE \"colord\"" >> ${B}/config.h
+ echo "#define PACKAGE_NAME \"$proj_name\"" >> ${B}/config.h
+ echo "#define PACKAGE_VERSION \"$version\"" >> ${B}/config.h
+}
+
+do_compile() {
+ oe_runmake -C${S} DESTDIR=${B}
+}
+
+do_install() {
+ version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
+ major=`echo $version | cut -d. -f1`
+
+ install -d ${D}${libdir}
+ install -m 755 ${B}/libcolord.so ${D}${libdir}/libcolord.so.$version
+ ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so"
+ ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so.$major"
+
+ install -d ${D}${bindir}
+ install -m 755 ${B}/cd_create_profile ${D}${bindir}/
+ install -m 755 ${B}/cd_idt8 ${D}${bindir}/
+}
diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
new file mode 100644
index 000000000..278b90e07
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
@@ -0,0 +1,166 @@
+From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 12 May 2019 21:58:02 +0200
+Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev
+ dependeny
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We do not have udev-native so it is a dependeny we cannot satisfy
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ lib/colord/cd-edid.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
+ lib/colord/cd-icc.c | 62 -------------------------------------------
+ 2 files changed, 63 insertions(+), 62 deletions(-)
+
+diff --git a/lib/colord/cd-edid.c b/lib/colord/cd-edid.c
+index a5e2328..dec509a 100644
+--- a/lib/colord/cd-edid.c
++++ b/lib/colord/cd-edid.c
+@@ -687,3 +687,66 @@ cd_edid_new (void)
+ edid = g_object_new (CD_TYPE_EDID, NULL);
+ return CD_EDID (edid);
+ }
++
++/**
++ * cd_icc_create_from_edid_data:
++ * @icc: A valid #CdIcc
++ * @edid: EDID data
++ * @error: A #GError, or %NULL
++ *
++ * Creates an ICC profile from EDID data.
++ *
++ * Return value: %TRUE for success
++ *
++ * Since: 1.1.2
++ **/
++gboolean
++cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
++{
++ CdIccPrivate *priv = GET_PRIVATE (icc);
++ const gchar *data;
++
++ /* not loaded */
++ if (priv->lcms_profile != NULL) {
++ g_set_error_literal (error,
++ CD_ICC_ERROR,
++ CD_ICC_ERROR_FAILED_TO_CREATE,
++ "already loaded or generated");
++ return FALSE;
++ }
++
++ /* create from parsed object */
++ if (!cd_icc_create_from_edid (icc,
++ cd_edid_get_gamma (edid),
++ cd_edid_get_red (edid),
++ cd_edid_get_green (edid),
++ cd_edid_get_blue (edid),
++ cd_edid_get_white (edid),
++ error)) {
++ return FALSE;
++ }
++
++ /* set copyright */
++ cd_icc_set_copyright (icc, NULL,
++ /* deliberately not translated */
++ "This profile is free of known copyright restrictions.");
++
++ /* set 'ICC meta Tag for Monitor Profiles' data */
++ data = cd_edid_get_checksum (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
++ data = cd_edid_get_monitor_name (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
++ data = cd_edid_get_serial_number (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
++ data = cd_edid_get_pnp_id (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
++ data = cd_edid_get_vendor_name (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
++ return TRUE;
++}
++
+diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c
+index f231814..2c8fe77 100644
+--- a/lib/colord/cd-icc.c
++++ b/lib/colord/cd-icc.c
+@@ -3094,68 +3094,6 @@ out:
+ return ret;
+ }
+
+-/**
+- * cd_icc_create_from_edid_data:
+- * @icc: A valid #CdIcc
+- * @edid: EDID data
+- * @error: A #GError, or %NULL
+- *
+- * Creates an ICC profile from EDID data.
+- *
+- * Return value: %TRUE for success
+- *
+- * Since: 1.1.2
+- **/
+-gboolean
+-cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
+-{
+- CdIccPrivate *priv = GET_PRIVATE (icc);
+- const gchar *data;
+-
+- /* not loaded */
+- if (priv->lcms_profile != NULL) {
+- g_set_error_literal (error,
+- CD_ICC_ERROR,
+- CD_ICC_ERROR_FAILED_TO_CREATE,
+- "already loaded or generated");
+- return FALSE;
+- }
+-
+- /* create from parsed object */
+- if (!cd_icc_create_from_edid (icc,
+- cd_edid_get_gamma (edid),
+- cd_edid_get_red (edid),
+- cd_edid_get_green (edid),
+- cd_edid_get_blue (edid),
+- cd_edid_get_white (edid),
+- error)) {
+- return FALSE;
+- }
+-
+- /* set copyright */
+- cd_icc_set_copyright (icc, NULL,
+- /* deliberately not translated */
+- "This profile is free of known copyright restrictions.");
+-
+- /* set 'ICC meta Tag for Monitor Profiles' data */
+- data = cd_edid_get_checksum (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
+- data = cd_edid_get_monitor_name (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
+- data = cd_edid_get_serial_number (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
+- data = cd_edid_get_pnp_id (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
+- data = cd_edid_get_vendor_name (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
+- return TRUE;
+-}
+-
+ /**
+ * cd_icc_create_from_edid:
+ * @icc: A valid #CdIcc
+--
+2.20.1
+
diff --git a/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-oe/recipes-support/colord/colord-native/Makefile
new file mode 100644
index 000000000..94e929ef4
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord-native/Makefile
@@ -0,0 +1,48 @@
+# For native build cd_idt8, cd_create_profile and a tiny version of libcolord.so
+# only. By reducing the library to what's necessary, we avoid dependencies on
+# naitve udev and libgudev
+
+CFLAGS+=$(shell pkg-config-native --cflags gio-2.0)
+CFLAGS+=$(shell pkg-config-native --cflags lcms2)
+CFLAGS+=-I./lib -I./lib/colord -I$(DESTDIR) -DCD_COMPILATION
+
+LDFLAGS+=$(shell pkg-config-native --libs gio-2.0)
+LDFLAGS+=$(shell pkg-config-native --libs lcms2)
+LDFLAGS+=-lm
+
+all: cd_idt8 cd_create_profile
+
+LIBSOURCES = \
+ lib/colord/cd-it8.c \
+ lib/colord/cd-color.c \
+ lib/colord/cd-spectrum.c \
+ lib/colord/cd-math.c \
+ lib/colord/cd-interp-akima.c \
+ lib/colord/cd-context-lcms.c \
+ lib/colord/cd-interp.c \
+ lib/colord/cd-interp-linear.c \
+ lib/colord/cd-it8-utils.c \
+ lib/colord/cd-enum.c \
+ lib/colord/cd-icc.c \
+ lib/colord/cd-icc-utils.c \
+ lib/colord/cd-dom.c
+
+libcolord.so: $(LIBSOURCES)
+ $(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,$@ $^ -o $(DESTDIR)/$@
+
+cd_idt8.o: client/cd-it8.c
+ $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
+
+cd_idt8: libcolord.so cd_idt8.o
+ $(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_idt8.o -o $(DESTDIR)/$@
+
+cd_create_profile.o: client/cd-create-profile.c
+ $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
+
+cd_create_profile: libcolord.so cd_create_profile.o
+ $(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_create_profile.o -o $(DESTDIR)/$@
+
+.PHONY: clean
+
+clean:
+ rm -f $(DESTDIR)/libcolord.so $(DESTDIR)/*.o $(DESTDIR)/cd_idt8 $(DESTDIR)/cd_create_profile
diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb
new file mode 100644
index 000000000..aa5d1d129
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord.bb
@@ -0,0 +1,45 @@
+require ${BPN}.inc
+
+inherit meson gobject-introspection gsettings gettext bash-completion systemd distro_features_check useradd
+
+# polkit and gobject-introspection are mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+DEPENDS += " \
+ ${BPN}-native \
+ glib-2.0 \
+ lcms \
+ sqlite3 \
+ libgusb \
+ libgudev \
+ polkit \
+"
+
+SRC_URI += " \
+ file://0001-Run-native-cd_idt8-cd_create_profile.patch \
+"
+
+EXTRA_OEMESON = " \
+ -Dman=false \
+ -Ddocs=false \
+"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
+
+SYSTEMD_SERVICE_${PN} = "colord.service"
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/polkit-1 \
+ ${datadir}/glib-2.0 \
+ ${datadir}/color \
+ ${systemd_user_unitdir} \
+ ${libdir}/tmpfiles.d \
+ ${libdir}/colord-plugins \
+ ${libdir}/colord-sensors \
+"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord"
diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc
new file mode 100644
index 000000000..7497fed51
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord.inc
@@ -0,0 +1,13 @@
+SUMMARY = "Making color management just work"
+HOMEPAGE = "https://www.freedesktop.org/software/colord/"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \
+"
+
+PV = "1.4.4"
+SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8"
+SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5"
+
diff --git a/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
new file mode 100644
index 000000000..4b52aa337
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
@@ -0,0 +1,59 @@
+From 5aad8831c0fb71940d6c4f982b0b30ffb6ae33b3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 12 May 2019 22:47:05 +0200
+Subject: [PATCH] Run native cd_idt8/cd_create_profile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ data/cmf/meson.build | 2 +-
+ data/illuminant/meson.build | 2 +-
+ data/profiles/meson.build | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/data/cmf/meson.build b/data/cmf/meson.build
+index a693cd7..1ae3613 100644
+--- a/data/cmf/meson.build
++++ b/data/cmf/meson.build
+@@ -2,7 +2,7 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ]
+ custom_target(arg,
+ input: arg + '.csv',
+ output: arg + '.cmf',
+- command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
++ command: [ 'cd_idt8', 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
+ install: true,
+ install_dir: join_paths(datadir, 'colord', 'cmf')
+ )
+diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build
+index f8dfa07..ad7dced 100644
+--- a/data/illuminant/meson.build
++++ b/data/illuminant/meson.build
+@@ -24,7 +24,7 @@ foreach arg: generated_spectra
+ custom_target(arg,
+ input: arg + '.csv',
+ output: arg + '.sp',
+- command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
++ command: [ 'cd_idt8', 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
+ install: true,
+ install_dir: join_paths(datadir, 'colord', 'illuminant')
+ )
+diff --git a/data/profiles/meson.build b/data/profiles/meson.build
+index 591b97d..2cef011 100644
+--- a/data/profiles/meson.build
++++ b/data/profiles/meson.build
+@@ -59,7 +59,7 @@ foreach arg: icc_profiles
+ generated_icc = custom_target(arg + '.icc',
+ input: xml_i18n,
+ output: arg + '.icc',
+- command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ],
++ command: [ 'cd_create_profile', '--output=@OUTPUT@', '@INPUT@' ],
+ install: true,
+ install_dir: join_paths(datadir, 'color', 'icc', 'colord'),
+ )
+--
+2.20.1
+
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 07/19] colord: initial add 1.4.4
2019-10-27 23:35 ` [PATCH 07/19] colord: initial add 1.4.4 Andreas Müller
@ 2019-10-28 20:08 ` Khem Raj
2019-10-28 20:50 ` Andreas Müller
0 siblings, 1 reply; 26+ messages in thread
From: Khem Raj @ 2019-10-28 20:08 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
https://errors.yoctoproject.org/Errors/Details/274841/
On Mon, Oct 28, 2019 at 12:37 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> * It is a dependency for upcoming gnome-settings-daemon
> * It is used by GNOME and KDE [1] so move it to meta-oe
> * Getting it to build was a bit tricky. Udev (systemd) is a mandatory
> dependency and for native we do not support build. To get around native build
> was stripped down to what's necessary only. Native build is done with the
> help of configuration in recipe and (old-school) Makefile. This solution was
> chosen to avoid massive patching of meson build which tends to be a
> maintenance burden (as experienced at KDE recipes in meta-qt5-extra).
>
> [1] https://www.freedesktop.org/software/colord/intro.html
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> .../recipes-support/colord/colord-native.bb | 64 +++++++
> ...n-cd_icc_create_from_edid-to-avoid-u.patch | 166 ++++++++++++++++++
> .../colord/colord-native/Makefile | 48 +++++
> meta-oe/recipes-support/colord/colord.bb | 45 +++++
> meta-oe/recipes-support/colord/colord.inc | 13 ++
> ...Run-native-cd_idt8-cd_create_profile.patch | 59 +++++++
> 6 files changed, 395 insertions(+)
> create mode 100644 meta-oe/recipes-support/colord/colord-native.bb
> create mode 100644 meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
> create mode 100644 meta-oe/recipes-support/colord/colord-native/Makefile
> create mode 100644 meta-oe/recipes-support/colord/colord.bb
> create mode 100644 meta-oe/recipes-support/colord/colord.inc
> create mode 100644 meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
>
> diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb
> new file mode 100644
> index 000000000..845041cc4
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord-native.bb
> @@ -0,0 +1,64 @@
> +require ${BPN}.inc
> +
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:"
> +
> +inherit meson native
> +
> +DEPENDS += " \
> + meson-native \
> + glib-2.0-native \
> + lcms-native \
> +"
> +
> +SRC_URI += " \
> + file://0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch \
> + file://Makefile;subdir=${BPN}-${PV} \
> +"
> +
> +do_configure() {
> + # we expect meson to fail - but before it extracts project's version in log file
> + meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON} > /dev/null 2>&1 || true
> +
> + # extract and split version
> + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
> + major=`echo $version | cut -d. -f1`
> + minor=`echo $version | cut -d. -f2`
> + micro=`echo $version | cut -d. -f3`
> + echo "Project version: $major.$minor.$micro"
> +
> + # extract project name
> + proj_name=`grep 'Project name:' ${B}/meson-logs/meson-log.txt | sed 's|Project name: ||'`
> +
> + # create cd-version.h
> + mkdir -p ${B}/colord
> + sed ${S}/lib/colord/cd-version.h.in \
> + -e 's:@CD_MAJOR_VERSION_PRIVATE@:1:g' \
> + -e 's:@CD_MINOR_VERSION_PRIVATE@:4:g' \
> + -e 's:@CD_MICRO_VERSION_PRIVATE@:4:g' \
> + > ${B}/colord/cd-version.h
> +
> + # create config.h based on target build and add what's necessary only
> + localedir=`echo ${datadir}/locale | sed 's:${prefix}/::g'`
> + echo "#define LOCALEDIR \"$localedir\"" >> ${B}/config.h
> + echo "#define GETTEXT_PACKAGE \"colord\"" >> ${B}/config.h
> + echo "#define PACKAGE_NAME \"$proj_name\"" >> ${B}/config.h
> + echo "#define PACKAGE_VERSION \"$version\"" >> ${B}/config.h
> +}
> +
> +do_compile() {
> + oe_runmake -C${S} DESTDIR=${B}
> +}
> +
> +do_install() {
> + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
> + major=`echo $version | cut -d. -f1`
> +
> + install -d ${D}${libdir}
> + install -m 755 ${B}/libcolord.so ${D}${libdir}/libcolord.so.$version
> + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so"
> + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so.$major"
> +
> + install -d ${D}${bindir}
> + install -m 755 ${B}/cd_create_profile ${D}${bindir}/
> + install -m 755 ${B}/cd_idt8 ${D}${bindir}/
> +}
> diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
> new file mode 100644
> index 000000000..278b90e07
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
> @@ -0,0 +1,166 @@
> +From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Sun, 12 May 2019 21:58:02 +0200
> +Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev
> + dependeny
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +We do not have udev-native so it is a dependeny we cannot satisfy
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + lib/colord/cd-edid.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
> + lib/colord/cd-icc.c | 62 -------------------------------------------
> + 2 files changed, 63 insertions(+), 62 deletions(-)
> +
> +diff --git a/lib/colord/cd-edid.c b/lib/colord/cd-edid.c
> +index a5e2328..dec509a 100644
> +--- a/lib/colord/cd-edid.c
> ++++ b/lib/colord/cd-edid.c
> +@@ -687,3 +687,66 @@ cd_edid_new (void)
> + edid = g_object_new (CD_TYPE_EDID, NULL);
> + return CD_EDID (edid);
> + }
> ++
> ++/**
> ++ * cd_icc_create_from_edid_data:
> ++ * @icc: A valid #CdIcc
> ++ * @edid: EDID data
> ++ * @error: A #GError, or %NULL
> ++ *
> ++ * Creates an ICC profile from EDID data.
> ++ *
> ++ * Return value: %TRUE for success
> ++ *
> ++ * Since: 1.1.2
> ++ **/
> ++gboolean
> ++cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
> ++{
> ++ CdIccPrivate *priv = GET_PRIVATE (icc);
> ++ const gchar *data;
> ++
> ++ /* not loaded */
> ++ if (priv->lcms_profile != NULL) {
> ++ g_set_error_literal (error,
> ++ CD_ICC_ERROR,
> ++ CD_ICC_ERROR_FAILED_TO_CREATE,
> ++ "already loaded or generated");
> ++ return FALSE;
> ++ }
> ++
> ++ /* create from parsed object */
> ++ if (!cd_icc_create_from_edid (icc,
> ++ cd_edid_get_gamma (edid),
> ++ cd_edid_get_red (edid),
> ++ cd_edid_get_green (edid),
> ++ cd_edid_get_blue (edid),
> ++ cd_edid_get_white (edid),
> ++ error)) {
> ++ return FALSE;
> ++ }
> ++
> ++ /* set copyright */
> ++ cd_icc_set_copyright (icc, NULL,
> ++ /* deliberately not translated */
> ++ "This profile is free of known copyright restrictions.");
> ++
> ++ /* set 'ICC meta Tag for Monitor Profiles' data */
> ++ data = cd_edid_get_checksum (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
> ++ data = cd_edid_get_monitor_name (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
> ++ data = cd_edid_get_serial_number (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
> ++ data = cd_edid_get_pnp_id (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
> ++ data = cd_edid_get_vendor_name (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
> ++ return TRUE;
> ++}
> ++
> +diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c
> +index f231814..2c8fe77 100644
> +--- a/lib/colord/cd-icc.c
> ++++ b/lib/colord/cd-icc.c
> +@@ -3094,68 +3094,6 @@ out:
> + return ret;
> + }
> +
> +-/**
> +- * cd_icc_create_from_edid_data:
> +- * @icc: A valid #CdIcc
> +- * @edid: EDID data
> +- * @error: A #GError, or %NULL
> +- *
> +- * Creates an ICC profile from EDID data.
> +- *
> +- * Return value: %TRUE for success
> +- *
> +- * Since: 1.1.2
> +- **/
> +-gboolean
> +-cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
> +-{
> +- CdIccPrivate *priv = GET_PRIVATE (icc);
> +- const gchar *data;
> +-
> +- /* not loaded */
> +- if (priv->lcms_profile != NULL) {
> +- g_set_error_literal (error,
> +- CD_ICC_ERROR,
> +- CD_ICC_ERROR_FAILED_TO_CREATE,
> +- "already loaded or generated");
> +- return FALSE;
> +- }
> +-
> +- /* create from parsed object */
> +- if (!cd_icc_create_from_edid (icc,
> +- cd_edid_get_gamma (edid),
> +- cd_edid_get_red (edid),
> +- cd_edid_get_green (edid),
> +- cd_edid_get_blue (edid),
> +- cd_edid_get_white (edid),
> +- error)) {
> +- return FALSE;
> +- }
> +-
> +- /* set copyright */
> +- cd_icc_set_copyright (icc, NULL,
> +- /* deliberately not translated */
> +- "This profile is free of known copyright restrictions.");
> +-
> +- /* set 'ICC meta Tag for Monitor Profiles' data */
> +- data = cd_edid_get_checksum (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
> +- data = cd_edid_get_monitor_name (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
> +- data = cd_edid_get_serial_number (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
> +- data = cd_edid_get_pnp_id (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
> +- data = cd_edid_get_vendor_name (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
> +- return TRUE;
> +-}
> +-
> + /**
> + * cd_icc_create_from_edid:
> + * @icc: A valid #CdIcc
> +--
> +2.20.1
> +
> diff --git a/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-oe/recipes-support/colord/colord-native/Makefile
> new file mode 100644
> index 000000000..94e929ef4
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord-native/Makefile
> @@ -0,0 +1,48 @@
> +# For native build cd_idt8, cd_create_profile and a tiny version of libcolord.so
> +# only. By reducing the library to what's necessary, we avoid dependencies on
> +# naitve udev and libgudev
> +
> +CFLAGS+=$(shell pkg-config-native --cflags gio-2.0)
> +CFLAGS+=$(shell pkg-config-native --cflags lcms2)
> +CFLAGS+=-I./lib -I./lib/colord -I$(DESTDIR) -DCD_COMPILATION
> +
> +LDFLAGS+=$(shell pkg-config-native --libs gio-2.0)
> +LDFLAGS+=$(shell pkg-config-native --libs lcms2)
> +LDFLAGS+=-lm
> +
> +all: cd_idt8 cd_create_profile
> +
> +LIBSOURCES = \
> + lib/colord/cd-it8.c \
> + lib/colord/cd-color.c \
> + lib/colord/cd-spectrum.c \
> + lib/colord/cd-math.c \
> + lib/colord/cd-interp-akima.c \
> + lib/colord/cd-context-lcms.c \
> + lib/colord/cd-interp.c \
> + lib/colord/cd-interp-linear.c \
> + lib/colord/cd-it8-utils.c \
> + lib/colord/cd-enum.c \
> + lib/colord/cd-icc.c \
> + lib/colord/cd-icc-utils.c \
> + lib/colord/cd-dom.c
> +
> +libcolord.so: $(LIBSOURCES)
> + $(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,$@ $^ -o $(DESTDIR)/$@
> +
> +cd_idt8.o: client/cd-it8.c
> + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
> +
> +cd_idt8: libcolord.so cd_idt8.o
> + $(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_idt8.o -o $(DESTDIR)/$@
> +
> +cd_create_profile.o: client/cd-create-profile.c
> + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
> +
> +cd_create_profile: libcolord.so cd_create_profile.o
> + $(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_create_profile.o -o $(DESTDIR)/$@
> +
> +.PHONY: clean
> +
> +clean:
> + rm -f $(DESTDIR)/libcolord.so $(DESTDIR)/*.o $(DESTDIR)/cd_idt8 $(DESTDIR)/cd_create_profile
> diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb
> new file mode 100644
> index 000000000..aa5d1d129
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord.bb
> @@ -0,0 +1,45 @@
> +require ${BPN}.inc
> +
> +inherit meson gobject-introspection gsettings gettext bash-completion systemd distro_features_check useradd
> +
> +# polkit and gobject-introspection are mandatory and cannot be configured
> +REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
> +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
> +
> +DEPENDS += " \
> + ${BPN}-native \
> + glib-2.0 \
> + lcms \
> + sqlite3 \
> + libgusb \
> + libgudev \
> + polkit \
> +"
> +
> +SRC_URI += " \
> + file://0001-Run-native-cd_idt8-cd_create_profile.patch \
> +"
> +
> +EXTRA_OEMESON = " \
> + -Dman=false \
> + -Ddocs=false \
> +"
> +
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
> +
> +SYSTEMD_SERVICE_${PN} = "colord.service"
> +
> +FILES_${PN} += " \
> + ${datadir}/dbus-1 \
> + ${datadir}/polkit-1 \
> + ${datadir}/glib-2.0 \
> + ${datadir}/color \
> + ${systemd_user_unitdir} \
> + ${libdir}/tmpfiles.d \
> + ${libdir}/colord-plugins \
> + ${libdir}/colord-sensors \
> +"
> +
> +USERADD_PACKAGES = "${PN}"
> +USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord"
> diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc
> new file mode 100644
> index 000000000..7497fed51
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord.inc
> @@ -0,0 +1,13 @@
> +SUMMARY = "Making color management just work"
> +HOMEPAGE = "https://www.freedesktop.org/software/colord/"
> +LICENSE = "GPLv2 & LGPLv2.1"
> +LIC_FILES_CHKSUM = " \
> + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> + file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \
> +"
> +
> +PV = "1.4.4"
> +SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
> +SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8"
> +SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5"
> +
> diff --git a/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
> new file mode 100644
> index 000000000..4b52aa337
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
> @@ -0,0 +1,59 @@
> +From 5aad8831c0fb71940d6c4f982b0b30ffb6ae33b3 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Sun, 12 May 2019 22:47:05 +0200
> +Subject: [PATCH] Run native cd_idt8/cd_create_profile
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + data/cmf/meson.build | 2 +-
> + data/illuminant/meson.build | 2 +-
> + data/profiles/meson.build | 2 +-
> + 3 files changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/data/cmf/meson.build b/data/cmf/meson.build
> +index a693cd7..1ae3613 100644
> +--- a/data/cmf/meson.build
> ++++ b/data/cmf/meson.build
> +@@ -2,7 +2,7 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ]
> + custom_target(arg,
> + input: arg + '.csv',
> + output: arg + '.cmf',
> +- command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
> ++ command: [ 'cd_idt8', 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
> + install: true,
> + install_dir: join_paths(datadir, 'colord', 'cmf')
> + )
> +diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build
> +index f8dfa07..ad7dced 100644
> +--- a/data/illuminant/meson.build
> ++++ b/data/illuminant/meson.build
> +@@ -24,7 +24,7 @@ foreach arg: generated_spectra
> + custom_target(arg,
> + input: arg + '.csv',
> + output: arg + '.sp',
> +- command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
> ++ command: [ 'cd_idt8', 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
> + install: true,
> + install_dir: join_paths(datadir, 'colord', 'illuminant')
> + )
> +diff --git a/data/profiles/meson.build b/data/profiles/meson.build
> +index 591b97d..2cef011 100644
> +--- a/data/profiles/meson.build
> ++++ b/data/profiles/meson.build
> +@@ -59,7 +59,7 @@ foreach arg: icc_profiles
> + generated_icc = custom_target(arg + '.icc',
> + input: xml_i18n,
> + output: arg + '.icc',
> +- command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ],
> ++ command: [ 'cd_create_profile', '--output=@OUTPUT@', '@INPUT@' ],
> + install: true,
> + install_dir: join_paths(datadir, 'color', 'icc', 'colord'),
> + )
> +--
> +2.20.1
> +
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 08/19] colord-gtk: initial add 0.2.0
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (6 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 07/19] colord: initial add 1.4.4 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 09/19] dconf: extend to native build for upcoming gdm Andreas Müller
` (10 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
it is a dependency for upcoming gnome-control-center
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../colord-gtk/colord-gtk_0.2.0.bb | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb
diff --git a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb
new file mode 100644
index 000000000..c960b99c4
--- /dev/null
+++ b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb
@@ -0,0 +1,21 @@
+SUMMARY = "GTK support library for colord"
+HOMEPAGE = "https://www.freedesktop.org/software/colord/"
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+inherit meson gobject-introspection gettext gtk-doc distro_features_check
+
+DEPENDS = " \
+ gtk+3 \
+ colord \
+"
+
+SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "66d048803c8b89e5e63da4b461484933"
+SRC_URI[sha256sum] = "2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717"
+
+EXTRA_OEMESON = "-Dman=false"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 09/19] dconf: extend to native build for upcoming gdm
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (7 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 08/19] colord-gtk: initial add 0.2.0 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 10/19] dconf-editor: upgrade 3.32.0 -> 3.34.0 Andreas Müller
` (9 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb
index ef549432e..3c3802f34 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb
@@ -16,8 +16,12 @@ SRC_URI += "file://fix-meson-0.52.patch"
# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
EXTRA_OEMESON = "-Dman=false"
+# no bash-completion for native
+EXTRA_OEMESON_append_class-native = "-Dbash_completion=false"
FILES_${PN} += " \
${datadir}/dbus-1 \
${libdir}/gio/modules/*.so \
"
+
+BBCLASSEXTEND = "native"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 10/19] dconf-editor: upgrade 3.32.0 -> 3.34.0
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (8 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 09/19] dconf: extend to native build for upcoming gdm Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 11/19] gtksourceview4: upgrade 4.2.0 -> 4.4.0 Andreas Müller
` (8 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../dconf/{dconf-editor_3.32.0.bb => dconf-editor_3.34.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-gnome/recipes-gnome/dconf/{dconf-editor_3.32.0.bb => dconf-editor_3.34.2.bb} (67%)
diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb b/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb
similarity index 67%
rename from meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb
rename to meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb
index 999ed041a..699511f7a 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb
@@ -8,8 +8,8 @@ DEPENDS = "dconf gtk+3"
inherit gnomebase vala gettext gsettings bash-completion
-SRC_URI[archive.md5sum] = "331a3603c0f8a9913e3a3c0f178b5310"
-SRC_URI[archive.sha256sum] = "f19d1332ac27e23ef3dc2ed07ba4e4646d9d7f05e2e78748aa525a1320adbaba"
+SRC_URI[archive.md5sum] = "2907205ad1a0e2774c981932cb7ff25b"
+SRC_URI[archive.sha256sum] = "cecc2a5cb44af68be80e970e83fb9e3e92e2a74df7c90b63324e6da19a929d5f"
FILES_${PN} += " \
${datadir}/dbus-1 \
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 11/19] gtksourceview4: upgrade 4.2.0 -> 4.4.0
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (9 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 10/19] dconf-editor: upgrade 3.32.0 -> 3.34.0 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 12/19] gnome-menus3: upgrade 3.10.1 -> 3.32.0 Andreas Müller
` (7 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...sourceview4_4.2.0.bb => gtksourceview4_4.4.0.bb} | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview4_4.2.0.bb => gtksourceview4_4.4.0.bb} (65%)
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb
similarity index 65%
rename from meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb
rename to meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb
index 10deaffb8..63bbb2547 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb
@@ -10,12 +10,17 @@ PNAME = "gtksourceview"
S = "${WORKDIR}/${PNAME}-${PV}"
-inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection vala
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.2/${PNAME}-${PV}.tar.xz"
-SRC_URI[md5sum] = "c9e6913c2fd30ca2fcdd71482faf8b99"
-SRC_URI[sha256sum] = "c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675"
+SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.4/${PNAME}-${PV}.tar.xz"
+SRC_URI[md5sum] = "5c47e314517692f2622a0b724c65e628"
+SRC_URI[sha256sum] = "9ddb914aef70a29a66acd93b4f762d5681202e44094d2d6370e51c9e389e689a"
+
+GIR_MESON_OPTION = 'gir'
+GTKDOC_MESON_OPTION = "gtk_doc"
FILES_${PN} += "${datadir}/gtksourceview-4"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 12/19] gnome-menus3: upgrade 3.10.1 -> 3.32.0
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (10 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 11/19] gtksourceview4: upgrade 4.2.0 -> 4.4.0 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 13/19] gnome-desktop3: upgrade 3.34.0 -> 3.34.1 Andreas Müller
` (6 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
* No Changelog avalailable - they suggest to clone the repo :(
* they use gettext instead of intltool
* gconf is not required in DEPENDS - modern gnome does not use gconf anymore
* add upstream-version-is-even to inherit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
| 21 -------------------
| 18 ++++++++++++++++
2 files changed, 18 insertions(+), 21 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
create mode 100644 meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb
diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
deleted file mode 100644
index 647ae914f..000000000
--- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "GNOME menus"
-SECTION = "x11/gnome"
-LICENSE = "GPLv2 & LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-
-DEPENDS = "python libxml2 gconf popt gtk+3 intltool-native gnome-common-native"
-
-inherit distro_features_check gnomebase pkgconfig python-dir pythonnative gobject-introspection
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-BPN = "gnome-menus"
-
-SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz"
-
-SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081"
-SRC_URI[sha256sum] = "46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71"
-
-FILES_${PN} += "${datadir}/desktop-directories/"
--git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb
new file mode 100644
index 000000000..b6d212a27
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "GNOME menus"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+DEPENDS = "python libxml2 popt gtk+3 gnome-common-native"
+
+inherit distro_features_check gnomebase gettext pkgconfig gobject-introspection upstream-version-is-even
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+BPN = "gnome-menus"
+
+SRC_URI[archive.md5sum] = "4262208c13f266d9ada7d356aada9e1b"
+SRC_URI[archive.sha256sum] = "c850c64b2074265fe59e099a340b8689cf3dd4658dc9feddd2ab5e95f1a74b74"
+
+FILES_${PN} += "${datadir}/desktop-directories/"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 13/19] gnome-desktop3: upgrade 3.34.0 -> 3.34.1
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (11 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 12/19] gnome-menus3: upgrade 3.10.1 -> 3.32.0 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 14/19] gnome-bluetooth: upgrade 3.32.1 -> 3.34.0 Andreas Müller
` (5 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...{gnome-desktop3_3.34.0.bb => gnome-desktop3_3.34.1.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop3_3.34.0.bb => gnome-desktop3_3.34.1.bb} (72%)
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.1.bb
similarity index 72%
rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb
rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.1.bb
index 77aa3fb61..0e3cf5b59 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.1.bb
@@ -8,21 +8,21 @@ BPN = "gnome-desktop"
GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase pkgconfig upstream-version-is-even gobject-introspection distro_features_check
+inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection distro_features_check
# gobject-introspection is mandatory and cannot be configured
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
-SRC_URI[archive.md5sum] = "3149bbd12eaf6f4420b1a999131ec470"
-SRC_URI[archive.sha256sum] = "8d331ee655c1d56b2b97562a07c7a7598ff6706a11ff1cdce97423ebc6b62426"
+SRC_URI[archive.md5sum] = "357b4e63960830c1399d3341d05746ea"
+SRC_URI[archive.sha256sum] = "c1dbeb5666dad27166c769e48e2ab41dd5ed74718ea35eb57c8488790662dc5a"
SRC_URI += " \
file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \
"
-DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev"
+DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev"
inherit distro_features_check gtk-doc
REQUIRED_DISTRO_FEATURES += "x11"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 14/19] gnome-bluetooth: upgrade 3.32.1 -> 3.34.0
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (12 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 13/19] gnome-desktop3: upgrade 3.34.0 -> 3.34.1 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 15/19] glade3: upgrade 3.8.5 -> 3.8.6 Andreas Müller
` (4 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../{gnome-bluetooth_3.32.1.bb => gnome-bluetooth_3.34.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-gnome/recipes-gnome/gnome-bluetooth/{gnome-bluetooth_3.32.1.bb => gnome-bluetooth_3.34.0.bb} (78%)
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.0.bb
similarity index 78%
rename from meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb
rename to meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.0.bb
index 3c4438e7e..ae6587be1 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.0.bb
@@ -16,7 +16,7 @@ inherit gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version-
# gtk-icon-cache bbclass will take care of this for us.
EXTRA_OEMESON = "-Dicon_update=false"
-SRC_URI[archive.md5sum] = "5b3d66f564a5067ea154750cdb6d850d"
-SRC_URI[archive.sha256sum] = "6441cafd313af94fba28b701698074f97d693b9023788a74e8e6f16f817ba1aa"
+SRC_URI[archive.md5sum] = "0c567e124a52e8ddc31c8bed0c3e57a1"
+SRC_URI[archive.sha256sum] = "e867e67423e1dc78c56c2ea11dec066ce0254238d559e4777c80fa2935eb6baf"
RDEPENDS_${PN} += "bluez5"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 15/19] glade3: upgrade 3.8.5 -> 3.8.6
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (13 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 14/19] gnome-bluetooth: upgrade 3.32.1 -> 3.34.0 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-28 20:08 ` Khem Raj
2019-10-27 23:35 ` [PATCH 16/19] gspell: upgrade 1.8.1 -> 1.8.2 Andreas Müller
` (3 subsequent siblings)
18 siblings, 1 reply; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
* online help support was added - ship it optionally
* prettify recipe a bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-devtools/glade/glade3_3.8.5.bb | 23 -------------------
.../recipes-devtools/glade/glade3_3.8.6.bb | 18 +++++++++++++++
2 files changed, 18 insertions(+), 23 deletions(-)
delete mode 100644 meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb
create mode 100644 meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb
diff --git a/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb b/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb
deleted file mode 100644
index c3da3e9b9..000000000
--- a/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Glade - A User Interface Designer"
-HOMEPAGE = "http://www.gnu.org/software/gnash"
-LICENSE = "GPLv2 & LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
- file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
- file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
-DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native"
-
-inherit distro_features_check autotools pkgconfig pythonnative gtk-icon-cache
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
- file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \
- file://0002-fix-gcc-6-build.patch \
- file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \
- "
-SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f"
-SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735"
-
-EXTRA_OECONF += "--disable-scrollkeeper"
-
-FILES_${PN} += "${datadir}/icons"
diff --git a/meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb b/meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb
new file mode 100644
index 000000000..8ed30944b
--- /dev/null
+++ b/meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Glade - A User Interface Designer"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
+ file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
+ file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
+DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native yelp-tools-native"
+
+inherit gnomebase gnome-help distro_features_check pythonnative gtk-icon-cache
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI += " \
+ file://0002-fix-gcc-6-build.patch \
+ file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \
+"
+SRC_URI[archive.md5sum] = "c16756952967f7316d64593124761027"
+SRC_URI[archive.sha256sum] = "aaeeebffaeb3068fb23757a2eede46adeb4c7cecc740feed7654e065491f5449"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 15/19] glade3: upgrade 3.8.5 -> 3.8.6
2019-10-27 23:35 ` [PATCH 15/19] glade3: upgrade 3.8.5 -> 3.8.6 Andreas Müller
@ 2019-10-28 20:08 ` Khem Raj
2019-10-28 21:11 ` Andreas Müller
0 siblings, 1 reply; 26+ messages in thread
From: Khem Raj @ 2019-10-28 20:08 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
https://errors.yoctoproject.org/Errors/Details/274843/
On Mon, Oct 28, 2019 at 12:38 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> * online help support was added - ship it optionally
> * prettify recipe a bit
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> .../recipes-devtools/glade/glade3_3.8.5.bb | 23 -------------------
> .../recipes-devtools/glade/glade3_3.8.6.bb | 18 +++++++++++++++
> 2 files changed, 18 insertions(+), 23 deletions(-)
> delete mode 100644 meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb
> create mode 100644 meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb
>
> diff --git a/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb b/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb
> deleted file mode 100644
> index c3da3e9b9..000000000
> --- a/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -SUMMARY = "Glade - A User Interface Designer"
> -HOMEPAGE = "http://www.gnu.org/software/gnash"
> -LICENSE = "GPLv2 & LGPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
> - file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
> - file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
> -DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native"
> -
> -inherit distro_features_check autotools pkgconfig pythonnative gtk-icon-cache
> -
> -REQUIRED_DISTRO_FEATURES = "x11"
> -
> -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
> - file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \
> - file://0002-fix-gcc-6-build.patch \
> - file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \
> - "
> -SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f"
> -SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735"
> -
> -EXTRA_OECONF += "--disable-scrollkeeper"
> -
> -FILES_${PN} += "${datadir}/icons"
> diff --git a/meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb b/meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb
> new file mode 100644
> index 000000000..8ed30944b
> --- /dev/null
> +++ b/meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb
> @@ -0,0 +1,18 @@
> +SUMMARY = "Glade - A User Interface Designer"
> +HOMEPAGE = "http://www.gnu.org/software/gnash"
> +LICENSE = "GPLv2 & LGPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
> + file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
> + file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
> +DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native yelp-tools-native"
> +
> +inherit gnomebase gnome-help distro_features_check pythonnative gtk-icon-cache
> +
> +REQUIRED_DISTRO_FEATURES = "x11"
> +
> +SRC_URI += " \
> + file://0002-fix-gcc-6-build.patch \
> + file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \
> +"
> +SRC_URI[archive.md5sum] = "c16756952967f7316d64593124761027"
> +SRC_URI[archive.sha256sum] = "aaeeebffaeb3068fb23757a2eede46adeb4c7cecc740feed7654e065491f5449"
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 16/19] gspell: upgrade 1.8.1 -> 1.8.2
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (14 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 15/19] glade3: upgrade 3.8.5 -> 3.8.6 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 17/19] gnome-system-monitor: upgrade 3.32.0 -> 3.32.1 Andreas Müller
` (2 subsequent siblings)
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../gspell/{gspell_1.8.1.bb => gspell_1.8.2.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-gnome/recipes-gnome/gspell/{gspell_1.8.1.bb => gspell_1.8.2.bb} (51%)
diff --git a/meta-gnome/recipes-gnome/gspell/gspell_1.8.1.bb b/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb
similarity index 51%
rename from meta-gnome/recipes-gnome/gspell/gspell_1.8.1.bb
rename to meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb
index 9de298c41..128a89f5d 100644
--- a/meta-gnome/recipes-gnome/gspell/gspell_1.8.1.bb
+++ b/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb
@@ -1,4 +1,4 @@
-SUMMARY = "spell adds spell-checking to a GTK+ applications"
+SUMMARY = "gspell adds spell-checking to a GTK+ applications"
HOMEPAGE = "https://wiki.gnome.org/Projects/gspell"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e"
@@ -7,5 +7,5 @@ DEPENDS = "gtk+3 iso-codes enchant2"
inherit gnomebase gettext gobject-introspection
-SRC_URI[archive.md5sum] = "8269918ea5ff798e49943e7daf6a32b9"
-SRC_URI[archive.sha256sum] = "819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5"
+SRC_URI[archive.md5sum] = "4f857382bc9d8d4afe1e67e5b5b9dbff"
+SRC_URI[archive.sha256sum] = "bb9195c3a95bacf556d0203e9691f7489e0d3bc5ae1e5a440c89b2f2435d3ed6"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 17/19] gnome-system-monitor: upgrade 3.32.0 -> 3.32.1
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (15 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 16/19] gspell: upgrade 1.8.1 -> 1.8.2 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 18/19] network-manager-applet: upgrade 1.8.22 -> 1.8.23 / build with meson / cleanup Andreas Müller
2019-10-27 23:35 ` [PATCH 19/19] ibus: initial add 1.5.21 Andreas Müller
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
* pack help files optionally
* add upstream-version-is-even to inherit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...t-build-help-we-do-not-have-yelp-yet.patch | 30 -------------------
...32.0.bb => gnome-system-monitor_3.32.1.bb} | 8 ++---
2 files changed, 3 insertions(+), 35 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch
rename meta-gnome/recipes-gnome/gnome-system-monitor/{gnome-system-monitor_3.32.0.bb => gnome-system-monitor_3.32.1.bb} (64%)
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch
deleted file mode 100644
index f2e720e9e..000000000
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c6649fdcfb2f44807089741557f8e527ab9751e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 24 Mar 2019 02:46:07 +0100
-Subject: [PATCH] Do not build help - we do not have yelp yet
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded-specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index d60ced7..6a0ab4b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -183,7 +183,6 @@ subdir('data')
- subdir('po')
- subdir('scripts')
- subdir('src')
--subdir('help')
-
-
- message('\n'.join(['',
---
-2.20.1
-
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb
similarity index 64%
rename from meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb
rename to meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb
index 8930e1222..a9cbf22d7 100644
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb
@@ -3,7 +3,6 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = " \
- itstool-native \
gnome-common-native \
libxml2-native \
glib-2.0-native \
@@ -15,13 +14,12 @@ DEPENDS = " \
GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase gconf gtk-icon-cache distro_features_check gettext
+inherit gnomebase gnome-help itstool gtk-icon-cache distro_features_check gettext upstream-version-is-even
REQUIRED_DISTRO_FEATURES = "x11 polkit"
-SRC_URI[archive.md5sum] = "6c2c5c5bf8f15d3e6985faacbd3055dd"
-SRC_URI[archive.sha256sum] = "af00c4a42dd1db17d9abe88edb11c7751b20982db1a8a2a467bab206fd8a77e3"
-SRC_URI += "file://0001-Do-not-build-help-we-do-not-have-yelp-yet.patch"
+SRC_URI[archive.md5sum] = "37356a1b8c20939adc6f47f739d2e49a"
+SRC_URI[archive.sha256sum] = "48c131335091bd927862f40ef56400f997981df2acfc82abea662bf91a1ea4f1"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 18/19] network-manager-applet: upgrade 1.8.22 -> 1.8.23 / build with meson / cleanup
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (16 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 17/19] gnome-system-monitor: upgrade 3.32.0 -> 3.32.1 Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:35 ` [PATCH 19/19] ibus: initial add 1.5.21 Andreas Müller
18 siblings, 0 replies; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
Cleanup means:
* remove unnecessary dependencies
* gobject-introspection builds fine for musl these days
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../network-manager-applet_1.8.22.bb | 44 -------------------
.../network-manager-applet_1.8.24.bb | 29 ++++++++++++
2 files changed, 29 insertions(+), 44 deletions(-)
delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb
create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb
deleted file mode 100644
index 37f512a73..000000000
--- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-SUMMARY = "GTK+ applet for NetworkManager"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-DEPENDS = "gtk+3 libnotify libsecret networkmanager \
- libgnome-keyring iso-codes nss \
- intltool-native \
-"
-
-GNOMEBASEBUILDCLASS = "autotools-brokensep"
-inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection gettext
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI[archive.md5sum] = "e0373f4c0d0637716e6e385799a9080f"
-SRC_URI[archive.sha256sum] = "ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed"
-
-PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager"
-PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info"
-PACKAGECONFIG ??= ""
-
-EXTRA_OECONF = " \
- --without-selinux \
-"
-
-# gobject-introspection related
-GI_DATA_ENABLED_libc-musl = "False"
-
-do_compile_prepend() {
- export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs"
-}
-
-RDEPENDS_${PN} =+ "networkmanager"
-
-FILES_${PN} += " \
- ${datadir}/nm-applet/ \
- ${datadir}/libnma/wifi.ui \
- ${datadir}/metainfo \
-"
-
-# musl builds generate gir files which otherwise go un-packaged
-FILES_${PN}-dev += " \
- ${datadir}/gir-1.0 \
-"
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb
new file mode 100644
index 000000000..90390e15f
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb
@@ -0,0 +1,29 @@
+SUMMARY = "GTK+ applet for NetworkManager"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+DEPENDS = "gtk+3 libnotify libsecret networkmanager iso-codes nss"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit distro_features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection gettext
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[archive.md5sum] = "5c1bf351fde5adc12200345550516050"
+SRC_URI[archive.sha256sum] = "118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr"
+PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager"
+PACKAGECONFIG[mobile-provider-info] = "-Dmobile_broadband_provider_info=true, -Dmobile_broadband_provider_info=false, mobile-broadband-provider-info,mobile-broadband-provider-info"
+PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux"
+
+RDEPENDS_${PN} =+ "networkmanager"
+
+FILES_${PN} += " \
+ ${datadir}/nm-applet/ \
+ ${datadir}/libnma/wifi.ui \
+ ${datadir}/metainfo \
+"
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 19/19] ibus: initial add 1.5.21
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
` (17 preceding siblings ...)
2019-10-27 23:35 ` [PATCH 18/19] network-manager-applet: upgrade 1.8.22 -> 1.8.23 / build with meson / cleanup Andreas Müller
@ 2019-10-27 23:35 ` Andreas Müller
2019-10-27 23:59 ` Andreas Müller
18 siblings, 1 reply; 26+ messages in thread
From: Andreas Müller @ 2019-10-27 23:35 UTC (permalink / raw)
To: openembedded-devel
It is a depency for gnome-shell
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-support/ibus/ibus-native.bb | 31 +++++++++++++++
meta-gnome/recipes-support/ibus/ibus.bb | 33 ++++++++++++++++
meta-gnome/recipes-support/ibus/ibus.inc | 33 ++++++++++++++++
...start-dbus-we-do-not-have-dbus-lauch.patch | 39 +++++++++++++++++++
4 files changed, 136 insertions(+)
create mode 100644 meta-gnome/recipes-support/ibus/ibus-native.bb
create mode 100644 meta-gnome/recipes-support/ibus/ibus.bb
create mode 100644 meta-gnome/recipes-support/ibus/ibus.inc
create mode 100644 meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
diff --git a/meta-gnome/recipes-support/ibus/ibus-native.bb b/meta-gnome/recipes-support/ibus/ibus-native.bb
new file mode 100644
index 000000000..c80048044
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus-native.bb
@@ -0,0 +1,31 @@
+require ${BPN}.inc
+
+inherit native
+
+DEPENDS = " \
+ glib-2.0-native \
+ dbus-native \
+ iso-codes \
+"
+
+EXTRA_OECONF += " \
+ --disable-unicode-dict \
+"
+PACKAGECONFIG = ""
+
+# for allarch iso-codes
+EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig"
+
+do_compile() {
+ cd src
+ oe_runmake ibusenumtypes.h ibusenumtypes.c
+ oe_runmake unicode-parser
+}
+
+do_install() {
+ install -d ${D}/${libdir}
+ install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir}
+
+ install -d ${D}/${bindir}
+ install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir}
+}
diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb
new file mode 100644
index 000000000..28f572ee7
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus.bb
@@ -0,0 +1,33 @@
+require ${BPN}.inc
+
+DEPENDS = " \
+ ${BPN}-native \
+ glib-2.0-native \
+ glib-2.0 \
+ dbus \
+ iso-codes \
+"
+
+inherit gtk-icon-cache bash-completion
+
+PACKAGECONFIG ??= " \
+ dconf gtk3 vala \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
+"
+
+do_configure_prepend() {
+ # run native unicode-parser
+ sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am
+}
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/GConf \
+ ${datadir}/glib-2.0 \
+ ${libdir}/gtk-3.0 \
+"
+
+FILES_${PN}-dev += " \
+ ${datadir}/gettext \
+"
+
diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc
new file mode 100644
index 000000000..fc598ef9f
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus.inc
@@ -0,0 +1,33 @@
+SUMMARY = "Intelligent Input Bus for Linux/Unix"
+HOMEPAGE = "https://github.com/ibus/ibus/wiki"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
+inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala
+
+PV = "1.5.21"
+SRC_URI = " \
+ git://github.com/ibus/ibus.git \
+ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
+"
+SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d"
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"
+PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf"
+PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+"
+PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
+PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland"
+PACKAGECONFIG[vala] = "--enable-vala,--disable-vala"
+PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11"
+
+EXTRA_OECONF += " \
+ --disable-tests \
+ --disable-emoji-dict \
+ --disable-python2 \
+"
+
+do_configure_prepend() {
+ touch ${S}/ChangeLog
+ touch ${S}/ABOUT-NLS
+}
diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
new file mode 100644
index 000000000..3701d19f5
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
@@ -0,0 +1,39 @@
+From f567bcbc2108d722faa90afeb03d3a3bcdf5f58b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 10 May 2019 14:30:08 +0200
+Subject: [PATCH] Do not try to start dbus - we do not have dbus-lauch
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ data/dconf/make-dconf-override-db.sh | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
+index 9c650e97..02fbf059 100755
+--- a/data/dconf/make-dconf-override-db.sh
++++ b/data/dconf/make-dconf-override-db.sh
+@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"
+ export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
+ mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR
+
+-eval `dbus-launch --sh-syntax`
+-
+-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
+-
+ # in case that schema is not installed on the system
+ glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
+
+@@ -46,5 +42,3 @@ for schema in $schemas; do
+ done
+
+ rm -rf $TMPDIR
+-
+-kill $DBUS_SESSION_BUS_PID
+--
+2.20.1
+
--
2.21.0
^ permalink raw reply related [flat|nested] 26+ messages in thread