Skip to contentSkip to conversation

Patch review

PATCH In review akuster 2 participants 42 messages May 18, 2020 – May 19, 2020

lore
Share & tools
lore

akuster

author
#0 lore raw

cover Patch review

These changes are being considered for backporting. Please have comments back by Thursday

The following changes since commit a62ad77973b16daac1cbaa03cbda3c6b9b91f2ff:

README: updated Maintainers list for Dunfell (2020-05-05 16:47:34 -0700)

are available in the Git repository at:

https://git.openembedded.org/meta-openembedded-contrib stable/dunfell-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/dunfell-nut

Adrian Bunk (1):
mraa: Replace -fcommon with fix

Alexander Vickberg (1):
tcpdump: Fix PACKAGECONFIG for OpenSSL

Andreas Müller (5):
xfce4-notifyd: upgrade 0.6.0 -> 0.6.1
xfconf: upgrade 4.14.1 -> 4.14.2
xfwm4: upgrade 4.14.1 -> 4.14.2
qpdf: upgrade 9.1.0 -> 10.0.1
qpdf: link libatomic explicitly on mips

Changqing Li (1):
apache2: fix service start fail

Claude Bing (3):
php: fix PACKAGECONFIG for soap
php: fix opcache link error in 7.4
php: update fix for opcache link issue in 7.4.4

Emmanuel Roullit (1):
appstream-glib: update 0.7.16 -> 0.7.17

Gianfranco Costamagna (1):
cpprest: Disable one more test requiring internet connection

Jonathan Liu (1):
x11vnc: fix xfc NULL pointer dereference

Khem Raj (1):
gtkwave: Disable mime update during install

Konrad Weihmann (1):
php: fix zip package config

Mingli Yu (10):
python3-ntplib: add missing python3-io RDEPENDS
python3-pid: add the missing rdepends
python3-parallax: add the missing rdepends
python3-pkgconfig: add missing rdepends
python3-pathlib2: add the missing rdepends
python3-ptyprocess: add the missing rdepends
python3-pydbus: add the missing rdepends
python3-pyudev: add the missing rdepends
python3-zipp: add the missing rdepends
gnome-themes-extra: correct the recipe name

Slater, Joseph (2):
python-pretty-table: add rdep's
python3-pyhamcrest: add rdep

Trevor Gamblin (7):
python3-py: add python3-netclient to RDEPENDS
python3-markdown: add logging and setuptools to RDEPENDS
python3-pyrsistent: add python3-numbers to RDEPENDS
python3-pytoml: add datetime and stringold to RDEPENDS
python3-dbusmock: re-add recipe and fix patch path
python3-pyyaml: add python3-netclient to RDEPENDS
python3-werkzeug: add python3-logging to RDEPENDS

Wang Mingyu (4):
mailcap: upgrade 2.1.48 -> 2.1.49
multipath-tools: upgrade 0.8.3 -> 0.8.4
modemmanager: upgrade 1.12.8 -> 1.12.10
python3-pyroute2: upgrade 0.5.11 -> 0.5.12

Yi Zhao (3):
nginx: remove /var/log/nginx when do_install
libldb: upgrade 1.5.6 -> 1.5.7
samba: upgrade 4.10.13 -> 4.10.15

Zang Ruochen (8):
python3-parse-type: Modify ptest output format
python3-pluggy: Modify ptest output format
python3-polyline: Modify ptest output format
python3-precise-runner: Modify ptest output format
python3-prettytable: Modify ptest output format
python3-ptyprocess: Modify ptest output format
python3-pyasn1: Modify ptest output format
python3-pyasn1-modules: Modify ptest output format

Zheng Ruoqin (4):
python3-pyserial: Modify ptest output format
python3-pyroute2: Modify ptest output format
v4l-utils: upgrade 1.18.0 -> 1.18.1
cpprest: upgrade 2.10.15 -> 2.10.16

[email protected] (3):
python3-setuptools-scm: Cosmetic improvement
python3-setuptools-scm: Add nativesdk to BBCLASSEXTEND
python3-attrs: Add nativesdk to BBCLASSEXTEND

 ...lib_0.7.16.bb => appstream-glib_0.7.17.bb} |  4 +-
 .../{samba_4.10.13.bb => samba_4.10.15.bb}    |  4 +-
 .../{libldb_1.5.6.bb => libldb_1.5.7.bb}      |  4 +-
 .../recipes-support/tcpdump/tcpdump_4.9.3.bb  |  2 +-
 ...ager_1.12.8.bb => modemmanager_1.12.10.bb} |  2 +-
 ...001-opcache-config.m4-enable-opcache.patch | 19 ++--
 meta-oe/recipes-devtools/php/php_7.4.4.bb     | 10 +-
 ...de-Declare-gVERSION-global-as-extern.patch | 31 +++++++
 meta-oe/recipes-extended/mraa/mraa_git.bb     |  3 +-
 ...ard_3.28.bb => gnome-themes-extra_3.28.bb} |  3 -
 .../gtkwave/gtkwave_3.3.104.bb                |  2 +-
 ...sor-fix-xfc-NULL-pointer-dereference.patch | 30 ++++++
 .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb  |  1 +
 ...4l-utils_1.18.0.bb => v4l-utils_1.18.1.bb} |  4 +-
 .../qpdf/{qpdf_9.1.0.bb => qpdf_10.0.1.bb}    |  6 +-
 .../cpprest/disable-outside-tests.patch       | 20 ++++
 ...{cpprest_2.10.15.bb => cpprest_2.10.16.bb} |  4 +-
 .../{mailcap_2.1.48.bb => mailcap_2.1.49.bb}  |  6 +-
 ...fix-bug-of-do_compile-and-do_install.patch | 44 +++++++++
 .../0024-RH-use-rpm-optflags-if-present.patch | 33 ++++---
 ...om-kernel-cmdline-mpath.wwids-with-A.patch | 93 +++----------------
 ...ools_0.8.3.bb => multipath-tools_0.8.4.bb} |  3 +-
 .../python/python-pathlib2.inc                |  2 +-
 .../python/python-prettytable.inc             |  5 +
 .../python/python-ptyprocess.inc              |  3 +
 .../python/python3-attrs_19.3.0.bb            |  6 +-
 ...y-to-add-own-objects-to-internal-obj.patch |  0
 ...ty-to-import-templates-from-packages.patch |  0
 .../python/python3-dbusmock_0.16.7.bb         | 25 +++++
 .../python/python3-markdown_3.0.1.bb          |  2 +
 .../python/python3-ntplib_0.3.3.bb            |  2 +-
 .../python/python3-parallax_1.0.5.bb          |  2 +
 .../python/python3-parse-type/run-ptest       |  2 +-
 .../python/python3-pid_2.2.5.bb               |  2 +
 .../python/python3-pkgconfig_1.4.0.bb         |  1 +
 .../python/python3-pluggy/run-ptest           |  3 +-
 .../python/python3-polyline/run-ptest         |  2 +-
 .../python/python3-precise-runner/run-ptest   |  2 +-
 .../python/python3-prettytable/run-ptest      |  2 +-
 .../python/python3-ptyprocess/run-ptest       |  2 +-
 .../python/python3-py_1.8.1.bb                |  2 +
 .../python/python3-pyasn1-modules/run-ptest   |  2 +-
 .../python/python3-pyasn1/run-ptest           |  2 +-
 .../python/python3-pydbus_0.6.0.bb            |  4 +-
 .../python/python3-pyhamcrest_1.9.0.bb        |  2 +
 .../python/python3-pyroute2/run-ptest         |  3 +-
 ...2_0.5.11.bb => python3-pyroute2_0.5.12.bb} |  4 +-
 .../python/python3-pyrsistent_0.15.7.bb       |  1 +
 .../python/python3-pyserial/run-ptest         |  3 +-
 .../python/python3-pytoml_0.1.21.bb           |  5 +
 .../python/python3-pyudev_0.21.0.bb           |  1 +
 .../python/python3-pyyaml_5.3.bb              |  1 +
 .../python/python3-setuptools-scm_3.3.3.bb    | 13 ++-
 .../python/python3-werkzeug_1.0.1.bb          |  1 +
 .../python/python3-zipp_0.6.0.bb              |  4 +-
 .../recipes-httpd/apache2/apache2_2.4.43.bb   |  8 --
 .../apache2/files/apache2-volatile.conf       |  2 -
 .../apache2/files/apache2.service             |  4 +
 .../recipes-httpd/apache2/files/init          |  5 +
 .../apache2/files/volatiles.04_apache2        |  3 -
 meta-webserver/recipes-httpd/nginx/nginx.inc  |  4 +-
 ...otifyd_0.6.0.bb => xfce4-notifyd_0.6.1.bb} |  4 +-
 .../{xfconf_4.14.1.bb => xfconf_4.14.2.bb}    |  4 +-
 .../{xfwm4_4.14.1.bb => xfwm4_4.14.2.bb}      |  4 +-
 64 files changed, 310 insertions(+), 167 deletions(-)
 rename meta-gnome/recipes-support/appstream-glib/{appstream-glib_0.7.16.bb => appstream-glib_0.7.17.bb} (84%)
 rename meta-networking/recipes-connectivity/samba/{samba_4.10.13.bb => samba_4.10.15.bb} (99%)
 rename meta-networking/recipes-support/libldb/{libldb_1.5.6.bb => libldb_1.5.7.bb} (95%)
 rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.12.8.bb => modemmanager_1.12.10.bb} (95%)
 create mode 100644 meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch
 rename meta-oe/recipes-gnome/gnome-themes/{gnome-themes-standard_3.28.bb => gnome-themes-extra_3.28.bb} (94%)
 create mode 100644 meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch
 rename meta-oe/recipes-multimedia/v4l2apps/{v4l-utils_1.18.0.bb => v4l-utils_1.18.1.bb} (93%)
 rename meta-oe/recipes-printing/qpdf/{qpdf_9.1.0.bb => qpdf_10.0.1.bb} (82%)
 rename meta-oe/recipes-support/cpprest/{cpprest_2.10.15.bb => cpprest_2.10.16.bb} (91%)
 rename meta-oe/recipes-support/mailcap/{mailcap_2.1.48.bb => mailcap_2.1.49.bb} (81%)
 create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch
 rename meta-oe/recipes-support/multipath-tools/{multipath-tools_0.8.3.bb => multipath-tools_0.8.4.bb} (97%)
 rename meta-python/recipes-devtools/python/{python-dbusmock => python3-dbusmock}/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch (100%)
 rename meta-python/recipes-devtools/python/{python-dbusmock => python3-dbusmock}/0002-Add-possibility-to-import-templates-from-packages.patch (100%)
 create mode 100644 meta-python/recipes-devtools/python/python3-dbusmock_0.16.7.bb
 rename meta-python/recipes-devtools/python/{python3-pyroute2_0.5.11.bb => python3-pyroute2_0.5.12.bb} (85%)
 delete mode 100644 meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf
 delete mode 100644 meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
 rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.6.0.bb => xfce4-notifyd_0.6.1.bb} (84%)
 rename meta-xfce/recipes-xfce/xfconf/{xfconf_4.14.1.bb => xfconf_4.14.2.bb} (83%)
 rename meta-xfce/recipes-xfce/xfwm4/{xfwm4_4.14.1.bb => xfwm4_4.14.2.bb} (90%)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/57 php: fix zip package config

From: Konrad Weihmann <[email protected]>

--enable-zip and --with-libzip were removed in PHP 7.x. These are replaced by --with-zip --with-zlib-dir.

(cherry picked from commit 6690afa59e5bb698e752c3346b8470e40f9d9daa)
---
 meta-oe/recipes-devtools/php/php_7.4.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/php/php_7.4.4.bb +1 -1
index ff4c28e133..c1784a78d9 100644
@@ -81,7 +81,7 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \
 "
 PACKAGECONFIG_class-native = ""
 
-PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
+PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip"
 
 PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \
                         --with-pdo-mysql=mysqlnd \
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 2/57 tcpdump: Fix PACKAGECONFIG for OpenSSL

In reply to akuster

From: Alexander Vickberg <[email protected]>

This fixes building TCPDump without OpenSSL. Current version does not recognize the option --without-openssl.

(cherry picked from commit 5b7ed1a8730a6e2c17d4650ee140b306483a3d9c)
---
 meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb +1 -1
index 05fc99bdc7..94543dd1da 100644
@@ -27,7 +27,7 @@ inherit autotools-brokensep ptest
 PACKAGECONFIG ?= "openssl"
 
 PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng"
-PACKAGECONFIG[openssl] = "--with-crypto,--without-openssl --without-crypto,openssl"
+PACKAGECONFIG[openssl] = "--with-crypto,--without-crypto,openssl"
 PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi"
 # Note: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled)
 PACKAGECONFIG[smb] = "--enable-smb,--disable-smb"
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 3/57 nginx: remove /var/log/nginx when do_install

In reply to akuster

From: Yi Zhao <[email protected]>

Remove directory /var/log/nginx when do_install because it is created by volatiles file.

(cherry picked from commit 6e9f393605eed1e5f4e317536b1463b83b978bad)
---
 meta-webserver/recipes-httpd/nginx/nginx.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-webserver/recipes-httpd/nginx/nginx.inc +3 -1
index 2824c66529..de080a2b01 100644
@@ -90,7 +90,7 @@ do_install () {
         install -d ${D}${sysconfdir}/tmpfiles.d
         echo "d /run/${BPN} - - - -" \
             > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
-        echo "d /${localstatedir}/log/${BPN} 0755 root root -" \
+        echo "d ${localstatedir}/log/${BPN} 0755 root root -" \
             >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
     fi
     install -d ${D}${sysconfdir}/${BPN}
@@ -139,6 +139,8 @@ do_install () {
             -e 's,@BASE_BINDIR@,${base_bindir},g' \
             ${D}${systemd_unitdir}/system/nginx.service
     fi
+
+    rm -rf ${D}${localstatedir}/log/
 }
 
 pkg_postinst_${PN} () {
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 4/57 php: fix PACKAGECONFIG for soap

In reply to akuster

From: Claude Bing <[email protected]>

PHP 7.4 enables libxml by default and removed it as a configurable option.

(cherry picked from commit 7aeef522ff3522ccf76a6750846e235e7c80427a)
---
 meta-oe/recipes-devtools/php/php_7.4.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/php/php_7.4.4.bb +1 -1
index c1784a78d9..a76dcaad37 100644
@@ -93,7 +93,7 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
                           ,--without-sqlite3 --without-pdo-sqlite \
                           ,sqlite3"
 PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql"
-PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2"
+PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2"
 PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2"
 PACKAGECONFIG[pam] = ",,libpam"
 PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \
Signature · 1 line
2.17.1
author
#5 lore raw

PATCH 5/57 python3-ntplib: add missing python3-io RDEPENDS

In reply to akuster

From: Mingli Yu <[email protected]>

Add the missing python3-io RDEPENDS to fix
below error:

 # python3
Python 3.8.2 (default, Apr 27 2020, 08:51:00)
[GCC 9.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
Quoted 1 line
Quoted 1 line
Quoted 1 line

import ntplib

Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib64/python3.8/site-packages/ntplib.py", line 32, in <module> import socket
ModuleNotFoundError: No module named 'socket'

(cherry picked from commit 0568dda628fa086aaedfa164c6b12654e09972a3)
---
 meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb +1 -1
index 93df83ad3c..ce2618b817 100644
@@ -11,4 +11,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools3 python3native pypi
 
-RDEPENDS_${PN} += "${PYTHON_PN}-datetime"
+RDEPENDS_${PN} += "${PYTHON_PN}-datetime ${PYTHON_PN}-io"
Signature · 1 line
2.17.1
author
#6 lore raw

PATCH 6/57 python3-pid: add the missing rdepends

In reply to akuster

From: Mingli Yu <[email protected]>

Add the missing rdepends to fix below error:

 # python3
 [snip]
Quoted 1 line
Quoted 1 line
Quoted 1 line

import pid

[snip]
ModuleNotFoundError: No module named 'fcntl'
ModuleNotFoundError: No module named 'logging'
ModuleNotFoundError: No module named 'tempfile'

(cherry picked from commit 580ec1e925e07484b46e76f2e7ee09d9b40c19e5)
---
 meta-python/recipes-devtools/python/python3-pid_2.2.5.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-python/recipes-devtools/python/python3-pid_2.2.5.bb +2 -0
index b8dd0d7474..ef19478885 100644
@@ -8,3 +8,5 @@ SRC_URI[md5sum] = "ad352ee1dc28b9746a15451c0c53e9d7"
 SRC_URI[sha256sum] = "96eb7dba326b88f5164bc1afdc986c7793e0d32d7f62366256a3903c7b0614ef"
 
 inherit pypi setuptools3
+
+RDEPENDS_${PN} += "${PYTHON_PN}-fcntl ${PYTHON_PN}-logging ${PYTHON_PN}-io"
Signature · 1 line
2.17.1
author
#7 lore raw

PATCH 7/57 python3-parallax: add the missing rdepends

In reply to akuster

From: Mingli Yu <[email protected]>

Add the missing rdepends to fix below error:

 # python3
 [snip]
Quoted 1 line
Quoted 1 line
Quoted 1 line

import parallax

[snip]
ModuleNotFoundError: No module named 'fcntl'
ModuleNotFoundError: No module named 'Queue'
ModuleNotFoundError: No module named 'getpass'

(cherry picked from commit e04584ef5ba7ed0abaf5b98c2da00bbeab5b6db8)
---
 meta-python/recipes-devtools/python/python3-parallax_1.0.5.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-python/recipes-devtools/python/python3-parallax_1.0.5.bb +2 -0
index d658bd621e..60631d43a0 100644
@@ -8,4 +8,6 @@ SRC_URI[sha256sum] = "e9e4dc500f1306a638df0f19d4ef976a623b260fc614c55cb1fd0d8410
 
 inherit pypi setuptools3
 
+RDEPENDS_${PN} += "${PYTHON_PN}-fcntl ${PYTHON_PN}-threading ${PYTHON_PN}-unixadmin"
+
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
author
#8 lore raw

PATCH 8/57 python3-pkgconfig: add missing rdepends

In reply to akuster

From: Mingli Yu <[email protected]>

Add missing rdepends to fix below error:

 # python3
 [snip]
Quoted 1 line
Quoted 1 line
Quoted 1 line

import pkgconfig

[snip]
ModuleNotFoundError: No module named 'shlex'

(cherry picked from commit 47b063d1da919ca022cf76b721959cfa82f1b876)
---
 meta-python/recipes-devtools/python/python3-pkgconfig_1.4.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta-python/recipes-devtools/python/python3-pkgconfig_1.4.0.bb +1 -0
index 92eb8bfb55..fc7a47a43d 100644
@@ -8,6 +8,7 @@ SRC_URI = "git://github.com/matze/pkgconfig.git"
 SRCREV ?= "8af0102346847e8873af8e76ab3f34ba9da806e2"
 
 RDEPENDS_${PN} = "pkgconfig \
+                 ${PYTHON_PN}-shell \
                  "
 
 inherit setuptools3
Signature · 1 line
2.17.1
author
#9 lore raw

PATCH 9/57 python3-py: add python3-netclient to RDEPENDS

In reply to akuster

From: Trevor Gamblin <[email protected]>

python3-py requires the uuid.py module, which is contained in python3-netclient. Without it:

root@qemux86-64:~# python3
Quoted 1 line
Quoted 1 line
Quoted 1 line

import py._path.local

Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib64/python3.8/site-packages/py/_path/local.py", line 7, in <module> import sys, os, atexit, io, uuid
ModuleNotFoundError: No module named 'uuid'

(cherry picked from commit 71bb82f31283398a6bc6e614444b8b73f2763591)
---
 meta-python/recipes-devtools/python/python3-py_1.8.1.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-python/recipes-devtools/python/python3-py_1.8.1.bb +2 -0
index 73aaf9e46a..ff66aeaa2b 100644
@@ -11,3 +11,5 @@ DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
 inherit pypi setuptools3
 
 BBCLASSEXTEND = "native nativesdk"
+
+RDEPENDS_${PN} += "${PYTHON_PN}-netclient"
Signature · 1 line
2.17.1
author
#10 lore raw

PATCH 10/57 python3-markdown: add logging and setuptools to RDEPENDS

In reply to akuster

From: Trevor Gamblin <[email protected]>

Importing the markdown module causes standard ModuleNotFoundErrors if the logging and pkg_resources modules are unavailable:

root@qemux86-64:~# python3
Python 3.8.2 (default, Apr 27 2020, 08:51:00)
[GCC 9.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
Quoted 1 line
Quoted 1 line
Quoted 1 line

import markdown

Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib64/python3.8/site-packages/markdown/_init_.py", line 25, in <module> from .core import Markdown, markdown, markdownFromFile
File "/usr/lib64/python3.8/site-packages/markdown/core.py", line 27, in <module> import logging
ModuleNotFoundError: No module named 'logging'

(cherry picked from commit 17426020a8c296986857511e85e3551207db857d)
---
 meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb +2 -0
index 68cd723acc..cdfe5496ad 100644
@@ -10,3 +10,5 @@ SRC_URI[md5sum] = "72219f46ca440b657bf227500731bdf1"
 SRC_URI[sha256sum] = "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"
 
 BBCLASSEXTEND = "native"
+
+RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools"
Signature · 1 line
2.17.1
author
#11 lore raw

PATCH 11/57 php: fix opcache link error in 7.4

In reply to akuster

From: Claude Bing <[email protected]>

Explicitly specifying -lrt is required for opcache to be linked against the proper dependencies. Additionally, PHP disables libdl when it detects a cross-compilation environment for some reason. In order to load any type of extension, re-enabling libdl is required.

(cherry picked from commit 0145cb4645b720efc36e4a034bb9e1077c191e5e)
---
 meta-oe/recipes-devtools/php/php_7.4.4.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
meta-oe/recipes-devtools/php/php_7.4.4.bb +11 -0
index a76dcaad37..07c3115060 100644
@@ -110,6 +110,17 @@ export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
 export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php"
 CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"
 
+# link against librt (libc) if opcache is specified in order to avoid the
+# following error:
+# Failed loading /usr/lib/php7/extensions/no-debug-non-zts-20190902/opcache.so: /usr/lib/php7/extensions/no-debug-non-zts-20190902/opcache.so: undefined symbol: shm_unlink
+LDFLAGS += "${@ " -lrt " if bb.utils.contains('PACKAGECONFIG', 'opcache', 'true', 'false', d) else "" }"
+
+# Adding these flags enables dynamic library support, which is disabled by
+# default when cross compiling
+# See https://bugs.php.net/bug.php?id=60109
+CFLAGS += " -DHAVE_LIBDL "
+LDFLAGS += " -ldl "
+
 EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
 
 acpaths = ""
Signature · 1 line
2.17.1
author
#12 lore raw

PATCH 12/57 python3-pathlib2: add the missing rdepends

In reply to akuster

From: Mingli Yu <[email protected]>

Add the missing rdepends to fix below error:

 # python3
 [snip]
Quoted 1 line
Quoted 1 line
Quoted 1 line

import pathlib2

[snip]
ModuleNotFoundError: No module named 'ctypes'

(cherry picked from commit e65e8da5338ac71b7e5ca8b5a781978d4c319a34)
---
 meta-python/recipes-devtools/python/python-pathlib2.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python-pathlib2.inc +1 -1
index 3199b56a03..d69d5273ae 100644
@@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=042856c23a3e903b33bf361ea1cbe29a"
 SRC_URI[md5sum] = "f2bd0a363eb0f8fa0556f35c1d9e66fb"
 SRC_URI[sha256sum] = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"
 
-RDEPENDS_${PN} += "${PYTHON_PN}-six"
+RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-ctypes"
 
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
author
#13 lore raw

PATCH 13/57 python3-ptyprocess: add the missing rdepends

In reply to akuster

From: Mingli Yu <[email protected]>

Add the missing rdepends to fix below error:

 # python3
 [snip]
Quoted 1 line
Quoted 1 line
Quoted 1 line

import ptyprocess

[snip]
ModuleNotFoundError: No module named 'fcntl'
ModuleNotFoundError: No module named 'pty'
ModuleNotFoundError: No module named 'resource'

(cherry picked from commit 07c7bacd997e9f593602acf840c10e9585cf5657)
---
 meta-python/recipes-devtools/python/python-ptyprocess.inc | 3 +++
 1 file changed, 3 insertions(+)
meta-python/recipes-devtools/python/python-ptyprocess.inc +3 -0
index 0cc9114754..a6dc21cf11 100644
@@ -15,6 +15,9 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 RDEPENDS_${PN} = "\
     ${PYTHON_PN}-core \
+    ${PYTHON_PN}-fcntl \
+    ${PYTHON_PN}-terminal \
+    ${PYTHON_PN}-resource \
 "
 
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
author
#14 lore raw

PATCH 14/57 python3-pydbus: add the missing rdepends

In reply to akuster

From: Mingli Yu <[email protected]>

Add the missing rdepends to fix below error:

 # python3
 [snip]
Quoted 1 line
Quoted 1 line
Quoted 1 line

import pydbus

[snip]
ModuleNotFoundError: No module named 'socket'
ModuleNotFoundError: No module named 'logging'

(cherry picked from commit 55190da2eba946319453531021089186bd2dd551)
---
 meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb +3 -1
index 931bc6f7cb..807e7b2de5 100644
@@ -14,4 +14,6 @@ inherit pypi setuptools3
 
 S = "${WORKDIR}/pydbus-${PV}"
 
-RDEPENDS_${PN} = "${PYTHON_PN}-pygobject"
+RDEPENDS_${PN} = "${PYTHON_PN}-pygobject \
+                  ${PYTHON_PN}-io \
+                  ${PYTHON_PN}-logging"
Signature · 1 line
2.17.1
author
#15 lore raw

PATCH 15/57 python3-pyudev: add the missing rdepends

In reply to akuster

From: Mingli Yu <[email protected]>

Add the missing rdepends to fix below error:

 # python3
 [snip]
Quoted 1 line
Quoted 1 line
Quoted 1 line

import pyudev

[snip]
ModuleNotFoundError: No module named 'fcntl'

(cherry picked from commit 4e79bf9f1d11739389f0cc7c9e6360dcd156f16c)
---
 meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb +1 -0
index f39847ffa7..49a3628f41 100644
@@ -17,5 +17,6 @@ RDEPENDS_${PN} = "\
     ${PYTHON_PN}-misc \
     ${PYTHON_PN}-six \
     ${PYTHON_PN}-threading \
+    ${PYTHON_PN}-fcntl \
     libudev \
 "
Signature · 1 line
2.17.1
author
#16 lore raw

PATCH 16/57 php: update fix for opcache link issue in 7.4.4

In reply to akuster

From: Claude Bing <[email protected]>

The source of the issue is the update for PHP 7.4 support in 0001-opcache-config.m4-enable-opcache.patch (commit 7cc7a9ec). Instead of working around the issue in the recipe file, update the patch to restore the call to PHP_ADD_LIBRARY().

(cherry picked from commit 3cfd16be4e1b62efe8ac640cecc080709cf2b9f9)
---
 ...001-opcache-config.m4-enable-opcache.patch | 19 +++++++++++++------
 meta-oe/recipes-devtools/php/php_7.4.4.bb     |  5 -----
 2 files changed, 13 insertions(+), 11 deletions(-)
meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch +13 -6
index ee0d5edcdb..1f3e683a0f 100644
@@ -1,4 +1,7 @@
-opcache/config.m4: enable opcache
+From a74b42098aededd296ec6a3cd4cf5a17e59d6f29 Mon Sep 17 00:00:00 2001
+From: Claude Bing <[email protected]>
+Date: Fri, 8 May 2020 10:15:32 -0400
+Subject: [PATCH] opcache/config.m4: enable opcache
 
 We can't use AC_TRY_RUN to run programs in a cross compile environment.
 Set
@@ -12,15 +15,18 @@ Signed-off-by: Anuj Mittal <[email protected]>
 
 update patch to version 7.4.4
 Signed-off-by: Changqing Li <[email protected]>
+
+fix issue linking with librt
+Signed-off-by: Claude Bing <[email protected]>
 ---
- ext/opcache/config.m4 | 194 +-------------------------------------------------
- 1 file changed, 3 insertions(+), 191 deletions(-)
+ ext/opcache/config.m4 | 195 +-----------------------------------------
+ 1 file changed, 4 insertions(+), 191 deletions(-)
 
 diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
-index 6c40caf..84ddf1e 100644
+index 6c40cafc1c..6569aa9e1c 100644
 --- a/ext/opcache/config.m4
 +++ b/ext/opcache/config.m4
-@@ -23,201 +23,13 @@ if test "$PHP_OPCACHE" != "no"; then
+@@ -23,201 +23,14 @@ if test "$PHP_OPCACHE" != "no"; then
    AC_CHECK_FUNCS([mprotect])
  
    AC_MSG_CHECKING(for sysvipc shared memory support)
@@ -222,9 +228,10 @@ index 6c40caf..84ddf1e 100644
 -    AC_MSG_RESULT([no])
 -  ])
 +  AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
++  PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
  
    PHP_NEW_EXTENSION(opcache,
  	ZendAccelerator.c \
 -- 
-2.7.4
+2.17.1
 
meta-oe/recipes-devtools/php/php_7.4.4.bb +0 -5
index 07c3115060..1d93902e72 100644
@@ -110,11 +110,6 @@ export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
 export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php"
 CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"
 
-# link against librt (libc) if opcache is specified in order to avoid the
-# following error:
-# Failed loading /usr/lib/php7/extensions/no-debug-non-zts-20190902/opcache.so: /usr/lib/php7/extensions/no-debug-non-zts-20190902/opcache.so: undefined symbol: shm_unlink
-LDFLAGS += "${@ " -lrt " if bb.utils.contains('PACKAGECONFIG', 'opcache', 'true', 'false', d) else "" }"
-
 # Adding these flags enables dynamic library support, which is disabled by
 # default when cross compiling
 # See https://bugs.php.net/bug.php?id=60109
Signature · 1 line
2.17.1
author
#17 lore raw

PATCH 17/57 python-pretty-table: add rdep's

In reply to akuster

From: "Slater, Joseph" <[email protected]>

python(3)-math and python(3)-html.

(cherry picked from commit 623cc3dabf77cd0bdec4ca61149f61049c1142e4)
---
 meta-python/recipes-devtools/python/python-prettytable.inc | 5 +++++
 1 file changed, 5 insertions(+)
meta-python/recipes-devtools/python/python-prettytable.inc +5 -0
index 09384dae17..c77a49191e 100644
@@ -29,6 +29,11 @@ SRC_URI += " \
 	file://run-ptest \
 "
 
+RDEPENDS_${PN} += " \
+	${PYTHON_PN}-math \
+	${PYTHON_PN}-html \
+"
+
 RDEPENDS_${PN}-ptest += " \
 	${PYTHON_PN}-pytest \
 "
Signature · 1 line
2.17.1
author
#18 lore raw

PATCH 18/57 python3-pyhamcrest: add rdep

In reply to akuster

From: "Slater, Joseph" <[email protected]>

python3-six.

(cherry picked from commit b34cb7ca8c2625ed9ab439dc50cf2ced0cc4571d)
---
 meta-python/recipes-devtools/python/python3-pyhamcrest_1.9.0.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-python/recipes-devtools/python/python3-pyhamcrest_1.9.0.bb +2 -0
index 04aa9b47f0..ee96a079a7 100644
@@ -8,3 +8,5 @@ SRC_URI[md5sum] = "8b833a3fa30197455df79424f30c8c3f"
 SRC_URI[sha256sum] = "8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd"
 
 inherit pypi setuptools3
+
+RDEPENDS_${PN} += "${PYTHON_PN}-six"
Signature · 1 line
2.17.1
author
#19 lore raw

PATCH 19/57 python3-zipp: add the missing rdepends

In reply to akuster

From: Mingli Yu <[email protected]>

Add the missing rdepends to fix below error:

 # python3
 [snip]
Quoted 1 line
Quoted 1 line
Quoted 1 line

import zipp

ModuleNotFoundError: No module named 'zipfile'
ModuleNotFoundError: No module named 'random' python3-math

(cherry picked from commit 16b524d00a1f0684093b278a45f98fa736dda1e2)
---
 meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb +3 -1
index 1019081f38..40db3c071a 100644
@@ -10,6 +10,8 @@ DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
 
 inherit pypi setuptools3
 
-RDEPENDS_${PN} += "${PYTHON_PN}-more-itertools"
+RDEPENDS_${PN} += "${PYTHON_PN}-compression \
+                   ${PYTHON_PN}-math \
+                   ${PYTHON_PN}-more-itertools"
 
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
author
#20 lore raw

PATCH 20/57 x11vnc: fix xfc NULL pointer dereference

In reply to akuster

From: Jonathan Liu <[email protected]>

(cherry picked from commit d8eecca63640b47d02665fa9c4caabc9776b830d)
---
 ...sor-fix-xfc-NULL-pointer-dereference.patch | 30 +++++++++++++++++++
 .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb  |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch
meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch new file +30 -0
new file mode 100644
index 0000000000..a571ba2838
@@ -0,0 +1,30 @@
+From 95a10ab64c2dbbec2c8dad91a5ffb73a0d68474b Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <[email protected]>
+Date: Mon, 16 Mar 2020 20:04:06 +1100
+Subject: [PATCH] src/cursor: fix xfc NULL pointer dereference
+
+xfc->width and xfc->height for the XFixes cursor image returned from
+XFixesGetCursorImage(dpy) are accessed without first checking that xfc
+is not NULL. This can result in the server sometimes crashing when
+moving a Google Chrome window.
+
+Fixes: 37c946191a0f ("Broken cursor bugfix for 64 bit systems (#49)")
+Upstream-Status: Accepted
+Signed-off-by: Jonathan Liu <[email protected]>
+---
+ src/cursor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cursor.c b/src/cursor.c
+index 39e73a6..74a08c6 100644
+--- a/src/cursor.c
++++ b/src/cursor.c
+@@ -1311,7 +1311,7 @@ static int get_exact_cursor(int init) {
+ 
+ 		/* retrieve the cursor info + pixels from server: */
+ 		xfc = XFixesGetCursorImage(dpy);
+-		{
++		if (xfc) {
+ 			/* 2017-07-09, Stephan Fuhrmann: This fixes an implementation flaw for 64 bit systems.
+ 			 * The XFixesCursorImage structure says xfc->pixels is (unsigned long*) in the structure, but
+ 			 * the protocol spec says it's 32 bit per pixel
meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +1 -0
index 0d84c420a1..e3a1914fef 100644
@@ -12,6 +12,7 @@ SRC_URI = "git://github.com/LibVNC/x11vnc \
            file://starting-fix.patch \
            file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \
            file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+           file://src-cursor-fix-xfc-NULL-pointer-dereference.patch \
            "
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.17.1
author
#21 lore raw

PATCH 21/57 python3-setuptools-scm: Cosmetic improvement

In reply to akuster

From: "[email protected]" <[email protected]>

Split values of RDEPENDS variables to individual lines in alphabetic order.

(cherry picked from commit 99e3432c60606af1d37947b3fce002d679cfcb50)
---
 .../python/python3-setuptools-scm_3.3.3.bb            | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
meta-python/recipes-devtools/python/python3-setuptools-scm_3.3.3.bb +9 -2
index f8d28b33af..c061ea2e63 100644
@@ -8,7 +8,14 @@ SRC_URI[sha256sum] = "bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217a
 PYPI_PACKAGE = "setuptools_scm"
 inherit pypi setuptools3
 
-RDEPENDS_${PN}_class-target = "${PYTHON_PN}-py ${PYTHON_PN}-setuptools ${PYTHON_PN}-debugger ${PYTHON_PN}-json"
-RDEPENDS_${PN}_class-native = "${PYTHON_PN}-setuptools-native"
+RDEPENDS_${PN}_class-target = "\
+    ${PYTHON_PN}-debugger \
+    ${PYTHON_PN}-json \
+    ${PYTHON_PN}-py \
+    ${PYTHON_PN}-setuptools \
+"
+RDEPENDS_${PN}_class-native = "\
+    ${PYTHON_PN}-setuptools-native \
+"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.17.1
author
#22 lore raw

PATCH 22/57 python3-setuptools-scm: Add nativesdk to BBCLASSEXTEND

In reply to akuster

From: "[email protected]" <[email protected]>

By doing so we mitigate failure when trying to bitbake recipe which rdepends on nativesdk-python3-setuptools-scm, such as following error when bitbaking nativesdk-python3-jsonschema:

ERROR: Nothing RPROVIDES 'nativesdk-python3-setuptools-scm' (but virtual:nativesdk:.../meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.2.0.bb RDEPENDS on or otherwise requires it)

(cherry picked from commit c966d3f063a9f159fd8db532b8034435e1cf3964)
---
 .../recipes-devtools/python/python3-setuptools-scm_3.3.3.bb   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-python/recipes-devtools/python/python3-setuptools-scm_3.3.3.bb +2 -2
index c061ea2e63..a1fc3831fb 100644
@@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217a
 PYPI_PACKAGE = "setuptools_scm"
 inherit pypi setuptools3
 
-RDEPENDS_${PN}_class-target = "\
+RDEPENDS_${PN} = "\
     ${PYTHON_PN}-debugger \
     ${PYTHON_PN}-json \
     ${PYTHON_PN}-py \
@@ -18,4 +18,4 @@ RDEPENDS_${PN}_class-native = "\
     ${PYTHON_PN}-setuptools-native \
 "
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
author
#23 lore raw

PATCH 23/57 python3-attrs: Add nativesdk to BBCLASSEXTEND

In reply to akuster

From: "[email protected]" <[email protected]>

By doing so we mitigate failure when trying to bitbake recipe which rdepends on nativesdk-python3-attrs, such as following error when bitbaking nativesdk-python3-jsonschema:

ERROR: Nothing RPROVIDES 'nativesdk-python3-attrs' (but virtual:nativesdk:.../meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.2.0.bb RDEPENDS on or otherwise requires it)

(cherry picked from commit 129efc7fa0c04ee812a972fc5b63990fe74288ea)
---
 meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb +5 -1
index b3739fda8c..7ff8049e52 100644
@@ -12,5 +12,9 @@ RDEPENDS_${PN}_class-target += " \
     ${PYTHON_PN}-crypt \
     ${PYTHON_PN}-ctypes \
 "
+RDEPENDS_${PN}_class-nativesdk += " \
+    ${PYTHON_PN}-crypt \
+    ${PYTHON_PN}-ctypes \
+"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
author
#24 lore raw

PATCH 24/57 xfce4-notifyd: upgrade 0.6.0 -> 0.6.1

In reply to akuster

From: Andreas Müller <[email protected]>

Release notes for 0.6.1

=======================
- Fix hover effect without compositing (Bug #16586)
- Move from exo-csource to xdt-csource (Bug #16717)
- Translation Updates:
Arabic, Armenian (Armenia), Bulgarian, Catalan, Chinese (China), Chinese (Taiwan), Czech, Danish, Dutch, English (Australia), Finnish, French, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, Interlingue, Japanese, Kazakh, Korean, Lithuanian, Malay, Norwegian Bokmål, Polish, Portuguese, Russian, Serbian, Spanish, Swedish, Thai, Turkish, Ukrainian

(cherry picked from commit 6626da2826fa24a8f40b0cd17254302aee9333c9)
---
 .../{xfce4-notifyd_0.6.0.bb => xfce4-notifyd_0.6.1.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.6.0.bb => xfce4-notifyd_0.6.1.bb} (84%)
meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb renamed from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.0.bb +2 -2
similarity index 84%
rename from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.0.bb
rename to meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb
index 5e0f44e296..aed5ce4dce 100644
@@ -14,8 +14,8 @@ DEPENDS = " \
 
 inherit xfce-app
 
-SRC_URI[md5sum] = "1724fcb635bbab44c9f62c69734e446d"
-SRC_URI[sha256sum] = "c1d126a81604ff967e4655f06427763bf559c338ba629c95cb9aa7f5d6dc8ba6"
+SRC_URI[md5sum] = "58e70621d6b9e0e66399ed41ab402a47"
+SRC_URI[sha256sum] = "9b5274999c89bf296a7de03b375e8233eef37940b7444502130b92dfb6a089b4"
 
 # Avoid trouble with other desktops e.g KDE which also ships dbus service named
 # org.freedesktop.Notifications
Signature · 1 line
2.17.1
author
#25 lore raw

PATCH 25/57 xfconf: upgrade 4.14.1 -> 4.14.2

In reply to akuster

From: Andreas Müller <[email protected]>

Release notes for 4.14.2

========================
This is a maintenance release of xfconf for Xfce 4.14

Use 'gsettings' as a common channel name for the GSetting backend Bug #14789 Fix GSettings backend assertion error, when probed but not used.
Bug #15960: Add some missing xfconf_shutdown() in xfconf-query Bug #15951: Fix 'xfconf_get_error_quark' introspecting warning Translation updates: gl, hr, zh_CN, sl, sq, be, da, el, es, hu, zh_TW, he.

Although the GSetting backend is fixed with this release, it is still disabled by default on Xfce 4.14 branch, to maintain the same installed files. It can be enabled with --enable-gsettings-backend compile time tunable and used by setting GSETTINGS_BACKEND=xfconf.

(cherry picked from commit 58aa7654e1ee86e31a06d18675e95ffda8e592b3)
---
 .../xfconf/{xfconf_4.14.1.bb => xfconf_4.14.2.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-xfce/xfconf/{xfconf_4.14.1.bb => xfconf_4.14.2.bb} (83%)
meta-xfce/recipes-xfce/xfconf/xfconf_4.14.2.bb renamed from meta-xfce/recipes-xfce/xfconf/xfconf_4.14.1.bb +2 -2
similarity index 83%
rename from meta-xfce/recipes-xfce/xfconf/xfconf_4.14.1.bb
rename to meta-xfce/recipes-xfce/xfconf/xfconf_4.14.2.bb
index 8da96a4205..893a32f420 100644
@@ -8,8 +8,8 @@ inherit xfce gtk-doc gobject-introspection
 
 EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl"
 
-SRC_URI[md5sum] = "cb51a59e2a89d05232f825ad8c74a7c0"
-SRC_URI[sha256sum] = "b893e0a329aee00902fec2f0509f56916c9dcc7844e1b1f9e3c7399458290d59"
+SRC_URI[md5sum] = "769b74d354aa65e0013edc6823b78e48"
+SRC_URI[sha256sum] = "1e7086cc5a63219e375c95a1dfd10ad7098c2586f55ac209e66aef61b969f255"
 
 FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \
                 ${libdir}/gio/modules/libxfconfgsettingsbackend.so \
Signature · 1 line
2.17.1
author
#26 lore raw

PATCH 26/57 xfwm4: upgrade 4.14.1 -> 4.14.2

In reply to akuster

From: Andreas Müller <[email protected]>

Release notes for 4.14.2

========================
4.14.2
======

- Prefer GLX on AMD (Bug #16716)
- Fix compositor without required X11 extensions (Bug #16713)
- Fix window decorations without XRender extension (Bug #16713)
- Avoid grabbing the keyboard with Alt-Tab to work around a bug in Qt with XInput2 valuators (Bug #16708)
- Automatically update window title fonts on scale change
- Fix a regression with title font size at scale 2 (Bug #16711)
- Fix an X error with XShape (Bug #16383)
- I18n:
Update translations: ar, be, be@tarask, bg, bn, ca, cs, da, de, el, en_AU, en_CA, en_GB, es, eu, fi, fr, gl, he, hr, hy_AM, id, ie, is, it, ka, ko, lt, lv, nb, nl, nn, oc, pl, pt, pt_BR, ro, sk, sl, sq, sv, th, ug, ur, ur_PK, zh_CN, zh_HK

(cherry picked from commit 278d762738fe23332b38751433e9b5f9c8a1f9a9)
---
 .../recipes-xfce/xfwm4/{xfwm4_4.14.1.bb => xfwm4_4.14.2.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-xfce/xfwm4/{xfwm4_4.14.1.bb => xfwm4_4.14.2.bb} (90%)
meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb renamed from meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.1.bb +2 -2
similarity index 90%
rename from meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.1.bb
rename to meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb
index 617e14f8e1..b6066a5266 100644
@@ -9,8 +9,8 @@ inherit xfce update-alternatives features_check
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch"
-SRC_URI[md5sum] = "b20bd22bdbe1b17f76a139fd74e072a9"
-SRC_URI[sha256sum] = "100781a18070762e8f34c1d450e767586576753d567f76a8c32818284f511428"
+SRC_URI[md5sum] = "6d61d07b6ea88a429c43e1b9c3293eb8"
+SRC_URI[sha256sum] = "b15b40342596a3b6ab5167a58371262adf5484e165cb25a31fef42f0aa8ffd92"
 
 PACKAGECONFIG ?= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \
Signature · 1 line
2.17.1
author
#27 lore raw

PATCH 27/57 qpdf: upgrade 9.1.0 -> 10.0.1

In reply to akuster

From: Andreas Müller <[email protected]>

(cherry picked from commit 831f3fd5023b87cdedf877e07f72df3314ff4d58)
---
 .../recipes-printing/qpdf/{qpdf_9.1.0.bb => qpdf_10.0.1.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-printing/qpdf/{qpdf_9.1.0.bb => qpdf_10.0.1.bb} (85%)
meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb renamed from meta-oe/recipes-printing/qpdf/qpdf_9.1.0.bb +2 -2
similarity index 85%
rename from meta-oe/recipes-printing/qpdf/qpdf_9.1.0.bb
rename to meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb
index 44a5fea841..f04e437d34 100644
@@ -7,8 +7,8 @@ DEPENDS = "libpcre zlib libjpeg-turbo"
 SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz"
 
 LIC_FILES_CHKSUM = "file://Artistic-2.0;md5=7806296b9fae874361e6fb10072b7ee3"
-SRC_URI[md5sum] = "090d03ab179c281233f8240ade179d54"
-SRC_URI[sha256sum] = "3abbbb7907f2e750336b9c97e67b6e806aca91ab537402ec080656d63940ed79"
+SRC_URI[md5sum] = "eb7fb7c6cd5d3036bf4f7a5e3f44d995"
+SRC_URI[sha256sum] = "5d2277c738188b7f4e3f01a6db7f2937ed6df54671f1fba834cd3d7ff865827b"
 
 inherit autotools-brokensep gettext
 
Signature · 1 line
2.17.1
author
#28 lore raw

PATCH 28/57 qpdf: link libatomic explicitly on mips

In reply to akuster

From: Andreas Müller <[email protected]>

(cherry picked from commit 7a1f41a6a0823e6ac7d5e44dba76ef9e7db3c47f)
---
 meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb +2 -0
index f04e437d34..3883a8dcf0 100644
@@ -20,6 +20,8 @@ EXTRA_OECONF = "--without-random \
 
 EXTRA_OEMAKE_class-target = "LIBTOOL=${HOST_SYS}-libtool"
 
+LDFLAGS_append_mipsarch = " -latomic"
+
 S="${WORKDIR}/${BPN}-${PV}"
 
 # avoid Makefile returning error on 'make clean' before configure was run
Signature · 1 line
2.17.1
author
#29 lore raw

PATCH 29/57 mailcap: upgrade 2.1.48 -> 2.1.49

In reply to akuster

From: Wang Mingyu <[email protected]>

man page changed from mailcap.4 to mailcap.5

(cherry picked from commit 2d6575d3f1aeff68961530990814cf29da1374e4)
---
 .../mailcap/{mailcap_2.1.48.bb => mailcap_2.1.49.bb}        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/mailcap/{mailcap_2.1.48.bb => mailcap_2.1.49.bb} (81%)
meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb renamed from meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb +3 -3
similarity index 81%
rename from meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb
rename to meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb
index 114ce4607c..ff3047f325 100644
@@ -14,12 +14,12 @@ by several applications e.g. to determine MIME types for filenames."
 SECTION = "System Environment/Base"
 
 LICENSE = "PD & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=100fcfb84512ccc03ffc7d89ac391305"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8dce08227d135cfda1f19d4c0c6689de"
 
 SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz"
 
-SRC_URI[md5sum] = "2c26e18e912a5cf00318fcf7f8f2d747"
-SRC_URI[sha256sum] = "d7b023b237d6053bf05ff6786e0663c55c614efcc99cdf856120be13b5c29157"
+SRC_URI[md5sum] = "d5701a1a541383c0eda328f4a6518751"
+SRC_URI[sha256sum] = "f7381516bc1a937348efd1d0e14618e0a2afc5d59fe821dd248632d5601b59b5"
 
 do_install() {
     oe_runmake install DESTDIR=${D} sysconfdir=${sysconfdir} mandir=${mandir}
Signature · 1 line
2.17.1
author
#30 lore raw

PATCH 30/57 python3-parse-type: Modify ptest output format

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit 86d1c32a818abba71c5a52d21249759cf601ab2e)
---
 .../recipes-devtools/python/python3-parse-type/run-ptest        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-parse-type/run-ptest +1 -1
index 5cec711696..b63c4de0d9 100644
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pytest
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
Signature · 1 line
2.17.1
author
#31 lore raw

PATCH 31/57 python3-pluggy: Modify ptest output format

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit 60ef83881cb285b8b20f3a178af17120b0a49dac)
---
 meta-python/recipes-devtools/python/python3-pluggy/run-ptest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-pluggy/run-ptest +2 -1
index 40c284799d..b63c4de0d9 100644
@@ -1,2 +1,3 @@
 #!/bin/sh
-pytest
+
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
Signature · 1 line
2.17.1
author
#32 lore raw

PATCH 32/57 python3-polyline: Modify ptest output format

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit 6b69dab552ae2c00c8cc6d68b062dc0067eb690f)
---
 meta-python/recipes-devtools/python/python3-polyline/run-ptest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-polyline/run-ptest +1 -1
index 5cec711696..b63c4de0d9 100644
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pytest
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
Signature · 1 line
2.17.1
author
#33 lore raw

PATCH 33/57 python3-precise-runner: Modify ptest output format

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit 388d26db292e2fe158a0e993cfb84805c74630ce)
---
 .../recipes-devtools/python/python3-precise-runner/run-ptest    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-precise-runner/run-ptest +1 -1
index 5cec711696..b63c4de0d9 100644
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pytest
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
Signature · 1 line
2.17.1
author
#34 lore raw

PATCH 34/57 python3-prettytable: Modify ptest output format

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit 71be27f71230a7a22a3c53625aef6256cbc18dce)
---
 .../recipes-devtools/python/python3-prettytable/run-ptest       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-prettytable/run-ptest +1 -1
index 5cec711696..b63c4de0d9 100644
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pytest
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
Signature · 1 line
2.17.1
author
#35 lore raw

PATCH 35/57 python3-ptyprocess: Modify ptest output format

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit e4213de6504c2a021380c7f41dadf64d98c53b0f)
---
 .../recipes-devtools/python/python3-ptyprocess/run-ptest        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest +1 -1
index 27c9e59c82..15c3f6282d 100644
@@ -1,3 +1,3 @@
 #!/bin/sh 
 
-pytest
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
Signature · 1 line
2.17.1
author
#36 lore raw

PATCH 36/57 python3-pyasn1: Modify ptest output format

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit 4f8809a1f7337f686fa112e1b224f4f8132983ad)
---
 meta-python/recipes-devtools/python/python3-pyasn1/run-ptest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-pyasn1/run-ptest +1 -1
index 5cec711696..b63c4de0d9 100644
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pytest
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
Signature · 1 line
2.17.1
author
#37 lore raw

PATCH 37/57 python3-pyasn1-modules: Modify ptest output format

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit 7b39cd7ad26bee0f71c3d7ea3bd6ed8848ab1871)
---
 .../recipes-devtools/python/python3-pyasn1-modules/run-ptest    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest +1 -1
index 5cec711696..b63c4de0d9 100644
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pytest
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
Signature · 1 line
2.17.1
author
#38 lore raw

PATCH 38/57 python3-pyserial: Modify ptest output format

In reply to akuster

From: Zheng Ruoqin <[email protected]>

(cherry picked from commit 6919766bd2b39f00e87189cb5c531cf0f619beb8)
---
 meta-python/recipes-devtools/python/python3-pyserial/run-ptest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-pyserial/run-ptest +2 -1
index 5cec711696..e301963f96 100644
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-pytest
+
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
Signature · 1 line
2.17.1
author
#39 lore raw

PATCH 39/57 python3-pyroute2: Modify ptest output format

In reply to akuster

From: Zheng Ruoqin <[email protected]>

(cherry picked from commit 638bd31bf82c1c76053a8be05d0723649f72adc2)
---
 meta-python/recipes-devtools/python/python3-pyroute2/run-ptest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-pyroute2/run-ptest +2 -1
index 5cec711696..ea429ba21e 100644
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-pytest
+pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
+
Signature · 1 line
2.17.1
#40 lore raw
In reply to akuster
Quoted 4 lines · akuster

...
Adrian Bunk (1):
mraa: Replace -fcommon with fix
...

I'd drop that one:
Cleanup patch that replaces a harmless workaround with a trivial fix.

cu
Adrian

author
#41 lore raw
Quoted 7 lines · Adrian Bunk
Quoted 4 lines · akuster

...
Adrian Bunk (1):
mraa: Replace -fcommon with fix
...

I'd drop that one:
Cleanup patch that replaces a harmless workaround with a trivial fix.

That one I was on the fence over as this release will be around longer, it might make maint easier over the long run if there is another patch later on for this package.Will drop for now.

As always, thanks for the review.

BR,
Armin

Quoted 3 lines

cu
Adrian